Merge branch 'feat/unencrypted' into tmp/20250103

RabbyHub · Jan 2, 2025 · d365951 · d365951
2 parents a20ce55 + bf1535f
commit d365951
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/background/index.ts b/src/background/index.ts
@@ -242,6 +242,20 @@ restoreAppState();
   );
 }
 
+keyringService.on('resetPassword', async () => {
+  const gasAccount = gasAccountService.getGasAccountData() as GasAccountServiceStore;
+
+  if (
+    gasAccount?.account?.type === KEYRING_TYPE.SimpleKeyring ||
+    gasAccount?.account?.type === KEYRING_TYPE.HdKeyring
+  ) {
+    gasAccountService.setGasAccountSig();
+    eventBus.emit(EVENTS.broadcastToUI, {
+      method: EVENTS.GAS_ACCOUNT.LOG_OUT,
+    });
+  }
+});
+
 // for page provider
 browser.runtime.onConnect.addListener((port) => {
   if (

diff --git a/src/background/service/keyring/index.ts b/src/background/service/keyring/index.ts
@@ -1307,6 +1307,7 @@ export class KeyringService extends EventEmitter {
 
     this.store.updateState({ vault, booted, hasEncryptedKeyringData: false });
 
+    this.emit('resetPassword');
     // lock wallet
     this.setLocked();
   }