[CP Staging] Revert https://github.com/Expensify/App/pull/68001 by aldo-expensify · Pull Request #68681 · Expensify/App

aldo-expensify · 2025-08-18T17:43:37Z

Explanation of Change

I manually created this revert because it could not be reverted using the Github Revert button

I on purpose skipped reverting this change because it looked very unrelated and maybe we still wanted to update this config:

Let me know if you think this should be reverted too

Fixed Issues

$ #68667
PROPOSAL:

Tests

Go to staging.new.expensify.com
Log in with new account
Go to Account > Profile
Click Timezone
Verify: Timezone will show the correct location
Disable "Automatically determine your location"
Verify: Timezone field still shows the selected time zone

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: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2025-08-18.at.10.44.53.AM.mov

MacOS: Desktop

melvin-bot · 2025-08-18T17:43:42Z

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

luacmartins

It seems like some checks are failing

carlosmiceli · 2025-08-18T18:03:55Z

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: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

aldo-expensify · 2025-08-18T18:16:16Z

It seems like some checks are failing

So many failed checks 😆

ESLint check / ESLint check (pull_request)
ESLint check / ESLint check (pull_request)

I would say we can ignore this because I'm just reverting code and not adding new code violation es lint rules, sounds good?

Remote Build iOS / build (Expensify Dev, Debug, true) (push)
Remote Build iOS / build (Expensify Dev, Debug, true) (push)Failing after 6m
Remote Build iOS / build (New Expensify Dev, DebugDevelopment, false) (push)
Remote Build iOS / build (New Expensify Dev, DebugDevelopment, false) (push)Failing after 4m

These two were failing for another revert on Friday, I think it is unrelated

For example: https://expensify.slack.com/archives/C01GTK53T8Q/p1755290836246129?thread_ts=1755233872.339249&cid=C01GTK53T8Q

Reassure Performance Tests / perf-tests (pull_request)
Reassure Performance Tests / perf-tests (pull_request)Failing after 9m

maybe flakeyness? I'll re-run

aldo-expensify · 2025-08-18T18:33:39Z

Pushed main in case it helps with the failing checks

aldo-expensify · 2025-08-18T19:54:58Z

I'll proceed with the merge since the performance tests failing is known and it is not related to this particular PR: https://expensify.slack.com/archives/C07J32337/p1755536301843629?thread_ts=1755531412.317049&cid=C07J32337

Revert #68001 (cherry picked from commit 00f2771) (cherry-picked to staging by AndrewGable)

OSBotify · 2025-08-18T20:03:51Z

✋ 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 · 2025-08-18T20:35:47Z

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

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

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

OSBotify · 2025-08-19T18:59:50Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.1.96-2 🚀

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

OSBotify · 2025-08-19T19:24:35Z

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

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

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

OSBotify · 2025-08-19T20:14:00Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.1.96-2 🚀

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

OSBotify · 2025-08-22T17:30:57Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.1.97-5 🚀

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

Revert #68001

c8ae76c

aldo-expensify self-assigned this Aug 18, 2025

aldo-expensify requested a review from a team as a code owner August 18, 2025 17:43

melvin-bot Bot requested review from rushatgabhane and removed request for a team August 18, 2025 17:43

luacmartins reviewed Aug 18, 2025

View reviewed changes

carlosmiceli approved these changes Aug 18, 2025

View reviewed changes

Merge branch 'main' of github.com:Expensify/App into aldo_revert68001

7d58c15

aldo-expensify merged commit 00f2771 into main Aug 18, 2025
22 of 26 checks passed

aldo-expensify deleted the aldo_revert68001 branch August 18, 2025 19:55

aldo-expensify changed the title ~~Revert https://github.com/Expensify/App/pull/68001~~ [CP Staging] Revert https://github.com/Expensify/App/pull/68001 Aug 18, 2025

OSBotify pushed a commit that referenced this pull request Aug 18, 2025

Merge pull request #68681 from Expensify/aldo_revert68001

12c7d18

Revert #68001 (cherry picked from commit 00f2771) (cherry-picked to staging by AndrewGable)

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

OSBotify mentioned this pull request Aug 18, 2025

Deploy Checklist: New Expensify 2025-08-18 #68664

Closed

47 tasks

melvin-bot Bot mentioned this pull request Aug 19, 2025

[Due for payment 2025-08-29] [Due for payment 2025-08-26] Account - Wrong default timezone and empty timezone field after disabling auto timezone #68667

Closed

16 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Staging] Revert https://github.com/Expensify/App/pull/68001#68681

[CP Staging] Revert https://github.com/Expensify/App/pull/68001#68681
aldo-expensify merged 2 commits into
mainfrom
aldo_revert68001

aldo-expensify commented Aug 18, 2025 •

edited

Loading

Uh oh!

melvin-bot Bot commented Aug 18, 2025

Uh oh!

luacmartins left a comment

Uh oh!

carlosmiceli commented Aug 18, 2025 •

edited

Loading

Uh oh!

aldo-expensify commented Aug 18, 2025

Uh oh!

aldo-expensify commented Aug 18, 2025

Uh oh!

aldo-expensify commented Aug 18, 2025

Uh oh!

Uh oh!

OSBotify commented Aug 18, 2025

Uh oh!

OSBotify commented Aug 18, 2025

Uh oh!

OSBotify commented Aug 19, 2025

Uh oh!

OSBotify commented Aug 19, 2025

Uh oh!

OSBotify commented Aug 19, 2025

Uh oh!

OSBotify commented Aug 22, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

aldo-expensify commented Aug 18, 2025 • 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 Aug 18, 2025

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

Uh oh!

carlosmiceli commented Aug 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

aldo-expensify commented Aug 18, 2025

Uh oh!

aldo-expensify commented Aug 18, 2025

Uh oh!

aldo-expensify commented Aug 18, 2025

Uh oh!

Uh oh!

OSBotify commented Aug 18, 2025

Uh oh!

OSBotify commented Aug 18, 2025

Uh oh!

OSBotify commented Aug 19, 2025

Uh oh!

OSBotify commented Aug 19, 2025

Uh oh!

OSBotify commented Aug 19, 2025

Uh oh!

OSBotify commented Aug 22, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

aldo-expensify commented Aug 18, 2025 •

edited

Loading

carlosmiceli commented Aug 18, 2025 •

edited

Loading