Update useWebViewHandler for token transfer

src/App.tsx

@@ -40,6 +40,7 @@ import { WalletEmbed } from "./screens/WalletEmbed";
 import { AutoSignIn } from "./screens/AutoSignIn";
 import { checkSufficientFunds, getPathKey, sendMessage } from "./utils/misc";
 import useAccountsData from "./hooks/useAccountsData";
+import { useWebViewHandler } from "./hooks/useWebViewHandler";
 
 const Stack = createStackNavigator<StackParamsList>();
 
@@ -279,6 +280,8 @@ const App = (): React.JSX.Element => {
 
   const showWalletConnect = useMemo(() => accounts.length > 0, [accounts]);
 
+  useWebViewHandler();
+
   return (
     <Surface style={styles.appSurface}>
       <Stack.Navigator

src/global.d.ts

@@ -0,0 +1,36 @@
+// Extends the Window interface for Android WebView communication
+declare global {
+  interface Window {
+    // Android bridge callbacks for signature and accounts related events
+    Android?: {
+      // Called when signature is successfully generated
+      onSignatureComplete?: (signature: string) => void;
+
+      // Called when signature generation fails
+      onSignatureError?: (error: string) => void;
+
+      // Called when signature process is cancelled
+      onSignatureCancelled?: () => void;
+
+      // Called when accounts are ready for use
+      onAccountsReady?: () => void;
+
+      // Called when transfer is successfully completed
+      onTransferComplete?: (result: string) => void;
+
+      // Called when transfer fails
+      onTransferError?: (error: string) => void;
+
+      // Called when transfer is cancelled
+      onTransferCancelled?: () => void;
+    };
+
+    // Handles incoming signature requests from Android
+    receiveSignRequestFromAndroid?: (message: string) => void;
+
+    // Handles incoming transfer requests from Android
+    receiveTransferRequestFromAndroid?: (to: string, amount: string) => void;
+  }
+}
+
+export {};

src/hooks/useGetOrCreateAccounts.ts

@@ -1,4 +1,4 @@
-import { useEffect } from "react";
+import { useEffect, useCallback } from "react";
 
 import { createWallet } from "../utils/accounts";
 import { sendMessage } from "../utils/misc";
@@ -9,19 +9,24 @@ const useGetOrCreateAccounts = () => {
   const { networksData } = useNetworks();
   const { getAccountsData } = useAccountsData();
 
+  // Wrap the function in useCallback to prevent recreation on each render
+  const getOrCreateAccountsForChain = useCallback(async (chainId: string) => {
+    let accountsData = await getAccountsData(chainId);
+
+    if (accountsData.length === 0) {
+      console.log("Accounts not found, creating wallet...");
+      await createWallet(networksData);
+      accountsData = await getAccountsData(chainId);
+    }
+
+    return accountsData;
+  }, [networksData, getAccountsData]);
+
   useEffect(() => {
     const handleCreateAccounts = async (event: MessageEvent) => {
       if (event.data.type !== 'REQUEST_CREATE_OR_GET_ACCOUNTS') return;
 
-      let accountsData = await getAccountsData(event.data.chainId);
+      const accountsData = await getOrCreateAccountsForChain(event.data.chainId);
-
-      if (accountsData.length === 0) {
-        console.log("Accounts not found, creating wallet...");
-        await createWallet(networksData);
-
-        // Re-fetch newly created accounts
-        accountsData = await getAccountsData(event.data.chainId);
-      }
 
       sendMessage(
         event.source as Window, 'WALLET_ACCOUNTS_DATA',
@@ -30,12 +35,37 @@ const useGetOrCreateAccounts = () => {
       );
     };
 
+    const autoCreateAccounts = async () => {
+      const defaultChainId = networksData[0]?.chainId;
+      
+      if (!defaultChainId) {
+        console.log('useGetOrCreateAccounts: No default chainId found');
+        return;
+      }
+
+      await getOrCreateAccountsForChain(defaultChainId);
+
+      // Notify Android that accounts are ready
+      if (window.Android?.onAccountsReady) {
+        window.Android.onAccountsReady();
+      } else {
+        console.log('useGetOrCreateAccounts: Android bridge not available');
+      }
+    };
+
     window.addEventListener('message', handleCreateAccounts);
 
+    const isAndroidWebView = !!(window.Android);
+    
+    // TODO: Call method to auto create accounts from android app
+    if (isAndroidWebView) {
+      autoCreateAccounts();
+    }
+
     return () => {
       window.removeEventListener('message', handleCreateAccounts);
     };
-  }, [networksData, getAccountsData]);
+  }, [networksData, getAccountsData, getOrCreateAccountsForChain]);
 };
 
 export default useGetOrCreateAccounts;

src/hooks/useWebViewHandler.ts

@@ -0,0 +1,176 @@
+import { useEffect, useCallback } from 'react';
+import { useNavigation } from '@react-navigation/native';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
+
+import { useAccounts } from '../context/AccountsContext';
+import { useNetworks } from '../context/NetworksContext';
+import { StackParamsList } from '../types';
+import useGetOrCreateAccounts from './useGetOrCreateAccounts';
+import { retrieveAccountsForNetwork } from '../utils/accounts';
+
+export const useWebViewHandler = () => {
+  // Navigation and context hooks
+  const navigation = useNavigation<NativeStackNavigationProp<StackParamsList>>();
+  const { selectedNetwork } = useNetworks();
+  const { accounts, currentIndex } = useAccounts();
+  
+  // Initialize accounts
+  useGetOrCreateAccounts();
+  
+  // Core navigation handler
+  const navigateToSignRequest = useCallback((message: string) => {
+    try {
+      // Validation checks
+      if (!selectedNetwork?.namespace || !selectedNetwork?.chainId) {
+        window.Android?.onSignatureError?.('Invalid network configuration');
+        return;
+      }
+
+      if (!accounts?.length) {
+        window.Android?.onSignatureError?.('No accounts available');
+        return;
+      }
+
+      const currentAccount = accounts[currentIndex];
+      if (!currentAccount) {
+        window.Android?.onSignatureError?.('Current account not found');
+        return;
+      }
+
+      // Create the path and validate with regex
+      const path = `/sign/${selectedNetwork.namespace}/${selectedNetwork.chainId}/${currentAccount.address}/${encodeURIComponent(message)}`;
+      const pathRegex = /^\/sign\/(eip155|cosmos)\/(.+)\/(.+)\/(.+)$/;
+      const match = path.match(pathRegex);
+      
+      if (!match) {
+        window.Android?.onSignatureError?.('Invalid signing path');
+        return;
+      }
+
+      const [, pathNamespace, pathChainId, pathAddress, pathMessage] = match;
+
+      // Reset navigation stack and navigate to sign request
+      navigation.reset({
+        index: 0,
+        routes: [
+          {
+            name: 'SignRequest',
+            path,
+            params: {
+              namespace: pathNamespace,
+              chainId: pathChainId,
+              address: pathAddress,
+              message: decodeURIComponent(pathMessage),
+              accountInfo: currentAccount,
+            },
+          },
+        ],
+      });
+    } catch (error) {
+      window.Android?.onSignatureError?.(`Navigation error: ${error}`);
+    }
+  }, [selectedNetwork, accounts, currentIndex, navigation]);
+
+  // Handle incoming transfer requests
+  const navigateToTransfer = useCallback(async (to: string, amount: string) => {
+    if (!accounts || accounts.length === 0) {
+      console.error('No accounts available');
+      if (window.Android?.onTransferError) {
+        window.Android.onTransferError('No accounts available');
+      }
+      return;
+    }
+
+    const currentAccount = accounts[currentIndex];
+    if (!currentAccount) {
+      console.error('Current account not found');
+      if (window.Android?.onTransferError) {
+        window.Android.onTransferError('Current account not found');
+      }
+      return;
+    }
+
+    // Use Cosmos Hub Testnet network
+    const cosmosHubTestnet = {
+      namespace: 'cosmos',
+      chainId: 'provider',
+      addressPrefix: 'cosmos'
+    };
+
+    try {
+      // Get all accounts for Cosmos Hub Testnet
+      const cosmosAccounts = await retrieveAccountsForNetwork(
+        `${cosmosHubTestnet.namespace}:${cosmosHubTestnet.chainId}`,
+        '0' // Use the first account
+      );
+
+      if (!cosmosAccounts || cosmosAccounts.length === 0) {
+        console.error('No Cosmos Hub Testnet accounts found');
+        if (window.Android?.onTransferError) {
+          window.Android.onTransferError('No Cosmos Hub Testnet accounts found');
+        }
+        return;
+      }
+
+      const cosmosAccount = cosmosAccounts[0]; // Use the first account
+
+      const path = `/transfer/${cosmosHubTestnet.namespace}/${cosmosHubTestnet.chainId}/${cosmosAccount.address}/${to}/${amount}`;
+      
+      const pathRegex = /^\/transfer\/(eip155|cosmos)\/(.+)\/(.+)\/(.+)\/(.+)$/;
+      if (!pathRegex.test(path)) {
+        console.error('Path does not match expected pattern:', path);
+        if (window.Android?.onTransferError) {
+          window.Android.onTransferError('Invalid path format');
+        }
+        return;
+      }
+
+      const match = path.match(pathRegex);
+      if (!match) {
+        console.error('Failed to parse path:', path);
+        if (window.Android?.onTransferError) {
+          window.Android.onTransferError('Failed to parse path');
+        }
+        return;
+      }
+      
+      navigation.reset({
+        index: 0,
+        routes: [
+          {
+            name: 'ApproveTransfer',
+            path: `/transfer/${cosmosHubTestnet.namespace}/${cosmosHubTestnet.chainId}/${cosmosAccount.address}/${to}/${amount}`,
+            params: {
+              namespace: cosmosHubTestnet.namespace,
+              chainId: `${cosmosHubTestnet.namespace}:${cosmosHubTestnet.chainId}`,
+              transaction: {
+                from: cosmosAccount.address,
+                to: to,
+                value: amount,
+                data: ''
+              },
+              accountInfo: cosmosAccount,
+            },
+          },
+        ],
+      });
+    } catch (error) {
+      console.error('Navigation error:', error);
+      if (window.Android?.onTransferError) {
+        window.Android.onTransferError(`Navigation error: ${error}`);
+      }
+    }
+  }, [accounts, currentIndex, navigation]);
+
+  useEffect(() => {
+    // Assign the function to the window object
+    window.receiveSignRequestFromAndroid = navigateToSignRequest;
+
+    window.receiveTransferRequestFromAndroid = navigateToTransfer;
+    
+    return () => {
+      window.receiveSignRequestFromAndroid = undefined;
+      window.receiveTransferRequestFromAndroid = undefined;
+    };
+  }, [navigateToSignRequest, navigateToTransfer]); // Only the function reference as dependency
+};

src/screens/ApproveTransfer.tsx

@@ -46,24 +46,29 @@ export const MEMO = 'Sending signed tx from Laconic Wallet';
 // Reference: https://ethereum.org/en/developers/docs/gas/#what-is-gas-limit
 const ETH_MINIMUM_GAS = 21000;
 
-type SignRequestProps = NativeStackScreenProps<
+type ApproveTransferProps = NativeStackScreenProps<StackParamsList, 'ApproveTransfer'> & {
-  StackParamsList,
+  route: {
-  'ApproveTransfer'
+    params: {
->;
+      transaction: any;
+      requestEvent?: {
+        params: {
+          chainId: string;
+          request: {
+            method: string;
+          };
+        };
+      };
+      requestSessionData?: any;
+      chainId?: string;
+    };
+    path?: string;
+  };
+};
 
-const ApproveTransfer = ({ route }: SignRequestProps) => {
+const ApproveTransfer = ({ route }: ApproveTransferProps) => {
   const { networksData } = useNetworks();
   const { web3wallet } = useWalletConnect();
 
-  const requestSession = route.params.requestSessionData;
-  const requestName = requestSession.peer.metadata.name;
-  const requestIcon = requestSession.peer.metadata.icons[0];
-  const requestURL = requestSession.peer.metadata.url;
-  const transaction = route.params.transaction;
-  const requestEvent = route.params.requestEvent;
-  const chainId = requestEvent.params.chainId;
-  const requestMethod = requestEvent.params.request.method;
-
   const [account, setAccount] = useState<Account>();
   const [isLoading, setIsLoading] = useState(true);
   const [balance, setBalance] = useState<string>('');
@@ -80,6 +85,80 @@ const ApproveTransfer = ({ route }: SignRequestProps) => {
   const [ethMaxPriorityFee, setEthMaxPriorityFee] =
     useState<BigNumber | null>();
 
+  const navigation =
+    useNavigation<NativeStackNavigationProp<StackParamsList>>();
+
+  // Extract data from route params or path
+  const requestSession = route.params?.requestSessionData;
+  const requestName = requestSession?.peer?.metadata?.name;
+  const requestIcon = requestSession?.peer?.metadata?.icons?.[0];
+  const requestURL = requestSession?.peer?.metadata?.url;
+  const transaction = route.params?.transaction;
+  const requestEvent = route.params?.requestEvent;
+  const chainId = requestEvent?.params?.chainId || route.params?.chainId;
+  const requestMethod = requestEvent?.params?.request?.method;
+
+  const sanitizePath = useCallback((path: string) => {
+    const regex = /^\/transfer\/(eip155|cosmos)\/(.+)\/(.+)\/(.+)\/(.+)$/;
+    const match = path.match(regex);
+    if (match) {
+      const [, pathNamespace, pathChainId, pathAddress, pathTo, pathAmount] = match;
+      return {
+        namespace: pathNamespace,
+        chainId: pathChainId,
+        address: pathAddress,
+        to: pathTo,
+        amount: pathAmount,
+      };
+    } else {
+      navigation.navigate('InvalidPath');
+    }
+    return null;
+  }, [navigation]);
+
+  const retrieveData = useCallback(async (requestNamespace: string, requestChainId: string, requestAddress: string) => {
+    const requestAccount = await retrieveSingleAccount(
+      requestNamespace,
+      requestChainId,
+      requestAddress,
+    );
+    if (!requestAccount) {
+      navigation.navigate('InvalidPath');
+      return;
+    }
+
+    setAccount(requestAccount);
+  }, [navigation]);
+
+  useEffect(() => {
+    if (route.path) {
+      const sanitizedRoute = sanitizePath(route.path);
+      if (sanitizedRoute) {
+        retrieveData(
+          sanitizedRoute.namespace,
+          sanitizedRoute.chainId,
+          sanitizedRoute.address,
+        );
+        return;
+      }
+    }
+
+    if (requestEvent) {
+      const requestedNetwork = networksData.find(
+        networkData => {
+          return `${networkData.namespace}:${networkData.chainId}` === chainId;
+        }
+      );
+      if (requestedNetwork && transaction?.from) {
+        retrieveData(
+          requestedNetwork.namespace,
+          requestedNetwork.chainId,
+          transaction.from,
+        );
+      }
+    }
+  }, [retrieveData, sanitizePath, route, networksData, requestEvent, chainId, transaction]);
+
   const isSufficientFunds = useMemo(() => {
     if (!transaction.value) {
       return;
@@ -139,7 +218,7 @@ const ApproveTransfer = ({ route }: SignRequestProps) => {
       ).privKey;
 
       const sender = await DirectSecp256k1Wallet.fromKey(
-        Buffer.from(cosmosPrivKey.split('0x')[1], 'hex'),
+        Uint8Array.from(Buffer.from(cosmosPrivKey.split('0x')[1], 'hex')),
         requestedNetwork?.addressPrefix,
       );
 
@@ -185,26 +264,6 @@ const ApproveTransfer = ({ route }: SignRequestProps) => {
     }
   }, [requestedNetwork, namespace]);
 
-  const navigation =
-    useNavigation<NativeStackNavigationProp<StackParamsList>>();
-
-  const retrieveData = useCallback(
-    async (requestAddress: string) => {
-      const requestAccount = await retrieveSingleAccount(
-        requestedNetwork!.namespace,
-        requestedNetwork!.chainId,
-        requestAddress,
-      );
-      if (!requestAccount) {
-        navigation.navigate('InvalidPath');
-        return;
-      }
-
-      setAccount(requestAccount);
-    },
-    [navigation, requestedNetwork],
-  );
-
   useEffect(() => {
     // Set loading to false when gas values for requested chain are fetched
     // If requested chain is EVM compatible, the cosmos gas values will be undefined and vice-versa, hence the condition checks only one of them at the same time
@@ -246,9 +305,6 @@ const ApproveTransfer = ({ route }: SignRequestProps) => {
     requestedNetwork,
     ethMaxFee,
   ]);
-  useEffect(() => {
-    retrieveData(transaction.from!);
-  }, [retrieveData, transaction]);
 
   const isEIP1559 = useMemo(() => {
     if (cosmosGasLimit) {
@@ -260,6 +316,101 @@ const ApproveTransfer = ({ route }: SignRequestProps) => {
     return false;
   }, [cosmosGasLimit, ethMaxFee, ethMaxPriorityFee]);
 
+  const handleIntent = async () => {
+    if (!account) {
+      throw new Error('Account is not valid');
+    }
+
+    if (route.path) {
+      const sanitizedRoute = sanitizePath(route.path);
+      if (!sanitizedRoute) {
+        throw new Error('Invalid path');
+      }
+
+      const requestedNetwork = networksData.find(
+        networkData => networkData.chainId === sanitizedRoute.chainId,
+      );
+
+      if (!requestedNetwork) {
+        throw new Error('Network not found');
+      }
+
+      const cosmosPrivKey = (
+        await getPathKey(
+          `${requestedNetwork.namespace}:${requestedNetwork.chainId}`,
+          account.index,
+        )
+      ).privKey;
+
+      const sender = await DirectSecp256k1Wallet.fromKey(
+        Uint8Array.from(Buffer.from(cosmosPrivKey.split('0x')[1], 'hex')),
+        requestedNetwork.addressPrefix,
+      );
+
+      const client = await SigningStargateClient.connectWithSigner(
+        requestedNetwork.rpcUrl!,
+        sender,
+      );
+
+      const sendMsg: MsgSendEncodeObject = {
+        typeUrl: '/cosmos.bank.v1beta1.MsgSend',
+        value: {
+          fromAddress: account.address,
+          toAddress: sanitizedRoute.to,
+          amount: [
+            {
+              amount: String(sanitizedRoute.amount),
+              denom: requestedNetwork.nativeDenom!,
+            },
+          ],
+        },
+      };
+
+      const gasEstimation = await client.simulate(
+        account.address,
+        [sendMsg],
+        MEMO,
+      );
+
+      const gasLimit = String(
+        Math.round(gasEstimation * Number(process.env.REACT_APP_GAS_ADJUSTMENT)),
+      );
+
+      const gasPrice = GasPrice.fromString(
+        requestedNetwork.gasPrice! + requestedNetwork.nativeDenom,
+      );
+
+      const cosmosFees = calculateFee(Number(gasLimit), gasPrice);
+
+      const result = await client.signAndBroadcast(
+        account.address,
+        [sendMsg],
+        {
+          amount: [
+            {
+              amount: cosmosFees.amount[0].amount,
+              denom: requestedNetwork.nativeDenom!,
+            },
+          ],
+          gas: gasLimit,
+        },
+        MEMO,
+      );
+
+      // Convert BigInt values to strings before sending to Android
+      const serializedResult = JSON.stringify(result, (key, value) => 
+        typeof value === 'bigint' ? value.toString() : value
+      );
+
+      // Send the result back to Android and close dialog
+      if (window.Android?.onTransferComplete) {
+        window.Android.onTransferComplete(serializedResult);
+      } else {
+        alert(`Transaction: ${serializedResult}`);
+      }
+    }
+  };
+
   const acceptRequestHandler = async () => {
     setIsTxLoading(true);
     try {
@@ -267,77 +418,80 @@ const ApproveTransfer = ({ route }: SignRequestProps) => {
         throw new Error('account not found');
       }
 
-      if (ethGasLimit && ethGasLimit.lt(ETH_MINIMUM_GAS)) {
+      if (requestEvent) {
-        throw new Error(`Atleast ${ETH_MINIMUM_GAS} gas limit is required`);
+        // Handle WalletConnect request
-      }
+        if (ethGasLimit && ethGasLimit.lt(ETH_MINIMUM_GAS)) {
+          throw new Error(`Atleast ${ETH_MINIMUM_GAS} gas limit is required`);
+        }
 
-      if (ethMaxFee && ethMaxPriorityFee && ethMaxFee.lte(ethMaxPriorityFee)) {
+        if (ethMaxFee && ethMaxPriorityFee && ethMaxFee.lte(ethMaxPriorityFee)) {
-        throw new Error(
+          throw new Error(
-          `Max fee per gas (${ethMaxFee.toNumber()}) cannot be lower than or equal to max priority fee per gas (${ethMaxPriorityFee.toNumber()})`,
+            `Max fee per gas (${ethMaxFee.toNumber()}) cannot be lower than or equal to max priority fee per gas (${ethMaxPriorityFee.toNumber()})`,
+          );
+        }
+
+        let options: WalletConnectRequests;
+
+        switch (requestMethod) {
+          case EIP155_SIGNING_METHODS.ETH_SEND_TRANSACTION:
+            if (
+              ethMaxFee === undefined ||
+              ethMaxPriorityFee === undefined ||
+              ethGasPrice === undefined
+            ) {
+              throw new Error('Gas values not found');
+            }
+
+            options = {
+              type: 'eth_sendTransaction',
+              provider: provider!,
+              ethGasLimit: BigNumber.from(ethGasLimit),
+              ethGasPrice: ethGasPrice ? ethGasPrice.toHexString() : null,
+              maxFeePerGas: ethMaxFee,
+              maxPriorityFeePerGas: ethMaxPriorityFee,
+            };
+            break;
+          case COSMOS_METHODS.COSMOS_SEND_TOKENS:
+            if (!cosmosStargateClient) {
+              throw new Error('Cosmos stargate client not found');
+            }
+
+            options = {
+              type: 'cosmos_sendTokens',
+              signingStargateClient: cosmosStargateClient,
+              cosmosFee: {
+                amount: [
+                  {
+                    amount: fees,
+                    denom: requestedNetwork!.nativeDenom!,
+                  },
+                ],
+                gas: cosmosGasLimit,
+              },
+              sendMsg,
+              memo: MEMO,
+            };
+            break;
+          default:
+            throw new Error('Invalid method');
+        }
+
+        const response = await approveWalletConnectRequest(
+          requestEvent,
+          account!,
+          namespace,
+          requestedNetwork!.chainId,
+          options,
         );
+
+        const { topic } = requestEvent;
+        await web3wallet!.respondSessionRequest({ topic, response });
+        navigation.navigate('Home');
+      } else {
+        // Handle direct intent
+        await handleIntent();
+        navigation.navigate('Home');
       }
-
-      let options: WalletConnectRequests;
-
-      switch (requestMethod) {
-        case EIP155_SIGNING_METHODS.ETH_SEND_TRANSACTION:
-          if (
-            ethMaxFee === undefined ||
-            ethMaxPriorityFee === undefined ||
-            ethGasPrice === undefined
-          ) {
-            throw new Error('Gas values not found');
-          }
-
-          options = {
-            type: 'eth_sendTransaction',
-            provider: provider!,
-            ethGasLimit: BigNumber.from(ethGasLimit),
-            ethGasPrice: ethGasPrice ? ethGasPrice.toHexString() : null,
-            maxFeePerGas: ethMaxFee,
-            maxPriorityFeePerGas: ethMaxPriorityFee,
-          };
-          break;
-        case COSMOS_METHODS.COSMOS_SEND_TOKENS:
-          if (!cosmosStargateClient) {
-            throw new Error('Cosmos stargate client not found');
-          }
-
-          options = {
-            type: 'cosmos_sendTokens',
-            signingStargateClient: cosmosStargateClient,
-            // StdFee object
-            cosmosFee: {
-              // This amount is total fees required for transaction
-              amount: [
-                {
-                  amount: fees,
-                  denom: requestedNetwork!.nativeDenom!,
-                },
-              ],
-              gas: cosmosGasLimit,
-            },
-            sendMsg,
-            memo: MEMO,
-          };
-
-          break;
-
-        default:
-          throw new Error('Invalid method');
-      }
-
-      const response = await approveWalletConnectRequest(
-        requestEvent,
-        account,
-        namespace,
-        requestedNetwork!.chainId,
-        options,
-      );
-
-      const { topic } = requestEvent;
-      await web3wallet!.respondSessionRequest({ topic, response });
-      navigation.navigate('Home');
     } catch (error) {
       if (!(error instanceof Error)) {
         throw error;
@@ -350,20 +504,26 @@ const ApproveTransfer = ({ route }: SignRequestProps) => {
   };
 
   const rejectRequestHandler = async () => {
-    const response = rejectWalletConnectRequest(requestEvent);
+    if (requestEvent) {
-    const { topic } = requestEvent;
+      const response = rejectWalletConnectRequest(requestEvent);
-    await web3wallet!.respondSessionRequest({
+      const { topic } = requestEvent;
-      topic,
+      await web3wallet!.respondSessionRequest({
-      response,
+        topic,
-    });
+        response,
+      });
+    }
 
-    navigation.navigate('Home');
+    if (window.Android?.onTransferCancelled) {
+      window.Android.onTransferCancelled();
+    } else {
+      navigation.navigate('Home');
+    }
   };
 
   useEffect(() => {
     const getAccountBalance = async () => {
       try {
-        if (!account) {
+        if (!account || !requestedNetwork) {
           return;
         }
         if (namespace === EIP155) {
@@ -373,20 +533,20 @@ const ApproveTransfer = ({ route }: SignRequestProps) => {
           const fetchedBalance = await provider.getBalance(account.address);
           setBalance(fetchedBalance ? fetchedBalance.toString() : '0');
         } else {
-          const cosmosBalance = await cosmosStargateClient?.getBalance(
+          if (!cosmosStargateClient) {
+            return;
+          }
+          const cosmosBalance = await cosmosStargateClient.getBalance(
             account.address,
-            requestedNetwork!.nativeDenom!.toLowerCase(),
+            requestedNetwork.nativeDenom!.toLowerCase(),
           );
-
+          setBalance(cosmosBalance?.amount || '0');
-          setBalance(cosmosBalance?.amount!);
         }
       } catch (error) {
-        if (!(error instanceof Error)) {
+        console.error('Error fetching balance:', error);
-          throw error;
+        setBalance('0');
-        }
+        // Don't show error dialog for balance fetch failures
-
+        // Just set balance to 0 and let the transaction proceed
-        setTxError(error.message);
-        setIsTxErrorDialogOpen(true);
       }
     };
 
@@ -508,16 +668,18 @@ const ApproveTransfer = ({ route }: SignRequestProps) => {
       ) : (
         <>
           <ScrollView contentContainerStyle={styles.appContainer}>
-            <View style={styles.dappDetails}>
+            {requestSession && (
-              {requestIcon && (
+              <View style={styles.dappDetails}>
-                <Image
+                {requestIcon && (
-                  style={styles.dappLogo}
+                  <Image
-                  source={requestIcon ? { uri: requestIcon } : undefined}
+                    style={styles.dappLogo}
-                />
+                    source={requestIcon ? { uri: requestIcon } : undefined}
-              )}
+                  />
-              <Text>{requestName}</Text>
+                )}
-              <Text variant="bodyMedium">{requestURL}</Text>
+                <Text>{requestName}</Text>
-            </View>
+                <Text variant="bodyMedium">{requestURL}</Text>
+              </View>
+            )}
             <View style={styles.dataBoxContainer}>
               <Text style={styles.dataBoxLabel}>From</Text>
               <View style={styles.dataBox}>
@@ -528,11 +690,7 @@ const ApproveTransfer = ({ route }: SignRequestProps) => {
               label={`Balance (${
                 namespace === EIP155 ? 'wei' : requestedNetwork!.nativeDenom
               })`}
-              data={
+              data={balance || '0'}
-                balance === '' || balance === undefined
-                  ? 'Loading balance...'
-                  : `${balance}`
-              }
             />
             {transaction && (
               <View style={styles.approveTransfer}>

src/screens/SignRequest.tsx

@@ -202,7 +202,13 @@ const SignRequest = ({ route }: SignRequestProps) => {
         chainId,
         accountId: account.index,
       });
-      alert(`Signature ${signedMessage}`);
+      
+      // Send the result back to Android and close dialog
+      if (window.Android?.onSignatureComplete) {
+        window.Android.onSignatureComplete(signedMessage || "");
+      } else {
+        alert(`Signature: ${signedMessage}`);
+      }
     }
   };
 
@@ -230,7 +236,11 @@ const SignRequest = ({ route }: SignRequestProps) => {
     }
 
     setIsRejecting(false);
-    navigation.navigate('Home');
+    if (window.Android?.onSignatureCancelled) {
+      window.Android.onSignatureCancelled();
+    } else {
+      navigation.navigate('Home');
+    }
   };
 
   useEffect(() => {

src/types.ts

@@ -13,8 +13,10 @@ export type StackParamsList = {
   };
   SignRequest: {
     namespace: string;
+    chainId?: string;
     address: string;
     message: string;
+    accountInfo?: Account;
     requestEvent?: Web3WalletTypes.SessionRequest;
     requestSessionData?: SessionTypes.Struct;
   };

src/utils/constants.ts

@@ -41,10 +41,10 @@ export const DEFAULT_NETWORKS: NetworksFormData[] = [
     isDefault: true,
   },
   {
-    chainId: 'theta-testnet-001',
+    chainId: 'provider',
-    networkName: COSMOS_TESTNET_CHAINS['cosmos:theta-testnet-001'].name,
+    networkName: COSMOS_TESTNET_CHAINS['cosmos:provider'].name,
     namespace: COSMOS,
-    rpcUrl: COSMOS_TESTNET_CHAINS['cosmos:theta-testnet-001'].rpc,
+    rpcUrl: COSMOS_TESTNET_CHAINS['cosmos:provider'].rpc,
     blockExplorerUrl: '',
     nativeDenom: 'uatom',
     addressPrefix: 'cosmos',

src/utils/wallet-connect/COSMOSData.ts

@@ -19,10 +19,10 @@ export const COSMOS_TESTNET_CHAINS: Record<
     namespace: string;
   }
 > = {
-  'cosmos:theta-testnet-001': {
+  'cosmos:provider': {
-    chainId: 'theta-testnet-001',
+    chainId: 'provider',
     name: 'Cosmos Hub Testnet',
-    rpc: 'https://rpc-t.cosmos.nodestake.top',
+    rpc: 'https://rpc-rs.cosmos.nodestake.top',
     namespace: 'cosmos',
   },
 };