diff --git a/app/components/post_list/post_list.tsx b/app/components/post_list/post_list.tsx
index b55cd7f59..cd7ae4ed9 100644
--- a/app/components/post_list/post_list.tsx
+++ b/app/components/post_list/post_list.tsx
@@ -198,7 +198,7 @@ const PostList = ({
 
         const viewableItemsMap = viewableItems.reduce((acc: Record<string, boolean>, {item, isViewable}) => {
             if (isViewable && item.type === 'post') {
-                acc[`${location}-${item.value.id}`] = true;
+                acc[`${location}-${item.value.currentPost.id}`] = true;
             }
             return acc;
         }, {});
diff --git a/app/screens/home/recent_mentions/recent_mentions.tsx b/app/screens/home/recent_mentions/recent_mentions.tsx
index 42dcf2170..c2ab358cb 100644
--- a/app/screens/home/recent_mentions/recent_mentions.tsx
+++ b/app/screens/home/recent_mentions/recent_mentions.tsx
@@ -115,7 +115,7 @@ const RecentMentionsScreen = ({appsEnabled, customEmojiNames, mentions, currentT
 
         const viewableItemsMap = viewableItems.reduce((acc: Record<string, boolean>, {item, isViewable}) => {
             if (isViewable && item.type === 'post') {
-                acc[`${Screens.MENTIONS}-${item.value.id}`] = true;
+                acc[`${Screens.MENTIONS}-${item.value.currentPost.id}`] = true;
             }
             return acc;
         }, {});
diff --git a/app/screens/home/saved_messages/saved_messages.tsx b/app/screens/home/saved_messages/saved_messages.tsx
index 12628123b..4685e3980 100644
--- a/app/screens/home/saved_messages/saved_messages.tsx
+++ b/app/screens/home/saved_messages/saved_messages.tsx
@@ -110,7 +110,7 @@ function SavedMessages({appsEnabled, posts, currentTimezone, customEmojiNames, i
 
         const viewableItemsMap = viewableItems.reduce((acc: Record<string, boolean>, {item, isViewable}) => {
             if (isViewable && item.type === 'post') {
-                acc[`${Screens.SAVED_MESSAGES}-${item.value.id}`] = true;
+                acc[`${Screens.SAVED_MESSAGES}-${item.value.currentPost.id}`] = true;
             }
             return acc;
         }, {});
diff --git a/app/screens/pinned_messages/pinned_messages.tsx b/app/screens/pinned_messages/pinned_messages.tsx
index c8e4a4c1b..65d5de9c4 100644
--- a/app/screens/pinned_messages/pinned_messages.tsx
+++ b/app/screens/pinned_messages/pinned_messages.tsx
@@ -87,7 +87,7 @@ function SavedMessages({
 
         const viewableItemsMap = viewableItems.reduce((acc: Record<string, boolean>, {item, isViewable}) => {
             if (isViewable && item.type === 'post') {
-                acc[`${Screens.PINNED_MESSAGES}-${item.value.id}`] = true;
+                acc[`${Screens.PINNED_MESSAGES}-${item.value.currentPost.id}`] = true;
             }
             return acc;
         }, {});
diff --git a/package-lock.json b/package-lock.json
index 0b0abeb2d..7e47b3044 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
   "packages": {
     "": {
       "name": "mattermost-mobile",
-      "version": "2.4.0",
+      "version": "2.5.0",
       "hasInstallScript": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -4323,7 +4323,7 @@
         "@react-native-community/cli-tools": "^10.1.1",
         "chalk": "^4.1.2",
         "execa": "^1.0.0",
-        "fast-xml-parser": "^4.0.12",
+        "fast-xml-parser": "^4.2.4",
         "glob": "^7.1.3",
         "ora": "^5.4.1"
       }
@@ -10824,9 +10824,8 @@
       "dev": true
     },
     "node_modules/fast-xml-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.0.tgz",
-      "integrity": "sha512-+zVQv4aVTO+o8oRUyRL7PjgeVo1J6oP8Cw2+a8UTZQcj5V0yUK5T63gTN0ldgiHDPghUjKc4OpT6SwMTwnOQug==",
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.4.tgz",
       "dependencies": {
         "strnum": "^1.0.5"
       },
@@ -25011,7 +25010,7 @@
         "@react-native-community/cli-tools": "^10.1.1",
         "chalk": "^4.1.2",
         "execa": "^1.0.0",
-        "fast-xml-parser": "^4.0.12",
+        "fast-xml-parser": "^4.2.4",
         "glob": "^7.1.3",
         "ora": "^5.4.1"
       },
@@ -29763,9 +29762,8 @@
       "dev": true
     },
     "fast-xml-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.0.tgz",
-      "integrity": "sha512-+zVQv4aVTO+o8oRUyRL7PjgeVo1J6oP8Cw2+a8UTZQcj5V0yUK5T63gTN0ldgiHDPghUjKc4OpT6SwMTwnOQug==",
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.4.tgz",
       "requires": {
         "strnum": "^1.0.5"
       }