[conroy-ricketts]

CCCT-2879

Cherry-pick of #3960 into commcare_2.65.

Product Description

When Firebase discards a phone OTP code, the user is told it is no longer valid and offered a new code, not "wrong passcode".

Technical Summary

2.65 already ships the PersonalID dead-code handling (CCCT-2803/2804), and its release notes promise this behavior; without this PR the Firebase path contradicts them.

Safety Assurance

Safety story

What gives confidence

• All commits cherry-picked cleanly; the diff matches CCCT-2879 Show Expired Firebase OTP Codes As No Longer Valid #3960.
• I ran the OTP unit and Robolectric tests on this branch; all pass.

Risks to review

• Rotation and resend-prompt fixes also apply to PersonalID's out-of-attempts state.

🤖 Generated with Claude Code

[coderabbitai]

Warning

Review limit reached

You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository.

Next included review available in 15 minutes.

Check out review usage here.

View limit details

Limit details: You’ve used the included review currently available.

Learn how review limits work.

Review configuration:

⚙️ Run configuration

• Configuration used: Repository UI
• Review profile: CHILL
• Plan: Advanced
• Run ID: bc423c37-a2e8-4dc3-ba3a-46ace2a09bb2

📥 Commits

Reviewing files that changed from the base of the PR and between 861d0bb and 7f29464.

📒 Files selected for processing (18)

• RELEASES.md
• app/res/layout/screen_personalid_phone_verify.xml
• app/res/values-es/strings.xml
• app/res/values-fr/strings.xml
• app/res/values-ha/strings.xml
• app/res/values-hi/strings.xml
• app/res/values-lt/strings.xml
• app/res/values-no/strings.xml
• app/res/values-pt/strings.xml
• app/res/values-sw/strings.xml
• app/res/values-ti/strings.xml
• app/res/values/strings.xml
• app/src/org/commcare/fragments/personalId/BasePersonalIdPhoneVerificationFragment.kt
• app/src/org/commcare/utils/FirebaseAuthService.java
• app/src/org/commcare/utils/OtpErrorType.java
• app/unit-tests/src/org/commcare/fragments/personalId/PersonalIdPhoneVerificationFragmentTest.kt
• app/unit-tests/src/org/commcare/utils/FirebaseAuthServiceTest.kt
• app/unit-tests/src/org/commcare/utils/OtpAnalyticsMapperTest.kt

• Autopilot · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 37.48%. Comparing base (f4b6c1b) to head (7f29464).
⚠️ Report is 7 commits behind head on commcare_2.65.

Additional details and impacted files

@@                 Coverage Diff                 @@
##             commcare_2.65    #3961      +/-   ##
===================================================
+ Coverage            37.32%   37.48%   +0.16%     
- Complexity            6864     6888      +24     
===================================================
  Files                 1034     1034              
  Lines                61094    61107      +13     
  Branches              7472     7475       +3     
===================================================
+ Hits                 22802    22907     +105     
+ Misses               35637    35543      -94     
- Partials              2655     2657       +2     

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.