fix: Update auth flow by new restore policy (#2253)

* fix: Update auth flow by new restore policy * chore: remove duplications * fix: sss stack updates * fix: Backup flow updates * fix: Restore backup
haqq-network · Jan 7, 2025 · 95c97f3 · 95c97f3
1 parent b64adac
commit 95c97f3
Show file tree

Hide file tree

Showing 11 changed files with 167 additions and 209 deletions.
diff --git a/assets/locales/ar/ar.json b/assets/locales/ar/ar.json
@@ -706,8 +706,6 @@
   "signupNetworkExitsAlertTitle": "هل أنت متأكد من أنك تريد استبدال حسابك؟",
   "signupNetworkExitsDescription1": "يمكنك استعادة حسابك أو استبداله.",
   "signupNetworkExitsDescription2": "في حالة الاستبدال، ستفقد جميع بيانات الحساب",
-  "signupNetworkExitsTitle": "لديك حساب بالفعل على {{provider}} تسجيل الدخول {{email}}",
-  "signupNetworkExitsTitleWithoutEmail": "لديك حساب بالفعل على {{provider}}",
   "signupStoreWalletAccountNumber": "حساب #{{number}}",
   "signupStoreWalletCreatingAccount": "جارٍ إنشاء حسابك",
   "sliderCaptchaDragText": "اسحب الشريط",

diff --git a/assets/locales/en/en.json b/assets/locales/en/en.json
@@ -723,8 +723,6 @@
   "signupNetworkExitsAlertTitle": "Are you sure you want to replace this account?",
   "signupNetworkExitsDescription1": "You can choose to restore or replace your account.",
   "signupNetworkExitsDescription2": "If you replace this account, all data will be lost.",
-  "signupNetworkExitsTitle": "You already have an account on {{provider}} login {{email}}",
-  "signupNetworkExitsTitleWithoutEmail": "You already have an account on {{provider}} login",
   "signupStoreWalletAccountNumber": "Account #{{number}}",
   "signupStoreWalletCreatingAccount": "Creating your account",
   "sliderCaptchaDragText": "Drag the slider",

diff --git a/assets/locales/id/id.json b/assets/locales/id/id.json
@@ -702,8 +702,6 @@
   "signupNetworkExitsAlertTitle": "Apakah Anda yakin ingin mengganti akun Anda?",
   "signupNetworkExitsDescription1": "Anda dapat memulihkan akun Anda atau menggantinya.",
   "signupNetworkExitsDescription2": "Dalam kasus penggantian, semua data akun akan hilang",
-  "signupNetworkExitsTitle": "Anda sudah memiliki akun di login {{provider}} {{email}}",
-  "signupNetworkExitsTitleWithoutEmail": "Anda sudah memiliki akun di login {{provider}}",
   "signupStoreWalletAccountNumber": "Akun #{{number}}",
   "signupStoreWalletCreatingAccount": "Membuat akun Anda",
   "sliderCaptchaDragText": "Geser penggeser",

diff --git a/assets/locales/tr/tr.json b/assets/locales/tr/tr.json
@@ -706,8 +706,6 @@
   "signupNetworkExitsAlertTitle": "Hesabınızı değiştirmek istediğinizden emin misiniz?",
   "signupNetworkExitsDescription1": "Hesabınızı geri yükleyebilir veya değiştirebilirsiniz.",
   "signupNetworkExitsDescription2": "Değiştirilmesi durumunda tüm hesap verileri kaybolacaktır",
-  "signupNetworkExitsTitle": "{{provider}} giriş {{email}} ile zaten bir hesabınız var",
-  "signupNetworkExitsTitleWithoutEmail": "{{provider}} giriş ile zaten bir hesabınız var",
   "signupStoreWalletAccountNumber": "Hesap #{{number}}",
   "signupStoreWalletCreatingAccount": "Hesabınız oluşturuluyor",
   "sliderCaptchaDragText": "Sürgüyü sürükle",

diff --git a/src/ar.ts b/src/ar.ts
@@ -677,10 +677,6 @@ export const ar = {
     'لا توجد حسابات مرتبطة في شبكتنا لتسجيل الدخول الاجتماعي الذي اخترته. قم بإنشاء حساب جديد بناءً على تسجيل الدخول الاجتماعي هذا أو اختر تسجيل دخول اجتماعي آخر',
   [I18N.signNotExitsTitle]:
     'لم نجد الحساب متصلاً بتسجيل الدخول {{provider}} {{email}}',
-  [I18N.signupNetworkExitsTitle]:
-    'لديك بالفعل حساب على {{provider}} تسجيل الدخول {{email}}',
-  [I18N.signupNetworkExitsTitleWithoutEmail]:
-    'لديك بالفعل حساب على {{provider}} تسجيل الدخول',
   [I18N.signupNetworkExitsDescription1]: 'يمكنك استعادة حسابك أو استبداله.',
   [I18N.signupNetworkExitsDescription2]:
     'في حالة الاستبدال, سيتم فقدان جميع بيانات الحساب',

diff --git a/src/components/signin-networks/signin-networks.tsx b/src/components/signin-networks/signin-networks.tsx
@@ -41,43 +41,32 @@ export const SigninNetworks = observer(
     isCustomSupported,
     onPressHardwareWallet,
   }: SssNetworksProps) => {
-    const [isApple, setIsApple] = useState(false);
-    const [isGoogle, setIsGoogle] = useState(false);
-    const [isCustom, setIsCustom] = useState(false);
-    const isLoading = useMemo(
-      () => isApple || isGoogle || isCustom,
-      [isApple, isGoogle, isCustom],
-    );
-
-    const onPressLoginCustom = useCallback(async () => {
-      try {
-        setIsCustom(true);
-
-        await onLogin(SssProviders.custom);
-      } finally {
-        setIsCustom(false);
-      }
-    }, [onLogin]);
-
-    const onPressLoginGoogle = useCallback(async () => {
-      try {
-        setIsGoogle(true);
-
-        await onLogin(SssProviders.google);
-      } finally {
-        setIsGoogle(false);
-      }
-    }, [onLogin]);
+    const [isLoading, setIsLoading] = useState<SssProviders | null>(null);
 
-    const onPressLoginApple = useCallback(async () => {
-      try {
-        setIsApple(true);
+    const isApple = useMemo(
+      () => isLoading === SssProviders.apple,
+      [isLoading],
+    );
+    const isGoogle = useMemo(
+      () => isLoading === SssProviders.google,
+      [isLoading],
+    );
+    const isCustom = useMemo(
+      () => isLoading === SssProviders.custom,
+      [isLoading],
+    );
 
-        await onLogin(SssProviders.apple);
-      } finally {
-        setIsApple(false);
-      }
-    }, [onLogin]);
+    const onPressLogin = useCallback(
+      (sssProvider: SssProviders) => async () => {
+        try {
+          setIsLoading(sssProvider);
+          await onLogin(sssProvider);
+        } finally {
+          setIsLoading(null);
+        }
+      },
+      [onLogin],
+    );
 
     const mnemonicWalletsCount = Wallet.getAll().filter(
       wallet => wallet.type === WalletType.mnemonic,
@@ -105,8 +94,8 @@ export const SigninNetworks = observer(
             <Spacer height={10} />
             <SocialButton
               loading={isApple}
-              disabled={isLoading && !isApple}
-              onPress={onPressLoginApple}
+              disabled={Boolean(isLoading && !isApple)}
+              onPress={onPressLogin(SssProviders.apple)}
               variant={SocialButtonVariant.apple}
               testID="sss_login_apple"
             />
@@ -117,8 +106,8 @@ export const SigninNetworks = observer(
             <Spacer height={10} />
             <SocialButton
               loading={isGoogle}
-              disabled={isLoading && !isGoogle}
-              onPress={onPressLoginGoogle}
+              disabled={Boolean(isLoading && !isGoogle)}
+              onPress={onPressLogin(SssProviders.google)}
               variant={SocialButtonVariant.google}
               testID="sss_login_google"
             />
@@ -129,8 +118,8 @@ export const SigninNetworks = observer(
             <Spacer height={10} />
             <Button
               loading={isCustom}
-              disabled={isLoading && !isCustom}
-              onPress={onPressLoginCustom}
+              disabled={Boolean(isLoading && !isCustom)}
+              onPress={onPressLogin(SssProviders.custom)}
               i18n={I18N.customNetwork}
               variant={ButtonVariant.contained}
               testID="sss_login_custom"

diff --git a/src/i18n.ts b/src/i18n.ts
@@ -583,8 +583,6 @@ export enum I18N {
   sssMigrateRewriteDescription = 'sssMigrateRewriteDescription',
   sssMigrateRewriteAlertTitle = 'sssMigrateRewriteAlertTitle',
   sssMigrateRewriteAlertDescription = 'sssMigrateRewriteAlertDescription',
-  signupNetworkExitsTitle = 'signupNetworkExitsTitle',
-  signupNetworkExitsTitleWithoutEmail = 'signupNetworkExitsTitleWithoutEmail',
   signupNetworkExitsDescription1 = 'signupNetworkExitsDescription1',
   signupNetworkExitsDescription2 = 'signupNetworkExitsDescription2',
   signupNetworkExitsAlertTitle = 'signupNetworkExitsAlertTitle',

diff --git a/src/route-types.ts b/src/route-types.ts
@@ -76,9 +76,9 @@ export enum SignUpStackRoutes {
   SignUpAgreement = 'signupAgreement',
   SignUpNetworks = 'signupNetworks',
   SignUpPin = 'signupPin',
-  OnboardingSetupPin = 'onboardingSetupPin',
+  OnboardingSetupPin = 'signupOnboardingSetupPin',
   SignupStoreWallet = 'signupStoreWallet',
-  SignupCloudProblems = 'cloudProblems',
+  SignupCloudProblems = 'signupCloudProblems',
   SignupImportantInfo = 'signupImportantInfo',
 }
 
@@ -742,12 +742,12 @@ export enum SignInStackRoutes {
   SigninAgreement = 'signinAgreement',
   SigninRestoreWallet = 'signinRestoreWallet',
   SigninPin = 'signinPin',
-  OnboardingSetupPin = 'onboardingSetupPin',
+  OnboardingSetupPin = 'signinOnboardingSetupPin',
   SigninStoreWallet = 'signinStoreWallet',
   SigninNotExists = 'signinNotExists',
   SigninNotRecovery = 'signinNotRecovery',
-  SigninCloudProblems = 'cloudProblems',
-  SigninChooseAccount = 'chooseAccount',
+  SigninCloudProblems = 'signinCloudProblems',
+  SigninChooseAccount = 'signinChooseAccount',
   SigninSharesNotFound = 'signinSharesNotFound',
 }
 

diff --git a/src/screens/HomeStack/SssMigrate/sss-migrate-networks.tsx b/src/screens/HomeStack/SssMigrate/sss-migrate-networks.tsx
@@ -61,11 +61,9 @@ export const SssMigrateNetworksScreen = memo(() => {
             //@ts-ignore
             navigation.navigate(nextScreen, {
               accountId: route.params.accountId,
-              privateKey: new SecureValue<string | null | undefined>(
-                creds?.privateKey,
-              ),
-              token: creds?.token,
-              verifier: creds?.verifier,
+              privateKey: new SecureValue<string | null>(creds!.privateKey),
+              token: creds!.token,
+              verifier: creds!.verifier,
               provider,
               email: '',
             });