From f886ea360aaf82e0342ea8dcdc9ba6d82c414137 Mon Sep 17 00:00:00 2001 From: VickyStash Date: Tue, 20 May 2025 13:39:14 +0200 Subject: [PATCH 1/4] Fix navigation logic --- src/pages/iou/request/step/IOURequestStepParticipants.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.tsx b/src/pages/iou/request/step/IOURequestStepParticipants.tsx index bf760d4f5d0c..be411dd95e89 100644 --- a/src/pages/iou/request/step/IOURequestStepParticipants.tsx +++ b/src/pages/iou/request/step/IOURequestStepParticipants.tsx @@ -228,7 +228,11 @@ function IOURequestStepParticipants({ }, ]); }); - Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(action, CONST.IOU.TYPE.SUBMIT, initialTransactionID, expenseChatReportID)); + if (isCategorizing) { + Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(action, CONST.IOU.TYPE.SUBMIT, initialTransactionID, expenseChatReportID)); + } else { + Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(action, CONST.IOU.TYPE.SUBMIT, initialTransactionID, expenseChatReportID, undefined, true)); + } return; } From 4fb9b39baf5a33999566eaed6e5a86d061c2b56f Mon Sep 17 00:00:00 2001 From: VickyStash Date: Tue, 20 May 2025 13:53:08 +0200 Subject: [PATCH 2/4] Re-run tests From 47a3017ed99beb931690f23300b5fdd1c38df721 Mon Sep 17 00:00:00 2001 From: VickyStash Date: Tue, 20 May 2025 18:42:43 +0200 Subject: [PATCH 3/4] Fix expense creation on android --- .../step/IOURequestStepParticipants.tsx | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.tsx b/src/pages/iou/request/step/IOURequestStepParticipants.tsx index be411dd95e89..4b7e20933ff9 100644 --- a/src/pages/iou/request/step/IOURequestStepParticipants.tsx +++ b/src/pages/iou/request/step/IOURequestStepParticipants.tsx @@ -278,7 +278,9 @@ function IOURequestStepParticipants({ }); numberOfParticipants.current = 0; } - }, [isFocused, action, transactions]); + // We don't want to clear out participants every time the transactions change + // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps + }, [isFocused, action, initialTransactionID]); return ( )} - + {transactions.length > 0 && ( + + )} ); } From c4f809d72a7b6584a1372895fbb6d0c86dd03ec7 Mon Sep 17 00:00:00 2001 From: VickyStash Date: Tue, 20 May 2025 19:27:31 +0200 Subject: [PATCH 4/4] Minor improvement --- src/pages/iou/request/step/IOURequestStepParticipants.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.tsx b/src/pages/iou/request/step/IOURequestStepParticipants.tsx index 4b7e20933ff9..e52f5984ce52 100644 --- a/src/pages/iou/request/step/IOURequestStepParticipants.tsx +++ b/src/pages/iou/request/step/IOURequestStepParticipants.tsx @@ -280,7 +280,7 @@ function IOURequestStepParticipants({ } // We don't want to clear out participants every time the transactions change // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps - }, [isFocused, action, initialTransactionID]); + }, [isFocused, action]); return (