Merge branch 'develop_bitOut-fix' into consoleCle

src/app/home/home.page.ts

@@ -104,15 +104,16 @@ export class HomePage implements OnInit {
 
         if (window.location.pathname != '/inactivity') {
 
-          document.querySelectorAll('ion-modal').forEach((e: any) => e.remove())
-          document.querySelectorAll('.popover-viewport').forEach((e: any) => e.remove())
+          document.querySelectorAll('ion-modal').forEach((e: any) => e.remove());
+          document.querySelectorAll('.popover-viewport').forEach((e: any) => e.remove());
+          document.querySelectorAll('.loading-blocker').forEach((e: any) => e.remove());
 
           const pathname = window.location.pathname
           SessionStore.setUrlBeforeInactivity(pathname)
         
           if (this.platform.is('mobileweb')) {
             this.router.navigate(['/inactivity']);
-          }else{
+          } else {
             this.router.navigate(['/']);
           }
         }

src/app/services/inativity.service.ts

@@ -22,14 +22,17 @@ export class InativityService {
 
     function userIsNotActive() {
       // your function for too long inactivity goes here
-      SessionStore.setInativity(false)
+      // SessionStore.setInativity(false)
       // alert('go out')
-      window['inactivity/function']()
+      try {
+        // window['inactivity/function']()
+      } catch (error) {}
+      
     }
 
     function resetTimer() {
       clearTimeout(time);
-      time = setTimeout(userIsNotActive, 60000 * 5);  // time is in milliseconds
+      time = setTimeout(userIsNotActive, 60000 * 1);  // time is in milliseconds
     }
   }
 }

src/assets/images/theme/gov/icons-userprofile.svg

@@ -1,27 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="35" height="35" viewBox="0 0 35 35">
-    <defs>
-        <circle id="nbs0qtv3ga" cx="17.5" cy="17.5" r="17.5"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <g>
-            <g>
-                <g>
-                    <g>
-                        <g transform="translate(-20 -466) translate(0 99) translate(20 327) translate(0 35) translate(0 5)">
-                            <rect width="35" height="35" fill="#FFF" fill-opacity=".6" rx="17.5"/>
-                            <g>
-                                <mask id="413y7q8i5b" fill="#fff">
-                                    <use xlink:href="#nbs0qtv3ga"/>
-                                </mask>
-                                <path fill="#42B9FE" fill-opacity=".7" d="M17.5 8.167c4.51 0 8.167 3.917 8.167 8.75 0 3.035-1.443 5.71-3.634 7.279 4.85 1.914 8.3 6.813 8.3 12.554 0 7.41-5.745 13.417-12.833 13.417S4.667 44.16 4.667 36.75c0-5.741 3.45-10.64 8.3-12.556-2.191-1.567-3.634-4.242-3.634-7.277 0-4.833 3.657-8.75 8.167-8.75z" mask="url(#413y7q8i5b)"/>
-                            </g>
-                            <text fill="#FFF" fill-opacity=".7" font-family="Roboto-Light, Roboto" font-size="20" font-weight="300">
-                                <tspan x="5.889" y="21.778">SE</tspan>
-                            </text>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "541e99a0f",
-  "SHA": "541e99a0f7d1ad43ad6383fd3e17105cc8afb869",
+  "shortSHA": "f640ac7e3",
+  "SHA": "f640ac7e332684911ede3391b0f07b35dd00252f",
   "branch": "develop_bitOut-fix",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Fri Dec 30 15:34:45 2022 +0100'",
-  "lastCommitMessage": "save",
-  "lastCommitNumber": "4600",
+  "lastCommitTime": "'Fri Dec 30 15:39:42 2022 +0100'",
+  "lastCommitMessage": "merge",
+  "lastCommitNumber": "4604",
   "change": "",
-  "changeStatus": "On branch develop_bitOut-fix\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   package-lock.json\n\tmodified:   package.json\n\tmodified:   src/app/app.module.ts\n\tmodified:   src/app/modals/profile/profile.page.ts\n\tmodified:   src/app/services/notifications.service.ts\n\tmodified:   src/app/shared/header/header.page.ts\n\tmodified:   src/main.ts\n\tmodified:   version/git-version.ts",
+  "changeStatus": "On branch develop_bitOut-fix\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/home/home.page.ts\n\tmodified:   src/app/services/inativity.service.ts\n\tdeleted:    src/assets/images/theme/gov/icons-userprofile.svg",
   "changeAuthor": "peter.maquiran"
 }