Remove Omit

Author: sea-snake

src/frontend/src/lib/components/UI/animation/FlyWrapper.svelte

@@ -2,7 +2,6 @@
   // Enable new styles only in the new layout pages.
   import "$lib/app.css";
   import Background from "$lib/components/UI/Background.svelte";
-  import FlyWrapper from "$lib/components/UI/animation/FlyWrapper.svelte";
 
   const { children, data } = $props();
 </script>
@@ -11,8 +10,6 @@
   <Background
     class="text-ii-text-primary-dark dark:text-ii-text-primary-light bg-ii-background-primary-light dark:bg-ii-background-primary-dark"
   >
-    <FlyWrapper>
-      {@render children()}
-    </FlyWrapper>
+    {@render children()}
   </Background>
 {/key}

src/frontend/src/routes/(new-styling)/+layout.svelte

@@ -31,10 +31,10 @@
   import { isCanisterError, throwCanisterError } from "$lib/utils/utils";
   import { authenticateWithJWT } from "$lib/utils/authenticate/jwt";
   import { type State } from "./state";
-  import ConnectOrCreatePasskey from "./stateComponents/ConnectOrCreatePasskey.svelte";
-  import CreatePasskey from "./stateComponents/CreatePasskey.svelte";
-  import SolveCaptcha from "./stateComponents/SolveCaptcha.svelte";
-  import ContinueAs from "./stateComponents/ContinueAs.svelte";
+  import ConnectOrCreatePasskey from "./components/ConnectOrCreatePasskey.svelte";
+  import CreatePasskey from "./components/CreatePasskey.svelte";
+  import SolveCaptcha from "./components/SolveCaptcha.svelte";
+  import ContinueAs from "./components/ContinueAs.svelte";
   import Dialog from "$lib/components/UI/Dialog.svelte";
   import Button from "$lib/components/UI/Button.svelte";
 

src/frontend/src/routes/(new-styling)/new-authorize/+page.svelte

@@ -3,10 +3,7 @@
   import { fly } from "svelte/transition";
   import { type State } from "../state.js";
 
-  type Props = Omit<
-    Extract<State, { state: "connectOrCreatePasskey" }>,
-    "state"
-  >;
+  type Props = Extract<State, { state: "connectOrCreatePasskey" }>;
 
   const { connect, create }: Props = $props();
 </script>

src/frontend/src/routes/(new-styling)/new-authorize/stateComponents/ConnectOrCreatePasskey.svelte renamed to src/frontend/src/routes/(new-styling)/new-authorize/components/ConnectOrCreatePasskey.svelte

@@ -2,7 +2,7 @@
   import Button from "$lib/components/UI/Button.svelte";
   import { type State } from "../state";
 
-  type Props = Omit<Extract<State, { state: "continueAs" }>, "state">;
+  type Props = Extract<State, { state: "continueAs" }>;
 
   const { number, name }: Props = $props();
 </script>

src/frontend/src/routes/(new-styling)/new-authorize/stateComponents/ContinueAs.svelte renamed to src/frontend/src/routes/(new-styling)/new-authorize/components/ContinueAs.svelte

@@ -4,7 +4,7 @@
   import { type State } from "../state";
   import { onMount } from "svelte";
 
-  type Props = Omit<Extract<State, { state: "createPasskey" }>, "state">;
+  type Props = Extract<State, { state: "createPasskey" }>;
 
   const { create, cancel }: Props = $props();
 

src/frontend/src/routes/(new-styling)/new-authorize/stateComponents/CreatePasskey.svelte renamed to src/frontend/src/routes/(new-styling)/new-authorize/components/CreatePasskey.svelte

@@ -3,7 +3,7 @@
   import { type State } from "../state";
   import { tick } from "svelte";
 
-  type Props = Omit<Extract<State, { state: "solveCaptcha" }>, "state">;
+  type Props = Extract<State, { state: "solveCaptcha" }>;
 
   const { image, attempt, solve, cancel }: Props = $props();