ordering-ui-react-native 0.21.44-release → 0.21.45-release

package/package.json

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

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

@@ -152,11 +152,11 @@ const NewOrderNotificationUI = (props: any) => {
       } catch { }
       const duration = moment.duration(moment().diff(moment.utc(value?.last_driver_assigned_at)))
       const assignedSecondsDiff = duration.asSeconds()
-      if (assignedSecondsDiff < 5 && !isBusinessApp && !value?.logistic_status && orderStatus.includes(value.status)) {
+      if (assignedSecondsDiff < 5 && !isBusinessApp && !value?.logistic_status) {
         setCurrentEvent({ evt: 2, orderId: value?.id ?? value?.order_id })
       }
     }
-    if ((!orderStatus.includes(value.status) && evtType !== 1) || value?.author_id === user.id) return
+    if ((!orderStatus.includes(value.status) && evtType !== 1 && isBusinessApp) || value?.author_id === user.id) return
     setCurrentEvent({
       evt: evtType,
       orderId: value?.driver

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

@@ -380,18 +380,18 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
   }
 
   useEffect(() => {
-    scrollRefTab.current?.scrollTo({ animated: true });
-    scrollListRef.current?.scrollTo({ animated: true });
-    scrollRef.current?.scrollTo({ y: 0, animated: true });
+    scrollRefTab.current?.scrollTo();
+    scrollListRef.current?.scrollTo();
+    scrollRef.current?.scrollTo();
     setTags({ values: [] })
   }, [currentTabSelected])
 
 	useEffect(() => {
 		const unsubcribe = navigation.addListener('focus', () => {
-      currentTabSelected === 'logisticOrders' ? loadLogisticOrders() : loadOrders && loadOrders({ newFetch: true })
+      currentTabSelected === 'logisticOrders' && loadLogisticOrders()
 		})
 		return unsubcribe
-	}, [navigation, loadOrders, loadLogisticOrders])
+	}, [navigation, loadLogisticOrders])
 
   return (
     <>