MRN-868,MRN-880

Author: karthikeyan-se-contus

src/components/ChatInput.js

@@ -40,7 +40,7 @@ import { setAudioRecordTime, setAudioRecording, setTextMessage } from '../redux/
 import {
    getAudioRecordTime,
    getAudioRecording,
-   getRoomLink,
+   getCurrentCallRoomId,
    getUserNameFromStore,
    useAudioRecordTime,
    useAudioRecording,
@@ -61,7 +61,8 @@ audioRecordRef.current = {};
 let userId = '',
    fileInfo = {},
    fileName = {},
-   audioRecordClick = 0;
+   audioRecordClick = 0,
+   isAudioClicked = false;
 
 export const chatInputRef = createRef();
 chatInputRef.current = {};
@@ -81,7 +82,6 @@ export const cancelAudioRecord = () => {
 function ChatInput({ chatUser }) {
    userId = getUserIdFromJid(chatUser);
    const stringSet = getStringSet();
-   let isAudioClicked = false;
    const themeColorPalatte = useThemeColorPalatte();
    const dispatch = useDispatch();
    const appState = useAppState();
@@ -234,26 +234,25 @@ function ChatInput({ chatUser }) {
    };
 
    const onResetRecord = () => {
+      isAudioClicked = false;
       setAudioRecording('');
       setRecordTime('');
       setRecordSecs(0);
       setShowDeleteIcon(false);
       dispatch(setAudioRecording({ userId, message: '' }));
-      isAudioClicked = false;
    };
 
    const onStartRecord = async () => {
       try {
-         if (isAudioClicked) {
+         const roomId = getCurrentCallRoomId();
+         if (roomId) {
+            showToast(stringSet.TOAST_MESSAGES.AUDIO_CANNOT_BE_RECORDED_WHILE_IN_CALL);
             return;
          }
-         isAudioClicked = true;
-         const roomLink = getRoomLink();
-         if (roomLink) {
-            showToast(stringSet.TOAST_MESSAGES.AUDIO_CANNOT_BE_RECORDED_WHILE_IN_CALL);
+         if (isAudioClicked) {
             return;
          }
-         console.log('onStartRecord ==> ');
+         isAudioClicked = true;
          pauseAudio();
          audioRecordClick += 1;
          const res = await audioRecordPermission();

src/hooks/useMediaMessaegs.js

@@ -40,35 +40,43 @@ export const useMergedMediaMessages = (jid, mediaTypeArr = []) => {
       getMediaMessage();
    }, [userId]);
 
-   // Memoized merged media messages
    const mergedMediaMessages = useMemo(() => {
-      const fetchedMessagesMap = {};
+      const fetchedMessagesMap = new Map();
 
       // Populate map with fetched messages
       fetchedMediaMessages.forEach(msg => {
-         fetchedMessagesMap[msg.msgId] = msg;
+         fetchedMessagesMap.set(msg.msgId, msg);
       });
 
-      // Merge state messages, prioritizing state data
-      stateMediaMessages.forEach(stateMsg => {
-         if (fetchedMessagesMap[stateMsg.msgId]) {
-            fetchedMessagesMap[stateMsg.msgId] = {
-               ...fetchedMessagesMap[stateMsg.msgId],
-               ...stateMsg,
+      // Maintain stateMediaMessages order while merging
+      const mergedMessages = stateMediaMessages.map(stateMsg => {
+         if (fetchedMessagesMap.has(stateMsg.msgId)) {
+            return {
+               ...fetchedMessagesMap.get(stateMsg.msgId), // Keep fetched message properties
+               ...stateMsg, // Override with state message properties
                msgBody: {
-                  ...fetchedMessagesMap[stateMsg.msgId].msgBody,
+                  ...fetchedMessagesMap.get(stateMsg.msgId).msgBody,
                   ...stateMsg.msgBody,
                   media: {
-                     ...fetchedMessagesMap[stateMsg.msgId].msgBody.media,
+                     ...fetchedMessagesMap.get(stateMsg.msgId).msgBody.media,
                      ...stateMsg.msgBody.media,
                   },
                },
             };
          } else {
-            fetchedMessagesMap[stateMsg.msgId] = stateMsg;
+            return stateMsg; // Keep state message if not in fetched messages
          }
       });
-      return Object.values(fetchedMessagesMap);
+
+      // Append fetched messages that are NOT in stateMediaMessages
+      fetchedMessagesMap.forEach((msg, msgId) => {
+         if (!stateMediaMessages.some(stateMsg => stateMsg.msgId === msgId)) {
+            mergedMessages.push(msg);
+         }
+      });
+
+      // Sort by timestamp to ensure correct order
+      return mergedMessages.sort((a, b) => a.timeStamp - b.timeStamp);
    }, [stateMediaMessages, fetchedMediaMessages]);
 
    return { mergedMediaMessages, isLoading };

src/redux/reduxHook.js

@@ -134,7 +134,7 @@ export const getAnySelectedChatMessages = userId => {
    return messages.some(item => item.isSelected === 1);
 };
 export const getRoomLink = () => store.getState().callData?.connectionState?.roomLink;
-
+export const getCurrentCallRoomId = () => store.getState().callData?.connectionState?.roomId;
 export const getMediaMessages = (userId, mediaTypeArr = []) => {
    const state = store.getState();
    const messages = state.chatMessagesData?.[userId] || [];

src/screens/PostPreViewPage.js

@@ -41,7 +41,7 @@ const PostPreViewPage = () => {
    };
 
    const initialPage = React.useMemo(() => {
-      const selectedMsgIndex = messageList.reverse().findIndex(message => {
+      const selectedMsgIndex = messageList.findIndex(message => {
          return message.msgId === msgId;
       });
       setCurrentIndex(selectedMsgIndex);