ordering-ui-react-native 0.21.50 → 0.21.51

package/package.json

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

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

@@ -263,6 +263,12 @@ export const OrderHeaderComponent = (props: OrderHeader) => {
             )}
           </>
         </OText>
+        {order?.external_id && (
+          <OText size={13}>
+            <OText size={13} weight='bold'>{`${t('EXTERNAL_ID', 'External ID :')} `}</OText>
+            {order?.external_id}id_de_prueba
+          </OText>
+        )}
         {!order?.isLogistic && !!order?.delivery_type && (!order?.order_group_id || !logisticOrderStatus?.includes(order?.status)) && (
           <>
             <OText size={13}>

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

@@ -122,8 +122,8 @@ const AddressFormUI = (props: AddressFormParams) => {
 			width: 16
 		},
 		wrapperNavbar: Platform.OS === 'ios'
-			? { paddingVertical: 0, paddingLeft: 40, paddingRight: 20 }
-			: { paddingVertical: 10, paddingLeft: 40, paddingRight: 20 }
+			? { paddingVertical: 0, paddingLeft: 20, paddingRight: 20 }
+			: { paddingVertical: 10, paddingLeft: 20, paddingRight: 20 }
 	});
 
 	const [, t] = useLanguage();

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

@@ -2,7 +2,7 @@ import styled from 'styled-components/native'
 
 export const AddressFormContainer = styled.View`
     flex: 1;
-    padding: 0px 40px 20px;
+    padding: 0px 20px 20px;
     background-color: ${(props: any) => props.theme.colors.backgroundPage};
     justify-content: space-between;
 `

package/themes/original/src/components/AddressList/styles.tsx

@@ -3,10 +3,10 @@ import styled from 'styled-components/native'
 export const Container = styled.ScrollView`
     position: relative;
     flex: 1;
-	 paddingLeft: 40px;
-	 paddingRight: 40px;
-     margin-bottom: 40px;
-     padding-top: 10px;
+	paddingLeft: 20px;
+	paddingRight: 20px;
+    margin-bottom: 40px;
+    padding-top: 10px;
 `
 
 export const AddressItem = styled.TouchableOpacity`

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

@@ -72,7 +72,7 @@ export const BusinessBasicInformation = (
 			alignItems: 'flex-start'
 		},
 		businessInfo: {
-			paddingHorizontal: 40,
+			paddingHorizontal: 20,
 			paddingTop: isChewLayout ? 0 : 56,
 		},
 		bullet: {
@@ -95,7 +95,7 @@ export const BusinessBasicInformation = (
 			width: '100%',
 			top: 0,
 			zIndex: 100,
-			left: 40
+			left: 20
 		},
 		socialIcon: {
 			borderRadius: 3,

package/themes/original/src/components/BusinessBasicInformation/styles.tsx

@@ -11,7 +11,7 @@ export const BusinessHeader = styled.ImageBackground`
 `;
 export const BusinessLogo = styled.View`
   position: absolute;
-  start: 40px;
+  start: 20px;
   top: -36px;
   z-index: 50;
   box-shadow: 0 0 2px ${Platform.OS == 'android' ? '#000000DD' : '#0000001A'};

package/themes/original/src/components/BusinessInformation/styles.tsx

@@ -17,7 +17,7 @@ export const MediaWrapper = styled.ScrollView`
   height: 127px;
 `
 export const InnerContent = styled.View`
-  padding: 20px 40px;
+  padding: 20px;
 `
 export const WrapScheduleBlock = styled.View`
   margin: 20px 0;
@@ -36,4 +36,4 @@ export const DivideView = styled.View`
 	height: 8px;
 	background-color: ${(props: any) => props.theme.colors.backgroundGray100};
 	margin-horizontal: -40px;
-`;
+`;

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

@@ -24,6 +24,8 @@ export const BusinessItemAccordion = (props: any) => {
 		checkoutButtonDisabled,
 		isMultiCheckout,
 		isFromUpselling,
+		changeActiveState,
+		isActive,
 		isGiftCart
 	} = props
 
@@ -39,14 +41,13 @@ export const BusinessItemAccordion = (props: any) => {
 	const isProducts = cart?.products?.length
 	const isBusinessChangeEnabled = configs?.cart_change_business_validation?.value === '1'
 
-	const [isActive, setActiveState] = useState(!!singleBusiness)
 	const [viewedCart, setViewedCart] = useState<any>(null)
 
 	useEffect(() => {
 		const cartsArray = Object.values(orderState?.carts)
 		const cartsLength = cartsArray.filter((cart: any) => cart.products.length > 0).length ?? 0
 		if (cartsLength === 1) {
-			setActiveState(!isClosed)
+			changeActiveState(!isClosed, cart?.uuid)
 		}
 	}, [orderState?.carts, isClosed])
 
@@ -69,7 +70,7 @@ export const BusinessItemAccordion = (props: any) => {
 		<BIContainer isClosed={isClosed} isMultiCheckout={isMultiCheckout} checkoutVisible={!isActive && !isClosed && !!isProducts && !checkoutButtonDisabled}>
 			<BIHeader
 				isClosed={isClosed}
-				onPress={() => !isClosed ? setActiveState(!isActive) : isClosed}
+				onPress={() => !isClosed ? changeActiveState(!isClosed, cart?.uuid) : isClosed}
 				activeOpacity={1}
 			>
 				<BIInfo>

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

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react'
 import { useLanguage, BusinessSearchList, useOrder, useUtils, useEvent, showToast, ToastType } from 'ordering-components/native'
-import { ScrollView, StyleSheet, TouchableOpacity, View, Dimensions } from 'react-native'
+import { ScrollView, StyleSheet, TouchableOpacity, View, Dimensions, Platform } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import { useTheme } from 'styled-components/native'
 import { HeaderTitle, OButton, OModal, OText } from '../shared'
@@ -92,7 +92,7 @@ export const BusinessListingSearchUI = (props: BusinessSearchParams) => {
     },
     filterContainer: {
       maxHeight: screenHeight - 150,
-      paddingHorizontal: 40,
+      paddingHorizontal: 20,
       width: '100%'
     },
     searchInput: {
@@ -259,7 +259,6 @@ export const BusinessListingSearchUI = (props: BusinessSearchParams) => {
         display: 'flex',
         flexDirection: 'row',
         alignItems: 'center',
-        paddingHorizontal: hideBrowse && !isChewLayout ? 40 : 20,
       }}>
         {hideBrowse && !isChewLayout && (
           <OButton
@@ -285,10 +284,10 @@ export const BusinessListingSearchUI = (props: BusinessSearchParams) => {
           />
         )}
         <HeaderTitle ph={20} text={t('SEARCH', 'Search')} />
-        <AntDesignIcon name='filter' size={18} style={{ marginLeft: 'auto', marginTop: 55, paddingHorizontal: 20 }} onPress={() => handleOpenfilters()} />
+        <AntDesignIcon name='filter' size={18} style={{ marginLeft: 'auto', marginTop: Platform.OS === 'ios' ? 35 : 55, paddingHorizontal: 20 }} onPress={() => handleOpenfilters()} />
       </View>
       <BContainer
-        style={{ paddingHorizontal: isChewLayout ? 20 : 40 }}
+        style={{ paddingHorizontal: 20 }}
       >
         <SearchWrapper>
           <SearchBar

package/themes/original/src/components/BusinessListingSearch/styles.tsx

@@ -1,7 +1,7 @@
 import styled, { css } from 'styled-components/native'
 
 export const BContainer = styled.View`
-  padding: 20px 40px;
+  padding: 20px;
 `
 
 export const SearchWrapper = styled.View`

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

@@ -64,7 +64,7 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
     container: {
       height: windowHeight,
       paddingVertical: 30,
-      paddingHorizontal: 40
+      paddingHorizontal: 20
     },
     businessLogo: {
       backgroundColor: 'white',
@@ -319,7 +319,7 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
 
   return (
     <>
-      <PreOrderContainer contentContainerStyle={{ paddingVertical: 32, paddingHorizontal: 40 }}>
+      <PreOrderContainer contentContainerStyle={{ paddingVertical: 32, paddingHorizontal: 20 }}>
         <TouchableOpacity onPress={() => goToBack && goToBack()} style={{ marginBottom: 12 }}>
           <IconAntDesign
             name='close'

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

@@ -92,7 +92,7 @@ const BusinessProductsCategoriesUI = (props: any) => {
 			ref={tabsRef}
 			horizontal
 			style={{ ...styles.container, borderBottomWidth: loading ? 0 : 1 }}
-			contentContainerStyle={{ paddingHorizontal: 40 }}
+			contentContainerStyle={{ paddingHorizontal: 20 }}
 			showsHorizontalScrollIndicator={false}
 			onScroll={(e: any) => setScrollOffsetX(e.nativeEvent.contentOffset.x)}
 			scrollEventThrottle={16}

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

@@ -114,7 +114,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
     },
     searchIcon: {
       borderWidth: 0,
-      padding: 15,
+      padding: 10,
       justifyContent: 'center',
       shadowColor: theme.colors.clear,
     },
@@ -194,7 +194,8 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
         product: product,
         businessSlug: business.slug,
         businessId: business.id || product?.category?.business_id,
-        productAddedToCartLength
+        productAddedToCartLength,
+        isRedirect: false
       })
     }
     events.emit('product_clicked', product)
@@ -529,9 +530,6 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
             </View>
           </FiltProductsContainer>
         )}
-        {isOpenFiltProducts && (
-          <BackgroundGray isIos={Platform.OS === 'ios'} />
-        )}
         <IOScrollView
           stickyHeaderIndices={[business?.professionals?.length > 0 ? 4 : 3]}
           style={{
@@ -600,7 +598,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
             <>
               <WrapContent
                 onLayout={(event: any) => setProductListLayout(event.nativeEvent.layout)}
-                style={{ paddingHorizontal: isChewLayout ? 20 : 40 }}
+                style={{ paddingHorizontal: 20 }}
               >
                 <BusinessProductsList
                   categories={[
@@ -657,6 +655,9 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
               </WrapContent>
             </>
           )}
+          {isOpenFiltProducts && (
+            <BackgroundGray isIos={Platform.OS === 'ios'} />
+          )}
         </IOScrollView>
         {viewOrderButtonVisible && (
           <View style={{ marginBottom: 0 }}>
@@ -714,7 +715,6 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
           professionalList={business?.professionals}
           professionalSelected={professionalSelected}
           handleChangeProfessional={handleChangeProfessionalSelected}
-          handleChangeProfessional={handleChangeProfessionalSelected}
           handleUpdateProfessionals={handleUpdateProfessionals}
           onSave={() => setOpenService(false)}
           onClose={() => setOpenService(false)}

package/themes/original/src/components/BusinessProductsListing/styles.tsx

@@ -50,7 +50,7 @@ export const BackgroundGray = styled.View`
 `
 
 export const ProfessionalFilterWrapper = styled.View`
-  padding-left: 40px;
+  padding-left: 20px;
   margin-bottom: 35px;
 `
 
@@ -63,6 +63,6 @@ export const NearBusiness = styled.View`
 export const TopActions = styled.TouchableOpacity`
 	height: 60px;
 	justify-content: center;
-  padding-horizontal: 30px;
+  padding-horizontal: 20px;
   width: 100px;
 `;

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

@@ -109,7 +109,7 @@ const BusinessReviewsUI = (props: BusinessReviewsParams) => {
 	return (
 		<BusinessReviewsContainer>
 			<BusinessReviewContent
-				contentContainerStyle={{ paddingHorizontal: 40, paddingVertical: 27 }}>
+				contentContainerStyle={{ paddingHorizontal: 20, paddingVertical: 27 }}>
 				{reviewsList.error ? (
 					<OText size={16}>{t('ERROR_UNKNOWN', 'An error has ocurred')}</OText>
 				) : (

package/themes/original/src/components/BusinessesListing/Layout/Appointment/index.tsx

@@ -415,7 +415,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 						<ScrollView
 							showsHorizontalScrollIndicator={false}
 							nestedScrollEnabled
-							horizontal contentContainerStyle={{ paddingHorizontal: 40 }}>
+							horizontal contentContainerStyle={{ paddingHorizontal: 20 }}>
 							{featuredBusiness.map((bAry: any, idx) => (
 								<View key={'f-listing_' + idx}>
 									<BusinessFeaturedController

package/themes/original/src/components/BusinessesListing/Layout/Appointment/styles.tsx

@@ -54,13 +54,13 @@ export const WrapMomentOption = styled.TouchableOpacity`
 export const HeaderWrapper = styled.ImageBackground`
 	width: 100%;
 	height: 370px;
-	padding: 20px 40px;
+	padding: 20px;
 	background-color: transparent;
 `;
 
 export const ListWrapper = styled.View`
 	background-color: ${(props: any) => props.theme.colors.backgroundLight};
-	padding-horizontal: 40px;
+	padding-horizontal: 20px;
 `;
 
 export const FeaturedWrapper = styled.View`
@@ -72,7 +72,7 @@ export const FeaturedWrapper = styled.View`
 export const OrderProgressWrapper = styled.View`
   margin-top: 37px;
   margin-bottom: 20px;
-	padding-horizontal: 40px;
+	padding-horizontal: 20px;
 `
 
 export const FarAwayMessage = styled.View`
@@ -98,10 +98,10 @@ export const FilterWrapper = styled.View`
 `
 
 export const ServiceWrapper = styled.View`
-  padding-horizontal: 40px;
+  padding-horizontal: 20px;
 `
 
 export const PriceWrapper = styled.View`
-  padding-horizontal: 40px;
+  padding-horizontal: 20px;
   margin-top: 30px;
 `

package/themes/original/src/components/BusinessesListing/Layout/Original/FlatListBusinessListFooter.tsx

@@ -11,7 +11,7 @@ export const FlatListBusinessListFooter = (props : any) => {
     } = props
     return (
         <>
-            <ListWrapper style={{ paddingHorizontal: isChewLayout ? 20 : 40 }}>
+            <ListWrapper style={{ paddingHorizontal: 20 }}>
                 {(businessesList.loading || !businessesList?.fetched) && (
                     <>
                         {[

package/themes/original/src/components/BusinessesListing/Layout/Original/FlatListBusinessListHeader.tsx

@@ -133,7 +133,7 @@ export const FlatListBusinessListHeader = (props: any) => {
             backgroundColor: theme.colors.white,
             borderColor: theme.colors.backgroundGray,
             borderRadius: 8,
-            marginHorizontal: 40,
+            marginHorizontal: 20,
             minHeight: 45,
             paddingVertical: 5,
             paddingHorizontal: 20,
@@ -165,7 +165,7 @@ export const FlatListBusinessListHeader = (props: any) => {
             )}
             <View style={{
                 height: !isPreOrderSetting && isChewLayout ? 150 : isChewLayout ? 200 : isFarAway ? 150 : 100,
-                marginTop: isChewLayout ? 0 : Platform.OS == 'ios' ? 0 : 50,
+                marginTop: 0,
                 backgroundColor: isChewLayout ? theme?.colors?.chew : theme.colors?.white
             }}
             >
@@ -276,7 +276,7 @@ export const FlatListBusinessListHeader = (props: any) => {
                             bgHeaderHeight={bgHeaderHeight}
                         >
                             {!auth && (
-                                <TouchableOpacity onPress={() => navigation?.canGoBack() && navigation.goBack()} style={{ position: 'absolute', marginStart: 40, paddingVertical: 20 }}>
+                                <TouchableOpacity onPress={() => navigation?.canGoBack() && navigation.goBack()} style={{ position: 'absolute', marginStart: 20, paddingVertical: 20 }}>
                                     <OIcon src={theme.images.general.arrow_left} color={theme.colors.textNormal} />
                                 </TouchableOpacity>
                             )}
@@ -284,7 +284,7 @@ export const FlatListBusinessListHeader = (props: any) => {
                     ) : (
                         <>
                             {!auth && (
-                                <TouchableOpacity onPress={() => navigation?.canGoBack() && navigation.goBack()} style={{ position: 'absolute', marginStart: 40, paddingVertical: 20 }}>
+                                <TouchableOpacity onPress={() => navigation?.canGoBack() && navigation.goBack()} style={{ position: 'absolute', marginStart: 20, paddingVertical: 20 }}>
                                     <OIcon src={theme.images.general.arrow_left} color={theme.colors.textNormal} />
                                 </TouchableOpacity>
                             )}
@@ -324,12 +324,12 @@ export const FlatListBusinessListHeader = (props: any) => {
             {
                 !businessId && !props.franchiseId && featuredBusiness && featuredBusiness.length > 0 && (
                     <FeaturedWrapper>
-                        <OText size={16} style={{ marginLeft: 40 }} weight={Platform.OS === 'ios' ? '600' : 'bold'}>{t('BUSINESS_FEATURE', 'Featured business')}</OText>
+                        <OText size={16} style={{ marginLeft: 20 }} weight={Platform.OS === 'ios' ? '600' : 'bold'}>{t('BUSINESS_FEATURE', 'Featured business')}</OText>
                         <ScrollView
                             showsHorizontalScrollIndicator={false}
                             nestedScrollEnabled
                             horizontal
-                            contentContainerStyle={{ paddingHorizontal: 40 }}
+                            contentContainerStyle={{ paddingHorizontal: 20 }}
                         >
                             {featuredBusiness.map((bAry: any, idx: number) => (
                                 <View key={'f-listing_' + idx}>
@@ -372,7 +372,7 @@ export const FlatListBusinessListHeader = (props: any) => {
             <PageBanner position='app_business_listing' navigation={navigation} />
             <View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100 }} />
 
-            <ListWrapper style={{ paddingHorizontal: isChewLayout ? 20 : 40 }}>
+            <ListWrapper style={{ paddingHorizontal: 20 }}>
                 {!businessId && !isAllCategoriesHidden && (
                     <BusinessTypeFilter
                         images={props.images}

package/themes/original/src/components/BusinessesListing/Layout/Original/index.tsx

@@ -94,7 +94,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 			backgroundColor: theme.colors.white,
 			borderColor: theme.colors.backgroundGray,
 			borderRadius: 8,
-			marginHorizontal: 40,
+			marginHorizontal: 20,
 			minHeight: 45,
 			paddingVertical: 5,
 			paddingHorizontal: 20,

package/themes/original/src/components/BusinessesListing/Layout/Original/styles.tsx

@@ -61,7 +61,7 @@ export const WrapMomentOption = styled.TouchableOpacity`
 export const HeaderWrapper = styled.ImageBackground`
 	width: 100%;
   height: 270px;
-	padding: 20px 40px;
+	padding: 20px;
 	background-color: transparent;
 `;
 

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

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useRef } from 'react';
 import {
   Cart as CartController,
   useOrder,
@@ -52,7 +52,11 @@ const CartUI = (props: any) => {
     preorderMaximumDays,
     preorderMinimumDays,
     cateringTypes,
-    isFromUpselling
+    isFromUpselling,
+    cartsOpened,
+    setCartsOpened,
+    changeActiveState,
+    isActive
   } = props
 
   const theme = useTheme();
@@ -62,7 +66,7 @@ const CartUI = (props: any) => {
   const [{ configs }] = useConfig();
   const [{ parsePrice, parseNumber, parseDate }] = useUtils()
   const [validationFields] = useValidationFields()
-
+  const commentRef = useRef()
   const [openUpselling, setOpenUpselling] = useState(false)
   const [openChangeStore, setOpenChangeStore] = useState(false)
   const [canOpenUpselling, setCanOpenUpselling] = useState(false)
@@ -109,7 +113,7 @@ const CartUI = (props: any) => {
     }
   }
 
-  const handleUpsellingPage = (individualCart : any) => {
+  const handleUpsellingPage = (individualCart: any) => {
     const isProductCartParam = !!individualCart?.products?.length
     setOpenUpselling(false)
     setCanOpenUpselling(false)
@@ -232,6 +236,10 @@ const CartUI = (props: any) => {
         checkoutButtonDisabled={(openUpselling && !canOpenUpselling) || subtotalWithTaxes < cart?.minimum || !cart?.valid_address}
         isMultiCheckout={isMultiCheckout}
         isFromUpselling={isFromUpselling}
+        cartsOpened={cartsOpened}
+        setCartsOpened={setCartsOpened}
+        changeActiveState={changeActiveState}
+        isActive={isActive}
         isGiftCart={!cart?.business_id}
       >
         {cart?.products?.length > 0 && cart?.products.map((product: any, i: number) => (
@@ -491,6 +499,7 @@ const CartUI = (props: any) => {
                         marginTop: 10,
                         borderRadius: 7.6
                       }}
+                      forwardRef={commentRef}
                       multiline
                     />
                     {commentState?.loading && (

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

@@ -1,6 +1,6 @@
-import React, { useState } from 'react';
+import React, { useCallback, useState } from 'react';
 import { View } from 'react-native';
-import { useLanguage, useConfig, useUtils } from 'ordering-components/native';
+import { useLanguage, useConfig, useUtils, useOrder } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
 import { CCContainer, CCNotCarts, CCList, CheckoutAction, ChCartsTotal } from './styles';
 
@@ -11,10 +11,9 @@ import { NotFoundSource } from '../NotFoundSource';
 
 export const CartContent = (props: any) => {
 	const {
-		carts,
-		isOrderStateCarts,
 		onNavigationRedirect,
-		singleBusiness
+		singleBusiness,
+		businessSlug
 	} = props
 
 	const theme = useTheme();
@@ -22,16 +21,22 @@ export const CartContent = (props: any) => {
 	const [{ configs }] = useConfig()
 	const [{ parsePrice }] = useUtils();
 	const [isCartsLoading, setIsCartsLoading] = useState(false)
-
-	const isChewLayout = theme?.header?.components?.layout?.type === 'chew'
+	const [cartsOpened, setCartsOpened] = useState([])
+	const [{ carts: cartsContext }] = useOrder();
+	const cartsList =
+		(cartsContext &&
+			Object.values(cartsContext).filter((cart: any) => cart.products.length > 0)) ??
+		[];
+	const carts = businessSlug
+		? cartsList.filter((cart: any) => cart?.business?.slug === businessSlug || parseInt(businessSlug) === cart?.business_id)
+		: cartsList
+	const isOrderStateCarts = !!carts
 	const isMultiCheckout = configs?.checkout_multi_business_enabled?.value === '1'
-	const cartsAvailable: any = Object.values(carts)?.filter((cart: any) => cart?.valid && cart?.status !== 2)
-
+	const cartsAvailable: any = Object.values(carts || {})?.filter((cart: any) => cart?.valid && cart?.status !== 2)
 	const totalCartsPrice = cartsAvailable?.length && cartsAvailable.reduce((total: any, cart: any) => { return total + cart?.total }, 0)
 	const totalCartsFee = cartsAvailable?.length && cartsAvailable
 		?.filter((cart: any) => cart?.status !== 1 && cart?.valid && cart?.products?.length)
 		?.reduce((total: any, cart: any) => { return total + (cart?.delivery_price_with_discount) }, 0)
-
 	const handleCheckoutRedirect = () => {
 		if (cartsAvailable.length === 1) {
 			onNavigationRedirect('CheckoutNavigator', {
@@ -66,9 +71,21 @@ export const CartContent = (props: any) => {
 		}
 	}
 
+	const changeActiveState = useCallback((isClosed : boolean, uuid : string) => {
+		const isActive = cartsOpened?.includes?.(uuid) || !!singleBusiness
+		if (isActive || !isClosed) {
+			setCartsOpened(cartsOpened?.filter?.((_uuid) => _uuid !== uuid))
+		} else {
+			setCartsOpened([
+				...cartsOpened,
+				uuid
+			])
+		}
+	}, [cartsOpened])
+
 	return (
 		<CCContainer
-			style={{ paddingHorizontal: isChewLayout ? 20 : 40 }}
+			style={{ paddingHorizontal: 20 }}
 		>
 			{isOrderStateCarts && carts?.length > 0 && (
 				<>
@@ -88,8 +105,12 @@ export const CartContent = (props: any) => {
 										hideUpselling
 										businessConfigs={cart?.business?.configs}
 										hideCouponInput={configs?.multi_business_checkout_coupon_input_style?.value === 'group'}
-                    hideDeliveryFee={configs?.multi_business_checkout_show_combined_delivery_fee?.value === '1'}
+										hideDeliveryFee={configs?.multi_business_checkout_show_combined_delivery_fee?.value === '1'}
 										hideDriverTip={configs?.multi_business_checkout_show_combined_driver_tip?.value === '1'}
+										cartsOpened={cartsOpened}
+										setCartsOpened={setCartsOpened}
+										changeActiveState={changeActiveState}
+										isActive={cartsOpened?.includes?.(cart?.uuid) || !!singleBusiness}
 									/>
 									<View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginHorizontal: -40, marginTop: 20 }} />
 								</>
@@ -101,32 +122,32 @@ export const CartContent = (props: any) => {
 							{!!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' && (
-                    <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: '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' && (
+											<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.')}