Merge branch 'main' into j-s/deadline-sort

island-is · Jun 26, 2024 · 7c534d5 · 7c534d5
2 parents 8c0493d + 11e9ede
commit 7c534d5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/apps/native/app/src/utils/lifecycle/setup-event-handlers.ts b/apps/native/app/src/utils/lifecycle/setup-event-handlers.ts
@@ -11,7 +11,6 @@ import SpotlightSearch from 'react-native-spotlight-search'
 import { evaluateUrl, navigateTo } from '../../lib/deep-linking'
 import { authStore } from '../../stores/auth-store'
 import { environmentStore } from '../../stores/environment-store'
-import { notificationsStore } from '../../stores/notifications-store'
 import { offlineStore } from '../../stores/offline-store'
 import { preferencesStore } from '../../stores/preferences-store'
 import { uiStore } from '../../stores/ui-store'
@@ -25,6 +24,8 @@ import { isIos } from '../devices'
 import { handleQuickAction } from '../quick-actions'
 
 let backgroundAppLockTimeout: ReturnType<typeof setTimeout>
+// Flag to track overlay state
+let overlayShown = false
 
 export function setupEventHandlers() {
   // Listen for url events through iOS and Android's Linking library
@@ -102,16 +103,19 @@ export function setupEventHandlers() {
           // Add a small delay for those accidental backgrounds in iOS
           backgroundAppLockTimeout = setTimeout(() => {
             const { lockScreenComponentId } = authStore.getState()
-            if (!lockScreenComponentId) {
+
+            if (!lockScreenComponentId && !overlayShown) {
+              overlayShown = true
               showAppLockOverlay({ status })
-            } else {
+            } else if (lockScreenComponentId) {
               Navigation.updateProps(lockScreenComponentId, { status })
             }
           }, 100)
         } else {
-          if (!lockScreenComponentId) {
+          if (!lockScreenComponentId && !overlayShown) {
+            overlayShown = true
             showAppLockOverlay({ status })
-          } else {
+          } else if (lockScreenComponentId) {
             Navigation.updateProps(lockScreenComponentId, { status })
           }
         }
@@ -127,9 +131,12 @@ export function setupEventHandlers() {
             lockScreenActivatedAt + appLockTimeout > Date.now()
           ) {
             hideAppLockOverlay(lockScreenComponentId)
+            overlayShown = false // Mark overlay as hidden
           } else {
             Navigation.updateProps(lockScreenComponentId, { status })
           }
+        } else {
+          overlayShown = false // Reset overlay state if no lock screen component
         }
       }
     }

diff --git a/...n/templates/official-journal-of-iceland/src/components/htmlEditor/templates/signatures.ts b/...n/templates/official-journal-of-iceland/src/components/htmlEditor/templates/signatures.ts
@@ -51,7 +51,7 @@ const titleTemplate = (title?: string, date?: string, locale = 'is') => {
   return `
   <p class="signature__title">${title}${title && date ? ', ' : ''}${
     date
-      ? format(new Date(date), 'dd. MMMM yyyy', {
+      ? format(new Date(date), 'd. MMMM yyyy', {
           locale: locale === 'is' ? is : en,
         })
       : ''

diff --git a/libs/portals/admin/regulations-admin/src/components/EditSignature.tsx b/libs/portals/admin/regulations-admin/src/components/EditSignature.tsx
@@ -28,7 +28,7 @@ import { useS3Upload } from '../utils/dataHooks'
 
 const defaultSignatureText = `
   <p class="Dags" align="center"><em>{ministry}nu, {dags}.</em></p>
-  <p class="FHUndirskr" align="center">f.h.r.</p>
+  <p class="FHUndirskr" align="center">F.h.r.</p>
   <p class="Undirritun" align="center"><strong>NAFN</strong></p>
   <p class="Undirritun" align="right"><em>NAFN.</em></p>
 ` as HTMLText