diff --git a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx index 83f6ff7320..7eeedb5460 100644 --- a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx +++ b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx @@ -347,165 +347,166 @@ export default function SelfHostedExpansionModal() { }} >
- {
-

{title}

- -
{'Questions?'}
- -
-
+
+
+

{title}

+ +
{'Questions?'}
+ +
+
- + className='form' + data-testid='shpm-form' + > + {intl.formatMessage({ - id: 'payment_form.credit_card', - defaultMessage: 'Credit Card', - })} + id: 'payment_form.credit_card', + defaultMessage: 'Credit Card', + })} -
+
{ - setFormState({...formState, cardFilled: event.complete}); - }} - theme={theme} - /> + forwardedRef={cardRef} + required={true} + onCardInputChange={(event: StripeCardElementChangeEvent) => { + setFormState({...formState, cardFilled: event.complete}); + }} + theme={theme} + />
-
+
) => { - setFormState({...formState, organization: e.target.value}); - }} - placeholder={intl.formatMessage({ - id: 'self_hosted_signup.organization', - defaultMessage: 'Organization Name', - })} - required={true} - /> + name='organization' + type='text' + value={formState.organization} + onChange={(e: React.ChangeEvent) => { + setFormState({...formState, organization: e.target.value}); + }} + placeholder={intl.formatMessage({ + id: 'self_hosted_signup.organization', + defaultMessage: 'Organization Name', + })} + required={true} + />
-
+
) => { - setFormState({...formState, cardName: e.target.value}); - }} - placeholder={intl.formatMessage({ - id: 'payment_form.name_on_card', - defaultMessage: 'Name on Card', - })} - required={true} - /> + name='name' + type='text' + value={formState.cardName} + onChange={(e: React.ChangeEvent) => { + setFormState({...formState, cardName: e.target.value}); + }} + placeholder={intl.formatMessage({ + id: 'payment_form.name_on_card', + defaultMessage: 'Name on Card', + })} + required={true} + />
- + + id='payment_form.billing_address' + defaultMessage='Billing address' + /> -
{ - setFormState({...formState, country: option.value}); - }} + setFormState({...formState, country: option.value}); + }} address={formState.address} changeAddress={(e) => { - setFormState({...formState, address: e.target.value}); - }} + setFormState({...formState, address: e.target.value}); + }} address2={formState.address2} changeAddress2={(e) => { - setFormState({...formState, address2: e.target.value}); - }} + setFormState({...formState, address2: e.target.value}); + }} city={formState.city} changeCity={(e) => { - setFormState({...formState, city: e.target.value}); - }} + setFormState({...formState, city: e.target.value}); + }} state={formState.state} changeState={(state: string) => { - setFormState({...formState, state}); - }} + setFormState({...formState, state}); + }} postalCode={formState.postalCode} changePostalCode={(e) => { - setFormState({...formState, postalCode: e.target.value}); - }} + setFormState({...formState, postalCode: e.target.value}); + }} /> - { - setFormState({...formState, shippingSame: val}); - }} + setFormState({...formState, shippingSame: val}); + }} /> - {!formState.shippingSame && ( - <> -
- +
+ +
+
{ + setFormState({...formState, shippingCountry: option.value}); + }} + address={formState.shippingAddress} + changeAddress={(e) => { + setFormState({...formState, shippingAddress: e.target.value}); + }} + address2={formState.shippingAddress2} + changeAddress2={(e) => { + setFormState({...formState, shippingAddress2: e.target.value}); + }} + city={formState.shippingCity} + changeCity={(e) => { + setFormState({...formState, shippingCity: e.target.value}); + }} + state={formState.shippingState} + changeState={(state: string) => { + setFormState({...formState, shippingState: state}); + }} + postalCode={formState.shippingPostalCode} + changePostalCode={(e) => { + setFormState({...formState, shippingPostalCode: e.target.value}); + }} /> -
-
{ - setFormState({...formState, shippingCountry: option.value}); - }} - address={formState.shippingAddress} - changeAddress={(e) => { - setFormState({...formState, shippingAddress: e.target.value}); - }} - address2={formState.shippingAddress2} - changeAddress2={(e) => { - setFormState({...formState, shippingAddress2: e.target.value}); - }} - city={formState.shippingCity} - changeCity={(e) => { - setFormState({...formState, shippingCity: e.target.value}); - }} - state={formState.shippingState} - changeState={(state: string) => { - setFormState({...formState, shippingState: state}); - }} - postalCode={formState.shippingPostalCode} - changePostalCode={(e) => { - setFormState({...formState, shippingPostalCode: e.target.value}); - }} - /> - - )} - + )} + { - setFormState({...formState, agreedTerms: data}); - }} + setFormState({...formState, agreedTerms: data}); + }} /> -
+
- { - setFormState({...formState, seats}); - setAdditionalSeats(seats); - }} + setFormState({...formState, seats}); + setAdditionalSeats(seats); + }} canSubmit={canSubmitForm} submit={submit} licensedSeats={licensedSeats} initialSeats={additionalSeats} /> +
-
} {((formState.succeeded || progress === SelfHostedSignupProgress.CREATED_LICENSE)) && !formState.error && !formState.submitting && (