Version 3.3.12 (#796)

* hide price (#791) * Update cardDetailUtils.ts * Revert "Update cardDetailUtils.ts" This reverts commit d16d766. * hide price * move to settings context * remove loadShowPrice from context * Revert "remove loadShowPrice from context" This reverts commit d94850e. * id * testID --------- Co-authored-by: Omer Gery <68545675+OmerGery@users.noreply.github.com> Co-authored-by: EliFrankel <elifrankelilj@gmail.com> * change default to false (#795) * add stripe key to debug mode * change default to false --------- Co-authored-by: Omer Gery <68545675+OmerGery@users.noreply.github.com> --------- Co-authored-by: Omer Gery <68545675+OmerGery@users.noreply.github.com> Co-authored-by: EliFrankel <elifrankelilj@gmail.com>
Autofleet · Dec 18, 2023 · 83a366b · 83a366b
1 parent a842539
commit 83a366b
Show file tree

Hide file tree

Showing 14 changed files with 105 additions and 31 deletions.
diff --git a/examples/client/Locomotion/src/Components/PriceBreakdown/index.tsx b/examples/client/Locomotion/src/Components/PriceBreakdown/index.tsx
@@ -17,6 +17,7 @@ import {
   PriceText,
 } from './styled';
 import { COUPON_TYPE } from '../../lib/commonTypes';
+import settingsContext from '../../context/settings';
 
 const NoBreakdownComponent = ({
   didRequestFail,
@@ -59,9 +60,11 @@ const PriceBreakdown = ({
   didRequestFail,
   retryGetPriceBreakdown,
 }: PriceBreakdownProps) => {
+  const { showPrice, loadShowPrice } = settingsContext.useContainer();
   const isDebuggingEnabled = typeof atob !== 'undefined';
   const [priceCalculationItems, setPriceCalculationItems] = useState<any[]>();
   const [total, setTotal] = useState<null | string>(null);
+
   const getPriceWithCurrency = (amount: number) => `${getCurrencySymbol(priceCalculation.currency)}${amount.toFixed(2)}`;
 
   const calculationTypeToUnit: any = {
@@ -83,7 +86,8 @@ const PriceBreakdown = ({
       totalPrice += item.price;
       let name;
       if (item.pricingRule) {
-        const calculationTypeToUnitInstance = calculationTypeToUnit[item.pricingRule.calculationType];
+        const calculationTypeToUnitInstance = calculationTypeToUnit[
+          item.pricingRule.calculationType];
         name = `${i18n.t('ridePriceBreakdown.priceItem', {
           name: item.pricingRule.name,
         })} ${calculationTypeToUnitInstance ? calculationTypeToUnitInstance(
@@ -117,6 +121,10 @@ const PriceBreakdown = ({
     }
   }, [priceCalculation]);
 
+  useEffect(() => {
+    loadShowPrice();
+  }, []);
+
   return (
     <>
       <InnerContainer>
@@ -142,8 +150,8 @@ const PriceBreakdown = ({
           <InnerContainer>
             <Row>
               <ItemText>{`${i18n.t('ridePriceBreakdown.total')}`}</ItemText>
-              {priceCalculationItems ? (
-                <PriceText>{total}</PriceText>
+              {priceCalculationItems && showPrice ? (
+                <PriceText testID="priceCalculation">{total}</PriceText>
               ) : (
                 <SkeletonContent
                   containerStyle={{}}

diff --git a/examples/client/Locomotion/src/Components/RideCard/index.tsx b/examples/client/Locomotion/src/Components/RideCard/index.tsx
@@ -14,7 +14,8 @@ import StopPointsVerticalView from '../StopPointsVerticalView';
 import { getFormattedPrice, isPriceEstimated, convertTimezoneByLocation } from '../../context/newRideContext/utils';
 import cashIcon from '../../assets/cash.svg';
 import { PAYMENT_METHODS } from '../../pages/Payments/consts';
-import paymentContext from '../../context/payments';
+import PaymentContext from '../../context/payments';
+import SettingsContext from '../../context/settings';
 
 interface CardComponentProps {
   paymentMethod: {
@@ -26,7 +27,7 @@ interface CardComponentProps {
 const CardComponent = ({ paymentMethod }: CardComponentProps) => {
   const isCash = PAYMENT_METHODS.CASH === paymentMethod.id;
   const isOffline = PAYMENT_METHODS.OFFLINE === paymentMethod.id;
-  const { offlinePaymentText, loadOfflinePaymentText } = paymentContext.useContainer();
+  const { offlinePaymentText, loadOfflinePaymentText } = PaymentContext.useContainer();
 
   useEffect(() => {
     loadOfflinePaymentText();
@@ -51,7 +52,7 @@ const CardComponent = ({ paymentMethod }: CardComponentProps) => {
   };
   return (
     <TextRowWithIcon
-      text={getText()}
+      text={getText() || ''}
       Image={() => !isCash && !isOffline && <PaymentIcon type={paymentMethod.brand} />}
       icon={getIcon()}
       style={{ marginTop: 10, marginBottom: 10 }}
@@ -79,6 +80,7 @@ const RideCard = ({
   const {
     getRidePriceCalculation,
   } = useContext(RidePageContext);
+  const { showPrice, loadShowPrice } = SettingsContext.useContainer();
 
   const addPriceCalculation = async () => {
     const price = await getRidePriceCalculation(ride.id, ride.priceCalculationId);
@@ -91,6 +93,10 @@ const RideCard = ({
     }
   }, [ride]);
 
+  useEffect(() => {
+    loadShowPrice();
+  }, []);
+
   const formatScheludedTo = async (time: any) => {
     try {
       const { stopPoints = [] } = ride;
@@ -144,7 +150,8 @@ const RideCard = ({
             {serviceName}
           </ServiceType>
         </TopTextsContainer>
-        <TopPriceContainer>
+        { showPrice && (
+        <TopPriceContainer testID="priceContainer">
           <RideDate>
             {getFormattedPrice(ride.priceCurrency, ride.priceAmount)}
           </RideDate>
@@ -157,6 +164,7 @@ const RideCard = ({
             : null}
           {displayTimezone ? <ServiceType /> : null}
         </TopPriceContainer>
+        )}
       </DateContainer>
 
       <StopPointsVerticalView ride={ride} />

diff --git a/examples/client/Locomotion/src/Components/RidePaymentDetails/index.tsx b/examples/client/Locomotion/src/Components/RidePaymentDetails/index.tsx
@@ -11,7 +11,7 @@ import {
   PaymentRow, RidePriceDetails, PriceText, ViewDetails, CardRowContainer,
 } from './styled';
 import { PaymentMethodInterface } from '../../context/payments/interface';
-import PaymentContext from '../../context/payments';
+import SettingsContext from '../../context/settings';
 import * as navigationService from '../../services/navigation';
 import Button from '../Button';
 
@@ -33,6 +33,8 @@ const RidePaymentDetails = ({
     getRidePriceCalculation,
   } = useContext(RidePageContext);
 
+  const { showPrice, loadShowPrice } = SettingsContext.useContainer();
+
   const updatePriceCalculation = async () => {
     const calculation = await getRidePriceCalculation(rideId);
     setPriceCalculation(calculation);
@@ -43,6 +45,7 @@ const RidePaymentDetails = ({
 
   useEffect(() => {
     updatePriceCalculation();
+    loadShowPrice();
   }, []);
 
   return (paymentMethod ? (
@@ -54,16 +57,19 @@ const RidePaymentDetails = ({
         </CardRowContainer>
         <RidePriceDetails>
 
-          {!rideHistory ? (totalAmount === 0
+          {!rideHistory && (totalAmount === 0
             ? <PriceText>{`${i18n.t('rideDetails.noCharge')}`}</PriceText>
-            : (
-              <PriceText>
+            : (showPrice
+              && (
+              <PriceText testID="priceText">
                 {getFormattedPrice(priceCalculation?.currency,
                   totalAmount)}
               </PriceText>
+              )
             )
-          ) : null}
+          )}
 
+          {showPrice && (
           <Button
             testID="viewRidePaymentDetails"
             noBackground
@@ -78,6 +84,7 @@ const RidePaymentDetails = ({
                </ViewDetails>
               ) : undefined}
           </Button>
+          )}
         </RidePriceDetails>
       </PaymentRow>
     </>

diff --git a/examples/client/Locomotion/src/context/newRideContext/index.tsx b/examples/client/Locomotion/src/context/newRideContext/index.tsx
@@ -257,7 +257,7 @@ const RidePageContextProvider = ({ children }: {
   const getRouteName = () => navigationService?.getNavigator()?.getCurrentRoute().name;
   const [numberOfPassengers, setNumberOfPassengers] = useState<number | null>(null);
   const [addressSearchLabel, setAddressSearchLabel] = useState<string | null>(null);
-  const [futureBookingDays, setfutureBookingDays] = useState(0);
+  const [futureBookingDays, setFutureBookingDays] = useState(0);
 
 
   const intervalRef = useRef<any>();
@@ -471,7 +471,7 @@ const RidePageContextProvider = ({ children }: {
 
   const loadFutureBookingDays = async () => {
     const maxDaysFromSettings = await getSettingByKey(SETTINGS_KEYS.MAX_DAYS_FOR_FUTURE_RIDE);
-    setfutureBookingDays(maxDaysFromSettings);
+    setFutureBookingDays(maxDaysFromSettings);
   };
 
   const getLastCompletedRide = async () => {

diff --git a/examples/client/Locomotion/src/context/onboarding/index.tsx b/examples/client/Locomotion/src/context/onboarding/index.tsx
@@ -3,7 +3,7 @@ import React, {
   createContext, useContext, useState,
 } from 'react';
 import { initStripe } from '@stripe/stripe-react-native';
-import Config from 'react-native-config';
+import AppSettings from '../../services/app-settings';
 import settings from '../settings';
 import SETTINGS_KEYS from '../settings/keys';
 import * as navigationService from '../../services/navigation';
@@ -109,9 +109,9 @@ const OnboardingContextProvider = ({ children }: { children: any }) => {
       getOrFetchClientPaymentAccount(),
       loadCustomer(),
     ]);
-
+    const publishableKey = await AppSettings.getStripeKey();
     initStripe({
-      publishableKey: Config.STRIPE_PUBLISHER_KEY,
+      publishableKey,
       merchantIdentifier: 'merchant.identifier',
       stripeAccountId: paymentAccount.stripeId,
     });

diff --git a/examples/client/Locomotion/src/context/settings/index.js b/examples/client/Locomotion/src/context/settings/index.js
@@ -21,6 +21,7 @@ const useSettings = () => {
   const [workingHours, setWorkingHours] = useState({});
   const [measureSystem, setMeasureSystem] = useState('metric');
   const [appSettingsState, setAppSettingsState] = useState({});
+  const [showPrice, setShowPrice] = useState(false);
 
 
   const getSettingByKey = async (key) => {
@@ -120,6 +121,11 @@ const useSettings = () => {
     setAppSettingsStates(appSettingsState);
   }, [appSettingsState]);
 
+  const loadShowPrice = async () => {
+    const hidePrice = await getSettingByKey(settingsKeys.HIDE_PRICE);
+    setShowPrice(!hidePrice);
+  };
+
   return {
     settingsList,
     getWorkingHours,
@@ -130,6 +136,8 @@ const useSettings = () => {
     getAppSettings,
     getMeasureSystem,
     measureSystem,
+    loadShowPrice,
+    showPrice,
   };
 };
 export default createContainer(useSettings);
diff --git a/examples/client/Locomotion/src/context/settings/keys.ts b/examples/client/Locomotion/src/context/settings/keys.ts
@@ -18,4 +18,5 @@ export default {
   DISABLE_CAPTCHA_UI: 'riderApp.disableCaptchaUi',
   MAX_DAYS_FOR_FUTURE_RIDE: 'riderApp.daysForFutureRideBooking',
   OFFLINE_PAYMENT_TEXT: 'riderApp.offlinePaymentText',
+  HIDE_PRICE: 'riderApp.hidePrice',
 };
diff --git a/...ocomotion/src/pages/ActiveRide/RideDrawer/RideOptions/ServiceOptions/ServiceCard/index.js b/...ocomotion/src/pages/ActiveRide/RideDrawer/RideOptions/ServiceOptions/ServiceCard/index.js
@@ -1,5 +1,5 @@
 import moment from 'moment';
-import React, { useContext, useState } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import propsTypes from 'prop-types';
 import { View } from 'react-native';
 import SvgIcon from '../../../../../../Components/SvgIcon';
@@ -20,6 +20,7 @@ import {
 import Tag from '../../../../../../Components/Tag';
 import { RidePageContext } from '../../../../../../context/newRideContext';
 import FareBreakdownPopup from '../../../../../../popups/FareBreakdownPopup';
+import SettingsContext from '../../../../../../context/settings';
 
 const FARE_POPUP = 'farePopup';
 
@@ -28,6 +29,7 @@ const ServiceCard = ({ service, withBorder }) => {
   const {
     setChosenService, chosenService, serviceEstimations, ride,
   } = useContext(RidePageContext);
+  const { showPrice, loadShowPrice } = SettingsContext.useContainer();
   const [popup, setPopup] = useState(null);
   const isFutureRide = ride.scheduledTo;
   const unavailable = !((ride.scheduledTo && service.priceCalculationId)
@@ -98,9 +100,13 @@ const ServiceCard = ({ service, withBorder }) => {
       return i18n.t('rideDetails.unavailable');
     }
 
-    return getFormattedPrice(service.currency, service.price);
+    return showPrice ? getFormattedPrice(service.currency, service.price) : null;
   };
 
+  useEffect(() => {
+    loadShowPrice();
+  }, []);
+
   return (
     <>
       <CardContainer

diff --git a/examples/client/Locomotion/src/pages/AuthScreens/AuthLoadingScreen.js b/examples/client/Locomotion/src/pages/AuthScreens/AuthLoadingScreen.js
@@ -1,8 +1,8 @@
 import React, { useContext, useEffect, useState } from 'react';
 import { initStripe } from '@stripe/stripe-react-native';
-import Config from 'react-native-config';
 import moment from 'moment';
 import { Platform } from 'react-native';
+import AppSettings from '../../services/app-settings';
 import { APP_ROUTES, MAIN_ROUTES } from '../routes';
 import { logout } from '../../services/logout';
 import { getUserDetails } from '../../context/user/api';
@@ -69,9 +69,9 @@ const AuthLoadingScreen = () => {
           }),
         ]);
 
-
+        const publishableKey = await AppSettings.getStripeKey();
         initStripe({
-          publishableKey: Config.STRIPE_PUBLISHER_KEY,
+          publishableKey,
           merchantIdentifier: 'merchant.identifier',
           stripeAccountId: paymentAccount.stripeId,
         });

diff --git a/examples/client/Locomotion/src/pages/DevPage/index.tsx b/examples/client/Locomotion/src/pages/DevPage/index.tsx
@@ -14,6 +14,7 @@ import { InputContainer, Label } from './styles';
 const DevSettingPage = () => {
   const [operationId, setOperationId] = useState(Config.OPERATION_ID);
   const [serverUrl, setServerUrl] = useState(Config.SERVER_HOST);
+  const [stripeKey, setStripeKey] = useState(Config.STRIPE_PUBLISHER_KEY);
   return (
     <PageContainer>
       <PageHeader
@@ -41,10 +42,19 @@ const DevSettingPage = () => {
         }}
         value={serverUrl}
       />
+      <Label>Stripe Key</Label>
+      <TextInput
+        testID="stripeKey"
+        autoFocus
+        onChangeText={(newStripeKey: string) => {
+          setStripeKey(newStripeKey);
+        }}
+        value={stripeKey}
+      />
       <NavButton
         testID="saveButton"
         onPress={() => {
-          AppSettings.setSettings({ serverUrl, operationId });
+          AppSettings.setSettings({ serverUrl, operationId, stripeKey });
           navigationService.goBack();
         }}
       >

diff --git a/examples/client/Locomotion/src/pages/PostRide/Tips/index.js b/examples/client/Locomotion/src/pages/PostRide/Tips/index.js
@@ -16,6 +16,7 @@ import BottomSheet from '../../../Components/BottomSheet';
 import BottomSheetContextProvider, { BottomSheetContext, SNAP_POINT_STATES } from '../../../context/bottomSheetContext';
 import CustomTip from './CustomTip';
 import { getFormattedPrice, getCurrencySymbol } from '../../../context/newRideContext/utils';
+import SettingsContext from '../../../context/settings';
 
 const TipSectionContainer = styled.View`
  width: 100%;
@@ -106,6 +107,7 @@ const Tips = ({
 }) => {
   const [selectedTip, setSelectedTip] = useState(null);
   const [customTip, setCustomTip] = useState(null);
+  const { showPrice, loadShowPrice } = SettingsContext.useContainer();
 
   const isPercentage = ridePrice >= tipSettings.percentageThreshold;
   const buttons = isPercentage ? tipSettings.percentage : tipSettings.fixedPrice;
@@ -121,6 +123,7 @@ const Tips = ({
 
   useEffect(() => {
     setSnapPointsState(SNAP_POINT_STATES.CUSTOM_TIP);
+    loadShowPrice();
   }, []);
 
 
@@ -173,9 +176,11 @@ const Tips = ({
             <Title testID="tipPageTitle">
               {`${i18n.t('postRide.tip.title')} ${driver.firstName}`}
             </Title>
-            <SubTitle>
+            {showPrice && (
+            <SubTitle testID="postRideTip">
               {`${i18n.t('postRide.tip.subTitle')} ${serviceDisplayPrice}`}
             </SubTitle>
+            )}
           </Column>
           <ThumbnailContainer>
             <StyledThumbnail>