ordering-ui-react-native 0.17.66 → 0.17.68

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

@@ -39,7 +39,8 @@ const ReviewCustomerUI = (props: ReviewCustomerParams) => {
     reviewState,
     setReviewState,
     actionState,
-    handleSendCustomerReview
+    handleSendCustomerReview,
+    handleCustomCustomerReview
   } = props
 
   const theme = useTheme()
@@ -153,6 +154,15 @@ const ReviewCustomerUI = (props: ReviewCustomerParams) => {
 
   const customerName = `${order?.customer?.name ?? ''} ${order?.customer?.middle_name ?? ''} ${order?.customer?.lastname ?? ''} ${order?.customer?.second_lastname ?? ''}`?.replace('  ', ' ')?.trim() ?? ''
 
+  const handleReviewClick = () => {
+    handleCustomCustomerReview
+      ? handleCustomCustomerReview({
+        qualification: reviewState?.qualification,
+        comment: reviewState?.comment
+      })
+      : handleSendCustomerReview()
+  }
+
   return (
     <KeyboardAvoidingView
       enabled
@@ -303,7 +313,7 @@ const ReviewCustomerUI = (props: ReviewCustomerParams) => {
 
       <ActionButtonWrapper>
         <FloatingButton
-          firstButtonClick={() => handleSendCustomerReview()}
+          firstButtonClick={() => handleReviewClick()}
           btnText={actionState.loading ? t('LOADING', 'Loading') : t('SEND_REVIEW', 'Send Review')}
           color={theme.colors.primary}
           widthButton={'100%'}

package/themes/business/src/components/shared/OLink.tsx

@@ -29,8 +29,19 @@ const OLink = (props: Props): React.ReactElement => {
       ],
     );
 
+  const handleInvalidNumberAlert = () =>
+    Alert.alert(
+      t('ERROR_OPENING_THE_LINK', 'Error opening the link'),
+      t('INVALID_NUMBER', 'Invalid number'),
+      [
+        {
+          text: t('OK', 'Ok'),
+        },
+      ],
+    );
+
   const handleOpenUrl = async (breakFunction = false) => {
-    if(breakFunction) {
+    if (breakFunction) {
       return
     }
     if (!url) {
@@ -40,8 +51,9 @@ const OLink = (props: Props): React.ReactElement => {
 
     try {
       const supported = await Linking.canOpenURL(url);
-
-      if (supported) {
+      if (url && url?.includes('tel:')) {
+        url?.includes('invalid') ? handleInvalidNumberAlert() : await Linking.openURL(url)
+      } else if (supported) {
         await Linking.openURL(url);
       } else {
         handleAlert();
@@ -57,17 +69,17 @@ const OLink = (props: Props): React.ReactElement => {
         <OButton
           onClick={() => handleOpenUrl()}
           text={shorcut} imgRightSrc=''
-          textStyle={{color: 'white'}}
-          style={{width: '100%', alignSelf: 'center', borderRadius: 10}}
+          textStyle={{ color: 'white' }}
+          style={{ width: '100%', alignSelf: 'center', borderRadius: 10 }}
         />
       ) : (
-      <OText
-        style={TextStyle}
-        numberOfLines={1}
-        ellipsizeMode="tail"
-        color={color}>
-        {shorcut}
-      </OText>
+        <OText
+          style={TextStyle}
+          numberOfLines={1}
+          ellipsizeMode="tail"
+          color={color}>
+          {shorcut}
+        </OText>
       )}
     </Pressable>
   );

package/themes/business/src/components/shared/OText.tsx

@@ -40,12 +40,13 @@ interface Props {
   numberOfLines?: number;
   ellipsizeMode?: string;
   adjustsFontSizeToFit?: boolean;
-  textDecorationLine?: string
+  textDecorationLine?: string;
+  lineHeight?: number;
 }
 
 const OText = (props: Props): React.ReactElement => {
   return (
-    <SText {...props} style={props.style}>
+    <SText {...props} style={[props.style, { lineHeight: props.lineHeight }]}>
       {props.children}
       {props.space && ' '}
     </SText>

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

@@ -311,6 +311,10 @@ export interface OrdersOptionParams {
   isLogisticActivated?: boolean;
   isAlsea?: boolean;
   checkNotification?: boolean;
+  ordersGroupedFormatted?: any;
+  handleChangeOrderStatus?: () => void;
+  handleSendCustomerReview?: () => void;
+  orderDetailsProps?: any;
 }
 export interface ActiveOrdersParams {
   orders?: any;
@@ -569,7 +573,7 @@ export interface AcceptOrRejectOrderParams {
   loading?: boolean;
   action: string;
   orderId?: number;
-  handleUpdateOrder?: (status: number, isAccept: any) => {};
+  handleUpdateOrder?: () => void;
   notShowCustomerPhone?: boolean | undefined;
   actions?: actions;
   titleAccept?: textTranslate;
@@ -598,6 +602,7 @@ export interface ReviewCustomerParams {
   actionState?: any,
   handleChangeQualification?: any,
   handleSendCustomerReview?: any,
+  handleCustomCustomerReview?: any,
 }
 
 export interface NoNetworkParams {

package/themes/original/index.tsx

@@ -68,6 +68,7 @@ import { SingleProductCard } from './src/components/SingleProductCard';
 import { SingleOrderCard } from './src/components/SingleOrderCard';
 import { UpsellingRedirect } from './src/components/BusinessProductsListing/UpsellingRedirect';
 import { ProductItemAccordion } from './src/components/ProductItemAccordion';
+import { ScheduleAccordion } from './src/components/ScheduleAccordion';
 import { BusinessItemAccordion } from './src/components/BusinessItemAccordion';
 import { CouponControl } from './src/components/CouponControl';
 import { TaxInformation } from './src/components/TaxInformation';
@@ -231,6 +232,7 @@ export {
 	SingleOrderCard,
 	UpsellingRedirect,
 	ProductItemAccordion,
+	ScheduleAccordion,
 	BusinessItemAccordion,
 	CouponControl,
 	TaxInformation,

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

@@ -25,7 +25,8 @@ import {
 	BusinessLogo,
 	Reviews,
 	RibbonBox,
-	ReviewAndFavorite
+	ReviewAndFavorite,
+	OfferBox
 } from './styles';
 import { useTheme } from 'styled-components/native';
 import FontAwesomeIcon from 'react-native-vector-icons/FontAwesome5';
@@ -50,7 +51,8 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 		businessPickupTime,
 		businessDistance,
 		handleFavoriteBusiness,
-		enableIntersection
+		enableIntersection,
+		getBusinessOffer
 	} = props;
 
 	const [{ parsePrice, parseDistance, parseNumber, optimizeImage }] = useUtils();
@@ -201,6 +203,18 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 								<FontAwesomeIcon name="crown" size={26} color="gold" />
 							</View>
 						)}
+						{(!isCustomLayout) && (
+							getBusinessOffer((business?.offers)) &&
+							<OfferBox>
+								<OText
+									size={10}
+									weight={'400'}
+									numberOfLines={2}
+									ellipsizeMode='tail'
+									lineHeight={13}
+								>{getBusinessOffer((business?.offers)) || parsePrice(0)}</OText>
+							</OfferBox>
+						)}
 						<BusinessState>
 							{!isBusinessOpen && (configState?.configs?.preorder_status_enabled?.value === '1') && (
 								<View style={styles.businessStateView}>

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

@@ -39,7 +39,7 @@ export const BusinessState = styled.View`
 `
 
 export const BusinessLogo = styled.View`
-   
+
 `
 
 export const ReviewAndFavorite = styled.View`
@@ -73,3 +73,15 @@ export const RibbonBox = styled.View`
     border-radius: 50px;
   `}
 `
+
+export const OfferBox = styled.View`
+  position: absolute;
+  z-index: 1;
+  top: 20px;
+  right: 10px;
+  border-radius: 50px;
+  color: ${(props: any) => props.theme.colors.textThird};
+  background: ${(props: any) => props.theme.colors.inputBorderColor};
+  padding: 3px 8px;
+  max-width: 180px;
+`

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

@@ -16,26 +16,19 @@ import {
 	DivideView,
 	MediaWrapper,
 } from './styles';
-import { Platform, StyleSheet, View } from 'react-native';
+import { StyleSheet, View } from 'react-native';
 import { BusinessInformationParams } from '../../types';
 import { GoogleMap } from '../GoogleMap';
 import { WebView } from 'react-native-webview';
 import { formatUrlVideo } from '../../utils'
+import { ScheduleAccordion } from '../ScheduleAccordion';
 const BusinessInformationUI = (props: BusinessInformationParams) => {
 	const { businessState, businessSchedule, businessLocation } = props;
 
 	const theme = useTheme();
 	const [, t] = useLanguage();
 	const [{ optimizeImage }] = useUtils();
-	const daysOfWeek = [
-		t('SUNDAY_ABBREVIATION', 'Sun'),
-		t('MONDAY_ABBREVIATION', 'Mon'),
-		t('TUESDAY_ABBREVIATION', 'Tues'),
-		t('WEDNESDAY_ABBREVIATION', 'Wed'),
-		t('THURSDAY_ABBREVIATION', 'Thur'),
-		t('FRIDAY_ABBREVIATION', 'Fri'),
-		t('SATURDAY_ABBREVIATION', 'Sat'),
-	];
+
 	const scheduleFormatted = ({
 		hour,
 		minute,
@@ -112,25 +105,11 @@ const BusinessInformationUI = (props: BusinessInformationParams) => {
 						<WrapScheduleBlock>
 							{businessSchedule.map((schedule: any, i: number) => (
 								<ScheduleBlock key={i}>
-									<OText
-										lineHeight={21}
-										mBottom={16}
-										size={14}
-										weight={Platform.OS === 'android' ? 'bold' : '600'}
-										style={{ flexBasis: '20%' }}>
-										{daysOfWeek[i].toUpperCase()}
-									</OText>
-									{schedule.enabled ? (
-										<OText mBottom={16}>
-											{scheduleFormatted(schedule.lapses[0].open) +
-												' - ' +
-												scheduleFormatted(schedule.lapses[0].close)}
-										</OText>
-									) : (
-										<OText color={theme.colors.red} mBottom={16}>
-											{t('CLOSED', 'Closed')}
-										</OText>
-									)}
+									<ScheduleAccordion
+										weekIndex={i}
+										scheduleFormatted={scheduleFormatted}
+										schedule={schedule}
+									/>
 								</ScheduleBlock>
 							))}
 						</WrapScheduleBlock>
@@ -152,10 +131,10 @@ const BusinessInformationUI = (props: BusinessInformationParams) => {
 											style={{ width: 210, height: 127, borderRadius: 7.6 }}
 											javaScriptEnabled={true}
 											domStorageEnabled={true}
-											source={{ 
+											source={{
 												html: `
 													<iframe width='80%' height='80%' src="${formatUrlVideo(v.video)}" frameBorder='0' allow='autoplay; encrypted-media' allowFullScreen />
-												`, 
+												`,
 											}}
 											mediaPlaybackRequiresUserAction={true}
 										/>

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

@@ -530,6 +530,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 							btnLeftValue={currentCart?.products.reduce((prev: number, product: any) => prev + product.quantity, 0)}
 							btnRightValue={parsePrice(currentCart?.total)}
 							disabled={subtotalWithTaxes < currentCart?.minimum || openUpselling}
+							hideButton={isCheckoutMultiBusinessEnabled}
 							handleClick={() => setOpenUpselling(true)}
 						/>
 					</View>

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

@@ -104,9 +104,38 @@ const CartUI = (props: any) => {
   const handleUpsellingPage = () => {
     setOpenUpselling(false)
     setCanOpenUpselling(false)
-    if (isCheckoutMultiBusinessEnabled && openCarts.length > 1) {
+    const cartSelectedHasGroup = cart?.group?.uuid
+    const cartFilterValidation = (cart : any) => cart?.valid && cart?.status !== 2
+    const cartsGroupLength = cartSelectedHasGroup ? Object.values(orderState.carts).filter((_cart : any) => _cart?.group?.uuid === cartSelectedHasGroup && cartFilterValidation(_cart))?.length : 0
+    if (cartsGroupLength > 1 && isCheckoutMultiBusinessEnabled) {
       props.onNavigationRedirect('CheckoutNavigator', {
-        screen: 'MultiCheckout'
+        screen: 'MultiCheckout',
+        cartUuid: cart?.group?.uuid
+      })
+      return
+    }
+    const cartGroupsCount : any = {}
+    Object.values(orderState.carts).filter(_cart => cartFilterValidation(_cart))?.forEach((_cart : any) => {
+      if (cartGroupsCount[_cart?.group?.uuid]) {
+        cartGroupsCount[_cart?.group?.uuid] += 1
+      } else {
+        cartGroupsCount[_cart?.group?.uuid] = 1
+      }
+    })
+    let groupForTheCart
+    const groupForAddCartArray = Object.keys(cartGroupsCount).filter(cartGroupUuid => cartGroupsCount[cartGroupUuid] > 0 && cartGroupsCount[cartGroupUuid] < 5)
+    const max = Math.max(...groupForAddCartArray.map(uuid => cartGroupsCount[uuid]))
+    const indexes = groupForAddCartArray.filter(uuid => cartGroupsCount[uuid] === max)
+    if (indexes?.length > 1) {
+      groupForTheCart = indexes.find(uuid => uuid !== 'undefined')
+    } else {
+      groupForTheCart = indexes[0]
+    }
+    if (isCheckoutMultiBusinessEnabled && openCarts.length > 1 && groupForTheCart) {
+      props.onNavigationRedirect('CheckoutNavigator', {
+        screen: 'MultiCart',
+        cartUuid: cart.uuid, 
+        cartGroup: groupForTheCart === 'undefined' ? 'create' : groupForTheCart
       })
     } else {
       props.onNavigationRedirect('CheckoutNavigator', {

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

@@ -22,7 +22,8 @@ const FloatingButtonUI = (props: FloatingButtonParams) => {
 		disabled,
 		isSecondaryBtn,
 		handleEmpty,
-		iosBottom
+		iosBottom,
+		hideButton
 	} = props;
 
 	const [, t] = useLanguage();
@@ -77,16 +78,17 @@ const FloatingButtonUI = (props: FloatingButtonParams) => {
 					</View>
 				)}
 			</View>
-			<Button
-				style={[isSecondaryBtn ? styles.secondaryBtn : styles.primaryBtn]}
-				onPress={handleButtonClick}
-				disabled={disabled}
-			>
-				<OText color={isSecondaryBtn ? theme.colors.textSecondary : theme.colors.white} lineHeight={24} size={14} weight={'400'}>
-					{btnText}
-				</OText>
-			</Button>
-
+			{!hideButton && (
+				<Button
+					style={[isSecondaryBtn ? styles.secondaryBtn : styles.primaryBtn]}
+					onPress={handleButtonClick}
+					disabled={disabled}
+				>
+					<OText color={isSecondaryBtn ? theme.colors.textSecondary : theme.colors.white} lineHeight={24} size={14} weight={'400'}>
+						{btnText}
+					</OText>
+				</Button>
+			)}
 		</Container>
 	);
 };

package/themes/original/src/components/LoginForm/Otp/index.tsx

@@ -59,11 +59,6 @@ export const Otp = (props: otpParams) => {
       justifyContent: 'space-between',
       marginVertical: 30
     },
-    focusStyles: {
-      borderColor: theme.colors.primary,
-      borderWidth: 1,
-      borderRadius: 8
-    },
     underlineStyleBase: {
       width: 45,
       height: 50,
@@ -91,7 +86,6 @@ export const Otp = (props: otpParams) => {
           numberOfInputs={pinCount || 6}
           style={loginStyle.container}
           inputStyles={loginStyle.underlineStyleBase}
-          focusStyles={loginStyle.focusStyles}
           handleChange={setCode}
         />
         <TouchableOpacity onPress={() => handleOnSubmit()} disabled={otpLeftTime > 520}>

package/themes/original/src/components/LoginForm/Otp/styles.tsx

@@ -3,5 +3,4 @@ import styled from 'styled-components/native';
 export const OTPContainer = styled.View`
   padding: 20px;
   align-items: center;
-  flex: 1 
 `

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

@@ -1,4 +1,5 @@
 import React, { useEffect, useState } from 'react'
+import Clipboard from '@react-native-clipboard/clipboard';
 import { Messages as MessagesController, useSession, useUtils, useLanguage, ToastType, useToast } from 'ordering-components/native'
 import { useTheme } from 'styled-components/native';
 import { launchImageLibrary } from 'react-native-image-picker'
@@ -397,6 +398,19 @@ const MessagesUI = (props: MessagesParams) => {
 		}
 	}
 
+	const onLongPress = (context: any, message: any) => {
+		const options = [
+			t('COPY_TEXT', 'Copy text'),
+			t('CANCEL', 'Cancel'),
+		];
+		const cancelButtonIndex = options.length - 1;
+		context.actionSheet().showActionSheetWithOptions({
+			options,
+			cancelButtonIndex
+		}, (buttonIndex: any) => buttonIndex === 0 && Clipboard.setString(message.text)
+		);
+	}
+
 	return (
 		<View style={{ height: getViewHeight(), width: '100%', paddingTop: 12, backgroundColor: 'white' }}>
 			<Wrapper>
@@ -473,6 +487,7 @@ const MessagesUI = (props: MessagesParams) => {
 					onSend={onSubmit}
 					onInputTextChanged={onChangeMessage}
 					alignTop
+					onLongPress={(context: any, message: any) => onLongPress(context, message)}
 					scrollToBottom
 					renderAvatarOnTop
 					renderUsernameOnMessage

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

@@ -0,0 +1,63 @@
+import React from 'react'
+import { ChAddress, ChContainer, ChSection, ChUserDetails, DeliveryOptionsContainer } from '../Checkout/styles'
+import { Placeholder, PlaceholderLine, Fade } from 'rn-placeholder'
+import { Container } from '../../layouts/Container';
+import { View, StyleSheet } from 'react-native'
+import { useTheme } from 'styled-components/native';
+import { MultiCartCreate } from 'ordering-components/native'
+
+export const MultiCartUI = () => {
+    const theme = useTheme();
+
+    const styles = StyleSheet.create({
+        pagePadding: {
+            paddingHorizontal: 40
+        }
+    })
+
+    return (
+        <>
+            <Container noPadding>
+                <ChContainer style={styles.pagePadding}>
+                    <ChSection>
+                        <ChUserDetails>
+                            <Placeholder Animation={Fade}>
+                                <PlaceholderLine height={20} />
+                                <PlaceholderLine height={12} />
+                                <PlaceholderLine height={12} />
+                                <PlaceholderLine height={12} style={{ marginBottom: 20 }} />
+                            </Placeholder>
+                        </ChUserDetails>
+                        <View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginHorizontal: -40 }} />
+                    </ChSection>
+                    <DeliveryOptionsContainer>
+                        <View style={{ height: 110 }}>
+                            <Placeholder Animation={Fade}>
+                                <PlaceholderLine height={20} />
+                                <PlaceholderLine height={40} />
+                            </Placeholder>
+                        </View>
+                    </DeliveryOptionsContainer>
+                    <ChSection>
+                        <ChAddress>
+                            <Placeholder Animation={Fade}>
+                                <PlaceholderLine height={20} style={{ marginBottom: 50 }} />
+                                <PlaceholderLine height={100} />
+                            </Placeholder>
+                        </ChAddress>
+                        <View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginTop: 13, marginHorizontal: -40 }} />
+                    </ChSection>
+                </ChContainer>
+            </Container>
+
+        </>
+    )
+}
+
+export const MultiCart = (props : any) => {
+    const mulcartProps = {
+        ...props,
+        UIComponent: MultiCartUI
+    }
+    return <MultiCartCreate {...mulcartProps} />
+}

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

@@ -25,7 +25,6 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
     businessIds,
     paymethodsAndWallets,
     walletsState,
-    businessPaymethods,
     paymethodSelected,
     handleSelectPaymethod,
     handleSelectWallet,
@@ -77,24 +76,24 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
   const renderPaymethods = ({ item }: any) => {
     return (
       <TouchableOpacity
-        onPress={() => handleSelectPaymethod(item)}
+        onPress={() => handleSelectPaymethod({ ...item, paymethod: { gateway: item.gateway }, paymethod_id: item?.id })}
       >
         <PMItem
           key={item.id}
-          isActive={paymethodSelected?.paymethod_id === item.paymethod_id}
+          isActive={paymethodSelected?.id === item.id}
         >
           <OIcon
             src={getPayIcon(item.paymethod?.gateway)}
             width={20}
             height={20}
-            color={paymethodSelected?.paymethod_id === item.paymethod_id ? theme.colors.white : theme.colors.backgroundDark}
+            color={paymethodSelected?.id === item.id ? theme.colors.white : theme.colors.backgroundDark}
           />
           <OText
             size={10}
             style={{ margin: 0, marginTop: 4 }}
-            color={paymethodSelected?.paymethod_id === item.paymethod_id ? theme.colors.white : '#000'}
+            color={paymethodSelected?.id === item.id ? theme.colors.white : '#000'}
           >
-            {t(item?.paymethod?.gateway.toUpperCase(), item?.paymethod?.name)}
+            {t(item?.gateway.toUpperCase(), item?.name)}
           </OText>
         </PMItem>
       </TouchableOpacity>
@@ -124,7 +123,7 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
         <FlatList
           horizontal
           showsHorizontalScrollIndicator={false}
-          data={businessPaymethods?.result?.filter((paymethod: any) => paymethodsAndWallets.paymethods.find((item: any) => item.id === paymethod.paymethod_id))}
+          data={paymethodsAndWallets.paymethods}
           renderItem={renderPaymethods}
           keyExtractor={(paymethod: any) => paymethod?.id?.toString?.()}
         />

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

@@ -53,7 +53,8 @@ const MultiCheckoutUI = (props: any) => {
     paymethodSelected,
     handleSelectPaymethod,
     handleSelectWallet,
-    handlePaymethodDataChange
+    handlePaymethodDataChange,
+    cartUuid
   } = props
 
 	const theme = useTheme();
@@ -78,7 +79,7 @@ const MultiCheckoutUI = (props: any) => {
 	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 isDisablePlaceOrderButton = !(paymethodSelected?.paymethod_id || paymethodSelected?.wallet_id) || openCarts.length > maximumCarts || (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 [isUserDetailsEdit, setIsUserDetailsEdit] = useState(false);
@@ -225,6 +226,7 @@ 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>

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

@@ -19,6 +19,7 @@ import {
   OrdersSummary,
   BorderLine
 } from './styles'
+import { NotFoundSource } from '../NotFoundSource'
 
 export const MultiOrdersDetailsUI = (props: any) => {
   const {
@@ -248,6 +249,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/OrdersOption/index.tsx

@@ -60,12 +60,42 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 	const [, { showToast }] = useToast()
 	const { loading, error, orders: values } = orderList
 	const [businessLoading, setBusinessLoading] = useState(true)
+	const [orders, setOrders] = useState([])
 
 	const imageFails = activeOrders
 		? theme.images.general.emptyActiveOrders
 		: theme.images.general.emptyPastOrders
 
-	const orders = customArray || values || []
+	const _orders = customArray || values || []
+	const uniqueOrders: any = []
+
+
+	useEffect(() => {
+		if (loading || error) return
+		const orders = _orders.map((order: any) => order?.cart_group_id
+			? _orders
+				.filter((_order : any) => _order?.cart_group_id === order?.cart_group_id)
+				?.reduce((orderCompleted : any, currentOrder : any) => ({
+					...orderCompleted,
+					total: orderCompleted.summary?.total + currentOrder?.summary?.total,
+					business: [orderCompleted.business, currentOrder.business].flat(),
+					business_id: [orderCompleted.business_id, currentOrder.business_id].flat(),
+					id: [orderCompleted.id, currentOrder.id].flat(),
+					review: orderCompleted.review && currentOrder.review,
+					user_review: orderCompleted.user_review && currentOrder.user_review,
+					products: [orderCompleted.products, currentOrder.products].flat()
+				}))
+			: order)
+			.filter((order: any) => {
+				const isDuplicate = uniqueOrders.includes(order?.cart_group_id)
+				if (!isDuplicate) {
+					uniqueOrders.push(order?.cart_group_id)
+					return true
+				}
+				return false
+			})
+		setOrders(orders)
+	}, [JSON.stringify(_orders)])
 
 	const getOrderStatus = (s: string) => {
 		const status = parseInt(s)
@@ -219,7 +249,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 						)}
 				</>
 			)}
-			{isBusiness && !!businessesSearchList && businesses?.loading &&  (
+			{isBusiness && !!businessesSearchList && businesses?.loading && (
 				<ScrollView horizontal>
 					<BusinessControllerSkeletons paginationProps={businessPaginationProps} />
 				</ScrollView>