From 9000317acd2aa8d263e06544d1cfb34c1af75d1d Mon Sep 17 00:00:00 2001
From: Rishabh <zrishabhgarg@gmail.com>
Date: Fri, 21 May 2021 13:26:55 +0530
Subject: [PATCH] Fixed incorrect stripe disconnect UI on memberships setting

no refs

When disconnecting Stripe via the stripe connect modal, we were not resetting the `stripeConnectIntegrationToken` which is used by backend to calculate properties of `stripe_connect_*` settings. This resulted in `stripe_connect_*` properties being retained in settings even after Stripe is disconnected as we keep passing the old integration token to settings API which overrides all connect settings. This change resets the stripe integration token to empty again so as its not using the old value even after modal is closed or disconnected.
---
 ghost/admin/app/components/modal-stripe-connect.hbs | 2 +-
 ghost/admin/app/components/modal-stripe-connect.js  | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ghost/admin/app/components/modal-stripe-connect.hbs b/ghost/admin/app/components/modal-stripe-connect.hbs
index 3ad2b2cce3..b00d6761a7 100644
--- a/ghost/admin/app/components/modal-stripe-connect.hbs
+++ b/ghost/admin/app/components/modal-stripe-connect.hbs
@@ -1,4 +1,4 @@
-<header class="modal-header" data-test-modal="webhook-form">
+<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"}}>
diff --git a/ghost/admin/app/components/modal-stripe-connect.js b/ghost/admin/app/components/modal-stripe-connect.js
index c25c064f7d..21736ab7ea 100644
--- a/ghost/admin/app/components/modal-stripe-connect.js
+++ b/ghost/admin/app/components/modal-stripe-connect.js
@@ -13,6 +13,13 @@ export default class ModalStripeConnect extends ModalBase {
         this.settings.set('stripeConnectIntegrationToken', stripeConnectIntegrationToken);
     }
 
+    @action
+    reset() {
+        // stripeConnectIntegrationToken is not a persisted value so we don't want
+        // to keep it around across transitions
+        this.settings.set('stripeConnectIntegrationToken', undefined);
+    }
+
     @action
     updateSuccessModifier() {
         if (this.settings.get('stripeConnectAccountId')) {