Merge pull request Expensify#82547 from software-mansion-labs/Guccio163/onyx-connect/nvp_recent_waypoints/handleMoneyRequestStepDistanceNavigation

Author: mollfpr

src/libs/actions/IOU/MoneyRequest.ts

@@ -147,6 +147,7 @@ type MoneyRequestStepDistanceNavigationParams = {
     odometerEnd?: number;
     odometerDistance?: number;
     betas: OnyxEntry<Beta[]>;
+    recentWaypoints: OnyxEntry<RecentWaypoint[]>;
     unit?: Unit;
     personalOutputCurrency?: string;
 };
@@ -540,13 +541,13 @@ function handleMoneyRequestStepDistanceNavigation({
     odometerEnd,
     odometerDistance,
     betas,
+    recentWaypoints,
     unit,
     personalOutputCurrency,
 }: MoneyRequestStepDistanceNavigationParams) {
     const isManualDistance = manualDistance !== undefined;
     const isOdometerDistance = odometerDistance !== undefined;
     const isGPSDistance = gpsDistance !== undefined && gpsCoordinates !== undefined;
-    const recentWaypoints = getRecentWaypoints();
 
     if (transaction?.splitShares && !isManualDistance && !isOdometerDistance) {
         resetSplitShares(transaction);

src/pages/iou/request/step/IOURequestStepDistance.tsx

@@ -339,6 +339,7 @@ function IOURequestStepDistance({
             selfDMReport,
             policyForMovingExpenses,
             betas,
+            recentWaypoints,
         });
     }, [
         iouType,
@@ -372,6 +373,7 @@ function IOURequestStepDistance({
         policyForMovingExpenses,
         selfDMReport,
         betas,
+        recentWaypoints,
     ]);
 
     const getError = () => {

src/pages/iou/request/step/IOURequestStepDistanceGPS/index.native.tsx

@@ -80,6 +80,7 @@ function IOURequestStepDistanceGPS({
 
     const shouldSkipConfirmation = !skipConfirmation || !report?.reportID ? false : !(isArchived || isPolicyExpenseChatUtils(report));
 
+    const [recentWaypoints] = useOnyx(ONYXKEYS.NVP_RECENT_WAYPOINTS);
     const navigateToNextStep = () => {
         const gpsCoordinates = getGPSCoordinates(gpsDraftDetails);
         const distance = getGPSConvertedDistance(gpsDraftDetails, unit);
@@ -120,6 +121,7 @@ function IOURequestStepDistanceGPS({
             selfDMReport,
             policyForMovingExpenses,
             betas,
+            recentWaypoints,
             unit,
             personalOutputCurrency: personalPolicy?.outputCurrency,
         });

src/pages/iou/request/step/IOURequestStepDistanceManual.tsx

@@ -232,6 +232,7 @@ function IOURequestStepDistanceManual({
                 selfDMReport,
                 policyForMovingExpenses,
                 betas,
+                recentWaypoints,
                 unit,
                 personalOutputCurrency: personalPolicy?.outputCurrency,
             });

src/pages/iou/request/step/IOURequestStepDistanceMap.tsx

@@ -331,6 +331,7 @@ function IOURequestStepDistanceMap({
             selfDMReport,
             policyForMovingExpenses,
             betas,
+            recentWaypoints,
         });
     }, [
         iouType,
@@ -364,6 +365,7 @@ function IOURequestStepDistanceMap({
         policyForMovingExpenses,
         selfDMReport,
         betas,
+        recentWaypoints,
     ]);
 
     const getError = () => {

src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx

@@ -448,6 +448,7 @@ function IOURequestStepDistanceOdometer({
             odometerEnd: end,
             odometerDistance: calculatedDistance,
             betas,
+            recentWaypoints,
             unit,
             personalOutputCurrency: personalPolicy?.outputCurrency,
         });

tests/actions/IOU/MoneyRequestTest.ts

@@ -777,6 +777,7 @@ describe('MoneyRequest', () => {
             quickAction: fakeQuickAction,
             selfDMReport,
             betas: [CONST.BETAS.ALL],
+            recentWaypoints: [] as RecentWaypoint[],
         };
         const splitShares: SplitShares = {
             [firstSplitParticipantID]: {
@@ -788,6 +789,7 @@ describe('MoneyRequest', () => {
         };
 
         beforeEach(async () => {
+            baseParams.recentWaypoints = (await getOnyxValue(ONYXKEYS.NVP_RECENT_WAYPOINTS)) ?? [];
             await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${fakeReport.reportID}`, {
                 ...fakeReport,
                 participants: {
@@ -840,8 +842,6 @@ describe('MoneyRequest', () => {
 
             expect(Split.resetSplitShares).not.toHaveBeenCalled();
 
-            const recentWaypoints = (await getOnyxValue(ONYXKEYS.NVP_RECENT_WAYPOINTS)) ?? [];
-
             expect(IOU.trackExpense).toHaveBeenCalledWith({
                 report: baseParams.report,
                 isDraftPolicy: false,
@@ -877,7 +877,7 @@ describe('MoneyRequest', () => {
                 currentUserAccountIDParam: baseParams.currentUserAccountID,
                 currentUserEmailParam: baseParams.currentUserLogin,
                 quickAction: baseParams.quickAction,
-                recentWaypoints,
+                recentWaypoints: baseParams.recentWaypoints,
                 betas: [CONST.BETAS.ALL],
             });
 
@@ -905,8 +905,6 @@ describe('MoneyRequest', () => {
                 waypoints: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
             });
 
-            const recentWaypoints = (await getOnyxValue(ONYXKEYS.NVP_RECENT_WAYPOINTS)) ?? [];
-
             expect(IOU.trackExpense).toHaveBeenCalledWith(
                 expect.objectContaining({
                     report: baseParams.report,
@@ -942,7 +940,7 @@ describe('MoneyRequest', () => {
                     currentUserAccountIDParam: baseParams.currentUserAccountID,
                     currentUserEmailParam: baseParams.currentUserLogin,
                     quickAction: baseParams.quickAction,
-                    recentWaypoints,
+                    recentWaypoints: baseParams.recentWaypoints,
                 }),
             );
         });