Merge branch 'main' into rb/fix-client-loader

frontend/src/components/modals/AccountSettingsModal.tsx

@@ -1,4 +1,4 @@
-import { useFetcher, useRouteLoaderData } from "@remix-run/react";
+import { useFetcher } from "@remix-run/react";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { BaseModalTitle } from "./confirmation-modals/BaseModal";
@@ -6,7 +6,6 @@ import ModalBody from "./ModalBody";
 import ModalButton from "../buttons/ModalButton";
 import FormFieldset from "../form/FormFieldset";
 import { CustomInput } from "../form/custom-input";
-import { clientLoader } from "#/routes/_oh";
 import { clientAction as settingsClientAction } from "#/routes/settings";
 import { clientAction as loginClientAction } from "#/routes/login";
 import { AvailableLanguages } from "#/i18n";
@@ -25,8 +24,8 @@ function AccountSettingsModal({
   gitHubError,
   analyticsConsent,
 }: AccountSettingsModalProps) {
+  const ghToken = localStorage.getItem("ghToken");
   const { t } = useTranslation();
-  const data = useRouteLoaderData<typeof clientLoader>("routes/_oh");
   const settingsFetcher = useFetcher<typeof settingsClientAction>({
     key: "settings",
   });
@@ -36,7 +35,7 @@ function AccountSettingsModal({
     event.preventDefault();
     const formData = new FormData(event.currentTarget);
     const language = formData.get("language")?.toString();
-    const ghToken = formData.get("ghToken")?.toString();
+    const newGHToken = formData.get("ghToken")?.toString();
     const analytics = formData.get("analytics")?.toString() === "on";
 
     const accountForm = new FormData();
@@ -49,7 +48,7 @@ function AccountSettingsModal({
       )?.value;
       accountForm.append("language", languageKey ?? "en");
     }
-    if (ghToken) loginForm.append("ghToken", ghToken);
+    if (newGHToken) loginForm.append("ghToken", newGHToken);
     accountForm.append("analytics", analytics.toString());
 
     settingsFetcher.submit(accountForm, {
@@ -85,14 +84,14 @@ function AccountSettingsModal({
             name="ghToken"
             label="GitHub Token"
             type="password"
-            defaultValue={data?.ghToken ?? ""}
+            defaultValue={ghToken ?? ""}
           />
           {gitHubError && (
             <p className="text-danger text-xs">
               {t(I18nKey.ACCOUNT_SETTINGS_MODAL$GITHUB_TOKEN_INVALID)}
             </p>
           )}
-          {data?.ghToken && !gitHubError && (
+          {ghToken && !gitHubError && (
             <ModalButton
               variant="text-like"
               text={t(I18nKey.ACCOUNT_SETTINGS_MODAL$DISCONNECT)}

frontend/src/components/modals/connect-to-github-modal.tsx

@@ -1,4 +1,4 @@
-import { useFetcher, useRouteLoaderData } from "@remix-run/react";
+import { useFetcher } from "@remix-run/react";
 import { useTranslation } from "react-i18next";
 import ModalBody from "./ModalBody";
 import { CustomInput } from "../form/custom-input";
@@ -7,7 +7,6 @@ import {
   BaseModalDescription,
   BaseModalTitle,
 } from "./confirmation-modals/BaseModal";
-import { clientLoader } from "#/routes/_oh";
 import { clientAction } from "#/routes/login";
 import { I18nKey } from "#/i18n/declaration";
 
@@ -16,7 +15,7 @@ interface ConnectToGitHubModalProps {
 }
 
 export function ConnectToGitHubModal({ onClose }: ConnectToGitHubModalProps) {
-  const data = useRouteLoaderData<typeof clientLoader>("routes/_oh");
+  const ghToken = localStorage.getItem("ghToken");
   const fetcher = useFetcher<typeof clientAction>({ key: "login" });
   const { t } = useTranslation();
 
@@ -51,7 +50,7 @@ export function ConnectToGitHubModal({ onClose }: ConnectToGitHubModalProps) {
           name="ghToken"
           required
           type="password"
-          defaultValue={data?.ghToken ?? ""}
+          defaultValue={ghToken ?? ""}
         />
 
         <div className="flex flex-col gap-2 w-full">