Skip to content

fix: stabilize reopen ordering in basic pickers - #85447

Merged
srikarparsi merged 11 commits into
Expensify:mainfrom
marufsharifi:fix/initial-selection-ordering-basic-pickers
Apr 8, 2026
Merged

fix: stabilize reopen ordering in basic pickers#85447
srikarparsi merged 11 commits into
Expensify:mainfrom
marufsharifi:fix/initial-selection-ordering-basic-pickers

Conversation

@marufsharifi

@marufsharifi marufsharifi commented Mar 16, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #69184
PROPOSAL: #69184 (Comment)

Tests

Note: Below is just an example of one place this issue occurs. There are others, like the country list when adding a personal bank account to the Wallet. This PR fixes the bug on all relevant lists in the app at once.

  1. Go to Workspaces
  2. Go to Company cards
  3. Tap Add cards (opens country list)
  4. Verify that:
    • The selected item is at the very top
    • While selecting an item, it does not scroll
    • The selected item stays highlighted after clearing the search input
  • Verify that no errors appear in the JS console

Offline tests

Same as Tests.

QA Steps

Same as Tests.

// TODO: These must be filled out, or the issue title must include "[No QA]."

  • 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 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

Record 1:

Screen.Recording.2026-03-30.at.7.24.01.PM.mov

Record 2:

Screen.Recording.2026-03-30.at.7.30.26.PM.mov

Record 3:

Screen.Recording.2026-03-30.at.7.24.55.PM.mov

Record 4:

Screen.Recording.2026-03-30.at.7.25.23.PM.mov

Record 5:

Screen.Recording.2026-03-30.at.7.26.39.PM.mov

Record 6:

Screen.Recording.2026-03-30.at.7.24.19.PM.mov

Record 8:

Screen.Recording.2026-03-30.at.7.27.10.PM.mov

Record 9:

Screen.Recording.2026-03-30.at.7.23.41.PM.mov

Record 10:

Screen.Recording.2026-04-01.at.3.13.33.PM.mov

Record 11:

Screen.Recording.2026-04-01.at.5.02.14.PM.mov

Record 12:

Screen.Recording.2026-04-01.at.5.03.25.PM.mov

Record 13:

Screen.Recording.2026-04-01.at.5.44.40.PM.mov

Record 14:

Screen.Recording.2026-04-01.at.5.45.11.PM.mov

Record 15:

Screen.Recording.2026-04-05.at.2.08.14.PM.mov

Record 16:

Screen.Recording.2026-04-05.at.2.13.16.PM.mov

Record 17:

Screen.Recording.2026-04-05.at.2.13.44.PM.mov

Record 18:

Screen.Recording.2026-04-05.at.2.14.28.PM.mov

Record 19:

Screen.Recording.2026-04-05.at.2.15.09.PM.mov

Record 20:

Screen.Recording.2026-04-05.at.2.17.19.PM.mov

Record 21:

Screen.Recording.2026-04-05.at.2.18.22.PM.mov

Record 22:

Screen.Recording.2026-04-05.at.2.22.26.PM.mov
Android: mWeb Chrome

Record 1:

Screen.Recording.2026-03-30.at.5.01.00.PM.mov

Record 2:

Screen.Recording.2026-03-30.at.5.03.08.PM.mov

Record 3:

Screen.Recording.2026-03-30.at.5.03.39.PM.mov

Record 4:

Screen.Recording.2026-03-30.at.5.13.30.PM.mov

Record 5:

Screen.Recording.2026-03-30.at.5.50.42.PM.mov

Record 6:

Screen.Recording.2026-03-30.at.4.55.18.PM.mov

Record 7:

Screen.Recording.2026-03-30.at.5.46.11.PM.mov

Record 8:

Screen.Recording.2026-03-30.at.4.54.08.PM.mov

Record 9:

Screen.Recording.2026-04-01.at.3.16.46.PM.mov

Record 10:

Screen.Recording.2026-04-01.at.3.17.57.PM.mov

Record 11:

Screen.Recording.2026-04-01.at.4.55.08.PM.mov

Record 12:

Screen.Recording.2026-04-01.at.4.57.46.PM.mov

Record 13:

Screen.Recording.2026-04-01.at.4.55.46.PM.mov

Record 14:

Screen.Recording.2026-04-01.at.4.58.45.PM.mov

Record 15:

Screen.Recording.2026-04-05.at.2.42.49.PM.mov

Record 16:

Screen.Recording.2026-04-05.at.3.02.24.PM.mov

Record 17:

Screen.Recording.2026-04-05.at.3.04.38.PM.mov

Record 18:

Screen.Recording.2026-04-05.at.3.05.12.PM.mov

Record 19:

Screen.Recording.2026-04-05.at.3.05.34.PM.mov

Record 20:

Screen.Recording.2026-04-05.at.3.06.56.PM.mov

Record 21:

Screen.Recording.2026-04-05.at.3.10.56.PM.mov

Record 22:

Screen.Recording.2026-04-05.at.3.11.45.PM.mov

Record 23:

Screen.Recording.2026-04-05.at.3.12.25.PM.mov
iOS: Native

Record 1:

Screen.Recording.2026-03-30.at.6.18.08.PM.mov

Record 2:

Screen.Recording.2026-03-30.at.6.18.31.PM.mov

Record 3:

Screen.Recording.2026-03-30.at.6.19.18.PM.mov

Record 4:

Screen.Recording.2026-03-30.at.6.20.11.PM.mov

Record 5:

Screen.Recording.2026-03-30.at.6.16.51.PM.mov

Record 6:

Screen.Recording.2026-03-30.at.6.20.53.PM.mov

Record 7:

Screen.Recording.2026-03-30.at.6.16.07.PM.mov

Record 8:

Screen.Recording.2026-04-01.at.11.33.09.AM.mov

Record 9:

Screen.Recording.2026-04-01.at.11.34.11.AM.mov

Record 10:

Screen.Recording.2026-04-01.at.11.35.50.AM.mov

Record 11:

Screen.Recording.2026-04-01.at.3.49.36.PM.mov

Record 12:

Screen.Recording.2026-04-01.at.3.53.02.PM.mov

Record 13:

Screen.Recording.2026-04-01.at.4.15.54.PM.mov

Record 14:

Screen.Recording.2026-04-01.at.4.16.47.PM.mov

Record 15:

Screen.Recording.2026-04-05.at.10.18.53.AM.mov

Record 16:

Screen.Recording.2026-04-05.at.11.00.26.AM.mov

Record 17:

Screen.Recording.2026-04-05.at.11.02.02.AM.mov

Record 18:

Screen.Recording.2026-04-05.at.11.02.53.AM.mov

Record 19:

Screen.Recording.2026-04-05.at.11.03.59.AM.mov

Record 20:

Screen.Recording.2026-04-05.at.11.05.48.AM.mov

Record 21:

Screen.Recording.2026-04-05.at.11.16.18.AM.mov

Record 22:

Screen.Recording.2026-04-05.at.12.22.30.PM.mov
iOS: mWeb Safari

Record 1:

Screen.Recording.2026-03-30.at.6.36.12.PM.mov

Record 2:

Screen.Recording.2026-03-30.at.6.36.51.PM.mov

Record 3:

Screen.Recording.2026-03-30.at.6.37.32.PM.mov

Record 4:

Screen.Recording.2026-03-30.at.6.36.33.PM.mov

Record 5:

Screen.Recording.2026-03-30.at.6.37.56.PM.mov

Record 6:

Screen.Recording.2026-03-30.at.6.38.40.PM.mov

Record 7:

Screen.Recording.2026-03-30.at.7.09.25.PM.mov

Record 8:

Screen.Recording.2026-03-30.at.7.14.01.PM.mov

Record 9:

Screen.Recording.2026-04-01.at.11.45.24.AM.mov

Record 10:

Screen.Recording.2026-04-01.at.11.46.41.AM.mov

Record 11:

Screen.Recording.2026-04-01.at.4.24.31.PM.mov

Record 12:

Screen.Recording.2026-04-01.at.4.25.32.PM.mov

Record 13:

Screen.Recording.2026-04-01.at.4.43.59.PM.mov

Record 14:

Screen.Recording.2026-04-05.at.11.53.14.AM.mov

Record 15:

Screen.Recording.2026-04-01.at.4.44.26.PM.mov

Record 16:

Screen.Recording.2026-04-05.at.11.55.14.AM.mov

Record 17:

Screen.Recording.2026-04-05.at.12.07.44.PM.mov

Record 18:

Screen.Recording.2026-04-05.at.12.08.31.PM.mov

Record 19:

Screen.Recording.2026-04-05.at.12.09.00.PM.mov

Record 20:

Screen.Recording.2026-04-05.at.12.09.16.PM.mov

Record 21:

Screen.Recording.2026-04-05.at.12.11.14.PM.mov

Record 22:

Screen.Recording.2026-04-05.at.12.13.37.PM.mov

Record 23:

Screen.Recording.2026-04-05.at.12.14.43.PM.mov
MacOS: Chrome / Safari

Record 1.

workspace.company.cards.add.card.feed.country.step.mov

Record 2.

settings.wallet.add.-.bank.account.account.detaisl.currencly.mov

Record 3.

Settings.Wallet.add.bank.account.bank.information.bank.region.mov

Record 4.

Settings.Wallet.add.bank.account.account.holder.detaisl.mov

Record 5.

create.expense.per.diem.subrate.mov

Record 6.

start.chat.roo.workspace.mov

Record 7.

start.chat.room.who.can.post.mov

Record 8.

only.available.by.route.copy.the.route.from.expensify.cards.mov

Record 9.

stat.chat.room.visibility.mov

Record 10.

expensify.card.issue.card.limit.type.mov

Record 11.

Expensify.card.card.item.Limit.Type.mov

Record 12.

create.expense.per.diem.add.subrate.then.update.that.subrate.mov

Record 13.

settings.profile.address.country.mov

Record 14.

Settings.profile.address.state.mov

Record 15.

Settings.Wallet.Add.bank.account.country.selection.mov

Record 16.

Screencast.From.2026-04-04.08-47-52.mp4

Record 17.

Screencast.From.2026-04-04.09-03-18.mp4

Record 18.

Screencast.From.2026-04-04.09-05-28.mp4

Record 19.

Screencast.From.2026-04-04.09-06-56.mp4

Record 20.

Screencast.From.2026-04-04.09-09-18.mp4

Record 21.

Screencast.From.2026-04-04.09-15-24.mp4

Record 22.

Screencast.From.2026-04-04.10-10-40.mp4

Record 23.

Screencast.From.2026-04-04.10-45-51.mp4

Record 24:

Screencast.From.2026-04-05.07-53-13.mp4

@melvin-bot

melvin-bot Bot commented Mar 16, 2026

Copy link
Copy Markdown

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

@marufsharifi marufsharifi mentioned this pull request Mar 16, 2026
Closed
53 tasks done
@codecov

codecov Bot commented Mar 16, 2026 •
edited by github-actions Bot
Loading

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/CONST/index.ts 93.65% <ø> (ø)
.../components/CountryPicker/CountrySelectorModal.tsx 100.00% <100.00%> (+100.00%) ⬆️
src/components/PushRowWithModal/PushRowModal.tsx 100.00% <100.00%> (+100.00%) ⬆️
src/components/SelectionList/BaseSelectionList.tsx 65.61% <100.00%> (+0.15%) ⬆️
src/components/StatePicker/StateSelectorModal.tsx 100.00% <100.00%> (+100.00%) ⬆️
src/components/ValuePicker/ValueSelectionList.tsx 100.00% <100.00%> (+100.00%) ⬆️
src/components/ValuePicker/ValueSelectorModal.tsx 100.00% <ø> (+100.00%) ⬆️
...le/PersonalDetails/DynamicCountrySelectionPage.tsx 93.75% <100.00%> (+93.75%) ⬆️
...ngs/Profile/PersonalDetails/StateSelectionPage.tsx 76.19% <100.00%> (+76.19%) ⬆️
src/pages/settings/Wallet/CountrySelectionList.tsx 100.00% <100.00%> (+100.00%) ⬆️
... and 3 more
... and 21 files with indirect coverage changes

linhvovan29546
linhvovan29546 suggested changes Mar 17, 2026
View reviewed changes

@linhvovan29546 linhvovan29546 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! Could you please prioritize this one so we can hopefully merge it today?

Comment thread src/hooks/useInitialSelection.ts
Comment thread src/hooks/useInitialSelection.ts
Comment thread src/pages/workspace/companyCards/addNew/SelectCountryStep.tsx Outdated
Comment thread src/components/CountryPicker/CountrySelectorModal.tsx Outdated
Comment thread src/components/PushRowWithModal/PushRowModal.tsx Outdated
Comment thread src/components/StatePicker/StateSelectorModal.tsx Outdated
Comment thread src/components/ValuePicker/ValueSelectionList.tsx Outdated
linhvovan29546
linhvovan29546 suggested changes Mar 17, 2026
View reviewed changes

@linhvovan29546 linhvovan29546 left a comment •
edited
Loading

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.

@marufsharifi Could you also apply this change to the DynamicCountrySelectionPage, StateSelectionPage, CountrySelectionList and CountrySelection component?

@linhvovan29546

linhvovan29546 commented Mar 17, 2026

Copy link
Copy Markdown
Contributor

Bug: After removing/clearing the search, the selected item is no longer highlighted.

Screen.Recording.2026-03-17.at.16.10.56.mov

@linhvovan29546

linhvovan29546 commented Mar 17, 2026

Copy link
Copy Markdown
Contributor

Bug: After clearing the search, the selection list automatically scrolls

Screen.Recording.2026-03-17.at.16.12.03.mov

linhvovan29546
linhvovan29546 suggested changes Mar 17, 2026
View reviewed changes
Comment thread src/components/CountryPicker/CountrySelectorModal.tsx Outdated
@marufsharifi

marufsharifi commented Mar 23, 2026

Copy link
Copy Markdown
Contributor Author

Sorry for the delay i was OOO, i will update here today. Thanks.

@marufsharifi
marufsharifi marked this pull request as ready for review March 30, 2026 03:21
@marufsharifi
marufsharifi requested review from a team as code owners March 30, 2026 03:21
@melvin-bot
melvin-bot Bot requested review from linhvovan29546 and removed request for a team March 30, 2026 03:21
@melvin-bot

melvin-bot Bot commented Mar 30, 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 requested review from trjExpensify and removed request for a team March 30, 2026 03:21
@marufsharifi
refactor: rename useInitialSelection hook and simplify single-value c…
be13995 
…allers

Rename useInitialSelectionRef to useInitialSelection to match its reactive
state return value, add a clarifying comment about why the snapshot only
resets on open/focus boundaries, and switch the current single-selection
picker callers to pass scalar values instead of string arrays.
@marufsharifi
fix: keep picker focus sync aligned with debounced search state
2be0c60 
Pass the debounced search value into SelectionList focus synchronization for
the basic picker flows so search-clear transitions use the same state that
drives the rendered data.
@marufsharifi

marufsharifi commented Mar 30, 2026

Copy link
Copy Markdown
Contributor Author

Bug: After removing/clearing the search, the selected item is no longer highlighted.

Screen.Recording.2026-03-17.at.16.10.56.mov

Fixed.

Root cause was that the picker data was driven by debouncedSearchValue, but the shared SelectionList focus-sync logic was still reacting to the live input value. During search clear, that mismatch could drop focus before the full list had actually returned, which made the selected row stop looking highlighted even though it was still selected.

I updated the affected first-PR pickers to pass the debounced search value into the shared focus-sync path, and added a focused regression test around useSearchFocusSync.

@marufsharifi

marufsharifi commented Mar 30, 2026

Copy link
Copy Markdown
Contributor Author

Bug: After clearing the search, the selection list automatically scrolls

Screen.Recording.2026-03-17.at.16.12.03.mov

Also fixed.

This turned out to have the same root cause as the first regression. The picker data was built from debouncedSearchValue, while the shared focus-sync logic was still reacting to the live input value. When clearing search one character at a time and waiting after each step, focus/scroll updates could run against stale filtered data before the full list had actually returned, which caused the visible jump.

Aligning the focus-sync path with the debounced search state fixed that transition as well.

@marufsharifi
fix: extend basic picker reopen ordering to dynamic country and state…
3acb38b 
… flows

Apply the initial-selection snapshot and reopen-only ordering behavior to
the dynamic profile country/state pickers and the shared wallet country
selection list. Search results now keep their natural filtered order while
focus sync follows the debounced search value, and the wallet country list
matches the no-focus-scroll behavior used in the first picker slice.
@marufsharifi
refactor: limit new picker memoization and preserve existing behavior
bd70341 
Keep the pre-existing memoization already present on main, but avoid the new
manual useMemo patterns introduced in this picker-ordering work where they
are not needed.
@marufsharifi
fix: align SelectCountryStep country options with selection list types
c9189b5 
Include `isSelected` on the base country options used by
`SelectCountryStep` so the reordered and searched lists satisfy the shared
`searchOptions` option shape, and update the test to select a real rendered
row instead of constructing a narrower list item.
@marufsharifi

marufsharifi commented Mar 30, 2026

Copy link
Copy Markdown
Contributor Author

@linhvovan29546, sorry for the delay. I've addressed all your comments, and I am completing the PR Author checklist. You can continue your review. thanks.

trjExpensify
trjExpensify reviewed Mar 30, 2026
View reviewed changes

@trjExpensify trjExpensify 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.

Please add tests. Also, CC: @Expensify/design as I think ya'll will want eyes on this one!

@melvin-bot
melvin-bot Bot requested a review from srikarparsi March 31, 2026 07:25
@marufsharifi

marufsharifi commented Mar 31, 2026

Copy link
Copy Markdown
Contributor Author

I am still testing; it needs more testing on all platforms. @srikarparsi, you can review the codes, but please wait until I finish testing, then merge. thanks.

@srikarparsi

srikarparsi commented Apr 3, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot can you please review this PR

@MelvinBot

MelvinBot commented Apr 3, 2026

Copy link
Copy Markdown
Contributor

Overall this is a well-structured PR. The useInitialSelection hook, SelectionListOrderUtils, and searchValueForFocusSync prop compose nicely to solve the ordering problem across all picker components. Tests are thorough. A few items:

1. initialSelectedValues defeats useMemo in ValueSelectionList

In ValueSelectionList.tsx, initialSelectedValues is a new array reference every render:

const initialSelectedValues = initialSelectedValue ? [initialSelectedValue] : [];
// ...
const options = useMemo(() => { ... }, [initialSelectedValues, items, selectedItem?.value]);

Since [initialSelectedValue] creates a fresh array each render, useMemo will always recompute (arrays are compared by reference). Consider memoizing this, e.g.:

const initialSelectedValues = useMemo(() => (initialSelectedValue ? [initialSelectedValue] : []), [initialSelectedValue]);

The same pattern exists in the other picker components (CountrySelectorModal, PushRowModal, etc.), but there initialSelectedValues is used in direct calls rather than useMemo deps, so it's less impactful — still worth making consistent though.

2. moveInitialSelectionToTopByKey is exported but unused

moveInitialSelectionToTopByKey in SelectionListOrderUtils.ts is only referenced in the unit test. If it's intended for future use, that's fine — just flagging it.

3. Minor: shouldSyncSelection / isEqual options are unused

useInitialSelection accepts shouldSyncSelection and isEqual options, but no caller uses them in this PR. If these are for a known upcoming use case, fine to keep. Otherwise they add surface area to the hook API that isn't exercised.

Everything else looks good — the debounced search value decoupling via searchValueForFocusSync, the threshold-gated reordering, and the focus sync test coverage are all solid.

@linhvovan29546

linhvovan29546 commented Apr 3, 2026

Copy link
Copy Markdown
Contributor

@marufsharifi Any updates? I don’t see the issue on my end.

@marufsharifi

marufsharifi commented Apr 3, 2026

Copy link
Copy Markdown
Contributor Author

@linhvovan29546, I've finished testing. I will check the latest comment. and finalize today. thanks.

@marufsharifi
Merge branch 'main' into fix/initial-selection-ordering-basic-pickers
d36078f
@marufsharifi
refactor: simplify initial selection hook and memo deps
0138ea8 
Avoid rebuilding `ValueSelectionList` options on every render by depending on
the scalar initial selection value instead of a freshly created array, and
trim the unused `shouldSyncSelection` / `isEqual` options from
`useInitialSelection`.
@marufsharifi
fixed lint error
00a7f22
@marufsharifi

marufsharifi commented Apr 5, 2026

Copy link
Copy Markdown
Contributor Author

@srikarparsi, I've addressed all the comments and finished testing on all platforms. Could you please take another look? thanks.

@marufsharifi

marufsharifi commented Apr 8, 2026

Copy link
Copy Markdown
Contributor Author

@srikarparsi, could you please take another look. thanks.

@srikarparsi

srikarparsi commented Apr 8, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot can you please review this PR

@MelvinBot

MelvinBot commented Apr 8, 2026

Copy link
Copy Markdown
Contributor

This is a well-structured PR. The approach of capturing the initial selection at open-time via useInitialSelection and reordering with SelectionListOrderUtils is clean, and applying it consistently across all picker components is the right call. Tests are thorough. A few observations:

Looks good:

  • The useInitialSelection hook correctly separates "what was selected when the picker opened" from "what is currently selected", preventing list reordering mid-session
  • The threshold constant (MOVE_SELECTED_ITEMS_TO_TOP_OF_LIST_THRESHOLD: 8) avoids unnecessary reordering on short lists
  • searchValueForFocusSync prop is a clean way to decouple debounced search from the text input value without breaking existing callers (defaults to textInputOptions?.value)
  • The switch from item === selectedItem (object identity) to item.value === selectedItem?.value (value comparison) in ValueSelectionList is a subtle improvement

Minor observations (non-blocking):

  1. useInitialSelection — resetDeps as an effect dependency array: The eslint-disable is justified here, but callers must pass a stable array literal (e.g., [isVisible]). If a caller ever passes a dynamically-constructed array, this would infinite-loop. All current call sites are correct.
  2. DynamicCountrySelectionPage now uses useDebouncedState: This is a behavior change from the immediate useState it had before. It aligns with all the other pickers, so this seems intentional and fine — just flagging it since it's not mentioned in the PR description.

No blockers from my side. 👍

@srikarparsi
srikarparsi merged commit 00fa1e0 into Expensify:main Apr 8, 2026
45 checks passed
@github-actions

github-actions Bot commented Apr 8, 2026

Copy link
Copy Markdown
Contributor

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

@github-actions

github-actions Bot commented Apr 8, 2026

Copy link
Copy Markdown
Contributor

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

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-00fa1e0-ea22b72-fa8996ee327d7dfc1c30c4710dcc06c2513e4005/index.html https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-00fa1e0-ea22b72-c99f999354d7806892d54f86a220f47ed49c8820/index.html
Android iOS
Web 🕸️
https://85447.pr-testing.expensify.com
Web

👀 View the workflow run that generated this build 👀

@OSBotify OSBotify mentioned this pull request Apr 9, 2026
Closed
66 tasks done
@OSBotify

OSBotify commented Apr 9, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/srikarparsi in version: 9.3.55-0 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot

MelvinBot commented Apr 9, 2026

Copy link
Copy Markdown
Contributor

No help site changes are required for this PR.

This PR fixes a UI behavior bug (scroll positioning and ordering of selected items in basic pickers like country/state selectors). It does not introduce new features, change terminology, modify workflows, or alter any user-facing labels or settings that would be documented in help articles under docs/articles.

@mitarachim mitarachim mentioned this pull request Apr 9, 2026
Closed
3 of 7 tasks
@mitarachim

mitarachim commented Apr 9, 2026

Copy link
Copy Markdown

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

@jponikarchuk jponikarchuk mentioned this pull request Apr 9, 2026
Closed
2 of 7 tasks
@jponikarchuk

jponikarchuk commented Apr 9, 2026

Copy link
Copy Markdown

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

@jponikarchuk jponikarchuk mentioned this pull request Apr 9, 2026
Open
5 of 8 tasks
@srikarparsi srikarparsi mentioned this pull request Apr 9, 2026
Merged
@OSBotify

OSBotify commented Apr 10, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/srikarparsi in version: 9.3.57-0 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot

MelvinBot commented Apr 10, 2026

Copy link
Copy Markdown
Contributor

No help site changes are required.

This PR is a UI behavior fix that stabilizes list ordering in basic pickers (country, state, and value selection lists). It moves the selected item to the top when a picker reopens, prevents scrolling on selection, and preserves the highlight after clearing search.

The help site articles under docs/articles do not document this level of picker interaction detail, so no documentation updates are needed.

@OSBotify

OSBotify commented Apr 10, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.57-1 🚀

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

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

Reviewers

@trjExpensify trjExpensify trjExpensify left review comments
+2 more reviewers
@srikarparsi srikarparsi srikarparsi approved these changes
@linhvovan29546 linhvovan29546 linhvovan29546 approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@marufsharifi marufsharifi

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@marufsharifi @linhvovan29546 @dubielzyk-expensify @shawnborton @srikarparsi @MelvinBot @OSBotify @mitarachim @jponikarchuk @trjExpensify