From 08d7e598760050d314bf29b3737b2a890be413da Mon Sep 17 00:00:00 2001
From: Kris Urbas <605420+krzysu@users.noreply.github.com>
Date: Thu, 27 Jul 2023 11:14:34 +0200
Subject: [PATCH] code review 2

---
 packages/react-web/src/inbox/useXmtpClient.ts       |  8 ++++----
 packages/react/src/experimental/index.ts            |  3 +--
 ...etController.ts => useActiveWalletInteractor.ts} |  2 +-
 .../react/src/experimental/useEnvironmentConfig.ts  | 13 -------------
 packages/react/src/profile/useProfile.ts            |  6 +++---
 packages/react/src/profile/useProfiles.ts           |  6 +++---
 6 files changed, 12 insertions(+), 26 deletions(-)
 rename packages/react/src/experimental/{useActiveWalletController.ts => useActiveWalletInteractor.ts} (82%)
 delete mode 100644 packages/react/src/experimental/useEnvironmentConfig.ts

diff --git a/packages/react-web/src/inbox/useXmtpClient.ts b/packages/react-web/src/inbox/useXmtpClient.ts
index 00b74e9bba..2bccb1f7b1 100644
--- a/packages/react-web/src/inbox/useXmtpClient.ts
+++ b/packages/react-web/src/inbox/useXmtpClient.ts
@@ -2,7 +2,7 @@ import {
   PendingSigningRequestError,
   UserRejectedError,
   WalletConnectionError,
-  useActiveWalletController,
+  useActiveWalletInteractor,
   useInboxKeyStorage,
 } from '@lens-protocol/react';
 import { assertError } from '@lens-protocol/shared-kernel';
@@ -57,7 +57,7 @@ export function useXmtpClient(): UseXmtpClientResult {
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState<UseXmtpClientResult['error']>();
 
-  const activeWalletController = useActiveWalletController();
+  const activeWallet = useActiveWalletInteractor();
   const storage = useInboxKeyStorage();
 
   const initializeWithLens = useCallback(
@@ -67,7 +67,7 @@ export function useXmtpClient(): UseXmtpClientResult {
 
       try {
         const existingKeys = await loadKeys(storage);
-        const signer = new SignerAdapter(activeWalletController);
+        const signer = new SignerAdapter(activeWallet);
 
         if (existingKeys) {
           const newClient = await initialize({
@@ -97,7 +97,7 @@ export function useXmtpClient(): UseXmtpClientResult {
         setIsLoading(false);
       }
     },
-    [activeWalletController, initialize, storage],
+    [activeWallet, initialize, storage],
   );
 
   return {
diff --git a/packages/react/src/experimental/index.ts b/packages/react/src/experimental/index.ts
index 32f12cef7b..c7d5dfa542 100644
--- a/packages/react/src/experimental/index.ts
+++ b/packages/react/src/experimental/index.ts
@@ -1,4 +1,3 @@
-export * from './useActiveWalletController';
+export * from './useActiveWalletInteractor';
 export * from './useApolloClient';
-export * from './useEnvironmentConfig';
 export * from './useInboxKeyStorage';
diff --git a/packages/react/src/experimental/useActiveWalletController.ts b/packages/react/src/experimental/useActiveWalletInteractor.ts
similarity index 82%
rename from packages/react/src/experimental/useActiveWalletController.ts
rename to packages/react/src/experimental/useActiveWalletInteractor.ts
index 74825a8eed..76e5a5005f 100644
--- a/packages/react/src/experimental/useActiveWalletController.ts
+++ b/packages/react/src/experimental/useActiveWalletInteractor.ts
@@ -7,7 +7,7 @@ import { useSharedDependencies } from '../shared';
  *
  * @internal
  */
-export function useActiveWalletController(): ActiveWallet {
+export function useActiveWalletInteractor(): ActiveWallet {
   const { activeWallet } = useSharedDependencies();
 
   return activeWallet;
diff --git a/packages/react/src/experimental/useEnvironmentConfig.ts b/packages/react/src/experimental/useEnvironmentConfig.ts
deleted file mode 100644
index 003e7f6f83..0000000000
--- a/packages/react/src/experimental/useEnvironmentConfig.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { EnvironmentConfig } from '../environments';
-import { useSharedDependencies } from '../shared';
-
-/**
- * Returns the internal {@link EnvironmentConfig}.
- *
- * @internal
- */
-export function useEnvironmentConfig(): EnvironmentConfig {
-  const { environment } = useSharedDependencies();
-
-  return environment;
-}
diff --git a/packages/react/src/profile/useProfile.ts b/packages/react/src/profile/useProfile.ts
index 0022ab9d09..5b28b93b98 100644
--- a/packages/react/src/profile/useProfile.ts
+++ b/packages/react/src/profile/useProfile.ts
@@ -47,8 +47,8 @@ export function useProfile({
   );
 
   const { data, error, loading } = useReadResult(
-    useGetProfile({
-      ...useLensApolloClient(
+    useGetProfile(
+      useLensApolloClient(
         useActiveProfileAsDefaultObserver({
           variables: useMediaTransformFromConfig(
             useSourcesFromConfig({
@@ -59,7 +59,7 @@ export function useProfile({
           skip,
         }),
       ),
-    }),
+    ),
   );
 
   if (loading) {
diff --git a/packages/react/src/profile/useProfiles.ts b/packages/react/src/profile/useProfiles.ts
index 44d2d9005e..78f090b210 100644
--- a/packages/react/src/profile/useProfiles.ts
+++ b/packages/react/src/profile/useProfiles.ts
@@ -99,8 +99,8 @@ export function useProfiles({
   );
 
   return usePaginatedReadResult(
-    useGetAllProfiles({
-      ...useLensApolloClient(
+    useGetAllProfiles(
+      useLensApolloClient(
         useActiveProfileAsDefaultObserver({
           variables: useMediaTransformFromConfig(
             useSourcesFromConfig({ byHandles, byProfileIds, limit, observerId }),
@@ -108,6 +108,6 @@ export function useProfiles({
           skip,
         }),
       ),
-    }),
+    ),
   );
 }