ordering-ui-react-native 0.20.8-release → 0.20.9-release

package/package.json

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

package/themes/business/index.tsx

@@ -43,6 +43,7 @@ import { NewOrderNotification } from './src/components/NewOrderNotification';
 import { DriverSchedule } from './src/components/DriverSchedule';
 import { ScheduleBlocked } from './src/components/ScheduleBlocked';
 import { OrderDetailsLogistic } from './src/components/OrderDetailsLogistic'
+import { Sessions } from './src/components/Sessions';
 //OComponents
 import {
   OText,
@@ -106,6 +107,7 @@ export {
   ReviewCustomer,
   SafeAreaContainerLayout,
   SearchBar,
+  Sessions,
   SignupForm,
   StoresList,
   UserFormDetailsUI,

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

@@ -20,7 +20,9 @@ import {
   useEvent,
   useLanguage,
   useSession,
-  useConfig
+  useConfig,
+  useToast,
+  ToastType
 } from 'ordering-components/native'
 
 import { OIcon, OText } from '../shared'
@@ -108,11 +110,12 @@ const SoundPlayerComponent = (props: any) => {
 
 const NewOrderNotificationUI = (props: any) => {
   const { isBusinessApp, evtList } = props
-
+  const [, t] = useLanguage()
   const [events] = useEvent()
   const [{ user, token }] = useSession()
   const [ordering] = useApi()
   const [{ configs }] = useConfig()
+  const [, { showToast }] = useToast()
   const { getCurrentLocation } = useLocation()
   const [currentEvent, setCurrentEvent] = useState<any>(null)
 
@@ -124,6 +127,10 @@ const NewOrderNotificationUI = (props: any) => {
     if (value?.driver) {
       try {
         const location = await getCurrentLocation()
+        if (!location?.latitude || !location?.longitude) {
+          showToast(t('ERROR_UPDATING_COORDS', 'Error updating coords'), ToastType.Error)
+          return
+        }
         await fetch(`${ordering.root}/users/${user.id}/locations`, {
           method: 'POST',
           body: JSON.stringify({

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

@@ -50,6 +50,7 @@ const { useDeviceOrientation, PORTRAIT } = DeviceOrientationMethods
 
 const OrdersOptionUI = (props: OrdersOptionParams) => {
   const {
+    navigation,
     setCurrentFilters,
     tabs,
     currentTabSelected,
@@ -385,6 +386,13 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
     setTags({ values: [] })
   }, [currentTabSelected])
 
+	useEffect(() => {
+		const unsubcribe = navigation.addListener('focus', () => {
+      currentTabSelected === 'logisticOrders' ? loadLogisticOrders() : loadOrders && loadOrders({ newFetch: true })
+		})
+		return unsubcribe
+	}, [navigation, loadOrders, loadLogisticOrders])
+
   return (
     <>
       <View style={styles.header}>

package/themes/business/src/components/PreviousOrders/OrderItem.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { Platform, PlatformIOSStatic, StyleSheet, TouchableOpacity, View } from 'react-native';
+import { Platform, PlatformIOSStatic, Pressable, StyleSheet, View } from 'react-native';
 import DeviceInfo from 'react-native-device-info';
 import { useTheme } from 'styled-components/native';
 import { useLanguage, useUtils, useConfig } from 'ordering-components/native';
@@ -138,8 +138,7 @@ export const OrderItem = React.memo((props: any) => {
   }, [configState.loading])
 
   return (
-    <TouchableOpacity
-      activeOpacity={1}
+    <Pressable
       disabled={order?.locked && isLogisticOrder}
       style={styles.cardButton}
       onPress={() => handlePressOrder({ ...order, logistic_order_id: _order?.id })}
@@ -237,6 +236,6 @@ export const OrderItem = React.memo((props: any) => {
           )}
         </Information>
       </Card>
-    </TouchableOpacity>
+    </Pressable>
   )
 }, OrderItemPropsAreEqual)

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

@@ -0,0 +1,187 @@
+import React, { useState } from 'react'
+import { View, TouchableOpacity, Platform, StyleSheet } from 'react-native'
+import { useLanguage, useSession, useUtils, Sessions as SessionsController } from 'ordering-components/native'
+import { SessionsParams } from '../../types'
+import { OAlert } from '../../../../../src/components/shared'
+import { OButton, OIcon, OText } from '../shared'
+import { useTheme } from 'styled-components/native'
+import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder'
+import AntIcon from 'react-native-vector-icons/AntDesign'
+
+import {
+  SessionsWrapper,
+  SessionItem,
+  DurationWrapper,
+  Container
+} from './styles'
+
+export const SessionsUI = (props: SessionsParams) => {
+  const {
+    navigation,
+    sessionsList,
+    actionState,
+    handleDeleteSession,
+    handleDeleteAllSessions
+  } = props
+
+  const [, t] = useLanguage()
+  const [{ user }] = useSession()
+  const [{ parseDate }] = useUtils()
+  const theme = useTheme()
+  const [confirm, setConfirm] = useState<any>({ open: false, content: null, handleOnAccept: null, id: null, title: null })
+  const goToBack = () => navigation?.canGoBack() && navigation.goBack()
+
+  const onDeleteSession = (session: any) => {
+    setConfirm({
+      open: true,
+      title: t('WEB_APPNAME', 'Ordering'),
+      content: [t('QUESTION_DELETE_SESSION', 'Are you sure to delete this session?')],
+      handleOnAccept: () => {
+        handleDeleteSession(session)
+        setConfirm({ ...confirm, open: false })
+      }
+    })
+  }
+
+  const onDeleteAllSessions = (isOldUser: any, deleteCurrent: any) => {
+    setConfirm({
+      open: true,
+      title: t('WEB_APPNAME', 'Ordering'),
+      content:
+        isOldUser
+          ? [t('QUESTION_ENABLE_ALL_SESSIONS', 'Are you sure to enable all sessions?')]
+          : deleteCurrent
+            ? [t('QUESTION_DELETE_ALL_SESSIONS', 'Are you sure that you want to delete all sessions?')]
+            : [t('QUESTION_DELETE_ALL_SESSIONS_EXCEPT_CURRENT', 'Are you sure that you want to delete all sessions except current?')],
+      handleOnAccept: () => {
+        handleDeleteAllSessions(deleteCurrent)
+        setConfirm({ ...confirm, open: false })
+      }
+    })
+  }
+
+  const styles = StyleSheet.create({
+    titleGroups: {
+      alignItems: 'center',
+      flexDirection: 'row',
+      minHeight: 33,
+    },
+    btnBackArrow: {
+      borderWidth: 0,
+      width: 32,
+      height: 32,
+      tintColor: theme.colors.textGray,
+      backgroundColor: theme.colors.clear,
+      borderColor: theme.colors.clear,
+      shadowColor: theme.colors.clear,
+      paddingLeft: 0,
+      paddingRight: 0,
+      marginTop: Platform.OS === 'ios' ? 30 : 10
+    },
+    innerPadding: {
+      paddingLeft: 10,
+      paddingRight: 10
+    }
+  });
+
+  return (
+    <Container
+      pdng={Platform.OS === 'ios' ? '10px' : '8px'}
+      style={styles.innerPadding}
+    >
+      <View style={styles.titleGroups}>
+        <TouchableOpacity onPress={() => goToBack()} style={styles.btnBackArrow}>
+          <OIcon src={theme.images.general.arrow_left} color={theme.colors.textGray} />
+        </TouchableOpacity>
+      </View>
+      <OText size={24} style={{ paddingTop: 12 }}>
+        {t('SESSIONS', 'Sessions')}
+      </OText>
+      {user?.session_strategy === 'jwt_session' ? (
+        <>
+          {sessionsList.loading ? (
+            [...Array(5).keys()].map(i => (
+              <SessionItem key={i}>
+                <Placeholder Animation={Fade}>
+                  <View style={{ flexDirection: 'row', alignItems: 'center' }}>
+                    <View style={{ flex: 1 }}>
+                      <PlaceholderLine width={40} />
+                      <PlaceholderLine width={40} />
+                    </View>
+                    <PlaceholderLine width={5} />
+                  </View>
+                </Placeholder>
+              </SessionItem>
+            ))
+          ) : (
+            sessionsList.sessions.length > 0 ? (
+              <SessionsWrapper>
+                {sessionsList.sessions.reverse().map((session: any) => (
+                  <SessionItem key={session.id}>
+                    <DurationWrapper>
+                      <OText>{parseDate(session.created_at)}</OText>
+                      <OText>{parseDate(session.valid_thru)}</OText>
+                    </DurationWrapper>
+                    {session.current && (
+                      <OText mLeft={15} style={{ flex: 1 }}>({t('CURRENT', 'Current')})</OText>
+                    )}
+                    <TouchableOpacity
+                      onPress={() => onDeleteSession(session)}
+                    >
+                      <AntIcon name='close' size={16} color={theme.colors.red} />
+                    </TouchableOpacity>
+                  </SessionItem>
+                ))}
+                <OButton
+                  text={t('DELETE_ALL_SESSIONS', 'Delete all sessions')}
+                  isDisabled={actionState.loading}
+                  textStyle={{ color: theme.colors.white, fontSize: 14 }}
+                  onClick={() => onDeleteAllSessions(false, true)}
+                  style={{ borderRadius: 7.6, marginTop: 30 }}
+                />
+                <OButton
+                  text={t('DELETE_ALL_SESSIONS_EXCEPT_CURRENT', 'Delete all sessions except current')}
+                  isDisabled={actionState.loading}
+                  textStyle={{ color: theme.colors.white, fontSize: 14 }}
+                  onClick={() => onDeleteAllSessions(false, false)}
+                  style={{ borderRadius: 7.6, marginTop: 20 }}
+                />
+              </SessionsWrapper>
+            ) : (
+              <OText>{t('YOU_DONT_HAVE_ANY_SESSIONS', 'You don\'t have any sessions')}</OText>
+            )
+          )}
+        </>
+      ) : (
+        <View>
+          <OText>
+            {t('YOU_DONT_HAVE_ENABLED_THE_SESSIONS', 'You don\'t have enabled the sessions, please active them to have a better control of your sessions.')}
+          </OText>
+          <OButton
+            text={t('ACTIVE_SESSIONS', 'Active sessions')}
+            isDisabled={actionState.loading}
+            textStyle={{ color: theme.colors.white, fontSize: 14 }}
+            onClick={() => onDeleteAllSessions(true, false)}
+            style={{ borderRadius: 7.6, marginTop: 20 }}
+          />
+        </View>
+      )}
+      <OAlert
+        open={confirm.open}
+        title={confirm.title}
+        content={confirm.content}
+        onAccept={confirm.handleOnAccept}
+        onCancel={() => setConfirm({ ...confirm, open: false, title: null })}
+        onClose={() => setConfirm({ ...confirm, open: false, title: null })}
+      />
+    </Container>
+  )
+}
+
+export const Sessions = (props: SessionsParams) => {
+  const sessionsProps = {
+    ...props,
+    UIComponent: SessionsUI
+  }
+  return <SessionsController {...sessionsProps} />
+}

package/themes/business/src/components/Sessions/styles.tsx

@@ -0,0 +1,20 @@
+import styled from 'styled-components/native'
+
+export const SessionsWrapper = styled.View`
+`
+export const SessionItem = styled.View`
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding-vertical: 15px;
+  border-bottom-color: ${(props: any) => props.theme.colors.lightGray};
+  border-bottom-width: 1px;
+`
+export const DurationWrapper = styled.View`
+  /* flex-direction: row; */
+`
+
+export const Container = styled.View`
+  padding-top: ${(props: any) => props.pdng};
+  margin-bottom: 50px;
+`

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

@@ -513,6 +513,17 @@ const ProfileUI = (props: ProfileParams) => {
               marginTop: 10
             }} />
           </Pressable>
+          <Pressable style={{ marginBottom: 10 }} onPress={() => navigation.navigate('Sessions')}>
+            <View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
+              <OText size={16}>{t('SESSIONS', 'Sessions')}</OText>
+              <AntDesignIcon size={18} name='right' />
+            </View>
+            <View style={{
+              borderBottomColor: theme.colors.tabBar,
+              borderBottomWidth: 1,
+              marginTop: 10
+            }} />
+          </Pressable>
           <Actions>
             <LanguageSelector />
 

package/themes/business/src/hooks/useLocation.tsx

@@ -48,8 +48,8 @@ export const useLocation = () => {
       GeoLocation.getCurrentPosition(
         ({ coords }) => {
           resolve({
-            latitude: coords.latitude,
-            longitude: coords.longitude,
+            latitude: typeof coords.latitude !== 'number' && !Number.isNaN(coords.latitude) ? coords.latitude : 0,
+            longitude: typeof coords.longitude !== 'number' && !Number.isNaN(coords.longitude) ? coords.longitude : 0,
             speed: coords.speed,
           });
         },
@@ -63,9 +63,10 @@ export const useLocation = () => {
     watchId.current = GeoLocation.watchPosition(
       ({ coords }) => {
         if (!isMounted.current) return;
+        if (typeof coords.latitude !== 'number' || typeof coords.longitude !== 'number') return
         const location: Location = {
-          latitude: coords.latitude,
-          longitude: coords.longitude,
+          latitude: coords.latitude || 0,
+          longitude: coords.longitude || 0,
           speed: coords.speed,
         };
         setUserLocation(location);

package/themes/business/src/types/index.tsx

@@ -630,3 +630,11 @@ export interface OrderDetailsLogisticParams {
   orderAssingId: number,
   order: any
 }
+
+export interface SessionsParams {
+  navigation: any,
+  sessionsList: any,
+  actionState: any,
+  handleDeleteSession: any,
+  handleDeleteAllSessions: any
+}

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

@@ -200,7 +200,11 @@ const CartUI = (props: any) => {
     if (cart?.business_id) {
       setOpenUpselling(true)
     } else {
-      handleUpsellingPage(cart)
+      onNavigationRedirect('CheckoutNavigator', {
+        screen: 'CheckoutPage',
+        cartUuid: cart?.uuid,
+        cartTotal: cart?.total
+      }, true)
     }
   }
 

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

@@ -135,53 +135,55 @@ export const CartContent = (props: any) => {
 					{isMultiCheckout && (
 						<>
 							{!!cartsAvailable.length && (
-								<ChCartsTotal>
-									{!!totalCartsFee && configs?.multi_business_checkout_show_combined_delivery_fee?.value === '1' && (
-										<View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
-											<OText size={14} lineHeight={24} color={theme.colors.textNormal} weight={'400'}>
-												{t('TOTAL_DELIVERY_FEE', 'Total delivery fee')}
-											</OText>
-											<OText size={14} lineHeight={24} color={theme.colors.textNormal} weight={'400'}>
-												{parsePrice(totalCartsFee)}
-											</OText>
-										</View>
-									)}
-									{cartsAvailable.reduce((sum: any, cart: any) => sum + cart?.driver_tip, 0) > 0 &&
-										configs?.multi_business_checkout_show_combined_driver_tip?.value === '1' && (
+								<>
+									<ChCartsTotal>
+										{!!totalCartsFee && configs?.multi_business_checkout_show_combined_delivery_fee?.value === '1' && (
 											<View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
 												<OText size={14} lineHeight={24} color={theme.colors.textNormal} weight={'400'}>
-													{t('DRIVER_TIP', 'Driver tip')}
+													{t('TOTAL_DELIVERY_FEE', 'Total delivery fee')}
 												</OText>
 												<OText size={14} lineHeight={24} color={theme.colors.textNormal} weight={'400'}>
-													{parsePrice(cartsAvailable.reduce((sum: any, cart: any) => sum + cart?.driver_tip, 0))}
+													{parsePrice(totalCartsFee)}
 												</OText>
 											</View>
 										)}
-									<View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
-										<OText size={16} lineHeight={24} color={theme.colors.textNormal} weight={'500'}>
-											{t('TOTAL_FOR_ALL_CARTS', 'Total for all Carts')}
-										</OText>
-										<OText size={16} lineHeight={24} color={theme.colors.textNormal} weight={'500'}>{parsePrice(totalCartsPrice)}</OText>
-									</View>
-									<View style={{ flexDirection: 'row', justifyContent: 'center', marginVertical: 20 }}>
-										<OText size={14} color={theme.colors.textNormal} weight={'300'} style={{ textAlign: 'center' }}>
-											{t('CART_GROUP_MESSAGE_ALERT', 'Discounts may be applied at the time of payment for this group.')}
-										</OText>
-									</View>
-								</ChCartsTotal>
+										{cartsAvailable.reduce((sum: any, cart: any) => sum + cart?.driver_tip, 0) > 0 &&
+											configs?.multi_business_checkout_show_combined_driver_tip?.value === '1' && (
+												<View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
+													<OText size={14} lineHeight={24} color={theme.colors.textNormal} weight={'400'}>
+														{t('DRIVER_TIP', 'Driver tip')}
+													</OText>
+													<OText size={14} lineHeight={24} color={theme.colors.textNormal} weight={'400'}>
+														{parsePrice(cartsAvailable.reduce((sum: any, cart: any) => sum + cart?.driver_tip, 0))}
+													</OText>
+												</View>
+											)}
+										<View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
+											<OText size={16} lineHeight={24} color={theme.colors.textNormal} weight={'500'}>
+												{t('TOTAL_FOR_ALL_CARTS', 'Total for all Carts')}
+											</OText>
+											<OText size={16} lineHeight={24} color={theme.colors.textNormal} weight={'500'}>{parsePrice(totalCartsPrice)}</OText>
+										</View>
+										<View style={{ flexDirection: 'row', justifyContent: 'center', marginVertical: 20 }}>
+											<OText size={14} color={theme.colors.textNormal} weight={'300'} style={{ textAlign: 'center' }}>
+												{t('CART_GROUP_MESSAGE_ALERT', 'Discounts may be applied at the time of payment for this group.')}
+											</OText>
+										</View>
+									</ChCartsTotal>
+									<CheckoutAction style={{ marginTop: 0 }}>
+										<OButton
+											text={t('CHECKOUT', 'Checkout')}
+											bgColor={!cartsAvailable.length ? theme.colors.secundary : theme.colors.primary}
+											isDisabled={!cartsAvailable.length}
+											borderColor={theme.colors.primary}
+											imgRightSrc={null}
+											textStyle={{ color: 'white', textAlign: 'center', flex: 1 }}
+											onClick={() => handleCheckoutRedirect()}
+											style={{ width: '100%', flexDirection: 'row', justifyContent: 'center', borderRadius: 7.6, shadowOpacity: 0 }}
+										/>
+									</CheckoutAction>
+								</>
 							)}
-							<CheckoutAction style={{ marginTop: 0 }}>
-								<OButton
-									text={t('CHECKOUT', 'Checkout')}
-									bgColor={!cartsAvailable.length ? theme.colors.secundary : theme.colors.primary}
-									isDisabled={!cartsAvailable.length}
-									borderColor={theme.colors.primary}
-									imgRightSrc={null}
-									textStyle={{ color: 'white', textAlign: 'center', flex: 1 }}
-									onClick={() => handleCheckoutRedirect()}
-									style={{ width: '100%', flexDirection: 'row', justifyContent: 'center', borderRadius: 7.6, shadowOpacity: 0 }}
-								/>
-							</CheckoutAction>
 						</>
 					)}
 				</>

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

@@ -5,6 +5,7 @@ import NativeStripeSdk from '@stripe/stripe-react-native/src/NativeStripeSdk'
 import Picker from 'react-native-country-picker-modal';
 import MaterialIcons from 'react-native-vector-icons/MaterialIcons'
 import IconAntDesign from 'react-native-vector-icons/AntDesign';
+import { useIsFocused } from '@react-navigation/native';
 
 import ReactNativeHapticFeedback from "react-native-haptic-feedback";
 import {
@@ -100,10 +101,12 @@ const CheckoutUI = (props: any) => {
 		currency,
 		merchantId,
 		setPlaceSpotNumber,
-		maxDate
+		maxDate,
+		urlscheme
 	} = props
 
 	const theme = useTheme();
+	const isFocused = useIsFocused();
 
 	const styles = StyleSheet.create({
 		btnBackArrow: {
@@ -208,7 +211,7 @@ const CheckoutUI = (props: any) => {
 	const isDisabledButtonPlace = loading || !cart?.valid || (!paymethodSelected && cart?.balance > 0) ||
 		placing || errorCash || subtotalWithTaxes < cart?.minimum ||
 		(cardsMethods.includes(paymethodSelected?.gateway) && cardList?.cards?.length === 0) ||
-		(options.type === 1 &&
+		(options.type === 1 && !isGiftCardCart &&
 			validationFields?.fields?.checkout?.driver_tip?.enabled &&
 			validationFields?.fields?.checkout?.driver_tip?.required &&
 			(Number(cart?.driver_tip) <= 0)) ||
@@ -413,6 +416,7 @@ const CheckoutUI = (props: any) => {
 	}, [])
 
 	useEffect(() => {
+		if (!isFocused) return
 		if (!cartState?.loading && (cartState?.error || typeof cartState?.cart === 'string')) {
 			const error = cartState?.error || typeof cartState.cart === 'string' && cartState.cart
 			if (error) {
@@ -420,7 +424,7 @@ const CheckoutUI = (props: any) => {
 				navigation.navigate('BusinessList')
 			}
 		}
-	}, [cartState?.error, cartState?.cart, cartState?.loading])
+	}, [cartState?.error, cartState?.cart, cartState?.loading, isFocused])
 
 	useEffect(() => {
 		const keyboardDidShowListener = Keyboard.addListener('keyboardDidShow', () => {
@@ -814,6 +818,7 @@ const CheckoutUI = (props: any) => {
 									handlePaymentMethodClickCustom={handlePaymentMethodClick}
 									handlePlaceOrder={handlePlaceOrder}
 									merchantId={merchantId}
+									urlscheme={urlscheme}
 									setMethodPaySupported={setMethodPaySupported}
 									methodPaySupported={methodPaySupported}
 									placeByMethodPay={placeByMethodPay}
@@ -955,7 +960,7 @@ const CheckoutUI = (props: any) => {
 										{t('INVALID_CART_MOMENT', 'Selected schedule time is invalid, please select a schedule into the business schedule interval.')}
 									</OText>
 								)}
-								{options.type === 1 &&
+								{options.type === 1 && !isGiftCardCart &&
 									validationFields?.fields?.checkout?.driver_tip?.enabled &&
 									validationFields?.fields?.checkout?.driver_tip?.required &&
 									(Number(cart?.driver_tip) <= 0) && (

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

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react'
+import React, { useState, useEffect, useCallback } from 'react'
 import {
   useLanguage,
   useConfig,
@@ -82,12 +82,12 @@ const MultiCheckoutUI = (props: any) => {
     wrapperNavbar: {
       paddingHorizontal: 20,
       backgroundColor: theme?.colors?.white,
-			borderWidth: 0
+      borderWidth: 0
     },
     detailWrapper: {
-			paddingHorizontal: 20,
-			width: '100%'
-		},
+      paddingHorizontal: 20,
+      width: '100%'
+    },
   })
 
   const [, { showToast }] = useToast();
@@ -143,16 +143,17 @@ const MultiCheckoutUI = (props: any) => {
     ?.reduce((sum: any, cart: any) => sum + clearAmount((cart?.subtotal + getIncludedTaxes(cart)) * accumulationRateBusiness(cart?.business_id)), 0)
     ?.toFixed(configs.format_number_decimal_length?.value ?? 2)
 
-	const [showTitle, setShowTitle] = useState(false)
+  const [showTitle, setShowTitle] = useState(false)
   const [isUserDetailsEdit, setIsUserDetailsEdit] = useState(false);
   const [phoneUpdate, setPhoneUpdate] = useState(false);
   const [userErrors, setUserErrors] = useState<any>([]);
+  const [cartsOpened, setCartsOpened] = useState([])
   const [placeByMethodPay, setPlaceByMethodPay] = useState(false)
-	const [allowedGuest, setAllowedGuest] = useState(false)
-	const [isOpen, setIsOpen] = useState(false)
-	const [requiredFields, setRequiredFields] = useState<any>([])
-	const stripePaymethods: any = ['stripe', 'stripe_direct', 'stripe_connect', 'stripe_redirect']
-	const [openModal, setOpenModal] = useState({ login: false, signup: false, isGuest: false })
+  const [allowedGuest, setAllowedGuest] = useState(false)
+  const [isOpen, setIsOpen] = useState(false)
+  const [requiredFields, setRequiredFields] = useState<any>([])
+  const stripePaymethods: any = ['stripe', 'stripe_direct', 'stripe_connect', 'stripe_redirect']
+  const [openModal, setOpenModal] = useState({ login: false, signup: false, isGuest: false })
   const [methodPaySupported, setMethodPaySupported] = useState({ enabled: false, message: null, loading: true })
   const methodsPay = ['global_google_pay', 'global_apple_pay']
   const isDisablePlaceOrderButton = cartGroup?.loading || placing || (!(paymethodSelected?.paymethod_id || paymethodSelected?.wallet_id) && cartGroup?.result?.balance > 0) ||
@@ -170,7 +171,7 @@ const MultiCheckoutUI = (props: any) => {
     setUserErrors([])
     const errors = []
     const notFields = ['coupon', 'driver_tip', 'mobile_phone', 'address', 'zipcode', 'address_notes']
-		const _requiredFields: any = []
+    const _requiredFields: any = []
 
     Object.values(validationFields?.fields?.checkout).map((field: any) => {
       if (field?.required && !notFields.includes(field.code)) {
@@ -188,7 +189,7 @@ const MultiCheckoutUI = (props: any) => {
     ) {
       _requiredFields.push('cellphone')
     }
-		setRequiredFields(_requiredFields)
+    setRequiredFields(_requiredFields)
 
     if (phoneUpdate) {
       errors.push(t('NECESSARY_UPDATE_COUNTRY_PHONE_CODE', 'It is necessary to update your phone number'))
@@ -203,18 +204,18 @@ const MultiCheckoutUI = (props: any) => {
 
   const handlePlaceOrder = (confirmPayment?: any) => {
     if (stripePaymethods.includes(paymethodSelected?.gateway) && user?.guest_id) {
-			setOpenModal({ ...openModal, signup: true, isGuest: true })
-			return
-		}
+      setOpenModal({ ...openModal, signup: true, isGuest: true })
+      return
+    }
 
     if (!userErrors.length && (!requiredFields?.length || allowedGuest)) {
       handleGroupPlaceOrder && handleGroupPlaceOrder(confirmPayment)
       return
     }
     if (requiredFields?.length) {
-			setIsOpen(true)
-			return
-		}
+      setIsOpen(true)
+      return
+    }
     let stringError = ''
     Object.values(userErrors).map((item: any, i: number) => {
       stringError += (i + 1) === userErrors.length ? `- ${item?.message || item}` : `- ${item?.message || item}\n`
@@ -224,26 +225,34 @@ const MultiCheckoutUI = (props: any) => {
   }
 
   const handlePlaceOrderAsGuest = () => {
-		setIsOpen(false)
-		handleGroupPlaceOrder && handleGroupPlaceOrder()
-	}
+    setIsOpen(false)
+    handleGroupPlaceOrder && handleGroupPlaceOrder()
+  }
 
   const handleSuccessSignup = (user: any) => {
-		login({
-			user,
-			token: user?.session?.access_token
-		})
-		openModal?.isGuest && handlePlaceOrderAsGuest()
-		setOpenModal({ ...openModal, signup: false, isGuest: false })
-	}
-
-	const handleSuccessLogin = (user: any) => {
-		if (user) setOpenModal({ ...openModal, login: false })
-	}
+    login({
+      user,
+      token: user?.session?.access_token
+    })
+    openModal?.isGuest && handlePlaceOrderAsGuest()
+    setOpenModal({ ...openModal, signup: false, isGuest: false })
+  }
+
+  const handleSuccessLogin = (user: any) => {
+    if (user) setOpenModal({ ...openModal, login: false })
+  }
 
   const handleScroll = ({ nativeEvent: { contentOffset } }: any) => {
-		setShowTitle(contentOffset.y > 30)
-	}
+    setShowTitle(contentOffset.y > 30)
+  }
+
+  const handleGoBack = () => {
+    if (navigation?.canGoBack()) {
+      navigation.goBack()
+    } else {
+      navigation.navigate('BottomTab', { screen: 'Cart' })
+    }
+  }
 
   useEffect(() => {
     if (validationFields && validationFields?.fields?.checkout) {
@@ -283,13 +292,25 @@ const MultiCheckoutUI = (props: any) => {
     }
   }, [paymethodSelected])
 
+  const changeActiveState = useCallback((isClosed: boolean, uuid: string) => {
+    const isActive = cartsOpened?.includes?.(uuid)
+    if (isActive || !isClosed) {
+      setCartsOpened(cartsOpened?.filter?.((_uuid) => _uuid !== uuid))
+    } else {
+      setCartsOpened([
+        ...cartsOpened,
+        uuid
+      ])
+    }
+  }, [cartsOpened])
+
   return (
     <>
       <SafeAreaView style={{ backgroundColor: theme.colors.backgroundPage }}>
         <View style={styles.wrapperNavbar}>
           <TopHeader>
             <>
-              <TopActions onPress={() => navigation?.canGoBack() && navigation.goBack()}>
+              <TopActions onPress={() => handleGoBack()}>
                 <IconAntDesign
                   name='arrowleft'
                   size={26}
@@ -321,8 +342,8 @@ const MultiCheckoutUI = (props: any) => {
             paddingTop={Platform.OS === 'ios' ? 0 : 4}
             btnStyle={{ paddingLeft: 0 }}
             titleWrapStyle={{ paddingHorizontal: 0 }}
-						titleStyle={{ marginRight: 0, marginLeft: 0 }}
-						style={{ marginTop: 20 }}
+            titleStyle={{ marginRight: 0, marginLeft: 0 }}
+            style={{ marginTop: 20 }}
           />
         </View>
         <ChContainer style={styles.pagePadding}>
@@ -514,6 +535,9 @@ const MultiCheckoutUI = (props: any) => {
                     hideDriverTip={configs?.multi_business_checkout_show_combined_driver_tip?.value === '1'}
                     onNavigationRedirect={(route: string, params: any) => props.navigation.navigate(route, params)}
                     businessConfigs={cart?.business?.configs}
+                    cartsOpened={cartsOpened}
+                    changeActiveState={changeActiveState}
+                    isActive={cartsOpened?.includes?.(cart?.uuid)}
                   />
                   {openCarts.length > 1 && (
                     <View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginTop: 13, marginHorizontal: -40 }} />
@@ -623,30 +647,30 @@ const MultiCheckoutUI = (props: any) => {
           </ScrollView>
         </OModal>
         <OModal
-						open={isOpen}
-						onClose={() => setIsOpen(false)}
-					>
-						<View style={styles.detailWrapper}>
-							<UserDetails
-								isUserDetailsEdit
-								useValidationFields
-								useDefualtSessionManager
-								useSessionUser
-								isCheckout
-								isEdit
-								phoneUpdate={phoneUpdate}
-								togglePhoneUpdate={togglePhoneUpdate}
-								requiredFields={requiredFields}
-								hideUpdateButton
-								handlePlaceOrderAsGuest={handlePlaceOrderAsGuest}
-								onClose={() => {
-									setIsOpen(false)
-									handlePlaceOrder()
-								}}
-								setIsOpen={setIsOpen}
-							/>
-						</View>
-					</OModal>
+          open={isOpen}
+          onClose={() => setIsOpen(false)}
+        >
+          <View style={styles.detailWrapper}>
+            <UserDetails
+              isUserDetailsEdit
+              useValidationFields
+              useDefualtSessionManager
+              useSessionUser
+              isCheckout
+              isEdit
+              phoneUpdate={phoneUpdate}
+              togglePhoneUpdate={togglePhoneUpdate}
+              requiredFields={requiredFields}
+              hideUpdateButton
+              handlePlaceOrderAsGuest={handlePlaceOrderAsGuest}
+              onClose={() => {
+                setIsOpen(false)
+                handlePlaceOrder()
+              }}
+              setIsOpen={setIsOpen}
+            />
+          </View>
+        </OModal>
       </Container>
 
       <FloatingButton

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

@@ -72,7 +72,7 @@ export const MultiOrdersDetailsUI = (props: any) => {
       navigation?.canGoBack() && navigation.goBack();
       return;
     }
-    navigation.navigate('BusinessList');
+    navigation.navigate('BottomTab');
     return true
   }
 

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

@@ -65,6 +65,7 @@ const PaymentOptionsUI = (props: any) => {
 		handlePaymentMethodClickCustom,
 		handlePlaceOrder,
 		merchantId,
+		urlscheme,
 		setMethodPaySupported,
 		placeByMethodPay,
 		methodPaySupported,
@@ -360,6 +361,7 @@ const PaymentOptionsUI = (props: any) => {
 					handleSource={handlePaymethodDataChange}
 					onCancel={() => handlePaymethodClick(null)}
 					merchantId={merchantId}
+					urlscheme={urlscheme}
 					setMethodPaySupported={setMethodPaySupported}
 					methodPaySupported={methodPaySupported}
 					placeByMethodPay={placeByMethodPay}
@@ -407,6 +409,7 @@ const PaymentOptionsUI = (props: any) => {
 						handleSource={handlePaymethodDataChange}
 						onCancel={() => handlePaymethodClick(null)}
 						merchantId={merchantId}
+						urlscheme={urlscheme}
 						publicKeyAddCard={isOpenMethod?.paymethod?.credentials?.stripe?.publishable}
 					/>
 				</KeyboardAvoidingView>

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

@@ -74,9 +74,9 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 
 	const [isActive, setActiveState] = useState(false)
 	const [isServiceOpen, setIsServiceOpen] = useState(false)
+	const [productQuantityState, setProductQuantityState] = useState(product.quantity.toString())
 	// const [setHeight, setHeightState] = useState({ height: new Animated.Value(0) })
 	// const [setRotate, setRotateState] = useState({ angle: new Animated.Value(0) })
-	let productQuantity = product.quantity.toString()
 
 	const productInfo = () => {
 		if (isCartProduct) {
@@ -120,7 +120,7 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 
 	const handleChangeQuantity = (value: string) => {
 		if (!orderState.loading) {
-			productQuantity = value 
+			setProductQuantityState(value)
 			if (parseInt(value) === 0) {
 				onDeleteProduct && onDeleteProduct(product)
 			} else {
@@ -210,7 +210,7 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 											<RNPickerSelect
 												items={productOptions}
 												onValueChange={handleChangeQuantity}
-												value={productQuantity}
+												value={productQuantityState}
 												style={pickerStyle}
 												useNativeAndroidPickerStyle={false}
 												placeholder={{}}
@@ -286,15 +286,15 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 							{productInfo().ingredients.length > 0 && productInfo().ingredients.some((ingredient: any) => !ingredient.selected) && (
 								<ProductOptionsList>
 									<OText size={10} color={theme.colors.textSecondary}>{t('INGREDIENTS', 'Ingredients')}</OText>
-									{productInfo().ingredients.map((ingredient: any) => !ingredient.selected && (
-										<OText size={10} color={theme.colors.textThird} key={ingredient.id} style={{ marginLeft: 10 }}>{t('NO', 'No')} {ingredient.name}</OText>
+									{productInfo().ingredients.map((ingredient: any, i) => !ingredient.selected && (
+										<OText size={10} color={theme.colors.textThird} key={ingredient.id + i} style={{ marginLeft: 10 }}>{t('NO', 'No')} {ingredient.name}</OText>
 									))}
 								</ProductOptionsList>
 							)}
 							{productInfo().options.length > 0 && (
 								<ProductOptionsList>
-									{productInfo().options.sort((a: any, b: any) => a.rank - b.rank).map((option: any, i: number) => (
-										<ProductOption key={option.id + i}>
+									{productInfo().options.sort((a: any, b: any) => a.rank - b.rank).map((option: any) => (
+										<ProductOption key={option.id}>
 											<OText size={10} color={theme.colors.textSecondary}>{option.name}</OText>
 											{option.suboptions.map((suboption: any) => (
 												<ProductSubOption key={suboption.id}>

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

@@ -34,7 +34,8 @@ const StripeElementsFormUI = (props: any) => {
 		methodPaySupported,
 		setPlaceByMethodPay,
 		cartTotal,
-		publicKeyAddCard
+		publicKeyAddCard,
+		urlScheme
 	} = props;
 
 	const theme = useTheme();
@@ -204,7 +205,7 @@ const StripeElementsFormUI = (props: any) => {
 					<StripeProvider
 						publishableKey={isToSave}
 						merchantIdentifier={merchantId}
-						urlScheme={merchantId}
+						urlScheme={`${urlScheme}://checkout/${cart?.uuid}`}
 					>
 						{methodsPay?.includes(paymethod) ? (
 							<StripeMethodForm