Import denom from registry-sdk

package.json

@@ -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",

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/components/Accounts.tsx

@@ -60,6 +60,7 @@ const Accounts = () => {
           networksData,
           selectedNetwork!,
           accounts,
+          currentIndex,
         );
 
         if (!updatedNamespaces) {

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,45 +11,29 @@ const DialogComponent = ({
   hideDialog,
   contentText,
 }: CustomDialogProps) => {
-  const [toastVisible, setToastVisible] = useState(false);
-
   const words = contentText.split(' ');
 
-  const handleCopy = () => {
-    Clipboard.setString(contentText);
-    setToastVisible(true);
-  };
-
   return (
-    <>
+    <Portal>
-      <Portal>
+      <Dialog visible={visible} onDismiss={hideDialog}>
-        <Dialog visible={visible} onDismiss={hideDialog}>
+        <Dialog.Content>
-          <Dialog.Content>
+          <Text variant="titleLarge">Mnemonic</Text>
-            <Text variant="titleLarge">Mnemonic</Text>
+          <View style={styles.dialogTitle}>
-            <View style={styles.dialogTitle}>
+            <Text variant="titleMedium">
-              <Text variant="titleMedium">
+              Your mnemonic provides full access to your wallet and funds. Make
-                Your mnemonic provides full access to your wallet and funds.
+              sure to note it down.{' '}
-                Make sure to note it down.{' '}
+            </Text>
-              </Text>
+            <Text variant="titleMedium" style={styles.dialogWarning}>
-              <Text variant="titleMedium" style={styles.dialogWarning}>
+              Do not share your mnemonic with anyone
-                Do not share your mnemonic with anyone
+            </Text>
-              </Text>
+            <GridView words={words} />
-              <GridView words={words} />
+          </View>
-            </View>
+        </Dialog.Content>
-          </Dialog.Content>
+        <Dialog.Actions>
-          <Dialog.Actions>
+          <Button onPress={hideDialog}>Done</Button>
-            <Button onPress={handleCopy}>Copy</Button>
+        </Dialog.Actions>
-            <Button onPress={hideDialog}>Done</Button>
+      </Dialog>
-          </Dialog.Actions>
+    </Portal>
-        </Dialog>
-      </Portal>
-      <Snackbar
-        visible={toastVisible}
-        onDismiss={() => setToastVisible(false)}
-        duration={1000}>
-        Mnemonic copied to clipboard
-      </Snackbar>
-    </>
   );
 };
 

src/components/PairingModal.tsx

@@ -20,7 +20,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('');
@@ -103,6 +103,7 @@ const PairingModal = ({
           networksData,
           selectedNetwork!,
           accounts,
+          currentIndex,
         );
         setSupportedNamespaces(nameSpaces);
       } catch (err) {
@@ -128,6 +129,7 @@ const PairingModal = ({
     networksData,
     selectedNetwork,
     accounts,
+    currentIndex,
     web3wallet,
     setCurrentProposal,
     setModalVisible,

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';
@@ -43,6 +42,7 @@ 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;
@@ -69,20 +69,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;
@@ -158,7 +144,7 @@ const ApproveTransaction = ({ route }: ApproveTransactionProps) => {
           return;
         }
         const gasEstimation = await cosmosStargateClient!.simulate(
-          signer,
+          transactionMessage.value.participant!,
           [transactionMessage],
           MEMO,
         );
@@ -182,7 +168,6 @@ const ApproveTransaction = ({ route }: ApproveTransactionProps) => {
     requestEventId,
     topic,
     web3wallet,
-    signer,
   ]);
 
   useEffect(() => {
@@ -258,13 +243,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 +267,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/SignRequest.tsx

@@ -88,13 +88,21 @@ const SignRequest = ({ route }: SignRequestProps) => {
         return;
       }
 
-      setAccount(requestAccount);
+      if (requestAccount !== account) {
-      setMessage(decodeURIComponent(requestMessage));
+        setAccount(requestAccount);
-      setNamespace(requestNamespace);
+      }
-      setChainId(requestChainId);
+      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/utils/constants.ts

@@ -1,3 +1,5 @@
+import { DENOM } from '@cerc-io/registry-sdk';
+
 import Config from 'react-native-config';
 import { COSMOS_TESTNET_CHAINS } from './wallet-connect/COSMOSData';
 import { EIP155_CHAINS } from './wallet-connect/EIP155Data';
@@ -11,7 +13,7 @@ export const DEFAULT_NETWORKS = [
     namespace: COSMOS,
     rpcUrl: Config.LACONICD_RPC_URL,
     blockExplorerUrl: '',
-    nativeDenom: 'alnt',
+    nativeDenom: DENOM,
     addressPrefix: 'laconic',
     coinType: '118',
     gasPrice: '1',

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

@@ -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"