From c3d93ea4ef92087aafc186ffa1f4dd909aa98cb4 Mon Sep 17 00:00:00 2001
From: Taras Perun <terry.perun@gmail.com>
Date: Wed, 24 Jan 2024 16:46:43 +0100
Subject: [PATCH] hide loading indicator when delete

---
 src/pages/home/report/ReportActionsList.js | 9 +++++++--
 src/pages/home/report/ReportActionsView.js | 8 +++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/pages/home/report/ReportActionsList.js b/src/pages/home/report/ReportActionsList.js
index 1b6de509000a..8bc26eea7d70 100644
--- a/src/pages/home/report/ReportActionsList.js
+++ b/src/pages/home/report/ReportActionsList.js
@@ -177,7 +177,9 @@ function ReportActionsList({
     const previousLastIndex = useRef(lastActionIndex);
 
     const linkedReportActionID = lodashGet(route, 'params.reportActionID', '');
-    const isLastPendingActionIsAdd = lodashGet(sortedVisibleReportActions, [0, 'pendingAction']) === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD;
+    const lastPendingAction = lodashGet(sortedReportActions, [0, 'pendingAction'])
+    const isLastPendingActionIsAdd = lastPendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD;
+    const isLastPendingActionIsDelete = lastPendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
 
     // This is utilized for automatically scrolling to the bottom when sending a new message, in cases where comment linking is used and the user is already at the end of the list.
     const isNewestActionAvailableAndPendingAdd = linkedReportActionID && isLastPendingActionIsAdd;
@@ -516,10 +518,13 @@ function ReportActionsList({
         );
     }, [isLoadingNewerReportActions, isOffline]);
 
+    // When performing comment linking, initially 25 items are added to the list. Subsequent fetches add 15 items from the cache or 50 items from the server.
+    // This is to ensure that the user is able to see the 'scroll to newer comments' button when they do comment linking and have not reached the end of the list yet.
+    const canScrollToNewerComments = !isLoadingInitialReportActions && !hasNewestReportAction && sortedReportActions.length > 25 && !isLastPendingActionIsDelete;
     return (
         <>
             <FloatingMessageCounter
-                isActive={(isFloatingMessageCounterVisible && !!currentUnreadMarker) || (!isLoadingInitialReportActions && !hasNewestReportAction)}
+                isActive={(isFloatingMessageCounterVisible && !!currentUnreadMarker) || canScrollToNewerComments}
                 onClick={scrollToBottomAndMarkReportAsRead}
             />
             <Animated.View style={[animatedStyles, styles.flex1, !shouldShowReportRecipientLocalTime && !hideComposer ? styles.pb4 : {}]}>
diff --git a/src/pages/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js
index 00584859c4f9..8b674b9e05a9 100755
--- a/src/pages/home/report/ReportActionsView.js
+++ b/src/pages/home/report/ReportActionsView.js
@@ -337,7 +337,12 @@ function ReportActionsView({reportActions: allReportActions, ...props}) {
     const loadNewerChats = useCallback(
         // eslint-disable-next-line rulesdir/prefer-early-return
         () => {
-            if (props.isLoadingInitialReportActions || props.isLoadingOlderReportActions || props.network.isOffline) {
+            if (
+                props.isLoadingInitialReportActions ||
+                props.isLoadingOlderReportActions ||
+                props.network.isOffline ||
+                newestReportAction.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE
+            ) {
                 return;
             }
             // Determines if loading older reports is necessary when the content is smaller than the list
@@ -362,6 +367,7 @@ function ReportActionsView({reportActions: allReportActions, ...props}) {
             firstReportActionID,
             props.network.isOffline,
             reportActions.length,
+            newestReportAction,
         ],
     );