From b96d0d053c210b3325fb6bd40391be64fb92fdd0 Mon Sep 17 00:00:00 2001
From: Roman <mail@romanh.de>
Date: Thu, 16 May 2024 17:07:22 +0200
Subject: [PATCH] v2.4.3: Minor frontend bugfix for MFA

---
 Core/core.php                                  | 2 +-
 react/admin-panel/src/views/profile/mfa-box.js | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Core/core.php b/Core/core.php
index 672c7bf..b69730f 100644
--- a/Core/core.php
+++ b/Core/core.php
@@ -10,7 +10,7 @@ if (is_file($autoLoad)) {
   require_once $autoLoad;
 }
 
-const WEBBASE_VERSION = "2.4.2";
+const WEBBASE_VERSION = "2.4.3";
 
 spl_autoload_extensions(".php");
 spl_autoload_register(function ($class) {
diff --git a/react/admin-panel/src/views/profile/mfa-box.js b/react/admin-panel/src/views/profile/mfa-box.js
index aa3947d..47cc2a4 100644
--- a/react/admin-panel/src/views/profile/mfa-box.js
+++ b/react/admin-panel/src/views/profile/mfa-box.js
@@ -8,9 +8,8 @@ import MfaFido from "./mfa-fido";
 import CollapseBox from "./collapse-box";
 
 const MfaStatusBox = styled(Box)((props) => ({
-    "& > svg": {
-        marginRight: props.theme.spacing(1),
-    },
+    display: "grid",
+    gridTemplateColumns: "30px auto",
 }));
 
 const MFAOptions = styled(Box)((props) => ({
@@ -69,7 +68,7 @@ export default function MultiFactorBox(props) {
             <Box>
                 <MfaStatusBox mb={2}>
                     <CheckCircle color="info" title={L("account.two_factor_confirmed")} />
-                    {L("account.2fa_type_" + profile.twoFactorToken.type)}
+                    <span>{L("account.2fa_type_" + profile.twoFactorToken.type)}</span>
                 </MfaStatusBox>
                 <SpacedFormGroup>
                     <FormLabel>{L("account.password")}</FormLabel>
@@ -82,7 +81,7 @@ export default function MultiFactorBox(props) {
                     </FormControl>
                 </SpacedFormGroup>
                 <Button startIcon={is2FARemoving ? <CircularProgress size={12} /> : <Remove />}
-                        color="danger" onClick={onRemove2FA}
+                        color="error" onClick={onRemove2FA}
                         variant="outlined" size="small"
                         disabled={is2FARemoving || !api.hasPermission("tfa/remove")}>
                     {is2FARemoving ? L("general.removing") + "…" : L("general.remove")}