Improve deleted tax behavior#78472
Conversation
|
@thesahindia 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] |
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.
|
|
Hi @MonilBhavsar, I have a question about the backend behavior. Screen.Recording.2025-12-29.at.15.21.50.mov
Can we update step 4 so that when I select the tax with value |
|
What API response did you get when you selected new tax rate with 40%? |
|
The response was from the UpdateMoneyRequestTaxRate API. |
|
Yes, do you mind sharing it here? |
|
requestID: "9b57e3713e2db251-LAX" {
"jsonCode": 200,
"requestID": "9b57e3713e2db251-LAX",
"onyxData": [
{
"key": "report_8491660798716591",
"onyxMethod": "merge",
"value": {
"participants": {
"21091638": {
"notificationPreference": ""
}
}
}
},
{
"key": "personalDetailsList",
"onyxMethod": "merge",
"value": {
"21091638": {
"accountID": 21091638,
"avatar": "https:\/\/d2k5nsl2zxldvw.cloudfront.net\/images\/avatars\/default-avatar_22.png",
"displayName": "TM",
"firstName": "TM",
"lastName": "",
"login": "huult+03242949242242@gmail.com",
"phoneNumber": "",
"pronouns": "",
"status": null,
"timezone": {
"automatic": true,
"selected": "Asia\/Ho_Chi_Minh"
},
"validated": false
}
}
},
{
"key": "report_8491660798716591",
"onyxMethod": "merge",
"value": {
"lastReadTime": "2025-12-29 08:20:52.382"
}
},
{
"key": "reportNameValuePairs_8491660798716591",
"onyxMethod": "merge",
"value": {
"chatType": "",
"description": "",
"parentReportActionID": "245929997925888734",
"parentReportID": "7730730594068390"
}
},
{
"key": "report_8491660798716591",
"onyxMethod": "merge",
"value": {
"chatType": "",
"description": "",
"lastActorAccountID": 21091638,
"lastMessageText": "huult+03242949242242@gmail.com ",
"lastVisibleActionCreated": "2025-12-29 07:42:11.872",
"managerID": null,
"ownerAccountID": 0,
"parentReportActionID": "245929997925888734",
"parentReportID": "7730730594068390",
"policyID": "B2E2C2A6310459F2",
"reportID": "8491660798716591",
"reportName": "Chat Report",
"state": "OPEN",
"stateNum": 0,
"statusNum": 0,
"type": "chat",
"visibility": null
}
},
{
"key": "reportActions_8491660798716591",
"onyxMethod": "merge",
"shouldShowPushNotification": true,
"value": {
"7967640082084948723": {
"actionName": "MODIFIEDEXPENSE",
"actorAccountID": 21091638,
"avatar": "https:\/\/d2k5nsl2zxldvw.cloudfront.net\/images\/avatars\/default-avatar_22.png",
"created": "2025-12-29 08:22:14.096",
"lastModified": "2025-12-29 08:22:14.096",
"message": [
{
"html": "huult+03242949242242@gmail.com ",
"text": "huult+03242949242242@gmail.com",
"type": "COMMENT",
"whisperedTo": []
}
],
"originalMessage": {
"isNewDot": true,
"lastModified": "2025-12-29 08:22:14.096"
},
"person": [
{
"style": "strong",
"text": "TM",
"type": "TEXT"
}
],
"reportActionID": "7967640082084948723",
"shouldShow": true
}
}
},
{
"key": "reportActions_7730730594068390",
"onyxMethod": "merge",
"value": {
"245929997925888734": {
"actionName": "IOU",
"actorAccountID": 21091638,
"avatar": "https:\/\/d2k5nsl2zxldvw.cloudfront.net\/images\/avatars\/default-avatar_22.png",
"created": "2025-12-29 07:42:09.798",
"lastModified": "2025-12-29 07:42:09.798",
"message": [
{
"html": "\u20ab23 expense",
"text": "\u20ab23 expense",
"type": "COMMENT",
"whisperedTo": []
}
],
"originalMessage": {
"IOUReportID": 7730730594068390,
"IOUTransactionID": "4798280820925149892",
"amount": 2300,
"comment": "",
"currency": "VND",
"isNewDot": true,
"lastModified": "2025-12-29 07:42:09.798",
"participantAccountIDs": [
21091638,
0
],
"type": "create"
},
"person": [
{
"style": "strong",
"text": "TM",
"type": "TEXT"
}
],
"reportActionID": "245929997925888734",
"shouldShow": true
}
}
},
{
"key": "report_8491660798716591",
"onyxMethod": "merge",
"value": {
"lastReadTime": "2025-12-29 08:22:14.096"
}
},
{
"key": "reportActions_742576667027986",
"onyxMethod": "merge",
"value": {
"4352628338059460823": {
"childCanHold": true,
"childCanUnhold": false,
"childCommenterCount": 0,
"childLastActorAccountID": 21091638,
"childLastMoneyRequestComment": "",
"childLastVisibleActionCreated": "",
"childManagerAccountID": 21091638,
"childMoneyRequestCount": 1,
"childOldestFourAccountIDs": "",
"childOwnerAccountID": 21091638,
"childRecentReceiptTransactionIDs": {},
"childReportID": "7730730594068390",
"childReportName": "Expense Report 2025-12-29",
"childStateNum": 0,
"childStatusNum": 0,
"childType": "expense",
"childVisibleActionCount": 0,
"message": [
{
"html": "TM's Workspace owes \u20ab23",
"text": "TM's Workspace owes \u20ab23",
"type": "COMMENT",
"whisperedTo": []
}
],
"originalMessage": {
"isNewDot": true,
"lastModified": "2025-12-29 07:42:09.802",
"linkedReportID": "7730730594068390"
}
}
}
},
{
"key": "transactionViolations_",
"onyxMethod": "mergecollection",
"value": {
"transactionViolations_4798280820925149892": [
{
"data": null,
"name": "taxOutOfPolicy",
"showInReview": true,
"type": "violation"
}
]
}
},
{
"key": "transactions_4798280820925149892",
"onyxMethod": "merge",
"value": {
"amount": -2300,
"bank": "",
"billable": false,
"cardID": 23662666,
"cardName": "Cash Expense",
"cardNumber": "",
"category": "Advertising",
"comment": {
"comment": ""
},
"convertedAmount": -2300,
"created": "2025-12-29",
"currency": "VND",
"hasEReceipt": false,
"inserted": "2025-12-29 07:42:09",
"managedCard": false,
"mcc": 0,
"merchant": "M",
"modifiedAmount": "",
"modifiedCreated": "",
"modifiedCurrency": "",
"modifiedMCC": "",
"modifiedMerchant": "",
"originalAmount": 0,
"originalCurrency": "",
"parentTransactionID": "",
"posted": "",
"receipt": null,
"reimbursable": true,
"reportID": "7730730594068390",
"status": "Posted",
"tag": "",
"taxAmount": -596,
"taxCode": "id_TAX_RATE_2",
"taxValue": "35%", // I would like to change this value to 40%.
"transactionID": "4798280820925149892"
}
},
{
"key": "report_7730730594068390",
"onyxMethod": "merge",
"value": {
"avatarUrl": null,
"chatReportID": "742576667027986",
"chatType": "",
"created": "2025-12-29 07:42:09",
"currency": "VND",
"description": "",
"errorFields": {
"export": null,
"notFound": null
},
"fieldList": null,
"hasExportError": false,
"hasOutstandingChildRequest": false,
"hasOutstandingChildTask": false,
"hasParentAccess": true,
"hasReportBeenReopened": false,
"hasReportBeenRetracted": false,
"invoiceReceiver": null,
"iouReportID": null,
"isCancelledIOU": false,
"isDeletedParentAction": null,
"isExportedToIntegration": false,
"isPinned": false,
"isWaitingOnBankAccount": false,
"lastActionType": "CREATED",
"lastActorAccountID": "21091638",
"lastMentionedTime": null,
"lastMessageHtml": "",
"lastMessageText": "",
"lastReadSequenceNumber": 0,
"lastReadTime": "2025-12-29 08:22:00.726",
"lastVisibleActionCreated": "2025-12-29 07:42:09.795",
"lastVisibleActionLastModified": "2025-12-29 07:42:09.795",
"managerID": 21091638,
"nonReimbursableTotal": 0,
"oldPolicyName": "",
"ownerAccountID": 21091638,
"parentReportActionID": "4352628338059460823",
"parentReportID": "742576667027986",
"participants": {
"21091638": {
"notificationPreference": ""
}
},
"permissions": [],
"policyAvatar": null,
"policyID": "B2E2C2A6310459F2",
"policyName": null,
"private_isArchived": "",
"reportID": "7730730594068390",
"reportName": "Expense Report 2025-12-29",
"stateNum": 0,
"statusNum": 0,
"total": -2300,
"transactionCount": 1,
"tripData": null,
"type": "expense",
"unheldNonReimbursableTotal": 0,
"unheldTotal": -2300,
"visibility": null,
"welcomeMessage": "",
"writeCapability": "all"
}
},
{
"key": "reportNameValuePairs_7730730594068390",
"onyxMethod": "merge",
"value": {
"expensify_text_title": {
"defaultExternalID": "",
"defaultValue": "{report:type} {report:startdate}",
"deletable": true,
"disabledOptions": [],
"externalID": null,
"externalIDs": [],
"fieldID": "text_title",
"isTax": false,
"keys": [],
"name": "title",
"orderWeight": 0,
"origin": null,
"target": "expense",
"type": "formula",
"value": "Expense Report 2025-12-29",
"values": []
},
"parentReportActionID": 4352628338059460823,
"parentReportID": 742576667027986
}
},
{ // It should remove the taxOutOfPolicy violation.
"key": "transactionViolations_",
"onyxMethod": "mergecollection",
"value": {
"transactionViolations_4798280820925149892": [
{
"data": null,
"name": "taxOutOfPolicy",
"showInReview": true,
"type": "violation"
}
]
}
}
],
"previousUpdateID": 9523081771,
"lastUpdateID": 9523082270
} |
|
Thanks for sharing! Will take a look |
|
|
Chrome / v9.3.37-9 PR:78472 Screen.Recording.2026-03-16.at.11.33.04.mp4 |
|
Thank you for testing! cc @thesahindia |
|
Thanks @thesahindia! Looks like PR reviewer checklist needs an update? |
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppScreen.Recording.2026-03-12.at.1.13.59.PM.movAndroid: mWeb ChromeiOS: HybridAppScreen.Recording.2026-03-12.at.4.39.24.PM.moviOS: mWeb SafariScreen.Recording.2026-03-12.at.4.42.55.PM.movMacOS: Chrome / SafariScreen.Recording.2026-03-12.at.4.56.15.PM.mov |
|
Please rerun the checks again @MonilBhavsar |
| const taxRateTitle = updatedTransaction ? getTaxName(policy, updatedTransaction, isExpenseUnreported) : getTaxName(policy, transaction, isExpenseUnreported); | ||
|
|
||
| const baseTransaction = updatedTransaction ?? transaction; | ||
| const {taxCode, taxValue} = transaction ?? {}; |
There was a problem hiding this comment.
Should it read tax values from baseTransaction?
There was a problem hiding this comment.
Yes, I updated it to use baseTransaction for the merge/duplicate flow.
|
Thanks all! This is looking good |
|
🚧 @MonilBhavsar has triggered a test Expensify/App build. You can view the workflow run here. |
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
|
|
🚀 Deployed to staging by https://github.com/MonilBhavsar in version: 9.3.40-0 🚀
|
|
🚀 Deployed to staging by https://github.com/MonilBhavsar in version: 9.3.40-0 🚀
|
|
Deploy Blocker #85729 was identified to be related to this PR. |
|
Deploy Blocker #85730 was identified to be related to this PR. |
|
🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.41-4 🚀
|
Explanation of Change
Handle deleted tax rates by detecting removed codes, showing them as disabled/selected in the picker, and clearing the tax on submit when editing
Fixed Issues
$ #73033
PROPOSAL: #73033 (comment)
Tests
Same QA step
Offline tests
QA Steps
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectioncanBeMissingparam foruseOnyxtoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Screen.Recording.2026-01-19.at.10.46.29.mp4
Android: mWeb Chrome
Screen.Recording.2026-01-19.at.10.50.11.mp4
iOS: Native
Screen.Recording.2026-01-19.at.10.55.24.mp4
iOS: mWeb Safari
Screen.Recording.2026-01-19.at.10.57.56.mp4
MacOS: Chrome / Safari
Screen.Recording.2026-01-19.at.10.39.58.mp4