ordering-ui-react-native 0.22.71 → 0.22.72-release

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

@@ -1,6 +1,6 @@
 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';
@@ -37,7 +37,8 @@ import {
   ItemContent,
   TimerInputWrapper,
   OverLine,
-  InputContainer
+  InputContainer,
+  FilterAlert
 } from './styles';
 import { PreviousOrders } from '../PreviousOrders';
 import { OrdersOptionParams } from '../../types';
@@ -55,6 +56,8 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
     navigation,
     setCurrentFilters,
     tabs,
+    combineTabs,
+    setCombineTabsState,
     isNetConnected,
     currentTabSelected,
     setCurrentTabSelected,
@@ -73,7 +76,8 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
     loadLogisticOrders,
     isLogisticActivated,
     handleChangeOrderStatus,
-    handleSendCustomerReview
+    handleSendCustomerReview,
+    ordersFiltered
   } = props;
 
   const defaultSearchList = {
@@ -104,6 +108,8 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
   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'),
@@ -127,7 +133,6 @@ 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)
@@ -257,7 +262,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
       paddingLeft: 0,
       paddingRight: 0,
       marginBottom: 30,
-      marginTop: 30
+      marginTop: Platform.OS === 'ios' ? 60 : 30
     },
     rowStyle: {
       display: 'flex',
@@ -287,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) => {
@@ -301,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)
@@ -377,6 +389,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
   }
 
   const handleClose = () => {
+    setSearch(defaultSearchList)
     setOpenSearchModal(false)
     setOpenSLASettingModal(false)
   }
@@ -392,12 +405,12 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
     setTags({ values: [] })
   }, [currentTabSelected])
 
-	useEffect(() => {
-		const unsubcribe = navigation.addListener('focus', () => {
+  useEffect(() => {
+    const unsubcribe = navigation.addListener('focus', () => {
       currentTabSelected === 'logisticOrders' && loadLogisticOrders && loadLogisticOrders()
-		})
-		return unsubcribe
-	}, [navigation, loadLogisticOrders])
+    })
+    return unsubcribe
+  }, [navigation, loadLogisticOrders])
 
   useEffect(() => {
     const orderStatuses = ['active', 'pending', 'inProgress', 'completed', 'cancelled']
@@ -405,11 +418,17 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
     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
@@ -443,6 +462,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 
     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()
@@ -451,6 +471,22 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 
   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>
@@ -462,73 +498,95 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
               name='refresh-cw'
               color={theme.colors.backgroundDark}
               size={24}
-              onPress={() => { currentTabSelected === 'logisticOrders' ? loadLogisticOrders && loadLogisticOrders() : loadOrders && loadOrders({ newFetch: true }) }}
-              style={{ marginRight: 20 }}
+              onPress={() => currentTabSelected === 'logisticOrders' ? loadLogisticOrders && loadLogisticOrders() : loadOrders && loadOrders({ newFetch: true, }, { allStatusses: hasSearchFilters })}
+              style={{
+                marginRight: 20
+              }}
             />
           )}
-          <FontistoIcon
-            name='search'
-            color={theme.colors.backgroundDark}
-            size={24}
-            onPress={() => setOpenSearchModal(true)}
-          />
-        </IconWrapper>
-      </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 }}>
-        {showTagsList && (
+        {showTagsList && !hasSearchFilters && (
           <View
             style={{
               display: 'flex',
@@ -619,16 +677,17 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
           refreshControl={
             <RefreshControl
               refreshing={refreshing}
-              onRefresh={() => { isNetConnected && (currentTabSelected === 'logisticOrders' ? loadLogisticOrders && 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}
@@ -644,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 }))}
@@ -657,51 +717,39 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
             )
           }
           {(
-            (
-              (
-                currentOrdersGroup?.loading ||
-                (currentOrdersGroup?.pagination?.total === null && isNetConnected) ||
-                logisticOrders?.loading
-              ) &&
-              !currentOrdersGroup?.error?.length &&
-              !currentOrdersGroup?.orders?.length
-            ) || internetLoading
+            loadingValidation || internetLoading
           ) && (
-            <View>
-              {[...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}
+              <View style={{ marginTop: 10 }}>
+                {[...Array(5)].map((_, i) => (
+                  <Placeholder key={i} Animation={Fade}>
+                    <View
                       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>
-          )}
+                        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>
+            )}
 
           {isNetConnected &&
-            !currentOrdersGroup?.error?.length &&
-            !currentOrdersGroup?.loading &&
-            currentOrdersGroup?.pagination?.totalPages &&
-            currentOrdersGroup?.pagination?.currentPage < currentOrdersGroup?.pagination?.totalPages &&
-            currentOrdersGroup?.orders?.length > 0 &&
+            paginationValidation &&
             (
               <OButton
                 onClick={handleLoadMore}
@@ -715,23 +763,23 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
             )}
 
           {!internetLoading &&
-            ((!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)))
-          ) &&
+            ((!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={
                   !isNetConnected ? t('NETWORK_ERROR', 'Network Error') :
-                  ((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')
+                    ((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}
@@ -742,9 +790,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
         </ScrollView>
       </View>
 
-      {isBusinessApp && (
-        <NewOrderNotification isBusinessApp={isBusinessApp} />
-      )}
+      <NewOrderNotification isBusinessApp={isBusinessApp} />
 
       {(openSearchModal || openSLASettingModal) && (
         <OModal open={openSearchModal || openSLASettingModal} entireModal customClose>
@@ -1020,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') },
@@ -1105,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',
       },
       {
@@ -1137,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',
         },
         {

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

@@ -154,3 +154,17 @@ export const Actions = styled.View`
 export const InputContainer = styled.View`
   position: relative;
 `
+
+export const FilterAlert = styled.View`
+  position: absolute;
+  z-index: 1000;
+  flex-direction: row;
+  top: 50px;
+  background-color: #FFF9E2;
+  flex-wrap: wrap;
+  align-items: flex-start;
+  justify-content: flex-start;
+  right: 10px;
+  padding: 5px;
+  border-radius: 10px
+`

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

@@ -1,5 +1,6 @@
 import React, { useState } from 'react';
 import { StyleSheet, TouchableOpacity, FlatList, RefreshControl } from 'react-native';
+import FastImage from 'react-native-fast-image';
 import { useTheme } from 'styled-components/native';
 import { useLanguage, useUtils } from 'ordering-components/native';
 import { Card, Logo, Information, Header, Badge } from './styles';
@@ -201,6 +202,24 @@ export const PreviousMessages = (props: PreviousMessagesParams) => {
         value: t('ORDER_DRIVER_ON_WAY', 'Driver on way'),
         slug: 'ORDER_DRIVER_ON_WAY',
         percentage: 45
+      },
+      {
+        key: 24,
+        value: t('ORDER_DRIVER_WAITING_FOR_ORDER', 'Driver waiting for order'),
+        slug: 'ORDER_DRIVER_WAITING_FOR_ORDER',
+        percentage: 25
+      },
+      {
+        key: 25,
+        value: t('ORDER_ACCEPTED_BY_DRIVER_COMPANY', 'Accepted by driver company'),
+        slug: 'ORDER_ACCEPTED_BY_DRIVER_COMPANY',
+        percentage: 25
+      },
+      {
+        key: 26,
+        value: t('ORDER_DRIVER_ARRIVED_CUSTOMER', 'Driver arrived to customer'),
+        slug: 'ORDER_DRIVER_ARRIVED_CUSTOMER',
+        percentage: 80
       }
     ];
 
@@ -284,10 +303,14 @@ export const PreviousMessages = (props: PreviousMessagesParams) => {
               activeOpacity={1}>
               <Card key={order?.id}>
                 <Logo style={styles.logo}>
-                  <OIcon
-                    url={optimizeImage(order?.business?.logo, 'h_300,c_limit')}
-                    src={!order?.business?.logo && theme?.images?.dummies?.businessLogo}
+                  <FastImage
                     style={styles.icon}
+                    source={order.business?.logo?.includes('https') ? {
+                      uri: order.business?.logo,
+                      priority: FastImage.priority.high,
+                      cache: FastImage.cacheControl.immutable
+                    } : order.business?.logo ?? theme?.images?.dummies?.businessLogo}
+                    resizeMode={FastImage.resizeMode.cover}
                   />
                 </Logo>
                 <Information>