move converting null

src/client/js/components/Admin/App/MailSetting.jsx

@@ -60,11 +60,12 @@ class MailSetting extends React.Component {
     try {
       const mailSettingParams = await adminAppContainer.initializeMailSettingHandler();
       toastSuccess(t('toaster.initialize_successed', { target: t('admin:app_setting.mail_settings') }));
-      this.emailInput.current.value = mailSettingParams.fromAddress;
-      this.hostInput.current.value = mailSettingParams.smtpHost;
-      this.portInput.current.value = mailSettingParams.smtpPort;
-      this.userInput.current.value = mailSettingParams.smtpUser;
-      this.passwordInput.current.value = mailSettingParams.smtpPassword;
+      // convert values to '' if value is null for overwriting values of inputs with refs
+      this.emailInput.current.value = mailSettingParams.fromAddress || '';
+      this.hostInput.current.value = mailSettingParams.smtpHost || '';
+      this.portInput.current.value = mailSettingParams.smtpPort || '';
+      this.userInput.current.value = mailSettingParams.smtpUser || '';
+      this.passwordInput.current.value = mailSettingParams.smtpPassword || '';
       this.closeInitializeValueModal();
     }
     catch (err) {

src/client/js/services/AdminAppContainer.js

@@ -273,15 +273,10 @@ export default class AdminAppContainer extends Container {
    * @return {Array} Appearance
    */
   async initializeMailSettingHandler() {
-    const { data } = await this.appContainer.apiv3.delete('/app-settings/mail-setting', {});
-    // convert values to '' if value is null for overwriting values of inputs with refs
-    const mailSettingParams = {
-      fromAddress: data.mailSettingParams.fromAddress || '',
-      smtpHost: data.mailSettingParams.smtpHost || '',
-      smtpPort: data.mailSettingParams.smtpPort || '',
-      smtpUser: data.mailSettingParams.smtpUser || '',
-      smtpPassword: data.mailSettingParams.smtpPassword || '',
-    };
+    const response = await this.appContainer.apiv3.delete('/app-settings/mail-setting', {});
+    const {
+      mailSettingParams,
+    } = response.data;
     this.setState(mailSettingParams);
     return mailSettingParams;
   }