diff --git a/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx b/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx index 582ba3f798bc..30c4be2b90d3 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"; @@ -306,9 +307,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(