Merge pull request #16 from StreetSupport/staging

Merge staging into main

Author: o-seliuchenko

src/utils/swep.ts

@@ -31,13 +31,12 @@ export function formatSwepActivePeriod(swepData: ISwepBanner): string {
     const fromString = activeFrom.toLocaleDateString('en-GB', formatOptions);
     const untilString = activeUntil.toLocaleDateString('en-GB', formatOptions);
 
-    if (now < activeFrom) {
-      return `SWEP will be active from ${fromString} until ${untilString}`;
-    } else if (now > activeUntil) {
-      return `SWEP was active from ${fromString} until ${untilString}`;
-    } else {
-      return `SWEP is currently active from ${fromString} until ${untilString}`;
-    }
+    return `SWEP is currently active from ${fromString} until ${untilString}`;
+  } else if (swepData.SwepActiveFrom && !swepData.SwepActiveUntil) {
+    const activeFrom = new Date(swepData.SwepActiveFrom);
+    const fromString = activeFrom.toLocaleDateString('en-GB', formatOptions);
+    
+    return `SWEP is currently active from ${fromString}`;
   } else {
     return 'Active period not specified';
   }