From 3d854f6ff221a78f496b8cf543e50558f329fc1a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 28 Mar 2026 09:47:51 +0000
Subject: [PATCH 1/2] Initial plan


From ee8426f3329dc836f905c5ede4a53e71fbf5a7fa Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 28 Mar 2026 09:55:38 +0000
Subject: [PATCH 2/2] Rename isLoggedIn to isAuthenticated, remove firebase
 isAuthenticated

Agent-Logs-Url: https://github.com/monkeytypegame/monkeytype/sessions/1a34e688-331a-4343-b32f-bd435c68347c
---
 frontend/__tests__/__harness__/mock-firebase.ts           | 1 -
 frontend/src/ts/ape/config.ts                             | 2 +-
 frontend/src/ts/auth.tsx                                  | 2 +-
 frontend/src/ts/collections/inbox.ts                      | 4 ++--
 frontend/src/ts/commandline/commandline-metadata.ts       | 4 ++--
 frontend/src/ts/commandline/lists.ts                      | 3 ++-
 frontend/src/ts/commandline/lists/custom-themes-list.ts   | 2 +-
 frontend/src/ts/commandline/lists/navigation.ts           | 2 +-
 frontend/src/ts/commandline/lists/presets.ts              | 2 +-
 frontend/src/ts/commandline/lists/quote-favorites.ts      | 2 +-
 frontend/src/ts/commandline/lists/tags.ts                 | 2 +-
 .../src/ts/components/common/anime/AnimeConditional.tsx   | 2 +-
 .../src/ts/components/layout/footer/ThemeIndicator.tsx    | 2 +-
 .../src/ts/components/modals/MobileTestConfigModal.tsx    | 4 ++--
 frontend/src/ts/components/modals/QuoteSearchModal.tsx    | 8 ++++----
 .../ts/components/pages/leaderboard/LeaderboardPage.tsx   | 6 +++---
 frontend/src/ts/components/pages/leaderboard/Sidebar.tsx  | 4 ++--
 frontend/src/ts/components/pages/profile/UserDetails.tsx  | 4 ++--
 frontend/src/ts/components/pages/test/TestConfig.tsx      | 4 ++--
 frontend/src/ts/config/metadata.ts                        | 2 +-
 frontend/src/ts/controllers/route-controller.ts           | 3 ++-
 frontend/src/ts/db.ts                                     | 3 ++-
 .../src/ts/elements/account-settings/ape-key-table.ts     | 2 +-
 .../ts/elements/account-settings/blocked-user-table.ts    | 2 +-
 frontend/src/ts/elements/modes-notice.ts                  | 2 +-
 frontend/src/ts/elements/settings/theme-picker.ts         | 3 +--
 frontend/src/ts/event-handlers/account.ts                 | 2 +-
 frontend/src/ts/firebase.ts                               | 4 ----
 frontend/src/ts/modals/simple-modals.ts                   | 7 ++-----
 frontend/src/ts/modals/user-report.ts                     | 2 +-
 frontend/src/ts/pages/account-settings.ts                 | 4 ++--
 frontend/src/ts/pages/settings.ts                         | 3 +--
 frontend/src/ts/queries/index.ts                          | 4 ++--
 frontend/src/ts/states/core.ts                            | 2 +-
 frontend/src/ts/test/result.ts                            | 2 +-
 frontend/src/ts/test/test-logic.ts                        | 4 ++--
 frontend/src/ts/test/test-screenshot.ts                   | 7 +++++--
 37 files changed, 57 insertions(+), 61 deletions(-)

diff --git a/frontend/__tests__/__harness__/mock-firebase.ts b/frontend/__tests__/__harness__/mock-firebase.ts
index b445c2b1979a..0c3811a591bc 100644
--- a/frontend/__tests__/__harness__/mock-firebase.ts
+++ b/frontend/__tests__/__harness__/mock-firebase.ts
@@ -2,5 +2,4 @@ import { vi } from "vitest";
 vi.mock("../../src/ts/firebase", () => ({
   app: undefined,
   Auth: undefined,
-  isAuthenticated: () => false,
 }));
diff --git a/frontend/src/ts/ape/config.ts b/frontend/src/ts/ape/config.ts
index 7bc1402587db..9e12b98e142c 100644
--- a/frontend/src/ts/ape/config.ts
+++ b/frontend/src/ts/ape/config.ts
@@ -1,5 +1,5 @@
 import { Config } from "@monkeytype/schemas/configs";
-import { isAuthenticated } from "../firebase";
+import { isAuthenticated } from "../states/core";
 import { showErrorNotification } from "../states/notifications";
 import Ape from ".";
 
diff --git a/frontend/src/ts/auth.tsx b/frontend/src/ts/auth.tsx
index 972b61ff07d7..01939173ae07 100644
--- a/frontend/src/ts/auth.tsx
+++ b/frontend/src/ts/auth.tsx
@@ -15,7 +15,6 @@ import { authEvent } from "./events/auth";
 import {
   isAuthAvailable,
   getAuthenticatedUser,
-  isAuthenticated,
   signOut as authSignOut,
   signInWithEmailAndPassword,
   createUserWithEmailAndPassword,
@@ -23,6 +22,7 @@ import {
   resetIgnoreAuthCallback,
 } from "./firebase";
 import * as Sentry from "./sentry";
+import { isAuthenticated } from "./states/core";
 import { showLoaderBar, hideLoaderBar } from "./states/loader-bar";
 import {
   showNoticeNotification,
diff --git a/frontend/src/ts/collections/inbox.ts b/frontend/src/ts/collections/inbox.ts
index 4ca003694493..398068daebdc 100644
--- a/frontend/src/ts/collections/inbox.ts
+++ b/frontend/src/ts/collections/inbox.ts
@@ -11,7 +11,7 @@ import { Accessor, createSignal } from "solid-js";
 import Ape from "../ape";
 import { queryClient } from "../queries";
 import { baseKey } from "../queries/utils/keys";
-import { isLoggedIn } from "../states/core";
+import { isAuthenticated } from "../states/core";
 import { flushDebounceStrategy } from "./utils/flushDebounceStrategy";
 import { showErrorNotification } from "../states/notifications";
 
@@ -92,7 +92,7 @@ export async function flushPendingChanges({
 // oxlint-disable-next-line typescript/explicit-function-return-type
 export function useInboxQuery(enabled: Accessor<boolean>) {
   return useLiveQuery((q) => {
-    if (!isLoggedIn() || !enabled()) return undefined;
+    if (!isAuthenticated() || !enabled()) return undefined;
     return q
       .from({ inbox: inboxCollection })
       .where(({ inbox }) => not(eq(inbox.status, "deleted")))
diff --git a/frontend/src/ts/commandline/commandline-metadata.ts b/frontend/src/ts/commandline/commandline-metadata.ts
index 9744c9ee16ab..afb70b6653c2 100644
--- a/frontend/src/ts/commandline/commandline-metadata.ts
+++ b/frontend/src/ts/commandline/commandline-metadata.ts
@@ -3,11 +3,11 @@ import * as SoundController from "../controllers/sound-controller";
 import * as TestLogic from "../test/test-logic";
 import { getLanguageDisplayString } from "../utils/strings";
 import * as ModesNotice from "../elements/modes-notice";
-import { isAuthenticated } from "../firebase";
+
 import { areUnsortedArraysEqual } from "../utils/arrays";
 import { Config } from "../config/store";
 import { get as getTypingSpeedUnit } from "../utils/typing-speed-units";
-import { getActivePage } from "../states/core";
+import { getActivePage, isAuthenticated } from "../states/core";
 import { Fonts } from "../constants/fonts";
 import { KnownFontName } from "@monkeytype/schemas/fonts";
 import * as UI from "../ui";
diff --git a/frontend/src/ts/commandline/lists.ts b/frontend/src/ts/commandline/lists.ts
index 7f9917222cb3..4a095f7b4f86 100644
--- a/frontend/src/ts/commandline/lists.ts
+++ b/frontend/src/ts/commandline/lists.ts
@@ -32,7 +32,8 @@ import * as TestStats from "../test/test-stats";
 import { Command, CommandsSubgroup } from "./types";
 import { buildCommandForConfigKey } from "./util";
 import { CommandlineConfigMetadataObject } from "./commandline-metadata";
-import { isAuthAvailable, isAuthenticated, signOut } from "../firebase";
+import { isAuthAvailable, signOut } from "../firebase";
+import { isAuthenticated } from "../states/core";
 import { ConfigKey } from "@monkeytype/schemas/configs";
 import {
   hideFpsCounter,
diff --git a/frontend/src/ts/commandline/lists/custom-themes-list.ts b/frontend/src/ts/commandline/lists/custom-themes-list.ts
index aacf492df125..f513ba2bb84f 100644
--- a/frontend/src/ts/commandline/lists/custom-themes-list.ts
+++ b/frontend/src/ts/commandline/lists/custom-themes-list.ts
@@ -1,5 +1,5 @@
 import { setConfig } from "../../config/setters";
-import { isAuthenticated } from "../../firebase";
+import { isAuthenticated } from "../../states/core";
 import * as DB from "../../db";
 import * as ThemeController from "../../controllers/theme-controller";
 import { Command, CommandsSubgroup } from "../types";
diff --git a/frontend/src/ts/commandline/lists/navigation.ts b/frontend/src/ts/commandline/lists/navigation.ts
index caf68b4cefa4..fc81b9b6ea77 100644
--- a/frontend/src/ts/commandline/lists/navigation.ts
+++ b/frontend/src/ts/commandline/lists/navigation.ts
@@ -1,5 +1,5 @@
 import { navigate } from "../../controllers/route-controller";
-import { isAuthenticated } from "../../firebase";
+import { isAuthenticated } from "../../states/core";
 import { toggleFullscreen } from "../../utils/misc";
 import { Command } from "../types";
 
diff --git a/frontend/src/ts/commandline/lists/presets.ts b/frontend/src/ts/commandline/lists/presets.ts
index 552440a6fbb2..8720745f0dfe 100644
--- a/frontend/src/ts/commandline/lists/presets.ts
+++ b/frontend/src/ts/commandline/lists/presets.ts
@@ -3,7 +3,7 @@ import * as ModesNotice from "../../elements/modes-notice";
 import * as Settings from "../../pages/settings";
 import * as PresetController from "../../controllers/preset-controller";
 import * as EditPresetPopup from "../../modals/edit-preset";
-import { isAuthenticated } from "../../firebase";
+import { isAuthenticated } from "../../states/core";
 import { Command, CommandsSubgroup } from "../types";
 
 const subgroup: CommandsSubgroup = {
diff --git a/frontend/src/ts/commandline/lists/quote-favorites.ts b/frontend/src/ts/commandline/lists/quote-favorites.ts
index ecfe6bf8876b..360b96e0d268 100644
--- a/frontend/src/ts/commandline/lists/quote-favorites.ts
+++ b/frontend/src/ts/commandline/lists/quote-favorites.ts
@@ -4,7 +4,7 @@ import {
   showErrorNotification,
   showSuccessNotification,
 } from "../../states/notifications";
-import { isAuthenticated } from "../../firebase";
+import { isAuthenticated } from "../../states/core";
 import { showLoaderBar, hideLoaderBar } from "../../states/loader-bar";
 import * as TestWords from "../../test/test-words";
 import { Command } from "../types";
diff --git a/frontend/src/ts/commandline/lists/tags.ts b/frontend/src/ts/commandline/lists/tags.ts
index 33a18be8abf9..4ea7b7ea1792 100644
--- a/frontend/src/ts/commandline/lists/tags.ts
+++ b/frontend/src/ts/commandline/lists/tags.ts
@@ -4,7 +4,7 @@ import * as ModesNotice from "../../elements/modes-notice";
 import * as TagController from "../../controllers/tag-controller";
 import { Config } from "../../config/store";
 import * as PaceCaret from "../../test/pace-caret";
-import { isAuthenticated } from "../../firebase";
+import { isAuthenticated } from "../../states/core";
 import { Command, CommandsSubgroup } from "../types";
 
 const subgroup: CommandsSubgroup = {
diff --git a/frontend/src/ts/components/common/anime/AnimeConditional.tsx b/frontend/src/ts/components/common/anime/AnimeConditional.tsx
index f3040115a453..cd14b8950c0d 100644
--- a/frontend/src/ts/components/common/anime/AnimeConditional.tsx
+++ b/frontend/src/ts/components/common/anime/AnimeConditional.tsx
@@ -15,7 +15,7 @@ import { AnimePresence } from "./AnimePresence";
  * @example
  * ```tsx
  * <AnimeConditional
- *   if={isLoggedIn()}
+ *   if={isAuthenticated()}
  *   then={<Dashboard />}
  *   else={<LoginForm />}
  *   exitBeforeEnter
diff --git a/frontend/src/ts/components/layout/footer/ThemeIndicator.tsx b/frontend/src/ts/components/layout/footer/ThemeIndicator.tsx
index 9b91c232e84b..de67f5b25a83 100644
--- a/frontend/src/ts/components/layout/footer/ThemeIndicator.tsx
+++ b/frontend/src/ts/components/layout/footer/ThemeIndicator.tsx
@@ -2,9 +2,9 @@ import { JSXElement, Show } from "solid-js";
 
 import { setConfig } from "../../../config/setters";
 import { Config } from "../../../config/store";
-import { isAuthenticated } from "../../../firebase";
 import {
   getThemeIndicator,
+  isAuthenticated,
   setCommandlineSubgroup,
 } from "../../../states/core";
 import { showModal } from "../../../states/modals";
diff --git a/frontend/src/ts/components/modals/MobileTestConfigModal.tsx b/frontend/src/ts/components/modals/MobileTestConfigModal.tsx
index 4b3ab07c5b0e..69719e717f31 100644
--- a/frontend/src/ts/components/modals/MobileTestConfigModal.tsx
+++ b/frontend/src/ts/components/modals/MobileTestConfigModal.tsx
@@ -9,7 +9,7 @@ import { For, JSXElement, Show } from "solid-js";
 import { setConfig, setQuoteLengthAll } from "../../config/setters";
 import { getConfig } from "../../config/store";
 import { restartTestEvent } from "../../events/test";
-import { isLoggedIn } from "../../states/core";
+import { isAuthenticated } from "../../states/core";
 import { showModal } from "../../states/modals";
 import { areUnsortedArraysEqual } from "../../utils/arrays";
 import { AnimatedModal } from "../common/AnimatedModal";
@@ -186,7 +186,7 @@ export function MobileTestConfigModal(): JSXElement {
           <Show when={getConfig.mode === "quote"}>
             <For each={quoteLengths}>
               {(ql) => (
-                <Show when={!("loginRequired" in ql) || isLoggedIn()}>
+                <Show when={!("loginRequired" in ql) || isAuthenticated()}>
                   <MCButton
                     text={ql.label}
                     active={isQuoteLengthActive(ql.value)}
diff --git a/frontend/src/ts/components/modals/QuoteSearchModal.tsx b/frontend/src/ts/components/modals/QuoteSearchModal.tsx
index 5cbd83f36890..5336001ad7b0 100644
--- a/frontend/src/ts/components/modals/QuoteSearchModal.tsx
+++ b/frontend/src/ts/components/modals/QuoteSearchModal.tsx
@@ -15,7 +15,7 @@ import { Config } from "../../config/store";
 import { isCaptchaAvailable } from "../../controllers/captcha-controller";
 import QuotesController, { Quote } from "../../controllers/quotes-controller";
 import * as DB from "../../db";
-import { isLoggedIn } from "../../states/core";
+import { isAuthenticated } from "../../states/core";
 import { hideLoaderBar, showLoaderBar } from "../../states/loader-bar";
 import {
   hideModalAndClearChain,
@@ -105,7 +105,7 @@ function Item(props: {
   onReport: () => void;
   onToggleFavorite: () => Promise<boolean>;
 }): JSXElement {
-  const loggedOut = (): boolean => !isLoggedIn();
+  const loggedOut = (): boolean => !isAuthenticated();
   const [isFav, setIsFav] = createSignal(
     // oxlint-disable-next-line solid/reactivity -- intentionally reading once as initial value
     !loggedOut() && QuotesController.isQuoteFavorite(props.quote),
@@ -455,7 +455,7 @@ export function QuoteSearchModal(): JSXElement {
         <div class="flex flex-col justify-between gap-2 sm:flex-row">
           <div class="text-2xl text-sub">Quote search</div>
           <div class="grid gap-2">
-            <Show when={isLoggedIn()}>
+            <Show when={isAuthenticated()}>
               <Button
                 fa={{ icon: "fa-plus" }}
                 text="Submit a quote"
@@ -509,7 +509,7 @@ export function QuoteSearchModal(): JSXElement {
               }}
             />
           </div>
-          <Show when={isLoggedIn()}>
+          <Show when={isAuthenticated()}>
             <Button
               variant="button"
               fa={{ icon: "fa-heart", fixedWidth: true }}
diff --git a/frontend/src/ts/components/pages/leaderboard/LeaderboardPage.tsx b/frontend/src/ts/components/pages/leaderboard/LeaderboardPage.tsx
index b92ee8a43e22..15edb775c214 100644
--- a/frontend/src/ts/components/pages/leaderboard/LeaderboardPage.tsx
+++ b/frontend/src/ts/components/pages/leaderboard/LeaderboardPage.tsx
@@ -10,7 +10,7 @@ import {
   getRankQueryOptions,
 } from "../../../queries/leaderboards";
 import { getServerConfigurationQueryOptions } from "../../../queries/server-configuration";
-import { getActivePage, isLoggedIn } from "../../../states/core";
+import { getActivePage, isAuthenticated } from "../../../states/core";
 import {
   getGoToUserPage,
   getPage,
@@ -100,7 +100,7 @@ export function LeaderboardPage(): JSXElement {
 
   const rankQuery = useQuery(() => ({
     ...getRankQueryOptions(getSelection()),
-    enabled: isLoggedIn() && isOpen(),
+    enabled: isAuthenticated() && isOpen(),
   }));
 
   const serverConfigurationQuery = useQuery(() => ({
@@ -191,7 +191,7 @@ export function LeaderboardPage(): JSXElement {
           />
 
           <Show
-            when={isLoggedIn() && !dataQuery.isLoading}
+            when={isAuthenticated() && !dataQuery.isLoading}
             fallback={<Separator />}
           >
             <AsyncContent
diff --git a/frontend/src/ts/components/pages/leaderboard/Sidebar.tsx b/frontend/src/ts/components/pages/leaderboard/Sidebar.tsx
index 7b4ab9ab2c45..1a875379def8 100644
--- a/frontend/src/ts/components/pages/leaderboard/Sidebar.tsx
+++ b/frontend/src/ts/components/pages/leaderboard/Sidebar.tsx
@@ -3,7 +3,7 @@ import { Language } from "@monkeytype/schemas/languages";
 import { Mode } from "@monkeytype/schemas/shared";
 import { Accessor, For, JSXElement, Show } from "solid-js";
 
-import { isLoggedIn } from "../../../states/core";
+import { isAuthenticated } from "../../../states/core";
 import { Selection } from "../../../states/leaderboard-selection";
 import { FaSolidIcon } from "../../../types/font-awesome";
 import { Button } from "../../common/Button";
@@ -65,7 +65,7 @@ export function Sidebar(props: {
           { id: "daily", text: "daily", icon: "fa-sun" },
         ]}
       />
-      <Show when={isLoggedIn() && props.connectionsEnabled}>
+      <Show when={isAuthenticated() && props.connectionsEnabled}>
         <Group
           selected={props.selection().friendsOnly}
           onSelect={selectFriendsOnly}
diff --git a/frontend/src/ts/components/pages/profile/UserDetails.tsx b/frontend/src/ts/components/pages/profile/UserDetails.tsx
index 9990134f25e4..d439228ab52e 100644
--- a/frontend/src/ts/components/pages/profile/UserDetails.tsx
+++ b/frontend/src/ts/components/pages/profile/UserDetails.tsx
@@ -19,7 +19,7 @@ import { addFriend, isFriend } from "../../../db";
 import * as EditProfileModal from "../../../modals/edit-profile";
 import * as UserReportModal from "../../../modals/user-report";
 import { bp } from "../../../states/breakpoints";
-import { getUserId, isLoggedIn } from "../../../states/core";
+import { getUserId, isAuthenticated } from "../../../states/core";
 import {
   showNoticeNotification,
   showErrorNotification,
@@ -113,7 +113,7 @@ function ActionButtons(props: {
 
   const [hasFriendRequest, setHasFriendRequest] = createSignal(false);
   const showFriendsButton = () =>
-    isLoggedIn() && !isUsersProfile() && !hasFriendRequest();
+    isAuthenticated() && !isUsersProfile() && !hasFriendRequest();
 
   createEffect(() => {
     setHasFriendRequest(
diff --git a/frontend/src/ts/components/pages/test/TestConfig.tsx b/frontend/src/ts/components/pages/test/TestConfig.tsx
index 9f3627c17484..8f7f96fa4cae 100644
--- a/frontend/src/ts/components/pages/test/TestConfig.tsx
+++ b/frontend/src/ts/components/pages/test/TestConfig.tsx
@@ -6,7 +6,7 @@ import { getConfig } from "../../../config/store";
 import { restartTestEvent } from "../../../events/test";
 import { createEffectOn } from "../../../hooks/effects";
 import { useRefWithUtils } from "../../../hooks/useRefWithUtils";
-import { isLoggedIn } from "../../../states/core";
+import { isAuthenticated } from "../../../states/core";
 import { showModal } from "../../../states/modals";
 import { getResultVisible, getFocus } from "../../../states/test";
 import { FaObject } from "../../../types/font-awesome";
@@ -345,7 +345,7 @@ function Mode2Quote(props: ComponentProps<"div">): JSXElement {
           />
         )}
       </For>
-      <Show when={isLoggedIn()}>
+      <Show when={isAuthenticated()}>
         <Button
           class={buttonClass}
           fa={{
diff --git a/frontend/src/ts/config/metadata.ts b/frontend/src/ts/config/metadata.ts
index 481faf990236..5f4042a85497 100644
--- a/frontend/src/ts/config/metadata.ts
+++ b/frontend/src/ts/config/metadata.ts
@@ -1,7 +1,7 @@
 import { checkCompatibility } from "@monkeytype/funbox";
 import * as DB from "../db";
 import { showNoticeNotification } from "../states/notifications";
-import { isAuthenticated } from "../firebase";
+import { isAuthenticated } from "../states/core";
 import { canSetFunboxWithConfig } from "./funbox-validation";
 import { reloadAfter } from "../utils/misc";
 import { isDevEnvironment } from "../utils/env";
diff --git a/frontend/src/ts/controllers/route-controller.ts b/frontend/src/ts/controllers/route-controller.ts
index 58c5d6a5c3f8..d5dcca696e0c 100644
--- a/frontend/src/ts/controllers/route-controller.ts
+++ b/frontend/src/ts/controllers/route-controller.ts
@@ -1,7 +1,8 @@
 import * as PageController from "./page-controller";
 import * as TestUI from "../test/test-ui";
 import * as PageTransition from "../legacy-states/page-transition";
-import { isAuthAvailable, isAuthenticated } from "../firebase";
+import { isAuthAvailable } from "../firebase";
+import { isAuthenticated } from "../states/core";
 import { isFunboxActive } from "../test/funbox/list";
 import * as TestState from "../test/test-state";
 import { showNoticeNotification } from "../states/notifications";
diff --git a/frontend/src/ts/db.ts b/frontend/src/ts/db.ts
index 43623d33b19f..5468b27c9b92 100644
--- a/frontend/src/ts/db.ts
+++ b/frontend/src/ts/db.ts
@@ -3,7 +3,8 @@ import {
   showNoticeNotification,
   showErrorNotification,
 } from "./states/notifications";
-import { isAuthenticated, getAuthenticatedUser } from "./firebase";
+import { getAuthenticatedUser } from "./firebase";
+import { isAuthenticated } from "./states/core";
 import { lastElementFromArray } from "./utils/arrays";
 import * as Dates from "date-fns";
 import {
diff --git a/frontend/src/ts/elements/account-settings/ape-key-table.ts b/frontend/src/ts/elements/account-settings/ape-key-table.ts
index a6a7faf2ffc8..2bc129194f24 100644
--- a/frontend/src/ts/elements/account-settings/ape-key-table.ts
+++ b/frontend/src/ts/elements/account-settings/ape-key-table.ts
@@ -11,7 +11,7 @@ import {
 } from "@monkeytype/schemas/ape-keys";
 import { format } from "date-fns/format";
 import { SimpleModal, TextArea } from "../simple-modal";
-import { isAuthenticated } from "../../firebase";
+import { isAuthenticated } from "../../states/core";
 import { qs, qsr } from "../../utils/dom";
 
 const editApeKey = new SimpleModal({
diff --git a/frontend/src/ts/elements/account-settings/blocked-user-table.ts b/frontend/src/ts/elements/account-settings/blocked-user-table.ts
index 7f440ca6ce30..a4f96cce6389 100644
--- a/frontend/src/ts/elements/account-settings/blocked-user-table.ts
+++ b/frontend/src/ts/elements/account-settings/blocked-user-table.ts
@@ -2,7 +2,7 @@ import { showErrorNotification } from "../../states/notifications";
 import { Connection } from "@monkeytype/schemas/connections";
 import Ape from "../../ape";
 import { format } from "date-fns/format";
-import { isAuthenticated } from "../../firebase";
+import { isAuthenticated } from "../../states/core";
 import * as DB from "../../db";
 import { getReceiverUid } from "../../db";
 import { qsr } from "../../utils/dom";
diff --git a/frontend/src/ts/elements/modes-notice.ts b/frontend/src/ts/elements/modes-notice.ts
index 39c5e41679a8..eda13c5988d0 100644
--- a/frontend/src/ts/elements/modes-notice.ts
+++ b/frontend/src/ts/elements/modes-notice.ts
@@ -5,7 +5,7 @@ import * as Last10Average from "../elements/last-10-average";
 import { Config } from "../config/store";
 import * as TestWords from "../test/test-words";
 import { configEvent, type ConfigEventKey } from "../events/config";
-import { isAuthenticated } from "../firebase";
+import { isAuthenticated } from "../states/core";
 import * as CustomTextState from "../legacy-states/custom-text-name";
 import { getLanguageDisplayString } from "../utils/strings";
 import Format from "../singletons/format";
diff --git a/frontend/src/ts/elements/settings/theme-picker.ts b/frontend/src/ts/elements/settings/theme-picker.ts
index 5e8856daea3c..b66f07d97494 100644
--- a/frontend/src/ts/elements/settings/theme-picker.ts
+++ b/frontend/src/ts/elements/settings/theme-picker.ts
@@ -11,8 +11,7 @@ import {
 import { showLoaderBar, hideLoaderBar } from "../../states/loader-bar";
 import * as DB from "../../db";
 import { configEvent } from "../../events/config";
-import { isAuthenticated } from "../../firebase";
-import { getActivePage } from "../../states/core";
+import { getActivePage, isAuthenticated } from "../../states/core";
 import { ThemeName } from "@monkeytype/schemas/configs";
 import { captureException } from "../../sentry";
 import { ColorName, ThemesList, ThemeWithName } from "../../constants/themes";
diff --git a/frontend/src/ts/event-handlers/account.ts b/frontend/src/ts/event-handlers/account.ts
index dacb31b25aae..e75072fae276 100644
--- a/frontend/src/ts/event-handlers/account.ts
+++ b/frontend/src/ts/event-handlers/account.ts
@@ -1,7 +1,7 @@
 import * as PbTablesModal from "../modals/pb-tables";
 import * as EditProfileModal from "../modals/edit-profile";
 import { getSnapshot } from "../db";
-import { isAuthenticated } from "../firebase";
+import { isAuthenticated } from "../states/core";
 import {
   showNoticeNotification,
   showErrorNotification,
diff --git a/frontend/src/ts/firebase.ts b/frontend/src/ts/firebase.ts
index 2c030b7ea7b6..bc6f08eb86cd 100644
--- a/frontend/src/ts/firebase.ts
+++ b/frontend/src/ts/firebase.ts
@@ -91,10 +91,6 @@ export async function init(callback: ReadyCallback): Promise<void> {
   }
 }
 
-export function isAuthenticated(): boolean {
-  return Auth?.currentUser !== undefined && Auth?.currentUser !== null;
-}
-
 /**
  *
  * @returns the current user if authenticated, else `null`
diff --git a/frontend/src/ts/modals/simple-modals.ts b/frontend/src/ts/modals/simple-modals.ts
index bf791d4e2c5c..8e415a364b82 100644
--- a/frontend/src/ts/modals/simple-modals.ts
+++ b/frontend/src/ts/modals/simple-modals.ts
@@ -7,11 +7,8 @@ import { showNoticeNotification } from "../states/notifications";
 import * as Settings from "../pages/settings";
 import * as ThemePicker from "../elements/settings/theme-picker";
 import { FirebaseError } from "firebase/app";
-import {
-  isAuthenticated,
-  getAuthenticatedUser,
-  isAuthAvailable,
-} from "../firebase";
+import { getAuthenticatedUser, isAuthAvailable } from "../firebase";
+import { isAuthenticated } from "../states/core";
 import {
   EmailAuthProvider,
   User,
diff --git a/frontend/src/ts/modals/user-report.ts b/frontend/src/ts/modals/user-report.ts
index 9a65e7b900c8..13db2a555000 100644
--- a/frontend/src/ts/modals/user-report.ts
+++ b/frontend/src/ts/modals/user-report.ts
@@ -9,7 +9,7 @@ import {
 import * as CaptchaController from "../controllers/captcha-controller";
 import SlimSelect from "slim-select";
 import AnimatedModal from "../utils/animated-modal";
-import { isAuthenticated } from "../firebase";
+import { isAuthenticated } from "../states/core";
 import { CharacterCounter } from "../elements/character-counter";
 import { ReportUserReason } from "@monkeytype/schemas/users";
 import { qsr } from "../utils/dom";
diff --git a/frontend/src/ts/pages/account-settings.ts b/frontend/src/ts/pages/account-settings.ts
index a7dce4331425..8ba2a27a885a 100644
--- a/frontend/src/ts/pages/account-settings.ts
+++ b/frontend/src/ts/pages/account-settings.ts
@@ -1,7 +1,7 @@
 import { PageWithUrlParams } from "./page";
 import * as Skeleton from "../utils/skeleton";
-import { getAuthenticatedUser, isAuthenticated } from "../firebase";
-import { getActivePage } from "../states/core";
+import { getAuthenticatedUser } from "../firebase";
+import { getActivePage, isAuthenticated } from "../states/core";
 import { swapElements } from "../utils/misc";
 import { getSnapshot } from "../db";
 import Ape from "../ape";
diff --git a/frontend/src/ts/pages/settings.ts b/frontend/src/ts/pages/settings.ts
index 62fe8c4f5057..390b55f1597a 100644
--- a/frontend/src/ts/pages/settings.ts
+++ b/frontend/src/ts/pages/settings.ts
@@ -18,9 +18,8 @@ import {
 } from "../states/notifications";
 import * as ImportExportSettingsModal from "../modals/import-export-settings";
 import { configEvent, type ConfigEventKey } from "../events/config";
-import { getActivePage } from "../states/core";
+import { getActivePage, isAuthenticated } from "../states/core";
 import { PageWithUrlParams } from "./page";
-import { isAuthenticated } from "../firebase";
 import { get as getTypingSpeedUnit } from "../utils/typing-speed-units";
 import SlimSelect from "slim-select";
 import * as Skeleton from "../utils/skeleton";
diff --git a/frontend/src/ts/queries/index.ts b/frontend/src/ts/queries/index.ts
index b91b02ebefd0..5a8c223d5853 100644
--- a/frontend/src/ts/queries/index.ts
+++ b/frontend/src/ts/queries/index.ts
@@ -1,10 +1,10 @@
 import { QueryClient } from "@tanstack/solid-query";
 import { createEffectOn } from "../hooks/effects";
-import { isLoggedIn } from "../states/core";
+import { isAuthenticated } from "../states/core";
 
 export const queryClient = new QueryClient();
 
-createEffectOn(isLoggedIn, (state) => {
+createEffectOn(isAuthenticated, (state) => {
   if (!state) {
     console.debug("QueryClient clear all user related queries.");
     void queryClient.resetQueries({ queryKey: ["user"] });
diff --git a/frontend/src/ts/states/core.ts b/frontend/src/ts/states/core.ts
index c2b3f80f0b2f..b8023581092b 100644
--- a/frontend/src/ts/states/core.ts
+++ b/frontend/src/ts/states/core.ts
@@ -30,7 +30,7 @@ export const [getGlobalOffsetTop, setGlobalOffsetTop] = createSignal(0);
 export const [getIsScreenshotting, setIsScreenshotting] = createSignal(false);
 
 export const [getUserId, setUserId] = createSignal<string | null>(null);
-export const isLoggedIn = (): boolean => getUserId() !== null;
+export const isAuthenticated = (): boolean => getUserId() !== null;
 
 export const [getSelectedProfileName, setSelectedProfileName] = createSignal<
   string | undefined
diff --git a/frontend/src/ts/test/result.ts b/frontend/src/ts/test/result.ts
index e83ec0146878..89cdf90de22a 100644
--- a/frontend/src/ts/test/result.ts
+++ b/frontend/src/ts/test/result.ts
@@ -15,7 +15,7 @@ import {
   showSuccessNotification,
   addNotificationWithLevel,
 } from "../states/notifications";
-import { isAuthenticated } from "../firebase";
+import { isAuthenticated } from "../states/core";
 import { getQuoteStats } from "../states/quote-rate";
 import * as GlarsesMode from "../legacy-states/glarses-mode";
 import * as SlowTimer from "../legacy-states/slow-timer";
diff --git a/frontend/src/ts/test/test-logic.ts b/frontend/src/ts/test/test-logic.ts
index 4fc8fac60eab..3ce10c09a91a 100644
--- a/frontend/src/ts/test/test-logic.ts
+++ b/frontend/src/ts/test/test-logic.ts
@@ -26,7 +26,7 @@ import * as TodayTracker from "./today-tracker";
 import * as ChallengeContoller from "../controllers/challenge-controller";
 import { clearQuoteStats } from "../states/quote-rate";
 import * as Result from "./result";
-import { getActivePage } from "../states/core";
+import { getActivePage, isAuthenticated } from "../states/core";
 import {
   setResultVisible,
   setWordsHaveNewline,
@@ -42,7 +42,7 @@ import { configEvent } from "../events/config";
 import { timerEvent } from "../events/timer";
 import objectHash from "object-hash";
 import * as AnalyticsController from "../controllers/analytics-controller";
-import { getAuthenticatedUser, isAuthenticated } from "../firebase";
+import { getAuthenticatedUser } from "../firebase";
 import * as ConnectionState from "../legacy-states/connection";
 import { highlight } from "../events/keymap";
 import * as LazyModeState from "../legacy-states/remember-lazy-mode";
diff --git a/frontend/src/ts/test/test-screenshot.ts b/frontend/src/ts/test/test-screenshot.ts
index 5487a16c0494..81a7fd5720a1 100644
--- a/frontend/src/ts/test/test-screenshot.ts
+++ b/frontend/src/ts/test/test-screenshot.ts
@@ -1,11 +1,14 @@
 import { showLoaderBar, hideLoaderBar } from "../states/loader-bar";
 import * as Replay from "./replay";
 import * as Misc from "../utils/misc";
-import { isAuthenticated } from "../firebase";
+import {
+  getActivePage,
+  isAuthenticated,
+  setIsScreenshotting,
+} from "../states/core";
 import { getActiveFunboxesWithFunction } from "./funbox/list";
 import * as DB from "../db";
 import { format } from "date-fns/format";
-import { getActivePage, setIsScreenshotting } from "../states/core";
 import { getHtmlByUserFlags } from "../controllers/user-flag-controller";
 import {
   showNoticeNotification,