From 1ebb4a5daa47af381a0e38fc03d237d16c5b556a Mon Sep 17 00:00:00 2001
From: brayn003 <rudra@appsmith.com>
Date: Tue, 17 Sep 2024 16:53:18 +0800
Subject: [PATCH] fix: adding loader for pull & discard

---
 .../src/pages/Editor/gitSync/QuickGitActions/index.tsx     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx b/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx
index b70cd6363e51..4efd76098830 100644
--- a/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx
+++ b/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx
@@ -36,6 +36,7 @@ import {
   getIsFetchingGitStatus,
   getIsGitConnected,
   getIsPollingAutocommit,
+  getIsPullingProgress,
   getPullFailed,
   protectedModeSelector,
 } from "selectors/gitSyncSelectors";
@@ -303,9 +304,11 @@ export default function QuickGitActions() {
   const { disabled: pullDisabled, message: pullTooltipMessage } =
     getPullBtnStatus(gitStatus, !!pullFailed, isProtectedMode);
 
-  const isPullInProgress = useSelector(getIsDiscardInProgress);
+  const isDiscardInProgress = useSelector(getIsDiscardInProgress);
+  const isPullInProgress = useSelector(getIsPullingProgress);
   const isFetchingGitStatus = useSelector(getIsFetchingGitStatus);
-  const showPullLoadingState = isPullInProgress || isFetchingGitStatus;
+  const showPullLoadingState =
+    isDiscardInProgress || isPullInProgress || isFetchingGitStatus;
   const changesToCommit = useSelector(getCountOfChangesToCommit);
 
   const isAutocommitFeatureEnabled = useFeatureFlag(