ordering-ui-react-native 0.15.9 → 0.15.10-release

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

@@ -3,17 +3,14 @@ import { TouchableOpacity, View } from 'react-native';
 import MaterialIcon from 'react-native-vector-icons/MaterialCommunityIcons';
 
 import { UDContainer, UDHeader, UDForm, UDInfo, EditBtn } from './styles';
+
 import {
 	UserFormDetails as UserFormController,
 	useLanguage,
 	useSession,
-	ToastType,
-	useToast
 } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
-import { OIcon, OText, OModal } from '../shared';
-import { VerifyPhone } from '../VerifyPhone';
-import Spinner from 'react-native-loading-spinner-overlay';
+import { OIcon, OText } from '../shared';
 
 import { UserFormDetailsUI } from '../UserFormDetails';
 import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder';
@@ -29,33 +26,15 @@ const UserDetailsUI = (props: any) => {
 		isUserDetailsEdit,
 		phoneUpdate,
 		togglePhoneUpdate,
-		isCheckout,
-		checkPhoneCodeState,
-		handleSendVerifyCode,
-		handleCheckPhoneCode,
-		verifyPhoneState,
-		isVerifiedPhone,
-		setCheckPhoneCodeState
+		isCheckout
 	} = props
 
 	const theme = useTheme();
 
 	const [, t] = useLanguage()
 	const [{ user }] = useSession()
-	const [, { showToast }] = useToast();
-
 	const userData = props.userData || (!formState.result.error && formState.result?.result) || user
 
-	const [isModalVisible, setIsModalVisible] = useState(false);
-	const [willVerifyOtpState, setWillVerifyOtpState] = useState(false);
-	const [phoneInputData, setPhoneInputData] = useState({
-		error: '',
-		phone: {
-			country_phone_code: null,
-			cellphone: null,
-		},
-	});
-
 
 	useEffect(() => {
 		if (isUserDetailsEdit) {
@@ -76,54 +55,6 @@ const UserDetailsUI = (props: any) => {
 		}
 	}, [user?.country_phone_code])
 
-	const handleVerifyCodeClick = () => {
-		if (formState?.changes?.cellphone && formState?.changes?.country_phone_code) {
-			const { cellphone, country_phone_code: countryPhoneCode } = formState?.changes
-
-			setPhoneInputData({
-				error: '',
-				phone: {
-					country_phone_code: countryPhoneCode,
-					cellphone: cellphone,
-				},
-			});
-			handleSendVerifyCode({
-			  cellphone: cellphone,
-			  country_phone_code: countryPhoneCode
-			})
-		}
-	}
-
-	useEffect(() => {
-		if (willVerifyOtpState) handleVerifyCodeClick()
-	}, [willVerifyOtpState])
-
-	useEffect(() => {
-		if (verifyPhoneState && !verifyPhoneState?.loading) {
-			if (verifyPhoneState.result?.error) {
-				const message = typeof verifyPhoneState?.result?.result === 'string'
-					? verifyPhoneState?.result?.result
-					: verifyPhoneState?.result?.result[0]
-				verifyPhoneState.result?.result && showToast(
-					ToastType.Error,
-					message
-				)
-				setWillVerifyOtpState(false)
-				return
-			}
-
-			const okResult = verifyPhoneState.result?.result === 'OK'
-			if (okResult) {
-				!isModalVisible && setIsModalVisible(true)
-				setWillVerifyOtpState(false)
-			}
-		}
-	}, [verifyPhoneState])
-
-	useEffect(() => {
-		if (isVerifiedPhone) setIsModalVisible(false)
-	}, [isVerifiedPhone])
-
 	return (
 		<>
 			{(validationFields.loading || formState.loading) && (
@@ -186,32 +117,10 @@ const UserDetailsUI = (props: any) => {
 							)}
 						</UDInfo>
 					) : (
-						<UserFormDetailsUI
-							{...props}
-							phoneUpdate={phoneUpdate}
-							togglePhoneUpdate={togglePhoneUpdate}
-							isCheckout={isCheckout}
-							setWillVerifyOtpState={setWillVerifyOtpState}
-						/>
+						<UserFormDetailsUI {...props} phoneUpdate={phoneUpdate} togglePhoneUpdate={togglePhoneUpdate} isCheckout={isCheckout} />
 					)}
 				</UDContainer>
 			)}
-			<OModal
-				open={isModalVisible}
-				onClose={() => setIsModalVisible(false)}
-				entireModal
-			>
-				<VerifyPhone
-				phone={phoneInputData.phone}
-				verifyPhoneState={verifyPhoneState}
-				checkPhoneCodeState={checkPhoneCodeState}
-				handleCheckPhoneCode={handleCheckPhoneCode}
-				setCheckPhoneCodeState={setCheckPhoneCodeState}
-				handleVerifyCodeClick={handleVerifyCodeClick}
-				onClose={() => setIsModalVisible(false)}
-				/>
-			</OModal>
-			<Spinner visible={verifyPhoneState?.loading} />
 		</>
 	)
 }

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

@@ -25,8 +25,6 @@ export const UserFormDetailsUI = (props: any) => {
 		handleButtonUpdateClick,
 		phoneUpdate,
 		hideUpdateButton,
-		setWillVerifyOtpState,
-		isVerifiedPhone,
 		handleChangePromotions
 	} = props;
 
@@ -141,8 +139,8 @@ export const UserFormDetailsUI = (props: any) => {
 			if (
 				formState.changes?.cellphone === null &&
 				((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,
@@ -153,9 +151,6 @@ export const UserFormDetailsUI = (props: any) => {
 				);
 				return;
 			}
-			if (formState?.changes?.cellphone && !isVerifiedPhone) {
-				showToast(ToastType.Error, t('VERIFY_ERROR_PHONE_NUMBER', 'The Phone Number field is not verified'))
-			}
 			let changes = null;
 			if (user?.cellphone && !userPhoneNumber) {
 				changes = {
@@ -216,13 +211,6 @@ export const UserFormDetailsUI = (props: any) => {
 			}
 		}
 	}, [user, isEdit]);
-
-	useEffect(() => {
-		if (!phoneInputData.error && phoneInputData?.phone?.country_phone_code && phoneInputData?.phone?.cellphone) {
-			setWillVerifyOtpState(true)
-		}
-	}, [phoneInputData])
-
 	return (
 		<>
 			<UDForm>

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

@@ -16,6 +16,7 @@ import { LogoutButton } from '../LogoutButton'
 import { LanguageSelector } from '../LanguageSelector'
 import MessageCircle from 'react-native-vector-icons/AntDesign'
 import Ionicons from 'react-native-vector-icons/Ionicons'
+import FastImage from 'react-native-fast-image'
 
 import {
 	OIcon,
@@ -135,24 +136,23 @@ const ProfileListUI = (props: ProfileParams) => {
 	}
 
 	return (
-		<View style={{ flex: 1, height: height - top - bottom - 62 }}>
-			<OText size={24} style={{ marginTop: 15, paddingHorizontal: 40 }}>
+		<View style={{ flex: 1, height: height - top - bottom - 62, paddingTop: 20 }}>
+			{/* <OText size={24} style={{ marginTop: 15, paddingHorizontal: 40 }}>
 				{t('PROFILE', 'Profile')}
-			</OText>
+			</OText> */}
 			<CenterView style={styles.pagePadding}>
-				<View style={styles.photo}>
-					{user?.photo ? (
-						<OIcon
-							url={user?.photo}
-							cover
-							width={60}
-							height={60}
-							borderRadius={8}
+				{user?.photo && (
+					<View style={styles.photo}>
+						<FastImage
+							style={{ height: 60, width: 60, borderRadius: 8 }}
+							source={{
+								uri: user?.photo,
+								priority: FastImage.priority.normal,
+							}}
+							resizeMode={FastImage.resizeMode.cover}
 						/>
-					) : (
-						<Ionicons name='person-outline' size={50} style={{ marginRight: 10 }} />
-					)}
-				</View>
+					</View>
+				)}
 				<View style={{ flexBasis: '70%' }}>
 					<OText size={20} lineHeight={30} weight={Platform.OS === 'ios' ? '500' : 'bold'} color={theme.colors.textNormal}>{user?.name} {user?.lastname}</OText>
 					<TouchableOpacity onPress={() => navigation.navigate('ProfileForm', { ...detailProps })}>
@@ -166,7 +166,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/components/UserProfileForm/index.tsx

@@ -21,6 +21,7 @@ import NavBar from '../NavBar';
 import { Container } from '../../layouts/Container';
 import { VerifyPhone } from '../VerifyPhone'
 import Ionicons from 'react-native-vector-icons/Ionicons'
+import FastImage from 'react-native-fast-image'
 
 const ProfileUI = (props: ProfileParams) => {
 	const {
@@ -288,12 +289,13 @@ const ProfileUI = (props: ProfileParams) => {
 					<CenterView style={styles.pagePadding}>
 						<View style={styles.photo}>
 							{user?.photo ? (
-								<OIcon
-									url={user?.photo}
-									cover
-									width={60}
-									height={60}
-									borderRadius={8}
+								<FastImage
+									style={{ height: 60, width: 80, borderRadius: 8 }}
+									source={{
+										uri: user?.photo,
+										priority: FastImage.priority.normal,
+									}}
+									resizeMode={FastImage.resizeMode.cover}
 								/>
 							) : (
 								<Ionicons name='person-outline' size={50} />

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

@@ -37,8 +37,8 @@ export const VerifyPhone = (props: any) => {
 			height: 75,
 			marginBottom: 25,
 			borderWidth: 1,
-			borderColor: theme.colors.inputBorderColor,
-			borderRadius: 8,
+			borderColor: theme.colors.disabled,
+			borderRadius: 20,
 			textAlign: 'center',
 			fontSize: 40
 		}
@@ -131,11 +131,11 @@ export const VerifyPhone = (props: any) => {
 
 	return (
 		<Container>
-			<OText size={26} style={{ textAlign: 'left', fontWeight: '600', marginTop: 10, marginBottom: 30 }}>
-				{t('ENTER_VERIFICATION_CODE', 'Enter verification code')}
+			<OText size={30} style={{ textAlign: 'left' }}>
+				{t('VERIFY_PHONE', 'Verify Phone')}
 			</OText>
 			{lastNumbers && (
-				<OText size={16} color={theme.colors.disabled}>
+				<OText size={20} color={theme.colors.disabled}>
 					{`${t('MESSAGE_ENTER_VERIFY_CODE', 'Please, enter the verification code we sent to your mobile ending with')} **${lastNumbers}`}
 				</OText>
 			)}
@@ -174,7 +174,7 @@ export const VerifyPhone = (props: any) => {
 						).result?.result)?.map((e: any, i: number) => (
 							<OText
 								key={i}
-								size={16}
+								size={20}
 								color={theme.colors.error}
 							>
 								{`* ${t(getTraduction(e))}`}
@@ -183,9 +183,12 @@ export const VerifyPhone = (props: any) => {
 					</ErrorSection>
 				)}
 			<ResendSection>
+				<OText size={16} style={{ marginRight: 5 }}>
+					{t('ARE_YOU_NOT_SEEING_THE_CODE', 'Are you not seeing the code?')}
+				</OText>
 				<Pressable onPress={() => handleSendCodeAgain()}>
 					<OText size={16} color={theme.colors.primary}>
-						{t('RESEND_CODE', 'Resend code')}
+						{t('SEND_AGAIN', 'Send Again')}
 					</OText>
 				</Pressable>
 			</ResendSection>

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

@@ -19,12 +19,13 @@ export const CountDownContainer = styled.View`
 export const ResendSection = styled.View`
   display: flex;
   flex-direction: row;
+  justify-content: center;
   margin-bottom: 30px;
 `
 
 export const WrappCountdown = styled.View`
   padding-top: 20px;
-  padding-bottom: 50px;
+  padding-bottom: 20px;
 `
 
 export const InputsSection = styled.View`

package/themes/original/src/components/shared/HeaderTitle.tsx

@@ -0,0 +1,21 @@
+import React from 'react';
+import { Platform } from 'react-native';
+import OText from './OText';
+
+const HeaderTitle = (props: any) => {
+  const { text, style } = props
+  return (
+    <OText
+      size={24}
+      style={style ?? {
+        marginTop: Platform.OS === 'android' ? 50 : 30,
+        paddingHorizontal: 40,
+        textTransform: 'capitalize'
+      }}
+    >
+      {text}
+    </OText>
+  )
+}
+
+export default HeaderTitle

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

@@ -11,6 +11,7 @@ import OKeyButton from './OKeyButton'
 import OModal from './OModal'
 import OAlert from './OAlert'
 import OBottomPopup from './OBottomPopup'
+import HeaderTitle from './HeaderTitle'
 
 export {
 	OText,
@@ -26,4 +27,5 @@ export {
 	OAlert,
   	OModal,
 	OBottomPopup,
+  HeaderTitle
 }

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

@@ -17,6 +17,8 @@ export interface LoginParams {
 	handleSendVerifyCode?: any;
 	handleCheckPhoneCode?: any;
 	notificationState?: any;
+	handleReCaptcha?: any;
+    enableReCaptcha?: any;
 }
 export interface ProfileParams {
 	navigation?: any;
@@ -100,6 +102,8 @@ export interface SignupParams {
 	handleCheckPhoneCode?: any;
 	notificationState?: any;
 	handleChangePromotions: () => void;
+	enableReCaptcha?: boolean;
+	handleReCaptcha?: () => void;
 }
 
 export interface PhoneInputParams {
@@ -115,6 +119,8 @@ export interface PhoneInputParams {
 	noDropIcon?: boolean;
 	flagStyle?: any;
 	isDisabled?: any;
+	isStartValidation?: any;
+	changeCountry?: any;
 }
 
 export interface LanguageSelectorParams {
@@ -142,9 +148,9 @@ export interface BusinessesListingParams {
 export interface HighestRatedBusinessesParams {
 	businessesList: { businesses: Array<any>, loading: boolean, error: null | string };
 	onBusinessClick?: void;
-	navigation? :any;
+	navigation?: any;
 	isLoading?: boolean;
-	getBusinesses: (newFetch : boolean) => void
+	getBusinesses: (newFetch: boolean) => void
 }
 export interface BusinessTypeFilterParams {
 	businessTypes?: Array<any>;
@@ -165,7 +171,15 @@ export interface BusinessControllerParams {
 	businessWillCloseSoonMinutes?: number
 	isBusinessClose?: number,
 	navigation?: any,
-	style?: ViewStyle
+	style?: ViewStyle,
+	businessHeader?: string,
+	businessFeatured?: boolean,
+	businessLogo?: string,
+	businessReviews?: any,
+	businessDeliveryPrice?: number,
+	businessDeliveryTime?: string,
+	businessPickupTime?: string,
+	businessDistance?: number
 }
 export interface BusinessProductsListingParams {
 	navigation?: any;
@@ -181,7 +195,7 @@ export interface BusinessProductsListingParams {
 	header?: any;
 	logo?: any;
 	productModal?: any;
-  getNextProducts?: () => {};
+	getNextProducts?: () => {};
 	handleChangeCategory: (value: any) => {};
 	setProductLogin?: () => {};
 	updateProductModal?: (value: any) => {};
@@ -208,11 +222,12 @@ export interface BusinessProductsCategoriesParams {
 	categoriesLayout?: any;
 	selectedCategoryId?: any;
 	lazyLoadProductsRecommended?: any;
-  setSelectedCategoryId?: any
-  setCategoryClicked?: any
+	setSelectedCategoryId?: any
+	setCategoryClicked?: any
 }
 export interface BusinessProductsListParams {
 	errors?: any;
+	isFiltMode?: any;
 	businessId?: number;
 	category?: any;
 	categories: Array<any>;
@@ -227,7 +242,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,
@@ -320,7 +339,10 @@ export interface OrderDetailsParams {
 	isFromCheckout?: boolean,
 	driverLocation?: any,
 	isFromRoot?: any,
-	goToBusinessList?: boolean
+	goToBusinessList?: boolean,
+	onNavigationRedirect?: any,
+	reorderState?: any,
+	handleReorder?: any,
 }
 export interface ProductItemAccordionParams {
 	key?: any;
@@ -354,7 +376,7 @@ export interface ReviewProductParams {
 	formState?: any,
 	handleChangeFormState?: any,
 	handleSendProductReview?: any
-  }
+}
 export interface SingleProductReviewParams {
 	product: any,
 	formState?: any,
@@ -382,7 +404,7 @@ export interface MessagesParams {
 	handleSend?: () => {},
 	setImage?: (image: string | null) => {},
 	setMessage?: (comment: string) => {},
-	setMessages?: () => {},
+	setMessages?: (image: any | null) => {},
 	readMessages?: () => {},
 	onClose?: () => void,
 	isMeesageListing?: boolean,
@@ -521,27 +543,45 @@ export interface HelpGuideParams {
 export interface HelpAccountAndPaymentParams {
 	navigation: any;
 }
-  
+
 export interface MessageListingParams {
 	navigation: any;
 	franchiseId?: any;
 }
 
-export interface BusinessSearchParams { 
+export interface BusinessSearchParams {
 	navigation: any,
-    businessesSearchList: any,
-    onBusinessClick: any,
-    handleChangeTermValue: (term: string) => void,
-    termValue: string,
-    paginationProps: any,
-    handleSearchbusinessAndProducts: (newFetch?: boolean) => void,
-    handleChangeFilters: (prop : string, value : any) => void,
-    filters: any,
-    businessTypes: Array<number>,
-    setFilters: (filters: any) => void,
+	businessesSearchList: any,
+	onBusinessClick: any,
+	handleChangeTermValue: (term: string) => void,
+	termValue: string,
+	paginationProps: any,
+	handleSearchbusinessAndProducts: (newFetch?: boolean) => void,
+	handleChangeFilters: (prop: string, value: any) => void,
+	filters: any,
+	businessTypes: Array<number>,
+	setFilters: (filters: any) => void,
 	lazySearch?: boolean
 }
-  
+
 export interface NoNetworkParams {
 	image?: any,
 }
+
+export interface PlaceSpotParams {
+	isOpenPlaceSpot?: boolean,
+	cart?: any,
+	placesState?: any,
+	handleChangePlace?: any,
+	getPlacesList?: any,
+	setOpenPlaceModal?: any
+}
+
+export interface PromotionParams {
+	navigation: any,
+    offersState: any,
+    handleSearchValue: any,
+    searchValue: string,
+    offerSelected: any,
+    setOfferSelected: any,
+}

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

@@ -33,7 +33,8 @@ export const getTraduction = (key: string) => {
     ERROR_PLACE_PAY_WITH_CARD1: 'An error occurred while trying to pay by card',
     ERROR_PLACE_PAY_WITH_PAYPAL_CAPTURE: 'An error occurred while trying to pay by PayPal',
     ERROR_ADD_PRODUCT_VERY_FAR_FOR_DELIVERY: 'Error adding product, very far for delivery',
-    ERROR_PRODUCT_NOT_FOUND: 'Error with the product'
+    ERROR_PRODUCT_NOT_FOUND: 'Error with the product',
+    ERROR_INVALID_OFFER: 'The offer doesn\'t exist'
   }
 
   return keyList[key] ? t(key, keyList[key]) : t(key)
@@ -170,6 +171,15 @@ export const getTypesText = (value: number) => {
   return ret?.content;
 }
 
+/**
+ * List shape for ribbon
+ */
+ export const shape = {
+  rectangle: 'rectangle',
+  rectangleRound: 'rectangle_round',
+  capsuleShape: 'capsule_shape'
+}
+
 /**
  * Function to transform degree to radian
  * @param {number} value for transform
@@ -202,4 +212,4 @@ export const formatUrlVideo = (url : string) => {
   const match = url.match(regExp)
   const id = (match && match[7].length === 11) ? match[7] : false
   return `https://www.youtube-nocookie.com/embed/${id}`
-}
+}

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/OrderTypeSelector/index.tsx

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