From bc25dbdefab33ddaaf3b51619044fd77df29de59 Mon Sep 17 00:00:00 2001
From: Rishabh <zrishabhgarg@gmail.com>
Date: Fri, 18 Jun 2021 16:24:18 +0530
Subject: [PATCH] Fixed modal errors in stripe connect and member product

refs https://github.com/TryGhost/Admin/commit/909bd60db3a733ac33029fa04aa9313bf937b248

- The modal actions for glimmer modal components need to define `actions.confirm` separately and add confirmAction to handle both enter and manual confirmation
---
 .../admin/app/components/modal-member-product.js  |  8 +++++++-
 .../admin/app/components/modal-stripe-connect.hbs |  4 ++--
 .../admin/app/components/modal-stripe-connect.js  | 15 +++++++++++++--
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/ghost/admin/app/components/modal-member-product.js b/ghost/admin/app/components/modal-member-product.js
index 8581035d22..3514eab6fa 100644
--- a/ghost/admin/app/components/modal-member-product.js
+++ b/ghost/admin/app/components/modal-member-product.js
@@ -56,7 +56,7 @@ export default class ModalMemberProduct extends ModalComponent {
     }
 
     @action
-    confirm() {
+    confirmAction() {
         return this.addProduct.perform();
     }
 
@@ -89,4 +89,10 @@ export default class ModalMemberProduct extends ModalComponent {
         this.closeModal();
         return response;
     }
+
+    actions = {
+        confirm() {
+            this.confirmAction(...arguments);
+        }
+    }
 }
diff --git a/ghost/admin/app/components/modal-stripe-connect.hbs b/ghost/admin/app/components/modal-stripe-connect.hbs
index a5e3c05351..a46c56396a 100644
--- a/ghost/admin/app/components/modal-stripe-connect.hbs
+++ b/ghost/admin/app/components/modal-stripe-connect.hbs
@@ -1,7 +1,7 @@
 <header class="modal-header" data-test-modal="webhook-form" {{will-destroy this.reset}}>
     <h1 data-test-text="title">Connect with Stripe</h1>
 </header>
-<button class="close" href title="Close" {{action "closeModal"}} {{action (optional this.noop) on="mouseDown"}}>
+<button class="close" href title="Close" {{action "confirm"}} {{action (optional this.noop) on="mouseDown"}}>
     {{svg-jar "close"}}
 </button>
 
@@ -19,7 +19,7 @@
     {{#if this.settings.stripeConnectAccountId}}
         <button
             class="gh-btn gh-btn-black"
-            {{action "closeModal"}}
+            {{action "confirm"}}
             {{action (optional this.noop) on="mouseDown"}}
             data-test-button="stripe-connect-ok"
         >
diff --git a/ghost/admin/app/components/modal-stripe-connect.js b/ghost/admin/app/components/modal-stripe-connect.js
index 960b168f0a..ea6d5d06dd 100644
--- a/ghost/admin/app/components/modal-stripe-connect.js
+++ b/ghost/admin/app/components/modal-stripe-connect.js
@@ -20,6 +20,18 @@ export default class ModalStripeConnect extends ModalBase {
         this.settings.set('stripeConnectIntegrationToken', undefined);
     }
 
+    @action
+    close(event) {
+        event?.preventDefault?.();
+        this.closeModal();
+    }
+
+    @action
+    confirmAction() {
+        this.confirm();
+        this.close();
+    }
+
     @action
     updateSuccessModifier() {
         if (this.settings.get('stripeConnectAccountId')) {
@@ -36,9 +48,8 @@ export default class ModalStripeConnect extends ModalBase {
     actions = {
         confirm() {
             if (this.settings.get('stripeConnectAccountId')) {
-                return this.send('closeModal');
+                return this.confirmAction();
             }
-
             // noop - enter key shouldn't do anything
         }
     }