Skip to content

Revert 85818#86804

Merged
luacmartins merged 5 commits intomainfrom
revert-85818
Apr 1, 2026
Merged

Revert 85818#86804
luacmartins merged 5 commits intomainfrom
revert-85818

Conversation

@luacmartins
Copy link
Copy Markdown
Contributor

@luacmartins luacmartins commented Mar 31, 2026

Explanation of Change

cc @jnowakow @rojiphil

Reverts #85818 to fix blockers. This is not a straight revert. The following conflicts were fixed:

  • src/components/Search/SearchList/ListItem/TransactionListItem.tsx
    Conflict was around passing onUndelete into handleActionButtonPressUtil(...) (undelete-related param added by the PR).

  • src/hooks/useSearchBulkActions.ts
    Conflict was around undelete wiring, including a useUndeleteTransactions() usage and differing names for the billing-grace-period Onyx value.

  • src/libs/actions/Search.ts
    Conflict was around the HandleActionButtonPressParams shape and function args — it had undelete additions like onUndelete alongside the newer billing restriction argument (ownerBillingGracePeriodEnd).

Fixed Issues

$ #86780
$ #86782
$ #86783
$ #86788
$ #86790
$ #86791
$ #86793
$ #86796
$ #86799
$ #86850
$ #86835

Tests

Same as fixed issues

  • Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

  • 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 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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 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)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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 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.
  • 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.
  • 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

…/deleted-transactions-on-search"

This reverts commit 95ec555, reversing
changes made to af0e8f6.
Align cached search results and callback memoization to satisfy react hooks lint rules.

Made-with: Cursor
@luacmartins luacmartins self-assigned this Mar 31, 2026
@luacmartins luacmartins marked this pull request as ready for review March 31, 2026 22:25
@luacmartins luacmartins requested review from a team as code owners March 31, 2026 22:25
@melvin-bot melvin-bot bot requested review from eVoloshchak and trjExpensify and removed request for a team March 31, 2026 22:25
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Mar 31, 2026

@eVoloshchak 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 luacmartins requested review from rojiphil and removed request for eVoloshchak March 31, 2026 22:28
@codecov
Copy link
Copy Markdown

codecov bot commented Mar 31, 2026

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
src/CONST/index.ts 95.16% <ø> (ø)
...hList/ListItem/ActionCell/actionTranslationsMap.ts 100.00% <ø> (ø)
...mponents/Search/SearchList/ListItem/StatusCell.tsx 60.00% <100.00%> (ø)
src/components/Search/SearchList/index.tsx 43.47% <ø> (-0.49%) ⬇️
src/components/TransactionItemRow/index.tsx 85.04% <ø> (-0.14%) ⬇️
src/hooks/useSearchBulkActions.ts 0.00% <ø> (ø)
src/libs/ReportUtils.ts 79.58% <100.00%> (-0.02%) ⬇️
src/libs/TransactionUtils/index.ts 83.69% <ø> (-0.03%) ⬇️
src/libs/actions/Search.ts 24.95% <100.00%> (+0.14%) ⬆️
src/libs/actions/Transaction.ts 67.77% <100.00%> (-0.32%) ⬇️
... and 5 more
... and 19 files with indirect coverage changes

Copy link
Copy Markdown

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

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: bfddc5b092

ℹ️ 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 on lines +1413 to 1416
...(oldIOUAction && !oldIOUAction.childReportID
? {
transactionThreadReportID,
transactionThreadCreatedReportActionID,
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Send thread metadata whenever a new thread is created

The payload for ChangeTransactionsReport now includes transactionThreadReportID/transactionThreadCreatedReportActionID only when oldIOUAction exists, but a new thread is also created when oldIOUAction is missing (e.g., legacy/stale transactions with no loaded IOU action). In that path, we still create optimistic thread/report-action objects but omit their IDs from transactionIDToReportActionAndThreadData, so the backend cannot reconcile those optimistic entities correctly and the move can leave broken/duplicate pending thread state.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor

@rojiphil rojiphil left a comment

Choose a reason for hiding this comment

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

@luacmartins Looks like there are changes in useSearchBulkActions that weren't in the original PR. I have left these as suggestions for your review. Otherwise, the revert LGTM.

@luacmartins
Copy link
Copy Markdown
Contributor Author

@rojiphil there were conflicts in useSearchBulkActions so I had to resolve them, which led to those changes. It seems like we have conflicts again, so I'll resolve them once more.

@luacmartins luacmartins requested a review from rojiphil April 1, 2026 15:39
@luacmartins
Copy link
Copy Markdown
Contributor Author

@rojiphil can you please review again?

@rojiphil
Copy link
Copy Markdown
Contributor

rojiphil commented Apr 1, 2026

Sure... Looking into the changes. Will update soon.

firstTransactionPolicy,
handleDeleteSelectedTransactions,
undeleteTransactions,
currentUserPersonalDetails?.email,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@luacmartins currentUserPersonalDetails?.email was added by the original PR. Once this is removed, the revert LGTM

@luacmartins luacmartins requested a review from rojiphil April 1, 2026 16:16
Copy link
Copy Markdown
Contributor

@rojiphil rojiphil left a comment

Choose a reason for hiding this comment

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

@luacmartins LGTM. Thanks.

@melvin-bot melvin-bot bot requested a review from lakchote April 1, 2026 16:21
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Apr 1, 2026

@lakchote 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
Copy link
Copy Markdown
Contributor Author

TS check is unrelated. We'll CP this so I'd rather not fix it here

@luacmartins luacmartins merged commit 4fe0948 into main Apr 1, 2026
35 of 37 checks passed
@luacmartins luacmartins deleted the revert-85818 branch April 1, 2026 17:43
@melvin-bot melvin-bot bot added the Emergency label Apr 1, 2026
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Apr 1, 2026

@luacmartins 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
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 1, 2026

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

OSBotify pushed a commit that referenced this pull request Apr 1, 2026
Revert 85818

(cherry picked from commit 4fe0948)

(cherry-picked to staging by luacmartins)
@OSBotify OSBotify added the CP Staging marks PRs that have been CP'd to staging label Apr 1, 2026
@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Apr 1, 2026

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

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

Bundle Size Analysis (Sentry):

@MelvinBot
Copy link
Copy Markdown
Contributor

🤖 Help Site Review: No changes required

I reviewed PR #86804 (revert of #85818) against all help site articles under docs/articles/.

What was reverted: The "undelete transactions" feature — including the Undelete bulk action, Deleted status badge, useUndeleteTransactions hook, and related translations.

Help site impact: None. The New Expensify help site articles never documented the undelete/restore feature:

  • docs/articles/new-expensify/reports-and-expenses/How-to-Delete-Expenses.md — covers deletion only, with no mention of recovery or restoration
  • No other New Expensify article references "undelete", "restore deleted", or "recover deleted" expenses

The only references to restoring deleted expenses exist in Expensify Classic articles (expensify-classic/expenses/Expense-Types.md and expensify-classic/copilots-and-delegates/Approving-Reports.md), which are unaffected by this revert.

Conclusion: Since the undelete feature was never documented in the help site before being reverted, no documentation changes are needed.

@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Apr 2, 2026

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.3.51-10 🚀

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

@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Apr 2, 2026

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

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

Bundle Size Analysis (Sentry):

@MelvinBot
Copy link
Copy Markdown
Contributor

No help site changes are required for this PR.

This PR reverts #85818, which added an "undelete" bulk action for transactions in the search UI. I searched docs/articles/ for any references to this feature (undelete, trash report, deleted transactions in search context) and found no existing documentation covering it. The only matches are unrelated Expensify Classic references (Reconciliation Dashboard, QuickBooks/Sage Intacct export errors).

Since the reverted feature was never documented in the help site, there's nothing to update or remove.

@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Apr 7, 2026

🚀 Deployed to production by https://github.com/roryabraham in version: 9.3.52-9 🚀

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

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

Labels

CP Staging marks PRs that have been CP'd to staging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants