Remove accounts'batches from the store on accounts removal

trilitech · Mar 14, 2024 · 0c56a09 · 0c56a09
1 parent c4d8c1c
commit 0c56a09
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/src/utils/hooks/removeAccountDataHooks.test.ts b/src/utils/hooks/removeAccountDataHooks.test.ts
@@ -5,7 +5,7 @@ import { accountsSlice } from "../redux/slices/accountsSlice";
 import { store } from "../redux/store";
 
 describe("useRemoveAccount", () => {
-  test("deletes relevant data from accounts slice", () => {
+  test("deletes secret key on deleting secret key account", () => {
     const account = mockSecretKeyAccount(0);
     store.dispatch(accountsSlice.actions.addAccount(account));
     store.dispatch(

diff --git a/src/utils/hooks/removeAccountDataHooks.ts b/src/utils/hooks/removeAccountDataHooks.ts
@@ -1,6 +1,14 @@
-import { AccountType, LedgerAccount, SecretKeyAccount, SocialAccount } from "../../types/Account";
+import { useGetAccountsByFingerPrint, useGetAccountsByType } from "./getAccountDataHooks";
+import {
+  Account,
+  AccountType,
+  LedgerAccount,
+  SecretKeyAccount,
+  SocialAccount,
+} from "../../types/Account";
 import { useAppDispatch } from "../redux/hooks";
 import { accountsSlice } from "../redux/slices/accountsSlice";
+import { batchesSlice } from "../redux/slices/batches";
 
 const { removeMnemonicAndAccounts, removeNonMnemonicAccounts } = accountsSlice.actions;
 
@@ -9,7 +17,12 @@ const { removeMnemonicAndAccounts, removeNonMnemonicAccounts } = accountsSlice.a
  */
 export const useRemoveMnemonic = () => {
   const dispatch = useAppDispatch();
+  const getAccountsByFingerPrint = useGetAccountsByFingerPrint();
+  const removeAccountsDependencies = useRemoveAccountsDependencies();
+
   return (fingerPrint: string) => {
+    removeAccountsDependencies(getAccountsByFingerPrint(fingerPrint));
+
     dispatch(
       removeMnemonicAndAccounts({
         fingerPrint,
@@ -23,7 +36,12 @@ export const useRemoveMnemonic = () => {
  */
 export const useRemoveNonMnemonic = () => {
   const dispatch = useAppDispatch();
+  const getAccountsByType = useGetAccountsByType();
+  const removeAccountsDependencies = useRemoveAccountsDependencies();
+
   return (accountType: AccountType) => {
+    removeAccountsDependencies(getAccountsByType(accountType));
+
     dispatch(
       removeNonMnemonicAccounts({
         accountType,
@@ -37,8 +55,22 @@ export const useRemoveNonMnemonic = () => {
  */
 export const useRemoveAccount = () => {
   const dispatch = useAppDispatch();
+  const removeAccountsDependencies = useRemoveAccountsDependencies();
 
   return (account: SocialAccount | LedgerAccount | SecretKeyAccount) => {
+    removeAccountsDependencies([account]);
     dispatch(accountsSlice.actions.removeAccount(account));
   };
 };
+
+/**
+ * Hook for removing all stored accounts' dependencies.
+ */
+const useRemoveAccountsDependencies = () => {
+  const dispatch = useAppDispatch();
+
+  return (accounts: Account[]) => {
+    const pkhs = accounts.map(account => account.address.pkh);
+    dispatch(batchesSlice.actions.removeByAccounts({ pkhs }));
+  };
+};