fix: save the scroll position in workspace list screen by truph01 · Pull Request #77313 · Expensify/App

truph01 · 2025-12-11T04:38:52Z

Explanation of Change

Implement scroll position preservation for WorkspacesListPage using the existing ScrollOffsetContext.

Fixed Issues

$ #76271
PROPOSAL: #76271 (comment)

Tests

Log in to the app
Tap on the Workspace tab
Scroll down to the bottom
Tap on any workspace
Swipe back
Verify: The app retains the previous scroll position after swiping back.

Verify that no errors appear in the JS console

Offline tests

QA Steps

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

Screenshots/Videos

Android: Native

Screen.Recording.2025-12-11.at.14.22.41.mov

Android: mWeb Chrome

Screen.Recording.2025-12-11.at.11.35.05.mov

iOS: Native

Screen.Recording.2025-12-11.at.14.18.06.mov

iOS: mWeb Safari

Screen.Recording.2025-12-11.at.11.30.15.mov

MacOS: Chrome / Safari

Screen.Recording.2025-12-11.at.11.24.41.mov

melvin-bot · 2025-12-11T04:39:07Z

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

codecov · 2025-12-11T04:47:31Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/components/ScrollOffsetContextProvider.tsx	`50.00% <100.00%> (+3.84%)`	⬆️
src/pages/workspace/WorkspacesListPage.tsx	`76.87% <80.00%> (+0.10%)`	⬆️
... and 11 files with indirect coverage changes

rojiphil · 2025-12-12T13:56:05Z

@truph01 Thanks for the PR.

The android version does not work fine for me.
Can you please check if it works with more number of workspaces?

77313-android-hybrid-issue-001.mp4

joekaufmanexpensify

Change is fine from a product perspective

truph01 · 2025-12-16T09:19:55Z

@rojiphil In your video, how many workspaces do you have?

rojiphil · 2025-12-16T10:06:12Z

In your video, how many workspaces do you have?

@truph01 Around 33 workspaces.

truph01 · 2025-12-22T11:03:27Z

On it now

truph01 · 2025-12-23T20:27:25Z

@rojiphil I've updated the PR. Here's the result when testing with an account that has more than 35 workspaces:

Screen.Recording.2025-12-24.at.03.26.01.mov

truph01 · 2025-12-30T09:22:20Z

@rojiphil Please help re-review this PR once you have a chance.

rojiphil · 2025-12-30T16:50:35Z

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 there are no new alerts related to the canBeMissing param for useOnyx
I verified proper code patterns were followed (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
- 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 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)
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
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- 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
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- 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 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 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.
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

77313-android-hybrid-001.mp4

Android: mWeb Chrome

77313-mweb-chrome-001.mp4

iOS: HybridApp

77313-ios-hybrid-001.mp4

iOS: mWeb Safari

77313-mweb-safari-001.mp4

MacOS: Chrome / Safari

77313-web-chrome-001.mp4

rojiphil

Thanks @truph01 for the updates.

@francoisl Changes LGTM and works well too.
Over to you. Thanks.

francoisl · 2025-12-30T18:39:29Z

src/pages/workspace/WorkspacesListPage.tsx

                        keyboardShouldPersistTaps="handled"
                        contentContainerStyle={styles.pb20}
+                        onScroll={onScroll}
+                        initialNumToRender={data.length}


Is this going to cause the list to render all items on mount? If so, it might have a performance impact, can we add a comment that explains why it's needed?
Also is there no way to make this dynamic based on the window height or something?

Also is there no way to make this dynamic based on the window height or something?

Yeah… like this approach although the data may not be huge enough to worry about performance issues as we are dealing about workspaces
@truph01 Can we use window height like how we use here?

@truph01 Can we use window height like how we use here?

@rojiphil The initialNumToRender in the linked example

App/src/pages/home/report/ReportActionsList.tsx

Line 651 in 634b5ce

const initialNumToRender = useMemo((): number | undefined => {

is used to calculate an ideal number of report actions to render on the initial mount, purely to ensure the content fills the screen.

In my PR, initialNumToRender serves a different purpose: it’s required to handle scrolling correctly on the first render. Because of that, the number of items to render initially cannot be derived in the same way as in the referenced example.

Ok fair. Can we still add a comment that explains why it's needed though please? Otherwise someone might try to remove it thinking it's unnecessary, and cause a regression.

I added a comment. @rojiphil @francoisl, please help check.

OSBotify · 2026-01-07T22:09:21Z

✋ 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 · 2026-01-08T16:48:13Z

🚀 Deployed to staging by https://github.com/francoisl in version: 9.2.96-1 🚀

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

OSBotify · 2026-01-09T18:17:12Z

🚀 Deployed to production by https://github.com/arosiclair in version: 9.2.96-6 🚀

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

OSBotify · 2026-01-09T19:13:34Z

🚀 Deployed to production by https://github.com/arosiclair in version: 9.2.96-6 🚀

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

OSBotify · 2026-01-09T19:20:30Z

🚀 Deployed to production by https://github.com/arosiclair in version: 9.2.96-6 🚀

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

This reverts commit 9c9d631, reversing changes made to 6d0b574.

mountiny · 2026-02-10T12:18:16Z

@truph01 @rojiphil @francoisl fyi we are reverting this PR because https://expensify.slack.com/archives/C05LX9D6E07/p1770725362096819?thread_ts=1770670428.191389&cid=C05LX9D6E07

I think that this feature is not work the overhead it brings for customer with many workspaces

…-position-workspace-list [NoQA] Revert "Merge pull request #77313 from truph01/fix/76271"

…-position-workspace-list [NoQA] Revert "Merge pull request #77313 from truph01/fix/76271" (cherry picked from commit e79a8eb) (cherry-picked to staging by mountiny)

OSBotify · 2026-02-11T06:52:30Z

🚀 Deployed to staging by https://github.com/francoisl in version: 9.3.17-0 🚀

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

IuliiaHerets · 2026-02-11T13:02:00Z

Hi @truph01, QA team failed this PR on Web and Android with the original issue

1770794630964.77313A.mp4

1770794630966.77313w.mp4

mountiny · 2026-02-11T13:20:43Z

@IuliiaHerets this was reverted, so that is expected

mountiny · 2026-02-11T13:21:02Z

Checked it off some mistake in the checklist

OSBotify · 2026-02-12T15:22:08Z

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.17-9 🚀

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

fix: save the scroll position in workspace list screen

7342757

melvin-bot bot assigned truph01 Dec 11, 2025

truph01 marked this pull request as ready for review December 11, 2025 04:39

truph01 requested review from a team as code owners December 11, 2025 04:39

melvin-bot bot requested review from joekaufmanexpensify and rojiphil and removed request for a team December 11, 2025 04:39

truph01 added 2 commits December 11, 2025 14:04

fix: lint

53a15ed

Merge branch 'Expensify:main' into fix/76271

ce9dfaf

joekaufmanexpensify previously approved these changes Dec 12, 2025

View reviewed changes

Merge branch 'Expensify:main' into fix/76271

d75a8ba

truph01 added 2 commits December 23, 2025 23:46

Merge branch 'Expensify:main' into fix/76271

c7a0377

fix: make scroll work

924968c

truph01 dismissed joekaufmanexpensify’s stale review via 924968c December 23, 2025 20:25

Merge branch 'Expensify:main' into fix/76271

7d47b51

rojiphil approved these changes Dec 30, 2025

View reviewed changes

melvin-bot bot requested a review from francoisl December 30, 2025 16:52

francoisl reviewed Dec 30, 2025

View reviewed changes

merge main

d0b32c9

truph01 added 2 commits January 7, 2026 16:39

Merge branch 'Expensify:main' into fix/76271

6bf0e90

fix: add explaination

68bdaa0

francoisl approved these changes Jan 7, 2026

View reviewed changes

francoisl merged commit 9c9d631 into Expensify:main Jan 7, 2026
39 of 40 checks passed

OSBotify mentioned this pull request Jan 8, 2026

Deploy Checklist: New Expensify 2026-01-08 #79110

Closed

76 tasks

melvin-bot bot mentioned this pull request Jan 9, 2026

[$250] Workspace - Workspace page auto scroll to top after opening a domain and swipe back #76271

Open

8 tasks

TMisiukiewicz added a commit to callstack-internal/Expensify-App that referenced this pull request Feb 10, 2026

Revert "Merge pull request Expensify#77313 from truph01/fix/76271"

656f135

This reverts commit 9c9d631, reversing changes made to 6d0b574.

mountiny added a commit that referenced this pull request Feb 10, 2026

Merge pull request #81970 from callstack-internal/revert-77313-scroll…

e79a8eb

…-position-workspace-list [NoQA] Revert "Merge pull request #77313 from truph01/fix/76271"

OSBotify mentioned this pull request Feb 11, 2026

Deploy Checklist: New Expensify 2026-02-11 #82079

Closed

MelvinBot mentioned this pull request Mar 24, 2026

Restore workspace list scroll position after navigation #86158

Draft

52 tasks

Conversation

truph01 commented Dec 11, 2025 • edited by francoisl 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!

melvin-bot bot commented Dec 11, 2025

Uh oh!

codecov bot commented Dec 11, 2025 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

rojiphil commented Dec 12, 2025

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

truph01 commented Dec 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rojiphil commented Dec 16, 2025

Uh oh!

truph01 commented Dec 22, 2025

Uh oh!

truph01 commented Dec 23, 2025

Uh oh!

truph01 commented Dec 30, 2025

Uh oh!

rojiphil commented Dec 30, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

rojiphil left a comment

Choose a reason for hiding this comment

Uh oh!

francoisl Dec 30, 2025

Choose a reason for hiding this comment

Uh oh!

rojiphil Jan 2, 2026

Choose a reason for hiding this comment

Uh oh!

truph01 Jan 5, 2026

Choose a reason for hiding this comment

Uh oh!

francoisl Jan 5, 2026

Choose a reason for hiding this comment

Uh oh!

truph01 Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Jan 7, 2026

Uh oh!

OSBotify commented Jan 8, 2026

Uh oh!

OSBotify commented Jan 9, 2026

Uh oh!

OSBotify commented Jan 9, 2026

Uh oh!

OSBotify commented Jan 9, 2026

Uh oh!

mountiny commented Feb 10, 2026

Uh oh!

OSBotify commented Feb 11, 2026

Uh oh!

IuliiaHerets commented Feb 11, 2026

Uh oh!

mountiny commented Feb 11, 2026

Uh oh!

mountiny commented Feb 11, 2026

Uh oh!

OSBotify commented Feb 12, 2026

Uh oh!

Reviewers

Assignees

truph01 commented Dec 11, 2025 •

edited by francoisl

Loading

codecov bot commented Dec 11, 2025 •

edited by github-actions bot

Loading

truph01 commented Dec 16, 2025 •

edited

Loading