From 1548979f843375ebe45c6fa038bc2a4f0fea5a6f Mon Sep 17 00:00:00 2001
From: Will <korea651@hanmail.net>
Date: Tue, 14 Mar 2023 20:37:29 +0900
Subject: [PATCH] Fix/release v0.0.22 (#709)

* fix typo

* hiding another modal when each modal appeared

* fix styling on light theme

* fix on feedback
---
 .../common/Notification/NotificationBar.vue     |  2 +-
 .../dapp-staking/stake-manage/StakeForm.vue     |  2 +-
 .../stake-manage/styles/stake-form.scss         |  6 ++++++
 src/components/header/Header.vue                | 17 +++++++++++++++--
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/components/common/Notification/NotificationBar.vue b/src/components/common/Notification/NotificationBar.vue
index b60a08612..ec672a872 100644
--- a/src/components/common/Notification/NotificationBar.vue
+++ b/src/components/common/Notification/NotificationBar.vue
@@ -215,7 +215,7 @@ export default defineComponent({
   padding-left: 12px;
   padding-right: 12px;
   margin-top: 8px;
-  word-break: break-all;
+  word-break: keep-all;
 }
 .btn--check {
   width: 90%;
diff --git a/src/components/dapp-staking/stake-manage/StakeForm.vue b/src/components/dapp-staking/stake-manage/StakeForm.vue
index ef48a8b36..a3f98d69f 100644
--- a/src/components/dapp-staking/stake-manage/StakeForm.vue
+++ b/src/components/dapp-staking/stake-manage/StakeForm.vue
@@ -73,7 +73,7 @@
       <div class="row--box-warning">
         <div class="column--title">
           <span class="text--dot">・</span>
-          <span class="color--white"> {{ $t(warningMsg) }}</span>
+          <span> {{ $t(warningMsg) }}</span>
         </div>
       </div>
       <div v-if="errMsg && currentAccount" class="row--box-error">
diff --git a/src/components/dapp-staking/stake-manage/styles/stake-form.scss b/src/components/dapp-staking/stake-manage/styles/stake-form.scss
index 1d6287630..1fe5fb7a5 100644
--- a/src/components/dapp-staking/stake-manage/styles/stake-form.scss
+++ b/src/components/dapp-staking/stake-manage/styles/stake-form.scss
@@ -58,9 +58,12 @@
   row-gap: 6px;
   border: 1px solid $border-yellow;
   padding: 8px 16px;
+  font-size: 14px;
+  font-weight: 500;
   width: 344px;
   border-radius: 6px;
   background: $transparent-yellow;
+  color: $warning-yellow;
   @media (min-width: $sm) {
     width: 412px;
   }
@@ -203,6 +206,9 @@
   input {
     color: white;
   }
+  .row--box-warning {
+    color: $gray-1;
+  }
   .row--box-error {
     background: $box-red-dark;
   }
diff --git a/src/components/header/Header.vue b/src/components/header/Header.vue
index 662ce6e69..b70fe98a7 100644
--- a/src/components/header/Header.vue
+++ b/src/components/header/Header.vue
@@ -10,13 +10,14 @@
         </connect-button>
       </template>
       <template v-else>
-        <account-button :account="currentAccount" @click="changeAccount" />
+        <account-button :account="currentAccount" @click="clickAccountBtn" />
       </template>
-      <network-button @show-network="modalNetwork = true" />
+      <network-button @show-network="clickNetworkBtn" />
     </header-comp>
 
     <!-- Modals -->
     <modal-network
+      v-if="modalNetwork"
       v-model:isOpen="modalNetwork"
       v-model:selectNetwork="currentNetworkIdx"
       :network-idx="currentNetworkIdx"
@@ -110,6 +111,16 @@ export default defineComponent({
       disconnectAccount,
     } = useConnectWallet();
 
+    const clickAccountBtn = () => {
+      changeAccount();
+      stateModal.modalNetwork = false;
+    };
+
+    const clickNetworkBtn = () => {
+      stateModal.modalNetwork = true;
+      modalAccountSelect.value = false;
+    };
+
     const store = useStore();
     const currentNetworkIdx = computed(() => store.getters['general/networkIdx']);
     const route = useRoute();
@@ -138,6 +149,8 @@ export default defineComponent({
       modalAccountSelect,
       width,
       screenSize,
+      clickAccountBtn,
+      clickNetworkBtn,
       setCloseModal,
       setWalletModal,
       openSelectModal,