From 639fe132a17b051c5d519f3e10f042727c28b97a Mon Sep 17 00:00:00 2001 From: I Nyoman Jyotisa Date: Thu, 23 Oct 2025 08:19:42 +0800 Subject: [PATCH 1/2] Fix: App freezes when creating per diem expense from 'Create expense' on empty report --- src/pages/iou/request/step/IOURequestStepSubrate.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/iou/request/step/IOURequestStepSubrate.tsx b/src/pages/iou/request/step/IOURequestStepSubrate.tsx index dfe469147fc4..7fd504a98197 100644 --- a/src/pages/iou/request/step/IOURequestStepSubrate.tsx +++ b/src/pages/iou/request/step/IOURequestStepSubrate.tsx @@ -137,6 +137,7 @@ function IOURequestStepSubrate({ const selectedSubrate = allPossibleSubrates.find(({id}) => id === subrateVal); const name = selectedSubrate?.name ?? ''; const rate = selectedSubrate?.rate ?? 0; + const transactionReportID = transaction?.reportID && transaction.reportID !== CONST.REPORT.UNREPORTED_REPORT_ID ? transaction.reportID : reportID; if (parsedIndex === filledSubrateCount) { addSubrate(transaction, pageIndex, quantityInt, subrateVal, name, rate); @@ -147,7 +148,7 @@ function IOURequestStepSubrate({ if (backTo) { goBack(); } else { - Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(action, iouType, transactionID, reportID)); + Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(action, iouType, transactionID, transactionReportID)); } }; From e8899b45aab2d6605b4c954c109a8e3d6b428abf Mon Sep 17 00:00:00 2001 From: I Nyoman Jyotisa Date: Thu, 23 Oct 2025 13:09:17 +0800 Subject: [PATCH 2/2] Fix: App freezes when creating per diem expense from 'Create expense' on empty report --- src/pages/iou/request/step/IOURequestStepSubrate.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/iou/request/step/IOURequestStepSubrate.tsx b/src/pages/iou/request/step/IOURequestStepSubrate.tsx index 7fd504a98197..f9a46aa76f5c 100644 --- a/src/pages/iou/request/step/IOURequestStepSubrate.tsx +++ b/src/pages/iou/request/step/IOURequestStepSubrate.tsx @@ -137,7 +137,7 @@ function IOURequestStepSubrate({ const selectedSubrate = allPossibleSubrates.find(({id}) => id === subrateVal); const name = selectedSubrate?.name ?? ''; const rate = selectedSubrate?.rate ?? 0; - const transactionReportID = transaction?.reportID && transaction.reportID !== CONST.REPORT.UNREPORTED_REPORT_ID ? transaction.reportID : reportID; + const transactionReportID = transaction?.participants?.at(0)?.reportID ?? transaction?.reportID ?? reportID; if (parsedIndex === filledSubrateCount) { addSubrate(transaction, pageIndex, quantityInt, subrateVal, name, rate);