ordering-ui-react-native 0.17.69 → 0.17.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.17.69",
+  "version": "0.17.70",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

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

@@ -11,19 +11,17 @@ import {
 } from 'react-native';
 import { useTheme } from 'styled-components/native';
 import SelectDropdown from 'react-native-select-dropdown'
-import { useLanguage, useSession } from 'ordering-components/native';
-import { Content, Timer, TimeField, Header, Action, Comments, CommentsButtonGroup } from './styles';
-import { FloatingButton } from '../FloatingButton';
+import { useLanguage } from 'ordering-components/native';
+import { Content, Timer, TimeField, Header, Comments, CommentsButtonGroup, TopActions } from './styles';
 import { OText, OButton, OTextarea, OIconButton } from '../shared';
 import { AcceptOrRejectOrderParams } from '../../types';
-import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
 import { orderCommentList } from '../../../../../src/utils'
 
 export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
   const {
+    isPage,
     customerCellphone,
-    loading,
     action,
     handleUpdateOrder,
     actions,
@@ -35,7 +33,6 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
   } = props;
 
   const [, t] = useLanguage();
-  const [{ user }] = useSession();
   const theme = useTheme();
   const scrollViewRef = useRef<any>(null);
   const viewRef = useRef<any>(null);
@@ -46,11 +43,9 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
   const [time, setTime] = useState('');
   const [comments, setComments] = useState('');
   const [rejectReason, setRejectReason] = useState(null);
-  const [isKeyboardShow, setIsKeyboardShow] = useState(false);
-  const { top, bottom } = useSafeAreaInsets()
+  const [keyboardState, setKeyboardState] = useState({ show: false, height: 0 });
 
   const isDriverApp = appTitle?.key === 'DELIVERY_APP'
-
   const orderCommentsList = orderCommentList(action)
 
   let codeNumberPhone, numberPhone, numberToShow;
@@ -93,6 +88,28 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
       alignItems: 'center',
       paddingHorizontal: 10
     },
+    parent: {
+      flex: 1,
+      backgroundColor: theme.colors.backgroundPage,
+    },
+    upper: {
+      flex: 1,
+      zIndex: 1001,
+      paddingTop: isPage ? 30 : 80,
+      marginBottom: 10,
+      backgroundColor: theme.colors.backgroundPage
+    },
+    bottomParent: {
+      justifyContent: "center",
+      paddingHorizontal: 30,
+      alignItems: "center",
+      width: '100%',
+      height: 45,
+    },
+    bottom: {
+      textAlignVertical: "center",
+      textAlign: "center",
+    }
   })
 
   const handleFocus = () => {
@@ -101,25 +118,6 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
     });
   };
 
-  useEffect(() => {
-    const keyboardDidShowListener = Keyboard.addListener(
-      'keyboardDidShow',
-      () => {
-        setIsKeyboardShow(true);
-      },
-    );
-    const keyboardDidHideListener = Keyboard.addListener(
-      'keyboardDidHide',
-      () => {
-        setIsKeyboardShow(false);
-      },
-    );
-    return () => {
-      keyboardDidShowListener.remove();
-      keyboardDidHideListener.remove();
-    };
-  }, []);
-
   if (!notShowCustomerPhone) {
     if (phoneNumber) {
       codeNumberPhone = phoneNumber.slice(0, 3);
@@ -172,15 +170,15 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
   };
 
   const openTimerIOnput = () => {
-    const isFocus = timerRef.current.isFocused();
+    const isFocus = timerRef.current?.isFocused();
     if (isFocus) {
-      timerRef.current.blur();
+      timerRef.current?.blur();
     }
 
   };
 
   const openTextTareaOInput = () => {
-    const isFocus = textTareaRef.current.isFocused();
+    const isFocus = textTareaRef.current?.isFocused();
     if (isFocus && textTareaRef?.current) {
       textTareaRef.current.blur();
     }
@@ -281,227 +279,250 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
     }
   }, [timerRef?.current])
 
+  useEffect(() => {
+    const keyboardDidShowListener =
+      Keyboard.addListener('keyboardDidShow', (e) => setKeyboardState({
+        show: true,
+        height: e.endCoordinates.height > 100
+          ? Platform.OS == 'ios' ? e.endCoordinates.height : 0 : 0
+      }))
+    const keyboardDidHideListener =
+      Keyboard.addListener('keyboardDidHide', () => setKeyboardState({ show: false, height: 0 }))
+    return () => {
+      keyboardDidShowListener.remove()
+      keyboardDidHideListener.remove()
+    }
+  }, [])
+
   return (
-    <KeyboardAvoidingView
-      enabled
-      behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-      style={{ flex: 1, paddingHorizontal: 30, paddingVertical: 30, marginTop: top, marginBottom: bottom, justifyContent: 'space-between' }}>
-      <View>
-        <OIconButton
-          icon={theme.images.general.arrow_left}
-          borderColor={theme.colors.clear}
-          iconStyle={{ width: 20, height: 20 }}
-          style={{
-            maxWidth: 40,
-            height: 35,
-            justifyContent: 'flex-end',
-            marginBottom: 30,
-          }}
-          onClick={() => handleArrowBack()}
-        />
-        <OText
-          size={20}
-          color={theme.colors.textGray}
-          style={{
-            fontFamily: 'Poppins',
-            fontStyle: 'normal',
-          }}
-          weight="600">
-          {titleOrder}
-        </OText>
-      </View>
-      <Content showsVerticalScrollIndicator={false} ref={scrollViewRef}>
-        <Header>
-          {action === 'reject' && (
-            <>
-              {!notShowCustomerPhone && (
+    <KeyboardAvoidingView style={{ flex: 1 }}>
+      <View style={styles.parent}>
+        <View style={styles.upper}>
+          <TopActions>
+            <OIconButton
+              icon={theme.images.general.arrow_left}
+              borderColor={theme.colors.clear}
+              iconStyle={{ width: 20, height: 20 }}
+              style={{
+                maxWidth: 40,
+                height: 35,
+                justifyContent: 'flex-end',
+                marginBottom: 10,
+              }}
+              onClick={() => handleArrowBack()}
+            />
+            <OText
+              size={20}
+              color={theme.colors.textGray}
+              style={{
+                fontFamily: 'Poppins',
+                fontStyle: 'normal',
+                marginBottom: 10,
+              }}
+              weight="600">
+              {titleOrder}
+            </OText>
+          </TopActions>
+          <Content showsVerticalScrollIndicator={false} ref={scrollViewRef}>
+            <Header>
+              {action === 'reject' && (
                 <>
+                  {!notShowCustomerPhone && (
+                    <>
+                      <OText
+                        size={15}
+                        color={theme.colors.textGray}
+                        style={{ marginTop: 10 }}>
+                        {t(
+                          'CALL_YOUR_CUSTOMER_TO_RESOLVE_THE_ISSUE_AS_POLITELY_AS_POSSIBLE',
+                          'Call your customer to resolve the issue as politely as possible',
+                        )}
+                      </OText>
+
+                      {numberToShow ? (
+                        <OButton
+                          bgColor="transparent"
+                          borderColor={theme.colors.primary}
+                          textStyle={{
+                            color: theme.colors.primary,
+                            fontSize: 20,
+                          }}
+                          style={{
+                            borderRadius: 10,
+                            marginVertical: 20,
+                          }}
+                          imgLeftStyle={{
+                            resizeMode: 'contain',
+                            left: 20,
+                            position: 'absolute',
+                          }}
+                          imgLeftSrc={theme.images.general.cellphone}
+                          text={numberToShow}
+                          onClick={() =>
+                            Linking.openURL(`tel:${customerCellphone}`)
+                          }
+                        />
+                      ) : (
+                        <OButton
+                          bgColor="transparent"
+                          borderColor={theme.colors.primary}
+                          textStyle={{
+                            color: theme.colors.primary,
+                            fontSize: 15,
+                          }}
+                          style={{
+                            borderRadius: 10,
+                            marginVertical: 20,
+                          }}
+                          imgLeftStyle={{
+                            resizeMode: 'contain',
+                            left: 20,
+                            position: 'absolute',
+                          }}
+                          isDisabled={true}
+                          imgLeftSrc={theme.images.general.cellphone}
+                          text={t('NOT_NUMBER', "There's not phonenumber.")}
+                          onClick={() =>
+                            Linking.openURL(`tel:${customerCellphone}`)
+                          }
+                        />
+                      )}
+                    </>
+                  )}
+
                   <OText
                     size={15}
                     color={theme.colors.textGray}
-                    style={{ marginTop: 10 }}>
+                    style={{ marginBottom: 10 }}>
                     {t(
-                      'CALL_YOUR_CUSTOMER_TO_RESOLVE_THE_ISSUE_AS_POLITELY_AS_POSSIBLE',
-                      'Call your customer to resolve the issue as politely as possible',
+                      'MARK_THE_ORDER_AS_REJECTED',
+                      'Mark the order as rejected',
                     )}
                   </OText>
 
-                  {numberToShow ? (
-                    <OButton
-                      bgColor="transparent"
-                      borderColor={theme.colors.primary}
-                      textStyle={{
-                        color: theme.colors.primary,
-                        fontSize: 20,
-                      }}
-                      style={{
-                        borderRadius: 10,
-                        marginVertical: 20,
-                      }}
-                      imgLeftStyle={{
-                        resizeMode: 'contain',
-                        left: 20,
-                        position: 'absolute',
-                      }}
-                      imgLeftSrc={theme.images.general.cellphone}
-                      text={numberToShow}
-                      onClick={() =>
-                        Linking.openURL(`tel:${customerCellphone}`)
-                      }
-                    />
-                  ) : (
-                    <OButton
-                      bgColor="transparent"
-                      borderColor={theme.colors.primary}
-                      textStyle={{
-                        color: theme.colors.primary,
-                        fontSize: 15,
-                      }}
-                      style={{
-                        borderRadius: 10,
-                        marginVertical: 20,
-                      }}
-                      imgLeftStyle={{
-                        resizeMode: 'contain',
-                        left: 20,
-                        position: 'absolute',
-                      }}
-                      isDisabled={true}
-                      imgLeftSrc={theme.images.general.cellphone}
-                      text={t('NOT_NUMBER', "There's not phonenumber.")}
-                      onClick={() =>
-                        Linking.openURL(`tel:${customerCellphone}`)
-                      }
-                    />
-                  )}
+                  <OText>
+                    <OText style={{ fontWeight: '600' }}>
+                      {t('NOTE', 'Note')}
+                      {': '}
+                    </OText>
+
+                    <OText size={15} color={theme.colors.textGray}>
+                      {t(
+                        'YOUR_CUSTOMER_WILL_RECEIVE_A_NOTIFICATION_ABOUT_THIS_ACTIONS',
+                        'Your customer will receive a notification about this actions',
+                      )}
+                    </OText>
+                  </OText>
                 </>
               )}
+            </Header>
 
-              <OText
-                size={15}
-                color={theme.colors.textGray}
-                style={{ marginBottom: 10 }}>
-                {t(
-                  'MARK_THE_ORDER_AS_REJECTED',
-                  'Mark the order as rejected',
-                )}
-              </OText>
-
-              <OText>
-                <OText style={{ fontWeight: '600' }}>
-                  {t('NOTE', 'Note')}
-                  {': '}
-                </OText>
-
-                <OText size={15} color={theme.colors.textGray}>
-                  {t(
-                    'YOUR_CUSTOMER_WILL_RECEIVE_A_NOTIFICATION_ABOUT_THIS_ACTIONS',
-                    'Your customer will receive a notification about this actions',
-                  )}
-                </OText>
-              </OText>
-            </>
-          )}
-        </Header>
-
-        {action === 'accept' && (
-          <View style={{ height: 400, justifyContent: 'center' }}>
-            <Timer onPress={() => openTimerIOnput()}>
-              <OText weight="600" style={{ textAlign: 'center' }} size={55}>
-                {hour}
-              </OText>
-              {hour.length > 0 && <OText size={55}>:</OText>}
-              <OText weight="600" style={{ textAlign: 'center' }} size={55}>
-                {min}
-              </OText>
-            </Timer>
-          </View>
-        )}
-        <TimeField
-          ref={timerRef}
-          keyboardType="numeric"
-          value={time}
-          placeholder={'00:00'}
-          onChangeText={handleTime}
-          onPressOut={() => handleFixTime()}
-          editable={true}
-          selectionColor={theme.colors.primary}
-          placeholderTextColor={theme.colors.textGray}
-          color={theme.colors.textGray}
-          onEndEditing={handleFixTime}
-          onSubmitEditing={() => handleAcceptOrReject()}
-          onBlur={() => actions && action === 'accept' && timerRef?.current?.focus?.()}
-        />
-
-        {orderCommentsList && isDriverApp && (
-          <CommentsButtonGroup>
-            <SelectDropdown
-              defaultButtonText={t('REJECT_REASONS_OPTIONS', 'Reject reasons')}
-              data={orderCommentsList?.list}
-              onSelect={(selectedItem) => {
-                setRejectReason(selectedItem?.value)
-              }}
-              buttonTextAfterSelection={(selectedItem) => selectedItem.content}
-              rowTextForSelection={(item) => 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) => {
-                return (
-                  <View
-                    style={{
-                      flexDirection: 'row',
-                      alignItems: 'center'
-                    }}
-                  >
-                    <View>
-                      <OText
-                        size={14}
-                        color={'#748194'}
-                        style={{ textTransform: 'capitalize' }}
-                      >
-                        {item?.content}
-                      </OText>
-                    </View>
-                  </View>
-                );
-              }}
-            />
-          </CommentsButtonGroup>
-        )}
-
-        {showTextArea && (
-          <Comments ref={viewRef}>
-            <OTextarea
-              textTareaRef={textTareaRef}
-              autoFocus
-              onFocus={handleFocus}
-              placeholder={t(
-                'PLEASE_TYPE_YOUR_COMMENTS_IN_HERE',
-                'Please type your comments in here',
-              )}
-              value={comments}
-              onChange={setComments}
+            {action === 'accept' && (
+              <View style={{ height: 400, justifyContent: 'center' }}>
+                <Timer onPress={() => openTimerIOnput()}>
+                  <OText weight="600" style={{ textAlign: 'center' }} size={55}>
+                    {hour}
+                  </OText>
+                  {hour.length > 0 && <OText size={55}>:</OText>}
+                  <OText weight="600" style={{ textAlign: 'center' }} size={55}>
+                    {min}
+                  </OText>
+                </Timer>
+              </View>
+            )}
+            <TimeField
+              ref={timerRef}
+              keyboardType="numeric"
+              value={time}
+              placeholder={'00:00'}
+              onChangeText={handleTime}
+              onPressOut={() => handleFixTime()}
+              editable={true}
+              selectionColor={theme.colors.primary}
+              placeholderTextColor={theme.colors.textGray}
+              color={theme.colors.textGray}
+              onEndEditing={handleFixTime}
+              onSubmitEditing={() => handleAcceptOrReject()}
+              onBlur={() => actions && action === 'accept' && timerRef?.current?.focus?.()}
             />
-          </Comments>
-        )}
-      </Content>
-
-      <Action>
-        <FloatingButton
-          firstButtonClick={() => {
-            handleAcceptOrReject();
+
+            {orderCommentsList && isDriverApp && (
+              <CommentsButtonGroup>
+                <SelectDropdown
+                  defaultButtonText={t('REJECT_REASONS_OPTIONS', 'Reject reasons')}
+                  data={orderCommentsList?.list}
+                  onSelect={(selectedItem) => {
+                    setRejectReason(selectedItem?.value)
+                  }}
+                  buttonTextAfterSelection={(selectedItem) => selectedItem.content}
+                  rowTextForSelection={(item) => 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) => {
+                    return (
+                      <View
+                        style={{
+                          flexDirection: 'row',
+                          alignItems: 'center'
+                        }}
+                      >
+                        <View>
+                          <OText
+                            size={14}
+                            color={'#748194'}
+                            style={{ textTransform: 'capitalize' }}
+                          >
+                            {item?.content}
+                          </OText>
+                        </View>
+                      </View>
+                    );
+                  }}
+                />
+              </CommentsButtonGroup>
+            )}
+
+            {showTextArea && (
+              <Comments ref={viewRef}>
+                <OTextarea
+                  textTareaRef={textTareaRef}
+                  autoFocus
+                  onFocus={handleFocus}
+                  placeholder={t(
+                    'PLEASE_TYPE_YOUR_COMMENTS_IN_HERE',
+                    'Please type your comments in here',
+                  )}
+                  value={comments}
+                  onChange={setComments}
+                />
+              </Comments>
+            )}
+          </Content>
+        </View>
+        <View
+          style={{
+            ...styles.bottomParent,
+            marginBottom: (keyboardState.height === 0) ? isPage ? 0 : 30 : keyboardState.height - (isPage ? 20 : -10)
           }}
-          btnText={buttonText}
-          color={action === 'accept' ? theme.colors.green : theme.colors.red}
-          widthButton={'100%'}
-        />
-      </Action>
+        >
+          <OButton
+            text={buttonText}
+            bgColor={action === 'accept' ? theme.colors.green : theme.colors.red}
+            borderColor={action === 'accept' ? theme.colors.green : theme.colors.red}
+            imgRightSrc={null}
+            style={{ borderRadius: 7, height: 45 }}
+            parentStyle={{ width: '100%' }}
+            textStyle={{color: '#FFF', fontSize: 18 }}
+            onClick={() => handleAcceptOrReject()}
+          />
+        </View>
+      </View>
     </KeyboardAvoidingView>
   );
 };

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

@@ -1,10 +1,14 @@
 import styled from 'styled-components/native';
 
 export const Content = styled.ScrollView`
-  background-color: ${(props: any) => props.theme.colors.white};
-  margin-bottom: 30px;
+  padding-horizontal: 30px;
 `;
 
+export const TopActions = styled.View`
+  padding-horizontal: 30px;
+  padding-bottom: 10px;
+`
+
 export const Timer = styled.TouchableOpacity`
   padding: 40px;
   justify-content: center;
@@ -29,8 +33,6 @@ export const TimeField = styled.TextInput`
 
 export const Header = styled.View``;
 
-export const Action = styled.View``;
-
 export const Comments = styled.View`
   margin-top: 20px;
   padding-bottom: 40px;

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

@@ -55,7 +55,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
     ordersGroup,
     setOrdersGroup,
     orderStatus,
-    ordersGroupedFormatted,
+    ordersFormatted,
     loadOrders,
     loadMoreOrders,
     onNavigationRedirect,
@@ -98,7 +98,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
   const [slaSettingTime, setSlaSettingTime] = useState(6000)
   const [currentDeliveryType, setCurrentDeliveryType] = useState('Delivery')
   const [search, setSearch] = useState(defaultSearchList)
-  const [selectedTabStatus, setSelectedTabStatus] = useState([])
+  const [selectedTabStatus, setSelectedTabStatus] = useState<any>([])
   const [hour, setHour] = useState(0)
   const [minute, setMinute] = useState(0)
   const [openedSelect, setOpenedSelect] = useState('')
@@ -585,9 +585,8 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
             currentTabSelected !== 'logisticOrders' &&
             (
               <PreviousOrders
-                orders={currentOrdersGroup?.orders}
+                orders={ordersFormatted}
                 navigation={props.navigation}
-                ordersGrouped={ordersGroupedFormatted}
                 onNavigationRedirect={onNavigationRedirect}
                 getOrderStatus={getOrderStatus}
                 handleClickOrder={handleClickOrder}
@@ -840,7 +839,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
                   </ScrollView>
                 </FiltersTab>
                 <DeliveryStatusWrapper>
-                  {selectedTabStatus && selectedTabStatus.length > 0 && selectedTabStatus.map((item, i) => (
+                  {selectedTabStatus && selectedTabStatus.length > 0 && selectedTabStatus.map((item: any, i: number) => (
                     <StatusBlock
                       key={i}
                       item={item}

package/themes/business/src/components/PreviousOrders/OrdersGroupedItem.tsx

@@ -67,7 +67,7 @@ export const OrdersGroupedItem = (props: any) => {
                 resizeMode={FastImage.resizeMode.cover}
               />
             </View>
-            <View style={{ flex: 1, marginLeft: 10, flexDirection: 'column' }}>
+            <View style={{ flex: 1, marginLeft: 5, flexDirection: 'column' }}>
               <View>
                 <OText numberOfLines={1} style={styles.title}>
                   {t('GROUP_NRO', 'Group No.')}{groupId}

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

@@ -15,7 +15,6 @@ import { GoogleMap } from '../GoogleMap';
 export const PreviousOrders = (props: any) => {
   const {
     orders,
-    ordersGrouped,
     onNavigationRedirect,
     getOrderStatus,
     handleClickOrder,
@@ -186,153 +185,154 @@ export const PreviousOrders = (props: any) => {
 
   return (
     <>
-      {ordersGrouped && Object.keys(ordersGrouped)?.length > 0 && (
-        <View style={{ marginBottom: 10 }}>
-          {Object.keys(ordersGrouped).map(k => (
-            <OrdersGroupedItem
-              key={k}
-              groupId={k}
-              orders={ordersGrouped[k]}
-            >
-              {ordersGrouped[k]?.length > 0 &&
-                ordersGrouped[k]
-                  ?.filter((order: any) => hash[order?.id] ? false : (hash[order?.id] = true))
-                  ?.map((_order: any) => {
-                    const order = _order?.isLogistic && !_order?.order_group && isLogisticOrder ? _order?.order : _order
-                    return (
-                      <OrdersList key={order.id} order={order} _order={_order} hideBtns />
+      {orders && orders?.length > 0 && orders.map((_order: any) => {
+        const order = !Array.isArray(_order) && (_order?.isLogistic && !_order?.order_group && isLogisticOrder ? _order?.order : _order)
+        const _ordersGrouped = Array.isArray(_order) && Object.fromEntries(_order)
+        return (
+          _ordersGrouped ? (
+            <View key={_order[0]} style={{ marginBottom: 10 }}>
+              {Object.keys(_ordersGrouped).map((k, idx) => (
+                <OrdersGroupedItem
+                  key={`${k}_${idx}`}
+                  groupId={k}
+                  orders={_ordersGrouped[k]}
+                >
+                  {_ordersGrouped[k]?.length > 0 &&
+                    _ordersGrouped[k]
+                      ?.filter((order: any) => hash[order?.id] ? false : (hash[order?.id] = true))
+                      ?.map((_order: any) => {
+                        const order_ = _order?.isLogistic && !_order?.order_group && isLogisticOrder ? _order?.order : _order
+                        return (
+                          <OrdersList key={order_.id} order={order_} _order={_order} hideBtns />
+                        )
+                      }
                     )
                   }
-                )
-              }
-              {ordersGrouped[k][0]?.status === 0 && (
-                <AcceptOrRejectOrderStyle>
-                  <OButton
-                    text={t('REJECT_ALL', 'Reject all')}
-                    bgColor={theme.colors.danger100}
-                    borderColor={theme.colors.danger100}
-                    imgRightSrc={null}
-                    style={{ borderRadius: 7, height: 40 }}
-                    parentStyle={{ width: '45%' }}
-                    textStyle={{ color: theme.colors.danger500, fontSize: 12 }}
-                    onClick={() => ordersGroupAction('', '', {
-                      action: 'reject',
-                      order: ordersGrouped[k][0],
-                      ids: ordersGrouped[k].map((o: any) => o.id)
-                    })}
-                  />
-                  <OButton
-                    text={t('ACCEPT_ALL', 'Accept all')}
-                    bgColor={theme.colors.success100}
-                    borderColor={theme.colors.success100}
-                    imgRightSrc={null}
-                    style={{ borderRadius: 7, height: 40 }}
-                    parentStyle={{ width: '45%' }}
-                    textStyle={{ color: theme.colors.success500, fontSize: 12 }}
-                    onClick={() => ordersGroupAction('', '', {
-                      action: 'accept',
-                      order: ordersGrouped[k][0],
-                      ids: ordersGrouped[k].map((o: any) => o.id)
-                    })}
-                  />
-                </AcceptOrRejectOrderStyle>
-              )}
-              <View>
-                {ordersGrouped[k][0]?.status === 7 && (
-                  <OButton
-                    text={t('READY_FOR_PICKUP', 'Ready for pickup')}
-                    bgColor={theme.colors.primaryLight}
-                    borderColor={theme.colors.primaryLight}
-                    imgRightSrc={null}
-                    style={{ borderRadius: 7, height: 40 }}
-                    parentStyle={{ width: '100%' }}
-                    textStyle={{ color: theme.colors.primary, fontSize: 12 }}
-                    onClick={() => handleChangeOrderStatus(
-                      4,
-                      ordersGrouped[k].map((o: any) => o.id),
+                  {_ordersGrouped[k][0]?.status === 0 && (
+                    <AcceptOrRejectOrderStyle>
+                      <OButton
+                        text={t('REJECT_ALL', 'Reject all')}
+                        bgColor={theme.colors.danger100}
+                        borderColor={theme.colors.danger100}
+                        imgRightSrc={null}
+                        style={{ borderRadius: 7, height: 40 }}
+                        parentStyle={{ width: '45%' }}
+                        textStyle={{ color: theme.colors.danger500, fontSize: 12 }}
+                        onClick={() => onNavigationRedirect('AcceptOrRejectOrder', {
+                          action: 'reject',
+                          order: _ordersGrouped[k][0],
+                          ids: _ordersGrouped[k].map((o: any) => o.id),
+                          handleChangeOrderStatus
+                        })}
+                      />
+                      <OButton
+                        text={t('ACCEPT_ALL', 'Accept all')}
+                        bgColor={theme.colors.success100}
+                        borderColor={theme.colors.success100}
+                        imgRightSrc={null}
+                        style={{ borderRadius: 7, height: 40 }}
+                        parentStyle={{ width: '45%' }}
+                        textStyle={{ color: theme.colors.success500, fontSize: 12 }}
+                        onClick={() => onNavigationRedirect('AcceptOrRejectOrder', {
+                          action: 'accept',
+                          order: _ordersGrouped[k][0],
+                          ids: _ordersGrouped[k].map((o: any) => o.id),
+                          handleChangeOrderStatus
+                        })}
+                      />
+                    </AcceptOrRejectOrderStyle>
+                  )}
+                  <View>
+                    {_ordersGrouped[k][0]?.status === 7 && (
+                      <OButton
+                        text={t('READY_FOR_PICKUP', 'Ready for pickup')}
+                        bgColor={theme.colors.primaryLight}
+                        borderColor={theme.colors.primaryLight}
+                        imgRightSrc={null}
+                        style={{ borderRadius: 7, height: 40 }}
+                        parentStyle={{ width: '100%' }}
+                        textStyle={{ color: theme.colors.primary, fontSize: 12 }}
+                        onClick={() => handleChangeOrderStatus(
+                          4,
+                          _ordersGrouped[k].map((o: any) => o.id),
+                        )}
+                      />
                     )}
-                  />
-                )}
-              </View>
-              <View>
-                {viewMapStatus.includes(ordersGrouped[k][0]?.status) && (
-                  <OButton
-                    text={t('TRACK_REAL_TIME_POSITION', 'Track real time position')}
-                    bgColor={theme.colors.primaryLight}
-                    borderColor={theme.colors.primaryLight}
-                    imgRightSrc={null}
-                    style={{ borderRadius: 7, height: 40 }}
-                    parentStyle={{ width: '100%' }}
-                    textStyle={{ color: theme.colors.primary, fontSize: 12 }}
-                    onClick={() => handleOpenMapView({ orders: ordersGrouped[k] })}
-                  />
-                )}
-              </View>
-              {ordersGrouped[k][0]?.status === 4 &&
-                ![1].includes(ordersGrouped[k][0]?.delivery_type) &&
-              (
-                <AcceptOrRejectOrderStyle>
-                  <OButton
-                    text={t('ORDER_NOT_PICKEDUP_BY_CUSTOMER', 'Order not picked up by customer')}
-                    bgColor={theme.colors.danger100}
-                    borderColor={theme.colors.danger100}
-                    imgRightSrc={null}
-                    style={{ borderRadius: 7, height: 40, paddingLeft: 10, paddingRight: 10 }}
-                    parentStyle={{ width: '45%' }}
-                    textStyle={{ color: theme.colors.danger500, fontSize: 12, textAlign: 'center' }}
-                    onClick={() => handleChangeOrderStatus(
-                      17,
-                      ordersGrouped[k].map((o: any) => o.id),
+                  </View>
+                  <View>
+                    {viewMapStatus.includes(_ordersGrouped[k][0]?.status) && (
+                      <OButton
+                        text={t('TRACK_REAL_TIME_POSITION', 'Track real time position')}
+                        bgColor={theme.colors.primaryLight}
+                        borderColor={theme.colors.primaryLight}
+                        imgRightSrc={null}
+                        style={{ borderRadius: 7, height: 40 }}
+                        parentStyle={{ width: '100%' }}
+                        textStyle={{ color: theme.colors.primary, fontSize: 12 }}
+                        onClick={() => handleOpenMapView({ orders: _ordersGrouped[k] })}
+                      />
                     )}
-                  />
-                  <OButton
-                    text={t('PICKUP_COMPLETED_BY_CUSTOMER', 'Pickup completed by customer')}
-                    bgColor={theme.colors.success100}
-                    borderColor={theme.colors.success100}
-                    imgRightSrc={null}
-                    style={{ borderRadius: 7, height: 40, paddingLeft: 10, paddingRight: 10 }}
-                    parentStyle={{ width: '45%' }}
-                    textStyle={{ color: theme.colors.success500, fontSize: 12, textAlign: 'center' }}
-                    onClick={() => handleChangeOrderStatus(
-                      15,
-                      ordersGrouped[k].map((o: any) => o.id),
-                    )}
-                  />
-                </AcceptOrRejectOrderStyle>
-              )}
-              {!ordersGrouped[k][0]?.user_review &&
-                pastOrderStatuses.includes(ordersGrouped[k][0]?.status) &&
-              (
-                <OButton
-                  text={t('REVIEW_CUSTOMER', 'Review customer')}
-                  bgColor={theme.colors.primary}
-                  borderColor={theme.colors.primary}
-                  imgRightSrc={null}
-                  style={{ borderRadius: 8, height: 40 }}
-                  parentStyle={{ width: '100%' }}
-                  textStyle={{ color: theme.colors.white }}
-                  onClick={() => setOpenReviewModal({
-                    order: ordersGrouped[k][0],
-                    customerId: ordersGrouped[k][0]?.customer_id,
-                    ids: ordersGrouped[k].map((o: any) => o.id)
-                  })}
-                />
-              )}
-            </OrdersGroupedItem>
-          ))}
-        </View>
-      )}
-      {orders?.length > 0 &&
-        orders
-          ?.filter((order: any) => hash[order?.id] ? false : (hash[order?.id] = true))
-          ?.map((_order: any) => {
-            const order = _order?.isLogistic && !_order?.order_group && isLogisticOrder ? _order?.order : _order
-            return (
-              <OrdersList key={order.id} order={order} _order={_order} />
-            )
-          }
+                  </View>
+                  {_ordersGrouped[k][0]?.status === 4 &&
+                    ![1].includes(_ordersGrouped[k][0]?.delivery_type) &&
+                  (
+                    <AcceptOrRejectOrderStyle>
+                      <OButton
+                        text={t('ORDER_NOT_PICKEDUP_BY_CUSTOMER', 'Order not picked up by customer')}
+                        bgColor={theme.colors.danger100}
+                        borderColor={theme.colors.danger100}
+                        imgRightSrc={null}
+                        style={{ borderRadius: 7, height: 40, paddingLeft: 10, paddingRight: 10 }}
+                        parentStyle={{ width: '45%' }}
+                        textStyle={{ color: theme.colors.danger500, fontSize: 12, textAlign: 'center' }}
+                        onClick={() => handleChangeOrderStatus(
+                          17,
+                          _ordersGrouped[k].map((o: any) => o.id),
+                        )}
+                      />
+                      <OButton
+                        text={t('PICKUP_COMPLETED_BY_CUSTOMER', 'Pickup completed by customer')}
+                        bgColor={theme.colors.success100}
+                        borderColor={theme.colors.success100}
+                        imgRightSrc={null}
+                        style={{ borderRadius: 7, height: 40, paddingLeft: 10, paddingRight: 10 }}
+                        parentStyle={{ width: '45%' }}
+                        textStyle={{ color: theme.colors.success500, fontSize: 12, textAlign: 'center' }}
+                        onClick={() => handleChangeOrderStatus(
+                          15,
+                          _ordersGrouped[k].map((o: any) => o.id),
+                        )}
+                      />
+                    </AcceptOrRejectOrderStyle>
+                  )}
+                  {!_ordersGrouped[k][0]?.user_review &&
+                    pastOrderStatuses.includes(_ordersGrouped[k][0]?.status) &&
+                  (
+                    <OButton
+                      text={t('REVIEW_CUSTOMER', 'Review customer')}
+                      bgColor={theme.colors.primary}
+                      borderColor={theme.colors.primary}
+                      imgRightSrc={null}
+                      style={{ borderRadius: 8, height: 40 }}
+                      parentStyle={{ width: '100%' }}
+                      textStyle={{ color: theme.colors.white }}
+                      onClick={() => setOpenReviewModal({
+                        order: _ordersGrouped[k][0],
+                        customerId: _ordersGrouped[k][0]?.customer_id,
+                        ids: _ordersGrouped[k].map((o: any) => o.id)
+                      })}
+                    />
+                  )}
+                </OrdersGroupedItem>
+              ))}
+            </View>
+          ) : (
+            <View key={order.id}>
+              <OrdersList order={order} _order={_order} />
+            </View>
+          )
         )
-      }
+      })}
 
       <OModal
         open={openModal}

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

@@ -311,7 +311,7 @@ export interface OrdersOptionParams {
   isLogisticActivated?: boolean;
   isAlsea?: boolean;
   checkNotification?: boolean;
-  ordersGroupedFormatted?: any;
+  ordersFormatted?: any;
   handleChangeOrderStatus?: () => void;
   handleSendCustomerReview?: () => void;
   orderDetailsProps?: any;
@@ -573,14 +573,17 @@ export interface AcceptOrRejectOrderParams {
   loading?: boolean;
   action: string;
   orderId?: number;
-  handleUpdateOrder?: () => void;
+  handleUpdateOrder?: (p1: any, p2: any) => {};
   notShowCustomerPhone?: boolean | undefined;
-  actions?: actions;
+  actions?: any;
   titleAccept?: textTranslate;
   titleReject?: textTranslate;
   titleNotReady?: textTranslate;
   appTitle?: textTranslate;
   orderTitle?: any
+  isPage?: boolean
+  navigation?: any
+  route?: any
 }
 
 export interface MapViewParams {