From f66e6f44c3d618815ab7ead04a20022f72ba2e74 Mon Sep 17 00:00:00 2001
From: Yurii Torbyk <jora.yt@gmail.com>
Date: Sat, 12 Mar 2016 21:28:05 +0200
Subject: [PATCH] Stop screen loader on payment error

---
 .../Checkout/view/frontend/web/js/action/place-order.js       | 4 ++++
 .../view/frontend/web/js/action/set-payment-information.js    | 1 +
 2 files changed, 5 insertions(+)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/action/place-order.js b/app/code/Magento/Checkout/view/frontend/web/js/action/place-order.js
index f0c0bcce05fce..f7c19d66419c1 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/action/place-order.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/action/place-order.js
@@ -47,6 +47,10 @@ define(
                     errorProcessor.process(response, messageContainer);
                     fullScreenLoader.stopLoader();
                 }
+            ).always(
+                function () {
+                    fullScreenLoader.stopLoader();
+                }
             );
         };
     }
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information.js b/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information.js
index b031a693a8cf8..7d1ab5e76d227 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information.js
@@ -48,6 +48,7 @@ define(
             ).fail(
                 function (response) {
                     errorProcessor.process(response, messageContainer);
+                    fullScreenLoader.stopLoader();
                 }
             ).always(
                 function () {