diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 4bdb6051f6..ce5b26ce6a 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -150,7 +150,8 @@
     "vite": "^5.4.8",
     "vite-plugin-checker": "^0.8.0",
     "vite-plugin-node-polyfills": "^0.17.0",
-    "zod": "^3.23.8"
+    "zod": "^3.23.8",
+    "@hookform/resolvers": "^3.9.0"
   },
   "packageManager": "pnpm@9.9.0",
   "dependencies": {
diff --git a/apps/desktop/src/views/settings/network/UpsertNetworkModal.test.tsx b/apps/desktop/src/views/settings/network/UpsertNetworkModal.test.tsx
index fd1524f60c..e6e3714f7c 100644
--- a/apps/desktop/src/views/settings/network/UpsertNetworkModal.test.tsx
+++ b/apps/desktop/src/views/settings/network/UpsertNetworkModal.test.tsx
@@ -12,6 +12,14 @@ beforeEach(() => {
 });
 
 describe("<UpsertNetworkModal />", () => {
+  const updatedNetwork = {
+    ...customNetwork,
+    rpcUrl: "https://rpc.com",
+    tzktApiUrl: "https://tzkt.com",
+    tzktExplorerUrl: "https://explorer.com",
+    buyTezUrl: "",
+  };
+
   describe("edit mode", () => {
     beforeEach(() => {
       store.dispatch(networksActions.upsertNetwork(customNetwork));
@@ -27,14 +35,6 @@ describe("<UpsertNetworkModal />", () => {
       const user = userEvent.setup();
       render(<UpsertNetworkModal network={customNetwork} />, { store });
 
-      const updatedNetwork = {
-        ...customNetwork,
-        rpcUrl: "https://rpc",
-        tzktApiUrl: "https://tzkt",
-        tzktExplorerUrl: "https://explorer",
-        buyTezUrl: "",
-      };
-
       await act(() => user.clear(screen.getByLabelText("RPC URL")));
       await act(() => user.clear(screen.getByLabelText("Tzkt API URL")));
       await act(() => user.clear(screen.getByLabelText("Tzkt Explorer URL")));
@@ -55,14 +55,6 @@ describe("<UpsertNetworkModal />", () => {
       const user = userEvent.setup();
       render(<UpsertNetworkModal network={customNetwork} />, { store });
 
-      const updatedNetwork = {
-        ...customNetwork,
-        rpcUrl: "https://rpc",
-        tzktApiUrl: "https://tzkt",
-        tzktExplorerUrl: "https://explorer",
-        buyTezUrl: "",
-      };
-
       await act(() => user.clear(screen.getByLabelText("RPC URL")));
       await act(() => user.clear(screen.getByLabelText("Tzkt API URL")));
       await act(() => user.clear(screen.getByLabelText("Tzkt Explorer URL")));
@@ -85,6 +77,48 @@ describe("<UpsertNetworkModal />", () => {
     });
   });
 
+  describe("URL fields validation", () => {
+    const urlFields = [
+      { label: "RPC URL", required: true },
+      { label: "Tzkt API URL", required: true },
+      { label: "Tzkt Explorer URL", required: true },
+      { label: "Buy Tez URL", required: false },
+    ];
+
+    it.each(urlFields)("validates $label field", async ({ label, required }) => {
+      const user = userEvent.setup();
+      render(<UpsertNetworkModal />, { store });
+
+      await user.type(screen.getByLabelText(label), "invalid-url");
+      await user.tab();
+
+      await waitFor(() => {
+        expect(screen.getByText(`Enter a valid ${label}`)).toBeVisible();
+      });
+
+      await user.clear(screen.getByLabelText(label));
+      await user.tab();
+
+      if (required) {
+        await waitFor(() => {
+          expect(screen.getByText(`${label} is required`)).toBeVisible();
+        });
+      } else {
+        await waitFor(() => {
+          expect(screen.queryByText(`${label} is required`)).not.toBeInTheDocument();
+        });
+      }
+
+      await user.type(screen.getByLabelText(label), "https://valid-url.com");
+      await user.tab();
+
+      await waitFor(() => {
+        expect(screen.queryByText(`Enter a valid ${label}`)).not.toBeInTheDocument();
+      });
+      expect(screen.queryByText(`${label} is required`)).not.toBeInTheDocument();
+    });
+  });
+
   describe("create mode", () => {
     describe("name field", () => {
       it("validates uniqueness", async () => {
diff --git a/apps/desktop/src/views/settings/network/UpsertNetworkModal.tsx b/apps/desktop/src/views/settings/network/UpsertNetworkModal.tsx
index 419df9af0f..6023157048 100644
--- a/apps/desktop/src/views/settings/network/UpsertNetworkModal.tsx
+++ b/apps/desktop/src/views/settings/network/UpsertNetworkModal.tsx
@@ -9,7 +9,8 @@ import {
   ModalFooter,
   ModalHeader,
 } from "@chakra-ui/react";
-import { useDynamicModalContext } from "@umami/components";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { getNetworkValidationScheme, useDynamicModalContext } from "@umami/components";
 import { networksActions, useAvailableNetworks } from "@umami/state";
 import { type Network } from "@umami/tezos";
 import { useForm } from "react-hook-form";
@@ -30,7 +31,11 @@ export const UpsertNetworkModal = ({ network }: { network?: Network }) => {
     formState: { errors, isValid },
     register,
     handleSubmit,
-  } = useForm<Network>({ mode: "onBlur", defaultValues: network });
+  } = useForm<Network>({
+    mode: "onBlur",
+    defaultValues: network,
+    resolver: zodResolver(getNetworkValidationScheme(availableNetworks, network)),
+  });
 
   const onSubmit = (network: Network) => {
     dispatch(networksActions.upsertNetwork(network));
@@ -51,12 +56,7 @@ export const UpsertNetworkModal = ({ network }: { network?: Network }) => {
               <Input
                 placeholder="mainnet"
                 {...register("name", {
-                  required: "Name is required",
-                  validate: name => {
-                    if (availableNetworks.find(n => n.name === name)) {
-                      return "Network with this name already exists";
-                    }
-                  },
+                  setValueAs: removeTrailingSlashes,
                 })}
               />
               {errors.name && <FormErrorMessage>{errors.name.message}</FormErrorMessage>}
@@ -67,7 +67,6 @@ export const UpsertNetworkModal = ({ network }: { network?: Network }) => {
             <Input
               placeholder="https://prod.tcinfra.net/rpc/mainnet"
               {...register("rpcUrl", {
-                required: "RPC URL is required",
                 setValueAs: removeTrailingSlashes,
               })}
             />
@@ -78,7 +77,6 @@ export const UpsertNetworkModal = ({ network }: { network?: Network }) => {
             <Input
               placeholder="https://api.ghostnet.tzkt.io"
               {...register("tzktApiUrl", {
-                required: "Tzkt API URL is required",
                 setValueAs: removeTrailingSlashes,
               })}
             />
@@ -89,7 +87,6 @@ export const UpsertNetworkModal = ({ network }: { network?: Network }) => {
             <Input
               placeholder="https://ghostnet.tzkt.io"
               {...register("tzktExplorerUrl", {
-                required: "Tzkt Explorer URL is required",
                 setValueAs: removeTrailingSlashes,
               })}
             />
@@ -98,9 +95,10 @@ export const UpsertNetworkModal = ({ network }: { network?: Network }) => {
             )}
           </FormControl>
 
-          <FormControl>
+          <FormControl isInvalid={!!errors.buyTezUrl}>
             <FormLabel>Buy Tez URL</FormLabel>
             <Input placeholder="https://faucet.ghostnet.teztnets.com" {...register("buyTezUrl")} />
+            {errors.buyTezUrl && <FormErrorMessage>{errors.buyTezUrl.message}</FormErrorMessage>}
           </FormControl>
           <ModalFooter>
             <Button width="100%" isDisabled={!isValid} onClick={() => {}} type="submit">
diff --git a/apps/web/package.json b/apps/web/package.json
index c7dade2aff..796da4f3dc 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -32,6 +32,7 @@
     "@chakra-ui/theme-tools": "^2.2.3",
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
+    "@hookform/resolvers": "^3.9.0",
     "@reduxjs/toolkit": "^2.2.7",
     "@tanstack/react-query": "^5.59.0",
     "@taquito/beacon-wallet": "^20.0.1",
diff --git a/apps/web/src/components/Menu/NetworkMenu/EditNetworkMenu.test.tsx b/apps/web/src/components/Menu/NetworkMenu/EditNetworkMenu.test.tsx
index 7a6c5fca7b..c0f82beb6e 100644
--- a/apps/web/src/components/Menu/NetworkMenu/EditNetworkMenu.test.tsx
+++ b/apps/web/src/components/Menu/NetworkMenu/EditNetworkMenu.test.tsx
@@ -13,6 +13,14 @@ beforeEach(() => {
 
 describe("<EditNetworkMenu />", () => {
   describe("edit mode", () => {
+    const updatedNetwork = {
+      ...customNetwork,
+      rpcUrl: "https://rpc.com",
+      tzktApiUrl: "https://tzkt.com",
+      tzktExplorerUrl: "https://explorer.com",
+      buyTezUrl: "",
+    };
+
     beforeEach(() => {
       store.dispatch(networksActions.upsertNetwork(customNetwork));
     });
@@ -27,14 +35,6 @@ describe("<EditNetworkMenu />", () => {
       const user = userEvent.setup();
       await renderInDrawer(<EditNetworkMenu network={customNetwork} />, store);
 
-      const updatedNetwork = {
-        ...customNetwork,
-        rpcUrl: "https://rpc",
-        tzktApiUrl: "https://tzkt",
-        tzktExplorerUrl: "https://explorer",
-        buyTezUrl: "",
-      };
-
       await act(() => user.clear(screen.getByLabelText("RPC URL")));
       await act(() => user.clear(screen.getByLabelText("Tzkt API URL")));
       await act(() => user.clear(screen.getByLabelText("Tzkt Explorer URL")));
@@ -45,7 +45,9 @@ describe("<EditNetworkMenu />", () => {
         user.type(screen.getByLabelText("Tzkt Explorer URL"), updatedNetwork.tzktExplorerUrl)
       );
 
-      expect(screen.getByText("Save changes")).toBeEnabled();
+      await waitFor(() => {
+        expect(screen.getByText("Save changes")).toBeEnabled();
+      });
 
       await act(() => user.click(screen.getByText("Save changes")));
       expect(store.getState().networks.available).toEqual([MAINNET, GHOSTNET, updatedNetwork]);
@@ -55,14 +57,6 @@ describe("<EditNetworkMenu />", () => {
       const user = userEvent.setup();
       await renderInDrawer(<EditNetworkMenu network={customNetwork} />, store);
 
-      const updatedNetwork = {
-        ...customNetwork,
-        rpcUrl: "https://rpc",
-        tzktApiUrl: "https://tzkt",
-        tzktExplorerUrl: "https://explorer",
-        buyTezUrl: "",
-      };
-
       await act(() => user.clear(screen.getByLabelText("RPC URL")));
       await act(() => user.clear(screen.getByLabelText("Tzkt API URL")));
       await act(() => user.clear(screen.getByLabelText("Tzkt Explorer URL")));
@@ -85,6 +79,48 @@ describe("<EditNetworkMenu />", () => {
     });
   });
 
+  describe("URL fields validation", () => {
+    const urlFields = [
+      { label: "RPC URL", required: true },
+      { label: "Tzkt API URL", required: true },
+      { label: "Tzkt Explorer URL", required: true },
+      { label: "Buy Tez URL", required: false },
+    ];
+
+    it.each(urlFields)("validates $label field", async ({ label, required }) => {
+      const user = userEvent.setup();
+      await renderInDrawer(<EditNetworkMenu />, store);
+
+      await user.type(screen.getByLabelText(label), "invalid-url");
+      await user.tab();
+
+      await waitFor(() => {
+        expect(screen.getByText(`Enter a valid ${label}`)).toBeVisible();
+      });
+
+      await user.clear(screen.getByLabelText(label));
+      await user.tab();
+
+      if (required) {
+        await waitFor(() => {
+          expect(screen.getByText(`${label} is required`)).toBeVisible();
+        });
+      } else {
+        await waitFor(() => {
+          expect(screen.queryByText(`${label} is required`)).not.toBeInTheDocument();
+        });
+      }
+
+      await user.type(screen.getByLabelText(label), "https://valid-url.com");
+      await user.tab();
+
+      await waitFor(() => {
+        expect(screen.queryByText(`Enter a valid ${label}`)).not.toBeInTheDocument();
+      });
+      expect(screen.queryByText(`${label} is required`)).not.toBeInTheDocument();
+    });
+  });
+
   describe("create mode", () => {
     describe("name field", () => {
       it("validates uniqueness", async () => {
diff --git a/apps/web/src/components/Menu/NetworkMenu/EditNetworkMenu.tsx b/apps/web/src/components/Menu/NetworkMenu/EditNetworkMenu.tsx
index 35d4453fba..61633276f4 100644
--- a/apps/web/src/components/Menu/NetworkMenu/EditNetworkMenu.tsx
+++ b/apps/web/src/components/Menu/NetworkMenu/EditNetworkMenu.tsx
@@ -1,5 +1,6 @@
 import { Button, FormControl, FormErrorMessage, FormLabel, Input, VStack } from "@chakra-ui/react";
-import { useDynamicDrawerContext } from "@umami/components";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { getNetworkValidationScheme, useDynamicDrawerContext } from "@umami/components";
 import { networksActions, useAppDispatch, useAvailableNetworks } from "@umami/state";
 import { type Network } from "@umami/tezos";
 import { useForm } from "react-hook-form";
@@ -21,7 +22,11 @@ export const EditNetworkMenu = ({ network }: EditNetworkMenuProps) => {
     formState: { errors, isValid },
     register,
     handleSubmit,
-  } = useForm<Network>({ mode: "onBlur", defaultValues: network });
+  } = useForm<Network>({
+    mode: "onBlur",
+    defaultValues: network,
+    resolver: zodResolver(getNetworkValidationScheme(availableNetworks, network)),
+  });
 
   const onSubmit = (network: Network) => {
     dispatch(networksActions.upsertNetwork(network));
@@ -35,17 +40,7 @@ export const EditNetworkMenu = ({ network }: EditNetworkMenuProps) => {
           {!network && (
             <FormControl isInvalid={!!errors.name}>
               <FormLabel>Name</FormLabel>
-              <Input
-                placeholder="mainnet"
-                {...register("name", {
-                  required: "Name is required",
-                  validate: name => {
-                    if (availableNetworks.find(n => n.name === name)) {
-                      return "Network with this name already exists";
-                    }
-                  },
-                })}
-              />
+              <Input placeholder="mainnet" {...register("name")} />
               {errors.name && <FormErrorMessage>{errors.name.message}</FormErrorMessage>}
             </FormControl>
           )}
@@ -54,7 +49,6 @@ export const EditNetworkMenu = ({ network }: EditNetworkMenuProps) => {
             <Input
               placeholder="https://prod.tcinfra.net/rpc/mainnet"
               {...register("rpcUrl", {
-                required: "RPC URL is required",
                 setValueAs: removeTrailingSlashes,
               })}
             />
@@ -65,7 +59,6 @@ export const EditNetworkMenu = ({ network }: EditNetworkMenuProps) => {
             <Input
               placeholder="https://api.ghostnet.tzkt.io"
               {...register("tzktApiUrl", {
-                required: "Tzkt API URL is required",
                 setValueAs: removeTrailingSlashes,
               })}
             />
@@ -76,7 +69,6 @@ export const EditNetworkMenu = ({ network }: EditNetworkMenuProps) => {
             <Input
               placeholder="https://ghostnet.tzkt.io"
               {...register("tzktExplorerUrl", {
-                required: "Tzkt Explorer URL is required",
                 setValueAs: removeTrailingSlashes,
               })}
             />
@@ -85,9 +77,10 @@ export const EditNetworkMenu = ({ network }: EditNetworkMenuProps) => {
             )}
           </FormControl>
 
-          <FormControl>
+          <FormControl isInvalid={!!errors.buyTezUrl}>
             <FormLabel>Buy Tez URL</FormLabel>
             <Input placeholder="https://faucet.ghostnet.teztnets.com" {...register("buyTezUrl")} />
+            {errors.buyTezUrl && <FormErrorMessage>{errors.buyTezUrl.message}</FormErrorMessage>}
           </FormControl>
         </VStack>
         <Button width="100%" marginTop="30px" isDisabled={!isValid} type="submit" variant="primary">
diff --git a/packages/components/src/AddressPill/AddressPillText.test.tsx b/packages/components/src/components/AddressPill/AddressPillText.test.tsx
similarity index 97%
rename from packages/components/src/AddressPill/AddressPillText.test.tsx
rename to packages/components/src/components/AddressPill/AddressPillText.test.tsx
index 6b9749164c..2707a1d96a 100644
--- a/packages/components/src/AddressPill/AddressPillText.test.tsx
+++ b/packages/components/src/components/AddressPill/AddressPillText.test.tsx
@@ -3,7 +3,7 @@ import { GHOSTNET, formatPkh, mockImplicitAddress } from "@umami/tezos";
 
 import { AddressPillText } from "./AddressPillText";
 import { mockFA2AddressKind } from "./testUtils";
-import { render, screen } from "../testUtils";
+import { render, screen } from "../../testUtils";
 const { upsert } = contactsActions;
 
 let store: UmamiStore;
diff --git a/packages/components/src/AddressPill/AddressPillText.tsx b/packages/components/src/components/AddressPill/AddressPillText.tsx
similarity index 100%
rename from packages/components/src/AddressPill/AddressPillText.tsx
rename to packages/components/src/components/AddressPill/AddressPillText.tsx
diff --git a/packages/components/src/AddressPill/index.ts b/packages/components/src/components/AddressPill/index.ts
similarity index 100%
rename from packages/components/src/AddressPill/index.ts
rename to packages/components/src/components/AddressPill/index.ts
diff --git a/packages/components/src/AddressPill/testUtils.ts b/packages/components/src/components/AddressPill/testUtils.ts
similarity index 73%
rename from packages/components/src/AddressPill/testUtils.ts
rename to packages/components/src/components/AddressPill/testUtils.ts
index 22cf0b4593..a7563a50d9 100644
--- a/packages/components/src/AddressPill/testUtils.ts
+++ b/packages/components/src/components/AddressPill/testUtils.ts
@@ -1,5 +1,6 @@
+import { mockContractAddress } from "@umami/tezos";
+
 import { type FA2Address } from "./types";
-import { mockContractAddress } from "../../../tezos/src/testUtils";
 
 export const mockFA2AddressKind = (index?: number): FA2Address => ({
   type: "fa2",
diff --git a/packages/components/src/AddressPill/types.ts b/packages/components/src/components/AddressPill/types.ts
similarity index 100%
rename from packages/components/src/AddressPill/types.ts
rename to packages/components/src/components/AddressPill/types.ts
diff --git a/packages/components/src/AddressPill/useAddressKind.test.ts b/packages/components/src/components/AddressPill/useAddressKind.test.ts
similarity index 99%
rename from packages/components/src/AddressPill/useAddressKind.test.ts
rename to packages/components/src/components/AddressPill/useAddressKind.test.ts
index c5c0814cc3..a32309967c 100644
--- a/packages/components/src/AddressPill/useAddressKind.test.ts
+++ b/packages/components/src/components/AddressPill/useAddressKind.test.ts
@@ -28,7 +28,7 @@ import {
 import { cloneDeep } from "lodash";
 
 import { useAddressKind } from "./useAddressKind";
-import { renderHook } from "../testUtils";
+import { renderHook } from "../../testUtils";
 
 let store: UmamiStore;
 
diff --git a/packages/components/src/AddressPill/useAddressKind.ts b/packages/components/src/components/AddressPill/useAddressKind.ts
similarity index 100%
rename from packages/components/src/AddressPill/useAddressKind.ts
rename to packages/components/src/components/AddressPill/useAddressKind.ts
diff --git a/packages/components/src/AddressPill/useAddressPill.test.tsx b/packages/components/src/components/AddressPill/useAddressPill.test.tsx
similarity index 94%
rename from packages/components/src/AddressPill/useAddressPill.test.tsx
rename to packages/components/src/components/AddressPill/useAddressPill.test.tsx
index bf36f12b07..3b89692023 100644
--- a/packages/components/src/AddressPill/useAddressPill.test.tsx
+++ b/packages/components/src/components/AddressPill/useAddressPill.test.tsx
@@ -1,8 +1,8 @@
-import { makeStore, UmamiStore } from "@umami/state";
+import { type UmamiStore, makeStore } from "@umami/state";
 import { mockImplicitAddress } from "@umami/tezos";
+
 import { useAddressPill } from "./useAddressPill";
-import { act, fireEvent, render, renderHook, screen, waitFor } from "../testUtils";
-import { Box, useDisclosure } from "@chakra-ui/react";
+import { act, renderHook } from "../../testUtils";
 
 let store: UmamiStore;
 
diff --git a/packages/components/src/AddressPill/useAddressPill.ts b/packages/components/src/components/AddressPill/useAddressPill.ts
similarity index 100%
rename from packages/components/src/AddressPill/useAddressPill.ts
rename to packages/components/src/components/AddressPill/useAddressPill.ts
diff --git a/packages/components/src/DynamicDisclosure/DynamicDisclosure.test.tsx b/packages/components/src/components/DynamicDisclosure/DynamicDisclosure.test.tsx
similarity index 99%
rename from packages/components/src/DynamicDisclosure/DynamicDisclosure.test.tsx
rename to packages/components/src/components/DynamicDisclosure/DynamicDisclosure.test.tsx
index 24d895bb53..588441f637 100644
--- a/packages/components/src/DynamicDisclosure/DynamicDisclosure.test.tsx
+++ b/packages/components/src/components/DynamicDisclosure/DynamicDisclosure.test.tsx
@@ -1,5 +1,5 @@
 import { useDynamicDrawer, useDynamicModal, useDynamicModalContext } from "./DynamicDisclosure";
-import { act, render, renderHook, screen } from "../testUtils";
+import { act, render, renderHook, screen } from "../../testUtils";
 
 describe("DynamicDisclosure", () => {
   describe("useDynamicModal", () => {
diff --git a/packages/components/src/DynamicDisclosure/DynamicDisclosure.tsx b/packages/components/src/components/DynamicDisclosure/DynamicDisclosure.tsx
similarity index 100%
rename from packages/components/src/DynamicDisclosure/DynamicDisclosure.tsx
rename to packages/components/src/components/DynamicDisclosure/DynamicDisclosure.tsx
diff --git a/packages/components/src/DynamicDisclosure/index.ts b/packages/components/src/components/DynamicDisclosure/index.ts
similarity index 100%
rename from packages/components/src/DynamicDisclosure/index.ts
rename to packages/components/src/components/DynamicDisclosure/index.ts
diff --git a/packages/components/src/DynamicDisclosure/useMultiForm.test.tsx b/packages/components/src/components/DynamicDisclosure/useMultiForm.test.tsx
similarity index 99%
rename from packages/components/src/DynamicDisclosure/useMultiForm.test.tsx
rename to packages/components/src/components/DynamicDisclosure/useMultiForm.test.tsx
index 3d301781bf..9356e6f2d1 100644
--- a/packages/components/src/DynamicDisclosure/useMultiForm.test.tsx
+++ b/packages/components/src/components/DynamicDisclosure/useMultiForm.test.tsx
@@ -11,7 +11,7 @@ import {
 
 import { useDynamicModalContext } from "./DynamicDisclosure";
 import { useMultiForm } from "./useMultiForm";
-import { act, renderHook, screen, userEvent, waitFor } from "../testUtils";
+import { act, renderHook, screen, userEvent, waitFor } from "../../testUtils";
 
 const Page3 = () => {
   const { goBack, allFormValues } = useDynamicModalContext();
diff --git a/packages/components/src/DynamicDisclosure/useMultiForm.tsx b/packages/components/src/components/DynamicDisclosure/useMultiForm.tsx
similarity index 100%
rename from packages/components/src/DynamicDisclosure/useMultiForm.tsx
rename to packages/components/src/components/DynamicDisclosure/useMultiForm.tsx
diff --git a/packages/components/src/MnemonicAutocomplete/MnemonicAutocomplete.test.tsx b/packages/components/src/components/MnemonicAutocomplete/MnemonicAutocomplete.test.tsx
similarity index 98%
rename from packages/components/src/MnemonicAutocomplete/MnemonicAutocomplete.test.tsx
rename to packages/components/src/components/MnemonicAutocomplete/MnemonicAutocomplete.test.tsx
index 99b732bc76..2e5520b886 100644
--- a/packages/components/src/MnemonicAutocomplete/MnemonicAutocomplete.test.tsx
+++ b/packages/components/src/components/MnemonicAutocomplete/MnemonicAutocomplete.test.tsx
@@ -2,7 +2,7 @@ import { FormControl, Text } from "@chakra-ui/react";
 import { FormProvider, useForm } from "react-hook-form";
 
 import { MnemonicAutocomplete } from "./MnemonicAutocomplete";
-import { fireEvent, render, screen, waitFor } from "../testUtils";
+import { fireEvent, render, screen, waitFor } from "../../testUtils";
 
 type FormFields = { word: string };
 
diff --git a/packages/components/src/MnemonicAutocomplete/MnemonicAutocomplete.tsx b/packages/components/src/components/MnemonicAutocomplete/MnemonicAutocomplete.tsx
similarity index 100%
rename from packages/components/src/MnemonicAutocomplete/MnemonicAutocomplete.tsx
rename to packages/components/src/components/MnemonicAutocomplete/MnemonicAutocomplete.tsx
diff --git a/packages/components/src/MnemonicAutocomplete/index.ts b/packages/components/src/components/MnemonicAutocomplete/index.ts
similarity index 100%
rename from packages/components/src/MnemonicAutocomplete/index.ts
rename to packages/components/src/components/MnemonicAutocomplete/index.ts
diff --git a/packages/components/src/ReactIdenticon.tsx b/packages/components/src/components/ReactIdenticon/ReactIdenticon.tsx
similarity index 100%
rename from packages/components/src/ReactIdenticon.tsx
rename to packages/components/src/components/ReactIdenticon/ReactIdenticon.tsx
diff --git a/packages/components/src/components/ReactIdenticon/index.ts b/packages/components/src/components/ReactIdenticon/index.ts
new file mode 100644
index 0000000000..728a5da53b
--- /dev/null
+++ b/packages/components/src/components/ReactIdenticon/index.ts
@@ -0,0 +1 @@
+export * from "./ReactIdenticon";
diff --git a/packages/components/src/components/index.ts b/packages/components/src/components/index.ts
new file mode 100644
index 0000000000..6974d66aba
--- /dev/null
+++ b/packages/components/src/components/index.ts
@@ -0,0 +1,4 @@
+export * from "./DynamicDisclosure";
+export * from "./AddressPill";
+export * from "./MnemonicAutocomplete";
+export * from "./ReactIdenticon";
diff --git a/packages/components/src/index.ts b/packages/components/src/index.ts
index ab8d00f841..8da0f1a7dd 100644
--- a/packages/components/src/index.ts
+++ b/packages/components/src/index.ts
@@ -1,5 +1,3 @@
-export * from "./AddressPill";
-export * from "./DynamicDisclosure";
 export * from "./hooks";
-export * from "./ReactIdenticon";
-export * from "./MnemonicAutocomplete";
+export * from "./utils";
+export * from "./components";
diff --git a/packages/components/src/testUtils.tsx b/packages/components/src/testUtils.tsx
index 46feb55765..020d99a16c 100644
--- a/packages/components/src/testUtils.tsx
+++ b/packages/components/src/testUtils.tsx
@@ -3,7 +3,7 @@ import { type UmamiStore, makeStore } from "@umami/state";
 import { type PropsWithChildren, type ReactNode, act } from "react";
 import { Provider } from "react-redux";
 
-import { DynamicModalContext, useDynamicModal } from "./DynamicDisclosure";
+import { DynamicModalContext, useDynamicModal } from "./components/DynamicDisclosure";
 export * from "@testing-library/user-event";
 
 const makeWrapper =
diff --git a/packages/components/src/utils/index.ts b/packages/components/src/utils/index.ts
new file mode 100644
index 0000000000..4730ee98de
--- /dev/null
+++ b/packages/components/src/utils/index.ts
@@ -0,0 +1 @@
+export * from "./validationSchemes";
diff --git a/packages/components/src/utils/validationSchemes.test.ts b/packages/components/src/utils/validationSchemes.test.ts
new file mode 100644
index 0000000000..fd60fbb6ac
--- /dev/null
+++ b/packages/components/src/utils/validationSchemes.test.ts
@@ -0,0 +1,115 @@
+import { type Network } from "@umami/tezos";
+
+import { getNetworkValidationScheme } from "./validationSchemes";
+
+describe("getNetworkValidationScheme", () => {
+  const mockAvailableNetworks: Network[] = [
+    {
+      name: "Existing Network",
+      rpcUrl: "https://example.com",
+      tzktApiUrl: "https://api.example.com",
+      tzktExplorerUrl: "https://explorer.example.com",
+    },
+  ];
+
+  it("should validate a correct network input", () => {
+    const schema = getNetworkValidationScheme(mockAvailableNetworks);
+    const validInput = {
+      name: "New Network",
+      rpcUrl: "https://rpc.example.com",
+      tzktApiUrl: "https://api.tzkt.example.com",
+      tzktExplorerUrl: "https://explorer.tzkt.example.com",
+      buyTezUrl: "https://buy.example.com",
+    };
+
+    const result = schema.safeParse(validInput);
+    expect(result.success).toBe(true);
+  });
+
+  it("should reject a network with an existing name", () => {
+    const schema = getNetworkValidationScheme(mockAvailableNetworks);
+    const invalidInput = {
+      name: "Existing Network",
+      rpcUrl: "https://rpc.example.com",
+      tzktApiUrl: "https://api.tzkt.example.com",
+      tzktExplorerUrl: "https://explorer.tzkt.example.com",
+    };
+
+    const result = schema.safeParse(invalidInput);
+    expect(result.success).toBe(false);
+
+    expect(result.error!.issues[0].message).toBe("Network with this name already exists");
+  });
+
+  it("should reject invalid URLs", () => {
+    const schema = getNetworkValidationScheme(mockAvailableNetworks);
+    const invalidInput = {
+      name: "Invalid URL Network",
+      rpcUrl: "http://insecure.com",
+      tzktApiUrl: "not-a-url",
+      tzktExplorerUrl: "ftp://invalid-protocol.com",
+    };
+
+    const result = schema.safeParse(invalidInput);
+    expect(result.success).toBe(false);
+
+    expect(result.error!.issues).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ message: "RPC URL must be secure and start with 'https://'" }),
+        expect.objectContaining({ message: "Enter a valid Tzkt API URL" }),
+        expect.objectContaining({
+          message: "Tzkt Explorer URL must be secure and start with 'https://'",
+        }),
+      ])
+    );
+  });
+
+  it("should allow empty buyTezUrl", () => {
+    const schema = getNetworkValidationScheme(mockAvailableNetworks);
+    const validInput = {
+      name: "No Buy Tez URL",
+      rpcUrl: "https://rpc.example.com",
+      tzktApiUrl: "https://api.tzkt.example.com",
+      tzktExplorerUrl: "https://explorer.tzkt.example.com",
+      buyTezUrl: "",
+    };
+
+    const result = schema.safeParse(validInput);
+    expect(result.success).toBe(true);
+  });
+
+  it("should make name optional when editing an existing network", () => {
+    const existingNetwork: Network = {
+      name: "Existing Network",
+      rpcUrl: "https://rpc.example.com",
+      tzktApiUrl: "https://api.tzkt.example.com",
+      tzktExplorerUrl: "https://explorer.tzkt.example.com",
+    };
+    const schema = getNetworkValidationScheme(mockAvailableNetworks, existingNetwork);
+    const validInput = {
+      rpcUrl: "https://new-rpc.example.com",
+      tzktApiUrl: "https://new-api.tzkt.example.com",
+      tzktExplorerUrl: "https://new-explorer.tzkt.example.com",
+      buyTezUrl: "",
+    };
+
+    const result = schema.safeParse(validInput);
+    expect(result.success).toBe(true);
+  });
+
+  it("should require name when adding a new network", () => {
+    const schema = getNetworkValidationScheme(mockAvailableNetworks);
+    const invalidInput = {
+      name: "",
+      rpcUrl: "https://rpc.example.com",
+      tzktApiUrl: "https://api.tzkt.example.com",
+      tzktExplorerUrl: "https://explorer.tzkt.example.com",
+      buyTezUrl: "",
+    };
+
+    const result = schema.safeParse(invalidInput);
+    expect(result.success).toBe(false);
+
+    expect(result.error!.issues[0].message).toBe("Name is required");
+  });
+});
diff --git a/packages/components/src/utils/validationSchemes.ts b/packages/components/src/utils/validationSchemes.ts
new file mode 100644
index 0000000000..3f0b2c115d
--- /dev/null
+++ b/packages/components/src/utils/validationSchemes.ts
@@ -0,0 +1,34 @@
+import { type Network } from "@umami/tezos";
+import { z } from "zod";
+
+const URL_REGEX = new RegExp(
+  "((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|" + // domain name
+    "((\\d{1,3}\\.){3}\\d{1,3}))" + // OR IP (v4) address
+    "(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*" + // port and path
+    "(\\?[;&a-z\\d%_.~+=-]*)?" + // query string
+    "(\\#[-a-z\\d_]*)?$",
+  "i"
+);
+
+const urlScheme = (urlType: string) =>
+  z
+    .string()
+    .min(1, `${urlType} URL is required`)
+    .regex(URL_REGEX, `Enter a valid ${urlType} URL`)
+    .startsWith("https://", { message: `${urlType} URL must be secure and start with 'https://'` });
+
+export const getNetworkValidationScheme = (availableNetworks: Network[], network?: Network) =>
+  z.object({
+    name: network
+      ? z.string().optional()
+      : z
+          .string()
+          .min(1, "Name is required")
+          .refine(name => !availableNetworks.find(n => n.name === name), {
+            message: "Network with this name already exists",
+          }),
+    rpcUrl: urlScheme("RPC"),
+    tzktApiUrl: urlScheme("Tzkt API"),
+    tzktExplorerUrl: urlScheme("Tzkt Explorer"),
+    buyTezUrl: urlScheme("Buy Tez").or(z.literal("")),
+  });
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bbcc6c65cd..78404a708a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -82,6 +82,9 @@ importers:
       '@emotion/styled':
         specifier: ^11.13.0
         version: 11.13.0(@emotion/react@11.13.3(@types/react@18.3.11)(react@18.3.1))(@types/react@18.3.11)(react@18.3.1)
+      '@hookform/resolvers':
+        specifier: ^3.9.0
+        version: 3.9.0(react-hook-form@7.52.2(react@18.3.1))
       '@reduxjs/toolkit':
         specifier: ^2.2.7
         version: 2.2.7(react-redux@9.1.2(@types/react@18.3.11)(react@18.3.1)(redux@5.0.1))(react@18.3.1)
@@ -624,6 +627,9 @@ importers:
       '@emotion/styled':
         specifier: ^11.13.0
         version: 11.13.0(@emotion/react@11.13.3(@types/react@18.3.11)(react@18.3.1))(@types/react@18.3.11)(react@18.3.1)
+      '@hookform/resolvers':
+        specifier: ^3.9.0
+        version: 3.9.0(react-hook-form@7.52.2(react@18.3.1))
       '@reduxjs/toolkit':
         specifier: ^2.2.7
         version: 2.2.7(react-redux@9.1.2(@types/react@18.3.11)(react@18.3.1)(redux@5.0.1))(react@18.3.1)
@@ -876,7 +882,7 @@ importers:
         version: 2.5.2
       jest-transformer-svg:
         specifier: ^2.0.2
-        version: 2.0.2(jest@29.7.0(@types/node@20.14.11)(babel-plugin-macros@3.1.0))(react@18.3.1)
+        version: 2.0.2(jest@29.7.0(@types/node@20.14.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.5.4)))(react@18.3.1)
       madge:
         specifier: ^8.0.0
         version: 8.0.0(typescript@5.5.4)
@@ -1018,7 +1024,7 @@ importers:
         version: 8.57.0
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@20.14.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.5.4))
+        version: 29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4))
       lodash:
         specifier: ^4.17.21
         version: 4.17.21
@@ -1121,7 +1127,7 @@ importers:
         version: 8.57.0
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@20.14.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.5.4))
+        version: 29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4))
       madge:
         specifier: ^8.0.0
         version: 8.0.0(typescript@5.5.4)
@@ -1179,7 +1185,7 @@ importers:
         version: 8.57.0
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@20.14.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.5.4))
+        version: 29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4))
       madge:
         specifier: ^8.0.0
         version: 8.0.0(typescript@5.5.4)
@@ -1294,7 +1300,7 @@ importers:
         version: 8.57.0
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@20.14.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.5.4))
+        version: 29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4))
       madge:
         specifier: ^8.0.0
         version: 8.0.0(typescript@5.5.4)
@@ -1345,13 +1351,13 @@ importers:
         version: 2.31.0(@typescript-eslint/parser@8.8.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.0)
       eslint-plugin-jest:
         specifier: ^28.8.3
-        version: 28.8.3(@typescript-eslint/eslint-plugin@8.8.0(@typescript-eslint/parser@8.8.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(jest@29.7.0(babel-plugin-macros@3.1.0))(typescript@5.5.4)
+        version: 28.8.3(@typescript-eslint/eslint-plugin@8.8.0(@typescript-eslint/parser@8.8.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(jest@29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4)))(typescript@5.5.4)
       eslint-plugin-jest-dom:
         specifier: ^5.4.0
         version: 5.4.0(@testing-library/dom@10.4.0)(eslint@8.57.0)
       eslint-plugin-playwright:
         specifier: ^1.6.2
-        version: 1.6.2(eslint-plugin-jest@28.8.3(@typescript-eslint/eslint-plugin@8.8.0(@typescript-eslint/parser@8.8.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(jest@29.7.0(babel-plugin-macros@3.1.0))(typescript@5.5.4))(eslint@8.57.0)
+        version: 1.6.2(eslint-plugin-jest@28.8.3(@typescript-eslint/eslint-plugin@8.8.0(@typescript-eslint/parser@8.8.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(jest@29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4)))(typescript@5.5.4))(eslint@8.57.0)
       eslint-plugin-react:
         specifier: ^7.37.1
         version: 7.37.1(eslint@8.57.0)
@@ -1378,7 +1384,7 @@ importers:
     devDependencies:
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@20.14.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.5.4))
+        version: 29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4))
       rimraf:
         specifier: ^6.0.1
         version: 6.0.1
@@ -1454,7 +1460,7 @@ importers:
         version: 8.57.0
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@20.14.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.5.4))
+        version: 29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4))
       madge:
         specifier: ^8.0.0
         version: 8.0.0(typescript@5.5.4)
@@ -1512,7 +1518,7 @@ importers:
         version: 8.57.0
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@20.14.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.5.4))
+        version: 29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4))
       madge:
         specifier: ^8.0.0
         version: 8.0.0(typescript@5.5.4)
@@ -1663,7 +1669,7 @@ importers:
         version: 8.57.0
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@20.14.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.5.4))
+        version: 29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4))
       madge:
         specifier: ^8.0.0
         version: 8.0.0(typescript@5.5.4)
@@ -1724,7 +1730,7 @@ importers:
         version: 8.57.0
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@20.14.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.5.4))
+        version: 29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4))
       madge:
         specifier: ^8.0.0
         version: 8.0.0(typescript@5.5.4)
@@ -1806,7 +1812,7 @@ importers:
         version: 8.57.0
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@20.14.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.5.4))
+        version: 29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4))
       madge:
         specifier: ^8.0.0
         version: 8.0.0(typescript@5.5.4)
@@ -1890,7 +1896,7 @@ importers:
         version: 8.57.0
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@20.14.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.5.4))
+        version: 29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4))
       madge:
         specifier: ^8.0.0
         version: 8.0.0(typescript@5.5.4)
@@ -3529,6 +3535,11 @@ packages:
   '@hapi/topo@5.1.0':
     resolution: {integrity: sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==}
 
+  '@hookform/resolvers@3.9.0':
+    resolution: {integrity: sha512-bU0Gr4EepJ/EQsH/IwEzYLsT/PEj5C0ynLQ4m+GSHS+xKH4TfSelhluTgOaoc4kA5s7eCsQbM4wvZLzELmWzUg==}
+    peerDependencies:
+      react-hook-form: ^7.0.0
+
   '@humanwhocodes/config-array@0.11.14':
     resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==}
     engines: {node: '>=10.10.0'}
@@ -12974,6 +12985,10 @@ snapshots:
     dependencies:
       '@hapi/hoek': 9.3.0
 
+  '@hookform/resolvers@3.9.0(react-hook-form@7.52.2(react@18.3.1))':
+    dependencies:
+      react-hook-form: 7.52.2(react@18.3.1)
+
   '@humanwhocodes/config-array@0.11.14':
     dependencies:
       '@humanwhocodes/object-schema': 2.0.3
@@ -13049,6 +13064,41 @@ snapshots:
       - supports-color
       - ts-node
 
+  '@jest/core@29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4))':
+    dependencies:
+      '@jest/console': 29.7.0
+      '@jest/reporters': 29.7.0
+      '@jest/test-result': 29.7.0
+      '@jest/transform': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.14.11
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      ci-info: 3.9.0
+      exit: 0.1.2
+      graceful-fs: 4.2.11
+      jest-changed-files: 29.7.0
+      jest-config: 29.7.0(@types/node@20.14.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4))
+      jest-haste-map: 29.7.0
+      jest-message-util: 29.7.0
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.7.0
+      jest-resolve-dependencies: 29.7.0
+      jest-runner: 29.7.0
+      jest-runtime: 29.7.0
+      jest-snapshot: 29.7.0
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      jest-watcher: 29.7.0
+      micromatch: 4.0.7
+      pretty-format: 29.7.0
+      slash: 3.0.0
+      strip-ansi: 6.0.1
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
   '@jest/environment@29.7.0':
     dependencies:
       '@jest/fake-timers': 29.7.0
@@ -16180,6 +16230,21 @@ snapshots:
       - supports-color
       - ts-node
 
+  create-jest@29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4)):
+    dependencies:
+      '@jest/types': 29.6.3
+      chalk: 4.1.2
+      exit: 0.1.2
+      graceful-fs: 4.2.11
+      jest-config: 29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4))
+      jest-util: 29.7.0
+      prompts: 2.4.2
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
   create-require@1.1.1: {}
 
   cross-env@7.0.3:
@@ -16990,23 +17055,23 @@ snapshots:
     optionalDependencies:
       '@testing-library/dom': 10.4.0
 
-  eslint-plugin-jest@28.8.3(@typescript-eslint/eslint-plugin@8.8.0(@typescript-eslint/parser@8.8.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(jest@29.7.0(babel-plugin-macros@3.1.0))(typescript@5.5.4):
+  eslint-plugin-jest@28.8.3(@typescript-eslint/eslint-plugin@8.8.0(@typescript-eslint/parser@8.8.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(jest@29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4)))(typescript@5.5.4):
     dependencies:
       '@typescript-eslint/utils': 7.18.0(eslint@8.57.0)(typescript@5.5.4)
       eslint: 8.57.0
     optionalDependencies:
       '@typescript-eslint/eslint-plugin': 8.8.0(@typescript-eslint/parser@8.8.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4)
-      jest: 29.7.0(@types/node@20.14.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.5.4))
+      jest: 29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4))
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  eslint-plugin-playwright@1.6.2(eslint-plugin-jest@28.8.3(@typescript-eslint/eslint-plugin@8.8.0(@typescript-eslint/parser@8.8.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(jest@29.7.0(babel-plugin-macros@3.1.0))(typescript@5.5.4))(eslint@8.57.0):
+  eslint-plugin-playwright@1.6.2(eslint-plugin-jest@28.8.3(@typescript-eslint/eslint-plugin@8.8.0(@typescript-eslint/parser@8.8.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(jest@29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4)))(typescript@5.5.4))(eslint@8.57.0):
     dependencies:
       eslint: 8.57.0
       globals: 13.24.0
     optionalDependencies:
-      eslint-plugin-jest: 28.8.3(@typescript-eslint/eslint-plugin@8.8.0(@typescript-eslint/parser@8.8.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(jest@29.7.0(babel-plugin-macros@3.1.0))(typescript@5.5.4)
+      eslint-plugin-jest: 28.8.3(@typescript-eslint/eslint-plugin@8.8.0(@typescript-eslint/parser@8.8.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(jest@29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4)))(typescript@5.5.4)
 
   eslint-plugin-react-hooks@4.6.2(eslint@8.57.0):
     dependencies:
@@ -18257,6 +18322,25 @@ snapshots:
       - supports-color
       - ts-node
 
+  jest-cli@29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4)):
+    dependencies:
+      '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4))
+      '@jest/test-result': 29.7.0
+      '@jest/types': 29.6.3
+      chalk: 4.1.2
+      create-jest: 29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4))
+      exit: 0.1.2
+      import-local: 3.2.0
+      jest-config: 29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4))
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      yargs: 17.7.2
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
   jest-config@29.7.0(@types/node@20.14.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.5.4)):
     dependencies:
       '@babel/core': 7.25.7
@@ -18288,6 +18372,68 @@ snapshots:
       - babel-plugin-macros
       - supports-color
 
+  jest-config@29.7.0(@types/node@20.14.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4)):
+    dependencies:
+      '@babel/core': 7.25.7
+      '@jest/test-sequencer': 29.7.0
+      '@jest/types': 29.6.3
+      babel-jest: 29.7.0(@babel/core@7.25.7)
+      chalk: 4.1.2
+      ci-info: 3.9.0
+      deepmerge: 4.3.1
+      glob: 7.2.3
+      graceful-fs: 4.2.11
+      jest-circus: 29.7.0(babel-plugin-macros@3.1.0)
+      jest-environment-node: 29.7.0
+      jest-get-type: 29.6.3
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.7.0
+      jest-runner: 29.7.0
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      micromatch: 4.0.7
+      parse-json: 5.2.0
+      pretty-format: 29.7.0
+      slash: 3.0.0
+      strip-json-comments: 3.1.1
+    optionalDependencies:
+      '@types/node': 20.14.11
+      ts-node: 10.9.2(@types/node@22.1.0)(typescript@5.5.4)
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+
+  jest-config@29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4)):
+    dependencies:
+      '@babel/core': 7.25.7
+      '@jest/test-sequencer': 29.7.0
+      '@jest/types': 29.6.3
+      babel-jest: 29.7.0(@babel/core@7.25.7)
+      chalk: 4.1.2
+      ci-info: 3.9.0
+      deepmerge: 4.3.1
+      glob: 7.2.3
+      graceful-fs: 4.2.11
+      jest-circus: 29.7.0(babel-plugin-macros@3.1.0)
+      jest-environment-node: 29.7.0
+      jest-get-type: 29.6.3
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.7.0
+      jest-runner: 29.7.0
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      micromatch: 4.0.7
+      parse-json: 5.2.0
+      pretty-format: 29.7.0
+      slash: 3.0.0
+      strip-json-comments: 3.1.1
+    optionalDependencies:
+      '@types/node': 22.1.0
+      ts-node: 10.9.2(@types/node@22.1.0)(typescript@5.5.4)
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+
   jest-diff@29.7.0:
     dependencies:
       chalk: 4.1.2
@@ -18484,7 +18630,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  jest-transformer-svg@2.0.2(jest@29.7.0(@types/node@20.14.11)(babel-plugin-macros@3.1.0))(react@18.3.1):
+  jest-transformer-svg@2.0.2(jest@29.7.0(@types/node@20.14.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.5.4)))(react@18.3.1):
     dependencies:
       jest: 29.7.0(@types/node@20.14.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.5.4))
       react: 18.3.1
@@ -18548,6 +18694,18 @@ snapshots:
       - supports-color
       - ts-node
 
+  jest@29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4)):
+    dependencies:
+      '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4))
+      '@jest/types': 29.6.3
+      import-local: 3.2.0
+      jest-cli: 29.7.0(@types/node@22.1.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4))
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
   jiti@1.21.6: {}
 
   jju@1.4.0: {}
@@ -20920,6 +21078,25 @@ snapshots:
       v8-compile-cache-lib: 3.0.1
       yn: 3.1.1
 
+  ts-node@10.9.2(@types/node@22.1.0)(typescript@5.5.4):
+    dependencies:
+      '@cspotcode/source-map-support': 0.8.1
+      '@tsconfig/node10': 1.0.11
+      '@tsconfig/node12': 1.0.11
+      '@tsconfig/node14': 1.0.3
+      '@tsconfig/node16': 1.0.4
+      '@types/node': 22.1.0
+      acorn: 8.12.1
+      acorn-walk: 8.3.3
+      arg: 4.1.3
+      create-require: 1.1.1
+      diff: 4.0.2
+      make-error: 1.3.6
+      typescript: 5.5.4
+      v8-compile-cache-lib: 3.0.1
+      yn: 3.1.1
+    optional: true
+
   tsconfig-paths@3.15.0:
     dependencies:
       '@types/json5': 0.0.29