ordering-ui-react-native 0.15.55 → 0.15.58

package/themes/original/src/components/AppleLogin/index.tsx

@@ -1,6 +1,6 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 import { Platform, Text, StyleSheet } from 'react-native';
-import { useApi, useSession, useLanguage, useConfig } from 'ordering-components/native';
+import { useApi, useSession, useLanguage, useConfig, useToast, ToastType } from 'ordering-components/native';
 import { appleAuthAndroid, appleAuth } from '@invertase/react-native-apple-authentication';
 import uuid from 'react-native-uuid';
 import Icon from 'react-native-vector-icons/FontAwesome5';
@@ -18,7 +18,12 @@ export const AppleLogin = (props: any) => {
   const [ordering] = useApi();
   const [{ auth }] = useSession();
   const [, t] = useLanguage();
-  const [{ configs }] = useConfig()
+  const [{ configs }] = useConfig();
+  const [, {showToast}] = useToast()
+  const [credentialStateForUser, updateCredentialStateForUser] = useState<any>(-1);
+
+  let user : any= null
+
   const buttonText = auth
     ? t('CONTINUE_WITH_APPLE', 'Logout with Apple')
     : t('CONTINUE_WITH_FACEBOOK', 'Continue with Apple');
@@ -39,8 +44,8 @@ export const AppleLogin = (props: any) => {
           handleLoading && handleLoading(false)
         }
       } else {
+        showToast(ToastType.Error, `Error login on apple from api Code: ${code}`, 10000)
         handleLoading && handleLoading(false)
-        logoutFromApple()
       }
     } catch (err: any) {
       handleLoading && handleLoading(false)
@@ -48,33 +53,52 @@ export const AppleLogin = (props: any) => {
     }
   }
 
-  const logoutFromApple = () => {
-
+  const fetchAndUpdateCredentialState = async (updateCredentialStateForUser : any) => {
+    if (user === null) {
+      updateCredentialStateForUser('N/A');
+    } else {
+      const credentialState = await appleAuth.getCredentialStateForUser(user);
+      if (credentialState === appleAuth.State.AUTHORIZED) {
+        updateCredentialStateForUser('AUTHORIZED');
+      } else {
+        updateCredentialStateForUser(credentialState);
+      }
+    }
   }
 
-  const onIOSButtonPress = async () => {
+  const onIOSButtonPress = async (updateCredentialStateForUser : any) => {
     try {
       const appleAuthRequestResponse = await appleAuth.performRequest({
         requestedOperation: appleAuth.Operation.LOGIN,
         requestedScopes: [appleAuth.Scope.EMAIL, appleAuth.Scope.FULL_NAME],
       });
 
-      // get current authentication state for user
-      // /!\ This method must be tested on a real device. On the iOS simulator it always throws an error.
-      const credentialState = await appleAuth.getCredentialStateForUser(appleAuthRequestResponse.user);
-
-      // use credentialState response to ensure the user is authenticated
-      if (credentialState === appleAuth.State.AUTHORIZED) {
-        // user is authenticated
-        if (appleAuthRequestResponse.authorizationCode) {
-          performAppleLogin(appleAuthRequestResponse.authorizationCode)
-        }
+      const {
+        user: newUser,
+        email,
+        identityToken,
+        authorizationCode
+      } = appleAuthRequestResponse;
+  
+      user = newUser;
+
+      fetchAndUpdateCredentialState(updateCredentialStateForUser).catch(error =>
+        updateCredentialStateForUser(`Error: ${error.code}`),
+      );
+
+      if (identityToken && authorizationCode) {
+        showToast(ToastType.Success, `Apple Authentication Completed, ${email}`)
+        performAppleLogin(authorizationCode)
+      } else {
+        handleErrors && handleErrors('UNABLE_LOGIN_TOKEN', 'Unable to login, no token found')
       }
+
     } catch (err: any) {
       handleLoading && handleLoading(false)
       handleErrors && handleErrors(err.message)
     }
   }
+
   const onAndroidButtonPress = async () => {
     try {
       // Generate secure, random values for state and nonce
@@ -108,10 +132,20 @@ export const AppleLogin = (props: any) => {
   }
 
   useEffect(() => {
-    if (Platform.OS == 'android') return;
-    // onCredentialRevoked returns a function that will remove the event listener. useEffect will call this function when the component unmounts
+    if (!appleAuth.isSupported || Platform.OS === 'android') return;
+
+    fetchAndUpdateCredentialState(updateCredentialStateForUser).catch(error =>
+      updateCredentialStateForUser(`Error: ${error.code}`),
+    );
+  }, []);
+
+  useEffect(() => {
+    if (!appleAuth.isSupported || Platform.OS === 'android') return;
+
     return appleAuth.onCredentialRevoked(async () => {
-      console.warn('If this function executes, User Credentials have been Revoked');
+      fetchAndUpdateCredentialState(updateCredentialStateForUser).catch(error =>
+        updateCredentialStateForUser(`Error: ${error.code}`),
+      );
     });
   }, []);
 
@@ -123,9 +157,12 @@ export const AppleLogin = (props: any) => {
 
   return (
     <Container>
+      {credentialStateForUser !== -1 && (
+        <Text>{credentialStateForUser}</Text>
+      )}
       {canShowButton() &&
         <AppleButton
-          onPress={() => Platform.OS == 'android' ? onAndroidButtonPress() : onIOSButtonPress()}
+          onPress={() => Platform.OS == 'android' ? onAndroidButtonPress() : onIOSButtonPress(updateCredentialStateForUser)}
         >
           <Icon
             name="apple"

package/themes/original/src/components/BusinessProductsList/index.tsx

@@ -4,7 +4,7 @@ import { SingleProductCard } from '../SingleProductCard';
 import { NotFoundSource } from '../NotFoundSource';
 import { BusinessProductsListParams } from '../../types';
 import { OButton, OIcon, OModal, OText } from '../shared';
-import { ProductsContainer, ErrorMessage, WrapperNotFound, RibbonBox } from './styles';
+import { ProductsContainer, ErrorMessage, WrapperNotFound, RibbonBox, SubCategoriesContainer, ContainerButton, HeaderWrapper } from './styles';
 import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder';
 import { View, ScrollView } from 'react-native';
 import { StyleSheet } from 'react-native';
@@ -28,7 +28,11 @@ const BusinessProductsListUI = (props: BusinessProductsListParams) => {
     handleCancelSearch,
     categoriesLayout,
     setCategoriesLayout,
-    currentCart
+    currentCart,
+    setSubcategoriesSelected,
+    subcategoriesSelected,
+    onClickCategory,
+    lazyLoadProductsRecommended
   } = props;
 
   const [, t] = useLanguage();
@@ -44,20 +48,85 @@ const BusinessProductsListUI = (props: BusinessProductsListParams) => {
     setCategoriesLayout(_categoriesLayout)
   }
 
+  const onClickSubcategory = (subCategory : any, parentCategory : any) => {
+    if (parentCategory && lazyLoadProductsRecommended) {
+      onClickCategory(parentCategory)
+    }
+    if (!subCategory) {
+      setSubcategoriesSelected?.(subcategoriesSelected.filter((_subcategory : any) => _subcategory?.parent_category_id !== parentCategory?.id))
+      return
+    }
+    const categoryFounded = subcategoriesSelected.find((_subcategory : any) => subCategory?.id === _subcategory?.id)
+    if (categoryFounded) {
+      setSubcategoriesSelected?.(subcategoriesSelected.filter((_subcategory : any) => subCategory?.id !== _subcategory?.id))
+    } else {
+      setSubcategoriesSelected?.([...subcategoriesSelected, subCategory])
+    }
+  }
+
+  const SubcategoriesComponent = ({ category } : any) => {
+    const allsubcategorySelected = !subcategoriesSelected?.some((subcategory : any) => category?.id === subcategory?.parent_category_id)
+
+    return (
+      <SubCategoriesContainer>
+        <ContainerButton
+          isSelected={allsubcategorySelected}
+        >
+          <OButton
+            onClick={() => onClickSubcategory(null, category)}
+            bgColor={allsubcategorySelected ? theme.colors.primary : theme.colors.backgroundGray}
+            text={`${t('ALL', 'All')} ${allsubcategorySelected ? 'X' : ''}`}
+            style={bpStyles.categoryButtonStyle}
+            textStyle={{ color: allsubcategorySelected ? theme.colors.white : theme.colors.textNormal, fontSize: 12 }}
+          />
+        </ContainerButton>
+        {category?.subcategories?.map((subcategory : any) => {
+          const isSubcategorySelected = subcategoriesSelected?.find((_subcategory : any) => _subcategory?.id === subcategory?.id)
+          return (
+            <ContainerButton
+              key={subcategory?.id}
+              isSelected={isSubcategorySelected}
+            >
+              <OButton
+                onClick={() => onClickSubcategory(subcategory, category)}
+                bgColor={isSubcategorySelected ? theme.colors.primary : theme.colors.backgroundGray}
+                text={`${subcategory?.name} ${isSubcategorySelected ? 'X' : ''}`}
+                style={bpStyles.categoryButtonStyle}
+                textStyle={{ color: isSubcategorySelected ? theme.colors.white : theme.colors.textNormal, fontSize: 12 }}
+              />
+            </ContainerButton>
+          )
+        }
+        )}
+      </SubCategoriesContainer>
+    )
+  }
+
+
   return (
     <ProductsContainer renderToHardwareTextureAndroid={categoryState.loading || isBusinessLoading}>
+      <HeaderWrapper>
+        {category?.subcategories?.length > 0 && (
+          <SubcategoriesComponent category={category} />
+        )}
+      </HeaderWrapper>
       {category.id &&
-        categoryState.products?.sort((a: any, b: any) => a.rank - b.rank).map((product: any) => (
-          <SingleProductCard
-            key={'prod_' + product.id}
-            isSoldOut={product.inventoried && !product.quantity}
-            product={product}
-            businessId={businessId}
-            onProductClick={() => onProductClick(product)}
-            productAddedToCartLength={currentCart?.products?.reduce((productsLength: number, Cproduct: any) => { return productsLength + (Cproduct?.id === product?.id ? Cproduct?.quantity : 0) }, 0)}
-          />
-        ))}
-
+        categoryState.products
+          ?.filter((product : any) =>
+            !subcategoriesSelected.find((subcategory : any) => subcategory?.parent_category_id === category?.id) ||
+            subcategoriesSelected?.some((subcategory : any) => subcategory.id === product?.category_id)
+              ?.sort((a: any, b: any) => a.rank - b.rank)
+              ?.map((product: any) => (
+                <SingleProductCard
+                  key={'prod_' + product.id}
+                  isSoldOut={product.inventoried && !product.quantity}
+                  product={product}
+                  businessId={businessId}
+                  onProductClick={() => onProductClick(product)}
+                  productAddedToCartLength={currentCart?.products?.reduce((productsLength: number, Cproduct: any) => { return productsLength + (Cproduct?.id === product?.id ? Cproduct?.quantity : 0) }, 0)}
+                />
+              ))
+          )}
       {!category.id &&
         featured &&
         categoryState?.products?.find((product: any) => product.featured) && (
@@ -72,7 +141,7 @@ const BusinessProductsListUI = (props: BusinessProductsListParams) => {
                 (product: any, i: any) =>
                   product.featured && (
                     <SingleProductCard
-                      key={i}
+                      key={'feat_' + product.id}
                       isSoldOut={product.inventoried && !product.quantity}
                       product={product}
                       businessId={businessId}
@@ -86,9 +155,14 @@ const BusinessProductsListUI = (props: BusinessProductsListParams) => {
         )}
 
       {!category?.id && categories.filter(category => category?.id !== null).map((category, i, _categories) => {
-        const products = !isUseParentCategory
-          ? categoryState?.products?.filter((product: any) => product?.category_id === category?.id) ?? []
-          : categoryState?.products?.filter((product: any) => category?.children?.some((cat: any) => cat.category_id === product?.category_id)) ?? []
+        const _products = !isUseParentCategory
+          ? categoryState?.products?.filter((product : any) => product?.category_id === category?.id) ?? []
+          : categoryState?.products?.filter((product : any) => category?.children?.some((cat : any) => cat.category_id === product?.category_id)) ?? []
+        const products = subcategoriesSelected?.length > 0
+          ? _products?.filter((product : any) =>
+            !subcategoriesSelected.find((subcategory : any) => subcategory?.parent_category_id === category?.id) ||
+            subcategoriesSelected?.some((subcategory : any) => subcategory.id === product?.category_id))
+          : _products
 
         const shortCategoryDescription = category?.description?.length > 80 ? `${category?.description?.substring(0, 80)}...` : category?.description
 
@@ -132,7 +206,7 @@ const BusinessProductsListUI = (props: BusinessProductsListParams) => {
                 </View>
                 {!!category?.description && (
                   <View style={{ position: 'relative' }}>
-                    <OText size={12} weight={'500'} mBottom={5}>
+                    <OText size={12} weight={'500'} mBottom={10} color='#909BA9'>
                       {shortCategoryDescription}
                       {category?.description?.length > 80 && (
                         <OButton
@@ -150,6 +224,9 @@ const BusinessProductsListUI = (props: BusinessProductsListParams) => {
                         />
                       )}
                     </OText>
+                    {category?.subcategories?.length > 0 && (
+                      <SubcategoriesComponent category={category} />
+                    )}
                   </View>
                 )}
                 <>
@@ -265,6 +342,15 @@ const bpStyles = StyleSheet.create({
     shadowRadius: 1,
     marginEnd: 13,
   },
+  categoryButtonStyle: {
+    borderWidth: 0,
+    marginLeft: 5,
+    marginRight: 5,
+    marginBottom: 10,
+    height: 35,
+    paddingLeft: 3,
+    paddingRight: 3,
+  }
 });
 
 export const BusinessProductsList = (props: BusinessProductsListParams) => {

package/themes/original/src/components/BusinessProductsList/styles.tsx

@@ -30,4 +30,15 @@ export const RibbonBox = styled.View`
   ${(props: any) => props.isCapsule && css`
     border-radius: 50px;
   `}
-`
+`
+
+export const SubCategoriesContainer = styled.View`
+  flex-direction: row;
+  flex-wrap: wrap;
+  margin-bottom: 10px;
+`
+
+export const ContainerButton = styled.View`
+`
+
+export const HeaderWrapper = styled.View``

package/themes/original/src/components/BusinessProductsListing/index.tsx

@@ -92,6 +92,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 	const [categoriesLayout, setCategoriesLayout] = useState<any>({})
 	const [productListLayout, setProductListLayout] = useState<any>(null)
 	const [isCategoryClicked, setCategoryClicked] = useState(false)
+	const [subcategoriesSelected, setSubcategoriesSelected] = useState([])
 
 	const currentCart: any = Object.values(orderState.carts).find((cart: any) => cart?.business?.slug === business?.slug) ?? {}
 
@@ -254,6 +255,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 								lazyLoadProductsRecommended={business?.lazy_load_products_recommended}
 								setSelectedCategoryId={setSelectedCategoryId}
 								setCategoryClicked={setCategoryClicked}
+								
 							/>
 						)}
 					</>
@@ -281,8 +283,11 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 								errorQuantityProducts={errorQuantityProducts}
 								handleCancelSearch={handleCancel}
 								categoriesLayout={categoriesLayout}
+								subcategoriesSelected={subcategoriesSelected}
+								lazyLoadProductsRecommended={business?.lazy_load_products_recommended}
 								setCategoriesLayout={setCategoriesLayout}
 								currentCart={currentCart}
+								setSubcategoriesSelected={setSubcategoriesSelected}
 							/>
 						</WrapContent>
 					</>

package/themes/original/src/components/BusinessesListing/index.tsx

@@ -317,7 +317,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 			{
 				!businessId && !props.franchiseId && featuredBusiness && featuredBusiness.length > 0 && (
 					<FeaturedWrapper>
-						<OText size={16} style={{ marginLeft: 40 }} weight={Platform.OS === 'ios' ? '600' : 'bold'}>{t('FEATURED_BUSINESS', 'Featured business')}</OText>
+						<OText size={16} style={{ marginLeft: 40 }} weight={Platform.OS === 'ios' ? '600' : 'bold'}>{t('BUSINESS_FEATURE', 'Featured business')}</OText>
 						<ScrollView
 							showsHorizontalScrollIndicator={false}
 							nestedScrollEnabled

package/themes/original/src/components/Home/index.tsx

@@ -36,7 +36,7 @@ export const Home = (props: any) => {
 					{t('WELCOME', 'Welcome!')}
 				</OText>
 				<OText color={theme.colors.white} size={14} style={{ marginBottom: 46 }}>
-					{t('LETS_START_ORDER', "Let's start to order now")}
+					{t('SUBTITLE_HOME', "Let's start to order now")}
 				</OText>
 				<OButton
 					text={t('LOGIN_NOW', 'Login now')}

package/themes/original/src/components/PhoneInputNumber/index.tsx

@@ -22,8 +22,9 @@ export const PhoneInputNumber = (props: PhoneInputParams) => {
 		textStyle,
 		flagStyle,
 		noDropIcon,
-    isDisabled,
-		isStartValidation
+		isDisabled,
+		isStartValidation,
+		changeCountry
 	} = props
 
 	const theme = useTheme();
@@ -106,11 +107,16 @@ export const PhoneInputNumber = (props: PhoneInputParams) => {
 			)}
 			<PhoneInput
 				ref={phoneInput}
-        disabled={isDisabled}
+				disabled={isDisabled}
 				defaultValue={userphoneNumber || defaultValue}
-				defaultCode={defaultCode ? transformCountryCode(defaultCode) : configs?.default_country_code?.value}
+				defaultCode={defaultCode ?
+					!isNaN(defaultCode)
+						? transformCountryCode(defaultCode)
+						: defaultCode
+					: configs?.default_country_code?.value}
 				onChangeFormattedText={(text: string) => handleChangeNumber(text)}
 				withDarkTheme
+				onChangeCountry={(country) => changeCountry?.(country)}
 				countryPickerProps={{ withAlphaFilter: true }}
 				textContainerStyle={{ ...style.input, ...inputStyle ? inputStyle : {} }}
 				textInputStyle={textStyle}

package/themes/original/src/components/SignupForm/index.tsx

@@ -119,6 +119,7 @@ const SignupFormUI = (props: SignupParams) => {
 		phone: {
 			country_phone_code: null,
 			cellphone: null,
+			country_code: null
 		},
 	});
 	const [recaptchaConfig, setRecaptchaConfig] = useState<any>({})
@@ -133,7 +134,7 @@ const SignupFormUI = (props: SignupParams) => {
 	const passwordRef = useRef<any>(null);
 	const recaptchaRef = useRef<any>({});
 
-  const showInputPhoneNumber = (validationFields?.fields?.checkout?.cellphone?.enabled ?? false) || configs?.verification_phone_required?.value === '1'
+	const showInputPhoneNumber = (validationFields?.fields?.checkout?.cellphone?.enabled ?? false) || configs?.verification_phone_required?.value === '1'
 
 	const handleRefs = (ref: any, code: string) => {
 		switch (code) {
@@ -216,8 +217,8 @@ const SignupFormUI = (props: SignupParams) => {
 			!phoneInputData.phone.country_phone_code &&
 			!phoneInputData.phone.cellphone &&
 			((validationFields?.fields?.checkout?.cellphone?.enabled &&
-        validationFields?.fields?.checkout?.cellphone?.required) ||
-        configs?.verification_phone_required?.value === '1')
+				validationFields?.fields?.checkout?.cellphone?.required) ||
+				configs?.verification_phone_required?.value === '1')
 		) {
 			showToast(
 				ToastType.Error,
@@ -232,7 +233,8 @@ const SignupFormUI = (props: SignupParams) => {
 			handleButtonSignupClick &&
 				handleButtonSignupClick({
 					...values,
-					...((phoneInputData.phone.cellphone !== null && phoneInputData.phone.country_phone_code !== null) && {...phoneInputData.phone}),
+					...((phoneInputData.phone.cellphone !== null && phoneInputData.phone.country_phone_code !== null) && { ...phoneInputData.phone }),
+					country_code: phoneInputData.phone.country_code
 				});
 			if (
 				!formState.loading &&
@@ -295,7 +297,7 @@ const SignupFormUI = (props: SignupParams) => {
 
 	const handleOpenRecaptcha = () => {
 		setRecaptchaVerified(false)
-	  	if (!recaptchaConfig?.siteKey) {
+		if (!recaptchaConfig?.siteKey) {
 			showToast(ToastType.Error, t('NO_RECAPTCHA_SITE_KEY', 'The config doesn\'t have recaptcha site key'));
 			return
 		}
@@ -304,7 +306,7 @@ const SignupFormUI = (props: SignupParams) => {
 			return
 		}
 		recaptchaRef.current.open()
-  	}
+	}
 
 	const onRecaptchaVerify = (token: any) => {
 		setRecaptchaVerified(true)
@@ -335,12 +337,12 @@ const SignupFormUI = (props: SignupParams) => {
 	}, [errors]);
 
 	useEffect(() => {
-    register('cellphone', {
-      required: isRequiredField('cellphone')
-        ? t('VALIDATION_ERROR_MOBILE_PHONE_REQUIRED', 'The field Mobile phone is required').replace('_attribute_', t('CELLPHONE', 'Cellphone'))
-        : null
-    })
-  }, [register])
+		register('cellphone', {
+			required: isRequiredField('cellphone')
+				? t('VALIDATION_ERROR_MOBILE_PHONE_REQUIRED', 'The field Mobile phone is required').replace('_attribute_', t('CELLPHONE', 'Cellphone'))
+				: null
+		})
+	}, [register])
 
 	useEffect(() => {
 		if (phoneInputData?.phone?.cellphone) setValue('cellphone', phoneInputData?.phone?.cellphone, '')
@@ -367,6 +369,16 @@ const SignupFormUI = (props: SignupParams) => {
 		}
 	}, [verifyPhoneState]);
 
+	useEffect(() => {
+		setPhoneInputData({
+			...phoneInputData,
+			phone: {
+				...phoneInputData.phone,
+				country_code: configs?.default_country_code?.value
+			}
+		})
+	}, [configs])
+
 	return (
 		<View>
 			<NavBar
@@ -490,8 +502,24 @@ const SignupFormUI = (props: SignupParams) => {
 								<View style={{ marginBottom: 25 }}>
 									<PhoneInputNumber
 										data={phoneInputData}
-										handleData={(val: any) => setPhoneInputData(val)}
+										handleData={(val: any) => setPhoneInputData({
+											...phoneInputData,
+											...val,
+											phone: {
+												...phoneInputData.phone,
+												...val.phone,
+												country_code: phoneInputData.phone.country_code
+											}
+										})}
 										forwardRef={phoneRef}
+										defaultCode={formState?.country_code ?? formState?.country_phone_code ?? null}
+										changeCountry={(val: any) => setPhoneInputData({
+											...phoneInputData,
+											phone: {
+												...phoneInputData.phone,
+												country_code: val.cca2
+											}
+										})}
 										textInputProps={{
 											returnKeyType: 'next',
 											onSubmitEditing: () => passwordRef?.current?.focus?.(),

package/themes/original/src/components/UserFormDetails/index.tsx

@@ -27,7 +27,7 @@ export const UserFormDetailsUI = (props: any) => {
 		hideUpdateButton,
 		setWillVerifyOtpState,
 		isVerifiedPhone,
-		handleChangePromotions
+		handleChangePromotions,
 	} = props;
 
 	const theme = useTheme();
@@ -182,6 +182,16 @@ export const UserFormDetailsUI = (props: any) => {
 		handleChangeInput(phoneNumber, true);
 	};
 
+	const changeCountry = (country : any) => {
+		let countryCode = {
+			country_code: {
+				name: 'country_code',
+				value: country.cca2
+			}
+		}
+		handleChangeInput(countryCode, true);
+	}
+
 	useEffect(() => {
 		if (Object.keys(errors).length > 0) {
 			const list = Object.values(errors);
@@ -315,8 +325,9 @@ export const UserFormDetailsUI = (props: any) => {
 									<PhoneInputNumber
 										data={phoneInputData}
 										handleData={(val: any) => handleChangePhoneNumber(val)}
+										changeCountry={(val : any) => changeCountry(val)}
 										defaultValue={phoneUpdate ? '' : user?.cellphone}
-										defaultCode={user?.country_phone_code || null}
+										defaultCode={user?.country_code ?? user?.country_phone_code ?? null}
 										boxStyle={styles.phoneSelect}
 										inputStyle={styles.phoneInputStyle}
 										textStyle={{ color: theme.colors.textNormal, fontSize: 12, padding: 0 }}

package/themes/original/src/components/UserProfile/index.tsx

@@ -167,7 +167,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={() => onRedirect('Messages', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
 						<MessageCircle name='message1' style={styles.messageIconStyle} color={theme.colors.textNormal} />

package/themes/original/src/config/constants.tsx

@@ -8,26 +8,26 @@ export const ORDER_TYPES = [
 	{
 		value: 1,
 		content: 'DELIVERY',
-		description: 'DELIVERY_DESCRIPTION'
+		description: 'ORDERTYPE_DESCRIPTION_DELIVERY'
 	},
 	{
 		value: 2,
 		content: 'PICKUP',
-		description: 'PICKUP_DESCRIPTION',
+		description: 'ORDERTYPE_DESCRIPTION_PICKUP',
 	},
 	{
 		value: 3,
 		content: 'EAT_IN',
-		description: 'EAT_IN_DESCRIPTION',
+		description: 'ORDERTYPE_DESCRIPTION_EATIN',
 	},
 	{
 		value: 4,
 		content: 'CURBSIDE',
-		description: 'CURBSIDE_DESCRIPTION',
+		description: 'ORDERTYPE_DESCRIPTION_CURBSIDE',
 	},
 	{
 		value: 5,
 		content: 'DRIVE_THRU',
-		description: 'DRIVE_THRU_DESCRIPTION',
+		description: 'ORDERTYPE_DESCRIPTION_DRIVETHRU',
 	}
-]
+]

package/themes/original/src/types/index.tsx

@@ -120,6 +120,7 @@ export interface PhoneInputParams {
 	flagStyle?: any;
 	isDisabled?: any;
 	isStartValidation?: any;
+	changeCountry?: any;
 }
 
 export interface LanguageSelectorParams {
@@ -240,7 +241,11 @@ export interface BusinessProductsListParams {
 	handleCancelSearch?: () => void,
 	categoriesLayout?: any,
 	setCategoriesLayout?: any,
-	currentCart?: any
+	currentCart?: any,
+	setSubcategoriesSelected?: any,
+    subcategoriesSelected?: any,
+    onClickCategory?: any,
+    lazyLoadProductsRecommended?: boolean
 }
 export interface SingleProductCardParams {
 	businessId: any,

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

@@ -140,7 +140,7 @@ const AddressListUI = (props: AddressListParams) => {
 				<AddressListContainer>
 					{isProfile && (
 						<NavBar
-							title={t('MY_SAVED_PLACES', 'My saved places')}
+							title={t('SAVED_PLACES', 'My saved places')}
 							titleAlign={'center'}
 							onActionLeft={() => goToBack()}
 							showCall={false}

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 }} />