Skip to content

Migrate AmountSelectorModal to be nav RHP#90346

Draft
mhawryluk wants to merge 6 commits into
Expensify:mainfrom
software-mansion-labs:refactor/migrate-amount-selector-modal-to-nav
Draft

Migrate AmountSelectorModal to be nav RHP#90346
mhawryluk wants to merge 6 commits into
Expensify:mainfrom
software-mansion-labs:refactor/migrate-amount-selector-modal-to-nav

Conversation

@mhawryluk
Copy link
Copy Markdown
Contributor

@mhawryluk mhawryluk commented May 12, 2026

Explanation of Change

Migrates AmountSelectorModal, used only by AmountPicker, used only by WorkspaceCreateTaxPage to be a navigation-based RHP, not a modal.

Fixed Issues

$ #53493
PROPOSAL: N/A

Tests

  1. Open a workspace.
  2. Enable Taxes in More features if not enabled already.
  3. Open the Taxes tab.
  4. Click Add rate
  5. Click Value
  6. Verify the amount form RHP is opened and the field is autofocused.
  7. Refresh the page (on web) and check if it's still visible.
  8. Enter a value > Save.
  9. Create a Tax, verify the value is correctly saved.
  10. Click the Add rate button again.
  11. Verify the previously typed value is not filled in.

Offline tests

N/A

QA Steps

  • Verify that no errors appear in the JS console

Same as tests.

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 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 shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • 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)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • 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)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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 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.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • 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
Nagranie.z.ekranu.2026-05-12.o.17.16.07.mov
Android: mWeb Chrome
Nagranie.z.ekranu.2026-05-12.o.17.22.17.mov
iOS: Native
Simulator.Screen.Recording.-.iPhone.17.Pro.-.2026-05-12.at.17.28.40.mov
iOS: mWeb Safari
Simulator.Screen.Recording.-.iPhone.17.Pro.-.2026-05-12.at.17.25.10.mov
MacOS: Chrome / Safari
Nagranie.z.ekranu.2026-05-12.o.16.03.27.mov

@codecov
Copy link
Copy Markdown

codecov Bot commented May 12, 2026

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
src/SCREENS.ts 100.00% <ø> (ø)
...gation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts 100.00% <ø> (ø)
src/libs/Navigation/linkingConfig/config.ts 76.92% <ø> (ø)
src/ROUTES.ts 17.43% <0.00%> (-0.02%) ⬇️
...gation/AppNavigator/ModalStackNavigators/index.tsx 6.73% <0.00%> (-0.01%) ⬇️
...c/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx 0.00% <0.00%> (ø)
src/pages/workspace/taxes/TaxValuePicker.tsx 0.00% <0.00%> (ø)
...es/workspace/taxes/WorkspaceCreateTaxValuePage.tsx 0.00% <0.00%> (ø)
... and 6 files with indirect coverage changes

import {DYNAMIC_ROUTES} from '@src/ROUTES';
import INPUT_IDS from '@src/types/form/WorkspaceNewTaxForm';

function WorkspaceCreateTaxValuePage() {
Copy link
Copy Markdown
Contributor

@jmusial jmusial May 13, 2026

Choose a reason for hiding this comment

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

Naming suggestion WorkspaceCreateTaxAmountSelectorPage to be consistent with all the var names

Or rename variable to sth like TAX_VALUE_PICKER

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I kept the original name, but since there's no AmountPicker anymore, I think it's consistent

inputRef.current = ref;
};
useFocusEffect(() => {
const focusTimeout = setTimeout(() => {
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.

Is it possible to use sth else for focus thatn setTimeout ?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

yes, I used TransitionTracker (cc: @collectioneur)

Copy link
Copy Markdown
Contributor

@jmusial jmusial left a comment

Choose a reason for hiding this comment

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

claaude suggests:

Duplication with existing ValuePage (screen TAX_VALUE) already handles editing an existing tax rate's value. The new WorkspaceCreateTaxValuePage does essentially the same thing for the create flow. Worth a follow-up to consolidate or at least factor a shared NumberWithSymbolForm-wrapped subcomponent so future styling/validation fixes don't have to be applied twice.

worth checking out if we can unify them

Comment thread src/pages/workspace/taxes/WorkspaceCreateTaxValuePage.tsx
@mhawryluk
Copy link
Copy Markdown
Contributor Author

claaude suggests:

Duplication with existing ValuePage (screen TAX_VALUE) already handles editing an existing tax rate's value. The new WorkspaceCreateTaxValuePage does essentially the same thing for the create flow. Worth a follow-up to consolidate or at least factor a shared NumberWithSymbolForm-wrapped subcomponent so future styling/validation fixes don't have to be applied twice.

worth checking out if we can unify them

the two pages differ significantly, most importantly they save the value in different places and they have different validation. I don't think introducing an additional common component is worth it.

@mhawryluk mhawryluk requested a review from jmusial May 14, 2026 15:10
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.

2 participants