Skip to content

fix: Code does not arrive when adding contact method with new user - #99909

Merged
AndrewGable merged 1 commit into
Expensify:mainfrom
nkdengineer:fix/98872
Sep 4, 2026
Merged

AndrewGable merged 1 commit into
Expensify:mainfrom
nkdengineer:fix/98872

Conversation

@nkdengineer

Copy link
Copy Markdown
Contributor

Explanation of Change

fix: Code does not arrive when adding contact method with new user

Fixed Issues

$ #98872
PROPOSAL: #98872 (comment)

Tests

  1. Login as new user
  2. Go to Profile > Add contact method
  3. Click on new contact method
  4. Enter verification code
  5. On the next page, verify that we received another magic code email (Can open Inspect > Network tab and verify the resend magic code API is called on this page).
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as test

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
Screen.Recording.2026-08-31.at.21.02.44.mov
Android: mWeb Chrome
Screen.Recording.2026-08-31.at.20.52.02.mov
iOS: Native
Screen.Recording.2026-08-31.at.21.04.50.mov
iOS: mWeb Safari
Screen.Recording.2026-08-31.at.20.55.01.mov
MacOS: Chrome / Safari
Screen.Recording.2026-08-31.at.20.48.49.mov

@codecov

codecov Bot commented Aug 31, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
...idateCodeActionModal/ValidateCodeActionContent.tsx 100.00% <100.00%> (+100.00%) ⬆️
src/libs/actions/User.ts 41.84% <100.00%> (+1.79%) ⬆️
...DynamicNewContactMethodConfirmValidateCodePage.tsx 0.00% <0.00%> (ø)
src/pages/settings/VerifyAccountPageBase.tsx 0.00% <0.00%> (ø)
... and 15 files with indirect coverage changes

@nkdengineer
nkdengineer marked this pull request as ready for review August 31, 2026 14:23
@nkdengineer
nkdengineer requested review from a team as code owners August 31, 2026 14:23
@melvin-bot
melvin-bot Bot requested review from DylanDylann and heyjennahay and removed request for a team and heyjennahay August 31, 2026 14:23
@melvin-bot

melvin-bot Bot commented Aug 31, 2026

Copy link
Copy Markdown

@DylanDylann Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@melvin-bot
melvin-bot Bot removed the request for review from a team August 31, 2026 14:23

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 7c41bca400

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread src/libs/actions/User.ts
Comment on lines +630 to +635
{
onyxMethod: Onyx.METHOD.MERGE,
key: ONYXKEYS.VALIDATE_ACTION_CODE,
value: {
lastValidateCodeRequestedAt: null,
lastValidateCodeReason: null,

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Clear the global request stamp only for account validation

When validateSecondaryLogin() is invoked from DynamicContactMethodDetailsPage, the code being validated was sent by requestContactMethodValidateCode() and is tracked on the login, not by VALIDATE_ACTION_CODE. Unconditionally clearing this global stamp therefore erases any unrelated recent account-level code request; returning to that account-code flow within the resend window makes ValidateCodeActionContent send another email instead of deduplicating it. Restrict this cleanup to the VerifyAccountPageBase use case, such as through a caller-controlled flag.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The impact is small and it would make the code more complicated, so I think it's fine to leave as is

@DylanDylann

DylanDylann commented Sep 4, 2026 •

Copy link
Copy Markdown
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp
Screen.Recording.2026-09-04.at.17.11.20.mov
Android: mWeb Chrome
Screen.Recording.2026-09-04.at.16.48.15.mov
iOS: HybridApp
Screen.Recording.2026-09-04.at.17.08.59.mov
iOS: mWeb Safari
Screen.Recording.2026-09-04.at.16.50.40.mov
MacOS: Chrome / Safari
Screen.Recording.2026-09-04.at.16.29.48.mov

@melvin-bot
melvin-bot Bot requested a review from AndrewGable September 4, 2026 10:18
@AndrewGable
AndrewGable merged commit 221813d into Expensify:main Sep 4, 2026
41 of 46 checks passed
@github-actions

github-actions Bot commented Sep 4, 2026

Copy link
Copy Markdown
Contributor

🚧 AndrewGable has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify

OSBotify commented Sep 4, 2026

Copy link
Copy Markdown
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@OSBotify

OSBotify commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/AndrewGable in version: 9.4.73-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 failure ❌

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site changes are required by this PR itself — but I opened a draft PR for one UI-label mismatch I found in the article that covers this exact flow: #100484.

Why this PR needs no doc changes

This is a bug fix that restores already-documented behavior. The article on updating contact methods already tells members that after adding a new email or phone number they should "Enter the verification code sent to the new contact method." That code simply wasn't arriving for a brand-new, unvalidated user. The fix makes it arrive.

Nothing here adds a feature, changes a workflow, renames a label, or introduces new UI — so no article content needed rewriting.

What the change actually does

lastValidateCodeRequestedAt is account-level, so the mount-time send in src/components/ValidateCodeActionModal/ValidateCodeActionContent.tsx:50-57 was suppressed by the resend window. A new user validating their account and then immediately adding a contact method hit that window, so the second code was never requested. The PR adds lastValidateCodeReason so the window only suppresses a repeat request for the same flow, and clears the stamp on successful validation.

None of that is member-visible beyond "the code now arrives," which the docs already assume.

What the draft PR does fix

While checking the article against the live UI, the button label didn't match:

Article said Live UI
Select New Contact Method Select New contact method

docs/HELPSITE_NAMING_CONVENTIONS.md requires exact UI text and exact capitalization, so I corrected it. Verified in the product at Account > Profile > Public > Contact methods:

Contact methods screen showing the New contact method button

I checked the rest of the article against the live UI too — the Account navigation tab, the Public section, the Contact methods row, and the account-verification code step that appears before you enter the new email address are all accurate.

The draft PR has the HelpDot label. I could not assign it to you: GitHub returns "not assignable" for nkdengineer on Expensify/App, so please self-assign.

@nkdengineer, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

@OSBotify

OSBotify commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.4.73-3 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Bundle Size Analysis (Sentry):

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants