ordering-ui-react-native 0.15.20 → 0.15.21-release

package/themes/single-business/src/components/OrderTypeSelector/index.tsx

@@ -58,7 +58,7 @@ const OrderTypeSelectorUI = (props: OrderTypeSelectParams) => {
 				btnStyle={{ paddingLeft: 0 }}
 				paddingTop={0}
 				style={{ paddingBottom: 0 }}
-				title={t('HOW_WILL_YOUR_ORDER_TYPE', 'How will your order type?')}
+				title={t('HOW_WILL_YOU_DELIVERY_TYPE', 'How will your order type?')}
 				titleAlign={'center'}
 				titleStyle={{ fontSize: 14 }}
 			/>
@@ -97,27 +97,27 @@ export const OrderTypeSelector = (props: any) => {
       {
         value: 1,
         content: t('DELIVERY', 'Delivery'),
-        description: t('ORDERTYPE_DESCRIPTION_DELIVERY', 'Lorem ipsum dolor sit amet, consectetur.')
+        description: t('ORDERTYPE_DESCRIPTION_DELIVERY', 'Delivery description')
       },
       {
         value: 2,
         content: t('PICKUP', 'Pickup'),
-        description: t('ORDERTYPE_DESCRIPTION_PICKUP', 'Lorem ipsum dolor sit amet, consectetur.')
+        description: t('ORDERTYPE_DESCRIPTION_PICKUP', 'Pickup description')
       },
       {
         value: 3,
         content: t('EAT_IN', 'Eat in'),
-        description: t('ORDERTYPE_DESCRIPTION_EATIN', 'Lorem ipsum dolor sit amet, consectetur.')
+        description: t('ORDERTYPE_DESCRIPTION_EATIN', 'Eat in description')
       },
       {
         value: 4,
         content: t('CURBSIDE', 'Curbside'),
-        description: t('ORDERTYPE_DESCRIPTION_CURBSIDE', 'Lorem ipsum dolor sit amet, consectetur.')
+        description: t('ORDERTYPE_DESCRIPTION_CURBSIDE', 'Curbside description')
       },
       {
         value: 5,
         content: t('DRIVE_THRU', 'Drive thru'),
-        description: t('ORDERTYPE_DESCRIPTION_DRIVETHRU', 'Lorem ipsum dolor sit amet, consectetur.')
+        description: t('ORDERTYPE_DESCRIPTION_DRIVETHRU', 'Drive Thru description')
       }
     ]
 	}

package/themes/single-business/src/components/UserProfile/index.tsx

@@ -154,7 +154,7 @@ const ProfileListUI = (props: ProfileParams) => {
 				<Actions>
 					<ListItem onPress={() => onRedirect('AddressList', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
 						<OIcon src={theme.images.general.pin} width={16} color={theme.colors.textNormal} style={{ marginEnd: 14 }} />
-						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('MY_SAVED_PLACES', 'My saved places')}</OText>
+						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('SAVED_PLACES', 'My saved places')}</OText>
 					</ListItem>
 					<ListItem onPress={() => navigation.navigate('Help', {})} activeOpacity={0.7}>
 						<OIcon src={theme.images.general.help} width={16} color={theme.colors.textNormal} style={{ marginEnd: 14 }} />

package/themes/uber-eats/src/components/BusinessesListing/index.tsx

@@ -144,7 +144,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
         {isFarAway && (
 					<FarAwayMessage style={styles.farAwayMsg}>
 						<Ionicons name='md-warning-outline' style={styles.iconStyle} />
-						<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'You are far from this address')}</OText>
+						<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'Your are far from this address')}</OText>
 					</FarAwayMessage>
 				)}
         <View style={styles.wrapperOrderOptions}>

package/src/components/StripeMethodForm/index.tsx

@@ -1,168 +0,0 @@
-import React, { useState, useEffect } from 'react'
-import { useLanguage } from 'ordering-components/native'
-import { useGooglePay, ApplePayButton, useApplePay } from '@stripe/stripe-react-native'
-import { OButton } from '../shared';
-import { Platform, View } from 'react-native';
-import { StripeMethodFormParams } from '../../types';
-import Spinner from 'react-native-loading-spinner-overlay';
-import { android_app_id } from '../../config.json'
-export const StripeMethodForm = (props: StripeMethodFormParams) => {
-  const {
-    cart,
-    handleSource,
-    onCancel,
-    setErrors,
-    paymethod,
-    devMode
-  } = props
-  const { initGooglePay, createGooglePayPaymentMethod, loading } = useGooglePay();
-  const { presentApplePay, isApplePaySupported } = useApplePay();
-  const [initialized, setInitialized] = useState(false);
-  const [loadingGooglePayment, setLoadingGooglePayment] = useState(false)
-  const [, t] = useLanguage()
-
-  useEffect(() => {
-    if (paymethod !== 'google_pay' || !initGooglePay) return
-    if (Platform.OS === 'ios') {
-      setErrors(t('GOOGLE_PAY_NOT_SUPPORTED', 'Google pay not supported'))
-      return
-    }
-    const initialize = async () => {
-      try {
-        const { error } = await initGooglePay({
-          testEnv: devMode,
-          merchantName: android_app_id,
-          countryCode: 'US',
-          billingAddressConfig: {
-            format: 'FULL',
-            isPhoneNumberRequired: true,
-            isRequired: false,
-          },
-          existingPaymentMethodRequired: false,
-          isEmailRequired: true,
-        });
-
-        if (error) {
-          setErrors(error.code + ' - ' + error.message);
-          return;
-        }
-        setInitialized(true);
-      } catch (err: any) {
-        setErrors('Catch ' + err?.message)
-      }
-    }
-    initialize();
-  }, [initGooglePay]);
-
-  useEffect(() => {
-    if (paymethod !== 'apple_pay') return
-    if (Platform.OS === 'android') {
-      setErrors(t('APPLE_PAY_NOT_SUPPORTED', 'Apple pay not supported'))
-      return
-    }
-  }, [])
-
-  const createPaymentMethod = async () => {
-    setLoadingGooglePayment(true)
-    const { error, paymentMethod } = await createGooglePayPaymentMethod({
-      amount: cart?.balance ?? cart?.total,
-      currencyCode: 'USD',
-    });
-    if (error) {
-      setErrors(error.code + ' - ' + error.message);
-      setLoadingGooglePayment(false)
-      return;
-    } else if (paymentMethod) {
-      handleSource({
-        ...paymentMethod?.Card,
-        id: paymentMethod.id,
-        type: paymentMethod.type,
-        source_id: paymentMethod?.id,
-        card: {
-          brand: paymentMethod.Card.brand,
-          last4: paymentMethod.Card.last4
-        }
-      })
-      onCancel()
-      setLoadingGooglePayment(false)
-    }
-  };
-
-  const pay = async () => {
-    if (!isApplePaySupported) {
-      setErrors(t('APPLE_PAY_NOT_SUPPORTED', 'Apple pay not supported'))
-      return
-    }
-
-    const { error, paymentMethod } = await presentApplePay({
-      cartItems: cart?.products?.map((product: any) => ({ label: product?.name, amount: product?.price?.toString?.() })),
-      country: 'US',
-      currency: 'USD',
-      shippingMethods: [
-        {
-          amount: cart?.balance?.toString() ?? cart?.total?.toString?.(),
-          identifier: 'DPS',
-          label: 'Courier',
-          detail: 'Delivery',
-          type: 'final',
-        },
-      ],
-
-      requiredShippingAddressFields: ['emailAddress', 'phoneNumber'],
-      requiredBillingContactFields: ['phoneNumber', 'name'],
-    });
-    if (error) {
-      setErrors(error.code + ' - ' + error.message);
-    } else if (paymentMethod) {
-      handleSource({
-        ...paymentMethod?.Card,
-        id: paymentMethod.id,
-        type: paymentMethod.type,
-        source_id: paymentMethod?.id,
-        card: {
-          brand: paymentMethod.Card.brand,
-          last4: paymentMethod.Card.last4
-        }
-      })
-      onCancel()
-    }
-  }
-
-  return (
-    <>
-      {paymethod === 'google_pay' ? (
-        <View>
-          <OButton
-            textStyle={{
-              color: '#fff'
-            }}
-            imgRightSrc={null}
-            onClick={createPaymentMethod}
-            isDisabled={loading || !initialized}
-            text={t('PAY_WITH_GOOGLE_PAY', 'Pay with Google Pay')}
-            isLoading={loading || !initialized}
-            style={{ marginTop: 20 }}
-          />
-        </View>
-      ) : (
-        <View>
-          {isApplePaySupported && (
-            <ApplePayButton
-              onPress={pay}
-              type="plain"
-              buttonStyle="black"
-              borderRadius={4}
-              style={{
-                width: '100%',
-                height: 50,
-              }}
-            />
-          )}
-        </View>
-      )}
-      <Spinner
-        visible={loadingGooglePayment}
-      />
-    </>
-  )
-}