8410: Custom Checkout Step and Shipping Step are Highlighted

Author: RomaKis

app/code/Magento/Checkout/view/frontend/web/js/view/payment.js

@@ -46,8 +46,18 @@ define([
 
         /** @inheritdoc */
         initialize: function () {
+            var self = this;
             this._super();
             checkoutDataResolver.resolvePaymentMethod();
+
+            //If some step is active this step will become inactive.
+            stepNavigator.steps().some(function (element) {
+                if (element.isVisible()) {
+                    self.isVisible(false);
+                    return true;
+                }
+            });
+
             stepNavigator.registerStep(
                 'payment',
                 null,

app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js

@@ -82,6 +82,14 @@ define([
             this._super();
 
             if (!quote.isVirtual()) {
+                //If some step is active this step will become inactive.
+                stepNavigator.steps().some(function (element) {
+                    if (element.isVisible()) {
+                        self.visible(false);
+                        return true;
+                    }
+                });
+
                 stepNavigator.registerStep(
                     'shipping',
                     '',