chore: PR changes

mrgnlabs · Dec 4, 2024 · 019a7c3 · 019a7c3
1 parent e6cc98c
commit 019a7c3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/apps/marginfi-v2-ui/src/context/MrgnlendProvider.tsx b/apps/marginfi-v2-ui/src/context/MrgnlendProvider.tsx
@@ -18,13 +18,20 @@ export const MrgnlendProvider: React.FC<{
   const debounceId = React.useRef<NodeJS.Timeout | null>(null);
   const { wallet, isOverride, connected } = useWallet();
   const { connection } = useConnection();
-  const [fetchMrgnlendState, setIsRefreshingStore, resetUserData, userDataFetched] = useMrgnlendStore((state) => [
+  const [fetchMrgnlendState, setIsRefreshingStore, resetUserData, marginfiAccounts] = useMrgnlendStore((state) => [
     state.fetchMrgnlendState,
     state.setIsRefreshingStore,
     state.resetUserData,
-    state.userDataFetched,
+
+    state.marginfiAccounts,
+  ]);
+  const [fetchPriorityFee, fetchAccountLabels] = useUiStore((state) => [
+    state.fetchPriorityFee,
+    state.fetchAccountLabels,
+    state.accountLabels,
   ]);
-  const [fetchPriorityFee] = useUiStore((state) => [state.fetchPriorityFee]);
+
+  const [hasFetchedAccountLabels, setHasFetchedAccountLabels] = React.useState(false);
 
   // identify user if logged in
   React.useEffect(() => {
@@ -98,5 +105,13 @@ export const MrgnlendProvider: React.FC<{
     }
   }, [connected, resetUserData]);
 
+  // Fetch account labels
+  React.useEffect(() => {
+    if (marginfiAccounts.length > 0 && !hasFetchedAccountLabels) {
+      setHasFetchedAccountLabels(true);
+      fetchAccountLabels(marginfiAccounts);
+    }
+  }, [marginfiAccounts, fetchAccountLabels, hasFetchedAccountLabels]);
+
   return <MrgnlendContext.Provider value={{}}>{children}</MrgnlendContext.Provider>;
 };
diff --git a/apps/marginfi-v2-ui/src/pages/_app.tsx b/apps/marginfi-v2-ui/src/pages/_app.tsx
@@ -47,12 +47,11 @@ const Footer = dynamic(async () => (await import("~/components/desktop/Footer"))
 type MrgnAppProps = { path: string };
 
 export default function MrgnApp({ Component, pageProps, path }: AppProps & MrgnAppProps) {
-  const [broadcastType, priorityFees, isOraclesStale, setIsFetchingData, fetchAccountLabels] = useUiStore((state) => [
+  const [broadcastType, priorityFees, isOraclesStale, setIsFetchingData] = useUiStore((state) => [
     state.broadcastType,
     state.priorityFees,
     state.isOraclesStale,
     state.setIsFetchingData,
-    state.fetchAccountLabels,
   ]);
   const [
     isMrgnlendStoreInitialized,
@@ -62,7 +61,6 @@ export default function MrgnApp({ Component, pageProps, path }: AppProps & MrgnA
     extendedBankInfos,
     nativeSolBalance,
     accountSummary,
-    marginfiAccounts,
   ] = useMrgnlendStore((state) => [
     state.initialized,
     state.isRefreshingStore,
@@ -71,13 +69,11 @@ export default function MrgnApp({ Component, pageProps, path }: AppProps & MrgnA
     state.extendedBankInfos,
     state.nativeSolBalance,
     state.accountSummary,
-    state.marginfiAccounts,
   ]);
 
   const { query, isReady } = useRouter();
   const [ready, setReady] = React.useState(false);
   const [rpcEndpoint, setRpcEndpoint] = React.useState("");
-  const [hasFetchedAccountLabels, setHasFetchedAccountLabels] = React.useState(false);
 
   React.useEffect(() => {
     const isFetchingData = isRefreshingMrgnlendStore;
@@ -95,13 +91,6 @@ export default function MrgnApp({ Component, pageProps, path }: AppProps & MrgnA
     init();
   }, []);
 
-  React.useEffect(() => {
-    if (marginfiAccounts.length > 0 && !hasFetchedAccountLabels) {
-      setHasFetchedAccountLabels(true);
-      fetchAccountLabels(marginfiAccounts);
-    }
-  }, [marginfiAccounts, fetchAccountLabels, hasFetchedAccountLabels]);
-
   return (
     <>
       <Meta path={path} />

diff --git a/...mrgn-ui/src/components/wallet-v2/components/wallet-auth-accounts/wallet-auth-accounts.tsx b/...mrgn-ui/src/components/wallet-v2/components/wallet-auth-accounts/wallet-auth-accounts.tsx
@@ -313,7 +313,7 @@ export const WalletAuthAccounts = ({
                           onClick={(e) => {
                             e.stopPropagation();
                             setEditingAccount(account);
-                            setEditingAccountName(accountLabels?.[account.address.toBase58()] || "");
+                            setEditingAccountName(accountLabel);
                             setWalletAuthAccountsState(WalletAuthAccountsState.EDIT_ACCOUNT);
                           }}
                         >