From e4c4797cdb42f29b702d9075bd23ae27de4bd862 Mon Sep 17 00:00:00 2001
From: Son NK <>
Date: Mon, 31 Aug 2020 17:11:18 +0200
Subject: [PATCH] do not mark a domain as unverified if it fails the MX check

---
 .../templates/dashboard/domain_detail/dns.html        | 11 ++++++++---
 app/dashboard/views/domain_detail.py                  |  3 +--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/dashboard/templates/dashboard/domain_detail/dns.html b/app/dashboard/templates/dashboard/domain_detail/dns.html
index f7fdf3ac..d869b28d 100644
--- a/app/dashboard/templates/dashboard/domain_detail/dns.html
+++ b/app/dashboard/templates/dashboard/domain_detail/dns.html
@@ -71,7 +71,10 @@
             {% endfor %}
           </div>
           {% if custom_domain.verified %}
-            Please make sure to fix this ASAP - your aliases might not work properly.
+            <div class="alert alert-danger">
+              Without the MX record set up correctly, you can miss emails sent to your aliases.
+              Please update the MX record ASAP.
+            </div>
           {% endif %}
         </div>
       {% endif %}
@@ -89,7 +92,8 @@
       </div>
 
       <div>
-        SPF <a href="https://en.wikipedia.org/wiki/Sender_Policy_Framework" target="_blank" rel="noopener">(Wikipedia↗)</a> is an email
+        SPF <a href="https://en.wikipedia.org/wiki/Sender_Policy_Framework" target="_blank"
+               rel="noopener">(Wikipedia↗)</a> is an email
         authentication method
         designed to detect forging sender addresses during the delivery of the email. <br>
         Setting up SPF is highly recommended to reduce the chance your emails ending up in the recipient's Spam folder.
@@ -153,7 +157,8 @@
       </div>
 
       <div>
-        DKIM <a href="https://en.wikipedia.org/wiki/DomainKeys_Identified_Mail" target="_blank" rel="noopener">(Wikipedia↗)</a> is an
+        DKIM <a href="https://en.wikipedia.org/wiki/DomainKeys_Identified_Mail" target="_blank" rel="noopener">(Wikipedia↗)</a>
+        is an
         email
         authentication method
         designed to avoid email spoofing. <br>
diff --git a/app/dashboard/views/domain_detail.py b/app/dashboard/views/domain_detail.py
index ba3eb536..4d539175 100644
--- a/app/dashboard/views/domain_detail.py
+++ b/app/dashboard/views/domain_detail.py
@@ -37,8 +37,7 @@ def domain_detail_dns(custom_domain_id):
 
             if sorted(mx_domains) != sorted(EMAIL_SERVERS_WITH_PRIORITY):
                 flash("The MX record is not correctly set", "warning")
-                custom_domain.verified = False
-                db.session.commit()
+
                 mx_ok = False
                 # build mx_errors to show to user
                 mx_errors = [