ordering-ui-react-native 0.12.35 → 0.12.39

package/package.json

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

package/src/components/AddressForm/index.tsx

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

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

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

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

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

@@ -40,12 +40,14 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
   const [time, setTime] = useState('');
   const [comments, setComments] = useState('');
   const [isKeyboardShow, setIsKeyboardShow] = useState(false);
-  const phoneNumber = customerCellphone;
-  let codeNumberPhone, numberPhone, numberToShow;
   const { top, bottom } = useSafeAreaInsets()
-  const titleOrder = t(orderTitle[action].key, orderTitle[action].text)
-  const buttonText = t(orderTitle[action].btnKey, orderTitle[action].btnText)
+
+  let codeNumberPhone, numberPhone, numberToShow;
+  const phoneNumber = customerCellphone;
+  const titleOrder = t(orderTitle[action]?.key, orderTitle[action]?.text)
+  const buttonText = t(orderTitle[action]?.btnKey, orderTitle[action]?.btnText)
   const showTextArea = ['reject', 'deliveryFailed', 'pickupFailed', 'notReady'].includes(action)
+
   const handleFocus = () => {
     viewRef?.current?.measure((x: any, y: any) => {
       scrollViewRef?.current?.scrollTo({ x: 0, y });
@@ -136,7 +138,7 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
 
     if (!isFocus) {
       if (time.length > 1) timerRef.current.clear();
-      timerRef.current.focus();
+      timerRef?.current?.focus?.();
       handleFocusTimer();
     }
   };
@@ -148,7 +150,7 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
     }
 
     if (!isFocus && textTareaRef?.current) {
-      textTareaRef.current.focus();
+      textTareaRef?.current?.focus?.();
     }
   };
 
@@ -161,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,
@@ -210,7 +212,6 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
     }
 
     bodyToSend.id = orderId;
-
     handleUpdateOrder && handleUpdateOrder(bodyToSend.status, bodyToSend);
   };
 

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

@@ -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/Business.tsx

@@ -48,8 +48,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     isFromCheckout,
     driverLocation,
     actions,
-    titleAccept,
-    titleReject,
+    orderTitle,
     appTitle,
   } = props;
 
@@ -607,8 +606,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                   orderId={order?.id}
                   notShowCustomerPhone={false}
                   actions={actions}
-                  titleAccept={titleAccept}
-                  titleReject={titleReject}
+                  orderTitle={orderTitle}
                   appTitle={appTitle}
                 />
               </OModal>

package/themes/business/src/components/OrderDetails/Delivery.tsx

@@ -128,6 +128,36 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     setOpenModalForAccept(true);
   };
 
+  const handleCloseModal = () => {
+    setOpenModalForBusiness(false);
+  };
+
+  const handleArrowBack: any = () => {
+    navigation?.canGoBack() && navigation.goBack();
+  };
+
+  const handleRejectLogisticOrder = () => {
+    handleClickLogisticOrder?.(2, order?.logistic_order_id)
+    handleArrowBack()
+  }
+
+  const locations = [
+    {
+      ...order?.business?.location,
+      title: order?.business?.name,
+      icon: order?.business?.logo || theme.images.dummies.businessLogo,
+      type: 'Business',
+    },
+    {
+      ...order?.customer?.location,
+      title: order?.customer?.name,
+      icon:
+        order?.customer?.photo ||
+        'https://res.cloudinary.com/demo/image/upload/c_thumb,g_face,r_max/d_avatar.png/non_existing_id.png',
+      type: 'Customer',
+    },
+  ];
+
   useEffect(() => {
     if (permissions.locationStatus !== 'granted' && openModalForMapView) {
       setOpenModalForMapView(false);
@@ -146,20 +176,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     if (openModalForMapView) {
       setOpenModalForMapView(false);
     }
-  }, [order?.loading]);
-
-  const handleCloseModal = () => {
-    setOpenModalForBusiness(false);
-  };
-
-  const handleArrowBack: any = () => {
-    navigation?.canGoBack() && navigation.goBack();
-  };
-
-  const handleRejectLogisticOrder = () => {
-    handleClickLogisticOrder?.(2, order?.logistic_order_id)
-    handleArrowBack()
-  }
+  }, [props.order?.loading]);
 
   useEffect(() => {
     if (order?.driver === null && session?.user?.level === 4) {
@@ -176,23 +193,6 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     }
   }, [order?.driver]);
 
-  const locations = [
-    {
-      ...order?.business?.location,
-      title: order?.business?.name,
-      icon: order?.business?.logo || theme.images.dummies.businessLogo,
-      type: 'Business',
-    },
-    {
-      ...order?.customer?.location,
-      title: order?.customer?.name,
-      icon:
-        order?.customer?.photo ||
-        'https://res.cloudinary.com/demo/image/upload/c_thumb,g_face,r_max/d_avatar.png/non_existing_id.png',
-      type: 'Customer',
-    },
-  ];
-
   useEffect(() => {
     if (driverLocation) {
       locations[0] = driverLocation;
@@ -270,7 +270,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                 />
               </Pickup>
             )}
-            {(order?.status === 3) && order?.delivery_type === 1 && (
+            {order?.status === 3 && order?.delivery_type === 1 && (
               <View style={{ paddingVertical: 20, marginBottom: 20 }}>
                 <OButton
                   style={styles.btnPickUp}
@@ -285,67 +285,6 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
               </View>
             )}
           </>
-
-          <OModal
-            open={openModalForBusiness}
-            order={order}
-            title={`${t('INVOICE_ORDER_NO', 'Order No.')} ${order.id}`}
-            entireModal
-            onClose={() => handleCloseModal()}>
-            <Chat
-              type={
-                openModalForBusiness ? USER_TYPE.BUSINESS : USER_TYPE.DRIVER
-              }
-              orderId={order?.id}
-              messages={messages}
-              order={order}
-              setMessages={setMessages}
-            />
-          </OModal>
-
-          <OModal
-            open={openModalForAccept}
-            onClose={() => setOpenModalForAccept(false)}
-            entireModal
-            customClose>
-            <AcceptOrRejectOrder
-              handleUpdateOrder={handleChangeOrderStatus}
-              closeModal={setOpenModalForAccept}
-              customerCellphone={order?.customer?.cellphone}
-              loading={order?.loading}
-              action={actionOrder}
-              orderId={order?.id}
-              notShowCustomerPhone
-              actions={actions}
-              orderTitle={orderTitle}
-              appTitle={appTitle}
-            />
-          </OModal>
-
-          <OModal
-            open={openModalForMapView}
-            onClose={() => handleOpenMapView()}
-            entireModal
-            customClose>
-            <DriverMap
-              navigation={navigation}
-              order={order}
-              orderStatus={getOrderStatus(order?.status, t)?.value || ''}
-              location={locationMarker}
-              readOnly
-              updateDriverPosition={updateDriverPosition}
-              driverUpdateLocation={driverUpdateLocation}
-              setDriverUpdateLocation={setDriverUpdateLocation}
-              handleViewActionOrder={handleViewActionOrder}
-              isBusinessMarker={isBusinessMarker}
-              isToFollow={isToFollow}
-              showAcceptOrReject={
-                showFloatButtonsAcceptOrReject[order?.status]
-              }
-              handleOpenMapView={handleOpenMapView}
-            />
-          </OModal>
-
           <View
             style={{
               height:
@@ -356,14 +295,14 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
 
         {showFloatButtonsPickUp[order?.status] && (
           <FloatingButton
-            disabled={order?.loading}
+            disabled={props.order?.loading}
             btnText={t('PICKUP_FAILED', 'Pickup failed')}
             isSecondaryBtn={false}
             secondButtonClick={() =>
               handleChangeOrderStatus && handleChangeOrderStatus(9)
             }
             firstButtonClick={() =>
-              handleViewActionOrder && handleViewActionOrder('failed')
+              handleViewActionOrder && handleViewActionOrder('pickupFailed')
             }
             secondBtnText={t('PICKUP_COMPLETE', 'Pickup complete')}
             secondButton={true}
@@ -375,14 +314,14 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
         {(order?.status === 9 || order?.status === 19) && (
           <>
             <FloatingButton
-              disabled={order?.loading}
+              disabled={props.order?.loading}
               btnText={t('DELIVERY_FAILED', 'Delivery Failed')}
               isSecondaryBtn={false}
               secondButtonClick={() =>
                 handleChangeOrderStatus && handleChangeOrderStatus(11)
               }
               firstButtonClick={() =>
-                handleViewActionOrder && handleViewActionOrder('failed')
+                handleViewActionOrder && handleViewActionOrder('deliveryFailed')
               }
               secondBtnText={t('DELIVERY_COMPLETE', 'Delivery complete')}
               secondButton={true}
@@ -405,14 +344,6 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
             widthButton={'45%'}
           />
         )}
-
-        <Alert
-          open={alertState.open}
-          onAccept={handleArrowBack}
-          onClose={handleArrowBack}
-          content={alertState.content}
-          title={t('WARNING', 'Warning')}
-        />
       </>
     )
   }
@@ -420,7 +351,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   return (
     <>
       {(!order || Object.keys(order).length === 0) &&
-        (order?.error?.length < 1 || !order?.error) && (
+        (props.order?.error?.length < 1 || !props.order?.error) && (
           <View style={{ flex: 1 }}>
             {[...Array(6)].map((item, i) => (
               <Placeholder key={i} Animation={Fade}>
@@ -437,7 +368,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
           </View>
         )}
 
-      {(!!order?.error || order?.error) && (
+      {(!!props.order?.error || props.order?.error) && (
         <NotFoundSource
           btnTitle={t('GO_TO_MY_ORDERS', 'Go to my orders')}
           content={
@@ -457,7 +388,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
           handleArrowBack={handleArrowBack}
           logisticOrderStatus={logisticOrderStatus}
         />
-        {order && Object.keys(order).length > 0 && (order?.error?.length < 1 || !order?.error) && (
+        {order && Object.keys(order).length > 0 && (props.order?.error?.length < 1 || !props.order?.error) && (
           <>
             {order?.order_group && order?.order_group_id ? order?.order_group?.orders.map((order: any) => (
               <OrderDetailsInformation order={order} />
@@ -466,7 +397,79 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
             )}
           </>
         )}
+        {openModalForMapView && (
+          <OModal
+            open={openModalForMapView}
+            onClose={() => handleOpenMapView()}
+            entireModal
+            customClose>
+            <DriverMap
+              navigation={navigation}
+              order={order}
+              orderStatus={getOrderStatus(order?.status, t)?.value || ''}
+              location={locationMarker}
+              readOnly
+              updateDriverPosition={updateDriverPosition}
+              driverUpdateLocation={driverUpdateLocation}
+              setDriverUpdateLocation={setDriverUpdateLocation}
+              handleViewActionOrder={handleViewActionOrder}
+              isBusinessMarker={isBusinessMarker}
+              isToFollow={isToFollow}
+              showAcceptOrReject={
+                showFloatButtonsAcceptOrReject[order?.status]
+              }
+              handleOpenMapView={handleOpenMapView}
+            />
+          </OModal>
+        )}
+        {openModalForBusiness && (
+          <OModal
+            open={openModalForBusiness}
+            order={order}
+            title={`${t('INVOICE_ORDER_NO', 'Order No.')} ${order.id}`}
+            entireModal
+            onClose={() => handleCloseModal()}>
+            <Chat
+              type={
+                openModalForBusiness ? USER_TYPE.BUSINESS : USER_TYPE.DRIVER
+              }
+              orderId={order?.id}
+              messages={messages}
+              order={order}
+              setMessages={setMessages}
+            />
+          </OModal>
+        )}
+        {openModalForAccept && (
+          <OModal
+            open={openModalForAccept}
+            onClose={() => setOpenModalForAccept(false)}
+            entireModal
+            customClose>
+            <AcceptOrRejectOrder
+              handleUpdateOrder={handleChangeOrderStatus}
+              closeModal={setOpenModalForAccept}
+              customerCellphone={order?.customer?.cellphone}
+              loading={props.order?.loading}
+              action={actionOrder}
+              orderId={order?.id}
+              notShowCustomerPhone
+              actions={actions}
+              orderTitle={orderTitle}
+              appTitle={appTitle}
+            />
+          </OModal>
+        )}
       </View>
+      {alertState?.open && (
+        <Alert
+          open={alertState.open}
+          onAccept={handleArrowBack}
+          onClose={handleArrowBack}
+          content={alertState.content}
+          title={t('WARNING', 'Warning')}
+        />
+      )}
     </>
   );
 };

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

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

@@ -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/business/src/types/index.tsx

@@ -526,9 +526,9 @@ export interface TagsParams {
 interface actions {
   accept: string;
   reject: string;
-  pickupFailed: string;
-  deliveryFailed: string;
-  notReady: string;
+  pickupFailed?: string;
+  deliveryFailed?: string;
+  notReady?: string;
 }
 
 interface textTranslate {

package/themes/doordash/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'
@@ -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

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

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