Skip to content

fix: stabilize reopen ordering in basic pickers#87700

Open
marufsharifi wants to merge 12 commits intoExpensify:mainfrom
marufsharifi:fix/preselected-items-to-top
Open

fix: stabilize reopen ordering in basic pickers#87700
marufsharifi wants to merge 12 commits intoExpensify:mainfrom
marufsharifi:fix/preselected-items-to-top

Conversation

@marufsharifi
Copy link
Copy Markdown
Contributor

@marufsharifi marufsharifi commented Apr 11, 2026 •
edited
Loading

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
Copy link
Copy Markdown

melvin-bot Bot commented Apr 11, 2026

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

@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 11, 2026 •
edited by github-actions Bot
Loading

Codecov Report

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

Files with missing lines Coverage Δ
src/CONST/index.ts 92.30% <ø> (ø)
.../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 22 files with indirect coverage changes

@marufsharifi marufsharifi changed the title Fix: Move pre-selected list items to top throughout the app fix: stabilize reopen ordering in basic pickers Apr 12, 2026
@marufsharifi
Merge branch 'main' into fix/preselected-items-to-top
1765080
@marufsharifi
fix: reset make-payments country list on re-entry
3356b6d 
Force the wallet make-payments country selector to remount its
CountrySelectionList before navigating away so the list returns at the top
with the selected country already pinned in place
@marufsharifi
fix: keep selected country highlighted in company card picker
5760875 
Restore click-driven focused-index updates for the company card country
selection step so a searched country remains highlighted after it is
selected, without reintroducing scroll-on-select behavior.
@marufsharifi marufsharifi marked this pull request as ready for review April 13, 2026 14:14
@marufsharifi marufsharifi requested review from a team as code owners April 13, 2026 14:14
@melvin-bot melvin-bot Bot requested review from flaviadefaria and linhvovan29546 and removed request for a team April 13, 2026 14:14
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented Apr 13, 2026

@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 a team and srikarparsi and removed request for a team April 13, 2026 14:14
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented Apr 13, 2026

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

@flaviadefaria
Copy link
Copy Markdown
Contributor

flaviadefaria commented Apr 13, 2026

No new product considerations - removing my assignment and unsubscribing.

@flaviadefaria flaviadefaria removed their request for review April 13, 2026 16:14
@linhvovan29546
Copy link
Copy Markdown
Contributor

linhvovan29546 commented Apr 14, 2026

@marufsharifi The unit test failed.

Could you please let me know the changes needed to fix these issue below?

#87461
#87454

@marufsharifi
Merge branch 'main' into fix/preselected-items-to-top
c28b48d
@marufsharifi
fix: keep selected country highlighted after selection
e361515 
Restore focused-index updates in the company card country picker so a
searched country stays highlighted when selected, while keeping the list
from scrolling on selection.
@marufsharifi
updated the test accordingly
b498637
@marufsharifi
Copy link
Copy Markdown
Contributor Author

marufsharifi commented Apr 15, 2026

@marufsharifi The unit test failed.

Could you please let me know the changes needed to fix these issue below?

#87461 #87454

I tracked both regressions back to the focus behavior we changed in this PR and addressed them in follow-up commits on this branch.

For #87461:

  • I restored shouldUpdateFocusedIndex in SelectCountryStep so a searched country stays highlighted after it is selected, while still keeping shouldScrollToFocusedIndex={false} and shouldScrollToFocusedIndexOnMount={false} to avoid scroll-on-select.
  • I updated the related expectation in tests/ui/SelectCountryStepTest.tsx.

For #87454
Fixed the back-navigation behavior in BankAccountPurposePage/substeps/CountrySelection by resetting the country-list instance on re-entry, so the screen returns with the selected country already pinned at the top.

@marufsharifi
Copy link
Copy Markdown
Contributor Author

marufsharifi commented Apr 15, 2026

@linhvovan29546, Could you please take another look, pr is ready for your review. thanks.

linhvovan29546
linhvovan29546 suggested changes Apr 17, 2026
View reviewed changes
Comment thread src/pages/settings/Wallet/BankAccountPurposePage/substeps/CountrySelection.tsx Outdated

return (
<CountrySelectionList
key={countryListInstanceID}
Copy link
Copy Markdown
Contributor

@linhvovan29546 linhvovan29546 Apr 17, 2026

Choose a reason for hiding this comment

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

Did you try other approaches? I don’t think this is a good way to fix it.

Copy link
Copy Markdown
Contributor Author

@marufsharifi marufsharifi Apr 18, 2026

Choose a reason for hiding this comment

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

@linhvovan29546, I looked into non-remount options, and I see three realistic approaches here:

  1. Reset the preserved scroll offset through the existing screen/substep lifecycle
  • Instead of forcing a React remount, we can try to hook into the Make payments step re-entry and explicitly reset the list position when returning to the country step.
  • I think this is the cleanest non-remount direction, assuming the current step architecture gives us a reliable re-entry signal and a good place to reset the viewport.
  1. Hide/defer the list until the viewport is restored
  • Keep the same screen instance, but avoid rendering the visible list until the selected country is pinned and the viewport is corrected.
  • This would prevent the user from seeing the jump, but it adds extra complexity and feels more like masking the issue than fixing the underlying behavior.
  1. Restore the position imperatively with scrollToIndex
  • This works functionally, but the user can still see the list scrolling back to the top after the screen becomes visible, which is not the intended UX.

Video of the scrollToIndex behavior:

Screen.Recording.1405-01-29.at.5.26.48.PM.mov

@linhvovan29546, could you please help me decide which approach to choose?

Copy link
Copy Markdown
Contributor

@linhvovan29546 linhvovan29546 Apr 20, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

@marufsharifi I’m not certain about this. We can confirm with the design team.

Copy link
Copy Markdown
Contributor

@linhvovan29546 linhvovan29546 Apr 20, 2026

Choose a reason for hiding this comment

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

@marufsharifi Could you please add the recording for 1 and 2 here? so we can review

Copy link
Copy Markdown
Contributor Author

@marufsharifi marufsharifi Apr 21, 2026

Choose a reason for hiding this comment

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

@linhvovan29546, I will provide them asap. thanks.

Copy link
Copy Markdown
Contributor

@linhvovan29546 linhvovan29546 Apr 23, 2026

Choose a reason for hiding this comment

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

i only use this one const initialSelectedValue = useInitialSelection(selectedCountry ?? undefined, {resetOnFocus:true});

Copy link
Copy Markdown
Contributor

@linhvovan29546 linhvovan29546 Apr 23, 2026

Choose a reason for hiding this comment

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

Ah, I can still reproduce it when scroll

Copy link
Copy Markdown
Contributor Author

@marufsharifi marufsharifi Apr 23, 2026

Choose a reason for hiding this comment

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

@linhvovan29546, I simplified this.

Instead of coordinating the restore cycle from CountrySelection with an extra version prop, the reset now lives entirely in CountrySelectionList:

  • CountrySelection only opts into the behavior with a boolean flag
  • CountrySelectionList uses its own focus lifecycle plus the existing SelectionList ref to reset the viewport on refocus after the initial mount

That keeps the fix local to the component that owns the list behavior, removes the parent focus/version plumbing, and still avoids the key remount workaround.

Copy link
Copy Markdown
Contributor

@linhvovan29546 linhvovan29546 Apr 23, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

Why not use a simpler approach like this?

 useLayoutEffect(() => {
    if(initialSelectedValue){
  selectionListRef.current?.scrollToIndex(0);
   }
}, [initialSelectedValue]);

Copy link
Copy Markdown
Contributor Author

@marufsharifi marufsharifi Apr 23, 2026

Choose a reason for hiding this comment

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

@linhvovan29546, I kept the same direction, but added a small guard.

The raw effect was calling scrollToIndex(0) on the initial render whenever initialSelectedValue was already truthy, and that could happen before FlashList layout was ready in this flow. In practice that caused the LayoutManager is not initialized, window size is unavailable error.

So I changed it to only run when initialSelectedValue changes after mount, which keeps the behavior on return to the country step but avoids the initial-render crash.

@marufsharifi
Merge branch 'main' into fix/preselected-items-to-top
fc89ee8
@marufsharifi
refactor: replace wallet country list remount with focus-driven reset
947a146 
Remove the make-payments country picker remount workaround and restore the
list through the existing screen focus lifecycle instead. The wallet
country list now refreshes its pinned selection snapshot on explicit
re-entry and resets the viewport with the existing SelectionList ref once
the selected country is back at the top.

Also add focused UI coverage for the wallet restore cycle.
@marufsharifi
refactor: simplify wallet country picker viewport reset
16d0083 
Replace the wallet make-payments country picker’s parent-managed restore
flow with a simpler list-owned focus reset. The country step now only opts
into viewport restoration, while `CountrySelectionList` handles the
refocus reset through its own lifecycle and existing `SelectionList` ref.

Also update the focused wallet tests to cover the simplified behavior.
@marufsharifi
fix: guard wallet country list scroll reset after mount
08a43e4 
Only reset the wallet country picker viewport when the pinned initial
selection changes after mount. This avoids calling `scrollToIndex(0)`
during the initial render, which could hit FlashList before layout is
ready and trigger the LayoutManager initialization error.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@srikarparsi srikarparsi Awaiting requested review from srikarparsi

1 more reviewer

@linhvovan29546 linhvovan29546 linhvovan29546 requested changes

Reviewers whose approvals may not affect merge requirements

At least 1 approving review is required to merge this pull request.

Assignees

@marufsharifi marufsharifi

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@marufsharifi @flaviadefaria @linhvovan29546