Fix walletStore re-encryption when record is unchanged

Author: everdimension

src/background/Wallet/Wallet.ts

@@ -306,8 +306,10 @@ export class Wallet {
       newCredentials,
     });
     this.userCredentials = newCredentials;
-    // TODO: we need "updateWalletStore" to re-encrypt the record even if it's not changed
-    await this.updateWalletStore(this.record);
+
+    const { encryptionKey } = this.userCredentials;
+    await this.walletStore.encryptAndSave(this.id, encryptionKey, this.record);
+
     this.setExpirationForSeedPhraseEncryptionKey(1000 * 120);
   }
 

src/background/Wallet/persistence.ts

@@ -41,10 +41,12 @@ export class WalletStore extends PersistentStore<WalletStoreState> {
     return this.lastRecord;
   }
 
-  async save(id: string, encryptionKey: string, record: WalletRecord) {
-    if (this.lastRecord === record) {
-      return;
-    }
+  /** Prefer WalletStore['save'] unless necessary */
+  async encryptAndSave(
+    id: string,
+    encryptionKey: string,
+    record: WalletRecord
+  ) {
     const encryptedRecord = await Model.encryptRecord(encryptionKey, record);
     this.setState((state) =>
       produce(state, (draft) => {
@@ -54,6 +56,13 @@ export class WalletStore extends PersistentStore<WalletStoreState> {
     this.lastRecord = record;
   }
 
+  async save(id: string, encryptionKey: string, record: WalletRecord) {
+    if (this.lastRecord === record) {
+      return;
+    }
+    await this.encryptAndSave(id, encryptionKey, record);
+  }
+
   deleteMany(keys: string[]) {
     this.setState((state) =>
       produce(state, (draft) => {