ordering-ui-react-native 0.18.53 → 0.18.55

package/package.json

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

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

@@ -170,6 +170,10 @@ const LoginFormUI = (props: LoginParams) => {
 				vibrateApp()
 				return
 			}
+			if(!values?.cellphone && otpType === 'cellphone'){
+				showToast(ToastType.Error, t('PHONE_NUMBER_REQUIRED', 'Phone number is required'));
+				return
+			}
 			if (loginTab === 'otp') {
 				generateOtpCode({
 					...values,
@@ -253,6 +257,7 @@ const LoginFormUI = (props: LoginParams) => {
 	}
 
 	const handleLoginOtp = (code: string) => {
+		if (!code) return
 		handleButtonLoginClick({ code })
 		setWillVerifyOtpState(false)
 	}

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

@@ -152,7 +152,7 @@ const OrderProgressUI = (props: any) => {
             </OrderInfoWrapper>
             <View style={{ flex: 1 }}>
               <ProgressContentWrapper>
-                <ProgressBar style={{ width: getOrderStatus(lastOrder.status)?.percentage ? `${getOrderStatus(lastOrder.status)?.percentage}%` : '0%' }} />
+                <ProgressBar style={{ width: getOrderStatus(lastOrder.status)?.percentage ? `${(getOrderStatus(lastOrder.status) as any).percentage * 100}%` : '0%' }} />
               </ProgressContentWrapper>
               <ProgressTextWrapper>
                 <OText size={12} style={{ width: '50%' }}>{getOrderStatus(lastOrder.status)?.value}</OText>

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

@@ -112,7 +112,7 @@ export const PhoneInputNumber = (props: PhoneInputParams) => {
 				defaultCode={defaultCode ?
 					!isNaN(defaultCode)
 						? transformCountryCode(defaultCode)
-						: defaultCode
+						: findExitingCode(defaultCode)
 					: findExitingCode(configs?.default_country_code?.value?.toUpperCase())}
 				onChangeFormattedText={(text: string) => handleChangeNumber(text)}
 				withDarkTheme

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

@@ -74,13 +74,22 @@ const ReviewProductsUI = (props: ReviewProductParams) => {
           titleWrapStyle={{ paddingHorizontal: 0 }}
           titleStyle={{ marginRight: 0, marginLeft: 0 }}
         />
-        {order?.products?.map((product: any) => !product?.deleted && (
-          <SingleProductReview
-            key={product.id}
-            product={product}
-            formState={formState}
-            handleChangeFormState={handleChangeFormState}
-          />
+        {order?.products && order.products.length > 0 && order?.products.map(productsOrder => (
+          productsOrder?.length ? productsOrder?.map((product: any, i: any) => !product?.deleted ?
+            <SingleProductReview
+              key={i}
+              product={product}
+              formState={formState}
+              handleChangeFormState={handleChangeFormState}
+            /> : null
+          ) : (!productsOrder?.deleted ? (
+            <SingleProductReview
+              product={productsOrder}
+              formState={formState}
+              handleChangeFormState={handleChangeFormState}
+            />
+          ) : null
+          )
         ))}
       </ReviewProductsContainer>
 

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

@@ -273,7 +273,7 @@ export const transformCountryCode = (countryCode: number) => {
 }
 
 export const findExitingCode = (countryCode: string) => {
-  const code = CODES.find((code: any) => code.countryCode === countryCode)
+  const code = CODES.find((code: any) => code.countryCode === (countryCode || '').toUpperCase())
   return code?.countryCode
 }
 
@@ -495,7 +495,7 @@ export const getOrderStatus = (s: string) => {
         'Order picked up completed by customer',
       ),
       slug: 'ORDER_PICKEDUP_COMPLETED_BY_CUSTOMER',
-      percentage: 100,
+      percentage: 1,
       image: theme.images.order.status1,
     },
     {
@@ -542,7 +542,7 @@ export const getOrderStatus = (s: string) => {
         'Customer almost arrived to business',
       ),
       slug: 'ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS',
-      percentage: 90,
+      percentage: 0.9,
       image: theme.images.order.status7,
     },
     {
@@ -552,21 +552,21 @@ export const getOrderStatus = (s: string) => {
         'Customer arrived to business',
       ),
       slug: 'ORDER_CUSTOMER_ARRIVED_BUSINESS',
-      percentage: 95,
+      percentage: 0.95,
       image: theme.images.order.status7,
     },
     {
       key: 22,
       value: t('ORDER_LOOKING_FOR_DRIVER', 'Looking for driver'),
       slug: 'ORDER_LOOKING_FOR_DRIVER',
-      percentage: 35,
+      percentage: 0.35,
       image: theme.images.order.status8
     },
     {
       key: 23,
       value: t('ORDER_DRIVER_ON_WAY', 'Driver on way'),
       slug: 'ORDER_DRIVER_ON_WAY',
-      percentage: 45,
+      percentage: 0.45,
       image: theme.images.order.status8
     }
   ];