ordering-ui-react-native 0.18.41 → 0.18.43

package/package.json

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

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

@@ -36,10 +36,11 @@ export const OrderEta = (props: any) => {
       if (diffTimeAsMinutes <= 0) {
         totalEta += (Math.floor(Math.abs(diffTimeAsMinutes / order?.eta_current_status_time) + 1) * order?.eta_current_status_penalty_time)
       }
-      _estimatedTime = parseDate(moment(_delivery).add(totalEta, 'minutes'))
+      _estimatedTime = moment.utc(_delivery).add(totalEta, 'minutes')
     } else {
-      _estimatedTime = parseDate(moment(_delivery).add(order?.eta_time, 'minutes'))
+      _estimatedTime = moment.utc(_delivery).add(order?.eta_time, 'minutes')
     }
+    _estimatedTime = outputFormat ? moment(_estimatedTime).format(outputFormat) : parseDate(_estimatedTime, { utc: false })
     setEstimatedDeliveryTime(_estimatedTime)
   }
 
@@ -49,11 +50,11 @@ export const OrderEta = (props: any) => {
       getEstimatedDeliveryTime()
     }, 1000)
     return () => clearInterval(interval)
-  }, [order])
+  }, [order, outputFormat])
 
   return (
     <>
-      {!outputFormat ? estimatedDeliveryTime : moment(estimatedDeliveryTime).format(outputFormat)}
+      {estimatedDeliveryTime}
     </>
   )
 }

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

@@ -121,7 +121,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   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 activeStatus = [0, 3, 4, 7, 8, 9, 13, 14, 18, 19, 20, 21, 22, 23]
   const enabledPoweredByOrdering = configs?.powered_by_ordering_module?.value
   const isGiftCardOrder = !order?.business_id
   const hideDeliveryDate = theme?.confirmation?.components?.order?.components?.date?.hidden

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

@@ -5,6 +5,7 @@ import {
   useOrder,
   useLanguage
 } from 'ordering-components/native';
+import FastImage from 'react-native-fast-image'
 import { StyleSheet, TouchableOpacity, View } from 'react-native';
 import { useTheme } from 'styled-components/native';
 import { OIcon, OText, OButton } from '../shared';
@@ -231,10 +232,13 @@ const SingleOrderCardUI = (props: SingleOrderCardParams) => {
                       key={business?.id}
                       style={styles.logoWrapper}
                     >
-                      <OIcon
-                        url={optimizeImage(business?.logo, 'h_300,c_limit')}
-                        src={optimizeImage(!business?.logo && theme?.images?.dummies?.businessLogo, 'h_300,c_limit')}
+                      <FastImage
                         style={styles.minilogo}
+                        source={business?.logo ? {
+                          uri: optimizeImage(business?.logo, 'h_300,c_limit'),
+                          priority: FastImage.priority.normal,
+                        } : theme?.images?.dummies?.businessLogo}
+                        resizeMode={FastImage.resizeMode.contain}
                       />
                     </Logo>
                   ))}
@@ -244,10 +248,13 @@ const SingleOrderCardUI = (props: SingleOrderCardParams) => {
                 </MultiLogosContainer>
               ) : (
                 <Logo style={styles.logoWrapper}>
-                  <OIcon
-                    url={optimizeImage(order.business?.logo, 'h_300,c_limit')}
-                    src={optimizeImage(!order.business?.logo && theme?.images?.dummies?.businessLogo, 'h_300,c_limit')}
+                  <FastImage
                     style={styles.logo}
+                    source={order.business?.logo ? {
+                      uri: optimizeImage(order.business?.logo, 'h_300,c_limit'),
+                      priority: FastImage.priority.normal,
+                    } : theme?.images?.dummies?.businessLogo}
+                    resizeMode={FastImage.resizeMode.contain}
                   />
                 </Logo>
               )}
@@ -296,7 +303,7 @@ const SingleOrderCardUI = (props: SingleOrderCardParams) => {
                         </OText>
                       </TouchableOpacity>
                     )}
-                  {!hideReorderButton && order?.id === 'number' && (
+                  {!hideReorderButton && typeof order?.id === 'number' && (
                     <OButton
                       text={t('REORDER', 'Reorder')}
                       imgRightSrc={''}