fix missing memo on bridge

src/components/WalletManagement/ModalChooseWallet/WalletByNetwork/WalletByNetwork.tsx

@@ -2,7 +2,7 @@ import { WalletType as WalletCosmosType } from '@oraichain/oraidex-common';
 import { Button } from 'components/Button';
 import { TToastType, displayToast } from 'components/Toasts/Toast';
 import type { WalletNetwork, WalletProvider, WalletType } from 'components/WalletManagement/walletConfig';
-import { getListAddressCosmos, setStorageKey, switchWalletTron } from 'helper';
+import { getListAddressCosmos, retry, setStorageKey, switchWalletTron } from 'helper';
 import useConfigReducer from 'hooks/useConfigReducer';
 import useTheme from 'hooks/useTheme';
 import useWalletReducer from 'hooks/useWalletReducer';
@@ -101,11 +101,23 @@ export const WalletByNetwork = ({ walletProvider }: { walletProvider: WalletProv
     }
 
     solanaWallet.select(selectType as any);
-    await solanaWallet.connect();
-    const { publicKey } = await provider.connect();
-    if (publicKey) {
-      setSolanaAddress(publicKey.toBase58());
-    }
+    await retry(
+      async () => {
+        try {
+          await solanaWallet.connect();
+        } catch (err) {
+          console.log('err', err);
+        }
+        const { publicKey } = await provider.connect();
+        if (publicKey) {
+          setSolanaAddress(publicKey.toBase58());
+        } else {
+          throw new Error('Cannot connect to Solana wallet');
+        }
+      },
+      3,
+      1000
+    );
   };
 
   const handleConnectWalletByNetwork = async (wallet: WalletNetwork) => {

src/helper/index.tsx

@@ -692,3 +692,15 @@ export const handleErrorRateLimit = (errorMsg: string) => {
     });
   }
 };
+
+export const retry = async (fn, retries = 3, delay = 1000) => {
+  try {
+    return await fn();
+  } catch (error) {
+    if (retries <= 0) {
+      throw error;
+    }
+    await sleep(delay);
+    return retry(fn, retries - 1, delay);
+  }
+};

src/pages/Balance/index.tsx

@@ -453,6 +453,10 @@ const Balance: React.FC<BalanceProps> = () => {
     fromToken: TokenItemType;
     transferAmount: number;
   }) => {
+    if (!oraiAddress) {
+      throw new Error('Please connect to Oraichain wallet');
+    }
+
     const web3Solana = new Web3SolanaProgramInteraction();
     console.log('from token address: ', fromToken.contractAddress);
     const bridgeBalance =
@@ -481,6 +485,10 @@ const Balance: React.FC<BalanceProps> = () => {
     fromToken: TokenItemType;
     transferAmount: number;
   }) => {
+    if (!solAddress) {
+      throw new Error('Please connect to Solana wallet');
+    }
+
     const receiverAddress = ORAICHAIN_RELAYER_ADDRESS;
     const currentBridgeBalance = await window.client.getBalance(receiverAddress, fromToken.denom);
     console.log(