feat: upgrade shouldRedirectToSetPasswordBefore2024.

RabbyHub · Dec 2, 2024 · 4e3abf2 · 4e3abf2
1 parent 6592cd3
commit 4e3abf2
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 19 deletions.
diff --git a/apps/mobile/src/components/AddAddressSelectMethod/index.tsx b/apps/mobile/src/components/AddAddressSelectMethod/index.tsx
@@ -11,10 +11,13 @@ import { useTheme2024 } from '@/hooks/theme';
 import { createGetStyles2024 } from '@/utils/styles';
 import { ListItem } from '@/components2024/ListItem/ListItem';
 import { trigger } from 'react-native-haptic-feedback';
+import { useSetPasswordFirst } from '@/hooks/useLock';
 
 interface Props {
   onDone: (isNoMnemonic?: boolean) => void;
-  shouldRedirectToSetPasswordBefore2024: any;
+  shouldRedirectToSetPasswordBefore2024: ReturnType<
+    typeof useSetPasswordFirst
+  >['shouldRedirectToSetPasswordBefore2024'];
   navigateTo: (screen: AppRootName, params?: object) => void;
 }
 
@@ -30,14 +33,14 @@ export const AddAddressSelectMethod: React.FC<Props> = ({
     <NormalScreenContainer overwriteStyle={styles.wrapper}>
       <View style={styles.section}>
         <ListItem
-          onPress={() => {
+          onPress={async () => {
             trigger('impactLight', {
               enableVibrateFallback: true,
               ignoreAndroidSystemSettings: false,
             });
 
             if (
-              shouldRedirectToSetPasswordBefore2024({
+              await shouldRedirectToSetPasswordBefore2024({
                 backScreen: RootNames.CreateSelectMethod,
               })
             ) {

diff --git a/apps/mobile/src/core/apis/account.ts b/apps/mobile/src/core/apis/account.ts
@@ -8,8 +8,6 @@ import { IDisplayedAccountWithBalance } from '@/hooks/accountToDisplay';
 import { TotalBalanceResponse } from '@rabby-wallet/rabby-api/dist/types';
 import { getAddressCacheBalance } from './balance';
 import { requestKeyring } from './keyring';
-import { CHAINS_ENUM } from '@/constant/chains';
-import { apiAccount } from '.';
 
 function ensureDisplayKeyring(keyring: KeyringIntf | DisplayKeyring) {
   if (keyring instanceof DisplayKeyring) {

diff --git a/apps/mobile/src/core/apis/lock.ts b/apps/mobile/src/core/apis/lock.ts
@@ -131,6 +131,14 @@ export async function updateWalletPassword(
   return result;
 }
 
+export async function shouldAskSetPassword() {
+  const lockInfo = await getRabbyLockInfo();
+
+  if (!lockInfo.isUseCustomPwd) return true;
+
+  return keyringService.getCountOfAccountsInKeyring() === 0;
+}
+
 export async function resetPasswordOnUI(newPassword: string) {
   const result = getInitError(newPassword);
   if (result.error) return result;

diff --git a/apps/mobile/src/hooks/useLock.ts b/apps/mobile/src/hooks/useLock.ts
@@ -300,19 +300,23 @@ export function useSetPasswordFirst() {
   );
 
   const shouldRedirectToSetPasswordBefore2024 = React.useCallback(
-    ({
+    async ({
       backScreen,
       isFirstImportPassword,
     }: {
-      backScreen?: (SettingNavigatorParamList['SetPassword'] & {
+      backScreen: (SettingNavigatorParamList['SetPassword'] & {
         actionAfterSetup: 'backScreen';
       })['replaceScreen'];
       isFirstImportPassword?: boolean;
     }) => {
       if (!APP_FEATURE_SWITCH.customizePassword) {
         return false;
       }
-      if (lockInfo.pwdStatus === PasswordStatus.Custom) {
+      // if (lockInfo.pwdStatus === PasswordStatus.Custom) {
+      //   return false;
+      // }
+      const shouldAsk = await apisLock.shouldAskSetPassword();
+      if (!shouldAsk) {
         return false;
       }
 
@@ -331,7 +335,7 @@ export function useSetPasswordFirst() {
       }
       return false;
     },
-    [navigation, lockInfo],
+    [navigation],
   );
 
   return {

diff --git a/apps/mobile/src/screens/Address/ImportMethods.tsx b/apps/mobile/src/screens/Address/ImportMethods.tsx
@@ -64,17 +64,17 @@ function ImportMethods(): JSX.Element {
             <Card
               style={styles.importItem}
               hasArrow={state?.isNotNewUserProc}
-              onPress={() => {
+              onPress={async () => {
                 trigger('impactLight', {
                   enableVibrateFallback: true,
                   ignoreAndroidSystemSettings: false,
                 });
                 if (
                   // only has address in this set password
                   state?.isNotNewUserProc &&
-                  shouldRedirectToSetPasswordBefore2024({
+                  (await shouldRedirectToSetPasswordBefore2024({
                     backScreen: RootNames.ImportMnemonic2024,
-                  })
+                  }))
                 ) {
                   return;
                 }
@@ -89,16 +89,16 @@ function ImportMethods(): JSX.Element {
             <Card
               hasArrow={state?.isNotNewUserProc}
               style={styles.importItem}
-              onPress={() => {
+              onPress={async () => {
                 trigger('impactLight', {
                   enableVibrateFallback: true,
                   ignoreAndroidSystemSettings: false,
                 });
                 if (
                   state?.isNotNewUserProc &&
-                  shouldRedirectToSetPasswordBefore2024({
+                  (await shouldRedirectToSetPasswordBefore2024({
                     backScreen: RootNames.ImportPrivateKey2024,
-                  })
+                  }))
                 ) {
                   return;
                 }

diff --git a/apps/mobile/src/screens/Address/ImportPrivateKeyScreen2024.tsx b/apps/mobile/src/screens/Address/ImportPrivateKeyScreen2024.tsx
@@ -86,14 +86,14 @@ export const ImportPrivateKeyScreen2024 = () => {
     }
   }, [privateKey, t]);
 
-  const handleConfirm = React.useCallback(() => {
+  const handleConfirm = React.useCallback(async () => {
     // verify private key for setPassword
     if (!verfiyPrivateKey()) {
       return;
     }
 
     if (
-      shouldRedirectToSetPasswordBefore2024({
+      await shouldRedirectToSetPasswordBefore2024({
         backScreen: RootNames.ImportSuccess2024,
         isFirstImportPassword: true,
       })

diff --git a/apps/mobile/src/screens/Address/ImportSeedPhraseScreen2024.tsx b/apps/mobile/src/screens/Address/ImportSeedPhraseScreen2024.tsx
@@ -229,14 +229,14 @@ export const ImportSeedPhraseScreen2024 = () => {
     }
   }, [mnemonics, t]);
 
-  const handleConfirm = React.useCallback(() => {
+  const handleConfirm = React.useCallback(async () => {
     // verify mnemonics for setPassword
     if (!verfiyMnemonics()) {
       return;
     }
 
     if (
-      shouldRedirectToSetPasswordBefore2024({
+      await shouldRedirectToSetPasswordBefore2024({
         backScreen: RootNames.ImportSuccess2024,
         isFirstImportPassword: true,
       })