fix(auth): preserve phone identity across add-email retries

2026-05-12 20:39:20 +08:00
parent 0b74e600c0
commit 67c111ed43
7 changed files with 183 additions and 2 deletions
@@ -182,21 +182,28 @@
      }

      const displayedEmail = normalizeStep8VerificationTargetEmail(result?.displayedEmail || resolvedEmail);
+      let persistedState = latestState;
      if (typeof persistRegistrationEmailState === 'function') {
        await persistRegistrationEmailState(latestState, resolvedEmail, {
          source: 'step8_add_email',
          preserveAccountIdentity: true,
        });
+        persistedState = typeof getState === 'function' ? await getState() : latestState;
      } else {
        await setState({
          email: resolvedEmail,
          step8VerificationTargetEmail: displayedEmail,
        });
+        persistedState = {
+          ...latestState,
+          email: resolvedEmail,
+          step8VerificationTargetEmail: displayedEmail,
+        };
      }

      return {
        state: {
-          ...latestState,
+          ...persistedState,
          email: resolvedEmail,
          step8VerificationTargetEmail: displayedEmail,
        },