ordering-ui-react-native 0.18.54 → 0.18.55-test

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.18.54",
+  "version": "0.18.55-test",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",
@@ -49,7 +49,7 @@
     "@react-navigation/material-bottom-tabs": "^5.3.14",
     "@react-navigation/native": "^5.7.6",
     "@react-navigation/stack": "^5.9.3",
-    "@segment/analytics-react-native": "^2.1.11",
+    "@segment/analytics-react-native": "2.13.0",
     "@segment/sovran-react-native": "^0.2.6",
     "@sentry/react-native": "^2.6.0",
     "@stripe/stripe-react-native": "^0.2.0",

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

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