refactor interface to remove network name, it's not required we detec…

…t this based on the provider
masa-finance · Feb 24, 2023 · 196f421 · 196f421
1 parent 122f6a3
commit 196f421
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 23 deletions.
diff --git a/src/provider/masa-context-provider.tsx b/src/provider/masa-context-provider.tsx
@@ -1,4 +1,4 @@
-import { EnvironmentName, Masa, NetworkName } from '@masa-finance/masa-sdk';
+import { EnvironmentName, Masa } from '@masa-finance/masa-sdk';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { createNewMasa, SupportedNetworks } from '../helpers';
 import {
@@ -27,23 +27,27 @@ export type EnvironmentNameEx = EnvironmentName & ('local' | 'stage');
 export interface MasaContextProviderProps extends MasaShape {
   children: React.ReactNode;
   company?: string;
-  environmentName?: EnvironmentNameEx;
-  signer?: Wallet | Signer;
   noWallet?: boolean;
+  signer?: Wallet | Signer;
+  environmentName?: EnvironmentNameEx;
   arweaveConfig?: ArweaveConfig;
   verbose?: boolean;
-  networkName?: NetworkName;
 }
 
 export const MasaContextProvider = ({
   children,
+  // masa-react branding
   company,
-  environmentName = 'dev' as EnvironmentNameEx,
-  verbose = false,
-  signer,
+  // use no wallet
   noWallet,
+  // signer used in masa instance
+  signer,
+  // env used in masa instance
+  environmentName = 'dev' as EnvironmentNameEx,
+  // arweave config used in masa instance
   arweaveConfig,
-  networkName,
+  // verbose on /off
+  verbose = false,
 }: MasaContextProviderProps): JSX.Element => {
   // masa
   const [masaInstance, setMasaInstance] = useState<Masa | undefined>();
@@ -67,7 +71,7 @@ export const MasaContextProvider = ({
 
   // modal
   const { isModalOpen, setModalOpen, setModalCallback, closeModal } = useModal(
-    networkName,
+    masaInstance,
     isLoggedIn,
     isConnected,
     network
@@ -220,7 +224,6 @@ export const MasaContextProvider = ({
     reloadGreens,
 
     // network
-    networkName,
     network,
     SupportedNetworks,
     switchNetwork,

diff --git a/src/provider/masa-shape.ts b/src/provider/masa-shape.ts
@@ -90,7 +90,6 @@ export interface MasaShape {
   reloadGreens?: () => void;
 
   // network
-  networkName?: NetworkName;
   network?: ethers.providers.Network;
   SupportedNetworks?: Partial<{ [index in NetworkName]: Network }>;
   switchNetwork?: (chainId: number) => void;

diff --git a/src/provider/modules/modal/modal.ts b/src/provider/modules/modal/modal.ts
@@ -1,9 +1,9 @@
 import { useCallback, useState } from 'react';
-import { NetworkName } from '@masa-finance/masa-sdk';
 import { providers } from 'ethers';
+import { Masa } from '@masa-finance/masa-sdk';
 
 export const useModal = (
-  networkName?: NetworkName,
+  masa?: Masa,
   isLoggedIn?: boolean,
   isConnected?: boolean,
   network?: providers.Network
@@ -22,18 +22,13 @@ export const useModal = (
       modalCallback &&
       isLoggedIn &&
       isConnected &&
-      (networkName ? !network?.name.includes(networkName) : true)
+      (masa?.config.network
+        ? !network?.name.includes(masa.config.network)
+        : true)
     ) {
       modalCallback();
     }
-  }, [
-    modalCallback,
-    setModalOpen,
-    isLoggedIn,
-    isConnected,
-    network,
-    networkName,
-  ]);
+  }, [modalCallback, setModalOpen, isLoggedIn, isConnected, network, masa]);
 
   return {
     isModalOpen,

diff --git a/stories/masa.stories.tsx b/stories/masa.stories.tsx
@@ -71,7 +71,7 @@ const Component = (): JSX.Element => {
 const Template: Story = (props: Args) => {
   return (
     <>
-      <MasaProvider company="Masa" networkName="goerli">
+      <MasaProvider company="Masa">
         <Component {...props} />
       </MasaProvider>
     </>