From 938107bb0d2d5ad870ac89f7ecc03de3dadac682 Mon Sep 17 00:00:00 2001
From: arunjaindev <arun.jain@devtron.ai>
Date: Fri, 31 Jan 2025 16:31:41 +0530
Subject: [PATCH 1/2] fix: default deployment app type for helm chart should be
  if hide helm or gitops is enabled

---
 .../v2/values/chartValuesDiff/ChartValuesView.component.tsx     | 1 -
 .../v2/values/chartValuesDiff/ChartValuesView.reducer.ts        | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/v2/values/chartValuesDiff/ChartValuesView.component.tsx b/src/components/v2/values/chartValuesDiff/ChartValuesView.component.tsx
index dd5f0a2bb9..f6612c1afb 100644
--- a/src/components/v2/values/chartValuesDiff/ChartValuesView.component.tsx
+++ b/src/components/v2/values/chartValuesDiff/ChartValuesView.component.tsx
@@ -434,7 +434,6 @@ export const GitOpsDrawer = ({
                         renderValidationErrorLabel()}
                 </div>
             ) : null}
-            <hr />
         </>
     )
 }
diff --git a/src/components/v2/values/chartValuesDiff/ChartValuesView.reducer.ts b/src/components/v2/values/chartValuesDiff/ChartValuesView.reducer.ts
index 30f735beae..3855455bbe 100644
--- a/src/components/v2/values/chartValuesDiff/ChartValuesView.reducer.ts
+++ b/src/components/v2/values/chartValuesDiff/ChartValuesView.reducer.ts
@@ -80,7 +80,7 @@ export const initState = (
         invalidProject: false,
         formValidationError: {},
         showNoGitOpsWarning: false,
-        deploymentAppType: deploymentAppType ?? DeploymentAppTypes.HELM,
+        deploymentAppType: deploymentAppType ?? window._env_.HIDE_GITOPS_OR_HELM_OPTION ? '' : DeploymentAppTypes.HELM,
         gitRepoURL: '',
         authMode: null,
         initialChartVersionValues: {

From 8e4cbd7bf0b670f0bfd6c43a5d965ccb5bf804b8 Mon Sep 17 00:00:00 2001
From: arunjaindev <arun.jain@devtron.ai>
Date: Fri, 31 Jan 2025 16:47:49 +0530
Subject: [PATCH 2/2] fix: clear deployment status polling timer

---
 src/components/app/details/appDetails/AppDetails.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/app/details/appDetails/AppDetails.tsx b/src/components/app/details/appDetails/AppDetails.tsx
index 40c2209a37..aa64298954 100644
--- a/src/components/app/details/appDetails/AppDetails.tsx
+++ b/src/components/app/details/appDetails/AppDetails.tsx
@@ -20,7 +20,6 @@ import {
     Progressing,
     noop,
     stopPropagation,
-    multiSelectStyles,
     DeploymentAppTypes,
     useSearchString,
     useAsync,
@@ -53,7 +52,6 @@ import {
     DEFAULT_STATUS_TEXT,
 } from '../../../../config'
 import { NavigationArrow, useAppContext, FragmentHOC } from '../../../common'
-import { groupHeaderStyle, Option } from '../../../v2/common/ReactSelect.utils'
 import { getAppConfigStatus, getAppOtherEnvironmentMin, stopStartApp } from '../../../../services/service'
 import AppNotDeployedIcon from '@Images/app-not-deployed.svg'
 import AppNotConfiguredIcon from '@Images/app-not-configured.png'
@@ -377,6 +375,7 @@ export const Details: React.FC<DetailsType> = ({
     useEffect(
         () => () => {
             clearPollingInterval()
+            clearDeploymentStatusTimer()
             IndexStore.clearAppDetails()
         },
         [],