ordering-ui-react-native 0.23.79 → 0.23.81

package/package.json

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

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

@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useRef, useCallback } from 'react';
-import { Dimensions, SafeAreaView, StyleSheet, View } from 'react-native';
+import { Dimensions, Platform, SafeAreaView, StyleSheet, View } from 'react-native';
 import { useFocusEffect } from '@react-navigation/native'
 import MapView, {
   PROVIDER_GOOGLE,
@@ -265,8 +265,8 @@ const MapViewComponent = (props: MapViewParams) => {
               style={{ flex: 1 }}
               zoomTapEnabled
               zoomEnabled
-              zoomControlEnabled
-              cacheEnabled
+              zoomControlEnabled={!(isDeliveryApp && Platform.OS === 'android')}
+              cacheEnabled={(isDeliveryApp && Platform.OS === 'android' && isFocused) || Platform.OS === 'ios' || !isDeliveryApp}
               moveOnMarkerPress
               onTouchStart={() => (following.current = false)}
             >

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

@@ -43,7 +43,10 @@ export const UserFormDetailsUI = (props: any) => {
 		isOrderTypeValidationField,
 		checkoutFields,
 		isCheckoutPlace,
-		setCellphoneStartZero
+		setCellphoneStartZero,
+		setPhoneState,
+		isPhoneVerifyRequired,
+		cellphoneOtpSent
 	} = props;
 
 	const theme = useTheme();
@@ -321,6 +324,15 @@ export const UserFormDetailsUI = (props: any) => {
 		setIsValid(_isValid)
 	}, [formState?.changes, requiredFields])
 
+	useEffect(() => {
+		if (!isPhoneVerifyRequired || cellphoneOtpSent || formState?.changes?.length === 0) return
+		setPhoneState?.({
+      cellphone: formState?.changes?.country_code === "PR" ? formState?.changes?.cellphone.replace('787', '') : formState?.changes?.cellphone,
+      country_phone_code: formState?.changes?.country_code === "PR" ? '1787' : formState?.changes?.country_phone_code,
+      formatted: `+${formState?.changes?.country_phone_code} ${formState?.changes?.cellphone}`
+    })
+	}, [formState?.changes, cellphoneOtpSent])
+
 	return (
 		<>
 			<UDForm>
@@ -505,7 +517,7 @@ export const UserFormDetailsUI = (props: any) => {
 					</UDLoader>
 				)}
 			</UDForm>
-			{!hideUpdateButton && (
+			{!hideUpdateButton && !isVerifiedPhone && (
 				<>
 					{((formState &&
 						Object.keys(formState?.changes).length > 0 &&

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

@@ -496,7 +496,9 @@ const UserVerificationUI = (props: any) => {
           <UserDetails
             user={user}
             isEdit
-            isVerifiedPhone
+            isPhoneVerifyRequired={isPhoneVerifyRequired}
+            cellphoneOtpSent={verificationState.phone}
+            setPhoneState={setPhoneState}
             dontToggleEditMode
           />
         </View>