From 7d7a6920b289343d086bcf49bd063f5525c4aba5 Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Fri, 26 Jul 2024 13:05:20 +0900
Subject: [PATCH 1/3] fix: show account only if available

---
 apps/ui/src/components/App/Topnav.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/ui/src/components/App/Topnav.vue b/apps/ui/src/components/App/Topnav.vue
index cd2b71cbe..3b5c64cba 100644
--- a/apps/ui/src/components/App/Topnav.vue
+++ b/apps/ui/src/components/App/Topnav.vue
@@ -123,7 +123,7 @@ watch(
           @click="modalAccountOpen = true"
         >
           <span
-            v-if="auth.isAuthenticated.value"
+            v-if="auth.isAuthenticated.value && web3.account"
             class="sm:flex items-center space-x-2"
           >
             <UiStamp :id="web3.account" :size="18" />

From 9a85c61a0fe5905bdd7db8b20222dea99e201c3b Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Fri, 26 Jul 2024 13:57:00 +0900
Subject: [PATCH 2/3] fix: show specific message when wallet action is required

---
 apps/ui/src/components/App/Topnav.vue | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/apps/ui/src/components/App/Topnav.vue b/apps/ui/src/components/App/Topnav.vue
index 3b5c64cba..5dc4379a6 100644
--- a/apps/ui/src/components/App/Topnav.vue
+++ b/apps/ui/src/components/App/Topnav.vue
@@ -123,14 +123,20 @@ watch(
           @click="modalAccountOpen = true"
         >
           <span
-            v-if="auth.isAuthenticated.value && web3.account"
+            v-if="auth.isAuthenticated.value"
             class="sm:flex items-center space-x-2"
           >
-            <UiStamp :id="web3.account" :size="18" />
-            <span
-              class="hidden sm:block"
-              v-text="web3.name || shorten(web3.account)"
-            />
+            <template v-if="web3.account">
+              <UiStamp :id="web3.account" :size="18" />
+              <span
+                class="hidden sm:block"
+                v-text="web3.name || shorten(web3.account)"
+              />
+            </template>
+            <div v-else class="flex space-x-2 items-center">
+              <UiLoading />
+              <span>Waiting for your wallet</span>
+            </div>
           </span>
           <template v-else>
             <span class="hidden sm:block" v-text="'Connect wallet'" />

From e840ee43c2e2a07f6c6ca770c1c96d8bebedd66a Mon Sep 17 00:00:00 2001
From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com>
Date: Sat, 27 Jul 2024 12:15:07 +0900
Subject: [PATCH 3/3] fix: revert changes

---
 apps/ui/src/components/App/Topnav.vue | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/apps/ui/src/components/App/Topnav.vue b/apps/ui/src/components/App/Topnav.vue
index 5dc4379a6..cd2b71cbe 100644
--- a/apps/ui/src/components/App/Topnav.vue
+++ b/apps/ui/src/components/App/Topnav.vue
@@ -126,17 +126,11 @@ watch(
             v-if="auth.isAuthenticated.value"
             class="sm:flex items-center space-x-2"
           >
-            <template v-if="web3.account">
-              <UiStamp :id="web3.account" :size="18" />
-              <span
-                class="hidden sm:block"
-                v-text="web3.name || shorten(web3.account)"
-              />
-            </template>
-            <div v-else class="flex space-x-2 items-center">
-              <UiLoading />
-              <span>Waiting for your wallet</span>
-            </div>
+            <UiStamp :id="web3.account" :size="18" />
+            <span
+              class="hidden sm:block"
+              v-text="web3.name || shorten(web3.account)"
+            />
           </span>
           <template v-else>
             <span class="hidden sm:block" v-text="'Connect wallet'" />