MRN-908

Author: karthikeyan-se-contus

src/SDK/utils.js

@@ -121,7 +121,6 @@ export const fetchMessagesFromSDK = async ({ fromUserJId, forceGetFromSDK = fals
       toJid: fromUserJId,
       lastMessageId,
       size: config.chatMessagesSizePerPage,
-      source: 'db',
    });
    if (statusCode === 200) {
       let hasEqualDataFetched = data.length === config.chatMessagesSizePerPage;

src/components/ReplyContainer.js

@@ -12,13 +12,14 @@ import ReplyImage from './ReplyImage';
 import ReplyLocation from './ReplyLocation';
 import ReplyText from './ReplyText';
 import ReplyVideo from './ReplyVideo';
-import { useReplyMessage } from '../redux/reduxHook';
+import { useBlockedStatus, useReplyMessage } from '../redux/reduxHook';
 
 function ReplyContainer({ chatUser }) {
    const stringSet = getStringSet();
    const userId = getUserIdFromJid(chatUser);
    const replyMessage = useReplyMessage(userId) || {};
    const dispatch = useDispatch();
+   const blockedStaus = useBlockedStatus(userId);
    const { msgBody = {}, deleteStatus = 0, recallStatus = 0, msgBody: { message_type = '' } = {} } = replyMessage;
    const handleCloseReplyContainer = () => {
       dispatch(setReplyMessage({ userId, message: {} }));
@@ -77,7 +78,7 @@ function ReplyContainer({ chatUser }) {
       }
    };
 
-   if (Object.keys(replyMessage).length === 0) {
+   if (Object.keys(replyMessage).length === 0 || blockedStaus) {
       return null;
    }
 

src/helpers/chatHelpers.js

@@ -26,7 +26,6 @@ import {
    GalleryIcon,
    HeadSetIcon,
    LocationIcon,
-   LogIcon,
    NotificationSettingsIcon,
    ProfileIcon,
    SandTimer,
@@ -42,7 +41,7 @@ import {
    requestStoragePermission,
 } from '../common/permissions';
 import { changeTimeFormat } from '../common/timeStamp';
-import { cancelAudioRecord } from '../components/ChatInput';
+import { stopAudioRecord } from '../components/ChatInput';
 import { conversationFlatListRef } from '../components/ConversationList';
 import config from '../config/config';
 import {
@@ -84,7 +83,7 @@ import {
    toggleIsChatSearching,
    updateMediaStatus,
 } from '../redux/chatMessageDataSlice';
-import { setReplyMessage, setTextMessage } from '../redux/draftSlice';
+import { setReplyMessage } from '../redux/draftSlice';
 import {
    clearRecentChatData,
    deleteMessagesForEveryoneInRecentChat,
@@ -1442,9 +1441,7 @@ export const handleUpdateBlockUser = (userId, isBlocked, chatUser) => async () =
       if (isBlocked) {
          const res = await SDK.blockUser(chatUser);
          if (res.statusCode === 200) {
-            cancelAudioRecord();
-            store.dispatch(setReplyMessage({ userId, message: {} }));
-            store.dispatch(setTextMessage({ userId, message: '' }));
+            stopAudioRecord();
             showToast(`You have blocked ${getUserNameFromStore(userId)}`);
             store.dispatch(updateBlockUser({ userId, isBlocked }));
          } else {