fix: update fixes

dhis2 · Jan 7, 2025 · 4264a3f · 4264a3f
1 parent 17487ae
commit 4264a3f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-12-19T12:57:22.277Z\n"
-"PO-Revision-Date: 2024-12-19T12:57:22.277Z\n"
+"POT-Creation-Date: 2025-01-07T08:32:23.225Z\n"
+"PO-Revision-Date: 2025-01-07T08:32:23.226Z\n"
 
 msgid "Never"
 msgstr "Never"

diff --git a/src/app.router.js b/src/app.router.js
@@ -50,7 +50,7 @@ class AppRouter extends Component {
 
     getDefaultRedirect() {
         const enforceVerifiedEmail =
-            this.props.d2.system.settings.settings.enforceVerifiedEmail
+            this.props.d2?.system?.settings?.settings?.enforceVerifiedEmail
         const emailVerified = this.props.d2.currentUser.emailVerified
 
         // Redirect to the profile page if email is unverified and the setting is enforced

diff --git a/src/layout/VerifyEmailWarning.js b/src/layout/VerifyEmailWarning.js
@@ -6,7 +6,8 @@ import React from 'react'
 export function VerifyEmailWarning({ config }) {
     const enforceVerifiedEmail =
         config?.system?.settings?.enforceVerifiedEmail || false
-    const emailVerified = config?.currentUser?.emailVerified || false
+    const emailVerified =
+        config.system?.settings?.settings?.enforceVerifiedEmail || false
 
     if (enforceVerifiedEmail && !emailVerified) {
         return (

diff --git a/src/layout/app.css b/src/layout/app.css
@@ -26,10 +26,11 @@ html, body {
   margin: 0;
 }
 
-.noticebox-wrapper{
-  margin-right: 15px;
+.noticebox-wrapper {
+  margin-inline-end: 15px;
 }
 
+
 .info-cell-name {
   color: #777;
   font-size: 12pt;