ordering-ui-react-native 0.11.15 → 0.11.16

package/package.json

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

package/src/components/OrderDetails/index.tsx

@@ -469,12 +469,8 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
               {
                 (
                   parseInt(order?.status) === 1 ||
-                  parseInt(order?.status) === 2 ||
-                  parseInt(order?.status) === 5 ||
-                  parseInt(order?.status) === 6 ||
-                  parseInt(order?.status) === 10 ||
                   parseInt(order?.status) === 11 ||
-                  parseInt(order?.status) === 12
+                  parseInt(order?.status) === 15 
                 ) && !order.review && !isReviewed && (
                   <OButton
                     onClick={() => handleClickOrderReview(order)}

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

@@ -1,9 +1,9 @@
 import React, { createRef, useEffect, useRef, useState } from 'react';
-import { View, Pressable, StyleSheet, Keyboard, TextStyle } from 'react-native';
+import { View, Pressable, StyleSheet, Keyboard, TextStyle, Linking, TouchableOpacity, Platform } from 'react-native';
 import { useForm, Controller } from 'react-hook-form';
 import Spinner from 'react-native-loading-spinner-overlay';
 import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons'
-
+import CheckBox from '@react-native-community/checkbox';
 import { PhoneInputNumber } from '../PhoneInputNumber'
 import { FacebookLogin } from '../FacebookLogin'
 
@@ -99,7 +99,11 @@ const SignupFormUI = (props: SignupParams) => {
 			flexDirection: 'row',
 			justifyContent: 'space-between',
 			marginBottom: 30
-		}
+		},
+		checkBoxStyle: {
+      width: 25,
+      height: 25,
+    }
 	});
 	const showInputPhoneNumber = validationFields?.fields?.checkout?.cellphone?.enabled ?? false
 
@@ -259,6 +263,15 @@ const SignupFormUI = (props: SignupParams) => {
 		onChange(value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, ''))
 	}
 
+	const handleOpenTermsUrl = async (url: any) => {
+		const supported = await Linking.canOpenURL(url);	
+		if (supported) {
+			await Linking.openURL(url);
+		} else {
+			showToast(ToastType.Error, t('VALIDATION_ERROR_ACTIVE_URL', 'The _attribute_ is not a valid URL.').replace('_attribute_', t('URL', 'URL')))
+		}
+	}
+
 	useEffect(() => {
 		if (!formState.loading && formState.result?.error) {
 			formState.result?.result && showToast(
@@ -509,6 +522,42 @@ const SignupFormUI = (props: SignupParams) => {
 						<Spinner visible />
 					)}
 
+					{configs?.terms_and_conditions?.value === 'true' && (
+						<View style={{ flexDirection: 'row', alignItems: 'center', marginTop: 10 }}>
+							<Controller
+								control={control}
+								render={({ onChange, value }: any) => (
+                  <CheckBox
+                    value={value}
+                    onValueChange={newValue => {
+                      onChange(newValue)
+                    }}
+                    boxType={'square'}
+                    tintColors={{
+                      true: theme.colors.primary,
+                      false: theme.colors.disabled
+                    }}
+                    tintColor={theme.colors.disabled}
+                    onCheckColor={theme.colors.primary}
+                    onTintColor={theme.colors.primary}
+                    style={Platform.OS === 'ios' && registerStyles.checkBoxStyle}
+                  />
+								)}
+								name='termsAccept'
+								rules={{
+									required: t('VALIDATION_ERROR_ACCEPTED', 'The _attribute_ must be accepted.').replace('_attribute_', t('TERMS_AND_CONDITIONS', 'Terms & Conditions'))
+								}}
+								defaultValue={false}
+							/>
+							<OText style={{ ...theme.labels.middle, paddingHorizontal: 5 }}>{t('TERMS_AND_CONDITIONS_TEXT', 'I’m agree with')}</OText>
+							<TouchableOpacity
+								onPress={() => handleOpenTermsUrl(configs?.terms_and_conditions_url?.value)}
+							>
+								<OText style={{ ...theme.labels.middle }} color={theme.colors.primary}>{t('TERMS_AND_CONDITIONS', 'Terms & Conditions')}</OText>
+							</TouchableOpacity>
+						</View>
+					)}
+
 					{signupTab === 'cellphone' && useSignupByEmail && useSignupByCellphone ? (
 						<OButton
 							onClick={handleSubmit(onSubmit)}

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

@@ -1,5 +1,5 @@
 import React, { createRef, useEffect, useRef, useState } from 'react';
-import { View, Pressable, StyleSheet, Keyboard } from 'react-native';
+import { View, Pressable, StyleSheet, Keyboard, Linking, Platform } from 'react-native';
 import { useForm, Controller } from 'react-hook-form';
 import Spinner from 'react-native-loading-spinner-overlay';
 
@@ -31,6 +31,7 @@ import NavBar from '../NavBar'
 import { VerifyPhone } from '../VerifyPhone';
 
 import { OText, OButton, OInput, OModal } from '../shared';
+import CheckBox from '@react-native-community/checkbox';
 import { SignupParams } from '../../types';
 import { sortInputFields } from '../../utils';
 import { useTheme } from 'styled-components/native';
@@ -90,7 +91,11 @@ const SignupFormUI = (props: SignupParams) => {
 			paddingBottom: 20 + bottom,
 			borderTopWidth: 1,
 			borderTopColor: theme.colors.secundary
-		}
+		},
+		checkBoxStyle: {
+      width: 20,
+      height: 20,
+    }
 	});
 
 	const showInputPhoneNumber = validationFields?.fields?.checkout?.cellphone?.enabled ?? false
@@ -249,6 +254,16 @@ const SignupFormUI = (props: SignupParams) => {
 		onChange(value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, ''))
 	}
 
+	const handleOpenTermsUrl = async (url: any) => {
+		const supported = await Linking.canOpenURL(url);
+
+		if (supported) {
+		  	await Linking.openURL(url);
+		} else {
+		  	showToast(ToastType.Error, t('VALIDATION_ERROR_ACTIVE_URL', 'The _attribute_ is not a valid URL.').replace('_attribute_', t('URL', 'URL')))
+		}
+	}
+
 	useEffect(() => {
 		if (!formState.loading && formState.result?.error) {
 			formState.result?.result && showToast(
@@ -394,6 +409,46 @@ const SignupFormUI = (props: SignupParams) => {
 								</View>
 							)}
 
+							{configs?.terms_and_conditions?.value === 'true' && (
+								<View style={{ flexDirection: 'row', alignItems: 'center', marginBottom: 20 }}>
+									<Controller
+										control={control}
+										render={({ onChange, value }: any) => (
+											<CheckBox
+												value={value}
+												onValueChange={newValue => {
+													onChange(newValue)
+												}}
+												boxType={'square'}
+												tintColors={{
+													true: theme.colors.primary,
+													false: theme.colors.disabled
+												}}
+												tintColor={theme.colors.disabled}
+												onCheckColor={theme.colors.primary}
+												onTintColor={theme.colors.primary}
+												style={Platform.OS === 'ios' && style.checkBoxStyle}
+											/>
+										)}
+										name='termsAccept'
+										rules={{
+											required: t('VALIDATION_ERROR_ACCEPTED', 'The _attribute_ must be accepted.').replace('_attribute_', t('TERMS_AND_CONDITIONS', 'Terms & Conditions'))
+										}}
+										defaultValue={false}
+									/>
+									<OText style={{ ...theme.labels.normal, paddingHorizontal: 5 }}>{t('TERMS_AND_CONDITIONS_TEXT', 'I’m agree with')}</OText>
+									<OButton
+										imgRightSrc={null}
+										text={t('TERMS_AND_CONDITIONS', 'Terms & Conditions')}
+										bgColor='#FFF'
+										borderColor='#FFF'
+										style={{ paddingLeft: 0, paddingRight: 0, height: 30, shadowColor: '#FFF' }}
+										textStyle={{ color: theme.colors.primary, marginLeft: 0, marginRight: 0 }}
+										onClick={() => handleOpenTermsUrl(configs?.terms_and_conditions_url?.value)}
+									/>
+								</View>
+							)}
+
 							{signupTab !== 'cellphone' && (
 								<View style={{ minHeight: 42, marginBottom: 16 }}>
 									<Controller

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

@@ -16,7 +16,7 @@ import {
 	DivideView,
 	MediaWrapper,
 } from './styles';
-import { StyleSheet, View } from 'react-native';
+import { Platform, StyleSheet, View } from 'react-native';
 import { BusinessInformationParams } from '../../types';
 import { GoogleMap } from '../GoogleMap';
 import { WebView } from 'react-native-webview';
@@ -116,7 +116,7 @@ const BusinessInformationUI = (props: BusinessInformationParams) => {
 										lineHeight={21}
 										mBottom={16}
 										size={14}
-										weight={'600'}
+										weight={Platform.OS === 'android' ? 'bold' : '600'}
 										style={{ flexBasis: '20%' }}>
 										{daysOfWeek[i].toUpperCase()}
 									</OText>

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

@@ -25,6 +25,7 @@ import {
 import { FloatingButton } from '../FloatingButton'
 import { ProductForm } from '../ProductForm'
 import { UpsellingProducts } from '../UpsellingProducts'
+
 const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 	const {
 		navigation,
@@ -139,7 +140,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 										imgRightSrc={null}
 										style={styles.btnBackArrow}
 										onClick={() => navigation?.canGoBack() && navigation.goBack()}
-										imgLeftStyle={{ tintColor: theme.colors.textNormal }}
+										imgLeftStyle={{ tintColor: theme.colors.textNormal, width: 16 }}
 									/>
 									{/* <AddressInput
                       onPress={() => auth

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

@@ -31,6 +31,7 @@ const CartUI = (props: any) => {
 		removeProduct,
 		handleCartOpen,
 		setIsCartsLoading,
+		hideUpselling
 		// isFromCart
 	} = props
 
@@ -248,6 +249,7 @@ const CartUI = (props: any) => {
 					canOpenUpselling={canOpenUpselling}
 					setCanOpenUpselling={setCanOpenUpselling}
 					handleCloseUpsellingPage={() => { }}
+					isFromCart
 				/>
 			)}
 		</CContainer>

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

@@ -34,6 +34,7 @@ export const CartContent = (props: any) => {
 										onNavigationRedirect={props.onNavigationRedirect}
 										isCartsLoading={isCartsLoading}
 										setIsCartsLoading={setIsCartsLoading}
+										hideUpselling
 									/>
 									<View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginHorizontal: -40, marginTop: 20 }} />
 								</>

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

@@ -36,7 +36,7 @@ const DriverTipsUI = (props: any) => {
 
 	const style = StyleSheet.create({
 		circle: {
-			borderRadius: 20
+			borderRadius: 30
 		},
 		inputStyle: {
 			flex: 1,
@@ -74,7 +74,7 @@ const DriverTipsUI = (props: any) => {
 									style={style.circle}
 									isActive={option === optionSelected}
 								>
-									<OText size={18} color={option === optionSelected ? '#FFF' : '#000'}>
+									<OText size={13} color={option === optionSelected ? '#FFF' : theme.colors.textSecondary}>
 										{`${isFixedPrice ? parsePrice(option) : `${option}%`}`}
 									</OText>
 								</DTCard>

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

@@ -13,7 +13,7 @@ export const DTWrapperTips = styled.View`
   display: flex;
   flex-direction: row;
   width: 100%;
-  justify-content: space-evenly;
+  justify-content: space-between;
   align-items: center;
   flex-wrap: wrap;
 `
@@ -22,11 +22,12 @@ export const DTCard = styled.View`
   display: flex;
   justify-content: center;
   align-items: center;
-  padding: 10px;
-  border: 1px solid ${(props: any) => props.theme.colors.primary};
+  border: 1px solid ${(props: any) => props.isActive ? props.theme.colors.primary : props.theme.colors.border};
   text-transform: capitalize;
-  min-height: 60px;
-  min-width: 60px;
+  min-height: 48px;
+  min-width: 48px;
+  max-width: 48px;
+  max-height: 48px;
   margin-right: 10px;
   margin-top: 10px;
 

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

@@ -4,7 +4,7 @@ import { useTheme } from 'styled-components/native';
 import { Platform, StyleSheet, View } from 'react-native'
 
 import RNPickerSelect from 'react-native-picker-select'
-import { Container } from './styles'
+import { Container, DummyContainer } from './styles'
 import { LanguageSelectorParams } from '../../types'
 import { OIcon } from '../shared'
 
@@ -63,7 +63,7 @@ const LanguageSelectorUI = (props: LanguageSelectorParams) => {
 
 	return (
 		<Container>
-			{languagesState?.languages && (
+			{languagesState?.languages ? (
 				<>
 					{iconColor && <OIcon src={theme.images.general.language} color={iconColor} style={{ marginEnd: 14 }} width={16} />}
 					<RNPickerSelect
@@ -77,7 +77,7 @@ const LanguageSelectorUI = (props: LanguageSelectorParams) => {
 						disabled={orderState.loading}
 					/>
 				</>
-			)}
+			) : <DummyContainer />}
 		</Container>
 	)
 }

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

@@ -5,3 +5,6 @@ export const Container = styled.View`
   justify-content: flex-start;
   flex-direction: row;
 `
+export const DummyContainer = styled.View`
+  height: 40px;
+`

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

@@ -337,7 +337,7 @@ const LoginFormUI = (props: LoginParams) => {
 								<OInput
 									isSecured={!passwordSee ? true : false}
 									placeholder={t('PASSWORD', 'Password')}
-									style={loginStyle.inputStyle}
+									style={{...loginStyle.inputStyle, marginBottom: 14}}
 									icon={theme.images.general.lock}
 									iconCustomRight={
 										!passwordSee ? (
@@ -373,6 +373,13 @@ const LoginFormUI = (props: LoginParams) => {
 							}}
 							defaultValue=""
 						/>
+						{onNavigationRedirect && forgotButtonText && (
+							<TouchableOpacity onPress={() => onNavigationRedirect('Forgot')}>
+								<OText size={14} mBottom={18}>
+									{forgotButtonText}
+								</OText>
+							</TouchableOpacity>
+						)}
 						<OButton
 							onClick={handleSubmit(onSubmit)}
 							text={loginButtonText}
@@ -386,13 +393,6 @@ const LoginFormUI = (props: LoginParams) => {
 					</FormInput>
 				)}
 
-				{onNavigationRedirect && forgotButtonText && (
-					<TouchableOpacity onPress={() => onNavigationRedirect('Forgot')}>
-						<OText size={16} mBottom={18}>
-							{forgotButtonText}
-						</OText>
-					</TouchableOpacity>
-				)}
 
 				{useLoginByCellphone &&
 					loginTab === 'cellphone' &&

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

@@ -36,9 +36,6 @@ const MessagesUI = (props: MessagesParams) => {
 
 	const [formattedMessages, setFormattedMessages] = useState<Array<any>>([])
 	const [isKeyboardShow, setIsKeyboardShow] = useState(false)
-	const previousStatus = [1, 2, 5, 6, 10, 11, 12, 16, 17]
-  const chatDisabled = previousStatus.includes(order?.status)
-
 	const { height } = useWindowDimensions();
 	const { top, bottom } = useSafeAreaInsets();
 
@@ -239,52 +236,36 @@ const MessagesUI = (props: MessagesParams) => {
 	)
 
 	const renderComposer = (props: typeof ComposerProps) => (
-		chatDisabled ? (
-      <View
-        style={{
-          width: '100%',
-          flexDirection: 'column',
-          alignItems: 'center'
-        }}
-      >
-        <MaterialCommunityIcon
-          name='close-octagon-outline'
-          size={24}
-        />
-        <OText size={14}>{t('NOT_SEND_MESSAGES', 'You can\'t send messages because the order has ended')}</OText>
-      </View>
-    ) : (
-			<View style={{
-				flexDirection: 'row', width: '80%', alignItems: 'center', backgroundColor: theme.colors.backgroundGray100,
-				borderRadius: 7.6,
-			}}>
-				<Composer
-					{...props}
-					textInputStyle={{
-						height: 32,
-						minHeight: 32,
-						alignItems: 'center',
-						justifyContent: 'center',
-						paddingHorizontal: 12,
-						borderColor: '#DBDCDB',
-						color: '#010300',
-					}}
-					textInputProps={{
-						value: message,
-						onSubmitEditing: onSubmit,
-						returnKeyType: message ? 'send' : 'done',
-						blurOnSubmit: true,
-						multiline: false,
-						numberOfLines: 1,
-						autoCorrect: false,
-						autoCompleteType: 'off',
-						enablesReturnKeyAutomatically: false
-					}}
-					placeholder={t('WRITE_MESSAGE', 'Write message...')}
-				/>
-				<RenderActions {...props} />
-			</View>
-		)
+		<View style={{
+			flexDirection: 'row', width: '80%', alignItems: 'center', backgroundColor: theme.colors.backgroundGray100,
+			borderRadius: 7.6,
+		}}>
+			<Composer
+				{...props}
+				textInputStyle={{
+					height: 32,
+					minHeight: 32,
+					alignItems: 'center',
+					justifyContent: 'center',
+					paddingHorizontal: 12,
+					borderColor: '#DBDCDB',
+					color: '#010300',
+				}}
+				textInputProps={{
+					value: message,
+					onSubmitEditing: onSubmit,
+					returnKeyType: message ? 'send' : 'done',
+					blurOnSubmit: true,
+					multiline: false,
+					numberOfLines: 1,
+					autoCorrect: false,
+					autoCompleteType: 'off',
+					enablesReturnKeyAutomatically: false
+				}}
+				placeholder={t('WRITE_MESSAGE', 'Write message...')}
+			/>
+			<RenderActions {...props} />
+		</View>
 	)
 
 	const renderSend = (props: any) => (

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

@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react'
+import React, { useEffect, useState } from 'react'
 import {
 	OrderTypeControl,
 	useLanguage,
@@ -26,6 +26,7 @@ const OrderTypeSelectorUI = (props: OrderTypeSelectParams) => {
 	const [orderState] = useOrder();
 	const [, t] = useLanguage();
 	const _orderTypes = orderTypes.filter((type: any) => configTypes?.includes(type.value));
+	const [isChanging, setChanging] = useState(false);
 	
 	const items = _orderTypes.map((type) => {
 		return {
@@ -40,9 +41,14 @@ const OrderTypeSelectorUI = (props: OrderTypeSelectParams) => {
 	const handleChangeOrderTypeCallback = (orderType: number) => {
 		if (!orderState.loading) {
 			handleChangeOrderType(orderType)
+			setChanging(true);
 		}
 	}
 
+	useEffect(() => {
+		if (isChanging)	goToBack();
+	}, [orderState?.options])
+
 	return (
 		<Wrapper>
 			<NavBar

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

@@ -81,7 +81,7 @@ export const SearchBar = (props: any) => {
 				icon={theme.images.general.search}
 				iconStyle={{ width: 12 }}
 				returnKeyType='done'
-				inputStyle={inputStyle}
+				inputStyle={{padding: 0, paddingTop: Platform.OS == 'android' ? 2 : 0, ...inputStyle}}
 			/>
 			{isCancelButtonShow && (
 				<OButton

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

@@ -1,9 +1,9 @@
 import React, { useEffect, useRef, useState } from 'react';
-import { View, Pressable, StyleSheet } from 'react-native';
+import { View, Pressable, StyleSheet, Linking, Platform } from 'react-native';
 import { useForm, Controller } from 'react-hook-form';
 import Spinner from 'react-native-loading-spinner-overlay';
 import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
-
+import CheckBox from '@react-native-community/checkbox';
 import { PhoneInputNumber } from '../PhoneInputNumber';
 import { FacebookLogin } from '../FacebookLogin';
 
@@ -90,6 +90,10 @@ const SignupFormUI = (props: SignupParams) => {
 			flexGrow: 1,
 			marginBottom: 7,
 		},
+		checkBoxStyle: {
+      width: 25,
+      height: 25,
+    }
 	});
 
 	const showInputPhoneNumber =
@@ -272,6 +276,16 @@ const SignupFormUI = (props: SignupParams) => {
 		onChange(value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, ''));
 	};
 
+	const handleOpenTermsUrl = async (url: any) => {
+		const supported = await Linking.canOpenURL(url);
+
+		if (supported) {
+		  	await Linking.openURL(url);
+		} else {
+		  	showToast(ToastType.Error, t('VALIDATION_ERROR_ACTIVE_URL', 'The _attribute_ is not a valid URL.').replace('_attribute_', t('URL', 'URL')))
+		}
+	}
+
 	useEffect(() => {
 		if (!formState.loading && formState.result?.error) {
 			formState.result?.result &&
@@ -453,6 +467,46 @@ const SignupFormUI = (props: SignupParams) => {
 								</View>
 							)}
 
+							{configs?.terms_and_conditions?.value === 'true' && (
+								<View style={{ flexDirection: 'row', alignItems: 'center', marginBottom: 20 }}>
+									<Controller
+										control={control}
+										render={({ onChange, value }: any) => (
+											<CheckBox
+												value={value}
+												onValueChange={newValue => {
+													onChange(newValue)
+												}}
+												boxType={'square'}
+												tintColors={{
+													true: theme.colors.primary,
+													false: theme.colors.disabled
+												}}
+												tintColor={theme.colors.disabled}
+												onCheckColor={theme.colors.primary}
+												onTintColor={theme.colors.primary}
+												style={Platform.OS === 'ios' && style.checkBoxStyle}
+											/>
+										)}
+										name='termsAccept'
+										rules={{
+											required: t('VALIDATION_ERROR_ACCEPTED', 'The _attribute_ must be accepted.').replace('_attribute_', t('TERMS_AND_CONDITIONS', 'Terms & Conditions'))
+										}}
+										defaultValue={false}
+									/>
+									<OText style={{ fontSize: 14, paddingHorizontal: 5 }}>{t('TERMS_AND_CONDITIONS_TEXT', 'I’m agree with')}</OText>
+									<OButton
+										imgRightSrc={null}
+										text={t('TERMS_AND_CONDITIONS', 'Terms & Conditions')}
+										bgColor='#FFF'
+										borderColor='#FFF'
+										style={{ paddingLeft: 0, paddingRight: 0, height: 30, shadowColor: '#FFF' }}
+										textStyle={{ color: theme.colors.primary, marginLeft: 0, marginRight: 0 }}
+										onClick={() => handleOpenTermsUrl(configs?.terms_and_conditions_url?.value)}
+									/>
+								</View>
+							)}
+
 							{signupTab !== 'cellphone' && (
 								<Controller
 									control={control}
@@ -535,11 +589,25 @@ const SignupFormUI = (props: SignupParams) => {
 							textStyle={{ color: 'white' }}
 							imgRightSrc={null}
 							isDisabled={formState.loading || validationFields.loading}
-							style={{ borderRadius: 7.6, marginTop: 6 }}
+							style={{ borderRadius: 7.6, marginTop: 6,shadowOpacity: 0 }}
 						/>
 					)}
 				</FormInput>
 
+				{
+          onNavigationRedirect && loginButtonText && (
+            <View style={style.wrappText}>
+              <OText size={14} style={{ marginRight: 5 }}>
+                {t('MOBILE_FRONT_ALREADY_HAVE_AN_ACCOUNT', 'Already have an account?')}
+              </OText>
+              <Pressable onPress={() => onNavigationRedirect('Login')}>
+                <OText size={14} color={theme.colors.primary}>
+                  {loginButtonText}
+                </OText>
+              </Pressable>
+            </View>
+          )
+        }
 				<View
 					style={{
 						flexDirection: 'row',
@@ -579,20 +647,6 @@ const SignupFormUI = (props: SignupParams) => {
 					</SocialButtons>
 				</ButtonsWrapper>
 
-				{/* {
-          onNavigationRedirect && loginButtonText && (
-            <View style={style.wrappText}>
-              <OText size={18} style={{ marginRight: 5 }}>
-                {t('MOBILE_FRONT_ALREADY_HAVE_AN_ACCOUNT', 'Already have an account?')}
-              </OText>
-              <Pressable onPress={() => onNavigationRedirect('Login')}>
-                <OText size={18} color={theme.colors.primary}>
-                  {loginButtonText}
-                </OText>
-              </Pressable>
-            </View>
-          )
-        } */}
 
 				{/* {
           configs && Object.keys(configs).length > 0 && (

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

@@ -106,8 +106,7 @@ const StripeElementsFormUI = (props: any) => {
 				!!card?.last4 &&
 				!!card?.expiryMonth &&
 				!!card?.expiryYear &&
-				!!card?.brand &&
-				!!card?.postalCode
+				!!card?.brand
 			)
 		}
 	}, [card])
@@ -118,12 +117,13 @@ const StripeElementsFormUI = (props: any) => {
 				<View style={{ flex: 1 }}>
 					<StripeProvider publishableKey={publicKey}>
 						<CardField
-							postalCodeEnabled={true}
+							postalCodeEnabled={false}
 							cardStyle={{
 								backgroundColor: '#FFFFFF',
 								textColor: '#000000',
+								fontSize: 17,
 								styles: {
-
+									
 								}
 							}}
 							style={{
@@ -132,7 +132,7 @@ const StripeElementsFormUI = (props: any) => {
 								marginVertical: 50,
 								borderWidth: 1,
 								borderColor: theme.colors.border,
-								borderRadius: 7.6
+								borderRadius: 7.6,
 							}}
 							onCardChange={(cardDetails: any) => setCard(cardDetails)}
 						/>

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

@@ -1,7 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import Spinner from 'react-native-loading-spinner-overlay';
-import MaterialComIcon from 'react-native-vector-icons/MaterialCommunityIcons'
-import { Platform, SafeAreaView, StyleSheet, TouchableOpacity, View } from 'react-native'
+import { Platform, StyleSheet, View } from 'react-native'
 import {
 	UpsellingPage as UpsellingPageController,
 	useUtils,
@@ -23,7 +21,6 @@ import {
 import { ProductForm } from '../ProductForm';
 import { OrderSummary } from '../OrderSummary';
 import { ScrollView } from 'react-native-gesture-handler';
-import NavBar from '../NavBar';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
 const UpsellingProductsUI = (props: UpsellingProductsParams) => {
@@ -36,7 +33,8 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
 		handleCloseUpsellingPage,
 		openUpselling,
 		canOpenUpselling,
-		setCanOpenUpselling
+		setCanOpenUpselling,
+		isFromCart
 	} = props
 
 	const theme = useTheme();
@@ -76,7 +74,11 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
 	useEffect(() => {
 		if (!isCustomMode) {
 			if (!upsellingProducts.loading) {
-				setCanOpenUpselling && setCanOpenUpselling(true)
+				if (upsellingProducts?.products?.length && !isFromCart) {
+					setCanOpenUpselling && setCanOpenUpselling(true)
+				} else {
+					handleUpsellingPage && handleUpsellingPage()
+				}
 			}
 			// if ((!upsellingProducts?.products?.length && !upsellingProducts.loading && !canOpenUpselling && openUpselling) ||
 			// 	(!upsellingProducts?.products?.length && !upsellingProducts.loading && openUpselling)) {
@@ -85,6 +87,10 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
 		}
 	}, [upsellingProducts.loading, upsellingProducts?.products.length])
 
+	useEffect(() => {
+		if (!cart?.validate && cart?.products?.length == 0) handleCloseUpsellingPage()
+	}, [cart])
+
 	const handleFormProduct = (product: any) => {
 		setActualProduct(product)
 		setModalIsOpen(true)
@@ -149,6 +155,7 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
 									title={''}
 									open={openUpselling}
 									onClose={() => handleUpsellingPage()}
+									isStatusBar
 								>
 									<TopBar style={{ paddingTop: Platform.OS == 'ios' ? 10 : 30 }}>
 										<TopActions onPress={() => handleCloseUpsellingPage()}>

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

@@ -1,5 +1,5 @@
 import React from 'react'
-import { Modal, TouchableWithoutFeedback, Dimensions, StyleSheet, View, Text } from 'react-native'
+import { Modal, TouchableWithoutFeedback, Dimensions, StyleSheet, View, Text, Platform, StatusBar } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 const deviceHeight = Dimensions.get('window').height
 
@@ -8,13 +8,15 @@ interface Props {
 	title?: string;
 	children?: any;
 	onClose?: any;
+	isStatusBar?: boolean;
 }
 const OBottomPopup = (props: Props) => {
 	const {
 		open,
 		title,
 		onClose,
-		children
+		children,
+		isStatusBar
 	} = props
 	const { top, bottom } = useSafeAreaInsets();
 	return (
@@ -25,6 +27,7 @@ const OBottomPopup = (props: Props) => {
 			onRequestClose={() => onClose()}
 			presentationStyle={'fullScreen'}
 		>
+		  {isStatusBar && <StatusBar translucent={false} />}
 			<View style={styles.container}>
 				<TouchableWithoutFeedback
 					style={styles.touchableOutsideStyle}

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

@@ -127,7 +127,7 @@ const styles = StyleSheet.create({
 		backgroundColor: 'transparent',
 		width: 35,
 		height: 35,
-		marginStart: -4,
+		marginStart: -9,
 		marginTop: 12,
 		alignItems: 'center',
 		justifyContent: 'center',

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

@@ -387,6 +387,7 @@ export interface UpsellingProductsParams {
 	setCanOpenUpselling?: (value: any) => void;
 	cart?: any;
 	handleCloseUpsellingPage: () => void;
+	isFromCart?: boolean;
 }
 
 export interface GoogleMapsParams {