Merge branch 'v2/dev' into pavania1/authz-illustrations

vitwit · Sep 13, 2024 · 93f4351 · 93f4351
2 parents 3749862 + aa4d389
commit 93f4351
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 41 deletions.
diff --git a/frontend/src/components/main-layout/ConnectWallet.tsx b/frontend/src/components/main-layout/ConnectWallet.tsx
@@ -38,23 +38,37 @@ 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;
-          const snapInstalled = await getSnap();
-          if (!snapInstalled) {
-            await connectSnap(); // Initiates installation if not already present
+          if (notSupoortedMetamaskChainIds.indexOf(chainId) <= -1) {
+            try {
+               await experimentalSuggestChain(networks[i].config, {
+                force: false,
+              });
+            } catch (error) {
+              console.log('Error while connecting ', chainId);
+            }
           }
 
-          try {
-            await experimentalSuggestChain(networks[i].config, {
-              force: false,
-            });
-          } catch (error) {
-            console.log('Error while connecting ', chainId);
-          }
+          console.timeEnd("Function execution time");
         }
+
+
       } catch (error) {
         console.log('trying to connect wallet ', error);
       }

diff --git a/frontend/src/components/main-layout/FixedLayout.tsx b/frontend/src/components/main-layout/FixedLayout.tsx
@@ -40,25 +40,30 @@ 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') {
       dispatch(setIsLoading());
       try {
+        const snapInstalled = await getSnap();
+        if (!snapInstalled) {
+          await connectSnap(); // Initiates installation if not already present
+        }
+
         for (let i = 0; i < networks.length; i++) {
           const chainId: string = networks[i].config.chainId;
-          const snapInstalled = await getSnap();
-          if (!snapInstalled) {
-            await connectSnap(); // Initiates installation if not already present
-          }
+          if (notSupoortedMetamaskChainIds.indexOf(chainId) <= -1) {
 
-          try {
-            await experimentalSuggestChain(networks[i].config, {
-              force: false,
-            });
-          } catch (error) {
-            console.log('Error while connecting ', chainId);
+            try {
+              await experimentalSuggestChain(networks[i].config, {
+                force: false,
+              });
+            } catch (error) {
+              console.log('Error while connecting ', chainId);
+            }
           }
+
         }
       } catch (error) {
         console.log('trying to connect wallet ', error);

diff --git a/frontend/src/store/features/wallet/walletSlice.ts b/frontend/src/store/features/wallet/walletSlice.ts
@@ -87,31 +87,36 @@ export const establishWalletConnection = createAsyncThunk(
       const chainInfos: Record<string, ChainInfo> = {};
       const nameToChainIDs: Record<string, string> = {};
       let anyNetworkAddress = '';
+      const notSupoortedMetamaskChainIds = ['agoric-3', 'evmos_9001-2', 'desmos-mainnet']
       for (let i = 0; i < networks.length; i++) {
         if (data.walletName === 'metamask') {
+
           try {
             const chainId: string = networks[i].config.chainId;
-            const chainName: string = networks[i].config.chainName;
-            const walletInfo = await getKey(chainId);
-            if (walletInfo?.address.includes('cosmos')) {
-              walletName = walletInfo?.address;
-            }
-            isNanoLedger = false;
+            if (notSupoortedMetamaskChainIds.indexOf(chainId) <= -1) {
+              const chainName: string = networks[i].config.chainName;
+              const walletInfo = await getKey(chainId);
+              if (walletInfo?.address.includes('cosmos')) {
+                walletName = walletInfo?.address;
+              }
+              isNanoLedger = false;
 
-            chainInfos[chainId] = {
-              walletInfo: {
-                algo: walletInfo?.algo,
-                bech32Address: walletInfo?.address,
-                pubKey: Buffer.from(walletInfo?.pubkey).toString('base64'),
-                isKeystone: '',
-                isNanoLedger: isNanoLedger,
-                name: walletName,
-              },
-              network: networks[i],
-            };
+              chainInfos[chainId] = {
+                walletInfo: {
+                  algo: walletInfo?.algo,
+                  bech32Address: walletInfo?.address,
+                  pubKey: Buffer.from(walletInfo?.pubkey).toString('base64'),
+                  isKeystone: '',
+                  isNanoLedger: isNanoLedger,
+                  name: walletName,
+                },
+                network: networks[i],
+              };
+
+              nameToChainIDs[chainName?.toLowerCase().split(' ').join('')] =
+                chainId;
+            }
 
-            nameToChainIDs[chainName?.toLowerCase().split(' ').join('')] =
-              chainId;
           } catch (error) {
             console.log(
               `unable to connect to network ${networks[i].config.chainName}: `,

diff --git a/server/cron/cron.go b/server/cron/cron.go
@@ -37,13 +37,13 @@ func (c *Cron) Start() error {
 
 	// Every 15 minute
 	cron.AddFunc("0 */15 * * * *", func() {
-		c.CoinsPriceInfoList()
+		go c.CoinsPriceInfoList()
 		log.Println("successfully saved price information list")
 	})
 
 	// Every 15 minute
 	cron.AddFunc("0 */15 * * * *", func() {
-		c.StartCheckUris()
+		go c.StartCheckUris()
 		log.Println("successfully saved chain information list")
 	})