From 16cd28d32c98c15f9fe2022c2a17147702ea1f83 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Thu, 16 Nov 2023 16:13:07 +0700 Subject: [PATCH 1/3] fix category is reset after refreshing --- src/libs/actions/IOU.js | 2 ++ src/pages/iou/steps/MoneyRequestConfirmPage.js | 5 ----- .../MoneyRequestParticipantsPage.js | 2 ++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js index 158c1960895a..112b40d4df55 100644 --- a/src/libs/actions/IOU.js +++ b/src/libs/actions/IOU.js @@ -2929,6 +2929,8 @@ function navigateToNextPage(iou, iouType, report, path = '') { .map((accountID) => ({accountID, selected: true})) .value(); setMoneyRequestParticipants(participants); + resetMoneyRequestCategory(); + resetMoneyRequestTag(); } Navigation.navigate(ROUTES.MONEY_REQUEST_CONFIRMATION.getRoute(iouType, report.reportID)); return; diff --git a/src/pages/iou/steps/MoneyRequestConfirmPage.js b/src/pages/iou/steps/MoneyRequestConfirmPage.js index 54a84f99fa55..c2697a02ca45 100644 --- a/src/pages/iou/steps/MoneyRequestConfirmPage.js +++ b/src/pages/iou/steps/MoneyRequestConfirmPage.js @@ -83,11 +83,6 @@ function MoneyRequestConfirmPage(props) { const isPolicyExpenseChat = useMemo(() => ReportUtils.isPolicyExpenseChat(ReportUtils.getRootParentReport(props.report)), [props.report]); const isManualRequestDM = props.selectedTab === CONST.TAB.MANUAL && iouType === CONST.IOU.TYPE.REQUEST; - useEffect(() => { - IOU.resetMoneyRequestCategory(); - IOU.resetMoneyRequestTag(); - }, []); - useEffect(() => { const policyExpenseChat = _.find(participants, (participant) => participant.isPolicyExpenseChat); if (policyExpenseChat) { diff --git a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js index 7d38ee1c0282..5c80fa22269e 100644 --- a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js +++ b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js @@ -86,6 +86,8 @@ function MoneyRequestParticipantsPage({iou, selectedTab, route, transaction}) { const navigateToConfirmationStep = (moneyRequestType) => { IOU.setMoneyRequestId(moneyRequestType); + IOU.resetMoneyRequestCategory(); + IOU.resetMoneyRequestTag(); Navigation.navigate(ROUTES.MONEY_REQUEST_CONFIRMATION.getRoute(moneyRequestType, reportID)); }; From d3a43647acec53465f521940421187997d50a2d8 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Thu, 16 Nov 2023 22:37:48 +0700 Subject: [PATCH 2/3] reset tag and category after going back --- src/libs/actions/IOU.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js index 112b40d4df55..5e32e3fb2e88 100644 --- a/src/libs/actions/IOU.js +++ b/src/libs/actions/IOU.js @@ -2929,9 +2929,9 @@ function navigateToNextPage(iou, iouType, report, path = '') { .map((accountID) => ({accountID, selected: true})) .value(); setMoneyRequestParticipants(participants); - resetMoneyRequestCategory(); - resetMoneyRequestTag(); } + resetMoneyRequestCategory(); + resetMoneyRequestTag(); Navigation.navigate(ROUTES.MONEY_REQUEST_CONFIRMATION.getRoute(iouType, report.reportID)); return; } From 5f431230beb0bc9f1a93b9198a43682e29588a61 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Fri, 17 Nov 2023 01:05:43 +0700 Subject: [PATCH 3/3] revert last change --- src/libs/actions/IOU.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js index 5e32e3fb2e88..112b40d4df55 100644 --- a/src/libs/actions/IOU.js +++ b/src/libs/actions/IOU.js @@ -2929,9 +2929,9 @@ function navigateToNextPage(iou, iouType, report, path = '') { .map((accountID) => ({accountID, selected: true})) .value(); setMoneyRequestParticipants(participants); + resetMoneyRequestCategory(); + resetMoneyRequestTag(); } - resetMoneyRequestCategory(); - resetMoneyRequestTag(); Navigation.navigate(ROUTES.MONEY_REQUEST_CONFIRMATION.getRoute(iouType, report.reportID)); return; }