From 2f133d6907685d110b89084d3ef3632550b1ee27 Mon Sep 17 00:00:00 2001 From: BhuvaneshPatil Date: Tue, 21 Nov 2023 01:20:41 +0530 Subject: [PATCH] Handle amount setting to zero when going back --- src/libs/actions/IOU.js | 2 +- src/pages/iou/steps/MoneyRequestConfirmPage.js | 2 +- .../MoneyRequestParticipantsPage.js | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js index 7a6c297d2cd6..44249716d711 100644 --- a/src/libs/actions/IOU.js +++ b/src/libs/actions/IOU.js @@ -2903,7 +2903,7 @@ function setUpDistanceTransaction() { */ function navigateToNextPage(iou, iouType, report, path = '') { const moneyRequestID = `${iouType}${report.reportID || ''}`; - const shouldReset = iou.id !== moneyRequestID; + const shouldReset = iou.id !== moneyRequestID && !_.isEmpty(report.reportID); // If the money request ID in Onyx does not match the ID from params, we want to start a new request // with the ID from params. We need to clear the participants in case the new request is initiated from FAB. diff --git a/src/pages/iou/steps/MoneyRequestConfirmPage.js b/src/pages/iou/steps/MoneyRequestConfirmPage.js index 54a84f99fa55..925ee8b45ec7 100644 --- a/src/pages/iou/steps/MoneyRequestConfirmPage.js +++ b/src/pages/iou/steps/MoneyRequestConfirmPage.js @@ -127,7 +127,7 @@ function MoneyRequestConfirmPage(props) { // Reset the money request Onyx if the ID in Onyx does not match the ID from params const moneyRequestId = `${iouType}${reportID}`; - const shouldReset = !isDistanceRequest && props.iou.id !== moneyRequestId; + const shouldReset = !isDistanceRequest && props.iou.id !== moneyRequestId && !_.isEmpty(reportID); if (shouldReset) { IOU.resetMoneyRequestInfo(moneyRequestId); } diff --git a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js index 7d38ee1c0282..7295e7f922a6 100644 --- a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js +++ b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js @@ -1,3 +1,4 @@ +import _ from 'lodash'; import lodashGet from 'lodash/get'; import lodashSize from 'lodash/size'; import PropTypes from 'prop-types'; @@ -108,7 +109,7 @@ function MoneyRequestParticipantsPage({iou, selectedTab, route, transaction}) { // Reset the money request Onyx if the ID in Onyx does not match the ID from params const moneyRequestId = `${iouType}${reportID}`; - const shouldReset = iou.id !== moneyRequestId; + const shouldReset = iou.id !== moneyRequestId && !_.isEmpty(reportID); if (shouldReset) { IOU.resetMoneyRequestInfo(moneyRequestId); }