fix: account id update issue (#277)

Synthetixio · May 22, 2024 · 3285fb9 · 3285fb9
1 parent 57ed912
commit 3285fb9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/liquidity/components/AccountsSelector/AccountsSelector.tsx b/liquidity/components/AccountsSelector/AccountsSelector.tsx
@@ -64,7 +64,6 @@ export function AccountsSelectorUi({
 
   return (
     <>
-      {/* // Temporarily disable account selector menu */}
       <Menu>
         {isLoading ? (
           <Skeleton startColor="whiteAlpha.500" endColor="whiteAlpha.200">

diff --git a/liquidity/ui/src/layouts/Default/NetworkController.tsx b/liquidity/ui/src/layouts/Default/NetworkController.tsx
@@ -26,13 +26,28 @@ export function NetworkController() {
   const [toolTipLabel, setTooltipLabel] = useState('Copy');
   const { activeWallet, walletsInfo, connect, disconnect } = useWallet();
   const { network: activeNetwork, setNetwork } = useNetwork();
-  const { data: accounts } = useAccounts();
+  const {
+    data: accounts,
+    isLoading: isAccountsLoading,
+    isFetching: isAccountsFetching,
+  } = useAccounts();
   const { mutation } = useCreateAccount();
   const [showTestnets, setShowTestnets] = useLocalStorage(LOCAL_STORAGE_KEYS.SHOW_TESTNETS, false);
   const [queryParams] = useSearchParams();
   const navigate = useNavigate();
   const { pathname } = useLocation();
 
+  useEffect(() => {
+    if (!isAccountsLoading && !isAccountsFetching && accounts) {
+      const accountId = queryParams.get('accountId');
+
+      if (accountId && !accounts?.includes(accountId)) {
+        queryParams.set('accountId', accounts[0]);
+        navigate({ pathname, search: accounts[0] ? queryParams.toString() : '' });
+      }
+    }
+  }, [accounts, isAccountsLoading, isAccountsFetching, queryParams, navigate, pathname]);
+
   useEffect(() => {
     // Check if wallet preference is stored in local storage
     if (!walletsInfo) {