ordering-ui-react-native 0.22.57 → 0.22.58-release

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

@@ -1,17 +1,19 @@
 import React, { useEffect, useState, useRef } from 'react';
 import { View, Pressable, StyleSheet, ScrollView, RefreshControl, Platform, TouchableOpacity } from 'react-native';
-import { useLanguage, useUtils, useToast, OrderListGroups, useConfig } from 'ordering-components/native';
+import { useLanguage, useUtils, OrderListGroups, useConfig } from 'ordering-components/native';
 import SelectDropdown from 'react-native-select-dropdown'
 import { Placeholder, PlaceholderLine, Fade } from 'rn-placeholder';
 import FeatherIcon from 'react-native-vector-icons/Feather';
 import FontistoIcon from 'react-native-vector-icons/Fontisto'
 import AntDesignIcon from 'react-native-vector-icons/AntDesign'
+import RNRestart from 'react-native-restart'
 
 import { useTheme } from 'styled-components/native';
 import { DeviceOrientationMethods } from '../../../../../src/hooks/DeviceOrientation'
 import { NotificationSetting } from '../../../../../src/components/NotificationSetting'
 import { NewOrderNotification } from '../NewOrderNotification';
 import { WebsocketStatus } from '../WebsocketStatus'
+import { _retrieveStoreData, _setStoreData } from '../../providers/StoreUtil'
 
 import { OText, OButton, OModal, OInput, OIcon } from '../shared';
 import { NotFoundSource } from '../NotFoundSource';
@@ -35,7 +37,8 @@ import {
   ItemContent,
   TimerInputWrapper,
   OverLine,
-  InputContainer
+  InputContainer,
+  FilterAlert
 } from './styles';
 import { PreviousOrders } from '../PreviousOrders';
 import { OrdersOptionParams } from '../../types';
@@ -53,6 +56,9 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
     navigation,
     setCurrentFilters,
     tabs,
+    combineTabs,
+    setCombineTabsState,
+    isNetConnected,
     currentTabSelected,
     setCurrentTabSelected,
     ordersGroup,
@@ -69,9 +75,9 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
     logisticOrders,
     loadLogisticOrders,
     isLogisticActivated,
-    isAlsea,
     handleChangeOrderStatus,
-    handleSendCustomerReview
+    handleSendCustomerReview,
+    ordersFiltered
   } = props;
 
   const defaultSearchList = {
@@ -95,12 +101,15 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
   const [, t] = useLanguage();
   const [{ parseDate }] = useUtils()
   const [configState] = useConfig()
+
   const [orientationState] = useDeviceOrientation();
   const [openSearchModal, setOpenSearchModal] = useState(false)
   const [openSLASettingModal, setOpenSLASettingModal] = useState(false)
   const [slaSettingTime, setSlaSettingTime] = useState(6000)
   const [currentDeliveryType, setCurrentDeliveryType] = useState('Delivery')
   const [search, setSearch] = useState(defaultSearchList)
+  const hasSearchFilters = JSON.stringify(defaultSearchList) !== JSON.stringify(search)
+
   const deliveryStatus = [
     {
       key: t('OK', 'Ok'),
@@ -124,12 +133,14 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
       backColor: '#E63757'
     }
   ]
-  const combineTabs = configState?.configs?.combine_pending_and_progress_orders?.value === '1'
   const [selectedTabStatus, setSelectedTabStatus] = useState<any>(deliveryStatus)
   const [openedSelect, setOpenedSelect] = useState('')
+  const [lastDateConnection, setLastDateConnection] = useState(null)
+  const [internetLoading, setInternetLoading] = useState(!isNetConnected && isNetConnected !== null)
 
   const HEIGHT_SCREEN = orientationState?.dimensions?.height
   const IS_PORTRAIT = orientationState.orientation === PORTRAIT
+  const showTagsList = !props.isAlsea && !props.isDriverApp && currentTabSelected !== 'logisticOrders'
 
   const preorderTypeList = [
     { key: null, name: t('SLA', 'SLA\'s') },
@@ -251,7 +262,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
       paddingLeft: 0,
       paddingRight: 0,
       marginBottom: 30,
-      marginTop: 30
+      marginTop: Platform.OS === 'ios' ? 60 : 30
     },
     rowStyle: {
       display: 'flex',
@@ -281,13 +292,27 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 
   const tagsList = ordersGroup[currentTabSelected]?.defaultFilter ?? []
   const currentOrdersGroup = ordersGroup[currentTabSelected]
+  const ordersValidation = hasSearchFilters ? ordersFiltered : currentOrdersGroup
+
+  const paginationValidation =
+    !ordersValidation?.error?.length &&
+    !ordersValidation?.loading &&
+    ordersValidation?.pagination?.totalPages &&
+    ordersValidation?.pagination?.currentPage < ordersValidation?.pagination?.totalPages &&
+    ordersValidation?.orders?.length > 0
+
+  const loadingValidation = (
+    ordersValidation?.loading ||
+    (ordersValidation?.pagination?.total === null && isNetConnected) ||
+    logisticOrders?.loading
+  ) && !ordersValidation?.error?.length
 
   const isEqual = (array1: any, array2: any) => {
     return array1?.every((item: any) => array2.includes(item)) && array2?.every((item: any) => array1.includes(item))
   }
 
   const handleLoadMore = () => {
-    loadMoreOrders && loadMoreOrders();
+    loadMoreOrders && loadMoreOrders({ allStatusses: hasSearchFilters });
   };
 
   const getOrderStatus = (key: number) => {
@@ -295,13 +320,6 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
   };
 
   const applyFilters = () => {
-    setOrdersGroup({
-      ...ordersGroup,
-      [currentTabSelected]: {
-        ...ordersGroup[currentTabSelected],
-        orders: []
-      }
-    })
     const dateRange = calculateDate(search.date.type, search.date.from, search.date.to)
     onFiltered && onFiltered({ ...search, date: { ...dateRange } })
     setOpenSearchModal(false)
@@ -371,6 +389,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
   }
 
   const handleClose = () => {
+    setSearch(defaultSearchList)
     setOpenSearchModal(false)
     setOpenSLASettingModal(false)
   }
@@ -380,148 +399,194 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
   }
 
   useEffect(() => {
-    scrollRefTab.current?.scrollTo({ animated: true });
-    scrollListRef.current?.scrollTo({ animated: true });
-    scrollRef.current?.scrollTo({ y: 0, animated: true });
+    scrollRefTab.current?.scrollTo();
+    scrollListRef.current?.scrollTo();
+    scrollRef.current?.scrollTo();
     setTags({ values: [] })
   }, [currentTabSelected])
 
-	useEffect(() => {
-		const unsubcribe = navigation.addListener('focus', () => {
-      currentTabSelected === 'logisticOrders' ? loadLogisticOrders() : loadOrders && loadOrders({ newFetch: true })
-		})
-		return unsubcribe
-	}, [navigation, loadOrders, loadLogisticOrders])
+  useEffect(() => {
+    const unsubcribe = navigation.addListener('focus', () => {
+      currentTabSelected === 'logisticOrders' && loadLogisticOrders && loadLogisticOrders()
+    })
+    return unsubcribe
+  }, [navigation, loadLogisticOrders])
+
+  useEffect(() => {
+    const orderStatuses = ['active', 'pending', 'inProgress', 'completed', 'cancelled']
+
+    const manageStoragedOrders = async () => {
+      setInternetLoading(true)
+      let lastConnection = await _retrieveStoreData('last_date_connection');
+      let _combineTabs = await _retrieveStoreData('combine_pending_and_progress_orders')
+      let ordersStoraged: any = {}
+      for (const status of orderStatuses) {
+        ordersStoraged[status] = await _retrieveStoreData(`${status}_orders`) ?? []
+      }
+
+      if (_combineTabs || !_combineTabs && combineTabs) {
+        _combineTabs && setCombineTabsState(_combineTabs)
+        _setStoreData('combine_pending_and_progress_orders', _combineTabs || combineTabs);
+      }
+
+      if (!lastConnection) {
+        const formattedDate = parseDate(new Date())
+        lastConnection = formattedDate
+        _setStoreData('last_date_connection', formattedDate);
+      }
+
+      lastConnection && setLastDateConnection(lastConnection)
+
+      if (Object.values(ordersStoraged).every((key: any) => Array.isArray(key) && !key?.length)) {
+        for (const status of orderStatuses) {
+          ordersStoraged[status] = ordersGroup[status]?.orders
+          _setStoreData(`${status}_orders`, ordersGroup[status]?.orders);
+        }
+      }
+
+      if (Object.values(ordersStoraged).some((key: any) => Array.isArray(key) && key?.length)) {
+        let newOrderGroup = {
+          ...ordersGroup
+        }
+        for (const status of orderStatuses) {
+          newOrderGroup[status] = {
+            ...ordersGroup[status],
+            error: null,
+            orders: ordersStoraged[status]
+          }
+        }
+        setOrdersGroup(newOrderGroup)
+      }
+      setInternetLoading(false)
+    };
+
+    if (isNetConnected) {
+      _setStoreData('last_date_connection', null);
+      _setStoreData('combine_pending_and_progress_orders', null);
+      orderStatuses.forEach((key: any) => _setStoreData(`${key}_orders`, null))
+    } else if (isNetConnected === false) {
+      manageStoragedOrders()
+    }
+  }, [isNetConnected]);
 
   return (
     <>
+      {hasSearchFilters && (
+        <FilterAlert>
+          <AntDesignIcon
+            name='warning'
+            color='#FFC700'
+            size={12}
+            onPress={() => setOpenSearchModal(true)}
+          />
+          <OText size={10} mLeft={5} mRight={5}>
+            {t('WARNING_FILTER_APPLIED', 'Filters applied. You may miss new orders.')}
+          </OText>
+          <Pressable onPress={() => handleClearFilters()}>
+            <OText textDecorationLine='underline' size={10} color='rgb(44, 123, 229)'>{t('CLEAR_FILTERS', 'Clear filters')}</OText>
+          </Pressable>
+        </FilterAlert>
+      )}
       <View style={styles.header}>
         <OText style={styles.title}>{t('MY_ORDERS', 'My orders')}</OText>
         <IconWrapper>
           <View style={{ marginRight: 10 }}>
             <WebsocketStatus />
           </View>
-          <FeatherIcon
-            name='refresh-cw'
-            color={theme.colors.backgroundDark}
-            size={24}
-            onPress={() => { currentTabSelected === 'logisticOrders' ? loadLogisticOrders() : loadOrders && loadOrders({ newFetch: true }) }}
-            style={{ marginRight: 20 }}
-          />
-          <FontistoIcon
-            name='search'
-            color={theme.colors.backgroundDark}
-            size={24}
-            onPress={() => setOpenSearchModal(true)}
-          />
-        </IconWrapper>
-      </View>
-      {configState?.configs?.order_deadlines_enabled?.value === '1' && (
-        <View style={styles.SLAwrapper}>
-          {/* <View style={{ flex: 0.5 }}>
-            <OButton
-              text={t('SLA_SETTING', 'SLA’s Settings')}
-              textStyle={{ color: theme.colors.backArrow }}
-              imgRightSrc={null}
+          {isNetConnected && (
+            <FeatherIcon
+              name='refresh-cw'
+              color={theme.colors.backgroundDark}
+              size={24}
+              onPress={() => currentTabSelected === 'logisticOrders' ? loadLogisticOrders && loadLogisticOrders() : loadOrders && loadOrders({ newFetch: true, }, { allStatusses: hasSearchFilters })}
               style={{
-                backgroundColor: theme.colors.inputChat,
-                borderRadius: 7.6,
-                zIndex: 10,
-                borderWidth: 0,
-                minHeight: 40
+                marginRight: 20
               }}
-              onClick={onClickSetting}
             />
-          </View> */}
-          {/* <View style={{ width: 10, height: '100%' }} /> */}
-          {/* <View style={{ flex: 0.5, justifyContent: 'center' }}>
-            <SelectDropdown
-              defaultButtonText={t('SLA', 'SLA\'s')}
-              data={preorderTypeList}
-              onSelect={(selectedItem, index) => {
-                onFiltered && onFiltered({ ...search, timeStatus: selectedItem?.key })
-              }}
-              buttonTextAfterSelection={(selectedItem, index) => {
-                return selectedItem.name
-              }}
-              rowTextForSelection={(item, index) => {
-                return item.key
-              }}
-              buttonStyle={styles.selectOption}
-              buttonTextStyle={styles.buttonTextStyle}
-              renderDropdownIcon={isOpened => {
-                return <FeatherIcon name={isOpened ? 'chevron-up' : 'chevron-down'} color={'#444'} size={18} />;
-              }}
-              dropdownStyle={styles.dropdownStyle}
-              dropdownOverlayColor='transparent'
-              rowStyle={styles.rowStyle}
-              renderCustomizedRowChild={(item, index) => {
-                return (
-                  <SlaOption>
-                    {index !== 0 && <OrderStatus timeState={item?.key} />}
-                    <View><OText size={14} color={'#748194'} >{item?.name}</OText></View>
-                  </SlaOption>
-                );
-              }}
-            />
-          </View> */}
-        </View>
-      )}
-      <FiltersTab>
-        <ScrollView
-          ref={scrollRefTab}
-          showsVerticalScrollIndicator={false}
-          showsHorizontalScrollIndicator={false}
-          horizontal
-          nestedScrollEnabled={true}
-        >
-          <TabsContainer>
-            {(isLogisticActivated && !isBusinessApp && !combineTabs) && (
-              <Pressable
-                style={styles.pressable}
-                onPress={() => setCurrentTabSelected('logisticOrders')}>
-                <OIcon
-                  src={theme.images?.general?.chronometer}
-                  borderBottomWidth={currentTabSelected === 'logisticOrders' ? 1 : 0}
-                  width={currentTabSelected === 'logisticOrders' ? 26 : 24}
-                  height={currentTabSelected === 'logisticOrders' ? 26 : 24}
-                  color={
-                    currentTabSelected === 'logisticOrders'
-                      ? theme.colors.textGray
-                      : theme.colors.unselectText
-                  }
-                  style={styles.icon}
-                />
-              </Pressable>
-            )}
-            {tabs.map((tab: any) => (
-              <TabPressable
-                key={tab.key}
-                onPress={() => setCurrentTabSelected(tab?.title)}
-                isSelected={tab.title === currentTabSelected ? 1 : 0}
-              >
-                <OText
+          )}
+          {currentTabSelected !== 'logisticOrders' && (
+            <View>
+              {hasSearchFilters && (
+                <AntDesignIcon
+                  name='exclamationcircle'
+                  color={theme.colors.primary}
+                  size={16}
                   style={{
-                    ...styles.tab,
-                    fontSize: tab.title === currentTabSelected ? 16 : 14,
-                    borderBottomWidth: Platform.OS === 'ios' && tab.title === currentTabSelected ? 1 : 0,
+                    position: 'absolute',
+                    zIndex: 1000,
+                    right: -8,
+                    top: -5
                   }}
-                  color={
-                    tab.title === currentTabSelected
-                      ? theme.colors.textGray
-                      : theme.colors.unselectText
-                  }
-                  weight={tab.title === currentTabSelected ? '600' : 'normal'}
+                  onPress={() => setOpenSearchModal(true)}
+                />
+              )}
+              <FontistoIcon
+                name='filter'
+                color={theme.colors.backgroundDark}
+                size={24}
+                onPress={() => setOpenSearchModal(true)}
+              />
+            </View>
+          )}
+        </IconWrapper>
+      </View>
+      {!hasSearchFilters && (
+        <FiltersTab>
+          <ScrollView
+            ref={scrollRefTab}
+            showsVerticalScrollIndicator={false}
+            showsHorizontalScrollIndicator={false}
+            horizontal
+            nestedScrollEnabled={true}
+          >
+            <TabsContainer>
+              {(isLogisticActivated && !isBusinessApp && !combineTabs) && (
+                <Pressable
+                  style={styles.pressable}
+                  onPress={() => setCurrentTabSelected('logisticOrders')}>
+                  <OIcon
+                    src={theme.images?.general?.chronometer}
+                    borderBottomWidth={currentTabSelected === 'logisticOrders' ? 1 : 0}
+                    width={currentTabSelected === 'logisticOrders' ? 26 : 24}
+                    height={currentTabSelected === 'logisticOrders' ? 26 : 24}
+                    color={
+                      currentTabSelected === 'logisticOrders'
+                        ? theme.colors.textGray
+                        : theme.colors.unselectText
+                    }
+                    style={styles.icon}
+                  />
+                </Pressable>
+              )}
+              {!hasSearchFilters && tabs.map((tab: any) => (
+                <TabPressable
+                  key={tab.key}
+                  onPress={() => setCurrentTabSelected(tab?.title)}
+                  isSelected={tab.title === currentTabSelected ? 1 : 0}
                 >
-                  {tab.text}
-                </OText>
-              </TabPressable>
-            ))}
-          </TabsContainer>
-        </ScrollView>
-      </FiltersTab>
+                  <OText
+                    style={{
+                      ...styles.tab,
+                      fontSize: tab.title === currentTabSelected ? 16 : 14,
+                      borderBottomWidth: Platform.OS === 'ios' && tab.title === currentTabSelected ? 1 : 0,
+                    }}
+                    color={
+                      tab.title === currentTabSelected
+                        ? theme.colors.textGray
+                        : theme.colors.unselectText
+                    }
+                    weight={tab.title === currentTabSelected ? '600' : 'normal'}
+                  >
+                    {tab.text}
+                  </OText>
+                </TabPressable>
+              ))}
+            </TabsContainer>
+          </ScrollView>
+        </FiltersTab>
+      )}
       <View style={{ flex: 1, minHeight: HEIGHT_SCREEN - 450 }}>
-        {currentTabSelected !== 'logisticOrders' && !isAlsea && (
+        {showTagsList && !hasSearchFilters && (
           <View
             style={{
               display: 'flex',
@@ -588,6 +653,22 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
             </ScrollView>
           </View>
         )}
+        {isNetConnected === false && lastDateConnection && (
+          <View
+            style={{
+              borderRadius: 8,
+              paddingVertical: 3,
+              backgroundColor: theme.colors.danger500,
+              marginBottom: 10
+            }}
+          >
+            <OText
+              style={{ color: 'white', textAlign: 'center' }}
+            >
+              {`${t('LAST_UPDATE', 'Last Update')}: ${lastDateConnection}`}
+            </OText>
+          </View>
+        )}
         <ScrollView
           ref={scrollListRef}
           showsVerticalScrollIndicator={false}
@@ -596,16 +677,17 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
           refreshControl={
             <RefreshControl
               refreshing={refreshing}
-              onRefresh={() => { currentTabSelected === 'logisticOrders' ? loadLogisticOrders() : loadOrders && loadOrders({ newFetch: true }) }}
+              onRefresh={() => { isNetConnected && (currentTabSelected === 'logisticOrders' ? loadLogisticOrders && loadLogisticOrders() : loadOrders && loadOrders({ newFetch: true }, { allStatusses: hasSearchFilters })) }}
             />
           }
         >
-          {!currentOrdersGroup?.error?.length &&
-            currentOrdersGroup?.orders?.length > 0 &&
+          {!ordersValidation?.error?.length &&
+            (ordersValidation?.orders?.length > 0 || ordersFiltered?.orders?.length > 0) &&
             currentTabSelected !== 'logisticOrders' &&
+            !ordersValidation?.loading &&
             (
               <PreviousOrders
-                orders={ordersFormatted}
+                orders={hasSearchFilters ? ordersFiltered?.orders : ordersFormatted}
                 navigation={props.navigation}
                 onNavigationRedirect={onNavigationRedirect}
                 getOrderStatus={getOrderStatus}
@@ -621,7 +703,8 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
               />
             )}
           {!logisticOrders?.error?.length &&
-            logisticOrders?.orders?.length > 0 &&
+            logisticOrders && logisticOrders?.orders?.length > 0 &&
+            !logisticOrders?.loading &&
             currentTabSelected === 'logisticOrders' && (
               <PreviousOrders
                 orders={logisticOrders?.orders?.filter((order: any) => !order?.expired).map((order: any) => ({ ...order, isLogistic: true }))}
@@ -633,46 +716,40 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
               />
             )
           }
-          {((currentOrdersGroup?.loading ||
-            currentOrdersGroup?.pagination?.total === null) ||
-            (logisticOrders?.loading)) &&
-            (
-              <>
-                <View>
-                  {[...Array(5)].map((_, i) => (
-                    <Placeholder key={i} Animation={Fade}>
-                      <View
+          {(
+            loadingValidation || internetLoading
+          ) && (
+              <View style={{ marginTop: 10 }}>
+                {[...Array(5)].map((_, i) => (
+                  <Placeholder key={i} Animation={Fade}>
+                    <View
+                      style={{
+                        width: '100%',
+                        flexDirection: 'row',
+                        marginBottom: 10,
+                      }}>
+                      <PlaceholderLine
+                        width={IS_PORTRAIT ? 22 : 11}
+                        height={74}
                         style={{
-                          width: '100%',
-                          flexDirection: 'row',
-                          marginBottom: 10,
-                        }}>
-                        <PlaceholderLine
-                          width={IS_PORTRAIT ? 22 : 11}
-                          height={74}
-                          style={{
-                            marginRight: 20,
-                            marginBottom: 20,
-                            borderRadius: 7.6,
-                          }}
-                        />
-                        <Placeholder>
-                          <PlaceholderLine width={30} style={{ marginTop: 5 }} />
-                          <PlaceholderLine width={50} />
-                          <PlaceholderLine width={20} />
-                        </Placeholder>
-                      </View>
-                    </Placeholder>
-                  ))}
-                </View>
-              </>
+                          marginRight: 20,
+                          marginBottom: 20,
+                          borderRadius: 7.6,
+                        }}
+                      />
+                      <Placeholder>
+                        <PlaceholderLine width={30} style={{ marginTop: 5 }} />
+                        <PlaceholderLine width={50} />
+                        <PlaceholderLine width={20} />
+                      </Placeholder>
+                    </View>
+                  </Placeholder>
+                ))}
+              </View>
             )}
 
-          {!currentOrdersGroup?.error?.length &&
-            !currentOrdersGroup?.loading &&
-            currentOrdersGroup?.pagination?.totalPages &&
-            currentOrdersGroup?.pagination?.currentPage < currentOrdersGroup?.pagination?.totalPages &&
-            currentOrdersGroup?.orders?.length > 0 &&
+          {isNetConnected &&
+            paginationValidation &&
             (
               <OButton
                 onClick={handleLoadMore}
@@ -685,33 +762,35 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
               />
             )}
 
-          {((!currentOrdersGroup?.loading &&
-            (currentOrdersGroup?.error?.length ||
-              currentOrdersGroup?.orders?.length === 0)) ||
-            (currentTabSelected === 'logisticOrders' &&
-              (logisticOrders?.error?.length > 0 || logisticOrders?.orders?.length === 0 || !logisticOrders?.orders?.some(order => !order?.expired)))
-          ) &&
+          {!internetLoading &&
+            ((!ordersValidation?.loading &&
+              (ordersValidation?.error?.length ||
+                ordersValidation?.orders?.length === 0)) ||
+              (currentTabSelected === 'logisticOrders' &&
+                (logisticOrders && !logisticOrders?.loading && (logisticOrders?.error?.length > 0 || logisticOrders?.orders?.length === 0 || !logisticOrders?.orders?.some(order => !order?.expired))))
+            ) &&
             (
               <NotFoundSource
                 content={
-                  ((currentTabSelected !== 'logisticOrders' && !currentOrdersGroup?.error?.length) ||
-                    (currentTabSelected === 'logisticOrders' && (!logisticOrders?.error?.length || (logisticOrders?.orders?.length > 0 && !logisticOrders?.orders?.some(order => !order?.expired)))))
-                    ? t('NO_RESULTS_FOUND', 'Sorry, no results found')
-                    : currentOrdersGroup?.error?.[0]?.message ||
-                    currentOrdersGroup?.error?.[0] ||
-                    (currentTabSelected === 'logisticOrders' && logisticOrders?.error) ||
-                    t('NETWORK_ERROR', 'Network Error')
+                  !isNetConnected ? t('NETWORK_ERROR', 'Network Error') :
+                    ((currentTabSelected !== 'logisticOrders' && !ordersValidation?.error?.length) ||
+                      (currentTabSelected === 'logisticOrders' && (!logisticOrders?.error?.length || (logisticOrders?.orders?.length > 0 && !logisticOrders?.orders?.some(order => !order?.expired)))))
+                      ? t('NO_RESULTS_FOUND', 'Sorry, no results found')
+                      : ordersValidation?.error?.[0]?.message ||
+                      ordersValidation?.error?.[0] ||
+                      (currentTabSelected === 'logisticOrders' && logisticOrders?.error) ||
+                      t('NETWORK_ERROR', 'Network Error')
                 }
                 image={theme.images.general.notFound}
                 conditioned={false}
+                btnTitle={!isNetConnected && t('REFRESH', 'Refresh')}
+                onClickButton={!isNetConnected && (() => RNRestart.Restart())}
               />
             )}
         </ScrollView>
       </View>
 
-      {isBusinessApp && (
-        <NewOrderNotification isBusinessApp={isBusinessApp} />
-      )}
+      <NewOrderNotification isBusinessApp={isBusinessApp} />
 
       {(openSearchModal || openSLASettingModal) && (
         <OModal open={openSearchModal || openSLASettingModal} entireModal customClose>
@@ -724,39 +803,41 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
             {openSearchModal && (
               <SearchModalContent>
                 <ModalTitle>{t('SEARCH_ORDERS', 'Search orders')}</ModalTitle>
-                <InputContainer style={{ marginBottom: 24 }}>
-                  <SelectDropdown
-                    defaultButtonText={search?.timeStatus
-                      ? preorderTypeList.find(type => type.key === search?.timeStatus)?.name
-                      : t('SLA', 'SLA\'s')}
-                    data={preorderTypeList}
-                    onSelect={(selectedItem, index) => {
-                      setSearch({ ...search, timeStatus: selectedItem?.key })
-                    }}
-                    buttonTextAfterSelection={(selectedItem, index) => {
-                      return selectedItem.name
-                    }}
-                    rowTextForSelection={(item, index) => {
-                      return item.key
-                    }}
-                    buttonStyle={styles.selectOption}
-                    buttonTextStyle={styles.buttonTextStyle}
-                    renderDropdownIcon={isOpened => {
-                      return <FeatherIcon name={isOpened ? 'chevron-up' : 'chevron-down'} color={'#444'} size={18} />;
-                    }}
-                    dropdownStyle={styles.dropdownStyle}
-                    dropdownOverlayColor='transparent'
-                    rowStyle={styles.rowStyle}
-                    renderCustomizedRowChild={(item, index) => {
-                      return (
-                        <SlaOption>
-                          {index !== 0 && <OrderStatus timeState={item?.key} />}
-                          <View><OText size={14} color={'#748194'} >{item?.name}</OText></View>
-                        </SlaOption>
-                      );
-                    }}
-                  />
-                </InputContainer>
+                {configState?.configs?.order_deadlines_enabled?.value === '1' && (
+                  <InputContainer style={{ marginBottom: 24 }}>
+                    <SelectDropdown
+                      defaultButtonText={search?.timeStatus
+                        ? preorderTypeList.find(type => type.key === search?.timeStatus)?.name
+                        : t('SLA', 'SLA\'s')}
+                      data={preorderTypeList}
+                      onSelect={(selectedItem, index) => {
+                        setSearch({ ...search, timeStatus: selectedItem?.key })
+                      }}
+                      buttonTextAfterSelection={(selectedItem, index) => {
+                        return selectedItem.name
+                      }}
+                      rowTextForSelection={(item, index) => {
+                        return item.key
+                      }}
+                      buttonStyle={styles.selectOption}
+                      buttonTextStyle={styles.buttonTextStyle}
+                      renderDropdownIcon={isOpened => {
+                        return <FeatherIcon name={isOpened ? 'chevron-up' : 'chevron-down'} color={'#444'} size={18} />;
+                      }}
+                      dropdownStyle={styles.dropdownStyle}
+                      dropdownOverlayColor='transparent'
+                      rowStyle={styles.rowStyle}
+                      renderCustomizedRowChild={(item, index) => {
+                        return (
+                          <SlaOption>
+                            {index !== 0 && <OrderStatus timeState={item?.key} />}
+                            <View><OText size={14} color={'#748194'} >{item?.name}</OText></View>
+                          </SlaOption>
+                        );
+                      }}
+                    />
+                  </InputContainer>
+                )}
                 <InputContainer>
                   <OInput
                     value={search.id}
@@ -985,12 +1066,29 @@ export const OrdersOption = (props: OrdersOptionParams) => {
   const [, t] = useLanguage();
   const [configState] = useConfig()
   const [checkNotificationStatus, setCheckNotificationStatus] = useState({ open: false, checked: false })
-  const combineTabs = configState?.configs?.combine_pending_and_progress_orders?.value === '1'
+  const [combineTabs, setCombineTabs] = useState(null)
+
+  useEffect(() => {
+    const getCombineTabsStoraged = async () => {
+      try {
+        const storagedValue = await _retrieveStoreData('combine_pending_and_progress_orders');
+        const _combineTabs = typeof configState?.configs?.combine_pending_and_progress_orders === 'object'
+          ? configState?.configs?.combine_pending_and_progress_orders?.value === '1'
+          : storagedValue
+          setCombineTabs(_combineTabs)
+      } catch {
+        return null
+      }
+    }
+    getCombineTabsStoraged()
+  }, [])
+
   const ordersProps = {
     ...props,
     UIComponent: OrdersOptionUI,
     useDefualtSessionManager: true,
     asDashboard: true,
+    combineTabs,
     isIos: Platform.OS === 'ios',
     orderStatus: [
       { key: 0, text: t('PENDING', 'Pending') },
@@ -1070,13 +1168,25 @@ export const OrdersOption = (props: OrdersOptionParams) => {
       {
         key: 23,
         text: t('ORDER_DRIVER_ON_WAY', 'Driver on way')
+      },
+      {
+        key: 24,
+        text: t('ORDER_DRIVER_WAITING_FOR_ORDER', 'Driver waiting for order')
+      },
+      {
+        key: 25,
+        text: t('ORDER_ACCEPTED_BY_DRIVER_COMPANY', 'Accepted by driver company')
+      },
+      {
+        key: 26,
+        text: t('ORDER_DRIVER_ARRIVED_CUSTOMER', 'Driver arrived to customer')
       }
     ],
     tabs: combineTabs ? [
       {
         key: 0,
         text: t('ACTIVE', 'Active'),
-        tags: props?.orderGroupStatusCustom?.active ?? [0, 3, 4, 7, 8, 9, 13, 14, 18, 19, 20, 21, 22, 23],
+        tags: props?.orderGroupStatusCustom?.active ?? [0, 3, 4, 7, 8, 9, 13, 14, 18, 19, 20, 21, 22, 23, 24, 25, 26],
         title: 'active',
       },
       {
@@ -1102,7 +1212,7 @@ export const OrdersOption = (props: OrdersOptionParams) => {
         {
           key: 1,
           text: t('IN_PROGRESS', 'In Progress'),
-          tags: props?.orderGroupStatusCustom?.inProgress ?? [3, 4, 7, 8, 9, 14, 18, 19, 20, 21, 22, 23],
+          tags: props?.orderGroupStatusCustom?.inProgress ?? [3, 4, 7, 8, 9, 14, 18, 19, 20, 21, 22, 23, 24, 25, 26],
           title: 'inProgress',
         },
         {
@@ -1128,3 +1238,7 @@ export const OrdersOption = (props: OrdersOptionParams) => {
     )}
   </>);
 };
+
+OrdersOption.defaultProps = {
+  isNetConnected: true
+}