ordering-ui-react-native 0.23.24 → 0.23.26

package/package.json

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

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

@@ -156,7 +156,7 @@ const NewOrderNotificationUI = (props: any) => {
         setCurrentEvent({ evt: 2, orderId: value?.id ?? value?.order_id })
       }
     }
-    if ((!orderStatus.includes(value.status) && evtType !== 1 && isBusinessApp && orderStatus?.length > 0) || value?.author_id === user.id) return    
+    if ((!orderStatus.includes(value.status) && evtType !== 1 && isBusinessApp && orderStatus?.length > 0) || value?.author_id === user.id) return
     setCurrentEvent({
       evt: evtType,
       orderId: value?.driver
@@ -178,21 +178,11 @@ const NewOrderNotificationUI = (props: any) => {
       handleEventNotification(3, o, orderStatus)
     }
 
-    if (!events?._events?.message_added_notification || events?._events?.message_added_notification?.length < 2) {
-      events.on('message_added_notification', handleEventTypeOne)
-    }
-    if (!events?._events?.order_added_notification || events?._events?.order_added_notification?.length < 2) {
-      events.on('order_added_notification', handleEventTypeTwo)
-    }
-    if (!events?._events?.order_updated_notification || events?._events?.order_updated_notification?.length < 2) {
-      events.on('order_updated_notification', handleEventTypeThree)
-    }
-    if (!events?._events?.request_register_notification || events?._events?.request_register_notification?.length < 2) {
-      events.on('request_register_notification', handleEventTypeTwo)
-    }
-    if (!events?._events?.request_update_notification || events?._events?.request_update_notification?.length < 2) {
-      events.on('request_update_notification', handleEventTypeThree)
-    }
+    events.on('message_added_notification', handleEventTypeOne)
+    events.on('order_added_notification', handleEventTypeTwo)
+    events.on('order_updated_notification', handleEventTypeThree)
+    events.on('request_register_notification', handleEventTypeTwo)
+    events.on('request_update_notification', handleEventTypeThree)
 
     return () => {
       events.off('message_added_notification', handleEventTypeOne)

package/themes/business/src/components/OrderDetails/Delivery.tsx

@@ -85,16 +85,16 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     key?: string | null;
   }>({ open: false, content: [], key: null });
 
-  const disabledActionsByInternet = !isNetConnected && canSaveChangesOffline === false
+  const disabledActionsByInternet = isNetConnected !== null && !isNetConnected  && canSaveChangesOffline === false
 
   const validStatusComplete = [9, 19, 23, 26]
 
   const pendingOrderStatus = [1, 4, 7, 13]
 
   const logisticOrderStatus = [4, 6, 7]
-  
+
   const deliveryTypes = [1, 7]
-  
+
   const showFloatButtonsPickUp: any = {
     8: !isHideRejectButtons,
     3: true,