Merge pull request #2692 from devtron-labs/fix/condition-container-null-check

fix: null check missing fix

Author: RohitRaj011

src/components/CIPipelineN/ConditionContainer.tsx

@@ -46,7 +46,7 @@ export const ConditionContainer = ({ type }: { type: ConditionContainerType }) =
         const { isConditionDetailsValid, conditionDetails: conditionDetailsError } =
             formDataErrorObj[activeStageName].steps[selectedTaskIndex][currentStepTypeVariable]
 
-        if (!isConditionDetailsValid) {
+        if (!isConditionDetailsValid && conditionDetailsError) {
             const { conditionDetails } = formData[activeStageName].steps[selectedTaskIndex][currentStepTypeVariable]
 
             const invalidConditionDetailsIds = Object.keys(conditionDetailsError).reduce((acc, key) => {

src/components/common/helpers/Helpers.tsx

@@ -787,7 +787,7 @@ export const convertToOptionsList = (
 export const importComponentFromFELibrary = (componentName: string, defaultComponent?, type?: 'function') => {
     // Adding this check as we do not want to import the component if flag is off
     // Using this as a hack, to be removed soon
-    if (!window._env_.FEATURE_AI_INTEGRATION_ENABLE && componentName === 'ExplainWithAIButton') {
+    if (!window._env_?.FEATURE_AI_INTEGRATION_ENABLE && componentName === 'ExplainWithAIButton') {
         return null
     }
     try {