diff --git a/ghost/admin/app/components/gh-members-lab-setting.hbs b/ghost/admin/app/components/gh-members-lab-setting.hbs index d073fdf43b..7c63b8be0b 100644 --- a/ghost/admin/app/components/gh-members-lab-setting.hbs +++ b/ghost/admin/app/components/gh-members-lab-setting.hbs @@ -57,12 +57,12 @@

Connect to Stripe

{{#if this.stripeConnectIntegration}}

- {{#if this.stripeConnectSuccess}} + {{#if this.stripeConnectSuccess}} {{svg-jar "check-circle" class="stroke-green w4 h4 nudge-top--3"}} Successfully connected to {{this.stripeConnectIntegration.name}} {{else}} Connected to {{this.stripeConnectIntegration.name}} {{/if}} - + {{#unless this.stripeConnectIntegration.livemode}} Test mode {{/unless}} @@ -94,7 +94,7 @@

-
-
+
diff --git a/ghost/admin/app/components/gh-members-lab-setting.js b/ghost/admin/app/components/gh-members-lab-setting.js index 823d73d084..24d110e7e0 100644 --- a/ghost/admin/app/components/gh-members-lab-setting.js +++ b/ghost/admin/app/components/gh-members-lab-setting.js @@ -128,10 +128,6 @@ export default Component.extend({ return !!bulkEmailSettings.isConfig; }), - isStripeConnectSecureKeyEmpty: computed('settings.stripeConnectIntegrationToken', function () { - return this.get('settings.stripeConnectIntegrationToken') ? false : true; - }), - init() { this._super(...arguments); this.set('mailgunRegions', [US, EU]); diff --git a/ghost/admin/app/controllers/settings/labs.js b/ghost/admin/app/controllers/settings/labs.js index 7e8918367b..371656a40c 100644 --- a/ghost/admin/app/controllers/settings/labs.js +++ b/ghost/admin/app/controllers/settings/labs.js @@ -281,5 +281,8 @@ export default Controller.extend({ this.set('importErrors', null); this.set('importSuccessful', false); this.set('fromAddressUpdate', null); + // stripeConnectIntegrationToken is not a persisted value so we don't want + // to keep it around across transitions + this.settings.set('stripeConnectIntegrationToken', undefined); } });