ordering-ui-react-native 0.14.55 → 0.14.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.14.55",
+  "version": "0.14.58",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

package/src/components/BusinessesListing/index.tsx

@@ -191,7 +191,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', 'Your are far from this address')}</OText>
+						<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'You are far from this address')}</OText>
 					</FarAwayMessage>
 				)}
       </OrderControlContainer>

package/src/components/Checkout/index.tsx

@@ -205,7 +205,7 @@ const CheckoutUI = (props: any) => {
   const onMessage = (e: any) => {
     if (e?.nativeEvent?.data && e?.nativeEvent?.data !== 'undefined') {
       let payment = JSON.parse(e.nativeEvent.data);
-
+      setOpenOrderCreating(true)
       if (payment === 'api error') {
         setShowGateway({ closedByUser: true, open: false })
         setProg(true);

package/src/components/StripeElementsForm/index.tsx

@@ -33,19 +33,33 @@ const StripeElementsFormUI = (props: any) => {
   const { confirmSetupIntent, loading: confirmSetupLoading } = useConfirmSetupIntent();
   const [createPmLoading, setCreatePmLoading] = useState(false);
 
-  const billingDetails = {
-    name: `${user.name} ${user.lastname}`,
-    email: user.email,
-    address: user.address
-  };
+  let billingDetails: any = {}
+
+  if (user?.name || user?.lastname) {
+    if (user?.name) {
+      billingDetails.name = user?.name
+    }
+    if (user?.lastname) {
+      billingDetails.name = `${billingDetails?.name} ${user?.lastname}`
+    }
+  }
+
+  if (user?.email) {
+    billingDetails.email = user?.email
+  }
+
+  if (user?.address) {
+    billingDetails.addressLine1 = user?.address
+  }
 
   const createPayMethod = async () => {
+    const params: any = { type: 'Card' }
+    if (Object.keys(billingDetails).length > 0) {
+      params.billingDetails = billingDetails
+    }
     try {
       setCreatePmLoading(true)
-      const { paymentMethod } = await createPaymentMethod({
-        type: 'Card',
-        billingDetails,
-      });
+      const { paymentMethod } = await createPaymentMethod(params);
 
       setCreatePmLoading(false)
       handleSource && handleSource({
@@ -68,11 +82,12 @@ const StripeElementsFormUI = (props: any) => {
       createPayMethod();
       return
     }
+    const params: any = { type: 'Card' }
+    if (Object.keys(billingDetails).length > 0) {
+      params.billingDetails = billingDetails
+    }
     try {
-      const { setupIntent, error } = await confirmSetupIntent(requirements, {
-        type: 'Card',
-        billingDetails,
-      });
+      const { setupIntent, error } = await confirmSetupIntent(requirements, params);
 
       if (setupIntent?.status === 'Succeeded') {
         stripeTokenHandler(setupIntent?.paymentMethodId, user, businessId);

package/src/components/TaxInformation/index.tsx

@@ -36,7 +36,7 @@ export const TaxInformation = (props: taxInformationParams) => {
         ? (product.tax?.id ? product.tax?.id === data?.id : product.tax?.id === null && data?.id === null)
         : type === 'fee'
           ? (product.fee?.id ? product.fee?.id === data?.id : (product.fee?.id === null && data?.id === null))
-          : Object.keys(data?.discounts ?? {}).map(code => code.includes(product?.code))
+          : Object.keys(data?.discounts ?? {}).map(code => code.includes(product?.code)) && product?.offers?.find(offer => offer?.name === data?.name)
     )
   }
 

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

@@ -197,7 +197,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', 'Your are far from this address')}</OText>
+					<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'You are far from this address')}</OText>
 				</FarAwayMessage>
 			)}
 			{!auth && (

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

@@ -155,7 +155,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', 'Your are far from this address')}</OText>
+						<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'You are far from this address')}</OText>
 					</FarAwayMessage>
 				)}
 				<View style={styles.wrapperOrderOptions}>

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

@@ -25,7 +25,7 @@ import FontAwesomeIcon from 'react-native-vector-icons/FontAwesome5';
 import FastImage from 'react-native-fast-image'
 
 export const BusinessControllerUI = (props: BusinessControllerParams) => {
-	const { business, handleClick, navigation } = props;
+	const { business, handleClick, navigation, isBusinessOpen } = props;
 	const [{ parsePrice, parseDistance, parseNumber, optimizeImage }] =
 		useUtils();
 	const [orderState] = useOrder();
@@ -122,7 +122,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 					</View>
 				)}
 				<BusinessState>
-					{!business?.open && (
+					{!isBusinessOpen && (
 						<View style={styles.businessStateView}>
 							<OText
 								color={theme.colors.textThird}
@@ -168,7 +168,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
           <OText>{getBusinessType()}</OText>
         </BusinessCategory> */}
 				<Metadata>
-					{!business?.open ? (
+					{!isBusinessOpen ? (
 						<View style={styles.closed}>
 							<OText size={10} color={theme.colors.red}>
 								{t('CLOSED', 'Closed')}

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

@@ -23,7 +23,7 @@ import {
 } from './styles';
 
 export const BusinessFeaturedCtrlUI = (props: BusinessControllerParams) => {
-	const { business, handleClick } = props;
+	const { business, handleClick, isBusinessOpen } = props;
 	const [{ parsePrice, parseDistance, parseNumber, optimizeImage }] =
 		useUtils();
 	const [orderState] = useOrder();
@@ -128,7 +128,7 @@ export const BusinessFeaturedCtrlUI = (props: BusinessControllerParams) => {
             <OText>{getBusinessType()}</OText>
           </BusinessCategory> */}
 					<Metadata>
-						{!business?.open ? (
+						{!isBusinessOpen ? (
 							<View style={styles.closed}>
 								<OText size={10} color={theme.colors.red}>
 									{t('CLOSED', 'Closed')}

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

@@ -130,8 +130,7 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
     disabledDateNumber: {
       color: '#B1BCCC',
       fontSize: 14,
-      fontWeight: '500',
-
+      fontWeight: '500'
     }
   })
 

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

@@ -155,6 +155,10 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 	const handleTouchDrag = useCallback(() => {
 		setCategoryClicked(false);
 	  }, []);
+	
+	const handleBackNavigation = () => {
+		navigation?.canGoBack() ? navigation.goBack() : navigation.navigate('BottomTab')
+	}
 
 	return (
 		<SafeAreaView
@@ -169,7 +173,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 									imgLeftSrc={theme.images.general.arrow_left}
 									imgRightSrc={null}
 									style={styles.btnBackArrow}
-									onClick={() => navigation?.canGoBack() && navigation.goBack()}
+									onClick={() => handleBackNavigation()}
 									imgLeftStyle={{ tintColor: theme.colors.textNormal, width: 16 }}
 								/>
 							</View>
@@ -231,7 +235,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 								selectedCategoryId={selectedCategoryId}
 								lazyLoadProductsRecommended={business?.lazy_load_products_recommended}
 								setSelectedCategoryId={setSelectedCategoryId}
-              	setCategoryClicked={setCategoryClicked}
+              					setCategoryClicked={setCategoryClicked}
 							/>
 						)}
 					</>
@@ -309,13 +313,13 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 					business={currentCart?.business}
 					cartProducts={currentCart?.products}
 					cart={currentCart}
-          setOpenUpselling={setOpenUpselling}
+          			setOpenUpselling={setOpenUpselling}
 					handleUpsellingPage={handleUpsellingPage}
 					handleCloseUpsellingPage={handleCloseUpsellingPage}
 					openUpselling={openUpselling}
 					canOpenUpselling={canOpenUpselling}
 					setCanOpenUpselling={setCanOpenUpselling}
-          onRedirect={onRedirect}
+          			onRedirect={onRedirect}
 				/>
 			)}
 		</SafeAreaView>

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

@@ -177,11 +177,8 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 	// }, [])
 
 	const handleOnRefresh = () => {
-		const hasMore = !(
-			paginationProps.totalPages === paginationProps.currentPage
-		);
-		if (!businessesList.loading && hasMore) {
-			getBusinesses();
+		if (!businessesList.loading) {
+			getBusinesses(true);
 		}
 	}
 
@@ -315,6 +312,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 									<BusinessFeaturedController
 										key={bAry[0].id}
 										business={bAry[0]}
+										isBusinessOpen={bAry[0]?.open}
 										handleCustomClick={handleBusinessClick}
 										orderType={orderState?.options?.type}
 									/>
@@ -322,6 +320,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 										<BusinessFeaturedController
 											key={bAry[1].id}
 											business={bAry[1]}
+											isBusinessOpen={bAry[1]?.open}
 											handleCustomClick={handleBusinessClick}
 											orderType={orderState?.options?.type}
 										/>
@@ -361,6 +360,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 						<BusinessController
 							key={business.id}
 							business={business}
+							isBusinessOpen={business.open}
 							handleCustomClick={handleBusinessClick}
 							orderType={orderState?.options?.type}
 							navigation={navigation}

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

@@ -103,6 +103,7 @@ const HighestRatedBusinessesUI = (props: HighestRatedBusinessesParams) => {
                     >
                       <BusinessController
                         business={business}
+                        isBusinessOpen={business?.open}
                         handleCustomClick={onBusinessClick}
                         orderType={orderState?.options?.type}
                         navigation={navigation}

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

@@ -1,18 +1,18 @@
-import React, { useState, useEffect, useCallback } from 'react';
-import moment, { Moment } from 'moment';
+import React, { useState, useEffect } from 'react';
+import moment from 'moment';
+import CalendarStrip from 'react-native-calendar-strip'
 import {
 	useLanguage,
 	useConfig,
-	useUtils,
 	useOrder,
 	MomentOption as MomentOptionController,
 } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
+import IconAntDesign from 'react-native-vector-icons/AntDesign'
 import {
-	ImageStore,
 	StyleSheet,
-	useWindowDimensions,
 	View,
+	TouchableOpacity
 } from 'react-native';
 import Spinner from 'react-native-loading-spinner-overlay';
 import { MomentOptionParams } from '../../types';
@@ -20,25 +20,17 @@ import NavBar from '../NavBar';
 import { OButton, OIcon, OText } from '../shared';
 import { Container } from '../../layouts/Container';
 import {
-	HeaderTitle,
 	WrapSelectOption,
-	Days,
-	Day,
-	WrapHours,
-	Hours,
-	Hour,
-	WrapDelveryTime,
+	OrderTimeWrapper,
+	TimeListWrapper,
+	TimeContentWrapper,
+	TimeItem
 } from './styles';
-import CalendarPicker from 'react-native-calendar-picker';
-import { TouchableRipple } from 'react-native-paper';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
-import FontAwesomeIcon from 'react-native-vector-icons/FontAwesome';
-import SelectDropdown from 'react-native-select-dropdown';
 
 const MomentOptionUI = (props: MomentOptionParams) => {
 	const {
 		navigation,
-		nopadding,
 		datesList,
 		hoursList,
 		dateSelected,
@@ -84,12 +76,62 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 			paddingHorizontal: 16,
 			flexDirection: 'row',
 			alignItems: 'center'
+		},
+		calendar: {
+			paddingBottom: 15,
+			borderBottomWidth: 1,
+			borderColor: theme.colors.backgroundGray200,
+			height: 100
+		},
+		calendarHeaderContainer: {
+			flex: 1,
+			justifyContent: 'flex-start',
+			textAlign: 'left',
+			marginBottom: 17,
+			borderBottomWidth: 1,
+			borderColor: theme.colors.backgroundGray200
+		},
+		calendarHeader: {
+			color: '#344050',
+			alignSelf: 'flex-start',
+			fontSize: 14,
+			fontWeight: '400'
+		},
+		dateNumber: {
+			color: '#B1BCCC',
+			fontSize: 16,
+			fontWeight: '500',
+		},
+		dateName: {
+			color: '#B1BCCC',
+			fontSize: 12,
+			textTransform: 'capitalize',
+		},
+		highlightDateName: {
+			color: '#344050',
+			fontSize: 12,
+			textTransform: 'capitalize',
+		},
+		highlightDateNumber: {
+			color: '#344050',
+			fontSize: 16,
+			textTransform: 'capitalize',
+		},
+		disabledDateName: {
+			color: '#B1BCCC',
+			fontSize: 10,
+			textTransform: 'capitalize',
+			opacity: 1,
+		},
+		disabledDateNumber: {
+			color: '#B1BCCC',
+			fontSize: 14,
+			fontWeight: '500'
 		}
 	});
 
 	const [, t] = useLanguage();
 	const [{ configs }] = useConfig();
-	const [{ parseTime }] = useUtils();
 	const [orderState] = useOrder();
 	const [optionSelected, setOptionSelected] = useState({
 		isAsap: false,
@@ -99,14 +141,11 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 		isLoading: 0,
 		isEditing: false,
 	});
-	const { width } = useWindowDimensions();
 	const { bottom } = useSafeAreaInsets();
 
-	const [toggleTime, setToggleTime] = useState(false);
-	const [selectedTime, setSelectedTime] = useState(timeSelected);
-	const [minDate, setMinDate] = useState(new Date())
-	const [maxDate, setMaxDate] = useState(new Date)
-	const [alert, setAlert] = useState<any>({ show: false })
+	const [selectedTime, setSelectedTime] = useState(null);
+	const [datesWhitelist, setDateWhitelist] = useState<any>([{ start: null, end: null }])
+	const [selectDate, setSelectedDate] = useState<any>(null)
 
 	const goToBack = () => navigation?.canGoBack() && navigation.goBack();
 
@@ -134,19 +173,6 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 		.utc()
 		.format('YYYY-MM-DD HH:mm:ss');
 
-	const getTwoChar = (ori: string) => {
-		return ori.substring(0, 2);
-	};
-	const weekDays = [
-		getTwoChar(t('SUNDAY_ABBREVIATION', 'Su')),
-		getTwoChar(t('MONDAY_ABBREVIATION', 'Mo')),
-		getTwoChar(t('TUESDAY_ABBREVIATION', 'Tu')),
-		getTwoChar(t('WEDNESDAY_ABBREVIATION', 'We')),
-		getTwoChar(t('THURSDAY_ABBREVIATION', 'Th')),
-		getTwoChar(t('FRIDAY_ABBREVIATION', 'Fr')),
-		getTwoChar(t('SATURDAY_ABBREVIATION', 'Sa')),
-	];
-
 	useEffect(() => {
 		if (orderState.options?.moment) {
 			setOptionSelected({ isAsap: false, isSchedule: true });
@@ -168,176 +194,163 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 		}
 	}, [momentState.isLoading]);
 
-	const customDayHeaderStylesCallback = () => {
-		return {
-			textStyle: {
-				color: theme.colors.disabled,
-				fontSize: 12,
-			},
-		};
-	};
+	const onSelectDate = (val: any) => {
+		setSelectedDate(val)
+		if (handleChangeDate) handleChangeDate(moment(val).format('YYYY-MM-DD'))
+	}
+
+	const LeftSelector = () => {
+		return (
+			<View style={{ height: '100%', justifyContent: 'flex-end' }}>
+				<IconAntDesign
+					name='caretleft'
+					color={theme.colors.textNormal}
+					size={16}
+				/>
+			</View>
+		)
+	}
+
+	const RightSelector = () => {
+		return (
+			<View style={{ height: '100%', justifyContent: 'flex-end' }}>
+				<IconAntDesign
+					name='caretright'
+					color={theme.colors.textNormal}
+					size={16}
+				/>
+			</View>
+		)
+	}
 
 	useEffect(() => {
 		if (datesList?.length > 0) {
-		  const _datesList = datesList.slice(0, Number(configs?.max_days_preorder?.value || 6))
-		  const minDateParts = _datesList[0].split('-')
-		  const maxDateParts = _datesList[_datesList.length - 1].split('-')
-		  const _minDate = new Date(minDateParts[0], minDateParts[1] - 1, minDateParts[2])
-		  const _maxDate = new Date(maxDateParts[0], maxDateParts[1] - 1, maxDateParts[2])
-		  setMinDate(_minDate)
-		  setMaxDate(_maxDate)
+			const _datesList = datesList.slice(0, Number(configs?.max_days_preorder?.value || 6))
+			const minDateParts = _datesList[0].split('-')
+			const maxDateParts = _datesList[_datesList.length - 1].split('-')
+			const _minDate = new Date(minDateParts[0], minDateParts[1] - 1, minDateParts[2])
+			const _maxDate = new Date(maxDateParts[0], maxDateParts[1] - 1, maxDateParts[2])
+			setDateWhitelist([{ start: _minDate, end: _maxDate }])
 		}
 	}, [datesList])
 
+	useEffect(() => {
+		if (dateSelected) {
+			const dateParts = dateSelected.split('-')
+			const _dateSelected = new Date(dateParts[0], dateParts[1] - 1, dateParts[2])
+			setSelectedDate(_dateSelected)
+		}
+	}, [dateSelected])
+
+	useEffect(() => {
+		setSelectedTime(timeSelected)
+	}, [timeSelected])
+
 	return (
 		<>
-		<Container style={{ paddingLeft: 40, paddingRight: 40 }}>
-			<View style={{ paddingBottom: 90 }}>
-				<NavBar
-					onActionLeft={() => goToBack()}
-					btnStyle={{ paddingLeft: 0 }}
-					paddingTop={0}
-					style={{ paddingBottom: 0, flexDirection: 'column', alignItems: 'flex-start' }}
-					title={t('QUESTION_WHEN_ORDER', 'When do you want your order?')}
-					titleAlign={'center'}
-					titleStyle={{ fontSize: 14, marginRight: 0, marginLeft: 0 }}
-					titleWrapStyle={{ paddingHorizontal: 0 }}
-				/>
+			<Container style={{ paddingLeft: 40, paddingRight: 40 }}>
+				<View style={{ paddingBottom: 90 }}>
+					<NavBar
+						onActionLeft={() => goToBack()}
+						btnStyle={{ paddingLeft: 0 }}
+						paddingTop={0}
+						style={{ paddingBottom: 0, flexDirection: 'column', alignItems: 'flex-start' }}
+						title={t('QUESTION_WHEN_ORDER', 'When do you want your order?')}
+						titleAlign={'center'}
+						titleStyle={{ fontSize: 14, marginRight: 0, marginLeft: 0 }}
+						titleWrapStyle={{ paddingHorizontal: 0 }}
+					/>
 
-				<WrapSelectOption
-					onPress={() => _handleAsap()}
-					disabled={orderState.loading} style={{ alignItems: 'flex-start' }}>
-					{optionSelected.isAsap ? (
-						<OIcon
-							src={theme.images.general.option_checked}
-							width={16}
-							style={{ marginEnd: 24 }}
-						/>
-					) : (
-						<OIcon
-							src={theme.images.general.option_normal}
-							width={16}
-							style={{ marginEnd: 24 }}
-						/>
-					)}
-					<OText color={optionSelected.isAsap ? theme.colors.textNormal : theme.colors.disabled}>{t('ASAP_ABBREVIATION', 'ASAP') + ` (${moment().format('dddd, MMM d, yyyy h:mm A')} + delivery time)`}</OText>
-				</WrapSelectOption>
-				<WrapSelectOption
-					onPress={() => setOptionSelected({ isAsap: false, isSchedule: true })}
-					disabled={orderState.loading}>
-					{optionSelected.isSchedule ? (
-						<OIcon
-							src={theme.images.general.option_checked}
-							width={16}
-							style={{ marginEnd: 24 }}
-						/>
-					) : (
-						<OIcon
-							src={theme.images.general.option_normal}
-							width={16}
-							style={{ marginEnd: 24 }}
-						/>
-					)}
-					<OText color={optionSelected.isSchedule ? theme.colors.textNormal : theme.colors.disabled}>{t('SCHEDULE_FOR_LATER', 'Schedule for later')}</OText>
-				</WrapSelectOption>
+					<WrapSelectOption
+						onPress={() => _handleAsap()}
+						disabled={orderState.loading} style={{ alignItems: 'flex-start' }}>
+						{optionSelected.isAsap ? (
+							<OIcon
+								src={theme.images.general.option_checked}
+								width={16}
+								style={{ marginEnd: 24 }}
+							/>
+						) : (
+							<OIcon
+								src={theme.images.general.option_normal}
+								width={16}
+								style={{ marginEnd: 24 }}
+							/>
+						)}
+						<OText color={optionSelected.isAsap ? theme.colors.textNormal : theme.colors.disabled}>{t('ASAP_ABBREVIATION', 'ASAP') + ` (${moment().format('dddd, MMM d, yyyy h:mm A')} + delivery time)`}</OText>
+					</WrapSelectOption>
+					<WrapSelectOption
+						onPress={() => setOptionSelected({ isAsap: false, isSchedule: true })}
+						disabled={orderState.loading}>
+						{optionSelected.isSchedule ? (
+							<OIcon
+								src={theme.images.general.option_checked}
+								width={16}
+								style={{ marginEnd: 24 }}
+							/>
+						) : (
+							<OIcon
+								src={theme.images.general.option_normal}
+								width={16}
+								style={{ marginEnd: 24 }}
+							/>
+						)}
+						<OText color={optionSelected.isSchedule ? theme.colors.textNormal : theme.colors.disabled}>{t('SCHEDULE_FOR_LATER', 'Schedule for later')}</OText>
+					</WrapSelectOption>
 
-				{optionSelected.isSchedule && (
-					<WrapDelveryTime>
-						{datesList.length > 0 && (
-							<View style={styles.dateWrap}>
-								<View style={styles.dateLabel}>
-									<OText size={12} color={theme.colors.textNormal}>{dateSelected}</OText>
-								</View>
-								<SelectDropdown
-									defaultButtonText={timeSelected ? timeSelected : t('DELIVERY_TIME', 'Delivery Time')}
-									defaultValue={74}
-									data={hoursList}
-									disabled={orderState.loading}
-									onSelect={(selectedItem, index) => {
-										setSelectedTime(selectedItem.startTime)
-									}}
-									buttonTextAfterSelection={(selectedItem, index) => {
-										return `${selectedItem.startTime} - ${selectedItem.endTime}`
-									}}
-									rowTextForSelection={(item, index) => {
-										return `${item.startTime} - ${item.endTime}`
-									}}
-									buttonStyle={{
-										backgroundColor: theme.colors.white,
-										borderColor: theme.colors.border,
-										borderWidth: 1,
-										borderRadius: 8,
-										height: 40,
-										width: '100%',
-										flexDirection: 'column',
-										alignItems: 'flex-start',
-										marginBottom: 20
-									}}
-									buttonTextStyle={{
-										color: theme.colors.textNormal,
-										fontSize: 12,
-										paddingTop: 10
-									}}
-									dropdownStyle={{
-										borderRadius: 8,
-										borderColor: theme.colors.lightGray,
-									}}
-									rowStyle={{
-										borderBottomColor: theme.colors.white,
-										backgroundColor: theme.colors.white,
-										height: 40,
-										flexDirection: 'column',
-										alignItems: 'flex-start',
-										paddingTop: 8,
-										paddingLeft: 22
-									}}
-									rowTextStyle={{
-										color: theme.colors.textNormal,
-										fontSize: 14,
-									}}
-								/>							
-								<CalendarPicker
-									nextTitle=">"
-									width={width - 80}
-									previousTitle="<"
-									nextComponent={
-										<OIcon
-											src={theme.images.general.chevron_right}
-											color={theme.colors.disabled}
-											width={12}
-											style={{ marginHorizontal: 4 }}
-										/>
-									}
-									previousComponent={
-										<OIcon
-											src={theme.images.general.chevron_left}
-											color={theme.colors.disabled}
-											width={12}
-											style={{ marginHorizontal: 4 }}
-										/>
-									}
-									onDateChange={(date: moment.Moment) =>
-										handleChangeDate(date.format('YYYY-MM-DD'))
-									}
-									selectedDayColor={theme.colors.primaryContrast}
-									todayBackgroundColor={theme.colors.border}
-									dayLabelsWrapper={{ borderColor: theme.colors.clear }}
-									customDayHeaderStyles={customDayHeaderStylesCallback}
-									weekdays={weekDays}
-									selectedStartDate={momento}
-									minDate={minDate}
-                					maxDate={maxDate}
-								/>
+					{optionSelected.isSchedule && (
+						<OrderTimeWrapper>
+							<View style={{ flex: 1 }}>
+								{selectDate && datesWhitelist[0]?.start !== null && (
+									<CalendarStrip
+										scrollable
+										style={styles.calendar}
+										calendarHeaderContainerStyle={styles.calendarHeaderContainer}
+										calendarHeaderStyle={styles.calendarHeader}
+										dateNumberStyle={styles.dateNumber}
+										dateNameStyle={styles.dateName}
+										iconContainer={{ flex: 0.1 }}
+										highlightDateNameStyle={styles.highlightDateName}
+										highlightDateNumberStyle={styles.highlightDateNumber}
+										dayContainerStyle={{ height: '100%' }}
+										highlightDateContainerStyle={{ height: '100%' }}
+										calendarHeaderFormat='MMMM, YYYY'
+										iconStyle={{ borderWidth: 1 }}
+										selectedDate={selectDate}
+										datesWhitelist={datesWhitelist}
+										disabledDateNameStyle={styles.disabledDateName}
+										disabledDateNumberStyle={styles.disabledDateNumber}
+										disabledDateOpacity={0.6}
+										onDateSelected={(date) => onSelectDate(date)}
+										leftSelector={<LeftSelector />}
+										rightSelector={<RightSelector />}
+									/>
+								)}
 							</View>
-						)}
-					</WrapDelveryTime>
-				)}
-			</View>
-			<Spinner visible={momentState.isLoading === 1} />
-		</Container>
-		<View style={{position: 'absolute', bottom: bottom, paddingBottom: 20, paddingHorizontal: 40, backgroundColor: 'white', width: '100%'}}>
-			<OButton onClick={handleChangeMoment} isDisabled={!selectedTime} text={t('CONTINUE', 'Continue')} style={{borderRadius: 7.6, height: 44, shadowOpacity: 0}} textStyle={{color: 'white', fontSize: 14}} showNextIcon />
-		</View>
+							<TimeListWrapper nestedScrollEnabled={true}>
+								<TimeContentWrapper>
+									{hoursList.map((time: any, i: number) => (
+										<TouchableOpacity key={i} onPress={() => setSelectedTime(time.startTime)}>
+											<TimeItem active={selectedTime === time.startTime}>
+												<OText
+													size={14}
+													color={selectedTime === time.startTime ? theme.colors.primary : theme.colors.textNormal}
+													style={{
+														lineHeight: 24
+													}}
+												>{time.startTime}</OText>
+											</TimeItem>
+										</TouchableOpacity>
+									))}
+									{hoursList.length % 3 === 2 && (
+										<TimeItem style={{ backgroundColor: 'transparent' }} />
+									)}
+								</TimeContentWrapper>
+							</TimeListWrapper>
+						</OrderTimeWrapper>
+					)}
+				</View>
+			</Container>
 		</>
 	);
 };

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

@@ -6,61 +6,37 @@ export const Container = styled.ScrollView`
   padding: 0 20px;
   padding-bottom: 20px;
 `
-export const HeaderTitle = styled.View`
-  flex-direction: column;
-  margin-bottom: 20px;
-`
+
 export const WrapSelectOption = styled.TouchableOpacity`
   flex-direction: row;
   align-items: center;
   margin-vertical: 5px;
 `
-export const Days = styled.View`
-  flex-wrap: wrap;
-  flex-direction: row;
-  margin-vertical: 10px;
+export const OrderTimeWrapper = styled.View`
+  margin-top: 34px;
 `
-export const Day = styled.TouchableOpacity`
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  border-right-width: 1px;
-  width: 25%;
-  margin-vertical: 10px;
-  border-color: ${(props: any) => props.theme.colors.textSecondary};
 
-  ${(props: any) => props.borderLeftShow && css`
-    border-left-width: 1px;
-  `}
-`
-export const WrapHours = styled.ScrollView`
-  border-width: 1px;
-  border-color: ${(props: any) => props.theme.colors.border};
-  border-radius: 7.6px;
-  margin-top: 6px;
-  height: 140px;
-  max-height: 140px;
+export const TimeListWrapper = styled.ScrollView`
+  margin-top: 30px;
+  max-height: 160px;
 `
-export const Hours = styled.View`
+
+export const TimeContentWrapper = styled.View`
   flex: 1;
   flex-wrap: wrap;
   flex-direction: row;
   justify-content: space-between;
-  margin: 0 20px;
 `
-export const Hour = styled.TouchableOpacity`
-  flex-direction: row;
+
+export const TimeItem = styled.View`
+  width: 86px;
+  height: 34px;
+  background: #E9ECEF;
+  border-radius: 7.6px;
   justify-content: center;
   align-items: center;
-  padding: 5px;
-  border-width: 1px;
-  border-radius: 7.6px;
-  border-color: ${(props: any) => props.theme.colors.border};
-  width: 90px;
-  margin-vertical: 7px;
-`
-
-export const WrapDelveryTime = styled.View`
-  flex: 1;
+  margin: 10px 0px;
+  ${({ active }: any) => active && css`
+    background: #F5F9FF;
+  `}
 `

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

@@ -155,7 +155,7 @@ export const ProductOptionsUI = (props: any) => {
 	const { product, loading, error } = productObject;
 	const [gallery, setGallery] = useState([])
 	const [thumbsSwiper, setThumbsSwiper] = useState(0)
-
+	const [indexGallery, setIndexGallery] = useState(0)
 	const [selOpt, setSelectedOpt] = useState(0);
 	const [isHaveWeight, setIsHaveWeight] = useState(false)
 	const [qtyBy, setQtyBy] = useState({
@@ -208,7 +208,10 @@ export const ProductOptionsUI = (props: any) => {
 	}
 
 	const handleClickThumb = (index: number) => {
-		swiperRef?.current.scrollBy(index - thumbsSwiper, true);
+		if (index !== indexGallery) {
+			swiperRef?.current.scrollBy(index - thumbsSwiper, true);
+			setIndexGallery(index)
+		}
 	}
 
 	const handleRedirectLogin = () => {
@@ -455,7 +458,7 @@ export const ProductOptionsUI = (props: any) => {
 														textDecorationLine: 'line-through',
 														marginLeft: 7,
 														marginRight: 7
-													}}>{parsePrice(product?.offer_price)}</OText>
+													}}>{product?.offer_price ? parsePrice(product?.offer_price) : ''}</OText>
 												)}
 											</View>
 										)}

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

@@ -51,7 +51,6 @@ export const ProductOptionSubOptionUI = (props: any) => {
 
 	const disableIncrement = option?.limit_suboptions_by_max ? balance === option?.max : state.quantity === suboption?.max || (!state.selected && balance === option?.max)
 	const price = option?.with_half_option && suboption?.half_price && state.position !== 'whole' ? suboption?.half_price : suboption?.price
-
 	return (
 		<Container>
 			<IconControl disabled={disabled} onPress={() => handleSuboptionClick()}>
@@ -73,54 +72,57 @@ export const ProductOptionSubOptionUI = (props: any) => {
 				</OText>
 			</IconControl>
 			{showMessage && <OText size={10} mLeft={4} mRight={4} style={{ flex: 1, textAlign: 'center' }} color={theme.colors.primary}>{`${t('OPTIONS_MAX_LIMIT', 'Maximum options to choose')}: ${option?.max}`}</OText>}
-			{option?.allow_suboption_quantity && state?.selected && (
-				<QuantityControl>
-					<Checkbox disabled={disabled || state.quantity === 0} onPress={decrement}>
-						<OIcon
-							src={theme.images.general.minus}
-							width={16}
-							color={state.quantity === 0 || disabled ? theme.colors.disabled : theme.colors.primary}
-						/>
-					</Checkbox>
-					<OText mLeft={5} mRight={5}>
-						{state.quantity}
-					</OText>
-					<Checkbox disabled={disabled || disableIncrement} onPress={increment}>
-						<OIcon
-							src={theme.images.general.plus}
-							width={16}
-							color={disableIncrement || disabled ? theme.colors.disabled : theme.colors.primary}
-						/>
-					</Checkbox>
-				</QuantityControl>
-			)}
-			{option?.with_half_option && state?.selected && (
-				<PositionControl>
-					<Circle disabled={disabled} onPress={() => changePosition('left')}>
-						<OIcon
-							src={theme.images.general.half_l}
-							color={state.selected && state.position === 'left' ? theme.colors.primary : '#cbcbcb'}
-							width={16}
-							style={styles.inverse}
-						/>
-					</Circle>
-					<Circle disabled={disabled} onPress={() => changePosition('whole')}>
-						<OIcon
-							src={theme.images.general.half_f}
-							color={state.selected && state.position === 'whole' ? theme.colors.primary : '#cbcbcb'}
-							width={16}
-						/>
-					</Circle>
-					<Circle disabled={disabled} onPress={() => changePosition('right')}>
-						<OIcon
-							src={theme.images.general.half_r}
-							color={state.selected && state.position === 'right' ? theme.colors.primary : '#cbcbcb'}
-							width={16}
-						/>
-					</Circle>
-				</PositionControl>
-			)
-			}
+			<QuantityControl>
+				{option?.allow_suboption_quantity && state?.selected && (
+					<>
+						<Checkbox disabled={disabled || state.quantity === 0} onPress={decrement}>
+							<OIcon
+								src={theme.images.general.minus}
+								width={16}
+								color={state.quantity === 0 || disabled ? theme.colors.disabled : theme.colors.primary}
+							/>
+						</Checkbox>
+						<OText size={12} mLeft={5} mRight={5}>
+							{state.quantity}
+						</OText>
+						<Checkbox disabled={disabled || disableIncrement} onPress={increment}>
+							<OIcon
+								src={theme.images.general.plus}
+								width={16}
+								color={disableIncrement || disabled ? theme.colors.disabled : theme.colors.primary}
+							/>
+						</Checkbox>
+					</>
+				)}
+			</QuantityControl>
+			<PositionControl>
+				{option?.with_half_option && state?.selected && (
+					<>
+						<Circle disabled={disabled} onPress={() => changePosition('left')}>
+							<OIcon
+								src={theme.images.general.half_l}
+								color={state.selected && state.position === 'left' ? theme.colors.primary : '#cbcbcb'}
+								width={16}
+								style={styles.inverse}
+							/>
+						</Circle>
+						<Circle disabled={disabled} onPress={() => changePosition('whole')}>
+							<OIcon
+								src={theme.images.general.half_f}
+								color={state.selected && state.position === 'whole' ? theme.colors.primary : '#cbcbcb'}
+								width={16}
+							/>
+						</Circle>
+						<Circle disabled={disabled} onPress={() => changePosition('right')}>
+							<OIcon
+								src={theme.images.general.half_r}
+								color={state.selected && state.position === 'right' ? theme.colors.primary : '#cbcbcb'}
+								width={16}
+							/>
+						</Circle>
+					</>
+				)}
+			</PositionControl>
 			<OText size={12} lineHeight={18} color={theme.colors.textSecondary}>
 				+ {parsePrice(price)}
 			</OText>

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

@@ -5,28 +5,35 @@ export const Container = styled.View`
   align-items: center;
   justify-content: space-between;
   padding: 10px;
+  width: 100%;
 `
 
 export const IconControl = styled.TouchableOpacity`
   flex-direction: row;
-  flex: 1;
+  width: 45%;
   align-items: center;
 `
 
 export const QuantityControl = styled.View`
   flex-direction: row;
   align-items: center;
+  justify-content: flex-start;
   margin-horizontal: 5px;
+  flex: 1;
+  width: 60px;
+
 `
 
 export const PositionControl = styled.View`
   flex-direction: row;
   align-items: center;
   margin-right: 5px;
+  flex: 1;
 `
 
 export const Checkbox = styled.TouchableOpacity`
 `
 
 export const Circle = styled.TouchableOpacity`
+  margin: 0 1px;
 `

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

@@ -121,9 +121,9 @@ export const SingleProductCard = (props: SingleProductCardParams) => {
 					{product?.name}
 				</OText>
 				<PricesContainer>
-					<OText color={theme.colors.primary}>{parsePrice(product?.price)}</OText>
+					<OText color={theme.colors.primary}>{product?.price ? parsePrice(product?.price) : ''}</OText>
 					{product?.offer_price !== null && product?.in_offer && (
-						<OText style={styles.regularPriceStyle}>{parsePrice(product?.offer_price)}</OText>
+						<OText style={styles.regularPriceStyle}>{product?.offer_price ? parsePrice(product?.offer_price) : ''}</OText>
 					)}
 				</PricesContainer>
 				<OText

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

@@ -37,19 +37,33 @@ const StripeElementsFormUI = (props: any) => {
 	const { top, bottom } = useSafeAreaInsets();
 	const [isKeyboardShow, setIsKeyboardShow] = useState(false);
 
-	const billingDetails = {
-		name: `${user.name} ${user.lastname}`,
-		email: user.email,
-		addressLine1: user.address
-	};
+  let billingDetails: any = {}
+
+  if (user?.name || user?.lastname) {
+    if (user?.name) {
+      billingDetails.name = user?.name
+    }
+    if (user?.lastname) {
+      billingDetails.name = `${billingDetails?.name} ${user?.lastname}`
+    }
+  }
+
+  if (user?.email) {
+    billingDetails.email = user?.email
+  }
+
+  if (user?.address) {
+    billingDetails.addressLine1 = user?.address
+  }
 
 	const createPayMethod = async () => {
+    const params: any = { type: 'Card' }
+    if (Object.keys(billingDetails).length > 0) {
+      params.billingDetails = billingDetails
+    }
 		try {
 			setCreatePmLoading(true)
-			const { paymentMethod } = await createPaymentMethod({
-				type: 'Card',
-				billingDetails,
-			});
+			const { paymentMethod } = await createPaymentMethod(params);
 
 			setCreatePmLoading(false)
 			handleSource && handleSource({
@@ -79,11 +93,12 @@ const StripeElementsFormUI = (props: any) => {
 			createPayMethod();
 			return
 		}
+    const params: any = { type: 'Card' }
+    if (Object.keys(billingDetails).length > 0) {
+      params.billingDetails = billingDetails
+    }
 		try {
-			const { setupIntent, error } = await confirmSetupIntent(requirements, {
-				type: 'Card',
-				billingDetails,
-			});
+			const { setupIntent, error } = await confirmSetupIntent(requirements, params);
 
 			if (setupIntent?.status === 'Succeeded') {
 				stripeTokenHandler(setupIntent?.paymentMethodId, user, businessId);

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

@@ -36,7 +36,7 @@ export const TaxInformation = (props: taxInformationParams) => {
         ? (product.tax?.id ? product.tax?.id === data?.id : product.tax?.id === null && data?.id === null)
         : type === 'fee'
           ? (product.fee?.id ? product.fee?.id === data?.id : (product.fee?.id === null && data?.id === null))
-          : Object.keys(data?.discounts ?? {}).map(code => code.includes(product?.code))
+          : Object.keys(data?.discounts ?? {}).map(code => code.includes(product?.code)) && product?.offers?.find((offer : any) => offer?.name === data?.name)
     )
   }
 

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', 'Your are far from this address')}</OText>
+						<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'You are far from this address')}</OText>
 					</FarAwayMessage>
 				)}
         <View style={styles.wrapperOrderOptions}>