enable isMailerActive

src/client/js/services/AdminAppContainer.js

@@ -63,9 +63,7 @@ export default class AdminAppContainer extends Container {
       siteUrl: appSettingsParams.siteUrl,
       envSiteUrl: appSettingsParams.envSiteUrl,
       isSetSiteUrl: !!appSettingsParams.siteUrl,
-      // GW-3714 manage mailer state
-      isMailerActive: true,
-      // isMailerActive: appSettingsParams.isMailerActive,
+      isMailerActive: appSettingsParams.isMailerActive,
       fromAddress: appSettingsParams.fromAddress,
       smtpHost: appSettingsParams.smtpHost,
       smtpPort: appSettingsParams.smtpPort,
@@ -265,9 +263,7 @@ export default class AdminAppContainer extends Container {
       smtpPassword: this.state.smtpPassword,
     });
     const { mailSettingParams } = response.data;
-    // GW-3714 manage mailer state
-    this.setState({ isMailerActive: true });
-    // this.setState({ isMailerActive: mailSettingParams.isMailerActive });
+    this.setState({ isMailerActive: mailSettingParams.isMailerActive });
     return mailSettingParams;
   }
 
@@ -282,9 +278,7 @@ export default class AdminAppContainer extends Container {
       sesSecretAccessKey: this.state.sesSecretAccessKey,
     });
     const { mailSettingParams } = response.data;
-    // GW-3714 manage mailer state
-    this.setState({ isMailerActive: true });
-    // this.setState({ isMailerActive: mailSettingParams.isMailerActive });
+    this.setState({ isMailerActive: mailSettingParams.isMailerActive });
     return mailSettingParams;
   }
 
@@ -293,7 +287,9 @@ export default class AdminAppContainer extends Container {
    * @memberOf AdminAppContainer
    */
   async sendTestEmail() {
-    return this.appContainer.apiv3.post('/app-settings/smtp-test');
+    const response = await this.appContainer.apiv3.post('/app-settings/smtp-test');
+    this.setState({ isMailerActive: response.data.isMailerActive });
+    return response.data;
   }
 
   /**