Merge `TabSelector` and `ScrollableTabSelector` by GCyganek · Pull Request #84132 · Expensify/App

GCyganek · 2026-03-04T12:28:49Z

Explanation of Change

Merging ScrollableTabSelector and TabSelector so that we have only one that has all features of the original component and scrolling capabilities of ScrollableTabSelector.

Changed behaviours are explained #84132 (comment) and were approved by the designers

Fixed Issues

$ #81338
PROPOSAL: N/A

Tests

Check if there are any regressions while using tabs selectors that can be accessed as described below. On web, narrow browser window so that there is an overflow to test scrolling and changing tabs:

New chat tab selector: FAB > Start chat

Share page tab selector:

On your phone open a random image from Files/Photos
Tap Share and select Expensify

Distance Request tab selector: FAB > Track distance

Create Expense tab selector: FAB > Create expense

SplitExpensePage:

Create a splittable expense
Open that expense
More > Split

Create expense tab selector with product training tooltip:

Prerequisites: new account (Scan training tooltip not dismissed yet)

FAB > Create expense
Tap Scan
Verify that it correctly shows the training tooltip

Create expense tab selector full labels and working scrolling when overflowing:

Prerequisites: default workspace with enabled Time expenses and Per diem (with some rates)

FAB > Create expense
Verify that all tabs have full labels even not selected ones
(continue on web:)
Narrow browser screen so that there is an overflow
Verify that scrolling and switching tabs works fine

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android-new-chat-selector-page.mov

android-iou-request-start-page-tooltip.mov

android-split-expense-page.mov

android-iou-request-start-page.mov

android-distance-request-start-page.mov

android-share-root-page.mov

Android: mWeb Chrome

iOS: Native

Screen.Recording.2026-03-05.at.17.17.35.mov

Screen.Recording.2026-03-05.at.17.18.04.mov

Screen.Recording.2026-03-05.at.17.18.22.mov

Screen.Recording.2026-03-05.at.17.19.24.mov

Screen.Recording.2026-03-05.at.17.20.27.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-03-05.at.17.09.58.mov

Screen.Recording.2026-03-05.at.17.12.34.mov

Screen.Recording.2026-03-05.at.17.13.08.mov

Screen.Recording.2026-03-05.at.17.13.25.mov

Screen.Recording.2026-03-05.at.17.14.56.mov

codecov · 2026-03-04T12:41:41Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
src/CONST/index.ts	`94.30% <ø> (ø)`
...stReportView/MoneyRequestReportTransactionList.tsx	`1.14% <ø> (ø)`
src/components/ScrollViewWithContext.tsx	`88.88% <100.00%> (-1.12%)`	⬇️
src/components/Search/SearchChartView.tsx	`6.38% <ø> (ø)`
src/components/Search/SearchList/index.tsx	`44.54% <ø> (ø)`
src/components/TabSelector/TabSelectorItem.tsx	`100.00% <100.00%> (ø)`
...components/TabSelector/scrollToTab/index.native.ts	`0.00% <ø> (ø)`
src/components/TabSelector/scrollToTab/index.ts	`0.00% <ø> (ø)`
src/libs/Navigation/DebugTabNavigator.tsx	`0.00% <ø> (ø)`
src/pages/iou/request/DistanceRequestStartPage.tsx	`0.00% <ø> (ø)`
... and 6 more
... and 8 files with indirect coverage changes

GCyganek · 2026-03-04T14:29:23Z

@Expensify/design I'm merging scrollable variant of the tab selector with the original variant, so that every tab selector now will be scrollable (if there is an overflow). I want to get your opinion on a few things here:

Sometimes in case where there is too many tabs, we hide tab labels to make sure they fit on the screen:

Do we want to keep doing that or do we want to have full labels now that we can scroll?

Screen.Recording.2026-03-04.at.15.13.43.mov

In case tabs do not fit on the screen and we have to scroll and there is a tab that has product training tooltip attached, the tooltip could stay at the same place while user is scrolling. Is this solution where I'm hiding the tooltip until user stops scrolling so that its position is calculated again before displayed again acceptable?

Screen.Recording.2026-03-04.at.15.15.35.mov

Also, the tooltip won't be shown if the tab is not fully visible:

Screen.Recording.2026-03-04.at.15.22.52.mov

Currently there is a logic that controls how the tooltip is displayed for a tab:

Compute horizontal shift for EducationalTooltip:

on desktop, ignore RHP bounds and center tooltip on the tab (no shift needed)

on mobile (aka small screen) center tooltip within the panel

I'm not sure if centering tooltip within the panel is the best idea as it looks like this in some cases:

I think it would look better if there was no shift:

I'm looking forward to your feedback!

dannymcclain · 2026-03-04T15:23:20Z

Do we want to keep doing that or do we want to have full labels now that we can scroll?

Full labels!

Is this solution where I'm hiding the tooltip until user stops scrolling so that its position is calculated again before displayed again acceptable?

This seems fine to me. Curious if the other designers have a different opinion.

Also, the tooltip won't be shown if the tab is not fully visible:

Yeah I think this makes sense to me too.

I'm not sure if centering tooltip within the panel is the best idea as it looks like this in some cases:
I think it would look better if there was no shift:

I agree - let's just make sure it looks right for all the cases/tabs (seems like maybe you've already done this)

Pretty stoked for this! Let's at least wait for @dubielzyk-expensify to get eyes on these questions/feedback as well.

dubielzyk-expensify · 2026-03-04T23:40:43Z

Yeah this is looking great! Wonderful attention to details @GCyganek !

Agree with everything Danny is saying 👍

Horizontal scroll on mobile is something we might have to revisit cause we might actually need a tiny arrow to see more there, but I think we can do that as a follow-up

trjExpensify · 2026-03-05T01:22:25Z

I might have missed something, but are we adding Distance back to Create expense? 🤔

dubielzyk-expensify · 2026-03-05T02:34:15Z

I might have missed something, but are we adding Distance back to Create expense? 🤔

No, I believe @GCyganek did this because of testing!? Cause yeah the top bar should only be manual, scan, per diem, time.

GCyganek · 2026-03-05T10:30:19Z

I might have missed something, but are we adding Distance back to Create expense? 🤔

No, I believe @GCyganek did this because of testing!? Cause yeah the top bar should only be manual, scan, per diem, time.

Yes, it's just for testing!

GCyganek · 2026-03-05T10:30:52Z

Horizontal scroll on mobile is something we might have to revisit cause we might actually need a tiny arrow to see more there, but I think we can do that as a follow-up

Sure!

melvin-bot · 2026-03-06T11:49:28Z

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

ZhenjaHorbach · 2026-03-06T12:11:36Z

@GCyganek
Do you need help with the review?

GCyganek · 2026-03-06T12:32:04Z

@GCyganek Do you need help with the review?

Would be great if you could test and review, yeah 🙏

trjExpensify · 2026-03-06T13:44:50Z

Yes, it's just for testing!

Phew 😂

trjExpensify

Agreed product change with design 👍

ZhenjaHorbach · 2026-03-06T15:28:31Z

src/components/TabSelector/TabSelectorBase.tsx

+            contentContainerStyle={{
+                flexGrow: 1,
+                paddingBottom: 12,
+                paddingHorizontal: 20,


Let's move this to src/styles/index.ts

ZhenjaHorbach · 2026-03-06T15:29:28Z

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

2026-03-06.17.10.24.mov

Android: mWeb Chrome

2026-03-06.17.12.38.mov

iOS: HybridApp

2026-03-06.17.10.24.mov

iOS: mWeb Safari

2026-03-06.17.12.38.mov

MacOS: Chrome / Safari

2026-03-06.17.07.00.mov

ZhenjaHorbach · 2026-03-06T16:15:42Z

src/components/TabSelector/TabSelectorBase.tsx

 import TabSelectorItem from './TabSelectorItem';
 import type {TabSelectorBaseProps} from './types';

+const MIN_SMOOTH_SCROLL_EVENT_THROTTLE = 16;


Actually, we use this value in a lot of places
scrollEventThrottle={16}
I think we can move this value to a constant file and update other places

ZhenjaHorbach · 2026-03-06T16:16:30Z

But overall changes look and work good!

ZhenjaHorbach · 2026-03-06T16:38:54Z

LGTM!

Julesssss · 2026-03-06T22:44:24Z

Ahh conflicts, that's unfortunate. Looking good though!

GCyganek · 2026-03-11T14:36:41Z

@Julesssss no conflicts, I think it's ready to be merged

github-actions · 2026-03-11T22:09:48Z

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

github-actions · 2026-03-11T22:14:16Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-92c651d-3d8daef-099d81665ef12600a5f8ac96537ab5e10588fd80/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-92c651d-3d8daef-ae8b58dc5f8cb54e133be47276fdc45cb2f262bb/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-11T22:17:24Z

✋ 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-03-12T23:18:02Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.3.37-0 🚀

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

mitarachim · 2026-03-13T01:54:44Z

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

jponikarchuk · 2026-03-13T08:50:38Z

This PR failing because of the issue #85207
This issue is reproducible in: Web, Android app

m-natarajan · 2026-03-13T15:00:44Z

@GCyganek Is this one testable in Native apps, If so, have to test only how the navigation works after selecting the tab?

GCyganek · 2026-03-13T15:16:45Z

@GCyganek Is this one testable in Native apps, If so, have to test only how the navigation works after selecting the tab?

Yes, I added instructions how to get to the tabs that were affected by this PR in the Tests section.

OSBotify · 2026-03-16T10:06:28Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.37-10 🚀

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

Merge tab selectors

4126453

melvin-bot bot assigned GCyganek Mar 4, 2026

Fix prettier

2239685

Fix typescript

61618a5

Show full labels in Create expense menu

dedc1d5

GCyganek marked this pull request as ready for review March 6, 2026 11:49

GCyganek requested review from a team as code owners March 6, 2026 11:49

melvin-bot bot requested review from ZhenjaHorbach and removed request for a team March 6, 2026 11:49

melvin-bot bot requested review from trjExpensify and removed request for a team March 6, 2026 11:49

trjExpensify previously approved these changes Mar 6, 2026

View reviewed changes

ZhenjaHorbach reviewed Mar 6, 2026

View reviewed changes

Extract style

22cd6f3

GCyganek dismissed trjExpensify’s stale review via 22cd6f3 March 6, 2026 16:14

GCyganek requested a review from a team as a code owner March 6, 2026 16:14

ZhenjaHorbach reviewed Mar 6, 2026

View reviewed changes

CONST.TIMING.MIN_SMOOTH_SCROLL_EVENT_THROTTLE

5b87e8e

ZhenjaHorbach approved these changes Mar 6, 2026

View reviewed changes

melvin-bot bot requested a review from Julesssss March 6, 2026 16:38

Julesssss previously approved these changes Mar 6, 2026

View reviewed changes

Merge branch 'main' into @GCyganek/merge-tab-selectors

a9c15cd

GCyganek dismissed Julesssss’s stale review via a9c15cd March 9, 2026 09:37

Merge branch 'main' into @GCyganek/merge-tab-selectors

83ad744

Julesssss approved these changes Mar 11, 2026

View reviewed changes

Julesssss merged commit 92c651d into Expensify:main Mar 11, 2026
29 checks passed

OSBotify mentioned this pull request Mar 12, 2026

Deploy Checklist: New Expensify 2026-03-12 #85146

Closed

87 tasks

mitarachim mentioned this pull request Mar 13, 2026

Android & iOS - Unable to switch between Chat and #room without dismissing keyboard #85160

Closed

7 tasks

This was referenced Mar 13, 2026

Revert "Merge TabSelector and ScrollableTabSelector" #85171

Closed

Expense - Report RHP re-renders every time clicking Create expense #85155

Closed

jponikarchuk mentioned this pull request Mar 13, 2026

[$250] Money Request - Training tooltip doesn't appeared #85207

Closed

7 tasks

melvin-bot bot mentioned this pull request Mar 16, 2026

[Due for payment 2026-03-23] Distance Request tabs - Merge TabSelector and scrollable variant #81338

Open

Conversation

GCyganek commented Mar 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Check if there are any regressions while using tabs selectors that can be accessed as described below. On web, narrow browser window so that there is an overflow to test scrolling and changing tabs:

Create expense tab selector with product training tooltip:

Create expense tab selector full labels and working scrolling when overflowing:

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

GCyganek commented Mar 4, 2026

Uh oh!

dannymcclain commented Mar 4, 2026

Uh oh!

dubielzyk-expensify commented Mar 4, 2026

Uh oh!

trjExpensify commented Mar 5, 2026

Uh oh!

dubielzyk-expensify commented Mar 5, 2026

Uh oh!

GCyganek commented Mar 5, 2026

Uh oh!

GCyganek commented Mar 5, 2026

Uh oh!

melvin-bot bot commented Mar 6, 2026

Uh oh!

ZhenjaHorbach commented Mar 6, 2026

Uh oh!

GCyganek commented Mar 6, 2026

Uh oh!

trjExpensify commented Mar 6, 2026

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

ZhenjaHorbach Mar 6, 2026

Choose a reason for hiding this comment

Uh oh!

ZhenjaHorbach commented Mar 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

ZhenjaHorbach Mar 6, 2026

Choose a reason for hiding this comment

Uh oh!

GCyganek Mar 6, 2026

Choose a reason for hiding this comment

Uh oh!

ZhenjaHorbach commented Mar 6, 2026

Uh oh!

ZhenjaHorbach commented Mar 6, 2026

Uh oh!

Julesssss commented Mar 6, 2026

Uh oh!

GCyganek commented Mar 11, 2026

Uh oh!

Uh oh!

github-actions bot commented Mar 11, 2026

Uh oh!

github-actions bot commented Mar 11, 2026

Uh oh!

OSBotify commented Mar 11, 2026

Uh oh!

OSBotify commented Mar 12, 2026

Uh oh!

mitarachim commented Mar 13, 2026

Uh oh!

jponikarchuk commented Mar 13, 2026

Uh oh!

m-natarajan commented Mar 13, 2026

Uh oh!

GCyganek commented Mar 4, 2026 •

edited

Loading

codecov bot commented Mar 4, 2026 •

edited by github-actions bot

Loading

ZhenjaHorbach commented Mar 6, 2026 •

edited

Loading

GCyganek commented Mar 13, 2026 •

edited

Loading