ordering-ui-react-native 0.12.37 → 0.12.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.12.37",
+  "version": "0.12.41",
   "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

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

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

@@ -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={props.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:
@@ -458,6 +397,69 @@ 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

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>

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

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

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

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

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

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

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

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