ACP2E-172: Error adding configurable product to cart using GraphQL directly after storeview is changed

Author: dhorytskyi

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

@@ -87,7 +87,7 @@ public function execute(string $cartHash, ?int $customerId, int $storeId): Quote
             throw new GraphQlNoSuchEntityException(__('The cart isn\'t active.'));
         }
 
-        $this->updateCartCurrency($cart, $storeId);
+        $cart = $this->updateCartCurrency($cart, $storeId);
 
         $cartCustomerId = (int)$cart->getCustomerId();
 
@@ -112,10 +112,11 @@ public function execute(string $cartHash, ?int $customerId, int $storeId): Quote
      *
      * @param Quote $cart
      * @param int $storeId
+     * @return Quote
      * @throws GraphQlInputException
      * @throws NoSuchEntityException
      */
-    private function updateCartCurrency(Quote $cart, int $storeId)
+    private function updateCartCurrency(Quote $cart, int $storeId): Quote
     {
         $cartStore = $this->storeRepository->getById($cart->getStoreId());
         $currentCartCurrencyCode = $cartStore->getCurrentCurrency()->getCode();
@@ -132,8 +133,11 @@ private function updateCartCurrency(Quote $cart, int $storeId)
         } elseif ($cart->getQuoteCurrencyCode() !== $currentCartCurrencyCode) {
             $cart->setQuoteCurrencyCode($cartStore->getCurrentCurrency());
         } else {
-            return;
+            return $cart;
         }
         $this->cartRepository->save($cart);
+        $cart = $this->cartRepository->get($cart->getId());
+
+        return $cart;
     }
 }