ordering-ui-react-native 0.15.35 → 0.15.37-release

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

@@ -1,56 +1,144 @@
 import React, { useState, useEffect } from 'react'
 import { useLanguage } from 'ordering-components/native';
-import { View, StyleSheet, Platform, I18nManager } from 'react-native';
+import { View, StyleSheet, RefreshControl } from 'react-native';
 
 import { OrdersOption } from '../OrdersOption'
-import { OText } from '../shared'
+import { HeaderTitle, OText } from '../shared'
 import { ScrollView } from 'react-native-gesture-handler';
-
-const PIXELS_TO_SCROLL = 1000;
+import { Tab } from './styles'
+import { useTheme } from 'styled-components/native';
+import { Container } from '../../layouts/Container';
 
 export const MyOrders = (props: any) => {
-  const [, t] = useLanguage();
-  const [loadMore, setLoadMore] = useState(false)
-
+  const {
+    hideOrders,
+    businessesSearchList
+  } = props
+  const [, t] = useLanguage()
+  const theme = useTheme()
+  const [refreshing] = useState(false);
+  const [refreshOrders, setRefreshOrders] = useState(false)
+  const [isEmptyBusinesses, setIsEmptyBusinesses] = useState(false)
+  const [businessOrderIds, setBusinessOrderIds] = useState([])
   const [ordersLength, setOrdersLength] = useState({
     activeOrdersLength: 0,
     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 MyOrdersMenu = [
+    { key: 'orders', value: t('ORDERS', 'Orders') },
+    { key: 'business', value: t('BUSINESS', 'Business') },
+    { key: 'products', value: t('PRODUCTS', 'Products') }
+  ]
 
-  const handleScroll = ({ nativeEvent }: any) => {
-		const y = nativeEvent.contentOffset.y
-		const height = nativeEvent.contentSize.height
+  const handleOnRefresh = () => {
+    setRefreshOrders(true);
+  }
 
-    if (y + PIXELS_TO_SCROLL > height ) {
-      setLoadMore(true)
+  const styles = StyleSheet.create({
+    container: {
+      paddingVertical: 5,
+      borderColor: theme.colors.clear,
+      backgroundColor: '#FFF'
+    },
+    featuredStyle: {
+      display: 'none',
+    },
+    tabStyle: {
+      marginTop: 10,
+      height: 4,
+      borderTopStartRadius: 4,
+      borderTopEndRadius: 4,
+      backgroundColor: theme.colors.textPrimary,
+    },
+    tabDeactived: {
+      marginTop: 10,
+      height: 4
     }
-	}
+  });
 
   return (
-    <ScrollView onScroll={(e: any) => handleScroll(e)}>
-      <OText
-        size={20}
-        mBottom={15}
-        style={{ marginTop: 25, paddingHorizontal: 40 }}>
-        {t('MY_ORDERS', 'My Orders')}
-      </OText>
-      <View style={{ paddingLeft: 40, paddingRight: 40 }}>
+    <Container noPadding refreshControl={
+      <RefreshControl
+        refreshing={refreshing}
+        onRefresh={() => handleOnRefresh()}
+      />
+    }>
+      {!hideOrders && (
+        <HeaderTitle text={t('MY_ORDERS', 'My Orders')} />
+      )}
+      {!allEmpty && (
+        <ScrollView
+          horizontal
+          style={{ ...styles.container, borderBottomWidth: 1 }}
+          contentContainerStyle={{ paddingHorizontal: !!businessesSearchList ? 0 : 40 }}
+          showsHorizontalScrollIndicator={false}
+          scrollEventThrottle={16}
+        >
+          {MyOrdersMenu.filter(option => !hideOrders || option.key !== 'orders').map(option => (
+            <Tab
+              key={option.key}
+              onPress={() => setSelectedOption(option.key)}
+              style={
+                {
+                  borderBottomColor:
+                    selectedOption === option.key
+                      ? theme.colors.textNormal
+                      : theme.colors.border,
+                }
+              }
+            >
+              <OText>{option?.value}</OText>
+            </Tab>
+          ))}
+        </ScrollView>
+      )}
+      {selectedOption === 'orders' && (
+        <>
+          <View style={{ paddingLeft: 40, paddingRight: 40 }}>
+            <OrdersOption
+              {...props}
+              activeOrders
+              ordersLength={ordersLength}
+              setOrdersLength={setOrdersLength}
+              setRefreshOrders={setRefreshOrders}
+              refreshOrders={refreshOrders}
+            />
+          </View>
+          <View style={{ paddingLeft: 40, paddingRight: 40 }}>
+            <OrdersOption
+              {...props}
+              ordersLength={ordersLength}
+              setOrdersLength={setOrdersLength}
+              setRefreshOrders={setRefreshOrders}
+              refreshOrders={refreshOrders}
+            />
+          </View>
+        </>
+      )}
+      {notOrderOptions.includes(selectedOption) && (
         <OrdersOption
           {...props}
+          titleContent={t('PREVIOUSLY_ORDERED', 'Previously ordered')}
+          hideOrders
+          horizontal
+          isBusiness={selectedOption === 'business'}
+          isProducts={selectedOption === 'products'}
           activeOrders
-          ordersLength={ordersLength}
-          setOrdersLength={setOrdersLength}
-          loadMoreStatus={loadMore}
-          setLoadMoreStatus={setLoadMore}
-        />
-      </View>
-      <View style={{ paddingLeft: 40, paddingRight: 40 }}>
-        <OrdersOption
-          {...props}
+          pastOrders
+          preOrders
+          businessesSearchList={businessesSearchList}
+          setIsEmptyBusinesses={setIsEmptyBusinesses}
+          businessOrderIds={businessOrderIds}
+          setBusinessOrderIds={setBusinessOrderIds}
           ordersLength={ordersLength}
           setOrdersLength={setOrdersLength}
         />
-      </View>
-    </ScrollView>
+      )}
+    </Container>
+
   )
 }

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

@@ -3,4 +3,11 @@ import styled, { css } from 'styled-components/native'
 export const Wrapper = styled.View`
   flex: 1;
   background-color: ${(props: any) => props.theme.colors.white};
-`
+`
+
+export const Tab = styled.TouchableOpacity`
+  padding-horizontal: 10px;
+  padding-vertical: 10px;
+  justify-content: center;
+	border-bottom-width: 1px;
+`

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

@@ -1,10 +1,12 @@
 import React, { useState, useEffect } from 'react';
 import { View, StyleSheet, BackHandler, Platform, Linking } from 'react-native';
 import LinearGradient from 'react-native-linear-gradient';
+import { _setStoreData } from '../../providers/StoreUtil';
 import {
   useLanguage,
   OrderDetails as OrderDetailsConTableoller,
   useUtils,
+  useOrder,
   useConfig
 } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
@@ -40,7 +42,7 @@ import { OSRow } from '../OrderSummary/styles';
 import AntIcon from 'react-native-vector-icons/AntDesign'
 import { TaxInformation } from '../TaxInformation';
 import { Placeholder, PlaceholderLine } from 'rn-placeholder';
-
+import NavBar from '../NavBar'
 export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const {
     navigation,
@@ -80,17 +82,20 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
       justifyContent: 'flex-start',
       paddingLeft: 0,
       height: 30,
-      width: 40,
+      width: 30,
+      marginTop: Platform.OS === 'ios' ? 0 : 30
     },
   });
 
   const [, t] = useLanguage();
   const [{ parsePrice, parseNumber, parseDate }] = useUtils();
   const [{ configs }] = useConfig();
+  const [{ carts }] = useOrder()
+
   const [isReviewed, setIsReviewed] = useState(false)
   const [openTaxModal, setOpenTaxModal] = useState<any>({ open: false, tax: null, type: '' })
-
   const { order, businessData } = props.order;
+  const mapValidStatuses = [9, 19, 23]
 
   const walletName: any = {
     cash: {
@@ -328,7 +333,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   };
 
   const getIncludedTaxes = () => {
-    if (order?.taxes?.length === 0) {
+    if (order?.taxes?.length === 0 || !order?.taxes) {
       return order.tax_type === 1 ? order?.summary?.tax ?? 0 : 0
     } else {
       return order?.taxes.reduce((taxIncluded: number, tax: any) => {
@@ -361,11 +366,24 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
 
 
   useEffect(() => {
+    const _businessId = 'businessId:' + businessData?.id
     if (reorderState?.error) {
-      navigation.navigate('Business', { store: businessData?.slug })
+      if (businessData?.id) {
+        _setStoreData('adjust-cart-products', JSON.stringify(_businessId))
+        navigation.navigate('Business', { store: businessData?.slug })
+      }
     }
-    if (!reorderState?.error && reorderState?.result?.uuid) {
-      onNavigationRedirect && onNavigationRedirect('CheckoutNavigator', { cartUuid: reorderState?.result.uuid })
+    if (!reorderState?.error && reorderState.loading === false && businessData?.id) {
+      const products = carts?.[_businessId]?.products
+      const available = products.every((product: any) => product.valid === true)
+
+      if (available && reorderState?.result?.uuid && (products?.length === order?.products.length)) {
+        onNavigationRedirect && onNavigationRedirect('CheckoutNavigator', { cartUuid: reorderState?.result.uuid })
+      } else {
+        _setStoreData('adjust-cart-products', JSON.stringify(_businessId))
+        products?.length !== order?.products.length && _setStoreData('already-removed', JSON.stringify('removed'))
+        navigation.navigate('Business', { store: businessData?.slug })
+      }
     }
   }, [reorderState])
 
@@ -397,6 +415,12 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
         'https://res.cloudinary.com/demo/image/upload/c_thumb,g_face,r_max/d_avatar.png/non_existing_id.png',
     },
   ];
+  const driverLocationString = typeof order?.driver?.location?.location === 'string' && order?.driver?.location?.location?.split(',').map((l: string) => l.replace(/[^-.0-9]/g, ''))
+  const parsedLocations = locations.map(location => typeof location?.location === 'string' ? {
+      ...location,
+      lat: parseFloat(location?.location?.split(',')[0].replace(/[^-.0-9]/g, '')),
+      lng: parseFloat(location?.location?.split(',')[1].replace(/[^-.0-9]/g, ''))
+    } : location)
 
   useEffect(() => {
     if (driverLocation) {
@@ -461,27 +485,23 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
       {order && Object.keys(order).length > 0 && (
         <>
           <Header>
-            <OButton
-              imgLeftSrc={theme.images.general.arrow_left}
-              imgRightSrc={null}
-              style={styles.btnBackArrow}
-              onClick={() => handleArrowBack()}
-              imgLeftStyle={{ tintColor: theme.colors.disabled }}
+            <NavBar
+              title={`${t('ORDER', 'Order')} #${order?.id}`}
+              titleAlign={'center'}
+              onActionLeft={handleArrowBack}
+              showCall={false}
+              btnStyle={{ paddingLeft: 0 }}
+              style={{ marginTop: Platform.OS === 'ios' ? 0 : 20 }}
+              titleWrapStyle={{ paddingHorizontal: 0 }}
+              titleStyle={{ marginRight: 0, marginLeft: 0 }}
+              subTitle={<OText size={12} lineHeight={18} color={theme.colors.textNormal}>
+                {order?.delivery_datetime_utc
+                  ? parseDate(order?.delivery_datetime_utc)
+                  : parseDate(order?.delivery_datetime, { utc: false })}
+              </OText>}
             />
             <OrderInfo>
               <OrderData>
-                <OText
-                  size={20}
-                  lineHeight={30}
-                  weight={'600'}
-                  color={theme.colors.textNormal}>
-                  {t('ORDER', 'Order')} #{order?.id}
-                </OText>
-                <OText size={12} lineHeight={18} color={theme.colors.textNormal}>
-                  {order?.delivery_datetime_utc
-                    ? parseDate(order?.delivery_datetime_utc)
-                    : parseDate(order?.delivery_datetime, { utc: false })}
-                </OText>
                 {
                   (
                     parseInt(order?.status) === 1 ||
@@ -662,7 +682,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                   </OText>
                 </View>
               )}
-              {order?.comment && (
+              {!!order?.comment && (
                 <View style={{ marginTop: 15 }}>
                   <OText size={16} style={{ textAlign: 'left' }} color={theme.colors.textNormal}>
                     {t('COMMENT', 'Comment')}
@@ -672,11 +692,16 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
               )}
               {order?.driver && (
                 <>
-                  {order?.driver?.location && parseInt(order?.status) === 9 && (
+                  {order?.driver?.location && mapValidStatuses.includes(parseInt(order?.status)) && (
                     <Map>
-                      <GoogleMap
-                        location={order?.driver?.location}
-                        locations={locations}
+                     <GoogleMap
+                        location={typeof order?.driver?.location?.location === 'string'
+                        ? {
+                            lat: parseFloat(driverLocationString[0]),
+                            lng: parseFloat(driverLocationString[1]),
+                          } : driverLocation ?? order?.driver?.location
+                        }
+                        locations={parsedLocations}
                         readOnly
                       />
                     </Map>
@@ -890,7 +915,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                     <OSRow>
                       <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal} numberOfLines={1}>
                         {fee.name || t('INHERIT_FROM_BUSINESS', 'Inherit from business')}
-                        ({fee?.fixed > 0 && `${parsePrice(fee?.fixed)} + `}{fee.percentage}%){' '}
+                        ({fee?.fixed > 0 && `${parsePrice(fee?.fixed)}${fee.percentage > 0 ? ' + ' : ''}`}{fee.percentage > 0 && `${fee.percentage}%`}){' '}
                       </OText>
                       <TouchableOpacity onPress={() => setOpenTaxModal({ open: true, data: fee, type: 'fee' })}>
                         <AntIcon name='infocirlceo' size={16} color={theme.colors.primary} />
@@ -1017,8 +1042,6 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
         open={openTaxModal.open}
         onClose={() => setOpenTaxModal({ open: false, data: null, type: '' })}
         entireModal
-        title={`${openTaxModal.data?.name ||
-          t('INHERIT_FROM_BUSINESS', 'Inherit from business')} ${openTaxModal.data?.rate_type !== 2 ? `(${typeof openTaxModal.data?.rate === 'number' ? `${openTaxModal.data?.rate}%` : `${parsePrice(openTaxModal.data?.fixed ?? 0)} + ${openTaxModal.data?.percentage}%`})` : ''}  `}
       >
         <TaxInformation
           type={openTaxModal.type}

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

@@ -5,7 +5,6 @@ export const OrderDetailsContainer = styled.ScrollView`
 `
 
 export const NavBack = styled.TouchableOpacity`
-
 `
 
 
@@ -127,4 +126,4 @@ export const Divider = styled.View`
 `
 export const OrderAction = styled.View`
   flex-direction: row;
-`
+`

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

@@ -98,7 +98,7 @@ const OrderProgressUI = (props: any) => {
       { key: 20, value: t('ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS', theme?.defaultLanguages?.ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS || 'Customer almost arrived to business'), slug: 'ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS', percentage: 90 },
       { key: 21, value: t('ORDER_CUSTOMER_ARRIVED_BUSINESS', theme?.defaultLanguages?.ORDER_CUSTOMER_ARRIVED_BUSINESS || 'Customer arrived to business'), slug: 'ORDER_CUSTOMER_ARRIVED_BUSINESS', percentage: 95 },
       { key: 22, value: t('ORDER_LOOKING_FOR_DRIVER', theme?.defaultLanguages?.ORDER_LOOKING_FOR_DRIVER || 'Looking for driver'), slug: 'ORDER_LOOKING_FOR_DRIVER', percentage: 35 },
-      { key: 23, value: t('ORDER_DRIVER_ON_WAY', theme?.defaultLanguages?.ORDER_DRIVER_ON_WAY  || 'Driver on way'), slug: 'ORDER_DRIVER_ON_WAY', percentage: 45 }
+      { key: 23, value: t('ORDER_DRIVER_ON_WAY', theme?.defaultLanguages?.ORDER_DRIVER_ON_WAY || 'Driver on way'), slug: 'ORDER_DRIVER_ON_WAY', percentage: 45 }
     ]
 
     const objectStatus = orderStatus.find((o) => o.key === status)
@@ -131,7 +131,7 @@ const OrderProgressUI = (props: any) => {
 
   useEffect(() => {
     if (isFocused) {
-      loadOrders()
+      loadOrders(false, false, false, true)
     }
   }, [isFocused])
 
@@ -188,7 +188,7 @@ const OrderProgressUI = (props: any) => {
               <ProgressBar style={{ width: getOrderStatus(lastOrder.status)?.percentage ? `${getOrderStatus(lastOrder.status)?.percentage}%` : '0%' }} />
             </ProgressContentWrapper>
             <ProgressTextWrapper>
-              <OText size={12}>{getOrderStatus(lastOrder.status)?.value}</OText>
+              <OText size={12} style={{ width: '50%' }}>{getOrderStatus(lastOrder.status)?.value}</OText>
               <TimeWrapper>
                 <OText size={11}>{t('ESTIMATED_DELIVERY', 'Estimated delivery')}</OText>
                 <OText size={11}>

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

@@ -20,6 +20,7 @@ export const ProgressTextWrapper = styled.View`
   flex-direction: row;
   justify-content: space-between;
   align-items: center;
+  width: 100%;
 `
 
 export const OrderInfoWrapper = styled.View`

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

@@ -71,7 +71,7 @@ const OrderSummaryUI = (props: any) => {
   }
 
   const getIncludedTaxes = () => {
-    if (cart?.taxes === null) {
+    if (cart?.taxes === null || !cart?.taxes) {
       return cart.business.tax_type === 1 ? cart?.tax : 0
     } else {
       return cart?.taxes.reduce((taxIncluded: number, tax: any) => {
@@ -112,7 +112,7 @@ const OrderSummaryUI = (props: any) => {
       {cart?.products?.length > 0 && (
         <>
           <OSProductList>
-            {cart?.products.map((product: any) => (
+            {cart?.products?.map((product: any) => (
               <ProductItemAccordion
                 key={product.code}
                 product={product}
@@ -202,7 +202,7 @@ const OrderSummaryUI = (props: any) => {
                     <OSRow>
                       <OText size={12} numberOfLines={1}>
                         {fee.name || t('INHERIT_FROM_BUSINESS', 'Inherit from business')}{' '}
-                        ({parsePrice(fee?.fixed)} + {fee?.percentage}%){' '}
+                        ({fee?.fixed > 0 && `${parsePrice(fee?.fixed)}${fee.percentage > 0 ? ' + ' : ''}`}{fee.percentage > 0 && `${fee.percentage}%`}){' '}
                       </OText>
                       <TouchableOpacity onPress={() => setOpenTaxModal({ open: true, data: fee, type: 'fee' })} >
                         <AntIcon name='infocirlceo' size={16} color={theme.colors.primary} />

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

@@ -19,7 +19,8 @@ const OrderTypeSelectorUI = (props: OrderTypeSelectParams) => {
 		typeSelected,
 		defaultValue,
 		configTypes,
-		orderTypes
+		orderTypes,
+		setOrderTypeValue
 	} = props
 
 	const theme = useTheme();
@@ -39,6 +40,7 @@ const OrderTypeSelectorUI = (props: OrderTypeSelectParams) => {
 
 	const handleChangeOrderTypeCallback = (orderType: number) => {
 		if (!orderState.loading) {
+			setOrderTypeValue && setOrderTypeValue(orderType)
 			handleChangeOrderType(orderType)
 			goToBack();
 		}
@@ -51,7 +53,7 @@ const OrderTypeSelectorUI = (props: OrderTypeSelectParams) => {
 				btnStyle={{ paddingLeft: 0 }}
 				paddingTop={0}
 				style={{ paddingBottom: 0 }}
-				title={t('HOW_WILL_YOUR_ORDER_TYPE', 'How will your order type?')}
+				title={t('HOW_WILL_YOU_DELIVERY_TYPE', 'How will your order type?')}
 				titleAlign={'center'}
 				titleStyle={{ fontSize: 14 }}
 			/>

package/themes/original/src/components/OrdersOption/PreviousBusinessOrdered/index.tsx

@@ -0,0 +1,153 @@
+import React, { useEffect } from 'react'
+import { BusinessList as BusinessListController, useOrder } from 'ordering-components/native'
+import { BusinessController } from '../../BusinessController'
+import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder';
+
+import { ListWrapper } from './styles'
+import {
+  View,
+  StyleSheet,
+  ScrollView,
+  Dimensions
+} from 'react-native';
+import { PreviousBusinessOrderedParams } from '../../../types';
+
+export const PreviousBusinessOrderedUI = (props: PreviousBusinessOrderedParams) => {
+  const {
+    navigation,
+    businessesList,
+    setBusinessLoading,
+    businessId,
+    onNavigationRedirect,
+    isBusinessesSearchList,
+    businessLoading
+  } = props
+
+  const [orderState] = useOrder()
+  const windowWidth = Dimensions.get('window').width;
+
+  const onBusinessClick = (business: any) => {
+    onNavigationRedirect('Business', { store: business.slug })
+  }
+  useEffect(() => {
+    if (businessesList?.loading && businessesList?.businesses?.length === 0) {
+      setBusinessLoading(true)
+    } else {
+      setBusinessLoading(false)
+    }
+  }, [businessesList?.loading])
+
+  const styles = StyleSheet.create({
+    container: {
+      marginBottom: 0,
+    },
+  });
+
+  const BusinessControllerList = ({ style }: any) => {
+    return (
+      <>
+        {businessesList.businesses?.filter((business: any) => businessId?.includes(business?.id))?.map((business: any, i: number) => (
+          <BusinessController
+            key={`${business.id}_` + i}
+            business={business}
+            isBusinessOpen={business.open}
+            handleCustomClick={() => onBusinessClick(business)}
+            orderType={orderState?.options?.type}
+            navigation={navigation}
+            businessHeader={business?.header}
+            businessFeatured={business?.featured}
+            businessLogo={business?.logo}
+            businessReviews={business?.reviews}
+            businessDeliveryPrice={business?.delivery_price}
+            businessDeliveryTime={business?.delivery_time}
+            businessPickupTime={business?.pickup_time}
+            businessDistance={business?.distance}
+            style={style}
+          />
+        ))}
+      </>
+    )
+  }
+
+  const BusinessSkeletons = () => {
+    return (
+      <>
+        {[...Array(4).keys()].map((item, i) => (
+          <Placeholder
+            Animation={Fade}
+            key={i}
+            style={{ marginBottom: 20 }}>
+            <View style={{ width: '100%' }}>
+              <PlaceholderLine
+                height={200}
+                style={{ marginBottom: 20, borderRadius: 25 }}
+              />
+              <View style={{ paddingHorizontal: 10 }}>
+                <View
+                  style={{
+                    flexDirection: 'row',
+                    justifyContent: 'space-between',
+                  }}>
+                  <PlaceholderLine
+                    height={25}
+                    width={40}
+                    style={{ marginBottom: 10 }}
+                  />
+                  <PlaceholderLine
+                    height={25}
+                    width={20}
+                    style={{ marginBottom: 10 }}
+                  />
+                </View>
+                <PlaceholderLine
+                  height={20}
+                  width={30}
+                  style={{ marginBottom: 10 }}
+                />
+                <PlaceholderLine
+                  height={20}
+                  width={80}
+                  style={{ marginBottom: 10 }}
+                />
+              </View>
+            </View>
+          </Placeholder>
+        ))}
+      </>
+    )
+  }
+
+  return (
+    <ScrollView horizontal={isBusinessesSearchList} style={styles.container} showsVerticalScrollIndicator={false}>
+      {isBusinessesSearchList ? (
+        <>
+          {!businessLoading && (
+            <BusinessControllerList
+              style={{ width: windowWidth - 80, marginRight: 20 }}
+            />
+          )}
+        </>
+      ) : (
+        <ListWrapper>
+          <BusinessControllerList />
+          {businessesList.loading && (
+            <BusinessSkeletons />
+          )}
+        </ListWrapper>
+      )}
+
+    </ScrollView>
+  )
+}
+
+export const PreviousBusinessOrdered = (props: PreviousBusinessOrderedParams) => {
+  const previousBusinessOrderedController = {
+    ...props,
+    UIComponent: PreviousBusinessOrderedUI,
+    paginationSettings: { initialPage: 1, pageSize: 50, controlType: 'infinity' }
+  }
+
+  return (
+    <BusinessListController {...previousBusinessOrderedController} />
+  )
+}

package/themes/original/src/components/OrdersOption/PreviousBusinessOrdered/styles.tsx

@@ -0,0 +1,6 @@
+import styled, { css } from 'styled-components/native'
+
+export const ListWrapper = styled.View`
+	background-color: ${(props: any) => props.theme.colors.backgroundLight};
+	padding-horizontal: ${(props : any) => props.isBusinessesSearchList ? '0' : '40px'};
+`;