From f84e5ad4dfc13cdea4dfbd25a4c0553cc83589d6 Mon Sep 17 00:00:00 2001 From: Nicolay Arefyeu Date: Thu, 3 Apr 2025 13:59:18 +0300 Subject: [PATCH 1/2] Hide distance menu items if no waypoints are available --- src/components/ReportActionItem/MoneyRequestView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx index 78ce4db4e5d9..7233bfab11a3 100644 --- a/src/components/ReportActionItem/MoneyRequestView.tsx +++ b/src/components/ReportActionItem/MoneyRequestView.tsx @@ -625,7 +625,7 @@ function MoneyRequestView({report, shouldShowAnimatedBackground, readonly = fals numberOfLinesTitle={0} /> - {isDistanceRequest ? ( + {isDistanceRequest && transaction?.comment?.waypoints ? ( distanceRequestFields ) : ( From a1ac576e4160a188cd4f4bbfe2e8fa64e38b9787 Mon Sep 17 00:00:00 2001 From: Nicolay Arefyeu Date: Thu, 3 Apr 2025 14:18:03 +0300 Subject: [PATCH 2/2] Show not found page if user tries to open distance page directly --- src/pages/iou/request/step/IOURequestStepDistance.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/iou/request/step/IOURequestStepDistance.tsx b/src/pages/iou/request/step/IOURequestStepDistance.tsx index d07d3be69d91..e9012cd81d19 100644 --- a/src/pages/iou/request/step/IOURequestStepDistance.tsx +++ b/src/pages/iou/request/step/IOURequestStepDistance.tsx @@ -537,6 +537,7 @@ function IOURequestStepDistance({ headerTitle={translate('common.distance')} onBackButtonPress={navigateBack} testID={IOURequestStepDistance.displayName} + shouldShowNotFoundPage={isEditing && !transaction?.comment?.waypoints} shouldShowWrapper={!isCreatingNewRequest} > <>