chore: git mod - fixes toast issues

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

@@ -75,7 +75,7 @@ interface TabDeployViewProps {
   commit: (commitMessage: string) => void;
   commitError: GitApiError | null;
   currentBranch: string | null;
-  discard: () => void;
+  discard: (successMessage: string) => void;
   discardError: GitApiError | null;
   isCommitLoading: boolean;
   isDiscardLoading: boolean;
@@ -239,7 +239,7 @@ function TabDeployView({
     AnalyticsUtil.logEvent("GIT_DISCARD", {
       source: "GIT_DISCARD_BUTTON_PRESS_2",
     });
-    discard();
+    discard(createMessage(DISCARD_CHANGES));
     setShowDiscardWarning(false);
     setShouldDiscard(true);
     setIsDiscarding(true);

app/client/src/git/components/QuickActions/QuickActionsView.tsx

@@ -5,6 +5,7 @@ import {
   AUTOCOMMIT_IN_PROGRESS_MESSAGE,
   COMMIT_CHANGES,
   createMessage,
+  DISCARD_AND_PULL_SUCCESS,
   GIT_SETTINGS,
   MERGE,
 } from "ee/constants/messages";
@@ -27,7 +28,7 @@ const Container = styled.div`
 
 interface QuickActionsViewProps {
   currentBranch: string | null;
-  discard: () => void;
+  discard: (successMessage: string) => void;
   isAutocommitEnabled: boolean;
   isAutocommitPolling: boolean;
   isBranchPopupOpen: boolean;
@@ -105,7 +106,7 @@ function QuickActionsView({
       });
 
       if (isProtectedMode) {
-        discard();
+        discard(createMessage(DISCARD_AND_PULL_SUCCESS));
       } else {
         pull();
       }

app/client/src/git/hooks/useDiscard.ts

@@ -12,11 +12,20 @@ export default function useDiscard() {
 
   const discardState = useArtifactSelector(selectDiscardState);
 
-  const discard = useCallback(() => {
-    if (artifactDef && artifactId) {
-      dispatch(gitArtifactActions.discardInit({ artifactDef, artifactId }));
-    }
-  }, [artifactDef, artifactId, dispatch]);
+  const discard = useCallback(
+    (successMessage: string) => {
+      if (artifactDef && artifactId) {
+        dispatch(
+          gitArtifactActions.discardInit({
+            artifactDef,
+            artifactId,
+            successMessage,
+          }),
+        );
+      }
+    },
+    [artifactDef, artifactId, dispatch],
+  );
 
   const clearDiscardError = useCallback(() => {
     if (artifactDef) {

app/client/src/git/sagas/discardSaga.ts

@@ -1,7 +1,6 @@
 import { toast } from "@appsmith/ads";
 import { captureException } from "@sentry/react";
 import { builderURL } from "ee/RouteBuilder";
-import { createMessage, DISCARD_SUCCESS } from "ee/constants/messages";
 import discardRequest from "git/requests/discardRequest";
 import type { DiscardResponse } from "git/requests/discardRequest.types";
 import type { DiscardInitPayload } from "git/store/actions/discardActions";
@@ -15,7 +14,7 @@ import { validateResponse } from "sagas/ErrorSagas";
 export default function* discardSaga(
   action: GitArtifactPayloadAction<DiscardInitPayload>,
 ) {
-  const { artifactDef, artifactId } = action.payload;
+  const { artifactDef, artifactId, successMessage } = action.payload;
 
   let response: DiscardResponse | undefined;
 
@@ -34,9 +33,11 @@ export default function* discardSaga(
 
     if (response && isValidResponse) {
       yield put(gitArtifactActions.discardSuccess({ artifactDef }));
-      toast.show(createMessage(DISCARD_SUCCESS), {
-        kind: "success",
-      });
+
+      if (successMessage) {
+        toast.show(successMessage, { kind: "success" });
+      }
+
       // adding delay to show toast animation before reloading
       yield delay(500);
       const basePageId: string =

app/client/src/git/sagas/pullSaga.ts

@@ -14,6 +14,8 @@ import { APP_MODE } from "entities/App";
 import log from "loglevel";
 import { captureException } from "@sentry/react";
 import { selectGitApiContractsEnabled } from "git/store/selectors/gitFeatureFlagSelectors";
+import { toast } from "@appsmith/ads";
+import { createMessage, DISCARD_AND_PULL_SUCCESS } from "ee/constants/messages";
 
 export default function* pullSaga(
   action: GitArtifactPayloadAction<PullInitPayload>,
@@ -50,6 +52,10 @@ export default function* pullSaga(
           mode: APP_MODE.EDIT,
         }),
       );
+
+      toast.show(createMessage(DISCARD_AND_PULL_SUCCESS), {
+        kind: "success",
+      });
     }
   } catch (e) {
     if (response && response.responseMeta.error) {

app/client/src/git/sagas/updateProtectedBranchesSaga.ts

@@ -1,4 +1,6 @@
+import { toast } from "@appsmith/ads";
 import { captureException } from "@sentry/react";
+import { createMessage, PROTECT_BRANCH_SUCCESS } from "ee/constants/messages";
 import updateProtectedBranchesRequest from "git/requests/updateProtectedBranchesRequest";
 import type {
   UpdateProtectedBranchesRequestParams,
@@ -41,6 +43,10 @@ export default function* updateProtectedBranchesSaga(
         gitArtifactActions.updateProtectedBranchesSuccess({ artifactDef }),
       );
       yield put(gitArtifactActions.fetchProtectedBranchesInit({ artifactDef }));
+
+      toast.show(createMessage(PROTECT_BRANCH_SUCCESS), {
+        kind: "success",
+      });
     }
   } catch (e) {
     if (response && response.responseMeta.error) {

app/client/src/git/store/actions/discardActions.ts

@@ -6,6 +6,7 @@ import type {
 
 export interface DiscardInitPayload extends GitArtifactBasePayload {
   artifactId: string;
+  successMessage?: string;
 }
 
 export const discardInitAction = createArtifactAction<DiscardInitPayload>(