Merge pull request #1083 from input-output-hk/fix/wallet-manager-deactivate-emit-persist

fix(web-extension): delete active wallet from storage and emit null

Author: mkazlauskas

packages/web-extension/src/walletManager/walletManager.ts

@@ -160,6 +160,8 @@ export class WalletManager<WalletMetadata extends { name: string }, AccountMetad
   /** Deactivate wallet. Wallet observable properties will emit only after a new wallet is {@link activate}ed. */
   async deactivate(): Promise<void> {
     this.#deactivateWallet();
+    await this.#managerStorage.remove(this.#managerStorageKey);
+    this.activeWalletId$.next(null);
   }
 
   /** Deactivates the active. */

packages/web-extension/test/walletManager/walletManager.test.ts

@@ -16,7 +16,7 @@ import { HexBlob, InvalidArgumentError, isNotNil } from '@cardano-sdk/util';
 import { MinimalRuntime } from '../../src/messaging';
 import { ObservableWallet, storage } from '@cardano-sdk/wallet';
 import { Storage } from 'webextension-polyfill';
-import { TimeoutError, filter, firstValueFrom, from, timeout } from 'rxjs';
+import { TimeoutError, filter, firstValueFrom, from, skip, timeout } from 'rxjs';
 import { logger } from '@cardano-sdk/util-dev';
 import pick from 'lodash/pick';
 
@@ -33,6 +33,7 @@ jest.mock('../../src/messaging', () => {
 const createInMemoryStorage = () => {
   const store: Record<string, any> = {};
   return {
+    clear: jest.fn(),
     get: async (keyOrKeys) =>
       typeof keyOrKeys === 'object'
         ? Array.isArray(keyOrKeys)
@@ -41,6 +42,15 @@ const createInMemoryStorage = () => {
         : keyOrKeys
         ? pick(store, keyOrKeys)
         : {},
+    remove: jest.fn(async (keyOrKeys) => {
+      if (Array.isArray(keyOrKeys)) {
+        for (const key of keyOrKeys) {
+          delete store[key];
+        }
+      } else {
+        delete store[keyOrKeys];
+      }
+    }),
     set: async (items) => {
       Object.assign(store, items);
     }
@@ -230,6 +240,17 @@ describe('WalletManager', () => {
     });
   });
 
+  describe('deactivate', () => {
+    it('deletes lastActivateProps from storage and emits null from activeWalletId$', async () => {
+      walletManager = await createWalletManager();
+      await walletManager.activate({ accountIndex: 0, chainId, walletId });
+      const activeWalletId = firstValueFrom(walletManager.activeWallet$.pipe(skip(1)));
+      await walletManager.deactivate();
+      expect(managerStorage.remove).toBeCalledTimes(1);
+      await expect(activeWalletId).resolves.toBeNull();
+    });
+  });
+
   describe('initialize', () => {
     it('does nothing before wallet is activated for the 1st time', async () => {
       await walletManager.initialize();