Skip to content

Let the base path decide the contact methods RHP background - #100292

Merged
roryabraham merged 1 commit into
Expensify:mainfrom
mukhrr:fix/100260
Sep 8, 2026
Merged

roryabraham merged 1 commit into
Expensify:mainfrom
mukhrr:fix/100260

Conversation

@mukhrr

@mukhrr mukhrr commented Sep 3, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

DYNAMIC_CONTACT_METHODS was pinned to SETTINGS.PROFILE.ROOT in SETTINGS_TO_RHP, so getMatchingFullScreenRoute resolved Account > Profile before it reached the dynamic base-path branch and the background tab swapped away from wherever the RHP was opened. The same swap left the URL base out of sync with the params stored on the route, so goBack from the contact method details page replaced the list instead of popping it and the modal took two back presses to close.

CONTACT_METHODS declares entryScreens: ['*'], so dropping it from the relations lets the base path decide, the same way DYNAMIC_IMPORTED_MEMBERS_ROLE is left out of WORKSPACE_TO_RHP.

Fixed Issues

$ #100260
PROPOSAL: #100260 (comment)

Tests

Use an account that has no phone number contact method, so the "Add your number" link is rendered, and that has at least one expense without a receipt.

  1. Open the Spend tab and click an expense without a receipt to open its details.
  2. In the receipt area, under "Other ways to add receipts", click "Add your number".
  3. Verify the Contact methods panel opens and the background still shows the expense, not Account > Profile.
  4. Click your contact method to open its details.
  5. Click the back button.
  6. Verify you are back on the Contact methods list.
  7. Click the back button again.
  8. Verify the panel closes on this single press and the expense details are shown again.
  • Verify that no errors appear in the JS console

Offline tests

The change only affects which full screen is resolved under the right hand panel, so there is no network surface to it. Going offline before step 1 and repeating the whole flow gives the same result: the background stays on the expense and each back press moves one screen.

QA Steps

Same as tests.

  • 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 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
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
REC-20260903172708.mp4

DYNAMIC_CONTACT_METHODS was pinned to the profile root in SETTINGS_TO_RHP, so
getMatchingFullScreenRoute resolved Account > Profile from the relations before
it reached the dynamic base-path branch. Opening the contact methods RHP from
anywhere else swapped the background tab to Account > Profile.

That swap also left the URL base out of sync with the params stored on the
contact methods route, so goBack from the contact method details page replaced
the route instead of popping it and the modal took two back presses to close.

CONTACT_METHODS declares entryScreens: ['*'], so leaving it out of the relations
lets the base path decide, the same way DYNAMIC_IMPORTED_MEMBERS_ROLE is left
out of WORKSPACE_TO_RHP.
@mukhrr
mukhrr requested review from a team as code owners September 3, 2026 12:09
@melvin-bot
melvin-bot Bot requested review from JmillsExpensify and situchan and removed request for a team and JmillsExpensify September 3, 2026 12:09
@melvin-bot

melvin-bot Bot commented Sep 3, 2026

Copy link
Copy Markdown

@situchan 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]

@mukhrr

mukhrr commented Sep 3, 2026

Copy link
Copy Markdown
Contributor Author

@situchan pls ignore this. @dmkt9 is going to review this. thanks

@situchan

situchan commented Sep 3, 2026

Copy link
Copy Markdown
Contributor

@mukhrr tip to assign correct C+ if they were not assigned in follow up issue for some reason:

Put original issue at the end:

### Fixed Issues
$ https://github.com/Expensify/App/issues/100260
$ https://github.com/Expensify/App/issues/95364

@dmkt9

dmkt9 commented Sep 8, 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 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
    • 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
    • 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 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
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari
chrome.mp4

@dmkt9 dmkt9 left a comment

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.

LGTM

@roryabraham
roryabraham merged commit 42848ad into Expensify:main Sep 8, 2026
39 of 41 checks passed
@OSBotify

OSBotify commented Sep 8, 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.

@github-actions

github-actions Bot commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

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

@OSBotify OSBotify mentioned this pull request Sep 9, 2026
83 tasks done
@OSBotify

OSBotify commented Sep 9, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.4.75-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 No help site changes are required for this PR.

This PR removes one entry (SCREENS.SETTINGS.PROFILE.DYNAMIC_CONTACT_METHODS) from the SETTINGS_TO_RHP navigation relations map so the base path decides which full screen renders behind the right-hand panel. Nothing that the help site documents changes.

Why no article needs an update

What changed: a single deletion in src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts.

What the help site documents about contact methods:

What this PR actually fixes: which background screen sits behind the panel, and the number of back presses needed to close it. No article describes either, and no article should — the help site documents feature names, settings labels, and steps, not modal stacking or back-press counts.

No copy, label, tab name, or setting name changed, so there is nothing to re-verify against the live UI.

I did not create a draft help site PR, because there is nothing to change. If you disagree — for example, if you consider this part of a broader contact methods behavior change worth documenting — reply with @MelvinBot <what to document> and I'll draft one.

@mukhrr, please confirm this assessment. No help site PR was created, so there is nothing to mark Ready for review.


view run

@lanitochka17

Copy link
Copy Markdown

Deploy Blocker #100765 was identified to be related to this PR.

@OSBotify

Copy link
Copy Markdown
Contributor

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

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

Bundle Size Analysis (Sentry):

@OSBotify

Copy link
Copy Markdown
Contributor

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

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 failure ❌
🍎 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.

7 participants