fix: Corrected message for REDEPLOY_APP_WARNING. Also not showing Redeploy when Pull button is shown in GIT Modal. (#41474) (#41475)

Author: tomjose92

app/client/src/ce/constants/messages.ts

@@ -1055,7 +1055,7 @@ export const CURRENT_PAGE_DISCARD_WARNING = (page: string) =>
 export const DISCARD_MESSAGE = () =>
   `Some changes may reappear after discarding them, these changes support new features in Appsmith. You can safely commit them to your repository.`;
 export const REDEPLOY_APP_WARNING = () =>
-  "The deployed version of this app is not using the latest versions of some packages. Redeploy to apply the latest package versions to the app.";
+  "The deployed version of this app may be out of sync with what you see in edit mode. Redeploy to apply the latest state.";
 
 // GIT DEPLOY end
 

app/client/src/git/components/OpsModal/TabDeploy/TabDeployView.tsx

@@ -147,9 +147,6 @@ function TabDeployView({
     !isCommitLoading &&
     !isDiscarding;
 
-  const shouldShowRedeploy =
-    !isFetchStatusLoading && !hasChangesToCommit && !!redeployTrigger;
-
   const isCommitting =
     !!commitButtonLoading &&
     (commitRequired || showCommitButton) &&
@@ -171,6 +168,12 @@ function TabDeployView({
     ((pullRequired && !isConflicting) ||
       (statusBehindCount > 0 && statusIsClean));
 
+  const shouldShowRedeploy =
+    !isFetchStatusLoading &&
+    !hasChangesToCommit &&
+    !showPullButton &&
+    !!redeployTrigger;
+
   const isCommitSuccess = useMemo(() => {
     return hasSubmitted && !isCommitLoading;
   }, [isCommitLoading, hasSubmitted]);