From db33b6de1ef979d4f2d40b753724f047d09c1718 Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Fri, 27 Dec 2019 16:04:27 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9B=B9=EB=A7=81=ED=81=AC=20=EB=B1=83?=
 =?UTF-8?q?=EC=A7=80=200=EC=9D=BC=EB=95=8C=20=EB=AF=B8=ED=91=9C=EC=8B=9C?=
 =?UTF-8?q?=20=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layouts/native/components/top-bar.component.html   |  8 +++++---
 .../app/layouts/native/components/top-bar.component.ts | 10 +++++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html
index eded2a25..f890a17a 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html
@@ -60,13 +60,15 @@
       (click)="onClickNotice()"
     >
       <svg class="svg-icon" viewBox="0 0 24 24" fill="currentColor">
-      <path d="M22.13,8.91h-1.94V1.56c0-0.31-0.18-0.58-0.47-0.7c-0.28-0.12-0.61-0.05-0.82,0.16c-3.35,3.35-6.25,4.95-8.09,5.7
+        <path
+          d="M22.13,8.91h-1.94V1.56c0-0.31-0.18-0.58-0.47-0.7c-0.28-0.12-0.61-0.05-0.82,0.16c-3.35,3.35-6.25,4.95-8.09,5.7
       	C8.82,7.54,7.61,7.56,7.6,7.56H1.87c-0.42,0-0.76,0.34-0.76,0.76v6.76c0,0.42,0.34,0.76,0.76,0.76h0.77l2.86,6.9
       	c0.12,0.28,0.39,0.47,0.7,0.47h4.19c0,0,0,0,0,0c0.42,0,0.76-0.34,0.76-0.76c0-0.12-0.03-0.23-0.08-0.33l-2.55-6.16
       	c1.69,0.33,5.57,1.6,10.38,6.42c0.14,0.14,0.34,0.22,0.53,0.22c0,0,0.01,0,0.01,0c0.41-0.01,0.74-0.34,0.74-0.76
       	c0-0.02,0-0.03,0-0.05l0-7.31h1.94c0.42,0,0.76-0.34,0.76-0.76V9.67C22.88,9.25,22.54,8.91,22.13,8.91z M2.63,9.07h4.22v5.25H2.63
       	V9.07z M6.7,21.68l-2.35-5.67h2.55l2.35,5.67H6.7z M8.36,14.39V9c1.57-0.24,5.45-1.26,10.31-5.68v6.34v0v4.05c0,0,0,0,0,0l0,6.34
-      	C13.81,15.65,9.93,14.63,8.36,14.39z M21.37,12.97h-1.19v-2.54h1.19V12.97z" />
+      	C13.81,15.65,9.93,14.63,8.36,14.39z M21.37,12.97h-1.19v-2.54h1.19V12.97z"
+        />
       </svg>
     </button>
 
@@ -224,7 +226,7 @@
         <li *ngFor="let link of weblink" (click)="onClickWebLink(link)">
           <div
             class="icon"
-            [matBadgeHidden]="getShowWebLinkbadge(link)"
+            [matBadgeHidden]="getHideWebLinkbadge(link)"
             [matBadge]="getWebLinkBadgeCount(link)"
             matBadgeDescription="확인하지 않은 메시지가 있습니다."
             matBadgeColor="accent"
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts
index 41b79a3f..3e89267e 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts
@@ -244,10 +244,18 @@ export class TopBarComponent implements OnInit, OnDestroy {
 
     this.nativeService.openDefaultBrowser(url);
   }
-  getShowWebLinkbadge(link: WebLink): boolean {
+  getHideWebLinkbadge(link: WebLink): boolean {
     const showType = ['WebLinkMail', 'WebLinkPayment'];
 
     if (showType.indexOf(link.key) > -1) {
+      if (link.key === 'WebLinkMail' && this.webLinkBadgeMail === 0) {
+        return true;
+      } else if (
+        link.key === 'WebLinkPayment' &&
+        this.webLinkBadgePayment === 0
+      ) {
+        return true;
+      }
       return false;
     } else {
       return true;