Fix amdinDomain not passed to the MailRelaySettingsItem

dashboard/src/components/MailRelaySettingsItem.vue

@@ -8,7 +8,8 @@ import { RELAY_PROVIDERS } from '../constants.js';
 import { prettyRelayProviderName } from '../utils';
 
 const props = defineProps({
-  domain: { type: String, required: true }
+  domain: { type: String, required: true },
+  adminDomain: { type: String, required: true }
 });
 
 const mailModel = MailModel.create();
@@ -22,7 +23,6 @@ const mailConfig = ref({});
 const dialog = useTemplateRef('dialog');
 const busy = ref(false);
 const formError = ref('');
-const adminDomain = ref('');
 const currentProvider = ref('cloudron-smtp');
 const provider = ref('cloudron-smtp');
 const host = ref('');
@@ -213,7 +213,7 @@ onMounted(async () => {
       <FormGroup>
         <label>{{ $t('email.outbound.title') }} <sup><a href="https://docs.cloudron.io/email/#relay-outbound-mails" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
         <div>
-          <b>{{ prettyRelayProviderName(currentProvider) }}</b> - <span v-html="$t('email.outbound.description')"></span>
+          <span>{{ prettyRelayProviderName(currentProvider) }}</span> / <span v-html="$t('email.outbound.description')"></span>
         </div>
       </FormGroup>
       <div style="display: flex; align-items: center;">

dashboard/src/constants.js

@@ -331,7 +331,7 @@ const RELAY_PROVIDERS = [
   { provider: 'postmark-smtp', name: 'Postmark', host: 'smtp.postmarkapp.com', port: 587, spfDoc: 'https://postmarkapp.com/support/article/1092-how-do-i-set-up-spf-for-postmark' },
   { provider: 'sendgrid-smtp', name: 'SendGrid', host: 'smtp.sendgrid.net', port: 587, username: 'apikey', spfDoc: 'https://sendgrid.com/docs/ui/account-and-settings/spf-records/' },
   { provider: 'sparkpost-smtp', name: 'SparkPost', host: 'smtp.sparkpostmail.com', port: 587, username: 'SMTP_Injection', spfDoc: 'https://www.sparkpost.com/resources/email-explained/spf-sender-policy-framework/' },
-  { provider: 'noop', name: 'Disable' },
+  { provider: 'noop', name: 'Disabled' },
 ];
 
 // named exports

dashboard/src/views/EmailDomainView.vue

@@ -256,6 +256,8 @@ onMounted(async () => {
        reject-style="secondary"
       @confirm="onSubmitSignature()"
     >
+      <p v-html="$t('email.signature.description')"></p>
+
       <div>
         <form @submit.prevent="onSubmitSignature()" autocomplete="off">
           <fieldset :disabled="signatureBusy">
@@ -285,7 +287,7 @@ onMounted(async () => {
         <Button @click="onSendTestMail">{{ $t('emails.domains.testEmailTooltip') }}</Button>
       </template>
 
-      <MailRelaySettingsItem v-if="domain" :domain="domain"/>
+      <MailRelaySettingsItem v-if="domain" :domain="domain" :adminDomain="adminDomain"/>
 
       <SettingsItem>
         <FormGroup>
@@ -298,7 +300,8 @@ onMounted(async () => {
       <SettingsItem>
         <FormGroup>
           <label>{{ $t('email.signature.title') }}</label>
-          <div v-html="$t('email.signature.description')"></div>
+          <div v-if="signatureHtml || signatureText">{{ $t('email.signature.customSignatureSet') }}</div>
+          <div v-else>{{ $t('email.signature.noSignatureSet') }}</div>
         </FormGroup>
         <div style="display: flex; align-items: center">
           <Button tool plain @click="onShowSignatureDialog()">{{ $t('main.dialog.edit') }}</Button>