fix: wrong network name for masa

masa-finance · Aug 2, 2023 · 908cfdc · 908cfdc
1 parent eb90b09
commit 908cfdc
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/src/refactor/masa-client/use-masa-client.ts b/src/refactor/masa-client/use-masa-client.ts
@@ -4,6 +4,7 @@ import { useConfig } from '../base-provider';
 import { useWallet } from '../wallet-client/wallet/use-wallet';
 import { useMasaSDK } from './use-masa-sdk';
 import { useNetwork } from '../wallet-client/network';
+import { getMasaNetworkName } from '../wallet-client/utils';
 
 export const useMasaClient = () => {
   const { masaConfig, contractAddressOverrides } = useConfig();
@@ -61,9 +62,11 @@ export const useMasaClient = () => {
 
     const network = await masa.config.signer?.provider?.getNetwork();
 
-    return network?.name === 'unknown'
-      ? currentNetwork?.networkName
-      : network?.name;
+    if (network?.name === 'unknown') {
+      return getMasaNetworkName(currentNetwork?.networkName);
+    } 
+      return getMasaNetworkName(network?.name);
+
   }, [masa, currentNetwork, activeChainId, masaChainId]);
 
   const masaClient = useMemo(() => {

diff --git a/src/refactor/masanew.stories.tsx b/src/refactor/masanew.stories.tsx
@@ -566,7 +566,7 @@ const TemplateNewMasaState = (props: Args) => (
   <MasaProvider
     config={{
       allowedWallets: ['metamask', 'walletconnect'],
-      forceChain: 'alfajores',
+      forceChain: 'ethereum',
       allowedNetworkNames: [
         'goerli',
         'ethereum',
@@ -580,7 +580,7 @@ const TemplateNewMasaState = (props: Args) => (
         'unknown',
       ],
       masaConfig: {
-        networkName: 'alfajores',
+        networkName: 'ethereum',
       },
     }}
   >

diff --git a/src/refactor/wallet-client/utils.ts b/src/refactor/wallet-client/utils.ts
@@ -139,6 +139,20 @@ export const getWagmiNetworkName = (masaNetworkName?: NetworkName) => {
   return masaNetworkName;
 };
 
+export const getMasaNetworkName = (
+  wagmiNetworkName:
+    | NetworkName
+    | 'homestead'
+    | 'celo-alfajores'
+    | undefined
+    | string
+) => {
+  if (wagmiNetworkName === 'homestead') return 'ethereum';
+  if (wagmiNetworkName === 'celo-alfajores') return 'alfajores';
+
+  return wagmiNetworkName;
+};
+
 export const getChainsSortedByForcedNetwork = (
   chains: Chain[],
   forceChain?: NetworkName

diff --git a/src/refactor/wallet-client/wallet-client-provider.tsx b/src/refactor/wallet-client/wallet-client-provider.tsx
@@ -77,12 +77,12 @@ export const WalletClientProvider = ({ children }: WalletClientProps) => {
     if (!forceChain) return;
     // * NOTE: comment the following 3 lines out to disable automatic network switching for forced network
     if (canProgramaticallySwitchNetwork) {
-      switchNetwork?.(chainIdsByNetwork[forceChain] as number);
+      // switchNetwork?.(chainIdsByNetwork[forceChain] as number);
     }
   }, [
     forceChain,
     canProgramaticallySwitchNetwork,
-    switchNetwork,
+    // switchNetwork,
     chainIdsByNetwork,
     chains,
   ]);
@@ -120,7 +120,7 @@ export const WalletClientProvider = ({ children }: WalletClientProps) => {
         isActiveChainUnsupported,
         availibleChains,
         pendingConnector,
-      } as WalletClientValue),
+      }) as WalletClientValue,
     [
       // wallet
       address,