Merge remote-tracking branch 'mage/fix/issue/38811' into AC-12119-v1

Author: glo17720

app/code/Magento/InstantPurchase/Model/QuoteManagement/QuoteCreation.php

@@ -57,9 +57,11 @@ public function createQuote(
         $quote->setCustomer($customer->getDataModel());
         $quote->setCustomerIsGuest(0);
         $quote->getShippingAddress()
-            ->importCustomerAddressData($shippingAddress->getDataModel());
+            ->importCustomerAddressData($shippingAddress->getDataModel())
+            ->setCollectShippingRates(true);
         $quote->getBillingAddress()
-            ->importCustomerAddressData($billingAddress->getDataModel());
+            ->importCustomerAddressData($billingAddress->getDataModel())
+            ->setCollectShippingRates(true);
         $quote->setInventoryProcessed(false);
         return $quote;
     }

app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/CheapestMethodDeferredChooser.php

@@ -20,10 +20,7 @@ class CheapestMethodDeferredChooser implements DeferredShippingMethodChooserInte
      */
     public function choose(Address $address)
     {
-        $address->setCollectShippingRates(true);
-        $address->collectShippingRates();
-        $shippingRates = $address->getAllShippingRates();
-
+        $shippingRates = $this->getShippingRates($address);
         if (empty($shippingRates)) {
             return null;
         }
@@ -32,6 +29,22 @@ public function choose(Address $address)
         return $cheapestRate->getCode();
     }
 
+    /**
+     * Retrieves previously collected shipping rates or computes new ones.
+     *
+     * @param Address $address
+     * @return Rate[]
+     */
+    private function getShippingRates(Address $address) : array {
+        if (!empty($shippingRates = $address->getAllShippingRates())) {
+            // Favour previously collected rates over recomputing.
+            return $shippingRates;
+        }
+        $address->setCollectShippingRates(true);
+        $address->collectShippingRates();
+        return $address->getAllShippingRates();
+    }
+
     /**
      * Selects shipping price with minimal price.
      *