Removed trial announcement bar

webapp/channels/src/components/announcement_bar/announcement_bar_controller.tsx

@@ -10,14 +10,9 @@ import withGetCloudSubscription from 'components/common/hocs/cloud/with_get_clou
 
 import CloudAnnualRenewalAnnouncementBar from './cloud_annual_renewal';
 import CloudDelinquencyAnnouncementBar from './cloud_delinquency';
-import CloudTrialAnnouncementBar from './cloud_trial_announcement_bar';
-import CloudTrialEndAnnouncementBar from './cloud_trial_ended_announcement_bar';
 import ConfigurationAnnouncementBar from './configuration_bar';
 import AnnouncementBar from './default_announcement_bar';
 import OverageUsersBanner from './overage_users_banner';
-import PaymentAnnouncementBar from './payment_announcement_bar';
-import AutoStartTrialModal from './show_start_trial_modal/show_start_trial_modal';
-import ShowThreeDaysLeftTrialModal from './show_tree_days_left_trial_modal/show_three_days_left_trial_modal';
 import TextDismissableBar from './text_dismissable_bar';
 import UsersLimitsAnnouncementBar from './users_limits_announcement_bar';
 import VersionBar from './version_bar';
@@ -64,24 +59,12 @@ class AnnouncementBarController extends React.PureComponent<Props> {
             );
         }
 
-        let paymentAnnouncementBar = null;
-        let cloudTrialAnnouncementBar = null;
-        let cloudTrialEndAnnouncementBar = null;
         let cloudDelinquencyAnnouncementBar = null;
         let cloudRenewalAnnouncementBar = null;
         const notifyAdminDowngradeDelinquencyBar = null;
         const toYearlyNudgeBannerDismissable = null;
         let toPaidPlanNudgeBannerDismissable = null;
         if (this.props.license?.Cloud === 'true') {
-            paymentAnnouncementBar = (
-                <PaymentAnnouncementBar/>
-            );
-            cloudTrialAnnouncementBar = (
-                <CloudTrialAnnouncementBar/>
-            );
-            cloudTrialEndAnnouncementBar = (
-                <CloudTrialEndAnnouncementBar/>
-            );
             cloudDelinquencyAnnouncementBar = (
                 <CloudDelinquencyAnnouncementBar/>
             );
@@ -91,13 +74,6 @@ class AnnouncementBarController extends React.PureComponent<Props> {
             toPaidPlanNudgeBannerDismissable = (<ToPaidPlanBannerDismissable/>);
         }
 
-        let autoStartTrialModal = null;
-        if (this.props.userIsAdmin) {
-            autoStartTrialModal = (
-                <AutoStartTrialModal/>
-            );
-        }
-
         return (
             <>
                 {adminConfiguredAnnouncementBar}
@@ -106,17 +82,12 @@ class AnnouncementBarController extends React.PureComponent<Props> {
                     license={this.props.license}
                     userIsAdmin={this.props.userIsAdmin}
                 />
-                {paymentAnnouncementBar}
-                {cloudTrialAnnouncementBar}
-                {cloudTrialEndAnnouncementBar}
                 {cloudDelinquencyAnnouncementBar}
                 {cloudRenewalAnnouncementBar}
                 {notifyAdminDowngradeDelinquencyBar}
                 {toYearlyNudgeBannerDismissable}
                 {toPaidPlanNudgeBannerDismissable}
                 {this.props.license?.Cloud !== 'true' && <OverageUsersBanner/>}
-                {autoStartTrialModal}
-                <ShowThreeDaysLeftTrialModal/>
                 <VersionBar/>
                 <ConfigurationAnnouncementBar
                     config={this.props.config}