ordering-ui-react-native 0.16.38 → 0.16.39-release

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

@@ -0,0 +1,148 @@
+import React, { useEffect } from 'react'
+import {
+	UserFormDetails as NotificationsController,
+	useLanguage,
+	useSession,
+	useOrderingTheme,
+	useToast,
+	ToastType,
+} from 'ordering-components/native'
+import { NotificationsGroupSwitchWrapper, SwitchWrapper } from './styles'
+import { Platform, StyleSheet, View } from 'react-native'
+import { useState } from 'react'
+import { useTheme } from 'styled-components/native';
+import Spinner from 'react-native-loading-spinner-overlay';
+import ToggleSwitch from 'toggle-switch-react-native'
+import { Container } from '../../layouts/Container'
+import NavBar from '../NavBar'
+import { OText } from '../shared'
+
+const NotificationsUI = (props: any) => {
+	const {
+		navigation,
+		singleNotifications,
+		handleChangePromotions,
+		userData
+	} = props
+
+	const theme = useTheme();
+	const [{ user: userSession }] = useSession()
+	const [, t] = useLanguage();
+	const [, { showToast }] = useToast();
+	const [orderingTheme] = useOrderingTheme()
+
+	const user = userData || userSession
+
+	const [notificationsList, setNotificationsList] = useState({
+		email: singleNotifications?.result?.result
+			? !!singleNotifications?.result?.result?.settings?.email?.newsletter
+			: !!(singleNotifications?.changes?.settings?.email?.newsletter ?? (user && user?.settings?.email?.newsletter)),
+		sms: singleNotifications?.result?.result
+			? !!singleNotifications?.result?.result?.settings?.sms?.newsletter
+			: !!(singleNotifications?.changes?.settings?.sms?.newsletter ?? (user && user?.settings?.sms?.newsletter)),
+		notification: singleNotifications?.result?.result
+			? !!singleNotifications?.result?.result?.settings?.notification?.newsletter
+			: !!(singleNotifications?.changes?.settings?.notification?.newsletter ?? (user && user?.settings?.notification?.newsletter))
+	})
+
+	const goToBack = () => navigation?.canGoBack() && navigation.goBack()
+	const showCustomerPromotions = !orderingTheme?.theme?.profile?.components?.promotions?.hidden
+	const showNotifications = !orderingTheme?.theme?.profile?.components?.notification_settings?.hidden
+
+	const handleEditNotifications = (key: any, value: any) => {
+		setNotificationsList({
+			...notificationsList,
+			[key]: value
+		})
+	}
+
+	useEffect(() => {
+		if (singleNotifications.result.result && !singleNotifications.loading) {
+			if (!singleNotifications.result?.error) {
+				showToast(ToastType.Success, t('UPDATE_SUCCESSFULLY', 'Update successfully'));
+			}
+		}
+	}, [singleNotifications.result])
+
+	useEffect(() => {
+		const isSingle = true
+		handleChangePromotions(notificationsList, isSingle)
+	}, [notificationsList])
+
+	return (
+		<Container noPadding>
+			<NavBar
+				title={t('NOTIFICATIONS', 'Notifications')}
+				titleAlign={'center'}
+				onActionLeft={goToBack}
+				showCall={false}
+				style={{ paddingHorizontal: 40, paddingVertical: Platform.OS === 'ios' ? 0 : 20, marginTop: Platform.OS === 'ios' ? 0 : 30 }}
+			/>
+			{showCustomerPromotions && showNotifications && (
+				<>
+					<Spinner visible={singleNotifications?.loading} />
+					<View style={{ ...styles.pagePadding }}>
+						<NotificationsGroupSwitchWrapper>
+							<OText style={{ ...styles.title }}>{t('MARKETING_NOTIFICATIONS', 'Marketing Notifications')}</OText>
+							<SwitchWrapper>
+								<OText>{t('EMAILS', 'Emails')}</OText>
+								<ToggleSwitch
+									isOn={notificationsList?.email}
+									onColor={theme.colors.primary}
+									size="small"
+									disabled={singleNotifications?.loading}
+									offColor={theme.colors.disabled}
+									animationSpeed={400}
+									onToggle={() => handleEditNotifications('email', !notificationsList?.email)}
+								/>
+							</SwitchWrapper>
+							<SwitchWrapper>
+								<OText>{t('SMS', 'Sms')}</OText>
+								<ToggleSwitch
+									isOn={notificationsList?.sms}
+									onColor={theme.colors.primary}
+									size="small"
+									disabled={singleNotifications?.loading}
+									offColor={theme.colors.disabled}
+									animationSpeed={400}
+									onToggle={() => handleEditNotifications('sms', !notificationsList?.sms)}
+								/>
+							</SwitchWrapper>
+							<SwitchWrapper>
+								<OText>{t('PUSH_NOTIFICATIONS', 'Push Notifications')}</OText>
+								<ToggleSwitch
+									isOn={notificationsList?.notification}
+									onColor={theme.colors.primary}
+									size="small"
+									disabled={singleNotifications?.loading}
+									offColor={theme.colors.disabled}
+									animationSpeed={400}
+									onToggle={() => handleEditNotifications('notification', !notificationsList?.notification)}
+								/>
+							</SwitchWrapper>
+						</NotificationsGroupSwitchWrapper>
+					</View>
+				</>
+			)}
+		</Container>
+	)
+}
+
+const styles = StyleSheet.create({
+	title: {
+		marginBottom: 24,
+		fontWeight: 'bold',
+	},
+	pagePadding: {
+		paddingLeft: 40,
+		paddingRight: 40
+	}
+});
+
+export const NotificationsList = (props: any) => {
+	const notificationsListProps = {
+		...props,
+		UIComponent: NotificationsUI
+	}
+	return <NotificationsController {...notificationsListProps} />
+}

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

@@ -0,0 +1,17 @@
+import styled from 'styled-components/native'
+
+export const ContainerButtons = styled.View`
+    margin-vertical: 50px
+`
+
+export const NotificationsGroupSwitchWrapper = styled.View`
+  flex-grow: 1;
+  justify-content: space-between;
+`
+
+export const SwitchWrapper = styled.View`
+  flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 12px;
+`

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

@@ -1,5 +1,5 @@
-import React, { useState, useEffect } from 'react';
-import { View, StyleSheet, BackHandler, Platform, Linking } from 'react-native';
+import React, { useState, useEffect, useMemo } from 'react';
+import { View, StyleSheet, BackHandler, Platform, Linking, RefreshControl } from 'react-native';
 import LinearGradient from 'react-native-linear-gradient';
 import { _setStoreData } from '../../providers/StoreUtil';
 import {
@@ -10,6 +10,7 @@ import {
   useConfig
 } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
+import { showLocation } from 'react-native-map-link';
 import {
   OrderDetailsContainer,
   Header,
@@ -30,7 +31,9 @@ import {
   OrderDriver,
   Map,
   Divider,
-  OrderAction
+  OrderAction,
+  PlaceSpotWrapper,
+  ProfessionalPhoto
 } from './styles';
 import { OButton, OIcon, OModal, OText } from '../shared';
 import { ProductItemAccordion } from '../ProductItemAccordion';
@@ -43,6 +46,8 @@ 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';
+import { PlaceSpot } from '../PlaceSpot'
 export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const {
     navigation,
@@ -53,7 +58,8 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     driverLocation,
     onNavigationRedirect,
     reorderState,
-    handleReorder
+    handleReorder,
+    getOrder
   } = props;
 
   const theme = useTheme();
@@ -64,6 +70,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     },
     statusBar: {
       height: 12,
+      borderRadius: 8
     },
     logo: {
       width: 75,
@@ -85,6 +92,17 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
       width: 30,
       marginTop: Platform.OS === 'ios' ? 0 : 30
     },
+    linkWrapper: {
+      display: 'flex',
+      alignItems: 'center',
+      flexDirection: 'row'
+    },
+    professionalBlock: {
+      borderBottomColor: theme.colors.border,
+      borderBottomWidth: 1,
+      marginVertical: 10,
+      paddingVertical: 5
+    }
   });
 
   const [, t] = useLanguage();
@@ -93,9 +111,14 @@ 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 [refreshing] = useState(false);
   const { order, businessData } = props.order;
   const mapValidStatuses = [9, 19, 23]
+  const placeSpotTypes = [3, 4, 5]
+  const directionTypes = [2, 3, 4, 5]
+  const enabledPoweredByOrdering = configs?.powered_by_ordering_module?.value
 
   const walletName: any = {
     cash: {
@@ -364,6 +387,19 @@ 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)
+  }
+
+  
+  const resfreshOrder = () => {
+    getOrder()
+  }
 
   useEffect(() => {
     const _businessId = 'businessId:' + businessData?.id
@@ -375,7 +411,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     }
     if (!reorderState?.error && reorderState.loading === false && businessData?.id) {
       const products = carts?.[_businessId]?.products
-      const available = products.every((product: any) => product.valid === true)
+      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 })
@@ -422,6 +458,59 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     lng: parseFloat(location?.location?.split(',')[1].replace(/[^-.0-9]/g, ''))
   } : location)
 
+  const getProductList = () => {
+    const professionalList = order?.products.reduce((prev: any, current: any) => {
+      const found = prev.find((item: any) => item.id === current?.calendar_event?.professional?.id)
+      if (found || !current?.calendar_event) {
+        return prev
+      }
+      return [...prev, current?.calendar_event?.professional]
+    }, [])
+
+    return (
+      <>
+        {professionalList?.length > 0 && professionalList.map((professional: any, i: number) => (
+          <View key={i} style={styles.professionalBlock}>
+            <View style={{ flexDirection: 'row', alignItems: 'center', width: '100%' }}>
+              {professional?.photo ? (
+                <ProfessionalPhoto
+                  source={{
+                    uri: professional?.photo
+                  }}
+                  imageStyle={{ borderRadius: 8 }}
+                />
+              ) : (
+                <OIcon
+                  src={theme.images.general.user}
+                  cover={false}
+                  width={80}
+                  height={80}
+                />
+              )}
+              <OText size={12} lineHeight={18} weight={'500'} numberOfLines={1}>{professional?.name} {professional?.lastname}</OText>
+            </View>
+            {order?.products.filter((product: any) => product?.calendar_event?.professional?.id === professional?.id).map((product: any, i: number) => (
+              <ProductItemAccordion
+                key={product?.id || i}
+                product={product}
+                isFromCheckout
+              />
+            ))}
+          </View>
+        ))}
+        {order?.products.filter((product: any) => !product?.calendar_event).map((product: any, i: number) => (
+          <ProductItemAccordion
+            key={product?.id || i}
+            product={product}
+            isFromCheckout
+          />
+        ))}
+      </>
+    )
+  }
+
+  const sortedProductList = useMemo(() => getProductList(), [order?.products])
+
   useEffect(() => {
     if (driverLocation) {
       parsedLocations[0] = {
@@ -432,7 +521,15 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   }, [driverLocation]);
 
   return (
-    <OrderDetailsContainer keyboardShouldPersistTaps="handled">
+    <OrderDetailsContainer 
+      keyboardShouldPersistTaps="handled"
+      refreshControl={
+        <RefreshControl
+          refreshing={refreshing}
+          onRefresh={() => resfreshOrder()}
+        />
+      }
+    >
       {(!order || Object.keys(order).length === 0) && (
         <Placeholder style={{ marginTop: 30 }}>
           <Header>
@@ -503,30 +600,54 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                   : parseDate(order?.delivery_datetime, { utc: false })}
               </OText>}
             />
+            {enabledPoweredByOrdering && (
+              <View style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
+                <OText>
+                  Powered By Ordering.co
+                </OText>
+              </View>
+            )}
             <OrderInfo>
               <OrderData>
-                {
-                  (
-                    parseInt(order?.status) === 1 ||
-                    parseInt(order?.status) === 11 ||
-                    parseInt(order?.status) === 15
-                  ) && !order.review && !isReviewed && (
-                    <TouchableOpacity
-                      activeOpacity={0.7}
-                      style={{ marginTop: 6 }}
-                      onPress={() => handleClickOrderReview(order)}
+                <View style={styles.linkWrapper}>
+                  {
+                    (
+                      parseInt(order?.status) === 1 ||
+                      parseInt(order?.status) === 11 ||
+                      parseInt(order?.status) === 15
+                    ) && !order.review && !isReviewed && (
+                      <TouchableOpacity
+                        activeOpacity={0.7}
+                        style={{ marginTop: 6, marginRight: 10 }}
+                        onPress={() => handleClickOrderReview(order)}
+                      >
+                        <OText
+                          size={12}
+                          lineHeight={15}
+                          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={12}
+                      lineHeight={15}
+                      color={theme.colors.primary}
+                      style={{ textDecorationLine: 'underline', textTransform: 'capitalize' }}
                     >
-                      <OText
-                        size={10}
-                        lineHeight={15}
-                        color={theme.colors.textSecondary}
-                        style={{ textDecorationLine: 'underline' }}
-                      >
-                        {t('REVIEW_YOUR_ORDER', 'Review your order')}
-                      </OText>
-                    </TouchableOpacity>
-                  )}
+                      {t('VIEW_DETAILS', 'View Details')}
+                    </OText>
+                  </TouchableOpacity>
+                </View>
+
                 <StaturBar>
                   <LinearGradient
                     start={{ x: 0.0, y: 0.0 }}
@@ -632,7 +753,39 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                   {order?.business?.address}
                 </OText>
               </View>
+              {directionTypes.includes(order?.delivery_type) && (
+                <OButton
+                  text={t('GET_DIRECTIONS', 'Get Directions')}
+                  imgRightSrc=''
+                  textStyle={{ color: theme.colors.white }}
+                  style={{
+                    alignSelf: 'center',
+                    borderRadius: 10,
+                    marginTop: 30
+                  }}
+                  onClick={() => showLocation({
+                    latitude: order?.business?.location?.lat,
+                    longitude: order?.business?.location?.lng,
+                    naverCallerName: 'com.reactnativeappstemplate5',
+                    dialogTitle: t('GET_DIRECTIONS', 'Get Directions'),
+                    dialogMessage: t('WHAT_APP_WOULD_YOU_USE', 'What app would you like to use?'),
+                    cancelText: t('CANCEL', 'Cancel'),
+                  })}
+                />
+              )}
             </OrderBusiness>
+            
+            {placeSpotTypes.includes(order?.delivery_type) && (
+              <PlaceSpotWrapper>
+                <PlaceSpot
+                  isInputMode
+                  cart={order}
+                  spotNumberDefault={order?.spot_number}
+                  vehicleDefault={order?.vehicle}
+                />
+              </PlaceSpotWrapper>
+            )}
+
             <View
               style={{
                 height: 8,
@@ -699,7 +852,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                 <>
                   {order?.driver?.location && mapValidStatuses.includes(parseInt(order?.status)) && (
                     <Map>
-                      <GoogleMap
+                     <GoogleMap
                         location={typeof order?.driver?.location?.location === 'string'
                           ? {
                             lat: parseFloat(driverLocationString[0]),
@@ -813,14 +966,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
               </OrderAction>
             </HeaderInfo>
             <OrderProducts>
-              {order?.products?.length &&
-                order?.products.map((product: any, i: number) => (
-                  <ProductItemAccordion
-                    key={product?.id || i}
-                    product={product}
-                    isFromCheckout
-                  />
-                ))}
+              {sortedProductList}
             </OrderProducts>
             <OrderBill>
               <View style={{ height: 1, backgroundColor: theme.colors.border, marginBottom: 17 }} />
@@ -988,8 +1134,8 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
               )}
               <Total>
                 <Table>
-                  <OText size={20} lineHeight={30} weight={'600'} color={theme.colors.textNormal}>{t('TOTAL', 'Total')}</OText>
-                  <OText size={20} lineHeight={30} weight={'600'} color={theme.colors.textNormal}>
+                  <OText size={14} style={{ fontWeight: 'bold' }} color={theme.colors.textNormal}>{t('TOTAL', 'Total')}</OText>
+                  <OText size={14} style={{ fontWeight: 'bold' }} color={theme.colors.textNormal}>
                     {parsePrice(order?.summary?.total ?? order?.total)}
                   </OText>
                 </Table>
@@ -1054,6 +1200,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>
   );
 };