fix: update selectable accounts (#593)

onbloc · Sep 26, 2024 · 6c5ca2f · 6c5ca2f
1 parent 65b2f8d
commit 6c5ca2f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/packages/adena-extension/src/hooks/web/use-account-import-screen.ts b/packages/adena-extension/src/hooks/web/use-account-import-screen.ts
@@ -243,8 +243,9 @@ const useAccountImportScreen = ({ wallet }: { wallet: Wallet }): UseAccountImpor
 
   const loadAccountsByKeyring = async (keyring: Keyring): Promise<void> => {
     setIsLoadingAccounts(true);
+    const filteredAccounts = loadedAccounts.filter((account) => account.keyringId === keyring.id);
     await waitForRun(async () => {
-      const startIndex = loadedAccounts.length;
+      const startIndex = filteredAccounts.length;
       const range = Array.from({ length: 5 }, (_, index) => index + startIndex);
 
       const accounts: Account[] = [];
@@ -255,8 +256,9 @@ const useAccountImportScreen = ({ wallet }: { wallet: Wallet }): UseAccountImpor
 
       return accounts;
     }).then((accounts) => {
+      const currentAccounts = [...filteredAccounts, ...accounts];
       setIsLoadingAccounts(false);
-      setLoadedAccounts([...loadedAccounts, ...accounts]);
+      setLoadedAccounts(currentAccounts);
     });
   };
 

diff --git a/packages/adena-extension/src/pages/web/account-import-screen/select-account-step.tsx b/packages/adena-extension/src/pages/web/account-import-screen/select-account-step.tsx
@@ -32,7 +32,7 @@ const SelectAccountStep = ({
   } = useAccountImportScreenReturn;
 
   const { data: accountInfos = [] } = useQuery<AccountInfo[]>(
-    ['accountImportSelectAccounts', loadedAccounts.length],
+    ['accountImportSelectAccounts', loadedAccounts],
     async () => {
       const accountInfos: AccountInfo[] = [];
       for (const account of loadedAccounts) {