ordering-ui-react-native 0.15.13 → 0.15.16

package/package.json

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

package/themes/business/src/components/OrdersOption/index.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useState, useRef } from 'react';
 import { View, Pressable, StyleSheet, ScrollView, RefreshControl, Linking, Platform, TextInput } from 'react-native';
-import { useLanguage, useUtils, useToast, ToastType, OrderListGroups } from 'ordering-components/native';
+import { useLanguage, useUtils, useToast, ToastType, OrderListGroups, useConfig } from 'ordering-components/native';
 import SelectDropdown from 'react-native-select-dropdown'
 import { Placeholder, PlaceholderLine, Fade } from 'rn-placeholder';
 import FeatherIcon from 'react-native-vector-icons/Feather';
@@ -400,20 +400,6 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
     setOpenSLASettingModal(false)
   }
 
-  const [settingTimeErrorMessage, setSettingTimeErrorMessage] = useState('')
-
-  const handlSLASettingTime = () => {
-    if (!hour || !minute) {
-      setSettingTimeErrorMessage(t('SLA_SETTING_ERROR', 'Time value is invalid'))
-      return
-    }
-    const _settingTimeSecond = hour * 3600 + minute * 60
-    setSlaSettingTime(_settingTimeSecond)
-    handleClose()
-    showToast(ToastType.Success, t('SLA_SETTING_UPDATED', 'SLAs setting updated'))
-  }
-
-
   useEffect(() => {
     setCurrentFilters(null)
     onFiltered && onFiltered(null)
@@ -859,24 +845,10 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
                       key={i}
                       item={item}
                       last={i + 1 === selectedTabStatus.length}
-                      setHour={setHour}
-                      setMinute={setMinute}
-                      setSettingTimeErrorMessage={setSettingTimeErrorMessage}
                     />
                   ))}
                   <VerticalLine />
                 </DeliveryStatusWrapper>
-                {settingTimeErrorMessage !== '' && (
-                  <OText style={styles.errorMessage}>{settingTimeErrorMessage}</OText>
-                )}
-                <Actions>
-                  <OButton
-                    text={t('ACCEPT', 'Accept')}
-                    textStyle={{ color: 'white', fontSize: 14 }}
-                    onClick={handlSLASettingTime}
-                    style={styles.acceptButtonStyle}
-                  />
-                </Actions>
               </SlaSettingModalContent>
             )}
           </ModalContainer>
@@ -887,7 +859,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 };
 
 export const StatusBlock = (props: any) => {
-  const { item, last, setHour, setMinute, setSettingTimeErrorMessage } = props
+  const { item, last } = props
   const [showTime, setShowTime] = useState(false)
 
   useEffect(() => {
@@ -898,7 +870,7 @@ export const StatusBlock = (props: any) => {
 
   return (
     <StatusItems>
-      <Pressable onPress={() => setShowTime(!showTime)} style={{ marginBottom: 5 }}>
+      <Pressable style={{ marginBottom: 10 }}>
         <ItemHeader>
           <IconWrapper>
             <OIcon
@@ -916,11 +888,7 @@ export const StatusBlock = (props: any) => {
         <OText>{item?.des}</OText>
       </ItemContent>
       {showTime && (
-        <Timer
-          setHour={setHour}
-          setMinute={setMinute}
-          setSettingTimeErrorMessage={setSettingTimeErrorMessage}
-        />
+        <Timer />
       )}
       {last && (
         <OverLine />
@@ -929,47 +897,28 @@ export const StatusBlock = (props: any) => {
   )
 }
 
-export const Timer = (props: any) => {
-  const { setHour, setMinute, setSettingTimeErrorMessage } = props
+export const Timer = () => {
   const [, t] = useLanguage()
   const theme = useTheme()
+  const [{ configs }] = useConfig();
 
   const styles = StyleSheet.create({
-    inputStyle: {
-      paddingHorizontal: 7,
-      paddingVertical: 2,
-      borderRadius: 0,
+    settingTime: {
       fontSize: 14,
+      borderWidth: 1,
+      borderRadius: 7.6,
+      margin: 0,
+      marginRight: 10,
+      paddingHorizontal: 10,
+      paddingTop: 5,
+      borderColor: theme.colors.disabled
     }
   })
 
-  const handleChangeInput = (val: any, type: string) => {
-    setSettingTimeErrorMessage('')
-    if (type === 'hour') {
-      setHour(val)
-    }
-    if (type === 'minute') {
-      setMinute(val)
-    }
-  }
-
   return (
     <TimerInputWrapper>
-      <TextInput
-        placeholder='HH'
-        keyboardType='number-pad'
-        maxLength={2}
-        style={{ ...styles.inputStyle, width: 36 }}
-        onChangeText={hour => handleChangeInput(hour, 'hour')}
-      />
-      <OText color={theme.colors.disabled}>:</OText>
-      <TextInput
-        placeholder='MM'
-        keyboardType='number-pad'
-        maxLength={2}
-        style={{ ...styles.inputStyle, width: 40 }}
-        onChangeText={minute => handleChangeInput(minute, 'minute')}
-      />
+      <OText style={styles.settingTime} color={theme.colors.disabled}>{configs?.order_deadlines_delayed_time?.value}</OText>
+      <OText>{t('MIN', 'min')}</OText>
     </TimerInputWrapper>
   )
 }

package/themes/business/src/components/OrdersOption/styles.tsx

@@ -130,15 +130,12 @@ export const ItemContent = styled.View`
 `
 
 export const TimerInputWrapper = styled.View`
-  border-width: 1px;
-  border-radius: 7.6px;
   color: ${(props: any) => props.theme.colors.disabled};
-  border-color: ${(props: any) => props.theme.colors.disabled};
+  margin-top: 15px;
   margin-left: 30px;
   margin-right: 30px;
   flex-direction: row;
-  align-items: center;
-  width: 80px;
+  align-items: flex-end;
 `
 export const OverLine = styled.View`
   position: absolute;

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

@@ -93,7 +93,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
       >
         <Category
           style={cardStyle}
-          source={{uri: item.images}}
+          source={item.images ? {uri: item.images} : theme.images.categories.all}
           resizeMode="cover"
           w={widthScreen}
           borderRadius={16}
@@ -172,7 +172,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
           <OCard
             key={category.id}
             title={category?.name || ''}
-            image={{uri: category?.image}}
+            image={category.images ? {uri: category.images} : theme.images.categories.all}
             style={{
               width:
                 orientationState?.orientation === LANDSCAPE

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

@@ -65,18 +65,6 @@ const ForgotPasswordUI = (props: any) => {
 		}
 	}, [formState])
 
-	useEffect(() => {
-		if (Object.keys(errors).length > 0) {
-			// Convert all errors in one string to show in toast provider
-			const list = Object.values(errors)
-			let stringError = ''
-			list.map((item: any, i: number) => {
-				stringError += (i + 1) === list.length ? `- ${item.message}` : `- ${item.message}\n`
-			})
-			showToast(ToastType.Error, stringError)
-		}
-	}, [errors])
-
 	return (
 		<Container>
 			<NavBar
@@ -100,6 +88,14 @@ const ForgotPasswordUI = (props: any) => {
 					{t('FORGOT_PASSWORD_TEXT_MESSAGE', "Enter your email address and we'll sent a link to reset your password.")}
 				</OText>
 				<FormInput>
+					{errors?.email && (
+						<OText
+							size={14}
+							color={theme.colors.danger5}
+							weight={'normal'}>
+							{errors?.email?.message}{errors?.email?.type === 'required' && '*'}
+						</OText>
+					)}
 					<Controller
 						control={control}
 						render={({ onChange, value }: any) => (

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

@@ -67,7 +67,7 @@ const LoginFormUI = (props: LoginParams) => {
 	const [, t] = useLanguage();
 	const [{ configs }] = useConfig();
 	const [, { login }] = useSession();
-	const { control, handleSubmit, errors } = useForm();
+	const { control, handleSubmit, errors, reset, register, setValue } = useForm();
 	const [passwordSee, setPasswordSee] = useState(false);
 	const [isLoadingVerifyModal, setIsLoadingVerifyModal] = useState(false);
 	const [isModalVisible, setIsModalVisible] = useState(false);
@@ -91,7 +91,7 @@ const LoginFormUI = (props: LoginParams) => {
 		inputStyle: {
 			marginBottom: 28,
 			borderWidth: 1,
-			borderColor: theme.colors.border,
+			// borderColor: theme.colors.border,
 			borderRadius: 7.6,
 		},
 		line: {
@@ -189,33 +189,21 @@ const LoginFormUI = (props: LoginParams) => {
 	}, [verifyPhoneState]);
 
 	useEffect(() => {
-		if (Object.keys(errors).length > 0) {
-			// Convert all errors in one string to show in toast provider
-			const list = Object.values(errors);
-			let stringError = '';
-			if (phoneInputData.error) {
-				list.unshift({ message: phoneInputData.error });
-			}
-			if (
-				loginTab === 'cellphone' &&
-				!phoneInputData.error &&
-				!phoneInputData.phone.country_phone_code &&
-				!phoneInputData.phone.cellphone
-			) {
-				list.unshift({
-					message: t(
-						'VALIDATION_ERROR_MOBILE_PHONE_REQUIRED',
-						'The field Mobile phone is required.',
-					),
-				});
-			}
-			list.map((item: any, i: number) => {
-				stringError +=
-					i + 1 === list.length ? `- ${item.message}` : `- ${item.message}\n`;
-			});
-			showToast(ToastType.Error, stringError);
-		}
-	}, [errors]);
+		if (phoneInputData?.phone?.cellphone) setValue('cellphone', phoneInputData?.phone?.cellphone, '')
+		else setValue('cellphone', '')
+	}, [phoneInputData?.phone?.cellphone])
+
+	useEffect(() => {
+    register('cellphone', {
+      required: loginTab === 'cellphone'
+        ? t('VALIDATION_ERROR_MOBILE_PHONE_REQUIRED', 'The field Mobile phone is required').replace('_attribute_', t('CELLPHONE', 'Cellphone'))
+        : null
+    })
+  }, [register])
+
+	useEffect(() => {
+    reset()
+  }, [loginTab])
 
 	return (
 		<Container>
@@ -284,43 +272,58 @@ const LoginFormUI = (props: LoginParams) => {
 				{(useLoginByCellphone || useLoginByEmail) && (
 					<FormInput>
 						{useLoginByEmail && loginTab === 'email' && (
-							<Controller
-								control={control}
-								render={({ onChange, value }: any) => (
-									<OInput
-										placeholder={t('EMAIL', 'Email')}
-										style={loginStyle.inputStyle}
-										icon={theme.images.general.email}
-										onChange={(e: any) => {
-											handleChangeInputEmail(e, onChange);
-										}}
-										value={value}
-										autoCapitalize="none"
-										autoCorrect={false}
-										type="email-address"
-										autoCompleteType="email"
-										returnKeyType="next"
-										onSubmitEditing={() => passwordRef.current?.focus()}
-										blurOnSubmit={false}
-										forwardRef={emailRef}
-									/>
+							<>
+								{errors?.email && (
+									<OText
+										size={14}
+										color={theme.colors.danger5}
+										weight={'normal'}>
+										{errors?.email?.message}{errors?.email?.type === 'required' && '*'}
+									</OText>
 								)}
-								name="email"
-								rules={{
-									required: t(
-										'VALIDATION_ERROR_EMAIL_REQUIRED',
-										'The field Email is required',
-									).replace('_attribute_', t('EMAIL', 'Email')),
-									pattern: {
-										value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
-										message: t(
-											'INVALID_ERROR_EMAIL',
-											'Invalid email address',
-										).replace('_attribute_', t('EMAIL', 'Email')),
-									},
-								}}
-								defaultValue=""
-							/>
+								<Controller
+									control={control}
+									render={({ onChange, value }: any) => (
+										<OInput
+											placeholder={t('EMAIL', 'Email')}
+											style={loginStyle.inputStyle}
+											icon={theme.images.general.email}
+											onChange={(e: any) => {
+												handleChangeInputEmail(e, onChange);
+											}}
+											value={value}
+											autoCapitalize="none"
+											autoCorrect={false}
+											type="email-address"
+											autoCompleteType="email"
+											returnKeyType="next"
+											onSubmitEditing={() => passwordRef.current?.focus()}
+											blurOnSubmit={false}
+											forwardRef={emailRef}
+											borderColor={errors?.email ? theme.colors.danger5 : theme.colors.border}
+										/>
+									)}
+									name="email"
+									rules={{
+										required: {
+											value: true,
+											message: 	t(
+											'VALIDATION_ERROR_EMAIL_REQUIRED',
+											'The field Email is required',
+										).replace('_attribute_', t('EMAIL', 'Email'))
+										},
+										pattern: {
+											value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
+											message: t(
+												'INVALID_ERROR_EMAIL',
+												'Invalid email address',
+											).replace('_attribute_', t('EMAIL', 'Email')),
+										}
+									}}
+									defaultValue=""
+								/>
+							</>
+
 						)}
 						{useLoginByCellphone && loginTab === 'cellphone' && (
 							<View style={{ marginBottom: 28 }}>
@@ -331,10 +334,18 @@ const LoginFormUI = (props: LoginParams) => {
 										returnKeyType: 'next',
 										onSubmitEditing: () => passwordRef?.current?.focus?.(),
 									}}
+									isStartValidation={errors?.cellphone}
 								/>
 							</View>
 						)}
-
+						{errors?.password && (
+							<OText
+								size={14}
+								color={theme.colors.danger5}
+								weight={'normal'}>
+								{errors?.password?.message}{errors?.password?.type === 'required' && '*'}
+							</OText>
+						)}
 						<Controller
 							control={control}
 							render={({ onChange, value }: any) => (
@@ -366,14 +377,18 @@ const LoginFormUI = (props: LoginParams) => {
 									returnKeyType="done"
 									onSubmitEditing={handleSubmit(onSubmit)}
 									blurOnSubmit
+									borderColor={errors?.password ? theme.colors.danger5 : theme.colors.border}
 								/>
 							)}
 							name="password"
 							rules={{
-								required: t(
+								required: {
+									value: true,
+									message: t(
 									'VALIDATION_ERROR_PASSWORD_REQUIRED',
 									'The field Password is required',
-								).replace('_attribute_', t('PASSWORD', 'Password')),
+								).replace('_attribute_', t('PASSWORD', 'Password'))
+								}
 							}}
 							defaultValue=""
 						/>

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

@@ -97,7 +97,7 @@ const MessagesUI = (props: MessagesParams) => {
 	}
 
 	const handleImagePicker = () => {
-		launchImageLibrary({ mediaType: 'photo', maxHeight: 300, maxWidth: 300, includeBase64: true }, (response: any) => {
+		launchImageLibrary({ mediaType: 'photo', maxHeight: 2048, maxWidth: 2048, includeBase64: true }, (response: any) => {
 			if (response.didCancel) {
 				console.log('User cancelled image picker');
 			} else if (response.errorMessage) {

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

@@ -594,18 +594,20 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                     {order?.business?.name}
                   </OText>
                   <Icons>
-                    <TouchableOpacity
-                      onPress={() => order?.business?.cellphone &&
-                        Linking.openURL(`tel:${order?.business?.cellphone}`)
-                      }
-                      style={{ paddingEnd: 5 }}
-                    >
-                      <OIcon
-                        src={theme.images.general.phone}
-                        width={16}
-                        color={theme.colors.disabled}
-                      />
-                    </TouchableOpacity>
+                    {!!order?.business?.cellphone && (
+                      <TouchableOpacity
+                        onPress={() => order?.business?.cellphone &&
+                          Linking.openURL(`tel:${order?.business?.cellphone}`)
+                        }
+                        style={{ paddingEnd: 5 }}
+                      >
+                        <OIcon
+                          src={theme.images.general.phone}
+                          width={16}
+                          color={theme.colors.disabled}
+                        />
+                      </TouchableOpacity>
+                    )}
                     <TouchableOpacity
                       style={{ paddingStart: 5 }}
                       onPress={() => handleOpenMessagesForBusiness()}>
@@ -624,13 +626,15 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                   mBottom={2}>
                   {order?.business?.email}
                 </OText>
-                <OText
-                  size={12}
-                  lineHeight={18}
-                  color={theme.colors.textNormal}
-                  mBottom={2}>
-                  {order?.business?.cellphone}
-                </OText>
+                {!!order?.business?.cellphone && (
+                  <OText
+                    size={12}
+                    lineHeight={18}
+                    color={theme.colors.textNormal}
+                    mBottom={2}>
+                    {order?.business?.cellphone}
+                  </OText>
+                )}
                 <OText size={12} lineHeight={18} color={theme.colors.textNormal}>
                   {order?.business?.address}
                 </OText>
@@ -978,7 +982,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                       marginTop: 10
                     }}
                   >
-                    {order?.payment_events?.map((event: any) => (
+                    {order?.payment_events?.map((event: any) => event.amount > 0 && (
                       <View
                         key={event.id}
                         style={{

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

@@ -22,18 +22,23 @@ export const PhoneInputNumber = (props: PhoneInputParams) => {
 		textStyle,
 		flagStyle,
 		noDropIcon,
-    isDisabled
+    isDisabled,
+		isStartValidation
 	} = props
 
 	const theme = useTheme();
 
+	const [, t] = useLanguage()
+	const [{ configs }] = useConfig()
+	const phoneInput = useRef<PhoneInput>(null);
+	const [userphoneNumber, setUserphoneNumber] = useState('');
 
 	const style = StyleSheet.create({
 		input: {
 			backgroundColor: theme.colors.white,
 			borderRadius: 7.6,
 			borderWidth: 1,
-			borderColor: theme.colors.border,
+			borderColor: (isStartValidation && userphoneNumber === '') ? theme.colors.danger5 : theme.colors.border,
 			paddingBottom: 0,
 			paddingTop: 0,
 			flexGrow: 1,
@@ -48,12 +53,6 @@ export const PhoneInputNumber = (props: PhoneInputParams) => {
 		}
 	})
 
-
-	const [, t] = useLanguage()
-	const [{ configs }] = useConfig()
-	const phoneInput = useRef<PhoneInput>(null);
-	const [userphoneNumber, setUserphoneNumber] = useState('');
-
 	const handleChangeNumber = (number: any) => {
 		setUserphoneNumber(number)
 	}
@@ -97,6 +96,14 @@ export const PhoneInputNumber = (props: PhoneInputParams) => {
 
 	return (
 		<Wrapper onPress={() => forwardRef?.current?.focus?.()}>
+			{(isStartValidation && userphoneNumber === '') && (
+				<OText
+					size={14}
+					color={theme.colors.danger5}
+				>
+					{t('VALIDATION_ERROR_MOBILE_PHONE_REQUIRED', 'The field Mobile phone is required').replace('_attribute_', t('CELLPHONE', 'Cellphone'))}*
+				</OText>
+			)}
 			<PhoneInput
 				ref={phoneInput}
         disabled={isDisabled}

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

@@ -872,9 +872,13 @@ export const ProductOptionsUI = (props: any) => {
 			</ScrollView>
 			{!loading && !error && product && (
 				<ProductActions ios={Platform?.OS === 'ios'}>
-					<OText size={16} lineHeight={24} weight={'600'}>
-						{productCart.total ? parsePrice(productCart?.total) : ''}
-					</OText>
+					<View>
+						<OText size={16} lineHeight={24} weight={'600'}>
+							{productCart.total ? parsePrice(productCart?.total) : ''}
+						</OText>
+						{product?.minimum_per_order && productCart?.quantity < product?.minimum_per_order && <OText size={12} color={theme.colors?.red}>{t('MOBILE_MINIMUM_TO_ORDER', 'Min. _number_ ').replace('_number_', product?.minimum_per_order)}</OText>}
+						{product?.maximum_per_order && productCart?.quantity > product?.maximum_per_order && <OText size={12} color={theme.colors?.red}>{t('MOBILE_MAXIMUM_TO_ORDER', 'Max. _number_'.replace('_number_', product?.maximum_per_order))}</OText>}
+					</View>
 					{productCart && !isSoldOut && maxProductQuantity > 0 && (
 						<View style={styles.quantityControl}>
 							<TouchableOpacity
@@ -883,6 +887,7 @@ export const ProductOptionsUI = (props: any) => {
 								<OIcon
 									src={theme.images.general.minus}
 									width={16}
+									style={{ borderWidth: 1, borderColor: 'red' }}
 									color={
 										productCart.quantity === 1 || isSoldOut
 											? theme.colors.backgroundGray
@@ -926,6 +931,7 @@ export const ProductOptionsUI = (props: any) => {
 								<OIcon
 									src={theme.images.general.plus}
 									width={16}
+									style={{ borderWidth: 1, borderColor: 'red' }}
 									color={
 										maxProductQuantity <= 0 ||
 											productCart.quantity >= maxProductQuantity ||
@@ -987,14 +993,14 @@ export const ProductOptionsUI = (props: any) => {
 												? t('UPDATE', 'Update')
 												: t('ADD', 'Add')
 										}`}
-									isDisabled={isSoldOut || maxProductQuantity <= 0}
+									isDisabled={isSoldOut || maxProductQuantity <= 0 || productCart?.quantity < product?.minimum_per_order || productCart?.quantity > product?.maximum_per_order}
 									textStyle={{
 										color: saveErrors || isSoldOut || maxProductQuantity <= 0 ? theme.colors.primary : theme.colors.white,
 										fontSize: orderState.loading || editMode ? 10 : 14
 									}}
 									style={{
-										backgroundColor: saveErrors || isSoldOut || maxProductQuantity <= 0 ? theme.colors.lightGray : theme.colors.primary,
-										borderColor: saveErrors || isSoldOut || maxProductQuantity <= 0 ? theme.colors.white : theme.colors.primary,
+										backgroundColor: saveErrors || isSoldOut || maxProductQuantity <= 0 || productCart?.quantity < product?.minimum_per_order || productCart?.quantity > product?.maximum_per_order ? theme.colors.lightGray : theme.colors.primary,
+										borderColor: saveErrors || isSoldOut || maxProductQuantity <= 0 || productCart?.quantity < product?.minimum_per_order || productCart?.quantity > product?.maximum_per_order ? theme.colors.white : theme.colors.primary,
 										opacity: saveErrors || isSoldOut || maxProductQuantity <= 0 ? 0.3 : 1,
 										borderRadius: 7.6,
 										height: 44,

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

@@ -68,7 +68,6 @@ const SignupFormUI = (props: SignupParams) => {
 
 	const theme = useTheme();
 
-
 	const style = StyleSheet.create({
 		btnOutline: {
 			backgroundColor: '#FFF',
@@ -77,7 +76,6 @@ const SignupFormUI = (props: SignupParams) => {
 		inputStyle: {
 			marginBottom: 20,
 			borderWidth: 1,
-			borderColor: theme.colors.border,
 			borderRadius: 7.6,
 		},
 		wrappText: {
@@ -102,7 +100,7 @@ const SignupFormUI = (props: SignupParams) => {
 	const [, t] = useLanguage();
 	const [, { login }] = useSession();
 	const [{ configs }] = useConfig();
-	const { control, handleSubmit, errors } = useForm();
+	const { control, handleSubmit, errors, register, setValue } = useForm();
 
 	const [passwordSee, setPasswordSee] = useState(false);
 	const [formValues, setFormValues] = useState(null);
@@ -227,7 +225,7 @@ const SignupFormUI = (props: SignupParams) => {
 			handleButtonSignupClick &&
 				handleButtonSignupClick({
 					...values,
-					...phoneInputData.phone,
+					...((phoneInputData.phone.cellphone !== null && phoneInputData.phone.country_phone_code !== null) && {...phoneInputData.phone}),
 				});
 			if (
 				!formState.loading &&
@@ -298,36 +296,23 @@ const SignupFormUI = (props: SignupParams) => {
 
 	useEffect(() => {
 		if (Object.keys(errors).length > 0) {
-			// Convert all errors in one string to show in toast provider
-			const list = Object.values(errors);
-			if (phoneInputData.error) {
-				list.push({ message: phoneInputData.error });
-			}
-			if (
-				!phoneInputData.error &&
-				!phoneInputData.phone.country_phone_code &&
-				!phoneInputData.phone.cellphone &&
-				((validationFields?.fields?.checkout?.cellphone?.enabled &&
-          validationFields?.fields?.checkout?.cellphone?.required) ||
-          configs?.verification_phone_required?.value === '1')
-			) {
-				list.push({
-					message: t(
-						'VALIDATION_ERROR_MOBILE_PHONE_REQUIRED',
-						'The field Mobile phone is required.',
-					),
-				});
-			}
-			let stringError = '';
-			list.map((item: any, i: number) => {
-				stringError +=
-					i + 1 === list.length ? `- ${item.message}` : `- ${item.message}\n`;
-			});
-			showToast(ToastType.Error, stringError);
 			setIsLoadingVerifyModal(false);
 		}
 	}, [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])
+
+	useEffect(() => {
+		if (phoneInputData?.phone?.cellphone) setValue('cellphone', phoneInputData?.phone?.cellphone, '')
+		else setValue('cellphone', '')
+	}, [phoneInputData?.phone?.cellphone])
+
 	useEffect(() => {
 		if (verifyPhoneState && !verifyPhoneState?.loading) {
 			if (verifyPhoneState.result?.error) {
@@ -412,48 +397,58 @@ const SignupFormUI = (props: SignupParams) => {
 									!notValidationFields.includes(field.code) &&
 									showField &&
 									showField(field.code) && (
-										<Controller
-											key={field.id}
-											control={control}
-											render={({ onChange, value }: any) => (
-												<OInput
-													placeholder={t(field.name)}
-													style={style.inputStyle}
-													icon={
-														field.code === 'email'
-															? theme.images.general.email
-															: theme.images.general.user
-													}
-													value={value}
-													onChange={(val: any) =>
-														field.code !== 'email'
-															? onChange(val)
-															: handleChangeInputEmail(val, onChange)
-													}
-													autoCapitalize={
-														field.code === 'email' ? 'none' : 'sentences'
-													}
-													autoCorrect={field.code === 'email' && false}
-													type={
-														field.code === 'email' ? 'email-address' : 'default'
-													}
-													autoCompleteType={
-														field.code === 'email' ? 'email' : 'off'
-													}
-													returnKeyType="next"
-													blurOnSubmit={false}
-													forwardRef={(ref: any) => handleRefs(ref, field.code)}
-													onSubmitEditing={() =>
-														field.code === 'email'
-															? phoneRef?.current?.focus?.()
-															: handleFocusRef(getNextFieldCode(i))
-													}
-												/>
+										<React.Fragment key={field.id}>
+											{errors?.[`${field.code}`] && (
+												<OText
+													size={14}
+													color={theme.colors.danger5}
+													weight={'normal'}>
+													{errors?.[`${field.code}`]?.message} {errors?.[`${field.code}`]?.type === 'required' && '*'}
+												</OText>
 											)}
-											name={field.code}
-											rules={getInputRules(field)}
-											defaultValue=""
-										/>
+											<Controller
+												control={control}
+												render={({ onChange, value }: any) => (
+													<OInput
+														placeholder={t(field.name)}
+														style={style.inputStyle}
+														icon={
+															field.code === 'email'
+																? theme.images.general.email
+																: theme.images.general.user
+														}
+														value={value}
+														onChange={(val: any) =>
+															field.code !== 'email'
+																? onChange(val)
+																: handleChangeInputEmail(val, onChange)
+														}
+														autoCapitalize={
+															field.code === 'email' ? 'none' : 'sentences'
+														}
+														autoCorrect={field.code === 'email' && false}
+														type={
+															field.code === 'email' ? 'email-address' : 'default'
+														}
+														autoCompleteType={
+															field.code === 'email' ? 'email' : 'off'
+														}
+														returnKeyType="next"
+														blurOnSubmit={false}
+														forwardRef={(ref: any) => handleRefs(ref, field.code)}
+														onSubmitEditing={() =>
+															field.code === 'email'
+																? phoneRef?.current?.focus?.()
+																: handleFocusRef(getNextFieldCode(i))
+														}
+														borderColor={errors?.[`${field.code}`] ? theme.colors.danger5 : theme.colors.border}
+													/>
+												)}
+												name={field.code}
+												rules={getInputRules(field)}
+												defaultValue=""
+											/>
+										</React.Fragment>
 									),
 							)}
 
@@ -467,6 +462,7 @@ const SignupFormUI = (props: SignupParams) => {
 											returnKeyType: 'next',
 											onSubmitEditing: () => passwordRef?.current?.focus?.(),
 										}}
+										isStartValidation={errors?.cellphone}
 									/>
 								</View>
 							)}
@@ -499,99 +495,122 @@ const SignupFormUI = (props: SignupParams) => {
 							</View>
 
 							{configs?.terms_and_conditions?.value === 'true' && (
-								<View style={{ flexDirection: 'row', alignItems: 'center', marginBottom: 20 }}>
+								<>
+									{errors?.termsAccept && (
+										<OText
+											size={14}
+											color={theme.colors.danger5}
+											weight={'normal'}>
+											{errors?.termsAccept?.message}*
+										</OText>
+									)}
+									<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 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' && (
+								<>
+									{errors?.password && (
+										<OText
+											size={14}
+											color={theme.colors.danger5}
+											weight={'normal'}>
+											{errors?.password?.message} {errors?.password?.type === 'required' && '*'}
+										</OText>
+									)}
 									<Controller
 										control={control}
 										render={({ onChange, value }: any) => (
-											<CheckBox
+											<OInput
+												isSecured={!passwordSee ? true : false}
+												placeholder={t('PASSWORD', 'Password')}
+												style={style.inputStyle}
+												icon={theme.images.general.lock}
+												iconCustomRight={
+													!passwordSee ? (
+														<MaterialCommunityIcons
+															name="eye-outline"
+															color={theme.colors.disabled}
+															size={24}
+															onPress={() => setPasswordSee(!passwordSee)}
+														/>
+													) : (
+														<MaterialCommunityIcons
+															name="eye-off-outline"
+															color={theme.colors.disabled}
+															size={24}
+															onPress={() => setPasswordSee(!passwordSee)}
+														/>
+													)
+												}
 												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}
+												onChange={(val: any) => onChange(val)}
+												returnKeyType="done"
+												onSubmitEditing={handleSubmit(onSubmit)}
+												blurOnSubmit
+												forwardRef={passwordRef}
+												borderColor={errors?.password ? theme.colors.danger5 : theme.colors.border}
 											/>
 										)}
-										name='termsAccept'
+										name="password"
 										rules={{
-											required: t('VALIDATION_ERROR_ACCEPTED', 'The _attribute_ must be accepted.').replace('_attribute_', t('TERMS_AND_CONDITIONS', 'Terms & Conditions'))
+											required: isRequiredField('password')
+												? t(
+													'VALIDATION_ERROR_PASSWORD_REQUIRED',
+													'The field Password is required',
+												).replace('_attribute_', t('PASSWORD', 'password'))
+												: null,
+											minLength: {
+												value: 8,
+												message: t(
+													'VALIDATION_ERROR_PASSWORD_MIN_STRING',
+													'The Password must be at least 8 characters.',
+												)
+													.replace('_attribute_', t('PASSWORD', 'Password'))
+													.replace('_min_', 8),
+											},
 										}}
-										defaultValue={false}
-									/>
-									<OText style={{ fontSize: 14, paddingHorizontal: 5 }}>{t('TERMS_AND_CONDITIONS_TEXT', 'I 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)}
+										defaultValue=""
 									/>
-								</View>
-							)}
+								</>
 
-							{signupTab !== 'cellphone' && (
-								<Controller
-									control={control}
-									render={({ onChange, value }: any) => (
-										<OInput
-											isSecured={!passwordSee ? true : false}
-											placeholder={t('PASSWORD', 'Password')}
-											style={style.inputStyle}
-											icon={theme.images.general.lock}
-											iconCustomRight={
-												!passwordSee ? (
-													<MaterialCommunityIcons
-														name="eye-outline"
-														color={theme.colors.disabled}
-														size={24}
-														onPress={() => setPasswordSee(!passwordSee)}
-													/>
-												) : (
-													<MaterialCommunityIcons
-														name="eye-off-outline"
-														color={theme.colors.disabled}
-														size={24}
-														onPress={() => setPasswordSee(!passwordSee)}
-													/>
-												)
-											}
-											value={value}
-											onChange={(val: any) => onChange(val)}
-											returnKeyType="done"
-											onSubmitEditing={handleSubmit(onSubmit)}
-											blurOnSubmit
-											forwardRef={passwordRef}
-										/>
-									)}
-									name="password"
-									rules={{
-										required: isRequiredField('password')
-											? t(
-												'VALIDATION_ERROR_PASSWORD_REQUIRED',
-												'The field Password is required',
-											).replace('_attribute_', t('PASSWORD', 'password'))
-											: null,
-										minLength: {
-											value: 8,
-											message: t(
-												'VALIDATION_ERROR_PASSWORD_MIN_STRING',
-												'The Password must be at least 8 characters.',
-											)
-												.replace('_attribute_', t('PASSWORD', 'Password'))
-												.replace('_min_', 8),
-										},
-									}}
-									defaultValue=""
-								/>
 							)}
 						</>
 					) : (

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

@@ -115,6 +115,7 @@ export interface PhoneInputParams {
 	noDropIcon?: boolean;
 	flagStyle?: any;
 	isDisabled?: any;
+	isStartValidation?: any;
 }
 
 export interface LanguageSelectorParams {