Skip to content

Scroll the workspace list to the top after creating the first workspace - #93200

Merged
JS00001 merged 14 commits into
Expensify:mainfrom
wildan-m:wildan/92475-table-scroll-reset-empty-to-populated
Jun 23, 2026
Merged

JS00001 merged 14 commits into
Expensify:mainfrom
wildan-m:wildan/92475-table-scroll-reset-empty-to-populated

Conversation

@wildan-m

@wildan-m wildan-m commented Jun 10, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

On a short (landscape) viewport, the first workspace created on an account that previously had none isn't visible in the Workspaces list until you scroll up — it sits hidden under the sticky "Workspaces" section header.

While the list is empty its content (the empty-state illustration) is taller than a short screen, so reaching the New workspace button means scrolling the list down. Creating the workspace navigates to the new workspace and back; on web the back-navigation restores that scrolled offset, and because the now-populated list is short, the single new row ends up scrolled underneath the sticky header.

The fix resets the list to the top in WorkspacesListPage when it goes from empty to populated and the page is focused, re-asserting after the navigation transition so it wins over the restored scroll offset. Lists that were already populated are left untouched (scroll position is preserved), so no other flow changes.

Fixed Issues

$ #92475
PROPOSAL: #92475 (comment)

Tests

  1. Use an account that has no workspaces yet (so the Workspaces list is empty).
  2. Open the app and go to Settings > Workspaces — confirm the empty state is shown. (On web / mWeb you can go straight to the /workspaces route instead of navigating through Settings.)
  3. Put the app in landscape orientation so the empty-state content is taller than the screen. (On web, resize the window to a short, wide height to mimic a landscape phone.)
  4. Tap New workspace, complete creation, then go back to the Workspaces list.
  5. Verify the newly created workspace appears at the top of the list and is visible immediately, without having to scroll.
  6. Create a second workspace and return to the list; verify the list is not forced back to the top — only the first (empty → populated) transition resets the scroll.
  7. Verify that no errors appear in the JS console.

Note — pre-existing, unrelated to this PR: In mWeb on landscape, two FABs overlap the workspace button behind them (they should sit on the right, like native). This is a separate layout issue not introduced by this change, reported in Slack: https://expensify.slack.com/archives/C01GTK53T8Q/p1781226613358879

Offline tests

This change only adjusts the list's scroll position on the client when data first appears. It has no network dependency and behaves identically online and offline.

QA Steps

Same as the Tests above.

  • 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
    • 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
Kapture.2026-06-12.at.07.59.16.mp4
Android: mWeb Chrome
Kapture.2026-06-12.at.08.00.21.mp4
iOS: Native
Kapture.2026-06-12.at.08.06.55.mp4
iOS: mWeb Safari Screenshot 2026-06-12 at 08 07 36
MacOS: Chrome / Safari
Kapture.2026-06-12.at.08.01.41.mp4

wildan-m added 5 commits June 5, 2026 05:15
…fer a frame

Key the reset off the unfiltered data count instead of the processed length so
that clearing a search or filter from a zero-result state no longer snaps the
list back to the top — only real data arriving (such as creating the first
workspace) triggers it. Defer the scroll to the next frame so it runs after the
list has laid out the newly added first row rather than racing that render.
…scroll-reset-empty-to-populated

# Conflicts:
#	src/components/Table/TableBody.tsx
@marufsharifi

Copy link
Copy Markdown
Contributor

@wildan-m, when will the PR be ready for review? thanks.

@marufsharifi

Copy link
Copy Markdown
Contributor

@wildan-m, do you need any help here?

@wildan-m

Copy link
Copy Markdown
Contributor Author

@marufsharifi I'm still trying to fix the mweb, but it doesn't work as expected—only half of the workspace list items are displayed.

image

wildan-m added 2 commits June 11, 2026 23:59
On mobile web the scroll-to-top reset was being undone by the browser's CSS
scroll anchoring: as the stretched empty state collapses and FlashList measures
the new rows, the browser re-anchors the scroll position, leaving the newly
created first row half-hidden until the user scrolls up. Opt the FlashList
scroll container out of scroll anchoring on web so the reset sticks.
@codecov

codecov Bot commented Jun 11, 2026 •

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/pages/workspace/WorkspacesListPage.tsx 69.44% <70.00%> (+68.42%) ⬆️
... and 242 files with indirect coverage changes

…workspace

The empty workspaces list is tall (illustration) and gets scrolled down to reach the
'New workspace' button in landscape. Creating the first workspace navigates to it and
back; on web the back-navigation restores that scroll offset, leaving the new row hidden
under the sticky section header. Scroll the list to the top when it goes from empty to
populated and the page is focused, re-asserting after the transition so the reset wins
over the restored offset.

Drops the earlier web scroll-anchoring tweak, which did not address the restored scroll.
@wildan-m
wildan-m force-pushed the wildan/92475-table-scroll-reset-empty-to-populated branch from a452a5a to 305bc9e Compare June 12, 2026 00:30
@wildan-m
wildan-m marked this pull request as ready for review June 12, 2026 01:22
@wildan-m
wildan-m requested review from a team as code owners June 12, 2026 01:22
@melvin-bot
melvin-bot Bot requested review from marufsharifi and removed request for a team June 12, 2026 01:22
@melvin-bot

melvin-bot Bot commented Jun 12, 2026

Copy link
Copy Markdown

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

Comment thread tests/ui/TableTest.tsx Resolved
Comment thread tests/ui/TableTest.tsx Resolved

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 305bc9e4a8

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

Comment thread src/components/Table/TableBody.tsx Resolved
…Page focus reset

The TableBody empty-to-populated reset duplicated the WorkspacesListPage one and had a race:
a data-length update before the queued frame cancelled the only scrollToOffset with no
reschedule. It was also redundant — the WorkspacesListPage focus reset already fixes the
workspace list (on web TableBody's reset fired while the screen was backgrounded, so the
scroll restore overrode it anyway). Revert TableBody and its tests to main.
@wildan-m wildan-m changed the title Reset table list scroll to top when data goes from empty to populated Scroll the workspace list to the top after creating the first workspace Jun 12, 2026
@marufsharifi

marufsharifi commented Jun 15, 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 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 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 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.
  • 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
Screenshot 2026-06-17 at 12 01 07 AM
Android: mWeb Chrome
Screenshot_1405-03-26_at_10 56 24_PM
iOS: HybridApp
Screenshot 1405-03-27 at 8 13 56 PM
iOS: mWeb Safari
Screenshot_1405-03-26_at_11 04 07_PM
MacOS: Chrome / Safari
Screenshot 2026-06-17 at 12 51 30 AM

@arekm213 arekm213 mentioned this pull request Jun 15, 2026
@marufsharifi

Copy link
Copy Markdown
Contributor

Code changes looks good, i am still testing.

@melvin-bot
melvin-bot Bot requested a review from JS00001 June 18, 2026 11:35
@marufsharifi

Copy link
Copy Markdown
Contributor

LGTM!

}
wasWorkspaceListEmptyRef.current = false;
tableRef.current?.scrollToOffset({offset: 0, animated: false});
const handle = TransitionTracker.runAfterTransitions({

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 are we calling scrollToOffset twice?

@wildan-m wildan-m Jun 20, 2026 •

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@JS00001 Good catch. the synchronous call was redundant (overridden by the scroll the back-navigation restores), so it's now just the runAfterTransitions reset that lands after that restore.

wildan-m added 2 commits June 20, 2026 10:32
…n reset

The synchronous scrollToOffset was overridden by the scroll restore during the back-navigation
anyway, so only the runAfterTransitions reset (which lands after that restore) was doing the
work. Keep a single call.
@JS00001

JS00001 commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

@marufsharifi the reviewer checklist isnt completed. Can you also please re-check the behavior after latest commit?

@marufsharifi

Copy link
Copy Markdown
Contributor

@JS00001, I re-tested it on all devices and flows; it works

@marufsharifi

Copy link
Copy Markdown
Contributor

It seems the checklist has changed; I will re-fill it in a few minutes. thanks.

@marufsharifi

Copy link
Copy Markdown
Contributor

@JS00001, re-filled the checklist; it may pass after re-running the actions. thanks.

@marufsharifi

Copy link
Copy Markdown
Contributor

@wildan-m, could you please merge the main. thanks.

@JS00001

JS00001 commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

jest is failing

@wildan-m

Copy link
Copy Markdown
Contributor Author

@JS00001 seems that regression from main, my change not related to emoji

@JS00001

JS00001 commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

lets see if someone fixes it on main

@wildan-m

Copy link
Copy Markdown
Contributor Author

@JS00001 @marufsharifi all green

@JS00001
JS00001 merged commit 9b6f2bb into Expensify:main Jun 23, 2026
33 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify OSBotify mentioned this pull request Jun 23, 2026
48 tasks done
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/JS00001 in version: 9.4.18-0 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 No help site changes required.

This PR is a client-side scroll-position fix in src/pages/workspace/WorkspacesListPage.tsx: when an empty Workspaces list gains its first workspace, it resets the list to the top so the new row isn't hidden under the sticky section header after returning from the create flow.

It changes behavior only — no new feature, no UI copy, no settings/labels/buttons, and no change to any documented user-facing flow. The relevant help articles (e.g. Create-a-company-workspace.md) describe the steps to create a workspace, which are unchanged here; none document list scroll position or empty-state layout. So there's nothing to update under App/docs/articles, and no draft docs PR was created.

If you believe a specific article should call out this behavior, let me know which one and I'll draft the update.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/blimpich in version: 9.4.18-2 🚀

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants