Cherry picking mattermost#6765

mattermost-build · Oct 13, 2020 · 5ea49bc · 5ea49bc
1 parent 859d7cb
commit 5ea49bc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/components/purchase_modal/index.ts b/components/purchase_modal/index.ts
@@ -8,11 +8,8 @@ import {getConfig} from 'mattermost-redux/selectors/entities/general';
 import {GenericAction, ActionFunc} from 'mattermost-redux/types/actions';
 import {Stripe} from '@stripe/stripe-js';
 
-import {getCloudProducts} from 'mattermost-redux/actions/cloud';
-
-import {
-    getClientConfig,
-} from 'mattermost-redux/actions/general';
+import {getCloudProducts, getCloudSubscription} from 'mattermost-redux/actions/cloud';
+import {getClientConfig} from 'mattermost-redux/actions/general';
 
 import {BillingDetails} from 'types/cloud/sku';
 
@@ -38,6 +35,7 @@ type Actions = {
     getCloudProducts: () => void;
     completeStripeAddPaymentMethod: (stripe: Stripe, billingDetails: BillingDetails, isDevMode: boolean) => Promise<boolean | null>;
     getClientConfig: () => void;
+    getCloudSubscription: () => void;
 }
 
 function mapDispatchToProps(dispatch: Dispatch<GenericAction>) {
@@ -48,6 +46,7 @@ function mapDispatchToProps(dispatch: Dispatch<GenericAction>) {
                 getCloudProducts,
                 completeStripeAddPaymentMethod,
                 getClientConfig,
+                getCloudSubscription,
             },
             dispatch,
         ),

diff --git a/components/purchase_modal/purchase_modal.tsx b/components/purchase_modal/purchase_modal.tsx
@@ -42,6 +42,7 @@ type Props = {
         getCloudProducts: () => void;
         completeStripeAddPaymentMethod: (stripe: Stripe, billingDetails: BillingDetails, isDevMode: boolean) => Promise<boolean | null>;
         getClientConfig: () => void;
+        getCloudSubscription: () => void;
     };
 }
 
@@ -245,7 +246,10 @@ export default class PurchaseModal extends React.PureComponent<Props, State> {
                                             this.props.actions.completeStripeAddPaymentMethod
                                         }
                                         isDevMode={this.props.isDevMode}
-                                        onClose={this.props.actions.closeModal}
+                                        onClose={() => {
+                                            this.props.actions.getCloudSubscription();
+                                            this.props.actions.closeModal();
+                                        }}
                                         onBack={() => {
                                             this.setState({processing: false});
                                         }}