From 7d591baea5e5f5d8a1bdd75438ab4d331a585570 Mon Sep 17 00:00:00 2001
From: Son <nguyenkims@users.noreply.github.com>
Date: Thu, 5 May 2022 14:57:32 +0200
Subject: [PATCH 1/2] handle case user doesn't have default domain for alias

when user doesn't have default domain for alias, display "Not Selected" to avoid confusion
---
 templates/dashboard/setting.html | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/templates/dashboard/setting.html b/templates/dashboard/setting.html
index 5eda0caa..7eeff817 100644
--- a/templates/dashboard/setting.html
+++ b/templates/dashboard/setting.html
@@ -274,12 +274,21 @@
         <form method="post" action="#random-alias" class="form-inline">
           <input type="hidden" name="form-name" value="change-random-alias-default-domain">
           <select class="form-control mr-sm-2" name="random-alias-default-domain">
-            {% for is_public, domain in current_user.available_domains_for_random_alias() %}
-              <option value="{{ domain }}"
-                  {% if current_user.default_random_alias_domain() == domain %} selected {% endif %} >
-                {{ domain }} ({% if is_public %} SimpleLogin domain {% else %} your domain {% endif %})
-              </option>
-            {% endfor %}
+            <option value="">Not Selected</option>
+            {% if current_user.default_alias_custom_domain_id or current_user.default_alias_public_domain_id %}
+              {% for is_public, domain in current_user.available_domains_for_random_alias() %}
+                <option value="{{ domain }}"
+                    {% if current_user.default_random_alias_domain() == domain %} selected {% endif %} >
+                  {{ domain }} ({% if is_public %} SimpleLogin domain {% else %} your domain {% endif %})
+                </option>
+              {% endfor %}
+            {% else %}
+              {% for is_public, domain in current_user.available_domains_for_random_alias() %}
+                <option value="{{ domain }}">
+                  {{ domain }} ({% if is_public %} SimpleLogin domain {% else %} your domain {% endif %})
+                </option>
+              {% endfor %}
+            {% endif %}
           </select>
           <button class="btn btn-outline-primary">Update</button>
         </form>
@@ -565,7 +574,7 @@
 
           <div class="form-check">
             <input type="checkbox" id="include-sender-header" name="enable"
-                    {% if current_user.include_header_email_header %} checked {% endif %} class="form-check-input">
+                {% if current_user.include_header_email_header %} checked {% endif %} class="form-check-input">
             <label for="include-sender-header">Include sender address in email headers</label>
           </div>
 

From f3b41279a9d3963bccfe658115fb746673d6e15e Mon Sep 17 00:00:00 2001
From: Son <nguyenkims@users.noreply.github.com>
Date: Wed, 11 May 2022 19:09:51 +0200
Subject: [PATCH 2/2] simplify template

---
 templates/dashboard/setting.html | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/templates/dashboard/setting.html b/templates/dashboard/setting.html
index 7eeff817..8e2d0ab2 100644
--- a/templates/dashboard/setting.html
+++ b/templates/dashboard/setting.html
@@ -275,20 +275,15 @@
           <input type="hidden" name="form-name" value="change-random-alias-default-domain">
           <select class="form-control mr-sm-2" name="random-alias-default-domain">
             <option value="">Not Selected</option>
-            {% if current_user.default_alias_custom_domain_id or current_user.default_alias_public_domain_id %}
-              {% for is_public, domain in current_user.available_domains_for_random_alias() %}
-                <option value="{{ domain }}"
-                    {% if current_user.default_random_alias_domain() == domain %} selected {% endif %} >
-                  {{ domain }} ({% if is_public %} SimpleLogin domain {% else %} your domain {% endif %})
-                </option>
-              {% endfor %}
-            {% else %}
-              {% for is_public, domain in current_user.available_domains_for_random_alias() %}
-                <option value="{{ domain }}">
-                  {{ domain }} ({% if is_public %} SimpleLogin domain {% else %} your domain {% endif %})
-                </option>
-              {% endfor %}
-            {% endif %}
+            {% for is_public, domain in current_user.available_domains_for_random_alias() %}
+              <option value="{{ domain }}"
+                  {% if current_user.default_alias_custom_domain_id or current_user.default_alias_public_domain_id %}
+                    {% if current_user.default_random_alias_domain() == domain %} selected {% endif %}
+                  {% endif %}
+              >
+              {{ domain }} ({% if is_public %} SimpleLogin domain {% else %} your domain {% endif %})
+              </option>
+            {% endfor %}
           </select>
           <button class="btn btn-outline-primary">Update</button>
         </form>