From a3cd34e9f65628f2dd581ca71e8be2cc931a6506 Mon Sep 17 00:00:00 2001
From: f0c1s <anubhav@appsmith.com>
Date: Wed, 29 Jun 2022 18:03:53 +0530
Subject: [PATCH] fix: Adding deploy button on git deploy tab (#14597)

---
 .../src/pages/Editor/gitSync/Tabs/Deploy.tsx       |  6 +++++-
 app/client/src/sagas/GitSyncSagas.ts               | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx b/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx
index f6c49aaac8..f44d2c458f 100644
--- a/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx
+++ b/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx
@@ -201,7 +201,11 @@ function Deploy() {
   }, []);
   const commitButtonDisabled = !hasChangesToCommit || !commitMessage;
   const commitButtonLoading = isCommittingInProgress;
-  const commitInputDisabled = !hasChangesToCommit || isCommittingInProgress;
+  const commitInputDisabled =
+    !hasChangesToCommit ||
+    isCommittingInProgress ||
+    isCommitAndPushSuccessful ||
+    isDiscarding;
 
   const commitRequired =
     !!gitStatus?.modifiedPages ||
diff --git a/app/client/src/sagas/GitSyncSagas.ts b/app/client/src/sagas/GitSyncSagas.ts
index 32cea0315e..3a53c4113b 100644
--- a/app/client/src/sagas/GitSyncSagas.ts
+++ b/app/client/src/sagas/GitSyncSagas.ts
@@ -193,6 +193,20 @@ function* connectToGitSaga(action: ConnectToGitReduxAction) {
 
       const updatedPath = addBranchParam(branch);
       history.replace(updatedPath);
+
+      /* commit effect START */
+      yield put(commitToRepoSuccess());
+      const curApplication: ApplicationPayload = yield select(
+        getCurrentApplication,
+      );
+      if (curApplication) {
+        curApplication.lastDeployedAt = new Date().toISOString();
+        yield put({
+          type: ReduxActionTypes.FETCH_APPLICATION_SUCCESS,
+          payload: curApplication,
+        });
+      }
+      /* commit effect END */
     }
   } catch (error) {
     if (action.onErrorCallback) {