ENGCOM-3358: [Forwardport] Prevent rendering of "Ship here" button to select a shipping item if it is already selected #18986

Author: Stanislav Idolov

app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingMethodsSection.xml

@@ -14,7 +14,7 @@
         <element name="shippingMethodRow" type="text" selector=".form.methods-shipping table tbody tr"/>
         <element name="checkShippingMethodByName" type="radio" selector="//div[@id='checkout-shipping-method-load']//td[contains(., '{{var1}}')]/..//input" parameterized="true"/>
         <element name="shippingMethodRowByName" type="text" selector="//div[@id='checkout-shipping-method-load']//td[contains(., '{{var1}}')]/.." parameterized="true"/>
-        <element name="shipHereButton" type="button" selector="//button[contains(@class, 'action-select-shipping-item')]/parent::div/following-sibling::div/button[contains(@class, 'action-select-shipping-item')]"/>
+        <element name="shipHereButton" type="button" selector="//div/following-sibling::div/button[contains(@class, 'action-select-shipping-item')]"/>
         <element name="shippingMethodLoader" type="button" selector="//div[contains(@class, 'checkout-shipping-method')]/following-sibling::div[contains(@class, 'loading-mask')]"/>
     </section>
 </sections>

app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html

@@ -35,7 +35,9 @@
             click="editAddress">
         <span translate="'Edit'"></span>
     </button>
+    <!-- ko if: (!isSelected()) -->
     <button type="button" click="selectAddress" class="action action-select-shipping-item">
         <span translate="'Ship Here'"></span>
     </button>
+    <!-- /ko -->
 </div>

app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_shipping.less

@@ -98,11 +98,6 @@
                     text-align: center;
                     top: 0;
                 }
-
-                .action-select-shipping-item {
-                    &:extend(.abs-no-display-s all);
-                    visibility: hidden;
-                }
             }
         }