Skip to content

Fix: Regressions from #97005 - #98283

Closed
thelullabyy wants to merge 9 commits into
Expensify:mainfrom
thelullabyy:fix-regressions/97005
Closed

Fix: Regressions from #97005#98283
thelullabyy wants to merge 9 commits into
Expensify:mainfrom
thelullabyy:fix-regressions/97005

Conversation

@thelullabyy

@thelullabyy thelullabyy commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #98200
$ #98196
$ #98193
$ #98192
PROPOSAL:

Tests

Verify that these bugs are no longer reproducible

$ #98200
$ #98196
$ #98193
$ #98192

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

Verify that these bugs are no longer reproducible

$ #98200
$ #98196
$ #98193
$ #98192

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • 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 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)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
98193.mov
98200.mov
98196.mov
98192.mov

@codecov

codecov Bot commented Aug 11, 2026

Copy link
Copy Markdown

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/components/MoneyReportHeader.tsx 89.83% <100.00%> (+89.83%) ⬆️
...stReportView/MoneyRequestReportTransactionList.tsx 0.28% <ø> (ø)
src/hooks/useNavigateToTransactionThread.ts 75.00% <100.00%> (+41.66%) ⬆️
src/libs/actions/TransactionThreadNavigation.ts 89.79% <100.00%> (+18.36%) ⬆️
src/components/Search/index.tsx 49.77% <37.50%> (+1.93%) ⬆️
... and 92 files with indirect coverage changes

@thelullabyy
thelullabyy marked this pull request as ready for review August 11, 2026 13:43
@thelullabyy
thelullabyy requested review from a team as code owners August 11, 2026 13:43
@melvin-bot
melvin-bot Bot requested review from nyomanjyotisa and trjExpensify and removed request for a team August 11, 2026 13:43
@melvin-bot

melvin-bot Bot commented Aug 11, 2026

Copy link
Copy Markdown

@nyomanjyotisa 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
melvin-bot Bot removed the request for review from a team August 11, 2026 13:43
@thelullabyy

Copy link
Copy Markdown
Contributor Author

@ShridharGoel @JS00001 Could you please review this PR. Thanks

@thelullabyy

Copy link
Copy Markdown
Contributor Author

@codex review

@ShridharGoel
ShridharGoel self-requested a review August 11, 2026 13:47
Comment thread src/hooks/useNavigateToTransactionThread.ts

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 73961c8b6c

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

Comment thread src/libs/actions/TransactionThreadNavigation.ts Outdated
@ShridharGoel

ShridharGoel commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

@thelullabyy Looks like #98193 is not fixed, it changes back to the previous number:

Screen.Recording.2026-08-11.at.7.30.34.PM.mov

@ShridharGoel

Copy link
Copy Markdown
Contributor

#98200 - Fixed

Screenshot 2026-08-11 at 7 29 29 PM

@JS00001

JS00001 commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

lmk when this is ready please

@ShridharGoel

Copy link
Copy Markdown
Contributor

#98192 - Fixed

Screenshot 2026-08-11 at 7 33 45 PM

@ShridharGoel

Copy link
Copy Markdown
Contributor

#98196 - Fixed

Screen.Recording.2026-08-11.at.7.37.03.PM.mov

@ShridharGoel

Copy link
Copy Markdown
Contributor

Carousel disappears after merging expenses:

Screen.Recording.2026-08-11.at.8.05.21.PM.mov

@ShridharGoel

Copy link
Copy Markdown
Contributor

@JS00001 @thelullabyy Maybe we can go ahead with this PR and then handle #98193 and this separately? These might not be blockers. What do you think?

@thelullabyy

Copy link
Copy Markdown
Contributor Author

Lemme check if I can raise a quick fix, but yes, if we are in urgent, I think we can raise another PR for it. I also don't think it can be a DB @ShridharGoel @JS00001

@JS00001

JS00001 commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

@ShridharGoel are either of those two reproducible on prod?

@thelullabyy

Copy link
Copy Markdown
Contributor Author

@ShridharGoel Kindly check again, I pushed the fix for this issue #98283 (comment)

@JS00001

JS00001 commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

So which issues are fixed in this PR, and which are being suggested to be demoted, could you make a list please?

@thelullabyy

Copy link
Copy Markdown
Contributor Author

@JS00001 I think this PR fixes all issues. But let's see if @ShridharGoel can reproduce any other bugs

@ShridharGoel

Copy link
Copy Markdown
Contributor

Kindly check again, I pushed the fix for this issue #98283 (comment)

Thanks, it works for the first time but if you merge again just after merging once, then the carousel buttons disappear.

@JS00001

JS00001 commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

@ShridharGoel could you make sure you have videos for all reported blockers please? Thanks both for the hard work on this!

@ShridharGoel

Copy link
Copy Markdown
Contributor

#98193 - Fixed

Screen.Recording.2026-08-11.at.10.39.01.PM.mov

@ShridharGoel

Copy link
Copy Markdown
Contributor

could you make sure you have videos for all reported blockers please?

Yes, all four are present now:

#98283 (comment)
#98283 (comment)
#98283 (comment)
#98283 (comment)

@JS00001

JS00001 commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

Nice, reviewing, thanks!

@ShridharGoel

Copy link
Copy Markdown
Contributor

This one is present, but shouldn't be a blocker:

Screen.Recording.2026-08-11.at.10.44.25.PM.mov

@JS00001

JS00001 commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

Demoting that one, @thelullabyy lets do a follow up please

@ShridharGoel

Copy link
Copy Markdown
Contributor

@JS00001 That one isn't reported I think, I had found it while testing this PR

@JS00001

JS00001 commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

@thelullabyy I just noticed the size, I dont really feel comfortable CPing a 600 line diff, would we be able to revert this PR and merge it back to main with these changes added on top?

@thelullabyy

Copy link
Copy Markdown
Contributor Author

@JS00001 I think most of them are UTs. What do you think? Should we CP staging then?

@JS00001

JS00001 commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

There are still ~150 lines of regular changes, which is a lot to bank on not having any other bugs, how much work would it be to revert the main PR and add these changes there?

@thelullabyy

Copy link
Copy Markdown
Contributor Author

Hmm in that case, I think we can revert the PR and then re-raise another PR with proper fix then @JS00001

@JS00001

JS00001 commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

@thelullabyy could you please raise a PR for the revert?

@thelullabyy

thelullabyy commented Aug 11, 2026

Copy link
Copy Markdown
Contributor Author

@ShridharGoel Could you please help me raise the straight revert PR...? It's ~1 AM for me now, I think I would be unavailable till tmr morning...

@ShridharGoel

Copy link
Copy Markdown
Contributor

@MelvinBot Create a straight revert of #97005

@JS00001

JS00001 commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

There were conflicts btw

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 I couldn't create a straight revert of #97005 — it doesn't apply cleanly.

git revert -m 1 9fdbedd (the same operation GitHub's "Revert" button runs) fails with merge conflicts, so there's no clean straight revert to open. The main branch has diverged too much since that PR merged (2026-08-07): 110 subsequent commits have modified the same files, so backing out #97005's diff collides with later work.

Conflicting files:

Because reverting #97005 would also delete the MoneyRequestReportTransactionsNavigation component/test that later code still references, a mechanical revert would likely break the build.

Options:

  1. Reconciled revert — I can open a revert PR with the conflicts resolved by hand (reverting Standardize Expense Report and Expense header with predictable button placement and carousel counter #97005's changes while preserving the 110 later commits). This is no longer a "straight" revert and needs careful review + testing, but it's the realistic path to backing out Standardize Expense Report and Expense header with predictable button placement and carousel counter #97005 now.
  2. Fix forward — continue with this PR (Fix: Regressions from #97005 #98283), which already targets the specific regressions from Standardize Expense Report and Expense header with predictable button placement and carousel counter #97005.

Reply with @MelvinBot do the reconciled revert if you want option 1, otherwise I'll leave the fix-forward here as-is.

@ShridharGoel

Copy link
Copy Markdown
Contributor

@JS00001 Since the revert will not be straightforward, should we go ahead with this fix (after getting it tested by QA) ?

@ShridharGoel

Copy link
Copy Markdown
Contributor

@MelvinBot do the reconciled revert

@JS00001

JS00001 commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

@thelullabyy can you please try reverting locally and check if the conflicts are complex or not?

@JS00001

JS00001 commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

@ShridharGoel I reverted here: #98346, and fixed conflicts manually

@JS00001 JS00001 closed this Aug 11, 2026
@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Done — reconciled revert of #97005 opened as a draft: #98349

A straight git revert wasn't possible (conflicts against ~110 later commits), so I restored the pre-#97005 versions of the three conflicting files and the clean-reverted remainder of its 31-file diff, then re-applied the one independent later change to those files — threading the now-required personalDetails param into getReportIDToOpenForExpense(...) and createTransactionThreadReport({...}) so the restored code still type-checks.

Verification: typecheck-tsgo ✅, lint-changed ✅, oxfmt clean ✅, restored unit test MoneyReportHeaderMoreContentTest.tsx 4/4 ✅. Automated web UI verification was attempted but blocked by an unrelated signed-in session rendering a blank page in CI, so the header/carousel flow still needs a manual check before merge.

The PR is assigned to you. Please fill in the Tests/QA sections and manually verify the expense/report header + carousel navigation, then mark it Ready for review. Since it was created from an upstream branch (you don't have push access to update it directly), I left branch-ownership instructions on the PR if you want to move it to your fork.

@ShridharGoel

Copy link
Copy Markdown
Contributor

@MelvinBot Why is your revert PR different from #98346 ?

@MelvinBot

Copy link
Copy Markdown
Contributor

⚠️ Something went wrong. This may be a transient issue — try again. If it persists, check status.anthropic.com.

Run details

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants