[CPStaging] Fix Use Device Settings on IOS and Android by grgia · Pull Request #33094 · Expensify/App

grgia · 2023-12-14T17:41:15Z

Details

When we switched to the dark theme, we decided to hardcode the native UI to Dark for simplicity's sake. Now that we have both light and dark themes, I'm removing the hard-coded values. This fix is for both IOS and Android

Fixed Issues

$ #33090
$ #33101

Tests

Verify that no errors appear in the JS console
Same as QA
NOTE: we used the adhoc builds on physical devices to properly test this. The emulators sometimes are incorrectly set up and will not reference the correct device theme

Offline tests

QA Steps

Verify that no errors appear in the JS console
Ensure that settings/preferences/theme is set to “Use Device Settings”
Go into device settings and Toggle your native device settings to light mode
Verify that theme in App is Light ✅
Go into device settings and Toggle your native device settings to dark mode
Verify that theme in App is Dark ✅

PR Author Checklist

Screenshots/Videos

Android: Native

#33094 (review)

Android: mWeb Chrome

iOS: Native

#33094 (review)

iOS: mWeb Safari

Screen.Recording.2023-12-14.at.12.58.56.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2023-12-14.at.12.56.21.PM.mov

MacOS: Desktop

OSBotify · 2023-12-14T20:06:58Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/33094/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/33094/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/33094/NewExpensify.dmg	https://33094.pr-testing.expensify.com

luacmartins

Works well on iOS

RPReplay_Final1702586214.MP4

melvin-bot · 2023-12-14T20:39:50Z

@Santhosh-Sellavel 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]

aldo-expensify

Worked fine for me in Android native

XRecorder_Edited_14122023_174740.mp4

grgia · 2023-12-14T21:05:26Z

@Santhosh-Sellavel bump on this deploy blocker, passes tests on all ADHOC builds

situchan · 2023-12-14T21:09:01Z

I can do expedite review if needed

grgia · 2023-12-14T21:09:37Z

@situchan sounds good!

situchan · 2023-12-14T21:10:55Z

+    expo: {
+        userInterfaceStyle: 'automatic',
+        ios: {
+            userInterfaceStyle: 'automatic',
+        },
+        android: {
+            userInterfaceStyle: 'automatic',
+        },
+    },


Is this necessary? App is not using expo yet

no you're right, I can remove and rebuild

grgia · 2023-12-14T21:16:18Z

@situchan removed, triggered a new build incase you have trouble testing on emulators as I did

situchan · 2023-12-14T21:28:21Z

My device theme is light. After first app install, app theme is dark before login

Screen.Recording.2023-12-15.at.3.25.59.AM.mov

situchan · 2023-12-14T21:33:11Z

As app theme is based on user preference, I assume before-login is default theme (dark), not depending on device system theme?

OSBotify · 2023-12-14T21:37:44Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/33094/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/33094/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/33094/NewExpensify.dmg	https://33094.pr-testing.expensify.com

aldo-expensify · 2023-12-14T21:51:56Z

@grgia should I test again in Android?

situchan · 2023-12-14T21:55:46Z

In android with device light theme, status bar color is white on first app load.
On white background, status bar should be dark

situchan · 2023-12-14T21:58:39Z

I think we should make status bar and system navigation bar compatible with page in a separate issue.
So if page is white, status bar should be dark and navigation bar should be light.
If page is black, status bar should be white and navigation bar should be dark.
If page has mixed theme (i.e. illustration pages), status bar should be white and navigation bar should be white.

situchan · 2023-12-14T21:59:17Z

@grgia should I test again in Android?

@aldo-expensify It will be same as your previous build as just removed expo code which is not releavant.

situchan · 2023-12-14T22:00:41Z

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 tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- 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 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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.js 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 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.
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: Native

XRecorder_15122023_074936.mp4

Android: mWeb Chrome

iOS: Native

Screen.Recording.2023-12-15.at.3.28.48.AM.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

situchan

Please create separate issues for these:
#33094 (comment)
#33094 (comment)

melvin-bot · 2023-12-14T22:03:21Z

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

OSBotify · 2023-12-14T22:12:01Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

[CPStaging] Fix Use Device Settings on IOS and Android (cherry picked from commit f10f708)

OSBotify · 2023-12-14T22:42:55Z

🚀 Cherry-picked to staging by https://github.com/luacmartins in version: 1.4.13-1 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2023-12-19T02:02:37Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.4.13-8 🚀

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

Remove Dark UIUserInterfaceStyle

5592222

grgia self-assigned this Dec 14, 2023

grgia added 2 commits December 14, 2023 11:00

revert old PR hardcoding dark theme

b8ffa63

prettier

43c71ba

grgia added the Ready To Build label Dec 14, 2023

luacmartins previously approved these changes Dec 14, 2023

View reviewed changes

grgia changed the title ~~Remove Dark UIUserInterfaceStyle~~ Fix Use Device Settings on IOS and Android Dec 14, 2023

grgia marked this pull request as ready for review December 14, 2023 20:39

grgia requested a review from a team as a code owner December 14, 2023 20:39

melvin-bot Bot requested review from Santhosh-Sellavel and removed request for a team December 14, 2023 20:39

aldo-expensify previously approved these changes Dec 14, 2023

View reviewed changes

grgia changed the title ~~Fix Use Device Settings on IOS and Android~~ [CPStaging] Fix Use Device Settings on IOS and Android Dec 14, 2023

grgia requested review from situchan and removed request for Santhosh-Sellavel December 14, 2023 21:09

situchan reviewed Dec 14, 2023

View reviewed changes

reset react-native.config.js to main

d8034b7

grgia dismissed stale reviews from aldo-expensify and luacmartins via d8034b7 December 14, 2023 21:15

situchan approved these changes Dec 14, 2023

View reviewed changes

melvin-bot Bot requested a review from AndrewGable December 14, 2023 22:03

aldo-expensify approved these changes Dec 14, 2023

View reviewed changes

grgia merged commit f10f708 into main Dec 14, 2023

grgia deleted the georgia-fixIOSTheme branch December 14, 2023 22:08

situchan mentioned this pull request Dec 14, 2023

[Theme Switching] 🐛 Android - Download confirmation window still dark in light theme #33120

Closed

6 tasks

OSBotify pushed a commit that referenced this pull request Dec 14, 2023

Merge pull request #33094 from Expensify/georgia-fixIOSTheme

61eef7c

[CPStaging] Fix Use Device Settings on IOS and Android (cherry picked from commit f10f708)

github-actions Bot mentioned this pull request Dec 14, 2023

Deploy Checklist: New Expensify 2023-12-14 #33072

Closed

77 tasks

grgia mentioned this pull request Dec 18, 2023

[$500] [HOLD for payment 2023-12-28] [HOLD for payment 2023-12-26] [Theme Switching] 🐛 - App is still in dark mode when device dark mode is off #33101

Closed

6 tasks

melvin-bot Bot mentioned this pull request Dec 19, 2023

[HOLD for payment 2023-12-28] [HOLD for payment 2023-12-26] [Theme Switching] 🐛 "Use Device Settings" not working on IOS #33090

Closed

Conversation

grgia commented Dec 14, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

OSBotify commented Dec 14, 2023

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Dec 14, 2023

Uh oh!

aldo-expensify left a comment

Choose a reason for hiding this comment

Uh oh!

grgia commented Dec 14, 2023

Uh oh!

situchan commented Dec 14, 2023

Uh oh!

grgia commented Dec 14, 2023

Uh oh!

situchan Dec 14, 2023

Choose a reason for hiding this comment

Uh oh!

grgia Dec 14, 2023

Choose a reason for hiding this comment

Uh oh!

grgia commented Dec 14, 2023

Uh oh!

situchan commented Dec 14, 2023

Uh oh!

situchan commented Dec 14, 2023

Uh oh!

OSBotify commented Dec 14, 2023

Uh oh!

aldo-expensify commented Dec 14, 2023

Uh oh!

situchan commented Dec 14, 2023

Uh oh!

situchan commented Dec 14, 2023

Uh oh!

situchan commented Dec 14, 2023

Uh oh!

situchan commented Dec 14, 2023

Reviewer Checklist

Screenshots/Videos

Uh oh!

situchan left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Dec 14, 2023

Uh oh!

OSBotify commented Dec 14, 2023

Uh oh!

OSBotify commented Dec 14, 2023

Uh oh!

OSBotify commented Dec 19, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

grgia commented Dec 14, 2023 •

edited

Loading