Skip to content

Move selected distance rate to the top of the rate list - #97631

Merged
robertjchen merged 12 commits into
Expensify:mainfrom
marufsharifi:fix/distance-rate-selected-order
Aug 20, 2026
Merged

robertjchen merged 12 commits into
Expensify:mainfrom
marufsharifi:fix/distance-rate-selected-order

Conversation

@marufsharifi

@marufsharifi marufsharifi commented Aug 1, 2026 •

Copy link
Copy Markdown

Explanation of Change

Fixes the distance rate picker so the currently-selected rate is shown at the top of the list when the picker opens, matching the "pre-selected items to the top" behavior we've rolled out across the app (country, category, tax rate, etc.).

Fixed Issues

$ #69184
PROPOSAL: #69184 (comment)

Tests

  1. Open a Control or Collect workspace → More features → enable Distance rates.
  2. Under Distance rates, add rates until there are at least 12 enabled rates. Give them names so the currently-selected one is not first alphabetically (e.g. many "A…" rates plus one "Zebra rate").
  3. Start a distance expense on that workspace (Submit expense → Distance) and proceed to the confirmation page.
  4. Tap the Rate field to open the rate picker.
  5. Verify: the currently-selected rate appears at the top of the list
  6. Pick a different rate → it saves and the picker closes. Re-open the Rate picker.
  7. Verify: the newly-selected rate is now pinned at the top.
  • Verify that no errors appear in the JS console

Offline tests

Same as Tests

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 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-03.at.10.25.59.AM.mov
Android: mWeb Chrome
Screen_Recording_20260803_102326_Chrome.mp4
iOS: Native
Screen.Recording.2026-08-03.at.10.43.05.AM.mov
iOS: mWeb Safari
Screen.Recording.2026-08-03.at.10.44.40.AM.mov
MacOS: Chrome / Safari
Screen.Recording.2026-08-03.at.10.14.13.AM.mov

@melvin-bot
melvin-bot Bot requested review from heyjennahay and linhvovan29546 and removed request for a team and heyjennahay August 17, 2026 09:32
@melvin-bot

melvin-bot Bot commented Aug 17, 2026

Copy link
Copy Markdown

@linhvovan29546 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 17, 2026 09:32
} as unknown as Transaction;

function renderPage() {
// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- test-only route stub; the page only reads route.params

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.

❌ CONSISTENCY-16 (docs)

The justification in this eslint-disable comment joins two independent clauses with a semicolon (test-only route stub; the page only reads route.params). Comments should read as plain sentences rather than semicolon-joined clauses.

Split it into two sentences, e.g.:

// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- test-only route stub. The page only reads route.params

Reviewed at: da11f18 | Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.

@marufsharifi

Copy link
Copy Markdown
Author

@linhvovan29546 The PR is ready for review, thanks

ListItem={SingleSelectListItem}
onSelectRow={({value}) => selectDistanceRate(value ?? '')}
shouldSingleExecuteRowSelect
initiallyFocusedItemKey={initiallyFocusedOption}

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.

Why don't we update this to initiallyFocusedItemKey={initiallySelectedRateID}?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Thanks for mentioning it! We should actually use pinnedRateID instead of initiallySelectedRateIDb it's the frozen value fed to moveInitialSelectionToTop, which keeps it consistent with the previous pin-to-top PRs. What do you think?

@linhvovan29546

linhvovan29546 commented Aug 20, 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
telegram-cloud-document-5-6068699148985572389.mp4
Android: mWeb Chrome
telegram-cloud-document-5-6068699148985572390.mp4
iOS: HybridApp
Screen.Recording.2026-08-20.at.11.50.40.mov
iOS: mWeb Safari
Screen.Recording.2026-08-20.at.10.45.44.mov
MacOS: Chrome / Safari
Screen.Recording.2026-08-20.at.09.54.44.mov

@melvin-bot
melvin-bot Bot requested a review from robertjchen August 20, 2026 04:53

@robertjchen robertjchen 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!

@robertjchen
robertjchen merged commit e6745c3 into Expensify:main Aug 20, 2026
36 of 40 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

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 mentioned this pull request Aug 21, 2026
55 tasks done
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/robertjchen in version: 9.4.58-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 change is a pure UX refinement to the distance Rate picker: when the picker opens, the currently-selected rate is now pinned to the top of the list (matching the "pre-selected items to the top" behavior used elsewhere in the app). It doesn't add, remove, or rename any feature, setting, tab, or button, and it doesn't change any documented workflow.

I reviewed the two articles that cover distance rates:

  • Distance Expenses — documents that the available rates appear for selection and how the applicable rate is determined, but not the ordering of rates within the picker.
  • Set Distance Rates — covers admin management (enable/add/edit/remove), not the member-side picker's sort order.

The list sort order of a picker is an implementation-level UX detail that the help site intentionally doesn't document, so no article edit is warranted and no draft docs PR is needed.

@marufsharifi, since no help site PR was created, there's nothing to review — but let me know if you'd like me to document any part of the distance rate picker behavior anyway.


view run

@lanitochka17

Copy link
Copy Markdown

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/Beamanator in version: 9.4.58-4 🚀

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.

6 participants