From 53dcd8b28f949361f399dc14f3722a063c6ac311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Wed, 4 Jan 2023 22:15:24 +0800
Subject: [PATCH] fix: resolve conflicts

---
 components/user/UserDropdown.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/user/UserDropdown.vue b/components/user/UserDropdown.vue
index 4557aee3..8b811be7 100644
--- a/components/user/UserDropdown.vue
+++ b/components/user/UserDropdown.vue
@@ -3,7 +3,7 @@
     <button btn-action-icon :aria-label="$t('action.switch_account')">
       <!-- TODO -->
       <div :class="{ 'hidden xl:block': !isGuest }" i-ri:more-2-line />
-      <AccountAvatar v-if="!isGuest" xl:hidden :account="account" w-9 h-9 />
+      <AccountAvatar v-if="!isGuest" xl:hidden :account="currentUser.account" w-9 h-9 />
       <span v-else>TODO: Guest</span>
     </button>
     <template #popper="{ hide }">