ordering-ui-react-native 0.22.8-release → 0.22.9-release

package/package.json

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

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

@@ -546,7 +546,7 @@ const ChatUI = (props: MessagesParams) => {
     });
     let _arrayMessages = [...newMessages.reverse()]
 
-    if (configs?.order_logbook_enabled?.value === '0') {
+    if (configs?.order_logbook_enabled?.value === '0' && user?.level === 4) {
       _arrayMessages = _arrayMessages.filter(msg => msg.type !== 1 && msg.type !== 0)
     }
     setFormattedMessages(_arrayMessages);

package/themes/original/src/components/Messages/index.tsx

@@ -55,7 +55,6 @@ const MessagesUI = (props: MessagesParams) => {
 		messages,
 		image,
 		message,
-		messagesToShow,
 		sendMessage,
 		setCanRead,
 		setMessage,
@@ -157,7 +156,7 @@ const MessagesUI = (props: MessagesParams) => {
 		}
 		messages.messages.map((message: any) => {
 			if (message.change?.attribute === 'driver_group_id') return
-			if (business && message.type !== 0 && (messagesToShow?.messages?.length || message?.can_see?.includes('2'))) {
+			if (business && message.type !== 0 && (props?.messagesToShow?.messages?.length || message?.can_see?.includes('2'))) {
 				newMessages.push({
 					_id: message?.id,
 					text: message.type === 1 ? messageConsole(message) : message.comment,
@@ -173,7 +172,7 @@ const MessagesUI = (props: MessagesParams) => {
 				});
 			}
 
-			if (driver && message.type !== 0 && (messagesToShow?.messages?.length || message?.can_see?.includes('4'))) {
+			if (driver && message.type !== 0 && (props?.messagesToShow?.messages?.length || message?.can_see?.includes('4'))) {
 				newMessages.push({
 					_id: message?.id,
 					text: message.type === 1 ? messageConsole(message) : message.comment,
@@ -190,15 +189,12 @@ const MessagesUI = (props: MessagesParams) => {
 			}
 
 			if (message.type === 0) {
-        newMessages.push(firstMessage);
-      }
+				newMessages.push(firstMessage);
+			}
 		})
 		let _arrayMessages = [...newMessages.reverse()]
 
-    if (configs?.order_logbook_enabled?.value === '0') {
-      _arrayMessages = _arrayMessages.filter(msg => msg.type !== 1 && msg.type !== 0)
-    }
-    setFormattedMessages(_arrayMessages);
+		setFormattedMessages(_arrayMessages);
 	}, [messages.messages.length, business, driver])
 
 	useEffect(() => {