Merge branch 'master' of github.com:isaacphysics/isaac-react-app into cs-related-questions

Author: mlt47

src/app/components/navigation/IsaacApp.tsx

@@ -89,9 +89,10 @@ export const IsaacApp = () => {
     }, []);
 
     useEffect(() => {
+        const dateNow = new Date();
         if (showNotification(user) && notifications && notifications.length > 0) {
             dispatch(openActiveModal(notificationModal(notifications[0])));
-            persistence.save(KEY.LAST_NOTIFICATION_TIME, Date.now().toString())
+            persistence.save(KEY.LAST_NOTIFICATION_TIME, dateNow.toString())
         }
     }, [notifications, user]);
 

src/app/services/notificationChecker.ts

@@ -4,8 +4,10 @@ import {KEY} from "./localStorage";
 
 
 export function showNotification(user: RegisteredUserDTO | null) {
-    if (user && user.registrationDate && (Date.now() - (Number(user.registrationDate)) > 14*24*60*60*1000)) {
-        if (Date.now() - Number(persistence.load(KEY.LAST_NOTIFICATION_TIME)) > 24*60*60*1000) {
+    const dateNow = new Date();
+    const notificationTime = persistence.load(KEY.LAST_NOTIFICATION_TIME);
+    if (user && user.registrationDate && (dateNow.getTime() - new Date(user.registrationDate).getTime()) > 14*24*60*60*1000) {
+        if (dateNow.getTime() - (new Date(notificationTime || "0").getTime()) > 24*60*60*1000) {
             return true
         }
     } else return false