From 1721ba5ddf4a62e09a5eadfcdce2f28e3bf19ff6 Mon Sep 17 00:00:00 2001
From: Marie Verdonck <maria.verdonck@atmire.com>
Date: Thu, 1 Jul 2021 16:19:31 +0200
Subject: [PATCH] Icon changes & fix after rebase

---
 src/app/core/auth/auth.reducer.spec.ts              | 12 ++++++++----
 src/app/shared/idle-modal/idle-modal.component.html |  6 +++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/app/core/auth/auth.reducer.spec.ts b/src/app/core/auth/auth.reducer.spec.ts
index f721c8c208..ba271fafb5 100644
--- a/src/app/core/auth/auth.reducer.spec.ts
+++ b/src/app/core/auth/auth.reducer.spec.ts
@@ -610,7 +610,8 @@ describe('authReducer', () => {
       loaded: false,
       blocking: true,
       loading: false,
-      authMethods: authMethods
+      authMethods: authMethods,
+      idle: false
     };
     expect(newState).toEqual(state);
   });
@@ -621,7 +622,8 @@ describe('authReducer', () => {
       loaded: false,
       blocking: true,
       loading: true,
-      authMethods: []
+      authMethods: [],
+      idle: false
     };
 
     const action = new RetrieveAuthMethodsErrorAction(false);
@@ -685,7 +687,8 @@ describe('authReducer', () => {
       loaded: false,
       blocking: true,
       loading: true,
-      authMethods: []
+      authMethods: [],
+      idle: false
     };
 
     const action = new RetrieveAuthMethodsErrorAction(true);
@@ -695,7 +698,8 @@ describe('authReducer', () => {
       loaded: false,
       blocking: true,
       loading: false,
-      authMethods: [new AuthMethod(AuthMethodType.Password)]
+      authMethods: [new AuthMethod(AuthMethodType.Password)],
+      idle: false
     };
     expect(newState).toEqual(state);
   });
diff --git a/src/app/shared/idle-modal/idle-modal.component.html b/src/app/shared/idle-modal/idle-modal.component.html
index beea91fe7b..a69c4d7e76 100644
--- a/src/app/shared/idle-modal/idle-modal.component.html
+++ b/src/app/shared/idle-modal/idle-modal.component.html
@@ -9,10 +9,10 @@
   </div>
   <div class="modal-footer">
     <button type="button" class="cancel btn btn-danger" (click)="logOutPressed()" aria-label="Log out">
-      <i class="fas fa-times"></i> {{ "idle-modal.log-out" | translate }}
+      <i class="fas fa-sign-out-alt"></i> {{ "idle-modal.log-out" | translate }}
     </button>
-    <button type="button" class="confirm btn btn-outline-secondary" (click)="extendSessionPressed()" aria-label="Extend session" ngbAutofocus>
-      {{ "idle-modal.extend-session" | translate }}
+    <button type="button" class="confirm btn btn-primary" (click)="extendSessionPressed()" aria-label="Extend session" ngbAutofocus>
+      <i class="fas fa-redo-alt"></i> {{ "idle-modal.extend-session" | translate }}
     </button>
   </div>
 </div>