Update hivegrid-cloud reference to latest main
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
e98d38e716
commit
7b21524c86
3781 files changed
+373484
-225607
No files matched your search
+6
-1
@@ -30,6 +30,7 @@ import { UserPasswordUpdatedDto } from "~/modules/events/dtos/UserPasswordUpdate
|
||||
import { AccountDeletedDto } from "~/modules/events/dtos/AccountDeletedDto";
|
||||
import { UserProfileDeletedDto } from "~/modules/events/dtos/UserProfileDeletedDto";
|
||||
import MyProfileScreen from "~/modules/users/components/MyProfileScreen";
|
||||
import { LanguageSettingsNotice } from "~/components/settings/LanguageSettingsNotice";
|
||||
import toast from "react-hot-toast";
|
||||
import { requireAuth } from "~/utils/loaders.middleware";
|
||||
import { generateRecoveryCodes } from "~/utils/auth/mfa/recovery-codes.server";
|
||||
@@ -74,7 +75,7 @@ function getCurrentSessionSettings(
|
||||
const cookies = Array.isArray(userInfo.cookies) ? userInfo.cookies : [];
|
||||
return {
|
||||
locale: userInfo.lng,
|
||||
lightOrDarkMode: userInfo.lightOrDarkMode || "system",
|
||||
lightOrDarkMode: userInfo.lightOrDarkMode === "dark" ? "dark" : "light",
|
||||
theme: typeof userInfo.theme === "string" && userInfo.theme.length > 0 ? userInfo.theme : null,
|
||||
cookieConsentCount: cookies.filter((cookie) => cookie?.allowed).length,
|
||||
impersonationActive: Boolean(userInfo.impersonatingFromUserId),
|
||||
@@ -423,11 +424,15 @@ export default function ProfileRoute() {
|
||||
<EditPageLayout className="pb-20">
|
||||
<MyProfileScreen
|
||||
user={appData.user}
|
||||
role={appData.currentRole}
|
||||
mfaStatus={actionData?.mfaStatus ?? loaderData.mfaStatus}
|
||||
otpauthUri={actionData?.otpauthUri}
|
||||
recoveryCodes={actionData?.recoveryCodes}
|
||||
mfaError={actionData?.mfaError}
|
||||
/>
|
||||
<div className="mt-6 w-full">
|
||||
<LanguageSettingsNotice />
|
||||
</div>
|
||||
</EditPageLayout>
|
||||
);
|
||||
}
|
||||
Reference in new issue
Block a user