合并utils

src/actions/ConversationActions.js

@@ -1,5 +1,5 @@
 
-import { groupBy, pick, sortArrayByOrder } from '@/utils/utils';
+import { groupBy, pick, sortArrayByOrder } from '@/utils/commons';
 import { fetchJSON, postJSON } from '@/utils/request'
 import { parseRenderMessageList } from '@/channel/whatsappUtils';
 import { API_HOST } from '@/config';

src/channel/whatsappUtils.js

@@ -1,4 +1,4 @@
-import { cloneDeep, isEmpty, olog } from "@/utils/utils";
+import { cloneDeep, isEmpty, olog } from "@/utils/commons";
 import dayjs from "dayjs";
 import { v4 as uuid } from "uuid";
 

src/components/SearchInput.jsx

@@ -1,6 +1,6 @@
 import React, { useMemo, useRef, useState } from 'react';
 import { Select, Spin } from 'antd';
-import { debounce } from '@/utils/utils';
+import { debounce } from '@/utils/commons';
 
 function DebounceSelect({ fetchOptions, debounceTimeout = 800, ...props }) {
   const [fetching, setFetching] = useState(false);

src/stores/ConversationStore.js

@@ -1,6 +1,6 @@
 import { create } from 'zustand';
 import { RealTimeAPI } from '@/channel/realTimeAPI';
-import { olog, isEmpty } from '@/utils/utils';
+import { olog, isEmpty } from '@/utils/commons';
 import { receivedMsgTypeMapped, handleNotification } from '@/channel/whatsappUtils';
 import { fetchConversationsList, fetchTemplates, fetchMessages } from '@/actions/ConversationActions';
 import { devtools } from 'zustand/middleware';

src/utils/commons.js

@@ -44,9 +44,9 @@ export function isNotEmpty(val) {
 	return val !== undefined && val !== null && val !== ""
 }
 
-export function isEmpty(val) {
-	return val === undefined || val === null || val === ""
-}
+// export function isEmpty(val) {
+// 	return val === undefined || val === null || val === ""
+// }
 
 export function prepareUrl(url) {
 	return new UrlBuilder(url)
@@ -91,4 +91,341 @@ export function escape2Html(str) {
 	var output = temp.innerText || temp.textContent
 	temp = null
 	return output
-}
+}
+
+/**
+ * ! 不支持计算 Set 或 Map
+ * @param {*} val
+ * @example
+ * true if: 0, [], {}, null, '', undefined
+ * false if: 'false', 'undefined'
+ */
+export function isEmpty(val) {
+  // return val === undefined || val === null || val === "";
+  return [Object, Array].includes((val || {}).constructor) && !Object.entries(val || {}).length;
+}
+/**
+ * 数组排序
+ */
+export const sortBy = (key) => {
+  return (a, b) => (a[key] > b[key] ? 1 : b[key] > a[key] ? -1 : 0);
+};
+
+/**
+ * Object排序keys
+ */
+export const sortKeys = (obj) =>
+  Object.keys(obj)
+    .sort()
+    .reduce((a, k2) => ({ ...a, [k2]: obj[k2] }), {});
+
+/**
+ * 数组排序, 给定排序数组
+ * @param {array} items 需要排序的数组
+ * @param {array} keyName 排序的key
+ * @param {array} keyOrder 给定排序
+ * @returns
+ */
+export const sortArrayByOrder = (items, keyName, keyOrder) => {
+  return items.sort((a, b) => {
+    return keyOrder.indexOf(a[keyName]) - keyOrder.indexOf(b[keyName]);
+  });
+};
+/**
+ * 合并Object, 递归地
+ */
+export function merge(...objects) {
+  const isDeep = objects.some((obj) => obj !== null && typeof obj === 'object');
+
+  const result = objects[0] || (isDeep ? {} : objects[0]);
+
+  for (let i = 1; i < objects.length; i++) {
+    const obj = objects[i];
+
+    if (!obj) continue;
+
+    Object.keys(obj).forEach((key) => {
+      const val = obj[key];
+
+      if (isDeep) {
+        if (Array.isArray(val)) {
+          result[key] = [].concat(Array.isArray(result[key]) ? result[key] : [result[key]], val);
+        } else if (typeof val === 'object') {
+          result[key] = merge(result[key], val);
+        } else {
+          result[key] = val;
+        }
+      } else {
+        result[key] = typeof val === 'boolean' ? val : result[key];
+      }
+    });
+  }
+
+  return result;
+}
+
+/**
+ * 数组分组
+ * - 相当于 lodash 的 _.groupBy
+ * @see https://www.lodashjs.com/docs/lodash.groupBy#_groupbycollection-iteratee_identity
+ */
+export function groupBy(array, callback) {
+  return array.reduce((groups, item) => {
+    const key = typeof callback === 'function' ? callback(item) : item[callback];
+
+    if (!groups[key]) {
+      groups[key] = [];
+    }
+
+    groups[key].push(item);
+    return groups;
+  }, {});
+}
+
+/**
+ * 创建一个从 object 中选中的属性的对象。
+ * @param {*} object
+ * @param {array} keys
+ */
+export function pick(object, keys) {
+  return keys.reduce((obj, key) => {
+    if (object && Object.prototype.hasOwnProperty.call(object, key)) {
+      obj[key] = object[key];
+    }
+    return obj;
+  }, {});
+}
+
+/**
+ * 返回对象的副本，经过筛选以省略指定的键。
+ * @param {*} object
+ * @param {string[]} keysToOmit
+ * @returns
+ */
+export function omit(object, keysToOmit) {
+  return Object.fromEntries(Object.entries(object).filter(([key]) => !keysToOmit.includes(key)));
+}
+
+/**
+ * 深拷贝
+ */
+export function cloneDeep(value) {
+  // return structuredClone(value);
+  if (typeof value !== 'object' || value === null) {
+    return value;
+  }
+
+  const result = Array.isArray(value) ? [] : {};
+
+  for (const key in value) {
+    if (Object.prototype.hasOwnProperty.call(value, key)) {
+      result[key] = cloneDeep(value[key]);
+    }
+  }
+
+  return result;
+}
+
+/**
+ * 向零四舍五入, 固定精度设置
+ */
+function curriedFix(precision = 0) {
+  return function (number) {
+    // Shift number by precision places
+    const shift = Math.pow(10, precision);
+    const shiftedNumber = number * shift;
+
+    // Round to nearest integer
+    const roundedNumber = Math.round(shiftedNumber);
+
+    // Shift back decimal place
+    return roundedNumber / shift;
+  };
+}
+/**
+ * 向零四舍五入, 保留2位小数
+ */
+export const fixTo2Decimals = curriedFix(2);
+/**
+ * 向零四舍五入, 保留4位小数
+ */
+export const fixTo4Decimals = curriedFix(4);
+
+export const fixTo1Decimals = curriedFix(1);
+export const fixToInt = curriedFix(0);
+
+/**
+ * 映射
+ * @example
+ * const keyMap = {
+    a: [{key: 'a1'}, {key: 'a2', transform: v => v * 2}],
+    b: {key: 'b1'}
+  };
+  const result = objectMapper({a: 1, b: 3}, keyMap);
+  // result = {a1: 1, a2: 2, b1: 3}
+ *
+ */
+export function objectMapper(input, keyMap) {
+  // Loop through array mapping
+  if (Array.isArray(input)) {
+    return input.map((obj) => objectMapper(obj, keyMap));
+  }
+
+  if (typeof input === 'object') {
+    const mappedObj = {};
+
+    Object.keys(input).forEach((key) => {
+      // Keep original keys not in keyMap
+      if (!keyMap[key]) {
+        mappedObj[key] = input[key];
+      }
+      // Handle array of maps
+      if (Array.isArray(keyMap[key])) {
+        keyMap[key].forEach((map) => {
+          let value = input[key];
+          if (map.transform) value = map.transform(value);
+          mappedObj[map.key] = value;
+        });
+
+        // Handle single map
+      } else {
+        const map = keyMap[key];
+        if (map) {
+          let value = input[key];
+          if (map.transform) value = map.transform(value);
+          mappedObj[map.key || key] = value;
+        }
+      }
+    });
+
+    return mappedObj;
+  }
+
+  return input;
+}
+
+/**
+ * 创建一个对应于对象路径的值数组
+ */
+export function at(obj, path) {
+  let result;
+  if (Array.isArray(obj)) {
+    // array case
+    const indexes = path.split('.').map((i) => parseInt(i));
+    result = [];
+    for (let i = 0; i < indexes.length; i++) {
+      result.push(obj[indexes[i]]);
+    }
+  } else {
+    // object case
+    const indexes = path.split('.').map((i) => i);
+    result = [obj];
+    for (let i = 0; i < indexes.length; i++) {
+      result = [result[0][indexes[i]]];
+    }
+  }
+  return result;
+}
+/**
+ * 删除 null/undefined
+ */
+export function flush(collection) {
+  let result, len, i;
+  if (!collection) {
+    return undefined;
+  }
+  if (Array.isArray(collection)) {
+    result = [];
+    len = collection.length;
+    for (i = 0; i < len; i++) {
+      const elem = collection[i];
+      if (elem != null) {
+        result.push(elem);
+      }
+    }
+    return result;
+  }
+  if (typeof collection === 'object') {
+    result = {};
+    const keys = Object.keys(collection);
+    len = keys.length;
+    for (i = 0; i < len; i++) {
+      const key = keys[i];
+      const value = collection[key];
+      if (value != null) {
+        result[key] = value;
+      }
+    }
+    return result;
+  }
+  return undefined;
+}
+
+/**
+ * 千分位 格式化数字
+ */
+export const numberFormatter = (number) => {
+  return new Intl.NumberFormat().format(number);
+};
+
+/**
+ * @example
+ *   const obj = { a: { b: 'c' } };
+ *   const keyArr = ['a', 'b'];
+ *   getNestedValue(obj, keyArr);  // Returns: 'c'
+ */
+export const getNestedValue = (obj, keyArr) => {
+  return keyArr.reduce((acc, curr) => {
+    return acc && Object.prototype.hasOwnProperty.call(acc, curr) ? acc[curr] : undefined;
+    // return acc && acc[curr];
+  }, obj);
+};
+
+/**
+ * 计算笛卡尔积
+ */
+export const cartesianProductArray = (arr, sep = '_', index = 0, prefix = '') => {
+  let result = [];
+  if (index === arr.length) {
+    return [prefix];
+  }
+  arr[index].forEach((item) => {
+    result = result.concat(cartesianProductArray(arr, sep, index + 1, prefix ? `${prefix}${sep}${item}` : `${item}`));
+  });
+  return result;
+};
+
+export const stringToColour = (str) => {
+  var hash = 0
+  for (let i = 0; i < str.length; i++) {
+    hash = str.charCodeAt(i) + ((hash << 5) - hash)
+  }
+  var colour = '#'
+  for (let i = 0; i < 3; i++) {
+    var value = (hash >> (i * 8)) & 0xff
+    value = (value % 150) + 50
+    colour += ('00' + value.toString(16)).substr(-2)
+  }
+  return colour
+}
+
+// export const debounce = (func, wait, immediate) => {
+//   var timeout;
+//   return function () {
+//     var context = this,
+//       args = arguments;
+//     clearTimeout(timeout);
+//     if (immediate && !timeout) func.apply(context, args);
+//     timeout = setTimeout(function () {
+//       timeout = null;
+//       if (!immediate) func.apply(context, args);
+//     }, wait);
+//   };
+// }
+
+export const olog = (text, ...args) => {
+  console.log(
+    `%c ${text} `,
+    'background:#fb923c ; padding: 1px; border-radius: 3px;  color: #fff',...args
+  );
+};

src/utils/utils.js

@@ -1,346 +0,0 @@
-import crypto from 'crypto-js';
-/**
- * ! 不支持计算 Set 或 Map
- * @param {*} val
- * @example
- * true if: 0, [], {}, null, '', undefined
- * false if: 'false', 'undefined'
- */
-export function isEmpty(val) {
-  // return val === undefined || val === null || val === "";
-  return [Object, Array].includes((val || {}).constructor) && !Object.entries(val || {}).length;
-}
-/**
- * 数组排序
- */
-export const sortBy = (key) => {
-  return (a, b) => (a[key] > b[key] ? 1 : b[key] > a[key] ? -1 : 0);
-};
-
-/**
- * Object排序keys
- */
-export const sortKeys = (obj) =>
-  Object.keys(obj)
-    .sort()
-    .reduce((a, k2) => ({ ...a, [k2]: obj[k2] }), {});
-
-/**
- * 数组排序, 给定排序数组
- * @param {array} items 需要排序的数组
- * @param {array} keyName 排序的key
- * @param {array} keyOrder 给定排序
- * @returns
- */
-export const sortArrayByOrder = (items, keyName, keyOrder) => {
-  return items.sort((a, b) => {
-    return keyOrder.indexOf(a[keyName]) - keyOrder.indexOf(b[keyName]);
-  });
-};
-/**
- * 合并Object, 递归地
- */
-export function merge(...objects) {
-  const isDeep = objects.some((obj) => obj !== null && typeof obj === 'object');
-
-  const result = objects[0] || (isDeep ? {} : objects[0]);
-
-  for (let i = 1; i < objects.length; i++) {
-    const obj = objects[i];
-
-    if (!obj) continue;
-
-    Object.keys(obj).forEach((key) => {
-      const val = obj[key];
-
-      if (isDeep) {
-        if (Array.isArray(val)) {
-          result[key] = [].concat(Array.isArray(result[key]) ? result[key] : [result[key]], val);
-        } else if (typeof val === 'object') {
-          result[key] = merge(result[key], val);
-        } else {
-          result[key] = val;
-        }
-      } else {
-        result[key] = typeof val === 'boolean' ? val : result[key];
-      }
-    });
-  }
-
-  return result;
-}
-
-/**
- * 数组分组
- * - 相当于 lodash 的 _.groupBy
- * @see https://www.lodashjs.com/docs/lodash.groupBy#_groupbycollection-iteratee_identity
- */
-export function groupBy(array, callback) {
-  return array.reduce((groups, item) => {
-    const key = typeof callback === 'function' ? callback(item) : item[callback];
-
-    if (!groups[key]) {
-      groups[key] = [];
-    }
-
-    groups[key].push(item);
-    return groups;
-  }, {});
-}
-
-/**
- * 创建一个从 object 中选中的属性的对象。
- * @param {*} object
- * @param {array} keys
- */
-export function pick(object, keys) {
-  return keys.reduce((obj, key) => {
-    if (object && Object.prototype.hasOwnProperty.call(object, key)) {
-      obj[key] = object[key];
-    }
-    return obj;
-  }, {});
-}
-
-/**
- * 返回对象的副本，经过筛选以省略指定的键。
- * @param {*} object
- * @param {string[]} keysToOmit
- * @returns
- */
-export function omit(object, keysToOmit) {
-  return Object.fromEntries(Object.entries(object).filter(([key]) => !keysToOmit.includes(key)));
-}
-
-/**
- * 深拷贝
- */
-export function cloneDeep(value) {
-  // return structuredClone(value);
-  if (typeof value !== 'object' || value === null) {
-    return value;
-  }
-
-  const result = Array.isArray(value) ? [] : {};
-
-  for (const key in value) {
-    if (Object.prototype.hasOwnProperty.call(value, key)) {
-      result[key] = cloneDeep(value[key]);
-    }
-  }
-
-  return result;
-}
-
-/**
- * 向零四舍五入, 固定精度设置
- */
-function curriedFix(precision = 0) {
-  return function (number) {
-    // Shift number by precision places
-    const shift = Math.pow(10, precision);
-    const shiftedNumber = number * shift;
-
-    // Round to nearest integer
-    const roundedNumber = Math.round(shiftedNumber);
-
-    // Shift back decimal place
-    return roundedNumber / shift;
-  };
-}
-/**
- * 向零四舍五入, 保留2位小数
- */
-export const fixTo2Decimals = curriedFix(2);
-/**
- * 向零四舍五入, 保留4位小数
- */
-export const fixTo4Decimals = curriedFix(4);
-
-export const fixTo1Decimals = curriedFix(1);
-export const fixToInt = curriedFix(0);
-
-/**
- * 映射
- * @example
- * const keyMap = {
-    a: [{key: 'a1'}, {key: 'a2', transform: v => v * 2}],
-    b: {key: 'b1'}
-  };
-  const result = objectMapper({a: 1, b: 3}, keyMap);
-  // result = {a1: 1, a2: 2, b1: 3}
- *
- */
-export function objectMapper(input, keyMap) {
-  // Loop through array mapping
-  if (Array.isArray(input)) {
-    return input.map((obj) => objectMapper(obj, keyMap));
-  }
-
-  if (typeof input === 'object') {
-    const mappedObj = {};
-
-    Object.keys(input).forEach((key) => {
-      // Keep original keys not in keyMap
-      if (!keyMap[key]) {
-        mappedObj[key] = input[key];
-      }
-      // Handle array of maps
-      if (Array.isArray(keyMap[key])) {
-        keyMap[key].forEach((map) => {
-          let value = input[key];
-          if (map.transform) value = map.transform(value);
-          mappedObj[map.key] = value;
-        });
-
-        // Handle single map
-      } else {
-        const map = keyMap[key];
-        if (map) {
-          let value = input[key];
-          if (map.transform) value = map.transform(value);
-          mappedObj[map.key || key] = value;
-        }
-      }
-    });
-
-    return mappedObj;
-  }
-
-  return input;
-}
-
-/**
- * 创建一个对应于对象路径的值数组
- */
-export function at(obj, path) {
-  let result;
-  if (Array.isArray(obj)) {
-    // array case
-    const indexes = path.split('.').map((i) => parseInt(i));
-    result = [];
-    for (let i = 0; i < indexes.length; i++) {
-      result.push(obj[indexes[i]]);
-    }
-  } else {
-    // object case
-    const indexes = path.split('.').map((i) => i);
-    result = [obj];
-    for (let i = 0; i < indexes.length; i++) {
-      result = [result[0][indexes[i]]];
-    }
-  }
-  return result;
-}
-/**
- * 删除 null/undefined
- */
-export function flush(collection) {
-  let result, len, i;
-  if (!collection) {
-    return undefined;
-  }
-  if (Array.isArray(collection)) {
-    result = [];
-    len = collection.length;
-    for (i = 0; i < len; i++) {
-      const elem = collection[i];
-      if (elem != null) {
-        result.push(elem);
-      }
-    }
-    return result;
-  }
-  if (typeof collection === 'object') {
-    result = {};
-    const keys = Object.keys(collection);
-    len = keys.length;
-    for (i = 0; i < len; i++) {
-      const key = keys[i];
-      const value = collection[key];
-      if (value != null) {
-        result[key] = value;
-      }
-    }
-    return result;
-  }
-  return undefined;
-}
-
-/**
- * 千分位 格式化数字
- */
-export const numberFormatter = (number) => {
-  return new Intl.NumberFormat().format(number);
-};
-
-/**
- * @example
- *   const obj = { a: { b: 'c' } };
- *   const keyArr = ['a', 'b'];
- *   getNestedValue(obj, keyArr);  // Returns: 'c'
- */
-export const getNestedValue = (obj, keyArr) => {
-  return keyArr.reduce((acc, curr) => {
-    return acc && Object.prototype.hasOwnProperty.call(acc, curr) ? acc[curr] : undefined;
-    // return acc && acc[curr];
-  }, obj);
-};
-
-/**
- * 计算笛卡尔积
- */
-export const cartesianProductArray = (arr, sep = '_', index = 0, prefix = '') => {
-  let result = [];
-  if (index === arr.length) {
-    return [prefix];
-  }
-  arr[index].forEach((item) => {
-    result = result.concat(cartesianProductArray(arr, sep, index + 1, prefix ? `${prefix}${sep}${item}` : `${item}`));
-  });
-  return result;
-};
-
-export const stringToColour_bak = (str) => {
-  // Hash the username using SHA256
-  const hash = crypto.SHA256(str);
-  // Convert the hash to a hexadecimal string
-  const hexString = hash.toString(crypto.enc.Hex);
-  // Use the first 6 characters of the hex string as a color
-  const color = '#' + hexString.substring(0, 6);
-  return color;
-};
-export const stringToColour = (str) => {
-  var hash = 0
-  for (let i = 0; i < str.length; i++) {
-    hash = str.charCodeAt(i) + ((hash << 5) - hash)
-  }
-  var colour = '#'
-  for (let i = 0; i < 3; i++) {
-    var value = (hash >> (i * 8)) & 0xff
-    value = (value % 150) + 50
-    colour += ('00' + value.toString(16)).substr(-2)
-  }
-  return colour
-}
-
-export const debounce = (func, wait, immediate) => {
-  var timeout;
-  return function () {
-    var context = this,
-      args = arguments;
-    clearTimeout(timeout);
-    if (immediate && !timeout) func.apply(context, args);
-    timeout = setTimeout(function () {
-      timeout = null;
-      if (!immediate) func.apply(context, args);
-    }, wait);
-  };
-}
-
-export const olog = (text, ...args) => {
-  console.log(
-    `%c ${text} `,
-    'background:#fb923c ; padding: 1px; border-radius: 3px;  color: #fff',...args
-  );
-};

src/views/Conversations/History/ConversationsList.jsx

@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react';
 import { Spin } from 'antd';
 import { ChatItem } from 'react-chat-elements';
 import useFormStore from '@/stores/FormStore';
-import { flush, pick } from '@/utils/utils';
+import { flush, pick } from '@/utils/commons';
 import { fetchConversationsSearch } from '@/actions/ConversationActions';
 
 const ConversationsList = ({ ...props }) => {

src/views/Conversations/History/MessagesList.jsx

@@ -4,7 +4,7 @@ import { LoadingOutlined } from '@ant-design/icons';
 import { MessageBox } from 'react-chat-elements';
 import { MESSAGE_PAGE_SIZE, fetchMessagesHistory } from '@/actions/ConversationActions';
 import useFormStore from '@/stores/FormStore';
-import { isEmpty, stringToColour } from '@/utils/utils';
+import { isEmpty, stringToColour } from '@/utils/commons';
 import { useShallow } from 'zustand/react/shallow';
 
 const BIG_PAGE_SIZE = MESSAGE_PAGE_SIZE * 100;

src/views/Conversations/Online/ConversationsList.jsx

@@ -4,7 +4,7 @@ import { Dropdown, Input, Button, } from 'antd';
 import { PlusOutlined, WhatsAppOutlined, } from '@ant-design/icons';
 import { fetchOrderConversationsList, fetchConversationItemClose, postNewConversationItem } from '@/actions/ConversationActions';
 import { ChatItem } from 'react-chat-elements';
-import { isEmpty } from '@/utils/utils';
+import { isEmpty } from '@/utils/commons';
 import useConversationStore from '@/stores/ConversationStore';
 import useAuthStore from '@/stores/AuthStore';
 

src/views/Conversations/Online/Input/MediaUpload.jsx

@@ -4,7 +4,7 @@ import { FileAddOutlined } from '@ant-design/icons';
 import { v4 as uuid } from 'uuid';
 import { API_HOST } from '@/config';
 import { whatsappSupportFileTypes } from '@/channel/whatsappUtils';
-import { isEmpty, } from '@/utils/utils';
+import { isEmpty, } from '@/utils/commons';
 // import useConversationStore from '@/stores/ConversationStore';
 
 const aliOSSHost = `https://haina-sale-system.oss-cn-shenzhen.aliyuncs.com/WAMedia/`;

src/views/Conversations/Online/Input/Template.jsx

@@ -3,7 +3,7 @@ import { App, Popover, Flex, Button, List, Input } from 'antd';
 import { MessageOutlined, SendOutlined } from '@ant-design/icons';
 import useAuthStore from '@/stores/AuthStore';
 import useConversationStore from '@/stores/ConversationStore';
-import { cloneDeep, getNestedValue, objectMapper, sortArrayByOrder } from '@/utils/utils';
+import { cloneDeep, getNestedValue, objectMapper, sortArrayByOrder } from '@/utils/commons';
 import { replaceTemplateString } from '@/channel/whatsappUtils';
 import { isEmpty } from '@/utils/commons';
 

src/views/Conversations/Online/InputComposer.jsx

@@ -17,7 +17,7 @@ import {
   YoutubeOutlined,
   AudioOutlined, PlayCircleOutlined, LoadingOutlined, CheckCircleOutlined, FileOutlined
 } from '@ant-design/icons';
-import { isEmpty, } from '@/utils/utils';
+import { isEmpty, } from '@/utils/commons';
 import { v4 as uuid } from 'uuid';
 import { sentMsgTypeMapped, whatsappSupportFileTypes } from '@/channel/whatsappUtils';
 import InputTemplate from './Input/Template';

src/views/Conversations/Online/MessagesList.jsx

@@ -4,7 +4,7 @@ import { App, Button } from 'antd';
 import { DownOutlined, LoadingOutlined } from '@ant-design/icons';
 import { useShallow } from 'zustand/react/shallow';
 import useConversationStore from '@/stores/ConversationStore';
-import { groupBy, isEmpty, } from '@/utils/utils';
+import { groupBy, isEmpty, } from '@/utils/commons';
 
 const MessagesList = ({ messages, handlePreview, reference, longListLoading, getMoreMessages, shouldScrollBottom, loadNextPage, handleContactClick, ...props }) => {
 

src/views/Conversations/Online/MessagesWrapper.jsx

@@ -5,7 +5,7 @@ import { Image, Modal, Button } from 'antd';
 import MessagesList from './MessagesList';
 import { fetchCleanUnreadMsgCount, fetchMessages, MESSAGE_PAGE_SIZE } from '@/actions/ConversationActions';
 import { fetchOrderConversationsList,  } from '@/actions/ConversationActions';
-import { isEmpty } from '@/utils/utils';
+import { isEmpty } from '@/utils/commons';
 import useAuthStore from '@/stores/AuthStore';
 
 const MessagesWrapper = () => {