ordering-ui-react-native 0.16.77 → 0.16.78-release

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

@@ -2,13 +2,14 @@ import * as React from 'react'
 import styled, { useTheme } from 'styled-components/native'
 import { OButton, OIcon, OText } from '../shared'
 import { Platform, TextStyle, ViewStyle, I18nManager, TouchableOpacity } from 'react-native'
+import AntDesignIcon from 'react-native-vector-icons/AntDesign'
 
 const TitleWrapper = styled.View`
   flex-direction: column;
   padding-horizontal: 10px;
 `
 const TitleTopWrapper = styled.View`
-  flex-grow: 1;
+  flex: 1;
   flex-direction: row;
   align-items: center;
 `
@@ -39,7 +40,8 @@ interface Props {
 	style?: ViewStyle,
 	titleWrapStyle?: ViewStyle,
 	paddingTop?: number,
-	isVertical?: boolean
+	isVertical?: boolean,
+	noMargin?: any
 }
 
 const NavBar = (props: Props) => {
@@ -61,8 +63,8 @@ const NavBar = (props: Props) => {
 	return (
 		<Wrapper style={{ paddingTop: props.paddingTop, ...{ flexDirection: props.isVertical ? 'column' : 'row', alignItems: props.isVertical ? 'flex-start' : 'center' }, ...props.style }}>
 			<OButton
-				imgLeftSrc={props.leftImg || theme.images.general.arrow_left}
-				imgLeftStyle={{ width: 18 }}
+				imgLeftSrc={theme.images.general.arrow_left}
+				imgLeftStyle={{ width: 26 }}
 				imgRightSrc={null}
 				style={{ ...btnBackArrow, ...props.btnStyle, ...props.isVertical ? (I18nManager.isRTL ? { paddingRight: 0 } : { paddingLeft: 0 }) : {} }}
 				onClick={props?.onActionLeft}
@@ -90,10 +92,9 @@ const NavBar = (props: Props) => {
 						style={
 							{
 								textAlign: props.titleAlign ? props.titleAlign : 'center',
-								marginRight: props.showCall ? 0 : 40,
+								marginRight: (props.showCall || !!props.noMargin) ? 0 : 40,
 								color: props.titleColor || theme.colors.textNormal,
 								paddingHorizontal: props.titleAlign == 'left' ? 12 : 0,
-								width: '100%',
 								...props.titleStyle,
 							}
 						}

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

@@ -1,5 +1,5 @@
 import React from 'react'
-import { useLanguage } from 'ordering-components/native'
+import { useLanguage, useOrderingTheme } from 'ordering-components/native'
 import { Dimensions } from 'react-native'
 import RNRestart from 'react-native-restart'
 import { OText, OIcon, OButton } from '../shared'
@@ -16,7 +16,8 @@ export const NetworkError = (props: NoNetworkParams) => {
   } = props
   const theme = useTheme()
   const [, t] = useLanguage()
-
+  const [orderingTheme] = useOrderingTheme()
+  const urlimage = orderingTheme?.theme?.no_internet?.components?.image
   const noNetworkImage = image || theme.images.general.noNetwork
   const deviceWidth = Dimensions.get('screen').width
 
@@ -38,7 +39,8 @@ export const NetworkError = (props: NoNetworkParams) => {
       </OText>
       <ImageContainer>
         <OIcon
-          src={noNetworkImage}
+          src={!urlimage && noNetworkImage}
+          url={urlimage}
           width={(deviceWidth - 80) * 0.9}
           height={(deviceWidth - 80) * 0.8}
         />

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

@@ -20,12 +20,13 @@ export const NotFoundSource = (props: NotFoundSourceParams) => {
 	const theme = useTheme();
 
 	const errorImage = image || theme.images.general.notFound
+	const isUrl = typeof errorImage === 'string' && errorImage.includes('http')
 
 	return (
 		<NotFound>
 			{errorImage && (
 				<NotFoundImage>
-					<OIcon src={errorImage} width={260} height={220} />
+					<OIcon url={isUrl && errorImage} src={!isUrl && errorImage} width={260} height={220} />
 				</NotFoundImage>
 			)}
 			{content && conditioned && !errorImage && <OText color={theme.colors.disabled} size={18} style={{ textAlign: 'center' }}>{content}</OText>}

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

@@ -0,0 +1,144 @@
+import React, { useEffect } from 'react'
+import {
+	UserFormDetails as NotificationsController,
+	useLanguage,
+	useSession,
+	useOrderingTheme,
+	useToast,
+	ToastType,
+} from 'ordering-components/native'
+import { NotificationsGroupSwitchWrapper, SwitchWrapper, Container } from './styles'
+import { 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 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>
+			<NavBar
+				title={t('NOTIFICATIONS', 'Notifications')}
+				titleAlign={'center'}
+				onActionLeft={goToBack}
+				showCall={false}
+				style={{
+					paddingHorizontal: 40,
+					paddingVertical: 0,
+				}}
+			/>
+			{showCustomerPromotions && showNotifications && (
+				<>
+					<Spinner visible={singleNotifications?.loading} />
+					<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>
+				</>
+			)}
+		</Container>
+	)
+}
+
+const styles = StyleSheet.create({
+	title: {
+		marginBottom: 24,
+		fontWeight: 'bold',
+	}
+});
+
+export const NotificationsList = (props: any) => {
+	const notificationsListProps = {
+		...props,
+		UIComponent: NotificationsUI
+	}
+	return <NotificationsController {...notificationsListProps} />
+}

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

@@ -0,0 +1,20 @@
+import styled from 'styled-components/native'
+
+export const Container = styled.ScrollView`
+    position: relative;
+    flex: 1;
+	  padding: 20px;
+`
+
+export const NotificationsGroupSwitchWrapper = styled.View`
+  flex-grow: 1;
+  justify-content: space-between;
+	padding: 0 20px;
+`
+
+export const SwitchWrapper = styled.View`
+  flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 12px;
+`

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

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+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';
@@ -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,
@@ -31,14 +32,15 @@ import {
   Map,
   Divider,
   OrderAction,
-  PlaceSpotWrapper
+  PlaceSpotWrapper,
+  ProfessionalPhoto
 } from './styles';
 import { OButton, OIcon, OModal, OText } from '../shared';
 import { ProductItemAccordion } from '../ProductItemAccordion';
 import { TouchableOpacity } from 'react-native-gesture-handler';
 import { OrderDetailsParams } from '../../types';
 import { GoogleMap } from '../GoogleMap';
-import { verifyDecimals } from '../../utils';
+import { verifyDecimals, getOrderStatus } from '../../utils';
 import { OSRow } from '../OrderSummary/styles';
 import AntIcon from 'react-native-vector-icons/AntDesign'
 import { TaxInformation } from '../TaxInformation';
@@ -68,6 +70,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     },
     statusBar: {
       height: 12,
+      borderRadius: 8
     },
     logo: {
       width: 75,
@@ -93,6 +96,12 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
       display: 'flex',
       alignItems: 'center',
       flexDirection: 'row'
+    },
+    professionalBlock: {
+      borderBottomColor: theme.colors.border,
+      borderBottomWidth: 1,
+      marginVertical: 10,
+      paddingVertical: 5
     }
   });
 
@@ -108,6 +117,9 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const { order, businessData } = props.order;
   const mapValidStatuses = [9, 19, 23]
   const placeSpotTypes = [3, 4, 5]
+  const directionTypes = [2, 3, 4, 5]
+  const activeStatus = [0, 3, 4, 7, 8, 9, 14, 18, 19, 20, 21, 22, 23]
+  const enabledPoweredByOrdering = configs?.powered_by_ordering_module?.value
 
   const walletName: any = {
     cash: {
@@ -118,205 +130,6 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     }
   }
 
-  const getOrderStatus = (s: string) => {
-    const status = parseInt(s);
-    const orderStatus = [
-      {
-        key: 0,
-        value: t('PENDING', 'Pending'),
-        slug: 'PENDING',
-        percentage: 0.25,
-        image: theme.images.order.status0,
-      },
-      {
-        key: 1,
-        value: t('COMPLETED', 'Completed'),
-        slug: 'COMPLETED',
-        percentage: 1,
-        image: theme.images.order.status1,
-      },
-      {
-        key: 2,
-        value: t('REJECTED', 'Rejected'),
-        slug: 'REJECTED',
-        percentage: 0,
-        image: theme.images.order.status2,
-      },
-      {
-        key: 3,
-        value: t('DRIVER_IN_BUSINESS', 'Driver in business'),
-        slug: 'DRIVER_IN_BUSINESS',
-        percentage: 0.6,
-        image: theme.images.order.status3,
-      },
-      {
-        key: 4,
-        value: t('PREPARATION_COMPLETED', 'Preparation Completed'),
-        slug: 'PREPARATION_COMPLETED',
-        percentage: 0.7,
-        image: theme.images.order.status4,
-      },
-      {
-        key: 5,
-        value: t('REJECTED_BY_BUSINESS', 'Rejected by business'),
-        slug: 'REJECTED_BY_BUSINESS',
-        percentage: 0,
-        image: theme.images.order.status5,
-      },
-      {
-        key: 6,
-        value: t('REJECTED_BY_DRIVER', 'Rejected by Driver'),
-        slug: 'REJECTED_BY_DRIVER',
-        percentage: 0,
-        image: theme.images.order.status6,
-      },
-      {
-        key: 7,
-        value: t('ACCEPTED_BY_BUSINESS', 'Accepted by business'),
-        slug: 'ACCEPTED_BY_BUSINESS',
-        percentage: 0.35,
-        image: theme.images.order.status7,
-      },
-      {
-        key: 8,
-        value: t('ACCEPTED_BY_DRIVER', 'Accepted by driver'),
-        slug: 'ACCEPTED_BY_DRIVER',
-        percentage: 0.45,
-        image: theme.images.order.status8,
-      },
-      {
-        key: 9,
-        value: t('PICK_UP_COMPLETED_BY_DRIVER', 'Pick up completed by driver'),
-        slug: 'PICK_UP_COMPLETED_BY_DRIVER',
-        percentage: 0.8,
-        image: theme.images.order.status9,
-      },
-      {
-        key: 10,
-        value: t('PICK_UP_FAILED_BY_DRIVER', 'Pick up Failed by driver'),
-        slug: 'PICK_UP_FAILED_BY_DRIVER',
-        percentage: 0,
-        image: theme.images.order.status10,
-      },
-      {
-        key: 11,
-        value: t(
-          'DELIVERY_COMPLETED_BY_DRIVER',
-          'Delivery completed by driver',
-        ),
-        slug: 'DELIVERY_COMPLETED_BY_DRIVER',
-        percentage: 1,
-        image: theme.images.order.status11,
-      },
-      {
-        key: 12,
-        value: t('DELIVERY_FAILED_BY_DRIVER', 'Delivery Failed by driver'),
-        slug: 'DELIVERY_FAILED_BY_DRIVER',
-        percentage: 0,
-        image: theme.images.order.status12,
-      },
-      {
-        key: 13,
-        value: t('PREORDER', 'PreOrder'),
-        slug: 'PREORDER',
-        percentage: 0,
-        image: theme.images.order.status13,
-      },
-      {
-        key: 14,
-        value: t('ORDER_NOT_READY', 'Order not ready'),
-        slug: 'ORDER_NOT_READY',
-        percentage: 0,
-        image: theme.images.order.status13,
-      },
-      {
-        key: 15,
-        value: t(
-          'ORDER_PICKEDUP_COMPLETED_BY_CUSTOMER',
-          'Order picked up completed by customer',
-        ),
-        slug: 'ORDER_PICKEDUP_COMPLETED_BY_CUSTOMER',
-        percentage: 100,
-        image: theme.images.order.status1,
-      },
-      {
-        key: 16,
-        value: t('CANCELLED_BY_CUSTOMER', 'Cancelled by customer'),
-        slug: 'CANCELLED_BY_CUSTOMER',
-        percentage: 0,
-        image: theme.images.order.status2,
-      },
-      {
-        key: 17,
-        value: t(
-          'ORDER_NOT_PICKEDUP_BY_CUSTOMER',
-          'Order not picked up by customer',
-        ),
-        slug: 'ORDER_NOT_PICKEDUP_BY_CUSTOMER',
-        percentage: 0,
-        image: theme.images.order.status2,
-      },
-      {
-        key: 18,
-        value: t(
-          'DRIVER_ALMOST_ARRIVED_TO_BUSINESS',
-          'Driver almost arrived to business',
-        ),
-        slug: 'DRIVER_ALMOST_ARRIVED_TO_BUSINESS',
-        percentage: 0.15,
-        image: theme.images.order.status3,
-      },
-      {
-        key: 19,
-        value: t(
-          'DRIVER_ALMOST_ARRIVED_TO_CUSTOMER',
-          'Driver almost arrived to customer',
-        ),
-        slug: 'DRIVER_ALMOST_ARRIVED_TO_CUSTOMER',
-        percentage: 0.9,
-        image: theme.images.order.status11,
-      },
-      {
-        key: 20,
-        value: t(
-          'ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS',
-          'Customer almost arrived to business',
-        ),
-        slug: 'ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS',
-        percentage: 90,
-        image: theme.images.order.status7,
-      },
-      {
-        key: 21,
-        value: t(
-          'ORDER_CUSTOMER_ARRIVED_BUSINESS',
-          'Customer arrived to business',
-        ),
-        slug: 'ORDER_CUSTOMER_ARRIVED_BUSINESS',
-        percentage: 95,
-        image: theme.images.order.status7,
-      },
-      {
-        key: 22,
-        value: t('ORDER_LOOKING_FOR_DRIVER', 'Looking for driver'),
-        slug: 'ORDER_LOOKING_FOR_DRIVER',
-        percentage: 35,
-        image: theme.images.order.status8
-      },
-      {
-        key: 23,
-        value: t('ORDER_DRIVER_ON_WAY', 'Driver on way'),
-        slug: 'ORDER_DRIVER_ON_WAY',
-        percentage: 45,
-        image: theme.images.order.status8
-      }
-    ];
-
-    const objectStatus = orderStatus.find((o) => o.key === status);
-
-    return objectStatus && objectStatus;
-  };
-
   const handleGoToMessages = (type: string) => {
     readMessages && readMessages();
     navigation.navigate(
@@ -447,6 +260,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] = {
@@ -531,11 +397,22 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
               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 })}
+                {
+                  activeStatus.includes(order?.status)
+                    ? order?.eta_time + 'min'
+                    : order?.delivery_datetime_utc
+                        ? parseDate(order?.delivery_datetime_utc)
+                        : 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>
                 <View style={styles.linkWrapper}>
@@ -551,7 +428,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                         onPress={() => handleClickOrderReview(order)}
                       >
                         <OText
-                          size={10}
+                          size={12}
                           lineHeight={15}
                           color={theme.colors.primary}
                           style={{ textDecorationLine: 'underline' }}
@@ -567,7 +444,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
 
                   >
                     <OText
-                      size={10}
+                      size={12}
                       lineHeight={15}
                       color={theme.colors.primary}
                       style={{ textDecorationLine: 'underline', textTransform: 'capitalize' }}
@@ -682,6 +559,26 @@ 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) && (
@@ -761,7 +658,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]),
@@ -875,14 +772,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 }} />
@@ -1050,8 +940,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>