fix: reverting the amount and currency after error clearance.

src/components/ReportActionItem/MoneyRequestView.tsx

@@ -71,9 +71,9 @@
 const receiptFieldViolationNames: OnyxTypes.ViolationName[] = [CONST.VIOLATIONS.MODIFIED_AMOUNT, CONST.VIOLATIONS.MODIFIED_DATE];
 
 const getTransactionID = (report: OnyxEntry<OnyxTypes.Report>, parentReportActions: OnyxEntry<OnyxTypes.ReportActions>) => {
     const parentReportAction = parentReportActions?.[report?.parentReportActionID ?? '-1'];
     const originalMessage = parentReportAction && ReportActionsUtils.isMoneyRequestAction(parentReportAction) ? ReportActionsUtils.getOriginalMessage(parentReportAction) : undefined;
     return originalMessage?.IOUTransactionID ?? -1;
 };
 
 function MoneyRequestView({report, shouldShowAnimatedBackground, readonly = false, updatedTransaction, isFromReviewDuplicates = false}: MoneyRequestViewProps) {
@@ -81,8 +81,8 @@
     const session = useSession();
     const {isOffline} = useNetwork();
     const {translate, toLocaleDigit} = useLocalize();
     const parentReportID = report?.parentReportID ?? '-1';
     const policyID = report?.policyID ?? '-1';
     const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`);
     const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${parentReport?.parentReportID}`, {
         selector: (chatReportValue) => chatReportValue && {reportID: chatReportValue.reportID, errorFields: chatReportValue.errorFields},
@@ -97,12 +97,12 @@
     });
     const [transactionViolations] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${getTransactionID(report, parentReportActions)}`);
 
     const parentReportAction = parentReportActions?.[report?.parentReportActionID ?? '-1'];
     const isTrackExpense = ReportUtils.isTrackExpenseReport(report);
     const moneyRequestReport = parentReport;
     const linkedTransactionID = useMemo(() => {
         const originalMessage = parentReportAction && ReportActionsUtils.isMoneyRequestAction(parentReportAction) ? ReportActionsUtils.getOriginalMessage(parentReportAction) : undefined;
         return originalMessage?.IOUTransactionID ?? '-1';
     }, [parentReportAction]);
 
     const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${linkedTransactionID}`);
@@ -227,7 +227,7 @@
             if (newBillable === TransactionUtils.getBillable(transaction)) {
                 return;
             }
             IOU.updateMoneyRequestBillable(transaction?.transactionID ?? '-1', report?.reportID ?? '-1', newBillable, policy, policyTagList, policyCategories);
         },
         [transaction, report, policy, policyTagList, policyCategories],
     );
@@ -323,8 +323,8 @@
                             ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(
                                 CONST.IOU.ACTION.EDIT,
                                 iouType,
                                 transaction?.transactionID ?? '-1',
                                 report?.reportID ?? '-1',
                                 Navigation.getReportRHPActiveRoute(),
                             ),
                         )
@@ -469,7 +469,7 @@
                                     return;
                                 }
                             }
-                            Transaction.clearError(transaction?.transactionID ?? linkedTransactionID);
+                            Transaction.clearError(transaction?.transactionID ?? linkedTransactionID, {});
                             ReportActions.clearAllRelatedReportActionErrors(report?.reportID ?? '-1', parentReportAction);
                         }}
                     >

src/libs/actions/Transaction.ts

@@ -457,8 +457,8 @@ function abandonReviewDuplicateTransactions() {
     Onyx.set(ONYXKEYS.REVIEW_DUPLICATES, null);
 }
 
-function clearError(transactionID: string) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {errors: null, errorFields: {route: null, waypoints: null, routes: null}});
+function clearError(transactionID: string, oldTransactionValues: Partial<Transaction>) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {...oldTransactionValues, errors: null, errorFields: {route: null, waypoints: null, routes: null}});
 }
 
 function markAsCash(transactionID: string, transactionThreadReportID: string) {

src/pages/home/report/PureReportActionItem.tsx

@@ -227,7 +227,7 @@ type PureReportActionItemProps = {
     isCurrentUserTheOnlyParticipant?: (participantAccountIDs?: number[]) => boolean;
 
     /** Function to clear an error from a transaction */
-    clearError?: (transactionID: string) => void;
+    clearError?: (transactionID: string, oldTransactionValues: Partial<OnyxTypes.Transaction>) => void;
 
     /** Function to clear all errors from a report action */
     clearAllRelatedReportActionErrors?: (reportID: string, reportAction: OnyxTypes.ReportAction | null | undefined, ignore?: IgnoreDirection, keys?: string[]) => void;
@@ -1126,9 +1126,33 @@ function PureReportActionItem({
                         >
                             <OfflineWithFeedback
                                 onClose={() => {
-                                    const transactionID = ReportActionsUtils.isMoneyRequestAction(action) ? ReportActionsUtils.getOriginalMessage(action)?.IOUTransactionID : undefined;
+                                    let transactionID;
+                                    let data = {};
+                                    if (ReportActionsUtils.isMoneyRequestAction(action)) {
+                                        transactionID = ReportActionsUtils.getOriginalMessage(action)?.IOUTransactionID;
+                                    } else if (ReportActionsUtils.isModifiedExpenseAction(action) && report?.reportID) {
+                                        const moneyRequestAction = Object.values(ReportActionsUtils.getAllReportActions(report?.reportID)).find(ReportActionsUtils.isMoneyRequestAction);
+                                        if (!moneyRequestAction) {
+                                            return;
+                                        }
+                                        transactionID = ReportActionsUtils.getOriginalMessage(moneyRequestAction)?.IOUTransactionID;
+                                        const moneyRequestActionOriginalMessage = ReportActionsUtils.getOriginalMessage(action);
+                                        if (
+                                            moneyRequestActionOriginalMessage &&
+                                            typeof moneyRequestActionOriginalMessage === 'object' &&
+                                            moneyRequestActionOriginalMessage.oldAmount &&
+                                            moneyRequestActionOriginalMessage.oldCurrency &&
+                                            'amount' in moneyRequestActionOriginalMessage &&
+                                            'currency' in moneyRequestActionOriginalMessage
+                                        ) {
+                                            data = {
+                                                modifiedAmount: moneyRequestActionOriginalMessage.oldAmount,
+                                                modifiedCurrency: moneyRequestActionOriginalMessage.oldCurrency,
+                                            };
+                                        }
+                                    }
                                     if (transactionID) {
-                                        clearError(transactionID);
+                                        clearError(transactionID, data);
                                     }
                                     clearAllRelatedReportActionErrors(reportID, action);
                                 }}