From 6258ef0c1111a79123026a0f4898d5a642f77980 Mon Sep 17 00:00:00 2001
From: Son NK <>
Date: Sun, 5 Apr 2020 12:02:08 +0200
Subject: [PATCH] Only display website_email instead of website_from in contact
 manager, alias log and refused emails

---
 app/dashboard/templates/dashboard/alias_contact_manager.html | 2 +-
 app/dashboard/templates/dashboard/alias_log.html             | 4 ++--
 app/dashboard/templates/dashboard/refused_email.html         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/dashboard/templates/dashboard/alias_contact_manager.html b/app/dashboard/templates/dashboard/alias_contact_manager.html
index e14a4339..afbac27c 100644
--- a/app/dashboard/templates/dashboard/alias_contact_manager.html
+++ b/app/dashboard/templates/dashboard/alias_contact_manager.html
@@ -66,7 +66,7 @@
           </div>
 
           <div>
-            <i class="fe fe-mail"></i> ➡ {{ contact.website_from or contact.website_email }}
+            <i class="fe fe-mail"></i> ➡ {{ contact.website_email }}
           </div>
 
           <div class="mb-2 text-muted small-text">
diff --git a/app/dashboard/templates/dashboard/alias_log.html b/app/dashboard/templates/dashboard/alias_log.html
index 201128f4..5cd8bfb4 100644
--- a/app/dashboard/templates/dashboard/alias_log.html
+++ b/app/dashboard/templates/dashboard/alias_log.html
@@ -111,13 +111,13 @@
 
           <div>
             {% if log.bounced %}
-              <span class="mr-2">{{ log.website_from or log.website_email }}</span>
+              <span class="mr-2">{{ log.website_email }}</span>
               <img src="{{ url_for('static', filename='arrows/forward-arrow.svg') }}" class="arrow">
               <span class="ml-2">{{ log.alias }}</span>
               <img src="{{ url_for('static', filename='arrows/blocked-arrow.svg') }}" class="arrow">
               <span class="ml-2">{{ log.mailbox }}</span>
             {% else %}
-              <span class="mr-2">{{ log.website_from or log.website_email }}</span>
+              <span class="mr-2">{{ log.website_email }}</span>
 
               <span>
               {% if log.is_reply %}
diff --git a/app/dashboard/templates/dashboard/refused_email.html b/app/dashboard/templates/dashboard/refused_email.html
index a630a3fa..f4073877 100644
--- a/app/dashboard/templates/dashboard/refused_email.html
+++ b/app/dashboard/templates/dashboard/refused_email.html
@@ -38,7 +38,7 @@
           Sent {{ refused_email.created_at | dt }}
         </div>
 
-        From: {{ forward.website_from or forward.website_email }} <br>
+        From: {{ forward.website_email }} <br>
 
         <span>
           To: {{ alias.email }}