fix: sign in flow when connected to unknown network

masa-finance · Oct 24, 2023 · 6271124 · 6271124
1 parent 0cb2e7b
commit 6271124
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 28 deletions.
diff --git a/src/masa-client/use-masa-client.ts b/src/masa-client/use-masa-client.ts
@@ -8,27 +8,17 @@ import { getMasaNetworkName } from '../wallet-client/utils';
 
 export const useMasaClient = () => {
   const { masaConfig, contractAddressOverrides } = useConfig();
-
   const { signer, isDisconnected, address } = useWallet();
-
   const { activeChainId, currentNetwork } = useNetwork();
 
-  const networkName = useMemo(
-    () =>
-      currentNetwork?.networkName
-        ? getMasaNetworkName(currentNetwork.networkName)
-        : 'unknown',
-    [currentNetwork?.networkName]
-  );
-
   const masa = useMasaSDK(
     {
       address,
       signer: isDisconnected ? undefined : signer,
       ...masaConfig,
       environmentName: masaConfig.environment,
       contractAddressOverrides,
-      networkName,
+      networkName: currentNetwork?.networkName ?? 'unknown',
     },
     [
       address,
@@ -73,7 +63,7 @@ export const useMasaClient = () => {
       return getMasaNetworkName(network.name);
     }, [masa, activeChainId, masaChainId]);
 
-  const masaClient = useMemo(() => {
+  return useMemo(() => {
     if (address !== masaAddress) {
       return {
         masaAddress,
@@ -83,15 +73,6 @@ export const useMasaClient = () => {
       };
     }
 
-    if (!currentNetwork) {
-      return {
-        masaAddress,
-        masaChainId,
-        sdk: undefined,
-        masa: undefined,
-      };
-    }
-
     return {
       masaAddress,
       masaNetwork,
@@ -101,15 +82,12 @@ export const useMasaClient = () => {
       isLoadingMasa: isLoadingMasaAddress || isLoadingMasaNetwork,
     };
   }, [
-    masa,
+    address,
     masaAddress,
-    masaChainId,
     masaNetwork,
-    address,
+    masaChainId,
+    masa,
     isLoadingMasaAddress,
     isLoadingMasaNetwork,
-    currentNetwork,
   ]);
-
-  return masaClient;
 };
diff --git a/src/masa-client/use-masa-sdk.ts b/src/masa-client/use-masa-sdk.ts
@@ -32,7 +32,7 @@ export const useMasaSDK = (
   {
     signer,
     environmentName,
-    networkName = 'unknown',
+    networkName,
     arweaveConfig,
     verbose,
     apiUrl,
@@ -77,6 +77,7 @@ export const useMasaSDK = (
       );
       contractOverrides.SoulNameContract.hasAddress = true;
     }
+
     if (verbose) {
       signer
         .getAddress()