ordering-ui-react-native 0.17.59 → 0.17.61

package/package.json

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

package/src/components/shared/OToast.tsx

@@ -5,7 +5,7 @@ import { useTheme } from 'styled-components/native';
 import { getTraduction } from '../../utils'
 
 const fadeDuration = 300;
-const bottomPosition = 20;
+const topPosition = 20;
 
 export const Toast = (props: any) => {
   const [toastConfig, { hideToast }] = useToast();
@@ -54,7 +54,7 @@ export const Toast = (props: any) => {
       backgroundColor = theme.colors.toastInfo || '#6BA4FF';
       break;
     case ToastType.Error:
-      backgroundColor = theme.colors.toastError || '#D83520' ;
+      backgroundColor = theme.colors.toastError || '#D83520';
       break;
     case ToastType.Success:
       backgroundColor = theme.colors.toastSuccess || '#90C68E';
@@ -65,7 +65,7 @@ export const Toast = (props: any) => {
     <Animated.View
       style={[
         styles.container,
-        { bottom: bottomPosition, opacity },
+        { top: topPosition, opacity },
       ]}
     >
       <View style={[styles.toast, { backgroundColor }]}>

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

@@ -472,7 +472,7 @@ const ChatUI = (props: MessagesParams) => {
     const firstMessage = {
       _id: 0,
       text: console,
-      createdAt: order?.created_at,
+      createdAt: parseDate(order?.created_at, { outputFormat: 'YYYY-MM-DD HH:mm:ss' }),
       system: true,
     };
     messages?.messages.map((message: any) => {
@@ -488,7 +488,7 @@ const ChatUI = (props: MessagesParams) => {
         newMessage = {
           _id: message.id,
           text: message.type === 1 ? messageConsole(message) : message.comment,
-          createdAt: message.type !== 0 && message.created_at,
+          createdAt: message.type !== 0 && parseDate(message?.created_at, { outputFormat: 'YYYY-MM-DD HH:mm:ss' }),
           image: message.source,
           system: message.type === 1,
           user: {

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

@@ -139,7 +139,7 @@ export const PreviousOrders = (props: any) => {
     const interval = setInterval(() => {
       const date: any = Date.now()
       setCurrentTime(date)
-    }, slaSettingTime)
+    }, slaSettingTime ?? 6000)
 
     return () => clearInterval(interval)
   }, [])

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

@@ -4,8 +4,8 @@ import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder';
 import { FavoriteParams } from '../../types';
 import { SingleOrderCard } from '../SingleOrderCard';
 import {
-	FavoriteList as FavoriteListController,
-	useOrder,
+  FavoriteList as FavoriteListController,
+  useOrder,
   useLanguage
 } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
@@ -19,7 +19,7 @@ import moment from 'moment';
 
 
 const FavoriteListUI = (props: FavoriteParams) => {
-	const {
+  const {
     favoriteList,
     handleUpdateFavoriteList,
     pagination,
@@ -31,9 +31,9 @@ const FavoriteListUI = (props: FavoriteParams) => {
     isBusiness,
     isOrder,
     isProduct
-	} = props
+  } = props
 
-	const theme = useTheme();
+  const theme = useTheme();
   const [, t] = useLanguage()
   const [orderState] = useOrder();
   const [{ carts }] = useOrder()
@@ -79,34 +79,39 @@ const FavoriteListUI = (props: FavoriteParams) => {
     const businessId = product?.category?.business?.id
     if (!categoryId || !businessId) return
     onNavigationRedirect && onNavigationRedirect('ProductDetails', {
-			productId: product?.id,
-			categoryId: categoryId,
-			businessId: businessId
-		})
+      isRedirect: 'business',
+      productId: product?.id,
+      businessId: businessId,
+      categoryId: categoryId,
+      business: {
+        store: product?.category?.business.slug,
+        header: product?.category?.header,
+      }
+    })
   }
 
   useEffect(() => {
-		const _businessId = 'businessId:' + reorderState?.result?.business_id
-		if (reorderState?.error) {
-		  if (reorderState?.result?.business_id) {
-			_setStoreData('adjust-cart-products', JSON.stringify(_businessId))
-			onNavigationRedirect && onNavigationRedirect('Business', { store: reorderState?.result?.business?.slug })
-		  }
-		}
-		if (!reorderState?.error && reorderState.loading === false && reorderState?.result?.business_id) {
-		  const cartProducts = carts?.[_businessId]?.products
-		  const available = cartProducts.every((product: any) => product.valid === true)
-		  const orderProducts = favoriteList?.favorites.find((order: any) => order?.id === reorderState?.result?.orderId)?.products
+    const _businessId = 'businessId:' + reorderState?.result?.business_id
+    if (reorderState?.error) {
+      if (reorderState?.result?.business_id) {
+        _setStoreData('adjust-cart-products', JSON.stringify(_businessId))
+        onNavigationRedirect && onNavigationRedirect('Business', { store: reorderState?.result?.business?.slug })
+      }
+    }
+    if (!reorderState?.error && reorderState.loading === false && reorderState?.result?.business_id) {
+      const cartProducts = carts?.[_businessId]?.products
+      const available = cartProducts.every((product: any) => product.valid === true)
+      const orderProducts = favoriteList?.favorites.find((order: any) => order?.id === reorderState?.result?.orderId)?.products
 
-		  if (available && reorderState?.result?.uuid && (cartProducts?.length === orderProducts?.length)) {
-			onNavigationRedirect && onNavigationRedirect('CheckoutNavigator', { cartUuid: reorderState?.result.uuid })
-		  } else {
-			_setStoreData('adjust-cart-products', JSON.stringify(_businessId))
-			cartProducts?.length !== orderProducts?.length && _setStoreData('already-removed', JSON.stringify('removed'))
-			onNavigationRedirect && onNavigationRedirect('Business', { store: reorderState?.result?.business?.slug })
-		  }
-		}
-	  }, [reorderState])
+      if (available && reorderState?.result?.uuid && (cartProducts?.length === orderProducts?.length)) {
+        onNavigationRedirect && onNavigationRedirect('CheckoutNavigator', { cartUuid: reorderState?.result.uuid })
+      } else {
+        _setStoreData('adjust-cart-products', JSON.stringify(_businessId))
+        cartProducts?.length !== orderProducts?.length && _setStoreData('already-removed', JSON.stringify('removed'))
+        onNavigationRedirect && onNavigationRedirect('Business', { store: reorderState?.result?.business?.slug })
+      }
+    }
+  }, [reorderState])
 
   const handleBusinessClick = (business: any) => {
     onNavigationRedirect && onNavigationRedirect('Business', {
@@ -195,12 +200,12 @@ const FavoriteListUI = (props: FavoriteParams) => {
     )
   }
 
-	return (
-		<Container>
+  return (
+    <Container>
       {isBusiness && (
         <>
           {favoriteList?.favorites?.length > 0 && (
-            favoriteList.favorites?.sort((a: any, b: any) => a?.name?.toLowerCase() > b?.name?.toLowerCase()).map((business: any, i:number) => (
+            favoriteList.favorites?.sort((a: any, b: any) => a?.name?.toLowerCase() > b?.name?.toLowerCase()).map((business: any, i: number) => (
               <BusinessController
                 key={`${business.id}_` + i}
                 business={business}
@@ -237,7 +242,7 @@ const FavoriteListUI = (props: FavoriteParams) => {
       {isOrder && (
         <>
           {favoriteList?.favorites?.length > 0 && (
-            favoriteList.favorites?.sort((a: any, b:any) => moment(a?.delivery_datetime_utc).valueOf() - moment(b?.delivery_datetime_utc).valueOf())
+            favoriteList.favorites?.sort((a: any, b: any) => moment(a?.delivery_datetime_utc).valueOf() - moment(b?.delivery_datetime_utc).valueOf())
               .map((order: any, i: number) => (
                 <SingleOrderCard
                   key={`${order?.id}_${i}`}
@@ -250,7 +255,7 @@ const FavoriteListUI = (props: FavoriteParams) => {
                   handleReorder={handleReorder}
                   reorderLoading={reorderState?.loading}
                 />
-            ))
+              ))
           )}
           {favoriteList?.loading && (
             [...Array(5).keys()].map(i => (
@@ -294,18 +299,18 @@ const FavoriteListUI = (props: FavoriteParams) => {
       )}
 
       {!favoriteList?.loading && pagination.totalPages && pagination.currentPage < pagination.totalPages && (
-				<WrappButton>
-					<OButton
-						onClick={() => getFavoriteList(pagination?.currentPage + 1)}
-						text={t('LOAD_MORE_ITEMS', 'Load more items')}
-						imgRightSrc={null}
-						textStyle={{ color: theme.colors.white }}
-						style={{ borderRadius: 7.6, shadowOpacity: 0, marginTop: 20 }}
-					/>
-				</WrappButton>
-			)}
+        <WrappButton>
+          <OButton
+            onClick={() => getFavoriteList(pagination?.currentPage + 1)}
+            text={t('LOAD_MORE_ITEMS', 'Load more items')}
+            imgRightSrc={null}
+            textStyle={{ color: theme.colors.white }}
+            style={{ borderRadius: 7.6, shadowOpacity: 0, marginTop: 20 }}
+          />
+        </WrappButton>
+      )}
     </Container>
-	)
+  )
 }
 
 export const FavoriteList = (props: any) => {

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

@@ -141,7 +141,7 @@ const MessagesUI = (props: MessagesParams) => {
 		const firstMessage = {
 			_id: 0,
 			text: _console,
-			createdAt: order?.created_at,
+			createdAt: parseDate(order?.created_at, { outputFormat: 'YYYY-MM-DD HH:mm:ss' }),
 			system: true
 		}
 		const newMessage: any = [];
@@ -150,7 +150,7 @@ const MessagesUI = (props: MessagesParams) => {
 				newMessage.push({
 					_id: message?.id,
 					text: message.type === 1 ? messageConsole(message) : message.comment,
-					createdAt: message.type !== 0 && message.created_at,
+					createdAt: message.type !== 0 && parseDate(message?.created_at, { outputFormat: 'YYYY-MM-DD HH:mm:ss' }),
 					image: message.source,
 					system: message.type === 1,
 					user: {
@@ -165,7 +165,7 @@ const MessagesUI = (props: MessagesParams) => {
 				newMessage.push({
 					_id: message?.id,
 					text: message.type === 1 ? messageConsole(message) : message.comment,
-					createdAt: message.type !== 0 && message.created_at,
+					createdAt: message.type !== 0 && parseDate(message?.created_at, { outputFormat: 'YYYY-MM-DD HH:mm:ss' }),
 					image: message.source,
 					system: message.type === 1,
 					user: {

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

@@ -103,15 +103,15 @@ export const MyOrders = (props: any) => {
             }}
           />
           <OText
-              size={24}
-              style={{
-                textTransform: 'capitalize',
-                marginLeft: 20,
-                top: 2
-              }}
-            >
-              {t('MY_ORDERS', 'My Orders')}
-            </OText>
+            size={24}
+            style={{
+              textTransform: 'capitalize',
+              marginLeft: 20,
+              top: 2
+            }}
+          >
+            {t('MY_ORDERS', 'My Orders')}
+          </OText>
         </View>
       )}
       {!hideOrders && !isChewLayout && !showNavbar && (
@@ -145,16 +145,18 @@ export const MyOrders = (props: any) => {
       )}
       {selectedOption === 'orders' && (
         <>
-          <View style={{ paddingLeft: 40, paddingRight: 40 }}>
-            <OrdersOption
-              {...props}
-              activeOrders
-              ordersLength={ordersLength}
-              setOrdersLength={setOrdersLength}
-              setRefreshOrders={setRefreshOrders}
-              refreshOrders={refreshOrders}
-            />
-          </View>
+          {ordersLength?.activeOrdersLength > 0 && (
+            <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}

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

@@ -118,6 +118,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 enabledPoweredByOrdering = configs?.powered_by_ordering_module?.value
 
   const walletName: any = {
@@ -595,9 +596,13 @@ 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 && (

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

@@ -109,14 +109,11 @@ const OrderProgressUI = (props: any) => {
   }
 
   const convertDiffToHours = (order: any) => {
-    const time = order.delivery_type === 1 ? order?.business?.delivery_time : order?.business?.pickup_time
+    const minute = order?.eta_time
     const deliveryTime = order?.delivery_datetime_utc
       ? parseDate(order?.delivery_datetime_utc, { outputFormat: 'YYYY-MM-DD HH:mm' })
       : parseDate(order?.delivery_datetime, { utc: false, outputFormat: 'YYYY-MM-DD HH:mm' })
-    const hour = time?.split(':')?.[0]
-    const minute = time?.split(':')?.[1]
-    const result = time ? (parseInt(hour, 10) * 60) + parseInt(minute, 10) : 0
-    const returnedDate = moment(deliveryTime).add(result, 'minutes').format('hh:mm A')
+    const returnedDate = moment(deliveryTime).add(minute, 'minutes').format('hh:mm A')
     return returnedDate
   }
 

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

@@ -131,7 +131,7 @@ const ReviewDriverUI = (props: ReviewDriverParams) => {
     if (!order?.user_review && !isDriverReviewed) {
       onSubmit()
     } else {
-      onNavigationRedirect && onNavigationRedirect('MyOrders')
+      onNavigationRedirect('BottomTab', { screen: 'MyOrders' })
     }
   }
 
@@ -145,7 +145,7 @@ const ReviewDriverUI = (props: ReviewDriverParams) => {
     }
     if (!formState.loading && !formState.result?.error && alertState.success) {
       setIsDriverReviewed && setIsDriverReviewed(true)
-      onNavigationRedirect('MyOrders')
+      onNavigationRedirect('BottomTab', { screen: 'MyOrders' })
     }
   }, [formState])
 
@@ -186,7 +186,7 @@ const ReviewDriverUI = (props: ReviewDriverParams) => {
         <NavBar
           title={t('REVIEW_DRIVER', 'Review driver')}
           titleAlign={'center'}
-          onActionLeft={() => onNavigationRedirect('BottomTab')}
+          onActionLeft={() => onNavigationRedirect('BottomTab', { screen: 'MyOrders' })}
           showCall={false}
           btnStyle={{ paddingLeft: 0 }}
           style={{ flexDirection: 'column', alignItems: 'flex-start' }}

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

@@ -56,7 +56,7 @@ const ReviewProductsUI = (props: ReviewProductParams) => {
       if (order?.driver && !order?.user_review) {
         onNavigationRedirect('ReviewDriver', { order: order })
       } else {
-        onNavigationRedirect('MyOrders')
+        onNavigationRedirect('BottomTab', { screen: 'MyOrders' })
       }
     }
   }, [formState])
@@ -67,7 +67,7 @@ const ReviewProductsUI = (props: ReviewProductParams) => {
         <NavBar
           title={t('REVIEW_PRODUCT', 'Review product')}
           titleAlign={'center'}
-          onActionLeft={() => onNavigationRedirect('BottomTab')}
+          onActionLeft={() => onNavigationRedirect('BottomTab', { screen: 'MyOrders' })}
           showCall={false}
           btnStyle={{ paddingLeft: 0 }}
           style={{ flexDirection: 'column', alignItems: 'flex-start' }}
@@ -87,7 +87,10 @@ const ReviewProductsUI = (props: ReviewProductParams) => {
       <FloatingBottomContainer>
         <ActionContainer>
           <SkipButton
-            onPress={() => (order?.driver && !order?.user_review) ? onNavigationRedirect('ReviewDriver', { order: order }) : onNavigationRedirect('MyOrders')}
+            onPress={() => (order?.driver && !order?.user_review) ?
+              onNavigationRedirect('ReviewDriver', { order: order }) :
+              onNavigationRedirect('BottomTab', { screen: 'MyOrders' })
+            }
           >
             <OText weight={700} size={18} color={theme.colors.textNormal}>{t('FRONT_VISUALS_SKIP', 'Skip')}</OText>
           </SkipButton>
@@ -95,7 +98,7 @@ const ReviewProductsUI = (props: ReviewProductParams) => {
             textStyle={{ color: theme.colors.white, paddingRight: 10 }}
             text={order?.driver && !order?.user_review ? t('CONTINUE', 'Continue') : t('SEND_REVIEW', 'Send Review')}
             style={{ borderRadius: 8 }}
-			      imgRightSrc={theme.images.general.arrow_right}
+            imgRightSrc={theme.images.general.arrow_right}
             imgRightStyle={{ tintColor: theme.colors.white, right: 5, margin: 5 }}
             isDisabled={formState.loading || formState?.changes?.length === 0}
             onClick={() => handleContinueClick()}

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

@@ -282,7 +282,11 @@ const SingleOrderCardUI = (props: SingleOrderCardParams) => {
                     color={theme.colors.textSecondary}
                     style={{ marginVertical: 3 }}
                     numberOfLines={1}>
-                    {order?.delivery_datetime_utc ? parseDate(order?.delivery_datetime_utc) : parseDate(order?.delivery_datetime, { utc: false })}
+                    {
+                      pastOrders
+                        ? order?.delivery_datetime_utc ? parseDate(order?.delivery_datetime_utc) : parseDate(order?.delivery_datetime, { utc: false })
+                        : order?.eta_time + 'min'
+                    }
                   </OText>
                 </View>
                 <OText