From 8369e8a98410554c44df8900ad775d416cb09e48 Mon Sep 17 00:00:00 2001
From: Naumov Alexey <Iamemptyhuh@gmail.com>
Date: Fri, 16 Jul 2021 12:58:20 +0300
Subject: [PATCH] feat(core-app): CB-1122  logic improvements

---
 .../SessionExpireWarningDialogService.ts                  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/webapp/packages/core-app/src/shared/SessionExpireWarningDialog/SessionExpireWarningDialogService.ts b/webapp/packages/core-app/src/shared/SessionExpireWarningDialog/SessionExpireWarningDialogService.ts
index 114c165443..7641520387 100644
--- a/webapp/packages/core-app/src/shared/SessionExpireWarningDialog/SessionExpireWarningDialogService.ts
+++ b/webapp/packages/core-app/src/shared/SessionExpireWarningDialog/SessionExpireWarningDialogService.ts
@@ -52,17 +52,15 @@ export class SessionExpireWarningDialogService extends Bootstrap {
 
       const remainingTime = new Date(sessionExpiredTime).getTime() - Date.now();
 
-      if (this.sessionExpireService.expired
-        || !sessionDuration
-        || sessionDuration < WARN_IN
-        || (this.dialogInternalPromise && remainingTime > WARN_IN)
-      ) {
+      if (this.sessionExpireService.expired || !sessionDuration || sessionDuration < WARN_IN) {
         this.close();
         return;
       }
 
       if (remainingTime < WARN_IN) {
         this.open();
+      } else {
+        this.close();
       }
     };