Merge origin/dev into PR 225 review fix

2026-05-10 06:02:53 +08:00
parent e9d7086b30 15af098327
commit 6b87d68630
42 changed files with 3710 additions and 175 deletions
@@ -58,7 +58,30 @@
        && !Boolean(state?.contributionMode);
    }

+    function hasStep7PhoneSignupIdentity(state = {}) {
+      return Boolean(
+        String(state?.signupPhoneNumber || '').trim()
+        || String(state?.signupPhoneCompletedActivation?.phoneNumber || '').trim()
+        || String(state?.signupPhoneActivation?.phoneNumber || '').trim()
+        || (
+          normalizeStep7IdentifierType(state?.accountIdentifierType) === 'phone'
+          && String(state?.accountIdentifier || '').trim()
+        )
+      );
+    }
+
+    function shouldPreferStep7PhoneSignupIdentity(state = {}) {
+      const frozenSignupMethod = normalizeStep7IdentifierType(state?.resolvedSignupMethod);
+      return canUseConfiguredPhoneSignup(state)
+        && frozenSignupMethod !== 'email'
+        && hasStep7PhoneSignupIdentity(state);
+    }
+
    function resolveStep7LoginIdentifierType(state = {}, fallbackType = '') {
+      if (shouldPreferStep7PhoneSignupIdentity(state)) {
+        return 'phone';
+      }
+
      const explicitIdentifierType = normalizeStep7IdentifierType(state?.accountIdentifierType);
      if (explicitIdentifierType) {
        return explicitIdentifierType;