refactor: simplify wallet options

tien · Jun 22, 2024 · 9492c24 · 9492c24
1 parent d54486c
commit 9492c24
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 26 deletions.
diff --git a/packages/core/src/wallets/aggregator/injected.ts b/packages/core/src/wallets/aggregator/injected.ts
@@ -1,16 +1,16 @@
-import type { KeyedStorage } from "../../storage.js";
 import InjectedWallet from "../injected.js";
+import type { WalletOptions } from "../wallet.js";
 import WalletAggregator from "./aggregator.js";
 import { getInjectedExtensions } from "polkadot-api/pjs-signer";
 import { BehaviorSubject } from "rxjs";
 import { map } from "rxjs/operators";
 
 export default class InjectedWalletAggregator extends WalletAggregator {
-  #storage: KeyedStorage | undefined;
+  #walletOptions: WalletOptions | undefined;
 
-  constructor(options?: { storage?: KeyedStorage }) {
+  constructor(options?: WalletOptions) {
     super();
-    this.#storage = options?.storage;
+    this.#walletOptions = options;
   }
 
   readonly #walletMap$ = new BehaviorSubject(new Map<string, InjectedWallet>());
@@ -26,15 +26,7 @@ export default class InjectedWalletAggregator extends WalletAggregator {
 
     for (const name of injectedNames) {
       if (!current.has(name)) {
-        current.set(
-          name,
-          new InjectedWallet(
-            name,
-            this.#storage === undefined
-              ? undefined
-              : { storage: this.#storage },
-          ),
-        );
+        current.set(name, new InjectedWallet(name, this.#walletOptions));
       }
     }
 

diff --git a/packages/core/src/wallets/injected.ts b/packages/core/src/wallets/injected.ts
@@ -1,6 +1,5 @@
 import { ReDotError } from "../errors.js";
-import type { KeyedStorage } from "../storage.js";
-import Wallet from "./wallet.js";
+import Wallet, { type WalletOptions } from "./wallet.js";
 import {
   connectInjectedExtension,
   type InjectedExtension,
@@ -20,13 +19,9 @@ export default class InjectedWallet extends Wallet {
 
   constructor(
     public readonly name: string,
-    options?: { storage?: KeyedStorage },
+    options?: WalletOptions,
   ) {
-    super();
-
-    if (options?.storage !== undefined) {
-      this.storage = options?.storage;
-    }
+    super(options);
   }
 
   override readonly initialize = async () => {

diff --git a/packages/core/src/wallets/wallet-connect/index.ts b/packages/core/src/wallets/wallet-connect/index.ts
@@ -44,7 +44,7 @@ export default class WalletConnect extends DeepLinkWallet {
     chainIds: string[];
     optionalChainIds?: string[];
   }) {
-    super();
+    super(undefined);
 
     this.#providerOptions =
       options.projectId === undefined

diff --git a/packages/core/src/wallets/wallet.ts b/packages/core/src/wallets/wallet.ts
@@ -2,15 +2,25 @@ import { KeyedStorage } from "../storage.js";
 import type { InjectedPolkadotAccount } from "polkadot-api/pjs-signer";
 import type { Observable } from "rxjs";
 
+export type WalletOptions = {
+  storage?: KeyedStorage | undefined;
+};
+
 export default abstract class Wallet {
   abstract readonly id: string;
 
   abstract readonly name: string;
 
-  protected storage = new KeyedStorage({
-    key: "@reactive-dot",
-    storage: globalThis.localStorage,
-  });
+  protected readonly storage: KeyedStorage;
+
+  constructor(options: WalletOptions | undefined) {
+    this.storage =
+      options?.storage ??
+      new KeyedStorage({
+        key: "@reactive-dot",
+        storage: globalThis.localStorage,
+      });
+  }
 
   abstract readonly initialize: () => void | Promise<void>;