diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 10dd51bb6..ec7211e0b 100644
--- a/src/app/home/home.page.ts
+++ b/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(['/']);
}
}
diff --git a/src/app/services/inativity.service.ts b/src/app/services/inativity.service.ts
index a4892dd1d..3f2c00cbc 100644
--- a/src/app/services/inativity.service.ts
+++ b/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
}
}
}
diff --git a/src/assets/images/theme/gov/icons-userprofile.svg b/src/assets/images/theme/gov/icons-userprofile.svg
deleted file mode 100644
index d02f18900..000000000
--- a/src/assets/images/theme/gov/icons-userprofile.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-
diff --git a/version/git-version.ts b/version/git-version.ts
index be5dc24f0..af52911d7 100644
--- a/version/git-version.ts
+++ b/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 ...\" 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"
}
\ No newline at end of file