.env.example

@@ -2,4 +2,3 @@ WALLET_CONNECT_PROJECT_ID=
 DEFAULT_GAS_PRICE=0.025
 # Reference: https://github.com/cosmos/cosmos-sdk/issues/16020
 DEFAULT_GAS_ADJUSTMENT=2
-LACONICD_RPC_URL=https://laconicd.laconic.com

development.md

@@ -9,6 +9,7 @@
 - Function for creating web3 wallet
 
   ```js
+  export let web3wallet: IWeb3Wallet;
   export let core: ICore;
 
   export async function createWeb3Wallet() {
@@ -25,27 +26,23 @@
         icons: ['https://avatars.githubusercontent.com/u/92608123'],
       },
     });
-
-    return web3wallet;
   }
   ```
 
 - Hook used for intializing web3 wallet
 
   ```js
-  export default function useInitialization(setWeb3wallet) {
+  export default function useInitialization() {
     const [initialized, setInitialized] = useState(false);
 
     const onInitialize = useCallback(async () => {
       try {
-        const web3walletInstance = await createWeb3Wallet();
+        await createWeb3Wallet();
-        setWeb3wallet(web3walletInstance);
-
         setInitialized(true);
       } catch (err: unknown) {
-        console.error('Error for initializing', err);
+        console.log('Error for initializing', err);
       }
-    }, [setWeb3wallet]);
+    }, []);
 
     useEffect(() => {
       if (!initialized) {

package.json

@@ -12,7 +12,7 @@
     "prepare": "husky"
   },
   "dependencies": {
-    "@cerc-io/registry-sdk": "^0.2.5",
+    "@cerc-io/registry-sdk": "^0.2.2",
     "@cosmjs/amino": "^0.32.3",
     "@cosmjs/crypto": "^0.32.3",
     "@cosmjs/proto-signing": "^0.32.3",
@@ -21,7 +21,6 @@
     "@hookform/resolvers": "^3.3.4",
     "@json-rpc-tools/utils": "^1.7.6",
     "@react-native-async-storage/async-storage": "^1.22.3",
-    "@react-native-clipboard/clipboard": "^1.14.1",
     "@react-native-community/netinfo": "^11.3.1",
     "@react-navigation/elements": "^1.3.30",
     "@react-navigation/native": "^6.1.10",

react-native-config.d.ts

@@ -4,7 +4,6 @@ declare module 'react-native-config' {
     WALLET_CONNECT_PROJECT_ID: string;
     DEFAULT_GAS_PRICE: string;
     DEFAULT_GAS_ADJUSTMENT: string;
-    LACONICD_RPC_URL: string;
   }
 
   export const Config: NativeConfig;

scripts/build-apk.sh

@@ -1,31 +0,0 @@
-#!/bin/bash
-
-# Default value for IS_RELEASE
-IS_RELEASE=${IS_RELEASE:-false}
-
-# Install dependencies
-echo "Installing dependencies..."
-yarn
-
-# Create the necessary directory for assets
-mkdir -p android/app/src/main/assets/
-
-# Bundle the React Native application
-yarn react-native bundle \
-  --platform android \
-  --dev false \
-  --entry-file index.js \
-  --bundle-output android/app/src/main/assets/index.android.bundle \
-  --assets-dest android/app/src/main/res
-
-# Navigate to the android directory
-cd android
-
-# Run the Gradle build based on the IS_RELEASE flag
-if [ "$IS_RELEASE" = "true" ]; then
-  echo "Building release version..."
-  ./gradlew assembleRelease
-else
-  echo "Building debug version..."
-  ./gradlew assembleDebug
-fi

src/App.tsx

@@ -24,6 +24,7 @@ import AddSession from './screens/AddSession';
 import WalletConnect from './screens/WalletConnect';
 import ApproveTransaction from './screens/ApproveTransaction';
 import { StackParamsList } from './types';
+import { web3wallet } from './utils/wallet-connect/WalletConnectUtils';
 import { EIP155_SIGNING_METHODS } from './utils/wallet-connect/EIP155Data';
 import { getSignParamsMessage } from './utils/wallet-connect/helpers';
 import ApproveTransfer from './screens/ApproveTransfer';
@@ -40,7 +41,7 @@ const App = (): React.JSX.Element => {
   const navigation =
     useNavigation<NativeStackNavigationProp<StackParamsList>>();
 
-  const { web3wallet, setActiveSessions } = useWalletConnect();
+  const { setActiveSessions } = useWalletConnect();
   const { accounts, setCurrentIndex } = useAccounts();
   const { networksData, selectedNetwork, setSelectedNetwork } = useNetworks();
   const [modalVisible, setModalVisible] = useState(false);
@@ -62,7 +63,7 @@ const App = (): React.JSX.Element => {
       setModalVisible(true);
       setCurrentProposal(proposal);
     },
-    [accounts, web3wallet],
+    [accounts],
   );
 
   const onSessionRequest = useCallback(
@@ -196,14 +197,13 @@ const App = (): React.JSX.Element => {
       setSelectedNetwork,
       setCurrentIndex,
       selectedNetwork,
-      web3wallet,
     ],
   );
 
   const onSessionDelete = useCallback(() => {
     const sessions = web3wallet!.getActiveSessions();
     setActiveSessions(sessions);
-  }, [setActiveSessions, web3wallet]);
+  }, [setActiveSessions]);
 
   useEffect(() => {
     web3wallet?.on('session_proposal', onSessionProposal);

src/components/Accounts.tsx

@@ -12,11 +12,11 @@ import styles from '../styles/stylesheet';
 import HDPathDialog from './HDPathDialog';
 import AccountDetails from './AccountDetails';
 import { useAccounts } from '../context/AccountsContext';
+import { web3wallet } from '../utils/wallet-connect/WalletConnectUtils';
 import { useNetworks } from '../context/NetworksContext';
 import ConfirmDialog from './ConfirmDialog';
 import { getNamespaces } from '../utils/wallet-connect/helpers';
 import ShowPKDialog from './ShowPKDialog';
-import { useWalletConnect } from '../context/WalletConnectContext';
 
 const Accounts = () => {
   const navigation =
@@ -26,8 +26,6 @@ const Accounts = () => {
     useAccounts();
   const { networksData, selectedNetwork, setNetworksData, setSelectedNetwork } =
     useNetworks();
-
-  const { web3wallet } = useWalletConnect();
   const [expanded, setExpanded] = useState(false);
   const [isAccountCreating, setIsAccountCreating] = useState(false);
   const [hdDialog, setHdDialog] = useState(false);
@@ -60,6 +58,7 @@ const Accounts = () => {
           networksData,
           selectedNetwork!,
           accounts,
+          currentIndex,
         );
 
         if (!updatedNamespaces) {
@@ -75,7 +74,7 @@ const Accounts = () => {
     // Call the updateSessions function when the 'accounts' dependency changes
     updateSessions();
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [accounts, web3wallet]);
+  }, [accounts]);
 
   const addAccountHandler = async () => {
     setIsAccountCreating(true);

src/components/Dialog.tsx

@@ -1,8 +1,6 @@
-import React, { useState } from 'react';
+import React from 'react';
 import { View } from 'react-native';
-import { Button, Dialog, Portal, Snackbar, Text } from 'react-native-paper';
+import { Button, Dialog, Portal, Text } from 'react-native-paper';
-
-import Clipboard from '@react-native-clipboard/clipboard';
 
 import styles from '../styles/stylesheet';
 import GridView from './Grid';
@@ -13,25 +11,17 @@ const DialogComponent = ({
   hideDialog,
   contentText,
 }: CustomDialogProps) => {
-  const [toastVisible, setToastVisible] = useState(false);
-
   const words = contentText.split(' ');
 
-  const handleCopy = () => {
-    Clipboard.setString(contentText);
-    setToastVisible(true);
-  };
-
   return (
-    <>
     <Portal>
       <Dialog visible={visible} onDismiss={hideDialog}>
         <Dialog.Content>
           <Text variant="titleLarge">Mnemonic</Text>
           <View style={styles.dialogTitle}>
             <Text variant="titleMedium">
-                Your mnemonic provides full access to your wallet and funds.
+              Your mnemonic provides full access to your wallet and funds. Make
-                Make sure to note it down.{' '}
+              sure to note it down.{' '}
             </Text>
             <Text variant="titleMedium" style={styles.dialogWarning}>
               Do not share your mnemonic with anyone
@@ -40,18 +30,10 @@ const DialogComponent = ({
           </View>
         </Dialog.Content>
         <Dialog.Actions>
-            <Button onPress={handleCopy}>Copy</Button>
           <Button onPress={hideDialog}>Done</Button>
         </Dialog.Actions>
       </Dialog>
     </Portal>
-      <Snackbar
-        visible={toastVisible}
-        onDismiss={() => setToastVisible(false)}
-        duration={1000}>
-        Mnemonic copied to clipboard
-      </Snackbar>
-    </>
   );
 };
 

src/components/PairingModal.tsx

@@ -8,6 +8,7 @@ import { buildApprovedNamespaces, getSdkError } from '@walletconnect/utils';
 
 import { PairingModalProps } from '../types';
 import styles from '../styles/stylesheet';
+import { web3wallet } from '../utils/wallet-connect/WalletConnectUtils';
 import { useAccounts } from '../context/AccountsContext';
 import { useWalletConnect } from '../context/WalletConnectContext';
 import { useNetworks } from '../context/NetworksContext';
@@ -20,7 +21,7 @@ const PairingModal = ({
   setModalVisible,
   setToastVisible,
 }: PairingModalProps) => {
-  const { accounts } = useAccounts();
+  const { accounts, currentIndex } = useAccounts();
   const { selectedNetwork, networksData } = useNetworks();
   const [isLoading, setIsLoading] = useState(false);
   const [chainError, setChainError] = useState('');
@@ -86,7 +87,7 @@ const PairingModal = ({
     });
   }, [currentProposal]);
 
-  const { setActiveSessions, web3wallet } = useWalletConnect();
+  const { setActiveSessions } = useWalletConnect();
 
   useEffect(() => {
     const getSupportedNamespaces = async () => {
@@ -103,6 +104,7 @@ const PairingModal = ({
           networksData,
           selectedNetwork!,
           accounts,
+          currentIndex,
         );
         setSupportedNamespaces(nameSpaces);
       } catch (err) {
@@ -128,7 +130,7 @@ const PairingModal = ({
     networksData,
     selectedNetwork,
     accounts,
-    web3wallet,
+    currentIndex,
     setCurrentProposal,
     setModalVisible,
   ]);

src/context/WalletConnectContext.tsx

@@ -1,16 +1,14 @@
 import React, { createContext, useContext, useEffect, useState } from 'react';
 
 import { SessionTypes } from '@walletconnect/types';
-import { IWeb3Wallet } from '@walletconnect/web3wallet';
 
 import { WalletConnectContextProps } from '../types';
+import { web3wallet } from '../utils/wallet-connect/WalletConnectUtils';
 import useInitialization from '../hooks/useInitialization';
 
 const WalletConnectContext = createContext<WalletConnectContextProps>({
   activeSessions: {},
   setActiveSessions: () => {},
-  web3wallet: {} as IWeb3Wallet,
-  setWeb3wallet: () => {},
 });
 
 const useWalletConnect = () => {
@@ -19,14 +17,12 @@ const useWalletConnect = () => {
 };
 
 const WalletConnectProvider = ({ children }: { children: React.ReactNode }) => {
-  const [web3wallet, setWeb3wallet] = useState<IWeb3Wallet | undefined>();
+  useInitialization();
-
-  useInitialization(setWeb3wallet);
 
   useEffect(() => {
     const sessions = (web3wallet && web3wallet.getActiveSessions()) || {};
     setActiveSessions(sessions);
-  }, [web3wallet]);
+  }, []);
 
   const [activeSessions, setActiveSessions] = useState<
     Record<string, SessionTypes.Struct>
@@ -37,8 +33,6 @@ const WalletConnectProvider = ({ children }: { children: React.ReactNode }) => {
       value={{
         activeSessions,
         setActiveSessions,
-        web3wallet,
-        setWeb3wallet,
       }}>
       {children}
     </WalletConnectContext.Provider>

src/hooks/useInitialization.ts

@@ -1,24 +1,17 @@
 import { useCallback, useEffect, useState } from 'react';
-
-import { IWeb3Wallet } from '@walletconnect/web3wallet';
-
 import { createWeb3Wallet } from '../utils/wallet-connect/WalletConnectUtils';
 
-export default function useInitialization(
+export default function useInitialization() {
-  setWeb3wallet: React.Dispatch<React.SetStateAction<IWeb3Wallet | undefined>>,
-) {
   const [initialized, setInitialized] = useState(false);
 
   const onInitialize = useCallback(async () => {
     try {
-      const web3walletInstance = await createWeb3Wallet();
+      await createWeb3Wallet();
-      setWeb3wallet(web3walletInstance);
-
       setInitialized(true);
     } catch (err: unknown) {
       console.error('Error for initializing', err);
     }
-  }, [setWeb3wallet]);
+  }, []);
 
   useEffect(() => {
     if (!initialized) {

src/screens/AddSession.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { AppState, TouchableOpacity, View } from 'react-native';
 import { Button, Text, TextInput } from 'react-native-paper';
 import {
@@ -15,7 +15,6 @@ import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { web3WalletPair } from '../utils/wallet-connect/WalletConnectUtils';
 import styles from '../styles/stylesheet';
 import { StackParamsList } from '../types';
-import { useWalletConnect } from '../context/WalletConnectContext';
 
 const AddSession = () => {
   const navigation =
@@ -24,8 +23,6 @@ const AddSession = () => {
   const { hasPermission, requestPermission } = useCameraPermission();
   const device = useCameraDevice('back');
 
-  const { web3wallet } = useWalletConnect();
-
   const [currentWCURI, setCurrentWCURI] = useState<string>('');
   const [isActive, setIsActive] = useState(AppState.currentState === 'active');
   const [isScanning, setScanning] = useState(true);
@@ -48,15 +45,11 @@ const AddSession = () => {
     await Linking.openSettings();
   };
 
-  const pair = useCallback(async () => {
+  const pair = async () => {
-    if (!web3wallet) {
+    const pairing = await web3WalletPair({ uri: currentWCURI });
-      return;
-    }
-
-    const pairing = await web3WalletPair(web3wallet, { uri: currentWCURI });
     navigation.navigate('WalletConnect');
     return pairing;
-  }, [web3wallet, currentWCURI, navigation]);
+  };
 
   useEffect(() => {
     const handleAppStateChange = (newState: string) => {

src/screens/ApproveTransaction.tsx

@@ -1,16 +1,15 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { Image, ScrollView, View } from 'react-native';
 import { Button, Text, TextInput } from 'react-native-paper';
 import { SvgUri } from 'react-native-svg';
 import Config from 'react-native-config';
-import { MsgCreateValidator } from 'cosmjs-types/cosmos/staking/v1beta1/tx';
 
 import {
   NativeStackNavigationProp,
   NativeStackScreenProps,
 } from '@react-navigation/native-stack';
 import { useNavigation } from '@react-navigation/native';
-import { DirectSecp256k1Wallet, EncodeObject } from '@cosmjs/proto-signing';
+import { DirectSecp256k1Wallet } from '@cosmjs/proto-signing';
 import { LaconicClient } from '@cerc-io/registry-sdk';
 import { GasPrice, calculateFee } from '@cosmjs/stargate';
 import { formatJsonRpcError } from '@json-rpc-tools/utils';
@@ -26,10 +25,10 @@ import {
   approveWalletConnectRequest,
   rejectWalletConnectRequest,
 } from '../utils/wallet-connect/wallet-connect-requests';
+import { web3wallet } from '../utils/wallet-connect/WalletConnectUtils';
 import { MEMO } from './ApproveTransfer';
 import TxErrorDialog from '../components/TxErrorDialog';
 import AccountDetails from '../components/AccountDetails';
-import { useWalletConnect } from '../context/WalletConnectContext';
 
 type ApproveTransactionProps = NativeStackScreenProps<
   StackParamsList,
@@ -43,14 +42,13 @@ const ApproveTransaction = ({ route }: ApproveTransactionProps) => {
   const requestName = requestSession.peer.metadata.name;
   const requestIcon = requestSession.peer.metadata.icons[0];
   const requestURL = requestSession.peer.metadata.url;
+  const transactionMessage = route.params.transactionMessage;
   const signer = route.params.signer;
   const requestEvent = route.params.requestEvent;
   const chainId = requestEvent.params.chainId;
   const requestEventId = requestEvent.id;
   const topic = requestEvent.topic;
 
-  const { web3wallet } = useWalletConnect();
-
   const [account, setAccount] = useState<Account>();
   const [cosmosStargateClient, setCosmosStargateClient] =
     useState<LaconicClient>();
@@ -69,20 +67,6 @@ const ApproveTransaction = ({ route }: ApproveTransactionProps) => {
   );
   const namespace = requestedNetwork!.namespace;
 
-  const transactionMessage = useMemo((): EncodeObject => {
-    const inputTxMsg = route.params.transactionMessage;
-
-    // If it's a MsgCreateValidator, decode the tx msg value using MsgCreateValidator type
-    if (inputTxMsg.typeUrl.includes('MsgCreateValidator')) {
-      return {
-        typeUrl: inputTxMsg.typeUrl,
-        value: MsgCreateValidator.fromJSON(inputTxMsg.value),
-      };
-    }
-
-    return inputTxMsg;
-  }, [route.params.transactionMessage]);
-
   useEffect(() => {
     if (namespace !== COSMOS) {
       return;
@@ -120,15 +104,7 @@ const ApproveTransaction = ({ route }: ApproveTransactionProps) => {
     };
 
     setClient();
-  }, [
+  }, [account, requestedNetwork, chainId, namespace, requestEventId, topic]);
-    account,
-    requestedNetwork,
-    chainId,
-    namespace,
-    requestEventId,
-    topic,
-    web3wallet,
-  ]);
 
   const retrieveData = useCallback(
     async (requestAddress: string) => {
@@ -158,7 +134,7 @@ const ApproveTransaction = ({ route }: ApproveTransactionProps) => {
           return;
         }
         const gasEstimation = await cosmosStargateClient!.simulate(
-          signer,
+          transactionMessage.value.participant!,
           [transactionMessage],
           MEMO,
         );
@@ -176,14 +152,7 @@ const ApproveTransaction = ({ route }: ApproveTransactionProps) => {
       }
     };
     getCosmosGas();
-  }, [
+  }, [cosmosStargateClient, transactionMessage, requestEventId, topic]);
-    cosmosStargateClient,
-    transactionMessage,
-    requestEventId,
-    topic,
-    web3wallet,
-    signer,
-  ]);
 
   useEffect(() => {
     const gasPrice = GasPrice.fromString(
@@ -258,13 +227,6 @@ const ApproveTransaction = ({ route }: ApproveTransactionProps) => {
     navigation.navigate('Laconic');
   };
 
-  const replacer = (key: string, value: any): any => {
-    if (value instanceof Uint8Array) {
-      return Buffer.from(value).toString('hex');
-    }
-    return value;
-  };
-
   return (
     <>
       <ScrollView contentContainerStyle={styles.approveTransaction}>
@@ -289,7 +251,7 @@ const ApproveTransaction = ({ route }: ApproveTransactionProps) => {
         </Text>
         <View style={styles.messageBody}>
           <Text variant="bodyLarge">
-            {JSON.stringify(transactionMessage, replacer, 2)}
+            {JSON.stringify(transactionMessage, null, 2)}
           </Text>
         </View>
         <>

src/screens/ApproveTransfer.tsx

@@ -34,6 +34,7 @@ import {
   rejectWalletConnectRequest,
   WalletConnectRequests,
 } from '../utils/wallet-connect/wallet-connect-requests';
+import { web3wallet } from '../utils/wallet-connect/WalletConnectUtils';
 import DataBox from '../components/DataBox';
 import { getPathKey } from '../utils/misc';
 import { useNetworks } from '../context/NetworksContext';
@@ -41,7 +42,6 @@ import { COSMOS, EIP155, IS_NUMBER_REGEX } from '../utils/constants';
 import TxErrorDialog from '../components/TxErrorDialog';
 import { EIP155_SIGNING_METHODS } from '../utils/wallet-connect/EIP155Data';
 import { COSMOS_METHODS } from '../utils/wallet-connect/COSMOSData';
-import { useWalletConnect } from '../context/WalletConnectContext';
 
 export const MEMO = 'Sending signed tx from Laconic Wallet';
 // Reference: https://ethereum.org/en/developers/docs/gas/#what-is-gas-limit
@@ -64,8 +64,6 @@ const ApproveTransfer = ({ route }: SignRequestProps) => {
   const chainId = requestEvent.params.chainId;
   const requestMethod = requestEvent.params.request.method;
 
-  const { web3wallet } = useWalletConnect();
-
   const [account, setAccount] = useState<Account>();
   const [isLoading, setIsLoading] = useState(true);
   const [balance, setBalance] = useState<string>('');

src/screens/HomeScreen.tsx

@@ -16,6 +16,7 @@ import styles from '../styles/stylesheet';
 import { useAccounts } from '../context/AccountsContext';
 import { useWalletConnect } from '../context/WalletConnectContext';
 import { NetworksDataState, StackParamsList } from '../types';
+import { web3wallet } from '../utils/wallet-connect/WalletConnectUtils';
 import { useNetworks } from '../context/NetworksContext';
 
 const WCLogo = () => {
@@ -32,7 +33,7 @@ const HomeScreen = () => {
 
   const { networksData, selectedNetwork, setSelectedNetwork, setNetworksData } =
     useNetworks();
-  const { web3wallet, setActiveSessions } = useWalletConnect();
+  const { setActiveSessions } = useWalletConnect();
 
   const navigation =
     useNavigation<NativeStackNavigationProp<StackParamsList>>();
@@ -109,7 +110,6 @@ const HomeScreen = () => {
 
     hideResetDialog();
   }, [
-    web3wallet,
     setAccounts,
     setActiveSessions,
     setCurrentIndex,

src/screens/SignRequest.tsx

@@ -20,10 +20,10 @@ import {
   rejectWalletConnectRequest,
   WalletConnectRequests,
 } from '../utils/wallet-connect/wallet-connect-requests';
+import { web3wallet } from '../utils/wallet-connect/WalletConnectUtils';
 import { EIP155_SIGNING_METHODS } from '../utils/wallet-connect/EIP155Data';
 import { useNetworks } from '../context/NetworksContext';
 import { COSMOS_METHODS } from '../utils/wallet-connect/COSMOSData';
-import { useWalletConnect } from '../context/WalletConnectContext';
 
 type SignRequestProps = NativeStackScreenProps<StackParamsList, 'SignRequest'>;
 
@@ -35,8 +35,6 @@ const SignRequest = ({ route }: SignRequestProps) => {
   const requestIcon = requestSession?.peer?.metadata?.icons[0];
   const requestURL = requestSession?.peer?.metadata?.url;
 
-  const { web3wallet } = useWalletConnect();
-
   const [account, setAccount] = useState<Account>();
   const [message, setMessage] = useState<string>('');
   const [namespace, setNamespace] = useState<string>('');
@@ -88,13 +86,21 @@ const SignRequest = ({ route }: SignRequestProps) => {
         return;
       }
 
+      if (requestAccount !== account) {
         setAccount(requestAccount);
+      }
+      if (requestMessage !== message) {
         setMessage(decodeURIComponent(requestMessage));
+      }
+      if (requestNamespace !== namespace) {
         setNamespace(requestNamespace);
+      }
+      if (requestChainId !== chainId) {
         setChainId(requestChainId);
+      }
       setIsLoading(false);
     },
-    [navigation],
+    [account, message, navigation, namespace, chainId],
   );
 
   const sanitizePath = useCallback(

src/screens/WalletConnect.tsx

@@ -6,10 +6,11 @@ import { SvgUri } from 'react-native-svg';
 import { getSdkError } from '@walletconnect/utils';
 
 import { useWalletConnect } from '../context/WalletConnectContext';
+import { web3wallet } from '../utils/wallet-connect/WalletConnectUtils';
 import styles from '../styles/stylesheet';
 
 export default function WalletConnect() {
-  const { web3wallet, activeSessions, setActiveSessions } = useWalletConnect();
+  const { activeSessions, setActiveSessions } = useWalletConnect();
 
   const disconnect = async (sessionId: string) => {
     await web3wallet!.disconnectSession({
@@ -22,9 +23,9 @@ export default function WalletConnect() {
   };
 
   useEffect(() => {
-    const sessions = web3wallet?.getActiveSessions() || {};
+    const sessions = web3wallet!.getActiveSessions();
     setActiveSessions(sessions);
-  }, [web3wallet, setActiveSessions]);
+  }, [setActiveSessions]);
 
   return (
     <View>

src/types.ts

@@ -1,7 +1,7 @@
 import { PopulatedTransaction } from 'ethers';
 
 import { SignClientTypes, SessionTypes } from '@walletconnect/types';
-import { IWeb3Wallet, Web3WalletTypes } from '@walletconnect/web3wallet';
+import { Web3WalletTypes } from '@walletconnect/web3wallet';
 import { EncodeObject } from '@cosmjs/proto-signing';
 
 export type StackParamsList = {
@@ -127,6 +127,4 @@ export interface WalletConnectContextProps {
   setActiveSessions: (
     activeSessions: Record<string, SessionTypes.Struct>,
   ) => void;
-  web3wallet: IWeb3Wallet | undefined;
-  setWeb3wallet: React.Dispatch<React.SetStateAction<IWeb3Wallet | undefined>>;
 }

src/utils/constants.ts

@@ -1,22 +1,9 @@
-import Config from 'react-native-config';
 import { COSMOS_TESTNET_CHAINS } from './wallet-connect/COSMOSData';
 import { EIP155_CHAINS } from './wallet-connect/EIP155Data';
 
 export const EIP155 = 'eip155';
 export const COSMOS = 'cosmos';
 export const DEFAULT_NETWORKS = [
-  {
-    chainId: 'laconic_9000-1',
-    networkName: 'laconicd',
-    namespace: COSMOS,
-    rpcUrl: Config.LACONICD_RPC_URL,
-    blockExplorerUrl: '',
-    nativeDenom: 'alnt',
-    addressPrefix: 'laconic',
-    coinType: '118',
-    gasPrice: '1',
-    isDefault: true,
-  },
   {
     chainId: '1',
     networkName: EIP155_CHAINS['eip155:1'].name,

src/utils/wallet-connect/WalletConnectUtils.tsx

@@ -6,6 +6,7 @@ import { Core } from '@walletconnect/core';
 import { ICore } from '@walletconnect/types';
 import { Web3Wallet, IWeb3Wallet } from '@walletconnect/web3wallet';
 
+export let web3wallet: IWeb3Wallet | undefined;
 export let core: ICore;
 
 export async function createWeb3Wallet() {
@@ -13,7 +14,7 @@ export async function createWeb3Wallet() {
     projectId: Config.WALLET_CONNECT_PROJECT_ID,
   });
 
-  const web3wallet = await Web3Wallet.init({
+  web3wallet = await Web3Wallet.init({
     core,
     metadata: {
       name: 'Laconic Wallet',
@@ -22,14 +23,9 @@ export async function createWeb3Wallet() {
       icons: ['https://avatars.githubusercontent.com/u/92608123'],
     },
   });
-
-  return web3wallet;
 }
 
-export async function web3WalletPair(
+export async function web3WalletPair(params: { uri: string }) {
-  web3wallet: IWeb3Wallet,
-  params: { uri: string },
-) {
   if (web3wallet) {
     return await web3wallet.core.pairing.pair({ uri: params.uri });
   }

src/utils/wallet-connect/helpers.ts

@@ -40,6 +40,7 @@ export const getNamespaces = async (
   networksData: NetworksDataState[],
   selectedNetwork: NetworksDataState,
   accounts: Account[],
+  currentIndex: number,
 ) => {
   const namespaceChainId = `${selectedNetwork.namespace}:${selectedNetwork.chainId}`;
 
@@ -100,6 +101,23 @@ export const getNamespaces = async (
     const requiredAddressesArray = await Promise.all(requiredAddressesPromise);
     const requiredAddresses = requiredAddressesArray.flat();
 
+    let sortedAccounts = requiredAddresses;
+
+    // If selected network is included in chains requested from dApp,
+    // Put selected account as first account
+    if (walletConnectChains.includes(namespaceChainId)) {
+      const currentAddresses = requiredAddresses.filter(address =>
+        address.includes(namespaceChainId),
+      );
+      sortedAccounts = [
+        currentAddresses[currentIndex],
+        ...currentAddresses.filter((address, index) => index !== currentIndex),
+        ...requiredAddresses.filter(
+          address => !currentAddresses.includes(address),
+        ),
+      ];
+    }
+
     // construct namespace object
     const newNamespaces = {
       eip155: {
@@ -115,7 +133,7 @@ export const getNamespaces = async (
           ...(optionalNamespaces.eip155?.events ?? []),
           ...(requiredNamespaces.eip155?.events ?? []),
         ],
-        accounts: requiredAddresses.filter(account => account.includes(EIP155)),
+        accounts: sortedAccounts.filter(account => account.includes(EIP155)),
       },
       cosmos: {
         chains: walletConnectChains.filter(chain => chain.includes(COSMOS)),
@@ -129,12 +147,18 @@ export const getNamespaces = async (
           ...(optionalNamespaces.cosmos?.events ?? []),
           ...(requiredNamespaces.cosmos?.events ?? []),
         ],
-        accounts: requiredAddresses.filter(account => account.includes(COSMOS)),
+        accounts: sortedAccounts.filter(account => account.includes(COSMOS)),
       },
     };
 
     return newNamespaces;
   } else {
+    // Set selected account as the first account in supported namespaces
+    const sortedAccounts = [
+      accounts[currentIndex],
+      ...accounts.filter((account, index) => index !== currentIndex),
+    ];
+
     switch (selectedNetwork.namespace) {
       case EIP155:
         return {
@@ -151,7 +175,7 @@ export const getNamespaces = async (
               ...(optionalNamespaces.eip155?.events ?? []),
               ...(requiredNamespaces.eip155?.events ?? []),
             ],
-            accounts: accounts.map(ethAccount => {
+            accounts: sortedAccounts.map(ethAccount => {
               return `${namespaceChainId}:${ethAccount.address}`;
             }),
           },
@@ -176,7 +200,7 @@ export const getNamespaces = async (
               ...(optionalNamespaces.cosmos?.events ?? []),
               ...(requiredNamespaces.cosmos?.events ?? []),
             ],
-            accounts: accounts.map(cosmosAccount => {
+            accounts: sortedAccounts.map(cosmosAccount => {
               return `${namespaceChainId}:${cosmosAccount.address}`;
             }),
           },

yarn.lock

@@ -752,10 +752,10 @@
     deepmerge "^3.2.0"
     hoist-non-react-statics "^3.3.0"
 
-"@cerc-io/registry-sdk@^0.2.5":
+"@cerc-io/registry-sdk@^0.2.2":
-  version "0.2.5"
+  version "0.2.2"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fregistry-sdk/-/0.2.5/registry-sdk-0.2.5.tgz#9ca19fecb2923520dd6a19946c309ecb2ec780a2"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fregistry-sdk/-/0.2.2/registry-sdk-0.2.2.tgz#2e8a533f069b4bb9f4cd4798e783f52e29167d0d"
-  integrity sha512-/KXAYf9gStaX/rRBMCEeDCexEIpTOFHeHzMK9B3xfCT+SyYZE9WC9GpX299LzBYJKKPsb0/JvnDfip9S1igJtA==
+  integrity sha512-ocRMbWtdewOg02ORfK1U+qbTqB46anHP4ApXokGkY4d+mFSApR3sdUEi2geHcs8oh+SG8YAp7LUJ9AAJneNY8g==
   dependencies:
     "@cosmjs/amino" "^0.28.1"
     "@cosmjs/crypto" "^0.28.1"
@@ -2071,11 +2071,6 @@
   dependencies:
     merge-options "^3.0.4"
 
-"@react-native-clipboard/clipboard@^1.14.1":
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/@react-native-clipboard/clipboard/-/clipboard-1.14.1.tgz#835f82fc86881a0808a8405f2576617bb5383554"
-  integrity sha512-SM3el0A28SwoeJljVNhF217o0nI4E7RfalLmuRQcT1/7tGcxUjgFa3jyrEndYUct8/uxxK5EUNGUu1YEDqzxqw==
-
 "@react-native-community/cli-clean@12.3.2":
   version "12.3.2"
   resolved "https://registry.yarnpkg.com/@react-native-community/cli-clean/-/cli-clean-12.3.2.tgz#d4f1730c3d22d816b4d513d330d5f3896a3f5921"