Improve

src/app/home/home-routing.module.ts

@@ -400,7 +400,7 @@ const routes: Routes = [
         loadChildren: ()=> import('../pages/inactivity/inactivity.module').then(m => m.InactivityPageModule)
       },
     ],
-    // canActivate: [InactivityGuard]
+    canActivate: [InactivityGuard]
 
   },
 ];

src/app/pages/login/login.page.ts

@@ -40,7 +40,6 @@ export class LoginPage implements OnInit {
     private changeProfileService: ChangeProfileService,
     public ThemeService: ThemeService,
     private storageservice: StorageService,
-    
   ) {}
 
   ngOnInit() {
@@ -132,7 +131,6 @@ export class LoginPage implements OnInit {
     }
   }
 
-
   goback() {
     const pathName = SessionStore.user.UrlBeforeInactivity
     if(pathName) {

src/app/services/toast.service.ts

@@ -196,16 +196,30 @@ export class ToastService {
 
 
   loading() : HTMLDivElement {
+
     let loader: HTMLDivElement = document.createElement('div')
+
+    let theme;
+
+    if(document.querySelector('body').className.includes('gov')) {
+      theme = 'gov'
+    } else if(document.querySelector('body').className.includes('default')) {
+      theme = 'blue'
+    } else if(document.querySelector('body').className.includes('tribunal')) {
+      theme = 'tribunal'
+    } else {
+      theme = 'gov'
+    }
+
     loader.innerHTML = `
-
-    <div class="loading-blocker">
-      <div class="loading-blocker-container">
-      <img src="/assets/images/Blocks-loader.gif" />
+      <div class="loading-blocker">
+        <div class="loading-blocker-container">
+        <img src="/assets/gif/theme/${theme}/Blocks-loader.svg" />
+        </div>
       </div>
-    </div>
-    `
-
+    `;
+    
+    console.log(document.querySelector('body').classList)
     document.body.append(loader)
 
     loader.addEventListener('click', ()=>{