ordering-ui-react-native 0.18.78 → 0.18.80

package/package.json

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

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

@@ -312,14 +312,15 @@ const ChatUI = (props: MessagesParams) => {
         quality: 1
       },
       (response: any) => {
-        if (response.didCancel) {
+        const image = response.assets[0];
+        if (image.didCancel) {
           console.log('User cancelled image picker');
-        } else if (response.errorMessage) {
-          console.log('ImagePicker Error: ', response.errorMessage);
-          showToast(ToastType.Error, response.errorMessage);
+        } else if (image.errorMessage) {
+          console.log('ImagePicker Error: ', image.errorMessage);
+          showToast(ToastType.Error, image.errorMessage);
         } else {
-          if (response.uri) {
-            const url = `data:${response.type};base64,${response.base64}`;
+          if (image.uri) {
+            const url = `data:${image.type};base64,${image.base64}`;
             setImage && setImage(url);
           } else {
             showToast(ToastType.Error, t('IMAGE_NOT_FOUND', 'Image not found'));

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

@@ -48,6 +48,7 @@ const NewOrderNotificationUI = (props: any) => {
   const notificationSound = new Sound(theme.sounds.notification, '', () => { });
 
   let _timeout: any = null
+  let times = 0
 
   const handleCloseEvents = () => {
     notificationSound.stop()
@@ -57,14 +58,19 @@ const NewOrderNotificationUI = (props: any) => {
 
   const handlePlayNotificationSound = (eventObj: any = null) => {
     setCurrentEvent(eventObj)
-    let times = 1
+    if (times > 0) {
+      if (times === 3) {
+        times = 0
+        return
+      }
+      return
+    }
     _timeout = setInterval(() => {
-      if (times <= SOUND_LOOP) {
+      if (times < SOUND_LOOP) {
         notificationSound.play()
         times++
       } else {
         clearInterval(_timeout)
-        times = 1
         return
       }
     }, 2500)
@@ -89,10 +95,10 @@ const NewOrderNotificationUI = (props: any) => {
       }
     }
     if (evtType === 3 || value.author_id === user.id) return
-    handlePlayNotificationSound({
+    setTimeout(() => handlePlayNotificationSound({
       evt: evtType,
       orderId: value?.driver ? value?.order_id : evtList[evtType].event === 'messages' ? value?.order?.id : value?.id
-    })
+    }), 1000)
   }
 
   useEffect(() => {

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

@@ -13,7 +13,8 @@ import {
   useToast,
   useSession,
   ToastType,
-  useUtils
+  useUtils,
+  useConfig
 } from 'ordering-components/native';
 
 //Components
@@ -59,7 +60,10 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   } = props;
   const [, { showToast }] = useToast();
   const [{ parsePrice, parseNumber }] = useUtils();
+  const [{ configs }] = useConfig();
   const { order } = props.order
+
+  const isAllowedDriverRejectOrder = configs?.allow_driver_reject_order?.value === '1'
   const theme = useTheme();
   const [, t] = useLanguage();
   const [session] = useSession();
@@ -295,6 +299,16 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   };
 
   const handleViewActionOrder = (action: string) => {
+    if (action === 'reject' && !isAllowedDriverRejectOrder) {
+      setAlertState({
+        open: true,
+        content: [
+          t('DRIVER_NOT_ALLOWED_TO_REJECT_ORDER', 'The driver is not allowed to reject an order.'),
+        ],
+        key: null,
+      })
+      return
+    }
     if (!isGrantedPermissions) {
       navigation.navigate('RequestPermissions')
       return
@@ -311,6 +325,13 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   };
 
   const handleArrowBack: any = () => {
+    if (alertState?.open && !isAllowedDriverRejectOrder) {
+      setAlertState({
+        ...alertState,
+        open: false
+      })
+      return
+    }
     navigation?.canGoBack() && navigation.goBack();
   };
 

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

@@ -611,11 +611,11 @@ export const OrderContentComponent = (props: OrderContent) => {
                         ? walletName[event?.wallet_event?.wallet?.type]?.name
                         : t(event?.paymethod?.name?.toUpperCase()?.replace(/ /g, '_'), event?.paymethod?.name)}
                     </OText>
-                    {event?.data?.charge_id && (
+                    {/* {event?.data?.charge_id && (
                       <OText>
                         {`${t('CODE', 'Code')}: ${event?.data?.charge_id}`}
                       </OText>
-                    )}
+                    )} */}
                   </View>
                   <OText>
                     {(event?.paymethod?.gateway === 'cash' && order?.cash)