[CP Stg] Use theme.text for Android picker item color in high contrast mode by MelvinBot · Pull Request #90860 · Expensify/App

MelvinBot · 2026-05-16T03:01:30Z

Explanation of Change

BasePicker was using theme.textLight as the text color for picker items on Android, assuming it would always be a light color (since Android native alert dialogs have a dark background). However, in the DARK_CONTRAST theme, textLight is overridden to colors.productLight900 (#002E22) — a very dark green. After PR #89600 started applying DARK_CONTRAST on the sign-in page when the user had high contrast mode enabled, the language picker dropdown became invisible: dark text on a dark dialog background.

The fix simplifies itemColor to always use theme.text, which is #E7ECE9 (light) in both DARK and DARK_CONTRAST themes and works correctly on Android's dark native dialog background. This also removes the now-unused getOperatingSystem import.

Fixed Issues

$ #90846
PROPOSAL: #90846 (comment)

Tests

Log in and set the theme to Dark contrast or Light contrast in Settings > Preferences > Theme
Sign out
Verify the sign-in page displays in the dark contrast theme with proper text contrast on green buttons
Sign back in, switch to Dark or Light theme (non-contrast), sign out again
Verify the sign-in page displays in the default dark theme (sign-in page is always dark)

Offline tests

N/A — this change only affects theme color selection for picker items.

QA Steps

Log in and set the theme to Dark contrast or Light contrast in Settings > Preferences > Theme
Sign out
Verify the sign-in page displays in the dark contrast theme with proper text contrast on green buttons
Sign back in, switch to Dark or Light theme (non-contrast), sign out again
Verify the sign-in page displays in the default dark theme (sign-in page is always dark)

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

… themes BasePicker was using theme.textLight for Android native picker dialog items, assuming it would always be a light color. In the DARK_CONTRAST theme, textLight maps to #002E22 (a dark color), making picker items invisible on the dark native dialog background. Changed to use theme.text which is #E7ECE9 in both dark and dark-contrast themes. Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>

melvin-bot · 2026-05-16T03:01:34Z

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

situchan · 2026-05-16T03:07:45Z

    /**
     * We pass light text on Android, since Android Native alerts have a dark background in all themes for now.
+     * We use theme.text instead of theme.textLight because textLight maps to a dark color in high contrast themes,
+     * making picker items invisible on the dark native dialog background.
     */
-    const itemColor = useMemo(() => {
-        if (getOperatingSystem() === CONST.OS.ANDROID) {
-            return theme.textLight;
-        }
-
-        return theme.text;
-    }, [theme]);
+    const itemColor = useMemo(() => theme.text, [theme]);


@MelvinBot remove entire comment and remove useMemo as auto memoized by React compiler.

Suggested change

/**

* We pass light text on Android, since Android Native alerts have a dark background in all themes for now.

* We use theme.text instead of theme.textLight because textLight maps to a dark color in high contrast themes,

* making picker items invisible on the dark native dialog background.

*/

const itemColor = useMemo(() => {

if (getOperatingSystem() === CONST.OS.ANDROID) {

return theme.textLight;

}

return theme.text;

}, [theme]);

const itemColor = useMemo(() => theme.text, [theme]);

const itemColor = theme.text;

Done — removed the comment and replaced useMemo with a plain assignment since React Compiler handles memoization automatically.

React Compiler auto-memoizes this, so useMemo is unnecessary. Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>

situchan · 2026-05-16T03:13:27Z

@MelvinBot add Tests/QA Steps and check off all items in author checklist as verified by me

MelvinBot · 2026-05-16T03:15:51Z

Updated the PR body: added Tests and QA Steps, and checked off all author checklist items as verified by situchan.

situchan · 2026-05-16T03:19:11Z

@MelvinBot Tests / QA Steps is not correct. Update like this:

Log in and set the theme to Dark contrast or Light contract in Settings > Preferences > Theme
Sign out
Verify the sign-in page displays in the dark contrast theme with proper text contrast on green buttons
Sign back in, switch to Dark or Light theme (non-contrast), sign out again
Verify the sign-in page displays in the default dark theme (sign-in page is always dark)

MelvinBot · 2026-05-16T03:21:00Z

Updated the Tests and QA Steps sections in the PR description as requested.

situchan · 2026-05-16T03:21:13Z

@MelvinBot mark as ready for review

MelvinBot · 2026-05-16T03:22:23Z

Marked as ready for review.

situchan · 2026-05-16T03:27:09Z

@MelvinBot mark as ready for review. Still in draft

MelvinBot · 2026-05-16T03:28:35Z

Marked this PR as ready for review.

melvin-bot · 2026-05-16T03:28:36Z

@situchan 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 · 2026-05-16T03:28:41Z

@youssef-lr 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]

situchan · 2026-05-16T03:29:06Z

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
- MacOS: Desktop
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

android.mov

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 8d7a558242

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

chatgpt-codex-connector · 2026-05-16T03:32:20Z

-
-        return theme.text;
-    }, [theme]);
+    const itemColor = theme.text;


Preserve light text for Android picker dialog items

This change makes Android picker options use theme.text for every theme, but the Android dialog background is hardcoded dark (@color/card_highlight_bg via android/app/src/main/res/values/styles.xml and android/app/src/main/res/values/colors.xml). In Light and Light Contrast themes, theme.text is #002E22 (src/styles/theme/themes/light.ts), which creates very low contrast against that dark dialog background, making option labels difficult to read. Before this commit, Android used theme.textLight, which avoided this regression for users in light themes opening any BasePicker on Android.

Useful? React with 👍 / 👎.

BasePicker is only used in signin page which is always dark theme, so it's fine.

joekaufmanexpensify

Fixing DB

melvin-bot · 2026-05-18T22:09:27Z

@roryabraham looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

github-actions · 2026-05-18T22:10:07Z

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

roryabraham · 2026-05-18T22:11:09Z

tests were passing?

…TextColor Use theme.text for Android picker item color in high contrast mode (cherry picked from commit 821ea3d) (cherry-picked to staging by roryabraham)

github-actions · 2026-05-18T22:14:42Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-821ea3d-02f886f-a83b63dc191485872a7f2393bc906383e90c348d/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-821ea3d-02f886f-68860699aad4fcc4ffa840b285c64c0b65db199a/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-05-18T22:18:34Z

✋ 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-05-18T22:38:42Z

🚀 Cherry-picked to staging by https://github.com/roryabraham in version: 9.3.75-12 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-05-18T22:40:07Z

No help site changes are needed for this PR.

This is a bug fix that corrects the Android picker item text color in high contrast mode (changing theme.textLight → theme.text in BasePicker.tsx). It doesn't add, remove, or rename any user-facing features, settings, or workflows that would require documentation updates.

OSBotify · 2026-05-19T07:29:54Z

🚀 Cherry-picked to staging by https://github.com/roryabraham in version: 9.3.75-14 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-05-19T07:31:47Z

No help site changes are required for this PR.

This is a purely internal bug fix that corrects the text color used for Android picker items in high contrast mode (theme.textLight → theme.text in BasePicker.tsx). It doesn't alter any user-facing features, settings, workflows, or terminology.

The existing help site article (docs/articles/new-expensify/settings/Account-Settings.md) already correctly documents the Theme and High contrast mode features — this PR just fixes a rendering bug within those features.

OSBotify · 2026-05-19T08:03:06Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.3.75-14 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

OSBotify · 2026-05-19T08:09:48Z

🚀 Cherry-picked to staging by https://github.com/roryabraham in version: 9.3.76-0 🚀

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

OSBotify · 2026-05-19T22:02:18Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.3.77-3 🚀

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

MelvinBot assigned situchan May 16, 2026

MelvinBot requested a review from a team May 16, 2026 03:01

MelvinBot mentioned this pull request May 16, 2026

[Due for payment 2026-05-26] [Due for payment 2026-05-26] [$250] Android - Login - Language options are not visible in high constrast mode #90846

Closed

7 tasks

situchan reviewed May 16, 2026

View reviewed changes

Remove useMemo and comment for itemColor in BasePicker

8d7a558

React Compiler auto-memoizes this, so useMemo is unnecessary. Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>

MelvinBot marked this pull request as ready for review May 16, 2026 03:28

MelvinBot requested a review from a team as a code owner May 16, 2026 03:28

melvin-bot Bot requested review from joekaufmanexpensify and situchan May 16, 2026 03:28

melvin-bot Bot requested review from a team and youssef-lr and removed request for a team May 16, 2026 03:28

situchan approved these changes May 16, 2026

View reviewed changes

chatgpt-codex-connector Bot reviewed May 16, 2026

View reviewed changes

joekaufmanexpensify approved these changes May 18, 2026

View reviewed changes

roryabraham approved these changes May 18, 2026

View reviewed changes

roryabraham merged commit 821ea3d into main May 18, 2026
64 of 67 checks passed

roryabraham deleted the claude-fixHighContrastPickerTextColor branch May 18, 2026 22:09

melvin-bot Bot added the Emergency label May 18, 2026

roryabraham changed the title ~~Use theme.text for Android picker item color in high contrast mode~~ [CP Stg] Use theme.text for Android picker item color in high contrast mode May 18, 2026

roryabraham removed the Emergency label May 18, 2026

OSBotify added the CP Staging marks PRs that have been CP'd to staging label May 18, 2026

OSBotify mentioned this pull request May 18, 2026

Deploy Checklist: New Expensify 2026-05-15 #90795

Closed

Conversation

MelvinBot commented May 16, 2026 • edited 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 May 16, 2026

Uh oh!

situchan May 16, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot May 16, 2026

Choose a reason for hiding this comment

Uh oh!

situchan commented May 16, 2026

Uh oh!

MelvinBot commented May 16, 2026

Uh oh!

situchan commented May 16, 2026

Uh oh!

MelvinBot commented May 16, 2026

Uh oh!

situchan commented May 16, 2026

Uh oh!

MelvinBot commented May 16, 2026

Uh oh!

situchan commented May 16, 2026

Uh oh!

MelvinBot commented May 16, 2026

Uh oh!

melvin-bot Bot commented May 16, 2026

Uh oh!

melvin-bot Bot commented May 16, 2026

Uh oh!

situchan commented May 16, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot May 16, 2026

Choose a reason for hiding this comment

Uh oh!

situchan May 16, 2026

Choose a reason for hiding this comment

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

melvin-bot Bot commented May 18, 2026

Uh oh!

github-actions Bot commented May 18, 2026

Uh oh!

roryabraham commented May 18, 2026

Uh oh!

github-actions Bot commented May 18, 2026

Uh oh!

OSBotify commented May 18, 2026

Uh oh!

OSBotify commented May 18, 2026

Uh oh!

MelvinBot commented May 18, 2026

Uh oh!

OSBotify commented May 19, 2026

Uh oh!

MelvinBot commented May 19, 2026

Uh oh!

OSBotify commented May 19, 2026

Uh oh!

OSBotify commented May 19, 2026

Uh oh!

OSBotify commented May 19, 2026

MelvinBot commented May 16, 2026 •

edited

Loading