From 495143b0270a0057f1eade1117fbf2c1a4fe7b6f Mon Sep 17 00:00:00 2001
From: Fabien O'Carroll <fabien@allou.is>
Date: Tue, 30 Jun 2020 11:50:43 +0200
Subject: [PATCH] Updated to remove stripe_connect_integration references

refs #10318
---
 .../app/components/gh-members-lab-setting.hbs |  4 ++--
 .../app/components/gh-members-lab-setting.js  | 19 +------------------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/ghost/admin/app/components/gh-members-lab-setting.hbs b/ghost/admin/app/components/gh-members-lab-setting.hbs
index f14089721a..333ce796f3 100644
--- a/ghost/admin/app/components/gh-members-lab-setting.hbs
+++ b/ghost/admin/app/components/gh-members-lab-setting.hbs
@@ -55,7 +55,7 @@
             <div class="flex justify-between">
                 <div>
                     <h4 class="gh-setting-title">Connect to Stripe</h4>
-                    {{#if this.stripeConnectIntegration}}
+                    {{#if this.stripeConnectAccountId}}
                         <p class="gh-setting-desc pa0 ma0">
                             {{#if this.stripeConnectSuccess}}
                                 {{svg-jar "check-circle" class="stroke-green w4 h4 nudge-top--3"}} <span class="green-d1">Successfully connected to {{this.stripeConnectAccountName}}</span>
@@ -77,7 +77,7 @@
                     {{/if}}
                 </div>
                 <div>
-                    {{#if this.stripeConnectIntegration}}
+                    {{#if this.stripeConnectAccountId}}
                         <button type="button" class="gh-btn" {{action "openDisconnectStripeModal"}}><span>Disconnect</span></button>
                     {{else}}
                         <button type="button" class="gh-btn" {{action (toggle "membersStripeOpen" this)}} data-test-toggle-membersstripe><span>{{if this.membersStripeOpen "Close" "Expand"}}</span></button>
diff --git a/ghost/admin/app/components/gh-members-lab-setting.js b/ghost/admin/app/components/gh-members-lab-setting.js
index f67501724e..31548e409d 100644
--- a/ghost/admin/app/components/gh-members-lab-setting.js
+++ b/ghost/admin/app/components/gh-members-lab-setting.js
@@ -55,26 +55,9 @@ export default Component.extend({
     stripeDirectSecretKey: reads('settings.stripeSecretKey'),
 
     stripeConnectAccountId: reads('settings.stripeConnectAccountId'),
-    stripeConnectAccountName: reads('settings.stripeConnectAccountName'),
+    stripeConnectAccountName: reads('settings.stripeConnectDisplayName'),
     stripeConnectLivemode: reads('settings.stripeConnectLivemode'),
 
-    stripeConnectIntegration: computed('settings.stripeConnectIntegration', function () {
-        try {
-            const integration = JSON.parse(this.get('settings.stripeConnectIntegration'));
-            if (!integration || !integration.account_id) {
-                return null;
-            }
-
-            return {
-                id: integration.account_id,
-                name: integration.display_name,
-                livemode: integration.livemode
-            };
-        } catch (err) {
-            return null;
-        }
-    }),
-
     selectedCurrency: computed('stripePlans.monthly.currency', function () {
         return CURRENCIES.findBy('value', this.get('stripePlans.monthly.currency'));
     }),