npm - ordering-ui-react-native - Versions diffs - 0.12.38 → 0.12.42 - Mend

ordering-ui-react-native 0.12.38 → 0.12.42

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (46) hide show

package/package.json CHANGED Viewed

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

package/src/components/AddressForm/index.tsx CHANGED Viewed

@@ -513,7 +513,7 @@ const AddressFormUI = (props: AddressFormParams) => {
                           }
                           setIsFirstTime(false)
                         },
-                        onSubmitEditing: () => internalNumberRef.current.focus(),
+                        onSubmitEditing: () => internalNumberRef?.current?.focus?.(),
                         autoCorrect: false,
                         blurOnSubmit: false,
                         returnKeyType: 'next'
@@ -573,7 +573,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'
@@ -582,11 +582,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}
                   />
                 )}
@@ -609,7 +609,7 @@ const AddressFormUI = (props: AddressFormParams) => {
                     style={styles.inputsStyle}
                     forwardRef={zipCodeRef}
                     returnKeyType='next'
-                    onSubmitEditing={() => addressNotesRef.current.focus()}
+                    onSubmitEditing={() => addressNotesRef?.current?.focus?.()}
                     blurOnSubmit={false}
                   />
                 )}

package/src/components/FacebookLogin/index.tsx CHANGED Viewed

@@ -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/src/components/LoginForm/index.tsx CHANGED Viewed

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

package/src/components/PaymentOptions/index.tsx CHANGED Viewed

@@ -159,7 +159,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) => !excludeGateway.includes(p.gateway))}
           renderItem={renderPaymethods}
-          keyExtractor={(paymethod: any) => paymethod.id.toString()}
+          keyExtractor={(paymethod: any) => paymethod?.id?.toString?.()}
         />
       )}
       {(paymethodsList.loading || isLoading) && (
@@ -232,7 +232,7 @@ const PaymentOptionsUI = (props: any) => {
       )}
       {/* Stripe */}
-      {isOpenMethod?.paymethod?.gateway === 'stripe' && !paymethodData.id && (
+      {isOpenMethod?.paymethod?.gateway === 'stripe' && !paymethodData?.id && (
         <View style={{ width: '100%' }}>
           <OButton
             text={t('ADD_PAYMENT_CARD', 'Add New Payment Card')}
@@ -281,7 +281,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
@@ -299,7 +299,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')}
@@ -365,7 +365,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/src/components/SignupForm/index.tsx CHANGED Viewed

@@ -368,7 +368,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}
@@ -387,7 +387,7 @@ const SignupFormUI = (props: SignupParams) => {
                     forwardRef={phoneRef}
                     textInputProps={{
                       returnKeyType: 'next',
-                      onSubmitEditing: () => passwordRef.current.focus()
+                      onSubmitEditing: () => passwordRef?.current?.focus?.()
                     }}
                   />
                 </View>

package/themes/business/src/components/AcceptOrRejectOrder/index.tsx CHANGED Viewed

@@ -138,7 +138,7 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
     if (!isFocus) {
       if (time.length > 1) timerRef.current.clear();
-      timerRef.current.focus();
+      timerRef?.current?.focus?.();
       handleFocusTimer();
     }
   };
@@ -150,7 +150,7 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
     }
     if (!isFocus && textTareaRef?.current) {
-      textTareaRef.current.focus();
+      textTareaRef?.current?.focus?.();
     }
   };
@@ -163,7 +163,7 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
     const time = parseInt(hour || '0') * 60 + (parseInt(minsToSend) || 0);
-    let bodyToSend;
+    let bodyToSend : any = {};
     const orderStatus: any = {
       acceptByBusiness: {
         prepared_in: time,

package/themes/business/src/components/LoginForm/index.tsx CHANGED Viewed

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

package/themes/business/src/components/OrderDetails/OrderContentComponent.tsx CHANGED Viewed

@@ -250,7 +250,7 @@ export const OrderContentComponent = (props: OrderContent) => {
             {order?.customer?.zipcode}
           </OText>
         )}
-        {!order?.user_review && pastOrderStatuses.includes(order?.status) && !isCustomerReviewed && (
+        {/* {!order?.user_review && pastOrderStatuses.includes(order?.status) && !isCustomerReviewed && (
           <OButton
             style={styles.btnReview}
             textStyle={{ color: theme.colors.white }}
@@ -258,7 +258,7 @@ export const OrderContentComponent = (props: OrderContent) => {
             imgRightSrc={false}
             onClick={() => setOpenReviewModal(true)}
           />
-        )}
+        )} */}
       </OrderCustomer>
       <OrderProducts>

package/themes/business/src/components/SearchBar/index.tsx CHANGED Viewed

@@ -27,7 +27,7 @@ export const SearchBar = (props: any) => {
   };
   const handleActiveInput = () => {
-    inputRef.current.focus();
+    inputRef?.current?.focus?.();
   };
   let timeout: null | any = null;

package/themes/business/src/components/SignupForm/index.tsx CHANGED Viewed

@@ -392,7 +392,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))
                         }
                       />
@@ -414,7 +414,7 @@ const SignupFormUI = (props: SignupParams) => {
                   onSubmitEditing={() => null}
                   textInputProps={{
                     returnKeyType: 'next',
-                    onSubmitEditing: () => passwordRef.current.focus(),
+                    onSubmitEditing: () => passwordRef?.current?.focus?.(),
                   }}
                 />
               </View>

package/themes/doordash/src/components/AddressForm/index.tsx CHANGED Viewed

@@ -437,7 +437,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 													}
 													setIsFirstTime(false)
 												},
-												onSubmitEditing: () => internalNumberRef.current.focus(),
+												onSubmitEditing: () => internalNumberRef?.current?.focus?.(),
 												autoCorrect: false,
 												blurOnSubmit: false,
 												returnKeyType: 'next'
@@ -499,7 +499,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'
@@ -508,11 +508,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}
 											inputStyle={{ fontSize: 12 }}
 										/>
@@ -538,7 +538,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 											style={styles.inputsStyle}
 											forwardRef={zipCodeRef}
 											returnKeyType='next'
-											onSubmitEditing={() => addressNotesRef.current.focus()}
+											onSubmitEditing={() => addressNotesRef?.current?.focus?.()}
 											blurOnSubmit={false}
 											inputStyle={{ fontSize: 12 }}
 										/>

package/themes/doordash/src/components/FacebookLogin/index.tsx CHANGED Viewed

@@ -31,7 +31,7 @@ export const FacebookLogin = (props: any) => {
     : text;
   const logoutWithFacebook = () => {
-    LoginManager.logOut();
+    LoginManager && LoginManager.logOut();
   };
   const handleLoginClick = async (accessToken: string) => {
@@ -61,7 +61,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/doordash/src/components/LoginForm/index.tsx CHANGED Viewed

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

package/themes/doordash/src/components/PaymentOptions/index.tsx CHANGED Viewed

@@ -172,7 +172,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?.()}
         />
       )}
       {(paymethodsList.loading || isLoading) && (
@@ -245,7 +245,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')}
@@ -295,7 +295,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)}
         overScreen
       >
@@ -314,7 +314,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')}
@@ -381,7 +381,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/doordash/src/components/SignupForm/index.tsx CHANGED Viewed

@@ -426,7 +426,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))}
 															inputStyle={{ color: theme.colors.textPrimary, fontSize: 12 }}
 														/>
 													)}
@@ -451,7 +451,7 @@ const SignupFormUI = (props: SignupParams) => {
 											forwardRef={phoneRef}
 											textInputProps={{
 												returnKeyType: 'next',
-												onSubmitEditing: () => passwordRef.current.focus(),
+												onSubmitEditing: () => passwordRef?.current?.focus?.(),
 												style: { borderWidth: 0, fontSize: 12 }
 											}}
 											textWrapStyle={{ borderColor: theme.colors.clear, borderWidth: 0, height: 40, paddingStart: 0 }}

package/themes/franchises/src/components/AddressForm/index.tsx CHANGED Viewed

@@ -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/franchises/src/components/FacebookLogin/index.tsx CHANGED Viewed

@@ -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/franchises/src/components/LoginForm/index.tsx CHANGED Viewed

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

package/themes/franchises/src/components/PaymentOptions/index.tsx CHANGED Viewed

@@ -286,7 +286,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
@@ -304,7 +304,7 @@ const PaymentOptionsUI = (props: any) => {
 			</OModal>
 			{/* Stripe Connect */}
-			{isOpenMethod?.paymethod?.gateway === 'stripe_connect' && !paymethodData.id && (
+			{isOpenMethod?.paymethod?.gateway === 'stripe_connect' && !paymethodData?.id && (
 				<View>
 					<StripeCardsList
 						paymethod={isOpenMethod?.paymethod}
@@ -370,7 +370,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/franchises/src/components/SignupForm/index.tsx CHANGED Viewed

@@ -426,7 +426,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))
 													}
 												/>
@@ -446,7 +446,7 @@ const SignupFormUI = (props: SignupParams) => {
 										forwardRef={phoneRef}
 										textInputProps={{
 											returnKeyType: 'next',
-											onSubmitEditing: () => passwordRef.current.focus(),
+											onSubmitEditing: () => passwordRef?.current?.focus?.(),
 										}}
 									/>
 								</View>

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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')}
       >

package/themes/uber-eats/src/components/SignupForm/index.tsx CHANGED Viewed

@@ -370,7 +370,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}
@@ -393,7 +393,7 @@ const SignupFormUI = (props: SignupParams) => {
                     forwardRef={phoneRef}
                     textInputProps={{
                       returnKeyType: 'next',
-                      onSubmitEditing: () => passwordRef.current.focus()
+                      onSubmitEditing: () => passwordRef?.current?.focus?.()
                     }}
                   />
                 </View>