From c4f6f21ca0821e1f478a7394ce449aa264caec4d Mon Sep 17 00:00:00 2001
From: Conor Macpherson <conor.macpherson@mattermost.com>
Date: Mon, 27 Mar 2023 13:53:27 -0400
Subject: [PATCH] lint.

---
 .../enterprise_edition.scss                   |  2 +-
 .../self_hosted_expansion_modal/index.tsx     | 47 +++++++++----------
 .../self_hosted_expansion_modal.scss          |  2 +-
 webapp/platform/client/src/client4.ts         |  2 +-
 4 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition.scss b/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition.scss
index 69ab2d6e1b..acce9b4621 100644
--- a/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition.scss
+++ b/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition.scss
@@ -209,4 +209,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/webapp/channels/src/components/self_hosted_expansion_modal/index.tsx b/webapp/channels/src/components/self_hosted_expansion_modal/index.tsx
index 1a2320db7c..da54d4ce65 100644
--- a/webapp/channels/src/components/self_hosted_expansion_modal/index.tsx
+++ b/webapp/channels/src/components/self_hosted_expansion_modal/index.tsx
@@ -19,10 +19,7 @@ import FullScreenModal from 'components/widgets/modals/full_screen_modal';
 import Input from 'components/widgets/inputs/input/input';
 
 import BackgroundSvg from 'components/common/svg_images_components/background_svg';
-import {COUNTRIES} from 'utils/countries';
-import StateSelector from 'components/payment_form/state_selector';
 import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
-import DropdownInput from 'components/dropdown_input';
 import StripeProvider from '../self_hosted_purchase_modal/stripe_provider';
 
 import {closeModal} from 'actions/views/modals';
@@ -124,11 +121,11 @@ export function canSubmit(formState: FormState, progress: ValueOf<typeof SelfHos
 
     const validShippingAddress = Boolean(
         formState.shippingSame ||
-        formState.shippingAddress &&
+        (formState.shippingAddress &&
         formState.shippingCity &&
         formState.shippingState &&
         formState.shippingPostalCode &&
-        formState.shippingCountry,
+        formState.shippingCountry),
     );
 
     const agreedToTerms = formState.agreedTerms;
@@ -140,28 +137,28 @@ export function canSubmit(formState: FormState, progress: ValueOf<typeof SelfHos
     const validSeats = formState.seats > 0;
 
     switch (progress) {
-        case SelfHostedSignupProgress.PAID:
-        case SelfHostedSignupProgress.CREATED_LICENSE:
-        case SelfHostedSignupProgress.CREATED_SUBSCRIPTION:
-            return true;
-        case SelfHostedSignupProgress.CONFIRMED_INTENT: {
-            return Boolean(
-                validAddress && validShippingAddress && validSeats && agreedToTerms
-            );
-        }
-        case SelfHostedSignupProgress.START:
-        case SelfHostedSignupProgress.CREATED_CUSTOMER:
-        case SelfHostedSignupProgress.CREATED_INTENT:
-            return Boolean(
-                validCard &&
+    case SelfHostedSignupProgress.PAID:
+    case SelfHostedSignupProgress.CREATED_LICENSE:
+    case SelfHostedSignupProgress.CREATED_SUBSCRIPTION:
+        return true;
+    case SelfHostedSignupProgress.CONFIRMED_INTENT: {
+        return Boolean(
+            validAddress && validShippingAddress && validSeats && agreedToTerms,
+        );
+    }
+    case SelfHostedSignupProgress.START:
+    case SelfHostedSignupProgress.CREATED_CUSTOMER:
+    case SelfHostedSignupProgress.CREATED_INTENT:
+        return Boolean(
+            validCard &&
                 validAddress &&
                 validShippingAddress &&
                 validSeats &&
-                agreedToTerms
-            );
-        default: {
-            return false;
-        }
+                agreedToTerms,
+        );
+    default: {
+        return false;
+    }
     }
 }
 
@@ -273,7 +270,7 @@ export default function SelfHostedExpansionModal() {
                 submitProgress,
                 {
                     seats: formState.seats,
-                    license_id: license.ID,
+                    license_id: license.Id,
                 },
             ));
 
diff --git a/webapp/channels/src/components/self_hosted_expansion_modal/self_hosted_expansion_modal.scss b/webapp/channels/src/components/self_hosted_expansion_modal/self_hosted_expansion_modal.scss
index 888532b85e..7166c369e7 100644
--- a/webapp/channels/src/components/self_hosted_expansion_modal/self_hosted_expansion_modal.scss
+++ b/webapp/channels/src/components/self_hosted_expansion_modal/self_hosted_expansion_modal.scss
@@ -3,7 +3,6 @@
 
     .form-view {
         display: flex;
-        overflow-x: hidden;
         width: 100%;
         height: 100%;
         flex-direction: row;
@@ -16,6 +15,7 @@
         font-family: "Open Sans";
         font-size: 16px;
         font-weight: 600;
+        overflow-x: hidden;
 
         .title {
             font-size: 22px;
diff --git a/webapp/platform/client/src/client4.ts b/webapp/platform/client/src/client4.ts
index 8aca0c6326..a71207f42f 100644
--- a/webapp/platform/client/src/client4.ts
+++ b/webapp/platform/client/src/client4.ts
@@ -3896,7 +3896,7 @@ export default class Client4 {
     confirmSelfHostedExpansion = (setupIntentId: string, expandRequest: SelfHostedExpansionRequest) => {
         return this.doFetch<SelfHostedSignupSuccessResponse>(
             `${this.getHostedCustomerRoute()}/confirm?expand=true`,
-            {method: 'post', body: JSON.stringify({stripe_setup_intent_id: setupIntentId, subscription: expandRequest})},
+            {method: 'post', body: JSON.stringify({stripe_setup_intent_id: setupIntentId, expand_request: expandRequest})},
         );
     }