ordering-ui-react-native 0.16.64 → 0.16.65-release

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

@@ -7,7 +7,7 @@ import {
   useValidationFields,
   useSession,
   useToast,
-	ToastType,
+  ToastType,
   MultiCheckout as MultiCheckoutController
 } from 'ordering-components/native'
 import { View, StyleSheet, Platform } from 'react-native'
@@ -21,6 +21,8 @@ import { AddressDetails } from '../AddressDetails'
 import { MultiCartsPaymethodsAndWallets } from '../MultiCartsPaymethodsAndWallets'
 import { Cart } from '../Cart'
 import { FloatingButton } from '../FloatingButton'
+import { DriverTips } from '../DriverTips'
+import { DriverTipsContainer } from '../Cart/styles'
 
 import {
   ChContainer,
@@ -36,11 +38,11 @@ import {
 } from './styles'
 
 const mapConfigs = {
-	mapZoom: 16,
-	mapSize: {
-		width: 640,
-		height: 190
-	}
+  mapZoom: 16,
+  mapSize: {
+    width: 640,
+    height: 190
+  }
 }
 
 const MultiCheckoutUI = (props: any) => {
@@ -53,74 +55,79 @@ const MultiCheckoutUI = (props: any) => {
     paymethodSelected,
     handleSelectPaymethod,
     handleSelectWallet,
-    handlePaymethodDataChange
+    handlePaymethodDataChange,
+    cartUuid,
+    totalCartsFee,
+    cartGroup
   } = props
 
-	const theme = useTheme();
+  const theme = useTheme();
   const styles = StyleSheet.create({
     pagePadding: {
-			paddingLeft: 40,
-			paddingRight: 40
-		},
-    wrapperNavbar: Platform.OS === 'ios'
-			? { paddingVertical: 0, paddingHorizontal: 40 }
-			: { paddingVertical: 20, paddingHorizontal: 40 }
+      paddingLeft: 40,
+      paddingRight: 40
+    },
+    wrapperNavbar: { paddingHorizontal: 40 }
   })
 
-	const [, { showToast }] = useToast();
+  const [, { showToast }] = useToast();
   const [, t] = useLanguage()
-	const [{ configs }] = useConfig();
-	const [{ parsePrice, parseDate }] = useUtils();
-	const [{ options, carts, loading }, { confirmCart }] = useOrder();
-	const [validationFields] = useValidationFields();
+  const [{ configs }] = useConfig();
+  const [{ parsePrice, parseDate }] = useUtils();
+  const [{ options, carts, loading }, { confirmCart }] = useOrder();
+  const [validationFields] = useValidationFields();
   const [{ user }] = useSession()
 
-	const configTypes = configs?.order_types_allowed?.value.split('|').map((value: any) => Number(value)) || []
-	const isPreOrder = configs?.preorder_status_enabled?.value === '1'
-  const maximumCarts = 5
-  const isDisablePlaceOrderButton = !(paymethodSelected?.paymethod_id || paymethodSelected?.wallet_id) || openCarts.length > maximumCarts
+  const configTypes = configs?.order_types_allowed?.value.split('|').map((value: any) => Number(value)) || []
+  const isPreOrder = configs?.preorder_status_enabled?.value === '1'
+  const isMultiDriverTips = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
+  const isDisablePlaceOrderButton = !(paymethodSelected?.paymethod_id || paymethodSelected?.wallet_id) || (paymethodSelected?.paymethod?.gateway === 'stripe' && !paymethodSelected?.paymethod_data)
+  const walletCarts = (Object.values(carts)?.filter((cart: any) => cart?.products && cart?.products?.length && cart?.status !== 2 && cart?.valid_schedule && cart?.valid_products && cart?.valid_address && cart?.valid_maximum && cart?.valid_minimum && cart?.wallets) || null) || []
+  const driverTipsOptions = typeof configs?.driver_tip_options?.value === 'string'
+    ? JSON.parse(configs?.driver_tip_options?.value) || []
+    : configs?.driver_tip_options?.value || []
 
-	const [isUserDetailsEdit, setIsUserDetailsEdit] = useState(false);
-	const [phoneUpdate, setPhoneUpdate] = useState(false);
-	const [userErrors, setUserErrors] = useState<any>([]);
+  const [isUserDetailsEdit, setIsUserDetailsEdit] = useState(false);
+  const [phoneUpdate, setPhoneUpdate] = useState(false);
+  const [userErrors, setUserErrors] = useState<any>([]);
   const handleMomentClick = () => {
-		if (isPreOrder) {
-			navigation.navigate('MomentOption')
-		}
-	}
+    if (isPreOrder) {
+      navigation.navigate('MomentOption')
+    }
+  }
 
   const checkValidationFields = () => {
-		setUserErrors([])
-		const errors = []
-		const notFields = ['coupon', 'driver_tip', 'mobile_phone', 'address', 'zipcode', 'address_notes']
+    setUserErrors([])
+    const errors = []
+    const notFields = ['coupon', 'driver_tip', 'mobile_phone', 'address', 'zipcode', 'address_notes']
 
-		Object.values(validationFields?.fields?.checkout).map((field: any) => {
-			if (field?.required && !notFields.includes(field.code)) {
-				if (!user[field?.code]) {
-					errors.push(t(`VALIDATION_ERROR_${field.code.toUpperCase()}_REQUIRED`, `The field ${field?.name} is required`))
-				}
-			}
-		})
+    Object.values(validationFields?.fields?.checkout).map((field: any) => {
+      if (field?.required && !notFields.includes(field.code)) {
+        if (!user[field?.code]) {
+          errors.push(t(`VALIDATION_ERROR_${field.code.toUpperCase()}_REQUIRED`, `The field ${field?.name} is required`))
+        }
+      }
+    })
 
-		if (
-			!user?.cellphone &&
-			((validationFields?.fields?.checkout?.cellphone?.enabled &&
-				validationFields?.fields?.checkout?.cellphone?.required) ||
-				configs?.verification_phone_required?.value === '1')
-		) {
-			errors.push(t('VALIDATION_ERROR_MOBILE_PHONE_REQUIRED', 'The field Phone number is required'))
-		}
+    if (
+      !user?.cellphone &&
+      ((validationFields?.fields?.checkout?.cellphone?.enabled &&
+        validationFields?.fields?.checkout?.cellphone?.required) ||
+        configs?.verification_phone_required?.value === '1')
+    ) {
+      errors.push(t('VALIDATION_ERROR_MOBILE_PHONE_REQUIRED', 'The field Phone number is required'))
+    }
 
-		if (phoneUpdate) {
-			errors.push(t('NECESSARY_UPDATE_COUNTRY_PHONE_CODE', 'It is necessary to update your phone number'))
-		}
+    if (phoneUpdate) {
+      errors.push(t('NECESSARY_UPDATE_COUNTRY_PHONE_CODE', 'It is necessary to update your phone number'))
+    }
 
-		setUserErrors(errors)
-	}
+    setUserErrors(errors)
+  }
 
   const togglePhoneUpdate = (val: boolean) => {
-		setPhoneUpdate(val)
-	}
+    setPhoneUpdate(val)
+  }
 
   const handlePlaceOrder = () => {
     if (!userErrors.length) {
@@ -128,33 +135,30 @@ const MultiCheckoutUI = (props: any) => {
       return
     }
     let stringError = ''
-		Object.values(userErrors).map((item: any, i: number) => {
-			stringError += (i + 1) === userErrors.length ? `- ${item?.message || item}` : `- ${item?.message || item}\n`
-		})
-		showToast(ToastType.Error, stringError)
+    Object.values(userErrors).map((item: any, i: number) => {
+      stringError += (i + 1) === userErrors.length ? `- ${item?.message || item}` : `- ${item?.message || item}\n`
+    })
+    showToast(ToastType.Error, stringError)
     setIsUserDetailsEdit(true)
   }
 
   useEffect(() => {
-		if (validationFields && validationFields?.fields?.checkout) {
-			checkValidationFields()
-		}
-	}, [validationFields, user])
+    if (validationFields && validationFields?.fields?.checkout) {
+      checkValidationFields()
+    }
+  }, [validationFields, user])
 
   return (
     <>
       <Container noPadding>
         <View style={styles.wrapperNavbar}>
           <NavBar
-            isVertical
             title={t('CHECKOUT', 'Checkout')}
             titleAlign={'center'}
             onActionLeft={() => navigation?.canGoBack() && navigation.goBack()}
             showCall={false}
+            paddingTop={Platform.OS === 'ios' ? 0 : 4}
             btnStyle={{ paddingLeft: 0 }}
-            style={{ marginTop: Platform.OS === 'ios' ? 0 : 30 }}
-            titleWrapStyle={{ paddingHorizontal: 0 }}
-            titleStyle={{ marginRight: 0, marginLeft: 0 }}
           />
         </View>
         <ChContainer style={styles.pagePadding}>
@@ -224,10 +228,40 @@ const MultiCheckoutUI = (props: any) => {
               handleSelectPaymethod={handleSelectPaymethod}
               handleSelectWallet={handleSelectWallet}
               handlePaymethodDataChange={handlePaymethodDataChange}
+              cartUuid={cartUuid}
             />
             <View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginTop: 13, marginHorizontal: -40 }} />
           </ChSection>
 
+          {
+            isMultiDriverTips &&
+            options?.type === 1 &&
+            validationFields?.fields?.checkout?.driver_tip?.enabled &&
+            openCarts.every((cart: any) => cart.business_id && cart.status !== 2) &&
+            driverTipsOptions && driverTipsOptions?.length > 0 &&
+          (
+            <ChSection>
+              <DriverTipsContainer>
+                <OText size={14} lineHeight={20} color={theme.colors.textNormal}>
+                  {t('DRIVER_TIPS', 'Driver Tips')}
+                </OText>
+                <DriverTips
+                  isMulti
+                  carts={openCarts}
+                  businessIds={openCarts.map((cart: any) => cart.business_id)}
+                  driverTipsOptions={driverTipsOptions}
+                  isFixedPrice={parseInt(configs?.driver_tip_type?.value, 10) === 1}
+                  isDriverTipUseCustom={!!parseInt(configs?.driver_tip_use_custom?.value, 10)}
+                  driverTip={parseInt(configs?.driver_tip_type?.value, 10) === 1
+                    ? openCarts[0]?.driver_tip
+                    : openCarts[0]?.driver_tip_rate}
+                  useOrderContext
+                />
+              </DriverTipsContainer>
+              <View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginTop: 13, marginHorizontal: -40 }} />
+            </ChSection>
+          )}
+
           <ChSection>
             <ChCarts>
               <CartsHeader>
@@ -241,20 +275,46 @@ const MultiCheckoutUI = (props: any) => {
                     cart={cart}
                     cartuuid={cart.uuid}
                     isMultiCheckout
+                    hideDeliveryFee={configs?.multi_business_checkout_show_combined_delivery_fee?.value === '1'}
+                    hideDriverTip={configs?.multi_business_checkout_show_combined_driver_tip?.value === '1'}
                     onNavigationRedirect={(route: string, params: any) => props.navigation.navigate(route, params)}
                   />
                   <View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginTop: 13, marginHorizontal: -40 }} />
                 </React.Fragment>
               ))}
-              {openCarts.length === 0 && (
+              {!cartGroup?.loading && openCarts.length === 0 && (
                 <CCNotCarts>
                   <OText size={24} style={{ textAlign: 'center' }}>
                     {t('CARTS_NOT_FOUND', 'You don\'t have carts available')}
                   </OText>
                 </CCNotCarts>
               )}
+              {walletCarts.length > 0 && (
+                <OText size={14} color={theme.colors.danger5} style={{ marginVertical: 20 }}>
+                  {t('WARNING_PARTIAL_WALLET_CARTS', 'Important: One or more carts can`t be completed due a partial payment with cash/points wallet and requires to be paid individually')}
+                </OText>
+              )}
               {openCarts.length > 0 && (
                 <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>
+                  )}
+                  {openCarts.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(openCarts.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')}
@@ -266,23 +326,18 @@ const MultiCheckoutUI = (props: any) => {
                   </OText>
                 </ChCartsTotal>
               )}
-              {openCarts.length > maximumCarts && (
-                <OText size={14} color={theme.colors.danger5} style={{ marginVertical: 20 }}>
-                  {t('WARNING_MAXIMUM_CARTS', 'You can only pay for a maximum of 5 carts, please discard one or more to continue.')}
-                </OText>
-              )}
             </ChCarts>
           </ChSection>
         </ChContainer>
       </Container>
-      
+
       <FloatingButton
-				handleClick={() => handlePlaceOrder()}
+        handleClick={() => handlePlaceOrder()}
         isSecondaryBtn={isDisablePlaceOrderButton}
         disabled={isDisablePlaceOrderButton}
         btnText={placing ? t('PLACING', 'Placing') : t('PLACE_ORDER', 'Place Order')}
         btnRightValueShow
-				btnRightValue={parsePrice(totalCartsPrice)}
+        btnRightValue={parsePrice(totalCartsPrice)}
         iosBottom={30}
       />
     </>

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

@@ -1,11 +1,11 @@
 import React, { useEffect } from 'react'
-import { useLanguage, useUtils, useToast,	ToastType, MultiOrdersDetails as MultiOrdersDetailsController } from 'ordering-components/native'
-import { View, StyleSheet, BackHandler } from 'react-native'
+import { useLanguage, useUtils, useToast, ToastType, MultiOrdersDetails as MultiOrdersDetailsController } from 'ordering-components/native'
+import { View, StyleSheet, BackHandler, TouchableOpacity } from 'react-native'
 import { useTheme } from 'styled-components/native'
 import { OText, OButton } from '../shared'
-import { Container } from '../../layouts/Container'
 import { Placeholder, PlaceholderLine, Fade } from 'rn-placeholder'
 import { SingleOrderCard } from './SingleOrderCard'
+import AntDesignIcon from 'react-native-vector-icons/AntDesign'
 
 import {
   OrdersDetailsContainer,
@@ -18,6 +18,7 @@ import {
   OrdersSummary,
   BorderLine
 } from './styles'
+import { NotFoundSource } from '../NotFoundSource'
 
 export const MultiOrdersDetailsUI = (props: any) => {
   const {
@@ -29,20 +30,26 @@ export const MultiOrdersDetailsUI = (props: any) => {
   } = props
 
   const theme = useTheme()
-	const styles = StyleSheet.create({
+  const styles = StyleSheet.create({
     btnBackArrow: {
-			borderWidth: 0,
-			backgroundColor: theme.colors.clear,
-			shadowColor: theme.colors.clear,
-			padding: 0,
+      borderWidth: 0,
+      backgroundColor: theme.colors.clear,
+      shadowColor: theme.colors.clear,
+      padding: 0,
       marginLeft: -20
-		},
-	})
-  
+    },
+  })
+
   const { loading, orders, error } = props.ordersList
   const [, t] = useLanguage()
   const [{ parsePrice, parseNumber, parseDate }] = useUtils();
-	const [, { showToast }] = useToast();
+  const [, { showToast }] = useToast();
+  const [{ configs }] = useConfig()
+
+  const isTaxIncludedOnPrice = orders.every((_order: any) => _order.taxes?.length ? _order.taxes?.every((_tax: any) => _tax.type === 1) : true)
+  const progressBarStyle = configs.multi_business_checkout_progress_bar_style?.value
+  const showBarInOrder = ['group', 'both']
+  const showBarInIndividual = ['individual', 'both']
 
   const walletName: any = {
     cash: {
@@ -60,7 +67,7 @@ export const MultiOrdersDetailsUI = (props: any) => {
     }
     navigation.navigate('BusinessList');
     return true
-	}
+  }
 
   const handleGoToOrderDetails = (uuid: any) => {
     navigation.navigate('OrderDetails', { orderId: uuid })
@@ -68,7 +75,7 @@ export const MultiOrdersDetailsUI = (props: any) => {
 
   useEffect(() => {
     if (error) {
-	  	showToast(ToastType.Error, error)
+      showToast(ToastType.Error, error)
     }
   }, [error])
 
@@ -83,11 +90,14 @@ export const MultiOrdersDetailsUI = (props: any) => {
     <OrdersDetailsContainer keyboardShouldPersistTaps="handled" contentContainerStyle={{ paddingHorizontal: 40 }}>
       <View style={{ flexDirection: 'row' }}>
         <OButton
-          imgLeftSrc={theme.images.general.arrow_left}
           imgRightSrc={null}
           style={styles.btnBackArrow}
           onClick={() => handleArrowBack()}
-          imgLeftStyle={{ tintColor: theme.colors.textNormal, width: 16 }}
+          icon={AntDesignIcon}
+          iconProps={{
+            name: 'arrowleft',
+            size: 26
+          }}
         />
       </View>
       <Header>
@@ -192,23 +202,27 @@ export const MultiOrdersDetailsUI = (props: any) => {
             </Row>
           ))}
           <BorderLine />
-          <Row>
-            <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
-              {t('TOTAL_BEFORE_TAX', 'Total before tax')}:
-            </OText>
-            <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
-              {parsePrice(ordersSummary?.subtotal)}
-            </OText>
-          </Row>
-          <Row>
-            <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
-            {t('ESTIMATED_TAX_TO_BE_COLLECTED', 'Estimated tax to be collected')}:
-            </OText>
-            <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
-              {parsePrice(ordersSummary?.tax)}
-            </OText>
-          </Row>
-          <BorderLine />
+          {!isTaxIncludedOnPrice && (
+            <>
+              <Row>
+                <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
+                  {t('TOTAL_BEFORE_TAX', 'Total before tax')}:
+                </OText>
+                <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
+                  {parsePrice(ordersSummary?.subtotal)}
+                </OText>
+              </Row>
+              <Row>
+                <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
+                  {t('ESTIMATED_TAX_TO_BE_COLLECTED', 'Estimated tax to be collected')}:
+                </OText>
+                <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
+                  {parsePrice(ordersSummary?.tax)}
+                </OText>
+              </Row>
+              <BorderLine />
+            </>
+          )}
           <Row style={{ marginTop: 10 }}>
             <OText size={14} lineHeight={18} weight={'500'} color={theme.colors.textNormal}>
               {t('PAYMENT_TOTAL', 'Payment total')}:
@@ -244,6 +258,19 @@ export const MultiOrdersDetailsUI = (props: any) => {
           ))}
         </>
       )}
+      {!loading && (error || orders?.length === 0) && (
+        error?.includes('ERROR_ACCESS_EXPIRED') ? (
+          <NotFoundSource
+            content={t(error[0], 'Sorry, the order has expired.')}
+          />
+        ) : (
+          <NotFoundSource
+            content={t('NOT_FOUND_ORDER', theme?.defaultLanguages?.NOT_FOUND_ORDER || 'Sorry, we couldn\'t find the requested order.')}
+            btnTitle={t('ORDERS_REDIRECT', theme?.defaultLanguages?.ORDERS_REDIRECT || 'Go to Orders')}
+            onClickButton={navigation.navigate('BusinessList')}
+          />
+        )
+      )}
       <Divider />
     </OrdersDetailsContainer>
   )

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

@@ -1,9 +1,10 @@
 import React, { useState, useEffect } from 'react'
 import { useLanguage } from 'ordering-components/native';
-import { View, StyleSheet, RefreshControl } from 'react-native';
+import { View, StyleSheet, RefreshControl, Platform } from 'react-native';
+import AntDesignIcon from 'react-native-vector-icons/AntDesign'
 
 import { OrdersOption } from '../OrdersOption'
-import { HeaderTitle, OText } from '../shared'
+import { HeaderTitle, OButton, OText } from '../shared'
 import { ScrollView } from 'react-native-gesture-handler';
 import { Tab } from './styles'
 import { useTheme } from 'styled-components/native';
@@ -11,6 +12,7 @@ import { Container } from '../../layouts/Container';
 
 export const MyOrders = (props: any) => {
   const {
+    navigation,
     hideOrders,
     businessesSearchList
   } = props
@@ -21,18 +23,25 @@ export const MyOrders = (props: any) => {
   const [isEmptyBusinesses, setIsEmptyBusinesses] = useState(false)
   const [businessOrderIds, setBusinessOrderIds] = useState([])
   const [ordersLength, setOrdersLength] = useState({
-    activeOrdersLength: 0,
+    activeOrdersLength: null,
     previousOrdersLength: 0,
   });
   const [selectedOption, setSelectedOption] = useState(!hideOrders ? 'orders' : 'business')
 
   const notOrderOptions = ['business', 'products']
   const allEmpty = (ordersLength?.activeOrdersLength === 0 && ordersLength?.previousOrdersLength === 0) || ((isEmptyBusinesses || businessOrderIds?.length === 0) && hideOrders)
+
+  const isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
+  const showNavbar = theme?.bar_menu?.components?.orders?.hidden
+  const hideOrdersTheme = theme?.bar_menu?.components?.orders?.hidden
+  const hideProductsTab = theme?.orders?.components?.products_tab?.hidden
+  const hideBusinessTab = theme?.orders?.components?.business_tab?.hidden
   const MyOrdersMenu = [
-    { key: 'orders', value: t('ORDERS', 'Orders') },
-    { key: 'business', value: t('BUSINESS', 'Business') },
-    { key: 'products', value: t('PRODUCTS', 'Products') }
+    { key: 'orders', value: t('ORDERS', 'Orders'), disabled: false },
+    { key: 'business', value: t('BUSINESS', 'Business'), disabled: hideBusinessTab },
+    { key: 'products', value: t('PRODUCTS', 'Products'), disabled: hideProductsTab }
   ]
+  const goToBack = () => navigation?.canGoBack() && navigation.goBack()
 
   const handleOnRefresh = () => {
     setRefreshOrders(true);
@@ -61,24 +70,64 @@ export const MyOrders = (props: any) => {
   });
 
   return (
-    <Container noPadding refreshControl={
-      <RefreshControl
-        refreshing={refreshing}
-        onRefresh={() => handleOnRefresh()}
-      />
-    }>
-      {!hideOrders && (
+    <Container
+      noPadding
+      refreshControl={
+        <RefreshControl
+          refreshing={refreshing}
+          onRefresh={() => handleOnRefresh()}
+        />
+      }
+    >
+      {(isChewLayout || showNavbar) && (
+        <View style={{
+          ...{
+            width: '100%',
+            display: 'flex',
+            flexDirection: 'row',
+            alignItems: 'center',
+            paddingHorizontal: isChewLayout ? 20 : 40,
+          },
+          ...props.titleStyle
+        }}>
+          {!props.hideBackBtn && (!isChewLayout || (isChewLayout && hideOrdersTheme)) && (
+            <OButton
+              imgLeftStyle={{ width: 18 }}
+              imgRightSrc={null}
+              style={{
+                borderWidth: 0,
+                width: 26,
+                height: 26,
+                backgroundColor: '#FFF',
+                borderColor: '#FFF',
+                shadowColor: '#FFF',
+                paddingLeft: 0,
+                paddingRight: 0,
+                marginTop: 30,
+              }}
+              onClick={goToBack}
+              icon={AntDesignIcon}
+              iconProps={{
+                name: 'arrowleft',
+                size: 26
+              }}
+            />
+          )}
+          <HeaderTitle ph={10} text={t('MY_ORDERS', 'My Orders')} />
+        </View>
+      )}
+      {!hideOrders && !isChewLayout && !showNavbar && (
         <HeaderTitle text={t('MY_ORDERS', 'My Orders')} />
       )}
       {!allEmpty && (
         <ScrollView
           horizontal
           style={{ ...styles.container, borderBottomWidth: 1 }}
-          contentContainerStyle={{ paddingHorizontal: !!businessesSearchList ? 0 : 40 }}
+          contentContainerStyle={{ paddingHorizontal: !!businessesSearchList ? 0 : isChewLayout ? 20 : 40 }}
           showsHorizontalScrollIndicator={false}
           scrollEventThrottle={16}
         >
-          {MyOrdersMenu.filter(option => !hideOrders || option.key !== 'orders').map(option => (
+          {MyOrdersMenu.filter(option => (!hideOrders || option.key !== 'orders') && !option.disabled).map(option => (
             <Tab
               key={option.key}
               onPress={() => setSelectedOption(option.key)}
@@ -98,7 +147,7 @@ export const MyOrders = (props: any) => {
       )}
       {selectedOption === 'orders' && (
         <>
-          <View style={{ paddingLeft: 40, paddingRight: 40 }}>
+          <View style={{ paddingHorizontal: isChewLayout ? 20 : 40 }}>
             <OrdersOption
               {...props}
               activeOrders
@@ -108,7 +157,7 @@ export const MyOrders = (props: any) => {
               refreshOrders={refreshOrders}
             />
           </View>
-          <View style={{ paddingLeft: 40, paddingRight: 40 }}>
+          <View style={{ paddingHorizontal: isChewLayout ? 20 : 40 }}>
             <OrdersOption
               {...props}
               ordersLength={ordersLength}
@@ -119,14 +168,31 @@ export const MyOrders = (props: any) => {
           </View>
         </>
       )}
-      {notOrderOptions.includes(selectedOption) && (
+      {selectedOption === 'business' && (
+        <OrdersOption
+          {...props}
+          isBusiness
+          titleContent={t('PREVIOUSLY_ORDERED', 'Previously ordered')}
+          hideOrders
+          horizontal
+          activeOrders
+          pastOrders
+          preOrders
+          businessesSearchList={businessesSearchList}
+          setIsEmptyBusinesses={setIsEmptyBusinesses}
+          businessOrderIds={businessOrderIds}
+          setBusinessOrderIds={setBusinessOrderIds}
+          ordersLength={ordersLength}
+          setOrdersLength={setOrdersLength}
+        />
+      )}
+      {selectedOption === 'products' && (
         <OrdersOption
           {...props}
+          isProducts
           titleContent={t('PREVIOUSLY_ORDERED', 'Previously ordered')}
           hideOrders
           horizontal
-          isBusiness={selectedOption === 'business'}
-          isProducts={selectedOption === 'products'}
           activeOrders
           pastOrders
           preOrders