Merge branch '2.4.5-develop' into AC-3515_regression_issue_12June2022

Author: sidolov

app/code/Magento/QuoteGraphQl/Model/Resolver/AvailablePaymentMethods.php

@@ -81,12 +81,13 @@ private function getPaymentMethodsData(CartInterface $cart): array
              */
             if ((int)$grandTotal === 0 && $carrierCode === self::FREE_SHIPPING_METHOD
                 && $paymentMethod->getCode() === self::FREE_PAYMENT_METHOD_CODE) {
-                $paymentMethodsData[] = [
-                    'title' => $paymentMethod->getTitle(),
-                    'code' => $paymentMethod->getCode(),
+                return [
+                    [
+                        'title' => $paymentMethod->getTitle(),
+                        'code' => $paymentMethod->getCode(),
+                    ]
                 ];
-            } elseif ((int)$grandTotal >= 0
-                && $carrierCode !== self::FREE_SHIPPING_METHOD) {
+            } elseif ((int)$grandTotal >= 0) {
                 $paymentMethodsData[] = [
                     'title' => $paymentMethod->getTitle(),
                     'code' => $paymentMethod->getCode(),