Fix selection jump in rule and currency pickers by marufsharifi · Pull Request #96587 · Expensify/App

marufsharifi · 2026-07-21T06:49:52Z

Explanation of Change

Fixes list jumps in rule and currency pickers where selecting an item could immediately move it to the top before the picker closes.

Fixed Issues

$ #69184
PROPOSAL: #69184 (comment)

Tests

Flow 1:

Go to Workspace settings > Rules > Merchant rules.
Create or edit a merchant rule.
Open Tag.
Select an item lower in the list.
Verify it does not jump to the top before the picker closes.
Reopen Tag and verify the selected item is pinned at the top.
Repeat steps 3-6 for Tax.

Flow 2:

Go to Settings > Expense rules.
Create or edit an expense rule.
Open Category.
Select an item lower in the list.
Verify it does not jump to the top before the picker closes.
Reopen Category and verify the selected item is pinned at the top.
Repeat for Tag and Tax.

Flow 3:

Go to Settings > Preferences > Payment currency.
Select a currency lower in the list.
Verify it does not jump to the top before the picker closes.
Reopen Payment currency and verify the selected currency is 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

Screenshots/Videos

Android: Native

Screen.Recording.2026-07-31.at.5.14.15.PM.mp4

Android: mWeb Chrome

Screen_Recording_20260731_170338_Chrome.1.mp4

iOS: Native

Screen.Recording.2026-07-31.at.5.54.01.PM.mp4

iOS: mWeb Safari

Screen.Recording.2026-07-31.at.5.42.20.PM.mp4

MacOS: Chrome / Safari

Screen.Recording.2026-07-31.at.4.51.32.PM.mp4

codecov · 2026-07-21T06:53:29Z

Codecov Report

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

Files with missing lines	Coverage Δ
.../components/Search/SearchSingleSelectionPicker.tsx	`88.88% <100.00%> (+0.51%)`	⬆️
...es/Debug/DynamicDebugDetailsConstantPickerPage.tsx	`0.00% <ø> (ø)`
src/components/CurrencySelectionList/index.tsx	`81.63% <83.33%> (+81.63%)`	⬆️
... and 65 files with indirect coverage changes

…vent auto-scroll on selection; add tests for CurrencySelectionList

melvin-bot · 2026-08-05T11:54:24Z

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

marufsharifi · 2026-08-05T12:17:43Z

@linhvovan29546 The PR is ready for review. thanks

marufsharifi · 2026-08-07T05:31:34Z

@linhvovan29546, Gentle bump. thanks.

linhvovan29546 · 2026-08-09T13:00:03Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: f123090299

ℹ️ 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".

chatgpt-codex-connector · 2026-08-09T13:05:59Z

+    const selectedCurrencyCodes = [initiallySelectedCurrencyCode, ...selectedCurrencies].filter(Boolean);
+    const initiallyPinnedCurrencyCodes = useInitialSelection(selectedCurrencyCodes, {resetOnFocus: true});


Memoize the pinned currency code list

When the currency picker is focused and re-renders for local state, such as typing in the search field, this expression creates a fresh array every render. useInitialSelection(..., {resetOnFocus: true}) refreshes the snapshot on focused renders and compares with Object.is, so the fresh array is always treated as a new selection and schedules another state update; typing in any currency picker can then loop until React reports a maximum update-depth/console error. Please memoize this code list, or pass a stable primitive/key, before handing it to useInitialSelection.

Useful? React with 👍 / 👎.

@marufsharifi Sorry, but I think the bot's comment is incorrect since this component already has React Compiler enabled. So I don't think we need to manually memoize it.

I haven't tested this yet. Could you please confirm whether this is actually an issue?

linhvovan29546 · 2026-08-09T12:54:00Z


 import type {CurrencyListItem, CurrencySelectionListProps} from './types';

+const EMPTY_SELECTED_CURRENCIES: string[] = [];


Can we use an empty array constant, such as EMPTY_ARRAY, here?

…cted currencies

marufsharifi · 2026-08-10T11:15:26Z

@linhvovan29546 The feedbacks have been resolved, Could please take another look? thanks

linhvovan29546 · 2026-08-10T12:15:40Z

Reviewer Checklist

Screenshots/Videos

Android: HybridApp

telegram-cloud-document-5-6327730391838893182.1.mp4

Android: mWeb Chrome

telegram-cloud-document-5-6327730391838893217.mp4

iOS: HybridApp

Screen.Recording.2026-08-10.at.20.18.57.mov

iOS: mWeb Safari

Screen.Recording.2026-08-10.at.20.02.46.mov

Screen.Recording.2026-08-10.at.20.04.26.mov

Screen.Recording.2026-08-10.at.20.05.06.mov

MacOS: Chrome / Safari

Screen.Recording.2026-08-10.at.19.14.28.mov

Screen.Recording.2026-08-10.at.19.25.52.mov

Screen.Recording.2026-08-10.at.19.28.58.mov

linhvovan29546 · 2026-08-10T12:23:38Z

            footerContent={shouldAutoSave ? undefined : footerContent}
            shouldShowLoadingPlaceholder={!noResultsFound}
            shouldUpdateFocusedIndex
+            shouldPreventAutoScrollOnSelect


This is redundant since shouldPreventAutoScrollOnSelect only works when canSelectMultiple is enabled.

linhvovan29546 · 2026-08-10T12:23:45Z

            textInputOptions={textInputOptions}
            shouldShowTextInput={!!searchInputLabel}
            shouldSingleExecuteRowSelect
+            shouldPreventAutoScrollOnSelect


This is redundant since shouldPreventAutoScrollOnSelect only works when canSelectMultiple is enabled.

…t and SearchSingleSelectionPicker

linhvovan29546 · 2026-08-10T12:42:15Z

Bug: The currency picker on the Debug Mode page doesn't move to the top or show the selected currency.

Screen.Recording.2026-08-10.at.19.40.58.mov

marufsharifi · 2026-08-10T12:53:10Z

Bug: The currency picker on the Debug Mode page doesn't move to the top or show the selected currency.

Thanks for catching that — the Debug picker wasn't passing the current currency into CurrencySelectionList, so there was nothing to select or pin. Added initiallySelectedCurrencyCode={fieldValue}. It is fixed now. You can take another look, thanks

linhvovan29546 · 2026-08-10T13:24:29Z

Bug: The currency picker scrolls when selecting an item. To reproduce this, disable the navigation function when selecting an item to force the issue to reproduce.

Screen.Recording.2026-08-10.at.20.22.53.mov

…update tests

linhvovan29546 · 2026-08-10T13:49:29Z

@marufsharifi Just make sure you didn't miss this comment #96587 (comment)

marufsharifi · 2026-08-10T13:54:14Z

Bug: The currency picker scrolls when selecting an item. To reproduce this, disable the navigation function when selecting an item to force the issue to reproduce.

Thanks, I've fixed that as well.

linhvovan29546 · 2026-08-10T13:56:46Z

Thanks, I've fixed that as well.

I mean, I think the bot's comment is incorrect.

marufsharifi · 2026-08-10T14:04:08Z

I mean, I think the bot's comment is incorrect.

Yeah , got it. my comment was about another bug you found, I quoted in the comment.
And about the bot comment You're right, I have reverted that back to plain derivation. thanks

…onList

linhvovan29546 · 2026-08-10T14:08:35Z

Thanks!

garrettmknight

Looks good from a product perspective

robertjchen

LGTM, thanks!

github-actions · 2026-08-11T08:44:20Z

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

OSBotify · 2026-08-11T08:51:59Z

✋ 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 · 2026-08-11T08:52:24Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #96587.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-35ab904c583-7d586de-0d7ec3a17c27bd752f5d3eae4a35cfaed16ad8c7/index.html	❌ FAILED ❌
	The QR code can't be generated, because the iOS build failed

Web 🕸️
https://96587.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-08-12T18:38:51Z

🚀 Deployed to staging by https://github.com/robertjchen in version: 9.4.53-0 🚀

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

MelvinBot · 2026-08-12T18:42:35Z

🤖 No help site changes required.

I reviewed the changes in this PR against the help site articles under docs/articles, and no updates are needed.

Why: This PR is a purely internal UI fix. It changes how the rule and currency pickers pin the initially selected item (via a new useInitialSelection hook) so the chosen row no longer visually "jumps" to the top before the picker closes. No user-facing feature, setting, tab, button, or workflow was added or changed — the pickers behave the same functionally, just without the visual glitch.

The help site documents what these features do (rules, currency/payment currency selection), not this kind of list-ordering micro-interaction, so there is nothing to add or correct. A search of docs/articles for related terms surfaced only unrelated natural-language uses of "jump."

Since no changes are required, I did not create a draft docs PR.

@marufsharifi, if you believe a specific behavior here should be reflected in the help site, let me know which article and I'll draft the update.

OSBotify · 2026-08-14T20:15:31Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.4.53-10 🚀

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

Bundle Size Analysis (Sentry):

Android

marufsharifi added 2 commits July 21, 2026 08:11

Fix selection jump in rule and currency pickers

3f91b68

Merge branch 'main' into fix/rule-currency-selection-jump

4923c07

melvin-bot Bot assigned marufsharifi Jul 21, 2026

marufsharifi added 3 commits July 31, 2026 14:50

Merge branch 'main' into fix/rule-currency-selection-jump

b7bc6f5

Refactor CurrencySelectionList and SearchSingleSelectionPicker to pre…

07fc92c

…vent auto-scroll on selection; add tests for CurrencySelectionList

Merge branch 'main' into fix/rule-currency-selection-jump

66376c0

marufsharifi marked this pull request as ready for review August 5, 2026 11:54

marufsharifi requested review from a team as code owners August 5, 2026 11:54

melvin-bot Bot requested a review from linhvovan29546 August 5, 2026 11:54

melvin-bot Bot requested review from garrettmknight and removed request for a team August 5, 2026 11:54

fix typecheck fail

f123090

garrettmknight previously approved these changes Aug 5, 2026

View reviewed changes

chatgpt-codex-connector Bot reviewed Aug 9, 2026

View reviewed changes

linhvovan29546 suggested changes Aug 9, 2026

View reviewed changes

marufsharifi added 2 commits August 10, 2026 15:09

refactor: replace empty array constant with utility function for sele…

c776734

…cted currencies

Merge branch 'main' into fix/rule-currency-selection-jump

a846c98

marufsharifi dismissed garrettmknight’s stale review via a846c98 August 10, 2026 10:41

linhvovan29546 suggested changes Aug 10, 2026

View reviewed changes

marufsharifi added 2 commits August 10, 2026 17:10

remove shouldPreventAutoScrollOnSelect prop from CurrencySelectionLis…

1801e61

…t and SearchSingleSelectionPicker

Merge branch 'main' into fix/rule-currency-selection-jump

a76a352

feat: add initiallySelectedCurrencyCode prop to CurrencySelectionList

51936de

feat: add shouldUpdateFocusedIndex prop to CurrencySelectionList and …

b06dfd7

…update tests

refactor: remove useMemo for selectedCurrencyCodes in CurrencySelecti…

5150276

…onList

linhvovan29546 approved these changes Aug 10, 2026

View reviewed changes

melvin-bot Bot requested a review from robertjchen August 10, 2026 14:23

garrettmknight approved these changes Aug 10, 2026

View reviewed changes

robertjchen approved these changes Aug 11, 2026

View reviewed changes

robertjchen merged commit 35ab904 into Expensify:main Aug 11, 2026
38 of 40 checks passed

github-actions Bot mentioned this pull request Aug 11, 2026

Investigate workflow job failing on main: build (Expensify Dev, Debug, true) #98264

Closed

OSBotify mentioned this pull request Aug 12, 2026

Deploy Checklist: New Expensify 2026-08-12 #98463

Closed

melvin-bot Bot mentioned this pull request Aug 14, 2026

Move pre-selected list items to top of list throughout the app #69184

Open

8 tasks

		const selectedCurrencyCodes = [initiallySelectedCurrencyCode, ...selectedCurrencies].filter(Boolean);
		const initiallyPinnedCurrencyCodes = useInitialSelection(selectedCurrencyCodes, {resetOnFocus: true});


		import type {CurrencyListItem, CurrencySelectionListProps} from './types';

		const EMPTY_SELECTED_CURRENCIES: string[] = [];

Conversation

marufsharifi commented Jul 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov Bot commented Jul 21, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

melvin-bot Bot commented Aug 5, 2026

Uh oh!

marufsharifi commented Aug 5, 2026

Uh oh!

marufsharifi commented Aug 7, 2026

Uh oh!

linhvovan29546 commented Aug 9, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Aug 9, 2026

Choose a reason for hiding this comment

Uh oh!

linhvovan29546 Aug 10, 2026

Choose a reason for hiding this comment

Uh oh!

linhvovan29546 Aug 9, 2026

Choose a reason for hiding this comment

Uh oh!

marufsharifi commented Aug 10, 2026

Uh oh!

linhvovan29546 commented Aug 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

linhvovan29546 Aug 10, 2026

Choose a reason for hiding this comment

Uh oh!

linhvovan29546 Aug 10, 2026

Choose a reason for hiding this comment

Uh oh!

linhvovan29546 commented Aug 10, 2026

Uh oh!

marufsharifi commented Aug 10, 2026

Uh oh!

linhvovan29546 commented Aug 10, 2026

Uh oh!

linhvovan29546 commented Aug 10, 2026

Uh oh!

marufsharifi commented Aug 10, 2026

Uh oh!

linhvovan29546 commented Aug 10, 2026

Uh oh!

marufsharifi commented Aug 10, 2026

Uh oh!

linhvovan29546 commented Aug 10, 2026

Uh oh!

garrettmknight left a comment

Choose a reason for hiding this comment

Uh oh!

robertjchen left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented Aug 11, 2026

Uh oh!

OSBotify commented Aug 11, 2026

Uh oh!

github-actions Bot commented Aug 11, 2026

Uh oh!

OSBotify commented Aug 12, 2026

Uh oh!

marufsharifi commented Jul 21, 2026 •

edited

Loading

codecov Bot commented Jul 21, 2026 •

edited by github-actions Bot

Loading

linhvovan29546 commented Aug 10, 2026 •

edited

Loading