MC-35458: Config fields changes

Author: OlgaVasyltsun

app/code/Magento/Config/Block/System/Config/Form/Fieldset.php

@@ -274,14 +274,8 @@ protected function _isCollapseState($element)
             return true;
         }
 
-        if (!empty($element->getGroup()['depends']['fields'])) {
-            foreach ($element->getGroup()['depends']['fields'] as $dependFieldData) {
-                if (is_array($dependFieldData) && isset($dependFieldData['value'], $dependFieldData['id'])) {
-                    if ($dependFieldData['value'] !== $this->getConfigData($dependFieldData['id'])) {
-                        return false;
-                    }
-                }
-            }
+        if ($this->isCollapseStateByDependentField($element)) {
+            return false;
         }
 
         $extra = $this->_authSession->getUser()->getExtra();
@@ -292,6 +286,34 @@ protected function _isCollapseState($element)
         return $this->isCollapsedDefault;
     }
 
+    /**
+     * Check if element should be collapsed by dependent field value.
+     *
+     * @param AbstractElement $element
+     * @return bool
+     */
+    private function isCollapseStateByDependentField(AbstractElement $element): bool
+    {
+        if (!empty($element->getGroup()['depends']['fields'])) {
+            foreach ($element->getGroup()['depends']['fields'] as $dependFieldData) {
+                if (is_array($dependFieldData) && isset($dependFieldData['value'], $dependFieldData['id'])) {
+                    $fieldSetForm = $this->getForm();
+                    $dependentFieldConfigValue = $this->_scopeConfig->getValue(
+                        $dependFieldData['id'],
+                        $fieldSetForm->getScope(),
+                        $fieldSetForm->getScopeCode()
+                    );
+
+                    if ($dependFieldData['value'] !== $dependentFieldConfigValue) {
+                        return true;
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+
     /**
      * If element or it's parent depends on other element we hide it during page load.
      *