fix links, types.

webapp/channels/src/components/common/hooks/useControlSelfHostedExpansionModal.ts

@@ -26,7 +26,7 @@ export default function useControlSelfHostedExpansionModal(options: HookOptions)
     const dispatch = useDispatch();
     const currentUser = useSelector(getCurrentUser);
     const controlModal = useControlModal({
-        modalId: ModalIdentifiers.SELF_HOSTED_EXPANSION,
+        modalId: ModalIdentifiers.EXPANSION_IN_PROGRESS,
         dialogType: SelfHostedExpansionModal,
     });
 

webapp/channels/src/components/self_hosted_expansion_modal/error_page.tsx

@@ -4,9 +4,8 @@
 import React from 'react';
 
 import {FormattedMessage} from 'react-intl';
-import {useSelector} from 'react-redux';
+import {useOpenSelfHostedZendeskSupportForm} from 'components/common/hooks/useOpenZendeskForm';
 
-import {getCloudContactUsLink, InquiryType} from 'selectors/cloud';
 
 import PaymentFailedSvg from 'components/common/svg_images_components/payment_failed_svg';
 import IconMessage from 'components/purchase_modal/icon_message';
@@ -14,7 +13,7 @@ import IconMessage from 'components/purchase_modal/icon_message';
 import './error_page.scss';
 
 export default function SelfHostedExpansionErrorPage() {
-    const contactSupportLink = useSelector(getCloudContactUsLink)(InquiryType.Technical);
+    const [, contactSupportLink] = useOpenSelfHostedZendeskSupportForm('Purchase error');
 
     const formattedTitle = (
         <FormattedMessage

webapp/channels/src/components/self_hosted_expansion_modal/index.test.tsx

@@ -330,6 +330,14 @@ describe('SelfHostedExpansionModal :: canSubmit', () => {
             state: 'string',
             country: 'string',
             postalCode: '12345',
+            shippingAddress: 'string',
+            shippingAddress2: 'string',
+            shippingCity: 'string',
+            shippingState: 'string',
+            shippingCountry: 'string',
+            shippingPostalCode: '12345',
+            shippingSame: false,
+            agreedTerms: true,
             cardName: 'string',
             organization: 'string',
             cardFilled: true,

webapp/channels/src/components/self_hosted_expansion_modal/index.tsx

@@ -336,7 +336,7 @@ export default function SelfHostedExpansionModal() {
                     show={show}
                     ariaLabelledBy='self_hosted_expansion_modal_title'
                     onClose={() => {
-                        dispatch(closeModal(ModalIdentifiers.SELF_HOSTED_EXPANSION));
+                        dispatch(closeModal(ModalIdentifiers.EXPANSION_IN_PROGRESS));
                         resetToken();
                     }}
                 >

webapp/channels/src/components/self_hosted_purchase_modal/index.tsx

@@ -71,6 +71,7 @@ import {SetPrefix, UnionSetActions} from './types';
 import './self_hosted_purchase_modal.scss';
 
 import {STORAGE_KEY_PURCHASE_IN_PROGRESS} from './constants';
+import {inferNames} from 'utils/hosted_customer';
 
 export interface State {
     address: string;

webapp/channels/src/utils/constants.tsx

@@ -459,7 +459,7 @@ export const ModalIdentifiers = {
     DELETE_WORKSPACE_RESULT: 'delete_workspace_result',
     SCREENING_IN_PROGRESS: 'screening_in_progress',
     CONFIRM_SWITCH_TO_YEARLY: 'confirm_switch_to_yearly',
-    SELF_HOSTED_EXPANSION: 'self_hosted_expansion',
+    EXPANSION_IN_PROGRESS: 'expansion_in_progress',
 };
 
 export const UserStatuses = {
@@ -1070,7 +1070,6 @@ export const CloudLinks = {
     SELF_HOSTED_SIGNUP: 'https://customers.mattermost.com/signup',
     DELINQUENCY_DOCS: 'https://docs.mattermost.com/about/cloud-subscriptions.html#failed-or-late-payments',
     SELF_HOSTED_PRICING: 'https://mattermost.com/pricing/#self-hosted',
-    SELF_HOSTED_BILLING: 'https://docs.mattermost.com/manage/self-hosted-billing.html',
 };
 
 export const HostedCustomerLinks = {
@@ -1090,6 +1089,7 @@ export const DocLinks = {
     ONBOARD_LDAP: 'https://docs.mattermost.com/onboard/ad-ldap.html',
     ONBOARD_SSO: 'https://docs.mattermost.com/onboard/sso-saml.html',
     TRUE_UP_REVIEW: 'https://mattermost.com/pl/true-up-documentation',
+    SELF_HOSTED_BILLING: 'https://docs.mattermost.com/manage/self-hosted-billing.html',
 };
 
 export const LicenseLinks = {