[MERGE] forward port branch saas-12.2 up to 995aa1685ee

1 files changed, 5 insertions, 8 deletions

diff --git a/addons/payment/static/src/js/payment_processing.js b/addons/payment/static/src/js/payment_processing.js
index 0fcfbc7ce81..73af1a344bb 100644
--- a/addons/payment/static/src/js/payment_processing.js
+++ b/addons/payment/static/src/js/payment_processing.js
@@ -54,6 +54,8 @@ odoo.define('payment.processing', function (require) {
                 }
                 else {
                     switch(data.error) {
+                    case "tx_process_retry":
+                        break;
                     case "no_tx_found":
                         self.displayContent("payment.no_tx_found", {});
                         break;
@@ -63,18 +65,12 @@ odoo.define('payment.processing', function (require) {
                     }
                 }
                 self.startPolling();
-            }).then(function() {
-                if ($.blockUI) {
-                    $.unblockUI();
-                }
+
             }).guardedCatch(function() {
-                if ($.blockUI) {
-                    $.unblockUI();
-                }
                 self.displayContent("payment.rpc_error", {});
                 self.startPolling();
             });
-        },
+        },g
         processPolledData: function (transactions) {
             var render_values = {
                 'tx_draft': [],
@@ -120,6 +116,7 @@ odoo.define('payment.processing', function (require) {
         },
         displayContent: function (xmlid, render_values) {
             var html = Qweb.render(xmlid, render_values);
+            $.unblockUI();
             this.$el.find('.o_payment_processing_content').html(html);
         },
         displayLoading: function () {