ordering-ui-react-native 0.12.37 → 0.12.41

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

@@ -437,7 +437,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 													}
 													setIsFirstTime(false)
 												},
-												onSubmitEditing: () => internalNumberRef.current.focus(),
+												onSubmitEditing: () => internalNumberRef?.current?.focus?.(),
 												autoCorrect: false,
 												blurOnSubmit: false,
 												returnKeyType: 'next',
@@ -519,7 +519,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 										control={control}
 										name='internal_number'
 										rules={{ required: isRequiredField && isRequiredField('internal_number') ? t(`VALIDATION_ERROR_INTERNAL_NUMBER_REQUIRED`, `The field internal number is required`) : null }}
-										defaultValue={address?.internal_number || formState.changes?.internal_number || addressState.address.internal_number || ''}
+										defaultValue={address?.internal_number || formState.changes?.internal_number || addressState?.address?.internal_number || ''}
 										render={() => (
 											<OInput
 												name='internal_number'
@@ -528,11 +528,11 @@ const AddressFormUI = (props: AddressFormParams) => {
 													handleChangeInput(text)
 													setValue('internal_number', text)
 												}}
-												value={address?.internal_number || formState.changes?.internal_number || addressState.address.internal_number || ''}
+												value={address?.internal_number || formState.changes?.internal_number || addressState?.address?.internal_number || ''}
 												style={styles.inputsStyle}
 												forwardRef={internalNumberRef}
 												returnKeyType='next'
-												onSubmitEditing={() => zipCodeRef.current.focus()}
+												onSubmitEditing={() => zipCodeRef?.current?.focus?.()}
 												blurOnSubmit={false}
 											/>
 										)}
@@ -556,7 +556,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 												style={styles.inputsStyle}
 												forwardRef={zipCodeRef}
 												returnKeyType='next'
-												onSubmitEditing={() => addressNotesRef.current.focus()}
+												onSubmitEditing={() => addressNotesRef?.current?.focus?.()}
 												blurOnSubmit={false}
 											/>
 										)}

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

@@ -27,7 +27,7 @@ export const FacebookLogin = (props: any) => {
     : t('Continue_WITH_FACEBOOK', 'Continue with Facebook');
 
   const logoutWithFacebook = () => {
-    LoginManager.logOut();
+    LoginManager && LoginManager.logOut();
   };
 
   const handleLoginClick = async (accessToken: string) => {
@@ -57,7 +57,7 @@ export const FacebookLogin = (props: any) => {
 
   const loginWithFacebook = () => {
     handleLoading && handleLoading(true)
-    LoginManager.logInWithPermissions(['public_profile']).then(
+    LoginManager && LoginManager.logInWithPermissions(['public_profile']).then(
       (login: any) => {
         if (login.isCancelled) {
           const err = t('LOGIN_WITH_FACEBOOK_CANCELLED', 'Login cancelled')

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

@@ -296,7 +296,7 @@ const LoginFormUI = (props: LoginParams) => {
 										handleData={(val: any) => setPhoneInputData(val)}
 										textInputProps={{
 											returnKeyType: 'next',
-											onSubmitEditing: () => inputRef.current.focus(),
+											onSubmitEditing: () => inputRef?.current?.focus?.(),
 										}}
 									/>
 								</View>

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

@@ -187,7 +187,7 @@ const PaymentOptionsUI = (props: any) => {
 					showsVerticalScrollIndicator={false}
 					data={paymethodsList.paymethods.sort((a: any, b: any) => a.id - b.id).filter((p: any) => !excludeIds.includes(p.id))}
 					renderItem={renderPaymethods}
-					keyExtractor={(paymethod: any) => paymethod.id.toString()}
+					keyExtractor={(paymethod: any) => paymethod?.id?.toString?.()}
 					ListFooterComponent={renderFooter}
 				/>
 			)}
@@ -220,7 +220,7 @@ const PaymentOptionsUI = (props: any) => {
 						/>
 					}
 
-					{isOpenMethod?.paymethod?.gateway === 'stripe' && !paymethodData.id && (
+					{isOpenMethod?.paymethod?.gateway === 'stripe' && !paymethodData?.id && (
 						<View>
 							<OButton
 								text={t('ADD_PAYMENT_CARD', 'Add New Payment Card')}
@@ -325,7 +325,7 @@ const PaymentOptionsUI = (props: any) => {
 			<OModal
 				entireModal
 				title={t('ADD_CREDIT_OR_DEBIT_CARD', 'Add credit or debit card')}
-				open={isOpenMethod?.paymethod?.gateway === 'stripe_direct' && !paymethodData.id}
+				open={isOpenMethod?.paymethod?.gateway === 'stripe_direct' && !paymethodData?.id}
 				onClose={() => handlePaymethodClick(null)}
 			>
 				<KeyboardAvoidingView
@@ -343,7 +343,7 @@ const PaymentOptionsUI = (props: any) => {
 			</OModal>
 
 			{/* Stripe Connect */}
-			{isOpenMethod?.paymethod?.gateway === 'stripe_connect' && !paymethodData.id && (
+			{isOpenMethod?.paymethod?.gateway === 'stripe_connect' && !paymethodData?.id && (
 				<View>
 					<OButton
 						text={t('ADD_PAYMENT_CARD', 'Add New Payment Card')}

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

@@ -383,7 +383,7 @@ const SignupFormUI = (props: SignupParams) => {
 														returnKeyType='next'
 														blurOnSubmit={false}
 														forwardRef={(ref: any) => handleRefs(ref, field.code)}
-														onSubmitEditing={() => field.code === 'email' ? phoneRef.current.focus() : handleFocusRef(getNextFieldCode(i))}
+														onSubmitEditing={() => field.code === 'email' ? phoneRef?.current?.focus?.() : handleFocusRef(getNextFieldCode(i))}
 													/>
 												)}
 												name={field.code}
@@ -403,7 +403,7 @@ const SignupFormUI = (props: SignupParams) => {
 										forwardRef={phoneRef}
 										textInputProps={{
 											returnKeyType: 'next',
-											onSubmitEditing: () => passwordRef.current.focus()
+											onSubmitEditing: () => passwordRef?.current?.focus?.()
 										}}
 									/>
 								</View>

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

@@ -554,7 +554,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 													setAddressEditing(text.length == 0);
 												},
 												onSubmitEditing: () =>
-													internalNumberRef.current.focus(),
+													internalNumberRef?.current?.focus?.(),
 												autoCorrect: false,
 												blurOnSubmit: false,
 												returnKeyType: 'next',
@@ -658,7 +658,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 									defaultValue={
 										address?.internal_number ||
 										formState.changes?.internal_number ||
-										addressState.address.internal_number ||
+										addressState?.address?.internal_number ||
 										''
 									}
 									render={() => (
@@ -672,13 +672,13 @@ const AddressFormUI = (props: AddressFormParams) => {
 											value={
 												address?.internal_number ||
 												formState.changes?.internal_number ||
-												addressState.address.internal_number ||
+												addressState?.address?.internal_number ||
 												''
 											}
 											style={{ ...styles.inputsStyle, marginRight: 24 }}
 											forwardRef={internalNumberRef}
 											returnKeyType="next"
-											onSubmitEditing={() => zipCodeRef.current.focus()}
+											onSubmitEditing={() => zipCodeRef?.current?.focus?.()}
 											blurOnSubmit={false}
 										/>
 									)}
@@ -719,7 +719,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 											style={styles.inputsStyle}
 											forwardRef={zipCodeRef}
 											returnKeyType="next"
-											onSubmitEditing={() => addressNotesRef.current.focus()}
+											onSubmitEditing={() => addressNotesRef?.current?.focus?.()}
 											blurOnSubmit={false}
 										/>
 									)}

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

@@ -25,7 +25,7 @@ export const FacebookLogin = (props: any) => {
 		: t('CONTINUE_WITH_FACEBOOK', 'Continue with Facebook');
 
 	const logoutWithFacebook = () => {
-		LoginManager.logOut();
+		LoginManager && LoginManager.logOut();
 	};
 
 	const handleLoginClick = async (accessToken: string) => {
@@ -48,7 +48,7 @@ export const FacebookLogin = (props: any) => {
 
 	const loginWithFacebook = () => {
 		handleLoading && handleLoading(true)
-		LoginManager.logInWithPermissions(['public_profile']).then(
+		LoginManager && LoginManager.logInWithPermissions(['public_profile']).then(
 			(login: any) => {
 				if (login.isCancelled) {
 					const err = t('LOGIN_WITH_FACEBOOK_CANCELLED', 'Login cancelled')

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

@@ -325,7 +325,7 @@ const LoginFormUI = (props: LoginParams) => {
 									handleData={(val: any) => setPhoneInputData(val)}
 									textInputProps={{
 										returnKeyType: 'next',
-										onSubmitEditing: () => inputRef.current.focus(),
+										onSubmitEditing: () => inputRef?.current?.focus?.(),
 									}}
 								/>
 							</View>

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

@@ -150,7 +150,7 @@ const PaymentOptionsUI = (props: any) => {
 					// data={paymethodsList.paymethods.sort((a: any, b: any) => a.id - b.id)}
 					data={paymethodsList.paymethods.sort((a: any, b: any) => a.id - b.id).filter((p: any) => !excludeIds.includes(p.id))}
 					renderItem={renderPaymethods}
-					keyExtractor={(paymethod: any) => paymethod.id.toString()}
+					keyExtractor={(paymethod: any) => paymethod?.id?.toString?.()}
 				/>
 			)}
 
@@ -226,7 +226,7 @@ const PaymentOptionsUI = (props: any) => {
 				)}
 
 			{/* Stripe */}
-			{isOpenMethod?.paymethod?.gateway === 'stripe' && !paymethodData.id && (
+			{isOpenMethod?.paymethod?.gateway === 'stripe' && !paymethodData?.id && (
 				<View>
 					<OButton
 						text={t('ADD_PAYMENT_CARD', 'Add New Payment Card')}
@@ -276,7 +276,7 @@ const PaymentOptionsUI = (props: any) => {
 			<OModal
 				entireModal
 				title={t('ADD_CREDIT_OR_DEBIT_CARD', 'Add credit or debit card')}
-				open={isOpenMethod?.paymethod?.gateway === 'stripe_direct' && !paymethodData.id}
+				open={isOpenMethod?.paymethod?.gateway === 'stripe_direct' && !paymethodData?.id}
 				onClose={() => handlePaymethodClick(null)}
 			>
 				<KeyboardAvoidingView
@@ -294,7 +294,7 @@ const PaymentOptionsUI = (props: any) => {
 			</OModal>
 
 			{/* Stripe Connect */}
-			{isOpenMethod?.paymethod?.gateway === 'stripe_connect' && !paymethodData.id && (
+			{isOpenMethod?.paymethod?.gateway === 'stripe_connect' && !paymethodData?.id && (
 				<View>
 					<OButton
 						text={t('ADD_PAYMENT_CARD', 'Add New Payment Card')}
@@ -360,7 +360,7 @@ const PaymentOptionsUI = (props: any) => {
 			{/* Paypal */}
 			{/* <Modal
         className='modal-info'
-        open={paymethodSelected?.gateway === 'paypal' && !paymethodData.id}
+        open={paymethodSelected?.gateway === 'paypal' && !paymethodData?.id}
         onClose={() => handlePaymethodClick(null)}
         title={t('PAY_WITH_PAYPAL', 'Pay with PayPal')}
       >

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

@@ -443,7 +443,7 @@ const SignupFormUI = (props: SignupParams) => {
 													forwardRef={(ref: any) => handleRefs(ref, field.code)}
 													onSubmitEditing={() =>
 														field.code === 'email'
-															? phoneRef.current.focus()
+															? phoneRef?.current?.focus?.()
 															: handleFocusRef(getNextFieldCode(i))
 													}
 												/>
@@ -463,7 +463,7 @@ const SignupFormUI = (props: SignupParams) => {
 										forwardRef={phoneRef}
 										textInputProps={{
 											returnKeyType: 'next',
-											onSubmitEditing: () => passwordRef.current.focus(),
+											onSubmitEditing: () => passwordRef?.current?.focus?.(),
 										}}
 									/>
 								</View>

package/themes/single-business/src/components/AddressForm/index.tsx

@@ -559,7 +559,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 													setAddressEditing(text.length == 0);
 												},
 												onSubmitEditing: () =>
-													internalNumberRef.current.focus(),
+													internalNumberRef?.current?.focus?.(),
 												autoCorrect: false,
 												blurOnSubmit: false,
 												returnKeyType: 'next',
@@ -652,7 +652,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 									defaultValue={
 										address?.internal_number ||
 										formState.changes?.internal_number ||
-										addressState.address.internal_number ||
+										addressState?.address?.internal_number ||
 										''
 									}
 									render={() => (
@@ -666,13 +666,13 @@ const AddressFormUI = (props: AddressFormParams) => {
 											value={
 												address?.internal_number ||
 												formState.changes?.internal_number ||
-												addressState.address.internal_number ||
+												addressState?.address?.internal_number ||
 												''
 											}
 											style={{ ...styles.inputsStyle, marginRight: 24 }}
 											forwardRef={internalNumberRef}
 											returnKeyType="next"
-											onSubmitEditing={() => zipCodeRef.current.focus()}
+											onSubmitEditing={() => zipCodeRef?.current?.focus?.()}
 											blurOnSubmit={false}
 										/>
 									)}
@@ -713,7 +713,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 											style={styles.inputsStyle}
 											forwardRef={zipCodeRef}
 											returnKeyType="next"
-											onSubmitEditing={() => addressNotesRef.current.focus()}
+											onSubmitEditing={() => addressNotesRef?.current?.focus?.()}
 											blurOnSubmit={false}
 										/>
 									)}

package/themes/single-business/src/components/AppleLogin/index.tsx

@@ -26,7 +26,7 @@ export const AppleLogin = (props: any) => {
 		: t('CONTINUE_WITH_FACEBOOK', 'Continue with Apple');
 
 	const logoutWithFacebook = () => {
-		LoginManager.logOut();
+		LoginManager && LoginManager.logOut();
 	};
 
 	const handleLoginClick = async (accessToken: string) => {
@@ -49,7 +49,7 @@ export const AppleLogin = (props: any) => {
 
 	const loginWithFacebook = () => {
 		handleLoading && handleLoading(true)
-		LoginManager.logInWithPermissions(['public_profile']).then(
+		LoginManager && LoginManager.logInWithPermissions(['public_profile']).then(
 			(login: any) => {
 				if (login.isCancelled) {
 					const err = t('LOGIN_WITH_FACEBOOK_CANCELLED', 'Login cancelled')

package/themes/single-business/src/components/FacebookLogin/index.tsx

@@ -25,7 +25,7 @@ export const FacebookLogin = (props: any) => {
 		: t('CONTINUE_WITH_FACEBOOK', 'Continue with Facebook');
 
 	const logoutWithFacebook = () => {
-		LoginManager.logOut();
+		LoginManager && LoginManager.logOut();
 	};
 
 	const handleLoginClick = async (accessToken: string) => {
@@ -48,7 +48,7 @@ export const FacebookLogin = (props: any) => {
 
 	const loginWithFacebook = () => {
 		handleLoading && handleLoading(true)
-		LoginManager.logInWithPermissions(['public_profile']).then(
+		LoginManager && LoginManager.logInWithPermissions(['public_profile']).then(
 			(login: any) => {
 				if (login.isCancelled) {
 					const err = t('LOGIN_WITH_FACEBOOK_CANCELLED', 'Login cancelled')

package/themes/single-business/src/components/GoogleLogin/index.tsx

@@ -26,7 +26,7 @@ export const GoogleLogin = (props: any) => {
 		: t('CONTINUE_WITH_GOOGLE', 'Continue with Google');
 
 	const logoutWithFacebook = () => {
-		LoginManager.logOut();
+		LoginManager && LoginManager.logOut();
 	};
 
 	const handleLoginClick = async (accessToken: string) => {
@@ -49,7 +49,7 @@ export const GoogleLogin = (props: any) => {
 
 	const loginWithFacebook = () => {
 		handleLoading && handleLoading(true)
-		LoginManager.logInWithPermissions(['public_profile']).then(
+		LoginManager && LoginManager.logInWithPermissions(['public_profile']).then(
 			(login: any) => {
 				if (login.isCancelled) {
 					const err = t('LOGIN_WITH_FACEBOOK_CANCELLED', 'Login cancelled')

package/themes/single-business/src/components/LoginForm/index.tsx

@@ -381,7 +381,7 @@ const LoginFormUI = (props: LoginParams) => {
 									handleData={(val: any) => setPhoneInputData(val)}
 									textInputProps={{
 										returnKeyType: 'next',
-										onSubmitEditing: () => inputRef.current.focus(),
+										onSubmitEditing: () => inputRef?.current?.focus?.(),
 									}}
 								/>
 							</View>

package/themes/single-business/src/components/PaymentOptions/index.tsx

@@ -240,7 +240,7 @@ const PaymentOptionsUI = (props: any) => {
 				)}
 
 			{/* Stripe */}
-			{isOpenMethod?.paymethod?.gateway === 'stripe' && !paymethodData.id && (
+			{isOpenMethod?.paymethod?.gateway === 'stripe' && !paymethodData?.id && (
 				<View>
 					<OButton
 						text={t('ADD_PAYMENT_CARD', 'Add New Payment Card')}
@@ -290,7 +290,7 @@ const PaymentOptionsUI = (props: any) => {
 			<OModal
 				entireModal
 				title={t('ADD_CREDIT_OR_DEBIT_CARD', 'Add credit or debit card')}
-				open={isOpenMethod?.paymethod?.gateway === 'stripe_direct' && !paymethodData.id}
+				open={isOpenMethod?.paymethod?.gateway === 'stripe_direct' && !paymethodData?.id}
 				onClose={() => handlePaymethodClick(null)}
 			>
 				<KeyboardAvoidingView
@@ -308,7 +308,7 @@ const PaymentOptionsUI = (props: any) => {
 			</OModal>
 
 			{/* Stripe Connect */}
-			{isOpenMethod?.paymethod?.gateway === 'stripe_connect' && !paymethodData.id && (
+			{isOpenMethod?.paymethod?.gateway === 'stripe_connect' && !paymethodData?.id && (
 				<View>
 					<OButton
 						text={t('ADD_PAYMENT_CARD', 'Add New Payment Card')}
@@ -374,7 +374,7 @@ const PaymentOptionsUI = (props: any) => {
 			{/* Paypal */}
 			{/* <Modal
         className='modal-info'
-        open={paymethodSelected?.gateway === 'paypal' && !paymethodData.id}
+        open={paymethodSelected?.gateway === 'paypal' && !paymethodData?.id}
         onClose={() => handlePaymethodClick(null)}
         title={t('PAY_WITH_PAYPAL', 'Pay with PayPal')}
       >

package/themes/single-business/src/components/ProductForm/index.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useRef } from 'react';
 import {
   ProductForm as ProductOptions,
   useSession,
@@ -9,7 +9,7 @@ import {
 import { useTheme } from 'styled-components/native';
 import { ProductIngredient } from '../ProductIngredient';
 import { ProductOption } from '../ProductOption';
-import { View, TouchableOpacity, StyleSheet, Dimensions, Platform, useWindowDimensions, Keyboard } from 'react-native';
+import { View, TouchableOpacity, StyleSheet, Dimensions, Platform, useWindowDimensions, Keyboard, KeyboardAvoidingView } from 'react-native';
 
 import {
   ProductHeader,
@@ -120,7 +120,7 @@ export const ProductOptionsUI = (props: any) => {
   const { top, bottom } = useSafeAreaInsets();
   const { height } = useWindowDimensions();
   const [selOpt, setSelectedOpt] = useState(0);
-
+  const scrollViewRef = useRef<any>()
   const isError = (id: number) => {
     let bgColor = theme.colors.white;
     if (errors[`id:${id}`]) {
@@ -241,6 +241,7 @@ export const ProductOptionsUI = (props: any) => {
     const keyboardDidShowListener = Keyboard.addListener(
       'keyboardDidShow',
       () => {
+        scrollViewRef?.current && scrollViewRef?.current?.scrollToEnd()
         setIsKeyboardShow(true);
       }
     );
@@ -259,7 +260,7 @@ export const ProductOptionsUI = (props: any) => {
 
   return (
     <>
-      <ScrollView style={{ height: windowHeight * 0.85 }}>
+      <ScrollView ref={scrollViewRef}>
         {!error && (
           <>
             <WrapHeader>
@@ -560,7 +561,7 @@ export const ProductOptionsUI = (props: any) => {
                       )}
                     </>
                   )}
-                  <ProductComment style={{ paddingBottom: isKeyboardShow ? 200 : 0 }}>
+                  <ProductComment>
                     <SectionTitle>
                       <OText size={16} weight={'600'} lineHeight={24}>
                         {t('SPECIAL_COMMENT', 'Special comment')}
@@ -597,7 +598,7 @@ export const ProductOptionsUI = (props: any) => {
         )}
       </ScrollView>
       {!loading && !error && product && (
-        <ProductActions style={{ maxHeight: windowHeight * 0.15 }}>
+        <ProductActions>
           <OText size={16} lineHeight={24} weight={'600'}>
             {productCart.total ? parsePrice(productCart?.total) : ''}
           </OText>

package/themes/single-business/src/components/ProductForm/styles.tsx

@@ -59,9 +59,12 @@ export const WrapperSubOption = styled.View`
 `
 
 export const ProductComment = styled.View`
+  padding-bottom: 40px
 `
 
 export const ProductActions = styled.View`
+  position: absolute;
+  bottom: 0px;
 	min-height: 70px;
   padding: 12px 40px;
   width: 100%;
@@ -72,7 +75,10 @@ export const ProductActions = styled.View`
   justify-content: space-between;
   border-top-width: 1px;
   border-top-color: ${(props: any) => props.theme.colors.border};
+  flex: 1;
+  flex-direction: row;
 `
+
 export const ExtraOptionWrap = styled.ScrollView`
 	margin-horizontal: -40px;
 `;

package/themes/single-business/src/components/SignupForm/index.tsx

@@ -425,7 +425,7 @@ const SignupFormUI = (props: SignupParams) => {
 													forwardRef={(ref: any) => handleRefs(ref, field.code)}
 													onSubmitEditing={() =>
 														field.code === 'email'
-															? phoneRef.current.focus()
+															? phoneRef?.current?.focus?.()
 															: handleFocusRef(getNextFieldCode(i))
 													}
 												/>
@@ -445,7 +445,7 @@ const SignupFormUI = (props: SignupParams) => {
 										forwardRef={phoneRef}
 										textInputProps={{
 											returnKeyType: 'next',
-											onSubmitEditing: () => passwordRef.current.focus(),
+											onSubmitEditing: () => passwordRef?.current?.focus?.(),
 										}}
 									/>
 								</View>

package/themes/single-business/src/components/UserProfileForm/index.tsx

@@ -114,8 +114,9 @@ const ProfileUI = (props: ProfileParams) => {
 					console.log('ImagePicker Error: ', response.errorMessage);
 					showToast(ToastType.Error, response.errorMessage);
 				} else {
-					if (response.uri) {
-						const url = `data:${response.type};base64,${response.base64}`;
+					if (response?.assets?.[0]?.uri) {
+						const image = response?.assets?.[0]
+						const url = `data:${image?.type};base64,${image?.base64}`;
 						handleButtonUpdateClick(null, true, url);
 					} else {
 						showToast(ToastType.Error, t('IMAGE_NOT_FOUND', 'Image not found'));

package/themes/uber-eats/src/components/AddressForm/index.tsx

@@ -523,7 +523,7 @@ const AddressFormUI = (props: AddressFormParams) => {
                           }
                           setIsFirstTime(false)
                         },
-                        onSubmitEditing: () => internalNumberRef.current.focus(),
+                        onSubmitEditing: () => internalNumberRef?.current?.focus?.(),
                         autoCorrect: false,
                         blurOnSubmit: false,
                         returnKeyType: 'next'
@@ -576,7 +576,7 @@ const AddressFormUI = (props: AddressFormParams) => {
                     control={control}
                     name='internal_number'
                     rules={{ required: isRequiredField && isRequiredField('internal_number') ? t(`VALIDATION_ERROR_INTERNAL_NUMBER_REQUIRED`, `The field internal number is required`) : null }}
-                    defaultValue={address?.internal_number || formState.changes?.internal_number || addressState.address.internal_number || ''}
+                    defaultValue={address?.internal_number || formState.changes?.internal_number || addressState?.address?.internal_number || ''}
                     render={() => (
                       <OInput
                         name='internal_number'
@@ -585,11 +585,11 @@ const AddressFormUI = (props: AddressFormParams) => {
                           handleChangeInput(text)
                           setValue('internal_number', text)
                         }}
-                        value={address?.internal_number || formState.changes?.internal_number || addressState.address.internal_number || ''}
+                        value={address?.internal_number || formState.changes?.internal_number || addressState?.address?.internal_number || ''}
                         style={styles.inputsStyle}
                         forwardRef={internalNumberRef}
                         returnKeyType='next'
-                        onSubmitEditing={() => zipCodeRef.current.focus()}
+                        onSubmitEditing={() => zipCodeRef?.current?.focus?.()}
                         blurOnSubmit={false}
                       />
                     )}
@@ -617,7 +617,7 @@ const AddressFormUI = (props: AddressFormParams) => {
                         style={styles.inputsStyle}
                         forwardRef={zipCodeRef}
                         returnKeyType='next'
-                        onSubmitEditing={() => addressNotesRef.current.focus()}
+                        onSubmitEditing={() => addressNotesRef?.current?.focus?.()}
                         blurOnSubmit={false}
                       />
                     )}

package/themes/uber-eats/src/components/FacebookLogin/index.tsx

@@ -26,7 +26,7 @@ export const FacebookLogin = (props: any) => {
     : t('LOGIN_WITH_FACEBOOK', 'Login with Facebook');
 
   const logoutWithFacebook = () => {
-    LoginManager.logOut();
+    LoginManager && LoginManager.logOut();
   };
 
   const handleLoginClick = async (accessToken: string) => {
@@ -57,7 +57,7 @@ export const FacebookLogin = (props: any) => {
 
   const loginWithFacebook = () => {
     handleLoading && handleLoading(true)
-    LoginManager.logInWithPermissions(['public_profile']).then(
+    LoginManager && LoginManager.logInWithPermissions(['public_profile']).then(
       (login: any) => {
         if (login.isCancelled) {
           const err = t('LOGIN_WITH_FACEBOOK_CANCELLED', 'Login cancelled')

package/themes/uber-eats/src/components/LoginForm/index.tsx

@@ -288,7 +288,7 @@ const LoginFormUI = (props: LoginParams) => {
                   handleData={(val: any) => setPhoneInputData(val)}
                   textInputProps={{
                     returnKeyType: 'next',
-                    onSubmitEditing: () => inputRef.current.focus(),
+                    onSubmitEditing: () => inputRef?.current?.focus?.(),
                   }}
                 />
               </View>

package/themes/uber-eats/src/components/PaymentOptions/index.tsx

@@ -195,7 +195,7 @@ const PaymentOptionsUI = (props: any) => {
 					showsVerticalScrollIndicator={false}
 					data={paymethodsList.paymethods.sort((a: any, b: any) => a.id - b.id).filter((p: any) => !excludeIds.includes(p.id))}
 					renderItem={renderPaymethods}
-					keyExtractor={(paymethod: any) => paymethod.id.toString()}
+					keyExtractor={(paymethod: any) => paymethod?.id?.toString?.()}
 					ListFooterComponent={renderFooter}
 				/>
 			)}
@@ -228,7 +228,7 @@ const PaymentOptionsUI = (props: any) => {
 						/>
 					}
 
-					{isOpenMethod?.paymethod?.gateway === 'stripe' && !paymethodData.id && (
+					{isOpenMethod?.paymethod?.gateway === 'stripe' && !paymethodData?.id && (
 						<View>
 							<OButton
 								text={t('ADD_PAYMENT_CARD', 'Add New Payment Card')}
@@ -333,7 +333,7 @@ const PaymentOptionsUI = (props: any) => {
 			<OModal
 				entireModal
 				title={t('ADD_CREDIT_OR_DEBIT_CARD', 'Add credit or debit card')}
-				open={isOpenMethod?.paymethod?.gateway === 'stripe_direct' && !paymethodData.id}
+				open={isOpenMethod?.paymethod?.gateway === 'stripe_direct' && !paymethodData?.id}
 				onClose={() => handlePaymethodClick(null)}
 			>
 				<KeyboardAvoidingView
@@ -351,7 +351,7 @@ const PaymentOptionsUI = (props: any) => {
 			</OModal>
 
 			{/* Stripe Connect */}
-			{isOpenMethod?.paymethod?.gateway === 'stripe_connect' && !paymethodData.id && (
+			{isOpenMethod?.paymethod?.gateway === 'stripe_connect' && !paymethodData?.id && (
 				<View>
 					<OButton
 						text={t('ADD_PAYMENT_CARD', 'Add New Payment Card')}
@@ -417,7 +417,7 @@ const PaymentOptionsUI = (props: any) => {
 			{/* Paypal */}
 			{/* <Modal
         className='modal-info'
-        open={paymethodSelected?.gateway === 'paypal' && !paymethodData.id}
+        open={paymethodSelected?.gateway === 'paypal' && !paymethodData?.id}
         onClose={() => handlePaymethodClick(null)}
         title={t('PAY_WITH_PAYPAL', 'Pay with PayPal')}
       >