ordering-ui-react-native 0.14.91 → 0.14.92-release

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

@@ -1,13 +1,17 @@
 import React, { useState, useEffect } from 'react';
-import { StyleSheet, TouchableOpacity, View } from 'react-native';
+import { StyleSheet, TouchableOpacity, View, Platform, PlatformIOSStatic } from 'react-native';
 import { useTheme } from 'styled-components/native';
 import moment from 'moment'
-import { useLanguage, useUtils } from 'ordering-components/native';
+import { useLanguage, useUtils, useConfig } from 'ordering-components/native';
 import { OButton, OIcon, OText } from '../shared';
 import {
   Card, Logo, Information, MyOrderOptions, NotificationIcon, AcceptOrRejectOrder, Timestatus
 } from './styles';
 import EntypoIcon from 'react-native-vector-icons/Entypo'
+import { DeviceOrientationMethods } from '../../../../../src/hooks/DeviceOrientation'
+import DeviceInfo from 'react-native-device-info';
+
+const { useDeviceOrientation, PORTRAIT } = DeviceOrientationMethods
 
 export const PreviousOrders = (props: any) => {
   const {
@@ -17,25 +21,44 @@ export const PreviousOrders = (props: any) => {
     handleClickOrder,
     isLogisticOrder,
     handleClickLogisticOrder,
-    slaSettingTime
+    slaSettingTime,
+    currentTabSelected,
+    currentOrdenSelected
   } = props;
   const [, t] = useLanguage();
   const [{ parseDate, optimizeImage }] = useUtils();
+  const [configState] = useConfig()
   const theme = useTheme();
-  const [currentTime, setCurrentTime] = useState()
+  const [, setCurrentTime] = useState()
+  const [allowColumns, setAllowColumns] = useState({
+    timer: true,
+    slaBar: true,
+  })
+
+  const [orientationState] = useDeviceOrientation();
+
+  const IS_PORTRAIT = orientationState.orientation === PORTRAIT
+
+  const platformIOS = Platform as PlatformIOSStatic
+  const isIpad = platformIOS.isPad
+  const isTablet = DeviceInfo.isTablet();
 
   const handlePressOrder = (order: any) => {
     if (order?.locked && isLogisticOrder) return
     handleClickOrder && handleClickOrder(order)
-    onNavigationRedirect &&
-      onNavigationRedirect('OrderDetails', { order: { ...order, isLogistic: isLogisticOrder }, handleClickLogisticOrder });
+    if (props.handleClickEvent) {
+      props.handleClickEvent({ ...order, isLogistic: isLogisticOrder })
+    } else {
+      onNavigationRedirect &&
+        onNavigationRedirect('OrderDetails', { order: { ...order, isLogistic: isLogisticOrder }, handleClickLogisticOrder });
+    }
   };
 
   const styles = StyleSheet.create({
     cardButton: {
       flex: 1,
-      minHeight: isLogisticOrder ? 50 : 64,
-      marginBottom: isLogisticOrder ? 0 : 30,
+      paddingVertical: (isIpad || isTablet) ? 20 : 0,
+      marginBottom: IS_PORTRAIT ? 25 : 0,
       marginLeft: 3,
     },
     icon: {
@@ -76,23 +99,40 @@ export const PreviousOrders = (props: any) => {
     },
   });
 
-  const getDelayTime = (order: any) => {
+  const getDelayMinutes = (order: any) => {
     // targetMin = delivery_datetime  + eta_time - now()
+    const offset = 300
+    const cdtToutc = parseDate(moment(order?.delivery_datetime).add(offset, 'minutes'))
     const _delivery = order?.delivery_datetime_utc
+      ? parseDate(order?.delivery_datetime_utc)
+      : parseDate(cdtToutc)
     const _eta = order?.eta_time
-    const tagetedMin = moment(_delivery).add(_eta, 'minutes').diff(moment().utc(), 'minutes')
-    let day = Math.floor(tagetedMin / 1440)
+    return moment(_delivery, 'YYYY-MM-DD hh:mm A').add(_eta, 'minutes').diff(moment().utc(), 'minutes')
+  }
+
+  const displayDelayedTime = (order: any) => {
+    let tagetedMin = getDelayMinutes(order)
+    // get day, hour and minutes
+    const sign = tagetedMin >= 0 ? '' : '- '
+    tagetedMin = Math.abs(tagetedMin)
+    let day: string | number = Math.floor(tagetedMin / 1440)
     const restMinOfTargetedMin = tagetedMin - 1440 * day
-    let restHours: any = Math.floor(restMinOfTargetedMin / 60)
-    let restMins: any = restMinOfTargetedMin - 60 * restHours
+    let restHours: string | number = Math.floor(restMinOfTargetedMin / 60)
+    let restMins: string | number = restMinOfTargetedMin - 60 * restHours
+    // make standard time format
+    day = day === 0 ? '' : day + 'day  '
+    restHours = restHours < 10 ? '0' + restHours : restHours
+    restMins = restMins < 10 ? '0' + restMins : restMins
 
-    if (order?.time_status === 'in_time' || order?.time_status === 'at_risk') day = Math.abs(day)
-    if (restHours < 10) restHours = ('0' + restHours)
-    if (restMins < 10) restMins = ('0' + restMins)
-    const finalTaget = day + 'day  ' + restHours + ':' + restMins
+    const finalTaget = sign + day + restHours + ':' + restMins
     return finalTaget
   }
 
+  const getStatusClassName = (minutes: any) => {
+    if (isNaN(Number(minutes))) return 0
+    return minutes > 0 ? 'in_time' : minutes === 0 ? 'at_risk' : 'delayed'
+  }
+
   useEffect(() => {
     const interval = setInterval(() => {
       const date: any = Date.now()
@@ -102,6 +142,15 @@ export const PreviousOrders = (props: any) => {
     return () => clearInterval(interval)
   }, [])
 
+  useEffect(() => {
+    const slaSettings = configState?.configs?.order_deadlines_enabled?.value === '1'
+    setAllowColumns({
+      ...allowColumns,
+      timer: slaSettings,
+      slaBar: slaSettings
+    })
+  }, [configState.loading])
+
   let hash: any = {};
 
   return (
@@ -114,8 +163,9 @@ export const PreviousOrders = (props: any) => {
             return (
               <View
                 style={{
-                  backgroundColor: order?.locked && isLogisticOrder ? '#ccc' : '#fff',
-                  marginBottom: isLogisticOrder ? 10 : 0
+                  backgroundColor: currentOrdenSelected === order?.id ? theme.colors.gray100 : order?.locked && isLogisticOrder ? '#ccc' : '#fff',
+                  marginBottom: isLogisticOrder ? 10 : 0,
+                  // justifyContent: 'center'
                 }}
                 key={order.id}
               >
@@ -126,7 +176,9 @@ export const PreviousOrders = (props: any) => {
                   activeOpacity={1}
                 >
                   <Card key={order.id}>
-                    <Timestatus style={{ backgroundColor: order?.time_status === 'in_time' ? '#00D27A' : order?.time_status === 'at_risk' ? '#FFC700' : order?.time_status === 'delayed' ? '#E63757' : '' }} />
+                  {allowColumns?.slaBar && (
+                    <Timestatus style={{ backgroundColor: getStatusClassName(getDelayMinutes(order)) === 'in_time' ? '#00D27A' : getStatusClassName(getDelayMinutes(order)) === 'at_risk' ? '#FFC700' : getStatusClassName(getDelayMinutes(order)) === 'delayed' ? '#E63757' : '' }} />
+                  )}
                     {
                       order.business?.logo && (
                         <Logo style={styles.logo}>
@@ -159,7 +211,7 @@ export const PreviousOrders = (props: any) => {
                           />
                         </NotificationIcon>
                       )}
-                      <View style={{ flexDirection: 'row' }}>
+                      <View style={{ flexDirection: 'row', flexWrap: 'wrap' }}>
                         <OText
                           style={styles.date}
                           color={theme.colors.unselectText}
@@ -169,9 +221,14 @@ export const PreviousOrders = (props: any) => {
                           {(order?.order_group_id && order?.order_group && isLogisticOrder ? `${order?.order_group?.orders?.length} ${t('ORDERS', 'Orders')}` : (t('NO', 'Order No.') + order.id)) + ' · '}
                           {order?.delivery_datetime_utc
                             ? parseDate(order?.delivery_datetime_utc, { outputFormat: 'MM/DD/YY · HH:mm a' })
-                            : parseDate(order?.delivery_datetime, { utc: false })}{' · '}
+                            : parseDate(order?.delivery_datetime, { utc: false })}
                         </OText>
-                        <OText style={styles.date} color={order?.time_status === 'in_time' ? '#00D27A' : order?.time_status === 'at_risk' ? '#FFC700' : order?.time_status === 'delayed' ? '#E63757' : ''} >{getDelayTime(order)}</OText>
+                        {((currentTabSelected === 'pending' || currentTabSelected === 'inProgress') && allowColumns?.timer) && (
+                          <>
+                            <OText> · </OText>
+                            <OText style={styles.date} color={getStatusClassName(getDelayMinutes(order)) === 'in_time' ? '#00D27A' : getStatusClassName(getDelayMinutes(order)) === 'at_risk' ? '#FFC700' : getStatusClassName(getDelayMinutes(order)) === 'delayed' ? '#E63757' : ''} >{displayDelayedTime(order)}</OText>
+                          </>
+                        )}
                       </View>
                       {!isLogisticOrder && (
                         <MyOrderOptions>

package/themes/business/src/types/index.tsx

@@ -575,3 +575,7 @@ export interface ReviewCustomerParams {
   handleChangeQualification?: any,
   handleSendCustomerReview?: any,
 }
+
+export interface NoNetworkParams {
+  image?: any;
+}

package/themes/doordash/src/components/BusinessesListing/index.tsx

@@ -197,7 +197,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 			{isFarAway && (
 				<FarAwayMessage style={styles.farAwayMsg}>
 					<Ionicons name='md-warning-outline' style={styles.iconStyle} />
-					<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'You are far from this address')}</OText>
+					<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'Your are far from this address')}</OText>
 				</FarAwayMessage>
 			)}
 			{!auth && (

package/themes/doordash/src/components/LoginForm/index.tsx

@@ -410,8 +410,7 @@ const LoginFormUI = (props: LoginParams) => {
                     textInputProps={{
                       returnKeyType: 'next',
                       onSubmitEditing: () => inputRef?.current?.focus?.(),
-                      style: { borderWidth: 0, fontSize: 12 },
-					  maxLength: 10
+                      style: { borderWidth: 0, fontSize: 12 }
                     }}
                     textWrapStyle={{ borderColor: theme.colors.clear, borderWidth: 0, height: 40, paddingStart: 0 }}
                   />

package/themes/instacart/src/components/BusinessesListing/index.tsx

@@ -155,7 +155,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 				{isFarAway && (
 					<FarAwayMessage style={styles.farAwayMsg}>
 						<Ionicons name='md-warning-outline' style={styles.iconStyle} />
-						<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'You are far from this address')}</OText>
+						<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'Your are far from this address')}</OText>
 					</FarAwayMessage>
 				)}
 				<View style={styles.wrapperOrderOptions}>

package/themes/kiosk/index.tsx

@@ -14,6 +14,7 @@ import { LanguageSelector } from './src/components/LanguageSelector'
 import { LoginForm } from './src/components/LoginForm'
 import { LogoutPopup } from './src/components/LogoutPopup'
 import Navbar from './src/components/NavBar'
+import { NetworkError } from './src/components/NetworkError'
 import { NotFoundSource } from './src/components/NotFoundSource'
 import OptionCard from './src/components/OptionCard'
 import { OrderDetails } from './src/components/OrderDetails'
@@ -82,6 +83,7 @@ export {
   LoginForm,
   LogoutPopup,
   Navbar,
+  NetworkError,
   NotFoundSource,
   OptionCard,
   OrderDetails,

package/themes/kiosk/src/components/BusinessController/index.tsx

@@ -6,6 +6,7 @@ import {
   BusinessController as BusinessSingleCard,
   useUtils,
 } from 'ordering-components/native';
+import FastImage from 'react-native-fast-image'
 
 import { Card, BusinessLogo } from './styles';
 
@@ -26,6 +27,16 @@ export const BusinessControllerUI = (props: any) => {
       alignItems: 'center',
       textAlign: 'center',
       marginTop: 10
+    },
+    logoStyle: {
+      width: 120,
+      height: 120,
+      borderRadius: 8,
+      borderWidth: 1,
+      borderColor: theme.colors.border,
+      flexDirection: 'column',
+      justifyContent: 'center',
+      alignItems: 'center',
     }
   });
 
@@ -39,12 +50,22 @@ export const BusinessControllerUI = (props: any) => {
       activeOpacity={1}
       onPress={() => handleBusinessClick(business)}
     >
-      <BusinessLogo
-        source={business?.logo ? {
-          uri: optimizeImage(business?.logo, 'h_120,c_limit'),
-        } : theme.images.dummies.businessLogo}
-        resizeMode='contain'
-      />
+      {business?.logo ? (
+        <FastImage
+          style={styles.logoStyle}
+          source={{
+            uri: business?.logo,
+            priority: FastImage.priority.high,
+            cache:FastImage.cacheControl.web
+          }}
+          resizeMode={FastImage.resizeMode.contain}
+        />
+      ) : (
+        <BusinessLogo
+          source={theme.images.dummies.businessLogo}
+          resizeMode='contain'
+        />
+      )}
       <OText
         size={WIDTH_SCREEN * 0.012}
         numberOfLines={2}

package/themes/kiosk/src/components/BusinessController/styles.tsx

@@ -3,7 +3,7 @@ import styled, { css } from 'styled-components/native';
 export const Card = styled.TouchableOpacity`
   display: flex;
   flex-direction: column;
-  justify-content: center;
+  justify-content: flex-start;
   align-items: center;
   margin: 0 15px 20px;
   width: 120px;

package/themes/kiosk/src/components/BusinessProductsListing/index.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { View, StyleSheet, ScrollView, TouchableOpacity } from 'react-native'
+import { View, StyleSheet, ScrollView, TouchableOpacity, ImageBackground } from 'react-native'
 import { BusinessAndProductList, useLanguage } from 'ordering-components/native'
 import { BusinessProductsListingParams, Business } from '../../types'
 import { OCard, OText, OIcon } from '../shared'
@@ -7,6 +7,7 @@ import GridContainer from '../../layouts/GridContainer'
 import Spinner from 'react-native-loading-spinner-overlay';
 import { LANDSCAPE, useDeviceOrientation } from '../../../../../src/hooks/DeviceOrientation';
 import styled, { useTheme } from 'styled-components/native';
+import FastImage from 'react-native-fast-image'
 
 const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
   const {navigation, businessState, resetInactivityTimeout, clearInactivityTimeout, bottomSheetVisibility } = props;
@@ -38,7 +39,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
     },
   });
 
-  const _categories: any = business?.original?.categories;
+  const _categories: any = business?.categories;
   let _promos: any = [];
   _categories?.forEach((categ: any) => {
     const _featuredProds = categ?.products?.filter(
@@ -59,17 +60,17 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
   );
 
   const RenderCategories = ({ item, cardStyle, widthScreen }: any) => {
-    const Category = styled.ImageBackground`
-      position: relative;
-      height: 150px;
-      width: ${(props: any) => props.w * 0.45}px;
-      border-radius: 10px;
-      padding: 10px;
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      align-items: center;
-    `
+    const stylesCat = StyleSheet.create({
+      categoryStyle: {
+        height: 150,
+        borderRadius: 10,
+        padding: 10,
+        flexDirection: 'column',
+        justifyContent: 'center',
+        alignItems: 'center',
+      }
+    })
+
     const WrapText = styled.View`
       height: 90px;
       display: flex;
@@ -78,6 +79,25 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
       border-radius: 10px;
     `
 
+    const Category = (props: any) => {
+      const imageProps = {
+        style: props.style,
+        source: props.source,
+        resizeMode: props.resizeMode,
+      }
+      return (
+        props.uri ? (
+          <FastImage {...imageProps}>
+            {props.children}
+          </FastImage>
+        ) : (
+          <ImageBackground {...imageProps}>
+            {props.children}
+          </ImageBackground>
+        )
+      )
+    }
+
     return (
       <TouchableOpacity
         key={item.id}
@@ -92,11 +112,17 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
         }}
       >
         <Category
-          style={cardStyle}
-          source={{uri: item.images}}
-          resizeMode="cover"
-          w={widthScreen}
-          borderRadius={16}
+          style={{ ...cardStyle, ...stylesCat.categoryStyle, width: widthScreen * 0.45 }}
+          uri={!!item.images}
+          source={!!item.images
+            ? {
+              uri: item.images,
+              priority: FastImage.priority.high,
+              cache:FastImage.cacheControl.web
+            }
+            : theme.images.categories.all
+          }
+          resizeMode={FastImage.resizeMode.cover}
         >
           {item?.inventoried && (
             <View style={styles.soldOut}>
@@ -111,7 +137,6 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
               mLeft={0}
               size={32}
               numberOfLines={1}
-              // mBottom={8}
               style={{...props?.titleStyle}}
               weight="bold"
             >
@@ -121,7 +146,6 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
               <OText
                 color={theme.colors.white}
                 numberOfLines={1}
-                // mBottom={4}
                 size={18}
                 style={{...props?.descriptionStyle}}
                 weight="400"
@@ -161,7 +185,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
   const _renderCategories = (): React.ReactElement => (
     <>
       {_renderTitle(t('CATEGORIES', 'Categories'))}
-      <GridContainer 
+      <GridContainer
         style={{
           paddingLeft: orientationState?.orientation === LANDSCAPE
           ? bottomSheetVisibility ? orientationState?.dimensions?.width * 0.004 :orientationState?.dimensions?.width * 0.008
@@ -171,9 +195,12 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
         {_categories && _categories.map((category: any) => (
           <OCard
             key={category.id}
+            isCentered
+            isUri={!!category.image}
             title={category?.name || ''}
-            image={{uri: category?.image}}
+            image={category.image ? {uri: category.image} : theme.images.categories.all}
             style={{
+              borderRadius: 10,
               width:
                 orientationState?.orientation === LANDSCAPE
                   ? bottomSheetVisibility ? orientationState?.dimensions?.width * 0.145 :orientationState?.dimensions?.width * 0.16
@@ -183,8 +210,8 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
               resetInactivityTimeout()
               navigation.navigate('Category', {
                 category,
-                categories: business.original.categories,
-                businessId: business?.api?.businessId,
+                categories: business?.categories,
+                businessId: business?.id,
                 businessSlug: business?.slug,
                 clearInactivityTimeout,
                 resetInactivityTimeout,

package/themes/kiosk/src/components/Cart/index.tsx

@@ -379,7 +379,7 @@ const CartUI = (props: any) => {
         <ProductForm
           productCart={curProduct}
           businessSlug={cart?.business?.slug}
-          businessId={curProduct?.business_id}
+          businessId={cart?.business_id}
           categoryId={curProduct?.category_id}
           productId={curProduct?.id}
           onSave={handlerProductAction}

package/themes/kiosk/src/components/CartBottomSheet/index.tsx

@@ -179,7 +179,7 @@ const CartBottomSheetUI = (props: CartBottomSheetUIProps): React.ReactElement |
         <ProductForm
           productCart={curProduct}
           businessSlug={cart?.business?.slug}
-          businessId={curProduct?.business_id}
+          businessId={cart?.business_id}
           categoryId={curProduct?.category_id}
           productId={curProduct?.id}
           onSave={handlerProductAction}

package/themes/kiosk/src/components/CartBottomSheet/styles.tsx

@@ -5,7 +5,7 @@ export const StyledContainer = styled.ScrollView`
 	zIndex: 1000;
 	width: 100%;
 	background-color: #fff;
-	padding: 20px 20px 20px 0px;
+	padding: 20px 0 0;
 	bottom: 0;
 	shadow-color: #000;
 	shadow-opacity:  0.4;

package/themes/kiosk/src/components/CartContent/index.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { useLanguage } from 'ordering-components/native';
-
+import { useCartBottomSheet } from '../../providers/CartBottomSheetProvider';
 import { CCNotCarts } from './styles';
 
 import { Cart } from '../Cart';
@@ -22,6 +22,7 @@ export const CartContent = (props: any) => {
 
   const [, t] = useLanguage()
   const [isCartsLoading, setIsCartsLoading] = useState(false)
+  const [, { hideCartBottomSheet }] = useCartBottomSheet();
 
   const cartProps = {
     navigation,
@@ -33,6 +34,15 @@ export const CartContent = (props: any) => {
     resetInactivityTimeout,
   }
 
+  useEffect(() => {
+    if (!cart && showNotFound) {
+      navigation?.canGoBack()
+        ? navigation.goBack()
+        : props.onNavigationRedirect && props.onNavigationRedirect('Business')
+      hideCartBottomSheet()
+    }
+  }, [cart])
+
   const content = (
     <>
       {(isOrderStateCarts && cart) && (
@@ -46,13 +56,13 @@ export const CartContent = (props: any) => {
           }
         </>
       )}
-      {(!cart && showNotFound) && (
+      {/* {(!cart && showNotFound) && (
         <CCNotCarts>
           <OText size={24} style={{ textAlign: 'center' }}>
             {t('CARTS_NOT_FOUND', 'You don\'t have carts available')}
           </OText>
         </CCNotCarts>
-      )}
+      )} */}
       <Spinner visible={isCartsLoading} />
     </>
   )

package/themes/kiosk/src/components/CartItem/index.tsx

@@ -1,6 +1,7 @@
 import React, { useState } from 'react';
-import { View, Animated, TouchableOpacity } from 'react-native';
+import { View, Animated, TouchableOpacity, ImageBackground } from 'react-native';
 import { useLanguage, useUtils } from 'ordering-components/native';
+import FastImage from 'react-native-fast-image'
 
 import {
   StyledCartItem,
@@ -70,13 +71,24 @@ const CartItem = (props: CartItemProps) => {
       >
         <StyledCartItem>
           <View style={{ flexDirection: 'row' }}>
-            <OImage
-              source={{ uri: product?.images || '' }}
-              height={60}
-              width={60}
-              resizeMode="cover"
-              borderRadius={6}
-            />
+            {product?.images ? (
+              <FastImage
+                style={{ height: 60, width: 80, borderRadius: 6 }}
+                source={{
+                  uri: product?.images,
+                  priority: FastImage.priority.normal,
+                  // cache:FastImage.cacheControl.web
+                }}
+                resizeMode={FastImage.resizeMode.cover}
+              />
+            ) : (
+              <ImageBackground
+                style={{ height: 60, width: 80, borderRadius: 6 }}
+                source={theme.images.dummies.product}
+                imageStyle={{ borderRadius: 6 }}
+                resizeMode='cover'
+              />
+            )}
 
             <View style={{ flexDirection: 'column', justifyContent: 'space-evenly', marginHorizontal: 15, marginTop: 10 }}>
               <View>

package/themes/kiosk/src/components/CategoriesMenu/index.tsx

@@ -156,13 +156,17 @@ const CategoriesMenu = (props: any): React.ReactElement => {
                 <OCard
                   key={product.id}
                   title={product?.name}
-                  image={{ uri: product?.images }}
+                  isUri={!!product.images}
+                  image={product.images ? {uri: product.images} : theme.images.dummies.product}
+                  price={parsePrice(product?.price)}
+                  description={product?.description}
+                  prevPrice={product?.offer_price > 0 && parsePrice(product?.offer_price)}
                   style={{
+                    borderRadius: 10,
                     width: orientationState?.orientation === LANDSCAPE
                       ? bottomSheetVisibility ? orientationState?.dimensions?.width * 0.145 :orientationState?.dimensions?.width * 0.16
                       : orientationState?.dimensions?.width * 0.20
                   }}
-                  titleStyle={{marginTop: Platform.OS === 'ios' ? orientationState?.orientation === LANDSCAPE ? orientationState?.dimensions.height * 0.05 : orientationState?.dimensions.width * 0.05 : 0}}
                   onPress={() => {
                     resetInactivityTimeout()
                     if (isDrawer) {
@@ -176,9 +180,6 @@ const CategoriesMenu = (props: any): React.ReactElement => {
                       });
                     }
                   }}
-                  {...(!!product?.description && { description: product?.description } )}
-                  {...(!!product?.price && { price: parsePrice(product?.price) } )}
-                  {...(product?.in_offer && { prevPrice: `$${product?.offer_price}` } )}
                 />
               ))}
             </GridContainer>
@@ -212,6 +213,7 @@ const CategoriesMenu = (props: any): React.ReactElement => {
             businessId={parseInt(businessId, 10)}
             businessSlug={businessSlug}
             onSave={() => {
+              showCartBottomSheet()
               setDrawerValues({ isOpen: !drawerState.isOpen, data: null })
             }}
             navigation={navigation}