From f86c9f929efe4b6e6ff3a2191cebcb2d47a4dc3e Mon Sep 17 00:00:00 2001
From: ngxson <thichthat@gmail.com>
Date: Wed, 15 Jul 2020 19:00:52 +0200
Subject: [PATCH] small UI changes

---
 src/popup/components/Header.vue         |  2 +-
 src/popup/components/Login.vue          |  2 +-
 src/popup/components/Main.vue           | 14 +++++++-------
 src/popup/components/NewAliasResult.vue |  3 ++-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/popup/components/Header.vue b/src/popup/components/Header.vue
index 797b949..ead3a01 100644
--- a/src/popup/components/Header.vue
+++ b/src/popup/components/Header.vue
@@ -33,7 +33,7 @@
           class="float-right"
           style="padding: 0.25rem 0.5rem; font-size: 0.875rem;"
         >
-          <font-awesome-icon icon="external-link-alt" /> Dashboard
+          Dashboard <font-awesome-icon icon="external-link-alt" />
         </a>
 
         <div
diff --git a/src/popup/components/Login.vue b/src/popup/components/Login.vue
index 79b9b2e..e4ed667 100644
--- a/src/popup/components/Login.vue
+++ b/src/popup/components/Login.vue
@@ -41,7 +41,7 @@
           target="_blank"
           class="mt-2 btn btn-outline-success btn-block"
         >
-          <font-awesome-icon icon="external-link-alt" /> Sign Up
+          Sign Up <font-awesome-icon icon="external-link-alt" />
         </a>
       </div>
 
diff --git a/src/popup/components/Main.vue b/src/popup/components/Main.vue
index a84ad03..b18b4e5 100644
--- a/src/popup/components/Main.vue
+++ b/src/popup/components/Main.vue
@@ -44,11 +44,6 @@
         </button>
       </div>
 
-      <div class="small-text mb-1" v-if="aliasPrefix">
-        Alias is autofilled by the current website name, please feel free to
-        change it.
-      </div>
-
       <div>
         <form @submit.prevent="createCustomAlias">
           <div class="row mb-2">
@@ -98,6 +93,11 @@
         </form>
       </div>
 
+      <div class="small-text mb-1" v-if="aliasPrefix">
+        Alias is autofilled by the current website name, please feel free to
+        change it.
+      </div>
+
       <div v-if="!canCreate">
         <p class="text-danger" style="font-size: 14px;">
           You have reached limit number of email aliases in free plan, please
@@ -354,7 +354,7 @@ export default {
 
         if (res.status === 201) {
           SLStorage.setTemporary("newAliasData", res.data);
-          Navigation.navigateTo(Navigation.PATH.NEW_ALIAS_RESULT, true);
+          Navigation.navigateTo(Navigation.PATH.NEW_ALIAS_RESULT);
         } else {
           Utils.showError(res.data.error);
         }
@@ -396,7 +396,7 @@ export default {
 
         if (res.status === 201) {
           SLStorage.setTemporary("newAliasData", res.data);
-          Navigation.navigateTo(Navigation.PATH.NEW_ALIAS_RESULT, true);
+          Navigation.navigateTo(Navigation.PATH.NEW_ALIAS_RESULT);
         } else {
           Utils.showError(res.data.error);
         }
diff --git a/src/popup/components/NewAliasResult.vue b/src/popup/components/NewAliasResult.vue
index d55a0e2..fb3b130 100644
--- a/src/popup/components/NewAliasResult.vue
+++ b/src/popup/components/NewAliasResult.vue
@@ -84,6 +84,7 @@ export default {
   },
   async mounted() {
     this.newAlias = this.$route.params.email;
+    this.note = `Used on ${await Utils.getHostName()}`;
     let notAskingRate = await SLStorage.get(SLStorage.SETTINGS.NOT_ASKING_RATE);
     if (!!notAskingRate) this.showVoteScreen = false;
     // TODO showVoteScreen 1 day after user installed plugin
@@ -114,7 +115,7 @@ export default {
         );
         this.loading = false;
       }
-      Navigation.navigateBack();
+      Navigation.navigateTo(Navigation.PATH.MAIN);
     },
 
     doNotAskRateAgain() {