chore: frontend fixes

dashboard/src/components/porter-form/field-components/KeyValueArray.tsx

@@ -290,7 +290,7 @@ const KeyValueArray: React.FC<Props> = (props) => {
       return (
         <Wrapper>
           <Helper color="#f5cb42" style={{ marginLeft: "10px" }}>
-            Overridden by the env group "{env_group?.name}"
+            Overrides variable in the env group "{env_group?.name}"
           </Helper>
         </Wrapper>
       );

dashboard/src/main/home/modals/LoadEnvGroupModal.tsx

@@ -203,16 +203,19 @@ export default class LoadEnvGroupModal extends Component<PropsType, StateType> {
                 <ClashIcon className="material-icons">sync_problem</ClashIcon>
               </ClashIconWrapper>
               <ClashingKeyExplanation>
-                <b>{key}</b> is defined in both environments
+                <b>{key}</b> is defined in both environments. Value in the
+                selected environment group will be overriden.
               </ClashingKeyExplanation>
             </ClashingKeyTop>
             <ClashingKeyDefinitions>
-              <ClashingKeyLabel>Old</ClashingKeyLabel>
+              <ClashingKeyLabel>Current</ClashingKeyLabel>
               <ClashingKeyValue>
                 {formattedEnvironmentValue(this.props.existingValues[key]) ||
                   emptyValue}
               </ClashingKeyValue>
-              <ClashingKeyLabel>New</ClashingKeyLabel>
+              <ClashingKeyLabel>
+                From {this.state.selectedEnvGroup.name}
+              </ClashingKeyLabel>
               <ClashingKeyValue>
                 {formattedEnvironmentValue(value) || emptyValue}
               </ClashingKeyValue>