From 41fb1b14a01221824bae1fdad125df53ef2b1625 Mon Sep 17 00:00:00 2001
From: richard-loafle <44828666+richard-loafle@users.noreply.github.com>
Date: Wed, 22 Jan 2020 16:37:47 +0900
Subject: [PATCH] bug fixed

---
 .../native/components/top-bar.component.html  | 17 +++++++++-------
 .../native/components/top-bar.component.ts    | 20 ++++++++++---------
 2 files changed, 21 insertions(+), 16 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 c4cf8803..5d3c03b4 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
@@ -256,6 +256,7 @@
   class="myset"
   xPosition="after"
   yPosition="below"
+  (closed)="onClosedProfileMenu($event)"
 >
   <div class="setting">
     <button mat-menu-item [matMenuTriggerFor]="presenseMenu">
@@ -309,12 +310,14 @@
     </button>
   </div>
   <mat-divider></mat-divider>
-  <div
-    class="setting menu-item"
-    [matMenuTriggerFor]="informationMenu"
-    (click)="onClickCheckForUpdates($event)"
-  >
-    {{ 'information.checkForUpdates' | translate }}
+  <div class="setting">
+    <button
+      mat-menu-item
+      [matMenuTriggerFor]="informationMenu"
+      (menuOpened)="onMenuOpenedinformationMenu()"
+    >
+      {{ 'information.checkForUpdates' | translate }}
+    </button>
   </div>
   <mat-divider></mat-divider>
   <div class="setting">
@@ -432,7 +435,7 @@
   </mat-radio-group>
 </mat-menu>
 
-<mat-menu #informationMenu="matMenu" (closed)="onClosedInformationMenu($event)">
+<mat-menu #informationMenu="matMenu">
   <div
     class="version-info-container menu-item"
     (click)="$event.stopPropagation()"
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 8602978f..8d657c49 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
@@ -400,6 +400,13 @@ export class TopBarComponent implements OnInit, OnDestroy {
     this.nativeService.openDefaultBrowser(url);
   }
 
+  onClosedProfileMenu() {
+    this.checkingUpdate = false;
+    this.checkingUpdateIsProcessing = false;
+    this.checkingUpdateAppVersion = undefined;
+    this.checkingUpdateIsExist = false;
+  }
+
   onClickUpdate() {
     this.store.dispatch(UpdateStore.applyInstantUpdate());
   }
@@ -500,19 +507,14 @@ export class TopBarComponent implements OnInit, OnDestroy {
     );
   }
 
-  onClickCheckForUpdates(event: Event) {
-    event.stopPropagation();
+  onMenuOpenedinformationMenu() {
+    if (this.checkingUpdate) {
+      return;
+    }
 
     this.checkForUpdates();
   }
 
-  onClosedInformationMenu() {
-    this.checkingUpdate = false;
-    this.checkingUpdateIsProcessing = false;
-    this.checkingUpdateAppVersion = undefined;
-    this.checkingUpdateIsExist = false;
-  }
-
   checkForUpdates() {
     this.checkingUpdate = true;
     this.checkingUpdateIsProcessing = true;