chore: only redirect on android if connected via deeplink

Author: ganchoradkov

wallets/rn_cli_wallet/package.json

@@ -36,7 +36,7 @@
     "@reown/walletkit": "1.1.1-canary-ca-10",
     "@sentry/react-native": "5.32.0",
     "@walletconnect/core": "2.17.2",
-    "@walletconnect/react-native-compat": "2.17.2-canary-ca-6",
+    "@walletconnect/react-native-compat": "2.17.2-canary-ca-7",
     "dayjs": "1.11.11",
     "ethers": "5.7.2",
     "patch-package": "8.0.0",

wallets/rn_cli_wallet/src/screens/App.tsx

@@ -75,6 +75,7 @@ const App = () => {
     ({url}: {url: string}) => {
       const isLinkMode = url.includes('wc_ev');
       SettingsStore.setIsLinkModeRequest(isLinkMode);
+      SettingsStore.setConnectionViaDeepLink(true);
 
       if (isLinkMode) {
         return;

wallets/rn_cli_wallet/src/store/SettingsStore.ts

@@ -24,6 +24,7 @@ interface State {
   socketStatus: 'connected' | 'disconnected' | 'stalled' | 'unknown';
   logs: string[];
   isLinkModeRequest: boolean;
+  connectionViaDeepLink: boolean;
 }
 
 /**
@@ -40,6 +41,7 @@ const state = proxy<State>({
   socketStatus: 'unknown',
   logs: [],
   isLinkModeRequest: false,
+  connectionViaDeepLink: false,
 });
 
 /**
@@ -98,6 +100,9 @@ const SettingsStore = {
       AsyncStorage.removeItem('TEST_NETS');
     }
   },
+  setConnectionViaDeepLink(value: State['connectionViaDeepLink']) {
+    state.connectionViaDeepLink = value;
+  },
 };
 
 export default SettingsStore;

wallets/rn_cli_wallet/src/utils/LinkingUtils.ts

@@ -1,6 +1,7 @@
 import {Linking, Platform} from 'react-native';
 import Toast from 'react-native-toast-message';
 import Minimizer from '@kangfenmao/react-native-minimizer';
+import SettingsStore from '@/store/SettingsStore';
 
 interface redirect {
   native?: string;
@@ -18,9 +19,13 @@ const goBackOrToast = () => {
     Toast.show({
       type: 'success',
       text1: 'Success!',
-      text2: 'Redirecting to the dapp',
+      text2: SettingsStore.state.connectionViaDeepLink
+        ? 'Redirecting to the dapp'
+        : 'Please go back to the dapp',
     });
-    Minimizer.goBack();
+    if (SettingsStore.state.connectionViaDeepLink) {
+      Minimizer.goBack();
+    }
   } else {
     Toast.show({
       type: 'success',

wallets/rn_cli_wallet/yarn.lock

@@ -4431,9 +4431,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@walletconnect/react-native-compat@npm:2.17.2-canary-ca-6":
-  version: 2.17.2-canary-ca-6
-  resolution: "@walletconnect/react-native-compat@npm:2.17.2-canary-ca-6"
+"@walletconnect/react-native-compat@npm:2.17.2-canary-ca-7":
+  version: 2.17.2-canary-ca-7
+  resolution: "@walletconnect/react-native-compat@npm:2.17.2-canary-ca-7"
   dependencies:
     events: 3.3.0
     fast-text-encoding: 1.0.6
@@ -4447,7 +4447,7 @@ __metadata:
   peerDependenciesMeta:
     expo-application:
       optional: true
-  checksum: 4a9c4c7b5f07429f5439f254fa519371f10436119ecf6af5e56e7fb0dfd2472c79a612ef3d97a345cacc1897c9ae9a0cdfd5d0ff09c0859ad377a1d42c2d2cff
+  checksum: 6557d927b15201c502e5b88b88b98b53d7e9aa882396874e57562ffc2c115f624ebce59b9f11f27bb7bd1e2361bbf3bfe2f118b8855011f131ecea8af37845b1
   languageName: node
   linkType: hard
 
@@ -13311,7 +13311,7 @@ __metadata:
     "@types/react": ^18.2.6
     "@types/react-test-renderer": ^18.0.0
     "@walletconnect/core": 2.17.2
-    "@walletconnect/react-native-compat": 2.17.2-canary-ca-6
+    "@walletconnect/react-native-compat": 2.17.2-canary-ca-7
     babel-jest: ^29.6.3
     babel-plugin-module-resolver: ^5.0.0
     dayjs: 1.11.11