Merge remote-tracking branch 'origin/MC-34841-free-payment' into MC-36897

Author: Prabhu Ram

app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php

@@ -7,9 +7,11 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Model\QuoteRepository;
 
 /**
  * Set single shipping address for a specified shopping cart
@@ -26,16 +28,25 @@ class SetShippingAddressesOnCart implements SetShippingAddressesOnCartInterface
      */
     private $getShippingAddress;
 
+    /**
+     * @var QuoteRepository
+     */
+    private $quoteRepository;
+
     /**
      * @param AssignShippingAddressToCart $assignShippingAddressToCart
      * @param GetShippingAddress $getShippingAddress
+     * @param QuoteRepository|null $quoteRepository
      */
     public function __construct(
         AssignShippingAddressToCart $assignShippingAddressToCart,
-        GetShippingAddress $getShippingAddress
+        GetShippingAddress $getShippingAddress,
+        QuoteRepository $quoteRepository = null
     ) {
         $this->assignShippingAddressToCart = $assignShippingAddressToCart;
         $this->getShippingAddress = $getShippingAddress;
+        $this->quoteRepository = $quoteRepository
+            ?? ObjectManager::getInstance()->get(QuoteRepository::class);
     }
 
     /**
@@ -70,5 +81,7 @@ public function execute(ContextInterface $context, CartInterface $cart, array $s
             throw $e;
         }
         $this->assignShippingAddressToCart->execute($cart, $shippingAddress);
+        // trigger quote re-evaluation after address change
+        $this->quoteRepository->save($cart);
     }
 }