fix: try to fix infinite switch loop

subsquid · May 17, 2024 · f98f400 · f98f400
1 parent 88a4723
commit f98f400
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/layouts/NetworkLayout/NetworkLayout.tsx b/src/layouts/NetworkLayout/NetworkLayout.tsx
@@ -267,8 +267,8 @@ export const NetworkLayout = ({
 
     if (chain?.id === getChainId(network)) return;
 
-    if (!chain?.unsupported) {
-      switchAndReset(getNetworkName(chain?.id));
+    if (chain && !chain?.unsupported) {
+      switchAndReset(getNetworkName(chain.id));
       return;
     }
 

diff --git a/src/network/useSubsquidNetwork.ts b/src/network/useSubsquidNetwork.ts
@@ -24,6 +24,8 @@ export function useSubsquidNetwork() {
   const queryClient = useQueryClient();
 
   const switchAndReset = (network: NetworkName) => {
+    if (app == network) return;
+
     changeApp(network);
     queryClient.clear();
   };
@@ -35,6 +37,6 @@ export function getChainId(network: NetworkName) {
   return network === NetworkName.Mainnet ? arbitrum.id : arbitrumSepolia.id;
 }
 
-export function getNetworkName(chainId?: number) {
+export function getNetworkName(chainId: number) {
   return chainId === arbitrum.id ? NetworkName.Mainnet : NetworkName.Testnet;
 }