cr2

Autofleet · Jan 23, 2024 · cdb8558 · cdb8558
1 parent 7505e92
commit cdb8558
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/examples/client/Locomotion/src/pages/ActiveRide/RideDrawer/RideOptions/RideButtons/index.tsx b/examples/client/Locomotion/src/pages/ActiveRide/RideDrawer/RideOptions/RideButtons/index.tsx
@@ -85,10 +85,11 @@ const RideButtons = ({
   const [passengersCounterError, setPassengersCounterError] = useState(false);
   const firstDate = () => moment(ride?.scheduledTo || undefined).add(ride?.scheduledTo ? 0 : (minMinutesBeforeFutureRide || 0) + 1, 'minutes').toDate();
   const [tempSelectedDate, setTempSelectedDate] = useState(firstDate());
-  const paymentMethodNotAllowedOnService = !businessAccountId
-  && chosenService && ride?.paymentMethodId
-    && !chosenService.allowedPaymentMethods.includes(getPaymentMethod(ride.paymentMethodId))
-    && serviceEstimations?.length > 0;
+  const ridePaymentId = ride?.paymentMethodId;
+  const selectedRequiredFields = chosenService && ridePaymentId && serviceEstimations?.length > 0;
+  const paymentMethodNotAllowedOnService = !businessAccountId && selectedRequiredFields
+  && !chosenService.allowedPaymentMethods.includes(getPaymentMethod(ridePaymentId));
+
 
   const checkFutureRidesSetting = async () => {
     const futureRidesEnabled = await getSettingByKey(