From bd8b7ab5f1b58d9f2a8300b51042af3fbc127ca1 Mon Sep 17 00:00:00 2001
From: Dan Ditomaso <dan.ditomaso@gmail.com>
Date: Tue, 10 Jun 2025 10:44:35 -0400
Subject: [PATCH] fixed tsc errors

---
 src/components/Form/FormSelect.tsx            |  1 +
 .../Messages/TraceRoute.test.tsx              |  2 -
 src/components/UI/Button.tsx                  | 70 ++++++++-----------
 src/components/UI/Typography/Link.tsx         |  6 +-
 src/pages/Nodes/index.tsx                     |  4 +-
 5 files changed, 39 insertions(+), 44 deletions(-)

diff --git a/src/components/Form/FormSelect.tsx b/src/components/Form/FormSelect.tsx
index 4c8559ca..c453d98e 100644
--- a/src/components/Form/FormSelect.tsx
+++ b/src/components/Form/FormSelect.tsx
@@ -43,6 +43,7 @@ export function SelectInput<T extends FieldValues>({
   } = useController({
     name: field.name,
     control,
+    defaultValue: field.properties.defaultValue,
   });
 
   const { enumValue, formatEnumName, defaultValue, ...remainingProperties } =
diff --git a/src/components/PageComponents/Messages/TraceRoute.test.tsx b/src/components/PageComponents/Messages/TraceRoute.test.tsx
index 606022a6..b643777a 100644
--- a/src/components/PageComponents/Messages/TraceRoute.test.tsx
+++ b/src/components/PageComponents/Messages/TraceRoute.test.tsx
@@ -104,10 +104,8 @@ describe("TraceRoute", () => {
       />,
     );
 
-    // Check for the translated title
     expect(screen.getByText("Route back:")).toBeInTheDocument();
 
-    // With route back, both names appear twice
     expect(screen.getAllByText("Source Node")).toHaveLength(2);
     expect(screen.getAllByText("Destination Node")).toHaveLength(2);
 
diff --git a/src/components/UI/Button.tsx b/src/components/UI/Button.tsx
index ef5ab101..905eca30 100644
--- a/src/components/UI/Button.tsx
+++ b/src/components/UI/Button.tsx
@@ -46,44 +46,36 @@ export interface ButtonProps
   iconAlignment?: "left" | "right";
 }
 
-const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
-  (
-    {
-      className,
-      variant,
-      size,
-      disabled,
-      icon,
-      iconAlignment = "left",
-      children,
-      ...props
-    },
-    ref,
-  ) => {
-    return (
-      <button
-        type="button"
-        className={cn(
-          buttonVariants({ variant, size, className }),
-          { "cursor-not-allowed": disabled },
-          "inline-flex items-center",
-        )}
-        ref={ref}
-        disabled={disabled}
-        {...props}
-      >
-        {icon && iconAlignment === "left" && (
-          <span className={cn({ "mr-2": !!children })}>{icon}</span>
-        )}
-        {children}
-
-        {icon && iconAlignment === "right" && (
-          <span className={cn({ "ml-2": !!children })}>{icon}</span>
-        )}
-      </button>
-    );
-  },
-);
-Button.displayName = "Button";
+const Button = ({
+  className,
+  variant,
+  size,
+  disabled,
+  icon,
+  iconAlignment = "left",
+  children,
+  ...props
+}: ButtonProps) => {
+  return (
+    <button
+      type="button"
+      className={cn(
+        buttonVariants({ variant, size, className }),
+        { "cursor-not-allowed": disabled },
+        "inline-flex items-center",
+      )}
+      disabled={disabled}
+      {...props}
+    >
+      {icon && iconAlignment === "left" && (
+        <span className={cn({ "mr-2": !!children })}>{icon}</span>
+      )}
+      {children}
+      {icon && iconAlignment === "right" && (
+        <span className={cn({ "ml-2": !!children })}>{icon}</span>
+      )}
+    </button>
+  );
+};
 
 export { Button, buttonVariants };
diff --git a/src/components/UI/Typography/Link.tsx b/src/components/UI/Typography/Link.tsx
index de477ed9..00fe91bf 100644
--- a/src/components/UI/Typography/Link.tsx
+++ b/src/components/UI/Typography/Link.tsx
@@ -6,7 +6,11 @@ import {
 
 export interface LinkProps extends RouterLinkProps {
   href: string;
-  children?: React.ReactNode;
+  children?:
+    | React.ReactNode
+    | ((
+      state: { isActive: boolean; isTransitioning: boolean },
+    ) => React.ReactNode);
   className?: string;
 }
 
diff --git a/src/pages/Nodes/index.tsx b/src/pages/Nodes/index.tsx
index c349cde3..025ea3b0 100644
--- a/src/pages/Nodes/index.tsx
+++ b/src/pages/Nodes/index.tsx
@@ -1,5 +1,5 @@
-import { LocationResponseDialog } from "@app/components/Dialog/LocationResponseDialog.tsx";
-import { TracerouteResponseDialog } from "@app/components/Dialog/TracerouteResponseDialog.tsx";
+import { LocationResponseDialog } from "@components/Dialog/LocationResponseDialog.tsx";
+import { TracerouteResponseDialog } from "@components/Dialog/TracerouteResponseDialog.tsx";
 import { Sidebar } from "@components/Sidebar.tsx";
 import { Avatar } from "@components/UI/Avatar.tsx";
 import { Mono } from "@components/generic/Mono.tsx";