From d7b4eaa2603d845ab5a28e8fff24f026067cefbd Mon Sep 17 00:00:00 2001
From: ngxson <thichthat@gmail.com>
Date: Wed, 5 Aug 2020 12:31:18 +0200
Subject: [PATCH] change Alias name to From name

---
 src/popup/components/Main.vue | 29 +++++++++++++++--------------
 src/popup/popup.js            |  4 +++-
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/popup/components/Main.vue b/src/popup/components/Main.vue
index 185b240..0f2b6cc 100644
--- a/src/popup/components/Main.vue
+++ b/src/popup/components/Main.vue
@@ -143,16 +143,11 @@
                   v-clipboard="() => alias.email"
                   v-clipboard:success="clipboardSuccessHandler"
                   v-clipboard:error="clipboardErrorHandler"
-                  v-b-tooltip.hover.top="
-                    alias.name ? 'Copy ' + alias.email : 'Click to Copy'
-                  "
+                  v-b-tooltip.hover.top="'Click to Copy'"
                 >
                   <a class="cursor">
-                    {{ alias.name ? alias.name : alias.email }}
-                  </a>
-                  <div class="email-sub" v-if="alias.name">
                     {{ alias.email }}
-                  </div>
+                  </a>
                   <div class="list-item-email-fade" />
                 </div>
                 <div style="white-space: nowrap;">
@@ -190,13 +185,6 @@
 
               <expand-transition>
                 <div class="more-options" v-if="alias.moreOptions">
-                  <label>Alias Name</label>
-                  <b-input
-                    v-model="alias.moreOptions.name"
-                    placeholder="Alias name"
-                    :disabled="alias.moreOptions.loading"
-                  />
-
                   <label>Alias Note</label>
                   <textarea-autosize
                     placeholder="Note, can be anything to help you remember why you created this alias. This field is optional."
@@ -206,6 +194,19 @@
                     :disabled="alias.moreOptions.loading"
                   ></textarea-autosize>
 
+                  <label>
+                    From Name
+                    <font-awesome-icon
+                      v-b-tooltip.hover.top="'This name is used when you send or reply from alias'"
+                      icon="question-circle"
+                    />
+                  </label>
+                  <b-input
+                    v-model="alias.moreOptions.name"
+                    placeholder="From name"
+                    :disabled="alias.moreOptions.loading"
+                  />
+
                   <div class="advanced-options mt-2" v-if="alias.moreOptions.showAdvanced">
                     <b-form-checkbox
                       :checked="!alias.moreOptions.disable_pgp"
diff --git a/src/popup/popup.js b/src/popup/popup.js
index c284f54..9be7919 100644
--- a/src/popup/popup.js
+++ b/src/popup/popup.js
@@ -24,6 +24,7 @@ import {
   faStar,
   faSave,
   faBug,
+  faQuestionCircle,
 } from "@fortawesome/free-solid-svg-icons";
 
 library.add(
@@ -35,7 +36,8 @@ library.add(
   faCopy,
   faStar,
   faSave,
-  faBug
+  faBug,
+  faQuestionCircle,
 );
 
 global.browser = require("webextension-polyfill");