MRN-901

Author: karthikeyan-se-contus

src/SDK/sdkCallBacks.js

@@ -709,7 +709,7 @@ export const callBacks = {
                store.dispatch(addChatMessageItem(res));
             }
 
-            if (isShowNotification) {
+            if (isShowNotification && !res?.editMessageId) {
                pushNotify(res.msgId, getNotifyNickName(res), getNotifyMessage(res), res?.fromUserJid);
             }
             break;

src/SDK/utils.js

@@ -4,9 +4,7 @@ import config from '../config/config';
 import {
    calculateWidthAndHeight,
    getCurrentChatUser,
-   getThumbImage,
    getUserIdFromJid,
-   getVideoThumbImage,
    handleConversationScollToBottom,
    handleUploadNextImage,
    isLocalUser,
@@ -110,7 +108,6 @@ export const fetchMessagesFromSDK = async ({ fromUserJId, forceGetFromSDK = fals
       hasNextChatPage[userId] = false;
       return;
    }
-   const page = chatPage[userId] || 1;
 
    const {
       statusCode,
@@ -124,11 +121,9 @@ export const fetchMessagesFromSDK = async ({ fromUserJId, forceGetFromSDK = fals
    });
    if (statusCode === 200) {
       let hasEqualDataFetched = data.length === config.chatMessagesSizePerPage;
-      if (data.length && hasEqualDataFetched) {
-         chatPage[userId] = page + 1;
-      }
+
       hasNextChatPage[userId] = hasEqualDataFetched;
-      store.dispatch(setChatMessages({ userJid, data, forceUpdate: page === 1 }));
+      store.dispatch(setChatMessages({ userJid, data }));
    }
    if (statusCode !== 200) {
       showToast(message);

src/components/ArchivedHeader.js

@@ -9,7 +9,7 @@ import Text from '../common/Text';
 import { getUserIdFromJid, showToast, toggleArchive } from '../helpers/chatHelpers';
 import { MIX_BARE_JID } from '../helpers/constants';
 import { getStringSet, replacePlaceholders } from '../localization/stringSet';
-import { deleteRecentChats, resetChatSelections } from '../redux/recentChatDataSlice';
+import { clearRecentChatData, deleteRecentChats, resetChatSelections } from '../redux/recentChatDataSlice';
 import {
    getArchiveSelectedChats,
    getUserNameFromStore,
@@ -20,6 +20,7 @@ import { ARCHIVED_SCREEN } from '../screens/constants';
 import SDK from '../SDK/SDK';
 import commonStyles from '../styles/commonStyles';
 import MuteChat from './MuteChat';
+import { clearChatMessageData } from '../redux/chatMessageDataSlice';
 
 function ArchivedHeader() {
    const stringSet = getStringSet();
@@ -60,13 +61,13 @@ function ArchivedHeader() {
    };
 
    const handleRemoveClose = () => {
-      const isUserLeft = filtered.every(res => (MIX_BARE_JID.test(res.userJid) ? res.userType === '' : true));
-      if (!isUserLeft && filtered.length > 1) {
+      const _isUserLeft = filtered.every(res => (MIX_BARE_JID.test(res.userJid) ? res.userType === '' : true));
+      if (!_isUserLeft && filtered.length > 1) {
          toggleModalContent();
          return showToast(stringSet.COMMON_TEXT.YOU_ARE_A_MEMBER);
       }
 
-      if (!isUserLeft) {
+      if (!_isUserLeft) {
          toggleModalContent();
          return showToast(stringSet.COMMON_TEXT.YOU_ARE_A_PARTICIPANT);
       }
@@ -75,6 +76,9 @@ function ArchivedHeader() {
 
       userJids.forEach(item => {
          SDK.deleteChat(item);
+         SDK.clearChat(item);
+         dispatch(clearChatMessageData(getUserIdFromJid(item)));
+         dispatch(clearRecentChatData(item));
       });
 
       dispatch(deleteRecentChats(ARCHIVED_SCREEN));

src/screens/ForwardMessage.js

@@ -582,9 +582,11 @@ const ForwardMessage = () => {
       // navigating the user after setTimeout to finish all the running things in background to avoid unwanted issues
       setTimeout(() => {
          const jid = Object.values(selectedUsers)[0]?.userJid;
+         const userId = getUserIdFromJid(jid);
          setShowLoader(false);
          onMessageForwaded?.();
          if (Object.values(selectedUsers).length === 1) {
+            dispatch(clearChatMessageData(userId));
             navigation.reset({
                index: 0,
                routes: [