fix: correct count logic for keyring.accounts

RabbyHub · Dec 2, 2024 · a6b1912 · a6b1912
1 parent 08e448e
commit a6b1912
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/apps/mobile/src/core/apis/lock.ts b/apps/mobile/src/core/apis/lock.ts
@@ -136,7 +136,7 @@ export async function shouldAskSetPassword() {
 
   if (!lockInfo.isUseCustomPwd) return true;
 
-  return keyringService.getCountOfAccountsInKeyring() === 0;
+  return (await keyringService.getCountOfAccountsInKeyring()) === 0;
 }
 
 export async function resetPasswordOnUI(newPassword: string) {
@@ -145,7 +145,7 @@ export async function resetPasswordOnUI(newPassword: string) {
 
   try {
     const hasAccountsInKeyring =
-      keyringService.getCountOfAccountsInKeyring() > 0;
+      (await keyringService.getCountOfAccountsInKeyring()) > 0;
 
     if (hasAccountsInKeyring) {
       const lockInfo = await getRabbyLockInfo();

diff --git a/packages/service-keyring/src/keyringService.ts b/packages/service-keyring/src/keyringService.ts
@@ -159,12 +159,9 @@ export class KeyringService extends RNEventEmitter {
   //   );
   // }
 
-  // TODO: should we refactor it with `.getAllVisibleAccountsArray`?
-  getCountOfAccountsInKeyring() {
-    return this.keyrings.reduce((accu, kr) => {
-      // !!!notice: kr.accounts maybe undefined!!!
-      return accu + (kr.accounts || []).length;
-    }, 0);
+  async getCountOfAccountsInKeyring() {
+    const accus = await this.getAllTypedVisibleAccounts();
+    return accus.length;
   }
 
   /**
@@ -173,7 +170,7 @@ export class KeyringService extends RNEventEmitter {
    * @param newPassword
    */
   async resetPassword(newPassword: string) {
-    if (this.getCountOfAccountsInKeyring()) {
+    if (await this.getCountOfAccountsInKeyring()) {
       throw new Error("You're trying to overwrite password on existing keyrings.");
     }