[CP Staging] Revert PRs 68977 and 68978 #69594

QichenZhu · 2025-09-01T11:00:21Z

Explanation of Change

Revert #68977 and #68978 to test if it addresses #69407.

Context: https://expensify.slack.com/archives/C01GTK53T8Q/p1756731332050539?thread_ts=1756398045.323639&cid=C01GTK53T8Q

Fixed Issues

$ #69407
PROPOSAL:

Tests

Go to any 1:1 DM.
Submit two manual expenses to the user.
Open the expense report.
Open any expense row.
Add a receipt in the transaction thread.
Wait for 30 seconds and verify it doesn't show a skeleton screen.

Verify that no errors appear in the JS console

Offline tests

Same as Tests.

QA Steps

Same as Tests.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos (N/A)

Android: Native

android-native.webm

Android: mWeb Chrome

android-web.webm

iOS: Native

ios-native.mp4

iOS: mWeb Safari

ios-web.mp4

MacOS: Chrome / Safari

mac-web.mov

MacOS: Desktop

mac-desktop.mov

…201" This reverts commit 2429118, reversing changes made to 6c441db.

…202" This reverts commit 60b43d5, reversing changes made to 4dc9955.

QichenZhu · 2025-09-01T11:22:01Z

There are tests failing but these come from main.

github-actions · 2025-09-01T11:23:55Z

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

github-actions · 2025-09-01T11:55:50Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/69594/index.html	❌ FAILED ❌
	The QR code can't be generated, because the iOS build failed

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

👀 View the workflow run that generated this build 👀

melvin-bot · 2025-09-01T13:24:07Z

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

mountiny · 2025-09-01T14:58:58Z

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

mountiny · 2025-09-01T14:59:14Z

Straight reverts and the failures are on main #69407 (comment) - QA confirmed the blocker is fixed

mountiny · 2025-09-01T15:04:58Z

Reassure fix coming independently here https://expensify.slack.com/archives/C01GTK53T8Q/p1756739046400199?thread_ts=1756729281.367639&cid=C01GTK53T8Q

This PR fixed the TS and eslint issue #69602

mountiny

Straight reverts

melvin-bot · 2025-09-01T15:06:13Z

@mountiny 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.

mountiny · 2025-09-01T15:06:45Z

Straight revert of 2 prs

OSBotify · 2025-09-01T15:16: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.

[CP Staging] Revert PRs 68977 and 68978 (cherry picked from commit 9719e30) (cherry-picked to staging by mountiny)

OSBotify · 2025-09-01T20:08:17Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.2.0-3 🚀

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

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

OSBotify · 2025-09-02T22:20:24Z

🚀 Deployed to production by https://github.com/arosiclair in version: 9.2.0-5 🚀

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

OSBotify · 2025-09-02T22:50:22Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.2.1-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-09-02T23:13:37Z

🚀 Deployed to production by https://github.com/arosiclair in version: 9.2.0-5 🚀

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

OSBotify · 2025-09-05T19:36:48Z

🚀 Deployed to production by https://github.com/arosiclair in version: 9.2.1-20 🚀

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

QichenZhu added 2 commits September 1, 2025 22:58

Revert "Merge pull request Expensify#68977 from DylanDylann/refactor-…

7ec209d

…201" This reverts commit 2429118, reversing changes made to 6c441db.

Revert "Merge pull request Expensify#68978 from DylanDylann/refactor-…

e240001

…202" This reverts commit 60b43d5, reversing changes made to 4dc9955.

melvin-bot bot assigned QichenZhu Sep 1, 2025

QichenZhu changed the title ~~Revert #68977, #68978~~ [No QA] Revert #68977, #68978 Sep 1, 2025

Fix types

aff784b

mountiny mentioned this pull request Sep 1, 2025

Revert "[CP Staging] fix: confirm page is not shown when splitting distance, group chat loads infinitely" #69604

Merged

QichenZhu marked this pull request as ready for review September 1, 2025 13:24

QichenZhu requested review from a team as code owners September 1, 2025 13:24

melvin-bot bot requested review from allroundexperts and removed request for a team September 1, 2025 13:24

QichenZhu changed the title ~~[No QA] Revert #68977, #68978~~ Revert #68977, #68978 Sep 1, 2025

mountiny changed the title ~~Revert #68977, #68978~~ [CP Staging] Revert PRs 68977 and 68978 Sep 1, 2025

mountiny approved these changes Sep 1, 2025

View reviewed changes

mountiny merged commit 9719e30 into Expensify:main Sep 1, 2025
26 of 30 checks passed

melvin-bot bot added the Emergency label Sep 1, 2025

mountiny removed the Emergency label Sep 1, 2025

rlinoz mentioned this pull request Sep 1, 2025

[Due for payment 2025-10-13] [$250] Android - Confirm page is not shown when splitting distance, group chat loads infinitely #69448

Closed

8 tasks

OSBotify pushed a commit that referenced this pull request Sep 1, 2025

Merge pull request #69594 from QichenZhu/revert/68977-68978

81f72cd

[CP Staging] Revert PRs 68977 and 68978 (cherry picked from commit 9719e30) (cherry-picked to staging by mountiny)

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

OSBotify mentioned this pull request Sep 1, 2025

Deploy Checklist: New Expensify 2025-08-28 #69401

Closed

70 tasks

arosiclair mentioned this pull request Sep 2, 2025

Android - Report - Expense report is displayed empty after backgrounding and reopening app. #69408

Closed

8 tasks

melvin-bot bot mentioned this pull request Sep 2, 2025

[Due for payment 2025-10-13] [Due for payment 2025-09-09] [$125] Android - Expense - Report loads infinitely after attaching receipt in transaction thread #69407

Closed

8 tasks

[CP Staging] Revert PRs 68977 and 68978 #69594

[CP Staging] Revert PRs 68977 and 68978 #69594

Uh oh!

Conversation

QichenZhu commented Sep 1, 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 (N/A)

Uh oh!

QichenZhu commented Sep 1, 2025

Uh oh!

github-actions bot commented Sep 1, 2025

Uh oh!

github-actions bot commented Sep 1, 2025

Uh oh!

melvin-bot bot commented Sep 1, 2025

Uh oh!

mountiny commented Sep 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

mountiny commented Sep 1, 2025

Uh oh!

mountiny commented Sep 1, 2025

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

melvin-bot bot commented Sep 1, 2025

Uh oh!

mountiny commented Sep 1, 2025

Uh oh!

OSBotify commented Sep 1, 2025

Uh oh!

OSBotify commented Sep 1, 2025

Uh oh!

OSBotify commented Sep 2, 2025

Uh oh!

OSBotify commented Sep 2, 2025

Uh oh!

OSBotify commented Sep 2, 2025

Uh oh!

OSBotify commented Sep 5, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

QichenZhu commented Sep 1, 2025 •

edited

Loading

mountiny commented Sep 1, 2025 •

edited

Loading