ordering-ui-react-native 0.22.27 → 0.22.28-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 { View, Pressable, StyleSheet, ScrollView, RefreshControl, Platform, TouchableOpacity, Animated, Easing } from 'react-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';
@@ -53,6 +55,9 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
     navigation,
     setCurrentFilters,
     tabs,
+    combineTabs,
+    setCombineTabsState,
+    isNetConnected,
     currentTabSelected,
     setCurrentTabSelected,
     ordersGroup,
@@ -69,7 +74,6 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
     logisticOrders,
     loadLogisticOrders,
     isLogisticActivated,
-    isAlsea,
     handleChangeOrderStatus,
     handleSendCustomerReview
   } = props;
@@ -95,6 +99,7 @@ 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)
@@ -124,12 +129,16 @@ 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 AnimatedFeatherIcon = Animated.createAnimatedComponent(FeatherIcon);
+  const spinValue = new Animated.Value(0);
 
   const preorderTypeList = [
     { key: null, name: t('SLA', 'SLA\'s') },
@@ -251,7 +260,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
       paddingLeft: 0,
       paddingRight: 0,
       marginBottom: 30,
-      marginTop: 30
+      marginTop: Platform.OS === 'ios' ? 60 : 30
     },
     rowStyle: {
       display: 'flex',
@@ -380,18 +389,94 @@ 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]);
+
+
+  const handleInitAnimation = () => {
+    Animated.timing(
+      spinValue,
+      {
+        toValue: 1,
+        duration: 2000,
+        easing: Easing.linear,
+        useNativeDriver: true
+      }
+    ).start()
+  }
+
+  useEffect(() => {
+    if (currentOrdersGroup?.loading || logisticOrders?.loading) {
+      handleInitAnimation()
+    }
+  }, [currentOrdersGroup?.loading, logisticOrders?.loading])
 
   return (
     <>
@@ -401,13 +486,23 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
           <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 }}
-          />
+          {isNetConnected && (
+            <AnimatedFeatherIcon
+              name='refresh-cw'
+              color={theme.colors.backgroundDark}
+              size={24}
+              onPress={() => currentTabSelected === 'logisticOrders' ? loadLogisticOrders && loadLogisticOrders() : loadOrders && loadOrders({ newFetch: true })}
+              style={{
+                marginRight: 20,
+                transform: [{
+                  rotate: spinValue.interpolate({
+                    inputRange: [0, 0.3],
+                    outputRange: ['0deg', '360deg'],
+                  })
+                }]
+              }}
+            />
+          )}
           <FontistoIcon
             name='search'
             color={theme.colors.backgroundDark}
@@ -416,57 +511,6 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
           />
         </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}
-              style={{
-                backgroundColor: theme.colors.inputChat,
-                borderRadius: 7.6,
-                zIndex: 10,
-                borderWidth: 0,
-                minHeight: 40
-              }}
-              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}
@@ -521,7 +565,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
         </ScrollView>
       </FiltersTab>
       <View style={{ flex: 1, minHeight: HEIGHT_SCREEN - 450 }}>
-        {currentTabSelected !== 'logisticOrders' && !isAlsea && (
+        {showTagsList && (
           <View
             style={{
               display: 'flex',
@@ -588,6 +632,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,7 +656,7 @@ 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 })) }}
             />
           }
         >
@@ -633,42 +693,48 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
               />
             )
           }
-          {((currentOrdersGroup?.loading ||
-            currentOrdersGroup?.pagination?.total === null) ||
-            (logisticOrders?.loading)) &&
+          {(
             (
-              <>
-                <View>
-                  {[...Array(5)].map((_, i) => (
-                    <Placeholder key={i} Animation={Fade}>
-                      <View
+              (
+                currentOrdersGroup?.loading ||
+                (currentOrdersGroup?.pagination?.total === null && isNetConnected) ||
+                logisticOrders?.loading
+              ) &&
+              !currentOrdersGroup?.error?.length &&
+              !currentOrdersGroup?.orders?.length
+            ) || 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}
                         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 &&
+          {isNetConnected &&
+            !currentOrdersGroup?.error?.length &&
             !currentOrdersGroup?.loading &&
             currentOrdersGroup?.pagination?.totalPages &&
             currentOrdersGroup?.pagination?.currentPage < currentOrdersGroup?.pagination?.totalPages &&
@@ -685,33 +751,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 &&
+            ((!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)))
+            ) &&
             (
               <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' && !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')
                 }
                 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 +792,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 +1055,16 @@ 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 getCombineTabsStoraged = async () => 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' : getCombineTabsStoraged()
+
   const ordersProps = {
     ...props,
     UIComponent: OrdersOptionUI,
     useDefualtSessionManager: true,
     asDashboard: true,
+    combineTabs,
     isIos: Platform.OS === 'ios',
     orderStatus: [
       { key: 0, text: t('PENDING', 'Pending') },
@@ -1070,13 +1144,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 +1188,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 +1214,7 @@ export const OrdersOption = (props: OrdersOptionParams) => {
     )}
   </>);
 };
+
+OrdersOption.defaultProps = {
+  isNetConnected: true
+}

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

@@ -6,7 +6,7 @@ import { useTheme } from 'styled-components/native';
 import { Wrapper } from './styles';
 import { OText, OIcon } from '../shared';
 import { PhoneInputParams } from '../../types';
-import { transformCountryCode } from '../../utils';
+import { transformCountryCode, findExitingCode } from '../../utils';
 
 export const PhoneInputNumber = (props: PhoneInputParams) => {
   const {
@@ -97,10 +97,13 @@ export const PhoneInputNumber = (props: PhoneInputParams) => {
         containerStyle={{ width: '100%' }}
         ref={phoneInput}
         defaultValue={userphoneNumber || defaultValue}
-        defaultCode={
-          defaultCode
-            ? transformCountryCode(defaultCode)
-            : configs?.default_country_code?.value
+        defaultCode={defaultCode ?
+					!isNaN(defaultCode)
+						? transformCountryCode(defaultCode)
+						: findExitingCode(defaultCode)
+					: !isNaN((configs?.default_country_code?.value || '')?.replace(/\+/g, ''))
+             ? transformCountryCode((configs?.default_country_code?.value || '')?.replace(/\+/g, ''))
+             : findExitingCode(configs?.default_country_code?.value?.toUpperCase())
         }
         onChangeFormattedText={(text: string) => handleChangeNumber(text)}
         countryPickerProps={{

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>