From 233efbe7003a8e5553b709b9177e980beb4f0779 Mon Sep 17 00:00:00 2001
From: simodrws <siamend@keyko.io>
Date: Fri, 9 Jun 2023 15:01:19 +0200
Subject: [PATCH] feat: more cleanup, masa client work

---
 .../masa-client/masa-client-provider.tsx        |  5 ++---
 src/refactor/masa-client/masa-client.ts         | 10 +++++++++-
 .../masa-client/masa-state-provider.tsx         | 17 -----------------
 src/refactor/masa-client/use-masa-sdk.ts        |  2 +-
 4 files changed, 12 insertions(+), 22 deletions(-)
 delete mode 100644 src/refactor/masa-client/masa-state-provider.tsx

diff --git a/src/refactor/masa-client/masa-client-provider.tsx b/src/refactor/masa-client/masa-client-provider.tsx
index b3163f54..0b67306e 100644
--- a/src/refactor/masa-client/masa-client-provider.tsx
+++ b/src/refactor/masa-client/masa-client-provider.tsx
@@ -1,15 +1,14 @@
 import React, { ReactNode, createContext, useContext, useMemo } from 'react';
-import type { Masa } from '@masa-finance/masa-sdk';
 import { useMasaClient } from './masa-client';
 
 export interface MasaClientProviderValue {
-  masa?: Masa;
+  masa?: ReturnType<typeof useMasaClient>['sdk'];
 }
 
 export const MasaClientContext = createContext({} as MasaClientProviderValue);
 
 export const MasaClientProvider = ({ children }: { children: ReactNode }) => {
-  const masa = useMasaClient();
+  const { sdk: masa } = useMasaClient();
 
   const masaClientProviderValue = useMemo(
     () => ({
diff --git a/src/refactor/masa-client/masa-client.ts b/src/refactor/masa-client/masa-client.ts
index edbb362e..5daea489 100644
--- a/src/refactor/masa-client/masa-client.ts
+++ b/src/refactor/masa-client/masa-client.ts
@@ -1,5 +1,6 @@
 import type { Signer } from 'ethers';
 import type { NetworkName } from '@masa-finance/masa-sdk';
+import { useMemo } from 'react';
 import { useConfig } from '../base-provider';
 import { useWallet } from '../wallet-client/wallet/use-wallet';
 import { useMasaSDK } from './use-masa-sdk';
@@ -30,5 +31,12 @@ export const useMasaClient = () => {
     ]
   );
 
-  return masa;
+  const masaClient = useMemo(
+    () => ({
+      sdk: masa,
+    }),
+    [masa]
+  );
+
+  return masaClient;
 };
diff --git a/src/refactor/masa-client/masa-state-provider.tsx b/src/refactor/masa-client/masa-state-provider.tsx
deleted file mode 100644
index eadc89d7..00000000
--- a/src/refactor/masa-client/masa-state-provider.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React, { ReactNode, createContext, useContext, useMemo } from 'react';
-
-export interface MasaProviderValue {}
-
-export const MasaContext = createContext({} as MasaProviderValue);
-
-export const MasaProvider = ({ children }: { children: ReactNode }) => {
-  const MasaProviderValue = useMemo(() => ({}), []);
-  return (
-    <MasaContext.Provider value={MasaProviderValue}>
-      {children}
-    </MasaContext.Provider>
-  );
-};
-
-export const useMasa = (): MasaProviderValue => useContext(MasaContext);
-export default MasaProvider;
diff --git a/src/refactor/masa-client/use-masa-sdk.ts b/src/refactor/masa-client/use-masa-sdk.ts
index 535afa74..c4d429e4 100644
--- a/src/refactor/masa-client/use-masa-sdk.ts
+++ b/src/refactor/masa-client/use-masa-sdk.ts
@@ -59,7 +59,7 @@ export const useMasaSDK = (
     let contractOverrides: Partial<IIdentityContracts> | undefined;
 
     if (contractAddressOverrides) {
-      if (verbose) console.log({ contractAddressOverrides });
+      if (verbose) console.log('DEBUG:', { contractAddressOverrides });
 
       contractOverrides = {} as Partial<IIdentityContracts>;
       contractOverrides.SoulStoreContract = SoulStore__factory.connect(