Fix error message for duplicate waypoint

src/components/DistanceRequest/index.js

@@ -150,13 +150,8 @@ function DistanceRequest({transactionID, report, transaction, route, isEditingRe
  return ErrorUtils.getLatestErrorField(transaction, 'route');
  }
 
- // Initially, both waypoints will be null, and if we give fallback value as empty string that will result in true condition, that's why different default values.
- if (_.keys(waypoints).length === 2 && lodashGet(waypoints, 'waypoint0.address', 'address1') === lodashGet(waypoints, 'waypoint1.address', 'address2')) {
- return {0: translate('iou.error.duplicateWaypointsErrorMessage')};
- }
-
  if (_.size(validatedWaypoints) < 2) {
- return {0: translate('iou.error.emptyWaypointsErrorMessage')};
+ return {0: translate('iou.error.atLeastTwoDifferentWaypoints')};
  }
  };
 

src/languages/en.ts

@@ -593,7 +593,7 @@ export default {
  genericEditFailureMessage: 'Unexpected error editing the money request, please try again later',
  genericSmartscanFailureMessage: 'Transaction is missing fields',
  duplicateWaypointsErrorMessage: 'Please remove duplicate waypoints',
- emptyWaypointsErrorMessage: 'Please enter at least two waypoints',
+ atLeastTwoDifferentWaypoints: 'Please enter at least two waypoints',
  },
  waitingOnEnabledWallet: ({submitterDisplayName}: WaitingOnBankAccountParams) => `Started settling up, payment is held until ${submitterDisplayName} enables their Wallet`,
  enableWallet: 'Enable Wallet',

src/languages/es.ts

@@ -587,7 +587,7 @@ export default {
  genericEditFailureMessage: 'Error inesperado al guardar la solicitud de dinero. Por favor, inténtalo más tarde',
  genericSmartscanFailureMessage: 'La transacción tiene campos vacíos',
  duplicateWaypointsErrorMessage: 'Por favor elimina los puntos de ruta duplicados',
- emptyWaypointsErrorMessage: 'Por favor introduce al menos dos puntos de ruta',
+ atLeastTwoDifferentWaypoints: 'Por favor introduce al menos dos puntos de ruta',
  },
  waitingOnEnabledWallet: ({submitterDisplayName}: WaitingOnBankAccountParams) => `Inició el pago, pero no se procesará hasta que ${submitterDisplayName} active su Billetera`,
  enableWallet: 'Habilitar Billetera',

src/libs/TransactionUtils.ts

@@ -417,6 +417,7 @@ function getValidWaypoints(waypoints: WaypointCollection, reArrangeIndexes = fal
  }
 
  let lastWaypointIndex = -1;
+ let waypointIndex = -1;
 
  return waypointValues.reduce<WaypointCollection>((acc, currentWaypoint, index) => {
  const previousWaypoint = waypointValues[lastWaypointIndex];
@@ -431,9 +432,10 @@ function getValidWaypoints(waypoints: WaypointCollection, reArrangeIndexes = fal
  return acc;
  }
 
- const validatedWaypoints: WaypointCollection = {...acc, [`waypoint${reArrangeIndexes ? lastWaypointIndex + 1 : index}`]: currentWaypoint};
+ const validatedWaypoints: WaypointCollection = {...acc, [`waypoint${reArrangeIndexes ? waypointIndex + 1 : index}`]: currentWaypoint};
 
- lastWaypointIndex += 1;
+ lastWaypointIndex = index;
+ waypointIndex += 1;
 
  return validatedWaypoints;
  }, {});