ordering-ui-react-native 0.15.51 → 0.15.53-release

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

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

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

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

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

@@ -0,0 +1,167 @@
+import React from 'react'
+import { useTheme } from 'styled-components/native'
+import { ScrollView, StyleSheet, View } from 'react-native'
+import { useLanguage, useUtils } from 'ordering-components/native'
+import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons'
+import { OText, OButton } from '../shared'
+
+export const OrderHistory = (props: any) => {
+  const {
+    order,
+    messages,
+    enableReview,
+    onClose,
+    handleTriggerReview
+  } = props
+
+  const [, t] = useLanguage()
+  const [{ parseDate }] = useUtils()
+  const theme = useTheme()
+
+  const styles = StyleSheet.create({
+    historyItem: {
+      display: 'flex',
+      alignItems: 'center',
+      flexDirection: 'row',
+      borderBottomWidth: 1,
+      borderColor: theme.colors.border
+    },
+    detailWrapper: {
+      marginLeft: 20,
+      paddingHorizontal: 13,
+      paddingVertical: 16
+    },
+    container: {
+      paddingHorizontal: 40,
+      paddingVertical: 15
+    }
+  });
+
+  const ORDER_STATUS: any = {
+    0: 'ORDER_STATUS_PENDING',
+    1: 'ORDERS_COMPLETED',
+    2: 'ORDER_REJECTED',
+    3: 'ORDER_STATUS_IN_BUSINESS',
+    4: 'ORDER_READY',
+    5: 'ORDER_REJECTED_RESTAURANT',
+    6: 'ORDER_STATUS_CANCELLEDBYDRIVER',
+    7: 'ORDER_STATUS_ACCEPTEDBYRESTAURANT',
+    8: 'ORDER_CONFIRMED_ACCEPTED_BY_DRIVER',
+    9: 'ORDER_PICKUP_COMPLETED_BY_DRIVER',
+    10: 'ORDER_PICKUP_FAILED_BY_DRIVER',
+    11: 'ORDER_DELIVERY_COMPLETED_BY_DRIVER',
+    12: 'ORDER_DELIVERY_FAILED_BY_DRIVER',
+    13: 'PREORDER',
+    14: 'ORDER_NOT_READY',
+    15: 'ORDER_PICKEDUP_COMPLETED_BY_CUSTOMER',
+    16: 'ORDER_STATUS_CANCELLED_BY_CUSTOMER',
+    17: 'ORDER_NOT_PICKEDUP_BY_CUSTOMER',
+    18: 'ORDER_DRIVER_ALMOST_ARRIVED_BUSINESS',
+    19: 'ORDER_DRIVER_ALMOST_ARRIVED_CUSTOMER',
+    20: 'ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS',
+    21: 'ORDER_CUSTOMER_ARRIVED_BUSINESS',
+    22: 'ORDER_LOOKING_FOR_DRIVER',
+      23: 'ORDER_DRIVER_ON_WAY'
+  }
+
+  const getLogisticTagStatus = (status: any) => {
+    switch (status) {
+      case 0:
+        return t('PENDING', 'Pending')
+      case 1:
+        return t('IN_PROGRESS', 'In Progress')
+      case 2:
+        return t('IN_QUEUE', 'In Queue')
+      case 3:
+        return t('EXPIRED', 'Logistic expired')
+      case 4:
+        return t('RESOLVED', 'Resolved')
+      default:
+        return status
+    }
+  }
+
+  const handleReview = () => {
+    if (enableReview) handleTriggerReview()
+    else onClose()
+  }
+
+  return (
+    <ScrollView contentContainerStyle={styles.container}>
+      <OText size={20} style={{ alignSelf: 'center', textAlign: 'center' }} mBottom={10}>
+        {t('DETAILS_OF_ORDER', 'Details of Order_NUMBER_').replace('_NUMBER_', ` # ${order?.id}`)}
+      </OText>
+      {!messages?.loading && order && (
+        <View style={styles.historyItem}>
+          <MaterialCommunityIcons
+            name="checkbox-marked-circle"
+            size={20}
+            color={theme.colors.primary}
+          />
+          <View style={styles.detailWrapper}>
+            <OText
+              size={14}
+              weight='bold'
+              numberOfLines={1}
+              ellipsizeMode='tail'
+            >
+              {t('ORDER_PLACED', 'Order placed')} {' '}
+              {t('VIA', 'Via')}{' '}
+              {order.app_id ? t(order.app_id.toUpperCase(), order.app_id) : t('OTHER', 'Other')}
+            </OText>
+            <OText size={12}>{parseDate(order?.created_at, { outputFormat: 'MMM DD, hh:mm A' })}</OText>
+          </View>
+        </View>
+      )}
+      {messages && messages?.messages.map((message: any, i: number) => message.type === 1 && (
+        <View
+          style={styles.historyItem}
+          key={i}
+        >
+          <MaterialCommunityIcons
+            name="checkbox-marked-circle"
+            size={20}
+            color={theme.colors.primary}
+          />
+          <View style={styles.detailWrapper}>
+            {message.change?.attribute !== 'driver_id' ? (
+              <OText
+                size={14}
+                weight='bold'
+                numberOfLines={1}
+                ellipsizeMode='tail'
+              >
+                {message.change?.attribute === 'logistic_status'
+                  ? getLogisticTagStatus(parseInt(message.change.new, 10))
+                  : t(ORDER_STATUS[parseInt(message.change.new, 10)])
+                }
+              </OText>
+            ) : (
+              <OText
+                size={14}
+                weight='bold'
+                numberOfLines={1}
+                ellipsizeMode='tail'
+              >
+                {message.change.new
+                  ? (`${message.driver?.name} ${!!message.driver?.lastname ? message.driver.lastname : ''} ${t('WAS_ASSIGNED_AS_DRIVER', 'Was assigned as driver')}`)
+                  : t('DRIVER_UNASSIGNED', 'Driver unassigned')}
+              </OText>
+            )}
+            <OText size={12}>{parseDate(message?.created_at, { outputFormat: 'MMM DD, hh:mm A' })}</OText>
+          </View>
+        </View>
+      ))}
+      <OButton
+        text={enableReview ? t('REVIEW_ORDER', 'Review order') : t('CONTINUE', 'Continue')}
+        textStyle={{ fontSize: 14, color: theme.colors.white }}
+        imgRightSrc={theme.images.general.arrow_right}
+        imgRightStyle={{ tintColor: theme.colors.white, right: 5, margin: 5 }}
+        borderColor='transparent'
+        bgColor={theme.colors.primary}
+        style={{ borderRadius: 7.6, borderWidth: 1, height: 44, shadowOpacity: 0, marginBottom: 30, marginTop: 20 }}
+        onClick={() => handleReview()}
+      />
+    </ScrollView>
+  )
+}

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

@@ -42,7 +42,8 @@ import { OSRow } from '../OrderSummary/styles';
 import AntIcon from 'react-native-vector-icons/AntDesign'
 import { TaxInformation } from '../TaxInformation';
 import { Placeholder, PlaceholderLine } from 'rn-placeholder';
-
+import NavBar from '../NavBar'
+import { OrderHistory } from './OrderHistory';
 export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const {
     navigation,
@@ -82,8 +83,14 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
       justifyContent: 'flex-start',
       paddingLeft: 0,
       height: 30,
-      width: 40,
+      width: 30,
+      marginTop: Platform.OS === 'ios' ? 0 : 30
     },
+    linkWrapper: {
+      display: 'flex',
+      alignItems: 'center',
+      flexDirection: 'row'
+    }
   });
 
   const [, t] = useLanguage();
@@ -92,8 +99,10 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const [{ carts }] = useOrder()
 
   const [isReviewed, setIsReviewed] = useState(false)
+  const [isOrderHistory, setIsOrderHistory] = useState(false)
   const [openTaxModal, setOpenTaxModal] = useState<any>({ open: false, tax: null, type: '' })
   const { order, businessData } = props.order;
+  const mapValidStatuses = [9, 19, 23]
 
   const walletName: any = {
     cash: {
@@ -331,7 +340,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   };
 
   const getIncludedTaxes = () => {
-    if (order?.taxes?.length === 0) {
+    if (order?.taxes?.length === 0 || !order?.taxes) {
       return order.tax_type === 1 ? order?.summary?.tax ?? 0 : 0
     } else {
       return order?.taxes.reduce((taxIncluded: number, tax: any) => {
@@ -362,18 +371,34 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     )
   }
 
+  const handleTriggerReview = () => {
+    setIsOrderHistory(false);
+    (
+      parseInt(order?.status) === 1 ||
+      parseInt(order?.status) === 11 ||
+      parseInt(order?.status) === 15
+    ) && !order.review && !isReviewed && handleClickOrderReview(order)
+  }
 
   useEffect(() => {
+    const _businessId = 'businessId:' + businessData?.id
     if (reorderState?.error) {
-      const _businessId = 'businessId:' + businessData?.id
-      const _uuid = carts[_businessId]?.uuid
-      if (_uuid) {
-        _setStoreData('remove-cartId', JSON.stringify(_uuid))
+      if (businessData?.id) {
+        _setStoreData('adjust-cart-products', JSON.stringify(_businessId))
         navigation.navigate('Business', { store: businessData?.slug })
       }
     }
-    if (!reorderState?.error && reorderState?.result?.uuid) {
-      onNavigationRedirect && onNavigationRedirect('CheckoutNavigator', { cartUuid: reorderState?.result.uuid })
+    if (!reorderState?.error && reorderState.loading === false && businessData?.id) {
+      const products = carts?.[_businessId]?.products
+      const available = products?.every((product: any) => product.valid === true)
+
+      if (available && reorderState?.result?.uuid && (products?.length === order?.products.length)) {
+        onNavigationRedirect && onNavigationRedirect('CheckoutNavigator', { cartUuid: reorderState?.result.uuid })
+      } else {
+        _setStoreData('adjust-cart-products', JSON.stringify(_businessId))
+        products?.length !== order?.products.length && _setStoreData('already-removed', JSON.stringify('removed'))
+        navigation.navigate('Business', { store: businessData?.slug })
+      }
     }
   }, [reorderState])
 
@@ -405,10 +430,19 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
         'https://res.cloudinary.com/demo/image/upload/c_thumb,g_face,r_max/d_avatar.png/non_existing_id.png',
     },
   ];
+  const driverLocationString = typeof order?.driver?.location?.location === 'string' && order?.driver?.location?.location?.split(',').map((l: string) => l.replace(/[^-.0-9]/g, ''))
+  const parsedLocations = locations.map(location => typeof location?.location === 'string' ? {
+    ...location,
+    lat: parseFloat(location?.location?.split(',')[0].replace(/[^-.0-9]/g, '')),
+    lng: parseFloat(location?.location?.split(',')[1].replace(/[^-.0-9]/g, ''))
+  } : location)
 
   useEffect(() => {
     if (driverLocation) {
-      locations[0] = driverLocation;
+      parsedLocations[0] = {
+        ...locations[0],
+        ...driverLocation
+      }
     }
   }, [driverLocation]);
 
@@ -469,28 +503,25 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
       {order && Object.keys(order).length > 0 && (
         <>
           <Header>
-            <OButton
-              imgLeftSrc={theme.images.general.arrow_left}
-              imgRightSrc={null}
-              style={styles.btnBackArrow}
-              onClick={() => handleArrowBack()}
-              imgLeftStyle={{ tintColor: theme.colors.disabled }}
+            <NavBar
+              title={`${t('ORDER', 'Order')} #${order?.id}`}
+              titleAlign={'center'}
+              onActionLeft={handleArrowBack}
+              showCall={false}
+              btnStyle={{ paddingLeft: 0 }}
+              style={{ marginTop: Platform.OS === 'ios' ? 0 : 20 }}
+              titleWrapStyle={{ paddingHorizontal: 0 }}
+              titleStyle={{ marginRight: 0, marginLeft: 0 }}
+              subTitle={<OText size={12} lineHeight={18} color={theme.colors.textNormal}>
+                {order?.delivery_datetime_utc
+                  ? parseDate(order?.delivery_datetime_utc)
+                  : parseDate(order?.delivery_datetime, { utc: false })}
+              </OText>}
             />
             <OrderInfo>
               <OrderData>
-                <OText
-                  size={20}
-                  lineHeight={30}
-                  weight={'600'}
-                  color={theme.colors.textNormal}>
-                  {t('ORDER', 'Order')} #{order?.id}
-                </OText>
-                <OText size={12} lineHeight={18} color={theme.colors.textNormal}>
-                  {order?.delivery_datetime_utc
-                    ? parseDate(order?.delivery_datetime_utc)
-                    : parseDate(order?.delivery_datetime, { utc: false })}
-                </OText>
-                {
+                <View style={styles.linkWrapper}>
+                  {
                   (
                     parseInt(order?.status) === 1 ||
                     parseInt(order?.status) === 11 ||
@@ -498,20 +529,36 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                   ) && !order.review && !isReviewed && (
                     <TouchableOpacity
                       activeOpacity={0.7}
-                      style={{ marginTop: 6 }}
+                      style={{ marginTop: 6, marginRight: 10 }}
                       onPress={() => handleClickOrderReview(order)}
-
                     >
                       <OText
                         size={10}
                         lineHeight={15}
-                        color={theme.colors.textSecondary}
+                        color={theme.colors.primary}
                         style={{ textDecorationLine: 'underline' }}
                       >
                         {t('REVIEW_YOUR_ORDER', 'Review your order')}
                       </OText>
                     </TouchableOpacity>
                   )}
+                    <TouchableOpacity
+                      activeOpacity={0.7}
+                      style={{ marginTop: 6 }}
+                      onPress={() => setIsOrderHistory(true)}
+
+                    >
+                      <OText
+                        size={10}
+                        lineHeight={15}
+                        color={theme.colors.primary}
+                        style={{ textDecorationLine: 'underline', textTransform: 'capitalize' }}
+                      >
+                        {t('VIEW_DETAILS', 'View Details')}
+                      </OText>
+                    </TouchableOpacity>
+                </View>
+
                 <StaturBar>
                   <LinearGradient
                     start={{ x: 0.0, y: 0.0 }}
@@ -651,13 +698,15 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                     mBottom={2}>
                     {order?.customer?.address}
                   </OText>
-                  <OText
-                    size={12}
-                    lineHeight={18}
-                    color={theme.colors.textNormal}
-                    mBottom={2}>
-                    {order?.customer?.cellphone}
-                  </OText>
+                  {(!!order?.customer?.cellphone) && (
+                    <OText
+                      size={12}
+                      lineHeight={18}
+                      color={theme.colors.textNormal}
+                      mBottom={2}>
+                      {`${!!order?.customer?.country_phone_code ? '+' + order?.customer?.country_phone_code : ''} ${order?.customer?.cellphone}`}
+                    </OText>
+                  )}
                 </InfoBlock>
               </Customer>
               {order?.delivery_option !== undefined && order?.delivery_type === 1 && (
@@ -670,7 +719,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                   </OText>
                 </View>
               )}
-              {order?.comment && (
+              {!!order?.comment && (
                 <View style={{ marginTop: 15 }}>
                   <OText size={16} style={{ textAlign: 'left' }} color={theme.colors.textNormal}>
                     {t('COMMENT', 'Comment')}
@@ -680,11 +729,16 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
               )}
               {order?.driver && (
                 <>
-                  {order?.driver?.location && parseInt(order?.status) === 9 && (
+                  {order?.driver?.location && mapValidStatuses.includes(parseInt(order?.status)) && (
                     <Map>
-                      <GoogleMap
-                        location={order?.driver?.location}
-                        locations={locations}
+                     <GoogleMap
+                        location={typeof order?.driver?.location?.location === 'string'
+                          ? {
+                            lat: parseFloat(driverLocationString[0]),
+                            lng: parseFloat(driverLocationString[1]),
+                          } : driverLocation ?? order?.driver?.location
+                        }
+                        locations={parsedLocations}
                         readOnly
                       />
                     </Map>
@@ -898,7 +952,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                     <OSRow>
                       <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal} numberOfLines={1}>
                         {fee.name || t('INHERIT_FROM_BUSINESS', 'Inherit from business')}
-                        ({fee?.fixed > 0 && `${parsePrice(fee?.fixed)} + `}{fee.percentage}%){' '}
+                        ({fee?.fixed > 0 && `${parsePrice(fee?.fixed)}${fee.percentage > 0 ? ' + ' : ''}`}{fee.percentage > 0 && `${fee.percentage}%`}){' '}
                       </OText>
                       <TouchableOpacity onPress={() => setOpenTaxModal({ open: true, data: fee, type: 'fee' })}>
                         <AntIcon name='infocirlceo' size={16} color={theme.colors.primary} />
@@ -1010,7 +1064,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                           )}
                         </View>
                         <OText>
-                          -{parsePrice(event.amount)}
+                          -{parsePrice(event.amount, { isTruncable: true })}
                         </OText>
                       </View>
                     ))}
@@ -1032,6 +1086,23 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
           products={order?.products}
         />
       </OModal>
+      <OModal
+        open={isOrderHistory}
+        onClose={() => setIsOrderHistory(false)}
+        entireModal
+      >
+        <OrderHistory
+          order={order}
+          messages={messages}
+          enableReview={(
+            parseInt(order?.status) === 1 ||
+            parseInt(order?.status) === 11 ||
+            parseInt(order?.status) === 15
+          ) && !order.review && !isReviewed}
+          onClose={() => setIsOrderHistory(false)}
+          handleTriggerReview={handleTriggerReview}
+        />
+      </OModal>
     </OrderDetailsContainer>
   );
 };

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

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