add reducer for metamask connection

vitwit · Sep 18, 2024 · 52dad86 · 52dad86
1 parent 236cfbc
commit 52dad86
Show file tree

Hide file tree

Showing 4 changed files with 159 additions and 138 deletions.
diff --git a/frontend/src/components/main-layout/ConnectWallet.tsx b/frontend/src/components/main-layout/ConnectWallet.tsx
@@ -1,11 +1,12 @@
 import { useAppDispatch, useAppSelector } from '@/custom-hooks/StateHooks';
 import {
+  establishMetamaskConnection,
   establishWalletConnection,
   setConnectWalletOpen,
   setIsLoading,
 } from '@/store/features/wallet/walletSlice';
 import { networks } from '@/utils/chainsInfo';
-import { SUPPORTED_WALLETS } from '@/utils/constants';
+import { NotSupportedMetamaskChainIds, SUPPORTED_WALLETS } from '@/utils/constants';
 import { getLocalNetworks } from '@/utils/localStorage';
 import {
   connectSnap,
@@ -38,50 +39,44 @@ const ConnectWallet = () => {
 
   const tryConnectWallet = async (walletName: string) => {
     if (walletName === 'metamask') {
-      const notSupoortedMetamaskChainIds = ['agoric-3', 'evmos_9001-2', 'desmos-mainnet']
       dispatch(setIsLoading());
-
       try {
         const snapInstalled = await getSnap();
         if (!snapInstalled) {
           await connectSnap(); // Initiates installation if not already present
         }
-      } catch (error) {
-        console.log('Unable to install snap', error)
-      }
 
-      try {
         for (let i = 0; i < networks.length; i++) {
-          console.time("Function execution time");
-
           const chainId: string = networks[i].config.chainId;
-          if (notSupoortedMetamaskChainIds.indexOf(chainId) <= -1) {
+          if (NotSupportedMetamaskChainIds.indexOf(chainId) <= -1) {
             try {
-               await experimentalSuggestChain(networks[i].config, {
+              await experimentalSuggestChain(networks[i].config, {
                 force: false,
               });
+              dispatch(
+                establishMetamaskConnection({
+                  walletName,
+                  network: networks[i],
+                })
+              );
             } catch (error) {
               console.log('Error while connecting ', chainId);
             }
           }
-
-          console.timeEnd("Function execution time");
         }
-
-
       } catch (error) {
         console.log('trying to connect wallet ', error);
       }
+    } else {
+      dispatch(
+        establishWalletConnection({
+          walletName,
+          networks: [...networks, ...getLocalNetworks()],
+        })
+      );
     }
-
-    dispatch(
-      establishWalletConnection({
-        walletName,
-        networks: [...networks, ...getLocalNetworks()],
-      })
-    );
   };
-
+  
   return (
     <Dialog
       open={open}

diff --git a/frontend/src/components/main-layout/FixedLayout.tsx b/frontend/src/components/main-layout/FixedLayout.tsx
@@ -12,6 +12,7 @@ import {
   getSnap,
 } from '@leapwallet/cosmos-snap-provider';
 import {
+  establishMetamaskConnection,
   establishWalletConnection,
   setIsLoading,
   unsetIsLoading,
@@ -33,7 +34,7 @@ import CustomLoader from '../common/CustomLoader';
 import { TxStatus } from '@/types/enums';
 import useGetShowAuthzAlert from '@/custom-hooks/useGetShowAuthzAlert';
 import { initializeGA } from '@/utils/util';
-
+import { NotSupportedMetamaskChainIds } from '@/utils/constants';
 
 declare let window: WalletWindow;
 
@@ -44,7 +45,6 @@ const FixedLayout = ({ children }: { children: React.ReactNode }) => {
   const isLoading = useAppSelector((state) => state.wallet.isLoading);
 
   const walletState = useAppSelector((state) => state.wallet.status);
-  const notSupoortedMetamaskChainIds = ['agoric-3', 'evmos_9001-2', 'desmos-mainnet']
 
   const tryConnectWallet = async (walletName: string) => {
     if (walletName === 'metamask') {
@@ -57,29 +57,33 @@ const FixedLayout = ({ children }: { children: React.ReactNode }) => {
 
         for (let i = 0; i < networks.length; i++) {
           const chainId: string = networks[i].config.chainId;
-          if (notSupoortedMetamaskChainIds.indexOf(chainId) <= -1) {
-
+          if (NotSupportedMetamaskChainIds.indexOf(chainId) <= -1) {
             try {
               await experimentalSuggestChain(networks[i].config, {
                 force: false,
               });
+              dispatch(
+                establishMetamaskConnection({
+                  walletName,
+                  network: networks[i],
+                })
+              );
             } catch (error) {
               console.log('Error while connecting ', chainId);
             }
           }
-
         }
       } catch (error) {
         console.log('trying to connect wallet ', error);
       }
+    } else {
+      dispatch(
+        establishWalletConnection({
+          walletName,
+          networks: [...networks, ...getLocalNetworks()],
+        })
+      );
     }
-
-    dispatch(
-      establishWalletConnection({
-        walletName,
-        networks: [...networks, ...getLocalNetworks()],
-      })
-    );
   };
 
   useEffect(() => {