ordering-ui-react-native 0.16.98 → 0.17.0

package/package.json

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

package/src/components/BusinessProductsList/index.tsx

@@ -68,7 +68,7 @@ const BusinessProductsListUI = (props: BusinessProductsListParams) => {
 
       {
         !category.id && categories && categories.filter(category => category.id !== null).map((category, i, _categories) => {
-          const products = categoryState.products?.filter((product: any) => category?.children?.some((cat: any) => cat?.category_id === product?.category_id)) || []
+          const products = categoryState.products?.filter((product: any) => category?.children?.some((cat: any) => cat?.category_id === product?.category_id) || product.category_id === category.id) || []
           return (
             <View key={`category${category.id}`} style={{ alignItems: 'flex-start', flex: 1 }}>
               {

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

@@ -67,11 +67,11 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
       shadowColor: '#000',
       shadowOffset: {
         width: 0,
-        height: 1.5,
+        height: business?.logo ? 1.5 : 0,
       },
       shadowOpacity: 0.21,
       shadowRadius: 3,
-      elevation: 7,
+      elevation: business?.logo ? 7 : 0,
     },
     header: {
       flexDirection: 'row',

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

@@ -28,7 +28,7 @@ export const OrdersOptionBusinessUI = (props: any) => {
   }, [businessesList?.businesses])
 
   const handleClear = () => {
-    onSearch({ ...search, option: '' })
+    onSearch({ ...search, business: '' })
   }
 
   const handleOpenSelect = () => {

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

@@ -176,17 +176,17 @@ export const PreviousMessages = (props: PreviousMessagesParams) => {
         slug: 'ORDER_CUSTOMER_ARRIVED_BUSINESS',
         percentage: 95,
       },
-      { 
-        key: 22, 
-        value: t('ORDER_LOOKING_FOR_DRIVER', 'Looking for driver'), 
-        slug: 'ORDER_LOOKING_FOR_DRIVER', 
+      {
+        key: 22,
+        value: t('ORDER_LOOKING_FOR_DRIVER', 'Looking for driver'),
+        slug: 'ORDER_LOOKING_FOR_DRIVER',
         percentage: 35
       },
-      { 
-        key: 23, 
-        value: t('ORDER_DRIVER_ON_WAY', 'Driver on way'), 
-        slug: 'ORDER_DRIVER_ON_WAY', 
-        percentage: 45 
+      {
+        key: 23,
+        value: t('ORDER_DRIVER_ON_WAY', 'Driver on way'),
+        slug: 'ORDER_DRIVER_ON_WAY',
+        percentage: 45
       }
     ];
 
@@ -266,15 +266,13 @@ export const PreviousMessages = (props: PreviousMessagesParams) => {
             style={styles.cardButton}
             activeOpacity={1}>
             <Card key={order?.id}>
-              {!!order?.business?.logo && (
-                <Logo style={styles.logo}>
-                  <OIcon
-                    url={optimizeImage(order?.business?.logo, 'h_300,c_limit')}
-                    style={styles.icon}
-                  />
-                </Logo>
-              )}
-
+              <Logo style={styles.logo}>
+                <OIcon
+                  url={optimizeImage(order?.business?.logo, 'h_300,c_limit')}
+                  src={!order?.business?.logo && theme?.images?.dummies?.businessLogo}
+                  style={styles.icon}
+                />
+              </Logo>
               <Information>
                 <Header>
                   <OText numberOfLines={1} style={styles.title}>

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

@@ -181,18 +181,16 @@ export const PreviousOrders = (props: any) => {
                     {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}>
-                          <OIcon
-                            url={optimizeImage(
-                              order.business?.logo,
-                              'h_300,c_limit',
-                            )}
-                            style={styles.icon}
-                          />
-                        </Logo>
-                      )}
+                    <Logo style={styles.logo}>
+                      <OIcon
+                        url={optimizeImage(
+                          order.business?.logo,
+                          'h_300,c_limit',
+                        )}
+                        src={!order?.business?.logo && theme?.images?.dummies?.businessLogo}
+                        style={styles.icon}
+                      />
+                    </Logo>
                     <Information>
                       {!!order?.order_group_id && (
                         <OText>