fix show price in future ride + don't display offline text in busines…

…s account payment (#822) * fix show price in future ride * Update index.tsx * remove business accoun subtitle
Autofleet · Apr 10, 2024 · e8cdb9f · e8cdb9f
1 parent 4faec21
commit e8cdb9f
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 72 deletions.
diff --git a/examples/client/Locomotion/src/Components/BusinessAccountText/index.tsx b/examples/client/Locomotion/src/Components/BusinessAccountText/index.tsx
diff --git a/examples/client/Locomotion/src/Components/BusinessAccountText/styled.ts b/examples/client/Locomotion/src/Components/BusinessAccountText/styled.ts
diff --git a/examples/client/Locomotion/src/Components/CardRow/index.tsx b/examples/client/Locomotion/src/Components/CardRow/index.tsx
@@ -5,7 +5,6 @@ import { View, Text } from 'react-native';
 import moment from 'moment';
 import styled, { ThemeContext } from 'styled-components';
 import { PaymentIcon } from 'react-native-payment-icons';
-import BusinessAccountText from '../BusinessAccountText';
 import { RideInterface, RidePageContext } from '../../context/newRideContext';
 import { PAYMENT_METHODS, paymentMethodToIconMap } from '../../pages/Payments/consts';
 import Button from '../Button';
@@ -204,19 +203,11 @@ const CardRow = (paymentMethod: any) => {
                 )
                 : (
                   <>
-                    {
-                      (businessAccountId && offlinePaymentText)
-                        ? (
-                          <BusinessAccountText
-                            title={getPaymentMethodTitle()}
-                            subTitle={offlinePaymentText}
-                          />
-                        )
-                        : (
-                          <Type>
-                            {getPaymentMethodTitle()}
-                          </Type>
-                        )}
+
+                    <Type>
+                      {getPaymentMethodTitle()}
+                    </Type>
+
                     {paymentMethod.lastFour
                       ? <Description>{getLastFourForamttedShort(paymentMethod.lastFour)}</Description>
                       : null}

diff --git a/examples/client/Locomotion/src/Components/RideCard/index.tsx b/examples/client/Locomotion/src/Components/RideCard/index.tsx
@@ -93,7 +93,7 @@ const RideCard = ({
   const {
     getRidePriceCalculation,
   } = useContext(RidePageContext);
-  const { businessAccountId } = useContext(RidePageContext);
+
   const { getBusinessAccountById } = PaymentContext.useContainer();
   const { showPrice, loadShowPrice } = SettingContext.useContainer();
 
@@ -109,8 +109,8 @@ const RideCard = ({
   }, [ride]);
 
   useEffect(() => {
-    showPriceBasedOnAccount(loadShowPrice, getBusinessAccountById, businessAccountId);
-  }, [businessAccountId]);
+    showPriceBasedOnAccount(loadShowPrice, getBusinessAccountById, ride.businessAccountId);
+  }, [ride.businessAccountId]);
 
   const formatScheludedTo = async (time: any) => {
     try {

diff --git a/examples/client/Locomotion/src/Components/TextRowWithIcon/index.tsx b/examples/client/Locomotion/src/Components/TextRowWithIcon/index.tsx
@@ -1,7 +1,6 @@
 import React, { useContext } from 'react';
 import { Text, View } from 'react-native';
 import styled, { ThemeContext } from 'styled-components';
-import BusinessAccountText from '../BusinessAccountText';
 import { FONT_SIZES } from '../../context/theme';
 import SvgIcon from '../SvgIcon';
 
@@ -57,13 +56,7 @@ const TextRowWithIcon = ({
         ...((Image || icon) && { marginLeft: 10 }),
       }}
       >
-        {subTitle ? (
-          <BusinessAccountText
-            title={text}
-            subTitle={subTitle}
-          />
-        )
-          : text}
+        {text}
       </BasicText>
     </Container>
   );

diff --git a/...ocomotion/src/pages/ActiveRide/RideDrawer/RideOptions/RideButtons/PaymentButton/index.tsx b/...ocomotion/src/pages/ActiveRide/RideDrawer/RideOptions/RideButtons/PaymentButton/index.tsx
@@ -6,7 +6,6 @@ import { PaymentIcon } from 'react-native-payment-icons';
 import styled, { ThemeContext } from 'styled-components';
 import { useFocusEffect } from '@react-navigation/native';
 import SkeletonContent from 'react-native-skeleton-content-nonexpo';
-import BusinessAccountText from '../../../../../../Components/BusinessAccountText';
 import { isCardPaymentMethod, isCashPaymentMethod, isOfflinePaymentMethod } from '../../../../../../lib/ride/utils';
 import { getCouponText } from '../../../../../../context/newRideContext/utils';
 import { MAIN_ROUTES } from '../../../../../routes';
@@ -77,7 +76,6 @@ interface PaymentButtonProps {
     brand?: Brand;
     id?: string;
     invalid?: boolean;
-    subTitle?: string;
 }
 
 
@@ -87,7 +85,6 @@ const PaymentButton = ({
   brand,
   id,
   invalid,
-  subTitle,
 }: PaymentButtonProps) => {
   const { primaryColor } = useContext(ThemeContext);
   const { getCoupon, coupon, setCoupon } = useContext(UserContext);
@@ -168,9 +165,7 @@ const PaymentButton = ({
               width={40}
             />
           )}
-        { subTitle
-          ? <BusinessAccountText title={title} subTitle={subTitle} />
-          : <TimeText numberOfLines={1}>{title}</TimeText> }
+        <TimeText numberOfLines={1}>{title}</TimeText>
       </CardNameContainer>
       <PromoButtonContainer>
         {loadPromoButton()}
@@ -185,5 +180,4 @@ PaymentButton.defaultProps = {
   brand: null,
   id: null,
   invalid: false,
-  subTitle: null,
 };
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
@@ -269,7 +269,6 @@ const RideButtons = ({
           brand={selectedPaymentMethod?.brand}
           icon={paymentMethodToIconMap[selectedPaymentMethod?.id]}
           title={getSelectedPaymentMethodTitle()}
-          subTitle={businessAccountId && offlinePaymentText}
           id={selectedPaymentMethod?.id}
           invalid={paymentMethodNotAllowedOnService}
         />