Merge pull request #1760 from shlinkio/dependabot/npm_and_yarn/react-router-7.10.1

Bump react-router from 7.9.6 to 7.10.1
Add missing node types
2025-12-11 10:13:55 -06:00 · 2025-12-08 11:05:13 +01:00 · 2025-12-08 11:03:47 +01:00 · 2025-12-08 10:58:40 +01:00 · 2025-12-06 09:50:03 +01:00 · 2025-12-06 08:47:02 +00:00
77 changed files with 4461 additions and 7193 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,6 +4,85 @@ All notable changes to this project will be documented in this file.

 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org).

+## [4.6.1] - 2025-11-15
+### Added
+* *Nothing*
+
+### Changed
+* [#802](https://github.com/shlinkio/shlink-web-client/issues/802) Improve dependency injection in components.
+* Stop injecting redux state and actions.
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* Fix small UI issues.
+
+
+## [4.6.0] - 2025-11-12
+### Added
+* [shlink-web-component#839](https://github.com/shlinkio/shlink-web-component/issues/839) Allow filtering short URLs by excluded tags when using Shlink >=4.6.0
+* [shlink-web-component#838](https://github.com/shlinkio/shlink-web-component/issues/838) Allow filtering tag, orphan and non-orphan visits by domain, when using Shlink >=4.6.0
+* [shlink-web-component#784](https://github.com/shlinkio/shlink-web-component/issues/784) Add optional `long-url` query parameter to short URL creation to prefill the long URL programmatically.
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* Drop support for Shlink older than 4.0.0
+
+### Fixed
+* *Nothing*
+
+
+## [4.5.1] - 2025-08-13
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1637](https://github.com/shlinkio/shlink-web-client/issues/1637) Fix brand color used in PWA
+* [#1636](https://github.com/shlinkio/shlink-web-client/issues/1636) Make sure sidebar toggle is rendered only in sections where the sidebar exists.
+
+
+## [4.5.0] - 2025-08-08
+### Added
+* [shlink-web-component#755](https://github.com/shlinkio/shlink-web-component/issues/755) Add support for `any-value-query-param` and `valueless-query-param` redirect conditions when using Shlink >=4.5.0.
+* [shlink-web-component#756](https://github.com/shlinkio/shlink-web-component/issues/756) Add support for desktop device types on device redirect conditions, when using Shlink >=4.5.0.
+* [shlink-web-component#713](https://github.com/shlinkio/shlink-web-component/issues/713) Expose a new `ShlinkSidebarToggleButton` component that can be used to customize the location of the sidebar toggle, rather than making it assume there's a header bar and position it there.
+* [shlink-web-component#657](https://github.com/shlinkio/shlink-web-component/issues/657) Allow visits table columns to be customized via settings, and add a new optional "Region" column.
+
+  As a side effect, the "Show user agent" toggle has been removed from the list, as this can now be globally configured in the settings.
+
+### Changed
+* Update to FontAwesome 7
+* Update to Recharts 3
+* Update to `@shlinkio/shlink-web-component` 0.16.1
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [shlink-web-component#698](https://github.com/shlinkio/shlink-web-component/issues/698) Fix line chart selection triggering after clicking a dot in the chart. It now works only when dragging while the mouse is clicked.
+
+
 ## [4.4.1] - 2025-06-23
 ### Added
 * *Nothing*
--- a/4
+++ b/4
@ -1,10 +1,10 @@
-FROM node:24.2-alpine AS node
+FROM node:25.2-alpine AS node
 COPY . /shlink-web-client
 ARG VERSION="latest"
 ENV VERSION=${VERSION}
 RUN cd /shlink-web-client && npm ci && node --run build

-FROM nginxinc/nginx-unprivileged:1.27-alpine
+FROM nginxinc/nginx-unprivileged:1.29-alpine
 ARG UID=101
 LABEL maintainer="Alejandro Celaya <alejandro@alejandrocelaya.com>"

--- a/dev.Dockerfile
+++ b/dev.Dockerfile
@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/playwright:v1.53.1-noble
+FROM mcr.microsoft.com/playwright:v1.57.0-noble

 ENV NODE_VERSION 22.14
 ENV TINI_VERSION v0.19.0
--- a/index.html
+++ b/index.html
@ -3,7 +3,8 @@
  <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-    <meta name="theme-color" content="#4696e5">
+    <meta name="theme-color" content="#2078CF" media="(prefers-color-scheme: light)">
+    <meta name="theme-color" content="#0B2D4E" media="(prefers-color-scheme: dark)">

    <!--
      manifest.json provides metadata used when your web app is added to the
--- a/manifest.ts
+++ b/manifest.ts
@ -1,12 +1,13 @@
+import { BRAND_COLOR_LM } from '@shlinkio/shlink-frontend-kit';
 import type { ManifestOptions } from 'vite-plugin-pwa';

 export const manifest: Partial<ManifestOptions> = {
  short_name: 'Shlink',
-  name: 'Shlink',
+  name: 'Shlink Web Client',
  start_url: '/',
  display: 'standalone',
-  theme_color: '#4696e5',
-  background_color: '#4696e5',
+  theme_color: BRAND_COLOR_LM, // Toolbar color
+  background_color: BRAND_COLOR_LM, // Splash screen background color
  icons: [
    {
      src: './icons/icon-16x16.png',
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -7,7 +7,7 @@
  "license": "MIT",
  "type": "module",
  "scripts": {
-    "lint": "eslint src test config/test",
+    "lint": "eslint src test config/test *.config.{js,ts}",
    "lint:fix": "node --run lint -- --fix",
    "types": "tsc",
    "start": "vite serve --host=0.0.0.0",
@ -20,66 +20,68 @@
    "test:verbose": "node --run test -- --verbose"
  },
  "dependencies": {
-    "@fortawesome/fontawesome-free": "^6.7.2",
-    "@fortawesome/fontawesome-svg-core": "^6.7.2",
-    "@fortawesome/free-brands-svg-icons": "^6.7.2",
-    "@fortawesome/free-regular-svg-icons": "^6.7.2",
-    "@fortawesome/free-solid-svg-icons": "^6.7.2",
-    "@fortawesome/react-fontawesome": "^0.2.2",
+    "@fortawesome/fontawesome-free": "^7.1.0",
+    "@fortawesome/fontawesome-svg-core": "^7.1.0",
+    "@fortawesome/free-brands-svg-icons": "^7.1.0",
+    "@fortawesome/free-regular-svg-icons": "^7.1.0",
+    "@fortawesome/free-solid-svg-icons": "^7.1.0",
+    "@fortawesome/react-fontawesome": "^3.1.1",
    "@json2csv/plainjs": "^7.0.6",
-    "@reduxjs/toolkit": "^2.8.2",
-    "@shlinkio/data-manipulation": "^1.0.3",
-    "@shlinkio/shlink-frontend-kit": "^1.0.0",
-    "@shlinkio/shlink-js-sdk": "^2.1.0",
-    "@shlinkio/shlink-web-component": "^0.15.0",
+    "@reduxjs/toolkit": "^2.11.0",
+    "@shlinkio/data-manipulation": "^1.0.4",
+    "@shlinkio/shlink-frontend-kit": "^1.3.1",
+    "@shlinkio/shlink-js-sdk": "^3.0.1",
+    "@shlinkio/shlink-web-component": "^0.17.0",
+    "@vitest/browser-playwright": "^4.0.15",
    "bottlejs": "^2.0.1",
    "clsx": "^2.1.1",
    "compare-versions": "^6.1.1",
-    "csvtojson": "^2.0.10",
+    "csvtojson": "^2.0.14",
    "date-fns": "^4.1.0",
-    "react": "^19.1.0",
-    "react-dom": "^19.1.0",
-    "react-external-link": "^2.5.0",
+    "react": "^19.2.1",
+    "react-dom": "^19.2.1",
+    "react-external-link": "^2.6.1",
    "react-redux": "^9.2.0",
-    "react-router": "^7.6.2",
+    "react-router": "^7.10.1",
    "redux-localstorage-simple": "^2.5.1",
-    "workbox-core": "^7.3.0",
-    "workbox-expiration": "^7.3.0",
-    "workbox-precaching": "^7.3.0",
-    "workbox-routing": "^7.3.0",
-    "workbox-strategies": "^7.3.0"
+    "workbox-core": "^7.4.0",
+    "workbox-expiration": "^7.4.0",
+    "workbox-precaching": "^7.4.0",
+    "workbox-routing": "^7.4.0",
+    "workbox-strategies": "^7.4.0"
  },
  "devDependencies": {
-    "@shlinkio/eslint-config-js-coding-standard": "~3.5.0",
-    "@stylistic/eslint-plugin": "^4.4.1",
-    "@tailwindcss/vite": "^4.1.10",
-    "@testing-library/jest-dom": "^6.6.3",
+    "@shlinkio/eslint-config-js-coding-standard": "~3.7.0",
+    "@stylistic/eslint-plugin": "^5.6.1",
+    "@tailwindcss/vite": "^4.1.17",
+    "@testing-library/jest-dom": "^6.9.1",
    "@testing-library/react": "^16.3.0",
    "@testing-library/user-event": "^14.6.1",
    "@total-typescript/shoehorn": "^0.1.2",
-    "@types/react": "^19.1.8",
-    "@types/react-dom": "^19.1.6",
-    "@vitejs/plugin-react": "^4.5.2",
-    "@vitest/browser": "^3.2.4",
-    "@vitest/coverage-v8": "^3.2.4",
+    "@types/node": "^24.10.1",
+    "@types/react": "^19.2.7",
+    "@types/react-dom": "^19.2.3",
+    "@vitejs/plugin-react": "^5.1.1",
+    "@vitest/browser": "^4.0.3",
+    "@vitest/coverage-v8": "^4.0.15",
    "adm-zip": "^0.5.16",
-    "axe-core": "^4.10.3",
-    "chalk": "^5.4.1",
-    "eslint": "^9.29.0",
+    "axe-core": "^4.11.0",
+    "chalk": "^5.6.2",
+    "eslint": "^9.39.1",
    "eslint-plugin-import": "^2.32.0",
    "eslint-plugin-jsx-a11y": "^6.10.2",
    "eslint-plugin-react": "^7.37.5",
    "eslint-plugin-react-compiler": "^19.0.0-beta-714736e-20250131",
-    "eslint-plugin-react-hooks": "^5.2.0",
+    "eslint-plugin-react-hooks": "^7.0.1",
    "eslint-plugin-simple-import-sort": "^12.1.1",
    "history": "^5.3.0",
-    "playwright": "^1.53.1",
+    "playwright": "^1.57.0",
    "tailwindcss": "^4.1.3",
-    "typescript": "^5.8.3",
-    "typescript-eslint": "^8.34.1",
-    "vite": "^6.3.5",
-    "vite-plugin-pwa": "^1.0.0",
-    "vitest": "^3.0.5"
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.48.1",
+    "vite": "^7.2.6",
+    "vite-plugin-pwa": "^1.2.0",
+    "vitest": "^4.0.3"
  },
  "browserslist": [
    ">0.2%",
--- a/src/api/services/ShlinkApiClientBuilder.ts
+++ b/src/api/services/ShlinkApiClientBuilder.ts
@ -1,13 +1,11 @@
 import type { HttpClient } from '@shlinkio/shlink-js-sdk';
 import { ShlinkApiClient } from '@shlinkio/shlink-js-sdk';
-import type { GetState } from '../../container/types';
 import type { ServerWithId } from '../../servers/data';
 import { hasServerData } from '../../servers/data';
+import type { GetState } from '../../store';

 const apiClients: Map<string, ShlinkApiClient> = new Map();

-const isGetState = (getStateOrSelectedServer: GetState | ServerWithId): getStateOrSelectedServer is GetState =>
-  typeof getStateOrSelectedServer === 'function';
 const getSelectedServerFromState = (getState: GetState): ServerWithId => {
  const { selectedServer } = getState();
  if (!hasServerData(selectedServer)) {
@ -18,7 +16,7 @@ const getSelectedServerFromState = (getState: GetState): ServerWithId => {
 };

 export const buildShlinkApiClient = (httpClient: HttpClient) => (getStateOrSelectedServer: GetState | ServerWithId) => {
-  const { url: baseUrl, apiKey, forwardCredentials } = isGetState(getStateOrSelectedServer)
+  const { url: baseUrl, apiKey, forwardCredentials } = typeof getStateOrSelectedServer === 'function'
    ? getSelectedServerFromState(getStateOrSelectedServer)
    : getStateOrSelectedServer;
  const serverKey = `${apiKey}_${baseUrl}_${forwardCredentials ? 'forward' : 'no-forward'}`;
@ -34,6 +32,7 @@ export const buildShlinkApiClient = (httpClient: HttpClient) => (getStateOrSelec
    { requestCredentials: forwardCredentials ? 'include' : undefined },
  );
  apiClients.set(serverKey, apiClient);
+
  return apiClient;
 };

--- a/src/api/services/provideServices.ts
+++ b/src/api/services/provideServices.ts
@ -1,6 +0,0 @@
-import type Bottle from 'bottlejs';
-import { buildShlinkApiClient } from './ShlinkApiClientBuilder';
-
-export const provideServices = (bottle: Bottle) => {
-  bottle.serviceFactory('buildShlinkApiClient', buildShlinkApiClient, 'HttpClient');
-};
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@ -1,109 +1,71 @@
 import { changeThemeInMarkup, getSystemPreferredTheme } from '@shlinkio/shlink-frontend-kit';
-import type { Settings } from '@shlinkio/shlink-web-component/settings';
 import { clsx } from 'clsx';
 import type { FC } from 'react';
-import { useEffect, useRef } from 'react';
+import { useEffect } from 'react';
 import { Route, Routes, useLocation } from 'react-router';
 import { AppUpdateBanner } from '../common/AppUpdateBanner';
+import { Home } from '../common/Home';
+import { MainHeader } from '../common/MainHeader';
 import { NotFound } from '../common/NotFound';
-import type { FCWithDeps } from '../container/utils';
-import { componentFactory, useDependencies } from '../container/utils';
-import type { ServersMap } from '../servers/data';
+import { ShlinkVersionsContainer } from '../common/ShlinkVersionsContainer';
+import { ShlinkWebComponentContainer } from '../common/ShlinkWebComponentContainer';
+import { CreateServer } from '../servers/CreateServer';
+import { EditServer } from '../servers/EditServer';
+import { ManageServers } from '../servers/ManageServers';
+import { useLoadRemoteServers } from '../servers/reducers/remoteServers';
+import { useSettings } from '../settings/reducers/settings';
+import { Settings } from '../settings/Settings';
 import { forceUpdate } from '../utils/helpers/sw';
+import { useAppUpdated } from './reducers/appUpdates';

-type AppProps = {
-  fetchServers: () => void;
-  servers: ServersMap;
-  settings: Settings;
-  resetAppUpdate: () => void;
-  appUpdated: boolean;
-};
+export const App: FC = () => {
+  const { appUpdated, resetAppUpdate } = useAppUpdated();

-type AppDeps = {
-  MainHeader: FC;
-  Home: FC;
-  ShlinkWebComponentContainer: FC;
-  CreateServer: FC;
-  EditServer: FC;
-  Settings: FC;
-  ManageServers: FC;
-  ShlinkVersionsContainer: FC;
-};
-
-const App: FCWithDeps<AppProps, AppDeps> = (
-  { fetchServers, servers, settings, appUpdated, resetAppUpdate },
-) => {
-  const {
-    MainHeader,
-    Home,
-    ShlinkWebComponentContainer,
-    CreateServer,
-    EditServer,
-    Settings,
-    ManageServers,
-    ShlinkVersionsContainer,
-  } = useDependencies(App);
+  useLoadRemoteServers();

  const location = useLocation();
-  const initialServers = useRef(servers);
  const isHome = location.pathname === '/';

-  useEffect(() => {
-    // Try to fetch the remote servers if the list is empty during first render.
-    // We use a ref because we don't care if the servers list becomes empty later.
-    if (Object.keys(initialServers.current).length === 0) {
-      fetchServers();
-    }
-  }, [fetchServers]);
-
+  const { settings } = useSettings();
  useEffect(() => {
    changeThemeInMarkup(settings.ui?.theme ?? getSystemPreferredTheme());
  }, [settings.ui?.theme]);

  return (
    <div className="h-full">
-      <MainHeader />
+      <>
+        <MainHeader />

-      <div className="h-full pt-(--header-height)">
-        <div
-          data-testid="shlink-wrapper"
-          className={clsx(
-            'min-h-full pb-[calc(var(--footer-height)+var(--footer-margin))] -mb-[calc(var(--footer-height)+var(--footer-margin))]',
-            { 'flex items-center pt-4': isHome },
-          )}
-        >
-          <Routes>
-            <Route index element={<Home />} />
-            <Route path="/settings">
-              {['', '*'].map((path) => <Route key={path} path={path} element={<Settings />} />)}
-            </Route>
-            <Route path="/manage-servers" element={<ManageServers />} />
-            <Route path="/server/create" element={<CreateServer />} />
-            <Route path="/server/:serverId/edit" element={<EditServer />} />
-            <Route path="/server/:serverId">
-              {['', '*'].map((path) => <Route key={path} path={path} element={<ShlinkWebComponentContainer />} />)}
-            </Route>
-            <Route path="*" element={<NotFound />} />
-          </Routes>
-        </div>
+        <div className="h-full pt-(--header-height)">
+          <div
+            data-testid="shlink-wrapper"
+            className={clsx(
+              'min-h-full pb-[calc(var(--footer-height)+var(--footer-margin))] -mb-[calc(var(--footer-height)+var(--footer-margin))]',
+              { 'flex items-center pt-4': isHome },
+            )}
+          >
+            <Routes>
+              <Route index element={<Home />} />
+              <Route path="/settings">
+                {['', '*'].map((path) => <Route key={path} path={path} element={<Settings />} />)}
+              </Route>
+              <Route path="/manage-servers" element={<ManageServers />} />
+              <Route path="/server/create" element={<CreateServer />} />
+              <Route path="/server/:serverId/edit" element={<EditServer />} />
+              <Route path="/server/:serverId">
+                {['', '*'].map((path) => <Route key={path} path={path} element={<ShlinkWebComponentContainer />} />)}
+              </Route>
+              <Route path="*" element={<NotFound />} />
+            </Routes>
+          </div>

-        <div className="h-(--footer-height) mt-(--footer-margin) md:px-4">
-          <ShlinkVersionsContainer />
+          <div className="h-(--footer-height) mt-(--footer-margin) md:px-4">
+            <ShlinkVersionsContainer />
+          </div>
        </div>
-      </div>
+      </>

      <AppUpdateBanner isOpen={appUpdated} onClose={resetAppUpdate} forceUpdate={forceUpdate} />
    </div>
  );
 };
-
-export const AppFactory = componentFactory(App, [
-  'MainHeader',
-  'Home',
-  'ShlinkWebComponentContainer',
-  'CreateServer',
-  'EditServer',
-  'Settings',
-  'ManageServers',
-  'ShlinkVersionsContainer',
-]);
--- a/src/app/reducers/appUpdates.ts
+++ b/src/app/reducers/appUpdates.ts
@ -1,4 +1,6 @@
 import { createSlice } from '@reduxjs/toolkit';
+import { useCallback } from 'react';
+import { useAppDispatch, useAppSelector } from '../../store';

 const { actions, reducer } = createSlice({
  name: 'shlink/appUpdates',
@ -12,3 +14,12 @@ const { actions, reducer } = createSlice({
 export const { appUpdateAvailable, resetAppUpdate } = actions;

 export const appUpdatesReducer = reducer;
+
+export const useAppUpdated = () => {
+  const dispatch = useAppDispatch();
+  const appUpdateAvailable = useCallback(() => dispatch(actions.appUpdateAvailable()), [dispatch]);
+  const resetAppUpdate = useCallback(() => dispatch(actions.resetAppUpdate()), [dispatch]);
+  const appUpdated = useAppSelector((state) => state.appUpdated);
+
+  return { appUpdated, appUpdateAvailable, resetAppUpdate };
+};
--- a/src/app/services/provideServices.ts
+++ b/src/app/services/provideServices.ts
@ -1,14 +0,0 @@
-import type Bottle from 'bottlejs';
-import type { ConnectDecorator } from '../../container/types';
-import { AppFactory } from '../App';
-import { appUpdateAvailable, resetAppUpdate } from '../reducers/appUpdates';
-
-export const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {
-  // Components
-  bottle.factory('App', AppFactory);
-  bottle.decorator('App', connect(['servers', 'settings', 'appUpdated'], ['fetchServers', 'resetAppUpdate']));
-
-  // Actions
-  bottle.serviceFactory('appUpdateAvailable', () => appUpdateAvailable);
-  bottle.serviceFactory('resetAppUpdate', () => resetAppUpdate);
-};
--- a/src/common/Home.tsx
+++ b/src/common/Home.tsx
@ -2,19 +2,18 @@ import { faExternalLinkAlt, faPlus } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Button, Card } from '@shlinkio/shlink-frontend-kit';
 import { clsx } from 'clsx';
+import type { FC } from 'react';
 import { useEffect } from 'react';
 import { ExternalLink } from 'react-external-link';
 import { useNavigate } from 'react-router';
-import type { ServersMap } from '../servers/data';
+import { withoutSelectedServer } from '../servers/helpers/withoutSelectedServer';
+import { useServers } from '../servers/reducers/servers';
 import { ServersListGroup } from '../servers/ServersListGroup';
 import { ShlinkLogo } from './img/ShlinkLogo';

-export type HomeProps = {
-  servers: ServersMap;
-};
-
-export const Home = ({ servers }: HomeProps) => {
+export const Home: FC = withoutSelectedServer(() => {
  const navigate = useNavigate();
+  const { servers } = useServers();
  const serversList = Object.values(servers);
  const hasServers = serversList.length > 0;

@ -50,7 +49,7 @@ export const Home = ({ servers }: HomeProps) => {
                <p>This application will help you manage your Shlink servers.</p>
                <p>
                  <Button to="/server/create" size="lg" inline>
-                    <FontAwesomeIcon icon={faPlus} /> Add a server
+                    <FontAwesomeIcon icon={faPlus} widthAuto /> Add a server
                  </Button>
                </p>
                <p>
@ -68,4 +67,4 @@ export const Home = ({ servers }: HomeProps) => {
      </Card>
    </div>
  );
-};
+});
--- a/src/common/MainHeader.tsx
+++ b/src/common/MainHeader.tsx
@ -3,16 +3,10 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { NavBar } from '@shlinkio/shlink-frontend-kit';
 import type { FC } from 'react';
 import { Link, useLocation } from 'react-router';
-import type { FCWithDeps } from '../container/utils';
-import { componentFactory, useDependencies } from '../container/utils';
+import { ServersDropdown } from '../servers/ServersDropdown';
 import { ShlinkLogo } from './img/ShlinkLogo';

-type MainHeaderDeps = {
-  ServersDropdown: FC;
-};
-
-const MainHeader: FCWithDeps<unknown, MainHeaderDeps> = () => {
-  const { ServersDropdown } = useDependencies(MainHeader);
+export const MainHeader: FC = () => {
  const { pathname } = useLocation();

  const settingsPath = '/settings';
@ -37,5 +31,3 @@ const MainHeader: FCWithDeps<unknown, MainHeaderDeps> = () => {
    </NavBar>
  );
 };
-
-export const MainHeaderFactory = componentFactory(MainHeader, ['ServersDropdown']);
--- a/src/common/ShlinkVersionsContainer.tsx
+++ b/src/common/ShlinkVersionsContainer.tsx
@ -1,16 +1,15 @@
 import { clsx } from 'clsx';
-import type { SelectedServer } from '../servers/data';
 import { isReachableServer } from '../servers/data';
+import { useSelectedServer } from '../servers/reducers/selectedServer';
 import { ShlinkVersions } from './ShlinkVersions';

-export type ShlinkVersionsContainerProps = {
-  selectedServer: SelectedServer;
+export const ShlinkVersionsContainer = () => {
+  const { selectedServer } = useSelectedServer();
+  return (
+    <div
+      className={clsx('text-center', { 'md:ml-(--aside-menu-width)': isReachableServer(selectedServer) })}
+    >
+      <ShlinkVersions selectedServer={selectedServer} />
+    </div>
+  );
 };
-
-export const ShlinkVersionsContainer = ({ selectedServer }: ShlinkVersionsContainerProps) => (
-  <div
-    className={clsx('text-center', { 'md:ml-(--aside-menu-width)': isReachableServer(selectedServer) })}
-  >
-    <ShlinkVersions selectedServer={selectedServer} />
-  </div>
-);
--- a/src/common/ShlinkWebComponentContainer.tsx
+++ b/src/common/ShlinkWebComponentContainer.tsx
@ -1,40 +1,37 @@
-import type { ShlinkWebComponentType, TagColorsStorage } from '@shlinkio/shlink-web-component';
-import type { Settings } from '@shlinkio/shlink-web-component/settings';
+import type { TagColorsStorage } from '@shlinkio/shlink-web-component';
+import {
+  ShlinkSidebarToggleButton,
+  ShlinkSidebarVisibilityProvider,
+  ShlinkWebComponent,
+} from '@shlinkio/shlink-web-component';
 import type { FC } from 'react';
 import { memo } from 'react';
 import type { ShlinkApiClientBuilder } from '../api/services/ShlinkApiClientBuilder';
-import type { FCWithDeps } from '../container/utils';
-import { componentFactory, useDependencies } from '../container/utils';
+import { withDependencies } from '../container/context';
 import { isReachableServer } from '../servers/data';
-import type { WithSelectedServerProps } from '../servers/helpers/withSelectedServer';
+import { ServerError } from '../servers/helpers/ServerError';
 import { withSelectedServer } from '../servers/helpers/withSelectedServer';
+import { useSelectedServer } from '../servers/reducers/selectedServer';
+import { useSettings } from '../settings/reducers/settings';
 import { NotFound } from './NotFound';

-type ShlinkWebComponentContainerProps = WithSelectedServerProps & {
-  settings: Settings;
+export type ShlinkWebComponentContainerProps = {
+  TagColorsStorage: TagColorsStorage;
+  buildShlinkApiClient: ShlinkApiClientBuilder;
 };

-type ShlinkWebComponentContainerDeps = {
-  buildShlinkApiClient: ShlinkApiClientBuilder,
-  TagColorsStorage: TagColorsStorage,
-  ShlinkWebComponent: ShlinkWebComponentType,
-  ServerError: FC,
-};
-
-const ShlinkWebComponentContainer: FCWithDeps<
-  ShlinkWebComponentContainerProps,
-  ShlinkWebComponentContainerDeps
+const ShlinkWebComponentContainerBase: FC<
+  ShlinkWebComponentContainerProps
 // FIXME Using `memo` here to solve a flickering effect in charts.
 //       memo is probably not the right solution. The root cause is the withSelectedServer HOC, but I couldn't fix the
 //       extra rendering there.
 //       This should be revisited at some point.
-> = withSelectedServer(memo(({ selectedServer, settings }) => {
-  const {
-    buildShlinkApiClient,
-    TagColorsStorage: tagColorsStorage,
-    ShlinkWebComponent,
-    ServerError,
-  } = useDependencies(ShlinkWebComponentContainer);
+> = withSelectedServer(memo(({
+  buildShlinkApiClient,
+  TagColorsStorage: tagColorsStorage,
+}) => {
+  const { selectedServer } = useSelectedServer();
+  const { settings } = useSettings();

  if (!isReachableServer(selectedServer)) {
    return <ServerError />;
@ -42,22 +39,24 @@ const ShlinkWebComponentContainer: FCWithDeps<

  const routesPrefix = `/server/${selectedServer.id}`;
  return (
-    <ShlinkWebComponent
-      serverVersion={selectedServer.version}
-      apiClient={buildShlinkApiClient(selectedServer)}
-      settings={settings}
-      routesPrefix={routesPrefix}
-      tagColorsStorage={tagColorsStorage}
-      createNotFound={(nonPrefixedHomePath) => (
-        <NotFound to={`${routesPrefix}${nonPrefixedHomePath}`}>List short URLs</NotFound>
-      )}
-    />
+    <ShlinkSidebarVisibilityProvider>
+      <ShlinkSidebarToggleButton className="fixed top-3.5 left-3 z-901" />
+      <ShlinkWebComponent
+        serverVersion={selectedServer.version}
+        apiClient={buildShlinkApiClient(selectedServer)}
+        settings={settings}
+        routesPrefix={routesPrefix}
+        tagColorsStorage={tagColorsStorage}
+        createNotFound={(nonPrefixedHomePath: string) => (
+          <NotFound to={`${routesPrefix}${nonPrefixedHomePath}`}>List short URLs</NotFound>
+        )}
+        autoSidebarToggle={false}
+      />
+    </ShlinkSidebarVisibilityProvider>
  );
 }));

-export const ShlinkWebComponentContainerFactory = componentFactory(ShlinkWebComponentContainer, [
+export const ShlinkWebComponentContainer = withDependencies(ShlinkWebComponentContainerBase, [
  'buildShlinkApiClient',
  'TagColorsStorage',
-  'ShlinkWebComponent',
-  'ServerError',
 ]);
--- a/src/common/services/provideServices.ts
+++ b/src/common/services/provideServices.ts
@ -1,37 +0,0 @@
-import { FetchHttpClient } from '@shlinkio/shlink-js-sdk/fetch';
-import { ShlinkWebComponent } from '@shlinkio/shlink-web-component';
-import type Bottle from 'bottlejs';
-import type { ConnectDecorator } from '../../container/types';
-import { withoutSelectedServer } from '../../servers/helpers/withoutSelectedServer';
-import { ErrorHandler } from '../ErrorHandler';
-import { Home } from '../Home';
-import { MainHeaderFactory } from '../MainHeader';
-import { ScrollToTop } from '../ScrollToTop';
-import { ShlinkVersionsContainer } from '../ShlinkVersionsContainer';
-import { ShlinkWebComponentContainerFactory } from '../ShlinkWebComponentContainer';
-
-export const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {
-  // Services
-  bottle.constant('window', window);
-  bottle.constant('console', console);
-  bottle.constant('fetch', window.fetch.bind(window));
-  bottle.service('HttpClient', FetchHttpClient, 'fetch');
-
-  // Components
-  bottle.serviceFactory('ScrollToTop', () => ScrollToTop);
-
-  bottle.factory('MainHeader', MainHeaderFactory);
-
-  bottle.serviceFactory('Home', () => Home);
-  bottle.decorator('Home', withoutSelectedServer);
-  bottle.decorator('Home', connect(['servers'], ['resetSelectedServer']));
-
-  bottle.serviceFactory('ShlinkWebComponent', () => ShlinkWebComponent);
-  bottle.factory('ShlinkWebComponentContainer', ShlinkWebComponentContainerFactory);
-  bottle.decorator('ShlinkWebComponentContainer', connect(['selectedServer', 'settings'], ['selectServer']));
-
-  bottle.serviceFactory('ShlinkVersionsContainer', () => ShlinkVersionsContainer);
-  bottle.decorator('ShlinkVersionsContainer', connect(['selectedServer']));
-
-  bottle.serviceFactory('ErrorHandler', () => ErrorHandler);
-};
--- a/src/container/context.tsx
+++ b/src/container/context.tsx
@ -0,0 +1,63 @@
+import type { IContainer } from 'bottlejs';
+import { type ComponentType, createContext, useContext } from 'react';
+
+const ContainerContext = createContext<IContainer | null>(null);
+
+export const ContainerProvider = ContainerContext.Provider;
+
+const useContainer = (wrapperName: string): IContainer => {
+  const container = useContext(ContainerContext);
+  if (!container) {
+    throw new Error(`You cannot use "${wrapperName}" outside of a ContainerProvider`);
+  }
+
+  return container;
+};
+
+/**
+ * Hook used to extract dependencies from the container in other hooks.
+ */
+export const useDependencies = <T extends unknown[]>(...names: string[]): T => {
+  const container = useContainer('useDependencies');
+
+  return names.map((name) => {
+    const dependency = container[name];
+    if (!dependency) {
+      throw new Error(`Dependency with name "${name}" not found in container`);
+    }
+
+    return dependency;
+  }) as T;
+};
+
+type Optionalize<P, K extends keyof P> = Omit<P, K> & Partial<Pick<P, K>>;
+
+/**
+ * Higher Order Component used to inject services into components as props.
+ * All dependencies become optional props so that they can still be explicitly set in tests if desired.
+ */
+export function withDependencies<
+  Props extends Record<string, unknown>,
+  DependencyName extends string & keyof Props,
+>(
+  Component: ComponentType<Props>,
+  dependencyNames: DependencyName[],
+): ComponentType<Optionalize<Props, DependencyName>> {
+  function Wrapper(props: Omit<Props, DependencyName>) {
+    const container = useContext(ContainerContext);
+
+    // Inject services, unless they have been overridden by props passed from
+    // the parent component.
+    const dependencies: Partial<Record<DependencyName, unknown>> = {};
+    for (const dependency of dependencyNames) {
+      if (!(dependency in props)) {
+        dependencies[dependency] = container?.[dependency];
+      }
+    }
+
+    const propsWithServices = { ...dependencies, ...props } as Props;
+    return <Component {...propsWithServices} />;
+  }
+
+  return Wrapper;
+}
--- a/src/container/index.ts
+++ b/src/container/index.ts
@ -1,42 +1,32 @@
-import type { IContainer } from 'bottlejs';
+import { useTimeoutToggle } from '@shlinkio/shlink-frontend-kit';
+import { FetchHttpClient } from '@shlinkio/shlink-js-sdk/fetch';
 import Bottle from 'bottlejs';
-import { connect as reduxConnect } from 'react-redux';
-import { provideServices as provideApiServices } from '../api/services/provideServices';
-import { provideServices as provideAppServices } from '../app/services/provideServices';
-import { provideServices as provideCommonServices } from '../common/services/provideServices';
-import { provideServices as provideServersServices } from '../servers/services/provideServices';
-import { provideServices as provideSettingsServices } from '../settings/services/provideServices';
-import { provideServices as provideUtilsServices } from '../utils/services/provideServices';
-import type { ConnectDecorator } from './types';
-
-type LazyActionMap = Record<string, (...args: unknown[]) => unknown>;
+import { buildShlinkApiClient } from '../api/services/ShlinkApiClientBuilder';
+import { ServersExporter } from '../servers/services/ServersExporter';
+import { ServersImporter } from '../servers/services/ServersImporter';
+import { csvToJson, jsonToCsv } from '../utils/helpers/csvjson';
+import { LocalStorage } from '../utils/services/LocalStorage';
+import { TagColorsStorage } from '../utils/services/TagColorsStorage';

 const bottle = new Bottle();

 export const { container } = bottle;

-const lazyService = <T extends (...args: unknown[]) => unknown, K>(cont: IContainer, serviceName: string) =>
-  (...args: any[]) => (cont[serviceName] as T)(...args) as K;
+bottle.constant('window', window);
+bottle.constant('console', console);
+bottle.constant('fetch', window.fetch.bind(window));
+bottle.service('HttpClient', FetchHttpClient, 'fetch');

-const mapActionService = (map: LazyActionMap, actionName: string): LazyActionMap => ({
-  ...map,
-  // Wrap actual action service in a function so that it is lazily created the first time it is called
-  [actionName]: lazyService(container, actionName),
-});
+bottle.constant('localStorage', window.localStorage);
+bottle.service('Storage', LocalStorage, 'localStorage');
+bottle.service('TagColorsStorage', TagColorsStorage, 'Storage');

-const pickProps = (propsToPick: string[]) => (obj: any) => Object.fromEntries(
-  propsToPick.map((key) => [key, obj[key]]),
-);
+bottle.constant('csvToJson', csvToJson);
+bottle.constant('jsonToCsv', jsonToCsv);

-const connect: ConnectDecorator = (propsFromState: string[] | null, actionServiceNames: string[] = []) =>
-  reduxConnect(
-    propsFromState ? pickProps(propsFromState) : null,
-    actionServiceNames.reduce(mapActionService, {}),
-  );
+bottle.serviceFactory('useTimeoutToggle', () => useTimeoutToggle);

-provideAppServices(bottle, connect);
-provideCommonServices(bottle, connect);
-provideApiServices(bottle);
-provideServersServices(bottle, connect);
-provideUtilsServices(bottle);
-provideSettingsServices(bottle, connect);
+bottle.serviceFactory('buildShlinkApiClient', buildShlinkApiClient, 'HttpClient');
+
+bottle.service('ServersImporter', ServersImporter, 'csvToJson');
+bottle.service('ServersExporter', ServersExporter, 'Storage', 'window', 'jsonToCsv');
--- a/src/container/store.ts
+++ b/src/container/store.ts
@ -1,25 +0,0 @@
-import { configureStore } from '@reduxjs/toolkit';
-import type { IContainer } from 'bottlejs';
-import type { RLSOptions } from 'redux-localstorage-simple';
-import { load, save } from 'redux-localstorage-simple';
-import { initReducers } from '../reducers';
-import { migrateDeprecatedSettings } from '../settings/helpers';
-import type { ShlinkState } from './types';
-
-const isProduction = process.env.NODE_ENV === 'production';
-const localStorageConfig: RLSOptions = {
-  states: ['settings', 'servers'],
-  namespace: 'shlink',
-  namespaceSeparator: '.',
-  debounce: 300,
-};
-const preloadedState = migrateDeprecatedSettings(load(localStorageConfig) as ShlinkState);
-
-export const setUpStore = (container: IContainer) => configureStore({
-  devTools: !isProduction,
-  reducer: initReducers(container),
-  preloadedState,
-  middleware: (defaultMiddlewaresIncludingReduxThunk) =>
-    defaultMiddlewaresIncludingReduxThunk({ immutableCheck: false, serializableCheck: false }) // State is too big for these
-      .concat(save(localStorageConfig)),
-});
--- a/src/container/types.ts
+++ b/src/container/types.ts
@ -1,13 +0,0 @@
-import type { Settings } from '@shlinkio/shlink-web-component/settings';
-import type { SelectedServer, ServersMap } from '../servers/data';
-
-export interface ShlinkState {
-  servers: ServersMap;
-  selectedServer: SelectedServer;
-  settings: Settings;
-  appUpdated: boolean;
-}
-
-export type ConnectDecorator = (props: string[] | null, actions?: string[]) => any;
-
-export type GetState = () => ShlinkState;
--- a/src/container/utils.ts
+++ b/src/container/utils.ts
@ -1,27 +0,0 @@
-import type { IContainer } from 'bottlejs';
-import type { FC } from 'react';
-import { useMemo } from 'react';
-
-export type FCWithDeps<Props, Deps> = FC<Props> & Partial<Deps>;
-
-export function useDependencies<Deps>(obj: Deps): Omit<Required<Deps>, keyof FC> {
-  return useMemo(() => obj as Omit<Required<Deps>, keyof FC>, [obj]);
-}
-
-export function componentFactory<Deps, CompType = Omit<Partial<Deps>, keyof FC>>(
-  Component: CompType,
-  deps: ReadonlyArray<keyof CompType>,
-) {
-  return (container: IContainer, console = globalThis.console) => {
-    deps.forEach((dep) => {
-      const resolvedDependency = container[dep as string];
-      if (!resolvedDependency && process.env.NODE_ENV !== 'production') {
-        console.error(`[Debug] Could not find "${dep as string}" dependency in container`);
-      }
-
-      Component[dep] = resolvedDependency;
-    });
-
-    return Component;
-  };
-}
--- a/src/index.tsx
+++ b/src/index.tsx
@ -2,24 +2,30 @@ import { createRoot } from 'react-dom/client';
 import { Provider } from 'react-redux';
 import { BrowserRouter } from 'react-router';
 import pack from '../package.json';
+import { App } from './app/App';
+import { appUpdateAvailable } from './app/reducers/appUpdates';
+import { ErrorHandler } from './common/ErrorHandler';
+import { ScrollToTop } from './common/ScrollToTop';
 import { container } from './container';
-import { setUpStore } from './container/store';
+import { ContainerProvider } from './container/context';
 import { register as registerServiceWorker } from './serviceWorkerRegistration';
+import { setUpStore } from './store';
 import './tailwind.css';

-const store = setUpStore(container);
-const { App, ScrollToTop, ErrorHandler, appUpdateAvailable } = container;
+const store = setUpStore();

 createRoot(document.getElementById('root')!).render(
-  <Provider store={store}>
-    <BrowserRouter basename={pack.homepage}>
-      <ErrorHandler>
-        <ScrollToTop>
-          <App />
-        </ScrollToTop>
-      </ErrorHandler>
-    </BrowserRouter>
-  </Provider>,
+  <ContainerProvider value={container}>
+    <Provider store={store}>
+      <BrowserRouter basename={pack.homepage}>
+        <ErrorHandler>
+          <ScrollToTop>
+            <App />
+          </ScrollToTop>
+        </ErrorHandler>
+      </BrowserRouter>
+    </Provider>
+  </ContainerProvider>,
 );

 // Learn more about service workers: https://cra.link/PWA
--- a/src/servers/CreateServer.tsx
+++ b/src/servers/CreateServer.tsx
@ -1,27 +1,22 @@
-import type { ResultProps,TimeoutToggle  } from '@shlinkio/shlink-frontend-kit';
-import { Button, Result,useToggle  } from '@shlinkio/shlink-frontend-kit';
+import type { ResultProps, TimeoutToggle } from '@shlinkio/shlink-frontend-kit';
+import { Button, Result, useToggle } from '@shlinkio/shlink-frontend-kit';
 import type { FC } from 'react';
 import { useCallback, useState } from 'react';
 import { useNavigate } from 'react-router';
 import { NoMenuLayout } from '../common/NoMenuLayout';
-import type { FCWithDeps } from '../container/utils';
-import { componentFactory, useDependencies } from '../container/utils';
+import { withDependencies } from '../container/context';
 import { useGoBack } from '../utils/helpers/hooks';
-import type { ServerData, ServersMap, ServerWithId } from './data';
+import type { ServerData } from './data';
 import { ensureUniqueIds } from './helpers';
 import { DuplicatedServersModal } from './helpers/DuplicatedServersModal';
-import type { ImportServersBtnProps } from './helpers/ImportServersBtn';
+import { ImportServersBtn } from './helpers/ImportServersBtn';
 import { ServerForm } from './helpers/ServerForm';
+import { withoutSelectedServer } from './helpers/withoutSelectedServer';
+import { useServers } from './reducers/servers';

 const SHOW_IMPORT_MSG_TIME = 4000;

-type CreateServerProps = {
-  createServers: (servers: ServerWithId[]) => void;
-  servers: ServersMap;
-};
-
-type CreateServerDeps = {
-  ImportServersBtn: FC<ImportServersBtnProps>;
+export type CreateServerProps = {
  useTimeoutToggle: TimeoutToggle;
 };

@ -34,14 +29,12 @@ const ImportResult = ({ variant }: Pick<ResultProps, 'variant'>) => (
  </div>
 );

-const CreateServer: FCWithDeps<CreateServerProps, CreateServerDeps> = ({ servers, createServers }) => {
-  const { ImportServersBtn, useTimeoutToggle } = useDependencies(CreateServer);
+const CreateServerBase: FC<CreateServerProps> = withoutSelectedServer(({ useTimeoutToggle }) => {
+  const { servers, createServers } = useServers();
  const navigate = useNavigate();
  const goBack = useGoBack();
  const hasServers = !!Object.keys(servers).length;
-  // eslint-disable-next-line react-compiler/react-compiler
  const [serversImported, setServersImported] = useTimeoutToggle({ delay: SHOW_IMPORT_MSG_TIME });
-  // eslint-disable-next-line react-compiler/react-compiler
  const [errorImporting, setErrorImporting] = useTimeoutToggle({ delay: SHOW_IMPORT_MSG_TIME });
  const { flag: isConfirmModalOpen, toggle: toggleConfirmModal } = useToggle();
  const [serverData, setServerData] = useState<ServerData>();
@ -86,6 +79,6 @@ const CreateServer: FCWithDeps<CreateServerProps, CreateServerDeps> = ({ servers
      />
    </NoMenuLayout>
  );
-};
+});

-export const CreateServerFactory = componentFactory(CreateServer, ['ImportServersBtn', 'useTimeoutToggle']);
+export const CreateServer = withDependencies(CreateServerBase, ['useTimeoutToggle']);
--- a/src/servers/DeleteServerButton.tsx
+++ b/src/servers/DeleteServerButton.tsx
@ -2,21 +2,14 @@ import { useToggle } from '@shlinkio/shlink-frontend-kit';
 import type { FC, PropsWithChildren } from 'react';
 import { useCallback } from 'react';
 import { useNavigate } from 'react-router';
-import type { FCWithDeps } from '../container/utils';
-import { componentFactory, useDependencies } from '../container/utils';
 import type { ServerWithId } from './data';
-import type { DeleteServerModalProps } from './DeleteServerModal';
+import { DeleteServerModal } from './DeleteServerModal';

 export type DeleteServerButtonProps = PropsWithChildren<{
  server: ServerWithId;
 }>;

-type DeleteServerButtonDeps = {
-  DeleteServerModal: FC<DeleteServerModalProps>;
-};
-
-const DeleteServerButton: FCWithDeps<DeleteServerButtonProps, DeleteServerButtonDeps> = ({ server, children }) => {
-  const { DeleteServerModal } = useDependencies(DeleteServerButton);
+export const DeleteServerButton: FC<DeleteServerButtonProps> = ({ server, children }) => {
  const { flag: isModalOpen, setToTrue: showModal, setToFalse: hideModal } = useToggle();
  const navigate = useNavigate();
  const onClose = useCallback((confirmed: boolean) => {
@ -35,5 +28,3 @@ const DeleteServerButton: FCWithDeps<DeleteServerButtonProps, DeleteServerButton
    </>
  );
 };
-
-export const DeleteServerButtonFactory = componentFactory(DeleteServerButton, ['DeleteServerModal']);
--- a/src/servers/DeleteServerModal.tsx
+++ b/src/servers/DeleteServerModal.tsx
@ -3,6 +3,7 @@ import { CardModal } from '@shlinkio/shlink-frontend-kit';
 import type { FC } from 'react';
 import { useCallback } from 'react';
 import type { ServerWithId } from './data';
+import { useServers } from './reducers/servers';

 export type DeleteServerModalProps = {
  server: ServerWithId;
@ -10,11 +11,8 @@ export type DeleteServerModalProps = {
  open: boolean;
 };

-type DeleteServerModalConnectProps = DeleteServerModalProps & {
-  deleteServer: (server: ServerWithId) => void;
-};
-
-export const DeleteServerModal: FC<DeleteServerModalConnectProps> = ({ server, onClose, open, deleteServer }) => {
+export const DeleteServerModal: FC<DeleteServerModalProps> = ({ server, onClose, open }) => {
+  const { deleteServer } = useServers();
  const onClosed = useCallback((exitAction: ExitAction) => {
    if (exitAction === 'confirm') {
      deleteServer(server);
--- a/src/servers/EditServer.tsx
+++ b/src/servers/EditServer.tsx
@ -1,26 +1,17 @@
-import { Button,useParsedQuery  } from '@shlinkio/shlink-frontend-kit';
+import { Button, useParsedQuery } from '@shlinkio/shlink-frontend-kit';
 import type { FC } from 'react';
 import { NoMenuLayout } from '../common/NoMenuLayout';
-import type { FCWithDeps } from '../container/utils';
-import { componentFactory } from '../container/utils';
 import { useGoBack } from '../utils/helpers/hooks';
 import type { ServerData } from './data';
 import { isServerWithId } from './data';
 import { ServerForm } from './helpers/ServerForm';
-import type { WithSelectedServerProps } from './helpers/withSelectedServer';
 import { withSelectedServer } from './helpers/withSelectedServer';
+import { useSelectedServer } from './reducers/selectedServer';
+import { useServers } from './reducers/servers';

-type EditServerProps = WithSelectedServerProps & {
-  editServer: (serverId: string, serverData: ServerData) => void;
-};
-
-type EditServerDeps = {
-  ServerError: FC;
-};
-
-const EditServer: FCWithDeps<EditServerProps, EditServerDeps> = withSelectedServer((
-  { editServer, selectedServer, selectServer },
-) => {
+export const EditServer: FC = withSelectedServer(() => {
+  const { editServer } = useServers();
+  const { selectServer, selectedServer } = useSelectedServer();
  const goBack = useGoBack();
  const { reconnect } = useParsedQuery<{ reconnect?: 'true' }>();

@ -49,5 +40,3 @@ const EditServer: FCWithDeps<EditServerProps, EditServerDeps> = withSelectedServ
    </NoMenuLayout>
  );
 });
-
-export const EditServerFactory = componentFactory(EditServer, ['ServerError']);
--- a/src/servers/ManageServers.tsx
+++ b/src/servers/ManageServers.tsx
@ -5,33 +5,25 @@ import { Button, Result, SearchInput, SimpleCard, Table } from '@shlinkio/shlink
 import type { FC } from 'react';
 import { useMemo, useState } from 'react';
 import { NoMenuLayout } from '../common/NoMenuLayout';
-import type { FCWithDeps } from '../container/utils';
-import { componentFactory, useDependencies } from '../container/utils';
-import type { ServersMap } from './data';
-import type { ImportServersBtnProps } from './helpers/ImportServersBtn';
-import type { ManageServersRowProps } from './ManageServersRow';
+import { withDependencies } from '../container/context';
+import { ImportServersBtn } from './helpers/ImportServersBtn';
+import { withoutSelectedServer } from './helpers/withoutSelectedServer';
+import { ManageServersRow } from './ManageServersRow';
+import { useServers } from './reducers/servers';
 import type { ServersExporter } from './services/ServersExporter';

-type ManageServersProps = {
-  servers: ServersMap;
-};
-
-type ManageServersDeps = {
+export type ManageServersProps = {
  ServersExporter: ServersExporter;
-  ImportServersBtn: FC<ImportServersBtnProps>;
  useTimeoutToggle: TimeoutToggle;
-  ManageServersRow: FC<ManageServersRowProps>;
 };

 const SHOW_IMPORT_MSG_TIME = 4000;

-const ManageServers: FCWithDeps<ManageServersProps, ManageServersDeps> = ({ servers }) => {
-  const {
-    ServersExporter: serversExporter,
-    ImportServersBtn,
-    useTimeoutToggle,
-    ManageServersRow,
-  } = useDependencies(ManageServers);
+const ManageServersBase: FC<ManageServersProps> = withoutSelectedServer(({
+  ServersExporter: serversExporter,
+  useTimeoutToggle,
+}) => {
+  const { servers } = useServers();
  const [searchTerm, setSearchTerm] = useState('');
  const allServers = useMemo(() => Object.values(servers), [servers]);
  const filteredServers = useMemo(
@ -39,7 +31,7 @@ const ManageServers: FCWithDeps<ManageServersProps, ManageServersDeps> = ({ serv
    [allServers, searchTerm],
  );
  const hasAutoConnect = allServers.some(({ autoConnect }) => !!autoConnect);
-  // eslint-disable-next-line react-compiler/react-compiler
+
  const [errorImporting, setErrorImporting] = useTimeoutToggle({ delay: SHOW_IMPORT_MSG_TIME });

  return (
@ -51,12 +43,12 @@ const ManageServers: FCWithDeps<ManageServersProps, ManageServersDeps> = ({ serv
          <ImportServersBtn className="flex-grow" onError={setErrorImporting}>Import servers</ImportServersBtn>
          {filteredServers.length > 0 && (
            <Button variant="secondary" className="flex-grow" onClick={async () => serversExporter.exportServers()}>
-              <FontAwesomeIcon icon={exportIcon} /> Export servers
+              <FontAwesomeIcon icon={exportIcon} widthAuto /> Export servers
            </Button>
          )}
        </div>
        <Button className="md:ml-auto" to="/server/create">
-          <FontAwesomeIcon icon={plusIcon} /> Add a server
+          <FontAwesomeIcon icon={plusIcon} widthAuto /> Add a server
        </Button>
      </div>

@ -87,11 +79,6 @@ const ManageServers: FCWithDeps<ManageServersProps, ManageServersDeps> = ({ serv
      )}
    </NoMenuLayout>
  );
-};
+});

-export const ManageServersFactory = componentFactory(ManageServers, [
-  'ServersExporter',
-  'ImportServersBtn',
-  'useTimeoutToggle',
-  'ManageServersRow',
-]);
+export const ManageServers = withDependencies(ManageServersBase, ['ServersExporter', 'useTimeoutToggle']);
--- a/src/servers/ManageServersRow.tsx
+++ b/src/servers/ManageServersRow.tsx
@ -3,22 +3,15 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Table, Tooltip, useTooltip } from '@shlinkio/shlink-frontend-kit';
 import type { FC } from 'react';
 import { Link } from 'react-router';
-import type { FCWithDeps } from '../container/utils';
-import { componentFactory, useDependencies } from '../container/utils';
 import type { ServerWithId } from './data';
-import type { ManageServersRowDropdownProps } from './ManageServersRowDropdown';
+import { ManageServersRowDropdown } from './ManageServersRowDropdown';

 export type ManageServersRowProps = {
  server: ServerWithId;
  hasAutoConnect: boolean;
 };

-type ManageServersRowDeps = {
-  ManageServersRowDropdown: FC<ManageServersRowDropdownProps>;
-};
-
-const ManageServersRow: FCWithDeps<ManageServersRowProps, ManageServersRowDeps> = ({ server, hasAutoConnect }) => {
-  const { ManageServersRowDropdown } = useDependencies(ManageServersRow);
+export const ManageServersRow: FC<ManageServersRowProps> = ({ server, hasAutoConnect }) => {
  const { anchor, tooltip } = useTooltip();

  return (
@ -31,6 +24,7 @@ const ManageServersRow: FCWithDeps<ManageServersRowProps, ManageServersRowDeps>
                icon={checkIcon}
                className="text-lm-brand dark:text-dm-brand"
                {...anchor}
+                data-testid="auto-connect"
              />
              <Tooltip {...tooltip}>Auto-connect to this server</Tooltip>
            </>
@ -47,5 +41,3 @@ const ManageServersRow: FCWithDeps<ManageServersRowProps, ManageServersRowDeps>
    </Table.Row>
  );
 };
-
-export const ManageServersRowFactory = componentFactory(ManageServersRow, ['ManageServersRowDropdown']);
--- a/src/servers/ManageServersRowDropdown.tsx
+++ b/src/servers/ManageServersRowDropdown.tsx
@ -6,29 +6,18 @@ import {
  faPlug as connectIcon,
 } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { RowDropdown,useToggle  } from '@shlinkio/shlink-frontend-kit';
+import { RowDropdown, useToggle } from '@shlinkio/shlink-frontend-kit';
 import type { FC } from 'react';
-import type { FCWithDeps } from '../container/utils';
-import { componentFactory, useDependencies } from '../container/utils';
 import type { ServerWithId } from './data';
-import type { DeleteServerModalProps } from './DeleteServerModal';
+import { DeleteServerModal } from './DeleteServerModal';
+import { useServers } from './reducers/servers';

 export type ManageServersRowDropdownProps = {
  server: ServerWithId;
 };

-type ManageServersRowDropdownConnectProps = ManageServersRowDropdownProps & {
-  setAutoConnect: (server: ServerWithId, autoConnect: boolean) => void;
-};
-
-type ManageServersRowDropdownDeps = {
-  DeleteServerModal: FC<DeleteServerModalProps>
-};
-
-const ManageServersRowDropdown: FCWithDeps<ManageServersRowDropdownConnectProps, ManageServersRowDropdownDeps> = (
-  { server, setAutoConnect },
-) => {
-  const { DeleteServerModal } = useDependencies(ManageServersRowDropdown);
+export const ManageServersRowDropdown: FC<ManageServersRowDropdownProps> = ({ server }) => {
+  const { setAutoConnect } = useServers();
  const { flag: isModalOpen, setToTrue: showModal, setToFalse: hideModal } = useToggle();
  const serverUrl = `/server/${server.id}`;
  const { autoConnect: isAutoConnect } = server;
@ -38,17 +27,17 @@ const ManageServersRowDropdown: FCWithDeps<ManageServersRowDropdownConnectProps,
    <>
      <RowDropdown menuAlignment="right">
        <RowDropdown.Item to={serverUrl} className="gap-1.5">
-          <FontAwesomeIcon icon={connectIcon} fixedWidth /> Connect
+          <FontAwesomeIcon icon={connectIcon} /> Connect
        </RowDropdown.Item>
        <RowDropdown.Item to={`${serverUrl}/edit`} className="gap-1.5">
-          <FontAwesomeIcon icon={editIcon} fixedWidth /> Edit server
+          <FontAwesomeIcon icon={editIcon} /> Edit server
        </RowDropdown.Item>
        <RowDropdown.Item onClick={() => setAutoConnect(server, !isAutoConnect)} className="gap-1.5">
-          <FontAwesomeIcon icon={autoConnectIcon} fixedWidth /> {isAutoConnect ? 'Do not a' : 'A'}uto-connect
+          <FontAwesomeIcon icon={autoConnectIcon} /> {isAutoConnect ? 'Do not a' : 'A'}uto-connect
        </RowDropdown.Item>
        <RowDropdown.Separator />
        <RowDropdown.Item className="[&]:text-danger gap-1.5" onClick={showModal}>
-          <FontAwesomeIcon icon={deleteIcon} fixedWidth /> Remove server
+          <FontAwesomeIcon icon={deleteIcon} /> Remove server
        </RowDropdown.Item>
      </RowDropdown>

@ -56,5 +45,3 @@ const ManageServersRowDropdown: FCWithDeps<ManageServersRowDropdownConnectProps,
    </>
  );
 };
-
-export const ManageServersRowDropdownFactory = componentFactory(ManageServersRowDropdown, ['DeleteServerModal']);
--- a/src/servers/ServersDropdown.tsx
+++ b/src/servers/ServersDropdown.tsx
@ -1,21 +1,20 @@
 import { faPlus as plusIcon, faServer as serverIcon } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Dropdown, NavBar } from '@shlinkio/shlink-frontend-kit';
-import type { SelectedServer, ServersMap } from './data';
+import type { FC } from 'react';
 import { getServerId } from './data';
+import { useSelectedServer } from './reducers/selectedServer';
+import { useServers } from './reducers/servers';

-export interface ServersDropdownProps {
-  servers: ServersMap;
-  selectedServer: SelectedServer;
-}
-
-export const ServersDropdown = ({ servers, selectedServer }: ServersDropdownProps) => {
+export const ServersDropdown: FC = () => {
+  const { servers } = useServers();
  const serversList = Object.values(servers);
+  const { selectedServer } = useSelectedServer();

  return (
    <NavBar.Dropdown buttonContent={(
      <span className="flex items-center gap-1.5">
-        <FontAwesomeIcon icon={serverIcon} fixedWidth /> Servers
+        <FontAwesomeIcon icon={serverIcon} /> Servers
      </span>
    )}>
      {serversList.length === 0 ? (
--- a/src/servers/ServersListGroup.tsx
+++ b/src/servers/ServersListGroup.tsx
@ -26,18 +26,16 @@ const ServerListItem = ({ id, name }: { id: string; name: string }) => (
 );

 export const ServersListGroup: FC<ServersListGroupProps> = ({ servers, borderless }) => (
-  <>
-    {servers.length > 0 && (
-      <div
-        data-testid="list"
-        className={clsx(
-          'w-full border-lm-border dark:border-dm-border',
-          'md:max-h-56 md:overflow-y-auto -mb-1 scroll-thin',
-          { 'border-y': !borderless },
-        )}
-      >
-        {servers.map(({ id, name }) => <ServerListItem key={id} id={id} name={name} />)}
-      </div>
-    )}
-  </>
+  servers.length > 0 && (
+    <div
+      data-testid="list"
+      className={clsx(
+        'w-full border-lm-border dark:border-dm-border',
+        'md:max-h-56 md:overflow-y-auto -mb-1 scroll-thin',
+        { 'border-y': !borderless },
+      )}
+    >
+      {servers.map(({ id, name }) => <ServerListItem key={id} id={id} name={name} />)}
+    </div>
+  )
 );
--- a/src/servers/helpers/DuplicatedServersModal.tsx
+++ b/src/servers/helpers/DuplicatedServersModal.tsx
@ -26,7 +26,7 @@ export const DuplicatedServersModal: FC<DuplicatedServersModalProps> = (
      cancelText={hasMultipleServers ? 'Ignore duplicates' : 'Discard'}
    >
      <p>{hasMultipleServers ? 'The next servers already exist:' : 'There is already a server with:'}</p>
-      <ul className="list-disc mt-4">
+      <ul className="list-disc my-4 pl-5">
        {duplicatedServers.map(({ url, apiKey }, index) => (!hasMultipleServers ? (
          <Fragment key={index}>
            <li>URL: <b>{url}</b></li>
--- a/src/servers/helpers/ImportServersBtn.tsx
+++ b/src/servers/helpers/ImportServersBtn.tsx
@ -1,11 +1,11 @@
 import { faFileUpload as importIcon } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { Button, Tooltip, useToggle , useTooltip } from '@shlinkio/shlink-frontend-kit';
-import type { ChangeEvent, PropsWithChildren } from 'react';
+import { Button, Tooltip, useToggle, useTooltip } from '@shlinkio/shlink-frontend-kit';
+import type { ChangeEvent, FC, PropsWithChildren } from 'react';
 import { useCallback, useRef, useState } from 'react';
-import type { FCWithDeps } from '../../container/utils';
-import { componentFactory, useDependencies } from '../../container/utils';
-import type { ServerData, ServersMap, ServerWithId } from '../data';
+import { withDependencies } from '../../container/context';
+import type { ServerData } from '../data';
+import { useServers } from '../reducers/servers';
 import type { ServersImporter } from '../services/ServersImporter';
 import { DuplicatedServersModal } from './DuplicatedServersModal';
 import { dedupServers, ensureUniqueIds } from './index';
@ -15,27 +15,20 @@ export type ImportServersBtnProps = PropsWithChildren<{
  onError?: (error: Error) => void;
  tooltipPlacement?: 'top' | 'bottom';
  className?: string;
+
+  // Injected
+  ServersImporter: ServersImporter
 }>;

-type ImportServersBtnConnectProps = ImportServersBtnProps & {
-  createServers: (servers: ServerWithId[]) => void;
-  servers: ServersMap;
-};
-
-type ImportServersBtnDeps = {
-  ServersImporter: ServersImporter
-};
-
-const ImportServersBtn: FCWithDeps<ImportServersBtnConnectProps, ImportServersBtnDeps> = ({
-  createServers,
-  servers,
+const ImportServersBtnBase: FC<ImportServersBtnProps> = ({
  children,
  onImport,
  onError = () => {},
  tooltipPlacement = 'bottom',
  className = '',
+  ServersImporter: serversImporter,
 }) => {
-  const { ServersImporter: serversImporter } = useDependencies(ImportServersBtn);
+  const { createServers, servers } = useServers();
  const fileInputRef = useRef<HTMLInputElement>(null);
  const { anchor, tooltip } = useTooltip({ placement: tooltipPlacement });
  const [duplicatedServers, setDuplicatedServers] = useState<ServerData[]>([]);
@ -84,7 +77,7 @@ const ImportServersBtn: FCWithDeps<ImportServersBtnConnectProps, ImportServersBt
  return (
    <>
      <Button variant="secondary" className={className} onClick={() => fileInputRef.current?.click()} {...anchor}>
-        <FontAwesomeIcon icon={importIcon} fixedWidth /> {children ?? 'Import from file'}
+        <FontAwesomeIcon icon={importIcon} widthAuto /> {children ?? 'Import from file'}
      </Button>
      <Tooltip {...tooltip}>
        You can create servers by importing a CSV file with <b>name</b>, <b>apiKey</b> and <b>url</b> columns.
@ -111,4 +104,4 @@ const ImportServersBtn: FCWithDeps<ImportServersBtnConnectProps, ImportServersBt
  );
 };

-export const ImportServersBtnFactory = componentFactory(ImportServersBtn, ['ServersImporter']);
+export const ImportServersBtn = withDependencies(ImportServersBtnBase, ['ServersImporter']);
--- a/src/servers/helpers/ServerError.tsx
+++ b/src/servers/helpers/ServerError.tsx
@ -2,24 +2,15 @@ import { Card, Message } from '@shlinkio/shlink-frontend-kit';
 import type { FC } from 'react';
 import { Link } from 'react-router';
 import { NoMenuLayout } from '../../common/NoMenuLayout';
-import type { FCWithDeps } from '../../container/utils';
-import { componentFactory, useDependencies } from '../../container/utils';
-import type { SelectedServer, ServersMap } from '../data';
 import { isServerWithId } from '../data';
-import type { DeleteServerButtonProps } from '../DeleteServerButton';
+import { DeleteServerButton } from '../DeleteServerButton';
+import { useSelectedServer } from '../reducers/selectedServer';
+import { useServers } from '../reducers/servers';
 import { ServersListGroup } from '../ServersListGroup';

-type ServerErrorProps = {
-  servers: ServersMap;
-  selectedServer: SelectedServer;
-};
-
-type ServerErrorDeps = {
-  DeleteServerButton: FC<DeleteServerButtonProps>;
-};
-
-const ServerError: FCWithDeps<ServerErrorProps, ServerErrorDeps> = ({ servers, selectedServer }) => {
-  const { DeleteServerButton } = useDependencies(ServerError);
+export const ServerError: FC = () => {
+  const { servers } = useServers();
+  const { selectedServer } = useSelectedServer();

  return (
    <NoMenuLayout>
@ -54,5 +45,3 @@ const ServerError: FCWithDeps<ServerErrorProps, ServerErrorDeps> = ({ servers, s
    </NoMenuLayout>
  );
 };
-
-export const ServerErrorFactory = componentFactory(ServerError, ['DeleteServerButton']);
--- a/src/servers/helpers/withSelectedServer.tsx
+++ b/src/servers/helpers/withSelectedServer.tsx
@ -3,27 +3,14 @@ import type { FC } from 'react';
 import { useEffect } from 'react';
 import { useParams } from 'react-router';
 import { NoMenuLayout } from '../../common/NoMenuLayout';
-import type { FCWithDeps } from '../../container/utils';
-import { useDependencies } from '../../container/utils';
-import type { SelectedServer } from '../data';
 import { isNotFoundServer } from '../data';
+import { useSelectedServer } from '../reducers/selectedServer';
+import { ServerError } from './ServerError';

-export type WithSelectedServerProps = {
-  selectServer: (serverId: string) => void;
-  selectedServer: SelectedServer;
-};
-
-type WithSelectedServerPropsDeps = {
-  ServerError: FC;
-};
-
-export function withSelectedServer<T extends object>(
-  WrappedComponent: FCWithDeps<WithSelectedServerProps & T, WithSelectedServerPropsDeps>,
-) {
-  const ComponentWrapper: FCWithDeps<WithSelectedServerProps & T, WithSelectedServerPropsDeps> = (props) => {
-    const { ServerError } = useDependencies(ComponentWrapper);
+export function withSelectedServer<T extends object>(WrappedComponent: FC<T>) {
+  const ComponentWrapper: FC<T> = (props) => {
    const params = useParams<{ serverId: string }>();
-    const { selectServer, selectedServer } = props;
+    const { selectServer, selectedServer } = useSelectedServer();

    useEffect(() => {
      if (params.serverId) {
--- a/src/servers/helpers/withoutSelectedServer.tsx
+++ b/src/servers/helpers/withoutSelectedServer.tsx
@ -1,13 +1,10 @@
 import type { FC } from 'react';
 import { useEffect } from 'react';
+import { useSelectedServer } from '../reducers/selectedServer';

-interface WithoutSelectedServerProps {
-  resetSelectedServer: () => unknown;
-}
-
-export function withoutSelectedServer<T extends object>(WrappedComponent: FC<WithoutSelectedServerProps & T>) {
-  return (props: WithoutSelectedServerProps & T) => {
-    const { resetSelectedServer } = props;
+export function withoutSelectedServer<T extends object>(WrappedComponent: FC<T>) {
+  return (props: T) => {
+    const { resetSelectedServer } = useSelectedServer();
    useEffect(() => {
      resetSelectedServer();
    }, [resetSelectedServer]);
--- a/src/servers/reducers/remoteServers.ts
+++ b/src/servers/reducers/remoteServers.ts
@ -1,21 +1,46 @@
 import type { HttpClient } from '@shlinkio/shlink-js-sdk';
+import { useCallback, useEffect, useRef } from 'react';
 import pack from '../../../package.json';
-import { createAsyncThunk } from '../../utils/helpers/redux';
+import { useDependencies } from '../../container/context';
+import { useAppDispatch } from '../../store';
+import { createAsyncThunk } from '../../store/helpers';
 import { hasServerData } from '../data';
 import { ensureUniqueIds } from '../helpers';
-import { createServers } from './servers';
+import { createServers, useServers } from './servers';

 const responseToServersList = (data: any) => ensureUniqueIds(
  {},
  (Array.isArray(data) ? data.filter(hasServerData) : []),
 );

-export const fetchServers = (httpClient: HttpClient) => createAsyncThunk(
+export const fetchServers = createAsyncThunk(
  'shlink/remoteServers/fetchServers',
-  async (_: void, { dispatch }): Promise<void> => {
+  async (httpClient: HttpClient, { dispatch }): Promise<void> => {
    const resp = await httpClient.jsonRequest<any>(`${pack.homepage}/servers.json`);
    const result = responseToServersList(resp);

    dispatch(createServers(result));
  },
 );
+
+export const useRemoteServers = () => {
+  const dispatch = useAppDispatch();
+  const [httpClient] = useDependencies<[HttpClient]>('HttpClient');
+  const dispatchFetchServer = useCallback(() => dispatch(fetchServers(httpClient)), [dispatch, httpClient]);
+
+  return { fetchServers: dispatchFetchServer };
+};
+
+export const useLoadRemoteServers = () => {
+  const { fetchServers } = useRemoteServers();
+  const { servers } = useServers();
+  const initialServers = useRef(servers);
+
+  useEffect(() => {
+    // Try to fetch the remote servers if the list is empty during first render.
+    // We use a ref because we don't care if the servers list becomes empty later.
+    if (Object.keys(initialServers.current).length === 0) {
+      fetchServers();
+    }
+  }, [fetchServers]);
+};
--- a/src/servers/reducers/selectedServer.ts
+++ b/src/servers/reducers/selectedServer.ts
@ -1,8 +1,11 @@
 import { createAction, createSlice } from '@reduxjs/toolkit';
 import { memoizeWith } from '@shlinkio/data-manipulation';
 import type { ShlinkHealth } from '@shlinkio/shlink-web-component/api-contract';
+import { useCallback } from 'react';
 import type { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
-import { createAsyncThunk } from '../../utils/helpers/redux';
+import { useDependencies } from '../../container/context';
+import { useAppDispatch, useAppSelector } from '../../store';
+import { createAsyncThunk } from '../../store/helpers';
 import { versionToPrintable, versionToSemVer as toSemVer } from '../../utils/helpers/version';
 import type { SelectedServer, ServerWithId } from '../data';

@ -29,9 +32,14 @@ const initialState: SelectedServer = null;

 export const resetSelectedServer = createAction<void>(`${REDUCER_PREFIX}/resetSelectedServer`);

-export const selectServer = (buildShlinkApiClient: ShlinkApiClientBuilder) => createAsyncThunk(
+export type SelectServerOptions = {
+  serverId: string;
+  buildShlinkApiClient: ShlinkApiClientBuilder;
+};
+
+export const selectServer = createAsyncThunk(
  `${REDUCER_PREFIX}/selectServer`,
-  async (serverId: string, { dispatch, getState }): Promise<SelectedServer> => {
+  async ({ serverId, buildShlinkApiClient }: SelectServerOptions, { dispatch, getState }): Promise<SelectedServer> => {
    dispatch(resetSelectedServer());

    const { servers } = getState();
@ -56,14 +64,29 @@ export const selectServer = (buildShlinkApiClient: ShlinkApiClientBuilder) => cr
  },
 );

-type SelectServerThunk = ReturnType<typeof selectServer>;
-
-export const selectedServerReducerCreator = (selectServerThunk: SelectServerThunk) => createSlice({
+export const { reducer: selectedServerReducer } = createSlice({
  name: REDUCER_PREFIX,
-  initialState,
+  initialState: initialState as SelectedServer,
  reducers: {},
  extraReducers: (builder) => {
    builder.addCase(resetSelectedServer, () => initialState);
-    builder.addCase(selectServerThunk.fulfilled, (_, { payload }) => payload as any);
+    builder.addCase(selectServer.fulfilled, (_, { payload }) => payload);
  },
 });
+
+export const useSelectedServer = () => {
+  const dispatch = useAppDispatch();
+  const [buildShlinkApiClient] = useDependencies<[ShlinkApiClientBuilder]>('buildShlinkApiClient');
+  const dispatchResetSelectedServer = useCallback(() => dispatch(resetSelectedServer()), [dispatch]);
+  const dispatchSelectServer = useCallback(
+    (serverId: string) => dispatch(selectServer({ serverId, buildShlinkApiClient })),
+    [buildShlinkApiClient, dispatch],
+  );
+  const selectedServer = useAppSelector(({ selectedServer }) => selectedServer);
+
+  return {
+    selectedServer,
+    resetSelectedServer: dispatchResetSelectedServer,
+    selectServer: dispatchSelectServer,
+  };
+};
--- a/src/servers/reducers/servers.ts
+++ b/src/servers/reducers/servers.ts
@ -1,21 +1,23 @@
 import type { PayloadAction } from '@reduxjs/toolkit';
 import { createSlice } from '@reduxjs/toolkit';
+import { useCallback } from 'react';
+import { useAppDispatch, useAppSelector } from '../../store';
 import type { ServerData, ServersMap, ServerWithId } from '../data';
 import { serversListToMap } from '../helpers';

-interface EditServer {
+type EditServer = {
  serverId: string;
  serverData: Partial<ServerData>;
-}
+};

-interface SetAutoConnect {
+type SetAutoConnect = {
  serverId: string;
  autoConnect: boolean;
-}
+};

 const initialState: ServersMap = {};

-export const { actions, reducer } = createSlice({
+export const { actions, reducer: serversReducer } = createSlice({
  name: 'shlink/servers',
  initialState,
  reducers: {
@ -65,4 +67,19 @@ export const { actions, reducer } = createSlice({

 export const { editServer, deleteServer, setAutoConnect, createServers } = actions;

-export const serversReducer = reducer;
+export const useServers = () => {
+  const dispatch = useAppDispatch();
+  const servers = useAppSelector((state) => state.servers);
+  const editServer = useCallback(
+    (serverId: string, serverData: Partial<ServerData>) => dispatch(actions.editServer(serverId, serverData)),
+    [dispatch],
+  );
+  const deleteServer = useCallback((server: ServerWithId) => dispatch(actions.deleteServer(server)), [dispatch]);
+  const setAutoConnect = useCallback(
+    (serverData: ServerWithId, autoConnect: boolean) => dispatch(actions.setAutoConnect(serverData, autoConnect)),
+    [dispatch],
+  );
+  const createServers = useCallback((servers: ServerWithId[]) => dispatch(actions.createServers(servers)), [dispatch]);
+
+  return { servers, editServer, deleteServer, setAutoConnect, createServers };
+};
--- a/src/servers/services/provideServices.ts
+++ b/src/servers/services/provideServices.ts
@ -1,73 +0,0 @@
-import type Bottle from 'bottlejs';
-import type { ConnectDecorator } from '../../container/types';
-import { CreateServerFactory } from '../CreateServer';
-import { DeleteServerButtonFactory } from '../DeleteServerButton';
-import { DeleteServerModal } from '../DeleteServerModal';
-import { EditServerFactory } from '../EditServer';
-import { ImportServersBtnFactory } from '../helpers/ImportServersBtn';
-import { ServerErrorFactory } from '../helpers/ServerError';
-import { withoutSelectedServer } from '../helpers/withoutSelectedServer';
-import { ManageServersFactory } from '../ManageServers';
-import { ManageServersRowFactory } from '../ManageServersRow';
-import { ManageServersRowDropdownFactory } from '../ManageServersRowDropdown';
-import { fetchServers } from '../reducers/remoteServers';
-import {
-  resetSelectedServer,
-  selectedServerReducerCreator,
-  selectServer,
-} from '../reducers/selectedServer';
-import { createServers, deleteServer, editServer, setAutoConnect } from '../reducers/servers';
-import { ServersDropdown } from '../ServersDropdown';
-import { ServersExporter } from './ServersExporter';
-import { ServersImporter } from './ServersImporter';
-
-export const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {
-  // Components
-  bottle.factory('ManageServers', ManageServersFactory);
-  bottle.decorator('ManageServers', withoutSelectedServer);
-  bottle.decorator('ManageServers', connect(['selectedServer', 'servers'], ['resetSelectedServer']));
-
-  bottle.factory('ManageServersRow', ManageServersRowFactory);
-
-  bottle.factory('ManageServersRowDropdown', ManageServersRowDropdownFactory);
-  bottle.decorator('ManageServersRowDropdown', connect(null, ['setAutoConnect']));
-
-  bottle.factory('CreateServer', CreateServerFactory);
-  bottle.decorator('CreateServer', withoutSelectedServer);
-  bottle.decorator('CreateServer', connect(['selectedServer', 'servers'], ['createServers', 'resetSelectedServer']));
-
-  bottle.factory('EditServer', EditServerFactory);
-  bottle.decorator('EditServer', connect(['selectedServer'], ['editServer', 'selectServer', 'resetSelectedServer']));
-
-  bottle.serviceFactory('ServersDropdown', () => ServersDropdown);
-  bottle.decorator('ServersDropdown', connect(['servers', 'selectedServer']));
-
-  bottle.serviceFactory('DeleteServerModal', () => DeleteServerModal);
-  bottle.decorator('DeleteServerModal', connect(null, ['deleteServer']));
-
-  bottle.factory('DeleteServerButton', DeleteServerButtonFactory);
-
-  bottle.factory('ImportServersBtn', ImportServersBtnFactory);
-  bottle.decorator('ImportServersBtn', connect(['servers'], ['createServers']));
-
-  bottle.factory('ServerError', ServerErrorFactory);
-  bottle.decorator('ServerError', connect(['servers', 'selectedServer']));
-
-  // Services
-  bottle.service('ServersImporter', ServersImporter, 'csvToJson');
-  bottle.service('ServersExporter', ServersExporter, 'Storage', 'window', 'jsonToCsv');
-
-  // Actions
-  bottle.serviceFactory('selectServer', selectServer, 'buildShlinkApiClient', 'loadMercureInfo');
-  bottle.serviceFactory('createServers', () => createServers);
-  bottle.serviceFactory('deleteServer', () => deleteServer);
-  bottle.serviceFactory('editServer', () => editServer);
-  bottle.serviceFactory('setAutoConnect', () => setAutoConnect);
-  bottle.serviceFactory('fetchServers', fetchServers, 'HttpClient');
-
-  bottle.serviceFactory('resetSelectedServer', () => resetSelectedServer);
-
-  // Reducers
-  bottle.serviceFactory('selectedServerReducerCreator', selectedServerReducerCreator, 'selectServer');
-  bottle.serviceFactory('selectedServerReducer', (obj) => obj.reducer, 'selectedServerReducerCreator');
-};
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@ -1,20 +1,18 @@
-import type { Settings as AppSettings } from '@shlinkio/shlink-web-component/settings';
 import { ShlinkWebSettings } from '@shlinkio/shlink-web-component/settings';
 import type { FC } from 'react';
 import { NoMenuLayout } from '../common/NoMenuLayout';
-import { DEFAULT_SHORT_URLS_ORDERING } from './reducers/settings';
+import { DEFAULT_SHORT_URLS_ORDERING, useSettings } from './reducers/settings';

-export type SettingsProps = {
-  settings: AppSettings;
-  setSettings: (newSettings: AppSettings) => void;
+export const Settings: FC = () => {
+  const { settings, setSettings } = useSettings();
+
+  return (
+    <NoMenuLayout>
+      <ShlinkWebSettings
+        settings={settings}
+        onUpdateSettings={setSettings}
+        defaultShortUrlsListOrdering={DEFAULT_SHORT_URLS_ORDERING}
+      />
+    </NoMenuLayout>
+  );
 };
-
-export const Settings: FC<SettingsProps> = ({ settings, setSettings }) => (
-  <NoMenuLayout>
-    <ShlinkWebSettings
-      settings={settings}
-      updateSettings={setSettings}
-      defaultShortUrlsListOrdering={DEFAULT_SHORT_URLS_ORDERING}
-    />
-  </NoMenuLayout>
-);
--- a/src/settings/helpers/index.ts
+++ b/src/settings/helpers/index.ts
@ -1,12 +1,6 @@
-import type { ShlinkState } from '../../container/types';
-
-export const migrateDeprecatedSettings = (state: Partial<ShlinkState>): Partial<ShlinkState> => {
-  if (!state.settings) {
-    return state;
-  }
-
+export const migrateDeprecatedSettings = (state: any): any => {
  // The "last180Days" interval had a typo, with a lowercase d
-  if (state.settings.visits && (state.settings.visits.defaultInterval as any) === 'last180days') {
+  if (state.settings?.visits?.defaultInterval === 'last180days') {
    state.settings.visits.defaultInterval = 'last180Days';
  }

--- a/src/settings/reducers/settings.ts
+++ b/src/settings/reducers/settings.ts
@ -3,6 +3,8 @@ import { createSlice } from '@reduxjs/toolkit';
 import { mergeDeepRight } from '@shlinkio/data-manipulation';
 import { getSystemPreferredTheme } from '@shlinkio/shlink-frontend-kit';
 import type { Settings, ShortUrlsListSettings } from '@shlinkio/shlink-web-component/settings';
+import { useCallback } from 'react';
+import { useAppDispatch, useAppSelector } from '../../store';
 import type { Defined } from '../../utils/types';

 type ShortUrlsOrder = Defined<ShortUrlsListSettings['defaultOrdering']>;
@ -18,9 +20,7 @@ const initialState: Settings = {
  realTimeUpdates: {
    enabled: true,
  },
-  shortUrlCreation: {
-    validateUrls: false,
-  },
+  shortUrlCreation: {},
  ui: {
    theme: getSystemPreferredTheme(),
  },
@ -43,3 +43,11 @@ const { reducer, actions } = createSlice({
 export const { setSettings } = actions;

 export const settingsReducer = reducer;
+
+export const useSettings = () => {
+  const dispatch = useAppDispatch();
+  const setSettings = useCallback((settings: Settings) => dispatch(actions.setSettings(settings)), [dispatch]);
+  const settings = useAppSelector((state) => state.settings);
+
+  return { settings, setSettings };
+};
--- a/src/settings/services/provideServices.ts
+++ b/src/settings/services/provideServices.ts
@ -1,15 +0,0 @@
-import type Bottle from 'bottlejs';
-import type { ConnectDecorator } from '../../container/types';
-import { withoutSelectedServer } from '../../servers/helpers/withoutSelectedServer';
-import { setSettings } from '../reducers/settings';
-import { Settings } from '../Settings';
-
-export const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {
-  // Components
-  bottle.serviceFactory('Settings', () => Settings);
-  bottle.decorator('Settings', withoutSelectedServer);
-  bottle.decorator('Settings', connect(['settings'], ['setSettings', 'resetSelectedServer']));
-
-  // Actions
-  bottle.serviceFactory('setSettings', () => setSettings);
-};
--- a/src/utils/helpers/redux.ts
+++ b/src/utils/helpers/redux.ts
@ -1,10 +1,10 @@
 import type { AsyncThunkPayloadCreator } from '@reduxjs/toolkit';
 import { createAsyncThunk as baseCreateAsyncThunk } from '@reduxjs/toolkit';
-import type { ShlinkState } from '../../container/types';
+import type { RootState } from '.';

 export const createAsyncThunk = <Returned, ThunkArg>(
  typePrefix: string,
-  payloadCreator: AsyncThunkPayloadCreator<Returned, ThunkArg, { state: ShlinkState, serializedErrorType: any }>,
+  payloadCreator: AsyncThunkPayloadCreator<Returned, ThunkArg, { state: RootState, serializedErrorType: any }>,
 ) => baseCreateAsyncThunk(
  typePrefix,
  payloadCreator,
--- a/src/store/index.ts
+++ b/src/store/index.ts
@ -0,0 +1,32 @@
+import { configureStore } from '@reduxjs/toolkit';
+import { useDispatch, useSelector } from 'react-redux';
+import type { RLSOptions } from 'redux-localstorage-simple';
+import { load, save } from 'redux-localstorage-simple';
+import { migrateDeprecatedSettings } from '../settings/helpers';
+import { initReducers } from './reducers';
+
+const localStorageConfig: RLSOptions = {
+  states: ['settings', 'servers'],
+  namespace: 'shlink',
+  namespaceSeparator: '.',
+  debounce: 300,
+};
+const getStateFromLocalStorage = () => migrateDeprecatedSettings(load(localStorageConfig));
+
+const isProduction = process.env.NODE_ENV === 'production';
+export const setUpStore = (preloadedState = getStateFromLocalStorage()) => configureStore({
+  devTools: !isProduction,
+  reducer: initReducers(),
+  preloadedState,
+  middleware: (defaultMiddlewaresIncludingReduxThunk) =>
+    defaultMiddlewaresIncludingReduxThunk().concat(save(localStorageConfig)),
+});
+
+export type StoreType = ReturnType<typeof setUpStore>;
+export type AppDispatch = StoreType['dispatch'];
+export type GetState = StoreType['getState'];
+export type RootState = ReturnType<GetState>;
+
+// Typed versions of useDispatch() and useSelector()
+export const useAppDispatch = useDispatch.withTypes<AppDispatch>();
+export const useAppSelector = useSelector.withTypes<RootState>();
--- a/src/store/reducers.ts
+++ b/src/store/reducers.ts
@ -1,12 +1,12 @@
 import { combineReducers } from '@reduxjs/toolkit';
-import type { IContainer } from 'bottlejs';
 import { appUpdatesReducer } from '../app/reducers/appUpdates';
+import { selectedServerReducer } from '../servers/reducers/selectedServer';
 import { serversReducer } from '../servers/reducers/servers';
 import { settingsReducer } from '../settings/reducers/settings';

-export const initReducers = (container: IContainer) => combineReducers({
+export const initReducers = () => combineReducers({
  appUpdated: appUpdatesReducer,
  servers: serversReducer,
-  selectedServer: container.selectedServerReducer,
+  selectedServer: selectedServerReducer,
  settings: settingsReducer,
 });
--- a/src/tailwind.css
+++ b/src/tailwind.css
@ -8,7 +8,5 @@
    :root {
        --footer-height: 2.3rem;
        --footer-margin: .8rem;
-        /* FIXME Remove this once updated to shlink-web-component 0.15.1 */
-        --header-height: 52px;
    }
 }
--- a/src/utils/services/provideServices.ts
+++ b/src/utils/services/provideServices.ts
@ -1,16 +0,0 @@
-import { useTimeoutToggle } from '@shlinkio/shlink-frontend-kit';
-import type Bottle from 'bottlejs';
-import { csvToJson, jsonToCsv } from '../helpers/csvjson';
-import { LocalStorage } from './LocalStorage';
-import { TagColorsStorage } from './TagColorsStorage';
-
-export const provideServices = (bottle: Bottle) => {
-  bottle.constant('localStorage', window.localStorage);
-  bottle.service('Storage', LocalStorage, 'localStorage');
-  bottle.service('TagColorsStorage', TagColorsStorage, 'Storage');
-
-  bottle.constant('csvToJson', csvToJson);
-  bottle.constant('jsonToCsv', jsonToCsv);
-
-  bottle.serviceFactory('useTimeoutToggle', () => useTimeoutToggle);
-};
--- a/test/helpers/MemoryRouterWithParams.tsx
+++ b/test/helpers/MemoryRouterWithParams.tsx
@ -1,23 +0,0 @@
-import type { FC, PropsWithChildren } from 'react';
-import { useMemo } from 'react';
-import { MemoryRouter, Route, Routes } from 'react-router';
-
-export type MemoryRouterWithParamsProps = PropsWithChildren<{
-  params: Record<string, string>;
-}>;
-
-/**
- * Wrap any component using useParams() with MemoryRouterWithParams, in order to determine wat the hook should return
- */
-export const MemoryRouterWithParams: FC<MemoryRouterWithParamsProps> = ({ children, params }) => {
-  const pathname = useMemo(() => `/${Object.values(params).join('/')}`, [params]);
-  const pathPattern = useMemo(() => `/:${Object.keys(params).join('/:')}`, [params]);
-
-  return (
-    <MemoryRouter>
-      <Routes location={{ pathname }}>
-        <Route path={pathPattern} element={children} />
-      </Routes>
-    </MemoryRouter>
-  );
-};
--- a/test/helpers/setUpTest.ts
+++ b/test/helpers/setUpTest.ts
@ -1,8 +0,0 @@
-import { render } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import type { ReactElement } from 'react';
-
-export const renderWithEvents = (element: ReactElement) => ({
-  user: userEvent.setup(),
-  ...render(element),
-});
--- a/test/helpers/setUpTest.tsx
+++ b/test/helpers/setUpTest.tsx
@ -0,0 +1,50 @@
+import type { ShlinkApiClient } from '@shlinkio/shlink-js-sdk';
+import type { RenderOptions } from '@testing-library/react';
+import { render } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { fromPartial } from '@total-typescript/shoehorn';
+import type { PropsWithChildren, ReactElement } from 'react';
+import { Provider } from 'react-redux';
+import { ContainerProvider } from '../../src/container/context';
+import type { RootState } from '../../src/store';
+import { setUpStore } from '../../src/store';
+
+export const renderWithEvents = (element: ReactElement, options?: RenderOptions) => ({
+  user: userEvent.setup(),
+  ...render(element, options),
+});
+
+export type RenderOptionsWithState = Omit<RenderOptions, 'wrapper'> & {
+  /** Initial state for the redux store */
+  initialState?: Partial<RootState>;
+
+  /**
+   * If provided, it will set this as the `buildShlinkApiClient` dependency in the `ContainerProvider`.
+   * If more dependencies are needed, then explicitly define your own `ContainerProvider` and make sure it includes a
+   * `buildShlinkApiClient` service.
+   *
+   * Defaults to vi.fn()
+   */
+  buildShlinkApiClient?: () => ShlinkApiClient;
+};
+
+/**
+ * Render provided ReactElement wrapped in a redux `Provider` and a `ContainerProvider` with a single
+ * `buildShlinkApiClient` dependency.
+ */
+export const renderWithStore = (
+  element: ReactElement,
+  { initialState = {}, buildShlinkApiClient = vi.fn(), ...options }: RenderOptionsWithState = {},
+) => {
+  const store = setUpStore(initialState);
+  const Wrapper = ({ children }: PropsWithChildren) => (
+    <ContainerProvider value={fromPartial({ buildShlinkApiClient })}>
+      <Provider store={store}>{children}</Provider>
+    </ContainerProvider>
+  );
+
+  return {
+    store,
+    ...renderWithEvents(element, { ...options, wrapper: Wrapper }),
+  };
+};
--- a/test/app/App.test.tsx
+++ b/test/app/App.test.tsx
@ -1,50 +1,51 @@
-import { act, render, screen } from '@testing-library/react';
+import type { HttpClient } from '@shlinkio/shlink-js-sdk';
+import { act, screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { MemoryRouter } from 'react-router';
-import { AppFactory } from '../../src/app/App';
+import { App } from '../../src/app/App';
+import { ContainerProvider } from '../../src/container/context';
+import type { ServerWithId } from '../../src/servers/data';
 import { checkAccessibility } from '../__helpers__/accessibility';
+import { renderWithStore } from '../__helpers__/setUpTest';
+
+vi.mock(import('../../src/common/ShlinkWebComponentContainer'), () => ({
+  ShlinkWebComponentContainer: () => <span>ShlinkWebComponentContainer</span>,
+}));

 describe('<App />', () => {
-  const App = AppFactory(
-    fromPartial({
-      MainHeader: () => <>MainHeader</>,
-      Home: () => <>Home</>,
-      ShlinkWebComponentContainer: () => <>ShlinkWebComponentContainer</>,
-      CreateServer: () => <>CreateServer</>,
-      EditServer: () => <>EditServer</>,
-      Settings: () => <>SettingsComp</>,
-      ManageServers: () => <>ManageServers</>,
-      ShlinkVersionsContainer: () => <>ShlinkVersions</>,
-    }),
-  );
-  const setUp = async (activeRoute = '/') => act(() => render(
+  const setUp = async (activeRoute = '/') => act(() => renderWithStore(
    <MemoryRouter initialEntries={[{ pathname: activeRoute }]}>
-      <App
-        fetchServers={() => {}}
-        servers={{}}
-        settings={fromPartial({})}
-        appUpdated={false}
-        resetAppUpdate={() => {}}
-      />
+      <ContainerProvider
+        value={fromPartial({
+          HttpClient: fromPartial<HttpClient>({}),
+          buildShlinkApiClient: vi.fn(),
+          useTimeoutToggle: vi.fn().mockReturnValue([false, vi.fn()]),
+        })}
+      >
+        <App />
+      </ContainerProvider>
    </MemoryRouter>,
+    {
+      initialState: {
+        servers: {
+          abc123: fromPartial<ServerWithId>({ id: 'abc123', name: 'abc123 server' }),
+          def456: fromPartial<ServerWithId>({ id: 'def456', name: 'def456 server' }),
+        },
+        settings: fromPartial({}),
+        appUpdated: false,
+      },
+    },
  ));

  it('passes a11y checks', () => checkAccessibility(setUp()));

-  it('renders children components', async () => {
-    await setUp();
-
-    expect(screen.getByText('MainHeader')).toBeInTheDocument();
-    expect(screen.getByText('ShlinkVersions')).toBeInTheDocument();
-  });
-
  it.each([
-    ['/settings/foo', 'SettingsComp'],
-    ['/settings/bar', 'SettingsComp'],
-    ['/manage-servers', 'ManageServers'],
-    ['/server/create', 'CreateServer'],
-    ['/server/abc123/edit', 'EditServer'],
-    ['/server/def456/edit', 'EditServer'],
+    ['/settings/general', 'User interface'],
+    ['/settings/short-urls', 'Short URLs form'],
+    ['/manage-servers', 'Add a server'],
+    ['/server/create', 'Add new server'],
+    ['/server/abc123/edit', 'Edit "abc123 server"'],
+    ['/server/def456/edit', 'Edit "def456 server"'],
    ['/server/abc123/foo', 'ShlinkWebComponentContainer'],
    ['/server/def456/bar', 'ShlinkWebComponentContainer'],
    ['/other', 'Oops! We could not find requested route.'],
--- a/test/common/Home.test.tsx
+++ b/test/common/Home.test.tsx
@ -1,15 +1,19 @@
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { MemoryRouter } from 'react-router';
 import { Home } from '../../src/common/Home';
 import type { ServersMap, ServerWithId } from '../../src/servers/data';
 import { checkAccessibility } from '../__helpers__/accessibility';
+import { renderWithStore } from '../__helpers__/setUpTest';

 describe('<Home />', () => {
-  const setUp = (servers: ServersMap = {}) => render(
+  const setUp = (servers: ServersMap = {}) => renderWithStore(
    <MemoryRouter>
-      <Home servers={servers} />
+      <Home />
    </MemoryRouter>,
+    {
+      initialState: { servers },
+    },
  );

  it('passes a11y checks', () => checkAccessibility(
--- a/test/common/MainHeader.test.tsx
+++ b/test/common/MainHeader.test.tsx
@ -1,22 +1,17 @@
 import { screen } from '@testing-library/react';
-import { fromPartial } from '@total-typescript/shoehorn';
 import { createMemoryHistory } from 'history';
 import { Router } from 'react-router';
-import { MainHeaderFactory } from '../../src/common/MainHeader';
+import { MainHeader } from '../../src/common/MainHeader';
 import { checkAccessibility } from '../__helpers__/accessibility';
-import { renderWithEvents } from '../__helpers__/setUpTest';
+import { renderWithStore } from '../__helpers__/setUpTest';

 describe('<MainHeader />', () => {
-  const MainHeader = MainHeaderFactory(fromPartial({
-    // Fake this component as a li[role="menuitem"], as it gets rendered inside a ul[role="menu"]
-    ServersDropdown: () => <li role="menuitem">ServersDropdown</li>,
-  }));
  const setUp = (pathname = '') => {
    const history = createMemoryHistory();
    history.push(pathname);

-    return renderWithEvents(
-      <Router location={history.location} navigator={history}>
+    return renderWithStore(
+      <Router location={history.location} navigator={history} unstable_useTransitions={false}>
        <MainHeader />
      </Router>,
    );
@ -26,7 +21,7 @@ describe('<MainHeader />', () => {

  it('renders ServersDropdown', () => {
    setUp();
-    expect(screen.getByText('ServersDropdown')).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'Servers' })).toBeInTheDocument();
  });

  it.each([
--- a/test/common/ShlinkVersionsContainer.test.tsx
+++ b/test/common/ShlinkVersionsContainer.test.tsx
@ -1,13 +1,13 @@
-import { render } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { ShlinkVersionsContainer } from '../../src/common/ShlinkVersionsContainer';
 import type { ReachableServer, SelectedServer } from '../../src/servers/data';
 import { checkAccessibility } from '../__helpers__/accessibility';
+import { renderWithStore } from '../__helpers__/setUpTest';

 describe('<ShlinkVersionsContainer />', () => {
-  const setUp = (selectedServer: SelectedServer = null) => render(
-    <ShlinkVersionsContainer selectedServer={selectedServer} />,
-  );
+  const setUp = (selectedServer: SelectedServer = null) => renderWithStore(<ShlinkVersionsContainer />, {
+    initialState: { selectedServer },
+  });

  it.each([
    [null],
--- a/test/common/ShlinkWebComponentContainer.test.tsx
+++ b/test/common/ShlinkWebComponentContainer.test.tsx
@ -1,21 +1,25 @@
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
-import { ShlinkWebComponentContainerFactory } from '../../src/common/ShlinkWebComponentContainer';
+import { MemoryRouter } from 'react-router';
+import { ShlinkWebComponentContainer } from '../../src/common/ShlinkWebComponentContainer';
 import type { NonReachableServer, NotFoundServer, SelectedServer } from '../../src/servers/data';
 import { checkAccessibility } from '../__helpers__/accessibility';
-import { MemoryRouterWithParams } from '../__helpers__/MemoryRouterWithParams';
+import { renderWithStore } from '../__helpers__/setUpTest';
+
+vi.mock('@shlinkio/shlink-web-component', () => ({
+  ShlinkSidebarVisibilityProvider: ({ children }: any) => children,
+  ShlinkSidebarToggleButton: ({ children }: any) => children,
+  ShlinkWebComponent: () => <>ShlinkWebComponent</>,
+}));

 describe('<ShlinkWebComponentContainer />', () => {
-  const ShlinkWebComponentContainer = ShlinkWebComponentContainerFactory(fromPartial({
-    buildShlinkApiClient: vi.fn().mockReturnValue(fromPartial({})),
-    TagColorsStorage: fromPartial({}),
-    ShlinkWebComponent: () => <>ShlinkWebComponent</>,
-    ServerError: () => <>ServerError</>,
-  }));
-  const setUp = (selectedServer: SelectedServer) => render(
-    <MemoryRouterWithParams params={{ serverId: 'abc123' }}>
-      <ShlinkWebComponentContainer selectServer={vi.fn()} selectedServer={selectedServer} settings={{}} />
-    </MemoryRouterWithParams>,
+  const setUp = (selectedServer: SelectedServer) => renderWithStore(
+    <MemoryRouter>
+      <ShlinkWebComponentContainer TagColorsStorage={fromPartial({})} />
+    </MemoryRouter>,
+    {
+      initialState: { selectedServer, servers: {}, settings: {} },
+    },
  );

  it('passes a11y checks', () => checkAccessibility(setUp(fromPartial({ version: '3.0.0' }))));
@ -24,18 +28,20 @@ describe('<ShlinkWebComponentContainer />', () => {
    setUp(null);

    expect(screen.getByText('Loading...')).toBeInTheDocument();
-    expect(screen.queryByText('ServerError')).not.toBeInTheDocument();
    expect(screen.queryByText('ShlinkWebComponent')).not.toBeInTheDocument();
  });

  it.each([
-    [fromPartial<NotFoundServer>({ serverNotFound: true })],
-    [fromPartial<NonReachableServer>({ serverNotReachable: true })],
-  ])('shows error for non reachable servers', (selectedServer) => {
+    [fromPartial<NotFoundServer>({ serverNotFound: true }), 'Could not find this Shlink server.'],
+    [
+      fromPartial<NonReachableServer>({ id: 'foo', serverNotReachable: true }),
+      /Could not connect to this Shlink server/,
+    ],
+  ])('shows error for non reachable servers', (selectedServer, expectedError) => {
    setUp(selectedServer);

    expect(screen.queryByText('Loading...')).not.toBeInTheDocument();
-    expect(screen.getByText('ServerError')).toBeInTheDocument();
+    expect(screen.getByText(expectedError)).toBeInTheDocument();
    expect(screen.queryByText('ShlinkWebComponent')).not.toBeInTheDocument();
  });

@ -43,7 +49,6 @@ describe('<ShlinkWebComponentContainer />', () => {
    setUp(fromPartial({ version: '3.0.0' }));

    expect(screen.queryByText('Loading...')).not.toBeInTheDocument();
-    expect(screen.queryByText('ServerError')).not.toBeInTheDocument();
    expect(screen.getByText('ShlinkWebComponent')).toBeInTheDocument();
  });
 });
--- a/test/container/context.test.tsx
+++ b/test/container/context.test.tsx
@ -0,0 +1,39 @@
+import { render } from '@testing-library/react';
+import { fromPartial } from '@total-typescript/shoehorn';
+import { ContainerProvider, useDependencies } from '../../src/container/context';
+
+describe('context', () => {
+  describe('useDependencies', () => {
+    let lastDependencies: unknown[];
+
+    function TestComponent({ name}: { name: string }) {
+      // eslint-disable-next-line react-compiler/react-compiler
+      lastDependencies =  useDependencies(name);
+      return null;
+    }
+
+    it('throws when used outside of ContainerProvider', () => {
+      expect(() => render(<TestComponent name="foo" />)).toThrowError(
+        'You cannot use "useDependencies" outside of a ContainerProvider',
+      );
+    });
+
+    it('throws when requested dependency is not found in container', () => {
+      expect(() => render(
+        <ContainerProvider value={fromPartial({})}>
+          <TestComponent name="foo" />
+        </ContainerProvider>,
+      )).toThrowError('Dependency with name "foo" not found in container');
+    });
+
+    it('gets dependency from container', () => {
+      render(
+        <ContainerProvider value={fromPartial({ foo: 'the dependency' })}>
+          <TestComponent name="foo" />
+        </ContainerProvider>,
+      );
+
+      expect(lastDependencies).toEqual(['the dependency']);
+    });
+  });
+});
--- a/test/servers/CreateServer.test.tsx
+++ b/test/servers/CreateServer.test.tsx
@ -2,10 +2,10 @@ import { fireEvent, screen, waitFor } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { createMemoryHistory } from 'history';
 import { Router } from 'react-router';
-import { CreateServerFactory } from '../../src/servers/CreateServer';
+import { CreateServer } from '../../src/servers/CreateServer';
 import type { ServersMap } from '../../src/servers/data';
 import { checkAccessibility } from '../__helpers__/accessibility';
-import { renderWithEvents } from '../__helpers__/setUpTest';
+import { renderWithStore } from '../__helpers__/setUpTest';

 type SetUpOptions = {
  serversImported?: boolean;
@ -14,9 +14,8 @@ type SetUpOptions = {
 };

 describe('<CreateServer />', () => {
-  const createServersMock = vi.fn();
  const defaultServers: ServersMap = {
-    foo: fromPartial({ url: 'https://existing_url.com', apiKey: 'existing_api_key' }),
+    foo: fromPartial({ url: 'https://existing_url.com', apiKey: 'existing_api_key', id: 'foo' }),
  };
  const setUp = ({ serversImported = false, importFailed = false, servers = defaultServers }: SetUpOptions = {}) => {
    let callCount = 0;
@ -25,18 +24,17 @@ describe('<CreateServer />', () => {
      callCount += 1;
      return result;
    });
-    const CreateServer = CreateServerFactory(fromPartial({
-      ImportServersBtn: () => <>ImportServersBtn</>,
-      useTimeoutToggle,
-    }));
    const history = createMemoryHistory({ initialEntries: ['/foo', '/bar'] });

    return {
      history,
-      ...renderWithEvents(
-        <Router location={history.location} navigator={history}>
-          <CreateServer createServers={createServersMock} servers={servers} />
+      ...renderWithStore(
+        <Router location={history.location} navigator={history} unstable_useTransitions={false}>
+          <CreateServer useTimeoutToggle={useTimeoutToggle} />
        </Router>,
+        {
+          initialState: { servers },
+        },
      ),
    };
  };
@ -62,27 +60,24 @@ describe('<CreateServer />', () => {
    expect(screen.getByText('The servers could not be imported. Make sure the format is correct.')).toBeInTheDocument();
  });

-  it('shows import button when no servers exist yet', () => {
-    setUp({ servers: {} });
-    expect(screen.queryByText('ImportServersBtn')).toBeInTheDocument();
-  });
-
  it('creates server data when form is submitted', async () => {
-    const { user, history } = setUp();
-
-    expect(createServersMock).not.toHaveBeenCalled();
+    const { user, history, store } = setUp();
+    const expectedServerId = 'the_name-the_url.com';

    await user.type(screen.getByLabelText(/^Name/), 'the_name');
    await user.type(screen.getByLabelText(/^URL/), 'https://the_url.com');
    await user.type(screen.getByLabelText(/^API key/), 'the_api_key');
-    fireEvent.submit(screen.getByRole('form'));

-    expect(createServersMock).toHaveBeenCalledWith([expect.objectContaining({
+    expect(store.getState().servers[expectedServerId]).not.toBeDefined();
+    fireEvent.submit(screen.getByRole('form'));
+    expect(store.getState().servers[expectedServerId]).toEqual(expect.objectContaining({
+      id: expectedServerId,
      name: 'the_name',
      url: 'https://the_url.com',
      apiKey: 'the_api_key',
-    })]);
-    expect(history.location.pathname).toEqual(expect.stringMatching(/^\/server\//));
+    }));
+
+    expect(history.location.pathname).toEqual(`/server/${expectedServerId}`);
    expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
  });

@ -92,12 +87,12 @@ describe('<CreateServer />', () => {
    await user.type(screen.getByLabelText(/^Name/), 'the_name');
    await user.type(screen.getByLabelText(/^URL/), 'https://existing_url.com');
    await user.type(screen.getByLabelText(/^API key/), 'existing_api_key');
+
    fireEvent.submit(screen.getByRole('form'));

    await waitFor(() => expect(screen.getByRole('dialog')).toBeInTheDocument());
    await user.click(screen.getByRole('button', { name: 'Discard' }));

-    expect(createServersMock).not.toHaveBeenCalled();
    expect(history.location.pathname).toEqual('/foo'); // Goes back to first route from history's initialEntries
  });
 });
--- a/test/servers/DeleteServerButton.test.tsx
+++ b/test/servers/DeleteServerButton.test.tsx
@ -3,20 +3,15 @@ import { fromPartial } from '@total-typescript/shoehorn';
 import { createMemoryHistory } from 'history';
 import type { ReactNode } from 'react';
 import { Router } from 'react-router';
-import { DeleteServerButtonFactory } from '../../src/servers/DeleteServerButton';
-import type { DeleteServerModalProps } from '../../src/servers/DeleteServerModal';
-import { DeleteServerModal } from '../../src/servers/DeleteServerModal';
+import { DeleteServerButton } from '../../src/servers/DeleteServerButton';
 import { checkAccessibility } from '../__helpers__/accessibility';
-import { renderWithEvents } from '../__helpers__/setUpTest';
+import { renderWithStore } from '../__helpers__/setUpTest';

 describe('<DeleteServerButton />', () => {
-  const DeleteServerButton = DeleteServerButtonFactory(fromPartial({
-    DeleteServerModal: (props: DeleteServerModalProps) => <DeleteServerModal {...props} deleteServer={vi.fn()} />,
-  }));
  const setUp = (children: ReactNode = 'Remove this server') => {
    const history = createMemoryHistory({ initialEntries: ['/foo'] });
-    const result = renderWithEvents(
-      <Router location={history.location} navigator={history}>
+    const result = renderWithStore(
+      <Router location={history.location} navigator={history} unstable_useTransitions={false}>
        <DeleteServerButton server={fromPartial({})}>{children}</DeleteServerButton>
      </Router>,
    );
--- a/test/servers/DeleteServerModal.test.tsx
+++ b/test/servers/DeleteServerModal.test.tsx
@ -1,23 +1,23 @@
 import { screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
+import type { ServerWithId } from '../../src/servers/data';
 import { DeleteServerModal } from '../../src/servers/DeleteServerModal';
 import { checkAccessibility } from '../__helpers__/accessibility';
-import { renderWithEvents } from '../__helpers__/setUpTest';
+import { renderWithStore } from '../__helpers__/setUpTest';
 import { TestModalWrapper } from '../__helpers__/TestModalWrapper';

 describe('<DeleteServerModal />', () => {
-  const deleteServerMock = vi.fn();
  const serverName = 'the_server_name';
-  const setUp = () => renderWithEvents(
+  const server = fromPartial<ServerWithId>({ id: 'foo', name: serverName });
+  const setUp = () => renderWithStore(
    <TestModalWrapper
-      renderModal={(args) => (
-        <DeleteServerModal
-          {...args}
-          server={fromPartial({ name: serverName })}
-          deleteServer={deleteServerMock}
-        />
-      )}
+      renderModal={(args) => <DeleteServerModal {...args} server={server} />}
    />,
+    {
+      initialState: {
+        servers: { foo: server },
+      },
+    },
  );

  it('passes a11y checks', () => checkAccessibility(setUp()));
@ -40,19 +40,21 @@ describe('<DeleteServerModal />', () => {
    [() => screen.getByRole('button', { name: 'Cancel' })],
    [() => screen.getByLabelText('Close dialog')],
  ])('closes dialog when clicking cancel button', async (getButton) => {
-    const { user } = setUp();
+    const { user, store } = setUp();

    expect(screen.getByRole('dialog')).toBeInTheDocument();
    await user.click(getButton());
    expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-    expect(deleteServerMock).not.toHaveBeenCalled();
+
+    // No server has been deleted
+    expect(Object.keys(store.getState().servers)).toHaveLength(1);
  });

  it('deletes server when clicking accept button', async () => {
-    const { user } = setUp();
+    const { user, store } = setUp();

-    expect(deleteServerMock).not.toHaveBeenCalled();
+    expect(Object.keys(store.getState().servers)).toHaveLength(1);
    await user.click(screen.getByRole('button', { name: 'Delete' }));
-    expect(deleteServerMock).toHaveBeenCalledOnce();
+    expect(Object.keys(store.getState().servers)).toHaveLength(0);
  });
 });
--- a/test/servers/EditServer.test.tsx
+++ b/test/servers/EditServer.test.tsx
@ -1,30 +1,34 @@
-import { fireEvent, screen } from '@testing-library/react';
+import { fireEvent, screen, waitFor } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { createMemoryHistory } from 'history';
 import { Router } from 'react-router';
 import type { ReachableServer, SelectedServer } from '../../src/servers/data';
-import { EditServerFactory } from '../../src/servers/EditServer';
+import { isServerWithId } from '../../src/servers/data';
+import { EditServer } from '../../src/servers/EditServer';
 import { checkAccessibility } from '../__helpers__/accessibility';
-import { renderWithEvents } from '../__helpers__/setUpTest';
+import { renderWithStore } from '../__helpers__/setUpTest';

 describe('<EditServer />', () => {
-  const ServerError = vi.fn();
-  const editServerMock = vi.fn();
  const defaultSelectedServer = fromPartial<ReachableServer>({
    id: 'abc123',
    name: 'the_name',
    url: 'the_url',
    apiKey: 'the_api_key',
  });
-  const EditServer = EditServerFactory(fromPartial({ ServerError }));
  const setUp = (selectedServer: SelectedServer = defaultSelectedServer) => {
    const history = createMemoryHistory({ initialEntries: ['/foo', '/bar'] });
    return {
      history,
-      ...renderWithEvents(
-        <Router location={history.location} navigator={history}>
-          <EditServer editServer={editServerMock} selectedServer={selectedServer} selectServer={vi.fn()} />
+      ...renderWithStore(
+        <Router location={history.location} navigator={history} unstable_useTransitions={false}>
+          <EditServer />
        </Router>,
+        {
+          initialState: {
+            selectedServer,
+            servers: isServerWithId(selectedServer) ? { [selectedServer.id]: selectedServer } : {},
+          },
+        },
      ),
    };
  };
@ -53,7 +57,7 @@ describe('<EditServer />', () => {
  });

  it('edits server and redirects to it when form is submitted', async () => {
-    const { user, history } = setUp();
+    const { user, history, store } = setUp();

    await user.type(screen.getByLabelText(/^Name/), ' edited');
    await user.type(screen.getByLabelText(/^URL/), ' edited');
@ -61,12 +65,10 @@ describe('<EditServer />', () => {
    // await user.click(screen.getByRole('button', { name: 'Save' }));
    fireEvent.submit(screen.getByRole('form'));

-    expect(editServerMock).toHaveBeenCalledWith('abc123', {
+    expect(store.getState().servers[defaultSelectedServer.id]).toEqual(expect.objectContaining({
      name: 'the_name edited',
      url: 'the_url edited',
-      apiKey: 'the_api_key',
-      forwardCredentials: false,
-    });
+    }));

    // After saving we go back, to the first route from history's initialEntries
    expect(history.location.pathname).toEqual('/foo');
@ -75,16 +77,15 @@ describe('<EditServer />', () => {
  it.each([
    { forwardCredentials: true },
    { forwardCredentials: false },
-  ])('edits advanced options - forward credentials', async (serverPartial) => {
-    const { user } = setUp({ ...defaultSelectedServer, ...serverPartial });
+  ])('edits advanced options - forward credentials', async ({ forwardCredentials }) => {
+    const { user, store } = setUp({ ...defaultSelectedServer, forwardCredentials });

    await user.click(screen.getByText('Advanced options'));
    await user.click(screen.getByLabelText('Forward credentials to this server on every request.'));
-
    fireEvent.submit(screen.getByRole('form'));

-    expect(editServerMock).toHaveBeenCalledWith('abc123', expect.objectContaining({
-      forwardCredentials: !serverPartial.forwardCredentials,
-    }));
+    await waitFor(() => expect(store.getState().servers[defaultSelectedServer.id]).toEqual(expect.objectContaining({
+      forwardCredentials: !forwardCredentials,
+    })));
  });
 });
--- a/test/servers/ManageServers.test.tsx
+++ b/test/servers/ManageServers.test.tsx
@ -2,28 +2,25 @@ import { screen, waitFor } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { MemoryRouter } from 'react-router';
 import type { ServersMap, ServerWithId } from '../../src/servers/data';
-import { ManageServersFactory } from '../../src/servers/ManageServers';
+import { ManageServers } from '../../src/servers/ManageServers';
 import type { ServersExporter } from '../../src/servers/services/ServersExporter';
 import { checkAccessibility } from '../__helpers__/accessibility';
-import { renderWithEvents } from '../__helpers__/setUpTest';
+import { renderWithStore } from '../__helpers__/setUpTest';

 describe('<ManageServers />', () => {
  const exportServers = vi.fn();
  const serversExporter = fromPartial<ServersExporter>({ exportServers });
  const useTimeoutToggle = vi.fn().mockReturnValue([false, vi.fn()]);
-  const ManageServers = ManageServersFactory(fromPartial({
-    ServersExporter: serversExporter,
-    ImportServersBtn: () => <span>ImportServersBtn</span>,
-    useTimeoutToggle,
-    ManageServersRow: ({ hasAutoConnect }: { hasAutoConnect: boolean }) => (
-      <tr><td>ManageServersRow {hasAutoConnect ? '[YES]' : '[NO]'}</td></tr>
-    ),
-  }));
  const createServerMock = (value: string, autoConnect = false) => fromPartial<ServerWithId>(
    { id: value, name: value, url: value, autoConnect },
  );
-  const setUp = (servers: ServersMap = {}) => renderWithEvents(
-    <MemoryRouter><ManageServers servers={servers} /></MemoryRouter>,
+  const setUp = (servers: ServersMap = {}) => renderWithStore(
+    <MemoryRouter>
+      <ManageServers useTimeoutToggle={useTimeoutToggle} ServersExporter={serversExporter} />
+    </MemoryRouter>,
+    {
+      initialState: { servers },
+    },
  );

  it('passes a11y checks', () => checkAccessibility(setUp({
@ -42,20 +39,22 @@ describe('<ManageServers />', () => {
      await user.clear(screen.getByPlaceholderText('Search...'));
      await user.type(screen.getByPlaceholderText('Search...'), searchTerm);
    };
+    // Add one for the header row
+    const expectRows = (amount: number) => expect(screen.getAllByRole('row')).toHaveLength(amount + 1);

-    expect(screen.getAllByText(/^ManageServersRow/)).toHaveLength(3);
+    expectRows(3);
    expect(screen.queryByText('No servers found.')).not.toBeInTheDocument();

    await search('foo');
-    await waitFor(() => expect(screen.getAllByText(/^ManageServersRow/)).toHaveLength(1));
+    await waitFor(() => expectRows(1));
    expect(screen.queryByText('No servers found.')).not.toBeInTheDocument();

    await search('Ba');
-    await waitFor(() => expect(screen.getAllByText(/^ManageServersRow/)).toHaveLength(2));
+    await waitFor(() => expectRows(2));
    expect(screen.queryByText('No servers found.')).not.toBeInTheDocument();

    await search('invalid');
-    await waitFor(() => expect(screen.queryByText(/^ManageServersRow/)).not.toBeInTheDocument());
+    await waitFor(() => expectRows(1));
    expect(screen.getByText('No servers found.')).toBeInTheDocument();
  });

@ -67,11 +66,9 @@ describe('<ManageServers />', () => {

    expect(screen.getAllByRole('columnheader')).toHaveLength(expectedCols);
    if (server.autoConnect) {
-      expect(screen.getByText(/\[YES]/)).toBeInTheDocument();
-      expect(screen.queryByText(/\[NO]/)).not.toBeInTheDocument();
+      expect(screen.getByTestId('auto-connect')).toBeInTheDocument();
    } else {
-      expect(screen.queryByText(/\[YES]/)).not.toBeInTheDocument();
-      expect(screen.getByText(/\[NO]/)).toBeInTheDocument();
+      expect(screen.queryByTestId('auto-connect')).not.toBeInTheDocument();
    }
  });

--- a/test/servers/ManageServersRow.test.tsx
+++ b/test/servers/ManageServersRow.test.tsx
@ -1,22 +1,19 @@
 import { Table } from '@shlinkio/shlink-frontend-kit';
-import { render, screen } from '@testing-library/react';
-import { fromPartial } from '@total-typescript/shoehorn';
+import { screen } from '@testing-library/react';
 import { MemoryRouter } from 'react-router';
 import type { ServerWithId } from '../../src/servers/data';
-import { ManageServersRowFactory } from '../../src/servers/ManageServersRow';
+import { ManageServersRow } from '../../src/servers/ManageServersRow';
 import { checkAccessibility } from '../__helpers__/accessibility';
+import { renderWithStore } from '../__helpers__/setUpTest';

 describe('<ManageServersRow />', () => {
-  const ManageServersRow = ManageServersRowFactory(fromPartial({
-    ManageServersRowDropdown: () => <span>ManageServersRowDropdown</span>,
-  }));
  const server: ServerWithId = {
    name: 'My server',
    url: 'https://example.com',
    apiKey: '123',
    id: 'abc',
  };
-  const setUp = (hasAutoConnect = false, autoConnect = false) => render(
+  const setUp = (hasAutoConnect = false, autoConnect = false) => renderWithStore(
    <MemoryRouter>
      <Table header={<Table.Row />}>
        <ManageServersRow server={{ ...server, autoConnect }} hasAutoConnect={hasAutoConnect} />
@ -34,9 +31,9 @@ describe('<ManageServersRow />', () => {
    expect(screen.getAllByRole('cell')).toHaveLength(expectedCols);
  });

-  it('renders a dropdown', () => {
+  it('renders an options dropdown', () => {
    setUp();
-    expect(screen.getByText('ManageServersRowDropdown')).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'Options' })).toBeInTheDocument();
  });

  it.each([
--- a/test/servers/ManageServersRowDropdown.test.tsx
+++ b/test/servers/ManageServersRowDropdown.test.tsx
@ -3,23 +3,22 @@ import type { UserEvent } from '@testing-library/user-event';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { MemoryRouter } from 'react-router';
 import type { ServerWithId } from '../../src/servers/data';
-import { ManageServersRowDropdownFactory } from '../../src/servers/ManageServersRowDropdown';
+import { ManageServersRowDropdown } from '../../src/servers/ManageServersRowDropdown';
 import { checkAccessibility } from '../__helpers__/accessibility';
-import { renderWithEvents } from '../__helpers__/setUpTest';
+import { renderWithStore } from '../__helpers__/setUpTest';

 describe('<ManageServersRowDropdown />', () => {
-  const ManageServersRowDropdown = ManageServersRowDropdownFactory(fromPartial({
-    DeleteServerModal: ({ open }: { open: boolean }) => (
-      <span>DeleteServerModal {open ? '[OPEN]' : '[CLOSED]'}</span>
-    ),
-  }));
-  const setAutoConnect = vi.fn();
  const setUp = (autoConnect = false) => {
    const server = fromPartial<ServerWithId>({ id: 'abc123', autoConnect });
-    return renderWithEvents(
+    return renderWithStore(
      <MemoryRouter>
-        <ManageServersRowDropdown setAutoConnect={setAutoConnect} server={server} />
+        <ManageServersRowDropdown server={server} />
      </MemoryRouter>,
+      {
+        initialState: {
+          servers: { [server.id]: server },
+        },
+      },
    );
  };
  const toggleDropdown = (user: UserEvent) => user.click(screen.getByRole('button'));
@ -44,26 +43,24 @@ describe('<ManageServersRowDropdown />', () => {
    expect(screen.getByRole('menuitem', { name: 'Edit server' })).toHaveAttribute('href', '/server/abc123/edit');
  });

-  it('allows toggling auto-connect', async () => {
-    const { user } = setUp();
+  it.each([true, false])('allows toggling auto-connect', async (autoConnect) => {
+    const { user, store } = setUp(autoConnect);

-    expect(setAutoConnect).not.toHaveBeenCalled();
    await toggleDropdown(user);
-    await user.click(screen.getByRole('menuitem', { name: 'Auto-connect' }));
-    expect(setAutoConnect).toHaveBeenCalledWith(expect.objectContaining({ id: 'abc123' }), true);
+    await user.click(screen.getByRole('menuitem', { name: autoConnect ? 'Do not auto-connect' : 'Auto-connect' }));
+
+    expect(Object.values(store.getState().servers)[0].autoConnect).toEqual(!autoConnect);
  });

  it('renders deletion modal', async () => {
    const { user } = setUp();

-    expect(screen.queryByText('DeleteServerModal [OPEN]')).not.toBeInTheDocument();
-    expect(screen.getByText('DeleteServerModal [CLOSED]')).toBeInTheDocument();
+    expect(screen.queryByRole('dialog')).not.toBeInTheDocument();

    await toggleDropdown(user);
    await user.click(screen.getByRole('menuitem', { name: 'Remove server' }));

-    expect(screen.getByText('DeleteServerModal [OPEN]')).toBeInTheDocument();
-    expect(screen.queryByText('DeleteServerModal [CLOSED]')).not.toBeInTheDocument();
+    expect(screen.getByRole('dialog')).toBeInTheDocument();
  });

  it.each([[true], [false]])('renders expected size and icon', (autoConnect) => {
--- a/test/servers/ServersDropdown.test.tsx
+++ b/test/servers/ServersDropdown.test.tsx
@ -4,7 +4,7 @@ import { MemoryRouter } from 'react-router';
 import type { ServersMap } from '../../src/servers/data';
 import { ServersDropdown } from '../../src/servers/ServersDropdown';
 import { checkAccessibility } from '../__helpers__/accessibility';
-import { renderWithEvents } from '../__helpers__/setUpTest';
+import { renderWithStore } from '../__helpers__/setUpTest';

 describe('<ServersDropdown />', () => {
  const fallbackServers: ServersMap = {
@ -12,12 +12,15 @@ describe('<ServersDropdown />', () => {
    '2b': fromPartial({ name: 'bar', id: '2b' }),
    '3c': fromPartial({ name: 'baz', id: '3c' }),
  };
-  const setUp = (servers: ServersMap = fallbackServers) => renderWithEvents(
+  const setUp = (servers: ServersMap = fallbackServers) => renderWithStore(
    <MemoryRouter>
      <ul role="menu">
-        <ServersDropdown servers={servers} selectedServer={null} />
+        <ServersDropdown />
      </ul>
    </MemoryRouter>,
+    {
+      initialState: { selectedServer: null, servers },
+    },
  );

  it('passes a11y checks', async () => {
--- a/test/servers/snapshots/ManageServersRow.test.tsx.snap
+++ b/test/servers/snapshots/ManageServersRow.test.tsx.snap
@ -27,13 +27,12 @@ exports[`<ManageServersRow /> > renders auto-connect icon only if server is auto
            class="svg-inline--fa fa-check text-lm-brand dark:text-dm-brand"
            data-icon="check"
            data-prefix="fas"
-            focusable="false"
+            data-testid="auto-connect"
            role="img"
            viewBox="0 0 448 512"
-            xmlns="http://www.w3.org/2000/svg"
          >
            <path
-              d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"
+              d="M434.8 70.1c14.3 10.4 17.5 30.4 7.1 44.7l-256 352c-5.5 7.6-14 12.3-23.4 13.1s-18.5-2.7-25.1-9.3l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0l101.5 101.5 234-321.7c10.4-14.3 30.4-17.5 44.7-7.1z"
              fill="currentColor"
            />
          </svg>
@ -58,9 +57,32 @@ exports[`<ManageServersRow /> > renders auto-connect icon only if server is auto
        <td
          class="border-lm-border dark:border-dm-border p-2 block lg:table-cell not-last:border-b-1 lg:border-b-1 before:lg:hidden before:content-[attr(data-column)] before:font-bold before:mr-1 text-right max-lg:absolute right-0 -top-1 mx-lg:pt-0"
        >
-          <span>
-            ManageServersRowDropdown
-          </span>
+          <div
+            class="relative inline-block"
+          >
+            <button
+              aria-controls="_r_o_"
+              aria-expanded="false"
+              aria-haspopup="true"
+              aria-label="Options"
+              class="flex items-center rounded-md focus-ring cursor-pointer border border-lm-border dark:border-dm-border bg-lm-primary dark:bg-dm-primary group-[&]/card:bg-lm-input group-[&]/card:dark:bg-dm-input px-3 py-1.5 gap-x-2"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="svg-inline--fa fa-ellipsis-vertical fa-width-auto"
+                data-icon="ellipsis-vertical"
+                data-prefix="fas"
+                role="img"
+                viewBox="0 0 128 512"
+              >
+                <path
+                  d="M64 144a56 56 0 1 1 0-112 56 56 0 1 1 0 112zm0 224c30.9 0 56 25.1 56 56s-25.1 56-56 56-56-25.1-56-56 25.1-56 56-56zm56-112c0 30.9-25.1 56-56 56s-56-25.1-56-56 25.1-56 56-56 56 25.1 56 56z"
+                  fill="currentColor"
+                />
+              </svg>
+            </button>
+          </div>
        </td>
      </tr>
    </tbody>
@ -110,9 +132,32 @@ exports[`<ManageServersRow /> > renders auto-connect icon only if server is auto
        <td
          class="border-lm-border dark:border-dm-border p-2 block lg:table-cell not-last:border-b-1 lg:border-b-1 before:lg:hidden before:content-[attr(data-column)] before:font-bold before:mr-1 text-right max-lg:absolute right-0 -top-1 mx-lg:pt-0"
        >
-          <span>
-            ManageServersRowDropdown
-          </span>
+          <div
+            class="relative inline-block"
+          >
+            <button
+              aria-controls="_r_t_"
+              aria-expanded="false"
+              aria-haspopup="true"
+              aria-label="Options"
+              class="flex items-center rounded-md focus-ring cursor-pointer border border-lm-border dark:border-dm-border bg-lm-primary dark:bg-dm-primary group-[&]/card:bg-lm-input group-[&]/card:dark:bg-dm-input px-3 py-1.5 gap-x-2"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="svg-inline--fa fa-ellipsis-vertical fa-width-auto"
+                data-icon="ellipsis-vertical"
+                data-prefix="fas"
+                role="img"
+                viewBox="0 0 128 512"
+              >
+                <path
+                  d="M64 144a56 56 0 1 1 0-112 56 56 0 1 1 0 112zm0 224c30.9 0 56 25.1 56 56s-25.1 56-56 56-56-25.1-56-56 25.1-56 56-56zm56-112c0 30.9-25.1 56-56 56s-56-25.1-56-56 25.1-56 56-56 56 25.1 56 56z"
+                  fill="currentColor"
+                />
+              </svg>
+            </button>
+          </div>
        </td>
      </tr>
    </tbody>
--- a/test/servers/snapshots/ManageServersRowDropdown.test.tsx.snap
+++ b/test/servers/snapshots/ManageServersRowDropdown.test.tsx.snap
@ -6,7 +6,7 @@ exports[`<ManageServersRowDropdown /> > renders expected size and icon 1`] = `
    class="relative inline-block"
  >
    <button
-      aria-controls="«r9»"
+      aria-controls="_r_1v_"
      aria-expanded="false"
      aria-haspopup="true"
      aria-label="Options"
@ -15,25 +15,19 @@ exports[`<ManageServersRowDropdown /> > renders expected size and icon 1`] = `
    >
      <svg
        aria-hidden="true"
-        class="svg-inline--fa fa-ellipsis-vertical "
+        class="svg-inline--fa fa-ellipsis-vertical fa-width-auto"
        data-icon="ellipsis-vertical"
        data-prefix="fas"
-        focusable="false"
        role="img"
        viewBox="0 0 128 512"
-        xmlns="http://www.w3.org/2000/svg"
      >
        <path
-          d="M64 360a56 56 0 1 0 0 112 56 56 0 1 0 0-112zm0-160a56 56 0 1 0 0 112 56 56 0 1 0 0-112zM120 96A56 56 0 1 0 8 96a56 56 0 1 0 112 0z"
+          d="M64 144a56 56 0 1 1 0-112 56 56 0 1 1 0 112zm0 224c30.9 0 56 25.1 56 56s-25.1 56-56 56-56-25.1-56-56 25.1-56 56-56zm56-112c0 30.9-25.1 56-56 56s-56-25.1-56-56 25.1-56 56-56 56 25.1 56 56z"
          fill="currentColor"
        />
      </svg>
    </button>
  </div>
-  <span>
-    DeleteServerModal 
-    [CLOSED]
-  </span>
 </div>
 `;

@ -43,7 +37,7 @@ exports[`<ManageServersRowDropdown /> > renders expected size and icon 2`] = `
    class="relative inline-block"
  >
    <button
-      aria-controls="«rb»"
+      aria-controls="_r_23_"
      aria-expanded="false"
      aria-haspopup="true"
      aria-label="Options"
@ -52,24 +46,18 @@ exports[`<ManageServersRowDropdown /> > renders expected size and icon 2`] = `
    >
      <svg
        aria-hidden="true"
-        class="svg-inline--fa fa-ellipsis-vertical "
+        class="svg-inline--fa fa-ellipsis-vertical fa-width-auto"
        data-icon="ellipsis-vertical"
        data-prefix="fas"
-        focusable="false"
        role="img"
        viewBox="0 0 128 512"
-        xmlns="http://www.w3.org/2000/svg"
      >
        <path
-          d="M64 360a56 56 0 1 0 0 112 56 56 0 1 0 0-112zm0-160a56 56 0 1 0 0 112 56 56 0 1 0 0-112zM120 96A56 56 0 1 0 8 96a56 56 0 1 0 112 0z"
+          d="M64 144a56 56 0 1 1 0-112 56 56 0 1 1 0 112zm0 224c30.9 0 56 25.1 56 56s-25.1 56-56 56-56-25.1-56-56 25.1-56 56-56zm56-112c0 30.9-25.1 56-56 56s-56-25.1-56-56 25.1-56 56-56 56 25.1 56 56z"
          fill="currentColor"
        />
      </svg>
    </button>
  </div>
-  <span>
-    DeleteServerModal 
-    [CLOSED]
-  </span>
 </div>
 `;
--- a/test/servers/helpers/ImportServersBtn.test.tsx
+++ b/test/servers/helpers/ImportServersBtn.test.tsx
@ -1,27 +1,22 @@
 import { screen, waitFor } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import type { ServerData, ServersMap, ServerWithId } from '../../../src/servers/data';
-import type {
-  ImportServersBtnProps } from '../../../src/servers/helpers/ImportServersBtn';
-import { ImportServersBtnFactory } from '../../../src/servers/helpers/ImportServersBtn';
+import type { ImportServersBtnProps } from '../../../src/servers/helpers/ImportServersBtn';
+import { ImportServersBtn } from '../../../src/servers/helpers/ImportServersBtn';
 import type { ServersImporter } from '../../../src/servers/services/ServersImporter';
 import { checkAccessibility } from '../../__helpers__/accessibility';
-import { renderWithEvents } from '../../__helpers__/setUpTest';
+import { renderWithStore } from '../../__helpers__/setUpTest';

 describe('<ImportServersBtn />', () => {
  const csvFile = new File([''], 'servers.csv', { type: 'text/csv' });
  const onImportMock = vi.fn();
-  const createServersMock = vi.fn();
  const importServersFromFile = vi.fn().mockResolvedValue([]);
  const serversImporterMock = fromPartial<ServersImporter>({ importServersFromFile });
-  const ImportServersBtn = ImportServersBtnFactory(fromPartial({ ServersImporter: serversImporterMock }));
-  const setUp = (props: Partial<ImportServersBtnProps> = {}, servers: ServersMap = {}) => renderWithEvents(
-    <ImportServersBtn
-      servers={servers}
-      {...props}
-      createServers={createServersMock}
-      onImport={onImportMock}
-    />,
+  const setUp = (props: Partial<ImportServersBtnProps> = {}, servers: ServersMap = {}) => renderWithStore(
+    <ImportServersBtn {...props} onImport={onImportMock} ServersImporter={serversImporterMock} />,
+    {
+      initialState: { servers },
+    },
  );

  it('passes a11y checks', () => checkAccessibility(setUp()));
@ -57,11 +52,8 @@ describe('<ImportServersBtn />', () => {
  it('imports servers when file input changes', async () => {
    const { user } = setUp();

-    const input = screen.getByTestId('csv-file-input');
-    await user.upload(input, csvFile);
-
+    await user.upload(screen.getByTestId('csv-file-input'), csvFile);
    expect(importServersFromFile).toHaveBeenCalledTimes(1);
-    expect(createServersMock).toHaveBeenCalledTimes(1);
  });

  it.each([
@ -78,26 +70,27 @@ describe('<ImportServersBtn />', () => {
      id: 'existingserver-s.test',
    };
    const newServer: ServerData = { name: 'newServer', url: 'http://s.test/newUrl', apiKey: 'newApiKey' };
-    const { user } = setUp({}, { [existingServer.id]: existingServer });
+    const { user, store } = setUp({}, { [existingServer.id]: existingServer });

-    importServersFromFile.mockResolvedValue([existingServer, newServer]);
+    importServersFromFile.mockResolvedValue([existingServerData, newServer]);

    expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
    await user.upload(screen.getByTestId('csv-file-input'), csvFile);

    // Once the file is uploaded, non-duplicated servers are immediately created
-    expect(createServersMock).toHaveBeenCalledExactlyOnceWith([expect.objectContaining(newServer)]);
+    const { servers } = store.getState();
+    expect(Object.keys(servers)).toHaveLength(2);

    expect(screen.getByRole('dialog')).toBeInTheDocument();
    await user.click(screen.getByRole('button', { name: btnName }));

-    // If duplicated servers are saved, there's one extra call
+    // If duplicated servers are saved, there's one extra server creation
    if (savesDuplicatedServers) {
-      expect(createServersMock).toHaveBeenLastCalledWith([expect.objectContaining(existingServerData)]);
+      const { servers } = store.getState();
+      expect(Object.keys(servers)).toHaveLength(3);
    }

    // On import is called only once, no matter what
    expect(onImportMock).toHaveBeenCalledOnce();
-    expect(createServersMock).toHaveBeenCalledTimes(savesDuplicatedServers ? 2 : 1);
  });
 });
--- a/test/servers/helpers/ServerError.test.tsx
+++ b/test/servers/helpers/ServerError.test.tsx
@ -1,16 +1,19 @@
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { MemoryRouter } from 'react-router';
 import type { NonReachableServer, NotFoundServer, SelectedServer } from '../../../src/servers/data';
-import { ServerErrorFactory } from '../../../src/servers/helpers/ServerError';
+import { ServerError } from '../../../src/servers/helpers/ServerError';
 import { checkAccessibility } from '../../__helpers__/accessibility';
+import { renderWithStore } from '../../__helpers__/setUpTest';

 describe('<ServerError />', () => {
-  const ServerError = ServerErrorFactory(fromPartial({ DeleteServerButton: () => null }));
-  const setUp = (selectedServer: SelectedServer) => render(
+  const setUp = (selectedServer: SelectedServer) => renderWithStore(
    <MemoryRouter>
-      <ServerError servers={{}} selectedServer={selectedServer} />
+      <ServerError />
    </MemoryRouter>,
+    {
+      initialState: { selectedServer, servers: {} },
+    },
  );

  it.each([
--- a/test/servers/reducers/remoteServers.test.ts
+++ b/test/servers/reducers/remoteServers.test.ts
@ -79,9 +79,8 @@ describe('remoteServersReducer', () => {
      },
    ])('tries to fetch servers from remote', async ({ serversArray, expectedNewServers }) => {
      jsonRequest.mockResolvedValue(serversArray);
-      const doFetchServers = fetchServers(httpClient);

-      await doFetchServers()(dispatch, vi.fn(), {});
+      await fetchServers(httpClient)(dispatch, vi.fn(), {});

      expect(dispatch).toHaveBeenCalledTimes(3);
      expect(dispatch).toHaveBeenNthCalledWith(2, expect.objectContaining({ payload: expectedNewServers }));
--- a/test/servers/reducers/selectedServer.test.ts
+++ b/test/servers/reducers/selectedServer.test.ts
@ -1,21 +1,19 @@
 import type { ShlinkApiClient } from '@shlinkio/shlink-js-sdk';
 import { fromPartial } from '@total-typescript/shoehorn';
-import type { ShlinkState } from '../../../src/container/types';
 import type { NonReachableServer, NotFoundServer, RegularServer } from '../../../src/servers/data';
 import {
  MAX_FALLBACK_VERSION,
  MIN_FALLBACK_VERSION,
  resetSelectedServer,
-  selectedServerReducerCreator,
-  selectServer as selectServerCreator,
+  selectedServerReducer as reducer,
+  selectServer,
 } from '../../../src/servers/reducers/selectedServer';
+import type { RootState } from '../../../src/store';

 describe('selectedServerReducer', () => {
  const dispatch = vi.fn();
  const health = vi.fn();
-  const buildApiClient = vi.fn().mockReturnValue(fromPartial<ShlinkApiClient>({ health }));
-  const selectServer = selectServerCreator(buildApiClient);
-  const { reducer } = selectedServerReducerCreator(selectServer);
+  const buildShlinkApiClient = vi.fn().mockReturnValue(fromPartial<ShlinkApiClient>({ health }));

  describe('reducer', () => {
    it('returns default when action is RESET_SELECTED_SERVER', () =>
@ -23,7 +21,7 @@ describe('selectedServerReducer', () => {

    it('returns selected server when action is SELECT_SERVER', () => {
      const payload = fromPartial<RegularServer>({ id: 'abc123' });
-      expect(reducer(null, selectServer.fulfilled(payload, '', ''))).toEqual(payload);
+      expect(reducer(null, selectServer.fulfilled(payload, '', { serverId: '', buildShlinkApiClient }))).toEqual(payload);
    });
  });

@ -50,10 +48,10 @@ describe('selectedServerReducer', () => {

      health.mockResolvedValue({ version: serverVersion });

-      await selectServer(id)(dispatch, getState, {});
+      await selectServer({ serverId: id, buildShlinkApiClient })(dispatch, getState, {});

      expect(getState).toHaveBeenCalledTimes(1);
-      expect(buildApiClient).toHaveBeenCalledTimes(1);
+      expect(buildShlinkApiClient).toHaveBeenCalledTimes(1);
      expect(dispatch).toHaveBeenCalledTimes(3); // "Pending", "reset" and "fulfilled"
      expect(dispatch).toHaveBeenLastCalledWith(expect.objectContaining({ payload: expectedSelectedServer }));
    });
@ -65,7 +63,7 @@ describe('selectedServerReducer', () => {

      health.mockRejectedValue({});

-      await selectServer(id)(dispatch, getState, {});
+      await selectServer({ serverId: id, buildShlinkApiClient })(dispatch, getState, {});

      expect(health).toHaveBeenCalled();
      expect(dispatch).toHaveBeenLastCalledWith(expect.objectContaining({ payload: expectedSelectedServer }));
@ -73,10 +71,10 @@ describe('selectedServerReducer', () => {

    it('dispatches error when server is not found', async () => {
      const id = crypto.randomUUID();
-      const getState = vi.fn(() => fromPartial<ShlinkState>({ servers: {} }));
+      const getState = vi.fn(() => fromPartial<RootState>({ servers: {} }));
      const expectedSelectedServer: NotFoundServer = { serverNotFound: true };

-      await selectServer(id)(dispatch, getState, {});
+      await selectServer({ serverId: id, buildShlinkApiClient })(dispatch, getState, {});

      expect(getState).toHaveBeenCalled();
      expect(health).not.toHaveBeenCalled();
--- a/test/settings/Settings.test.tsx
+++ b/test/settings/Settings.test.tsx
@ -1,12 +1,12 @@
-import { render } from '@testing-library/react';
 import { MemoryRouter } from 'react-router';
 import { Settings } from '../../src/settings/Settings';
 import { checkAccessibility } from '../__helpers__/accessibility';
+import { renderWithStore } from '../__helpers__/setUpTest';

 describe('<Settings />', () => {
-  const setUp = () => render(
+  const setUp = () => renderWithStore(
    <MemoryRouter>
-      <Settings settings={{}} setSettings={vi.fn()} />
+      <Settings />
    </MemoryRouter>,
  );

--- a/test/settings/helpers/index.test.ts
+++ b/test/settings/helpers/index.test.ts
@ -1,6 +1,6 @@
 import { fromPartial } from '@total-typescript/shoehorn';
-import type { ShlinkState } from '../../../src/container/types';
 import { migrateDeprecatedSettings } from '../../../src/settings/helpers';
+import type { RootState } from '../../../src/store';

 describe('settings-helpers', () => {
  describe('migrateDeprecatedSettings', () => {
@ -9,7 +9,7 @@ describe('settings-helpers', () => {
    });

    it('updates settings as expected', () => {
-      const state = fromPartial<ShlinkState>({
+      const state = fromPartial<RootState>({
        settings: {
          visits: {
            defaultInterval: 'last180days' as any,
--- a/test/settings/reducers/settings.test.ts
+++ b/test/settings/reducers/settings.test.ts
@ -4,7 +4,7 @@ import { DEFAULT_SHORT_URLS_ORDERING, setSettings, settingsReducer } from '../..

 describe('settingsReducer', () => {
  const realTimeUpdates = { enabled: true };
-  const shortUrlCreation = { validateUrls: false };
+  const shortUrlCreation = {};
  const ui = { theme: 'light' as const };
  const visits = { defaultInterval: 'last30Days' as const };
  const shortUrlsList = { defaultOrdering: DEFAULT_SHORT_URLS_ORDERING };
--- a/vite.config.ts
+++ b/vite.config.ts
@ -1,5 +1,6 @@
 import tailwindcss from '@tailwindcss/vite';
 import react from '@vitejs/plugin-react';
+import { playwright } from '@vitest/browser-playwright';
 import { resolve } from 'path';
 import { VitePWA } from 'vite-plugin-pwa';
 import { defineConfig } from 'vitest/config';
@ -40,7 +41,7 @@ export default defineConfig({
  test: {
    // Run tests in an actual browser
    browser: {
-      provider: 'playwright',
+      provider: playwright(),
      enabled: true,
      headless: true,
      screenshotFailures: false,
@ -63,8 +64,8 @@ export default defineConfig({
      // Required code coverage. Lower than this will make the check fail
      thresholds: {
        statements: 95,
-        branches: 95,
-        functions: 95,
+        branches: 89, // FIXME Increase to 95 again. It dropped after updating to vitest 4
+        functions: 93,
        lines: 95,
      },
    },