fixed network switch

src/components/masa-interface/masa-interface.tsx

@@ -45,15 +45,19 @@ export const MasaInterface = ({
     soulnames,
     forcedPage,
     currentNetwork,
-    network
+    forceNetwork,
   } = useMasa();
 
   const page = useMemo(() => {
     if (forcedPage) return forcedPage;
     if (!isConnected) return 'connector';
 
-    if (network && currentNetwork?.chainId !== network) return 'switchNetwork';
-    console.log({ network });
+    if (forceNetwork && currentNetwork?.networkName !== forceNetwork) {
+      return 'switchNetwork';
+    }
+
+    console.log({ forceNetwork });
+
     if (!isLoggedIn && provider) return 'authenticate';
 
     if (
@@ -81,7 +85,7 @@ export const MasaInterface = ({
     creditScores,
     soulnames,
     forcedPage,
-    network,
+    forceNetwork,
   ]);
 
   return (

src/components/masa-interface/pages/create-soulname/create-soulname.tsx

@@ -88,7 +88,7 @@ export const InterfaceCreateSoulname = (): JSX.Element => {
       setLoadingMint(true);
 
       if (identity?.identityId) {
-        await masa?.soulName.create?.(soulname, registrationPeriod, 'eth');
+        await masa?.soulName.create?.('eth', soulname, registrationPeriod);
         closeModal?.(true);
       } else {
         await handlePurchaseIdentityWithSoulname?.(

src/components/masa-interface/pages/switch-chain/switch-chain.tsx

@@ -1,38 +1,24 @@
 import React, { useCallback, useMemo } from 'react';
 import { useMasa } from '../../../../provider';
 import { MasaLoading } from '../../../masa-loading';
-import { Network } from '../../../../helpers';
-import { getNetworkNameByChainId } from '../../../../helpers/networks';
+import { Network, SupportedNetworks } from '../../../../helpers';
 
 export const InterfaceSwitchChain = (): JSX.Element => {
-  const { isLoading, switchNetwork, network, SupportedNetworks, masa } =
-    useMasa();
+  const { isLoading, switchNetwork, forceNetwork } = useMasa();
 
-  const currentNetwork: Network | undefined = useMemo(() => {
-    if (SupportedNetworks && masa?.config.network)
-      for (const networkName in SupportedNetworks) {
-        if (
-          SupportedNetworks[networkName].chainName
-            ?.toLowerCase()
-            .includes(masa.config.network)
-        ) {
-          return SupportedNetworks[networkName];
-        }
-      }
+  const networkData: Network | undefined = useMemo(() => {
+    if (forceNetwork) {
+      return SupportedNetworks[forceNetwork];
+    }
 
-    return null;
-  }, [masa, SupportedNetworks]);
+    return;
+  }, [forceNetwork]);
 
   const handleSwitch = useCallback(() => {
-    if (network) {
-      switchNetwork?.(network);
+    if (networkData) {
+      switchNetwork?.(networkData.chainId);
     }
-  }, [switchNetwork, switchNetwork]);
-
-  const networkData = useMemo(
-    () => getNetworkNameByChainId(network ?? 0),
-    [network]
-  );
+  }, [switchNetwork, switchNetwork, networkData]);
 
   if (isLoading) return <MasaLoading />;
 
@@ -56,7 +42,7 @@ export const InterfaceSwitchChain = (): JSX.Element => {
         >
           Switch to{' '}
           <span style={{ textTransform: 'capitalize' }}>
-            {networkData}
+            {networkData?.chainName}
           </span>
         </button>
       </div>

src/provider/masa-context-provider.tsx

@@ -1,4 +1,4 @@
-import { EnvironmentName, Masa } from '@masa-finance/masa-sdk';
+import { EnvironmentName, Masa, NetworkName } from '@masa-finance/masa-sdk';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { createNewMasa, SupportedNetworks } from '../helpers';
 import {
@@ -33,7 +33,7 @@ export interface MasaContextProviderProps extends MasaShape {
   environmentName?: EnvironmentNameEx;
   arweaveConfig?: ArweaveConfig;
   verbose?: boolean;
-  network?: number
+  forceNetwork?: NetworkName;
 }
 
 export const MasaContextProvider = ({
@@ -51,7 +51,7 @@ export const MasaContextProvider = ({
   // verbose on /off
   verbose = false,
   // force network
-  network
+  forceNetwork,
 }: MasaContextProviderProps): JSX.Element => {
   // masa
   const [masaInstance, setMasaInstance] = useState<Masa | undefined>();
@@ -251,7 +251,7 @@ export const MasaContextProvider = ({
     currentNetwork,
     SupportedNetworks,
     switchNetwork,
-    network,
+    forceNetwork,
   };
 
   return (

src/provider/masa-shape.ts

@@ -103,5 +103,5 @@ export interface MasaShape {
   currentNetwork?: Network;
   SupportedNetworks?: Partial<{ [index in NetworkName]: Network }>;
   switchNetwork?: (chainId: number) => void;
-  network?: number
+  forceNetwork?: NetworkName;
 }

src/provider/modules/green/green.ts

@@ -71,7 +71,7 @@ export const useGreen = (
       phoneNumber: string,
       code: string
     ): Promise<VerifyGreenResult | undefined> => {
-      const response = await masa?.green.create(phoneNumber, code);
+      const response = await masa?.green.create('eth', phoneNumber, code);
       await queryClient.invalidateQueries(queryKey);
       return response;
     },

src/provider/modules/identity/identity.ts

@@ -62,9 +62,9 @@ export const useIdentity = (
       paymentMethod: PaymentMethod
     ) => {
       const result = await masa?.identity.createWithSoulName(
+        paymentMethod,
         soulname,
-        registrationPeriod,
-        paymentMethod
+        registrationPeriod
       );
       await queryClient.invalidateQueries('identity');
 

src/provider/modules/soulnames/soulnames.ts

@@ -50,9 +50,9 @@ export const useSoulnames = (
       paymentMethod: PaymentMethod
     ) => {
       const result = await masa?.soulName.create(
+        paymentMethod,
         soulname,
-        registrationPeriod,
-        paymentMethod
+        registrationPeriod
       );
       await queryClient.invalidateQueries('soulnames');