merge

src/app/shared/header/header.page.ts

@@ -65,11 +65,17 @@ export class HeaderPage implements OnInit {
       if(event.notification == "recive") {
         console.log('header', event.notification)
         this.notificationLength++
-        window['headerupdate']()
+        
+        if(window['headerupdate']) {
+          window['headerupdate']()
+        }
+        
       } else if(event.notification == "deleted") {
         console.log('header', event.notification)
         this.notificationLength--
-        window['headerupdate']()
+        if(window['headerupdate']) {
+          window['headerupdate']()
+        }
       }
     });
 

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "7743bdbe7",
-  "SHA": "7743bdbe743b9bc218b41830448d02e3b63f21a4",
+  "shortSHA": "5e069a378",
+  "SHA": "5e069a37836cfedeceda2b740adb35f388e42189",
   "branch": "developer-prod",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Tue Aug 22 09:16:02 2023 +0100'",
+  "lastCommitTime": "'Tue Aug 22 09:18:52 2023 +0100'",
   "lastCommitMessage": "merge",
-  "lastCommitNumber": "5196",
+  "lastCommitNumber": "5198",
   "change": "",
-  "changeStatus": "On branch developer-prod\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/shared/header/header.page.ts\n\tmodified:   version/git-version.ts",
+  "changeStatus": "On branch developer-prod\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/shared/header/header.page.ts",
   "changeAuthor": "peter.maquiran"
 }