Skip to content

[CP Staging] Revert 79085 & 77238#79145

Merged
arosiclair merged 2 commits intomainfrom
arosiclair-revert-79085-77238
Jan 8, 2026
Merged

[CP Staging] Revert 79085 & 77238#79145
arosiclair merged 2 commits intomainfrom
arosiclair-revert-79085-77238

Conversation

@arosiclair
Copy link
Contributor

@arosiclair arosiclair commented Jan 8, 2026

Explanation of Change

Reverts #79085 and #77238

Fixed Issues

$ #79124
$ #79125
$ #79126
$ #79127

This reverts commit 63b3857, reversing
changes made to 883e8ec.
This reverts commit 454e537, reversing
changes made to 5014512.
@arosiclair arosiclair self-assigned this Jan 8, 2026
@arosiclair arosiclair changed the title Revert 79085 & 77238 [CP Staging] Revert 79085 & 77238 Jan 8, 2026
@arosiclair arosiclair marked this pull request as ready for review January 8, 2026 20:48
@arosiclair arosiclair requested review from a team as code owners January 8, 2026 20:48
@melvin-bot melvin-bot bot requested review from eVoloshchak and trjExpensify and removed request for a team January 8, 2026 20:48
@melvin-bot
Copy link

melvin-bot bot commented Jan 8, 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]

@melvin-bot melvin-bot bot requested review from a team and joekaufmanexpensify and removed request for a team January 8, 2026 20:48
@codecov
Copy link

codecov bot commented Jan 8, 2026

Codecov Report

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

Files with missing lines Coverage Δ
src/CONST/index.ts 83.47% <ø> (ø)
src/components/MoneyReportHeader.tsx 0.00% <ø> (ø)
...ents/ReportActionItem/TransactionPreview/index.tsx 83.87% <100.00%> (ø)
src/components/TransactionItemRow/index.tsx 87.12% <100.00%> (ø)
src/libs/DistanceRequestUtils.ts 81.34% <100.00%> (+16.41%) ⬆️
src/libs/SearchUIUtils.ts 59.32% <100.00%> (+0.14%) ⬆️
src/libs/Violations/ViolationsUtils.ts 67.37% <100.00%> (+0.90%) ⬆️
src/libs/actions/IOU/index.ts 67.48% <100.00%> (+56.22%) ⬆️
src/libs/actions/Policy/Member.ts 72.75% <ø> (+2.72%) ⬆️
...rc/pages/iou/request/step/IOURequestStepAmount.tsx 4.12% <ø> (+0.04%) ⬆️
... and 19 more
... and 108 files with indirect coverage changes

@arosiclair arosiclair merged commit d09fa19 into main Jan 8, 2026
33 of 38 checks passed
@arosiclair arosiclair deleted the arosiclair-revert-79085-77238 branch January 8, 2026 20:56
@Julesssss

This comment was marked as outdated.

@melvin-bot melvin-bot bot added the Emergency label Jan 8, 2026
@melvin-bot
Copy link

melvin-bot bot commented Jan 8, 2026

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

Copy link

@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: 6c309dc047

ℹ️ 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 127 to +129
reportID: item.reportID,
policyID: item.report?.policyID,
amount: hasValidModifiedAmount(item) ? Number(item.modifiedAmount) : item.amount,
amount: item.modifiedAmount ?? item.amount,

Choose a reason for hiding this comment

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

P2 Badge Fall back to original amount when modifiedAmount is 0

Using item.modifiedAmount ?? item.amount treats an explicitly set modifiedAmount of 0 as valid, but the rest of the app uses 0 as the “unset/missing” sentinel (e.g., other views use modifiedAmount || amount). When a transaction has a real non‑zero amount and modifiedAmount is stored as 0 (common for unmodified transactions), this selection entry will carry amount = 0, which then flows into selected report totals and bulk actions/export. The bug appears whenever modifiedAmount is explicitly 0, causing totals for selected items to be wrong.

Useful? React with 👍 / 👎.

@arosiclair
Copy link
Contributor Author

straight revert

OSBotify pushed a commit that referenced this pull request Jan 8, 2026
[CP Staging] Revert 79085 & 77238

(cherry picked from commit d09fa19)

(cherry-picked to staging by arosiclair)
@OSBotify OSBotify added the CP Staging marks PRs that have been CP'd to staging label Jan 8, 2026
@OSBotify
Copy link
Contributor

OSBotify commented Jan 8, 2026

✋ 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
Copy link
Contributor

OSBotify commented Jan 8, 2026

🚀 Cherry-picked to staging by https://github.com/arosiclair in version: 9.2.96-2 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Jan 9, 2026

🚀 Deployed to production by https://github.com/arosiclair in version: 9.2.96-6 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Jan 9, 2026

🚀 Deployed to production by https://github.com/arosiclair in version: 9.2.96-6 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Jan 9, 2026

🚀 Deployed to production by https://github.com/arosiclair in version: 9.2.96-6 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Jan 9, 2026

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

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

@OSBotify
Copy link
Contributor

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

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/francoisl in version: 9.2.99-8 🚀

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.

3 participants