fix: storybook packages, network detection hook fix

masa-finance · Aug 16, 2023 · 5904e70 · 5904e70
1 parent 9cc9611
commit 5904e70
Show file tree

Hide file tree

Showing 4 changed files with 832 additions and 975 deletions.
diff --git a/package.json b/package.json
@@ -40,7 +40,6 @@
     "@masa-finance/masa-sdk": "^3.5.8",
     "@metamask/providers": "^11.1.1",
     "@rainbow-me/rainbowkit": "~0.12.17",
-    "@storybook/react": "^7.2.1",
     "@tanstack/query-sync-storage-persister": "^4.32.6",
     "@tanstack/react-query": "^4.28.0",
     "@tanstack/react-query-persist-client": "^4.28.0",
@@ -64,7 +63,6 @@
     "react-use-pagination": "^2.0.1",
     "reaptcha": "^1.12.1",
     "rodal": "^2.0.0",
-    "storybook": "^7.2.3",
     "wagmi": "~0.12.19"
   },
   "devDependencies": {
@@ -73,15 +71,15 @@
     "@babel/preset-react": "^7.22.3",
     "@size-limit/preset-big-lib": "^8.2.4",
     "@size-limit/webpack-why": "^8.2.4",
-    "@storybook/addon-essentials": "^7.2.3",
+    "@storybook/addon-essentials": "^7.3.1",
     "@storybook/addon-info": "^5.3.21",
-    "@storybook/addon-links": "^7.1.1",
-    "@storybook/addon-mdx-gfm": "^7.0.26",
-    "@storybook/addon-styling": "^1.3.4",
-    "@storybook/addons": "^7.2.1",
-    "@storybook/components": "^7.1.0",
-    "@storybook/react": "^7.2.1",
-    "@storybook/react-webpack5": "^7.1.1",
+    "@storybook/addon-links": "^7.3.1",
+    "@storybook/addon-mdx-gfm": "^7.3.1",
+    "@storybook/addon-styling": "^1.3.6",
+    "@storybook/addons": "^7.3.1",
+    "@storybook/components": "^7.3.1",
+    "@storybook/react": "^7.3.1",
+    "@storybook/react-webpack5": "^7.3.1",
     "@tanstack/eslint-plugin-query": "^4.32.5",
     "@tanstack/react-query-devtools": "^4.29.12",
     "@types/jest": "^29.5.2",
@@ -130,6 +128,7 @@
     "sass": "^1.62.1",
     "sass-loader": "^13.3.2",
     "size-limit": "^8.1.0",
+    "storybook": "^7.3.1",
     "storybook-addon-sass-postcss": "^0.1.3",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.2.0",

diff --git a/src/refactor/masa-client/use-masa-client.ts b/src/refactor/masa-client/use-masa-client.ts
@@ -60,12 +60,14 @@ export const useMasaClient = () => {
     useAsync(async () => {
       if (!masa) return undefined;
       if (masaChainId !== activeChainId) return undefined;
-
       const network = await masa.config.signer?.provider?.getNetwork();
 
+      if (!network) return undefined;
+
       if (network?.name === 'unknown') {
         return getMasaNetworkName(currentNetwork?.networkName);
       }
+
       return getMasaNetworkName(network?.name);
     }, [masa, currentNetwork, activeChainId, masaChainId]);
 
@@ -78,6 +80,16 @@ export const useMasaClient = () => {
         masa: undefined,
       };
     }
+
+    if (!currentNetwork) {
+      return {
+        masaAddress,
+        masaChainId,
+        sdk: undefined,
+        masa: undefined,
+      };
+    }
+
     return {
       masaAddress,
       masaNetwork,
@@ -94,6 +106,7 @@ export const useMasaClient = () => {
     address,
     isLoadingMasaAddress,
     isLoadingMasaNetwork,
+    currentNetwork,
   ]);
 
   return masaClient;

diff --git a/src/refactor/wallet-client/network/use-network.ts b/src/refactor/wallet-client/network/use-network.ts
@@ -67,6 +67,7 @@ export const useNetwork = () => {
     //   nw = 'alfajores';
     // }
 
+    if (!nw) return undefined;
     const newNetwork = getNetworkNameByChainId(nw ?? 0);
 
     return SupportedNetworks[newNetwork];