diff --git a/.babelrc b/.babelrc
index cdcf92c67..0960c0126 100644
--- a/.babelrc
+++ b/.babelrc
@@ -2,27 +2,5 @@
   "presets": [
     "@babel/preset-env",
     "@babel/preset-react"
-  ],
-  "env": {
-    "test": {
-      "plugins": [
-        "istanbul"
-      ]
-    }
-  },
-  "plugins": [
-    "react-hot-loader/babel",
-    "@babel/plugin-proposal-class-properties",
-    [
-      "module-resolver",
-      {
-        "root": [
-          "./src"
-        ],
-        "alias": {
-          "src": "./src"
-        }
-      }
-    ]
   ]
 }
\ No newline at end of file
diff --git a/.env.example b/.env.example
index 67dd880dd..5afea5b9f 100644
--- a/.env.example
+++ b/.env.example
@@ -1,10 +1,10 @@
 # Required
-API_URL=https://mvj.dev.hel.ninja/v1
-STORAGE_PREFIX=MVJ
+VITE_API_URL=https://mvj.dev.hel.ninja/v1
+VITE_STORAGE_PREFIX=MVJ
 PORT=3000
 # The SSO OpenId Connect settings
-OPENID_CONNECT_API_TOKEN_KEY=https://api.hel.fi/auth/mvj
-OPENID_CONNECT_API_TOKEN_URL=https://api.hel.fi/sso/api-tokens/
-OPENID_CONNECT_AUTHORITY_URL=https://api.hel.fi/sso/openid/
-OPENID_CONNECT_CLIENT_ID=https://api.hel.fi/auth/mvj
-OPENID_CONNECT_SCOPE=openid profile mvj https://api.hel.fi/auth/mvj
\ No newline at end of file
+VITE_OPENID_CONNECT_API_TOKEN_KEY=https://api.hel.fi/auth/mvj
+VITE_OPENID_CONNECT_API_TOKEN_URL=https://api.hel.fi/sso/api-tokens/
+VITE_OPENID_CONNECT_AUTHORITY_URL=https://api.hel.fi/sso/openid/
+VITE_OPENID_CONNECT_CLIENT_ID=https://api.hel.fi/auth/mvj
+VITE_OPENID_CONNECT_SCOPE=openid profile mvj https://api.hel.fi/auth/mvj
\ No newline at end of file
diff --git a/.eslintrc b/.eslintrc
deleted file mode 100644
index 7329cae38..000000000
--- a/.eslintrc
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "extends": [
-    "eslint:recommended",
-    "plugin:react/recommended"
-  ],
-  "env": {
-    "browser": true,
-    "es6": true,
-    "mocha": true,
-    "node": true
-  },
-  "globals": {
-    "Generator": true,
-    "__DEV__": true
-  },
-  "parser": "@babel/eslint-parser",
-  "rules": {
-    "comma-dangle": [2, "always-multiline"],
-    "comma-spacing": 2,
-    "display-name": 0,
-    "eol-last": [2, "always"],
-    "indent": [2, 2, {"SwitchCase":1}],
-    "key-spacing": ["error"],
-    "no-console": 0,
-    "no-multiple-empty-lines": 2,
-    "object-curly-spacing": [2, "never"],
-    "quotes": [2, "single", {"avoidEscape": true, "allowTemplateLiterals": true}],
-    "semi": [2, "always"],
-    "react/display-name": "off",
-    "react/no-find-dom-node": "off",
-    "no-case-declarations": "off"
-  },
-  "plugins": [
-    "react"
-  ],
-  "settings": {
-    "react": {
-      "version": "detect"
-    }
-  }
-}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b529bf71f..fafe58384 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,5 +22,5 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
     - run: yarn
-    - run: yarn test:coverage
-    - run: yarn compile
\ No newline at end of file
+    - run: yarn coverage
+    - run: yarn build
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index 1394b3b0f..0d39b83d4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 City of Helsinki
+Copyright (c) 2024 City of Helsinki
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 04cd9c201..a7f22fac4 100644
--- a/README.md
+++ b/README.md
@@ -4,24 +4,19 @@
 
 
 # MVJ UI
-City of Helsinki ground rental system UI
+City of Helsinki Land lease UI
 
-Based on [React Boilerplate](https://github.com/nordsoftware/react-boilerplate).
 
 ## What's in the box?
 
-- [Flowtype](https://flowtype.org/) Type checker
+- [Typescript](https://www.typescriptlang.org/) Type checker
 - [Yarn](https://yarnpkg.com/) Dependency manager
+- [Vite](https://vitejs.dev/) Front-end tooling
+- [Vitest](https://vitest.dev/) Testing framework
 - [React](https://facebook.github.io/react/) User interface components
 - [Redux](http://redux.js.org/) Predictable state container
 - [Lodash](https://lodash.com/) Utility library
-- [Babel](https://babeljs.io/) ES.Next transpiler
 - [Eslint](http://eslint.org/) Linting utility
-- [Webpack](https://webpack.github.io/) Module bundler
-- [Mocha](https://mochajs.org/) Testing framework
-- [Chai](http://chaijs.com/) Assertion library
-- [Enzyme](https://github.com/airbnb/enzyme) React testing utilities
-- And more...
 
 ## Usage with Docker
 
@@ -54,32 +49,23 @@ Make sure you have [Yarn](https://yarnpkg.com/en/docs/install) installed globall
 ```bash
 yarn
 ```
-#### 3. Setup Flow typing definitions for dependencies
 
-```bash
-flow-typed install
-```
-If the tool cannot be found as is, you can invoke it from
-the node binary folder manually (i.e.
-`./node_modules/.bin/flow-typed`) instead of just
-`flow-typed`).
-
-#### 4. Add .env file
+#### 3. Add .env file
 
 ```bash
 cp .env.example .env
 ```
 
-#### 5. Start the development server
+#### 4. Start the development server
 
 ```bash
 yarn start
 ```
 
-#### 6. Compile the distribution build
+#### 5. Compile the distribution build
 
 ```bash
-yarn run compile
+yarn run build
 ```
 ## Test
 
@@ -91,12 +77,12 @@ yarn test
 
 #### Run the test suit in watch mode
 
-```
+```bash
 yarn run test:watch
 ```
 
 #### Generate the test coverage report
 
-```
+```bash
 yarn run test:coverage
 ```
diff --git a/config/env.js b/config/env.js
deleted file mode 100644
index 0b340c861..000000000
--- a/config/env.js
+++ /dev/null
@@ -1,57 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const paths = require('./paths');
-
-// Make sure that including paths.js after env.js will read .env variables.
-delete require.cache[require.resolve('./paths')];
-
-const NODE_ENV = process.env.NODE_ENV;
-if (!NODE_ENV) {
-  throw new Error(
-    'The NODE_ENV environment variable is required but was not specified.'
-  );
-}
-
-// https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
-var dotenvFiles = [
-  paths.dotenv,
-].filter(Boolean);
-
-// Load environment variables from .env* files. Suppress warnings using silent
-// if this file is missing. dotenv will never modify any environment variables
-// that have already been set.
-// https://github.com/motdotla/dotenv
-dotenvFiles.forEach(dotenvFile => {
-  if (fs.existsSync(dotenvFile)) {
-    require('dotenv').config({
-      path: dotenvFile,
-    });
-  }
-});
-
-function getClientEnvironment() {
-  const raw = Object.keys(process.env)
-    .reduce(
-      (env, key) => {
-        env[key] = process.env[key];
-        return env;
-      },
-      {
-        // Useful for determining whether we’re running in production mode.
-        // Most importantly, it switches React into the correct mode.
-        NODE_ENV: process.env.NODE_ENV || 'development',
-      }
-    );
-  // Stringify all values so we can feed into Webpack DefinePlugin
-  const stringified = {
-    'process.env': Object.keys(raw).reduce((env, key) => {
-      env[key] = JSON.stringify(raw[key]);
-      return env;
-    }, {}),
-  };
-
-  return {raw, stringified};
-}
-
-module.exports = getClientEnvironment;
diff --git a/config/paths.js b/config/paths.js
deleted file mode 100644
index fc0fe22d6..000000000
--- a/config/paths.js
+++ /dev/null
@@ -1,58 +0,0 @@
-'use strict';
-
-const path = require('path');
-const fs = require('fs');
-const url = require('url');
-
-// Make sure any symlinks in the project folder are resolved:
-// https://github.com/facebookincubator/create-react-app/issues/637
-const appDirectory = fs.realpathSync(process.cwd());
-const resolveApp = relativePath => path.resolve(appDirectory, relativePath);
-
-const envPublicUrl = process.env.PUBLIC_URL;
-
-function ensureSlash(path, needsSlash) {
-  const hasSlash = path.endsWith('/');
-  if (hasSlash && !needsSlash) {
-    return path.substr(path, path.length - 1);
-  } else if (!hasSlash && needsSlash) {
-    return `${path}/`;
-  } else {
-    return path;
-  }
-}
-
-
-const getPublicUrl = appPackageJson =>
-  envPublicUrl || require(appPackageJson).homepage;
-
-// We use `PUBLIC_URL` environment variable or "homepage" field to infer
-// "public path" at which the app is served.
-// Webpack needs to know it to put the right <script> hrefs into HTML even in
-// single-page apps that may serve index.html for nested URLs like /todos/42.
-// We can't use a relative path in HTML because we don't want to load something
-// like /todos/42/static/js/bundle.7289d.js. We have to know the root.
-function getServedPath(appPackageJson) {
-  const publicUrl = getPublicUrl(appPackageJson);
-  const servedUrl =
-    envPublicUrl || (publicUrl ? url.parse(publicUrl).pathname : '/');
-  return ensureSlash(servedUrl, true);
-}
-
-
-// config after eject: we're in ./config/
-module.exports = {
-  dotenv: resolveApp('.env'),
-  appBuild: resolveApp('dist'),
-  appHtml: resolveApp('src/index.html'),
-  appIndexJs: resolveApp('src/index.ts'),
-  appScss: resolveApp('src/main.scss'),
-  silentRenewJs: resolveApp('src/silent_renew.ts'),
-  silentRenewHtml: resolveApp('src/silent_renew.html'),
-  appPackageJson: resolveApp('package.json'),
-  appSrc: resolveApp('src'),
-  yarnLockFile: resolveApp('yarn.lock'),
-  appNodeModules: resolveApp('node_modules'),
-  publicUrl: getPublicUrl(resolveApp('package.json')),
-  servedPath: getServedPath(resolveApp('package.json')),
-};
diff --git a/config/polyfills.js b/config/polyfills.js
deleted file mode 100644
index 7b5be436c..000000000
--- a/config/polyfills.js
+++ /dev/null
@@ -1,19 +0,0 @@
-'use strict';
-
-if (typeof Promise === 'undefined') {
-  // Rejection tracking prevents a common issue where React gets into an
-  // inconsistent state due to an error, but it gets swallowed by a Promise,
-  // and the user has no idea what causes React's erratic future behavior.
-  require('promise/lib/rejection-tracking').enable();
-  window.Promise = require('promise/lib/es6-extensions.js');
-}
-
-// fetch() polyfill for making API calls.
-require('whatwg-fetch');
-
-// babel polyfills
-require('@babel/polyfill');
-
-// Object.assign() is commonly used with React.
-// It will use the native implementation if it's present and isn't buggy.
-Object.assign = require('object-assign');
diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js
deleted file mode 100644
index 85ab5f168..000000000
--- a/config/webpack.config.dev.js
+++ /dev/null
@@ -1,166 +0,0 @@
-'use strict';
-
-const path = require('path');
-const webpack = require('webpack');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin');
-const getClientEnvironment = require('./env');
-const paths = require('./paths');
-
-// Webpack uses `publicPath` to determine where the app is being served from.
-// In development, we always serve from the root. This makes config easier.
-const publicPath = '/';
-
-// Get environment variables to inject into our app.
-const env = getClientEnvironment();
-// This is the development configuration.
-// It is focused on developer experience and fast rebuilds.
-// The production configuration is different and lives in a separate file.
-module.exports = {
-  mode: 'development',
-  // You may want 'eval' instead if you prefer to see the compiled output in DevTools.
-  // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.
-  devtool: 'cheap-module-source-map',
-
-  // These are the "entry points" to our application.
-  // This means they will be the "root" imports that are included in JS bundle.
-  // The first two entry points enable "hot" CSS and auto-refreshes for JS.
-  entry: {
-    'app': [
-      require.resolve('react-dev-utils/webpackHotDevClient'),
-      require.resolve('./polyfills'),
-      require.resolve('react-hot-loader/patch'),
-      paths.appIndexJs,
-      paths.appScss,
-    ],
-    'assets/silent_renew': [
-      require.resolve('./polyfills'),
-      paths.silentRenewJs,
-    ],
-
-  },
-  output: {
-    path: paths.appBuild,
-    publicPath: publicPath,
-    filename: '[name].js',
-    sourceMapFilename: '[file].map',
-    chunkFilename: '[id].js',
-  },
-  resolve: {
-    alias: {
-      'react-dom': '@hot-loader/react-dom'
-    },
-    modules: [
-      path.resolve(__dirname, '../src'),
-      'node_modules',
-    ],
-    extensions: ['.ts', '.tsx', '.web.js', '.js', '.json', '.web.jsx', '.jsx'],
-    // Some libraries import Node modules but don't use them in the browser.
-    // Tell Webpack to provide empty mocks for them so importing them works.
-    fallback: {
-      dgram: 'empty',
-      fs: 'empty',
-      net: 'empty',
-      tls: 'empty',
-    }
-  },
-  module: {
-    strictExportPresence: true,
-    rules: [
-      {
-        test: /\.tsx?$/,
-        use: 'ts-loader',
-        exclude: /node_modules/,
-      },
-      {
-        test: /\.(js|jsx)$/,
-        loader: 'babel-loader',
-        include: paths.appSrc,
-        exclude: paths.appNodeModules,
-        options: {
-
-          // This is a feature of `babel-loader` for webpack (not Babel itself).
-          // It enables caching results in ./node_modules/.cache/babel-loader/
-          // directory for faster rebuilds.
-          cacheDirectory: true,
-        },
-      },
-      {
-        test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-        loader: require.resolve('url-loader'),
-        options: {
-          limit: 5000,
-          mimetype: 'application/font-woff',
-        },
-      },
-      {
-        test: /\.[ot]tf?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-        loader: require.resolve('url-loader'),
-        options: {
-          limit: 5000,
-          mimetype: 'application/octet-stream',
-        },
-      },
-      {
-        test: /\.(eot|svg|png|jpe?g)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-        type: 'asset/resource',
-        generator: {
-            filename: '[hash][ext]'
-        },
-      },
-      {
-        test: [
-          /\.scss$/,
-          /\.css$/,
-        ],
-        use: [
-          'style-loader',
-          'css-loader',
-          'sass-loader',
-        ],
-      },
-    ],
-  },
-  plugins: [
-    // Makes some environment variables available to the JS code, for example:
-    // if (process.env.NODE_ENV === 'development') { ... }. See `./env.js`.
-    new webpack.DefinePlugin(env.stringified),
-    // Generates an `index.html` file with the <script> injected.
-    new HtmlWebpackPlugin({
-      template: paths.appHtml,
-      chunks: ['app'],
-    }),
-    // Generates an `silent_renew.html` file with the <script> injected.
-    new HtmlWebpackPlugin({
-      template: 'src/silent_renew.html',
-      filename: 'silent_renew.html',
-      chunks: ['assets/silent_renew'],
-    }),
-
-    // This is necessary to emit hot updates (currently CSS only):
-    new webpack.HotModuleReplacementPlugin(),
-    // Watcher doesn't work well if you mistype casing in a path so we use
-    // a plugin that prints an error when you attempt to do this.
-    // See https://github.com/facebookincubator/create-react-app/issues/240
-    new CaseSensitivePathsPlugin(),
-    // This is a practical solution that requires the user to opt into importing specific locales.
-    // https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
-    // You can remove this if you don't use Moment.js:
-    new webpack.IgnorePlugin({
-      resourceRegExp: /^\.\/locale$/,
-      contextRegExp: /moment$/,
-    }),
-  ],
-
-  // Turn off performance hints during development because we don't do any
-  // splitting or minification in interest of speed. These warnings become
-  // cumbersome.
-  performance: {
-    hints: false,
-  },
-  // Reportedly, this avoids CPU overload on some systems.
-  // https://github.com/facebookincubator/create-react-app/issues/293
-  watchOptions: {
-    ignored: /node_modules/,
-  },
-};
diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
deleted file mode 100644
index 157cea0f3..000000000
--- a/config/webpack.config.prod.js
+++ /dev/null
@@ -1,223 +0,0 @@
-'use strict';
-
-const path = require('path');
-const webpack = require('webpack');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const ManifestPlugin = require('webpack-manifest-plugin');
-const WorkboxWebpackPlugin = require('workbox-webpack-plugin');
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const TerserPlugin = require('terser-webpack-plugin');
-const paths = require('./paths');
-const getClientEnvironment = require('./env');
-
-// Webpack uses `publicPath` to determine where the app is being served from.
-// It requires a trailing slash, or the file assets will get an incorrect path.
-const publicPath = paths.servedPath;
-// Source maps are resource heavy and can cause out of memory issue for large source files.
-const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== 'false';
-// `publicUrl` is just like `publicPath`, but we will provide it to our app
-// as %PUBLIC_URL% in `index.html` and `process.env.PUBLIC_URL` in JavaScript.
-// Omit trailing slash as %PUBLIC_URL%/xyz looks better than %PUBLIC_URL%xyz.
-const publicUrl = publicPath.slice(0, -1);
-// Get environment variables to inject into our app.
-const env = getClientEnvironment(publicUrl);
-
-// Assert this just to be safe.
-// Development builds of React are slow and not intended for production.
-if (env.stringified['process.env'].NODE_ENV !== '"production"') {
-  throw new Error('Production builds must have NODE_ENV=production.');
-}
-
-// This is the production configuration.
-// It compiles slowly and is focused on producing a fast and minimal bundle.
-// The development configuration is different and lives in a separate file.
-module.exports = {
-  mode: 'production',
-  // Don't attempt to continue if there are any errors.
-  bail: true,
-  // We generate sourcemaps in production. This is slow but gives good results.
-  // You can exclude the *.map files from the build during deployment.
-  devtool: shouldUseSourceMap ? 'source-map' : false,
-  // In production, we only want to load the polyfills and the app code.
-  entry: {
-    'app': [
-      require.resolve('./polyfills'),
-      paths.appIndexJs,
-      paths.appScss,
-    ],
-    'assets/silent_renew': [
-      require.resolve('./polyfills'),
-      paths.silentRenewJs,
-    ],
-  },
-  output: {
-    path: paths.appBuild,
-    publicPath: publicPath,
-    filename: '[name].[chunkhash:8].js',
-    sourceMapFilename: '[file].map',
-    chunkFilename: '[id].[chunkhash:8].js',
-    // Point sourcemap entries to original disk location (format as URL on Windows)
-    devtoolModuleFilenameTemplate: info =>
-      path
-        .relative(paths.appSrc, info.absoluteResourcePath)
-        .replace(/\\/g, '/'),
-  },
-  resolve: {
-    modules: [
-      path.resolve(__dirname, '../src'),
-      'node_modules',
-    ],
-    extensions: ['.web.js', '.js', '.json', '.web.jsx', '.jsx', '.ts', '.tsx'],
-    // Some libraries import Node modules but don't use them in the browser.
-    // Tell Webpack to provide empty mocks for them so importing them works.
-    fallback: {
-      dgram: 'empty',
-      fs: 'empty',
-      net: 'empty',
-      tls: 'empty',
-    }
-  },
-  module: {
-    strictExportPresence: true,
-    rules: [
-      {
-        test: /\.tsx?$/,
-        use: 'ts-loader',
-        exclude: /node_modules/,
-      },
-      {
-        test: /\.(js|jsx)$/,
-        loader: 'babel-loader',
-        include: paths.appSrc,
-        exclude: paths.appNodeModules,
-        options: {
-
-          // This is a feature of `babel-loader` for webpack (not Babel itself).
-          // It enables caching results in ./node_modules/.cache/babel-loader/
-          // directory for faster rebuilds.
-          cacheDirectory: true,
-        },
-      },
-      {
-        test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-        loader: require.resolve('url-loader'),
-        options: {
-          limit: 5000,
-          mimetype: 'application/font-woff',
-        },
-      },
-      {
-        test: /\.[ot]tf?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-        loader: require.resolve('url-loader'),
-        options: {
-          limit: 5000,
-          mimetype: 'application/octet-stream',
-        },
-      },
-      {
-        test: /\.(eot|svg|png|jpe?g)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-        type: 'asset/resource',
-        generator: {
-            filename: '[hash][ext]'
-        },
-      },
-      {
-        test: [
-          /\.scss$/,
-          /\.css$/,
-        ],
-        use: [
-          MiniCssExtractPlugin.loader,
-          'css-loader',
-          'sass-loader',
-        ],
-      },
-    ],
-  },
-  plugins: [
-    // Generates an `index.html` file with the <script> injected.
-    new HtmlWebpackPlugin({
-      inject: true,
-      template: paths.appHtml,
-      chunks: ['app'],
-      minify: {
-        removeComments: true,
-        collapseWhitespace: true,
-        removeRedundantAttributes: true,
-        useShortDoctype: true,
-        removeEmptyAttributes: true,
-        removeStyleLinkTypeAttributes: true,
-        keepClosingSlash: true,
-        minifyJS: true,
-        minifyCSS: true,
-        minifyURLs: true,
-      },
-    }),
-    new HtmlWebpackPlugin({
-      inject: true,
-      template: paths.silentRenewHtml,
-      filename: 'silent_renew.html',
-      chunks: ['assets/silent_renew'],
-      minify: {
-        removeComments: true,
-        collapseWhitespace: true,
-        removeRedundantAttributes: true,
-        useShortDoctype: true,
-        removeEmptyAttributes: true,
-        removeStyleLinkTypeAttributes: true,
-        keepClosingSlash: true,
-        minifyJS: true,
-        minifyCSS: true,
-        minifyURLs: true,
-      },
-    }),
-    // Makes some environment variables available to the JS code, for example:
-    // if (process.env.NODE_ENV === 'production') { ... }. See `./env.js`.
-    // It is absolutely essential that NODE_ENV was set to production here.
-    // Otherwise React will be compiled in the very slow development mode.
-    new webpack.DefinePlugin(env.stringified),
-    new webpack.LoaderOptionsPlugin({
-      minimize: true,
-    }),
-    new MiniCssExtractPlugin({
-      filename: '[name][contenthash:8].css',
-    }),
-    // Generate a manifest file which contains a mapping of all asset filenames
-    // to their corresponding output file so that tools can pick it up without
-    // having to parse `index.html`.
-    new ManifestPlugin.WebpackManifestPlugin({
-      fileName: 'asset-manifest.json',
-    }),
-    // Generate a service worker script that will precache, and keep up to date,
-    // the HTML & assets that are part of the Webpack build.
-    new WorkboxWebpackPlugin.GenerateSW({
-      clientsClaim: true,
-      exclude: [/\.map$/, /asset-manifest\.json$/],
-      navigateFallback: publicUrl + '/index.html',
-      navigateFallbackDenylist: [
-        // Exclude URLs starting with /_, as they're likely an API call
-        new RegExp('^/_'),
-        // Exclude URLs containing a dot, as they're likely a resource in
-        // public/ and not a SPA route
-        new RegExp('/[^/]+\\.[^/]+$'),
-      ],
-    }),
-    // This is a practical solution that requires the user to opt into importing specific locales.
-    // https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
-    new webpack.IgnorePlugin({
-      resourceRegExp: /^\.\/locale$/,
-      contextRegExp: /moment$/,
-    }),
-  ],
-  optimization: {
-    minimizer: [new TerserPlugin({
-      terserOptions: {
-        warnings: false,
-        output: {
-          comments: false,
-        },
-      },
-      extractComments: false,
-    })],
-  }
-};
diff --git a/config/webpackDevServer.config.js b/config/webpackDevServer.config.js
deleted file mode 100644
index 3df3c2e1b..000000000
--- a/config/webpackDevServer.config.js
+++ /dev/null
@@ -1,52 +0,0 @@
-'use strict';
-
-const errorOverlayMiddleware = require('react-dev-utils/errorOverlayMiddleware');
-const noopServiceWorkerMiddleware = require('react-dev-utils/noopServiceWorkerMiddleware');
-const webpackConfig = require('./webpack.config.dev');
-
-const protocol = process.env.HTTPS === 'true' ? 'https' : 'http';
-const host = process.env.HOST || '0.0.0.0';
-const port = process.env.PORT || 3000;
-
-module.exports = function() {
-  return {
-    allowedHosts: ['localhost', '0.0.0.0', '127.0.0.1'],
-    // Enable gzip compression of generated files.
-    compress: true,
-    // By default files from `contentBase` will not trigger a page reload.
-    static: {
-      directory: webpackConfig.output.path,
-      watch: true,
-    },
-    // Enable HTTPS if the HTTPS environment variable is set to 'true'
-    https: protocol === 'https',
-    host: host,
-    client: { 
-      logging: 'none',
-      overlay: false,
-    },
-    open: true,
-    devMiddleware: {
-      publicPath: webpackConfig.output.publicPath,
-    },
-    historyApiFallback: {
-      // Paths with dots should still use the history fallback.
-      // See https://github.com/facebookincubator/create-react-app/issues/387.
-      disableDotRule: true,
-    },
-    host: host,
-    port: port,
-    //proxy,
-    setupMiddlewares: function(middlewares) {
-      // This lets us open files from the runtime error overlay.
-      middlewares.unshift(errorOverlayMiddleware());
-      // This service worker file is effectively a 'no-op' that will reset any
-      // previous service worker registered for the same host:port combination.
-      // We do this in development to avoid hitting the production cache if
-      // it used the same host and port.
-      // https://github.com/facebookincubator/create-react-app/issues/2272#issuecomment-302832432
-      middlewares.unshift(noopServiceWorkerMiddleware(webpackConfig.output.publicPath));
-      return middlewares;
-    },
-  };
-};
diff --git a/defs/react-leaflet.js b/defs/react-leaflet.js
deleted file mode 100644
index 308f1df37..000000000
--- a/defs/react-leaflet.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'react-leaflet' {
-  declare module.exports: any;
-}
diff --git a/defs/redux-actions.js b/defs/redux-actions.js
deleted file mode 100644
index eb7b5e733..000000000
--- a/defs/redux-actions.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// @flow
-
-declare module 'redux-actions' {
-  declare function createAction<Type: string, Payload>(
-    type: Type
-  ): (payload: Payload) => {type: Type, payload: Payload}
-
-  declare function handleActions<State>(
-    reducerMap: {[key: string]: (state: State, action: any) => State},
-    defaultState: State
-  ): (state: State, action: any) => State
-
-  declare module.exports: {
-    createAction: typeof createAction,
-    handleActions: typeof handleActions
-  }
-}
diff --git a/eslint.config.mjs b/eslint.config.mjs
new file mode 100644
index 000000000..ffd8d296e
--- /dev/null
+++ b/eslint.config.mjs
@@ -0,0 +1,20 @@
+import globals from "globals";
+import pluginJs from "@eslint/js";
+import tseslint from "typescript-eslint";
+import pluginReact from "eslint-plugin-react";
+
+export default [
+  pluginJs.configs.recommended,
+  ...tseslint.configs.recommended,
+  pluginReact.configs.flat.recommended,
+  {
+    settings: {
+      react: { version: "detect" }
+    },
+    languageOptions: { globals: globals.browser },
+    files: ["src/**/*.{js,mjs,cjs,ts,jsx,tsx}"],
+    rules: {
+      "@typescript-eslint/no-explicit-any": "off"
+    }
+  }
+];
diff --git a/src/index.html b/index.html
similarity index 68%
rename from src/index.html
rename to index.html
index 9a3aae61d..b84288c22 100644
--- a/src/index.html
+++ b/index.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
-<html lang='fi'>
+<html lang="fi">
 <head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>Maanvuokrausjärjestelmä | Helsingin Kaupunki</title>
 </head>
 <body>
 <div id="root"></div>
+<script type="module" src="/src/index.tsx"></script>
 </body>
 </html>
diff --git a/package.json b/package.json
index 94eb3d2a0..ed8909fdf 100644
--- a/package.json
+++ b/package.json
@@ -1,32 +1,26 @@
 {
   "name": "mvj-ui",
   "version": "1.0.0",
-  "description": "City of Helsinki ground rent system UI",
-  "main": "src/index.ts",
+  "description": "City of Helsinki Land lease UI",
+  "main": "src/index.tsx",
   "author": "Jori Lindell <jori.lindell@digia.com>",
   "license": "MIT",
-  "nyc": {
-    "require": [
-      "@babel/register",
-      "./src/test.ts"
-    ],
-    "sourceMap": false,
-    "instrument": false
-  },
+  "type": "module",
   "scripts": {
+    "build": "vite build",
+    "dev": "vite",
     "lint": "eslint src",
-    "serve": "webpack serve",
-    "start": "node scripts/start.js",
-    "compile": "node scripts/compile.js",
+    "start": "vite",
+    "compile": "vite build",
     "precommit": "npm-run-all lint",
     "prepush": "npm-run-all test",
-    "test": "mocha --require @babel/register --require ts-node/register --require tsconfig-paths/register --require src/test.ts \"src/**/*spec.ts\"",
-    "test:coverage": "cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text --require ts-node/register --require tsconfig-paths/register mocha \"src/**/*spec.ts\" --exit",
-    "test:watch": "npm run test -- --watch"
+    "test": "vitest",
+    "coverage": "vitest run --coverage",
+    "test:watch": "vitest watch"
   },
   "dependencies": {
     "classnames": "^2.2.6",
-    "connected-react-router": "^6.5.2",
+    "connected-react-router": "^6.9.3",
     "copy-to-clipboard": "^3.2.0",
     "date-fns": "^2.0.0-beta.4",
     "dotenv": "^8.0.0",
@@ -42,21 +36,20 @@
     "leaflet-zoombox": "^0.5.1",
     "lodash": "^4.17.21",
     "normalize.css": "^8.0.1",
-    "offline-plugin": "^5.0.7",
     "oidc-client": "^1.8.2",
     "proj4": "^2.5.0",
     "proj4leaflet": "^1.0.2",
     "prop-types": "^15.7.2",
-    "react": "16.8.6",
+    "react": "^16.9",
     "react-datepicker": "2.8.0",
-    "react-dom": "16.8.6",
+    "react-dom": "^16.9",
     "react-dual-listbox": "^2.0.0",
-    "react-foundation": "^0.9.6",
+    "react-foundation": "^0.9.7",
     "react-leaflet": "^2.8.0",
     "react-leaflet-draw": "^0.19.0",
-    "react-leaflet-fullscreen": "1.0.1",
+    "react-leaflet-fullscreen": "^1.0.2",
     "react-redux": "^7.1.0",
-    "react-redux-toastr": "^7.5.1",
+    "react-redux-toastr": "^7.6.12",
     "react-resize-detector": "^4.2.0",
     "react-router": "^5.0.1",
     "react-router-dom": "^5.0.1",
@@ -72,68 +65,48 @@
     "whatwg-fetch": "^3.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.9",
+    "@babel/core": "^7.25.2",
     "@babel/eslint-parser": "^7.23.9",
-    "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/polyfill": "^7.12.1",
-    "@babel/preset-env": "^7.5.5",
-    "@babel/preset-react": "^7.23.3",
-    "@babel/register": "^7.23.7",
-    "@hot-loader/react-dom": "17.0.2",
-    "@istanbuljs/nyc-config-typescript": "^1.0.2",
-    "@types/chai": "^4.3.16",
+    "@babel/helper-environment-visitor": "^7.24.7",
+    "@babel/preset-env": "^7.25.3",
+    "@babel/preset-react": "^7.24.7",
+    "@eslint/js": "^9.9.0",
+    "@rollup/plugin-babel": "^6.0.4",
     "@types/history": "^5.0.0",
-    "@types/leaflet": "1.5.23",
+    "@types/leaflet": "^1.5.23",
+    "@types/leaflet-draw": "^1.0.11",
     "@types/lodash": "^4.17.1",
-    "@types/mocha": "^10.0.6",
-    "@types/react": "^18.3.2",
-    "@types/react-dom": "^18.3.0",
+    "@types/proj4leaflet": "^1.0.2",
+    "@types/react": "^16.9.56",
+    "@types/react-dom": "^16.9.24",
+    "@types/react-redux": "^7.1.33",
     "@types/redux-actions": "^2.6.5",
-    "@types/webpack-env": "^1.18.5",
-    "babel-loader": "^9.1.3",
-    "babel-plugin-istanbul": "^6.1.1",
+    "@types/redux-form": "^8.2.5",
+    "@typescript-eslint/parser": "^8.1.0",
+    "@vitejs/plugin-react": "^4.3.1",
+    "@vitest/coverage-istanbul": "^2.0.5",
+    "@vitest/ui": "^2.0.5",
     "babel-plugin-module-resolver": "^5.0.0",
-    "case-sensitive-paths-webpack-plugin": "^2.4.0",
-    "chai": "^4.2.0",
-    "chai-enzyme": "^1.0.0-beta.1",
-    "cheerio": "^1.0.0-rc.3",
-    "clean-webpack-plugin": "^4.0.0",
-    "codecov": "^3.5.0",
     "cross-env": "^5.2.0",
-    "css-loader": "^6.10.0",
-    "debug": "^4.3.4",
-    "enzyme": "^3.10.0",
-    "enzyme-adapter-react-16": "^1.14.0",
-    "eslint": "^8.56.0",
-    "eslint-plugin-react": "^7.14.3",
-    "favicons-webpack-plugin": "^6.0.1",
-    "file-loader": "^6.2.0",
-    "fs-extra": "^11.2.0",
-    "html-webpack-plugin": "^5.6.0",
-    "json-loader": "^0.5.7",
-    "mini-css-extract-plugin": "^2.7.7",
-    "mocha": "^6.2.0",
-    "node-sass": "^8.0.0",
-    "nodemon": "^3.0.3",
+    "eslint": "^8.57.0",
+    "eslint-plugin-react": "^7.35.0",
+    "eslint-plugin-react-hooks": "^4.6.2",
+    "eslint-plugin-react-refresh": "^0.4.7",
+    "globals": "^15.9.0",
+    "jsdom": "^24.1.1",
     "npm-run-all": "^4.1.5",
-    "nyc": "^14.1.1",
-    "react-dev-utils": "^12.0.1",
-    "react-hot-loader": "^4.13.1",
-    "sass-loader": "^14.1.0",
-    "sinon": "^7.3.2",
-    "sinon-chai": "^3.3.0",
-    "style-loader": "^3.3.4",
-    "terser-webpack-plugin": "^5.3.10",
-    "ts-loader": "^9.5.1",
+    "postcss": "^8.4.41",
+    "postcss-url": "^10.1.3",
+    "sass": "^1.77.8",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5.5.4",
-    "url": "^0.11.3",
-    "url-loader": "^4.1.1",
-    "webpack": "^5.9.0",
-    "webpack-dev-server": "^4.15.1",
-    "webpack-hot-middleware": "^2.26.0",
-    "webpack-manifest-plugin": "^5.0.0",
-    "workbox-webpack-plugin": "7.0.0"
+    "typescript-eslint": "^8.1.0",
+    "vite": "^5.3.5",
+    "vite-plugin-commonjs": "^0.10.1",
+    "vitest": "^2.0.5"
+  },
+  "resolutions": {
+    "@types/react": "^16"
   }
 }
diff --git a/scripts/compile.js b/scripts/compile.js
deleted file mode 100644
index 666bb3616..000000000
--- a/scripts/compile.js
+++ /dev/null
@@ -1,127 +0,0 @@
-'use strict';
-
-// Do this as the first thing so that any code reading it knows the right env.
-process.env.BABEL_ENV = 'production';
-process.env.NODE_ENV = 'production';
-
-// Makes the script crash on unhandled rejections instead of silently
-// ignoring them. In the future, promise rejections that are not handled will
-// terminate the Node.js process with a non-zero exit code.
-process.on('unhandledRejection', err => {
-  throw err;
-});
-
-// Ensure environment variables are read.
-require('../config/env');
-
-const path = require('path');
-const chalk = require('chalk');
-const fs = require('fs-extra');
-const webpack = require('webpack');
-const config = require('../config/webpack.config.prod');
-const paths = require('../config/paths');
-const checkRequiredFiles = require('react-dev-utils/checkRequiredFiles');
-const formatWebpackMessages = require('react-dev-utils/formatWebpackMessages');
-const printHostingInstructions = require('react-dev-utils/printHostingInstructions');
-const FileSizeReporter = require('react-dev-utils/FileSizeReporter');
-const printBuildError = require('react-dev-utils/printBuildError');
-
-const measureFileSizesBeforeBuild =
-  FileSizeReporter.measureFileSizesBeforeBuild;
-const printFileSizesAfterBuild = FileSizeReporter.printFileSizesAfterBuild;
-const useYarn = fs.existsSync(paths.yarnLockFile);
-
-// These sizes are pretty large. We'll warn for bundles exceeding them.
-const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
-const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024;
-
-// Warn and crash if required files are missing
-if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs, paths.silentRenewHtml, paths.silentRenewJs])) {
-  process.exit(1);
-}
-
-// First, read the current file sizes in build directory.
-// This lets us display how much they changed later.
-measureFileSizesBeforeBuild(paths.appBuild)
-  .then(previousFileSizes => {
-    // Remove all content but keep the directory so that
-    // if you're in it, you don't end up in Trash
-    fs.emptyDirSync(paths.appBuild);
-    // Start the webpack build
-    return build(previousFileSizes);
-  })
-  .then(
-    ({stats, previousFileSizes, warnings}) => {
-      if (warnings.length) {
-        console.log(chalk.yellow('Compiled with warnings.\n'));
-        console.log(warnings.join('\n\n'));
-        console.log(
-          '\nSearch for the ' +
-            chalk.underline(chalk.yellow('keywords')) +
-            ' to learn more about each warning.'
-        );
-        console.log(
-          'To ignore, add ' +
-            chalk.cyan('// eslint-disable-next-line') +
-            ' to the line before.\n'
-        );
-      } else {
-        console.log(chalk.green('Compiled successfully.\n'));
-      }
-
-      console.log('File sizes after gzip:\n');
-      printFileSizesAfterBuild(
-        stats,
-        previousFileSizes,
-        paths.appBuild,
-        WARN_AFTER_BUNDLE_GZIP_SIZE,
-        WARN_AFTER_CHUNK_GZIP_SIZE
-      );
-      console.log();
-
-      const appPackage = require(paths.appPackageJson);
-      const publicUrl = paths.publicUrl;
-      const publicPath = config.output.publicPath;
-      const buildFolder = path.relative(process.cwd(), paths.appBuild);
-      printHostingInstructions(
-        appPackage,
-        publicUrl,
-        publicPath,
-        buildFolder,
-        useYarn
-      );
-    },
-    err => {
-      console.log(chalk.red('Failed to compile.\n'));
-      printBuildError(err);
-      process.exit(1);
-    }
-  );
-
-// Create the production build and print the deployment instructions.
-function build(previousFileSizes) {
-  console.log('Creating an optimized production build...');
-
-  let compiler = webpack(config);
-  return new Promise((resolve, reject) => {
-    compiler.run((err, stats) => {
-      if (err) {
-        return reject(err);
-      }
-      const messages = formatWebpackMessages(stats.toJson({}, true));
-      if (messages.errors.length) {
-        // Only keep the first error. Others are often indicative
-        // of the same problem, but confuse the reader with noise.
-        if (messages.errors.length > 1) {
-          messages.errors.length = 1;
-        }
-        return reject(new Error(messages.errors.join('\n\n')));
-      }
-      return resolve({
-        stats,
-        previousFileSizes,
-        warnings: messages.warnings,
-      });
-    });
-  });
-}
diff --git a/scripts/start.js b/scripts/start.js
deleted file mode 100644
index 949e993f7..000000000
--- a/scripts/start.js
+++ /dev/null
@@ -1,108 +0,0 @@
-'use strict';
-
-// Do this as the first thing so that any code reading it knows the right env.
-process.env.BABEL_ENV = 'development';
-process.env.NODE_ENV = 'development';
-
-// Makes the script crash on unhandled rejections instead of silently
-// ignoring them. In the future, promise rejections that are not handled will
-// terminate the Node.js process with a non-zero exit code.
-process.on('unhandledRejection', err => {
-  throw err;
-});
-
-// Ensure environment variables are read.
-require('../config/env');
-
-const fs = require('fs');
-const chalk = require('react-dev-utils/chalk');
-const webpack = require('webpack');
-const WebpackDevServer = require('webpack-dev-server');
-const clearConsole = require('react-dev-utils/clearConsole');
-const checkRequiredFiles = require('react-dev-utils/checkRequiredFiles');
-const {
-  choosePort,
-  createCompiler,
-  prepareProxy,
-  prepareUrls,
-} = require('react-dev-utils/WebpackDevServerUtils');
-const openBrowser = require('react-dev-utils/openBrowser');
-const paths = require('../config/paths');
-const config = require('../config/webpack.config.dev');
-const createDevServerConfig = require('../config/webpackDevServer.config');
-
-const useYarn = fs.existsSync(paths.yarnLockFile);
-const isInteractive = process.stdout.isTTY;
-
-// Warn and crash if required files are missing
-if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs, paths.silentRenewHtml, paths.silentRenewJs])) {
-  process.exit(1);
-}
-
-// Tools like Cloud9 rely on this.
-const DEFAULT_PORT = parseInt(process.env.PORT, 10) || 3000;
-const HOST = process.env.HOST || '0.0.0.0';
-
-// We attempt to use the default port but if it is busy, we offer the user to
-// run on a different port. `detect()` Promise resolves to the next free port.
-choosePort(HOST, DEFAULT_PORT)
-  .then(port => {
-    if (port == null) {
-      // We have not found a port.
-      return;
-    }
-    const protocol = process.env.HTTPS === 'true' ? 'https' : 'http';
-    const appName = require(paths.appPackageJson).name;
-    const useTypeScript = true;
-    const urls = prepareUrls(protocol, HOST, port);
-    const devSocket = {
-      warnings: warnings =>
-        devServer.sockWrite(devServer.sockets, 'warnings', warnings),
-      errors: errors =>
-        devServer.sockWrite(devServer.sockets, 'errors', errors),
-    };
-    // Create a webpack compiler that is configured with custom messages.
-    const compiler = createCompiler({
-      appName,
-      config,
-      devSocket,
-      urls,
-      useYarn,
-      useTypeScript,
-      webpack,
-    });
-    // Load proxy config
-    const proxySetting = require(paths.appPackageJson).proxy;
-    const proxyConfig = prepareProxy(proxySetting, paths.appPublic);
-    // Serve webpack assets generated by the compiler over a web sever.
-    const serverConfig = createDevServerConfig(
-      proxyConfig,
-      urls.lanUrlForConfig
-    );
-
-    const devServer = new WebpackDevServer(serverConfig, compiler);
-    // Launch WebpackDevServer.
-    devServer.startCallback((port, HOST, err) => {
-      if (err) {
-        return console.log(err);
-      }
-      if (isInteractive) {
-        clearConsole();
-      }
-      console.log(chalk.cyan('Starting the development server...\n'));
-      openBrowser(urls.localUrlForBrowser);
-    });
-
-    ['SIGINT', 'SIGTERM'].forEach(function(sig) {
-      process.on(sig, function() {
-        devServer.close();
-        process.exit();
-      });
-    });
-  })
-  .catch(err => {
-    if (err && err.message) {
-      console.log(err.message, err);
-    }
-    process.exit(1);
-  });
diff --git a/src/api/ApiErrorModal.tsx b/src/api/ApiErrorModal.tsx
index 8cd98db7f..c4b6be914 100644
--- a/src/api/ApiErrorModal.tsx
+++ b/src/api/ApiErrorModal.tsx
@@ -2,8 +2,8 @@
 import flowRight from "lodash/flowRight";
 import React from "react";
 import { Button } from "react-foundation";
-import { reveal } from "../foundation/reveal";
-import { Sizes } from "../foundation/enums";
+import { reveal } from "@/foundation/reveal";
+import { Sizes } from "@/foundation/enums";
 
 const ApiErrorModal = ({
   data,
diff --git a/src/api/spec.ts b/src/api/api.spec.ts
similarity index 95%
rename from src/api/spec.ts
rename to src/api/api.spec.ts
index 33b497f54..a14eda316 100644
--- a/src/api/spec.ts
+++ b/src/api/api.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { receiveError, clearError } from "./actions";
 import apiReducer from "./reducer";
 import type { ApiState } from "./types";
diff --git a/src/api/callApi.ts b/src/api/callApi.ts
index 85ee74024..64d35f2db 100644
--- a/src/api/callApi.ts
+++ b/src/api/callApi.ts
@@ -1,6 +1,6 @@
 import { call, select } from "redux-saga/effects";
-import { getApiToken } from "auth/selectors";
-import { UI_ACCEPT_LANGUAGE_VALUE } from "api/constants";
+import { getApiToken } from "@/auth/selectors";
+import { UI_ACCEPT_LANGUAGE_VALUE } from "@/api/constants";
 
 function* callApi(request: Request): Generator<any, any, any> {
   const apiToken = yield select(getApiToken);
diff --git a/src/api/callApiAsync.ts b/src/api/callApiAsync.ts
index 685947309..f5a79edec 100644
--- a/src/api/callApiAsync.ts
+++ b/src/api/callApiAsync.ts
@@ -1,6 +1,6 @@
-import { store } from "root/startApp";
-import { getApiToken } from "auth/selectors";
-import { UI_ACCEPT_LANGUAGE_VALUE } from "api/constants";
+import { store } from "@/index";
+import { getApiToken } from "@/auth/selectors";
+import { UI_ACCEPT_LANGUAGE_VALUE } from "@/api/constants";
 import type { ApiSyncResponse } from "./types";
 import type { ApiResponse } from "types";
 
diff --git a/src/api/callUploadRequest.ts b/src/api/callUploadRequest.ts
index 36c5e7d68..e9b28d674 100644
--- a/src/api/callUploadRequest.ts
+++ b/src/api/callUploadRequest.ts
@@ -1,7 +1,7 @@
 import { call, put, select } from "redux-saga/effects";
-import { receiveError } from "api/actions";
-import { getApiToken } from "auth/selectors";
-import { UI_ACCEPT_LANGUAGE_VALUE } from "api/constants";
+import { receiveError } from "@/api/actions";
+import { getApiToken } from "@/auth/selectors";
+import { UI_ACCEPT_LANGUAGE_VALUE } from "@/api/constants";
 
 function* callUploadRequest(request: Request): Generator<any, any, any> {
   const apiToken = yield select(getApiToken);
diff --git a/src/api/createUrl.ts b/src/api/createUrl.ts
index 2d57c79f1..aadeb9967 100644
--- a/src/api/createUrl.ts
+++ b/src/api/createUrl.ts
@@ -1,4 +1,4 @@
 import isArray from "lodash/isArray";
 export const stringifyQuery = (query: Record<string, any>): string => Object.keys(query).map(key => [key, query[key]].map(v => encodeURIComponent(v)).join('=')).join('&');
 export const standardStringifyQuery = (query: Record<string, any>): string => Object.keys(query).map(key => isArray(query[key]) ? [key, query[key].map(v => encodeURIComponent(v)).join(`&${key}=`)].join('=') : [key, query[key]].map(v => encodeURIComponent(v)).join('=')).join('&');
-export default ((url: string, params?: Record<string, any>): string => `${process.env.API_URL || ''}/${url}${params ? `?${stringifyQuery(params)}` : ''}`);
\ No newline at end of file
+export default ((url: string, params?: Record<string, any>): string => `${import.meta.env.VITE_API_URL || ''}/${url}${params ? `?${stringifyQuery(params)}` : ''}`);
\ No newline at end of file
diff --git a/src/api/createUrlWithoutVersionSuffix.ts b/src/api/createUrlWithoutVersionSuffix.ts
index 9f472b730..5dd2bb97a 100644
--- a/src/api/createUrlWithoutVersionSuffix.ts
+++ b/src/api/createUrlWithoutVersionSuffix.ts
@@ -1,4 +1,4 @@
-import { getApiUrlWithOutVersionSuffix } from "util/helpers";
+import { getApiUrlWithOutVersionSuffix } from "@/util/helpers";
 import { stringifyQuery } from "./createUrl";
 export default ((url: string, params?: Record<string, any>) => {
   const apiUrlWithOutVersionSuffix = getApiUrlWithOutVersionSuffix();
diff --git a/src/api/reducer.ts b/src/api/reducer.ts
index bedae0a29..5e850c53d 100644
--- a/src/api/reducer.ts
+++ b/src/api/reducer.ts
@@ -1,6 +1,6 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
-import type { Reducer } from "../types";
+import type { Reducer } from "@/types";
 import type { ApiError, ReceiveErrorAction } from "./types";
 export const errorReducer: Reducer<ApiError> = handleActions({
   ['mvj/api/RECEIVE_ERROR']: (state, {
diff --git a/src/api/selectors.ts b/src/api/selectors.ts
index e417b985c..b02600a77 100644
--- a/src/api/selectors.ts
+++ b/src/api/selectors.ts
@@ -1,3 +1,3 @@
-import type { Selector } from "../types";
+import type { Selector } from "@/types";
 import type { ApiError } from "./types";
 export const getError: Selector<ApiError, void> = state => state.api.error;
\ No newline at end of file
diff --git a/src/api/types.ts b/src/api/types.ts
index d89d59f8a..ca926a3d1 100644
--- a/src/api/types.ts
+++ b/src/api/types.ts
@@ -1,4 +1,4 @@
-import type { Action } from "../types";
+import type { Action } from "@/types";
 export type ApiError = Record<string, any> | null;
 export type ReceiveErrorAction = Action<string, ApiError>;
 export type ClearErrorAction = Action<string, void>;
diff --git a/src/app/App.tsx b/src/app/App.tsx
index cd3170e68..9ce6b073b 100644
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -5,33 +5,34 @@ import { withRouter } from "react-router";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
 import get from "lodash/get";
-import { Sizes } from "foundation/enums";
-import { revealContext } from "foundation/reveal";
-import { ActionTypes, AppConsumer, AppProvider } from "app/AppContext";
-import ApiErrorModal from "api/ApiErrorModal";
-import ConfirmationModal from "components/modal/ConfirmationModal";
-import Loader from "components/loader/Loader";
-import LoginPage from "auth/components/LoginPage";
-import SideMenu from "components/sideMenu/SideMenu";
-import TopNavigation from "components/topNavigation/TopNavigation";
-import userManager from "auth/util/user-manager";
-import { Routes, getRouteById } from "root/routes";
-import { clearError } from "api/actions";
-import { clearApiToken, fetchApiToken } from "auth/actions";
-import { getEpochTime } from "util/helpers";
-import { getError } from "api/selectors";
-import { getApiToken, getApiTokenExpires, getIsFetching, getLoggedInUser } from "auth/selectors";
-import { getLinkUrl, getPageTitle, getShowSearch } from "components/topNavigation/selectors";
-import { getUserGroups, getUserActiveServiceUnit, getUserServiceUnits } from "usersPermissions/selectors";
-import { setRedirectUrlToSessionStorage } from "util/storage";
-import type { ApiError } from "../api/types";
-import type { ApiToken } from "../auth/types";
-import type { UserGroups, UserServiceUnit, UserServiceUnits } from "usersPermissions/types";
-import type { RootState } from "../root/types";
+import { Sizes } from "@/foundation/enums";
+import { revealContext } from "@/foundation/reveal";
+import { ActionTypes, AppConsumer, AppProvider } from "@/app/AppContext";
+import ApiErrorModal from "@/api/ApiErrorModal";
+import ConfirmationModal from "@/components/modal/ConfirmationModal";
+import Loader from "@/components/loader/Loader";
+import LoginPage from "@/auth/components/LoginPage";
+import SideMenu from "@/components/sideMenu/SideMenu";
+import TopNavigation from "@/components/topNavigation/TopNavigation";
+import userManager from "@/auth/util/user-manager";
+import { Routes, getRouteById } from "@/root/routes";
+import { clearError } from "@/api/actions";
+import { clearApiToken, fetchApiToken } from "@/auth/actions";
+import { getEpochTime } from "@/util/helpers";
+import { getError } from "@/api/selectors";
+import { getApiToken, getApiTokenExpires, getIsFetching, getLoggedInUser } from "@/auth/selectors";
+import { getLinkUrl, getPageTitle, getShowSearch } from "@/components/topNavigation/selectors";
+import { getUserGroups, getUserActiveServiceUnit, getUserServiceUnits } from "@/usersPermissions/selectors";
+import { setRedirectUrlToSessionStorage } from "@/util/storage";
+import type { ApiError } from "@/api/types";
+import type { ApiToken } from "@/auth/types";
+import type { UserGroups, UserServiceUnit, UserServiceUnits } from "@/usersPermissions/types";
+import type { RootState } from "@/root/types";
+import "@/main.scss";
 const url = window.location.toString();
 const IS_DEVELOPMENT_URL = url.includes('ninja') || url.includes('localhost');
 type OwnProps = {
-  children: React.ReactNode;
+  children: JSX.Element;
 };
 type Props = OwnProps & {
   apiError: ApiError;
diff --git a/src/app/AppContext.tsx b/src/app/AppContext.tsx
index 4b670db0d..76f4a43fc 100644
--- a/src/app/AppContext.tsx
+++ b/src/app/AppContext.tsx
@@ -57,7 +57,7 @@ export class AppProvider extends React.Component<Props, AppContextState> {
     }
   };
 
-  render(): React.ReactNode {
+  render() {
     const {
       state,
       props: {
diff --git a/src/app/_app.scss b/src/app/_app.scss
index a1e1b64ab..54a3b0290 100644
--- a/src/app/_app.scss
+++ b/src/app/_app.scss
@@ -87,7 +87,7 @@
   display: block;
   overflow: hidden;
   min-height: 100%;
-  background: url('../assets/images/dev-background.png');
+  background: url('/assets/images/dev-background.png');
   background-repeat: repeat;
 
   [type="radio"] {
diff --git a/src/application/actions.ts b/src/application/actions.ts
index 77742705b..87db92e63 100644
--- a/src/application/actions.ts
+++ b/src/application/actions.ts
@@ -1,5 +1,5 @@
 import { createAction } from "redux-actions";
-import type { ApplicantInfoCheckAttributesNotFoundAction, ApplicationRelatedAttachmentsNotFoundAction, AttachmentAttributesNotFoundAction, AttributesNotFoundAction, DeleteUploadAction, FetchApplicantInfoCheckAttributesAction, FetchApplicationRelatedAttachmentsAction, FetchAttachmentAttributesAction, FetchAttributesAction, FetchFormAttributesAction, FetchPendingUploadsAction, FormAttributesNotFoundAction, PendingUploadsNotFoundAction, ReceiveApplicantInfoCheckAttributesAction, ReceiveApplicationRelatedAttachmentsAction, ReceiveAttachmentAttributesAction, ReceiveAttachmentMethodsAction, ReceiveAttributesAction, ReceiveFileOperationFinishedAction, ReceiveFormAttributesAction, ReceiveMethodsAction, ReceivePendingUploadsAction, ReceiveUpdatedApplicantInfoCheckItemAction, ReceiveUpdatedTargetInfoCheckItemAction, UploadAttachmentPayload, UploadFileAction } from "application/types";
+import type { ApplicantInfoCheckAttributesNotFoundAction, ApplicationRelatedAttachmentsNotFoundAction, AttachmentAttributesNotFoundAction, AttributesNotFoundAction, DeleteUploadAction, FetchApplicantInfoCheckAttributesAction, FetchApplicationRelatedAttachmentsAction, FetchAttachmentAttributesAction, FetchAttributesAction, FetchFormAttributesAction, FetchPendingUploadsAction, FormAttributesNotFoundAction, PendingUploadsNotFoundAction, ReceiveApplicantInfoCheckAttributesAction, ReceiveApplicationRelatedAttachmentsAction, ReceiveAttachmentAttributesAction, ReceiveAttachmentMethodsAction, ReceiveAttributesAction, ReceiveFileOperationFinishedAction, ReceiveFormAttributesAction, ReceiveMethodsAction, ReceivePendingUploadsAction, ReceiveUpdatedApplicantInfoCheckItemAction, ReceiveUpdatedTargetInfoCheckItemAction, UploadAttachmentPayload, UploadFileAction } from "@/application/types";
 import type { Attributes, Methods } from "types";
 export const fetchAttributes = (): FetchAttributesAction => createAction('mvj/application/FETCH_ATTRIBUTES')();
 export const receiveMethods = (methods: Methods): ReceiveMethodsAction => createAction('mvj/application/RECEIVE_METHODS')(methods);
diff --git a/src/application/spec.ts b/src/application/application.spec.ts
similarity index 97%
rename from src/application/spec.ts
rename to src/application/application.spec.ts
index 1b26adb45..4bdb3b372 100644
--- a/src/application/spec.ts
+++ b/src/application/application.spec.ts
@@ -1,9 +1,9 @@
-import { expect } from "chai";
-import applicationReducer from "application/reducer";
-import type { ApplicationState } from "application/types";
-import { attributesNotFound, fetchAttachmentAttributes, fetchAttributes, receiveAttachmentAttributes, receiveAttributes, receiveFormAttributes, receiveMethods } from "application/actions";
-import mockFormAttributes from "application/form-attributes-mock-data.json";
-import { companyIdentifierValidator, emailValidator, personalIdentifierValidator, validateApplicationForm } from "application/formValidation";
+import { describe, expect, it } from "vitest";
+import applicationReducer from "./reducer";
+import type { ApplicationState } from "./types";
+import { attributesNotFound, fetchAttachmentAttributes, fetchAttributes, receiveAttachmentAttributes, receiveAttributes, receiveFormAttributes, receiveMethods } from "./actions";
+import mockFormAttributes from "./form-attributes-mock-data.json" assert { type: "json" };
+import { companyIdentifierValidator, emailValidator, personalIdentifierValidator, validateApplicationForm } from "./formValidation";
 import { get } from "lodash/object";
 const baseState: ApplicationState = {
   attributes: null,
diff --git a/src/application/components/ApplicationAnswersField.tsx b/src/application/components/ApplicationAnswersField.tsx
index d5071af1c..5aafe5fb1 100644
--- a/src/application/components/ApplicationAnswersField.tsx
+++ b/src/application/components/ApplicationAnswersField.tsx
@@ -1,11 +1,11 @@
 import React from "react";
 import { Column, Row } from "react-foundation";
-import FileDownloadLink from "components/file/FileDownloadLink";
-import FormTextTitle from "components/form/FormTextTitle";
-import FormText from "components/form/FormText";
-import ApplicationAnswersSection from "application/components/ApplicationAnswersSection";
-import { getApplicationAttachmentDownloadLink } from "application/helpers";
-import type { FormSection, SavedApplicationFormSection, SectionExtraComponentProps, UploadedFileMeta } from "application/types";
+import FileDownloadLink from "@/components/file/FileDownloadLink";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import FormText from "@/components/form/FormText";
+import ApplicationAnswersSection from "@/application/components/ApplicationAnswersSection";
+import { getApplicationAttachmentDownloadLink } from "@/application/helpers";
+import type { FormSection, SavedApplicationFormSection, SectionExtraComponentProps, UploadedFileMeta } from "@/application/types";
 type Props = {
   section: FormSection;
   answer: SavedApplicationFormSection;
@@ -27,7 +27,7 @@ const ApplicationAnswersField = ({
   identifier,
   sectionExtraComponent: SectionExtraComponent,
   sectionTitleTransformers
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   return <>
     <Row>
       {section.fields.filter(field => field.enabled).map(field => {
diff --git a/src/application/components/ApplicationAnswersSection.tsx b/src/application/components/ApplicationAnswersSection.tsx
index eb135a3e6..a7ca38532 100644
--- a/src/application/components/ApplicationAnswersSection.tsx
+++ b/src/application/components/ApplicationAnswersSection.tsx
@@ -1,8 +1,8 @@
 import React from "react";
-import Collapse from "components/collapse/Collapse";
-import SubTitle from "components/content/SubTitle";
-import ApplicationAnswersField from "application/components/ApplicationAnswersField";
-import type { FormSection, SavedApplicationFormSection, SectionExtraComponentProps } from "application/types";
+import Collapse from "@/components/collapse/Collapse";
+import SubTitle from "@/components/content/SubTitle";
+import ApplicationAnswersField from "@/application/components/ApplicationAnswersField";
+import type { FormSection, SavedApplicationFormSection, SectionExtraComponentProps } from "@/application/types";
 type Props = {
   section: FormSection;
   answer: SavedApplicationFormSection | Array<SavedApplicationFormSection>;
@@ -21,7 +21,7 @@ const ApplicationAnswersSection = ({
   fieldTypes,
   sectionExtraComponent,
   sectionTitleTransformers
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   if (!answer) {
     return null;
   }
diff --git a/src/application/components/ApplicationSubsection.tsx b/src/application/components/ApplicationSubsection.tsx
index bb3556c08..1b5ded0d9 100644
--- a/src/application/components/ApplicationSubsection.tsx
+++ b/src/application/components/ApplicationSubsection.tsx
@@ -2,28 +2,28 @@ import React, { Fragment, useCallback } from "react";
 import { change, FieldArray, formValueSelector } from "redux-form";
 import { connect } from "react-redux";
 import { Column, Row } from "react-foundation";
-import AddButton from "components/form/AddButton";
-import RemoveButton from "components/form/RemoveButton";
-import FormField from "components/form/FormField";
-import AddFileButton from "components/form/AddFileButton";
-import FormTextTitle from "components/form/FormTextTitle";
-import FormText from "components/form/FormText";
-import Authorization from "components/authorization/Authorization";
-import FileDownloadLink from "components/file/FileDownloadLink";
-import LoadingIndicator from "components/multi-select/LoadingIndicator";
-import { ButtonColors } from "components/enums";
-import FormHintText from "components/form/FormHintText";
-import { formatDate, isFieldAllowedToRead } from "util/helpers";
-import { ConfirmationModalTexts } from "enums";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import { ApplicantTypes } from "application/enums";
-import { getApplicationAttachmentDownloadLink, getFieldFileIds, getSectionApplicantType, getSectionTemplate, valueToApplicantType } from "application/helpers";
-import { getAttachmentAttributes, getAttachmentMethods, getExistingUploads, getFieldTypeMapping, getIsFetchingApplicationRelatedAttachments, getIsFetchingAttachmentAttributes, getIsFetchingPendingUploads, getIsPerformingFileOperation, getPendingUploads } from "application/selectors";
-import { ApplicationSectionKeys } from "application/components/enums";
-import { APPLICANT_MAIN_IDENTIFIERS, APPLICANT_SECTION_IDENTIFIER, APPLICANT_TYPE_FIELD_IDENTIFIER, EMAIL_FIELD_IDENTIFIER, TARGET_SECTION_IDENTIFIER } from "application/constants";
-import { deleteUploadedAttachment, uploadAttachment } from "application/actions";
-import type { FormSection, PlotApplicationFormValue, UploadedFileMeta } from "application/types";
-import { companyIdentifierValidator, emailValidator, personalIdentifierValidator } from "application/formValidation";
+import AddButton from "@/components/form/AddButton";
+import RemoveButton from "@/components/form/RemoveButton";
+import FormField from "@/components/form/FormField";
+import AddFileButton from "@/components/form/AddFileButton";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import FormText from "@/components/form/FormText";
+import Authorization from "@/components/authorization/Authorization";
+import FileDownloadLink from "@/components/file/FileDownloadLink";
+import LoadingIndicator from "@/components/multi-select/LoadingIndicator";
+import { ButtonColors } from "@/components/enums";
+import FormHintText from "@/components/form/FormHintText";
+import { formatDate, isFieldAllowedToRead } from "@/util/helpers";
+import { ConfirmationModalTexts } from "@/enums";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import { ApplicantTypes } from "@/application/enums";
+import { getApplicationAttachmentDownloadLink, getFieldFileIds, getSectionApplicantType, getSectionTemplate, valueToApplicantType } from "@/application/helpers";
+import { getAttachmentAttributes, getAttachmentMethods, getExistingUploads, getFieldTypeMapping, getIsFetchingApplicationRelatedAttachments, getIsFetchingAttachmentAttributes, getIsFetchingPendingUploads, getIsPerformingFileOperation, getPendingUploads } from "@/application/selectors";
+import { ApplicationSectionKeys } from "@/application/components/enums";
+import { APPLICANT_MAIN_IDENTIFIERS, APPLICANT_SECTION_IDENTIFIER, APPLICANT_TYPE_FIELD_IDENTIFIER, EMAIL_FIELD_IDENTIFIER, TARGET_SECTION_IDENTIFIER } from "@/application/constants";
+import { deleteUploadedAttachment, uploadAttachment } from "@/application/actions";
+import type { FormSection, PlotApplicationFormValue, UploadedFileMeta } from "@/application/types";
+import { companyIdentifierValidator, emailValidator, personalIdentifierValidator } from "@/application/formValidation";
 const ApplicationFormFileField = connect((state, props) => {
   const {
     formName,
@@ -344,13 +344,13 @@ const ApplicationFormSubsectionFieldArray = ({
   fields: any;
   section: any;
   headerTag: string | React.ComponentType<{
-    children?: React.ReactNode;
+    children?: JSX.Element;
   }>;
   formName: string;
   formPath: string;
   sectionTitleTransformers: Array<(arg0: string, arg1: FormSection, arg2: string) => string>;
   answerId: number | null;
-}): React.ReactNode => {
+}): JSX.Element => {
   return <div className="ApplicationFormSubsectionFieldArray">
       {fields.map((identifier, i) => {
       const subtitle: string = (sectionTitleTransformers || []).reduce((title, transformer) => transformer(title, section, identifier), `${section.title} (${i + 1})`);
@@ -383,14 +383,14 @@ const ApplicationSubsection = ({
   path: Array<string>;
   section: any;
   headerTag?: string | React.ComponentType<{
-    children?: React.ReactNode;
+    children?: JSX.Element;
   }>;
   parentApplicantType?: string | null;
   formName: string;
   formPath: string | null | undefined;
   sectionTitleTransformers: Array<(arg0: string, arg1: FormSection, arg2: string) => string>;
   answerId: number | null;
-}): React.ReactNode => {
+}): JSX.Element => {
   if (!section.visible) {
     return null;
   }
diff --git a/src/application/components/infoCheck/ApplicantInfoCheck.tsx b/src/application/components/infoCheck/ApplicantInfoCheck.tsx
index ab637be46..b6aa3a94d 100644
--- a/src/application/components/infoCheck/ApplicantInfoCheck.tsx
+++ b/src/application/components/infoCheck/ApplicantInfoCheck.tsx
@@ -1,14 +1,14 @@
 import React, { Component } from "react";
 import { Column, Row } from "react-foundation";
-import { getLabelOfOption } from "util/helpers";
-import { getUserFullName } from "users/helpers";
+import { getLabelOfOption } from "@/util/helpers";
+import { getUserFullName } from "@/users/helpers";
 type Props = {
   infoChecks: Record<string, any>;
   infoCheckStateOptions: any;
 };
 
 class ApplicantInfoCheck extends Component<Props> {
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       infoChecks,
       infoCheckStateOptions
diff --git a/src/application/components/infoCheck/ApplicantInfoCheckEdit.tsx b/src/application/components/infoCheck/ApplicantInfoCheckEdit.tsx
index 3ebd042b7..f0355da87 100644
--- a/src/application/components/infoCheck/ApplicantInfoCheckEdit.tsx
+++ b/src/application/components/infoCheck/ApplicantInfoCheckEdit.tsx
@@ -2,11 +2,11 @@ import React, { Component } from "react";
 import { Row } from "react-foundation";
 import { connect } from "react-redux";
 import { change } from "redux-form";
-import ApplicantInfoCheckModal from "application/components/infoCheck/ApplicantInfoCheckModal";
-import { ApplicantInfoCheckFieldPaths, ApplicantInfoCheckFieldTitles, ApplicantTypes } from "application/enums";
-import ApplicantInfoCheckEditItem from "application/components/infoCheck/ApplicantInfoCheckEditItem";
-import FormText from "components/form/FormText";
-import { getApplicantInfoCheckFormName } from "application/helpers";
+import ApplicantInfoCheckModal from "@/application/components/infoCheck/ApplicantInfoCheckModal";
+import { ApplicantInfoCheckFieldPaths, ApplicantInfoCheckFieldTitles, ApplicantTypes } from "@/application/enums";
+import ApplicantInfoCheckEditItem from "@/application/components/infoCheck/ApplicantInfoCheckEditItem";
+import FormText from "@/components/form/FormText";
+import { getApplicantInfoCheckFormName } from "@/application/helpers";
 type OwnProps = {
   infoCheckIds: Array<number>;
   answer: Record<string, any>;
@@ -71,7 +71,7 @@ class ApplicantInfoCheckEdit extends Component<Props, State> {
     }
   };
 
-  renderErrors(): React.ReactNode {
+  renderErrors(): JSX.Element {
     const {
       submissionErrors
     } = this.props;
@@ -113,7 +113,7 @@ class ApplicantInfoCheckEdit extends Component<Props, State> {
     </FormText>;
   }
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       isModalOpen,
       modalCheckItem,
diff --git a/src/application/components/infoCheck/ApplicantInfoCheckEditItem.tsx b/src/application/components/infoCheck/ApplicantInfoCheckEditItem.tsx
index e8f8bfaef..a7e76b868 100644
--- a/src/application/components/infoCheck/ApplicantInfoCheckEditItem.tsx
+++ b/src/application/components/infoCheck/ApplicantInfoCheckEditItem.tsx
@@ -4,9 +4,9 @@ import { connect } from "react-redux";
 import { getFormValues, reduxForm } from "redux-form";
 import { Column, Row } from "react-foundation";
 import classNames from "classnames";
-import { getApplicantInfoCheckAttributes } from "application/selectors";
-import { getFieldOptions, getLabelOfOption } from "util/helpers";
-import { getUserFullName } from "users/helpers";
+import { getApplicantInfoCheckAttributes } from "@/application/selectors";
+import { getFieldOptions, getLabelOfOption } from "@/util/helpers";
+import { getUserFullName } from "@/users/helpers";
 import type { Attributes } from "types";
 type OwnProps = {
   openModal: (...args: Array<any>) => any;
diff --git a/src/application/components/infoCheck/ApplicantInfoCheckForm.tsx b/src/application/components/infoCheck/ApplicantInfoCheckForm.tsx
index d4666b882..46394f473 100644
--- a/src/application/components/infoCheck/ApplicantInfoCheckForm.tsx
+++ b/src/application/components/infoCheck/ApplicantInfoCheckForm.tsx
@@ -4,13 +4,13 @@ import { Column, Row } from "react-foundation";
 import get from "lodash/get";
 import flowRight from "lodash/flowRight";
 import { connect } from "react-redux";
-import { FieldTypes, FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import FormField from "components/form/FormField";
-import ModalButtonWrapper from "components/modal/ModalButtonWrapper";
-import Button from "components/button/Button";
-import { ApplicantInfoCheckFieldPaths, ApplicantInfoCheckFieldTitles } from "application/enums";
-import { getApplicantInfoCheckAttributes } from "application/selectors";
+import { FieldTypes, FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import FormField from "@/components/form/FormField";
+import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper";
+import Button from "@/components/button/Button";
+import { ApplicantInfoCheckFieldPaths, ApplicantInfoCheckFieldTitles } from "@/application/enums";
+import { getApplicantInfoCheckAttributes } from "@/application/selectors";
 import type { Attributes } from "types";
 type OwnProps = {
   infoCheck: Record<string, any>;
@@ -62,7 +62,7 @@ class ApplicantInfoCheckForm extends Component<Props> {
     onSubmit(formValues);
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       attributes,
       valid,
diff --git a/src/application/components/infoCheck/ApplicantInfoCheckModal.tsx b/src/application/components/infoCheck/ApplicantInfoCheckModal.tsx
index 33b3b88c9..41f5aad43 100644
--- a/src/application/components/infoCheck/ApplicantInfoCheckModal.tsx
+++ b/src/application/components/infoCheck/ApplicantInfoCheckModal.tsx
@@ -1,12 +1,12 @@
 import React, { Component } from "react";
-import Modal from "components/modal/Modal";
-import ModalButtonWrapper from "components/modal/ModalButtonWrapper";
-import Button from "components/button/Button";
-import ApplicantInfoCheckForm from "application/components/infoCheck/ApplicantInfoCheckForm";
-import TradeRegisterTemplate from "tradeRegister/components/TradeRegisterTemplate";
-import CreditDecisionTemplate from "creditDecision/components/CreditDecisionTemplate";
-import { ContactTypes } from "contacts/enums";
-import { ApplicantInfoCheckExternalTypes } from "application/enums";
+import Modal from "@/components/modal/Modal";
+import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper";
+import Button from "@/components/button/Button";
+import ApplicantInfoCheckForm from "@/application/components/infoCheck/ApplicantInfoCheckForm";
+import TradeRegisterTemplate from "@/tradeRegister/components/TradeRegisterTemplate";
+import CreditDecisionTemplate from "@/creditDecision/components/CreditDecisionTemplate";
+import { ContactTypes } from "@/contacts/enums";
+import { ApplicantInfoCheckExternalTypes } from "@/application/enums";
 type Props = {
   isOpen: boolean;
   onClose: (...args: Array<any>) => any;
@@ -39,7 +39,7 @@ class ApplicantInfoCheckModal extends Component<Props, State> {
     this.form = element;
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       isOpen,
       onClose,
diff --git a/src/application/constants.ts b/src/application/constants.ts
index fe07ec4b0..33bf82771 100644
--- a/src/application/constants.ts
+++ b/src/application/constants.ts
@@ -1,4 +1,4 @@
-import { ApplicantTypes } from "application/enums";
+import { ApplicantTypes } from "@/application/enums";
 export const APPLICANT_SECTION_IDENTIFIER = 'hakijan-tiedot';
 export const TARGET_SECTION_IDENTIFIER = 'haettava-kohde';
 export const APPLICANT_TYPE_FIELD_IDENTIFIER = 'hakija';
diff --git a/src/application/formValidation.ts b/src/application/formValidation.ts
index 1eb4ab636..fb563e829 100644
--- a/src/application/formValidation.ts
+++ b/src/application/formValidation.ts
@@ -1,6 +1,6 @@
 import { parseISO } from "date-fns";
 import { get, set } from "lodash/object";
-import { CONTROL_SHARE_FIELD_IDENTIFIER } from "application/constants";
+import { CONTROL_SHARE_FIELD_IDENTIFIER } from "@/application/constants";
 const PERSONAL_IDENTIFIER_CHECK_CHAR_LIST = '0123456789ABCDEFHJKLMNPRSTUVWXY';
 // from the rightmost digit to the leftmost
 const COMPANY_IDENTIFIER_CHECKSUM_MULTIPLIERS = [2, 4, 8, 5, 10, 9, 7];
diff --git a/src/application/helpers.ts b/src/application/helpers.ts
index a24a9860a..9bb2e30e5 100644
--- a/src/application/helpers.ts
+++ b/src/application/helpers.ts
@@ -1,15 +1,15 @@
 import { formValueSelector } from "redux-form";
 import _ from "lodash";
-import { FormNames } from "enums";
-import { ApplicantInfoCheckExternalTypes, ApplicantInfoCheckTypes, ApplicantTypes, TargetIdentifierTypes } from "application/enums";
-import { getContentUser } from "users/helpers";
-import createUrl from "api/createUrl";
-import { APPLICANT_MAIN_IDENTIFIERS, APPLICANT_SECTION_IDENTIFIER, TARGET_SECTION_IDENTIFIER } from "application/constants";
-import { store } from "root/startApp";
-import { displayUIMessage } from "util/helpers";
-import type { PlotSearch } from "plotSearch/types";
-import type { RootState } from "root/types";
-import type { ApplicationFormSection, Form, FormSection, PlotApplicationFormValue, SavedApplicationFormSection, UploadedFileMeta } from "application/types";
+import { FormNames } from "@/enums";
+import { ApplicantInfoCheckExternalTypes, ApplicantInfoCheckTypes, ApplicantTypes, TargetIdentifierTypes } from "@/application/enums";
+import { getContentUser } from "@/users/helpers";
+import createUrl from "@/api/createUrl";
+import { APPLICANT_MAIN_IDENTIFIERS, APPLICANT_SECTION_IDENTIFIER, TARGET_SECTION_IDENTIFIER } from "@/application/constants";
+import { store } from "@/index";
+import { displayUIMessage } from "@/util/helpers";
+import type { PlotSearch } from "@/plotSearch/types";
+import type { RootState } from "@/root/types";
+import type { ApplicationFormSection, Form, FormSection, PlotApplicationFormValue, SavedApplicationFormSection, UploadedFileMeta } from "@/application/types";
 export const transformTargetSectionTitle = (plotSearch: PlotSearch): (...args: Array<any>) => any => (title: string, section: FormSection, answer: SavedApplicationFormSection): string => {
   if (section.identifier === TARGET_SECTION_IDENTIFIER && answer?.metadata?.identifier) {
     const target = plotSearch?.plot_search_targets.find(target => target.id === answer.metadata?.identifier);
diff --git a/src/application/reducer.ts b/src/application/reducer.ts
index 118cc60ab..67b366d04 100644
--- a/src/application/reducer.ts
+++ b/src/application/reducer.ts
@@ -2,7 +2,7 @@ import type { Action } from "redux";
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
 import type { Attributes, Methods, Reducer } from "types";
-import type { ApplicationState, ReceiveApplicantInfoCheckAttributesAction, ReceiveApplicationRelatedAttachmentsAction, ReceiveAttachmentAttributesAction, ReceiveAttachmentMethodsAction, ReceiveAttributesAction, ReceiveFormAttributesAction, ReceiveMethodsAction } from "application/types";
+import type { ApplicationState, ReceiveApplicantInfoCheckAttributesAction, ReceiveApplicationRelatedAttachmentsAction, ReceiveAttachmentAttributesAction, ReceiveAttachmentMethodsAction, ReceiveAttributesAction, ReceiveFormAttributesAction, ReceiveMethodsAction } from "@/application/types";
 const attributesReducer: Reducer<Attributes> = handleActions({
   ['mvj/application/RECEIVE_ATTRIBUTES']: (state: Attributes, {
     payload: attributes
diff --git a/src/application/requests.ts b/src/application/requests.ts
index ef97e59ee..6ece53c02 100644
--- a/src/application/requests.ts
+++ b/src/application/requests.ts
@@ -1,6 +1,6 @@
-import callApi from "api/callApi";
-import createUrl from "api/createUrl";
-import callUploadRequest from "api/callUploadRequest";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
+import callUploadRequest from "@/api/callUploadRequest";
 import { UploadFileData } from "./types";
 export const fetchAttributesRequest = (): Generator<any, any, any> => {
   return callApi(new Request(createUrl('answer/'), {
diff --git a/src/application/saga.ts b/src/application/saga.ts
index b67b331b4..c96ae8a8c 100644
--- a/src/application/saga.ts
+++ b/src/application/saga.ts
@@ -1,12 +1,12 @@
 import { all, call, fork, put, select, takeEvery, takeLatest } from "redux-saga/effects";
 import { getFormValues, initialize } from "redux-form";
-import { applicantInfoCheckAttributesNotFound, applicationRelatedAttachmentsNotFound, attachmentAttributesNotFound, attributesNotFound, fetchApplicationRelatedAttachments, fetchPendingUploads, formAttributesNotFound, pendingUploadsNotFound, receiveApplicantInfoCheckAttributes, receiveApplicationRelatedAttachments, receiveAttachmentAttributes, receiveAttachmentMethods, receiveAttributes, receiveFileOperationFinished, receiveFormAttributes, receiveMethods, receivePendingUploads } from "application/actions";
-import { receiveError } from "api/actions";
-import { deleteUploadRequest, fetchApplicantInfoCheckAttributesRequest, fetchAttachmentAttributesRequest, fetchAttributesRequest, fetchFormAttributesRequest, fetchPendingUploadsRequest, fetchSingleApplicationAttachments, uploadFileRequest } from "application/requests";
-import { getApplicantInfoCheckFormName } from "application/helpers";
-import { getContentUser } from "users/helpers";
-import { displayUIMessage } from "util/helpers";
-import type { DeleteUploadAction, ReceiveUpdatedTargetInfoCheckItemAction, UploadFileAction } from "application/types";
+import { applicantInfoCheckAttributesNotFound, applicationRelatedAttachmentsNotFound, attachmentAttributesNotFound, attributesNotFound, fetchApplicationRelatedAttachments, fetchPendingUploads, formAttributesNotFound, pendingUploadsNotFound, receiveApplicantInfoCheckAttributes, receiveApplicationRelatedAttachments, receiveAttachmentAttributes, receiveAttachmentMethods, receiveAttributes, receiveFileOperationFinished, receiveFormAttributes, receiveMethods, receivePendingUploads } from "@/application/actions";
+import { receiveError } from "@/api/actions";
+import { deleteUploadRequest, fetchApplicantInfoCheckAttributesRequest, fetchAttachmentAttributesRequest, fetchAttributesRequest, fetchFormAttributesRequest, fetchPendingUploadsRequest, fetchSingleApplicationAttachments, uploadFileRequest } from "@/application/requests";
+import { getApplicantInfoCheckFormName } from "@/application/helpers";
+import { getContentUser } from "@/users/helpers";
+import { displayUIMessage } from "@/util/helpers";
+import type { DeleteUploadAction, ReceiveUpdatedTargetInfoCheckItemAction, UploadFileAction } from "@/application/types";
 
 function* fetchAttributesSaga(): Generator<any, any, any> {
   try {
diff --git a/src/application/selectors.ts b/src/application/selectors.ts
index c6bab8d53..897c5e2b4 100644
--- a/src/application/selectors.ts
+++ b/src/application/selectors.ts
@@ -1,5 +1,5 @@
-import type { Attributes, Methods, Selector } from "types";
-import type { RootState } from "root/types";
+import type { Attributes, Methods, Selector } from "@/types";
+import type { RootState } from "@/root/types";
 export const getAttributes: Selector<Attributes, void> = (state: RootState): Attributes => state.application.attributes;
 export const getMethods: Selector<Methods, void> = (state: RootState): Methods => state.application.methods;
 export const getIsFetchingAttributes: Selector<boolean, void> = (state: RootState): boolean => state.application.isFetchingAttributes;
diff --git a/src/areaNote/spec.ts b/src/areaNote/areanote.spec.ts
similarity index 99%
rename from src/areaNote/spec.ts
rename to src/areaNote/areanote.spec.ts
index 95846faf8..d743b5076 100644
--- a/src/areaNote/spec.ts
+++ b/src/areaNote/areanote.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchAttributes, attributesNotFound, receiveAttributes, receiveMethods, receiveAreaNoteList, receiveDeletedAreaNote, receiveEditedAreaNote, fetchAreaNoteList, createAreaNote, deleteAreaNote, editAreaNote, notFound, showEditMode, hideEditMode, initializeAreaNote } from "./actions";
 import areaNotesReducer from "./reducer";
 import type { AreaNoteState } from "./types";
diff --git a/src/areaNote/components/AreaNoteListPage.tsx b/src/areaNote/components/AreaNoteListPage.tsx
index 86e451edf..6f79cf249 100644
--- a/src/areaNote/components/AreaNoteListPage.tsx
+++ b/src/areaNote/components/AreaNoteListPage.tsx
@@ -5,26 +5,26 @@ import { withRouter } from "react-router";
 import { initialize } from "redux-form";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import AreaNotesEditMap from "areaNote/components/AreaNotesEditMap";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import AreaNotesEditMap from "@/areaNote/components/AreaNotesEditMap";
 import AreaNotesLayer from "./AreaNotesLayer";
-import Authorization from "components/authorization/Authorization";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import PageContainer from "components/content/PageContainer";
+import Authorization from "@/components/authorization/Authorization";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import PageContainer from "@/components/content/PageContainer";
 import Search from "./search/Search";
-import { fetchAreaNoteList, hideEditMode, initializeAreaNote, showEditMode } from "areaNote/actions";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { FormNames, Methods, PermissionMissingTexts } from "enums";
-import { getAreaNoteById, getAreaNoteCoordinates } from "areaNote/helpers";
-import { getSearchQuery, getUrlParams, isMethodAllowed, setPageTitle } from "util/helpers";
-import { getBoundsFromCoordinates, getCenterFromCoordinates } from "util/map";
-import { getRouteById, Routes } from "root/routes";
-import { getAreaNoteList, getIsEditMode, getIsFetching } from "areaNote/selectors";
-import { withAreaNoteAttributes } from "components/attributes/AreaNoteAttributes";
+import { fetchAreaNoteList, hideEditMode, initializeAreaNote, showEditMode } from "@/areaNote/actions";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { FormNames, Methods, PermissionMissingTexts } from "@/enums";
+import { getAreaNoteById, getAreaNoteCoordinates } from "@/areaNote/helpers";
+import { getSearchQuery, getUrlParams, isMethodAllowed, setPageTitle } from "@/util/helpers";
+import { getBoundsFromCoordinates, getCenterFromCoordinates } from "@/util/map";
+import { getRouteById, Routes } from "@/root/routes";
+import { getAreaNoteList, getIsEditMode, getIsFetching } from "@/areaNote/selectors";
+import { withAreaNoteAttributes } from "@/components/attributes/AreaNoteAttributes";
 import type { Methods as MethodsType } from "types";
-import type { AreaNoteList } from "areaNote/types";
+import type { AreaNoteList } from "@/areaNote/types";
 type Props = {
   areaNoteMethods: MethodsType;
   areaNotes: AreaNoteList;
diff --git a/src/areaNote/components/AreaNotesEditMap.tsx b/src/areaNote/components/AreaNotesEditMap.tsx
index 53d91a236..1643b5e72 100644
--- a/src/areaNote/components/AreaNotesEditMap.tsx
+++ b/src/areaNote/components/AreaNotesEditMap.tsx
@@ -9,11 +9,11 @@ import throttle from "lodash/throttle";
 import MapContainer from "./MapContainer";
 import SaveConditionPanel from "./SaveConditionPanel";
 import ZoomLevelWarning from "./ZoomLevelWarning";
-import { createAreaNote, deleteAreaNote, editAreaNote, hideEditMode } from "areaNote/actions";
-import { DEFAULT_CENTER, DEFAULT_ZOOM } from "util/constants";
-import { convertFeatureCollectionToFeature } from "areaNote/helpers";
-import { localizeMap } from "util/map";
-import { getInitialAreaNote, getIsEditMode } from "areaNote/selectors";
+import { createAreaNote, deleteAreaNote, editAreaNote, hideEditMode } from "@/areaNote/actions";
+import { DEFAULT_CENTER, DEFAULT_ZOOM } from "@/util/constants";
+import { convertFeatureCollectionToFeature } from "@/areaNote/helpers";
+import { localizeMap } from "@/util/map";
+import { getInitialAreaNote, getIsEditMode } from "@/areaNote/selectors";
 localizeMap();
 const SHAPE_COLOR = '#9c27b0';
 const SHAPE_FILL_OPACITY = 0.5;
diff --git a/src/areaNote/components/AreaNotesLayer.tsx b/src/areaNote/components/AreaNotesLayer.tsx
index 2601b7247..9d5326ea8 100644
--- a/src/areaNote/components/AreaNotesLayer.tsx
+++ b/src/areaNote/components/AreaNotesLayer.tsx
@@ -1,14 +1,14 @@
 import React, { Component } from "react";
 import { connect } from "react-redux";
 import { GeoJSON } from "react-leaflet";
-import { initializeAreaNote, showEditMode } from "areaNote/actions";
-import { Methods } from "enums";
-import { convertAreaNoteListToGeoJson, convertFeatureToFeatureCollection } from "areaNote/helpers";
-import { getUserFullName } from "users/helpers";
-import { formatDate, isMethodAllowed } from "util/helpers";
-import { getIsEditMode, getMethods as getAreaNoteMethods } from "areaNote/selectors";
+import { initializeAreaNote, showEditMode } from "@/areaNote/actions";
+import { Methods } from "@/enums";
+import { convertAreaNoteListToGeoJson, convertFeatureToFeatureCollection } from "@/areaNote/helpers";
+import { getUserFullName } from "@/users/helpers";
+import { formatDate, isMethodAllowed } from "@/util/helpers";
+import { getIsEditMode, getMethods as getAreaNoteMethods } from "@/areaNote/selectors";
 import type { Methods as MethodsType } from "types";
-import type { AreaNoteList } from "areaNote/types";
+import type { AreaNoteList } from "@/areaNote/types";
 type Props = {
   allowToEdit?: boolean;
   areaNoteMethods: MethodsType;
diff --git a/src/areaNote/components/MapContainer.tsx b/src/areaNote/components/MapContainer.tsx
index b960efc16..6343f7c62 100644
--- a/src/areaNote/components/MapContainer.tsx
+++ b/src/areaNote/components/MapContainer.tsx
@@ -9,11 +9,11 @@ const {
 import FullscreenControl from "react-leaflet-fullscreen";
 import proj4 from "proj4";
 import "proj4leaflet";
-import GeoSearch from "components/map/GeoSearch";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import ZoomBox from "components/map/ZoomBox";
-import { MIN_ZOOM, MAX_ZOOM } from "util/constants";
+import GeoSearch from "@/components/map/GeoSearch";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import ZoomBox from "@/components/map/ZoomBox";
+import { MIN_ZOOM, MAX_ZOOM } from "@/util/constants";
 const bounds = L.bounds([25440000, 6630000], [25571072, 6761072]);
 const CRS = new L.Proj.CRS('EPSG:3879', '+proj=tmerc +lat_0=0 +lon_0=25 +k=1 +x_0=25500000 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs', {
   resolutions: [256, 128, 64, 32, 16, 8, 4, 2, 1, 0.5, 0.25, 0.125, 0.0625, 0.03125],
@@ -68,7 +68,7 @@ class MapContainer extends Component<Props> {
     };
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       bounds,
       center,
diff --git a/src/areaNote/components/SaveConditionPanel.tsx b/src/areaNote/components/SaveConditionPanel.tsx
index f6de3640c..8684fb889 100644
--- a/src/areaNote/components/SaveConditionPanel.tsx
+++ b/src/areaNote/components/SaveConditionPanel.tsx
@@ -2,15 +2,15 @@ import React, { Component } from "react";
 import { connect } from "react-redux";
 import classNames from "classnames";
 import { Row, Column } from "react-foundation";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import Authorization from "components/authorization/Authorization";
-import Button from "components/button/Button";
-import FormFieldLabel from "components/form/FormFieldLabel";
-import TextAreaInput from "components/inputs/TextAreaInput";
-import { ConfirmationModalTexts, Methods } from "enums";
-import { ButtonColors } from "components/enums";
-import { isMethodAllowed } from "util/helpers";
-import { getMethods as getAreaNoteMethods } from "areaNote/selectors";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import Authorization from "@/components/authorization/Authorization";
+import Button from "@/components/button/Button";
+import FormFieldLabel from "@/components/form/FormFieldLabel";
+import TextAreaInput from "@/components/inputs/TextAreaInput";
+import { ConfirmationModalTexts, Methods } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { isMethodAllowed } from "@/util/helpers";
+import { getMethods as getAreaNoteMethods } from "@/areaNote/selectors";
 import type { Methods as MethodsType } from "types";
 type Props = {
   areaNoteMethods: MethodsType;
diff --git a/src/areaNote/components/search/Search.tsx b/src/areaNote/components/search/Search.tsx
index 8438a78e4..2a01f071f 100644
--- a/src/areaNote/components/search/Search.tsx
+++ b/src/areaNote/components/search/Search.tsx
@@ -5,10 +5,10 @@ import { Row, Column } from "react-foundation";
 import debounce from "lodash/debounce";
 import flowRight from "lodash/flowRight";
 import isEqual from "lodash/isEqual";
-import FormField from "components/form/FormField";
-import SearchClearLink from "components/search/SearchClearLink";
-import SearchContainer from "components/search/SearchContainer";
-import { FieldTypes, FormNames } from "enums";
+import FormField from "@/components/form/FormField";
+import SearchClearLink from "@/components/search/SearchClearLink";
+import SearchContainer from "@/components/search/SearchContainer";
+import { FieldTypes, FormNames } from "@/enums";
 type Props = {
   formValues: Record<string, any>;
   handleSubmit: (...args: Array<any>) => any;
diff --git a/src/areaNote/helpers.ts b/src/areaNote/helpers.ts
index 3f5c27726..a05a6662e 100644
--- a/src/areaNote/helpers.ts
+++ b/src/areaNote/helpers.ts
@@ -1,5 +1,5 @@
 import get from "lodash/get";
-import { getCoordinatesOfGeometry } from "util/map";
+import { getCoordinatesOfGeometry } from "@/util/map";
 import type { AreaNote } from "./types";
 
 /**
diff --git a/src/areaNote/requests.ts b/src/areaNote/requests.ts
index 43dcfc81f..2e3c01b9f 100644
--- a/src/areaNote/requests.ts
+++ b/src/areaNote/requests.ts
@@ -1,6 +1,6 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
-import type { AreaNote, AreaNoteId } from "areaNote/types";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
+import type { AreaNote, AreaNoteId } from "@/areaNote/types";
 export const fetchAttributes = (): Generator<any, any, any> => {
   return callApi(new Request(createUrl(`area_note/`), {
     method: 'OPTIONS'
diff --git a/src/areaNote/saga.ts b/src/areaNote/saga.ts
index 7213bd136..1ce42eb2b 100644
--- a/src/areaNote/saga.ts
+++ b/src/areaNote/saga.ts
@@ -1,8 +1,8 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { SubmissionError } from "redux-form";
-import { receiveError } from "api/actions";
+import { receiveError } from "@/api/actions";
 import { receiveAttributes, receiveMethods, attributesNotFound, hideEditMode, notFound, receiveAreaNoteList, receiveDeletedAreaNote, receiveEditedAreaNote } from "./actions";
-import { displayUIMessage } from "util/helpers";
+import { displayUIMessage } from "@/util/helpers";
 import { createAreaNote, deleteAreaNote, editAreaNote, fetchAreaNotes, fetchAttributes } from "./requests";
 
 function* fetchAttributesSaga(): Generator<any, any, any> {
diff --git a/src/areaNote/selectors.ts b/src/areaNote/selectors.ts
index c8ef02385..c3521c133 100644
--- a/src/areaNote/selectors.ts
+++ b/src/areaNote/selectors.ts
@@ -1,5 +1,5 @@
 import type { Attributes, Methods, Selector } from "types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 import type { AreaNoteList } from "./types";
 export const getIsFetching: Selector<boolean, void> = (state: RootState): boolean => state.areaNote.isFetching;
 export const getIsFetchingAttributes: Selector<boolean, void> = (state: RootState): boolean => state.areaNote.isFetchingAttributes;
diff --git a/src/areaSearch/actions.ts b/src/areaSearch/actions.ts
index b6fcb7ce5..e2d8c1c61 100644
--- a/src/areaSearch/actions.ts
+++ b/src/areaSearch/actions.ts
@@ -1,5 +1,5 @@
 import { createAction } from "redux-actions";
-import type { AreaSearchesByBBoxNotFoundAction, AreaSearchesNotFoundAction, AttributesNotFoundAction, FetchAreaSearchListAction, FetchAreaSearchListByBBoxAction, FetchAttributesAction, FetchSingleAreaSearchAction, ReceiveAreaSearchListAction, ReceiveAreaSearchListByBBoxAction, ReceiveAttributesAction, ReceiveMethodsAction, ReceiveSingleAreaSearchAction, SingleAreaSearchNotFoundAction, ClearFormValidFlagsAction, HideEditModeAction, ReceiveCollapseStatesAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ShowEditModeAction, FetchListAttributesAction, ReceiveListAttributesAction, ReceiveListMethodsAction, ListAttributesNotFoundAction, ReceiveAreaSearchInfoCheckBatchEditSuccessAction, ReceiveAreaSearchInfoCheckBatchEditFailureAction, BatchEditAreaSearchInfoChecksAction, EditAreaSearchAction, ReceiveAreaSearchEditedAction, ReceiveAreaSearchEditFailedAction, CreateAreaSearchSpecsAction, ReceiveAreaSearchSpecsCreateFailedAction, ReceiveAreaSearchSpecsCreatedAction, CreateAreaSearchApplicationAction, ReceiveAreaSearchApplicationCreatedAction, ReceiveAreaSearchApplicationCreateFailedAction, DeleteAreaSearchAttachmentAction, UploadAreaSearchAttachmentAction, ReceiveFileOperationFinishedAction, ReceiveFileOperationFailedAction, SetAreaSearchAttachmentsAction, UploadedAreaSearchAttachmentMeta } from "areaSearch/types";
+import type { AreaSearchesByBBoxNotFoundAction, AreaSearchesNotFoundAction, AttributesNotFoundAction, FetchAreaSearchListAction, FetchAreaSearchListByBBoxAction, FetchAttributesAction, FetchSingleAreaSearchAction, ReceiveAreaSearchListAction, ReceiveAreaSearchListByBBoxAction, ReceiveAttributesAction, ReceiveMethodsAction, ReceiveSingleAreaSearchAction, SingleAreaSearchNotFoundAction, ClearFormValidFlagsAction, HideEditModeAction, ReceiveCollapseStatesAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ShowEditModeAction, FetchListAttributesAction, ReceiveListAttributesAction, ReceiveListMethodsAction, ListAttributesNotFoundAction, ReceiveAreaSearchInfoCheckBatchEditSuccessAction, ReceiveAreaSearchInfoCheckBatchEditFailureAction, BatchEditAreaSearchInfoChecksAction, EditAreaSearchAction, ReceiveAreaSearchEditedAction, ReceiveAreaSearchEditFailedAction, CreateAreaSearchSpecsAction, ReceiveAreaSearchSpecsCreateFailedAction, ReceiveAreaSearchSpecsCreatedAction, CreateAreaSearchApplicationAction, ReceiveAreaSearchApplicationCreatedAction, ReceiveAreaSearchApplicationCreateFailedAction, DeleteAreaSearchAttachmentAction, UploadAreaSearchAttachmentAction, ReceiveFileOperationFinishedAction, ReceiveFileOperationFailedAction, SetAreaSearchAttachmentsAction, UploadedAreaSearchAttachmentMeta } from "@/areaSearch/types";
 import type { Attributes, Methods } from "types";
 export const hideEditMode = (): HideEditModeAction => createAction('mvj/areaSearch/HIDE_EDIT')();
 export const showEditMode = (): ShowEditModeAction => createAction('mvj/areaSearch/SHOW_EDIT')();
diff --git a/src/areaSearch/spec.ts b/src/areaSearch/areasearch.spec.ts
similarity index 97%
rename from src/areaSearch/spec.ts
rename to src/areaSearch/areasearch.spec.ts
index f40df178c..630b852af 100644
--- a/src/areaSearch/spec.ts
+++ b/src/areaSearch/areasearch.spec.ts
@@ -1,7 +1,7 @@
-import { expect } from "chai";
-import areaSearchReducer from "areaSearch/reducer";
-import { areaSearchesByBBoxNotFound, areaSearchesNotFound, attributesNotFound, batchEditAreaSearchInfoChecks, editAreaSearch, fetchAreaSearchList, fetchAreaSearchListByBBox, fetchAttributes, fetchListAttributes, fetchSingleAreaSearch, hideEditMode, listAttributesNotFound, receiveAreaSearchByBBoxList, receiveAreaSearchEdited, receiveAreaSearchEditFailed, receiveAreaSearchList, receiveAttributes, receiveListAttributes, receiveListMethods, receiveMethods, receiveSingleAreaSearch, setAreaSearchAttachments, showEditMode, singleAreaSearchNotFound } from "areaSearch/actions";
-import type { AreaSearchState } from "areaSearch/types";
+import { describe, expect, it } from "vitest";
+import areaSearchReducer from "@/areaSearch/reducer";
+import { areaSearchesByBBoxNotFound, areaSearchesNotFound, attributesNotFound, batchEditAreaSearchInfoChecks, editAreaSearch, fetchAreaSearchList, fetchAreaSearchListByBBox, fetchAttributes, fetchListAttributes, fetchSingleAreaSearch, hideEditMode, listAttributesNotFound, receiveAreaSearchByBBoxList, receiveAreaSearchEdited, receiveAreaSearchEditFailed, receiveAreaSearchList, receiveAttributes, receiveListAttributes, receiveListMethods, receiveMethods, receiveSingleAreaSearch, setAreaSearchAttachments, showEditMode, singleAreaSearchNotFound } from "@/areaSearch/actions";
+import type { AreaSearchState } from "@/areaSearch/types";
 const defaultState: AreaSearchState = {
   attributes: null,
   methods: null,
diff --git a/src/areaSearch/components/AreaSearchApplicantInfoCheck.tsx b/src/areaSearch/components/AreaSearchApplicantInfoCheck.tsx
index ad74eb890..e51e948b3 100644
--- a/src/areaSearch/components/AreaSearchApplicantInfoCheck.tsx
+++ b/src/areaSearch/components/AreaSearchApplicantInfoCheck.tsx
@@ -1,10 +1,10 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
-import { getFieldOptions } from "util/helpers";
+import { getFieldOptions } from "@/util/helpers";
 import type { Attributes } from "types";
-import ApplicantInfoCheck from "application/components/infoCheck/ApplicantInfoCheck";
-import { getApplicantInfoCheckAttributes } from "application/selectors";
-import { getApplicantInfoCheckItems } from "application/helpers";
+import ApplicantInfoCheck from "@/application/components/infoCheck/ApplicantInfoCheck";
+import { getApplicantInfoCheckAttributes } from "@/application/selectors";
+import { getApplicantInfoCheckItems } from "@/application/helpers";
 type OwnProps = {
   infoCheckData: Array<Record<string, any>>;
 };
@@ -13,7 +13,7 @@ type Props = OwnProps & {
 };
 
 class AreaSearchApplicantInfoCheck extends PureComponent<Props> {
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       infoCheckAttributes,
       infoCheckData
diff --git a/src/areaSearch/components/AreaSearchApplicantInfoCheckEdit.tsx b/src/areaSearch/components/AreaSearchApplicantInfoCheckEdit.tsx
index 4936d9f41..ce5cfa97b 100644
--- a/src/areaSearch/components/AreaSearchApplicantInfoCheckEdit.tsx
+++ b/src/areaSearch/components/AreaSearchApplicantInfoCheckEdit.tsx
@@ -1,10 +1,10 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import { change } from "redux-form";
-import PlotApplicationInfoCheckCollapse from "plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse";
-import { getApplicantInfoCheckSubmissionErrors, getApplicationApplicantInfoCheckData } from "areaSearch/selectors";
-import ApplicantInfoCheckEdit from "application/components/infoCheck/ApplicantInfoCheckEdit";
-import { getApplicantInfoCheckFormName } from "application/helpers";
+import PlotApplicationInfoCheckCollapse from "@/plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse";
+import { getApplicantInfoCheckSubmissionErrors, getApplicationApplicantInfoCheckData } from "@/areaSearch/selectors";
+import ApplicantInfoCheckEdit from "@/application/components/infoCheck/ApplicantInfoCheckEdit";
+import { getApplicantInfoCheckFormName } from "@/application/helpers";
 type OwnProps = {
   section: Record<string, any>;
   identifier: string;
@@ -21,7 +21,7 @@ type Props = OwnProps & {
 };
 
 class PlotApplicationApplicantInfoCheck extends PureComponent<Props> {
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       infoCheckIds,
       answer,
diff --git a/src/areaSearch/components/AreaSearchApplication.tsx b/src/areaSearch/components/AreaSearchApplication.tsx
index a950796a2..f60de978f 100644
--- a/src/areaSearch/components/AreaSearchApplication.tsx
+++ b/src/areaSearch/components/AreaSearchApplication.tsx
@@ -4,32 +4,32 @@ import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
 import orderBy from "lodash/orderBy";
 import { Column, Row } from "react-foundation";
-import { getAttributes, getCurrentAreaSearch } from "areaSearch/selectors";
-import ApplicationAnswersSection from "application/components/ApplicationAnswersSection";
-import { formatDate, formatDateRange, formatNumber, getFieldAttributes, getFieldOptions, getLabelOfOption } from "util/helpers";
+import { getAttributes, getCurrentAreaSearch } from "@/areaSearch/selectors";
+import ApplicationAnswersSection from "@/application/components/ApplicationAnswersSection";
+import { formatDate, formatDateRange, formatNumber, getFieldAttributes, getFieldOptions, getLabelOfOption } from "@/util/helpers";
 import type { Attributes } from "types";
-import { reshapeSavedApplicationObject } from "plotApplications/helpers";
-import { transformApplicantSectionTitle, getAreaSearchApplicationAttachmentDownloadLink } from "application/helpers";
-import Title from "components/content/Title";
-import Divider from "components/content/Divider";
-import Collapse from "components/collapse/Collapse";
-import Loader from "components/loader/Loader";
-import FormTextTitle from "components/form/FormTextTitle";
-import FormText from "components/form/FormText";
-import { AreaSearchFieldTitles } from "areaSearch/enums";
-import { getUserFullName } from "users/helpers";
-import SubTitle from "components/content/SubTitle";
-import FileDownloadLink from "components/file/FileDownloadLink";
-import { getAreaFromGeoJSON } from "util/map";
-import SingleAreaSearchMap from "areaSearch/components/map/SingleAreaSearchMap";
-import AreaSearchApplicationPropertyIdentifiers from "areaSearch/components/AreaSearchApplicationPropertyIdentifiers";
-import AreaSearchApplicantInfoCheck from "areaSearch/components/AreaSearchApplicantInfoCheck";
-import { transformApplicantInfoCheckTitle } from "areaSearch/helpers";
-import TitleH3 from "components/content/TitleH3";
-import AreaSearchStatusNoteHistory from "areaSearch/components/AreaSearchStatusNoteHistory";
-import { getFormAttributes, getIsFetchingFormAttributes } from "application/selectors";
-import { APPLICANT_SECTION_IDENTIFIER } from "application/constants";
-import type { Form } from "application/types";
+import { reshapeSavedApplicationObject } from "@/plotApplications/helpers";
+import { transformApplicantSectionTitle, getAreaSearchApplicationAttachmentDownloadLink } from "@/application/helpers";
+import Title from "@/components/content/Title";
+import Divider from "@/components/content/Divider";
+import Collapse from "@/components/collapse/Collapse";
+import Loader from "@/components/loader/Loader";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import FormText from "@/components/form/FormText";
+import { AreaSearchFieldTitles } from "@/areaSearch/enums";
+import { getUserFullName } from "@/users/helpers";
+import SubTitle from "@/components/content/SubTitle";
+import FileDownloadLink from "@/components/file/FileDownloadLink";
+import { getAreaFromGeoJSON } from "@/util/map";
+import SingleAreaSearchMap from "@/areaSearch/components/map/SingleAreaSearchMap";
+import AreaSearchApplicationPropertyIdentifiers from "@/areaSearch/components/AreaSearchApplicationPropertyIdentifiers";
+import AreaSearchApplicantInfoCheck from "@/areaSearch/components/AreaSearchApplicantInfoCheck";
+import { transformApplicantInfoCheckTitle } from "@/areaSearch/helpers";
+import TitleH3 from "@/components/content/TitleH3";
+import AreaSearchStatusNoteHistory from "@/areaSearch/components/AreaSearchStatusNoteHistory";
+import { getFormAttributes, getIsFetchingFormAttributes } from "@/application/selectors";
+import { APPLICANT_SECTION_IDENTIFIER } from "@/application/constants";
+import type { Form } from "@/application/types";
 type OwnProps = {};
 type Props = OwnProps & {
   areaSearch: Record<string, any> | null;
@@ -51,7 +51,7 @@ class AreaSearchApplication extends Component<Props, State> {
     selectedAreaSectionRefreshKey: 0
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       areaSearch,
       isFetchingFormAttributes,
diff --git a/src/areaSearch/components/AreaSearchApplicationAuditLog.tsx b/src/areaSearch/components/AreaSearchApplicationAuditLog.tsx
index 6ac91f625..3cb456a15 100644
--- a/src/areaSearch/components/AreaSearchApplicationAuditLog.tsx
+++ b/src/areaSearch/components/AreaSearchApplicationAuditLog.tsx
@@ -1,21 +1,21 @@
 import React, { Fragment, PureComponent } from "react";
 import { connect } from "react-redux";
 import isEmpty from "lodash/isEmpty";
-import AuditLogTable from "components/auditLog/AuditLogTable";
-import Divider from "components/content/Divider";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import Pagination from "components/table/Pagination";
-import TableWrapper from "components/table/TableWrapper";
-import Title from "components/content/Title";
-import { fetchAuditLogByAreaSearch } from "auditLog/actions";
-import { LIST_TABLE_PAGE_SIZE } from "util/constants";
-import { AreaSearchFieldPaths, AreaSearchFieldTitles } from "areaSearch/enums";
-import { getApiResponseCount, getApiResponseMaxPage, getApiResponseResults } from "util/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getAuditLogByAreaSearch, getIsFetchingByAreaSearch } from "auditLog/selectors";
-import { getIsEditMode } from "leases/selectors";
-import type { AuditLogList } from "auditLog/types";
+import AuditLogTable from "@/components/auditLog/AuditLogTable";
+import Divider from "@/components/content/Divider";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import Pagination from "@/components/table/Pagination";
+import TableWrapper from "@/components/table/TableWrapper";
+import Title from "@/components/content/Title";
+import { fetchAuditLogByAreaSearch } from "@/auditLog/actions";
+import { LIST_TABLE_PAGE_SIZE } from "@/util/constants";
+import { AreaSearchFieldPaths, AreaSearchFieldTitles } from "@/areaSearch/enums";
+import { getApiResponseCount, getApiResponseMaxPage, getApiResponseResults } from "@/util/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getAuditLogByAreaSearch, getIsFetchingByAreaSearch } from "@/auditLog/selectors";
+import { getIsEditMode } from "@/leases/selectors";
+import type { AuditLogList } from "@/auditLog/types";
 type Props = {
   auditLogList: AuditLogList;
   fetchAuditLogByAreaSearch: (...args: Array<any>) => any;
diff --git a/src/areaSearch/components/AreaSearchApplicationCreateForm.tsx b/src/areaSearch/components/AreaSearchApplicationCreateForm.tsx
index 9b7dc505b..6a39cc445 100644
--- a/src/areaSearch/components/AreaSearchApplicationCreateForm.tsx
+++ b/src/areaSearch/components/AreaSearchApplicationCreateForm.tsx
@@ -2,12 +2,12 @@ import React, { Component } from "react";
 import { connect } from "react-redux";
 import { flowRight } from "lodash/util";
 import { getFormValues, reduxForm } from "redux-form";
-import ApplicationSubsection from "application/components/ApplicationSubsection";
-import { getInitialApplicationForm } from "application/helpers";
-import { getFieldTypeMapping } from "application/selectors";
-import { FormNames } from "enums";
-import { receiveFormValidFlags } from "areaSearch/actions";
-import { validateApplicationForm } from "application/formValidation";
+import ApplicationSubsection from "@/application/components/ApplicationSubsection";
+import { getInitialApplicationForm } from "@/application/helpers";
+import { getFieldTypeMapping } from "@/application/selectors";
+import { FormNames } from "@/enums";
+import { receiveFormValidFlags } from "@/areaSearch/actions";
+import { validateApplicationForm } from "@/application/formValidation";
 type OwnProps = {
   formData: any;
 };
@@ -52,7 +52,7 @@ class AreaSearchApplicationCreateForm extends Component<Props> {
     }
   }
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       formData,
       formValues
diff --git a/src/areaSearch/components/AreaSearchApplicationCreatePage.tsx b/src/areaSearch/components/AreaSearchApplicationCreatePage.tsx
index 647fedfe4..af1d2338c 100644
--- a/src/areaSearch/components/AreaSearchApplicationCreatePage.tsx
+++ b/src/areaSearch/components/AreaSearchApplicationCreatePage.tsx
@@ -2,28 +2,28 @@ import React, { Component } from "react";
 import { connect } from "react-redux";
 import { flowRight } from "lodash/util";
 import { destroy, getFormValues, initialize, isDirty } from "redux-form";
-import { getRouteById, Routes } from "root/routes";
-import FullWidthContainer from "components/content/FullWidthContainer";
-import PageNavigationWrapper from "components/content/PageNavigationWrapper";
-import ControlButtonBar from "components/controlButtons/ControlButtonBar";
-import ControlButtons from "components/controlButtons/ControlButtons";
-import Tabs from "components/tabs/Tabs";
-import TabContent from "components/tabs/TabContent";
-import TabPane from "components/tabs/TabPane";
-import PageContainer from "components/content/PageContainer";
-import ContentContainer from "components/content/ContentContainer";
-import AreaSearchApplicationCreateSpecs from "areaSearch/components/AreaSearchApplicationCreateSpecs";
-import { createAreaSearchApplication, createAreaSearchSpecs, deleteUploadedAttachment, fetchAttributes, hideEditMode, receiveIsSaveClicked, receiveSingleAreaSearch, showEditMode, uploadAttachment } from "areaSearch/actions";
-import { getAttributes, getCurrentAreaSearch, getIsFetchingAttributes, getIsFormValidById, getIsSaveClicked, getIsPerformingFileOperation, getIsSubmittingAreaSearchSpecs, getIsSubmittingAreaSearchApplication } from "areaSearch/selectors";
-import { setPageTitle } from "util/helpers";
-import Loader from "components/loader/Loader";
-import AreaSearchApplicationCreateForm from "areaSearch/components/AreaSearchApplicationCreateForm";
-import { FormNames } from "enums";
-import { getInitialAreaSearchCreateForm, prepareAreaSearchDataForSubmission } from "areaSearch/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import FullWidthContainer from "@/components/content/FullWidthContainer";
+import PageNavigationWrapper from "@/components/content/PageNavigationWrapper";
+import ControlButtonBar from "@/components/controlButtons/ControlButtonBar";
+import ControlButtons from "@/components/controlButtons/ControlButtons";
+import Tabs from "@/components/tabs/Tabs";
+import TabContent from "@/components/tabs/TabContent";
+import TabPane from "@/components/tabs/TabPane";
+import PageContainer from "@/components/content/PageContainer";
+import ContentContainer from "@/components/content/ContentContainer";
+import AreaSearchApplicationCreateSpecs from "@/areaSearch/components/AreaSearchApplicationCreateSpecs";
+import { createAreaSearchApplication, createAreaSearchSpecs, deleteUploadedAttachment, fetchAttributes, hideEditMode, receiveIsSaveClicked, receiveSingleAreaSearch, showEditMode, uploadAttachment } from "@/areaSearch/actions";
+import { getAttributes, getCurrentAreaSearch, getIsFetchingAttributes, getIsFormValidById, getIsSaveClicked, getIsPerformingFileOperation, getIsSubmittingAreaSearchSpecs, getIsSubmittingAreaSearchApplication } from "@/areaSearch/selectors";
+import { setPageTitle } from "@/util/helpers";
+import Loader from "@/components/loader/Loader";
+import AreaSearchApplicationCreateForm from "@/areaSearch/components/AreaSearchApplicationCreateForm";
+import { FormNames } from "@/enums";
+import { getInitialAreaSearchCreateForm, prepareAreaSearchDataForSubmission } from "@/areaSearch/helpers";
 import type { Attributes } from "types";
-import { getFormAttributes, getIsFetchingFormAttributes } from "application/selectors";
-import { fetchFormAttributes } from "application/actions";
-import type { UploadedFileMeta } from "application/types";
+import { getFormAttributes, getIsFetchingFormAttributes } from "@/application/selectors";
+import { fetchFormAttributes } from "@/application/actions";
+import type { UploadedFileMeta } from "@/application/types";
 type OwnProps = {};
 type Props = OwnProps & {
   history: Record<string, any>;
@@ -207,7 +207,7 @@ class AreaSearchApplicationCreatePage extends Component<Props, State> {
     }
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       isFetchingAttributes,
       currentAreaSearch,
diff --git a/src/areaSearch/components/AreaSearchApplicationCreateSpecs.tsx b/src/areaSearch/components/AreaSearchApplicationCreateSpecs.tsx
index 2a6d6bb97..d7c2995e7 100644
--- a/src/areaSearch/components/AreaSearchApplicationCreateSpecs.tsx
+++ b/src/areaSearch/components/AreaSearchApplicationCreateSpecs.tsx
@@ -4,19 +4,19 @@ import { connect } from "react-redux";
 import { Column, Row } from "react-foundation";
 import get from "lodash/get";
 import { flowRight } from "lodash/util";
-import Title from "components/content/Title";
-import { FieldTypes, FormNames } from "enums";
-import { getAttributes, getIsPerformingFileOperation, getIsSaveClicked, getIsSubmittingAreaSearchSpecs } from "areaSearch/selectors";
+import Title from "@/components/content/Title";
+import { FieldTypes, FormNames } from "@/enums";
+import { getAttributes, getIsPerformingFileOperation, getIsSaveClicked, getIsSubmittingAreaSearchSpecs } from "@/areaSearch/selectors";
 import type { Attributes } from "types";
-import Authorization from "components/authorization/Authorization";
-import FormField from "components/form/FormField";
-import AreaSearchMap from "areaSearch/components/map/AreaSearchMap";
-import FormFieldLabel from "components/form/FormFieldLabel";
-import { createAreaSearchSpecs, receiveFormValidFlags } from "areaSearch/actions";
-import AddFileButton from "components/form/AddFileButton";
-import RemoveButton from "components/form/RemoveButton";
-import type { UploadedFileMeta } from "application/types";
-import { nonEmptyGeometry } from "areaSearch/validators";
+import Authorization from "@/components/authorization/Authorization";
+import FormField from "@/components/form/FormField";
+import AreaSearchMap from "@/areaSearch/components/map/AreaSearchMap";
+import FormFieldLabel from "@/components/form/FormFieldLabel";
+import { createAreaSearchSpecs, receiveFormValidFlags } from "@/areaSearch/actions";
+import AddFileButton from "@/components/form/AddFileButton";
+import RemoveButton from "@/components/form/RemoveButton";
+import type { UploadedFileMeta } from "@/application/types";
+import { nonEmptyGeometry } from "@/areaSearch/validators";
 import { startOfToday } from "date-fns";
 type OwnProps = {
   onFileAdded: (...args: Array<any>) => any;
@@ -75,7 +75,7 @@ class AreaSearchApplicationCreateSpecs extends Component<Props> {
     onFileRemoved(index);
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       attributes,
       change,
diff --git a/src/areaSearch/components/AreaSearchApplicationEdit.tsx b/src/areaSearch/components/AreaSearchApplicationEdit.tsx
index 44d0909fa..78df61f10 100644
--- a/src/areaSearch/components/AreaSearchApplicationEdit.tsx
+++ b/src/areaSearch/components/AreaSearchApplicationEdit.tsx
@@ -6,38 +6,38 @@ import orderBy from "lodash/orderBy";
 import get from "lodash/get";
 import { Column, Row } from "react-foundation";
 import { reduxForm } from "redux-form";
-import { getAttributes, getCurrentAreaSearch } from "areaSearch/selectors";
-import ApplicationAnswersSection from "application/components/ApplicationAnswersSection";
-import { formatDate, formatDateRange, formatNumber, getFieldAttributes, getFieldOptions, getLabelOfOption, displayUIMessage } from "util/helpers";
+import { getAttributes, getCurrentAreaSearch } from "@/areaSearch/selectors";
+import ApplicationAnswersSection from "@/application/components/ApplicationAnswersSection";
+import { formatDate, formatDateRange, formatNumber, getFieldAttributes, getFieldOptions, getLabelOfOption, displayUIMessage } from "@/util/helpers";
 import type { Attributes } from "types";
-import { reshapeSavedApplicationObject } from "plotApplications/helpers";
-import { transformApplicantSectionTitle, getAreaSearchApplicationAttachmentDownloadLink } from "application/helpers";
-import Title from "components/content/Title";
-import Divider from "components/content/Divider";
-import Collapse from "components/collapse/Collapse";
-import Loader from "components/loader/Loader";
-import FormTextTitle from "components/form/FormTextTitle";
-import FormText from "components/form/FormText";
-import { AreaSearchFieldTitles } from "areaSearch/enums";
-import { getUserFullName } from "users/helpers";
-import SubTitle from "components/content/SubTitle";
-import FileDownloadLink from "components/file/FileDownloadLink";
-import { getAreaFromGeoJSON } from "util/map";
-import SingleAreaSearchMap from "areaSearch/components/map/SingleAreaSearchMap";
-import AreaSearchApplicationPropertyIdentifiers from "areaSearch/components/AreaSearchApplicationPropertyIdentifiers";
-import AreaSearchApplicantInfoCheckEdit from "areaSearch/components/AreaSearchApplicantInfoCheckEdit";
-import { FieldTypes, FormNames } from "enums";
-import { getInitialAreaSearchEditForm, transformApplicantInfoCheckTitle } from "areaSearch/helpers";
-import FormField from "components/form/FormField";
-import TitleH3 from "components/content/TitleH3";
-import AreaSearchStatusNoteHistory from "areaSearch/components/AreaSearchStatusNoteHistory";
-import { getFormAttributes, getIsFetchingFormAttributes, getIsPerformingFileOperation } from "application/selectors";
-import { APPLICANT_SECTION_IDENTIFIER } from "application/constants";
-import type { Form } from "application/types";
-import type { AreaSearch, UploadedAreaSearchAttachmentMeta } from "areaSearch/types";
-import AddFileButton from "components/form/AddFileButton";
-import { uploadAttachment, setAreaSearchAttachments } from "areaSearch/actions";
-import RemoveButton from "components/form/RemoveButton";
+import { reshapeSavedApplicationObject } from "@/plotApplications/helpers";
+import { transformApplicantSectionTitle, getAreaSearchApplicationAttachmentDownloadLink } from "@/application/helpers";
+import Title from "@/components/content/Title";
+import Divider from "@/components/content/Divider";
+import Collapse from "@/components/collapse/Collapse";
+import Loader from "@/components/loader/Loader";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import FormText from "@/components/form/FormText";
+import { AreaSearchFieldTitles } from "@/areaSearch/enums";
+import { getUserFullName } from "@/users/helpers";
+import SubTitle from "@/components/content/SubTitle";
+import FileDownloadLink from "@/components/file/FileDownloadLink";
+import { getAreaFromGeoJSON } from "@/util/map";
+import SingleAreaSearchMap from "@/areaSearch/components/map/SingleAreaSearchMap";
+import AreaSearchApplicationPropertyIdentifiers from "@/areaSearch/components/AreaSearchApplicationPropertyIdentifiers";
+import AreaSearchApplicantInfoCheckEdit from "@/areaSearch/components/AreaSearchApplicantInfoCheckEdit";
+import { FieldTypes, FormNames } from "@/enums";
+import { getInitialAreaSearchEditForm, transformApplicantInfoCheckTitle } from "@/areaSearch/helpers";
+import FormField from "@/components/form/FormField";
+import TitleH3 from "@/components/content/TitleH3";
+import AreaSearchStatusNoteHistory from "@/areaSearch/components/AreaSearchStatusNoteHistory";
+import { getFormAttributes, getIsFetchingFormAttributes, getIsPerformingFileOperation } from "@/application/selectors";
+import { APPLICANT_SECTION_IDENTIFIER } from "@/application/constants";
+import type { Form } from "@/application/types";
+import type { AreaSearch, UploadedAreaSearchAttachmentMeta } from "@/areaSearch/types";
+import AddFileButton from "@/components/form/AddFileButton";
+import { uploadAttachment, setAreaSearchAttachments } from "@/areaSearch/actions";
+import RemoveButton from "@/components/form/RemoveButton";
 type Props = {
   areaSearch: AreaSearch | null;
   isFetchingFormAttributes: boolean;
@@ -112,7 +112,7 @@ class AreaSearchApplicationEdit extends Component<Props, State> {
     }
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       areaSearch,
       isFetchingFormAttributes,
diff --git a/src/areaSearch/components/AreaSearchApplicationListPage.tsx b/src/areaSearch/components/AreaSearchApplicationListPage.tsx
index 62bbe0e59..b5671834e 100644
--- a/src/areaSearch/components/AreaSearchApplicationListPage.tsx
+++ b/src/areaSearch/components/AreaSearchApplicationListPage.tsx
@@ -7,46 +7,46 @@ import { Row, Column } from "react-foundation";
 import { formValueSelector, initialize, reduxForm } from "redux-form";
 import { withRouter } from "react-router";
 import debounce from "lodash/debounce";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import { FieldTypes, FormNames, Methods, PermissionMissingTexts } from "enums";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import PageContainer from "components/content/PageContainer";
-import Pagination from "components/table/Pagination";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import Search from "areaSearch/components/search/Search";
-import { LIST_TABLE_PAGE_SIZE } from "util/constants";
-import SortableTable from "components/table/SortableTable";
-import TableFilters from "components/table/TableFilters";
-import TableFilterWrapper from "components/table/TableFilterWrapper";
-import TableWrapper from "components/table/TableWrapper";
-import IconRadioButtons from "components/button/IconRadioButtons";
-import TableIcon from "components/icons/TableIcon";
-import MapIcon from "components/icons/MapIcon";
-import { getRouteById, Routes } from "root/routes";
-import { formatDate, getLabelOfOption, setPageTitle, getFieldOptions, getSearchQuery, getApiResponseCount, getApiResponseMaxPage, getUrlParams, isMethodAllowed } from "util/helpers";
-import { withAreaSearchAttributes } from "components/attributes/AreaSearchAttributes";
-import { getAreaSearchList, getAreaSearchListByBBox, getIsEditingAreaSearch, getIsFetchingAreaSearchList, getIsFetchingAreaSearchListByBBox, getLastAreaSearchEditError } from "areaSearch/selectors";
-import { DEFAULT_AREA_SEARCH_STATES, DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER } from "areaSearch/constants";
-import { editAreaSearch, fetchAreaSearchList, fetchAreaSearchListByBBox } from "areaSearch/actions";
-import { getUserFullName } from "users/helpers";
-import { areaSearchSearchFilters } from "areaSearch/helpers";
-import { BOUNDING_BOX_FOR_SEARCH_QUERY, MAX_ZOOM_LEVEL_TO_FETCH_AREA_SEARCHES } from "areaSearch/constants";
-import AreaSearchListMap from "areaSearch/components/map/AreaSearchListMap";
-import VisualisationTypeWrapper from "components/table/VisualisationTypeWrapper";
-import { ButtonColors } from "components/enums";
-import Button from "components/button/Button";
-import EditAreaSearchPreparerModal from "areaSearch/components/EditAreaSearchPreparerModal";
-import Authorization from "components/authorization/Authorization";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import FormField from "components/form/FormField";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import { FieldTypes, FormNames, Methods, PermissionMissingTexts } from "@/enums";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import PageContainer from "@/components/content/PageContainer";
+import Pagination from "@/components/table/Pagination";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import Search from "@/areaSearch/components/search/Search";
+import { LIST_TABLE_PAGE_SIZE } from "@/util/constants";
+import SortableTable from "@/components/table/SortableTable";
+import TableFilters from "@/components/table/TableFilters";
+import TableFilterWrapper from "@/components/table/TableFilterWrapper";
+import TableWrapper from "@/components/table/TableWrapper";
+import IconRadioButtons from "@/components/button/IconRadioButtons";
+import TableIcon from "@/components/icons/TableIcon";
+import MapIcon from "@/components/icons/MapIcon";
+import { getRouteById, Routes } from "@/root/routes";
+import { formatDate, getLabelOfOption, setPageTitle, getFieldOptions, getSearchQuery, getApiResponseCount, getApiResponseMaxPage, getUrlParams, isMethodAllowed } from "@/util/helpers";
+import { withAreaSearchAttributes } from "@/components/attributes/AreaSearchAttributes";
+import { getAreaSearchList, getAreaSearchListByBBox, getIsEditingAreaSearch, getIsFetchingAreaSearchList, getIsFetchingAreaSearchListByBBox, getLastAreaSearchEditError } from "@/areaSearch/selectors";
+import { DEFAULT_AREA_SEARCH_STATES, DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER } from "@/areaSearch/constants";
+import { editAreaSearch, fetchAreaSearchList, fetchAreaSearchListByBBox } from "@/areaSearch/actions";
+import { getUserFullName } from "@/users/helpers";
+import { areaSearchSearchFilters } from "@/areaSearch/helpers";
+import { BOUNDING_BOX_FOR_SEARCH_QUERY, MAX_ZOOM_LEVEL_TO_FETCH_AREA_SEARCHES } from "@/areaSearch/constants";
+import AreaSearchListMap from "@/areaSearch/components/map/AreaSearchListMap";
+import VisualisationTypeWrapper from "@/components/table/VisualisationTypeWrapper";
+import { ButtonColors } from "@/components/enums";
+import Button from "@/components/button/Button";
+import EditAreaSearchPreparerModal from "@/areaSearch/components/EditAreaSearchPreparerModal";
+import Authorization from "@/components/authorization/Authorization";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import FormField from "@/components/form/FormField";
 import type { Attributes, Methods as MethodsType } from "types";
 import type { ApiResponse } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
-import AreaSearchExportModal from "areaSearch/components/AreaSearchExportModal";
-import { getUserActiveServiceUnit } from "usersPermissions/selectors";
-import type { UserServiceUnit } from "usersPermissions/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
+import AreaSearchExportModal from "@/areaSearch/components/AreaSearchExportModal";
+import { getUserActiveServiceUnit } from "@/usersPermissions/selectors";
+import type { UserServiceUnit } from "@/usersPermissions/types";
 const VisualizationTypes = {
   MAP: 'map',
   TABLE: 'table'
diff --git a/src/areaSearch/components/AreaSearchApplicationPage.tsx b/src/areaSearch/components/AreaSearchApplicationPage.tsx
index 6ba7e9cc0..42797a087 100644
--- a/src/areaSearch/components/AreaSearchApplicationPage.tsx
+++ b/src/areaSearch/components/AreaSearchApplicationPage.tsx
@@ -7,40 +7,40 @@ import isEmpty from "lodash/isEmpty";
 import { groupBy } from "lodash/collection";
 import { initialize, isDirty, destroy, getFormValues, isValid, change } from "redux-form";
 import type { ContextRouter } from "react-router";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import FullWidthContainer from "components/content/FullWidthContainer";
-import PageContainer from "components/content/PageContainer";
-import { ButtonColors } from "components/enums";
-import Loader from "components/loader/Loader";
-import TabContent from "components/tabs/TabContent";
-import TabPane from "components/tabs/TabPane";
-import Tabs from "components/tabs/Tabs";
-import ContentContainer from "components/content/ContentContainer";
-import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors";
-import PageNavigationWrapper from "components/content/PageNavigationWrapper";
-import ControlButtonBar from "components/controlButtons/ControlButtonBar";
-import ControlButtons from "components/controlButtons/ControlButtons";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { getRouteById, Routes } from "root/routes";
-import { ConfirmationModalTexts, FormNames, Methods, PermissionMissingTexts } from "enums";
-import { getIsEditMode, getIsSaveClicked, getIsFormValidFlags, getCurrentAreaSearch, getIsFetchingCurrentAreaSearch } from "areaSearch/selectors";
-import { showEditMode, receiveIsSaveClicked, hideEditMode, clearFormValidFlags, receiveFormValidFlags, fetchSingleAreaSearch, batchEditAreaSearchInfoChecks } from "areaSearch/actions";
-import { getUrlParams, setPageTitle, isMethodAllowed, getSearchQuery, scrollToTopPage } from "util/helpers";
-import { clearUnsavedChanges } from "contacts/helpers";
-import ConfirmationModal from "components/modal/ConfirmationModal";
-import AreaSearchApplication from "areaSearch/components/AreaSearchApplication";
-import { withAreaSearchAttributes } from "components/attributes/AreaSearchAttributes";
-import AreaSearchApplicationEdit from "areaSearch/components/AreaSearchApplicationEdit";
-import AreaSearchApplicationAuditLog from "areaSearch/components/AreaSearchApplicationAuditLog";
-import { fetchApplicantInfoCheckAttributes, fetchFormAttributes } from "application/actions";
-import { getFormAttributes, getIsFetchingApplicantInfoCheckAttributes, getIsFetchingFormAttributes } from "application/selectors";
-import { getApplicationApplicantInfoCheckData } from "areaSearch/selectors";
-import { getApplicantInfoCheckFormName, getApplicantInfoCheckItems, prepareApplicantInfoCheckForSubmission } from "application/helpers";
-import { prepareAreaSearchForSubmission } from "areaSearch/helpers";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import FullWidthContainer from "@/components/content/FullWidthContainer";
+import PageContainer from "@/components/content/PageContainer";
+import { ButtonColors } from "@/components/enums";
+import Loader from "@/components/loader/Loader";
+import TabContent from "@/components/tabs/TabContent";
+import TabPane from "@/components/tabs/TabPane";
+import Tabs from "@/components/tabs/Tabs";
+import ContentContainer from "@/components/content/ContentContainer";
+import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors";
+import PageNavigationWrapper from "@/components/content/PageNavigationWrapper";
+import ControlButtonBar from "@/components/controlButtons/ControlButtonBar";
+import ControlButtons from "@/components/controlButtons/ControlButtons";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { getRouteById, Routes } from "@/root/routes";
+import { ConfirmationModalTexts, FormNames, Methods, PermissionMissingTexts } from "@/enums";
+import { getIsEditMode, getIsSaveClicked, getIsFormValidFlags, getCurrentAreaSearch, getIsFetchingCurrentAreaSearch } from "@/areaSearch/selectors";
+import { showEditMode, receiveIsSaveClicked, hideEditMode, clearFormValidFlags, receiveFormValidFlags, fetchSingleAreaSearch, batchEditAreaSearchInfoChecks } from "@/areaSearch/actions";
+import { getUrlParams, setPageTitle, isMethodAllowed, getSearchQuery, scrollToTopPage } from "@/util/helpers";
+import { clearUnsavedChanges } from "@/contacts/helpers";
+import ConfirmationModal from "@/components/modal/ConfirmationModal";
+import AreaSearchApplication from "@/areaSearch/components/AreaSearchApplication";
+import { withAreaSearchAttributes } from "@/components/attributes/AreaSearchAttributes";
+import AreaSearchApplicationEdit from "@/areaSearch/components/AreaSearchApplicationEdit";
+import AreaSearchApplicationAuditLog from "@/areaSearch/components/AreaSearchApplicationAuditLog";
+import { fetchApplicantInfoCheckAttributes, fetchFormAttributes } from "@/application/actions";
+import { getFormAttributes, getIsFetchingApplicantInfoCheckAttributes, getIsFetchingFormAttributes } from "@/application/selectors";
+import { getApplicationApplicantInfoCheckData } from "@/areaSearch/selectors";
+import { getApplicantInfoCheckFormName, getApplicantInfoCheckItems, prepareApplicantInfoCheckForSubmission } from "@/application/helpers";
+import { prepareAreaSearchForSubmission } from "@/areaSearch/helpers";
 import type { Attributes, Methods as MethodsType } from "types";
-import type { InfoCheckBatchEditData } from "areaSearch/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
-import SingleAreaSearchMap from "areaSearch/components/map/SingleAreaSearchMap";
+import type { InfoCheckBatchEditData } from "@/areaSearch/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
+import SingleAreaSearchMap from "@/areaSearch/components/map/SingleAreaSearchMap";
 type OwnProps = {};
 type Props = ContextRouter & OwnProps & {
   clearFormValidFlags: (...args: Array<any>) => any;
diff --git a/src/areaSearch/components/AreaSearchApplicationPropertyIdentifiers.tsx b/src/areaSearch/components/AreaSearchApplicationPropertyIdentifiers.tsx
index 29d544bb7..9d34c5a04 100644
--- a/src/areaSearch/components/AreaSearchApplicationPropertyIdentifiers.tsx
+++ b/src/areaSearch/components/AreaSearchApplicationPropertyIdentifiers.tsx
@@ -1,6 +1,6 @@
 import React, { Component, Fragment } from "react";
-import Button from "components/button/Button";
-import { ButtonColors } from "components/enums";
+import Button from "@/components/button/Button";
+import { ButtonColors } from "@/components/enums";
 type Props = {
   ids: Array<string> | null | undefined;
 };
@@ -13,7 +13,7 @@ class AreaSearchApplicationPropertyIdentifiers extends Component<Props, State> {
     expanded: false
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       ids
     } = this.props;
diff --git a/src/areaSearch/components/AreaSearchExportModal.tsx b/src/areaSearch/components/AreaSearchExportModal.tsx
index 244e9dc6b..295b57219 100644
--- a/src/areaSearch/components/AreaSearchExportModal.tsx
+++ b/src/areaSearch/components/AreaSearchExportModal.tsx
@@ -2,15 +2,15 @@ import React, { Component } from "react";
 import { formValueSelector, reduxForm } from "redux-form";
 import { flowRight } from "lodash/util";
 import { connect } from "react-redux";
-import Modal from "components/modal/Modal";
-import ModalButtonWrapper from "components/modal/ModalButtonWrapper";
-import Button from "components/button/Button";
-import { ButtonColors } from "components/enums";
-import FileDownloadButton from "components/file/FileDownloadButton";
-import FormField from "components/form/FormField";
-import { FieldTypes, FormNames } from "enums";
-import type { RootState } from "root/types";
-import createUrl from "api/createUrl";
+import Modal from "@/components/modal/Modal";
+import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper";
+import Button from "@/components/button/Button";
+import { ButtonColors } from "@/components/enums";
+import FileDownloadButton from "@/components/file/FileDownloadButton";
+import FormField from "@/components/form/FormField";
+import { FieldTypes, FormNames } from "@/enums";
+import type { RootState } from "@/root/types";
+import createUrl from "@/api/createUrl";
 type OwnProps = {
   isOpen: boolean;
   onClose: () => void;
@@ -41,7 +41,7 @@ class AreaSearchExportModal extends Component<Props> {
     }
   }
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       isOpen,
       onClose,
diff --git a/src/areaSearch/components/AreaSearchStatusNoteHistory.tsx b/src/areaSearch/components/AreaSearchStatusNoteHistory.tsx
index 94a9138ee..3146bdf7d 100644
--- a/src/areaSearch/components/AreaSearchStatusNoteHistory.tsx
+++ b/src/areaSearch/components/AreaSearchStatusNoteHistory.tsx
@@ -1,13 +1,13 @@
 import React, { Component } from "react";
-import Collapse from "components/collapse/Collapse";
-import { formatDate } from "util/helpers";
-import { getUserFullName } from "users/helpers";
+import Collapse from "@/components/collapse/Collapse";
+import { formatDate } from "@/util/helpers";
+import { getUserFullName } from "@/users/helpers";
 type Props = {
   statusNotes: Array<Record<string, any>> | null | undefined;
 };
 
 class AreaSearchStatusNoteHistory extends Component<Props> {
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       statusNotes
     } = this.props;
diff --git a/src/areaSearch/components/EditAreaSearchPreparerForm.tsx b/src/areaSearch/components/EditAreaSearchPreparerForm.tsx
index 4227e2fa0..f6f968752 100644
--- a/src/areaSearch/components/EditAreaSearchPreparerForm.tsx
+++ b/src/areaSearch/components/EditAreaSearchPreparerForm.tsx
@@ -4,16 +4,16 @@ import { getFormValues, reduxForm } from "redux-form";
 import { connect } from "react-redux";
 import { Column, Row } from "react-foundation";
 import get from "lodash/get";
-import { editAreaSearch } from "areaSearch/actions";
-import FormField from "components/form/FormField";
-import { getAttributes } from "areaSearch/selectors";
-import { AreaSearchFieldTitles } from "areaSearch/enums";
-import { FieldTypes, FormNames } from "enums";
-import Button from "components/button/Button";
-import { ButtonColors } from "components/enums";
-import { getInitialAreaSearchEditForm } from "areaSearch/helpers";
-import ModalButtonWrapper from "components/modal/ModalButtonWrapper";
-import AreaSearchStatusNoteHistory from "areaSearch/components/AreaSearchStatusNoteHistory";
+import { editAreaSearch } from "@/areaSearch/actions";
+import FormField from "@/components/form/FormField";
+import { getAttributes } from "@/areaSearch/selectors";
+import { AreaSearchFieldTitles } from "@/areaSearch/enums";
+import { FieldTypes, FormNames } from "@/enums";
+import Button from "@/components/button/Button";
+import { ButtonColors } from "@/components/enums";
+import { getInitialAreaSearchEditForm } from "@/areaSearch/helpers";
+import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper";
+import AreaSearchStatusNoteHistory from "@/areaSearch/components/AreaSearchStatusNoteHistory";
 import type { Attributes } from "types";
 type OwnProps = {
   onClose: (...args: Array<any>) => any;
@@ -51,7 +51,7 @@ class EditAreaSearchPreparerForm extends Component<Props> {
     }
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       areaSearchAttributes,
       areaSearchData,
diff --git a/src/areaSearch/components/EditAreaSearchPreparerModal.tsx b/src/areaSearch/components/EditAreaSearchPreparerModal.tsx
index f7bfc8a42..7033e5644 100644
--- a/src/areaSearch/components/EditAreaSearchPreparerModal.tsx
+++ b/src/areaSearch/components/EditAreaSearchPreparerModal.tsx
@@ -1,10 +1,10 @@
 import React, { Component } from "react";
-import Modal from "components/modal/Modal";
-import EditAreaSearchPreparerForm from "areaSearch/components/EditAreaSearchPreparerForm";
-import { getAreaSearchList } from "areaSearch/selectors";
+import Modal from "@/components/modal/Modal";
+import EditAreaSearchPreparerForm from "@/areaSearch/components/EditAreaSearchPreparerForm";
+import { getAreaSearchList } from "@/areaSearch/selectors";
 import { connect } from "react-redux";
-import { formatDate } from "util/helpers";
-import FormText from "components/form/FormText";
+import { formatDate } from "@/util/helpers";
+import FormText from "@/components/form/FormText";
 type OwnProps = {
   allowToChangeRelateTo?: boolean;
   isOpen: boolean;
@@ -29,7 +29,7 @@ class EditAreaSearchPreparerModal extends Component<Props> {
     this.form = element;
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       isOpen,
       onClose,
diff --git a/src/areaSearch/components/map/AreaSearchLayer.tsx b/src/areaSearch/components/map/AreaSearchLayer.tsx
index 8752dd730..6abbb20da 100644
--- a/src/areaSearch/components/map/AreaSearchLayer.tsx
+++ b/src/areaSearch/components/map/AreaSearchLayer.tsx
@@ -3,10 +3,10 @@ import { withRouter } from "react-router";
 import { FeatureGroup, GeoJSON, Popup } from "react-leaflet";
 import flowRight from "lodash/flowRight";
 import { Link } from "react-router-dom";
-import { getRouteById, Routes } from "root/routes";
+import { getRouteById, Routes } from "@/root/routes";
 import type { Attributes, LeafletGeoJson } from "types";
-import { withAreaSearchAttributes } from "components/attributes/AreaSearchAttributes";
-import { formatDate, getFieldOptions, getLabelOfOption } from "util/helpers";
+import { withAreaSearchAttributes } from "@/components/attributes/AreaSearchAttributes";
+import { formatDate, getFieldOptions, getLabelOfOption } from "@/util/helpers";
 type OwnProps = {
   color: string;
   areaSearchesGeoJson: LeafletGeoJson;
diff --git a/src/areaSearch/components/map/AreaSearchListMap.tsx b/src/areaSearch/components/map/AreaSearchListMap.tsx
index f42b479d9..f24ab6abd 100644
--- a/src/areaSearch/components/map/AreaSearchListMap.tsx
+++ b/src/areaSearch/components/map/AreaSearchListMap.tsx
@@ -3,19 +3,19 @@ import { connect } from "react-redux";
 import { withRouter } from "react-router";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import AreaNotesEditMap from "areaNote/components/AreaNotesEditMap";
-import { DEFAULT_ZOOM, MAP_COLORS } from "util/constants";
-import { getApiResponseResults, getUrlParams } from "util/helpers";
-import { getBoundsFromBBox, getBoundsFromFeatures } from "util/map";
-import { getAreaNoteList } from "areaNote/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import AreaSearchLayer from "areaSearch/components/map/AreaSearchLayer";
-import { getAreaSearchListByBBox } from "areaSearch/selectors";
-import { getAreaSearchGeoJson } from "areaSearch/helpers";
-import { MAX_ZOOM_LEVEL_TO_FETCH_AREA_SEARCHES } from "areaSearch/constants";
+import AreaNotesEditMap from "@/areaNote/components/AreaNotesEditMap";
+import { DEFAULT_ZOOM, MAP_COLORS } from "@/util/constants";
+import { getApiResponseResults, getUrlParams } from "@/util/helpers";
+import { getBoundsFromBBox, getBoundsFromFeatures } from "@/util/map";
+import { getAreaNoteList } from "@/areaNote/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import AreaSearchLayer from "@/areaSearch/components/map/AreaSearchLayer";
+import { getAreaSearchListByBBox } from "@/areaSearch/selectors";
+import { getAreaSearchGeoJson } from "@/areaSearch/helpers";
+import { MAX_ZOOM_LEVEL_TO_FETCH_AREA_SEARCHES } from "@/areaSearch/constants";
 import type { ApiResponse, LeafletGeoJson } from "types";
-import type { AreaNoteList } from "areaNote/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { AreaNoteList } from "@/areaNote/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 
 const getMapBounds = () => {
   const {
diff --git a/src/areaSearch/components/map/AreaSearchMap.tsx b/src/areaSearch/components/map/AreaSearchMap.tsx
index a98106061..381a4bfc0 100644
--- a/src/areaSearch/components/map/AreaSearchMap.tsx
+++ b/src/areaSearch/components/map/AreaSearchMap.tsx
@@ -1,11 +1,15 @@
 import React, { Component } from "react";
 import { FeatureGroup } from "react-leaflet";
 import { EditControl } from "react-leaflet-draw";
+// This is a hack to get react-leaflet-draw, the issue and solution described at:
+// https://github.com/Leaflet/Leaflet.draw/issues/1026#issuecomment-986702652
+// @ts-ignore
+window.type = true; 
 import throttle from "lodash/throttle";
 import classNames from "classnames";
-import MapContainer from "areaNote/components/MapContainer";
-import { DEFAULT_CENTER, DEFAULT_ZOOM } from "util/constants";
-import { convertFeatureCollectionToFeature } from "areaNote/helpers";
+import MapContainer from "@/areaNote/components/MapContainer";
+import { DEFAULT_CENTER, DEFAULT_ZOOM } from "@/util/constants";
+import { convertFeatureCollectionToFeature } from "@/areaNote/helpers";
 const SHAPE_COLOR = '#9c27b0';
 const SHAPE_FILL_OPACITY = 0.5;
 const SHAPE_ERROR_COLOR = '#bd2719';
@@ -64,7 +68,7 @@ class AreaSearchMap extends Component<Props, State> {
     change(convertFeatureCollectionToFeature(features).geometry);
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       hasError
     } = this.props;
diff --git a/src/areaSearch/components/map/SingleAreaSearchMap.tsx b/src/areaSearch/components/map/SingleAreaSearchMap.tsx
index ed56749c5..f6e8a1867 100644
--- a/src/areaSearch/components/map/SingleAreaSearchMap.tsx
+++ b/src/areaSearch/components/map/SingleAreaSearchMap.tsx
@@ -1,11 +1,11 @@
 import React, { Component } from "react";
 import { FeatureGroup, GeoJSON } from "react-leaflet";
 import classNames from "classnames";
-import { DEFAULT_CENTER, DEFAULT_ZOOM } from "util/constants";
-import MapContainer from "areaNote/components/MapContainer";
-import { getBoundsFromFeatures, getCenterFromCoordinates, getCoordinatesOfGeometry } from "util/map";
+import { DEFAULT_CENTER, DEFAULT_ZOOM } from "@/util/constants";
+import MapContainer from "@/areaNote/components/MapContainer";
+import { getBoundsFromFeatures, getCenterFromCoordinates, getCoordinatesOfGeometry } from "@/util/map";
 import type { LeafletFeatureGeometry } from "types";
-import { getAreaSearchFeatures } from "areaSearch/helpers";
+import { getAreaSearchFeatures } from "@/areaSearch/helpers";
 type Props = {
   geometry: LeafletFeatureGeometry;
   minimap?: boolean;
@@ -55,7 +55,7 @@ class SingleAreaSearchMap extends Component<Props> {
     this.initialize();
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       geometry,
       minimap = false
diff --git a/src/areaSearch/components/search/Search.tsx b/src/areaSearch/components/search/Search.tsx
index fd637ca38..a4b748057 100644
--- a/src/areaSearch/components/search/Search.tsx
+++ b/src/areaSearch/components/search/Search.tsx
@@ -7,21 +7,21 @@ import debounce from "lodash/debounce";
 import flowRight from "lodash/flowRight";
 import isEqual from "lodash/isEqual";
 import isEmpty from "lodash/isEmpty";
-import { getFieldOptions, getUrlParams } from "util/helpers";
-import FormField from "components/form/FormField";
-import SearchClearLink from "components/search/SearchClearLink";
-import SearchChangeTypeLink from "components/search/SearchChangeTypeLink";
-import SearchContainer from "components/search/SearchContainer";
-import SearchRow from "components/search/SearchRow";
-import SearchLabelColumn from "components/search/SearchLabelColumn";
-import SearchLabel from "components/search/SearchLabel";
-import SearchInputColumn from "components/search/SearchInputColumn";
-import { FieldTypes, FormNames } from "enums";
+import { getFieldOptions, getUrlParams } from "@/util/helpers";
+import FormField from "@/components/form/FormField";
+import SearchClearLink from "@/components/search/SearchClearLink";
+import SearchChangeTypeLink from "@/components/search/SearchChangeTypeLink";
+import SearchContainer from "@/components/search/SearchContainer";
+import SearchRow from "@/components/search/SearchRow";
+import SearchLabelColumn from "@/components/search/SearchLabelColumn";
+import SearchLabel from "@/components/search/SearchLabel";
+import SearchInputColumn from "@/components/search/SearchInputColumn";
+import { FieldTypes, FormNames } from "@/enums";
 import type { ApiResponse, Attributes } from "types";
-import { getAreaSearchList, getAttributes } from "areaSearch/selectors";
-import SearchSubtitleLabel from "components/search/SearchSubtitleLabel";
-import { AreaSearchFieldPaths } from "areaSearch/enums";
-import { getIsFetching as getIsFetchingDistricts } from "district/selectors";
+import { getAreaSearchList, getAttributes } from "@/areaSearch/selectors";
+import SearchSubtitleLabel from "@/components/search/SearchSubtitleLabel";
+import { AreaSearchFieldPaths } from "@/areaSearch/enums";
+import { getIsFetching as getIsFetchingDistricts } from "@/district/selectors";
 type OwnProps = {
   isSearchInitialized: boolean;
   onSearch: (...args: Array<any>) => any;
@@ -100,7 +100,6 @@ class Search extends Component<Props, State> {
     delete searchQuery.zoom;
     const keys = Object.keys(searchQuery);
 
-    // $FlowFixMe[method-unbinding] https://github.com/facebook/flow/issues/8689
     if (!keys.length || keys.length === 1 && Object.prototype.hasOwnProperty.call(searchQuery, 'search')) {
       return true;
     }
diff --git a/src/areaSearch/constants.ts b/src/areaSearch/constants.ts
index f77beb893..89f1dd3b5 100644
--- a/src/areaSearch/constants.ts
+++ b/src/areaSearch/constants.ts
@@ -1,4 +1,4 @@
-import { TableSortOrder } from "enums";
+import { TableSortOrder } from "@/enums";
 export const DEFAULT_AREA_SEARCH_STATES: Array<string> = [];
 export const DEFAULT_SORT_KEY = 'identifier';
 export const DEFAULT_SORT_ORDER = TableSortOrder.ASCENDING;
diff --git a/src/areaSearch/helpers.ts b/src/areaSearch/helpers.ts
index 0a00ac687..8010a0fd3 100644
--- a/src/areaSearch/helpers.ts
+++ b/src/areaSearch/helpers.ts
@@ -1,14 +1,14 @@
 import isArray from "lodash/isArray";
 import get from "lodash/get";
 import { formValueSelector, getFormValues } from "redux-form";
-import { FormNames, TableSortOrder } from "enums";
-import { APPLICANT_MAIN_IDENTIFIERS } from "application/constants";
-import { getUserFullName } from "users/helpers";
-import { store } from "root/startApp";
-import { getCurrentAreaSearch } from "areaSearch/selectors";
-import { prepareApplicationForSubmission } from "application/helpers";
+import { FormNames, TableSortOrder } from "@/enums";
+import { APPLICANT_MAIN_IDENTIFIERS } from "@/application/constants";
+import { getUserFullName } from "@/users/helpers";
+import { store } from "@/index";
+import { getCurrentAreaSearch } from "@/areaSearch/selectors";
+import { prepareApplicationForSubmission } from "@/application/helpers";
 import type { LeafletFeature, LeafletGeoJson } from "types";
-import type { SavedApplicationFormSection } from "application/types";
+import type { SavedApplicationFormSection } from "@/application/types";
 export const areaSearchSearchFilters = (query: Record<string, any>): Record<string, any> => {
   const searchQuery = { ...query
   };
diff --git a/src/areaSearch/reducer.ts b/src/areaSearch/reducer.ts
index eacd83ca9..aebf109b2 100644
--- a/src/areaSearch/reducer.ts
+++ b/src/areaSearch/reducer.ts
@@ -2,8 +2,8 @@ import { combineReducers } from "redux";
 import type { Action } from "redux";
 import { handleActions } from "redux-actions";
 import type { Attributes, Methods, Reducer } from "types";
-import type { AreaSearchState, ReceiveAreaSearchEditFailedAction, ReceiveAreaSearchListAction, ReceiveCollapseStatesAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ReceiveSingleAreaSearchAction } from "areaSearch/types";
-import type { ReceiveAttributesAction, ReceiveMethodsAction, SetAreaSearchAttachmentsAction } from "areaSearch/types";
+import type { AreaSearchState, ReceiveAreaSearchEditFailedAction, ReceiveAreaSearchListAction, ReceiveCollapseStatesAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ReceiveSingleAreaSearchAction } from "@/areaSearch/types";
+import type { ReceiveAttributesAction, ReceiveMethodsAction, SetAreaSearchAttachmentsAction } from "@/areaSearch/types";
 import type { ApiResponse } from "types";
 import merge from "lodash/merge";
 const attributesReducer: Reducer<Attributes> = handleActions({
diff --git a/src/areaSearch/requests.ts b/src/areaSearch/requests.ts
index e3aa3325f..746330430 100644
--- a/src/areaSearch/requests.ts
+++ b/src/areaSearch/requests.ts
@@ -1,6 +1,6 @@
-import callApi from "api/callApi";
-import createUrl from "api/createUrl";
-import callUploadRequest from "api/callUploadRequest";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
+import callUploadRequest from "@/api/callUploadRequest";
 export const fetchAreaSearchListAttributesRequest = (): Generator<any, any, any> => {
   return callApi(new Request(createUrl('area_search/'), {
     method: 'OPTIONS'
diff --git a/src/areaSearch/saga.ts b/src/areaSearch/saga.ts
index edd64d2c7..6e0ce5700 100644
--- a/src/areaSearch/saga.ts
+++ b/src/areaSearch/saga.ts
@@ -1,14 +1,14 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
-import { receiveError } from "api/actions";
-import { receiveAttributes, receiveMethods, attributesNotFound, receiveAreaSearchList, areaSearchesNotFound, areaSearchesByBBoxNotFound, receiveAreaSearchByBBoxList, receiveSingleAreaSearch, singleAreaSearchNotFound, listAttributesNotFound, receiveListAttributes, receiveListMethods, receiveAreaSearchInfoChecksBatchEditFailure, receiveAreaSearchInfoChecksBatchEditSuccess, hideEditMode, fetchSingleAreaSearch, receiveAreaSearchEdited, receiveAreaSearchEditFailed, receiveAreaSearchSpecsCreated, receiveAreaSearchSpecsCreateFailed, receiveAreaSearchApplicationCreated, receiveAreaSearchApplicationCreateFailed, receiveFileOperationFailed, receiveFileOperationFinished } from "areaSearch/actions";
-import { editSingleAreaSearchRequest, fetchAreaSearchAttributesRequest, fetchAreaSearchesRequest, fetchAreaSearchListAttributesRequest, fetchSingleAreaSearchRequest, createAreaSearchSpecsRequest, deleteAreaSearchAttachmentRequest, uploadAreaSearchAttachmentRequest } from "areaSearch/requests";
-import { editApplicantInfoCheckItemRequest } from "plotApplications/requests";
-import { receiveUpdatedApplicantInfoCheckItem } from "application/actions";
-import { displayUIMessage } from "util/helpers";
+import { receiveError } from "@/api/actions";
+import { receiveAttributes, receiveMethods, attributesNotFound, receiveAreaSearchList, areaSearchesNotFound, areaSearchesByBBoxNotFound, receiveAreaSearchByBBoxList, receiveSingleAreaSearch, singleAreaSearchNotFound, listAttributesNotFound, receiveListAttributes, receiveListMethods, receiveAreaSearchInfoChecksBatchEditFailure, receiveAreaSearchInfoChecksBatchEditSuccess, hideEditMode, fetchSingleAreaSearch, receiveAreaSearchEdited, receiveAreaSearchEditFailed, receiveAreaSearchSpecsCreated, receiveAreaSearchSpecsCreateFailed, receiveAreaSearchApplicationCreated, receiveAreaSearchApplicationCreateFailed, receiveFileOperationFailed, receiveFileOperationFinished } from "@/areaSearch/actions";
+import { editSingleAreaSearchRequest, fetchAreaSearchAttributesRequest, fetchAreaSearchesRequest, fetchAreaSearchListAttributesRequest, fetchSingleAreaSearchRequest, createAreaSearchSpecsRequest, deleteAreaSearchAttachmentRequest, uploadAreaSearchAttachmentRequest } from "@/areaSearch/requests";
+import { editApplicantInfoCheckItemRequest } from "@/plotApplications/requests";
+import { receiveUpdatedApplicantInfoCheckItem } from "@/application/actions";
+import { displayUIMessage } from "@/util/helpers";
 import { push } from "react-router-redux";
-import { getRouteById, Routes } from "root/routes";
-import { createApplicationRequest } from "application/requests";
-import type { DeleteAreaSearchAttachmentAction, UploadAreaSearchAttachmentAction } from "areaSearch/types";
+import { getRouteById, Routes } from "@/root/routes";
+import { createApplicationRequest } from "@/application/requests";
+import type { DeleteAreaSearchAttachmentAction, UploadAreaSearchAttachmentAction } from "@/areaSearch/types";
 
 function* fetchListAttributesSaga(): Generator<any, any, any> {
   try {
diff --git a/src/areaSearch/selectors.ts b/src/areaSearch/selectors.ts
index 7643a233c..fccc3d08a 100644
--- a/src/areaSearch/selectors.ts
+++ b/src/areaSearch/selectors.ts
@@ -1,6 +1,6 @@
 import get from "lodash/get";
 import type { ApiResponse, Attributes, Methods, Selector } from "types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 export const getAttributes: Selector<Attributes, void> = (state: RootState): Attributes => state.areaSearch.attributes;
 export const getMethods: Selector<Methods, void> = (state: RootState): Methods => state.areaSearch.methods;
 export const getIsFetchingAttributes: Selector<boolean, void> = (state: RootState): boolean => state.areaSearch.isFetchingAttributes;
diff --git a/src/areaSearch/types.ts b/src/areaSearch/types.ts
index 836573484..bad25af4f 100644
--- a/src/areaSearch/types.ts
+++ b/src/areaSearch/types.ts
@@ -1,5 +1,5 @@
 import type { Action, ApiResponse, Attributes, Methods, User } from "types";
-import type { UploadedFileMeta } from "application/types";
+import type { UploadedFileMeta } from "@/application/types";
 export type AreaSearchState = {
   attributes: Attributes;
   methods: Methods;
diff --git a/src/auditLog/actions.ts b/src/auditLog/actions.ts
index 5415976a9..8ce38b6ff 100644
--- a/src/auditLog/actions.ts
+++ b/src/auditLog/actions.ts
@@ -1,8 +1,8 @@
 import { createAction } from "redux-actions";
-import type { ContactId } from "contacts/types";
-import type { LeaseId } from "leases/types";
-import type { AreaSearchId } from "areaSearch/types";
-import type { AuditLogListMap, FetchAuditLogByContactAction, ReceiveAuditLogByContactAction, NotFoundByContactAction, FetchAuditLogByLeaseAction, ReceiveAuditLogByLeaseAction, NotFoundByLeaseAction, FetchAuditLogByAreaSearchAction, ReceiveAuditLogByAreaSearchAction, NotFoundByAreaSearchAction } from "auditLog/types";
+import type { ContactId } from "@/contacts/types";
+import type { LeaseId } from "@/leases/types";
+import type { AreaSearchId } from "@/areaSearch/types";
+import type { AuditLogListMap, FetchAuditLogByContactAction, ReceiveAuditLogByContactAction, NotFoundByContactAction, FetchAuditLogByLeaseAction, ReceiveAuditLogByLeaseAction, NotFoundByLeaseAction, FetchAuditLogByAreaSearchAction, ReceiveAuditLogByAreaSearchAction, NotFoundByAreaSearchAction } from "@/auditLog/types";
 export const fetchAuditLogByContact = (contactId: ContactId): FetchAuditLogByContactAction => createAction('mvj/auditLog/FETCH_BY_CONTACT')(contactId);
 export const receiveAuditLogByContact = (payload: AuditLogListMap): ReceiveAuditLogByContactAction => createAction('mvj/auditLog/RECEIVE_BY_CONTACT')(payload);
 export const notFoundByContact = (contactId: ContactId): NotFoundByContactAction => createAction('mvj/auditLog/NOT_FOUND_BY_CONTACT')(contactId);
diff --git a/src/auditLog/spec.ts b/src/auditLog/auditlog.spec.ts
similarity index 98%
rename from src/auditLog/spec.ts
rename to src/auditLog/auditlog.spec.ts
index 093b9cdec..aef8dc904 100644
--- a/src/auditLog/spec.ts
+++ b/src/auditLog/auditlog.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchAuditLogByContact, receiveAuditLogByContact, notFoundByContact, fetchAuditLogByLease, receiveAuditLogByLease, notFoundByLease } from "./actions";
 import auditLogReducer from "./reducer";
 import type { AuditLogState } from "./types";
diff --git a/src/auditLog/helpers.ts b/src/auditLog/helpers.ts
index cf164fda7..f87e3f63a 100644
--- a/src/auditLog/helpers.ts
+++ b/src/auditLog/helpers.ts
@@ -1,8 +1,8 @@
 import get from "lodash/get";
-import { InfillDevelopmentCompensationLeasesFieldPaths, InfillDevelopmentCompensationLeaseDecisionsFieldPaths, InfillDevelopmentCompensationLeaseIntendedUsesFieldPaths } from "infillDevelopment/enums";
-import { InvoicePaymentsFieldPaths, InvoiceRowsFieldPaths } from "invoices/enums";
-import { LeaseAreasFieldPaths, LeaseAreaAddressesFieldPaths, LeaseBasisOfRentsFieldPaths, LeaseContractsFieldPaths, LeaseContractChangesFieldPaths, LeaseContractCollateralsFieldPaths, LeaseConstructabilityDescriptionsFieldPaths, LeaseDecisionsFieldPaths, LeaseDecisionConditionsFieldPaths, LeaseInspectionsFieldPaths, LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths, LeaseRentsFieldPaths, LeaseRentContractRentsFieldPaths, LeaseRentDueDatesFieldPaths, LeaseRentFixedInitialYearRentsFieldPaths, LeaseRentAdjustmentsFieldPaths, LeaseTenantsFieldPaths, LeaseTenantContactSetFieldPaths } from "leases/enums";
-import { getFieldAttributes } from "util/helpers";
+import { InfillDevelopmentCompensationLeasesFieldPaths, InfillDevelopmentCompensationLeaseDecisionsFieldPaths, InfillDevelopmentCompensationLeaseIntendedUsesFieldPaths } from "@/infillDevelopment/enums";
+import { InvoicePaymentsFieldPaths, InvoiceRowsFieldPaths } from "@/invoices/enums";
+import { LeaseAreasFieldPaths, LeaseAreaAddressesFieldPaths, LeaseBasisOfRentsFieldPaths, LeaseContractsFieldPaths, LeaseContractChangesFieldPaths, LeaseContractCollateralsFieldPaths, LeaseConstructabilityDescriptionsFieldPaths, LeaseDecisionsFieldPaths, LeaseDecisionConditionsFieldPaths, LeaseInspectionsFieldPaths, LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths, LeaseRentsFieldPaths, LeaseRentContractRentsFieldPaths, LeaseRentDueDatesFieldPaths, LeaseRentFixedInitialYearRentsFieldPaths, LeaseRentAdjustmentsFieldPaths, LeaseTenantsFieldPaths, LeaseTenantContactSetFieldPaths } from "@/leases/enums";
+import { getFieldAttributes } from "@/util/helpers";
 import type { Attributes } from "types";
 
 /** 
diff --git a/src/auditLog/reducer.ts b/src/auditLog/reducer.ts
index 6dedc82c5..dda81f467 100644
--- a/src/auditLog/reducer.ts
+++ b/src/auditLog/reducer.ts
@@ -1,7 +1,7 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
 import type { Reducer } from "types";
-import type { AuditLogListMap, AuditLogIsFetchingMap, FetchAuditLogByContactAction, ReceiveAuditLogByContactAction, NotFoundByContactAction, FetchAuditLogByLeaseAction, ReceiveAuditLogByLeaseAction, NotFoundByLeaseAction, FetchAuditLogByAreaSearchAction, NotFoundByAreaSearchAction, ReceiveAuditLogByAreaSearchAction } from "auditLog/types";
+import type { AuditLogListMap, AuditLogIsFetchingMap, FetchAuditLogByContactAction, ReceiveAuditLogByContactAction, NotFoundByContactAction, FetchAuditLogByLeaseAction, ReceiveAuditLogByLeaseAction, NotFoundByLeaseAction, FetchAuditLogByAreaSearchAction, NotFoundByAreaSearchAction, ReceiveAuditLogByAreaSearchAction } from "@/auditLog/types";
 const isFetchingByContactReducer: Reducer<AuditLogIsFetchingMap> = handleActions({
   ['mvj/auditLog/FETCH_BY_CONTACT']: (state: AuditLogIsFetchingMap, {
     payload: contactId
diff --git a/src/auditLog/requests.ts b/src/auditLog/requests.ts
index 250e8e2b4..aa9333c43 100644
--- a/src/auditLog/requests.ts
+++ b/src/auditLog/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "api/callApi";
-import createUrl from "api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 export const fetchAuditLog = (params: Record<string, any>): Generator<any, any, any> => {
   return callApi(new Request(createUrl('auditlog/', params)));
 };
\ No newline at end of file
diff --git a/src/auditLog/saga.ts b/src/auditLog/saga.ts
index 6d5d9c81e..0e3be8de3 100644
--- a/src/auditLog/saga.ts
+++ b/src/auditLog/saga.ts
@@ -1,5 +1,5 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
-import { receiveError } from "api/actions";
+import { receiveError } from "@/api/actions";
 import { receiveAuditLogByContact, notFoundByContact, receiveAuditLogByLease, notFoundByLease, receiveAuditLogByAreaSearch, notFoundByAreaSearch } from "./actions";
 import { fetchAuditLog } from "./requests";
 
diff --git a/src/auditLog/selectors.ts b/src/auditLog/selectors.ts
index e6f89b4c8..f8c020a37 100644
--- a/src/auditLog/selectors.ts
+++ b/src/auditLog/selectors.ts
@@ -1,4 +1,4 @@
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 import type { Selector } from "types";
 export const getIsFetchingByContact: Selector<boolean, string> = (state: RootState, contactId: string): boolean => state.auditLog.isFetchingByContact[contactId];
 export const getAuditLogByContact: Selector<boolean, string> = (state: RootState, contactId: string): boolean => state.auditLog.byContact[contactId];
diff --git a/src/auditLog/types.ts b/src/auditLog/types.ts
index 22fae8f6e..3e20fa5a2 100644
--- a/src/auditLog/types.ts
+++ b/src/auditLog/types.ts
@@ -1,7 +1,7 @@
-import type { Action } from "../types";
-import type { ContactId } from "contacts/types";
-import type { LeaseId } from "leases/types";
-import type { AreaSearchId } from "areaSearch/types";
+import type { Action } from "@/types";
+import type { ContactId } from "@/contacts/types";
+import type { LeaseId } from "@/leases/types";
+import type { AreaSearchId } from "@/areaSearch/types";
 export type AuditLogState = {
   byContact: AuditLogListMap;
   byLease: AuditLogListMap;
diff --git a/src/auth/spec.ts b/src/auth/auth.spec.ts
similarity index 97%
rename from src/auth/spec.ts
rename to src/auth/auth.spec.ts
index 73abaf513..b40b9ce6c 100644
--- a/src/auth/spec.ts
+++ b/src/auth/auth.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { clearApiToken, fetchApiToken, receiveApiToken, tokenNotFound } from "./actions";
 import authReducer from "./reducer";
 describe('Auth', () => {
diff --git a/src/auth/components/CallbackPage.tsx b/src/auth/components/CallbackPage.tsx
index 6294d279f..effcbba87 100644
--- a/src/auth/components/CallbackPage.tsx
+++ b/src/auth/components/CallbackPage.tsx
@@ -1,14 +1,14 @@
 import React, { PureComponent } from "react";
 import { withRouter } from "react-router";
 import { CallbackComponent, CallbackComponentProps } from "redux-oidc";
-import { getRedirectUrlFromSessionStorage } from "util/storage";
-import userManager from "auth/util/user-manager";
-import { getRouteById, Routes } from "root/routes";
+import { getRedirectUrlFromSessionStorage } from "@/util/storage";
+import userManager from "@/auth/util/user-manager";
+import { getRouteById, Routes } from "@/root/routes";
 type Props = {
   history: Record<string, any>;
 };
 
-const CallbackComponentWithChildren = ({ children, ...rest }: CallbackComponentProps & { children: React.ReactNode }): React.ReactNode => {
+const CallbackComponentWithChildren = ({ children, ...rest }: CallbackComponentProps & { children: JSX.Element }): JSX.Element => {
   return <CallbackComponent {...rest}>
         {children}
       </CallbackComponent>;
diff --git a/src/auth/reducer.ts b/src/auth/reducer.ts
index 38326648f..d5de7ff98 100644
--- a/src/auth/reducer.ts
+++ b/src/auth/reducer.ts
@@ -1,6 +1,6 @@
 import { handleActions } from "redux-actions";
 import { combineReducers } from "redux";
-import type { Reducer } from "../types";
+import type { Reducer } from "@/types";
 import type { ReceiveApiTokenAction } from "./types";
 const isFetchingReducer: Reducer<boolean> = handleActions({
   'mvj/auth/FETCH_API_TOKEN': () => true,
diff --git a/src/auth/saga.ts b/src/auth/saga.ts
index 3648817f5..9d728b631 100644
--- a/src/auth/saga.ts
+++ b/src/auth/saga.ts
@@ -1,14 +1,14 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { tokenNotFound, receiveApiToken } from "./actions";
-import { getEpochTime } from "util/helpers";
-import userManager from "../auth/util/user-manager";
+import { getEpochTime } from "@/util/helpers";
+import userManager from "@/auth/util/user-manager";
 
 function* fetchApiTokenSaga({
   payload: token,
   type: any
 }): Generator<any, any, any> {
   try {
-    const request = new Request(process.env.OPENID_CONNECT_API_TOKEN_URL || 'https://api.hel.fi/sso/api-tokens/', {
+    const request = new Request(import.meta.env.VITE_OPENID_CONNECT_API_TOKEN_URL || 'https://api.hel.fi/sso/api-tokens/', {
       headers: {
         'Authorization': `Bearer ${token}`
       }
diff --git a/src/auth/selectors.ts b/src/auth/selectors.ts
index 1fe022bd7..b4d7ed563 100644
--- a/src/auth/selectors.ts
+++ b/src/auth/selectors.ts
@@ -1,7 +1,7 @@
-import type { Selector } from "../types";
+import type { Selector } from "@/types";
 import type { ApiToken, AuthState } from "./types";
 // Helper functions to select state
-export const getApiToken: Selector<ApiToken, void> = (state: Record<string, any>): AuthState => state.auth.apiToken[process.env.OPENID_CONNECT_API_TOKEN_KEY || 'https://api.hel.fi/auth/mvj'];
+export const getApiToken: Selector<ApiToken, void> = (state: Record<string, any>): AuthState => state.auth.apiToken[import.meta.env.VITE_OPENID_CONNECT_API_TOKEN_KEY || 'https://api.hel.fi/auth/mvj'];
 export const getApiTokenExpires: Selector<ApiToken, void> = (state: Record<string, any>): AuthState => state.auth.apiToken['expires_at'];
 export const getIsFetching: Selector<ApiToken, void> = (state: Record<string, any>): AuthState => state.auth.isFetching;
 export const getLoggedInUser: Selector<Record<string, any>, void> = (state: Record<string, any>): Record<string, any> => state.oidc.user;
\ No newline at end of file
diff --git a/src/auth/types.ts b/src/auth/types.ts
index 1884afa20..161cacc49 100644
--- a/src/auth/types.ts
+++ b/src/auth/types.ts
@@ -1,4 +1,4 @@
-import type { Action } from "../types";
+import type { Action } from "@/types";
 export type ApiToken = Record<string, any> | null;
 export type AuthState = Record<string, any> | null;
 export type FetchApiTokenAction = Action<string, string>;
diff --git a/src/auth/util/user-manager.ts b/src/auth/util/user-manager.ts
index 8613fbf20..2c8275712 100644
--- a/src/auth/util/user-manager.ts
+++ b/src/auth/util/user-manager.ts
@@ -3,14 +3,14 @@
 // TODO: migrate to oidc-client-ts, because oidc-client is not maintained anymore
 import { Global, Log, UserManager, WebStorageStateStore } from "oidc-client";
 const userManagerConfig = {
-  authority: process.env.OPENID_CONNECT_AUTHORITY_URL || 'https://api.hel.fi/sso/openid/',
+  authority: import.meta.env.VITE_OPENID_CONNECT_AUTHORITY_URL || 'https://api.hel.fi/sso/openid/',
   automaticSilentRenew: true,
-  client_id: process.env.OPENID_CONNECT_CLIENT_ID || '',
+  client_id: import.meta.env.VITE_OPENID_CONNECT_CLIENT_ID || '',
   filterProtocolClaims: true,
   loadUserInfo: true,
   redirect_uri: `${location.origin}/callback`,
   response_type: 'id_token token',
-  scope: process.env.OPENID_CONNECT_SCOPE || 'openid profile https://api.hel.fi/auth/mvj',
+  scope: import.meta.env.VITE_OPENID_CONNECT_SCOPE || 'openid profile https://api.hel.fi/auth/mvj',
   silent_redirect_uri: `${location.origin}/silent_renew.html`,
   userStore: new WebStorageStateStore({
     store: Global.localStorage
diff --git a/src/basisOfRentCalculator/components/BasisOfRentCalculatorForm.tsx b/src/basisOfRentCalculator/components/BasisOfRentCalculatorForm.tsx
index 32eb7fcad..06d5cc4f9 100644
--- a/src/basisOfRentCalculator/components/BasisOfRentCalculatorForm.tsx
+++ b/src/basisOfRentCalculator/components/BasisOfRentCalculatorForm.tsx
@@ -2,12 +2,12 @@ import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import { FieldArray, formValueSelector, reduxForm } from "redux-form";
 import flowRight from "lodash/flowRight";
-import BasisOfRentsEdit from "leases/components/leaseSections/rent/BasisOfRentsEdit";
-import Divider from "components/content/Divider";
-import Title from "components/content/Title";
-import { FormNames } from "enums";
-import { LeaseBasisOfRentsFieldPaths, LeaseBasisOfRentsFieldTitles } from "leases/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
+import BasisOfRentsEdit from "@/leases/components/leaseSections/rent/BasisOfRentsEdit";
+import Divider from "@/components/content/Divider";
+import Title from "@/components/content/Title";
+import { FormNames } from "@/enums";
+import { LeaseBasisOfRentsFieldPaths, LeaseBasisOfRentsFieldTitles } from "@/leases/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
 type Props = {
   basisOfRents: Array<Record<string, any>>;
 };
diff --git a/src/basisOfRentCalculator/components/BasisOfRentCalculatorPage.tsx b/src/basisOfRentCalculator/components/BasisOfRentCalculatorPage.tsx
index 6d2e06115..e69b87ec2 100644
--- a/src/basisOfRentCalculator/components/BasisOfRentCalculatorPage.tsx
+++ b/src/basisOfRentCalculator/components/BasisOfRentCalculatorPage.tsx
@@ -1,19 +1,19 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import AuthorizationError from "components/authorization/AuthorizationError";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
 import BasisOfRentCalculatorForm from "./BasisOfRentCalculatorForm";
-import ContentContainer from "components/content/ContentContainer";
-import Loader from "components/loader/Loader";
-import PageContainer from "components/content/PageContainer";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { PermissionMissingTexts } from "enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { hasPermissions, setPageTitle } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors";
-import { withLeaseAttributes } from "components/attributes/LeaseAttributes";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import ContentContainer from "@/components/content/ContentContainer";
+import Loader from "@/components/loader/Loader";
+import PageContainer from "@/components/content/PageContainer";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { PermissionMissingTexts } from "@/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { hasPermissions, setPageTitle } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors";
+import { withLeaseAttributes } from "@/components/attributes/LeaseAttributes";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   isFetchingLeaseAttributes: boolean;
   isFetchingUsersPermissions: boolean;
diff --git a/src/batchrun/actions.ts b/src/batchrun/actions.ts
index d22142eaa..fb3440cfa 100644
--- a/src/batchrun/actions.ts
+++ b/src/batchrun/actions.ts
@@ -1,6 +1,6 @@
 import { createAction } from "redux-actions";
 import type { Attributes, Methods } from "types";
-import type { FetchJobRunAttributesAction, ReceiveJobRunAttributesAction, ReceiveJobRunMethodsAction, NotFoundJobRunAttributesAction, FetchJobRunLogEntryAttributesAction, ReceiveJobRunLogEntryAttributesAction, ReceiveJobRunLogEntryMethodsAction, NotFoundJobRunLogEntryAttributesAction, FetchScheduledJobAttributesAction, ReceiveScheduledJobAttributesAction, ReceiveScheduledJobMethodsAction, NotFoundScheduledJobAttributesAction, FetchJobRunsAction, ReceiveJobRunsAction, NotFoundJobRunsAction, FetchJobRunLogEntriesByRunAction, ReceiveJobRunLogEntriesByRunAction, NotFoundJobRunLogEntriesByRunAction, FetchScheduledJobsAction, ReceiveScheduledJobsAction, NotFoundScheduledJobsAction } from "batchrun/types";
+import type { FetchJobRunAttributesAction, ReceiveJobRunAttributesAction, ReceiveJobRunMethodsAction, NotFoundJobRunAttributesAction, FetchJobRunLogEntryAttributesAction, ReceiveJobRunLogEntryAttributesAction, ReceiveJobRunLogEntryMethodsAction, NotFoundJobRunLogEntryAttributesAction, FetchScheduledJobAttributesAction, ReceiveScheduledJobAttributesAction, ReceiveScheduledJobMethodsAction, NotFoundScheduledJobAttributesAction, FetchJobRunsAction, ReceiveJobRunsAction, NotFoundJobRunsAction, FetchJobRunLogEntriesByRunAction, ReceiveJobRunLogEntriesByRunAction, NotFoundJobRunLogEntriesByRunAction, FetchScheduledJobsAction, ReceiveScheduledJobsAction, NotFoundScheduledJobsAction } from "@/batchrun/types";
 export const fetchJobRunAttributes = (): FetchJobRunAttributesAction => createAction('mvj/batchrun/FETCH_JOB_RUN_ATTRIBUTES')();
 export const receiveJobRunAttributes = (attributes: Attributes): ReceiveJobRunAttributesAction => createAction('mvj/batchrun/RECEIVE_JOB_RUN_ATTRIBUTES')(attributes);
 export const receiveJobRunMethods = (methods: Methods): ReceiveJobRunMethodsAction => createAction('mvj/batchrun/RECEIVE_JOB_RUN_METHODS')(methods);
diff --git a/src/batchrun/spec.ts b/src/batchrun/batchrun.spec.ts
similarity index 99%
rename from src/batchrun/spec.ts
rename to src/batchrun/batchrun.spec.ts
index 419ca7ff7..4b74fbd4e 100644
--- a/src/batchrun/spec.ts
+++ b/src/batchrun/batchrun.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchJobRunAttributes, notFoundJobRunAttributes, receiveJobRunAttributes, receiveJobRunMethods, fetchJobRunLogEntryAttributes, notFoundJobRunLogEntryAttributes, receiveJobRunLogEntryAttributes, receiveJobRunLogEntryMethods, fetchScheduledJobAttributes, notFoundScheduledJobAttributes, receiveScheduledJobAttributes, receiveScheduledJobMethods, fetchJobRuns, receiveJobRuns, notFoundJobRuns, fetchJobRunLogEntriesByRun, receiveJobRunLogEntriesByRun, notFoundJobRunLogEntriesByRun, fetchScheduledJobs, receiveScheduledJobs, notFoundScheduledJobs } from "./actions";
 import batchrunReducer from "./reducer";
 import type { BatchRunState } from "./types";
diff --git a/src/batchrun/components/BatchRunPage.tsx b/src/batchrun/components/BatchRunPage.tsx
index 361128bf5..5ce0ee9e9 100644
--- a/src/batchrun/components/BatchRunPage.tsx
+++ b/src/batchrun/components/BatchRunPage.tsx
@@ -3,26 +3,26 @@ import { connect } from "react-redux";
 import { withRouter } from "react-router";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import ContentContainer from "components/content/ContentContainer";
-import Divider from "components/content/Divider";
-import FullWidthContainer from "components/content/FullWidthContainer";
-import PageContainer from "components/content/PageContainer";
-import PageNavigationWrapper from "components/content/PageNavigationWrapper";
-import JobRuns from "batchrun/components/JobRuns";
-import Loader from "components/loader/Loader";
-import ScheduledJobs from "batchrun/components/ScheduledJobs";
-import Tabs from "components/tabs/Tabs";
-import TabContent from "components/tabs/TabContent";
-import TabPane from "components/tabs/TabPane";
-import Title from "components/content/Title";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { PermissionMissingTexts } from "enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getSearchQuery, getUrlParams, hasPermissions, setPageTitle } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import ContentContainer from "@/components/content/ContentContainer";
+import Divider from "@/components/content/Divider";
+import FullWidthContainer from "@/components/content/FullWidthContainer";
+import PageContainer from "@/components/content/PageContainer";
+import PageNavigationWrapper from "@/components/content/PageNavigationWrapper";
+import JobRuns from "@/batchrun/components/JobRuns";
+import Loader from "@/components/loader/Loader";
+import ScheduledJobs from "@/batchrun/components/ScheduledJobs";
+import Tabs from "@/components/tabs/Tabs";
+import TabContent from "@/components/tabs/TabContent";
+import TabPane from "@/components/tabs/TabPane";
+import Title from "@/components/content/Title";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { PermissionMissingTexts } from "@/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getSearchQuery, getUrlParams, hasPermissions, setPageTitle } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   history: Record<string, any>;
   isFetchingUsersPermissions: boolean;
diff --git a/src/batchrun/components/JobRunLogEntryPanel.tsx b/src/batchrun/components/JobRunLogEntryPanel.tsx
index 74af7a1a4..e6092df7e 100644
--- a/src/batchrun/components/JobRunLogEntryPanel.tsx
+++ b/src/batchrun/components/JobRunLogEntryPanel.tsx
@@ -1,16 +1,16 @@
 import React, { Fragment, PureComponent } from "react";
 import { connect } from "react-redux";
 import isEmpty from "lodash/isEmpty";
-import CopyToClipboardButton from "components/form/CopyToClipboardButton";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import SortableTable from "components/table/SortableTable";
-import TablePanel from "components/table/TablePanel";
-import { fetchJobRunLogEntriesByRun } from "batchrun/actions";
-import { JobRunLogEntryFieldPaths, JobRunLogEntryFieldTitles } from "batchrun/enums";
-import { copyElementContentsToClipboard, displayUIMessage, formatDate, getApiResponseResults, isFieldAllowedToRead } from "util/helpers";
-import { TableSortOrder } from "enums";
-import { getIsFetchingJobRunLogEntriesByRun, getJobRunLogEntryAttributes, getJobRunLogEntriesByRun } from "batchrun/selectors";
+import CopyToClipboardButton from "@/components/form/CopyToClipboardButton";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import SortableTable from "@/components/table/SortableTable";
+import TablePanel from "@/components/table/TablePanel";
+import { fetchJobRunLogEntriesByRun } from "@/batchrun/actions";
+import { JobRunLogEntryFieldPaths, JobRunLogEntryFieldTitles } from "@/batchrun/enums";
+import { copyElementContentsToClipboard, displayUIMessage, formatDate, getApiResponseResults, isFieldAllowedToRead } from "@/util/helpers";
+import { TableSortOrder } from "@/enums";
+import { getIsFetchingJobRunLogEntriesByRun, getJobRunLogEntryAttributes, getJobRunLogEntriesByRun } from "@/batchrun/selectors";
 import type { ApiResponse, Attributes } from "types";
 type Props = {
   fetchJobRunLogEntriesByRun: (...args: Array<any>) => any;
diff --git a/src/batchrun/components/JobRuns.tsx b/src/batchrun/components/JobRuns.tsx
index e265065c5..f4eff9153 100644
--- a/src/batchrun/components/JobRuns.tsx
+++ b/src/batchrun/components/JobRuns.tsx
@@ -3,28 +3,28 @@ import { withRouter } from "react-router";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import ErrorIcon from "components/icons/ErrorIcon";
-import GreenBox from "components/content/GreenBox";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import ErrorIcon from "@/components/icons/ErrorIcon";
+import GreenBox from "@/components/content/GreenBox";
 import JobRunLogEntryPanel from "./JobRunLogEntryPanel";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import Pagination from "components/table/Pagination";
-import SortableTable from "components/table/SortableTable";
-import SuccessIcon from "components/icons/SuccessIcon";
-import TableAndPanelWrapper from "components/table/TableAndPanelWrapper";
-import { fetchJobRuns } from "batchrun/actions";
-import { LIST_TABLE_PAGE_SIZE } from "util/constants";
-import { PermissionMissingTexts } from "enums";
-import { JobRunFieldPaths, JobRunFieldTitles, JobRunJobFieldPaths, JobRunJobFieldTitles } from "batchrun/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { formatDate, getApiResponseCount, getApiResponseMaxPage, getApiResponseResults, hasPermissions, isFieldAllowedToRead } from "util/helpers";
-import { getIsFetchingJobRuns, getJobRunAttributes, getJobRuns } from "batchrun/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { withBatchrunJobRunTabAttributes } from "components/attributes/BatchrunJobRunsTabAttributes";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import Pagination from "@/components/table/Pagination";
+import SortableTable from "@/components/table/SortableTable";
+import SuccessIcon from "@/components/icons/SuccessIcon";
+import TableAndPanelWrapper from "@/components/table/TableAndPanelWrapper";
+import { fetchJobRuns } from "@/batchrun/actions";
+import { LIST_TABLE_PAGE_SIZE } from "@/util/constants";
+import { PermissionMissingTexts } from "@/enums";
+import { JobRunFieldPaths, JobRunFieldTitles, JobRunJobFieldPaths, JobRunJobFieldTitles } from "@/batchrun/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { formatDate, getApiResponseCount, getApiResponseMaxPage, getApiResponseResults, hasPermissions, isFieldAllowedToRead } from "@/util/helpers";
+import { getIsFetchingJobRuns, getJobRunAttributes, getJobRuns } from "@/batchrun/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { withBatchrunJobRunTabAttributes } from "@/components/attributes/BatchrunJobRunsTabAttributes";
 import type { Attributes } from "types";
-import type { JobRuns as JobRunsType } from "batchrun/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { JobRuns as JobRunsType } from "@/batchrun/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   fetchJobRuns: (...args: Array<any>) => any;
   isFetchingBatchrunJobRunsTabAttributes: boolean;
diff --git a/src/batchrun/components/ScheduledJobs.tsx b/src/batchrun/components/ScheduledJobs.tsx
index c9645646e..d60d93d54 100644
--- a/src/batchrun/components/ScheduledJobs.tsx
+++ b/src/batchrun/components/ScheduledJobs.tsx
@@ -3,23 +3,23 @@ import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import FormText from "components/form/FormText";
-import GreenBox from "components/content/GreenBox";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import SortableTable from "components/table/SortableTable";
-import { fetchScheduledJobs } from "batchrun/actions";
-import { PermissionMissingTexts } from "enums";
-import { ScheduledJobFieldPaths, ScheduledJobFieldTitles, ScheduledJobJobFieldPaths, ScheduledJobJobFieldTitles } from "batchrun/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getApiResponseResults, hasPermissions, isFieldAllowedToRead } from "util/helpers";
-import { getIsFetchingScheduledJobs, getScheduledJobs } from "batchrun/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { withBatchrunScheduledJobTabAttributes } from "components/attributes/BatchrunScheduledJobsTabAttributes";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import FormText from "@/components/form/FormText";
+import GreenBox from "@/components/content/GreenBox";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import SortableTable from "@/components/table/SortableTable";
+import { fetchScheduledJobs } from "@/batchrun/actions";
+import { PermissionMissingTexts } from "@/enums";
+import { ScheduledJobFieldPaths, ScheduledJobFieldTitles, ScheduledJobJobFieldPaths, ScheduledJobJobFieldTitles } from "@/batchrun/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getApiResponseResults, hasPermissions, isFieldAllowedToRead } from "@/util/helpers";
+import { getIsFetchingScheduledJobs, getScheduledJobs } from "@/batchrun/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { withBatchrunScheduledJobTabAttributes } from "@/components/attributes/BatchrunScheduledJobsTabAttributes";
 import type { Attributes } from "types";
-import type { ScheduledJobs as ScheduledJobsType } from "batchrun/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { ScheduledJobs as ScheduledJobsType } from "@/batchrun/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   batchrunScheduledJobAttributes: Attributes;
   fetchScheduledJobs: (...args: Array<any>) => any;
diff --git a/src/batchrun/reducer.ts b/src/batchrun/reducer.ts
index 7f90ed10a..904f09531 100644
--- a/src/batchrun/reducer.ts
+++ b/src/batchrun/reducer.ts
@@ -1,7 +1,7 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
 import type { Attributes, Methods, Reducer } from "types";
-import type { ReceiveJobRunAttributesAction, ReceiveJobRunMethodsAction, ReceiveJobRunsAction, JobRuns, ReceiveJobRunLogEntryAttributesAction, ReceiveJobRunLogEntryMethodsAction, FetchJobRunLogEntriesByRunAction, ReceiveJobRunLogEntriesByRunAction, NotFoundJobRunLogEntriesByRunAction, ReceiveScheduledJobAttributesAction, ReceiveScheduledJobMethodsAction, ReceiveScheduledJobsAction, ScheduledJobs } from "batchrun/types";
+import type { ReceiveJobRunAttributesAction, ReceiveJobRunMethodsAction, ReceiveJobRunsAction, JobRuns, ReceiveJobRunLogEntryAttributesAction, ReceiveJobRunLogEntryMethodsAction, FetchJobRunLogEntriesByRunAction, ReceiveJobRunLogEntriesByRunAction, NotFoundJobRunLogEntriesByRunAction, ReceiveScheduledJobAttributesAction, ReceiveScheduledJobMethodsAction, ReceiveScheduledJobsAction, ScheduledJobs } from "@/batchrun/types";
 const isFetchingJobRunsReducer: Reducer<boolean> = handleActions({
   'mvj/batchrun/FETCH_JOB_RUNS': () => true,
   'mvj/batchrun/RECEIVE_JOB_RUNS': () => false,
diff --git a/src/batchrun/requests.ts b/src/batchrun/requests.ts
index d0153bf97..6ad0226be 100644
--- a/src/batchrun/requests.ts
+++ b/src/batchrun/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 export const fetchJobRunAttributes = () => {
   return callApi(new Request(createUrl('job_run/'), {
     method: 'OPTIONS'
diff --git a/src/batchrun/saga.ts b/src/batchrun/saga.ts
index 13f275323..fde449a6b 100644
--- a/src/batchrun/saga.ts
+++ b/src/batchrun/saga.ts
@@ -1,7 +1,7 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
-import { receiveError } from "api/actions";
-import { notFoundJobRuns, notFoundJobRunAttributes, notFoundJobRunLogEntryAttributes, notFoundJobRunLogEntriesByRun, notFoundScheduledJobAttributes, notFoundScheduledJobs, receiveJobRunAttributes, receiveJobRunMethods, receiveJobRuns, receiveJobRunLogEntryAttributes, receiveJobRunLogEntryMethods, receiveJobRunLogEntriesByRun, receiveScheduledJobAttributes, receiveScheduledJobMethods, receiveScheduledJobs } from "batchrun/actions";
-import { fetchJobRunAttributes, fetchJobRuns, fetchJobRunLogEntryAttributes, fetchJobRunLogEntries, fetchScheduledJobAttributes, fetchScheduledJobs } from "batchrun/requests";
+import { receiveError } from "@/api/actions";
+import { notFoundJobRuns, notFoundJobRunAttributes, notFoundJobRunLogEntryAttributes, notFoundJobRunLogEntriesByRun, notFoundScheduledJobAttributes, notFoundScheduledJobs, receiveJobRunAttributes, receiveJobRunMethods, receiveJobRuns, receiveJobRunLogEntryAttributes, receiveJobRunLogEntryMethods, receiveJobRunLogEntriesByRun, receiveScheduledJobAttributes, receiveScheduledJobMethods, receiveScheduledJobs } from "@/batchrun/actions";
+import { fetchJobRunAttributes, fetchJobRuns, fetchJobRunLogEntryAttributes, fetchJobRunLogEntries, fetchScheduledJobAttributes, fetchScheduledJobs } from "@/batchrun/requests";
 
 function* fetchJobRunAttributesSaga(): Generator<any, any, any> {
   try {
diff --git a/src/batchrun/selectors.ts b/src/batchrun/selectors.ts
index 181b46eec..35da4f860 100644
--- a/src/batchrun/selectors.ts
+++ b/src/batchrun/selectors.ts
@@ -1,6 +1,6 @@
 import type { ApiResponse, Attributes, Methods, Selector } from "types";
-import type { RootState } from "root/types";
-import type { JobRuns, ScheduledJobs } from "batchrun/types";
+import type { RootState } from "@/root/types";
+import type { JobRuns, ScheduledJobs } from "@/batchrun/types";
 export const getIsFetchingJobRunAttributes: Selector<boolean, void> = (state: RootState): boolean => state.batchrun.isFetchingJobRunAttributes;
 export const getJobRunAttributes: Selector<Attributes, void> = (state: RootState): Attributes => state.batchrun.jobRunAttributes;
 export const getJobRunMethods: Selector<Methods, void> = (state: RootState): Methods => state.batchrun.jobRunMethods;
diff --git a/src/billingPeriods/spec.ts b/src/billingPeriods/billingPeriods.spec.ts
similarity index 97%
rename from src/billingPeriods/spec.ts
rename to src/billingPeriods/billingPeriods.spec.ts
index e7636395e..ca30a6f38 100644
--- a/src/billingPeriods/spec.ts
+++ b/src/billingPeriods/billingPeriods.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { receiveBillingPeriodsByLease, fetchBillingPeriodsByLease, notFound } from "./actions";
 import billingPeriodsReducer from "./reducer";
 import type { BillingPeriodState } from "./types";
diff --git a/src/billingPeriods/reducer.ts b/src/billingPeriods/reducer.ts
index 13c47242a..4b3f587c2 100644
--- a/src/billingPeriods/reducer.ts
+++ b/src/billingPeriods/reducer.ts
@@ -1,6 +1,6 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
-import type { Reducer } from "../types";
+import type { Reducer } from "@/types";
 import type { ReceiveBillingPeriodsAction } from "./types";
 const isFetchingReducer: Reducer<boolean> = handleActions({
   'mvj/billingperiods/FETCH_ALL': () => true,
diff --git a/src/billingPeriods/requests.ts b/src/billingPeriods/requests.ts
index 14ed2f954..5ddc6b71a 100644
--- a/src/billingPeriods/requests.ts
+++ b/src/billingPeriods/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 import type { FetchBillingPeriodsPayload } from "./types";
 export const fetchBillingPeriods = (payload: FetchBillingPeriodsPayload): Generator<any, any, any> => {
   return callApi(new Request(createUrl(`lease_billing_periods/?lease=${payload.leaseId}&year=${payload.year}`)));
diff --git a/src/billingPeriods/saga.ts b/src/billingPeriods/saga.ts
index cc689d0e2..c5c30471b 100644
--- a/src/billingPeriods/saga.ts
+++ b/src/billingPeriods/saga.ts
@@ -1,7 +1,7 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { notFound, receiveBillingPeriodsByLease } from "./actions";
 import { fetchBillingPeriods } from "./requests";
-import { receiveError } from "../api/actions";
+import { receiveError } from "@/api/actions";
 
 function* fetchBillingPeriodsSaga({
   payload,
diff --git a/src/billingPeriods/selectors.ts b/src/billingPeriods/selectors.ts
index e18ca1d28..ac944a243 100644
--- a/src/billingPeriods/selectors.ts
+++ b/src/billingPeriods/selectors.ts
@@ -1,6 +1,6 @@
 import type { Selector } from "types";
-import type { RootState } from "root/types";
-import type { LeaseId } from "leases/types";
+import type { RootState } from "@/root/types";
+import type { LeaseId } from "@/leases/types";
 export const getIsFetching: Selector<boolean, void> = (state: RootState): boolean => state.billingPeriod.isFetching;
 export const getBillingPeriodsByLease: Selector<Record<string, any>, LeaseId> = (state: RootState, leaseId: LeaseId): Record<string, any> => {
   return state.billingPeriod.byLease[leaseId];
diff --git a/src/billingPeriods/types.ts b/src/billingPeriods/types.ts
index bb90acb98..b219f4f29 100644
--- a/src/billingPeriods/types.ts
+++ b/src/billingPeriods/types.ts
@@ -1,5 +1,5 @@
-import type { Action } from "../types";
-import type { LeaseId } from "leases/types";
+import type { Action } from "@/types";
+import type { LeaseId } from "@/leases/types";
 export type BillingPeriodState = {
   byLease: Record<string, any>;
   isFetching: boolean;
diff --git a/src/collectionCourtDecision/actions.ts b/src/collectionCourtDecision/actions.ts
index ba00411b9..be48b89db 100644
--- a/src/collectionCourtDecision/actions.ts
+++ b/src/collectionCourtDecision/actions.ts
@@ -1,6 +1,6 @@
 import { createAction } from "redux-actions";
 import type { Attributes, Methods } from "types";
-import type { LeaseId } from "leases/types";
+import type { LeaseId } from "@/leases/types";
 import type { FetchAttributesAction, ReceiveAttributesAction, ReceiveMethodsAction, CollectionCourtDecisionAttributesNotFoundAction, UploadCollectionCourtDecisionPayload, DeleteCollectionCourtDecisionPayload, FetchCollectionCourtDecisionsByLeaseAction, ReceiveCollectionCourtDecisionsByLeaseAction, CollectionCourtDecisionsNotFoundByLeaseAction, UploadCollectionCourtDecisionAction, DeleteCollectionCourtDecisionAction, HideCollectionCourtDecisionPanelAction, ShowCollectionCourtDecisionPanelAction } from "./types";
 export const fetchAttributes = (): FetchAttributesAction => createAction('mvj/collectionCourtDecision/FETCH_ATTRIBUTES')();
 export const receiveAttributes = (attributes: Attributes): ReceiveAttributesAction => createAction('mvj/collectionCourtDecision/RECEIVE_ATTRIBUTES')(attributes);
diff --git a/src/collectionCourtDecision/spec.ts b/src/collectionCourtDecision/collectionCourtDecision.spec.ts
similarity index 99%
rename from src/collectionCourtDecision/spec.ts
rename to src/collectionCourtDecision/collectionCourtDecision.spec.ts
index aafb24687..bfc449b2e 100644
--- a/src/collectionCourtDecision/spec.ts
+++ b/src/collectionCourtDecision/collectionCourtDecision.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchAttributes, attributesNotFound, receiveAttributes, receiveMethods, fetchCollectionCourtDecisionsByLease, receiveCollectionCourtDecisionsByLease, notFoundByLease, uploadCollectionCourtDecision, deleteCollectionCourtDecision, hideCollectionCourtDecisionPanel, showCollectionCourtDecisionPanel } from "./actions";
 import collectionCourtDecisionReducer from "./reducer";
 import type { CollectionCourtDecisionState } from "./types";
diff --git a/src/collectionCourtDecision/reducer.ts b/src/collectionCourtDecision/reducer.ts
index deaeb4b77..824f12292 100644
--- a/src/collectionCourtDecision/reducer.ts
+++ b/src/collectionCourtDecision/reducer.ts
@@ -1,6 +1,6 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
-import type { Attributes, Methods, Reducer } from "../types";
+import type { Attributes, Methods, Reducer } from "@/types";
 import type { ReceiveAttributesAction, ReceiveMethodsAction, FetchCollectionCourtDecisionsByLeaseAction, ReceiveCollectionCourtDecisionsByLeaseAction, CollectionCourtDecisionsNotFoundByLeaseAction } from "./types";
 const isFetchingAttributesReducer: Reducer<boolean> = handleActions({
   'mvj/collectionCourtDecision/FETCH_ATTRIBUTES': () => true,
diff --git a/src/collectionCourtDecision/requests.ts b/src/collectionCourtDecision/requests.ts
index 92df22e36..f112b8ef9 100644
--- a/src/collectionCourtDecision/requests.ts
+++ b/src/collectionCourtDecision/requests.ts
@@ -1,8 +1,8 @@
-import callApi from "api/callApi";
-import callUploadRequest from "api/callUploadRequest";
-import createUrl from "api/createUrl";
+import callApi from "@/api/callApi";
+import callUploadRequest from "@/api/callUploadRequest";
+import createUrl from "@/api/createUrl";
 import type { CollectionCourtDecisionId, UploadCollectionCourtDecisionPayload } from "./types";
-import type { LeaseId } from "leases/types";
+import type { LeaseId } from "@/leases/types";
 export const fetchAttributes = (): Generator<any, any, any> => {
   return callApi(new Request(createUrl('collection_court_decision/'), {
     method: 'OPTIONS'
diff --git a/src/collectionCourtDecision/saga.ts b/src/collectionCourtDecision/saga.ts
index ed04824d7..665b8c0a3 100644
--- a/src/collectionCourtDecision/saga.ts
+++ b/src/collectionCourtDecision/saga.ts
@@ -1,8 +1,8 @@
 import { all, call, fork, put, select, takeLatest } from "redux-saga/effects";
 import { SubmissionError } from "redux-form";
-import { receiveError } from "api/actions";
+import { receiveError } from "@/api/actions";
 import { receiveAttributes, receiveMethods, attributesNotFound, fetchCollectionCourtDecisionsByLease as fetchCollectionCourtDecisionsByLeaseAction, hideCollectionCourtDecisionPanel, receiveCollectionCourtDecisionsByLease, notFoundByLease } from "./actions";
-import { displayUIMessage } from "../util/helpers";
+import { displayUIMessage } from "@/util/helpers";
 import { fetchAttributes, fetchCollectionCourtDecisionsByLease, uploadCollectionCourtDecision, deleteCollectionCourtDecision } from "./requests";
 import { getCollectionCourtDecisionsByLease } from "./selectors";
 
diff --git a/src/collectionCourtDecision/selectors.ts b/src/collectionCourtDecision/selectors.ts
index 6ae1cb4f9..e69ff1ffd 100644
--- a/src/collectionCourtDecision/selectors.ts
+++ b/src/collectionCourtDecision/selectors.ts
@@ -1,6 +1,6 @@
 import type { Attributes, Methods, Selector } from "types";
-import type { LeaseId } from "leases/types";
-import type { RootState } from "root/types";
+import type { LeaseId } from "@/leases/types";
+import type { RootState } from "@/root/types";
 export const getAttributes: Selector<Attributes, void> = (state: RootState): Attributes => state.collectionCourtDecision.attributes;
 export const getMethods: Selector<Methods, void> = (state: RootState): Methods => state.collectionCourtDecision.methods;
 export const getIsFetchingAttributes: Selector<boolean, void> = (state: RootState): boolean => state.collectionCourtDecision.isFetchingAttributes;
diff --git a/src/collectionCourtDecision/types.ts b/src/collectionCourtDecision/types.ts
index fb7cfe9df..cb3ed65c8 100644
--- a/src/collectionCourtDecision/types.ts
+++ b/src/collectionCourtDecision/types.ts
@@ -1,5 +1,5 @@
 import type { Action, Attributes, Methods } from "types";
-import type { LeaseId } from "leases/types";
+import type { LeaseId } from "@/leases/types";
 export type CollectionCourtDecisionState = {
   attributes: Attributes;
   byLease: Record<string, any>;
diff --git a/src/collectionLetter/actions.ts b/src/collectionLetter/actions.ts
index cec086781..e9f74163e 100644
--- a/src/collectionLetter/actions.ts
+++ b/src/collectionLetter/actions.ts
@@ -1,6 +1,6 @@
 import { createAction } from "redux-actions";
 import type { Attributes, Methods } from "types";
-import type { LeaseId } from "leases/types";
+import type { LeaseId } from "@/leases/types";
 import type { FetchAttributesAction, ReceiveAttributesAction, ReceiveMethodsAction, CollectionLetterAttributesNotFoundAction, UploadCollectionLetterPayload, DeleteCollectionLetterPayload, FetchCollectionLettersByLeaseAction, ReceiveCollectionLettersByLeaseAction, CollectionLettersNotFoundByLeaseAction, UploadCollectionLetterAction, DeleteCollectionLetterAction } from "./types";
 export const fetchAttributes = (): FetchAttributesAction => createAction('mvj/collectionLetter/FETCH_ATTRIBUTES')();
 export const receiveAttributes = (attributes: Attributes): ReceiveAttributesAction => createAction('mvj/collectionLetter/RECEIVE_ATTRIBUTES')(attributes);
diff --git a/src/collectionLetter/spec.ts b/src/collectionLetter/collectionLetter.spec.ts
similarity index 98%
rename from src/collectionLetter/spec.ts
rename to src/collectionLetter/collectionLetter.spec.ts
index 7c5551329..ecaf0a65d 100644
--- a/src/collectionLetter/spec.ts
+++ b/src/collectionLetter/collectionLetter.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchAttributes, attributesNotFound, receiveAttributes, receiveMethods, fetchCollectionLettersByLease, receiveCollectionLettersByLease, notFoundByLease, uploadCollectionLetter, deleteCollectionLetter } from "./actions";
 import collectionLetterReducer from "./reducer";
 import type { CollectionLetterState } from "./types";
diff --git a/src/collectionLetter/requests.ts b/src/collectionLetter/requests.ts
index 66fac847e..48c69f16a 100644
--- a/src/collectionLetter/requests.ts
+++ b/src/collectionLetter/requests.ts
@@ -1,8 +1,8 @@
-import callApi from "api/callApi";
-import callUploadRequest from "api/callUploadRequest";
-import createUrl from "api/createUrl";
+import callApi from "@/api/callApi";
+import callUploadRequest from "@/api/callUploadRequest";
+import createUrl from "@/api/createUrl";
 import type { CollectionLetterId, UploadCollectionLetterPayload } from "./types";
-import type { LeaseId } from "leases/types";
+import type { LeaseId } from "@/leases/types";
 export const fetchAttributes = (): Generator<any, any, any> => {
   return callApi(new Request(createUrl('collection_letter/'), {
     method: 'OPTIONS'
diff --git a/src/collectionLetter/saga.ts b/src/collectionLetter/saga.ts
index 262e5f49e..7cc3c02ea 100644
--- a/src/collectionLetter/saga.ts
+++ b/src/collectionLetter/saga.ts
@@ -1,8 +1,8 @@
 import { all, call, fork, put, select, takeLatest } from "redux-saga/effects";
 import { SubmissionError } from "redux-form";
-import { receiveError } from "api/actions";
+import { receiveError } from "@/api/actions";
 import { attributesNotFound, receiveAttributes, receiveMethods, fetchCollectionLettersByLease as fetchCollectionLettersByLeaseAction, receiveCollectionLettersByLease, notFoundByLease } from "./actions";
-import { displayUIMessage } from "../util/helpers";
+import { displayUIMessage } from "@/util/helpers";
 import { fetchAttributes, fetchCollectionLettersByLease, uploadCollectionLetter, deleteCollectionLetter } from "./requests";
 import { getCollectionLettersByLease } from "./selectors";
 
diff --git a/src/collectionLetter/selectors.ts b/src/collectionLetter/selectors.ts
index bd58f300e..857b890cb 100644
--- a/src/collectionLetter/selectors.ts
+++ b/src/collectionLetter/selectors.ts
@@ -1,6 +1,6 @@
 import type { Attributes, Methods, Selector } from "types";
-import type { LeaseId } from "leases/types";
-import type { RootState } from "root/types";
+import type { LeaseId } from "@/leases/types";
+import type { RootState } from "@/root/types";
 export const getAttributes: Selector<Attributes, void> = (state: RootState): Attributes => state.collectionLetter.attributes;
 export const getMethods: Selector<Methods, void> = (state: RootState): Methods => state.collectionLetter.methods;
 export const getIsFetchingAttributes: Selector<boolean, void> = (state: RootState): boolean => state.collectionLetter.isFetchingAttributes;
diff --git a/src/collectionLetter/types.ts b/src/collectionLetter/types.ts
index dd2ec7895..85bee3b22 100644
--- a/src/collectionLetter/types.ts
+++ b/src/collectionLetter/types.ts
@@ -1,5 +1,5 @@
 import type { Action, Attributes, Methods } from "types";
-import type { LeaseId } from "leases/types";
+import type { LeaseId } from "@/leases/types";
 export type CollectionLetterState = {
   attributes: Attributes;
   byLease: Record<string, any>;
diff --git a/src/collectionNote/actions.ts b/src/collectionNote/actions.ts
index d2ced8c88..7765d6408 100644
--- a/src/collectionNote/actions.ts
+++ b/src/collectionNote/actions.ts
@@ -1,7 +1,7 @@
 import { createAction } from "redux-actions";
 import type { Attributes, Methods } from "types";
 import type { FetchAttributesAction, ReceiveAttributesAction, ReceiveMethodsAction, CollectionNoteAttributesNotFoundAction, CreateCollectionNotePayload, DeleteCollectionNotePayload, FetchCollectionNotesByLeaseAction, ReceiveCollectionNotesByLeaseAction, CollectionNotesNotFoundByLeaseAction, CreateCollectionNoteAction, DeleteCollectionNoteAction } from "./types";
-import type { LeaseId } from "../leases/types";
+import type { LeaseId } from "@/leases/types";
 export const fetchAttributes = (): FetchAttributesAction => createAction('mvj/collectionNote/FETCH_ATTRIBUTES')();
 export const receiveAttributes = (attributes: Attributes): ReceiveAttributesAction => createAction('mvj/collectionNote/RECEIVE_ATTRIBUTES')(attributes);
 export const receiveMethods = (methods: Methods): ReceiveMethodsAction => createAction('mvj/collectionNote/RECEIVE_METHODS')(methods);
diff --git a/src/collectionNote/spec.ts b/src/collectionNote/collectionNote.spec.ts
similarity index 98%
rename from src/collectionNote/spec.ts
rename to src/collectionNote/collectionNote.spec.ts
index 0f858c1d0..711c43a22 100644
--- a/src/collectionNote/spec.ts
+++ b/src/collectionNote/collectionNote.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchAttributes, attributesNotFound, receiveAttributes, receiveMethods, fetchCollectionNotesByLease, receiveCollectionNotesByLease, notFoundByLease, createCollectionNote, deleteCollectionNote } from "./actions";
 import collectionNoteReducer from "./reducer";
 import type { CollectionNoteState } from "./types";
diff --git a/src/collectionNote/requests.ts b/src/collectionNote/requests.ts
index 9eccb874c..d139fd417 100644
--- a/src/collectionNote/requests.ts
+++ b/src/collectionNote/requests.ts
@@ -1,7 +1,7 @@
-import callApi from "api/callApi";
-import createUrl from "api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 import type { CollectionNoteId } from "./types";
-import type { LeaseId } from "leases/types";
+import type { LeaseId } from "@/leases/types";
 export const fetchAttributes = (): Generator<any, any, any> => {
   return callApi(new Request(createUrl('collection_note/'), {
     method: 'OPTIONS'
diff --git a/src/collectionNote/saga.ts b/src/collectionNote/saga.ts
index 476b731e7..afbdf38bb 100644
--- a/src/collectionNote/saga.ts
+++ b/src/collectionNote/saga.ts
@@ -1,8 +1,8 @@
 import { all, call, fork, put, select, takeLatest } from "redux-saga/effects";
 import { SubmissionError } from "redux-form";
-import { receiveError } from "api/actions";
+import { receiveError } from "@/api/actions";
 import { receiveAttributes, receiveMethods, attributesNotFound, fetchCollectionNotesByLease as fetchCollectionNotesByLeaseAction, receiveCollectionNotesByLease, notFoundByLease } from "./actions";
-import { displayUIMessage } from "util/helpers";
+import { displayUIMessage } from "@/util/helpers";
 import { fetchAttributes, fetchCollectionNotesByLease, createCollectionNote, deleteCollectionNote } from "./requests";
 import { getCollectionNotesByLease } from "./selectors";
 
diff --git a/src/collectionNote/selectors.ts b/src/collectionNote/selectors.ts
index a0f7f56f3..e9c7f4b4d 100644
--- a/src/collectionNote/selectors.ts
+++ b/src/collectionNote/selectors.ts
@@ -1,6 +1,6 @@
-import type { Attributes, Methods, Selector } from "../types";
-import type { LeaseId } from "leases/types";
-import type { RootState } from "root/types";
+import type { Attributes, Methods, Selector } from "@/types";
+import type { LeaseId } from "@/leases/types";
+import type { RootState } from "@/root/types";
 export const getAttributes: Selector<Attributes, void> = (state: RootState): Attributes => state.collectionNote.attributes;
 export const getMethods: Selector<Methods, void> = (state: RootState): Methods => state.collectionNote.methods;
 export const getIsFetchingAttributes: Selector<boolean, void> = (state: RootState): boolean => state.collectionNote.isFetchingAttributes;
diff --git a/src/collectionNote/types.ts b/src/collectionNote/types.ts
index 69b67a025..c5db47d0a 100644
--- a/src/collectionNote/types.ts
+++ b/src/collectionNote/types.ts
@@ -1,5 +1,5 @@
 import type { Action, Attributes, Methods } from "types";
-import type { LeaseId } from "leases/types";
+import type { LeaseId } from "@/leases/types";
 export type CollectionNoteId = number;
 export type CollectionNoteState = {
   attributes: Attributes;
diff --git a/src/comments/actions.ts b/src/comments/actions.ts
index bce5ad53f..b4f7d1d6a 100644
--- a/src/comments/actions.ts
+++ b/src/comments/actions.ts
@@ -1,6 +1,6 @@
 import { createAction } from "redux-actions";
 import type { Attributes, Methods } from "types";
-import type { LeaseId } from "leases/types";
+import type { LeaseId } from "@/leases/types";
 import type { Comment, CommentId, FetchAttributesAction, ReceiveAttributesAction, ReceiveMethodsAction, FetchCommentsByLeaseAction, CreateCommentAction, EditCommentAction, ReceiveCommentsByLeaseAction, CommentAttributesNotFoundAction, CommentNotFoundAction, ClearEditFlagsAction, HideEditModeByIdAction, ShowEditModeByIdAction, ReceiveIsSaveClickedAction } from "./types";
 export const attributesNotFound = (): CommentAttributesNotFoundAction => createAction('mvj/comments/ATTRIBUTES_NOT_FOUND')();
 export const notFound = (): CommentNotFoundAction => createAction('mvj/comments/NOT_FOUND')();
diff --git a/src/comments/spec.ts b/src/comments/comments.spec.ts
similarity index 99%
rename from src/comments/spec.ts
rename to src/comments/comments.spec.ts
index 757f97e60..c02cb7eda 100644
--- a/src/comments/spec.ts
+++ b/src/comments/comments.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchAttributes, receiveAttributes, receiveMethods, attributesNotFound, fetchCommentsByLease, receiveCommentsByLease, createComment, editComment, notFound, clearEditFlags, showEditModeById, hideEditModeById, receiveIsSaveClicked } from "./actions";
 import commentReducer from "./reducer";
 import type { CommentState } from "./types";
diff --git a/src/comments/helpers.ts b/src/comments/helpers.ts
index 6ea571dcb..2dce93fd5 100644
--- a/src/comments/helpers.ts
+++ b/src/comments/helpers.ts
@@ -1,5 +1,5 @@
 import get from "lodash/get";
-import { getContentUser } from "users/helpers";
+import { getContentUser } from "@/users/helpers";
 
 /**
  * Get content comments
diff --git a/src/comments/requests.ts b/src/comments/requests.ts
index 12d6556f0..b20fbc161 100644
--- a/src/comments/requests.ts
+++ b/src/comments/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 import type { Comment } from "./types";
 export const fetchAttributes = (): Generator<any, any, any> => {
   return callApi(new Request(createUrl('comment/'), {
diff --git a/src/comments/saga.ts b/src/comments/saga.ts
index 8736bb619..2f3ce1764 100644
--- a/src/comments/saga.ts
+++ b/src/comments/saga.ts
@@ -1,9 +1,9 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { initialize, SubmissionError } from "redux-form";
 import { attributesNotFound, notFound, fetchCommentsByLease, hideEditModeById, receiveAttributes, receiveMethods, receiveCommentsByLease, receiveIsSaveClicked } from "./actions";
-import { receiveError } from "../api/actions";
-import { FormNames } from "enums";
-import { displayUIMessage } from "util/helpers";
+import { receiveError } from "@/api/actions";
+import { FormNames } from "@/enums";
+import { displayUIMessage } from "@/util/helpers";
 import { createComment, editComment, fetchAttributes, fetchComments } from "./requests";
 
 function* fetchAttributesSaga(): Generator<any, any, any> {
diff --git a/src/comments/selectors.ts b/src/comments/selectors.ts
index 1b9000b18..d5a01be8a 100644
--- a/src/comments/selectors.ts
+++ b/src/comments/selectors.ts
@@ -1,7 +1,7 @@
 import type { Attributes, Methods, Selector } from "types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 import type { CommentId, CommentList } from "./types";
-import type { LeaseId } from "leases/types";
+import type { LeaseId } from "@/leases/types";
 export const getEditModeFlags: Selector<Record<string, any>, void> = (state: RootState): Record<string, any> => state.comment.isEditModeById;
 export const getIsEditModeById: Selector<boolean, CommentId> = (state: RootState, commentId: CommentId): boolean => state.comment.isEditModeById[commentId];
 export const getIsFetching: Selector<boolean, void> = (state: RootState): boolean => state.comment.isFetching;
diff --git a/src/comments/types.ts b/src/comments/types.ts
index 62f9093ac..e4f4f34b9 100644
--- a/src/comments/types.ts
+++ b/src/comments/types.ts
@@ -1,5 +1,5 @@
 import type { Action, Attributes, Methods } from "types";
-import type { LeaseId } from "leases/types";
+import type { LeaseId } from "@/leases/types";
 export type CommentState = {
   attributes: Attributes;
   byLease: Record<string, any>;
diff --git a/src/components/address-search/AddressSearchInput.tsx b/src/components/address-search/AddressSearchInput.tsx
index 696ebe76a..a2537b44e 100644
--- a/src/components/address-search/AddressSearchInput.tsx
+++ b/src/components/address-search/AddressSearchInput.tsx
@@ -3,13 +3,12 @@ import ReactDOM from "react-dom";
 import classNames from "classnames";
 import capitalize from "lodash/capitalize";
 import debounce from "lodash/debounce";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import { stringifyQuery } from "api/createUrl";
-import { KeyCodes } from "enums";
-import { findFromOcdString } from "util/helpers";
-import { SERVICE_MAP_URL } from "util/constants";
-
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import { stringifyQuery } from "@/api/createUrl";
+import { KeyCodes } from "@/enums";
+import { findFromOcdString } from "@/util/helpers";
+import { SERVICE_MAP_URL } from "@/util/constants";
 type Language = "fi" | "sv";
 const MINIMUM_SEARCH_STRING = 3;
 const DEBOUNCE_TIME_MILLISECONDS = 500;
diff --git a/src/components/attributes/AreaNoteAttributes.tsx b/src/components/attributes/AreaNoteAttributes.tsx
index 9b604b3e8..b1ac90ec4 100644
--- a/src/components/attributes/AreaNoteAttributes.tsx
+++ b/src/components/attributes/AreaNoteAttributes.tsx
@@ -1,8 +1,8 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import { fetchAttributes as fetchAreaNoteAttributes } from "areaNote/actions";
-import { getAttributes as getAreaNoteAttributes, getIsFetchingAttributes as getIsFetchingAreaNoteAttributes, getMethods as getAreaNoteMethods } from "areaNote/selectors";
+import { fetchAttributes as fetchAreaNoteAttributes } from "@/areaNote/actions";
+import { getAttributes as getAreaNoteAttributes, getIsFetchingAttributes as getIsFetchingAreaNoteAttributes, getMethods as getAreaNoteMethods } from "@/areaNote/selectors";
 import type { Attributes, Methods } from "types";
 
 function AreaNoteAttributes(WrappedComponent: any) {
diff --git a/src/components/attributes/AreaSearchAttributes.tsx b/src/components/attributes/AreaSearchAttributes.tsx
index 9bdd4bfa5..db582dd3c 100644
--- a/src/components/attributes/AreaSearchAttributes.tsx
+++ b/src/components/attributes/AreaSearchAttributes.tsx
@@ -1,10 +1,10 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import { getAttributes, getIsFetchingAttributes, getIsFetchingListAttributes, getListAttributes, getListMethods, getMethods } from "areaSearch/selectors";
+import { getAttributes, getIsFetchingAttributes, getIsFetchingListAttributes, getListAttributes, getListMethods, getMethods } from "@/areaSearch/selectors";
 import type { Attributes, Methods } from "types";
-import { fetchAttributes, fetchListAttributes } from "areaSearch/actions";
-import type { RootState } from "root/types";
+import { fetchAttributes, fetchListAttributes } from "@/areaSearch/actions";
+import type { RootState } from "@/root/types";
 
 function AreaSearchAttributes(WrappedComponent: React.ComponentType<any>) {
   type Props = {
diff --git a/src/components/attributes/BatchrunJobRunsTabAttributes.tsx b/src/components/attributes/BatchrunJobRunsTabAttributes.tsx
index 6867b81bf..40de77c7e 100644
--- a/src/components/attributes/BatchrunJobRunsTabAttributes.tsx
+++ b/src/components/attributes/BatchrunJobRunsTabAttributes.tsx
@@ -1,8 +1,8 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import { fetchJobRunAttributes as fetchBatchrunJobRunAttributes, fetchJobRunLogEntryAttributes as fetchBatchrunJobRunLogEntryAttributes } from "batchrun/actions";
-import { getIsFetchingJobRunAttributes as getIsFetchingBatchrunJobRunAttributes, getIsFetchingJobRunLogEntryAttributes as getIsFetchingBatchrunJobRunLogEntryAttributes, getJobRunAttributes as getBatchrunJobRunAttributes, getJobRunMethods as getBatchrunJobRunMethods, getJobRunLogEntryAttributes as getBatchrunJobRunLogEntryAttributes, getJobRunLogEntryMethods as getBatchrunJobRunLogEntryMethods } from "batchrun/selectors";
+import { fetchJobRunAttributes as fetchBatchrunJobRunAttributes, fetchJobRunLogEntryAttributes as fetchBatchrunJobRunLogEntryAttributes } from "@/batchrun/actions";
+import { getIsFetchingJobRunAttributes as getIsFetchingBatchrunJobRunAttributes, getIsFetchingJobRunLogEntryAttributes as getIsFetchingBatchrunJobRunLogEntryAttributes, getJobRunAttributes as getBatchrunJobRunAttributes, getJobRunMethods as getBatchrunJobRunMethods, getJobRunLogEntryAttributes as getBatchrunJobRunLogEntryAttributes, getJobRunLogEntryMethods as getBatchrunJobRunLogEntryMethods } from "@/batchrun/selectors";
 import type { Attributes, Methods } from "types";
 
 function BatchrunJobRunTabAttributes(WrappedComponent: any) {
diff --git a/src/components/attributes/BatchrunScheduledJobsTabAttributes.tsx b/src/components/attributes/BatchrunScheduledJobsTabAttributes.tsx
index ffaa061de..617f6c8b0 100644
--- a/src/components/attributes/BatchrunScheduledJobsTabAttributes.tsx
+++ b/src/components/attributes/BatchrunScheduledJobsTabAttributes.tsx
@@ -1,8 +1,8 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import { fetchScheduledJobAttributes as fetchBatchrunScheduledJobAttributes } from "batchrun/actions";
-import { getScheduledJobAttributes as getBatchrunScheduledJobAttributes, getIsFetchingScheduledJobAttributes as getIsFetchingBatchrunScheduledJobAttributes, getScheduledJobMethods as getBatchrunScheduledJobMethods } from "batchrun/selectors";
+import { fetchScheduledJobAttributes as fetchBatchrunScheduledJobAttributes } from "@/batchrun/actions";
+import { getScheduledJobAttributes as getBatchrunScheduledJobAttributes, getIsFetchingScheduledJobAttributes as getIsFetchingBatchrunScheduledJobAttributes, getScheduledJobMethods as getBatchrunScheduledJobMethods } from "@/batchrun/selectors";
 import type { Attributes, Methods } from "types";
 
 function BatchrunScheduledJobTabAttributes(WrappedComponent: any) {
diff --git a/src/components/attributes/ContactAttributes.tsx b/src/components/attributes/ContactAttributes.tsx
index b8b4aea63..7ea29f825 100644
--- a/src/components/attributes/ContactAttributes.tsx
+++ b/src/components/attributes/ContactAttributes.tsx
@@ -1,8 +1,8 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import { fetchAttributes as fetchContactAttributes } from "contacts/actions";
-import { getAttributes as getContactAttributes, getIsFetchingAttributes as getIsFetchingContactAttributes, getMethods as getContactMethods } from "contacts/selectors";
+import { fetchAttributes as fetchContactAttributes } from "@/contacts/actions";
+import { getAttributes as getContactAttributes, getIsFetchingAttributes as getIsFetchingContactAttributes, getMethods as getContactMethods } from "@/contacts/selectors";
 import type { Attributes, Methods } from "types";
 
 function ContactAttributes(WrappedComponent: any) {
diff --git a/src/components/attributes/InfillDevelopmentListPageAttributes.tsx b/src/components/attributes/InfillDevelopmentListPageAttributes.tsx
index 8db87013d..d51be592e 100644
--- a/src/components/attributes/InfillDevelopmentListPageAttributes.tsx
+++ b/src/components/attributes/InfillDevelopmentListPageAttributes.tsx
@@ -1,8 +1,8 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import { fetchAttributes as fetchInfillDevelopmentAttributes } from "infillDevelopment/actions";
-import { getAttributes as getInfillDevelopmentAttributes, getIsFetchingAttributes as getIsFetchingInfillDevelopmentAttributes, getMethods as getInfillDevelopmentMethods } from "infillDevelopment/selectors";
+import { fetchAttributes as fetchInfillDevelopmentAttributes } from "@/infillDevelopment/actions";
+import { getAttributes as getInfillDevelopmentAttributes, getIsFetchingAttributes as getIsFetchingInfillDevelopmentAttributes, getMethods as getInfillDevelopmentMethods } from "@/infillDevelopment/selectors";
 import type { Attributes, Methods } from "types";
 
 function InfillDevelopmentListPageAttributes(WrappedComponent: any) {
diff --git a/src/components/attributes/InfillDevelopmentPageAttributes.tsx b/src/components/attributes/InfillDevelopmentPageAttributes.tsx
index 09527666e..36ac5df21 100644
--- a/src/components/attributes/InfillDevelopmentPageAttributes.tsx
+++ b/src/components/attributes/InfillDevelopmentPageAttributes.tsx
@@ -1,12 +1,12 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import { fetchAttributes as fetchInfillDevelopmentAttributes } from "infillDevelopment/actions";
-import { fetchAttributes as fetchInfillDevelopmentAttachmentAttributes } from "infillDevelopmentAttachment/actions";
-import { fetchAttributes as fetchLeaseAttributes } from "leases/actions";
-import { getAttributes as getInfillDevelopmentAttributes, getIsFetchingAttributes as getIsFetchingInfillDevelopmentAttributes, getMethods as getInfillDevelopmentMethods } from "infillDevelopment/selectors";
-import { getAttributes as getInfillDevelopmentAttachmentAttributes, getIsFetchingAttributes as getIsFetchingInfillDevelopmentAttachmentAttributes, getMethods as getInfillDevelopmentAttachmentMethods } from "infillDevelopmentAttachment/selectors";
-import { getAttributes as getLeaseAttributes, getIsFetchingAttributes as getIsFetchingLeaseAttributes, getMethods as getLeaseMethods } from "leases/selectors";
+import { fetchAttributes as fetchInfillDevelopmentAttributes } from "@/infillDevelopment/actions";
+import { fetchAttributes as fetchInfillDevelopmentAttachmentAttributes } from "@/infillDevelopmentAttachment/actions";
+import { fetchAttributes as fetchLeaseAttributes } from "@/leases/actions";
+import { getAttributes as getInfillDevelopmentAttributes, getIsFetchingAttributes as getIsFetchingInfillDevelopmentAttributes, getMethods as getInfillDevelopmentMethods } from "@/infillDevelopment/selectors";
+import { getAttributes as getInfillDevelopmentAttachmentAttributes, getIsFetchingAttributes as getIsFetchingInfillDevelopmentAttachmentAttributes, getMethods as getInfillDevelopmentAttachmentMethods } from "@/infillDevelopmentAttachment/selectors";
+import { getAttributes as getLeaseAttributes, getIsFetchingAttributes as getIsFetchingLeaseAttributes, getMethods as getLeaseMethods } from "@/leases/selectors";
 import type { Attributes, Methods } from "types";
 
 function InfillDevelopmentPageAttributes(WrappedComponent: any) {
diff --git a/src/components/attributes/InvoiceNoteAttributes.tsx b/src/components/attributes/InvoiceNoteAttributes.tsx
index 9f41774ca..bd1ee6984 100644
--- a/src/components/attributes/InvoiceNoteAttributes.tsx
+++ b/src/components/attributes/InvoiceNoteAttributes.tsx
@@ -1,8 +1,8 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import { fetchAttributes as fetchInvoiceNoteAttributes } from "invoiceNote/actions";
-import { getAttributes as getInvoiceNoteAttributes, getIsFetchingAttributes as getIsFetchingInvoiceNoteAttributes, getMethods as getInvoiceNoteMethods } from "invoiceNote/selectors";
+import { fetchAttributes as fetchInvoiceNoteAttributes } from "@/invoiceNote/actions";
+import { getAttributes as getInvoiceNoteAttributes, getIsFetchingAttributes as getIsFetchingInvoiceNoteAttributes, getMethods as getInvoiceNoteMethods } from "@/invoiceNote/selectors";
 import type { Attributes, Methods } from "types";
 
 function InvoiceNoteAttributes(WrappedComponent: any) {
diff --git a/src/components/attributes/LandUseContractAttributes.tsx b/src/components/attributes/LandUseContractAttributes.tsx
index 1bb84651d..5cc659139 100644
--- a/src/components/attributes/LandUseContractAttributes.tsx
+++ b/src/components/attributes/LandUseContractAttributes.tsx
@@ -1,11 +1,11 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import { fetchAttributes as fetchLandUseContractAttributes } from "landUseContract/actions";
-import { getAttributes as getLandUseContractAttributes, getIsFetchingAttributes as getIsFetchingLandUseContractAttributes, getMethods as getLandUseContractMethods } from "landUseContract/selectors";
+import { fetchAttributes as fetchLandUseContractAttributes } from "@/landUseContract/actions";
+import { getAttributes as getLandUseContractAttributes, getIsFetchingAttributes as getIsFetchingLandUseContractAttributes, getMethods as getLandUseContractMethods } from "@/landUseContract/selectors";
 import type { Attributes, Methods } from "types";
-import { fetchAttributes as fetchLandUseAgreementAttachmentAttributes } from "landUseAgreementAttachment/actions";
-import { getAttributes as getLandUseAgreementAttachmentAttributes, getIsFetchingAttributes as getIsFetchingLandUseAgreementAttachmentAttributes, getMethods as getLandUseAgreementAttachmentMethods } from "landUseAgreementAttachment/selectors";
+import { fetchAttributes as fetchLandUseAgreementAttachmentAttributes } from "@/landUseAgreementAttachment/actions";
+import { getAttributes as getLandUseAgreementAttachmentAttributes, getIsFetchingAttributes as getIsFetchingLandUseAgreementAttachmentAttributes, getMethods as getLandUseAgreementAttachmentMethods } from "@/landUseAgreementAttachment/selectors";
 
 function LandUseContractAttributes(WrappedComponent: any) {
   type Props = {
diff --git a/src/components/attributes/LeaseAttributes.tsx b/src/components/attributes/LeaseAttributes.tsx
index 635ef8b4d..f196f3cea 100644
--- a/src/components/attributes/LeaseAttributes.tsx
+++ b/src/components/attributes/LeaseAttributes.tsx
@@ -1,8 +1,8 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import { fetchAttributes as fetchLeaseAttributes } from "leases/actions";
-import { getAttributes as getLeaseAttributes, getIsFetchingAttributes as getIsFetchingLeaseAttributes, getMethods as getLeaseMethods } from "leases/selectors";
+import { fetchAttributes as fetchLeaseAttributes } from "@/leases/actions";
+import { getAttributes as getLeaseAttributes, getIsFetchingAttributes as getIsFetchingLeaseAttributes, getMethods as getLeaseMethods } from "@/leases/selectors";
 import type { Attributes, Methods } from "types";
 
 function LeaseAttributes(WrappedComponent: any) {
diff --git a/src/components/attributes/LeaseInvoiceTabAttributes.tsx b/src/components/attributes/LeaseInvoiceTabAttributes.tsx
index 7855f1297..edbc09c11 100644
--- a/src/components/attributes/LeaseInvoiceTabAttributes.tsx
+++ b/src/components/attributes/LeaseInvoiceTabAttributes.tsx
@@ -1,20 +1,20 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import { fetchAttributes as fetchCollectionCourtDecisionAttributes } from "collectionCourtDecision/actions";
-import { fetchAttributes as fetchCollectionLetterAttributes } from "collectionLetter/actions";
-import { fetchAttributes as fetchCollectionNoteAttributes } from "collectionNote/actions";
-import { fetchAttributes as fetchCreateCollectionLetterAttributes } from "createCollectionLetter/actions";
-import { fetchAttributes as fetchInvoiceNoteAttributes } from "invoiceNote/actions";
-import { fetchAttributes as fetchLeaseCreateChargeAttributes } from "leaseCreateCharge/actions";
-import { fetchReceivableTypes } from "leaseCreateCharge/actions";
-import { getAttributes as getCollectionCourtDecisionAttributes, getIsFetchingAttributes as getIsFetchingCollectionCourtDecisionAttributes, getMethods as getCollectionCourtDecisionMethods } from "collectionCourtDecision/selectors";
-import { getAttributes as getCollectionLetterAttributes, getIsFetchingAttributes as getIsFetchignCollectionLetterAttributes, getMethods as getCollectionLetterMethods } from "collectionLetter/selectors";
-import { getAttributes as getCollectionNoteAttributes, getIsFetchingAttributes as getIsFetchingCollectionNoteAttributes, getMethods as getCollectionNoteMethods } from "collectionNote/selectors";
-import { getAttributes as getCreateCollectionLetterAttributes, getIsFetchingAttributes as getIsFetchignCreateCollectionLetterAttributes } from "createCollectionLetter/selectors";
-import { getAttributes as getInvoiceNoteAttributes, getIsFetchingAttributes as getIsFetchingInvoiceNoteAttributes, getMethods as getInvoiceNoteMethods } from "invoiceNote/selectors";
-import { getAttributes as getLeaseCreateChargeAttributes, getIsFetchingAttributes as getIsFetchingLeaseCreateChargeAttributes } from "leaseCreateCharge/selectors";
-import { getIsFetchingReceivableTypes, getReceivableTypes } from "leaseCreateCharge/selectors";
+import { fetchAttributes as fetchCollectionCourtDecisionAttributes } from "@/collectionCourtDecision/actions";
+import { fetchAttributes as fetchCollectionLetterAttributes } from "@/collectionLetter/actions";
+import { fetchAttributes as fetchCollectionNoteAttributes } from "@/collectionNote/actions";
+import { fetchAttributes as fetchCreateCollectionLetterAttributes } from "@/createCollectionLetter/actions";
+import { fetchAttributes as fetchInvoiceNoteAttributes } from "@/invoiceNote/actions";
+import { fetchAttributes as fetchLeaseCreateChargeAttributes } from "@/leaseCreateCharge/actions";
+import { fetchReceivableTypes } from "@/leaseCreateCharge/actions";
+import { getAttributes as getCollectionCourtDecisionAttributes, getIsFetchingAttributes as getIsFetchingCollectionCourtDecisionAttributes, getMethods as getCollectionCourtDecisionMethods } from "@/collectionCourtDecision/selectors";
+import { getAttributes as getCollectionLetterAttributes, getIsFetchingAttributes as getIsFetchignCollectionLetterAttributes, getMethods as getCollectionLetterMethods } from "@/collectionLetter/selectors";
+import { getAttributes as getCollectionNoteAttributes, getIsFetchingAttributes as getIsFetchingCollectionNoteAttributes, getMethods as getCollectionNoteMethods } from "@/collectionNote/selectors";
+import { getAttributes as getCreateCollectionLetterAttributes, getIsFetchingAttributes as getIsFetchignCreateCollectionLetterAttributes } from "@/createCollectionLetter/selectors";
+import { getAttributes as getInvoiceNoteAttributes, getIsFetchingAttributes as getIsFetchingInvoiceNoteAttributes, getMethods as getInvoiceNoteMethods } from "@/invoiceNote/selectors";
+import { getAttributes as getLeaseCreateChargeAttributes, getIsFetchingAttributes as getIsFetchingLeaseCreateChargeAttributes } from "@/leaseCreateCharge/selectors";
+import { getIsFetchingReceivableTypes, getReceivableTypes } from "@/leaseCreateCharge/selectors";
 import type { Attributes, Methods } from "types";
 
 function LeaseInvoiceTabAttributes(WrappedComponent: any) {
diff --git a/src/components/attributes/LeaseInvoicingConfirmationReportAttributes.tsx b/src/components/attributes/LeaseInvoicingConfirmationReportAttributes.tsx
index 430964f65..baf45d590 100644
--- a/src/components/attributes/LeaseInvoicingConfirmationReportAttributes.tsx
+++ b/src/components/attributes/LeaseInvoicingConfirmationReportAttributes.tsx
@@ -1,8 +1,8 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import { fetchLeaseInvoicingConfirmationReportAttributes } from "leaseStatisticReport/actions";
-import { getReportData, getIsFetchingReportData, getReportOptions, getReports } from "leaseStatisticReport/selectors";
+import { fetchLeaseInvoicingConfirmationReportAttributes } from "@/leaseStatisticReport/actions";
+import { getReportData, getIsFetchingReportData, getReportOptions, getReports } from "@/leaseStatisticReport/selectors";
 
 function LeaseInvoicingConfirmationReportAttributes(WrappedComponent: any) {
   type Props = {};
diff --git a/src/components/attributes/LeasePageAttributes.tsx b/src/components/attributes/LeasePageAttributes.tsx
index 29cb5ab2b..fb4244810 100644
--- a/src/components/attributes/LeasePageAttributes.tsx
+++ b/src/components/attributes/LeasePageAttributes.tsx
@@ -1,15 +1,15 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import { fetchAttributes as fetchCommentAttributes } from "comments/actions";
-import { fetchAttributes as fetchInvoiceAttributes } from "invoices/actions";
-import { fetchAttributes as fetchLeaseAttributes } from "leases/actions";
-import { getAttributes as getCommentAttributes, getIsFetchingAttributes as getIsFetchingCommentAttributes, getMethods as getCommentMethods } from "comments/selectors";
-import { getAttributes as getInvoiceAttributes, getIsFetchingAttributes as getIsFetchingInvoiceAttributes, getMethods as getInvoiceMethods } from "invoices/selectors";
-import { getAttributes as getLeaseAttributes, getIsFetchingAttributes as getIsFetchingLeaseAttributes, getMethods as getLeaseMethods } from "leases/selectors";
-import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors";
+import { fetchAttributes as fetchCommentAttributes } from "@/comments/actions";
+import { fetchAttributes as fetchInvoiceAttributes } from "@/invoices/actions";
+import { fetchAttributes as fetchLeaseAttributes } from "@/leases/actions";
+import { getAttributes as getCommentAttributes, getIsFetchingAttributes as getIsFetchingCommentAttributes, getMethods as getCommentMethods } from "@/comments/selectors";
+import { getAttributes as getInvoiceAttributes, getIsFetchingAttributes as getIsFetchingInvoiceAttributes, getMethods as getInvoiceMethods } from "@/invoices/selectors";
+import { getAttributes as getLeaseAttributes, getIsFetchingAttributes as getIsFetchingLeaseAttributes, getMethods as getLeaseMethods } from "@/leases/selectors";
+import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes, Methods } from "types";
-import type { UsersPermissions } from "usersPermissions/types";
+import type { UsersPermissions } from "@/usersPermissions/types";
 
 function LeasePageAttributes(WrappedComponent: any) {
   type Props = {
diff --git a/src/components/attributes/LeaseStatisticReportAttributes.tsx b/src/components/attributes/LeaseStatisticReportAttributes.tsx
index 2df1f2346..3707b8caa 100644
--- a/src/components/attributes/LeaseStatisticReportAttributes.tsx
+++ b/src/components/attributes/LeaseStatisticReportAttributes.tsx
@@ -1,9 +1,9 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import { fetchAttributes as fetchLeaseStatisticReportAttributes } from "leaseStatisticReport/actions";
-import { fetchReports } from "leaseStatisticReport/actions";
-import { getAttributes as getLeaseStatisticReportAttributes, getIsFetchingAttributes as getIsFetchingLeaseStatisticReportAttributes, getReports, getIsFetchingReports, getIsFetchingReportData, getIsSendingMail } from "leaseStatisticReport/selectors";
+import { fetchAttributes as fetchLeaseStatisticReportAttributes } from "@/leaseStatisticReport/actions";
+import { fetchReports } from "@/leaseStatisticReport/actions";
+import { getAttributes as getLeaseStatisticReportAttributes, getIsFetchingAttributes as getIsFetchingLeaseStatisticReportAttributes, getReports, getIsFetchingReports, getIsFetchingReportData, getIsSendingMail } from "@/leaseStatisticReport/selectors";
 import type { Attributes, Methods, Reports } from "types";
 
 function LeaseStatisticReportTabAttributes(WrappedComponent: any) {
diff --git a/src/components/attributes/LeaseholdTransferAttributes.tsx b/src/components/attributes/LeaseholdTransferAttributes.tsx
index ff11da25e..b6409a67f 100644
--- a/src/components/attributes/LeaseholdTransferAttributes.tsx
+++ b/src/components/attributes/LeaseholdTransferAttributes.tsx
@@ -1,8 +1,8 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import { fetchAttributes as fetchLeaseholdTransferAttributes } from "leaseholdTransfer/actions";
-import { getAttributes as getLeaseholdTransferAttributes, getIsFetchingAttributes as getIsFetchingLeaseholdTransferAttributes, getMethods as getLeaseholdTransferMethods } from "leaseholdTransfer/selectors";
+import { fetchAttributes as fetchLeaseholdTransferAttributes } from "@/leaseholdTransfer/actions";
+import { getAttributes as getLeaseholdTransferAttributes, getIsFetchingAttributes as getIsFetchingLeaseholdTransferAttributes, getMethods as getLeaseholdTransferMethods } from "@/leaseholdTransfer/selectors";
 import type { Attributes, Methods } from "types";
 
 function LeaseholdTransferAttributes(WrappedComponent: any) {
diff --git a/src/components/attributes/PlotApplicationsAttributes.tsx b/src/components/attributes/PlotApplicationsAttributes.tsx
index e40346c1a..235e08350 100644
--- a/src/components/attributes/PlotApplicationsAttributes.tsx
+++ b/src/components/attributes/PlotApplicationsAttributes.tsx
@@ -2,8 +2,8 @@ import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
 import type { Attributes, Methods } from "types";
-import { fetchAttributes as fetchPlotApplicationsAttributes } from "application/actions";
-import { getAttributes as getPlotApplicationsAttributes, getIsFetchingAttributes as getIsFetchingPlotApplicationsAttributes, getMethods } from "application/selectors";
+import { fetchAttributes as fetchPlotApplicationsAttributes } from "@/application/actions";
+import { getAttributes as getPlotApplicationsAttributes, getIsFetchingAttributes as getIsFetchingPlotApplicationsAttributes, getMethods } from "@/application/selectors";
 
 function PlotApplicationsAttributes(WrappedComponent: any) {
   type Props = {
diff --git a/src/components/attributes/PlotSearchAttributes.tsx b/src/components/attributes/PlotSearchAttributes.tsx
index ab75b7c25..6557bf324 100644
--- a/src/components/attributes/PlotSearchAttributes.tsx
+++ b/src/components/attributes/PlotSearchAttributes.tsx
@@ -1,10 +1,10 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import { fetchAttributes as fetchPlotSearchAttributes, fetchPlotSearchSubtypes } from "plotSearch/actions";
-import { getAttributes as getPlotSearchAttributes, getIsFetchingAttributes as getIsFetchingPlotSearchAttributes, getPlotSearchMethods, getPlotSearchSubTypes, getIsFetching } from "plotSearch/selectors";
-import { getFormAttributes, getIsFetchingFormAttributes } from "application/selectors";
-import { fetchFormAttributes } from "application/actions";
+import { fetchAttributes as fetchPlotSearchAttributes, fetchPlotSearchSubtypes } from "@/plotSearch/actions";
+import { getAttributes as getPlotSearchAttributes, getIsFetchingAttributes as getIsFetchingPlotSearchAttributes, getPlotSearchMethods, getPlotSearchSubTypes, getIsFetching } from "@/plotSearch/selectors";
+import { getFormAttributes, getIsFetchingFormAttributes } from "@/application/selectors";
+import { fetchFormAttributes } from "@/application/actions";
 import type { Attributes, Methods } from "types";
 
 function PlotSearchAttributes(WrappedComponent: any) {
diff --git a/src/components/attributes/RentBasisAttributes.tsx b/src/components/attributes/RentBasisAttributes.tsx
index 7a83aa033..b72e3d3f0 100644
--- a/src/components/attributes/RentBasisAttributes.tsx
+++ b/src/components/attributes/RentBasisAttributes.tsx
@@ -1,8 +1,8 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import { fetchAttributes as fetchRentBasisAttributes } from "rentbasis/actions";
-import { getAttributes as getRentBasisAttributes, getIsFetchingAttributes as getIsFetchingRentBasisAttributes, getMethods as getRentBasisMethods } from "rentbasis/selectors";
+import { fetchAttributes as fetchRentBasisAttributes } from "@/rentbasis/actions";
+import { getAttributes as getRentBasisAttributes, getIsFetchingAttributes as getIsFetchingRentBasisAttributes, getMethods as getRentBasisMethods } from "@/rentbasis/selectors";
 import type { Attributes, Methods } from "types";
 
 function RentBasisAttributes(WrappedComponent: any) {
diff --git a/src/components/attributes/SapInvoicesAttributes.tsx b/src/components/attributes/SapInvoicesAttributes.tsx
index 1a9eb392e..e31acb93d 100644
--- a/src/components/attributes/SapInvoicesAttributes.tsx
+++ b/src/components/attributes/SapInvoicesAttributes.tsx
@@ -1,8 +1,8 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import { fetchAttributes as fetchInvoiceAttributes } from "invoices/actions";
-import { getAttributes as getInvoiceAttributes, getIsFetchingAttributes as getIsFetchingInvoiceAttributes, getMethods as getInvoiceMethods } from "invoices/selectors";
+import { fetchAttributes as fetchInvoiceAttributes } from "@/invoices/actions";
+import { getAttributes as getInvoiceAttributes, getIsFetchingAttributes as getIsFetchingInvoiceAttributes, getMethods as getInvoiceMethods } from "@/invoices/selectors";
 import type { Attributes, Methods } from "types";
 
 function SapInvoicesAttributes(WrappedComponent: any) {
diff --git a/src/components/attributes/UsersPermissions.tsx b/src/components/attributes/UsersPermissions.tsx
index 7d96587ef..85b336862 100644
--- a/src/components/attributes/UsersPermissions.tsx
+++ b/src/components/attributes/UsersPermissions.tsx
@@ -2,9 +2,9 @@ import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import { fetchUsersPermissions } from "usersPermissions/actions";
-import { getUsersPermissions, getIsFetching as getIsFetchingUsersPermissions } from "usersPermissions/selectors";
-import type { UsersPermissions } from "usersPermissions/types";
+import { fetchUsersPermissions } from "@/usersPermissions/actions";
+import { getUsersPermissions, getIsFetching as getIsFetchingUsersPermissions } from "@/usersPermissions/selectors";
+import type { UsersPermissions } from "@/usersPermissions/types";
 
 function UsersPermissionsWrapper(WrappedComponent: any) {
   type Props = {
diff --git a/src/components/auditLog/AuditLogTableItem.tsx b/src/components/auditLog/AuditLogTableItem.tsx
index 47ba20324..82917c499 100644
--- a/src/components/auditLog/AuditLogTableItem.tsx
+++ b/src/components/auditLog/AuditLogTableItem.tsx
@@ -1,10 +1,10 @@
 import React, { Fragment, PureComponent } from "react";
 import classNames from "classnames";
-import AccordionIcon from "components/icons/AccordionIcon";
+import AccordionIcon from "@/components/icons/AccordionIcon";
 import AuditLogTableItemChange from "./AuditLogTableItemChange";
-import { formatDate } from "util/helpers";
-import { getAuditLogActionTypeInFinnish } from "auditLog/helpers";
-import { getUserFullName } from "users/helpers";
+import { formatDate } from "@/util/helpers";
+import { getAuditLogActionTypeInFinnish } from "@/auditLog/helpers";
+import { getUserFullName } from "@/users/helpers";
 type Props = {
   item: Record<string, any>;
 };
diff --git a/src/components/auditLog/AuditLogTableItemChange.tsx b/src/components/auditLog/AuditLogTableItemChange.tsx
index bca2b9ac0..eb699395c 100644
--- a/src/components/auditLog/AuditLogTableItemChange.tsx
+++ b/src/components/auditLog/AuditLogTableItemChange.tsx
@@ -1,12 +1,12 @@
 import React from "react";
 import { connect } from "react-redux";
-import ShowMore from "components/showMore/ShowMore";
-import { getAuditLogContentLabel } from "auditLog/helpers";
-import { getAttributes as getCommentAttributes } from "comments/selectors";
-import { getAttributes as getContactAttributes } from "contacts/selectors";
-import { getAttributes as getInfillDevelopmentCompensationAttributes } from "infillDevelopment/selectors";
-import { getAttributes as getInvoiceAttributes } from "invoices/selectors";
-import { getAttributes as getLeaseAttributes } from "leases/selectors";
+import ShowMore from "@/components/showMore/ShowMore";
+import { getAuditLogContentLabel } from "@/auditLog/helpers";
+import { getAttributes as getCommentAttributes } from "@/comments/selectors";
+import { getAttributes as getContactAttributes } from "@/contacts/selectors";
+import { getAttributes as getInfillDevelopmentCompensationAttributes } from "@/infillDevelopment/selectors";
+import { getAttributes as getInvoiceAttributes } from "@/invoices/selectors";
+import { getAttributes as getLeaseAttributes } from "@/leases/selectors";
 import type { Attributes } from "types";
 type Props = {
   change: {
diff --git a/src/components/authorization/Authorization.ts b/src/components/authorization/Authorization.ts
index 6ec273b07..a5067691c 100644
--- a/src/components/authorization/Authorization.ts
+++ b/src/components/authorization/Authorization.ts
@@ -1,13 +1,13 @@
 type Props = {
   allow: boolean;
-  children?: React.ReactNode;
-  errorComponent?: React.ReactNode;
+  children?: JSX.Element;
+  errorComponent?: JSX.Element;
 };
 
 const Authorization = ({
   allow,
   children,
   errorComponent
-}: Props): React.ReactNode => allow ? children || null : errorComponent ? errorComponent : null;
+}: Props): JSX.Element => allow ? children || null : errorComponent ? errorComponent : null;
 
 export default Authorization;
\ No newline at end of file
diff --git a/src/components/button/BackButton.tsx b/src/components/button/BackButton.tsx
index de786654e..860aa0c6e 100644
--- a/src/components/button/BackButton.tsx
+++ b/src/components/button/BackButton.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import classNames from "classnames";
-import BackIcon from "components/icons/BackIcon";
+import BackIcon from "@/components/icons/BackIcon";
 import IconButton from "./IconButton";
 type Props = {
   className?: string;
diff --git a/src/components/button/Button.tsx b/src/components/button/Button.tsx
index 8f8488648..4cebcb997 100644
--- a/src/components/button/Button.tsx
+++ b/src/components/button/Button.tsx
@@ -20,7 +20,7 @@ const Button = ({
   text,
   title,
   type = 'button'
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   return <button ref={innerRef} className={classNames('mvj-button', className)} onClick={onClick} disabled={disabled} style={style} title={title} type={type}>
       {text}
     </button>;
diff --git a/src/components/button/CloseButton.tsx b/src/components/button/CloseButton.tsx
index d01a7c5f9..ee5db0e45 100644
--- a/src/components/button/CloseButton.tsx
+++ b/src/components/button/CloseButton.tsx
@@ -1,7 +1,5 @@
 import React from "react";
 import classNames from "classnames";
-// @ts-ignore: unable to find svg file. Handled by webpack?
-import closeIcon from "../../../assets/icons/icon_close.svg";
 type Props = {
   className?: string;
   onClick: (...args: Array<any>) => any;
@@ -31,7 +29,7 @@ const CloseButton = ({
   };
 
   return <button ref={handleSetReference} aria-label='Sulje' className={classNames('close-button-component', className)} type={type} title={title} onClick={onClick} onKeyDown={handleKeyDown}>
-      <img src={closeIcon} alt='Poista' />
+      <i className={classNames('.close-button-component.i', className)} aria-label='Poista' />
     </button>;
 };
 
diff --git a/src/components/button/EditButton.tsx b/src/components/button/EditButton.tsx
index e5033bba0..bd184026a 100644
--- a/src/components/button/EditButton.tsx
+++ b/src/components/button/EditButton.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import classNames from "classnames";
-import EditIcon from "components/icons/EditIcon";
+import EditIcon from "@/components/icons/EditIcon";
 type Props = {
   className?: string;
   disabled?: boolean;
diff --git a/src/components/button/SendupButton.tsx b/src/components/button/SendupButton.tsx
index c70273a38..4e01dc0b5 100644
--- a/src/components/button/SendupButton.tsx
+++ b/src/components/button/SendupButton.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import classNames from "classnames";
-import SendupIcon from "components/icons/SendupIcon";
+import SendupIcon from "@/components/icons/SendupIcon";
 type Props = {
   className?: string;
   onClick: (...args: Array<any>) => any;
diff --git a/src/components/button/_close-button.scss b/src/components/button/_close-button.scss
index 161990356..cb7e3dc6b 100644
--- a/src/components/button/_close-button.scss
+++ b/src/components/button/_close-button.scss
@@ -2,7 +2,7 @@
   cursor: pointer;
   position: relative;
   top: rem-calc(-1px);
-
+  background-image: url(/assets/icons/icon_error.svg);
   img {
     height: 20px;
     width: 20px;
diff --git a/src/components/collapse/Collapse.tsx b/src/components/collapse/Collapse.tsx
index b797a2883..806206da6 100644
--- a/src/components/collapse/Collapse.tsx
+++ b/src/components/collapse/Collapse.tsx
@@ -4,13 +4,13 @@ import ReactDOM from "react-dom";
 import classNames from "classnames";
 import { Row, Column } from "react-foundation";
 import ReactResizeDetector from "react-resize-detector";
-import AccordionIcon from "../icons/AccordionIcon";
-import ArchiveButton from "../form/ArchiveButton";
+import AccordionIcon from "@/components/icons/AccordionIcon";
+import ArchiveButton from "@/components/form/ArchiveButton";
 import CollapseHeaderTitle from "./CollapseHeaderTitle";
-import AttachButton from "../form/AttachButton";
-import CopyToClipboardButton from "../form/CopyToClipboardButton";
-import RemoveButton from "../form/RemoveButton";
-import UnarchiveButton from "../form/UnarchiveButton";
+import AttachButton from "@/components/form/AttachButton";
+import CopyToClipboardButton from "@/components/form/CopyToClipboardButton";
+import RemoveButton from "@/components/form/RemoveButton";
+import UnarchiveButton from "@/components/form/UnarchiveButton";
 type Props = {
   archived?: boolean;
   children: any;
@@ -143,7 +143,7 @@ class Collapse extends PureComponent<Props, State> {
     }
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       contentHeight,
       isOpen,
diff --git a/src/components/collapse/CollapseHeaderSubtitle.tsx b/src/components/collapse/CollapseHeaderSubtitle.tsx
index ee86c1666..70fd293db 100644
--- a/src/components/collapse/CollapseHeaderSubtitle.tsx
+++ b/src/components/collapse/CollapseHeaderSubtitle.tsx
@@ -5,6 +5,6 @@ type Props = {
 
 const CollapseHeaderSubtitle = ({
   children
-}: Props): React.ReactNode => <span className='collapse__header_subtitle'>{children}</span>;
+}: Props): JSX.Element => <span className='collapse__header_subtitle'>{children}</span>;
 
 export default CollapseHeaderSubtitle;
\ No newline at end of file
diff --git a/src/components/collapse/CollapseHeaderTitle.tsx b/src/components/collapse/CollapseHeaderTitle.tsx
index a7375902c..5f675a018 100644
--- a/src/components/collapse/CollapseHeaderTitle.tsx
+++ b/src/components/collapse/CollapseHeaderTitle.tsx
@@ -2,7 +2,7 @@ import { $Shape } from "utility-types";
 import React, { PureComponent } from "react";
 import ReactDOM from "react-dom";
 import classNames from "classnames";
-import UIDataTooltip from "components/tooltip/UIDataTooltip";
+import UIDataTooltip from "@/components/tooltip/UIDataTooltip";
 type Props = {
   children?: any;
   enableUiDataEdit?: boolean;
@@ -64,7 +64,7 @@ class CollapseHeaderTitle extends PureComponent<Props, State> {
     });
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       children,
       enableUiDataEdit,
diff --git a/src/components/spec.ts b/src/components/components.spec.ts
similarity index 82%
rename from src/components/spec.ts
rename to src/components/components.spec.ts
index 385dc057c..5a425915d 100644
--- a/src/components/spec.ts
+++ b/src/components/components.spec.ts
@@ -1,7 +1,7 @@
-import { expect } from "chai";
-import ErrorIcon from "components/icons/ErrorIcon";
-import SuccessIcon from "components/icons/SuccessIcon";
-import ToastrIcons from "components/toastr/ToastrIcons";
+import { describe, expect, it } from "vitest";
+import ErrorIcon from "@/components/icons/ErrorIcon";
+import SuccessIcon from "@/components/icons/SuccessIcon";
+import ToastrIcons from "@/components/toastr/ToastrIcons";
 
 describe('components', () => {
   describe('ErrorIcon', () => {
diff --git a/src/components/content/SubTitle.tsx b/src/components/content/SubTitle.tsx
index 216c462ab..99b813f23 100644
--- a/src/components/content/SubTitle.tsx
+++ b/src/components/content/SubTitle.tsx
@@ -2,7 +2,7 @@ import { $Shape } from "utility-types";
 import React, { PureComponent } from "react";
 import ReactDOM from "react-dom";
 import classNames from "classnames";
-import UIDataTooltip from "components/tooltip/UIDataTooltip";
+import UIDataTooltip from "@/components/tooltip/UIDataTooltip";
 type Props = {
   children?: any;
   enableUiDataEdit?: boolean;
@@ -63,7 +63,7 @@ class SubTitle extends PureComponent<Props, State> {
     });
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       children,
       enableUiDataEdit,
diff --git a/src/components/content/Title.tsx b/src/components/content/Title.tsx
index 8511c5499..e195a69b8 100644
--- a/src/components/content/Title.tsx
+++ b/src/components/content/Title.tsx
@@ -2,7 +2,7 @@ import { $Shape } from "utility-types";
 import React, { PureComponent } from "react";
 import ReactDOM from "react-dom";
 import classNames from "classnames";
-import UIDataTooltip from "components/tooltip/UIDataTooltip";
+import UIDataTooltip from "@/components/tooltip/UIDataTooltip";
 type Props = {
   children?: any;
   enableUiDataEdit?: boolean;
@@ -63,7 +63,7 @@ class Title extends PureComponent<Props, State> {
     });
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       children,
       enableUiDataEdit,
diff --git a/src/components/content/TitleH3.tsx b/src/components/content/TitleH3.tsx
index 464e05aa3..0e3a083bc 100644
--- a/src/components/content/TitleH3.tsx
+++ b/src/components/content/TitleH3.tsx
@@ -2,7 +2,7 @@ import { $Shape } from "utility-types";
 import React, { PureComponent } from "react";
 import ReactDOM from "react-dom";
 import classNames from "classnames";
-import UIDataTooltip from "components/tooltip/UIDataTooltip";
+import UIDataTooltip from "@/components/tooltip/UIDataTooltip";
 type Props = {
   children?: any;
   enableUiDataEdit?: boolean;
@@ -63,7 +63,7 @@ class TitleH3 extends PureComponent<Props, State> {
     });
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       children,
       enableUiDataEdit,
diff --git a/src/components/controlButtons/CommentButton.tsx b/src/components/controlButtons/CommentButton.tsx
index 75e843bef..a0bb85b08 100644
--- a/src/components/controlButtons/CommentButton.tsx
+++ b/src/components/controlButtons/CommentButton.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import CommentIcon from "components/icons/CommentIcon";
+import CommentIcon from "@/components/icons/CommentIcon";
 type Props = {
   commentAmount: number;
   onClick: (...args: Array<any>) => any;
diff --git a/src/components/controlButtons/ControlButtonBar.tsx b/src/components/controlButtons/ControlButtonBar.tsx
index 4c814af0a..c1bb121ac 100644
--- a/src/components/controlButtons/ControlButtonBar.tsx
+++ b/src/components/controlButtons/ControlButtonBar.tsx
@@ -1,9 +1,9 @@
 import React from "react";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import BackButton from "components/button/BackButton";
-import { ConfirmationModalTexts } from "enums";
-import { ButtonColors } from "components/enums";
-import { hasAnyPageDirtyForms } from "util/forms";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import BackButton from "@/components/button/BackButton";
+import { ConfirmationModalTexts } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { hasAnyPageDirtyForms } from "@/util/forms";
 type Props = {
   buttonComponent?: any;
   infoComponent?: any;
diff --git a/src/components/controlButtons/ControlButtons.tsx b/src/components/controlButtons/ControlButtons.tsx
index f861c939f..6abb4b778 100644
--- a/src/components/controlButtons/ControlButtons.tsx
+++ b/src/components/controlButtons/ControlButtons.tsx
@@ -1,11 +1,11 @@
 import React from "react";
 import Button from "../button/Button";
-import Authorization from "components/authorization/Authorization";
+import Authorization from "@/components/authorization/Authorization";
 import CommentButton from "./CommentButton";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import { ConfirmationModalTexts } from "enums";
-import { hasAnyPageDirtyForms } from "util/forms";
-import { ButtonColors } from "components/enums";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import { ConfirmationModalTexts } from "@/enums";
+import { hasAnyPageDirtyForms } from "@/util/forms";
+import { ButtonColors } from "@/components/enums";
 type Props = {
   allowComments?: boolean;
   allowCopy?: boolean;
@@ -55,7 +55,7 @@ const ControlButtons = ({
   showCommentButton = true,
   showCopyButton = false,
   saveButtonText = 'Tallenna'
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   const handleComment = () => {
     onComment?.();
   };
diff --git a/src/components/excel/ExcelLink.tsx b/src/components/excel/ExcelLink.tsx
index c50c62d82..7b2681228 100644
--- a/src/components/excel/ExcelLink.tsx
+++ b/src/components/excel/ExcelLink.tsx
@@ -1,11 +1,11 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import { saveAs } from "file-saver";
-import ExcelIcon from "components/icons/ExcelIcon";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import { getApiToken } from "auth/selectors";
-import { displayUIMessage } from "util/helpers";
+import ExcelIcon from "@/components/icons/ExcelIcon";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import { getApiToken } from "@/auth/selectors";
+import { displayUIMessage } from "@/util/helpers";
 type Props = {
   label: string;
   apiToken: string;
diff --git a/src/components/file/FileDownloadButton.tsx b/src/components/file/FileDownloadButton.tsx
index bc9a9a3ae..33c1f85bb 100644
--- a/src/components/file/FileDownloadButton.tsx
+++ b/src/components/file/FileDownloadButton.tsx
@@ -2,10 +2,10 @@ import React from "react";
 import { connect } from "react-redux";
 import debounce from "lodash/debounce";
 import { saveAs } from "file-saver";
-import Button from "components/button/Button";
-import { ButtonColors } from "components/enums";
-import { displayUIMessage, getFileNameFromResponse } from "util/helpers";
-import { getApiToken } from "auth/selectors";
+import Button from "@/components/button/Button";
+import { ButtonColors } from "@/components/enums";
+import { displayUIMessage, getFileNameFromResponse } from "@/util/helpers";
+import { getApiToken } from "@/auth/selectors";
 type OwnProps = {
   disabled: boolean;
   label: string;
diff --git a/src/components/file/FileDownloadLink.tsx b/src/components/file/FileDownloadLink.tsx
index 2a941945f..0755a7552 100644
--- a/src/components/file/FileDownloadLink.tsx
+++ b/src/components/file/FileDownloadLink.tsx
@@ -2,10 +2,10 @@ import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import { saveAs } from "file-saver";
 import classNames from "classnames";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import { displayUIMessage, getFileNameFromResponse } from "util/helpers";
-import { getApiToken } from "auth/selectors";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import { displayUIMessage, getFileNameFromResponse } from "@/util/helpers";
+import { getApiToken } from "@/auth/selectors";
 type Props = {
   apiToken: string;
   className?: string;
diff --git a/src/components/form/ActionButtonWrapper.tsx b/src/components/form/ActionButtonWrapper.tsx
index f75fa5d3e..7c8c22f1f 100644
--- a/src/components/form/ActionButtonWrapper.tsx
+++ b/src/components/form/ActionButtonWrapper.tsx
@@ -5,6 +5,6 @@ type Props = {
 
 const ActionButtonWrapper = ({
   children
-}: Props): React.ReactNode => <div className='form__action-button-wrapper'>{children}</div>;
+}: Props): JSX.Element => <div className='form__action-button-wrapper'>{children}</div>;
 
 export default ActionButtonWrapper;
\ No newline at end of file
diff --git a/src/components/form/AddButton.tsx b/src/components/form/AddButton.tsx
index 88afdaccf..1d6c26533 100644
--- a/src/components/form/AddButton.tsx
+++ b/src/components/form/AddButton.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import classNames from "classnames";
-import AddIcon from "components/icons/AddIcon";
+import AddIcon from "@/components/icons/AddIcon";
 type Props = {
   className?: string;
   disabled?: boolean;
@@ -17,7 +17,7 @@ const AddButton = ({
   onClick,
   style,
   title
-}: Props): React.ReactNode => <button className={classNames('form__add-button', className)} disabled={disabled} onClick={onClick} style={style} title={title} type='button'>
+}: Props): JSX.Element => <button className={classNames('form__add-button', className)} disabled={disabled} onClick={onClick} style={style} title={title} type='button'>
     <AddIcon />
     <span>{label}</span>
   </button>;
diff --git a/src/components/form/AddButtonSecondary.tsx b/src/components/form/AddButtonSecondary.tsx
index 5b86699fa..c1928736b 100644
--- a/src/components/form/AddButtonSecondary.tsx
+++ b/src/components/form/AddButtonSecondary.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import classNames from "classnames";
-import AddIcon from "components/icons/AddIcon";
+import AddIcon from "@/components/icons/AddIcon";
 type Props = {
   className?: string;
   disabled?: boolean;
@@ -17,7 +17,7 @@ const AddButtonSecondary = ({
   onClick,
   style,
   title
-}: Props): React.ReactNode => <button className={classNames('form__add-button secondary', className)} disabled={disabled} onClick={onClick} style={style} title={title} type='button'>
+}: Props): JSX.Element => <button className={classNames('form__add-button secondary', className)} disabled={disabled} onClick={onClick} style={style} title={title} type='button'>
     <AddIcon />
     <span>{label}</span>
   </button>;
diff --git a/src/components/form/AddButtonThird.tsx b/src/components/form/AddButtonThird.tsx
index 469c1d07c..ffce39044 100644
--- a/src/components/form/AddButtonThird.tsx
+++ b/src/components/form/AddButtonThird.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import classNames from "classnames";
-import AddIcon from "components/icons/AddIcon";
+import AddIcon from "@/components/icons/AddIcon";
 type Props = {
   className?: string;
   disabled?: boolean;
@@ -17,7 +17,7 @@ const AddButtonThird = ({
   onClick,
   style,
   title
-}: Props): React.ReactNode => <button className={classNames('form__add-button third-level', className)} disabled={disabled} onClick={onClick} style={style} title={title} type='button'>
+}: Props): JSX.Element => <button className={classNames('form__add-button third-level', className)} disabled={disabled} onClick={onClick} style={style} title={title} type='button'>
     <AddIcon />
     <span>{label}</span>
   </button>;
diff --git a/src/components/form/AddFileButton.tsx b/src/components/form/AddFileButton.tsx
index a9da8417b..5f4d78ce1 100644
--- a/src/components/form/AddFileButton.tsx
+++ b/src/components/form/AddFileButton.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import AddIcon from "components/icons/AddIcon";
+import AddIcon from "@/components/icons/AddIcon";
 type Props = {
   label: string;
   name: string;
@@ -11,7 +11,7 @@ const AddFileButton = ({
   label,
   name,
   onChange
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   let input: any;
 
   const handleKeyDown = (e: any) => {
diff --git a/src/components/form/ArchiveButton.tsx b/src/components/form/ArchiveButton.tsx
index cad81d35b..134e07339 100644
--- a/src/components/form/ArchiveButton.tsx
+++ b/src/components/form/ArchiveButton.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import classNames from "classnames";
-import ArchiveIcon from "components/icons/ArchiveIcon";
+import ArchiveIcon from "@/components/icons/ArchiveIcon";
 type Props = {
   className?: string;
   disabled?: boolean;
@@ -15,7 +15,7 @@ const ArchiveButton = ({
   onClick,
   title,
   type = 'button'
-}: Props): React.ReactNode => <button className={classNames('form__archive-button', className)} disabled={disabled} type={type} title={title} onClick={onClick}>
+}: Props): JSX.Element => <button className={classNames('form__archive-button', className)} disabled={disabled} type={type} title={title} onClick={onClick}>
     <ArchiveIcon className='icon-medium' />
   </button>;
 
diff --git a/src/components/form/AsyncSelect.tsx b/src/components/form/AsyncSelect.tsx
index 6610f991c..16b879c17 100644
--- a/src/components/form/AsyncSelect.tsx
+++ b/src/components/form/AsyncSelect.tsx
@@ -1,8 +1,8 @@
 import React, { Component } from "react";
 import Async from "react-select/async";
 import classNames from "classnames";
-import DropdownIndicator from "components/inputs/DropdownIndicator";
-import LoadingIndicator from "components/inputs/SelectLoadingIndicator";
+import DropdownIndicator from "@/components/inputs/DropdownIndicator";
+import LoadingIndicator from "@/components/inputs/SelectLoadingIndicator";
 type Props = {
   disabled?: boolean;
   displayError: boolean;
@@ -127,7 +127,7 @@ class AsyncSelect extends Component<Props, State> {
     }
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       disabled,
       displayError,
diff --git a/src/components/form/AttachButton.tsx b/src/components/form/AttachButton.tsx
index 19020b067..1cbfa1751 100644
--- a/src/components/form/AttachButton.tsx
+++ b/src/components/form/AttachButton.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import classNames from "classnames";
-import AttachIcon from "components/icons/AttachIcon";
+import AttachIcon from "@/components/icons/AttachIcon";
 type Props = {
   className?: string;
   disabled?: boolean;
@@ -15,7 +15,7 @@ const AttachButton = ({
   onClick,
   title,
   type = 'button'
-}: Props): React.ReactNode => <button className={classNames('form__attach-button', className)} disabled={disabled} type={type} title={title} onClick={onClick}>
+}: Props): JSX.Element => <button className={classNames('form__attach-button', className)} disabled={disabled} type={type} title={title} onClick={onClick}>
     <AttachIcon className='icon-medium' />
   </button>;
 
diff --git a/src/components/form/CopyToClipboardButton.tsx b/src/components/form/CopyToClipboardButton.tsx
index 757f810db..d3e0c2b8a 100644
--- a/src/components/form/CopyToClipboardButton.tsx
+++ b/src/components/form/CopyToClipboardButton.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import classNames from "classnames";
-import CopyToClipboardIcon from "components/icons/CopyToClipboardIcon";
+import CopyToClipboardIcon from "@/components/icons/CopyToClipboardIcon";
 type Props = {
   className?: string;
   disabled?: boolean;
@@ -10,7 +10,7 @@ type Props = {
   style?: any;
 };
 
-const CopyToClipboardButton = (props: Props): React.ReactNode => {
+const CopyToClipboardButton = (props: Props): JSX.Element => {
   const {
     className,
     disabled,
diff --git a/src/components/form/DecisionSelectInput.tsx b/src/components/form/DecisionSelectInput.tsx
index 3c3a6b4d8..d77bdc7f3 100644
--- a/src/components/form/DecisionSelectInput.tsx
+++ b/src/components/form/DecisionSelectInput.tsx
@@ -1,8 +1,8 @@
 import React from "react";
 import debounce from "lodash/debounce";
-import AsyncSelect from "components/form/AsyncSelect";
-import { fetchDecisions } from "leases/requestsAsync";
-import { formatDecisionName } from "plotSearch/helpers";
+import AsyncSelect from "@/components/form/AsyncSelect";
+import { fetchDecisions } from "@/leases/requestsAsync";
+import { formatDecisionName } from "@/plotSearch/helpers";
 type Props = {
   disabled?: boolean;
   name: string;
@@ -25,7 +25,7 @@ const DecisionSelectInput = ({
   getOptions,
   cacheOptions,
   hasError
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   const getDecisionOptions = (decisionList: Array<Record<string, any>>): Array<Record<string, any>> => decisionList.map(decision => {
     return {
       value: decision.id,
diff --git a/src/components/form/DocumentsButton.tsx b/src/components/form/DocumentsButton.tsx
index e3d90c1ce..902004852 100644
--- a/src/components/form/DocumentsButton.tsx
+++ b/src/components/form/DocumentsButton.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import classNames from "classnames";
-import DocIcon from "components/icons/DocIcon";
+import DocIcon from "@/components/icons/DocIcon";
 type Props = {
   className?: string;
   disabled?: boolean;
@@ -17,7 +17,7 @@ const AddButton = ({
   onClick,
   style,
   title
-}: Props): React.ReactNode => <button className={classNames('form__add-button', className)} disabled={disabled} onClick={onClick} style={style} title={title} type='button'>
+}: Props): JSX.Element => <button className={classNames('form__add-button', className)} disabled={disabled} onClick={onClick} style={style} title={title} type='button'>
     <span>{label}</span>
     <DocIcon />
   </button>;
diff --git a/src/components/form/EditButton.tsx b/src/components/form/EditButton.tsx
index 0804762f1..30c105aef 100644
--- a/src/components/form/EditButton.tsx
+++ b/src/components/form/EditButton.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import classNames from "classnames";
-import EditIcon from "components/icons/EditIcon";
+import EditIcon from "@/components/icons/EditIcon";
 type Props = {
   className?: string;
   disabled?: boolean;
@@ -15,7 +15,7 @@ const EditButton = ({
   onClick,
   title,
   type = 'button'
-}: Props): React.ReactNode => <button className={classNames('form__edit-button', className)} disabled={disabled} type={type} title={title} onClick={onClick}>
+}: Props): JSX.Element => <button className={classNames('form__edit-button', className)} disabled={disabled} type={type} title={title} onClick={onClick}>
     <EditIcon className='icon-medium' />
   </button>;
 
diff --git a/src/components/form/ErrorBlock.tsx b/src/components/form/ErrorBlock.tsx
index 4c9dfca71..97b687f37 100644
--- a/src/components/form/ErrorBlock.tsx
+++ b/src/components/form/ErrorBlock.tsx
@@ -5,6 +5,6 @@ type Props = {
 
 const ErrorBlock = ({
   error
-}: Props): React.ReactNode => <span className="form-field__error-block" role="alert">{error}</span>;
+}: Props): JSX.Element => <span className="form-field__error-block" role="alert">{error}</span>;
 
 export default ErrorBlock;
\ No newline at end of file
diff --git a/src/components/form/ErrorField.tsx b/src/components/form/ErrorField.tsx
index dd9f69f4a..690ed188a 100644
--- a/src/components/form/ErrorField.tsx
+++ b/src/components/form/ErrorField.tsx
@@ -11,6 +11,6 @@ const ErrorField = ({
   },
   showError = false,
   style
-}: Props): React.ReactNode => showError && error ? <span className="form-field__error-field" role="alert" style={style}>{error}</span> : null;
+}: Props): JSX.Element => showError && error ? <span className="form-field__error-field" role="alert" style={style}>{error}</span> : null;
 
 export default ErrorField;
\ No newline at end of file
diff --git a/src/components/form/FieldAndRemoveButtonWrapper.tsx b/src/components/form/FieldAndRemoveButtonWrapper.tsx
index d31d2566d..3ef3d9b63 100644
--- a/src/components/form/FieldAndRemoveButtonWrapper.tsx
+++ b/src/components/form/FieldAndRemoveButtonWrapper.tsx
@@ -10,7 +10,7 @@ const FieldAndRemoveButtonWrapper = ({
   className,
   field,
   removeButton
-}: Props): React.ReactNode => <div className={classNames('form__field-and-remove-button-wrapper', className)}>
+}: Props): JSX.Element => <div className={classNames('form__field-and-remove-button-wrapper', className)}>
     {field}
     <div className='form__field-and-remove-button-wrapper_button'>
       {removeButton}
diff --git a/src/components/form/FieldTypeAddress.tsx b/src/components/form/FieldTypeAddress.tsx
index 6b3cc493e..77b910e3f 100644
--- a/src/components/form/FieldTypeAddress.tsx
+++ b/src/components/form/FieldTypeAddress.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import classNames from "classnames";
-import AddressSearchInput from "components/address-search/AddressSearchInput";
+import AddressSearchInput from "@/components/address-search/AddressSearchInput";
 type Props = {
   autoComplete: string;
   disabled: boolean;
@@ -23,7 +23,7 @@ const FieldTypeAddress = ({
   },
   isDirty,
   valueSelectedCallback
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   return <div className={classNames('form-field__address', {
     'has-error': displayError
   }, {
diff --git a/src/components/form/FieldTypeBasic.tsx b/src/components/form/FieldTypeBasic.tsx
index 518455417..fc58555d7 100644
--- a/src/components/form/FieldTypeBasic.tsx
+++ b/src/components/form/FieldTypeBasic.tsx
@@ -27,7 +27,7 @@ const FieldTypeBasic = ({
   placeholder,
   setRefForField,
   type = 'text'
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   const handleChange = (e: any) => {
     if (autoBlur) {
       onBlur(e.target.value);
diff --git a/src/components/form/FieldTypeBoolean.tsx b/src/components/form/FieldTypeBoolean.tsx
index da657b04e..435575305 100644
--- a/src/components/form/FieldTypeBoolean.tsx
+++ b/src/components/form/FieldTypeBoolean.tsx
@@ -22,7 +22,7 @@ const FieldTypeBoolean = ({
   },
   isDirty = false,
   label
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   const options = [{
     value: false,
     label: 'Ei'
diff --git a/src/components/form/FieldTypeCheckbox.tsx b/src/components/form/FieldTypeCheckbox.tsx
index 022b5de74..dc98262b2 100644
--- a/src/components/form/FieldTypeCheckbox.tsx
+++ b/src/components/form/FieldTypeCheckbox.tsx
@@ -20,7 +20,7 @@ const FieldTypeCheckbox = ({
   isDirty = false,
   label,
   options
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   const hasMultipleValues = options && options.length > 1;
 
   const handleChange = (event: any, optionValue) => {
diff --git a/src/components/form/FieldTypeCheckboxDateTime.tsx b/src/components/form/FieldTypeCheckboxDateTime.tsx
index bcc8627b1..3d719be2c 100644
--- a/src/components/form/FieldTypeCheckboxDateTime.tsx
+++ b/src/components/form/FieldTypeCheckboxDateTime.tsx
@@ -28,7 +28,7 @@ class FieldTypeCheckboxDateTime extends PureComponent<Props, State> {
     onBlur(value ? null : defaultValue ? defaultValue : new Date().toISOString());
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       disabled = false,
       displayError = false,
diff --git a/src/components/form/FieldTypeContactSelect.tsx b/src/components/form/FieldTypeContactSelect.tsx
index 9476b6b20..76f1db28f 100644
--- a/src/components/form/FieldTypeContactSelect.tsx
+++ b/src/components/form/FieldTypeContactSelect.tsx
@@ -1,10 +1,10 @@
 import React from "react";
 import debounce from "lodash/debounce";
-import AsyncSelect from "components/form/AsyncSelect";
-import { getContentContact } from "contacts/helpers";
-import { addEmptyOption, sortStringByKeyAsc } from "util/helpers";
-import { fetchContacts } from "contacts/requestsAsync";
-import type { UserServiceUnit } from "usersPermissions/types";
+import AsyncSelect from "@/components/form/AsyncSelect";
+import { getContentContact } from "@/contacts/helpers";
+import { addEmptyOption, sortStringByKeyAsc } from "@/util/helpers";
+import { fetchContacts } from "@/contacts/requestsAsync";
+import type { UserServiceUnit } from "@/usersPermissions/types";
 type Props = {
   disabled?: boolean;
   displayError: boolean;
@@ -23,7 +23,7 @@ const FieldTypeContactSelect = ({
   onChange,
   placeholder,
   serviceUnit
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   const getContacts = debounce(async (inputValue: string, callback: (...args: Array<any>) => any) => {
     const contacts = await fetchContacts({
       search: inputValue,
diff --git a/src/components/form/FieldTypeDatePicker.tsx b/src/components/form/FieldTypeDatePicker.tsx
index 688ec5b0d..989cca8b9 100644
--- a/src/components/form/FieldTypeDatePicker.tsx
+++ b/src/components/form/FieldTypeDatePicker.tsx
@@ -3,7 +3,7 @@ import DatePicker, { registerLocale } from "react-datepicker";
 import parse from "date-fns/parse";
 import fi from "date-fns/locale/fi";
 import classNames from "classnames";
-import { isValidDate } from "util/date";
+import { isValidDate } from "@/util/date";
 registerLocale('fi', fi);
 type Props = {
   disabled: boolean;
@@ -29,7 +29,7 @@ const FieldTypeDatePicker = ({
   maxDate,
   placeholder,
   setRefForField
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   const handleSetReference = (element: any) => {
     if (setRefForField) {
       setRefForField(element);
diff --git a/src/components/form/FieldTypeDecimal.tsx b/src/components/form/FieldTypeDecimal.tsx
index f23d904ff..7b94bd90f 100644
--- a/src/components/form/FieldTypeDecimal.tsx
+++ b/src/components/form/FieldTypeDecimal.tsx
@@ -1,7 +1,7 @@
 import React, { PureComponent } from "react";
 import classNames from "classnames";
-import { formatNumber } from "util/helpers";
-import { convertStrToDecimalNumber, isDecimalNumberStr } from "util/helpers";
+import { formatNumber } from "@/util/helpers";
+import { convertStrToDecimalNumber, isDecimalNumberStr } from "@/util/helpers";
 type Props = {
   autoBlur: boolean;
   autoComplete?: string;
@@ -77,7 +77,7 @@ class FieldTypeDecimal extends PureComponent<Props, State> {
     }
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       autoComplete,
       disabled,
diff --git a/src/components/form/FieldTypeFractional.tsx b/src/components/form/FieldTypeFractional.tsx
index 90f330859..57e567feb 100644
--- a/src/components/form/FieldTypeFractional.tsx
+++ b/src/components/form/FieldTypeFractional.tsx
@@ -24,7 +24,7 @@ const FieldTypeFractional = ({
   isDirty = false,
   setRefForField,
   input
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   const firstFieldRef = useRef<null | HTMLInputElement>(null);
   const secondFieldRef = useRef<null | HTMLInputElement>(null);
 
diff --git a/src/components/form/FieldTypeHidden.tsx b/src/components/form/FieldTypeHidden.tsx
index 00c902a55..bce69c9f8 100644
--- a/src/components/form/FieldTypeHidden.tsx
+++ b/src/components/form/FieldTypeHidden.tsx
@@ -15,7 +15,7 @@ const FieldTypeHidden = ({
   input,
   isDirty,
   setRefForField
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   const handleSetRefForField = (element: any) => {
     if (setRefForField) {
       setRefForField(element);
diff --git a/src/components/form/FieldTypeIntendedUseSelect.tsx b/src/components/form/FieldTypeIntendedUseSelect.tsx
index 312c5ee08..98eed1d00 100644
--- a/src/components/form/FieldTypeIntendedUseSelect.tsx
+++ b/src/components/form/FieldTypeIntendedUseSelect.tsx
@@ -1,10 +1,10 @@
 import React from "react";
 import debounce from "lodash/debounce";
-import AsyncSelect from "components/form/AsyncSelect";
-import { addEmptyOption, sortStringByKeyAsc } from "util/helpers";
-import { getContentIntendedUse } from "leases/helpers";
-import { fetchIntendedUses } from "leases/requestsAsync";
-import type { ServiceUnit } from "serviceUnits/types";
+import AsyncSelect from "@/components/form/AsyncSelect";
+import { addEmptyOption, sortStringByKeyAsc } from "@/util/helpers";
+import { getContentIntendedUse } from "@/leases/helpers";
+import { fetchIntendedUses } from "@/leases/requestsAsync";
+import type { ServiceUnit } from "@/serviceUnits/types";
 type Props = {
   disabled?: boolean;
   displayError: boolean;
@@ -22,7 +22,7 @@ const FieldTypeIntendedUseSelect = ({
   onChange,
   placeholder,
   serviceUnit
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   const getIntendedUses = debounce(async (inputValue: string, callback: (...args: Array<any>) => any) => {
     const intendedUses = await fetchIntendedUses({
       search: inputValue,
diff --git a/src/components/form/FieldTypeLeaseSelect.tsx b/src/components/form/FieldTypeLeaseSelect.tsx
index 253f82201..1a2ec7ddd 100644
--- a/src/components/form/FieldTypeLeaseSelect.tsx
+++ b/src/components/form/FieldTypeLeaseSelect.tsx
@@ -1,10 +1,10 @@
 import React from "react";
 import debounce from "lodash/debounce";
-import AsyncSelect from "components/form/AsyncSelect";
-import { getContentLeaseOption } from "leases/helpers";
-import { addEmptyOption, sortStringByKeyAsc } from "util/helpers";
-import { fetchLeases } from "leases/requestsAsync";
-import type { UserServiceUnit } from "usersPermissions/types";
+import AsyncSelect from "@/components/form/AsyncSelect";
+import { getContentLeaseOption } from "@/leases/helpers";
+import { addEmptyOption, sortStringByKeyAsc } from "@/util/helpers";
+import { fetchLeases } from "@/leases/requestsAsync";
+import type { UserServiceUnit } from "@/usersPermissions/types";
 type Props = {
   disabled?: boolean;
   displayError: boolean;
@@ -23,7 +23,7 @@ const FieldTypeLeaseSelect = ({
   onChange,
   placeholder,
   serviceUnit
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   const getLeases = debounce(async (inputValue: string, callback: (...args: Array<any>) => any) => {
     const leases = await fetchLeases({
       succinct: true,
diff --git a/src/components/form/FieldTypeLessorSelect.tsx b/src/components/form/FieldTypeLessorSelect.tsx
index 8d098eb6e..1e04dd90a 100644
--- a/src/components/form/FieldTypeLessorSelect.tsx
+++ b/src/components/form/FieldTypeLessorSelect.tsx
@@ -1,10 +1,10 @@
 import React from "react";
 import debounce from "lodash/debounce";
-import AsyncSelect from "components/form/AsyncSelect";
-import { getContentLessor } from "lessor/helpers";
-import { addEmptyOption, sortStringByKeyAsc } from "util/helpers";
-import { fetchContacts } from "contacts/requestsAsync";
-import type { UserServiceUnit } from "usersPermissions/types";
+import AsyncSelect from "@/components/form/AsyncSelect";
+import { getContentLessor } from "@/lessor/helpers";
+import { addEmptyOption, sortStringByKeyAsc } from "@/util/helpers";
+import { fetchContacts } from "@/contacts/requestsAsync";
+import type { UserServiceUnit } from "@/usersPermissions/types";
 type Props = {
   disabled?: boolean;
   displayError: boolean;
@@ -23,7 +23,7 @@ const FieldTypeLessorSelect = ({
   onChange,
   placeholder,
   serviceUnit
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   const getLessors = debounce(async (inputValue: string, callback: (...args: Array<any>) => any) => {
     const lessors = await fetchContacts({
       is_lessor: true,
diff --git a/src/components/form/FieldTypeMultiSelect.tsx b/src/components/form/FieldTypeMultiSelect.tsx
index d244205b4..04863cd24 100644
--- a/src/components/form/FieldTypeMultiSelect.tsx
+++ b/src/components/form/FieldTypeMultiSelect.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import classNames from "classnames";
-import MultiSelect from "components/multi-select/MultiSelect";
+import MultiSelect from "@/components/multi-select/MultiSelect";
 type Props = {
   disabled: boolean;
   displayError: boolean;
@@ -23,7 +23,7 @@ const FieldTypeMultiSelect = ({
   isDirty,
   isLoading = false,
   options
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   const handleBlur = (selected: Array<string>) => onBlur(selected);
 
   return <div className={classNames('form-field__multiselect', {
diff --git a/src/components/form/FieldTypeRadioWithField.tsx b/src/components/form/FieldTypeRadioWithField.tsx
index aa863b671..c30bae455 100644
--- a/src/components/form/FieldTypeRadioWithField.tsx
+++ b/src/components/form/FieldTypeRadioWithField.tsx
@@ -23,7 +23,7 @@ const FieldTypeRadioWithField = ({
   isDirty,
   label,
   options
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   const handleChange = (e: any) => {
     if (autoBlur) {
       onBlur(e.target.value);
diff --git a/src/components/form/FieldTypeSearch.tsx b/src/components/form/FieldTypeSearch.tsx
index 78a784e70..c5896dea4 100644
--- a/src/components/form/FieldTypeSearch.tsx
+++ b/src/components/form/FieldTypeSearch.tsx
@@ -24,7 +24,7 @@ const FieldTypeSearch = ({
   isDirty,
   placeholder,
   type = 'text'
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   const handleChange = (e: any) => {
     if (autoBlur) {
       onBlur(e.target.value);
diff --git a/src/components/form/FieldTypeSelect.tsx b/src/components/form/FieldTypeSelect.tsx
index b9750fb23..0bc829fec 100644
--- a/src/components/form/FieldTypeSelect.tsx
+++ b/src/components/form/FieldTypeSelect.tsx
@@ -1,8 +1,8 @@
 import React, { PureComponent } from "react";
 import Select from "react-select";
 import classNames from "classnames";
-import DropdownIndicator from "components/inputs/DropdownIndicator";
-import LoadingIndicator from "components/inputs/SelectLoadingIndicator";
+import DropdownIndicator from "@/components/inputs/DropdownIndicator";
+import LoadingIndicator from "@/components/inputs/SelectLoadingIndicator";
 type Props = {
   autoBlur: boolean;
   disabled: boolean;
@@ -89,7 +89,7 @@ class FieldTypeSelect extends PureComponent<Props, State> {
     }
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       disabled,
       displayError,
diff --git a/src/components/form/FieldTypeTextArea.tsx b/src/components/form/FieldTypeTextArea.tsx
index 77da30bb8..b856b5cc8 100644
--- a/src/components/form/FieldTypeTextArea.tsx
+++ b/src/components/form/FieldTypeTextArea.tsx
@@ -29,7 +29,7 @@ const FieldTypeTextArea = ({
   rows = 3,
   setRefForField,
   type = 'text'
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   const handleChange = (e: any) => {
     if (autoBlur) {
       onBlur(e.target.value);
diff --git a/src/components/form/FieldTypeTime.tsx b/src/components/form/FieldTypeTime.tsx
index 71b8d4239..7d257d509 100644
--- a/src/components/form/FieldTypeTime.tsx
+++ b/src/components/form/FieldTypeTime.tsx
@@ -23,7 +23,7 @@ const FieldTypeTime = ({
   isDirty = false,
   placeholder,
   setRefForField
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   const handleSetReference = (element: any) => {
     if (setRefForField) {
       setRefForField(element);
diff --git a/src/components/form/FieldTypeUserSelect.tsx b/src/components/form/FieldTypeUserSelect.tsx
index 68c14d1de..f1919eabd 100644
--- a/src/components/form/FieldTypeUserSelect.tsx
+++ b/src/components/form/FieldTypeUserSelect.tsx
@@ -1,10 +1,10 @@
 import React, { useEffect, useState, useRef } from "react";
 import debounce from "lodash/debounce";
-import AsyncSelect from "components/form/AsyncSelect";
-import { getContentUser } from "users/helpers";
-import { addEmptyOption, sortStringByKeyAsc } from "util/helpers";
-import { fetchSingleUser, fetchUsers } from "users/requestsAsync";
-import type { UserServiceUnit } from "usersPermissions/types";
+import AsyncSelect from "@/components/form/AsyncSelect";
+import { getContentUser } from "@/users/helpers";
+import { addEmptyOption, sortStringByKeyAsc } from "@/util/helpers";
+import { fetchSingleUser, fetchUsers } from "@/users/requestsAsync";
+import type { UserServiceUnit } from "@/usersPermissions/types";
 type Props = {
   disabled?: boolean;
   displayError: boolean;
@@ -26,7 +26,7 @@ const FieldTypeUserSelect = ({
   placeholder,
   multiSelect,
   serviceUnit
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   // If a plain ID value has already been set when the component mounts,
   // retrieve the corresponding single user object and set the state up accordingly
   // so that we can show the user's name in the closed dropdown properly.
diff --git a/src/components/form/FormField.tsx b/src/components/form/FormField.tsx
index 8be2c386e..570b11b46 100644
--- a/src/components/form/FormField.tsx
+++ b/src/components/form/FormField.tsx
@@ -4,39 +4,39 @@ import { Field } from "redux-form";
 import classNames from "classnames";
 import get from "lodash/get";
 import ErrorBlock from "./ErrorBlock";
-import ExternalLink from "components/links/ExternalLink";
-import FieldTypeAddress from "components/form/FieldTypeAddress";
-import FieldTypeBasic from "components/form/FieldTypeBasic";
-import FieldTypeBoolean from "components/form/FieldTypeBoolean";
-import FieldTypeCheckbox from "components/form/FieldTypeCheckbox";
-import FieldTypeCheckboxDateTime from "components/form/FieldTypeCheckboxDateTime";
-import FieldTypeContactSelect from "components/form/FieldTypeContactSelect";
-import FieldTypeDatePicker from "components/form/FieldTypeDatePicker";
-import FieldTypeDecimal from "components/form/FieldTypeDecimal";
-import FieldTypeIntendedUseSelect from "components/form/FieldTypeIntendedUseSelect";
-import FieldTypeLeaseSelect from "components/form/FieldTypeLeaseSelect";
-import FieldTypeLessorSelect from "components/form/FieldTypeLessorSelect";
-import FieldTypeMultiSelect from "components/form/FieldTypeMultiSelect";
-import FieldTypeRadioWithField from "components/form/FieldTypeRadioWithField";
-import FieldTypeSearch from "components/form/FieldTypeSearch";
-import FieldTypeSelect from "components/form/FieldTypeSelect";
-import FieldTypeTextArea from "components/form/FieldTypeTextArea";
-import FieldTypeUserSelect from "components/form/FieldTypeUserSelect";
-import FormFieldLabel from "components/form/FormFieldLabel";
-import FieldTypeTime from "components/form/FieldTypeTime";
-import FieldTypeHidden from "components/form/FieldTypeHidden";
-import FieldTypeFractional from "components/form/FieldTypeFractional";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import { FieldTypes as FieldTypeOptions } from "enums";
-import { getContactFullName } from "contacts/helpers";
-import { formatDate, formatNumber, getFieldAttributeOptions, getLabelOfOption, isEmptyValue, getReferenceNumberLink } from "util/helpers";
-import { getUserFullName } from "users/helpers";
-import { genericNormalizer } from "components/form/normalizers";
-import { getRouteById, Routes } from "root/routes";
-import { genericValidator } from "components/form/validations";
-import { getHoursAndMinutes } from "util/date";
-import type { UserServiceUnit } from "usersPermissions/types";
+import ExternalLink from "@/components/links/ExternalLink";
+import FieldTypeAddress from "@/components/form/FieldTypeAddress";
+import FieldTypeBasic from "@/components/form/FieldTypeBasic";
+import FieldTypeBoolean from "@/components/form/FieldTypeBoolean";
+import FieldTypeCheckbox from "@/components/form/FieldTypeCheckbox";
+import FieldTypeCheckboxDateTime from "@/components/form/FieldTypeCheckboxDateTime";
+import FieldTypeContactSelect from "@/components/form/FieldTypeContactSelect";
+import FieldTypeDatePicker from "@/components/form/FieldTypeDatePicker";
+import FieldTypeDecimal from "@/components/form/FieldTypeDecimal";
+import FieldTypeIntendedUseSelect from "@/components/form/FieldTypeIntendedUseSelect";
+import FieldTypeLeaseSelect from "@/components/form/FieldTypeLeaseSelect";
+import FieldTypeLessorSelect from "@/components/form/FieldTypeLessorSelect";
+import FieldTypeMultiSelect from "@/components/form/FieldTypeMultiSelect";
+import FieldTypeRadioWithField from "@/components/form/FieldTypeRadioWithField";
+import FieldTypeSearch from "@/components/form/FieldTypeSearch";
+import FieldTypeSelect from "@/components/form/FieldTypeSelect";
+import FieldTypeTextArea from "@/components/form/FieldTypeTextArea";
+import FieldTypeUserSelect from "@/components/form/FieldTypeUserSelect";
+import FormFieldLabel from "@/components/form/FormFieldLabel";
+import FieldTypeTime from "@/components/form/FieldTypeTime";
+import FieldTypeHidden from "@/components/form/FieldTypeHidden";
+import FieldTypeFractional from "@/components/form/FieldTypeFractional";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import { FieldTypes as FieldTypeOptions } from "@/enums";
+import { getContactFullName } from "@/contacts/helpers";
+import { formatDate, formatNumber, getFieldAttributeOptions, getLabelOfOption, isEmptyValue, getReferenceNumberLink } from "@/util/helpers";
+import { getUserFullName } from "@/users/helpers";
+import { genericNormalizer } from "@/components/form/normalizers";
+import { getRouteById, Routes } from "@/root/routes";
+import { genericValidator } from "@/components/form/validations";
+import { getHoursAndMinutes } from "@/util/date";
+import type { UserServiceUnit } from "@/usersPermissions/types";
 const FieldTypes = {
   [FieldTypeOptions.ADDRESS]: FieldTypeAddress,
   [FieldTypeOptions.BOOLEAN]: FieldTypeBoolean,
@@ -171,9 +171,12 @@ const FormFieldInput = ({
       case FieldTypeOptions.STRING:
       case FieldTypeOptions.HIDDEN:
       case FieldTypeOptions.FRACTIONAL:
-      case FieldTypeOptions.INTENDED_USE:
+      case FieldTypeOptions.TEXTAREA:
         return value;
 
+      case FieldTypeOptions.INTENDED_USE:
+        return value?.name ?? '-';
+
       case FieldTypeOptions.REFERENCE_NUMBER:
         return value ? <ExternalLink href={getReferenceNumberLink(value)} text={value} /> : null;
 
@@ -381,7 +384,7 @@ class FormField extends PureComponent<Props, State> {
     return validate(value);
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       autoBlur,
       autoComplete,
diff --git a/src/components/form/FormFieldLabel.tsx b/src/components/form/FormFieldLabel.tsx
index f75ddf4b5..1867b9704 100644
--- a/src/components/form/FormFieldLabel.tsx
+++ b/src/components/form/FormFieldLabel.tsx
@@ -2,7 +2,7 @@ import { $Shape } from "utility-types";
 import React, { PureComponent } from "react";
 import ReactDOM from "react-dom";
 import classNames from "classnames";
-import UIDataTooltip from "components/tooltip/UIDataTooltip";
+import UIDataTooltip from "@/components/tooltip/UIDataTooltip";
 type Props = {
   children?: any;
   className?: string;
@@ -67,7 +67,7 @@ class FormFieldLabel extends PureComponent<Props, State> {
     });
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       children,
       className,
diff --git a/src/components/form/FormHintText.tsx b/src/components/form/FormHintText.tsx
index 57c009a3a..bbd6fa4a2 100644
--- a/src/components/form/FormHintText.tsx
+++ b/src/components/form/FormHintText.tsx
@@ -6,7 +6,7 @@ type Props = {
   style?: Record<string, any>;
 };
 
-const FormHintText = (props: Props): React.ReactNode => {
+const FormHintText = (props: Props): JSX.Element => {
   const {
     children,
     className,
diff --git a/src/components/form/FormText.tsx b/src/components/form/FormText.tsx
index 5026574a0..b9d6643a9 100644
--- a/src/components/form/FormText.tsx
+++ b/src/components/form/FormText.tsx
@@ -6,7 +6,7 @@ type Props = {
   style?: Record<string, any>;
 };
 
-const FormText = (props: Props): React.ReactNode => {
+const FormText = (props: Props): JSX.Element => {
   const {
     children,
     className,
diff --git a/src/components/form/FormTextTitle.tsx b/src/components/form/FormTextTitle.tsx
index 79e2918f7..b94d1c6d3 100644
--- a/src/components/form/FormTextTitle.tsx
+++ b/src/components/form/FormTextTitle.tsx
@@ -2,7 +2,7 @@ import { $Shape } from "utility-types";
 import React, { PureComponent } from "react";
 import ReactDOM from "react-dom";
 import classNames from "classnames";
-import UIDataTooltip from "components/tooltip/UIDataTooltip";
+import UIDataTooltip from "@/components/tooltip/UIDataTooltip";
 type Props = {
   children?: any;
   enableUiDataEdit?: boolean;
@@ -68,7 +68,7 @@ class FormTextTitle extends PureComponent<Props, State> {
     });
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       children,
       enableUiDataEdit,
diff --git a/src/components/form/FormTitleAndText.tsx b/src/components/form/FormTitleAndText.tsx
index 663fcb6b6..3060aff5b 100644
--- a/src/components/form/FormTitleAndText.tsx
+++ b/src/components/form/FormTitleAndText.tsx
@@ -1,6 +1,6 @@
 import React from "react";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
 type Props = {
   text: any;
   textClassName?: string;
@@ -11,7 +11,7 @@ const FormTitleAndText = ({
   text,
   textClassName,
   title
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   return <div>
       <FormTextTitle title={title} />
       <FormText className={textClassName}>{text}</FormText>
diff --git a/src/components/form/FormWrapper.tsx b/src/components/form/FormWrapper.tsx
index 84c1fb0a0..1c15d706d 100644
--- a/src/components/form/FormWrapper.tsx
+++ b/src/components/form/FormWrapper.tsx
@@ -5,6 +5,6 @@ type Props = {
 
 const FormWrapper = ({
   children
-}: Props): React.ReactNode => <div className='form-wrapper'>{children}</div>;
+}: Props): JSX.Element => <div className='form-wrapper'>{children}</div>;
 
 export default FormWrapper;
\ No newline at end of file
diff --git a/src/components/form/FormWrapperLeft.tsx b/src/components/form/FormWrapperLeft.tsx
index 350ff3442..31380e50a 100644
--- a/src/components/form/FormWrapperLeft.tsx
+++ b/src/components/form/FormWrapperLeft.tsx
@@ -5,6 +5,6 @@ type Props = {
 
 const FormWrapperLeft = ({
   children
-}: Props): React.ReactNode => <div className='form-wrapper__left'>{children}</div>;
+}: Props): JSX.Element => <div className='form-wrapper__left'>{children}</div>;
 
 export default FormWrapperLeft;
\ No newline at end of file
diff --git a/src/components/form/FormWrapperRight.tsx b/src/components/form/FormWrapperRight.tsx
index e98b510f9..273752bde 100644
--- a/src/components/form/FormWrapperRight.tsx
+++ b/src/components/form/FormWrapperRight.tsx
@@ -5,6 +5,6 @@ type Props = {
 
 const FormWrapperRight = ({
   children
-}: Props): React.ReactNode => <div className='form-wrapper__right'>{children}</div>;
+}: Props): JSX.Element => <div className='form-wrapper__right'>{children}</div>;
 
 export default FormWrapperRight;
\ No newline at end of file
diff --git a/src/components/form/RemoveButton.tsx b/src/components/form/RemoveButton.tsx
index d8812b907..98e434c7b 100644
--- a/src/components/form/RemoveButton.tsx
+++ b/src/components/form/RemoveButton.tsx
@@ -1,6 +1,6 @@
 import React from "react";
-import { createClassName, generalClassNames, GeneralPropTypes } from "foundation/utils";
-import TrashIcon from "components/icons/TrashIcon";
+import { createClassName, generalClassNames, GeneralPropTypes } from "@/foundation/utils";
+import TrashIcon from "@/components/icons/TrashIcon";
 type Props = {
   className?: string;
   disabled?: boolean;
@@ -10,7 +10,7 @@ type Props = {
   type?: "button" | "submit" | "reset";
 };
 
-const RemoveButton = (props: Props): React.ReactNode => {
+const RemoveButton = (props: Props): JSX.Element => {
   const {
     className,
     disabled,
diff --git a/src/components/form/SuccessField.tsx b/src/components/form/SuccessField.tsx
index 5846511a5..9cd3802c7 100644
--- a/src/components/form/SuccessField.tsx
+++ b/src/components/form/SuccessField.tsx
@@ -11,7 +11,7 @@ const SuccessField = ({
   },
   showWarning = true,
   style
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   return showWarning && warning ? <span className="form-field__success-field" role="alert" style={style}>{warning}</span> : null;
 };
 
diff --git a/src/components/form/UnarchiveButton.tsx b/src/components/form/UnarchiveButton.tsx
index 9e37ec864..e0a85e2ee 100644
--- a/src/components/form/UnarchiveButton.tsx
+++ b/src/components/form/UnarchiveButton.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import classNames from "classnames";
-import UnarchiveIcon from "components/icons/UnarchiveIcon";
+import UnarchiveIcon from "@/components/icons/UnarchiveIcon";
 type Props = {
   className?: string;
   disabled?: boolean;
@@ -15,7 +15,7 @@ const UnarchiveButton = ({
   onClick,
   title,
   type = 'button'
-}: Props): React.ReactNode => <button className={classNames('form__unarchive-button', className)} disabled={disabled} type={type} title={title} onClick={onClick}>
+}: Props): JSX.Element => <button className={classNames('form__unarchive-button', className)} disabled={disabled} type={type} title={title} onClick={onClick}>
     <UnarchiveIcon className='icon-medium' />
   </button>;
 
diff --git a/src/components/form/WarningField.tsx b/src/components/form/WarningField.tsx
index 4536c95c3..d1fc5021b 100644
--- a/src/components/form/WarningField.tsx
+++ b/src/components/form/WarningField.tsx
@@ -11,7 +11,7 @@ const WarningField = ({
   },
   showWarning = true,
   style
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   return showWarning && warning ? <span className="form-field__warning-field" role="alert" style={style}>{warning}</span> : null;
 };
 
diff --git a/src/components/form/normalizers.ts b/src/components/form/normalizers.ts
index 2f0e95116..e2d97774f 100644
--- a/src/components/form/normalizers.ts
+++ b/src/components/form/normalizers.ts
@@ -1,5 +1,5 @@
 import format from "date-fns/format";
-import { FieldTypes } from "enums";
+import { FieldTypes } from "@/enums";
 export const normalizeDate = (date: any): string | null => date && format(new Date(date), 'yyyy-MM-dd') || null;
 export const normalizeInteger = (value: any): any => value && Number.isInteger(Number(value)) ? Number(value) : value;
 export const genericNormalizer = (value: any, options: Record<string, any>): any => {
diff --git a/src/components/form/validations.ts b/src/components/form/validations.ts
index b5d928a95..c0b05dd19 100644
--- a/src/components/form/validations.ts
+++ b/src/components/form/validations.ts
@@ -1,7 +1,7 @@
 import isBefore from "date-fns/isBefore";
 import isArray from "lodash/isArray";
-import { isValidDate } from "util/date";
-import { isEmptyValue } from "util/helpers";
+import { isValidDate } from "@/util/date";
+import { isEmptyValue } from "@/util/helpers";
 
 const decimalPlaces = n => {
   let result = /^-?[0-9]+\.([0-9]+)$/.exec(n);
diff --git a/src/components/formValidations.ts b/src/components/formValidations.ts
index ae659f212..49c44c0fb 100644
--- a/src/components/formValidations.ts
+++ b/src/components/formValidations.ts
@@ -1,5 +1,5 @@
 import { RentCalculatorTypes } from "./enums";
-import { isEmptyValue } from "util/helpers";
+import { isEmptyValue } from "@/util/helpers";
 import { year } from "./form/validations";
 export const validateRentCalculatorForm = (values: Record<string, any>) => {
   const errors: any = {};
diff --git a/src/components/helpers.ts b/src/components/helpers.ts
index ccd664908..47210c68e 100644
--- a/src/components/helpers.ts
+++ b/src/components/helpers.ts
@@ -1,9 +1,9 @@
 import get from "lodash/get";
 import { RentExplanationSubjectType, RentSubItemSubjectType, RentSubItemType } from "./enums";
-import { LeaseRentsFieldPaths, LeaseRentAdjustmentsFieldPaths, LeaseRentContractRentsFieldPaths, TenantContactType } from "leases/enums";
-import { formatNumber, getFieldOptions, getLabelOfOption } from "util/helpers";
+import { LeaseRentsFieldPaths, LeaseRentAdjustmentsFieldPaths, LeaseRentContractRentsFieldPaths, TenantContactType } from "@/leases/enums";
+import { formatNumber, getFieldOptions, getLabelOfOption } from "@/util/helpers";
 import type { Attributes } from "types";
-import type { BillingPeriod, BillingPeriodInvoice, PreviewInvoices } from "previewInvoices/types";
+import type { BillingPeriod, BillingPeriodInvoice, PreviewInvoices } from "@/previewInvoices/types";
 export const getRentsTotalAmount = (rents: Array<Record<string, any>>) => {
   let amount = 0;
   rents.forEach(rent => {
diff --git a/src/components/inputs/EstateIdSelectInput.tsx b/src/components/inputs/EstateIdSelectInput.tsx
index fa99bf974..2551fef3f 100644
--- a/src/components/inputs/EstateIdSelectInput.tsx
+++ b/src/components/inputs/EstateIdSelectInput.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import debounce from "lodash/debounce";
-import AsyncSelect from "components/form/AsyncSelect";
-import { fetchEstateIdList } from "landUseContract/requestsAsync";
+import AsyncSelect from "@/components/form/AsyncSelect";
+import { fetchEstateIdList } from "@/landUseContract/requestsAsync";
 type Props = {
   disabled?: boolean;
   name: string;
diff --git a/src/components/inputs/LeaseSelectInput.tsx b/src/components/inputs/LeaseSelectInput.tsx
index 6629f6187..38e3460e0 100644
--- a/src/components/inputs/LeaseSelectInput.tsx
+++ b/src/components/inputs/LeaseSelectInput.tsx
@@ -1,14 +1,14 @@
 import React from "react";
 import debounce from "lodash/debounce";
-import AsyncSelect from "components/form/AsyncSelect";
-import { getContentLeaseIdentifier } from "leases/helpers";
-import { fetchLeases } from "leases/requestsAsync";
-import { fetchAreaSearches, fetchTargetStatuses, fetchPlotSearches } from "leases/requestsAsync";
-import { getLabelOfOption, getFieldOptions } from "util/helpers";
-import { getAttributes as getLeaseAttributes } from "leases/selectors";
-import { store } from "root/startApp";
-import { LeaseFieldPaths, LeaseHistoryItemTypes, LeaseHistoryContentTypes } from "leases/enums";
-import type { UserServiceUnit } from "usersPermissions/types";
+import AsyncSelect from "@/components/form/AsyncSelect";
+import { getContentLeaseIdentifier } from "@/leases/helpers";
+import { fetchLeases } from "@/leases/requestsAsync";
+import { fetchAreaSearches, fetchTargetStatuses, fetchPlotSearches } from "@/leases/requestsAsync";
+import { getLabelOfOption, getFieldOptions } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes } from "@/leases/selectors";
+import { store } from "@/index";
+import { LeaseFieldPaths, LeaseHistoryItemTypes, LeaseHistoryContentTypes } from "@/leases/enums";
+import type { UserServiceUnit } from "@/usersPermissions/types";
 type Props = {
   disabled?: boolean;
   name: string;
diff --git a/src/components/inputs/PlanUnitSelectInput.tsx b/src/components/inputs/PlanUnitSelectInput.tsx
index 95537db6a..5573d9a88 100644
--- a/src/components/inputs/PlanUnitSelectInput.tsx
+++ b/src/components/inputs/PlanUnitSelectInput.tsx
@@ -1,8 +1,8 @@
 import React from "react";
 import debounce from "lodash/debounce";
-import AsyncSelect from "components/form/AsyncSelect";
-import { getContentPlanUnitIdentifier } from "plotSearch/helpers";
-import { fetchPlanUnitListWithIdentifiersList, fetchCustomDetailedPlanListWithIdentifiersList } from "plotSearch/requestsAsync";
+import AsyncSelect from "@/components/form/AsyncSelect";
+import { getContentPlanUnitIdentifier } from "@/plotSearch/helpers";
+import { fetchPlanUnitListWithIdentifiersList, fetchCustomDetailedPlanListWithIdentifiersList } from "@/plotSearch/requestsAsync";
 type Props = {
   disabled?: boolean;
   name: string;
@@ -19,7 +19,7 @@ const PlanUnitSelectInput = ({
   onBlur,
   placeholder,
   value
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   const getPlanUnitOptions = (planUnitList: Array<Record<string, any>>, customDetailedPlanList: Array<Record<string, any>>): Array<Record<string, any>> => {
     return [...planUnitList, ...customDetailedPlanList].map(planUnit => {
       return {
diff --git a/src/components/inputs/SelectLoadingIndicator.tsx b/src/components/inputs/SelectLoadingIndicator.tsx
index 97900477b..8f6ca7176 100644
--- a/src/components/inputs/SelectLoadingIndicator.tsx
+++ b/src/components/inputs/SelectLoadingIndicator.tsx
@@ -1,7 +1,7 @@
 // flow
 import React from "react";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
 
 const SelectLoadingIndicator = () => <LoaderWrapper className='select-wrapper'>
     <Loader isLoading className='small' />
diff --git a/src/components/inputs/SingleRadioInput.tsx b/src/components/inputs/SingleRadioInput.tsx
index 72f0cbb98..12abf2cf3 100644
--- a/src/components/inputs/SingleRadioInput.tsx
+++ b/src/components/inputs/SingleRadioInput.tsx
@@ -1,6 +1,6 @@
 import React, { Fragment } from "react";
 import classNames from "classnames";
-import { KeyCodes } from "enums";
+import { KeyCodes } from "@/enums";
 type Props = {
   checked: boolean;
   disabled?: boolean;
diff --git a/src/components/inputs/UserServiceUnitSelectInput.tsx b/src/components/inputs/UserServiceUnitSelectInput.tsx
index 9c9f57b75..2cca1dfc6 100644
--- a/src/components/inputs/UserServiceUnitSelectInput.tsx
+++ b/src/components/inputs/UserServiceUnitSelectInput.tsx
@@ -3,12 +3,12 @@ import flowRight from "lodash/flowRight";
 import { connect } from "react-redux";
 import { reduxForm } from "redux-form";
 import Select from "react-select";
-import FormFieldLabel from "components/form/FormFieldLabel";
-import DropdownIndicator from "components/inputs/DropdownIndicator";
-import LoadingIndicator from "components/inputs/SelectLoadingIndicator";
-import { FormNames } from "enums";
-import { setUserActiveServiceUnit } from "usersPermissions/actions";
-import type { UserServiceUnit, UserServiceUnits } from "usersPermissions/types";
+import FormFieldLabel from "@/components/form/FormFieldLabel";
+import DropdownIndicator from "@/components/inputs/DropdownIndicator";
+import LoadingIndicator from "@/components/inputs/SelectLoadingIndicator";
+import { FormNames } from "@/enums";
+import { setUserActiveServiceUnit } from "@/usersPermissions/actions";
+import type { UserServiceUnit, UserServiceUnits } from "@/usersPermissions/types";
 type Props = {
   userServiceUnits: UserServiceUnits;
   userActiveServiceUnit: UserServiceUnit;
diff --git a/src/components/invoice-simulator/InvoiceSimulator.tsx b/src/components/invoice-simulator/InvoiceSimulator.tsx
index a50ed71fb..fc061923d 100644
--- a/src/components/invoice-simulator/InvoiceSimulator.tsx
+++ b/src/components/invoice-simulator/InvoiceSimulator.tsx
@@ -3,28 +3,28 @@ import { connect } from "react-redux";
 import classNames from "classnames";
 import { formValueSelector, isValid } from "redux-form";
 import { Row, Column } from "react-foundation";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import Button from "components/button/Button";
-import FormText from "components/form/FormText";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import Button from "@/components/button/Button";
+import FormText from "@/components/form/FormText";
 import InvoiceSimulatorBillingPeriod from "./InvoiceSimulatorBillingPeriods";
 import InvoiceSimulatorForm from "./InvoiceSimulatorForm";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import { fetchPreviewInvoices } from "previewInvoices/actions";
-import { FormNames, PermissionMissingTexts } from "enums";
-import { ButtonColors } from "components/enums";
-import { InvoiceFieldPaths, InvoiceRowsFieldPaths } from "invoices/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getContentPreviewInvoiceBillingPeriods } from "components/helpers";
-import { getFieldOptions, hasPermissions } from "util/helpers";
-import { getAttributes as getInvoiceAttributes } from "invoices/selectors";
-import { getCurrentLease } from "leases/selectors";
-import { getIsFetching, getPreviewInvoices } from "previewInvoices/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import { fetchPreviewInvoices } from "@/previewInvoices/actions";
+import { FormNames, PermissionMissingTexts } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { InvoiceFieldPaths, InvoiceRowsFieldPaths } from "@/invoices/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getContentPreviewInvoiceBillingPeriods } from "@/components/helpers";
+import { getFieldOptions, hasPermissions } from "@/util/helpers";
+import { getAttributes as getInvoiceAttributes } from "@/invoices/selectors";
+import { getCurrentLease } from "@/leases/selectors";
+import { getIsFetching, getPreviewInvoices } from "@/previewInvoices/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
-import type { PreviewInvoices } from "previewInvoices/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { Lease } from "@/leases/types";
+import type { PreviewInvoices } from "@/previewInvoices/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   currentLease: Lease;
   fetchPreviewInvoices: (...args: Array<any>) => any;
diff --git a/src/components/invoice-simulator/InvoiceSimulatorBillingPeriods.tsx b/src/components/invoice-simulator/InvoiceSimulatorBillingPeriods.tsx
index 0d6ec14ae..f545538f4 100644
--- a/src/components/invoice-simulator/InvoiceSimulatorBillingPeriods.tsx
+++ b/src/components/invoice-simulator/InvoiceSimulatorBillingPeriods.tsx
@@ -1,13 +1,13 @@
 import React, { Fragment } from "react";
 import { Row, Column } from "react-foundation";
-import AmountWithVat from "components/vat/AmountWithVat";
-import Collapse from "components/collapse/Collapse";
-import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle";
-import RentCalculatorExplanation from "components/rent-calculator/RentCalculatorExplanation";
-import FormTitleAndText from "components/form/FormTitleAndText";
+import AmountWithVat from "@/components/vat/AmountWithVat";
+import Collapse from "@/components/collapse/Collapse";
+import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle";
+import RentCalculatorExplanation from "@/components/rent-calculator/RentCalculatorExplanation";
+import FormTitleAndText from "@/components/form/FormTitleAndText";
 import InvoiceSimulatorInvoice from "./InvoiceSimulatorInvoice";
-import SubTitle from "components/content/SubTitle";
-import { formatDate, formatDateRange } from "util/helpers";
+import SubTitle from "@/components/content/SubTitle";
+import { formatDate, formatDateRange } from "@/util/helpers";
 type Props = {
   dueDate: string;
   endDate: string;
diff --git a/src/components/invoice-simulator/InvoiceSimulatorForm.tsx b/src/components/invoice-simulator/InvoiceSimulatorForm.tsx
index d72255d7d..e433d8f6a 100644
--- a/src/components/invoice-simulator/InvoiceSimulatorForm.tsx
+++ b/src/components/invoice-simulator/InvoiceSimulatorForm.tsx
@@ -3,11 +3,11 @@ import { connect } from "react-redux";
 import { change, formValueSelector, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import FormField from "components/form/FormField";
-import { FormNames } from "enums";
-import { getCurrentYear } from "util/date";
-import { getCurrentLease } from "leases/selectors";
-import { getBillingPeriodsByLease } from "billingPeriods/selectors";
+import FormField from "@/components/form/FormField";
+import { FormNames } from "@/enums";
+import { getCurrentYear } from "@/util/date";
+import { getCurrentLease } from "@/leases/selectors";
+import { getBillingPeriodsByLease } from "@/billingPeriods/selectors";
 type Props = {
   onSubmit: (...args: Array<any>) => any;
 };
diff --git a/src/components/invoice-simulator/InvoiceSimulatorInvoice.tsx b/src/components/invoice-simulator/InvoiceSimulatorInvoice.tsx
index afbe89dd7..fb40abe3f 100644
--- a/src/components/invoice-simulator/InvoiceSimulatorInvoice.tsx
+++ b/src/components/invoice-simulator/InvoiceSimulatorInvoice.tsx
@@ -1,14 +1,14 @@
 import React, { Fragment } from "react";
 import { Row, Column } from "react-foundation";
-import AmountWithVat from "components/vat/AmountWithVat";
-import Collapse from "components/collapse/Collapse";
-import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle";
-import FormText from "components/form/FormText";
-import FormTitleAndText from "components/form/FormTitleAndText";
+import AmountWithVat from "@/components/vat/AmountWithVat";
+import Collapse from "@/components/collapse/Collapse";
+import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle";
+import FormText from "@/components/form/FormText";
+import FormTitleAndText from "@/components/form/FormTitleAndText";
 import InvoiceSimulatorInvoiceRows from "./InvoiceSimulatorInvoiceRows";
-import SubTitle from "components/content/SubTitle";
-import { getContactFullName } from "contacts/helpers";
-import { formatDate, formatDateRange, getLabelOfOption } from "util/helpers";
+import SubTitle from "@/components/content/SubTitle";
+import { getContactFullName } from "@/contacts/helpers";
+import { formatDate, formatDateRange, getLabelOfOption } from "@/util/helpers";
 type Props = {
   billedAmount: number;
   dueDate: string;
diff --git a/src/components/invoice-simulator/InvoiceSimulatorInvoiceRows.tsx b/src/components/invoice-simulator/InvoiceSimulatorInvoiceRows.tsx
index 890f114ad..6f1aa5669 100644
--- a/src/components/invoice-simulator/InvoiceSimulatorInvoiceRows.tsx
+++ b/src/components/invoice-simulator/InvoiceSimulatorInvoiceRows.tsx
@@ -1,11 +1,11 @@
 import React from "react";
 import { Row, Column } from "react-foundation";
-import AmountWithVat from "components/vat/AmountWithVat";
-import Divider from "components/content/Divider";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import { getContactFullName } from "contacts/helpers";
-import { getLabelOfOption } from "util/helpers";
+import AmountWithVat from "@/components/vat/AmountWithVat";
+import Divider from "@/components/content/Divider";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import { getContactFullName } from "@/contacts/helpers";
+import { getLabelOfOption } from "@/util/helpers";
 type Props = {
   dueDate: string;
   receivableTypeOptions: Array<Record<string, any>>;
diff --git a/src/components/ktj/KtjLink.tsx b/src/components/ktj/KtjLink.tsx
index 303b4e063..dd400568c 100644
--- a/src/components/ktj/KtjLink.tsx
+++ b/src/components/ktj/KtjLink.tsx
@@ -1,10 +1,10 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import { saveAs } from "file-saver";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import { getApiToken } from "auth/selectors";
-import { displayUIMessage, getApiUrlWithOutVersionSuffix } from "util/helpers";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import { getApiToken } from "@/auth/selectors";
+import { displayUIMessage, getApiUrlWithOutVersionSuffix } from "@/util/helpers";
 type Props = {
   apiToken: string;
   fileKey: string;
diff --git a/src/components/links/DecisionLink.tsx b/src/components/links/DecisionLink.tsx
index 366a4ff2e..60a7fb79b 100644
--- a/src/components/links/DecisionLink.tsx
+++ b/src/components/links/DecisionLink.tsx
@@ -1,6 +1,6 @@
 import React from "react";
-import { getLabelOfOption, getReferenceNumberLink } from "../../util/helpers";
-import FormText from "components/form/FormText";
+import { getLabelOfOption, getReferenceNumberLink } from "@/util/helpers";
+import FormText from "@/components/form/FormText";
 type Props = {
   decision: Record<string, any> | null | undefined;
   decisionOptions: Array<Record<string, any>>;
diff --git a/src/components/links/ExternalLink.tsx b/src/components/links/ExternalLink.tsx
index c5ec02d67..693a4b703 100644
--- a/src/components/links/ExternalLink.tsx
+++ b/src/components/links/ExternalLink.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import classNames from "classnames";
-import ExternalLinkIcon from "components/icons/ExternalLinkIcon";
+import ExternalLinkIcon from "@/components/icons/ExternalLinkIcon";
 type Props = {
   className?: string;
   href: string | null | undefined;
diff --git a/src/components/map/HelsinkiProvider.ts b/src/components/map/HelsinkiProvider.ts
index 742e6ee62..552ef733d 100644
--- a/src/components/map/HelsinkiProvider.ts
+++ b/src/components/map/HelsinkiProvider.ts
@@ -1,5 +1,5 @@
 import { Provider } from 'leaflet-geosearch';
-import { SERVICE_MAP_URL } from 'util/constants';
+import { SERVICE_MAP_URL } from '@/util/constants';
 import type { AddressResult, ServiceMapResponse, ParseArgument, SearchArgument, SearchResult } from './types';
 export default class HelsinkiProvider extends Provider<ServiceMapResponse, AddressResult> {
   options: Record<string, any>;
diff --git a/src/components/map/_leaflet.scss b/src/components/map/_leaflet.scss
index 5fc1849c5..d74449d5a 100644
--- a/src/components/map/_leaflet.scss
+++ b/src/components/map/_leaflet.scss
@@ -284,7 +284,7 @@
   margin-bottom: 0 !important;
 }
 .leaflet-control-layers-toggle {
-  background-image: url(../assets/images/layers-2x.png);
+  background-image: url(/assets/images/layers-2x.png);
   background-size: 70%;
 }
 .leaflet-bar a:hover {
@@ -384,7 +384,7 @@
 
 /* Default icon URLs */
 .leaflet-default-icon-path {
-  //background-image: url(../assets/images/marker-icon.png);
+  background-image: url(/assets/images/marker-icon.png);
 }
 
 
diff --git a/src/components/modal/ConfirmationModal.tsx b/src/components/modal/ConfirmationModal.tsx
index 208901b60..b0e1b43aa 100644
--- a/src/components/modal/ConfirmationModal.tsx
+++ b/src/components/modal/ConfirmationModal.tsx
@@ -1,7 +1,7 @@
 import React, { Component } from "react";
-import Button from "components/button/Button";
-import Modal from "components/modal/Modal";
-import { ButtonColors } from "components/enums";
+import Button from "@/components/button/Button";
+import Modal from "@/components/modal/Modal";
+import { ButtonColors } from "@/components/enums";
 type Props = {
   confirmButtonClassName?: string | null | undefined;
   confirmButtonLabel?: string | null | undefined;
@@ -27,7 +27,7 @@ class ConfirmationModal extends Component<Props> {
     }
   }
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       confirmButtonClassName,
       confirmButtonLabel = 'Tallenna',
diff --git a/src/components/modal/Modal.tsx b/src/components/modal/Modal.tsx
index 586e23524..c3f85f9b4 100644
--- a/src/components/modal/Modal.tsx
+++ b/src/components/modal/Modal.tsx
@@ -1,6 +1,6 @@
 import React, { Component } from "react";
 import classnames from "classnames";
-import CloseButton from "../button/CloseButton";
+import CloseButton from "@/components/button/CloseButton";
 type Props = {
   children?: any;
   className?: string;
@@ -50,7 +50,7 @@ class Modal extends Component<Props, State> {
     });
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       children,
       className,
diff --git a/src/components/modal/ModalButtonWrapper.tsx b/src/components/modal/ModalButtonWrapper.tsx
index f2e4a9912..227e8e15e 100644
--- a/src/components/modal/ModalButtonWrapper.tsx
+++ b/src/components/modal/ModalButtonWrapper.tsx
@@ -5,6 +5,6 @@ type Props = {
 
 const ModalButtonWrapper = ({
   children
-}: Props): React.ReactNode => <div className='modal__button-wrapper'>{children}</div>;
+}: Props): JSX.Element => <div className='modal__button-wrapper'>{children}</div>;
 
 export default ModalButtonWrapper;
\ No newline at end of file
diff --git a/src/components/multi-select/MultiSelect.tsx b/src/components/multi-select/MultiSelect.tsx
index c5cabc0e9..63b3f44fb 100644
--- a/src/components/multi-select/MultiSelect.tsx
+++ b/src/components/multi-select/MultiSelect.tsx
@@ -34,7 +34,7 @@ const MultiSelect = ({
   hasSelectAll = true,
   onSelectedChanged,
   valueRenderer
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   const getSelectedText = () => {
     const selectedOptions = selected.map(s => options.find(o => o.value === s));
     const selectedLabels = selectedOptions.map(s => s ? s.label : '');
diff --git a/src/components/rent-calculator/RentCalculator.tsx b/src/components/rent-calculator/RentCalculator.tsx
index b760de2f2..f04655856 100644
--- a/src/components/rent-calculator/RentCalculator.tsx
+++ b/src/components/rent-calculator/RentCalculator.tsx
@@ -3,29 +3,29 @@ import { connect } from "react-redux";
 import { formValueSelector, isValid } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import Button from "components/button/Button";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
+import Button from "@/components/button/Button";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
 import RentCalculatorForm from "./RentCalculatorForm";
 import RentForPeriod from "./RentForPeriod";
-import SubTitle from "components/content/SubTitle";
-import { fetchBillingPeriodsByLease } from "billingPeriods/actions";
-import { deleteRentForPeriodByLease, fetchRentForPeriodByLease, receiveIsSaveClicked } from "rentForPeriod/actions";
-import { FormNames } from "enums";
-import { ButtonColors, RentCalculatorFieldPaths, RentCalculatorFieldTitles, RentCalculatorTypes } from "components/enums";
-import { RentCycles } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getContentRents } from "leases/helpers";
-import { hasPermissions } from "util/helpers";
-import { getCurrentYear } from "util/date";
-import { getUiDataRentCalculatorKey } from "uiData/helpers";
-import { getBillingPeriodsByLease } from "billingPeriods/selectors";
-import { getCurrentLease, getIsEditMode } from "leases/selectors";
-import { getIsFetching, getIsSaveClicked, getRentForPeriodArrayByLease } from "rentForPeriod/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import type { Lease } from "leases/types";
-import type { RentForPeriodId } from "rentForPeriod/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import SubTitle from "@/components/content/SubTitle";
+import { fetchBillingPeriodsByLease } from "@/billingPeriods/actions";
+import { deleteRentForPeriodByLease, fetchRentForPeriodByLease, receiveIsSaveClicked } from "@/rentForPeriod/actions";
+import { FormNames } from "@/enums";
+import { ButtonColors, RentCalculatorFieldPaths, RentCalculatorFieldTitles, RentCalculatorTypes } from "@/components/enums";
+import { RentCycles } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getContentRents } from "@/leases/helpers";
+import { hasPermissions } from "@/util/helpers";
+import { getCurrentYear } from "@/util/date";
+import { getUiDataRentCalculatorKey } from "@/uiData/helpers";
+import { getBillingPeriodsByLease } from "@/billingPeriods/selectors";
+import { getCurrentLease, getIsEditMode } from "@/leases/selectors";
+import { getIsFetching, getIsSaveClicked, getRentForPeriodArrayByLease } from "@/rentForPeriod/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import type { Lease } from "@/leases/types";
+import type { RentForPeriodId } from "@/rentForPeriod/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 let rentForPeriodId = 1;
 type Props = {
   billingPeriod: number;
diff --git a/src/components/rent-calculator/RentCalculatorExplanation.tsx b/src/components/rent-calculator/RentCalculatorExplanation.tsx
index 33d30d2ca..1d7221aef 100644
--- a/src/components/rent-calculator/RentCalculatorExplanation.tsx
+++ b/src/components/rent-calculator/RentCalculatorExplanation.tsx
@@ -3,13 +3,13 @@ import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import classNames from "classnames";
 import get from "lodash/get";
-import AmountWithVat from "components/vat/AmountWithVat";
-import FormText from "components/form/FormText";
+import AmountWithVat from "@/components/vat/AmountWithVat";
+import FormText from "@/components/form/FormText";
 import RentCalculatorSubItem from "./RentCalculatorSubItem";
-import { RentExplanationSubjectType } from "../enums";
-import { formatDateRange, formatNumber } from "util/helpers";
-import { getRentExplanationAmount, getRentExplanationDescription } from "../helpers";
-import { getAttributes } from "leases/selectors";
+import { RentExplanationSubjectType } from "@/components/enums";
+import { formatDateRange, formatNumber } from "@/util/helpers";
+import { getRentExplanationAmount, getRentExplanationDescription } from "@/components/helpers";
+import { getAttributes } from "@/leases/selectors";
 import type { Attributes } from "types";
 type Props = {
   attributes: Attributes;
diff --git a/src/components/rent-calculator/RentCalculatorForm.tsx b/src/components/rent-calculator/RentCalculatorForm.tsx
index 7e881c718..8ce94f880 100644
--- a/src/components/rent-calculator/RentCalculatorForm.tsx
+++ b/src/components/rent-calculator/RentCalculatorForm.tsx
@@ -3,16 +3,16 @@ import { connect } from "react-redux";
 import { change, Field, formValueSelector, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import ErrorField from "components/form/ErrorField";
-import FormField from "components/form/FormField";
-import { FieldTypes, FormNames } from "enums";
-import { RentCalculatorTypes } from "components/enums";
-import { validateRentCalculatorForm } from "components/formValidations";
-import { formatDateRange } from "util/helpers";
-import { getCurrentYear } from "util/date";
-import { getCurrentLease } from "leases/selectors";
-import { getBillingPeriodsByLease } from "billingPeriods/selectors";
-import type { BillingPeriodList } from "billingPeriods/types";
+import ErrorField from "@/components/form/ErrorField";
+import FormField from "@/components/form/FormField";
+import { FieldTypes, FormNames } from "@/enums";
+import { RentCalculatorTypes } from "@/components/enums";
+import { validateRentCalculatorForm } from "@/components/formValidations";
+import { formatDateRange } from "@/util/helpers";
+import { getCurrentYear } from "@/util/date";
+import { getCurrentLease } from "@/leases/selectors";
+import { getBillingPeriodsByLease } from "@/billingPeriods/selectors";
+import type { BillingPeriodList } from "@/billingPeriods/types";
 type Props = {
   billingPeriod: number | null | undefined;
   billingPeriods: BillingPeriodList;
diff --git a/src/components/rent-calculator/RentCalculatorSubItem.tsx b/src/components/rent-calculator/RentCalculatorSubItem.tsx
index e25a68f27..05a9186dc 100644
--- a/src/components/rent-calculator/RentCalculatorSubItem.tsx
+++ b/src/components/rent-calculator/RentCalculatorSubItem.tsx
@@ -3,11 +3,11 @@ import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import classNames from "classnames";
 import get from "lodash/get";
-import FormText from "components/form/FormText";
-import { RentSubItemSubjectType } from "components/enums";
-import { formatDateRange, formatNumber } from "util/helpers";
-import { getRentSubItemAmount, getRentSubItemDescription } from "../helpers";
-import { getAttributes } from "leases/selectors";
+import FormText from "@/components/form/FormText";
+import { RentSubItemSubjectType } from "@/components/enums";
+import { formatDateRange, formatNumber } from "@/util/helpers";
+import { getRentSubItemAmount, getRentSubItemDescription } from "@/components/helpers";
+import { getAttributes } from "@/leases/selectors";
 import type { Attributes } from "types";
 type Props = {
   attributes: Attributes;
diff --git a/src/components/rent-calculator/RentCalculatorTotalRow.tsx b/src/components/rent-calculator/RentCalculatorTotalRow.tsx
index 5443d493b..47d42ff9d 100644
--- a/src/components/rent-calculator/RentCalculatorTotalRow.tsx
+++ b/src/components/rent-calculator/RentCalculatorTotalRow.tsx
@@ -2,10 +2,10 @@ import React from "react";
 import { Row, Column } from "react-foundation";
 import isAfter from "date-fns/isAfter";
 import get from "lodash/get";
-import AmountWithVat from "components/vat/AmountWithVat";
-import Divider from "components/content/Divider";
-import FormText from "components/form/FormText";
-import { getRentsTotalAmount } from "../helpers";
+import AmountWithVat from "@/components/vat/AmountWithVat";
+import Divider from "@/components/content/Divider";
+import FormText from "@/components/form/FormText";
+import { getRentsTotalAmount } from "@/components/helpers";
 type Props = {
   rents: Array<Record<string, any>>;
 };
diff --git a/src/components/rent-calculator/RentForPeriod.tsx b/src/components/rent-calculator/RentForPeriod.tsx
index cb20257bc..8716c6a03 100644
--- a/src/components/rent-calculator/RentForPeriod.tsx
+++ b/src/components/rent-calculator/RentForPeriod.tsx
@@ -1,13 +1,13 @@
 import React from "react";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
-import FormText from "components/form/FormText";
-import RemoveButton from "components/form/RemoveButton";
+import FormText from "@/components/form/FormText";
+import RemoveButton from "@/components/form/RemoveButton";
 import RentCalculatorRent from "./RentCalculatorRent";
 import RentCalculatorTotalRow from "./RentCalculatorTotalRow";
-import { RentCalculatorTypeOptions } from "components/constants";
-import { RentCalculatorTypes } from "components/enums";
-import { formatDateRange, getLabelOfOption } from "util/helpers";
+import { RentCalculatorTypeOptions } from "@/components/constants";
+import { RentCalculatorTypes } from "@/components/enums";
+import { formatDateRange, getLabelOfOption } from "@/util/helpers";
 type Props = {
   onRemove: (...args: Array<any>) => any;
   rentForPeriod: Record<string, any>;
diff --git a/src/components/resize/WindowResizeHandler.tsx b/src/components/resize/WindowResizeHandler.tsx
index 86f8777de..3fce73801 100644
--- a/src/components/resize/WindowResizeHandler.tsx
+++ b/src/components/resize/WindowResizeHandler.tsx
@@ -1,6 +1,6 @@
 import React, { PureComponent } from "react";
 import throttle from "lodash/throttle";
-import { isLargeScreen } from "util/helpers";
+import { isLargeScreen } from "@/util/helpers";
 export function withWindowResize(WrappedComponent: any) {
   type Props = Record<string, any>;
   type State = {
diff --git a/src/components/search/SearchContainer.tsx b/src/components/search/SearchContainer.tsx
index a4a495800..d8951e32d 100644
--- a/src/components/search/SearchContainer.tsx
+++ b/src/components/search/SearchContainer.tsx
@@ -7,7 +7,7 @@ type Props = {
 const SearchContainer = ({
   children,
   onSubmit
-}: Props): React.ReactNode => // TODO: determine which components actually have an use for onSubmit and consider
+}: Props): JSX.Element => // TODO: determine which components actually have an use for onSubmit and consider
 //  making it optional. Several search components seem to provide a function that
 //  they themselves take as props, but then that prop is never defined itself.
 <form onSubmit={onSubmit} className='search__container'>{children}</form>;
diff --git a/src/components/search/SearchSubtitleLabel.tsx b/src/components/search/SearchSubtitleLabel.tsx
index d748732ea..900da9998 100644
--- a/src/components/search/SearchSubtitleLabel.tsx
+++ b/src/components/search/SearchSubtitleLabel.tsx
@@ -7,6 +7,6 @@ type Props = {
 const SearchSubtitleLabel = ({
   children,
   style
-}: Props): React.ReactNode => <div className='search__subtitle-label-column' style={style}>{children}</div>;
+}: Props): JSX.Element => <div className='search__subtitle-label-column' style={style}>{children}</div>;
 
 export default SearchSubtitleLabel;
\ No newline at end of file
diff --git a/src/components/sideMenu/SideMenu.tsx b/src/components/sideMenu/SideMenu.tsx
index a8b873a4e..cbd479285 100644
--- a/src/components/sideMenu/SideMenu.tsx
+++ b/src/components/sideMenu/SideMenu.tsx
@@ -5,19 +5,19 @@ import { withRouter } from "react-router";
 import classnames from "classnames";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import Authorization from "components/authorization/Authorization";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
+import Authorization from "@/components/authorization/Authorization";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
 import SubMenu from "./SubMenu";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import { ConfirmationModalTexts } from "enums";
-import { ButtonColors } from "components/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { hasAnyPageDirtyForms } from "util/forms";
-import { hasPermissions } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { withUsersPermissions } from "components/attributes/UsersPermissions";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import { ConfirmationModalTexts } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { hasAnyPageDirtyForms } from "@/util/forms";
+import { hasPermissions } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { withUsersPermissions } from "@/components/attributes/UsersPermissions";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type OwnProps = {
   isOpen: boolean;
   onLinkClick: (...args: Array<any>) => any;
@@ -195,7 +195,7 @@ class SideMenu extends Component<Props, State> {
                 color: '#b7b7b7'
               }} onClick={handleClick} to={getRouteById(Routes.LAND_USE_CONTRACTS)}>Maankäyttösopimukset</Link></li>
                   
-                  {process.env.NODE_ENV !== 'production' && <SubMenu header='Tonttihaut ja kilpailut' isOpen={subMenuKey === 'plot'} items={[{
+                  {!import.meta.env.PROD && <SubMenu header='Tonttihaut ja kilpailut' isOpen={subMenuKey === 'plot'} items={[{
               allow: hasPermissions(usersPermissions, UsersPermissions.VIEW_PLOTSEARCH),
               onClick: handleClick,
               text: 'Tonttihaut',
@@ -206,7 +206,7 @@ class SideMenu extends Component<Props, State> {
               text: 'Tonttihakemukset',
               to: getRouteById(Routes.PLOT_APPLICATIONS)
             }]} menuKey='plot' onHeaderClick={this.handleHeaderClick} />}
-                  {process.env.NODE_ENV !== 'production' && <Authorization allow={hasPermissions(usersPermissions, UsersPermissions.VIEW_AREASEARCH)}>
+                  {!import.meta.env.PROD && <Authorization allow={hasPermissions(usersPermissions, UsersPermissions.VIEW_AREASEARCH)}>
                     <li><Link onClick={handleClick} to={getRouteById(Routes.AREA_SEARCH)}>Aluehaut</Link></li>
                   </Authorization>}
 
diff --git a/src/components/sideMenu/SubMenu.tsx b/src/components/sideMenu/SubMenu.tsx
index 67a23a5c7..90f881dfa 100644
--- a/src/components/sideMenu/SubMenu.tsx
+++ b/src/components/sideMenu/SubMenu.tsx
@@ -2,9 +2,9 @@ import React, { PureComponent } from "react";
 import ReactDOM from "react-dom";
 import { Link } from "react-router-dom";
 import classNames from "classnames";
-import BackIcon from "components/icons/BackIcon";
-import Authorization from "components/authorization/Authorization";
-import { KeyCodes } from "enums";
+import BackIcon from "@/components/icons/BackIcon";
+import Authorization from "@/components/authorization/Authorization";
+import { KeyCodes } from "@/enums";
 type Props = {
   header: string;
   isOpen: boolean;
@@ -61,7 +61,7 @@ class SubMenu extends PureComponent<Props> {
     }
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       header,
       isOpen,
diff --git a/src/components/table/MultiItemCollapse.tsx b/src/components/table/MultiItemCollapse.tsx
index 7e40c2404..5033b1c8c 100644
--- a/src/components/table/MultiItemCollapse.tsx
+++ b/src/components/table/MultiItemCollapse.tsx
@@ -1,6 +1,6 @@
 import React, { PureComponent } from "react";
 import classNames from "classnames";
-import ListItem from "components/content/ListItem";
+import ListItem from "@/components/content/ListItem";
 type Props = {
   items: Array<any>;
   itemRenderer: (...args: Array<any>) => any;
diff --git a/src/components/table/SortableTable.tsx b/src/components/table/SortableTable.tsx
index 7ce400088..af8be67be 100644
--- a/src/components/table/SortableTable.tsx
+++ b/src/components/table/SortableTable.tsx
@@ -8,8 +8,8 @@ import isEmpty from "lodash/isEmpty";
 import SortableTableHeader from "./SortableTableHeader";
 import SortableTableGroup from "./SortableTableGroup";
 import SortableTableRow from "./SortableTableRow";
-import { sortStringByKeyAsc, sortStringByKeyDesc } from "util/helpers";
-import { TableSortOrder } from "enums";
+import { sortStringByKeyAsc, sortStringByKeyDesc } from "@/util/helpers";
+import { TableSortOrder } from "@/enums";
 export type Column = {
   arrayRenderer?: (...args: Array<any>) => any;
   dataClassName?: string;
@@ -52,7 +52,7 @@ type Props = {
   className?: string;
   footer?: (arg0: {
     columnCount: number;
-  }) => React.ReactNode;
+  }) => JSX.Element;
   invoiceToCredit?: any;
   onSelectRow?: any;
 };
@@ -408,7 +408,7 @@ class SortableTable extends Component<Props, State> {
     return colSpan;
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       columns,
       fixedHeader,
diff --git a/src/components/table/SortableTableGroup.tsx b/src/components/table/SortableTableGroup.tsx
index 31a436da9..c845c587e 100644
--- a/src/components/table/SortableTableGroup.tsx
+++ b/src/components/table/SortableTableGroup.tsx
@@ -3,7 +3,7 @@ import React, { PureComponent, KeyboardEventHandler } from "react";
 import classNames from "classnames";
 import get from "lodash/get";
 import isArray from "lodash/isArray";
-import AccordionIcon from "components/icons/AccordionIcon";
+import AccordionIcon from "@/components/icons/AccordionIcon";
 import MultiItemCollapse from "./MultiItemCollapse";
 import SortableTableRow from "./SortableTableRow";
 import type { Column } from "./SortableTable";
@@ -56,7 +56,7 @@ class SortableTableGroup extends PureComponent<Props, State> {
     this.forceUpdate();
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       columns,
       id,
diff --git a/src/components/table/SortableTableHeader.tsx b/src/components/table/SortableTableHeader.tsx
index 881d96e00..047afdafe 100644
--- a/src/components/table/SortableTableHeader.tsx
+++ b/src/components/table/SortableTableHeader.tsx
@@ -1,8 +1,8 @@
 import React from "react";
 import classNames from "classnames";
 import kebabCase from "lodash/kebabCase";
-import { SortIconBoth, SortIconDesc, SortIconAsc } from "components/table/Icons";
-import { TableSortOrder } from "enums";
+import { SortIconBoth, SortIconDesc, SortIconAsc } from "@/components/table/Icons";
+import { TableSortOrder } from "@/enums";
 import type { Column } from "./SortableTable";
 type Props = {
   columns: Array<Column>;
@@ -26,7 +26,7 @@ const SortableTableHeader = ({
   sortable,
   sortKey,
   sortOrder
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   const setTheadRef = (el: any) => {
     if (getRef) {
       getRef(el);
diff --git a/src/components/table/SortableTableRow.tsx b/src/components/table/SortableTableRow.tsx
index 6abaa6e3f..7edbc823b 100644
--- a/src/components/table/SortableTableRow.tsx
+++ b/src/components/table/SortableTableRow.tsx
@@ -3,7 +3,7 @@ import React, { PureComponent, KeyboardEventHandler } from "react";
 import classNames from "classnames";
 import get from "lodash/get";
 import isArray from "lodash/isArray";
-import AccordionIcon from "components/icons/AccordionIcon";
+import AccordionIcon from "@/components/icons/AccordionIcon";
 import MultiItemCollapse from "./MultiItemCollapse";
 import type { Column } from "./SortableTable";
 type Props = {
@@ -103,7 +103,7 @@ class SortableTableRow extends PureComponent<Props, State> {
     this.forceUpdate();
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       className,
       columns,
diff --git a/src/components/table/TableFilters.tsx b/src/components/table/TableFilters.tsx
index 9589ceef1..0942c2f6a 100644
--- a/src/components/table/TableFilters.tsx
+++ b/src/components/table/TableFilters.tsx
@@ -1,13 +1,13 @@
 import React from "react";
 import classNames from "classnames";
-import CheckboxInput from "components/inputs/CheckboxInput";
+import CheckboxInput from "@/components/inputs/CheckboxInput";
 type Props = {
   alignFiltersRight?: boolean;
   amountText: React.ReactNode;
   filterOptions: Array<Record<string, any>>;
   filterValue: Array<string>;
   onFilterChange?: (...args: Array<any>) => any;
-  componentToRenderUnderTitle?: React.ReactNode;
+  componentToRenderUnderTitle?: JSX.Element;
 };
 
 const TableFilters = ({
@@ -17,7 +17,7 @@ const TableFilters = ({
   filterValue,
   onFilterChange,
   componentToRenderUnderTitle = null
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   const handleFilterChange = (values: Array<Record<string, any>>) => {
     if (onFilterChange) {
       onFilterChange(values);
diff --git a/src/components/table/TablePanel.tsx b/src/components/table/TablePanel.tsx
index 145c8843e..d4bb0e25d 100644
--- a/src/components/table/TablePanel.tsx
+++ b/src/components/table/TablePanel.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import CloseButton from "components/button/CloseButton";
+import CloseButton from "@/components/button/CloseButton";
 type Props = {
   children: any;
   onClose: (...args: Array<any>) => any;
diff --git a/src/components/table/TablePanelContainer.tsx b/src/components/table/TablePanelContainer.tsx
index dbbe33d27..9ac8079ff 100644
--- a/src/components/table/TablePanelContainer.tsx
+++ b/src/components/table/TablePanelContainer.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import classNames from "classnames";
-import CloseButton from "components/button/CloseButton";
+import CloseButton from "@/components/button/CloseButton";
 type Props = {
   footer?: any;
   children: any;
diff --git a/src/components/tabs/Tabs.tsx b/src/components/tabs/Tabs.tsx
index 09dca17a0..ebdbdf5b1 100644
--- a/src/components/tabs/Tabs.tsx
+++ b/src/components/tabs/Tabs.tsx
@@ -1,6 +1,6 @@
 import React, { PureComponent } from "react";
 import classNames from "classnames";
-import Authorization from "components/authorization/Authorization";
+import Authorization from "@/components/authorization/Authorization";
 type Props = {
   active: number | null | undefined;
   className?: string;
diff --git a/src/components/tooltip/Tooltip.tsx b/src/components/tooltip/Tooltip.tsx
index fb8efcd6a..5f87352af 100644
--- a/src/components/tooltip/Tooltip.tsx
+++ b/src/components/tooltip/Tooltip.tsx
@@ -1,13 +1,13 @@
 import React, { Component, Fragment } from "react";
 import classNames from "classnames";
-import CloseButton from "components/button/CloseButton";
-import type { TooltipPosition } from "components/tooltip/types";
+import CloseButton from "@/components/button/CloseButton";
+import type { TooltipPosition } from "@/components/tooltip/types";
 import ReactDOM from "react-dom";
 type Props = {
   isOpen: boolean;
   className?: string | Record<string, any>;
   onClose: (arg0: Event) => void;
-  children: React.ReactNode;
+  children: JSX.Element;
   relativeTo?: Element;
 };
 type State = {
@@ -112,7 +112,7 @@ class Tooltip extends Component<Props, State> {
     return 'bottom-right';
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       isOpen,
       className,
diff --git a/src/components/tooltip/TooltipToggleButton.tsx b/src/components/tooltip/TooltipToggleButton.tsx
index a87f27677..50d315ed2 100644
--- a/src/components/tooltip/TooltipToggleButton.tsx
+++ b/src/components/tooltip/TooltipToggleButton.tsx
@@ -3,7 +3,7 @@ type Props = {
   className?: string;
   onClick: (arg0: React.MouseEvent<HTMLButtonElement>) => void;
   style?: Record<string, any>;
-  children: React.ReactNode;
+  children: JSX.Element;
 };
 
 class TooltipToggleButton extends Component<Props> {
@@ -19,7 +19,7 @@ class TooltipToggleButton extends Component<Props> {
     }
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       className,
       style,
diff --git a/src/components/tooltip/TooltipWrapper.tsx b/src/components/tooltip/TooltipWrapper.tsx
index ff2220dd6..2c90263fe 100644
--- a/src/components/tooltip/TooltipWrapper.tsx
+++ b/src/components/tooltip/TooltipWrapper.tsx
@@ -2,11 +2,11 @@ import React, { Component } from "react";
 type Props = {
   style?: Record<string, any>;
   innerRef?: any;
-  children: React.ReactNode;
+  children: JSX.Element;
 };
 
 class TooltipWrapper extends Component<Props> {
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       style,
       innerRef,
diff --git a/src/components/tooltip/UIDataTooltip.tsx b/src/components/tooltip/UIDataTooltip.tsx
index 1ce078ec8..e2d07b50f 100644
--- a/src/components/tooltip/UIDataTooltip.tsx
+++ b/src/components/tooltip/UIDataTooltip.tsx
@@ -1,29 +1,29 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import isEmpty from "lodash/isEmpty";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddIcon from "components/icons/AddIcon";
-import Button from "components/button/Button";
-import ErrorBlock from "components/form/ErrorBlock";
-import FormFieldLabel from "components/form/FormFieldLabel";
-import InfoIcon from "components/icons/InfoIcon";
-import ModalButtonWrapper from "components/modal/ModalButtonWrapper";
-import TextAreaInput from "components/inputs/TextAreaInput";
-import { createUiData, deleteUiData, editUiData } from "uiData/actions";
-import { ConfirmationModalTexts } from "enums";
-import { ButtonColors } from "components/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getFieldAttributes, hasPermissions } from "util/helpers";
-import { getUiDataByKey } from "uiData/helpers";
-import { getAttributes as getUiDataAttributes, getUiDataList } from "uiData/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { genericValidator } from "components/form/validations";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddIcon from "@/components/icons/AddIcon";
+import Button from "@/components/button/Button";
+import ErrorBlock from "@/components/form/ErrorBlock";
+import FormFieldLabel from "@/components/form/FormFieldLabel";
+import InfoIcon from "@/components/icons/InfoIcon";
+import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper";
+import TextAreaInput from "@/components/inputs/TextAreaInput";
+import { createUiData, deleteUiData, editUiData } from "@/uiData/actions";
+import { ConfirmationModalTexts } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getFieldAttributes, hasPermissions } from "@/util/helpers";
+import { getUiDataByKey } from "@/uiData/helpers";
+import { getAttributes as getUiDataAttributes, getUiDataList } from "@/uiData/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { genericValidator } from "@/components/form/validations";
 import type { Attributes } from "types";
-import type { UiDataList } from "uiData/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
-import Tooltip from "components/tooltip/Tooltip";
-import TooltipWrapper from "components/tooltip/TooltipWrapper";
-import TooltipToggleButton from "components/tooltip/TooltipToggleButton";
+import type { UiDataList } from "@/uiData/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
+import Tooltip from "@/components/tooltip/Tooltip";
+import TooltipWrapper from "@/components/tooltip/TooltipWrapper";
+import TooltipToggleButton from "@/components/tooltip/TooltipToggleButton";
 type OwnProps = {
   relativeTo?: Element;
   enableUiDataEdit?: boolean;
diff --git a/src/components/topNavigation/TopNavigation.tsx b/src/components/topNavigation/TopNavigation.tsx
index e92f3076a..dbea6059d 100644
--- a/src/components/topNavigation/TopNavigation.tsx
+++ b/src/components/topNavigation/TopNavigation.tsx
@@ -3,17 +3,17 @@ import classNames from "classnames";
 import { withRouter } from "react-router";
 import { Link } from "react-router-dom";
 import { IconMenuDots } from "hds-react";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import MainMenuIcon from "../icons/MainMenuIcon";
-import SearchInput from "../inputs/SearchInput";
-import UserServiceUnitSelectInput from "../inputs/UserServiceUnitSelectInput";
-import { ConfirmationModalTexts } from "enums";
-import { ButtonColors } from "components/enums";
-import { hasAnyPageDirtyForms } from "util/forms";
-import { getSearchQuery, getUrlParams } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-
-import type { UserGroups, UserServiceUnit, UserServiceUnits } from "usersPermissions/types";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import MainMenuIcon from "@/components/icons/MainMenuIcon";
+import SearchInput from "@/components/inputs/SearchInput";
+import UserServiceUnitSelectInput from "@/components/inputs/UserServiceUnitSelectInput";
+import { ConfirmationModalTexts } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { hasAnyPageDirtyForms } from "@/util/forms";
+import { getSearchQuery, getUrlParams } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+
+import type { UserGroups, UserServiceUnit, UserServiceUnits } from "@/usersPermissions/types";
 
 type Props = {
   history: Record<string, any>;
diff --git a/src/components/uiData/UiDataListHOC.tsx b/src/components/uiData/UiDataListHOC.tsx
index a0df98b20..1cef06b34 100644
--- a/src/components/uiData/UiDataListHOC.tsx
+++ b/src/components/uiData/UiDataListHOC.tsx
@@ -2,10 +2,10 @@ import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import { fetchAttributes as fetchUiDataAttributes, fetchUiDataList } from "uiData/actions";
-import { getAttributes as getUiDataAttributes, getIsFetching, getIsFetchingAttributes as getIsFetchingUiDataAttributes, getMethods as getUiDataMethods, getUiDataList } from "uiData/selectors";
+import { fetchAttributes as fetchUiDataAttributes, fetchUiDataList } from "@/uiData/actions";
+import { getAttributes as getUiDataAttributes, getIsFetching, getIsFetchingAttributes as getIsFetchingUiDataAttributes, getMethods as getUiDataMethods, getUiDataList } from "@/uiData/selectors";
 import type { Attributes, Methods } from "types";
-import type { UiDataList } from "uiData/types";
+import type { UiDataList } from "@/uiData/types";
 
 function UiDataListHOC(WrappedComponent: any) {
   type Props = {
diff --git a/src/components/vat/AmountWithVat.tsx b/src/components/vat/AmountWithVat.tsx
index d4a9e5d4e..8535617b7 100644
--- a/src/components/vat/AmountWithVat.tsx
+++ b/src/components/vat/AmountWithVat.tsx
@@ -2,10 +2,10 @@ import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import isAfter from "date-fns/isAfter";
 import isBefore from "date-fns/isBefore";
-import { formatNumber } from "util/helpers";
-import { getCurrentLease } from "leases/selectors";
-import { getVats } from "vat/selectors";
-import type { VatList } from "vat/types";
+import { formatNumber } from "@/util/helpers";
+import { getCurrentLease } from "@/leases/selectors";
+import { getVats } from "@/vat/selectors";
+import type { VatList } from "@/vat/types";
 type Props = {
   amount: number;
   date: string;
diff --git a/src/contacts/components/ContactAuditLog.tsx b/src/contacts/components/ContactAuditLog.tsx
index 671be79a2..43621c12a 100644
--- a/src/contacts/components/ContactAuditLog.tsx
+++ b/src/contacts/components/ContactAuditLog.tsx
@@ -1,21 +1,21 @@
 import React, { Fragment, PureComponent } from "react";
 import { connect } from "react-redux";
 import isEmpty from "lodash/isEmpty";
-import AuditLogTable from "components/auditLog/AuditLogTable";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import Pagination from "components/table/Pagination";
-import TableWrapper from "components/table/TableWrapper";
-import { fetchAuditLogByContact } from "auditLog/actions";
-import { LIST_TABLE_PAGE_SIZE } from "util/constants";
-import { getApiResponseCount, getApiResponseMaxPage, getApiResponseResults } from "util/helpers";
-import { getAuditLogByContact, getIsFetchingByContact } from "auditLog/selectors";
-import type { AuditLogList } from "auditLog/types";
+import AuditLogTable from "@/components/auditLog/AuditLogTable";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import Pagination from "@/components/table/Pagination";
+import TableWrapper from "@/components/table/TableWrapper";
+import { fetchAuditLogByContact } from "@/auditLog/actions";
+import { LIST_TABLE_PAGE_SIZE } from "@/util/constants";
+import { getApiResponseCount, getApiResponseMaxPage, getApiResponseResults } from "@/util/helpers";
+import { getAuditLogByContact, getIsFetchingByContact } from "@/auditLog/selectors";
+import type { AuditLogList } from "@/auditLog/types";
 type Props = {
-  auditLogList: AuditLogList;
+  auditLogList?: AuditLogList;
   contactId: string;
-  fetchAuditLogByContact: (...args: Array<any>) => any;
-  isFetching: boolean;
+  fetchAuditLogByContact?: (...args: Array<any>) => any;
+  isFetching?: boolean;
 };
 type State = {
   activePage: number;
diff --git a/src/contacts/components/ContactEdit.tsx b/src/contacts/components/ContactEdit.tsx
index 00e926c71..fb63dd1a8 100644
--- a/src/contacts/components/ContactEdit.tsx
+++ b/src/contacts/components/ContactEdit.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import ContactForm from "./forms/ContactForm";
-import GreenBox from "components/content/GreenBox";
+import GreenBox from "@/components/content/GreenBox";
 
 const ContactEdit = () => {
   return <GreenBox className='no-margin'>
diff --git a/src/contacts/components/ContactModal.tsx b/src/contacts/components/ContactModal.tsx
index eb1e35746..b4202a030 100644
--- a/src/contacts/components/ContactModal.tsx
+++ b/src/contacts/components/ContactModal.tsx
@@ -1,15 +1,15 @@
 import React from "react";
 import { connect } from "react-redux";
-import Button from "components/button/Button";
+import Button from "@/components/button/Button";
 import ContactForm from "./forms/ContactForm";
-import GreenBox from "components/content/GreenBox";
-import Modal from "components/modal/Modal";
-import { ButtonColors } from "components/enums";
-import { Methods } from "enums";
-import { isMethodAllowed } from "util/helpers";
-import { getIsContactFormValid, getIsSaveClicked, getMethods as getContactMethods } from "contacts/selectors";
+import GreenBox from "@/components/content/GreenBox";
+import Modal from "@/components/modal/Modal";
+import { ButtonColors } from "@/components/enums";
+import { Methods } from "@/enums";
+import { isMethodAllowed } from "@/util/helpers";
+import { getIsContactFormValid, getIsSaveClicked, getMethods as getContactMethods } from "@/contacts/selectors";
 import type { Methods as MethodsType } from "types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 type Props = {
   contactMethods: MethodsType;
   isContactFormValid: boolean;
diff --git a/src/contacts/components/ContactPage.tsx b/src/contacts/components/ContactPage.tsx
index 7998bc659..0032371fa 100644
--- a/src/contacts/components/ContactPage.tsx
+++ b/src/contacts/components/ContactPage.tsx
@@ -4,46 +4,46 @@ import { change, formValueSelector, getFormValues, isDirty } from "redux-form";
 import { withRouter } from "react-router";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import Authorization from "components/authorization/Authorization";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import ConfirmationModal from "components/modal/ConfirmationModal";
+import Authorization from "@/components/authorization/Authorization";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import ConfirmationModal from "@/components/modal/ConfirmationModal";
 import ContactAuditLog from "./ContactAuditLog";
 import ContactEdit from "./ContactEdit";
 import ContactReadonly from "./ContactReadonly";
-import ContentContainer from "components/content/ContentContainer";
-import ControlButtonBar from "components/controlButtons/ControlButtonBar";
-import ControlButtons from "components/controlButtons/ControlButtons";
-import CreditDecisionTemplate from "../../creditDecision/components/CreditDecisionTemplate";
-import Divider from "components/content/Divider";
-import FullWidthContainer from "components/content/FullWidthContainer";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import PageContainer from "components/content/PageContainer";
-import PageNavigationWrapper from "components/content/PageNavigationWrapper";
-import Tabs from "components/tabs/Tabs";
-import TabPane from "components/tabs/TabPane";
-import TabContent from "components/tabs/TabContent";
-import Title from "components/content/Title";
-import TradeRegisterTemplate from "tradeRegister/components/TradeRegisterTemplate";
-import { editContact, fetchSingleContact, hideEditMode, initializeContactForm, receiveIsSaveClicked, receiveSingleContact, showEditMode } from "contacts/actions";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { ConfirmationModalTexts, FormNames, Methods, PermissionMissingTexts } from "enums";
-import { ContactFieldPaths, ContactFieldTitles, ContactTypes } from "contacts/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { clearUnsavedChanges, getContactFullName } from "contacts/helpers";
-import { getUiDataContactKey } from "uiData/helpers";
-import { hasPermissions, getSearchQuery, getUrlParams, isMethodAllowed, scrollToTopPage, setPageTitle } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getCurrentContact, getIsContactFormValid, getIsEditMode, getIsFetching, getIsSaveClicked, getIsSaving } from "contacts/selectors";
-import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "util/storage";
-import { withContactAttributes } from "components/attributes/ContactAttributes";
-import { withUiDataList } from "components/uiData/UiDataListHOC";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { getUserActiveServiceUnit } from "usersPermissions/selectors";
+import ContentContainer from "@/components/content/ContentContainer";
+import ControlButtonBar from "@/components/controlButtons/ControlButtonBar";
+import ControlButtons from "@/components/controlButtons/ControlButtons";
+import CreditDecisionTemplate from "@/creditDecision/components/CreditDecisionTemplate";
+import Divider from "@/components/content/Divider";
+import FullWidthContainer from "@/components/content/FullWidthContainer";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import PageContainer from "@/components/content/PageContainer";
+import PageNavigationWrapper from "@/components/content/PageNavigationWrapper";
+import Tabs from "@/components/tabs/Tabs";
+import TabPane from "@/components/tabs/TabPane";
+import TabContent from "@/components/tabs/TabContent";
+import Title from "@/components/content/Title";
+import TradeRegisterTemplate from "@/tradeRegister/components/TradeRegisterTemplate";
+import { editContact, fetchSingleContact, hideEditMode, initializeContactForm, receiveIsSaveClicked, receiveSingleContact, showEditMode } from "@/contacts/actions";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { ConfirmationModalTexts, FormNames, Methods, PermissionMissingTexts } from "@/enums";
+import { ContactFieldPaths, ContactFieldTitles, ContactTypes } from "@/contacts/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { clearUnsavedChanges, getContactFullName } from "@/contacts/helpers";
+import { getUiDataContactKey } from "@/uiData/helpers";
+import { hasPermissions, getSearchQuery, getUrlParams, isMethodAllowed, scrollToTopPage, setPageTitle } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getCurrentContact, getIsContactFormValid, getIsEditMode, getIsFetching, getIsSaveClicked, getIsSaving } from "@/contacts/selectors";
+import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "@/util/storage";
+import { withContactAttributes } from "@/components/attributes/ContactAttributes";
+import { withUiDataList } from "@/components/uiData/UiDataListHOC";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { getUserActiveServiceUnit } from "@/usersPermissions/selectors";
 import type { Methods as MethodsType } from "types";
-import type { RootState } from "root/types";
-import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "usersPermissions/types";
-import type { Contact } from "../types";
+import type { RootState } from "@/root/types";
+import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "@/usersPermissions/types";
+import type { Contact } from "@/contacts/types";
 type Props = {
   change: (...args: Array<any>) => any;
   contact: Contact;
@@ -441,7 +441,13 @@ class ContactPage extends Component<Props, State> {
                   {ContactFieldTitles.BASIC_INFO}
                 </Title>
                 <Divider />
-                {isEditMode ? <Authorization allow={isMethodAllowed(contactMethods, Methods.PATCH)} errorComponent={<AuthorizationError text={PermissionMissingTexts.GENERAL} />}> <ContactEdit /></Authorization> : <ContactReadonly contact={contact} />}
+                {isEditMode ? (
+                  <Authorization allow={isMethodAllowed(contactMethods, Methods.PATCH)} errorComponent={<AuthorizationError text={PermissionMissingTexts.GENERAL} />}>
+                    <ContactEdit />
+                  </Authorization>
+                ) : (
+                  <ContactReadonly contact={contact} />
+                )}
               </ContentContainer>
             </TabPane>
 
@@ -462,11 +468,13 @@ class ContactPage extends Component<Props, State> {
             <TabPane>
               <ContentContainer>
                 <Authorization allow={hasPermissions(usersPermissions, UsersPermissions.VIEW_CREDITDECISION)} errorComponent={<AuthorizationError text={PermissionMissingTexts.GENERAL} />}>
+                  <>
                   <Title enableUiDataEdit={isEditMode} uiDataKey={getUiDataContactKey(ContactFieldPaths.CREDIT_DECISION)}>
                     {ContactFieldTitles.CREDIT_DECISION}
                   </Title>
                   <Divider />
                   <CreditDecisionTemplate contactType={contact.type} contactId={contactId} />
+                  </>
                 </Authorization>
               </ContentContainer>
             </TabPane>
@@ -474,11 +482,13 @@ class ContactPage extends Component<Props, State> {
             <TabPane>
               <ContentContainer>
                 <Authorization allow={hasPermissions(usersPermissions, UsersPermissions.VIEW_CONTACT)} errorComponent={<AuthorizationError text={PermissionMissingTexts.GENERAL} />}>
+                  <>
                   <Title enableUiDataEdit={isEditMode} uiDataKey={getUiDataContactKey(ContactFieldPaths.AUDIT_LOG)}>
                     {ContactFieldTitles.AUDIT_LOG}
                   </Title>
                   <Divider />
                   <ContactAuditLog contactId={contactId} />
+                  </>
                 </Authorization>
               </ContentContainer>
             </TabPane>
diff --git a/src/contacts/components/ContactReadonly.tsx b/src/contacts/components/ContactReadonly.tsx
index 87f837391..2dd54f882 100644
--- a/src/contacts/components/ContactReadonly.tsx
+++ b/src/contacts/components/ContactReadonly.tsx
@@ -1,7 +1,7 @@
 import React from "react";
-import ContactTemplate from "contacts/components/templates/ContactTemplate";
-import GreenBox from "components/content/GreenBox";
-import type { Contact } from "../types";
+import ContactTemplate from "@/contacts/components/templates/ContactTemplate";
+import GreenBox from "@/components/content/GreenBox";
+import type { Contact } from "@/types";
 type Props = {
   contact: Contact;
 };
diff --git a/src/contacts/components/ContactsListPage.tsx b/src/contacts/components/ContactsListPage.tsx
index 49c84611a..d32853fa0 100644
--- a/src/contacts/components/ContactsListPage.tsx
+++ b/src/contacts/components/ContactsListPage.tsx
@@ -4,33 +4,33 @@ import { withRouter } from "react-router";
 import { initialize } from "redux-form";
 import flowRight from "lodash/flowRight";
 import { Row, Column } from "react-foundation";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import Authorization from "components/authorization/Authorization";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import PageContainer from "components/content/PageContainer";
-import Pagination from "components/table/Pagination";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import Authorization from "@/components/authorization/Authorization";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import PageContainer from "@/components/content/PageContainer";
+import Pagination from "@/components/table/Pagination";
 import Search from "./search/Search";
-import SortableTable from "components/table/SortableTable";
-import TableFilters from "components/table/TableFilters";
-import TableWrapper from "components/table/TableWrapper";
-import { fetchContacts, initializeContactForm } from "../actions";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { LIST_TABLE_PAGE_SIZE } from "util/constants";
-import { DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER } from "contacts/constants";
-import { FormNames, Methods, PermissionMissingTexts } from "enums";
-import { ContactFieldPaths, ContactFieldTitles } from "contacts/enums";
-import { getContactFullName, mapContactSearchFilters } from "contacts/helpers";
-import { getApiResponseCount, getApiResponseMaxPage, getApiResponseResults, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, setPageTitle } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getContactList, getIsFetching } from "../selectors";
-import { withContactAttributes } from "components/attributes/ContactAttributes";
-import { getUserActiveServiceUnit } from "usersPermissions/selectors";
-import type { ContactList } from "../types";
+import SortableTable from "@/components/table/SortableTable";
+import TableFilters from "@/components/table/TableFilters";
+import TableWrapper from "@/components/table/TableWrapper";
+import { fetchContacts, initializeContactForm } from "@/contacts/actions";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { LIST_TABLE_PAGE_SIZE } from "@/util/constants";
+import { DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER } from "@/contacts/constants";
+import { FormNames, Methods, PermissionMissingTexts } from "@/enums";
+import { ContactFieldPaths, ContactFieldTitles } from "@/contacts/enums";
+import { getContactFullName, mapContactSearchFilters } from "@/contacts/helpers";
+import { getApiResponseCount, getApiResponseMaxPage, getApiResponseResults, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, setPageTitle } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getContactList, getIsFetching } from "@/contacts/selectors";
+import { withContactAttributes } from "@/components/attributes/ContactAttributes";
+import { getUserActiveServiceUnit } from "@/usersPermissions/selectors";
+import type { ContactList } from "@/contacts/types";
 import type { Attributes, Methods as MethodsType } from "types";
-import type { RootState } from "root/types";
-import type { UserServiceUnit } from "usersPermissions/types";
+import type { RootState } from "@/root/types";
+import type { UserServiceUnit } from "@/usersPermissions/types";
 type Props = {
   contactAttributes: Attributes;
   contactList: ContactList;
diff --git a/src/contacts/components/NewContactPage.tsx b/src/contacts/components/NewContactPage.tsx
index f7eb31799..613c0e1d4 100644
--- a/src/contacts/components/NewContactPage.tsx
+++ b/src/contacts/components/NewContactPage.tsx
@@ -3,31 +3,31 @@ import { connect } from "react-redux";
 import { getFormValues, isDirty } from "redux-form";
 import { withRouter } from "react-router";
 import flowRight from "lodash/flowRight";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AuthorizationError from "components/authorization/AuthorizationError";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
 import ContactForm from "./forms/ContactForm";
-import ContentContainer from "components/content/ContentContainer";
-import ControlButtonBar from "components/controlButtons/ControlButtonBar";
-import ControlButtons from "components/controlButtons/ControlButtons";
-import FullWidthContainer from "components/content/FullWidthContainer";
-import GreenBox from "components/content/GreenBox";
-import Loader from "components/loader/Loader";
-import PageContainer from "components/content/PageContainer";
-import PageNavigationWrapper from "components/content/PageNavigationWrapper";
-import { createContact, hideEditMode, receiveIsSaveClicked, showEditMode } from "contacts/actions";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { ConfirmationModalTexts, FormNames, Methods, PermissionMissingTexts } from "enums";
-import { ButtonColors } from "components/enums";
-import { ContactTypes } from "contacts/enums";
-import { isEmptyValue, isMethodAllowed, setPageTitle } from "util/helpers";
-import { contactExists } from "contacts/requestsAsync";
-import { getRouteById, Routes } from "root/routes";
-import { getIsContactFormValid, getIsSaveClicked } from "contacts/selectors";
-import { withContactAttributes } from "components/attributes/ContactAttributes";
-import { withUiDataList } from "components/uiData/UiDataListHOC";
+import ContentContainer from "@/components/content/ContentContainer";
+import ControlButtonBar from "@/components/controlButtons/ControlButtonBar";
+import ControlButtons from "@/components/controlButtons/ControlButtons";
+import FullWidthContainer from "@/components/content/FullWidthContainer";
+import GreenBox from "@/components/content/GreenBox";
+import Loader from "@/components/loader/Loader";
+import PageContainer from "@/components/content/PageContainer";
+import PageNavigationWrapper from "@/components/content/PageNavigationWrapper";
+import { createContact, hideEditMode, receiveIsSaveClicked, showEditMode } from "@/contacts/actions";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { ConfirmationModalTexts, FormNames, Methods, PermissionMissingTexts } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { ContactTypes } from "@/contacts/enums";
+import { isEmptyValue, isMethodAllowed, setPageTitle } from "@/util/helpers";
+import { contactExists } from "@/contacts/requestsAsync";
+import { getRouteById, Routes } from "@/root/routes";
+import { getIsContactFormValid, getIsSaveClicked } from "@/contacts/selectors";
+import { withContactAttributes } from "@/components/attributes/ContactAttributes";
+import { withUiDataList } from "@/components/uiData/UiDataListHOC";
 import type { Methods as MethodsType } from "types";
-import type { RootState } from "root/types";
-import type { Contact } from "../types";
+import type { RootState } from "@/root/types";
+import type { Contact } from "@/types";
 type Props = {
   contactFormValues: Contact;
   contactMethods: MethodsType;
diff --git a/src/contacts/components/forms/ContactForm.tsx b/src/contacts/components/forms/ContactForm.tsx
index 198020814..451f6d9f4 100644
--- a/src/contacts/components/forms/ContactForm.tsx
+++ b/src/contacts/components/forms/ContactForm.tsx
@@ -4,26 +4,26 @@ import { Row, Column } from "react-foundation";
 import { change, formValueSelector, reduxForm } from "redux-form";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import Authorization from "components/authorization/Authorization";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import FormWrapper from "components/form/FormWrapper";
-import FormWrapperLeft from "components/form/FormWrapperLeft";
-import FormWrapperRight from "components/form/FormWrapperRight";
-import { receiveContactFormValid } from "contacts/actions";
-import { FieldTypes, FormNames } from "enums";
-import WarningContainer from "components/content/WarningContainer";
-import WarningField from "components/form/WarningField";
-import { getContactBusinessIdFieldError } from "contacts/helpers";
-import { ContactFieldPaths, ContactFieldTitles, ContactTypes } from "contacts/enums";
-import { getUiDataContactKey } from "uiData/helpers";
-import { getFieldAttributes, isEmptyValue, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes, getInitialContactFormValues, getIsContactFormValid, getIsSaveClicked } from "contacts/selectors";
-import { getUserActiveServiceUnit } from "usersPermissions/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import FormWrapper from "@/components/form/FormWrapper";
+import FormWrapperLeft from "@/components/form/FormWrapperLeft";
+import FormWrapperRight from "@/components/form/FormWrapperRight";
+import { receiveContactFormValid } from "@/contacts/actions";
+import { FieldTypes, FormNames } from "@/enums";
+import WarningContainer from "@/components/content/WarningContainer";
+import WarningField from "@/components/form/WarningField";
+import { getContactBusinessIdFieldError } from "@/contacts/helpers";
+import { ContactFieldPaths, ContactFieldTitles, ContactTypes } from "@/contacts/enums";
+import { getUiDataContactKey } from "@/uiData/helpers";
+import { getFieldAttributes, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes, getInitialContactFormValues, getIsContactFormValid, getIsSaveClicked } from "@/contacts/selectors";
+import { getUserActiveServiceUnit } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { RootState } from "root/types";
-import type { UserServiceUnit } from "usersPermissions/types";
+import type { RootState } from "@/root/types";
+import type { UserServiceUnit } from "@/usersPermissions/types";
 type Props = {
   attributes: Attributes;
   change: (...args: Array<any>) => any;
@@ -274,12 +274,14 @@ class ContactForm extends Component<Props> {
               </Column>
               <Column small={12} medium={6} large={4}>
                 <Authorization allow={isFieldAllowedToRead(attributes, ContactFieldPaths.SERVICE_UNIT)}>
+                  <>
                   <FormTextTitle uiDataKey={getUiDataContactKey(ContactFieldPaths.SERVICE_UNIT)}>
                     {ContactFieldTitles.SERVICE_UNIT}
                   </FormTextTitle>
                   <FormText>
                     {initialValues.service_unit ? initialValues.service_unit.name || '-' : userActiveServiceUnit && userActiveServiceUnit.name || '-'}
                   </FormText>
+                  </>
                 </Authorization>
               </Column>
               {type === ContactTypes.PERSON && <Column small={12} medium={6} large={4}>
diff --git a/src/contacts/components/search/Search.tsx b/src/contacts/components/search/Search.tsx
index e5391e1fb..1eff8d652 100644
--- a/src/contacts/components/search/Search.tsx
+++ b/src/contacts/components/search/Search.tsx
@@ -6,13 +6,13 @@ import debounce from "lodash/debounce";
 import flowRight from "lodash/flowRight";
 import isEqual from "lodash/isEqual";
 import isEmpty from "lodash/isEmpty";
-import FormField from "components/form/FormField";
-import SearchClearLink from "components/search/SearchClearLink";
-import SearchContainer from "components/search/SearchContainer";
-import { FieldTypes, FormNames } from "enums";
-import { fetchServiceUnits } from "serviceUnits/actions";
-import { getServiceUnits, getIsFetching as getIsFetchingServiceUnits } from "serviceUnits/selectors";
-import type { ServiceUnits } from "serviceUnits/types";
+import FormField from "@/components/form/FormField";
+import SearchClearLink from "@/components/search/SearchClearLink";
+import SearchContainer from "@/components/search/SearchContainer";
+import { FieldTypes, FormNames } from "@/enums";
+import { fetchServiceUnits } from "@/serviceUnits/actions";
+import { getServiceUnits, getIsFetching as getIsFetchingServiceUnits } from "@/serviceUnits/selectors";
+import type { ServiceUnits } from "@/serviceUnits/types";
 type Props = {
   formValues: Record<string, any>;
   fetchServiceUnits: (...args: Array<any>) => any;
diff --git a/src/contacts/components/templates/ContactTemplate.tsx b/src/contacts/components/templates/ContactTemplate.tsx
index 51b1c89ac..54ec91d28 100644
--- a/src/contacts/components/templates/ContactTemplate.tsx
+++ b/src/contacts/components/templates/ContactTemplate.tsx
@@ -1,17 +1,17 @@
 import React from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
-import Authorization from "components/authorization/Authorization";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import FormWrapper from "components/form/FormWrapper";
-import FormWrapperLeft from "components/form/FormWrapperLeft";
-import FormWrapperRight from "components/form/FormWrapperRight";
-import { ContactFieldPaths, ContactFieldTitles } from "contacts/enums";
-import { getUiDataContactKey } from "uiData/helpers";
-import { getFieldOptions, getLabelOfOption, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes } from "contacts/selectors";
-import { ContactTypes } from "contacts/enums";
+import Authorization from "@/components/authorization/Authorization";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import FormWrapper from "@/components/form/FormWrapper";
+import FormWrapperLeft from "@/components/form/FormWrapperLeft";
+import FormWrapperRight from "@/components/form/FormWrapperRight";
+import { ContactFieldPaths, ContactFieldTitles } from "@/contacts/enums";
+import { getUiDataContactKey } from "@/uiData/helpers";
+import { getFieldOptions, getLabelOfOption, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes } from "@/contacts/selectors";
+import { ContactTypes } from "@/contacts/enums";
 import type { Attributes } from "types";
 type Props = {
   attributes: Attributes;
@@ -31,98 +31,120 @@ const ContactTemplate = ({
         <Row>
           <Column small={12} medium={6} large={4}>
             <Authorization allow={isFieldAllowedToRead(attributes, ContactFieldPaths.TYPE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataContactKey(ContactFieldPaths.TYPE)}>
                 {ContactFieldTitles.TYPE}
               </FormTextTitle>
               <FormText>{getLabelOfOption(typeOptions, contact.type) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           {contact.type === ContactTypes.PERSON && <Column small={12} medium={6} large={4}>
               <Authorization allow={isFieldAllowedToRead(attributes, ContactFieldPaths.LAST_NAME)}>
+                <>
                 <FormTextTitle uiDataKey={getUiDataContactKey(ContactFieldPaths.LAST_NAME)}>
                   {ContactFieldTitles.LAST_NAME}
                 </FormTextTitle>
                 <FormText>{contact.last_name || '-'}</FormText>
+                </>
               </Authorization>
             </Column>}
           {contact.type === ContactTypes.PERSON && <Column small={12} medium={6} large={4}>
               <Authorization allow={isFieldAllowedToRead(attributes, ContactFieldPaths.FIRST_NAME)}>
+                <>
                 <FormTextTitle uiDataKey={getUiDataContactKey(ContactFieldPaths.FIRST_NAME)}>
                   {ContactFieldTitles.FIRST_NAME}
                 </FormTextTitle>
                 <FormText>{contact.first_name || '-'}</FormText>
+                </>
               </Authorization>
             </Column>}
           {contact.type && contact.type !== ContactTypes.PERSON && <Column small={12} medium={6} large={8}>
               <Authorization allow={isFieldAllowedToRead(attributes, ContactFieldPaths.NAME)}>
+                <>
                 <FormTextTitle uiDataKey={getUiDataContactKey(ContactFieldPaths.NAME)}>
                   {ContactFieldTitles.NAME}
                 </FormTextTitle>
                 <FormText>{contact.name || '-'}</FormText>
+                </>
               </Authorization>
             </Column>}
         </Row>
         <Row>
           <Column>
             <Authorization allow={isFieldAllowedToRead(attributes, ContactFieldPaths.CARE_OF)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataContactKey(ContactFieldPaths.CARE_OF)}>
                 {ContactFieldTitles.CARE_OF}
               </FormTextTitle>
               <FormText>{contact.care_of || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
         </Row>
         <Row>
           <Column>
             <Authorization allow={isFieldAllowedToRead(attributes, ContactFieldPaths.ADDRESS)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataContactKey(ContactFieldPaths.ADDRESS)}>
                 {ContactFieldTitles.ADDRESS}
               </FormTextTitle>
               <FormText>{contact.address || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
         </Row>
         <Row>
           <Column small={12} medium={4} large={4}>
             <Authorization allow={isFieldAllowedToRead(attributes, ContactFieldPaths.POSTAL_CODE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataContactKey(ContactFieldPaths.POSTAL_CODE)}>
                 {ContactFieldTitles.POSTAL_CODE}
               </FormTextTitle>
               <FormText>{contact.postal_code || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={12} medium={4} large={4}>
             <Authorization allow={isFieldAllowedToRead(attributes, ContactFieldPaths.CITY)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataContactKey(ContactFieldPaths.CITY)}>
                 {ContactFieldTitles.CITY}
               </FormTextTitle>
               <FormText>{contact.city || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={12} medium={4} large={4}>
             <Authorization allow={isFieldAllowedToRead(attributes, ContactFieldPaths.COUNTRY)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataContactKey(ContactFieldPaths.COUNTRY)}>
                 {ContactFieldTitles.COUNTRY}
               </FormTextTitle>
               <FormText>{getLabelOfOption(countryOptions, contact.country) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
         </Row>
         <Row>
           <Column small={12} medium={6} large={4}>
             <Authorization allow={isFieldAllowedToRead(attributes, ContactFieldPaths.PHONE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataContactKey(ContactFieldPaths.PHONE)}>
                 {ContactFieldTitles.PHONE}
               </FormTextTitle>
               <FormText>{contact.phone || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={12} medium={6} large={8}>
             <Authorization allow={isFieldAllowedToRead(attributes, ContactFieldPaths.EMAIL)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataContactKey(ContactFieldPaths.EMAIL)}>
                 {ContactFieldTitles.EMAIL}
               </FormTextTitle>
               <FormText>{contact.email || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
         </Row>
@@ -131,78 +153,96 @@ const ContactTemplate = ({
         <Row>
           {contact.type === ContactTypes.PERSON && <Column small={12} medium={6} large={4}>
               <Authorization allow={isFieldAllowedToRead(attributes, ContactFieldPaths.NATIONAL_IDENTIFICATION_NUMBER)}>
+                <>
                 <FormTextTitle uiDataKey={getUiDataContactKey(ContactFieldPaths.NATIONAL_IDENTIFICATION_NUMBER)}>
                   {ContactFieldTitles.NATIONAL_IDENTIFICATION_NUMBER}
                 </FormTextTitle>
                 <FormText>{contact.national_identification_number || '-'}</FormText>
+                </>
               </Authorization>
             </Column>}
           {contact.type && contact.type !== ContactTypes.PERSON && <Column small={12} medium={6} large={4}>
               <Authorization allow={isFieldAllowedToRead(attributes, ContactFieldPaths.BUSINESS_ID)}>
+                <>
                 <FormTextTitle uiDataKey={getUiDataContactKey(ContactFieldPaths.BUSINESS_ID)}>
                   {ContactFieldTitles.BUSINESS_ID}
                 </FormTextTitle>
                 <FormText>{contact.business_id || '-'}</FormText>
+                </>
               </Authorization>
             </Column>}
           <Column small={12} medium={6} large={4}>
             <Authorization allow={isFieldAllowedToRead(attributes, ContactFieldPaths.LANGUAGE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataContactKey(ContactFieldPaths.LANGUAGE)}>
                 {ContactFieldTitles.LANGUAGE}
               </FormTextTitle>
               <FormText>{getLabelOfOption(languageOptions, contact.language) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={12} medium={6} large={4}>
             <Authorization allow={isFieldAllowedToRead(attributes, ContactFieldPaths.SAP_CUSTOMER_NUMBER)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataContactKey(ContactFieldPaths.SAP_CUSTOMER_NUMBER)}>
                 {ContactFieldTitles.SAP_CUSTOMER_NUMBER}
               </FormTextTitle>
               <FormText>{contact.sap_customer_number || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
         </Row>
         <Row>
           <Column small={12} medium={6} large={4}>
             <Authorization allow={isFieldAllowedToRead(attributes, ContactFieldPaths.PARTNER_CODE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataContactKey(ContactFieldPaths.PARTNER_CODE)}>
                 {ContactFieldTitles.PARTNER_CODE}
               </FormTextTitle>
               <FormText>{contact.partner_code || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={12} medium={6} large={4}>
             <Authorization allow={isFieldAllowedToRead(attributes, ContactFieldPaths.ELECTRONIC_BILLING_ADDRESS)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataContactKey(ContactFieldPaths.ELECTRONIC_BILLING_ADDRESS)}>
                 {ContactFieldTitles.ELECTRONIC_BILLING_ADDRESS}
               </FormTextTitle>
               <FormText>{contact.electronic_billing_address || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={12} medium={6} large={4}>
             <Authorization allow={isFieldAllowedToRead(attributes, ContactFieldPaths.ID)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataContactKey(ContactFieldPaths.ID)}>
                 {ContactFieldTitles.ID}
               </FormTextTitle>
               <FormText>{contact.id || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
         </Row>
         <Row>
           <Column small={12} medium={6} large={4}>
             <Authorization allow={isFieldAllowedToRead(attributes, ContactFieldPaths.IS_LESSOR)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataContactKey(ContactFieldPaths.IS_LESSOR)}>
                 {ContactFieldTitles.IS_LESSOR}
               </FormTextTitle>
               <FormText>{contact.is_lessor ? 'Kyllä' : 'Ei'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={12} medium={6} large={4}>
             <Authorization allow={isFieldAllowedToRead(attributes, ContactFieldPaths.SERVICE_UNIT)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataContactKey(ContactFieldPaths.SERVICE_UNIT)}>
                 {ContactFieldTitles.SERVICE_UNIT}
               </FormTextTitle>
               <FormText>{contact.service_unit && contact.service_unit.name ? contact.service_unit.name : '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           {contact.type === ContactTypes.PERSON && <Column small={12} medium={6} large={4}>
@@ -215,10 +255,12 @@ const ContactTemplate = ({
         <Row>
           <Column>
             <Authorization allow={isFieldAllowedToRead(attributes, ContactFieldPaths.NOTE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataContactKey(ContactFieldPaths.NOTE)}>
                 {ContactFieldTitles.NOTE}
               </FormTextTitle>
               <FormText>{contact.note || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
         </Row>
diff --git a/src/contacts/constants.ts b/src/contacts/constants.ts
index 71ef3a8d1..5f983a052 100644
--- a/src/contacts/constants.ts
+++ b/src/contacts/constants.ts
@@ -1,4 +1,4 @@
-import { TableSortOrder } from "enums";
+import { TableSortOrder } from "@/enums";
 
 /**
  * Default sort key of contact list page
diff --git a/src/contacts/spec.ts b/src/contacts/contacts.spec.ts
similarity index 99%
rename from src/contacts/spec.ts
rename to src/contacts/contacts.spec.ts
index 5e9fec7c1..88fa3f2c2 100644
--- a/src/contacts/spec.ts
+++ b/src/contacts/contacts.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchAttributes, receiveAttributes, receiveMethods, attributesNotFound, receiveSingleContact, initializeContactForm, receiveContactFormValid, showEditMode, hideEditMode, showContactModal, hideContactModal, receiveContactModalSettings, receiveContacts, fetchContacts, fetchSingleContact, createContact, editContact, createContactOnModal, editContactOnModal, notFound, receiveIsSaveClicked } from "./actions";
 import contactReducer from "./reducer";
 import type { ContactState } from "./types";
diff --git a/src/contacts/helpers.ts b/src/contacts/helpers.ts
index 789831350..7191ba09f 100644
--- a/src/contacts/helpers.ts
+++ b/src/contacts/helpers.ts
@@ -1,8 +1,8 @@
 import { isDirty } from "redux-form";
-import { FormNames, TableSortOrder } from "enums";
+import { FormNames, TableSortOrder } from "@/enums";
 import { ContactTypes } from "./enums";
-import { getIsEditMode } from "contacts/selectors";
-import { removeSessionStorageItem } from "util/storage";
+import { getIsEditMode } from "@/contacts/selectors";
+import { removeSessionStorageItem } from "@/util/storage";
 
 /**
  * Get full name of contact
diff --git a/src/contacts/reducer.ts b/src/contacts/reducer.ts
index 0cb650bae..1c9f73a9d 100644
--- a/src/contacts/reducer.ts
+++ b/src/contacts/reducer.ts
@@ -1,6 +1,6 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
-import type { Attributes, Methods, Reducer } from "../types";
+import type { Attributes, Methods, Reducer } from "@/types";
 import type { Contact, ContactList, ContactModalSettings, InitializeContactFormValuesAction, ReceiveAttributesAction, ReceiveMethodsAction, ReceiveContactsAction, ReceiveSingleContactAction, ReceiveContactFormValidAction, ReceiveContactModalSettingsAction, ReceiveIsSaveClickedAction } from "./types";
 const isEditModeReducer: Reducer<boolean> = handleActions({
   'mvj/contacts/HIDE_EDIT': () => false,
diff --git a/src/contacts/requests.ts b/src/contacts/requests.ts
index 274b3e071..c12557d17 100644
--- a/src/contacts/requests.ts
+++ b/src/contacts/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 import type { Contact, ContactId } from "./types";
 export const fetchAttributes = (): Generator<any, any, any> => {
   return callApi(new Request(createUrl(`contact/`), {
diff --git a/src/contacts/requestsAsync.ts b/src/contacts/requestsAsync.ts
index 174772570..f10f004d4 100644
--- a/src/contacts/requestsAsync.ts
+++ b/src/contacts/requestsAsync.ts
@@ -1,5 +1,5 @@
-import createUrl from "api/createUrl";
-import callApiAsync from "api/callApiAsync";
+import createUrl from "@/api/createUrl";
+import callApiAsync from "@/api/callApiAsync";
 import { ContactExistsResponse } from "./types";
 export const fetchContacts = async (query?: Record<string, any>) => {
   const {
diff --git a/src/contacts/saga.ts b/src/contacts/saga.ts
index 44d329101..07a4f4e8e 100644
--- a/src/contacts/saga.ts
+++ b/src/contacts/saga.ts
@@ -2,10 +2,10 @@ import { all, call, fork, put, select, takeLatest } from "redux-saga/effects";
 import { push } from "react-router-redux";
 import { SubmissionError } from "redux-form";
 import { hideContactModal, hideEditMode, receiveAttributes, receiveMethods, attributesNotFound, receiveContacts, receiveContactModalSettings, receiveSingleContact, notFound } from "./actions";
-import { receiveError } from "api/actions";
-import { displayUIMessage } from "util/helpers";
+import { receiveError } from "@/api/actions";
+import { displayUIMessage } from "@/util/helpers";
 import { createContact, editContact, fetchAttributes, fetchContacts, fetchSingleContact } from "./requests";
-import { getRouteById, Routes } from "../root/routes";
+import { getRouteById, Routes } from "@/root/routes";
 import { getContactModalSettings } from "./selectors";
 
 function* fetchAttributesSaga(): Generator<any, any, any> {
diff --git a/src/contacts/selectors.ts b/src/contacts/selectors.ts
index 47afd2f1f..aec078770 100644
--- a/src/contacts/selectors.ts
+++ b/src/contacts/selectors.ts
@@ -1,5 +1,5 @@
 import type { Attributes, Methods, Selector } from "types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 import type { Contact, ContactList, ContactModalSettings } from "./types";
 export const getInitialContactFormValues: Selector<Contact, void> = (state: RootState): Contact => state.contact.initialContactFormValues;
 export const getIsContactFormValid: Selector<boolean, void> = (state: RootState): boolean => state.contact.isContactFormValid;
diff --git a/src/contacts/types.ts b/src/contacts/types.ts
index e5b3abe2f..05d230414 100644
--- a/src/contacts/types.ts
+++ b/src/contacts/types.ts
@@ -1,4 +1,4 @@
-import type { Action, Attributes, Methods } from "../types";
+import type { Action, Attributes, Methods } from "@/types";
 export type ContactState = {
   attributes: Attributes;
   contactModalSettings: ContactModalSettings;
diff --git a/src/contractFile/spec.ts b/src/contractFile/contractFile.spec.ts
similarity index 97%
rename from src/contractFile/spec.ts
rename to src/contractFile/contractFile.spec.ts
index 993366926..01fd49e62 100644
--- a/src/contractFile/spec.ts
+++ b/src/contractFile/contractFile.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchContractFilesById, receiveContractFilesById, notFoundById } from "./actions";
 import contractFileReducer from "./reducer";
 import type { ContractFileState } from "./types";
diff --git a/src/contractFile/reducer.ts b/src/contractFile/reducer.ts
index ef6db02a9..9004f811e 100644
--- a/src/contractFile/reducer.ts
+++ b/src/contractFile/reducer.ts
@@ -1,7 +1,7 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
 import type { Reducer } from "types";
-import type { FetchContractFilesByIdAction, ReceiveContractFilesByIdAction, NotFoundByIdAction } from "contractFile/types";
+import type { FetchContractFilesByIdAction, ReceiveContractFilesByIdAction, NotFoundByIdAction } from "@/contractFile/types";
 const isFetchingByIdReducer: Reducer<Record<string, any>> = handleActions({
   ['mvj/contractFile/FETCH_BY_ID']: (state: Record<string, any>, {
     payload: contractId
diff --git a/src/contractFile/requests.ts b/src/contractFile/requests.ts
index 86697df50..ba5e8fcc5 100644
--- a/src/contractFile/requests.ts
+++ b/src/contractFile/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "../api/callApi";
-import createUrlWithoutVersionSuffix from "../api/createUrlWithoutVersionSuffix";
+import callApi from "@/api/callApi";
+import createUrlWithoutVersionSuffix from "@/api/createUrlWithoutVersionSuffix";
 import type { ContractId } from "./types";
 export const fetchContractFiles = (id: ContractId): Generator<any, any, any> => {
   return callApi(new Request(createUrlWithoutVersionSuffix(`contract_file/${id}/`)));
diff --git a/src/contractFile/saga.ts b/src/contractFile/saga.ts
index 39386e4a2..27f2c0103 100644
--- a/src/contractFile/saga.ts
+++ b/src/contractFile/saga.ts
@@ -1,6 +1,6 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { SubmissionError } from "redux-form";
-import { receiveError } from "api/actions";
+import { receiveError } from "@/api/actions";
 import { receiveContractFilesById, notFoundById } from "./actions";
 import { fetchContractFiles } from "./requests";
 
diff --git a/src/contractFile/selectors.ts b/src/contractFile/selectors.ts
index 2252894cf..79a1a277c 100644
--- a/src/contractFile/selectors.ts
+++ b/src/contractFile/selectors.ts
@@ -1,4 +1,4 @@
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 import type { Selector } from "types";
 import type { ContractId } from "./types";
 export const getContractFilesById: Selector<Array<Record<string, any>>, ContractId> = (state: RootState, id: ContractId): Array<Record<string, any>> => state.contractFile.byId[id];
diff --git a/src/contractFile/types.ts b/src/contractFile/types.ts
index 941d05dea..646a2fbff 100644
--- a/src/contractFile/types.ts
+++ b/src/contractFile/types.ts
@@ -1,4 +1,4 @@
-import type { Action } from "../types";
+import type { Action } from "@/types";
 export type ContractId = number;
 export type ReceiveContractFilePayload = {
   contractId: ContractId;
diff --git a/src/createCollectionLetter/spec.ts b/src/createCollectionLetter/createCollectionLetter.spec.ts
similarity index 97%
rename from src/createCollectionLetter/spec.ts
rename to src/createCollectionLetter/createCollectionLetter.spec.ts
index 848afd5ef..dd5494da6 100644
--- a/src/createCollectionLetter/spec.ts
+++ b/src/createCollectionLetter/createCollectionLetter.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchAttributes, attributesNotFound, receiveAttributes } from "./actions";
 import createCollectionLetterReducer from "./reducer";
 import type { CreateCollectionLetterState } from "./types";
diff --git a/src/createCollectionLetter/reducer.ts b/src/createCollectionLetter/reducer.ts
index 101c7a32a..6a524a9f7 100644
--- a/src/createCollectionLetter/reducer.ts
+++ b/src/createCollectionLetter/reducer.ts
@@ -1,6 +1,6 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
-import type { Attributes, Reducer } from "../types";
+import type { Attributes, Reducer } from "@/types";
 import type { ReceiveAttributesAction } from "./types";
 const isFetchingAttributesReducer: Reducer<boolean> = handleActions({
   'mvj/createCollectionLetter/FETCH_ATTRIBUTES': () => true,
diff --git a/src/createCollectionLetter/requests.ts b/src/createCollectionLetter/requests.ts
index ff03846a5..f89215fad 100644
--- a/src/createCollectionLetter/requests.ts
+++ b/src/createCollectionLetter/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 export const fetchAttributes = (): Generator<any, any, any> => {
   return callApi(new Request(createUrl(`lease_create_collection_letter/`), {
     method: 'OPTIONS'
diff --git a/src/createCollectionLetter/saga.ts b/src/createCollectionLetter/saga.ts
index bfee5a589..6062ff7a8 100644
--- a/src/createCollectionLetter/saga.ts
+++ b/src/createCollectionLetter/saga.ts
@@ -1,7 +1,7 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { receiveAttributes, attributesNotFound } from "./actions";
 import { fetchAttributes } from "./requests";
-import { receiveError } from "../api/actions";
+import { receiveError } from "@/api/actions";
 
 function* fetchAttributesSaga(): Generator<any, any, any> {
   try {
diff --git a/src/createCollectionLetter/selectors.ts b/src/createCollectionLetter/selectors.ts
index 13322d195..55132793e 100644
--- a/src/createCollectionLetter/selectors.ts
+++ b/src/createCollectionLetter/selectors.ts
@@ -1,4 +1,4 @@
 import type { Attributes, Selector } from "types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 export const getIsFetchingAttributes: Selector<boolean, void> = (state: RootState): boolean => state.createCollectionLetter.isFetchingAttributes;
 export const getAttributes: Selector<Attributes, void> = (state: RootState): Attributes => state.createCollectionLetter.attributes;
\ No newline at end of file
diff --git a/src/createCollectionLetter/types.ts b/src/createCollectionLetter/types.ts
index 0aaa57568..469458415 100644
--- a/src/createCollectionLetter/types.ts
+++ b/src/createCollectionLetter/types.ts
@@ -1,4 +1,4 @@
-import type { Action, Attributes } from "../types";
+import type { Action, Attributes } from "@/types";
 export type CreateCollectionLetterState = {
   attributes: Attributes;
   isFetchingAttributes: boolean;
diff --git a/src/creditDecision/actions.ts b/src/creditDecision/actions.ts
index db52165ae..6a993d203 100644
--- a/src/creditDecision/actions.ts
+++ b/src/creditDecision/actions.ts
@@ -1,5 +1,5 @@
 import { createAction } from "redux-actions";
-import type { CreditDecisionNotFoundByBusinessIdAction, CreditDecisionNotFoundByContactIdAction, CreditDecisionNotFoundByNinAction, FetchCreditDecisionByBusinessIdAction, FetchCreditDecisionByContactIdAction, FetchCreditDecisionByNinAction, FetchHistoryByBusinessIdAction, FetchHistoryByContactIdAction, HistoryDataMap, HistoryNotFoundByBusinessIdAction, HistoryNotFoundByContactIdAction, ReceiveCreditDecisionByBusinessIdAction, ReceiveCreditDecisionByContactIdAction, ReceiveCreditDecisionByNinAction, ReceiveHistoryByBusinessIdAction, ReceiveHistoryByContactIdAction } from "creditDecision/types";
+import type { CreditDecisionNotFoundByBusinessIdAction, CreditDecisionNotFoundByContactIdAction, CreditDecisionNotFoundByNinAction, FetchCreditDecisionByBusinessIdAction, FetchCreditDecisionByContactIdAction, FetchCreditDecisionByNinAction, FetchHistoryByBusinessIdAction, FetchHistoryByContactIdAction, HistoryDataMap, HistoryNotFoundByBusinessIdAction, HistoryNotFoundByContactIdAction, ReceiveCreditDecisionByBusinessIdAction, ReceiveCreditDecisionByContactIdAction, ReceiveCreditDecisionByNinAction, ReceiveHistoryByBusinessIdAction, ReceiveHistoryByContactIdAction } from "@/creditDecision/types";
 export const fetchHistoryByBusinessId = (id: string): FetchHistoryByBusinessIdAction => createAction('mvj/creditDecision/FETCH_HISTORY_BY_BUSINESS_ID')(id);
 export const receiveHistoryByBusinessId = (payload: HistoryDataMap): ReceiveHistoryByBusinessIdAction => createAction('mvj/creditDecision/RECEIVE_HISTORY_BY_BUSINESS_ID')(payload);
 export const historyNotFoundByBusinessId = (id: string): HistoryNotFoundByBusinessIdAction => createAction('mvj/creditDecision/HISTORY_NOT_FOUND_BY_BUSINESS_ID')(id);
diff --git a/src/creditDecision/components/CreditDecisionHistory.tsx b/src/creditDecision/components/CreditDecisionHistory.tsx
index c5716265e..9d8ed6b2a 100644
--- a/src/creditDecision/components/CreditDecisionHistory.tsx
+++ b/src/creditDecision/components/CreditDecisionHistory.tsx
@@ -2,17 +2,17 @@ import React, { Fragment, PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import InfoIcon from "components/icons/InfoIcon";
-import GreenBox from "components/content/GreenBox";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import StatusText from "creditDecision/components/StatusText";
-import WhiteBox from "components/content/WhiteBox";
-import { CreditDecisionText } from "creditDecision/enums";
-import { formatDate } from "util/helpers";
-import { getHoursAndMinutes } from "util/date";
-import { fetchHistoryByBusinessId, fetchHistoryByContactId } from "creditDecision/actions";
-import { getHistoryByBusinessId, getIsFetchingHistoryByBusinessId, getHistoryByContactId, getIsFetchingHistoryByContactId } from "creditDecision/selectors";
+import InfoIcon from "@/components/icons/InfoIcon";
+import GreenBox from "@/components/content/GreenBox";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import StatusText from "@/creditDecision/components/StatusText";
+import WhiteBox from "@/components/content/WhiteBox";
+import { CreditDecisionText } from "@/creditDecision/enums";
+import { formatDate } from "@/util/helpers";
+import { getHoursAndMinutes } from "@/util/date";
+import { fetchHistoryByBusinessId, fetchHistoryByContactId } from "@/creditDecision/actions";
+import { getHistoryByBusinessId, getIsFetchingHistoryByBusinessId, getHistoryByContactId, getIsFetchingHistoryByContactId } from "@/creditDecision/selectors";
 type Props = {
   businessId?: string;
   contactId?: string;
diff --git a/src/creditDecision/components/CreditDecisionRequest.tsx b/src/creditDecision/components/CreditDecisionRequest.tsx
index 1e683db6d..e8d2e8eff 100644
--- a/src/creditDecision/components/CreditDecisionRequest.tsx
+++ b/src/creditDecision/components/CreditDecisionRequest.tsx
@@ -1,26 +1,26 @@
 import React, { Fragment, PureComponent } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import Button from "components/button/Button";
-import ErrorIcon from "components/icons/ErrorIcon";
-import GreenBox from "components/content/GreenBox";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import StatusText from "creditDecision/components/StatusText";
-import WhiteBox from "components/content/WhiteBox";
-import { ContactTypes } from "contacts/enums";
-import { CreditDecisionText } from "creditDecision/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { hasPermissions } from "util/helpers";
-import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors";
-import { formatDate } from "util/helpers";
-import { getHoursAndMinutes } from "util/date";
-import { fetchCreditDecisionByBusinessId, fetchCreditDecisionByContactId, fetchCreditDecisionByNin } from "creditDecision/actions";
-import { getCreditDecisionByBusinessId, getCreditDecisionByContactId, getCreditDecisionByNin, getIsFetchingCreditDecisionByBusinessId, getIsFetchingCreditDecisionByContactId, getIsFetchingCreditDecisionByNin } from "creditDecision/selectors";
+import Button from "@/components/button/Button";
+import ErrorIcon from "@/components/icons/ErrorIcon";
+import GreenBox from "@/components/content/GreenBox";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import StatusText from "@/creditDecision/components/StatusText";
+import WhiteBox from "@/components/content/WhiteBox";
+import { ContactTypes } from "@/contacts/enums";
+import { CreditDecisionText } from "@/creditDecision/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { hasPermissions } from "@/util/helpers";
+import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors";
+import { formatDate } from "@/util/helpers";
+import { getHoursAndMinutes } from "@/util/date";
+import { fetchCreditDecisionByBusinessId, fetchCreditDecisionByContactId, fetchCreditDecisionByNin } from "@/creditDecision/actions";
+import { getCreditDecisionByBusinessId, getCreditDecisionByContactId, getCreditDecisionByNin, getIsFetchingCreditDecisionByBusinessId, getIsFetchingCreditDecisionByContactId, getIsFetchingCreditDecisionByNin } from "@/creditDecision/selectors";
 type Props = {
   businessId: string;
   contactId: string;
diff --git a/src/creditDecision/components/CreditDecisionSearchPage.tsx b/src/creditDecision/components/CreditDecisionSearchPage.tsx
index 627391d03..ded004170 100644
--- a/src/creditDecision/components/CreditDecisionSearchPage.tsx
+++ b/src/creditDecision/components/CreditDecisionSearchPage.tsx
@@ -4,22 +4,22 @@ import { initialize } from "redux-form";
 import { withRouter } from "react-router";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import ContentContainer from "components/content/ContentContainer";
-import Divider from "components/content/Divider";
-import Loader from "components/loader/Loader";
-import PageContainer from "components/content/PageContainer";
-import SearchForm from "creditDecision/components/SearchForm";
-import CreditDecisionTemplate from "creditDecision/components/CreditDecisionTemplate";
-import { ContactTypes } from "contacts/enums";
-import { CreditDecisionText } from "creditDecision/enums";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { FormNames, PermissionMissingTexts } from "enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { hasPermissions, getSearchQuery, getUrlParams, setPageTitle } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import ContentContainer from "@/components/content/ContentContainer";
+import Divider from "@/components/content/Divider";
+import Loader from "@/components/loader/Loader";
+import PageContainer from "@/components/content/PageContainer";
+import SearchForm from "@/creditDecision/components/SearchForm";
+import CreditDecisionTemplate from "@/creditDecision/components/CreditDecisionTemplate";
+import { ContactTypes } from "@/contacts/enums";
+import { CreditDecisionText } from "@/creditDecision/enums";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { FormNames, PermissionMissingTexts } from "@/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { hasPermissions, getSearchQuery, getUrlParams, setPageTitle } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   history: Record<string, any>;
   initialize: (...args: Array<any>) => any;
diff --git a/src/creditDecision/components/CreditDecisionTemplate.tsx b/src/creditDecision/components/CreditDecisionTemplate.tsx
index f37c336c0..eca4c18d5 100644
--- a/src/creditDecision/components/CreditDecisionTemplate.tsx
+++ b/src/creditDecision/components/CreditDecisionTemplate.tsx
@@ -1,7 +1,7 @@
 import React, { Fragment } from "react";
-import CreditDecisionRequest from "creditDecision/components/CreditDecisionRequest";
-import CreditDecisionHistory from "creditDecision/components/CreditDecisionHistory";
-import { ContactTypes } from "contacts/enums";
+import CreditDecisionRequest from "@/creditDecision/components/CreditDecisionRequest";
+import CreditDecisionHistory from "@/creditDecision/components/CreditDecisionHistory";
+import { ContactTypes } from "@/contacts/enums";
 type Props = {
   businessId?: string;
   contactId?: string;
@@ -14,7 +14,7 @@ const CreditDecisionTemplate = ({
   contactId,
   contactType,
   nin
-}: Props): React.ReactNode => <Fragment>
+}: Props) => <Fragment>
     <CreditDecisionRequest contactType={contactType} contactId={contactId} businessId={businessId} nin={nin} />
 
     {contactType !== ContactTypes.PERSON && <CreditDecisionHistory contactId={contactId} businessId={businessId} />}
diff --git a/src/creditDecision/components/SearchForm.tsx b/src/creditDecision/components/SearchForm.tsx
index 907e27170..0c80a1f82 100644
--- a/src/creditDecision/components/SearchForm.tsx
+++ b/src/creditDecision/components/SearchForm.tsx
@@ -2,17 +2,17 @@ import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { getFormValues, formValueSelector, reduxForm } from "redux-form";
 import flowRight from "lodash/flowRight";
-import Button from "components/button/Button";
-import FormField from "components/form/FormField";
-import GreenBox from "components/content/GreenBox";
-import SearchInputColumn from "components/search/SearchInputColumn";
-import SearchLabel from "components/search/SearchLabel";
-import SearchLabelColumn from "components/search/SearchLabelColumn";
-import SearchRow from "components/search/SearchRow";
-import { ButtonColors } from "components/enums";
-import { ContactTypes } from "contacts/enums";
-import { FieldTypes, FormNames } from "enums";
-import { CreditDecisionText, SearchLabels } from "creditDecision/enums";
+import Button from "@/components/button/Button";
+import FormField from "@/components/form/FormField";
+import GreenBox from "@/components/content/GreenBox";
+import SearchInputColumn from "@/components/search/SearchInputColumn";
+import SearchLabel from "@/components/search/SearchLabel";
+import SearchLabelColumn from "@/components/search/SearchLabelColumn";
+import SearchRow from "@/components/search/SearchRow";
+import { ButtonColors } from "@/components/enums";
+import { ContactTypes } from "@/contacts/enums";
+import { FieldTypes, FormNames } from "@/enums";
+import { CreditDecisionText, SearchLabels } from "@/creditDecision/enums";
 type Props = {
   formSelectedType: String;
   formValues: Record<string, any>;
diff --git a/src/creditDecision/components/StatusText.tsx b/src/creditDecision/components/StatusText.tsx
index 47ad0e161..d809ce071 100644
--- a/src/creditDecision/components/StatusText.tsx
+++ b/src/creditDecision/components/StatusText.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import classNames from "classnames";
-import QuestionIcon from "components/icons/QuestionIcon";
-import SuccessIcon from "components/icons/SuccessIcon";
-import CancelIcon from "components/icons/CancelIcon";
-import { CreditDecisionStatus, CreditDecisionStatusLabels } from "creditDecision/enums";
+import QuestionIcon from "@/components/icons/QuestionIcon";
+import SuccessIcon from "@/components/icons/SuccessIcon";
+import CancelIcon from "@/components/icons/CancelIcon";
+import { CreditDecisionStatus, CreditDecisionStatusLabels } from "@/creditDecision/enums";
 type Props = {
   status: String;
   className?: String;
diff --git a/src/creditDecision/creditDecision.spec.ts b/src/creditDecision/creditDecision.spec.ts
new file mode 100644
index 000000000..7c46eb415
--- /dev/null
+++ b/src/creditDecision/creditDecision.spec.ts
@@ -0,0 +1,11 @@
+import { describe, expect, it } from "vitest";
+
+describe('Credit Decision', () => {
+  describe('Reducer', () => {
+    describe('creditDecisionReducer', () => {
+      it('should have a placeholder test', () => {
+        expect(true).toBe(true);
+      });
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/creditDecision/reducer.ts b/src/creditDecision/reducer.ts
index b72a074a0..5643238af 100644
--- a/src/creditDecision/reducer.ts
+++ b/src/creditDecision/reducer.ts
@@ -1,7 +1,7 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
 import type { Reducer } from "types";
-import type { CreditDecisionDataMap, CreditDecisionNotFoundByBusinessIdAction, CreditDecisionNotFoundByContactIdAction, CreditDecisionNotFoundByNinAction, FetchCreditDecisionByBusinessIdAction, FetchCreditDecisionByContactIdAction, FetchCreditDecisionByNinAction, FetchHistoryByBusinessIdAction, FetchHistoryByContactIdAction, HistoryDataMap, HistoryNotFoundByBusinessIdAction, HistoryNotFoundByContactIdAction, IsFetchingCreditDecisionMap, IsFetchingHistoryMap, ReceiveCreditDecisionByBusinessIdAction, ReceiveCreditDecisionByContactIdAction, ReceiveCreditDecisionByNinAction, ReceiveHistoryByBusinessIdAction, ReceiveHistoryByContactIdAction } from "creditDecision/types";
+import type { CreditDecisionDataMap, CreditDecisionNotFoundByBusinessIdAction, CreditDecisionNotFoundByContactIdAction, CreditDecisionNotFoundByNinAction, FetchCreditDecisionByBusinessIdAction, FetchCreditDecisionByContactIdAction, FetchCreditDecisionByNinAction, FetchHistoryByBusinessIdAction, FetchHistoryByContactIdAction, HistoryDataMap, HistoryNotFoundByBusinessIdAction, HistoryNotFoundByContactIdAction, IsFetchingCreditDecisionMap, IsFetchingHistoryMap, ReceiveCreditDecisionByBusinessIdAction, ReceiveCreditDecisionByContactIdAction, ReceiveCreditDecisionByNinAction, ReceiveHistoryByBusinessIdAction, ReceiveHistoryByContactIdAction } from "@/creditDecision/types";
 const isFetchingHistoryByBusinessIdReducer: Reducer<IsFetchingHistoryMap> = handleActions({
   ['mvj/creditDecision/FETCH_HISTORY_BY_BUSINESS_ID']: (state: IsFetchingHistoryMap, {
     payload: id
diff --git a/src/creditDecision/requests.ts b/src/creditDecision/requests.ts
index b8f1df23a..bb8ff3b29 100644
--- a/src/creditDecision/requests.ts
+++ b/src/creditDecision/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "api/callApi";
-import createUrl from "../api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 export const fetchHistoryBusinessId = (id: string): Generator<any, any, any> => {
   return callApi(new Request(createUrl(`get_credit_decisions?business_id=${id}`)));
 };
diff --git a/src/creditDecision/saga.ts b/src/creditDecision/saga.ts
index d61f22bfd..15192b213 100644
--- a/src/creditDecision/saga.ts
+++ b/src/creditDecision/saga.ts
@@ -1,5 +1,5 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
-import { receiveError } from "api/actions";
+import { receiveError } from "@/api/actions";
 import { creditDecisionNotFoundByBusinessId, creditDecisionNotFoundByContactId, creditDecisionNotFoundByNin, fetchHistoryByBusinessId, fetchHistoryByContactId, historyNotFoundByBusinessId, historyNotFoundByContactId, receiveCreditDecisionByBusinessId, receiveCreditDecisionByContactId, receiveCreditDecisionByNin, receiveHistoryByBusinessId, receiveHistoryByContactId } from "./actions";
 import { fetchHistoryBusinessId, fetchHistoryContactId, fetchCreditDecisionContactId, fetchCreditDecisionBusinessId, fetchCreditDecisionNin } from "./requests";
 
diff --git a/src/creditDecision/selectors.ts b/src/creditDecision/selectors.ts
index 687d055ae..56d466a95 100644
--- a/src/creditDecision/selectors.ts
+++ b/src/creditDecision/selectors.ts
@@ -1,4 +1,4 @@
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 import type { Selector } from "types";
 export const getIsFetchingHistoryByBusinessId: Selector<boolean, string> = (state: RootState, id: string): boolean => state.creditDecision.isFetchingHistoryByBusinessId[id];
 export const getIsFetchingHistoryByContactId: Selector<boolean, string> = (state: RootState, id: string): boolean => state.creditDecision.isFetchingHistoryByContactId[id];
diff --git a/src/creditDecision/spec.ts b/src/creditDecision/spec.ts
deleted file mode 100644
index 2a2a9ce8b..000000000
--- a/src/creditDecision/spec.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-
-describe('Credit Decision', () => {
-  describe('Reducer', () => {
-    describe('creditDecisionReducer', () => {// TODO
-    });
-  });
-});
\ No newline at end of file
diff --git a/src/district/spec.ts b/src/district/district.spec.ts
similarity index 97%
rename from src/district/spec.ts
rename to src/district/district.spec.ts
index efd66d553..b569d2730 100644
--- a/src/district/spec.ts
+++ b/src/district/district.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchDistrictsByMunicipality, receiveDistrictsByMunicipality, notFound } from "./actions";
 import districtReducer from "./reducer";
 import type { DistrictState } from "./types";
diff --git a/src/district/helpers.ts b/src/district/helpers.ts
index 303f936fd..d9bf3cbf2 100644
--- a/src/district/helpers.ts
+++ b/src/district/helpers.ts
@@ -1,4 +1,4 @@
-import { addEmptyOption } from "util/helpers";
+import { addEmptyOption } from "@/util/helpers";
 
 /**
  * Get district options
diff --git a/src/district/reducer.ts b/src/district/reducer.ts
index 2ff1474df..978111ad9 100644
--- a/src/district/reducer.ts
+++ b/src/district/reducer.ts
@@ -1,6 +1,6 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
-import type { Reducer } from "../types";
+import type { Reducer } from "@/types";
 import type { DistrictListMap, ReceiveDistrictsByMunicipalityAction } from "./types";
 const isFetchingReducer: Reducer<boolean> = handleActions({
   'mvj/district/FETCH_BY_MUNICIPALITY': () => true,
diff --git a/src/district/requests.ts b/src/district/requests.ts
index a15f74e2f..2156d6941 100644
--- a/src/district/requests.ts
+++ b/src/district/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 export const fetchDistricts = (search: string) => {
   return callApi(new Request(createUrl(`district/${search || ''}`)));
 };
\ No newline at end of file
diff --git a/src/district/saga.ts b/src/district/saga.ts
index dfd0e648f..ccf5f41de 100644
--- a/src/district/saga.ts
+++ b/src/district/saga.ts
@@ -1,7 +1,7 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { notFound, receiveDistrictsByMunicipality } from "./actions";
 import { fetchDistricts } from "./requests";
-import { receiveError } from "../api/actions";
+import { receiveError } from "@/api/actions";
 
 function* fetchDistrictsByMunicipalitySaga({
   payload: municipalityId,
diff --git a/src/district/selectors.ts b/src/district/selectors.ts
index 7be306ed9..64ebe463d 100644
--- a/src/district/selectors.ts
+++ b/src/district/selectors.ts
@@ -1,5 +1,5 @@
 import type { Selector } from "types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 import type { DistrictList } from "./types";
 export const getIsFetching: Selector<boolean, void> = (state: RootState): boolean => state.district.isFetching;
 export const getDistrictsByMunicipality: Selector<DistrictList | null | undefined, number> = (state: RootState, municipalityId: number): DistrictList | null | undefined => {
diff --git a/src/district/types.ts b/src/district/types.ts
index 7be035d58..7835a7ce4 100644
--- a/src/district/types.ts
+++ b/src/district/types.ts
@@ -1,4 +1,4 @@
-import type { Action } from "../types";
+import type { Action } from "@/types";
 export type DistrictState = {
   byMunicipality: DistrictListMap;
   isFetching: boolean;
diff --git a/src/enums.tsx b/src/enums.tsx
index eea0b7dff..cf23d0dda 100644
--- a/src/enums.tsx
+++ b/src/enums.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { DELETE_MODAL_BUTTON_TEXT } from "util/constants";
+import { DELETE_MODAL_BUTTON_TEXT } from './util/constants';
 
 /**
  * Table sort order enumerable.
diff --git a/src/index.ts b/src/index.ts
deleted file mode 100644
index a7c5d6042..000000000
--- a/src/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import startApp from "./root/startApp";
-import "./polyfills";
-startApp();
\ No newline at end of file
diff --git a/src/index.tsx b/src/index.tsx
new file mode 100644
index 000000000..bc1ddc7c9
--- /dev/null
+++ b/src/index.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { Provider } from 'react-redux';
+import { ConnectedRouter } from 'connected-react-router';
+import { OidcProvider } from 'redux-oidc';
+import configureStore, { history } from '@/root/configureStore';
+import routes from '@/root/routes';
+import userManager from '@/auth/util/user-manager';
+
+import './polyfills';
+export const store = configureStore();
+
+const container = document.getElementById('root');
+ReactDOM.render(
+  <Provider store={store}>
+    {/*
+    // @ts-ignore: Children not included in type error */}
+    <OidcProvider store={store} userManager={userManager}>
+      {/*
+      // @ts-ignore: Children not included in type error */}
+      <ConnectedRouter history={history}>
+        {routes}
+      </ConnectedRouter>
+    </OidcProvider>
+  </Provider>,
+  container
+  );
\ No newline at end of file
diff --git a/src/index/actions.ts b/src/index/actions.ts
index c30ecf620..5cb120aef 100644
--- a/src/index/actions.ts
+++ b/src/index/actions.ts
@@ -1,5 +1,5 @@
 import { createAction } from "redux-actions";
-import type { IndexList, FetchIndexListAction, ReceiveIndexListAction, NotFoundAction } from "index/types";
+import type { IndexList, FetchIndexListAction, ReceiveIndexListAction, NotFoundAction } from "@/index/types";
 export const fetchIndexList = (query: Record<string, any>): FetchIndexListAction => createAction('mvj/index/FETCH_ALL')(query);
 export const receiveIndexList = (indexList: IndexList): ReceiveIndexListAction => createAction('mvj/index/RECEIVE_ALL')(indexList);
 export const notFound = (): NotFoundAction => createAction('mvj/index/NOT_FOUND')();
\ No newline at end of file
diff --git a/src/index/components/IndexListPage.tsx b/src/index/components/IndexListPage.tsx
index 38bf3b6a0..cd3cb7e7e 100644
--- a/src/index/components/IndexListPage.tsx
+++ b/src/index/components/IndexListPage.tsx
@@ -2,21 +2,21 @@ import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import AuthorizationError from "components/authorization/AuthorizationError";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
 import IndexTable from "./IndexTable";
-import Loader from "components/loader/Loader";
-import PageContainer from "components/content/PageContainer";
-import { fetchIndexList } from "index/actions";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { PermissionMissingTexts } from "enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getContentYearlyIndexes } from "index/helpers";
-import { hasPermissions, setPageTitle } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getIndexList, getIsFetching } from "index/selectors";
-import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors";
-import type { IndexList } from "index/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import Loader from "@/components/loader/Loader";
+import PageContainer from "@/components/content/PageContainer";
+import { fetchIndexList } from "@/index/actions";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { PermissionMissingTexts } from "@/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getContentYearlyIndexes } from "@/index/helpers";
+import { hasPermissions, setPageTitle } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getIndexList, getIsFetching } from "@/index/selectors";
+import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors";
+import type { IndexList } from "@/index/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   fetchIndexList: (...args: Array<any>) => any;
   indexList: IndexList;
diff --git a/src/index/helpers.ts b/src/index/helpers.ts
index 226e9be13..3e3e8d818 100644
--- a/src/index/helpers.ts
+++ b/src/index/helpers.ts
@@ -1,4 +1,4 @@
-import { sortNumberByKeyDesc } from "util/helpers";
+import { sortNumberByKeyDesc } from "@/util/helpers";
 
 /** 
  * Get content yearly indexes to display on index table
diff --git a/src/index/spec.ts b/src/index/index.spec.ts
similarity index 96%
rename from src/index/spec.ts
rename to src/index/index.spec.ts
index 9ede22456..9c39bcf62 100644
--- a/src/index/spec.ts
+++ b/src/index/index.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchIndexList, receiveIndexList, notFound } from "./actions";
 import indexReducer from "./reducer";
 import type { IndexState } from "./types";
diff --git a/src/index/reducer.ts b/src/index/reducer.ts
index e73e373d6..5a5262564 100644
--- a/src/index/reducer.ts
+++ b/src/index/reducer.ts
@@ -1,7 +1,7 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
 import type { Reducer } from "types";
-import type { IndexList, ReceiveIndexListAction } from "index/types";
+import type { IndexList, ReceiveIndexListAction } from "@/index/types";
 const isFetchingReducer: Reducer<boolean> = handleActions({
   'mvj/index/FETCH_ALL': () => true,
   'mvj/index/RECEIVE_ALL': () => false,
diff --git a/src/index/requests.ts b/src/index/requests.ts
index 21ec4e7f9..5a29f8386 100644
--- a/src/index/requests.ts
+++ b/src/index/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 export const fetchIndexList = (query: Record<string, any>): Generator<any, any, any> => {
   return callApi(new Request(createUrl('index/', query)));
 };
\ No newline at end of file
diff --git a/src/index/selectors.ts b/src/index/selectors.ts
index 8b5e2040f..fb4a99cb5 100644
--- a/src/index/selectors.ts
+++ b/src/index/selectors.ts
@@ -1,5 +1,5 @@
 import type { Selector } from "types";
-import type { RootState } from "root/types";
-import type { IndexList } from "index/types";
+import type { RootState } from "@/root/types";
+import type { IndexList } from "@/index/types";
 export const getIsFetching: Selector<boolean, void> = (state: RootState): boolean => state.index.isFetching;
 export const getIndexList: Selector<IndexList, void> = (state: RootState): IndexList => state.index.list;
\ No newline at end of file
diff --git a/src/infillDevelopment/components/InfillDevelopmentListPage.tsx b/src/infillDevelopment/components/InfillDevelopmentListPage.tsx
index 7e0301929..a32b3263d 100644
--- a/src/infillDevelopment/components/InfillDevelopmentListPage.tsx
+++ b/src/infillDevelopment/components/InfillDevelopmentListPage.tsx
@@ -5,30 +5,30 @@ import { initialize } from "redux-form";
 import { withRouter } from "react-router";
 import flowRight from "lodash/flowRight";
 import isArray from "lodash/isArray";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import Authorization from "components/authorization/Authorization";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import PageContainer from "components/content/PageContainer";
-import Pagination from "components/table/Pagination";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import Authorization from "@/components/authorization/Authorization";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import PageContainer from "@/components/content/PageContainer";
+import Pagination from "@/components/table/Pagination";
 import Search from "./search/Search";
-import SortableTable from "components/table/SortableTable";
-import TableFilters from "components/table/TableFilters";
-import TableWrapper from "components/table/TableWrapper";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { fetchInfillDevelopments, receiveFormInitialValues } from "infillDevelopment/actions";
-import { LIST_TABLE_PAGE_SIZE } from "util/constants";
-import { DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER } from "infillDevelopment/constants";
-import { FormNames, Methods, PermissionMissingTexts } from "enums";
-import { InfillDevelopmentCompensationFieldPaths, InfillDevelopmentCompensationLeasesFieldPaths } from "infillDevelopment/enums";
-import { getContentInfillDevelopmentListResults, mapInfillDevelopmentSearchFilters } from "infillDevelopment/helpers";
-import { getApiResponseCount, getApiResponseMaxPage, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, setPageTitle } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getInfillDevelopments, getIsFetching } from "infillDevelopment/selectors";
-import { withInfillDevelopmentListPageAttributes } from "components/attributes/InfillDevelopmentListPageAttributes";
+import SortableTable from "@/components/table/SortableTable";
+import TableFilters from "@/components/table/TableFilters";
+import TableWrapper from "@/components/table/TableWrapper";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { fetchInfillDevelopments, receiveFormInitialValues } from "@/infillDevelopment/actions";
+import { LIST_TABLE_PAGE_SIZE } from "@/util/constants";
+import { DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER } from "@/infillDevelopment/constants";
+import { FormNames, Methods, PermissionMissingTexts } from "@/enums";
+import { InfillDevelopmentCompensationFieldPaths, InfillDevelopmentCompensationLeasesFieldPaths } from "@/infillDevelopment/enums";
+import { getContentInfillDevelopmentListResults, mapInfillDevelopmentSearchFilters } from "@/infillDevelopment/helpers";
+import { getApiResponseCount, getApiResponseMaxPage, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, setPageTitle } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getInfillDevelopments, getIsFetching } from "@/infillDevelopment/selectors";
+import { withInfillDevelopmentListPageAttributes } from "@/components/attributes/InfillDevelopmentListPageAttributes";
 import type { Attributes, Methods as MethodsType } from "types";
-import type { InfillDevelopmentList } from "infillDevelopment/types";
+import type { InfillDevelopmentList } from "@/infillDevelopment/types";
 type Props = {
   fetchInfillDevelopments: (...args: Array<any>) => any;
   history: Record<string, any>;
diff --git a/src/infillDevelopment/components/InfillDevelopmentPage.tsx b/src/infillDevelopment/components/InfillDevelopmentPage.tsx
index 70b34c989..f60269d57 100644
--- a/src/infillDevelopment/components/InfillDevelopmentPage.tsx
+++ b/src/infillDevelopment/components/InfillDevelopmentPage.tsx
@@ -5,41 +5,41 @@ import { connect } from "react-redux";
 import { change, destroy, getFormValues, isDirty } from "redux-form";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import Authorization from "components/authorization/Authorization";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import ConfirmationModal from "components/modal/ConfirmationModal";
-import ContentContainer from "components/content/ContentContainer";
-import ControlButtonBar from "components/controlButtons/ControlButtonBar";
-import ControlButtons from "components/controlButtons/ControlButtons";
-import Divider from "components/content/Divider";
-import FullWidthContainer from "components/content/FullWidthContainer";
+import Authorization from "@/components/authorization/Authorization";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import ConfirmationModal from "@/components/modal/ConfirmationModal";
+import ContentContainer from "@/components/content/ContentContainer";
+import ControlButtonBar from "@/components/controlButtons/ControlButtonBar";
+import ControlButtons from "@/components/controlButtons/ControlButtons";
+import Divider from "@/components/content/Divider";
+import FullWidthContainer from "@/components/content/FullWidthContainer";
 import InfillDevelopmentForm from "./forms/InfillDevelopmentForm";
 import InfillDevelopmentTemplate from "./sections/basicInfo/InfillDevelopmentTemplate";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import PageContainer from "components/content/PageContainer";
-import PageNavigationWrapper from "components/content/PageNavigationWrapper";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import PageContainer from "@/components/content/PageContainer";
+import PageNavigationWrapper from "@/components/content/PageNavigationWrapper";
 import SingleInfillDevelopmentMap from "./sections/map/SingleInfillDevelopmentMap";
-import Tabs from "components/tabs/Tabs";
-import TabContent from "components/tabs/TabContent";
-import TabPane from "components/tabs/TabPane";
-import Title from "components/content/Title";
-import { clearFormValidFlags, editInfillDevelopment, fetchSingleInfillDevelopment, hideEditMode, receiveFormInitialValues, receiveSingleInfillDevelopment, receiveIsSaveClicked, showEditMode } from "infillDevelopment/actions";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { ConfirmationModalTexts, FormNames, Methods, PermissionMissingTexts } from "enums";
-import { InfillDevelopmentCompensationFieldPaths, InfillDevelopmentCompensationFieldTitles, InfillDevelopmentCompensationLeasesFieldPaths } from "infillDevelopment/enums";
-import { clearUnsavedChanges, getContentInfillDevelopment, getCopyOfInfillDevelopment, getPayloadInfillDevelopment } from "infillDevelopment/helpers";
-import { getUiDataInfillDevelopmentKey } from "uiData/helpers";
-import { getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, scrollToTopPage, setPageTitle } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getCurrentInfillDevelopment, getIsEditMode, getIsFetching, getIsFormValidById, getIsSaveClicked, getIsSaving } from "infillDevelopment/selectors";
-import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors";
-import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "util/storage";
-import { withInfillDevelopmentPageAttributes } from "components/attributes/InfillDevelopmentPageAttributes";
-import { withUiDataList } from "components/uiData/UiDataListHOC";
+import Tabs from "@/components/tabs/Tabs";
+import TabContent from "@/components/tabs/TabContent";
+import TabPane from "@/components/tabs/TabPane";
+import Title from "@/components/content/Title";
+import { clearFormValidFlags, editInfillDevelopment, fetchSingleInfillDevelopment, hideEditMode, receiveFormInitialValues, receiveSingleInfillDevelopment, receiveIsSaveClicked, showEditMode } from "@/infillDevelopment/actions";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { ConfirmationModalTexts, FormNames, Methods, PermissionMissingTexts } from "@/enums";
+import { InfillDevelopmentCompensationFieldPaths, InfillDevelopmentCompensationFieldTitles, InfillDevelopmentCompensationLeasesFieldPaths } from "@/infillDevelopment/enums";
+import { clearUnsavedChanges, getContentInfillDevelopment, getCopyOfInfillDevelopment, getPayloadInfillDevelopment } from "@/infillDevelopment/helpers";
+import { getUiDataInfillDevelopmentKey } from "@/uiData/helpers";
+import { getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, scrollToTopPage, setPageTitle } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getCurrentInfillDevelopment, getIsEditMode, getIsFetching, getIsFormValidById, getIsSaveClicked, getIsSaving } from "@/infillDevelopment/selectors";
+import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors";
+import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "@/util/storage";
+import { withInfillDevelopmentPageAttributes } from "@/components/attributes/InfillDevelopmentPageAttributes";
+import { withUiDataList } from "@/components/uiData/UiDataListHOC";
 import type { Attributes, Methods as MethodsType } from "types";
-import type { InfillDevelopment } from "infillDevelopment/types";
-import type { UsersPermissions } from "usersPermissions/types";
+import type { InfillDevelopment } from "@/infillDevelopment/types";
+import type { UsersPermissions } from "@/usersPermissions/types";
 type Props = {
   change: (...args: Array<any>) => any;
   clearFormValidFlags: (...args: Array<any>) => any;
@@ -463,12 +463,14 @@ class InfillDevelopmentPage extends Component<Props, State> {
             <TabPane>
               <ContentContainer>
                 <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationLeasesFieldPaths.LEASE)} errorComponent={<AuthorizationError text={PermissionMissingTexts.GENERAL} />}>
+                  <>
                   <Title enableUiDataEdit={isEditMode} uiDataKey={getUiDataInfillDevelopmentKey(InfillDevelopmentCompensationFieldPaths.MAP)}>
                     {InfillDevelopmentCompensationFieldTitles.MAP}
                   </Title>
                   <Divider />
 
                   <SingleInfillDevelopmentMap />
+                  </>
                 </Authorization>
               </ContentContainer>
             </TabPane>
diff --git a/src/infillDevelopment/components/NewInfillDevelopmentPage.tsx b/src/infillDevelopment/components/NewInfillDevelopmentPage.tsx
index c28965470..cc3ef569c 100644
--- a/src/infillDevelopment/components/NewInfillDevelopmentPage.tsx
+++ b/src/infillDevelopment/components/NewInfillDevelopmentPage.tsx
@@ -3,27 +3,27 @@ import { connect } from "react-redux";
 import { withRouter } from "react-router";
 import { getFormValues, isDirty } from "redux-form";
 import flowRight from "lodash/flowRight";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import ContentContainer from "components/content/ContentContainer";
-import ControlButtonBar from "components/controlButtons/ControlButtonBar";
-import ControlButtons from "components/controlButtons/ControlButtons";
-import FullWidthContainer from "components/content/FullWidthContainer";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import ContentContainer from "@/components/content/ContentContainer";
+import ControlButtonBar from "@/components/controlButtons/ControlButtonBar";
+import ControlButtons from "@/components/controlButtons/ControlButtons";
+import FullWidthContainer from "@/components/content/FullWidthContainer";
 import InfillDevelopmentForm from "./forms/InfillDevelopmentForm";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import PageContainer from "components/content/PageContainer";
-import PageNavigationWrapper from "components/content/PageNavigationWrapper";
-import { clearFormValidFlags, createInfillDevelopment, hideEditMode, receiveIsSaveClicked, showEditMode } from "infillDevelopment/actions";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { FormNames, Methods, PermissionMissingTexts } from "enums";
-import { getPayloadInfillDevelopment } from "infillDevelopment/helpers";
-import { isMethodAllowed, setPageTitle } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getIsFormValidById, getIsSaveClicked, getIsSaving } from "infillDevelopment/selectors";
-import { withInfillDevelopmentPageAttributes } from "components/attributes/InfillDevelopmentPageAttributes";
-import { withUiDataList } from "components/uiData/UiDataListHOC";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import PageContainer from "@/components/content/PageContainer";
+import PageNavigationWrapper from "@/components/content/PageNavigationWrapper";
+import { clearFormValidFlags, createInfillDevelopment, hideEditMode, receiveIsSaveClicked, showEditMode } from "@/infillDevelopment/actions";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { FormNames, Methods, PermissionMissingTexts } from "@/enums";
+import { getPayloadInfillDevelopment } from "@/infillDevelopment/helpers";
+import { isMethodAllowed, setPageTitle } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getIsFormValidById, getIsSaveClicked, getIsSaving } from "@/infillDevelopment/selectors";
+import { withInfillDevelopmentPageAttributes } from "@/components/attributes/InfillDevelopmentPageAttributes";
+import { withUiDataList } from "@/components/uiData/UiDataListHOC";
 import type { Methods as MethodsType } from "types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 type Props = {
   clearFormValidFlags: (...args: Array<any>) => any;
   createInfillDevelopment: (...args: Array<any>) => any;
diff --git a/src/infillDevelopment/components/forms/InfillDevelopmentForm.tsx b/src/infillDevelopment/components/forms/InfillDevelopmentForm.tsx
index 98f226a40..d812b4127 100644
--- a/src/infillDevelopment/components/forms/InfillDevelopmentForm.tsx
+++ b/src/infillDevelopment/components/forms/InfillDevelopmentForm.tsx
@@ -3,20 +3,20 @@ import { connect } from "react-redux";
 import { FieldArray, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import Authorization from "components/authorization/Authorization";
-import FormField from "components/form/FormField";
-import GreenBox from "components/content/GreenBox";
+import Authorization from "@/components/authorization/Authorization";
+import FormField from "@/components/form/FormField";
+import GreenBox from "@/components/content/GreenBox";
 import LeaseItemsEdit from "./LeaseItemsEdit";
-import SubTitle from "components/content/SubTitle";
-import { receiveFormValidFlags } from "infillDevelopment/actions";
-import { FieldTypes, FormNames } from "enums";
-import { InfillDevelopmentCompensationFieldPaths, InfillDevelopmentCompensationFieldTitles, InfillDevelopmentCompensationLeasesFieldPaths, InfillDevelopmentCompensationLeasesFieldTitles } from "infillDevelopment/enums";
-import { getUiDataInfillDevelopmentKey } from "uiData/helpers";
-import { getFieldAttributes, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes as getInfillDevelopmentAttributes, getFormInitialValues, getIsSaveClicked } from "infillDevelopment/selectors";
-import { referenceNumber } from "components/form/validations";
+import SubTitle from "@/components/content/SubTitle";
+import { receiveFormValidFlags } from "@/infillDevelopment/actions";
+import { FieldTypes, FormNames } from "@/enums";
+import { InfillDevelopmentCompensationFieldPaths, InfillDevelopmentCompensationFieldTitles, InfillDevelopmentCompensationLeasesFieldPaths, InfillDevelopmentCompensationLeasesFieldTitles } from "@/infillDevelopment/enums";
+import { getUiDataInfillDevelopmentKey } from "@/uiData/helpers";
+import { getFieldAttributes, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes as getInfillDevelopmentAttributes, getFormInitialValues, getIsSaveClicked } from "@/infillDevelopment/selectors";
+import { referenceNumber } from "@/components/form/validations";
 import type { Attributes } from "types";
-import type { InfillDevelopment } from "infillDevelopment/types";
+import type { InfillDevelopment } from "@/infillDevelopment/types";
 type Props = {
   infillDevelopment: InfillDevelopment;
   infillDevelopmentAttributes: Attributes;
@@ -123,10 +123,12 @@ class InfillDevelopmentForm extends Component<Props> {
           </Row>
 
           <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationLeasesFieldPaths.INFILL_DEVELOPMENT_COMPENSATION_LEASES)}>
+            <>
             <SubTitle enableUiDataEdit uiDataKey={getUiDataInfillDevelopmentKey(InfillDevelopmentCompensationLeasesFieldPaths.INFILL_DEVELOPMENT_COMPENSATION_LEASES)}>
               {InfillDevelopmentCompensationLeasesFieldTitles.INFILL_DEVELOPMENT_COMPENSATION_LEASES}
             </SubTitle>
             <FieldArray component={LeaseItemsEdit} infillDevelopment={infillDevelopment} isSaveClicked={isSaveClicked} name={`infill_development_compensation_leases`} />
+            </>
           </Authorization>
         </GreenBox>
       </form>;
diff --git a/src/infillDevelopment/components/forms/LeaseItemEdit.tsx b/src/infillDevelopment/components/forms/LeaseItemEdit.tsx
index 1713b1855..8bababb0b 100644
--- a/src/infillDevelopment/components/forms/LeaseItemEdit.tsx
+++ b/src/infillDevelopment/components/forms/LeaseItemEdit.tsx
@@ -5,45 +5,45 @@ import { Row, Column } from "react-foundation";
 import isEmpty from "lodash/isEmpty";
 import flowRight from "lodash/flowRight";
 import get from "lodash/get";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButtonThird from "components/form/AddButtonThird";
-import AddFileButton from "components/form/AddFileButton";
-import Authorization from "components/authorization/Authorization";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import Collapse from "components/collapse/Collapse";
-import ExternalLink from "components/links/ExternalLink";
-import FileDownloadLink from "components/file/FileDownloadLink";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import ListItem from "components/content/ListItem";
-import ListItems from "components/content/ListItems";
-import RemoveButton from "components/form/RemoveButton";
-import SubTitle from "components/content/SubTitle";
-import { receiveCollapseStates } from "infillDevelopment/actions";
-import { createInfillDevelopmentAttachment, deleteInfillDevelopmentAttachment } from "infillDevelopmentAttachment/actions";
-import { fetchLeaseById } from "leases/actions";
-import { ConfirmationModalTexts, FieldTypes, FormNames, Methods, ViewModes } from "enums";
-import { ButtonColors } from "components/enums";
-import { InfillDevelopmentCompensationLeasesFieldPaths, InfillDevelopmentCompensationLeasesFieldTitles, InfillDevelopmentCompensationLeaseDecisionsFieldPaths, InfillDevelopmentCompensationLeaseDecisionsFieldTitles, InfillDevelopmentCompensationLeaseIntendedUsesFieldPaths, InfillDevelopmentCompensationLeaseIntendedUsesFieldTitles } from "infillDevelopment/enums";
-import { InfillDevelopmentCompensationAttachmentFieldPaths, InfillDevelopmentCompensationAttachmentFieldTitles } from "infillDevelopmentAttachment/enums";
-import { LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths, LeaseTenantsFieldPaths } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getUiDataInfillDevelopmentKey, getUiDataInfillDevelopmentAttachmentKey } from "uiData/helpers";
-import { convertStrToDecimalNumber, formatDate, formatNumber, getFieldAttributes, hasPermissions, isActive, isFieldAllowedToRead, isFieldRequired, isMethodAllowed } from "util/helpers";
-import { getContactFullName } from "contacts/helpers";
-import { getContentLeaseAreas, getContentLeaseIdentifier, getContentTenants } from "leases/helpers";
-import { getUserFullName } from "users/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getAttributes as getInfillDevelopmentAttributes, getCollapseStateByKey } from "infillDevelopment/selectors";
-import { getAttributes as getInfillDevelopmentAttachmentAttributes, getMethods as getInfillDevelopmentAttachmentMethods } from "infillDevelopmentAttachment/selectors";
-import { getAttributes as getLeaseAttributes, getIsFetchingById, getLeaseById } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { referenceNumber } from "components/form/validations";
-import { getUserActiveServiceUnit } from "usersPermissions/selectors";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import AddFileButton from "@/components/form/AddFileButton";
+import Authorization from "@/components/authorization/Authorization";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import Collapse from "@/components/collapse/Collapse";
+import ExternalLink from "@/components/links/ExternalLink";
+import FileDownloadLink from "@/components/file/FileDownloadLink";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import ListItem from "@/components/content/ListItem";
+import ListItems from "@/components/content/ListItems";
+import RemoveButton from "@/components/form/RemoveButton";
+import SubTitle from "@/components/content/SubTitle";
+import { receiveCollapseStates } from "@/infillDevelopment/actions";
+import { createInfillDevelopmentAttachment, deleteInfillDevelopmentAttachment } from "@/infillDevelopmentAttachment/actions";
+import { fetchLeaseById } from "@/leases/actions";
+import { ConfirmationModalTexts, FieldTypes, FormNames, Methods, ViewModes } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { InfillDevelopmentCompensationLeasesFieldPaths, InfillDevelopmentCompensationLeasesFieldTitles, InfillDevelopmentCompensationLeaseDecisionsFieldPaths, InfillDevelopmentCompensationLeaseDecisionsFieldTitles, InfillDevelopmentCompensationLeaseIntendedUsesFieldPaths, InfillDevelopmentCompensationLeaseIntendedUsesFieldTitles } from "@/infillDevelopment/enums";
+import { InfillDevelopmentCompensationAttachmentFieldPaths, InfillDevelopmentCompensationAttachmentFieldTitles } from "@/infillDevelopmentAttachment/enums";
+import { LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths, LeaseTenantsFieldPaths } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getUiDataInfillDevelopmentKey, getUiDataInfillDevelopmentAttachmentKey } from "@/uiData/helpers";
+import { convertStrToDecimalNumber, formatDate, formatNumber, getFieldAttributes, hasPermissions, isActive, isFieldAllowedToRead, isFieldRequired, isMethodAllowed } from "@/util/helpers";
+import { getContactFullName } from "@/contacts/helpers";
+import { getContentLeaseAreas, getContentLeaseIdentifier, getContentTenants } from "@/leases/helpers";
+import { getUserFullName } from "@/users/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getAttributes as getInfillDevelopmentAttributes, getCollapseStateByKey } from "@/infillDevelopment/selectors";
+import { getAttributes as getInfillDevelopmentAttachmentAttributes, getMethods as getInfillDevelopmentAttachmentMethods } from "@/infillDevelopmentAttachment/selectors";
+import { getAttributes as getLeaseAttributes, getIsFetchingById, getLeaseById } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { referenceNumber } from "@/components/form/validations";
+import { getUserActiveServiceUnit } from "@/usersPermissions/selectors";
 import type { Attributes, Methods as MethodsType } from "types";
-import type { Lease, LeaseId } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "usersPermissions/types";
+import type { Lease, LeaseId } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "@/usersPermissions/types";
 type DecisionsProps = {
   fields: any;
   infillDevelopmentAttributes: Attributes;
@@ -459,6 +459,7 @@ class LeaseItemEdit extends PureComponent<Props, State> {
             </Column>
             <Column small={6} medium={4} large={2}>
               <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseTenantsFieldPaths.TENANTS)}>
+                <>
                 <FormTextTitle enableUiDataEdit uiDataKey={getUiDataInfillDevelopmentKey(LeaseTenantsFieldPaths.TENANTS)}>
                   Vuokralainen
                 </FormTextTitle>
@@ -470,10 +471,12 @@ class LeaseItemEdit extends PureComponent<Props, State> {
                         <ExternalLink className='no-margin' href={`${getRouteById(Routes.CONTACTS)}/${get(tenant, 'tenant.contact.id')}`} text={getContactFullName(get(tenant, 'tenant.contact'))} />
                       </ListItem>)}
                   </ListItems>}
+                    </>
               </Authorization>
             </Column>
             <Column small={6} medium={4} large={2}>
               <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeasePlotsFieldPaths.PLOTS)}>
+                <>
                 <FormTextTitle enableUiDataEdit uiDataKey={getUiDataInfillDevelopmentKey(LeasePlotsFieldPaths.PLOTS)}>
                   Kiinteistö
                 </FormTextTitle>
@@ -483,10 +486,12 @@ class LeaseItemEdit extends PureComponent<Props, State> {
                 {!isFetching && !!plots.length && <ListItems>
                     {plots.map((plot, index) => <ListItem key={index}>{plot.identifier || '-'}</ListItem>)}
                   </ListItems>}
+                </>
               </Authorization>
             </Column>
             <Column small={6} medium={4} large={2}>
               <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeasePlanUnitsFieldPaths.PLAN_UNITS)}>
+                <>
                 <FormTextTitle enableUiDataEdit uiDataKey={getUiDataInfillDevelopmentKey(LeasePlanUnitsFieldPaths.PLAN_UNITS)}>
                   Kaavayksikkö
                 </FormTextTitle>
@@ -496,13 +501,16 @@ class LeaseItemEdit extends PureComponent<Props, State> {
                 {!isFetching && !!planUnits.length && <ListItems>
                     {planUnits.map((planUnit, index) => <ListItem key={index}>{planUnit.identifier || '-'}</ListItem>)}
                   </ListItems>}
+                </>
               </Authorization>
             </Column>
             <Column small={6} medium={4} large={2}>
               <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationLeasesFieldPaths.LEASE)}>
+                <>
                 {isFetching && <FormText>Ladataan...</FormText>}
                 {!isFetching && !leaseId && <FormText>-</FormText>}
                 {!isFetching && leaseId && <ExternalLink href={`${getRouteById(Routes.LEASES)}/${leaseId}?tab=7`} text='Karttalinkki' />}
+                </>
               </Authorization>
             </Column>
           </Row>
@@ -536,10 +544,12 @@ class LeaseItemEdit extends PureComponent<Props, State> {
             </Column>
             <Column small={6} medium={4} large={2}>
               <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationLeasesFieldPaths.MONETARY_COMPENSATION_AMOUNT) || isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationLeasesFieldPaths.COMPENSATION_INVESTMENT_AMOUNT)}>
+                <>
                 <FormTextTitle enableUiDataEdit uiDataKey={getUiDataInfillDevelopmentKey(InfillDevelopmentCompensationLeasesFieldPaths.TOTAL_COMPENSATION)}>
                   {InfillDevelopmentCompensationLeasesFieldTitles.TOTAL_COMPENSATION}
                 </FormTextTitle>
                 <FormText>{`${formatNumber(totalCompensation)} €`}</FormText>
+                </>
               </Authorization>
             </Column>
             <Column small={6} medium={4} large={2}>
@@ -689,7 +699,7 @@ class LeaseItemEdit extends PureComponent<Props, State> {
 }
 
 const selector = formValueSelector(FormNames.INFILL_DEVELOPMENT);
-export default flowRight(connect((state, props) => {
+export default flowRight(connect((state, props: Props) => {
   const {
     field
   } = props;
diff --git a/src/infillDevelopment/components/forms/LeaseItemsEdit.tsx b/src/infillDevelopment/components/forms/LeaseItemsEdit.tsx
index d4df7cb2a..889aacc64 100644
--- a/src/infillDevelopment/components/forms/LeaseItemsEdit.tsx
+++ b/src/infillDevelopment/components/forms/LeaseItemsEdit.tsx
@@ -1,18 +1,18 @@
 import React, { Fragment, ReactElement } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import Authorization from "components/authorization/Authorization";
-import FormText from "components/form/FormText";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import Authorization from "@/components/authorization/Authorization";
+import FormText from "@/components/form/FormText";
 import LeaseItemEdit from "./LeaseItemEdit";
-import { ConfirmationModalTexts } from "enums";
-import { ButtonColors } from "components/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { hasPermissions } from "util/helpers";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
-import type { InfillDevelopment } from "infillDevelopment/types";
+import { ConfirmationModalTexts } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { hasPermissions } from "@/util/helpers";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
+import type { InfillDevelopment } from "@/infillDevelopment/types";
 type Props = {
   fields: any;
   infillDevelopment: InfillDevelopment;
diff --git a/src/infillDevelopment/components/search/Search.tsx b/src/infillDevelopment/components/search/Search.tsx
index 04e36679b..298607b67 100644
--- a/src/infillDevelopment/components/search/Search.tsx
+++ b/src/infillDevelopment/components/search/Search.tsx
@@ -7,18 +7,18 @@ import debounce from "lodash/debounce";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
 import isEqual from "lodash/isEqual";
-import FormField from "components/form/FormField";
-import SearchChangeTypeLink from "components/search/SearchChangeTypeLink";
-import SearchClearLink from "components/search/SearchClearLink";
-import SearchContainer from "components/search/SearchContainer";
-import SearchLabel from "components/search/SearchLabel";
-import SearchLabelColumn from "components/search/SearchLabelColumn";
-import SearchInputColumn from "components/search/SearchInputColumn";
-import SearchRow from "components/search/SearchRow";
-import { FieldTypes, FormNames } from "enums";
-import { InfillDevelopmentCompensationLeaseDecisionsFieldPaths } from "infillDevelopment/enums";
-import { getFieldOptions, getUrlParams } from "util/helpers";
-import { getAttributes as getInfillDevelopmentAttributes } from "infillDevelopment/selectors";
+import FormField from "@/components/form/FormField";
+import SearchChangeTypeLink from "@/components/search/SearchChangeTypeLink";
+import SearchClearLink from "@/components/search/SearchClearLink";
+import SearchContainer from "@/components/search/SearchContainer";
+import SearchLabel from "@/components/search/SearchLabel";
+import SearchLabelColumn from "@/components/search/SearchLabelColumn";
+import SearchInputColumn from "@/components/search/SearchInputColumn";
+import SearchRow from "@/components/search/SearchRow";
+import { FieldTypes, FormNames } from "@/enums";
+import { InfillDevelopmentCompensationLeaseDecisionsFieldPaths } from "@/infillDevelopment/enums";
+import { getFieldOptions, getUrlParams } from "@/util/helpers";
+import { getAttributes as getInfillDevelopmentAttributes } from "@/infillDevelopment/selectors";
 import type { Attributes } from "types";
 type Props = {
   formValues: Record<string, any>;
diff --git a/src/infillDevelopment/components/sections/basicInfo/InfillDevelopmentTemplate.tsx b/src/infillDevelopment/components/sections/basicInfo/InfillDevelopmentTemplate.tsx
index 88ff99dc5..9695e2dc3 100644
--- a/src/infillDevelopment/components/sections/basicInfo/InfillDevelopmentTemplate.tsx
+++ b/src/infillDevelopment/components/sections/basicInfo/InfillDevelopmentTemplate.tsx
@@ -2,24 +2,24 @@ import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
-import Authorization from "components/authorization/Authorization";
-import ExternalLink from "components/links/ExternalLink";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import GreenBox from "components/content/GreenBox";
+import Authorization from "@/components/authorization/Authorization";
+import ExternalLink from "@/components/links/ExternalLink";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import GreenBox from "@/components/content/GreenBox";
 import LeaseItem from "./LeaseItem";
-import SubTitle from "components/content/SubTitle";
-import { InfillDevelopmentCompensationFieldPaths, InfillDevelopmentCompensationFieldTitles, InfillDevelopmentCompensationLeasesFieldPaths, InfillDevelopmentCompensationLeasesFieldTitles } from "infillDevelopment/enums";
-import { getUiDataInfillDevelopmentKey } from "uiData/helpers";
-import { formatDate, getFieldOptions, getLabelOfOption, getReferenceNumberLink, isFieldAllowedToRead } from "util/helpers";
-import { getUserFullName } from "users/helpers";
-import { getAttributes as getInfillDevelopmentAttributes } from "infillDevelopment/selectors";
+import SubTitle from "@/components/content/SubTitle";
+import { InfillDevelopmentCompensationFieldPaths, InfillDevelopmentCompensationFieldTitles, InfillDevelopmentCompensationLeasesFieldPaths, InfillDevelopmentCompensationLeasesFieldTitles } from "@/infillDevelopment/enums";
+import { getUiDataInfillDevelopmentKey } from "@/uiData/helpers";
+import { formatDate, getFieldOptions, getLabelOfOption, getReferenceNumberLink, isFieldAllowedToRead } from "@/util/helpers";
+import { getUserFullName } from "@/users/helpers";
+import { getAttributes as getInfillDevelopmentAttributes } from "@/infillDevelopment/selectors";
 import type { Attributes } from "types";
-import type { InfillDevelopment } from "infillDevelopment/types";
+import type { InfillDevelopment } from "@/infillDevelopment/types";
 type Props = {
   infillDevelopment: InfillDevelopment;
   infillDevelopmentAttributes: Attributes;
-  isFetching: boolean;
+  isFetching?: boolean;
 };
 
 const InfillDevelopmentTemplate = ({
@@ -33,65 +33,80 @@ const InfillDevelopmentTemplate = ({
         <Row>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationFieldPaths.NAME)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataInfillDevelopmentKey(InfillDevelopmentCompensationFieldPaths.NAME)}>
                 {InfillDevelopmentCompensationFieldTitles.NAME}
               </FormTextTitle>
               <FormText>{infillDevelopment.name || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationFieldPaths.DETAILED_PLAN_IDENTIFIER)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataInfillDevelopmentKey(InfillDevelopmentCompensationFieldPaths.DETAILED_PLAN_IDENTIFIER)}>
                 {InfillDevelopmentCompensationFieldTitles.DETAILED_PLAN_IDENTIFIER}
               </FormTextTitle>
               <FormText>{infillDevelopment.detailed_plan_identifier || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationFieldPaths.REFERENCE_NUMBER)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataInfillDevelopmentKey(InfillDevelopmentCompensationFieldPaths.REFERENCE_NUMBER)}>
                 {InfillDevelopmentCompensationFieldTitles.REFERENCE_NUMBER}
               </FormTextTitle>
               <FormText>{infillDevelopment.reference_number ? <ExternalLink href={getReferenceNumberLink(infillDevelopment.reference_number)} text={infillDevelopment.reference_number} className='no-margin' /> : '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationFieldPaths.STATE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataInfillDevelopmentKey(InfillDevelopmentCompensationFieldPaths.STATE)}>
                 {InfillDevelopmentCompensationFieldTitles.STATE}
               </FormTextTitle>
               <FormText>{getLabelOfOption(stateOptions, infillDevelopment.state) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
         </Row>
         <Row>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationFieldPaths.USER)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataInfillDevelopmentKey(InfillDevelopmentCompensationFieldPaths.USER)}>
                 {InfillDevelopmentCompensationFieldTitles.USER}
               </FormTextTitle>
               <FormText>{getUserFullName(infillDevelopment.user) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationFieldPaths.LEASE_CONTRACT_CHANGE_DATE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataInfillDevelopmentKey(InfillDevelopmentCompensationFieldPaths.LEASE_CONTRACT_CHANGE_DATE)}>
                 {InfillDevelopmentCompensationFieldTitles.LEASE_CONTRACT_CHANGE_DATE}
               </FormTextTitle>
               <FormText>{formatDate(infillDevelopment.lease_contract_change_date) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={12} medium={4} large={8}>
             <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationFieldPaths.NOTE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataInfillDevelopmentKey(InfillDevelopmentCompensationFieldPaths.NOTE)}>
                 {InfillDevelopmentCompensationFieldTitles.NOTE}
               </FormTextTitle>
               <FormText>{infillDevelopment.note || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
         </Row>
 
         <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationLeasesFieldPaths.INFILL_DEVELOPMENT_COMPENSATION_LEASES)}>
+          <>
           <SubTitle uiDataKey={getUiDataInfillDevelopmentKey(InfillDevelopmentCompensationLeasesFieldPaths.INFILL_DEVELOPMENT_COMPENSATION_LEASES)}>
             {InfillDevelopmentCompensationLeasesFieldTitles.INFILL_DEVELOPMENT_COMPENSATION_LEASES}
           </SubTitle>
@@ -102,6 +117,7 @@ const InfillDevelopmentTemplate = ({
         }}>
               {leases.map(lease => <LeaseItem id={lease.id} key={lease.id} leaseData={lease} leaseId={get(lease, 'lease.value')} />)}
             </div>}
+          </>
         </Authorization>
       </GreenBox>
     </Fragment>;
diff --git a/src/infillDevelopment/components/sections/basicInfo/LeaseInfo.tsx b/src/infillDevelopment/components/sections/basicInfo/LeaseInfo.tsx
index b6b36d238..32bec250f 100644
--- a/src/infillDevelopment/components/sections/basicInfo/LeaseInfo.tsx
+++ b/src/infillDevelopment/components/sections/basicInfo/LeaseInfo.tsx
@@ -5,22 +5,22 @@ import { withRouter } from "react-router";
 import { Link } from "react-router-dom";
 import flowRight from "lodash/flowRight";
 import get from "lodash/get";
-import Authorization from "components/authorization/Authorization";
-import ExternalLink from "components/links/ExternalLink";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import ListItem from "components/content/ListItem";
-import ListItems from "components/content/ListItems";
-import { getRouteById, Routes } from "root/routes";
-import { InfillDevelopmentCompensationLeasesFieldPaths, InfillDevelopmentCompensationLeasesFieldTitles } from "infillDevelopment/enums";
-import { LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths, LeaseTenantsFieldPaths } from "leases/enums";
-import { getContactFullName } from "contacts/helpers";
-import { getUiDataInfillDevelopmentKey } from "uiData/helpers";
-import { getSearchQuery, getUrlParams, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes as getInfillDevelopmentAttributes } from "infillDevelopment/selectors";
-import { getAttributes as getLeaseAttributes } from "leases/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import ExternalLink from "@/components/links/ExternalLink";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import ListItem from "@/components/content/ListItem";
+import ListItems from "@/components/content/ListItems";
+import { getRouteById, Routes } from "@/root/routes";
+import { InfillDevelopmentCompensationLeasesFieldPaths, InfillDevelopmentCompensationLeasesFieldTitles } from "@/infillDevelopment/enums";
+import { LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths, LeaseTenantsFieldPaths } from "@/leases/enums";
+import { getContactFullName } from "@/contacts/helpers";
+import { getUiDataInfillDevelopmentKey } from "@/uiData/helpers";
+import { getSearchQuery, getUrlParams, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes as getInfillDevelopmentAttributes } from "@/infillDevelopment/selectors";
+import { getAttributes as getLeaseAttributes } from "@/leases/selectors";
 import type { Attributes } from "types";
-import type { LeaseId } from "leases/types";
+import type { LeaseId } from "@/leases/types";
 type Props = {
   identifier: string | null | undefined;
   infillDevelopmentAttributes: Attributes;
@@ -57,14 +57,17 @@ const LeaseInfo = ({
       <Row>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationLeasesFieldPaths.LEASE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataInfillDevelopmentKey(InfillDevelopmentCompensationLeasesFieldPaths.LEASE)}>
               {InfillDevelopmentCompensationLeasesFieldTitles.LEASE}
             </FormTextTitle>
             <ExternalLink href={`${getRouteById(Routes.LEASES)}/${leaseId}`} text={identifier || '-'} />
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseTenantsFieldPaths.TENANTS)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataInfillDevelopmentKey(LeaseTenantsFieldPaths.TENANTS)}>
               Vuokralainen
             </FormTextTitle>
@@ -75,10 +78,12 @@ const LeaseInfo = ({
                     <ExternalLink className='no-margin' href={`${getRouteById(Routes.CONTACTS)}/${get(tenant, 'tenant.contact.id')}`} text={getContactFullName(get(tenant, 'tenant.contact'))} />
                   </ListItem>)}
               </ListItems>}
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeasePlotsFieldPaths.PLOTS)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataInfillDevelopmentKey(LeasePlotsFieldPaths.PLOTS)}>
               Kiinteistö
             </FormTextTitle>
@@ -87,10 +92,12 @@ const LeaseInfo = ({
             {!!plots.length && <ListItems>
                 {plots.map((plot, index) => <ListItem key={index}>{plot.identifier || '-'}</ListItem>)}
               </ListItems>}
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeasePlanUnitsFieldPaths.PLAN_UNITS)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataInfillDevelopmentKey(LeasePlanUnitsFieldPaths.PLAN_UNITS)}>
               Kaavayksikkö
             </FormTextTitle>
@@ -99,6 +106,7 @@ const LeaseInfo = ({
             {!!planUnits.length && <ListItems>
                 {planUnits.map((planUnit, index) => <ListItem key={index}>{planUnit.identifier || '-'}</ListItem>)}
               </ListItems>}
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
@@ -110,7 +118,7 @@ const LeaseInfo = ({
     </Fragment>;
 };
 
-export default flowRight( // $FlowFixMe
+export default flowRight(
 withRouter, connect(state => {
   return {
     infillDevelopmentAttributes: getInfillDevelopmentAttributes(state),
diff --git a/src/infillDevelopment/components/sections/basicInfo/LeaseItem.tsx b/src/infillDevelopment/components/sections/basicInfo/LeaseItem.tsx
index 04c3963ee..7605c79d0 100644
--- a/src/infillDevelopment/components/sections/basicInfo/LeaseItem.tsx
+++ b/src/infillDevelopment/components/sections/basicInfo/LeaseItem.tsx
@@ -4,33 +4,33 @@ import { Row, Column } from "react-foundation";
 import isEmpty from "lodash/isEmpty";
 import flowRight from "lodash/flowRight";
 import get from "lodash/get";
-import Authorization from "components/authorization/Authorization";
-import Collapse from "components/collapse/Collapse";
-import ExternalLink from "components/links/ExternalLink";
-import FileDownloadLink from "components/file/FileDownloadLink";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
+import Authorization from "@/components/authorization/Authorization";
+import Collapse from "@/components/collapse/Collapse";
+import ExternalLink from "@/components/links/ExternalLink";
+import FileDownloadLink from "@/components/file/FileDownloadLink";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
 import LeaseInfo from "./LeaseInfo";
-import ListItem from "components/content/ListItem";
-import ListItems from "components/content/ListItems";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import SubTitle from "components/content/SubTitle";
-import { receiveCollapseStates } from "infillDevelopment/actions";
-import { fetchLeaseById } from "leases/actions";
-import { FormNames, Methods, ViewModes } from "enums";
-import { InfillDevelopmentCompensationLeasesFieldPaths, InfillDevelopmentCompensationLeasesFieldTitles, InfillDevelopmentCompensationLeaseDecisionsFieldPaths, InfillDevelopmentCompensationLeaseDecisionsFieldTitles, InfillDevelopmentCompensationLeaseIntendedUsesFieldPaths, InfillDevelopmentCompensationLeaseIntendedUsesFieldTitles } from "infillDevelopment/enums";
-import { InfillDevelopmentCompensationAttachmentFieldPaths, InfillDevelopmentCompensationAttachmentFieldTitles } from "infillDevelopmentAttachment/enums";
-import { LeaseFieldPaths } from "leases/enums";
-import { getContentLeaseAreas, getContentLeaseIdentifier, getContentTenants } from "leases/helpers";
-import { getUiDataInfillDevelopmentKey, getUiDataInfillDevelopmentAttachmentKey } from "uiData/helpers";
-import { getUserFullName } from "users/helpers";
-import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, getReferenceNumberLink, isActive, isEmptyValue, isFieldAllowedToRead, isMethodAllowed } from "util/helpers";
-import { getAttributes as getInfillDevelopmentAttributes, getCollapseStateByKey } from "infillDevelopment/selectors";
-import { getAttributes as getInfillDevelopmentAttachmentAttributes, getMethods as getInfillDevelopmentAttachmentMethods } from "infillDevelopmentAttachment/selectors";
-import { getAttributes as getLeaseAttributes, getIsFetchingById, getLeaseById } from "leases/selectors";
+import ListItem from "@/components/content/ListItem";
+import ListItems from "@/components/content/ListItems";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import SubTitle from "@/components/content/SubTitle";
+import { receiveCollapseStates } from "@/infillDevelopment/actions";
+import { fetchLeaseById } from "@/leases/actions";
+import { FormNames, Methods, ViewModes } from "@/enums";
+import { InfillDevelopmentCompensationLeasesFieldPaths, InfillDevelopmentCompensationLeasesFieldTitles, InfillDevelopmentCompensationLeaseDecisionsFieldPaths, InfillDevelopmentCompensationLeaseDecisionsFieldTitles, InfillDevelopmentCompensationLeaseIntendedUsesFieldPaths, InfillDevelopmentCompensationLeaseIntendedUsesFieldTitles } from "@/infillDevelopment/enums";
+import { InfillDevelopmentCompensationAttachmentFieldPaths, InfillDevelopmentCompensationAttachmentFieldTitles } from "@/infillDevelopmentAttachment/enums";
+import { LeaseFieldPaths } from "@/leases/enums";
+import { getContentLeaseAreas, getContentLeaseIdentifier, getContentTenants } from "@/leases/helpers";
+import { getUiDataInfillDevelopmentKey, getUiDataInfillDevelopmentAttachmentKey } from "@/uiData/helpers";
+import { getUserFullName } from "@/users/helpers";
+import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, getReferenceNumberLink, isActive, isEmptyValue, isFieldAllowedToRead, isMethodAllowed } from "@/util/helpers";
+import { getAttributes as getInfillDevelopmentAttributes, getCollapseStateByKey } from "@/infillDevelopment/selectors";
+import { getAttributes as getInfillDevelopmentAttachmentAttributes, getMethods as getInfillDevelopmentAttachmentMethods } from "@/infillDevelopmentAttachment/selectors";
+import { getAttributes as getLeaseAttributes, getIsFetchingById, getLeaseById } from "@/leases/selectors";
 import type { Attributes, Methods as MethodsType } from "types";
-import type { Lease, LeaseId } from "leases/types";
+import type { Lease, LeaseId } from "@/leases/types";
 type Props = {
   collapseState: boolean;
   fetchLeaseById: (...args: Array<any>) => any;
@@ -157,6 +157,7 @@ class LeaseItem extends PureComponent<Props, State> {
         {isFetching ? <LoaderWrapper><Loader isLoading={isFetching} /></LoaderWrapper> : <LeaseInfo identifier={identifier} leaseId={leaseId} planUnits={planUnits} plots={plots} tenants={tenants} />}
 
         <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationLeaseDecisionsFieldPaths.DECISIONS)}>
+          <>
           <SubTitle uiDataKey={getUiDataInfillDevelopmentKey(InfillDevelopmentCompensationLeaseDecisionsFieldPaths.DECISIONS)}>
             {InfillDevelopmentCompensationLeaseDecisionsFieldTitles.DECISIONS}
           </SubTitle>
@@ -218,9 +219,11 @@ class LeaseItem extends PureComponent<Props, State> {
                   </Column>
                 </Row>)}
             </ListItems>}
+          </>
         </Authorization>
 
         <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationLeaseIntendedUsesFieldPaths.INTENDED_USES)}>
+          <>
           <SubTitle uiDataKey={getUiDataInfillDevelopmentKey(InfillDevelopmentCompensationLeaseIntendedUsesFieldPaths.INTENDED_USES)}>
             {InfillDevelopmentCompensationLeaseIntendedUsesFieldTitles.INTENDED_USES}
           </SubTitle>
@@ -268,84 +271,104 @@ class LeaseItem extends PureComponent<Props, State> {
                   </Column>
                 </Row>)}
             </ListItems>}
+          </>
         </Authorization>
 
         <Row>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationLeasesFieldPaths.MONETARY_COMPENSATION_AMOUNT)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataInfillDevelopmentKey(InfillDevelopmentCompensationLeasesFieldPaths.MONETARY_COMPENSATION_AMOUNT)}>
                 {InfillDevelopmentCompensationLeasesFieldTitles.MONETARY_COMPENSATION_AMOUNT}
               </FormTextTitle>
               <FormText>{!isEmptyValue(leaseData.monetary_compensation_amount) ? `${formatNumber(leaseData.monetary_compensation_amount)} €` : '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationLeasesFieldPaths.COMPENSATION_INVESTMENT_AMOUNT)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataInfillDevelopmentKey(InfillDevelopmentCompensationLeasesFieldPaths.COMPENSATION_INVESTMENT_AMOUNT)}>
                 {InfillDevelopmentCompensationLeasesFieldTitles.COMPENSATION_INVESTMENT_AMOUNT}
               </FormTextTitle>
               <FormText>{!isEmptyValue(leaseData.compensation_investment_amount) ? `${formatNumber(leaseData.compensation_investment_amount)} €` : '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationLeasesFieldPaths.MONETARY_COMPENSATION_AMOUNT) || isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationLeasesFieldPaths.COMPENSATION_INVESTMENT_AMOUNT)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataInfillDevelopmentKey(InfillDevelopmentCompensationLeasesFieldPaths.TOTAL_COMPENSATION)}>
                 {InfillDevelopmentCompensationLeasesFieldTitles.TOTAL_COMPENSATION}
               </FormTextTitle>
               <FormText>{`${formatNumber(totalCompensation)} €`}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationLeasesFieldPaths.INCREASE_IN_VALUE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataInfillDevelopmentKey(InfillDevelopmentCompensationLeasesFieldPaths.INCREASE_IN_VALUE)}>
                 {InfillDevelopmentCompensationLeasesFieldTitles.INCREASE_IN_VALUE}
               </FormTextTitle>
               <FormText>{!isEmptyValue(leaseData.increase_in_value) ? `${formatNumber(leaseData.increase_in_value)} €` : '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationLeasesFieldPaths.PART_OF_THE_INCREASE_IN_VALUE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataInfillDevelopmentKey(InfillDevelopmentCompensationLeasesFieldPaths.PART_OF_THE_INCREASE_IN_VALUE)}>
                 {InfillDevelopmentCompensationLeasesFieldTitles.PART_OF_THE_INCREASE_IN_VALUE}
               </FormTextTitle>
               <FormText>{!isEmptyValue(leaseData.part_of_the_increase_in_value) ? `${formatNumber(leaseData.part_of_the_increase_in_value)} €` : '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationLeasesFieldPaths.DISCOUNT_IN_RENT)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataInfillDevelopmentKey(InfillDevelopmentCompensationLeasesFieldPaths.DISCOUNT_IN_RENT)}>
                 {InfillDevelopmentCompensationLeasesFieldTitles.DISCOUNT_IN_RENT}
               </FormTextTitle>
               <FormText>{!isEmptyValue(leaseData.discount_in_rent) ? `${formatNumber(leaseData.discount_in_rent)} €` : '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationLeasesFieldPaths.YEAR)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataInfillDevelopmentKey(InfillDevelopmentCompensationLeasesFieldPaths.YEAR)}>
                 {InfillDevelopmentCompensationLeasesFieldTitles.YEAR}
               </FormTextTitle>
               <FormText>{leaseData.year || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationLeasesFieldPaths.SENT_TO_SAP_DATE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataInfillDevelopmentKey(InfillDevelopmentCompensationLeasesFieldPaths.SENT_TO_SAP_DATE)}>
                 {InfillDevelopmentCompensationLeasesFieldTitles.SENT_TO_SAP_DATE}
               </FormTextTitle>
               <FormText>{formatDate(leaseData.sent_to_sap_date) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationLeasesFieldPaths.PAID_DATE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataInfillDevelopmentKey(InfillDevelopmentCompensationLeasesFieldPaths.PAID_DATE)}>
                 {InfillDevelopmentCompensationLeasesFieldTitles.PAID_DATE}
               </FormTextTitle>
               <FormText>{formatDate(leaseData.paid_date) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
         </Row>
 
         <Authorization allow={isMethodAllowed(infillDevelopmentAttachmentMethods, Methods.GET)}>
+          <>
           <SubTitle uiDataKey={getUiDataInfillDevelopmentAttachmentKey(InfillDevelopmentCompensationAttachmentFieldPaths.ATTACHMENTS)}>
             {InfillDevelopmentCompensationAttachmentFieldTitles.ATTACHMENTS}
           </SubTitle>
@@ -392,6 +415,7 @@ class LeaseItem extends PureComponent<Props, State> {
                   </Row>;
           })}
             </Fragment>}
+          </>
         </Authorization>
 
         <Authorization allow={isFieldAllowedToRead(infillDevelopmentAttributes, InfillDevelopmentCompensationLeasesFieldPaths.NOTE)}>
@@ -409,7 +433,7 @@ class LeaseItem extends PureComponent<Props, State> {
 
 }
 
-export default flowRight(connect((state, props) => {
+export default flowRight(connect((state, props: Props) => {
   const id = props.id;
   return {
     collapseState: getCollapseStateByKey(state, `${ViewModes.READONLY}.${FormNames.INFILL_DEVELOPMENT}.${id}`),
diff --git a/src/infillDevelopment/components/sections/map/InfillDevelopmentLeaseLayer.tsx b/src/infillDevelopment/components/sections/map/InfillDevelopmentLeaseLayer.tsx
index 9d5e137ac..8178ccbf6 100644
--- a/src/infillDevelopment/components/sections/map/InfillDevelopmentLeaseLayer.tsx
+++ b/src/infillDevelopment/components/sections/map/InfillDevelopmentLeaseLayer.tsx
@@ -1,8 +1,8 @@
 import React, { PureComponent } from "react";
 import { GeoJSON } from "react-leaflet";
-import { MAP_COLORS } from "util/constants";
-import { LeaseAreasFieldTitles, LeasePlanUnitsFieldTitles, LeasePlotsFieldTitles } from "leases/enums";
-import { formatDate, formatNumber, getLabelOfOption, isEmptyValue } from "util/helpers";
+import { MAP_COLORS } from "@/util/constants";
+import { LeaseAreasFieldTitles, LeasePlanUnitsFieldTitles, LeasePlotsFieldTitles } from "@/leases/enums";
+import { formatDate, formatNumber, getLabelOfOption, isEmptyValue } from "@/util/helpers";
 type Props = {
   areaLocationOptions: Array<Record<string, any>>;
   areaTypeOptions: Array<Record<string, any>>;
diff --git a/src/infillDevelopment/components/sections/map/SingleInfillDevelopmentMap.tsx b/src/infillDevelopment/components/sections/map/SingleInfillDevelopmentMap.tsx
index dc769f2e8..8d28ba312 100644
--- a/src/infillDevelopment/components/sections/map/SingleInfillDevelopmentMap.tsx
+++ b/src/infillDevelopment/components/sections/map/SingleInfillDevelopmentMap.tsx
@@ -4,29 +4,29 @@ import { withRouter } from "react-router";
 import flowRight from "lodash/flowRight";
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
-import AreaNotesEditMap from "areaNote/components/AreaNotesEditMap";
-import AreaNotesLayer from "areaNote/components/AreaNotesLayer";
+import AreaNotesEditMap from "@/areaNote/components/AreaNotesEditMap";
+import AreaNotesLayer from "@/areaNote/components/AreaNotesLayer";
 import InfillDevelopmentLeaseLayer from "./InfillDevelopmentLeaseLayer";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import { fetchAreaNoteList } from "areaNote/actions";
-import { fetchLeaseById } from "leases/actions";
-import { MAP_COLORS } from "util/constants";
-import { LeaseAreasFieldPaths, LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getContentLeaseIdentifier, getLeaseCoordinates } from "leases/helpers";
-import { getContentInfillDevelopmentLeaseGeoJson } from "infillDevelopment/helpers";
-import { getFieldOptions, getUrlParams, hasPermissions } from "util/helpers";
-import { getBoundsFromCoordinates, getCenterFromCoordinates } from "util/map";
-import { getAreaNoteList } from "areaNote/selectors";
-import { getCurrentInfillDevelopment } from "infillDevelopment/selectors";
-import { getAllLeases, getAttributes as getLeaseAttributes, getIsFetchingAllLeases } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import { fetchAreaNoteList } from "@/areaNote/actions";
+import { fetchLeaseById } from "@/leases/actions";
+import { MAP_COLORS } from "@/util/constants";
+import { LeaseAreasFieldPaths, LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getContentLeaseIdentifier, getLeaseCoordinates } from "@/leases/helpers";
+import { getContentInfillDevelopmentLeaseGeoJson } from "@/infillDevelopment/helpers";
+import { getFieldOptions, getUrlParams, hasPermissions } from "@/util/helpers";
+import { getBoundsFromCoordinates, getCenterFromCoordinates } from "@/util/map";
+import { getAreaNoteList } from "@/areaNote/selectors";
+import { getCurrentInfillDevelopment } from "@/infillDevelopment/selectors";
+import { getAllLeases, getAttributes as getLeaseAttributes, getIsFetchingAllLeases } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { AreaNoteList } from "areaNote/types";
-import type { InfillDevelopment } from "infillDevelopment/types";
-import type { Lease } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { AreaNoteList } from "@/areaNote/types";
+import type { InfillDevelopment } from "@/infillDevelopment/types";
+import type { Lease } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   allLeases: Array<Lease>;
   areaNotes: AreaNoteList;
diff --git a/src/infillDevelopment/constants.ts b/src/infillDevelopment/constants.ts
index 4bafbd24d..6ade639a3 100644
--- a/src/infillDevelopment/constants.ts
+++ b/src/infillDevelopment/constants.ts
@@ -1,4 +1,4 @@
-import { TableSortOrder } from "enums";
+import { TableSortOrder } from "@/enums";
 
 /**
  * Default sort key of infill development compensation list page
diff --git a/src/infillDevelopment/helpers.ts b/src/infillDevelopment/helpers.ts
index 7f894d17b..35d195c6a 100644
--- a/src/infillDevelopment/helpers.ts
+++ b/src/infillDevelopment/helpers.ts
@@ -1,14 +1,14 @@
 import get from "lodash/get";
 import { isDirty } from "redux-form";
-import { FormNames, TableSortOrder } from "enums";
-import { getContentLeaseIdentifier, getContentLeaseOption } from "leases/helpers";
-import { getContentUser } from "users/helpers";
-import { convertStrToDecimalNumber, getApiResponseResults } from "util/helpers";
-import { getIsEditMode } from "infillDevelopment/selectors";
-import { removeSessionStorageItem } from "util/storage";
-import { getContentLeaseAreasFeatures, getContentPlanUnitFeatures, getContentLeasePlotsFeatures } from "leases/helpers";
+import { FormNames, TableSortOrder } from "@/enums";
+import { getContentLeaseIdentifier, getContentLeaseOption } from "@/leases/helpers";
+import { getContentUser } from "@/users/helpers";
+import { convertStrToDecimalNumber, getApiResponseResults } from "@/util/helpers";
+import { getIsEditMode } from "@/infillDevelopment/selectors";
+import { removeSessionStorageItem } from "@/util/storage";
+import { getContentLeaseAreasFeatures, getContentPlanUnitFeatures, getContentLeasePlotsFeatures } from "@/leases/helpers";
 import type { LeafletGeoJson } from "types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 
 /**
  * Get infill development compensation list results
diff --git a/src/infillDevelopment/spec.ts b/src/infillDevelopment/infillDevelopment.spec.ts
similarity index 99%
rename from src/infillDevelopment/spec.ts
rename to src/infillDevelopment/infillDevelopment.spec.ts
index 8fe454826..803fe60a9 100644
--- a/src/infillDevelopment/spec.ts
+++ b/src/infillDevelopment/infillDevelopment.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchInfillDevelopments, fetchSingleInfillDevelopment, hideEditMode, notFound, fetchAttributes, attributesNotFound, receiveAttributes, receiveMethods, receiveInfillDevelopments, receiveSingleInfillDevelopment, receiveFormInitialValues, createInfillDevelopment, editInfillDevelopment, showEditMode, receiveFormValidFlags, clearFormValidFlags, receiveIsSaveClicked, receiveCollapseStates } from "./actions";
 import infillDevelopmentReducer from "./reducer";
 import type { InfillDevelopmentState } from "./types";
diff --git a/src/infillDevelopment/reducer.ts b/src/infillDevelopment/reducer.ts
index 95a73f7ca..ba177f640 100644
--- a/src/infillDevelopment/reducer.ts
+++ b/src/infillDevelopment/reducer.ts
@@ -1,8 +1,8 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
 import merge from "lodash/merge";
-import { FormNames } from "enums";
-import type { Attributes, Methods, Reducer } from "../types";
+import { FormNames } from "@/enums";
+import type { Attributes, Methods, Reducer } from "@/types";
 import type { InfillDevelopment, InfillDevelopmentList, ReceiveAttributesAction, ReceiveMethodsAction, ReceiveFormInitialValuesAction, ReceiveFormValidFlagsAction, ReceiveInfillDevelopmentListAction, ReceiveIsSaveClickedAction, ReceiveSingleInfillDevelopmentAction, ReceiveCollapseStatesAction } from "./types";
 const isEditModeReducer: Reducer<boolean> = handleActions({
   'mvj/infillDevelopment/HIDE_EDIT': () => false,
diff --git a/src/infillDevelopment/requests.ts b/src/infillDevelopment/requests.ts
index 36b727fa0..f968fef62 100644
--- a/src/infillDevelopment/requests.ts
+++ b/src/infillDevelopment/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 import type { InfillDevelopment, InfillDevelopmentId } from "./types";
 export const fetchAttributes = (): Generator<any, any, any> => {
   return callApi(new Request(createUrl(`infill_development_compensation/`), {
diff --git a/src/infillDevelopment/saga.ts b/src/infillDevelopment/saga.ts
index 7948b7b8d..7936147b8 100644
--- a/src/infillDevelopment/saga.ts
+++ b/src/infillDevelopment/saga.ts
@@ -2,10 +2,10 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { push } from "react-router-redux";
 import { SubmissionError } from "redux-form";
 import { fetchSingleInfillDevelopment as fetchSingleInfillDevelopmentAction, hideEditMode, attributesNotFound, notFound, receiveIsSaveClicked, receiveAttributes, receiveMethods, receiveInfillDevelopments, receiveSingleInfillDevelopment } from "./actions";
-import { receiveError } from "api/actions";
-import { displayUIMessage } from "util/helpers";
+import { receiveError } from "@/api/actions";
+import { displayUIMessage } from "@/util/helpers";
 import { createInfillDevelopment, editInfillDevelopment, fetchAttributes, fetchInfillDevelopments, fetchSingleInfillDevelopment } from "./requests";
-import { getRouteById, Routes } from "root/routes";
+import { getRouteById, Routes } from "@/root/routes";
 
 function* fetchAttributesSaga(): Generator<any, any, any> {
   try {
diff --git a/src/infillDevelopment/selectors.ts b/src/infillDevelopment/selectors.ts
index 7592ccee5..475452437 100644
--- a/src/infillDevelopment/selectors.ts
+++ b/src/infillDevelopment/selectors.ts
@@ -1,6 +1,6 @@
 import get from "lodash/get";
 import type { Attributes, Methods, Selector } from "types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 import type { InfillDevelopment, InfillDevelopmentList } from "./types";
 export const getAttributes: Selector<Attributes, void> = (state: RootState): Attributes => state.infillDevelopment.attributes;
 export const getMethods: Selector<Methods, void> = (state: RootState): Methods => state.infillDevelopment.methods;
diff --git a/src/infillDevelopment/types.ts b/src/infillDevelopment/types.ts
index 36b1049bc..51c93681d 100644
--- a/src/infillDevelopment/types.ts
+++ b/src/infillDevelopment/types.ts
@@ -1,4 +1,4 @@
-import type { Action, Attributes, Methods } from "../types";
+import type { Action, Attributes, Methods } from "@/types";
 export type InfillDevelopmentState = {
   attributes: Attributes;
   collapseStates: Record<string, any>;
diff --git a/src/infillDevelopmentAttachment/spec.ts b/src/infillDevelopmentAttachment/infillDevelopmentAttachment.spec.ts
similarity index 98%
rename from src/infillDevelopmentAttachment/spec.ts
rename to src/infillDevelopmentAttachment/infillDevelopmentAttachment.spec.ts
index d6ac46bc3..74110550b 100644
--- a/src/infillDevelopmentAttachment/spec.ts
+++ b/src/infillDevelopmentAttachment/infillDevelopmentAttachment.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchAttributes, attributesNotFound, receiveAttributes, receiveMethods, createInfillDevelopmentAttachment, deleteInfillDevelopmentAttachment } from "./actions";
 import infillDevelopmentAttachmentReducer from "./reducer";
 import type { InfillDevelopmentAttachmentState } from "./types";
diff --git a/src/infillDevelopmentAttachment/reducer.ts b/src/infillDevelopmentAttachment/reducer.ts
index c4a3570fe..2a1683736 100644
--- a/src/infillDevelopmentAttachment/reducer.ts
+++ b/src/infillDevelopmentAttachment/reducer.ts
@@ -1,6 +1,6 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
-import type { Attributes, Methods, Reducer } from "../types";
+import type { Attributes, Methods, Reducer } from "@/types";
 import type { ReceiveAttributesAction, ReceiveMethodsAction } from "./types";
 const isFetchingAttributesReducer: Reducer<boolean> = handleActions({
   'mvj/infillDevelopmentAttachment/FETCH_ATTRIBUTES': () => true,
diff --git a/src/infillDevelopmentAttachment/requests.ts b/src/infillDevelopmentAttachment/requests.ts
index 33061c4d8..1c2f2cc3c 100644
--- a/src/infillDevelopmentAttachment/requests.ts
+++ b/src/infillDevelopmentAttachment/requests.ts
@@ -1,6 +1,6 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
-import callUploadRequest from "api/callUploadRequest";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
+import callUploadRequest from "@/api/callUploadRequest";
 import type { CreateInfillDevelopmentAttachmentPayload } from "./types";
 export const fetchAttributes = (): Generator<any, any, any> => {
   return callApi(new Request(createUrl(`infill_development_compensation_attachment/`), {
diff --git a/src/infillDevelopmentAttachment/saga.ts b/src/infillDevelopmentAttachment/saga.ts
index 5de29ffc1..9724dea37 100644
--- a/src/infillDevelopmentAttachment/saga.ts
+++ b/src/infillDevelopmentAttachment/saga.ts
@@ -1,9 +1,9 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { SubmissionError } from "redux-form";
 import { attributesNotFound, receiveAttributes, receiveMethods } from "./actions";
-import { fetchSingleInfillDevelopment } from "infillDevelopment/actions";
-import { receiveError } from "api/actions";
-import { displayUIMessage } from "util/helpers";
+import { fetchSingleInfillDevelopment } from "@/infillDevelopment/actions";
+import { receiveError } from "@/api/actions";
+import { displayUIMessage } from "@/util/helpers";
 import { fetchAttributes, createInfillDevelopmentAttachment, deleteInfillDevelopmentAttachment } from "./requests";
 
 function* fetchAttributesSaga(): Generator<any, any, any> {
diff --git a/src/infillDevelopmentAttachment/selectors.ts b/src/infillDevelopmentAttachment/selectors.ts
index d0ea22164..5eafbd1b3 100644
--- a/src/infillDevelopmentAttachment/selectors.ts
+++ b/src/infillDevelopmentAttachment/selectors.ts
@@ -1,5 +1,5 @@
 import type { Attributes, Methods, Selector } from "types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 export const getAttributes: Selector<Attributes, void> = (state: RootState): Attributes => state.infillDevelopmentAttachment.attributes;
 export const getMethods: Selector<Methods, void> = (state: RootState): Methods => state.infillDevelopmentAttachment.methods;
 export const getIsFetchingAttributes: Selector<boolean, void> = (state: RootState): boolean => state.infillDevelopmentAttachment.isFetchingAttributes;
\ No newline at end of file
diff --git a/src/infillDevelopmentAttachment/types.ts b/src/infillDevelopmentAttachment/types.ts
index c44b1f69d..b61d632cc 100644
--- a/src/infillDevelopmentAttachment/types.ts
+++ b/src/infillDevelopmentAttachment/types.ts
@@ -1,5 +1,5 @@
-import type { Action, Attributes, Methods } from "../types";
-import type { InfillDevelopmentId } from "infillDevelopment/types";
+import type { Action, Attributes, Methods } from "@/types";
+import type { InfillDevelopmentId } from "@/infillDevelopment/types";
 export type InfillDevelopmentAttachmentState = {
   attributes: Attributes;
   isFetchingAttributes: boolean;
diff --git a/src/invoiceNote/components/CreateInvoiceNoteModal.tsx b/src/invoiceNote/components/CreateInvoiceNoteModal.tsx
index 518a00325..9f8b0b882 100644
--- a/src/invoiceNote/components/CreateInvoiceNoteModal.tsx
+++ b/src/invoiceNote/components/CreateInvoiceNoteModal.tsx
@@ -3,18 +3,18 @@ import { reduxForm } from "redux-form";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import Button from "components/button/Button";
-import FormField from "components/form/FormField";
-import Modal from "components/modal/Modal";
-import ModalButtonWrapper from "components/modal/ModalButtonWrapper";
-import { FieldTypes, FormNames } from "enums";
-import { InvoiceNoteFieldPaths, InvoiceNoteFieldTitles } from "invoiceNote/enums";
-import { ButtonColors } from "components/enums";
-import { getFieldAttributes } from "util/helpers";
-import { getAttributes } from "invoiceNote/selectors";
-import { getUserActiveServiceUnit } from "usersPermissions/selectors";
+import Button from "@/components/button/Button";
+import FormField from "@/components/form/FormField";
+import Modal from "@/components/modal/Modal";
+import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper";
+import { FieldTypes, FormNames } from "@/enums";
+import { InvoiceNoteFieldPaths, InvoiceNoteFieldTitles } from "@/invoiceNote/enums";
+import { ButtonColors } from "@/components/enums";
+import { getFieldAttributes } from "@/util/helpers";
+import { getAttributes } from "@/invoiceNote/selectors";
+import { getUserActiveServiceUnit } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { UserServiceUnit } from "usersPermissions/types";
+import type { UserServiceUnit } from "@/usersPermissions/types";
 type Props = {
   handleSubmit: (...args: Array<any>) => any;
   initialize: (...args: Array<any>) => any;
diff --git a/src/invoiceNote/components/InvoiceNoteListPage.tsx b/src/invoiceNote/components/InvoiceNoteListPage.tsx
index d6efc99b3..70d4d66d8 100644
--- a/src/invoiceNote/components/InvoiceNoteListPage.tsx
+++ b/src/invoiceNote/components/InvoiceNoteListPage.tsx
@@ -5,34 +5,34 @@ import { withRouter } from "react-router";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import Authorization from "components/authorization/Authorization";
-import AuthorizationError from "components/authorization/AuthorizationError";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import Authorization from "@/components/authorization/Authorization";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
 import CreateInvoiceNoteModal from "./CreateInvoiceNoteModal";
-import ExternalLink from "components/links/ExternalLink";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import PageContainer from "components/content/PageContainer";
-import Pagination from "components/table/Pagination";
+import ExternalLink from "@/components/links/ExternalLink";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import PageContainer from "@/components/content/PageContainer";
+import Pagination from "@/components/table/Pagination";
 import Search from "./Search";
-import ShowMore from "components/showMore/ShowMore";
-import SortableTable from "components/table/SortableTable";
-import TableFilters from "components/table/TableFilters";
-import TableWrapper from "components/table/TableWrapper";
-import { createInvoiceNoteAndFetchList, fetchInvoiceNoteList, hideCreateInvoiceNoteModal, receiveInvoiceNoteList, showCreateInvoiceNoteModal } from "invoiceNote/actions";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { LIST_TABLE_PAGE_SIZE } from "util/constants";
-import { FormNames, Methods, PermissionMissingTexts } from "enums";
-import { InvoiceNoteFieldPaths, InvoiceNoteFieldTitles } from "invoiceNote/enums";
-import { getContentLeaseIdentifier } from "leases/helpers";
-import { formatDate, getApiResponseCount, getApiResponseResults, getApiResponseMaxPage, getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getInvoiceNoteList, getIsCreateModalOpen, getIsFetching } from "invoiceNote/selectors";
-import { withInvoiceNoteAttributes } from "components/attributes/InvoiceNoteAttributes";
-import { getUserActiveServiceUnit } from "usersPermissions/selectors";
+import ShowMore from "@/components/showMore/ShowMore";
+import SortableTable from "@/components/table/SortableTable";
+import TableFilters from "@/components/table/TableFilters";
+import TableWrapper from "@/components/table/TableWrapper";
+import { createInvoiceNoteAndFetchList, fetchInvoiceNoteList, hideCreateInvoiceNoteModal, receiveInvoiceNoteList, showCreateInvoiceNoteModal } from "@/invoiceNote/actions";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { LIST_TABLE_PAGE_SIZE } from "@/util/constants";
+import { FormNames, Methods, PermissionMissingTexts } from "@/enums";
+import { InvoiceNoteFieldPaths, InvoiceNoteFieldTitles } from "@/invoiceNote/enums";
+import { getContentLeaseIdentifier } from "@/leases/helpers";
+import { formatDate, getApiResponseCount, getApiResponseResults, getApiResponseMaxPage, getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getInvoiceNoteList, getIsCreateModalOpen, getIsFetching } from "@/invoiceNote/selectors";
+import { withInvoiceNoteAttributes } from "@/components/attributes/InvoiceNoteAttributes";
+import { getUserActiveServiceUnit } from "@/usersPermissions/selectors";
 import type { Attributes, Methods as MethodsType } from "types";
-import type { InvoiceNoteList } from "invoiceNote/types";
-import type { UserServiceUnit } from "usersPermissions/types";
+import type { InvoiceNoteList } from "@/invoiceNote/types";
+import type { UserServiceUnit } from "@/usersPermissions/types";
 
 const getColumns = (invoiceNoteAttributes: Attributes) => {
   const columns = [];
diff --git a/src/invoiceNote/components/Search.tsx b/src/invoiceNote/components/Search.tsx
index f049b3976..fbe7950e3 100644
--- a/src/invoiceNote/components/Search.tsx
+++ b/src/invoiceNote/components/Search.tsx
@@ -5,12 +5,12 @@ import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
 import isEqual from "lodash/isEqual";
 import isEmpty from "lodash/isEmpty";
-import FormField from "components/form/FormField";
-import SearchContainer from "components/search/SearchContainer";
-import { FieldTypes, FormNames } from "enums";
-import { fetchServiceUnits } from "serviceUnits/actions";
-import { getServiceUnits, getIsFetching as getIsFetchingServiceUnits } from "serviceUnits/selectors";
-import type { ServiceUnits } from "serviceUnits/types";
+import FormField from "@/components/form/FormField";
+import SearchContainer from "@/components/search/SearchContainer";
+import { FieldTypes, FormNames } from "@/enums";
+import { fetchServiceUnits } from "@/serviceUnits/actions";
+import { getServiceUnits, getIsFetching as getIsFetchingServiceUnits } from "@/serviceUnits/selectors";
+import type { ServiceUnits } from "@/serviceUnits/types";
 type Props = {
   formValues: Record<string, any>;
   fetchServiceUnits: (...args: Array<any>) => any;
diff --git a/src/invoiceNote/spec.ts b/src/invoiceNote/invoiceNote.spec.ts
similarity index 98%
rename from src/invoiceNote/spec.ts
rename to src/invoiceNote/invoiceNote.spec.ts
index c7bab2ad2..55a6f7ea3 100644
--- a/src/invoiceNote/spec.ts
+++ b/src/invoiceNote/invoiceNote.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchAttributes, attributesNotFound, receiveAttributes, receiveMethods, fetchInvoiceNoteList, receiveInvoiceNoteList, createInvoiceNoteAndFetchList, notFound, hideCreateInvoiceNoteModal, showCreateInvoiceNoteModal } from "./actions";
 import invoiceNoteReducer from "./reducer";
 import type { InvoiceNoteState } from "./types";
diff --git a/src/invoiceNote/requests.ts b/src/invoiceNote/requests.ts
index 5965cb497..f1ba6cbb6 100644
--- a/src/invoiceNote/requests.ts
+++ b/src/invoiceNote/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "api/callApi";
-import createUrl from "api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 export const fetchAttributes = (): Generator<any, any, any> => {
   return callApi(new Request(createUrl('invoice_note/'), {
     method: 'OPTIONS'
diff --git a/src/invoiceNote/saga.ts b/src/invoiceNote/saga.ts
index c2fdf1735..e43758e82 100644
--- a/src/invoiceNote/saga.ts
+++ b/src/invoiceNote/saga.ts
@@ -1,8 +1,8 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { SubmissionError } from "redux-form";
-import { receiveError } from "api/actions";
+import { receiveError } from "@/api/actions";
 import { attributesNotFound, fetchInvoiceNoteList, hideCreateInvoiceNoteModal, notFound, receiveAttributes, receiveInvoiceNoteList, receiveMethods } from "./actions";
-import { displayUIMessage } from "util/helpers";
+import { displayUIMessage } from "@/util/helpers";
 import { createInvoiceNote, fetchAttributes, fetchInvoiceNotes } from "./requests";
 
 function* fetchAttributesSaga(): Generator<any, any, any> {
diff --git a/src/invoiceNote/selectors.ts b/src/invoiceNote/selectors.ts
index 8d9cce6be..8ad5be3b3 100644
--- a/src/invoiceNote/selectors.ts
+++ b/src/invoiceNote/selectors.ts
@@ -1,6 +1,6 @@
-import type { Attributes, Methods, Selector } from "../types";
-import type { RootState } from "root/types";
-import type { InvoiceNoteList } from "invoiceNote/types";
+import type { Attributes, Methods, Selector } from "@/types";
+import type { RootState } from "@/root/types";
+import type { InvoiceNoteList } from "@/invoiceNote/types";
 export const getIsFetchingAttributes: Selector<boolean, void> = (state: RootState): boolean => state.invoiceNote.isFetchingAttributes;
 export const getAttributes: Selector<Attributes, void> = (state: RootState): Attributes => state.invoiceNote.attributes;
 export const getMethods: Selector<Methods, void> = (state: RootState): Methods => state.invoiceNote.methods;
diff --git a/src/invoiceSets/actions.ts b/src/invoiceSets/actions.ts
index 8c3d0420e..8e7263580 100644
--- a/src/invoiceSets/actions.ts
+++ b/src/invoiceSets/actions.ts
@@ -1,5 +1,5 @@
 import { createAction } from "redux-actions";
-import type { LeaseId } from "leases/types";
+import type { LeaseId } from "@/leases/types";
 import type { FetchInvoiceSetsByLeaseAction, ReceiveInvoiceSetsByLeaseAction, CreditInvoiceSetAction, InvoiceSetsNotFoundAction } from "./types";
 export const fetchInvoiceSetsByLease = (leaseId: LeaseId): FetchInvoiceSetsByLeaseAction => createAction('mvj/invoiceSets/FETCH_BY_LEASE')(leaseId);
 export const receiveInvoiceSetsByLease = (payload: Record<string, any>): ReceiveInvoiceSetsByLeaseAction => createAction('mvj/invoiceSets/RECEIVE_BY_LEASE')(payload);
diff --git a/src/invoiceSets/helpers.ts b/src/invoiceSets/helpers.ts
index 61f32a08f..b9df79074 100644
--- a/src/invoiceSets/helpers.ts
+++ b/src/invoiceSets/helpers.ts
@@ -1,5 +1,5 @@
-import { CreditInvoiceOptions } from "leases/enums";
-import { convertStrToDecimalNumber } from "util/helpers";
+import { CreditInvoiceOptions } from "@/leases/enums";
+import { convertStrToDecimalNumber } from "@/util/helpers";
 
 /**
  * Get credit invoice set payload for API
diff --git a/src/invoiceSets/spec.ts b/src/invoiceSets/invoiceSets.spec.ts
similarity index 97%
rename from src/invoiceSets/spec.ts
rename to src/invoiceSets/invoiceSets.spec.ts
index 513e60fd4..0256b9f16 100644
--- a/src/invoiceSets/spec.ts
+++ b/src/invoiceSets/invoiceSets.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { receiveInvoiceSetsByLease, fetchInvoiceSetsByLease, notFound, creditInvoiceSet } from "./actions";
 import invoiceSetsReducer from "./reducer";
 import type { InvoiceSetState } from "./types";
diff --git a/src/invoiceSets/reducer.ts b/src/invoiceSets/reducer.ts
index 43a672a10..b1b559279 100644
--- a/src/invoiceSets/reducer.ts
+++ b/src/invoiceSets/reducer.ts
@@ -1,6 +1,6 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
-import type { Reducer } from "../types";
+import type { Reducer } from "@/types";
 import type { InvoiceSetListMap, ReceiveInvoiceSetsByLeaseAction } from "./types";
 const isFetchingReducer: Reducer<boolean> = handleActions({
   ['mvj/invoiceSets/FETCH_BY_LEASE']: () => true,
diff --git a/src/invoiceSets/requests.ts b/src/invoiceSets/requests.ts
index eb642f5e2..88b450d30 100644
--- a/src/invoiceSets/requests.ts
+++ b/src/invoiceSets/requests.ts
@@ -1,6 +1,6 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
-import type { LeaseId } from "leases/types";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
+import type { LeaseId } from "@/leases/types";
 export const fetchInvoiceSetsByLease = (leaseId: LeaseId): Generator<any, any, any> => {
   return callApi(new Request(createUrl(`invoice_set/?lease=${leaseId}&limit=10000`)));
 };
diff --git a/src/invoiceSets/saga.ts b/src/invoiceSets/saga.ts
index f8ab16572..ae5d29890 100644
--- a/src/invoiceSets/saga.ts
+++ b/src/invoiceSets/saga.ts
@@ -1,9 +1,9 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { SubmissionError } from "redux-form";
-import { fetchInvoicesByLease, receiveInvoiceToCredit, receiveIsCreditInvoicePanelOpen } from "invoices/actions";
+import { fetchInvoicesByLease, receiveInvoiceToCredit, receiveIsCreditInvoicePanelOpen } from "@/invoices/actions";
 import { fetchInvoiceSetsByLease as fetchInvoiceSetsByLeaseAction, notFound, receiveInvoiceSetsByLease } from "./actions";
-import { receiveError } from "api/actions";
-import { displayUIMessage } from "util/helpers";
+import { receiveError } from "@/api/actions";
+import { displayUIMessage } from "@/util/helpers";
 import { creditInvoiceSet, fetchInvoiceSetsByLease } from "./requests";
 
 function* fetchInvoiceSetsByLeaseSaga({
diff --git a/src/invoiceSets/selectors.ts b/src/invoiceSets/selectors.ts
index 24fb137a6..b62c4f8b2 100644
--- a/src/invoiceSets/selectors.ts
+++ b/src/invoiceSets/selectors.ts
@@ -1,7 +1,7 @@
 import type { Selector } from "types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 import type { InvoiceSetList } from "./types";
-import type { LeaseId } from "leases/types";
+import type { LeaseId } from "@/leases/types";
 export const getIsFetching: Selector<boolean, void> = (state: RootState): boolean => state.invoiceSet.isFetching;
 export const getInvoiceSetsByLease: Selector<InvoiceSetList, LeaseId> = (state: RootState, leaseId: LeaseId): InvoiceSetList => {
   return state.invoiceSet.byLease[leaseId];
diff --git a/src/invoiceSets/types.ts b/src/invoiceSets/types.ts
index 5e41f2a6c..17f252ecd 100644
--- a/src/invoiceSets/types.ts
+++ b/src/invoiceSets/types.ts
@@ -1,5 +1,5 @@
-import type { Action } from "../types";
-import type { LeaseId } from "leases/types";
+import type { Action } from "@/types";
+import type { LeaseId } from "@/leases/types";
 export type InvoiceSetState = {
   byLease: InvoiceSetListMap;
   isFetching: boolean;
diff --git a/src/invoices/actions.ts b/src/invoices/actions.ts
index b98bd84bd..5e02899ec 100644
--- a/src/invoices/actions.ts
+++ b/src/invoices/actions.ts
@@ -1,7 +1,7 @@
 import { createAction } from "redux-actions";
 import type { Attributes, Methods } from "types";
 import type { FetchAttributesAction, ReceiveAttributesAction, ReceiveMethodsAction, InvoiceAttributesNotFoundAction, Invoice, InvoiceListMap, FetchInvoicesByLeaseAction, ReceiveInvoicesByLeaseAction, CreateInvoiceAction, CreditInvoiceAction, PatchInvoiceAction, ExportInvoiceToLaskeAndUpdateListAction, ExportInvoiceToLaskeAndUpdateListPayload, ReceivePatchedInvoiceAction, ClearPatchedInvoiceAction, InvoiceNotFoundAction, ReceiveInvoiceToCreditAction, ReceiveIsCreateInvoicePanelOpenAction, ReceiveIsCreditInvoicePanelOpenAction, ReceiveIsCreateClickedAction, ReceiveIsCreditClickedAction, ReceiveIsEditClickedAction, DeleteInvoiceAction } from "./types";
-import type { LeaseId } from "leases/types";
+import type { LeaseId } from "@/leases/types";
 export const fetchAttributes = (): FetchAttributesAction => createAction('mvj/invoices/FETCH_ATTRIBUTES')();
 export const receiveAttributes = (attributes: Attributes): ReceiveAttributesAction => createAction('mvj/invoices/RECEIVE_ATTRIBUTES')(attributes);
 export const receiveMethods = (methods: Methods): ReceiveMethodsAction => createAction('mvj/invoices/RECEIVE_METHODS')(methods);
diff --git a/src/invoices/helpers.ts b/src/invoices/helpers.ts
index dec624de1..78b00f8a9 100644
--- a/src/invoices/helpers.ts
+++ b/src/invoices/helpers.ts
@@ -1,9 +1,9 @@
 import isPast from "date-fns/isPast";
 import forEach from "lodash/forEach";
 import get from "lodash/get";
-import { CreditInvoiceOptions } from "leases/enums";
+import { CreditInvoiceOptions } from "@/leases/enums";
 import { InvoiceState, InvoiceType, ReceivableTypes } from "./enums";
-import { convertStrToDecimalNumber, getLabelOfOption, sortStringAsc } from "util/helpers";
+import { convertStrToDecimalNumber, getLabelOfOption, sortStringAsc } from "@/util/helpers";
 
 /**
  * Get payments of single invoice to show on UI
diff --git a/src/invoices/spec.ts b/src/invoices/invoices.spec.ts
similarity index 99%
rename from src/invoices/spec.ts
rename to src/invoices/invoices.spec.ts
index 440c8fc91..77ee4f4d8 100644
--- a/src/invoices/spec.ts
+++ b/src/invoices/invoices.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { receiveAttributes, receiveMethods, fetchAttributes, attributesNotFound, receiveInvoicesByLease, receiveIsCreateInvoicePanelOpen, receiveIsCreditInvoicePanelOpen, receiveIsCreateClicked, receiveIsCreditClicked, receiveIsEditClicked, fetchInvoicesByLease, createInvoice, patchInvoice, exportInvoiceToLaskeAndUpdateList, receivePatchedInvoice, clearPatchedInvoice, notFound, receiveInvoiceToCredit, creditInvoice, deleteInvoice } from "./actions";
 import invoiceReducer from "./reducer";
 import type { InvoiceState } from "./types";
diff --git a/src/invoices/reducer.ts b/src/invoices/reducer.ts
index 9a0af705a..9412f93b6 100644
--- a/src/invoices/reducer.ts
+++ b/src/invoices/reducer.ts
@@ -1,6 +1,6 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
-import type { Attributes, Methods, Reducer } from "../types";
+import type { Attributes, Methods, Reducer } from "@/types";
 import type { ReceiveAttributesAction, ReceiveMethodsAction, Invoice, InvoiceListMap, ReceiveInvoicesByLeaseAction, ReceiveInvoiceToCreditAction, ReceiveIsCreateInvoicePanelOpenAction, ReceiveIsCreditInvoicePanelOpenAction, ReceiveIsCreateClickedAction, ReceiveIsCreditClickedAction, ReceiveIsEditClickedAction, ReceivePatchedInvoiceAction } from "./types";
 const isFetchingReducer: Reducer<boolean> = handleActions({
   'mvj/invoices/CREATE': () => true,
diff --git a/src/invoices/requests.ts b/src/invoices/requests.ts
index 40a8e08af..f563ffa6a 100644
--- a/src/invoices/requests.ts
+++ b/src/invoices/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 import type { Invoice, InvoiceId } from "./types";
 export const fetchAttributes = () => {
   return callApi(new Request(createUrl('invoice/'), {
diff --git a/src/invoices/saga.ts b/src/invoices/saga.ts
index ff65d3ef6..fe42750b2 100644
--- a/src/invoices/saga.ts
+++ b/src/invoices/saga.ts
@@ -1,8 +1,8 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { SubmissionError } from "redux-form";
 import { fetchInvoicesByLease, receiveAttributes, receiveMethods, attributesNotFound, receiveInvoicesByLease, receiveInvoiceToCredit, receiveIsCreateInvoicePanelOpen, receiveIsCreditInvoicePanelOpen, receiveIsEditClicked, receivePatchedInvoice, notFound } from "./actions";
-import { receiveError } from "api/actions";
-import { displayUIMessage } from "util/helpers";
+import { receiveError } from "@/api/actions";
+import { displayUIMessage } from "@/util/helpers";
 import { exportInvoiceToLaske, fetchAttributes, fetchInvoices, createInvoice, creditInvoice, patchInvoice, deleteInvoice } from "./requests";
 
 function* fetchAttributesSaga(): Generator<any, any, any> {
diff --git a/src/invoices/selectors.ts b/src/invoices/selectors.ts
index afa103be5..6fbc015c7 100644
--- a/src/invoices/selectors.ts
+++ b/src/invoices/selectors.ts
@@ -1,7 +1,7 @@
 import type { Attributes, Methods, Selector } from "types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 import type { Invoice, InvoiceList } from "./types";
-import type { LeaseId } from "leases/types";
+import type { LeaseId } from "@/leases/types";
 export const getIsFetching: Selector<boolean, void> = (state: RootState): boolean => state.invoice.isFetching;
 export const getIsSaving: Selector<boolean, void> = (state: RootState): boolean => state.invoice.isSaving;
 export const getIsCreateInvoicePanelOpen: Selector<boolean, void> = (state: RootState): boolean => state.invoice.isCreatePanelOpen;
diff --git a/src/invoices/types.ts b/src/invoices/types.ts
index 7b2117c11..ba904404c 100644
--- a/src/invoices/types.ts
+++ b/src/invoices/types.ts
@@ -1,5 +1,5 @@
 import type { Action, Attributes, Methods } from "types";
-import type { LeaseId } from "leases/types";
+import type { LeaseId } from "@/leases/types";
 export type InvoiceState = {
   attributes: Attributes;
   byLease: InvoiceListMap;
diff --git a/src/landUseAgreementAttachment/spec.ts b/src/landUseAgreementAttachment/landUseAgreementAttachment.spec.ts
similarity index 98%
rename from src/landUseAgreementAttachment/spec.ts
rename to src/landUseAgreementAttachment/landUseAgreementAttachment.spec.ts
index 64893c146..e4a621f22 100644
--- a/src/landUseAgreementAttachment/spec.ts
+++ b/src/landUseAgreementAttachment/landUseAgreementAttachment.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchAttributes, attributesNotFound, receiveAttributes, receiveMethods, createLandUseAgreementAttachment, deleteLandUseAgreementAttachment } from "./actions";
 import landUseAgreementAttachmentReducer from "./reducer";
 import type { LandUseAgreementAttachmentState } from "./types";
diff --git a/src/landUseAgreementAttachment/reducer.ts b/src/landUseAgreementAttachment/reducer.ts
index 50fa18838..975ca5622 100644
--- a/src/landUseAgreementAttachment/reducer.ts
+++ b/src/landUseAgreementAttachment/reducer.ts
@@ -1,6 +1,6 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
-import type { Attributes, Methods, Reducer } from "../types";
+import type { Attributes, Methods, Reducer } from "@/types";
 import type { ReceiveAttributesAction, ReceiveMethodsAction } from "./types";
 const isFetchingAttributesReducer: Reducer<boolean> = handleActions({
   'mvj/landUseAgreementAttachment/FETCH_ATTRIBUTES': () => true,
diff --git a/src/landUseAgreementAttachment/requests.ts b/src/landUseAgreementAttachment/requests.ts
index 02775b987..0a2880b9f 100644
--- a/src/landUseAgreementAttachment/requests.ts
+++ b/src/landUseAgreementAttachment/requests.ts
@@ -1,6 +1,6 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
-import callUploadRequest from "api/callUploadRequest";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
+import callUploadRequest from "@/api/callUploadRequest";
 import type { CreateLandUseAgreementAttachmentPayload } from "./types";
 export const fetchAttributes = (): Generator<any, any, any> => {
   return callApi(new Request(createUrl(`land_use_agreement_attachment/`), {
diff --git a/src/landUseAgreementAttachment/saga.ts b/src/landUseAgreementAttachment/saga.ts
index 4955e828e..0b2689e46 100644
--- a/src/landUseAgreementAttachment/saga.ts
+++ b/src/landUseAgreementAttachment/saga.ts
@@ -1,9 +1,9 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { SubmissionError } from "redux-form";
 import { attributesNotFound, receiveAttributes, receiveMethods } from "./actions";
-import { fetchSingleLandUseContract } from "landUseContract/actions";
-import { receiveError } from "api/actions";
-import { displayUIMessage } from "util/helpers";
+import { fetchSingleLandUseContract } from "@/landUseContract/actions";
+import { receiveError } from "@/api/actions";
+import { displayUIMessage } from "@/util/helpers";
 import { fetchAttributes, createLandUseAgreementAttachment, deleteLandUseAgreementAttachment } from "./requests";
 
 function* fetchAttributesSaga(): Generator<any, any, any> {
diff --git a/src/landUseAgreementAttachment/selectors.ts b/src/landUseAgreementAttachment/selectors.ts
index 5661caf87..bb3cecc88 100644
--- a/src/landUseAgreementAttachment/selectors.ts
+++ b/src/landUseAgreementAttachment/selectors.ts
@@ -1,5 +1,5 @@
 import type { Attributes, Methods, Selector } from "types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 export const getAttributes: Selector<Attributes, void> = (state: RootState): Attributes => state.landUseAgreementAttachment.attributes;
 export const getMethods: Selector<Methods, void> = (state: RootState): Methods => state.landUseAgreementAttachment.methods;
 export const getIsFetchingAttributes: Selector<boolean, void> = (state: RootState): boolean => state.landUseAgreementAttachment.isFetchingAttributes;
\ No newline at end of file
diff --git a/src/landUseAgreementAttachment/types.ts b/src/landUseAgreementAttachment/types.ts
index 7fde2e4af..48a43729e 100644
--- a/src/landUseAgreementAttachment/types.ts
+++ b/src/landUseAgreementAttachment/types.ts
@@ -1,4 +1,4 @@
-import type { Action, Attributes, Methods } from "../types";
+import type { Action, Attributes, Methods } from "@/types";
 export type LandUseAgreementAttachmentState = {
   attributes: Attributes;
   isFetchingAttributes: boolean;
diff --git a/src/landUseContract/components/LandUseContractListPage.tsx b/src/landUseContract/components/LandUseContractListPage.tsx
index c9e61d073..42c3d30dc 100644
--- a/src/landUseContract/components/LandUseContractListPage.tsx
+++ b/src/landUseContract/components/LandUseContractListPage.tsx
@@ -5,29 +5,29 @@ import { connect } from "react-redux";
 import { initialize } from "redux-form";
 import flowRight from "lodash/flowRight";
 import isArray from "lodash/isArray";
-import Authorization from "components/authorization/Authorization";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import { FormNames, Methods, PermissionMissingTexts } from "enums";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
+import Authorization from "@/components/authorization/Authorization";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import { FormNames, Methods, PermissionMissingTexts } from "@/enums";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
 import CreateLandUseContractModal from "./createLandUseContract/CreateLandUseContractModal";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import PageContainer from "components/content/PageContainer";
-import Pagination from "components/table/Pagination";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import PageContainer from "@/components/content/PageContainer";
+import Pagination from "@/components/table/Pagination";
 import Search from "./search/Search";
-import SortableTable from "components/table/SortableTable";
-import TableFilters from "components/table/TableFilters";
-import TableWrapper from "components/table/TableWrapper";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { createLandUseContract, fetchLandUseContractList } from "landUseContract/actions";
-import { LIST_TABLE_PAGE_SIZE } from "util/constants";
-import { getContentLandUseContractListResults } from "landUseContract/helpers";
-import { getApiResponseCount, getApiResponseMaxPage, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, setPageTitle, isMethodAllowed } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getIsFetching, getLandUseContractList } from "landUseContract/selectors";
-import { withLandUseContractAttributes } from "components/attributes/LandUseContractAttributes";
+import SortableTable from "@/components/table/SortableTable";
+import TableFilters from "@/components/table/TableFilters";
+import TableWrapper from "@/components/table/TableWrapper";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { createLandUseContract, fetchLandUseContractList } from "@/landUseContract/actions";
+import { LIST_TABLE_PAGE_SIZE } from "@/util/constants";
+import { getContentLandUseContractListResults } from "@/landUseContract/helpers";
+import { getApiResponseCount, getApiResponseMaxPage, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, setPageTitle, isMethodAllowed } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getIsFetching, getLandUseContractList } from "@/landUseContract/selectors";
+import { withLandUseContractAttributes } from "@/components/attributes/LandUseContractAttributes";
 import type { Attributes, Methods as MethodType } from "types";
-import type { LandUseContract, LandUseContractList } from "landUseContract/types";
+import type { LandUseContract, LandUseContractList } from "@/landUseContract/types";
 type Props = {
   createLandUseContract: (...args: Array<any>) => any;
   fetchLandUseContractList: (...args: Array<any>) => any;
diff --git a/src/landUseContract/components/LandUseContractPage.tsx b/src/landUseContract/components/LandUseContractPage.tsx
index a2901c95e..41bf97900 100644
--- a/src/landUseContract/components/LandUseContractPage.tsx
+++ b/src/landUseContract/components/LandUseContractPage.tsx
@@ -4,53 +4,53 @@ import { withRouter } from "react-router";
 import { change, destroy, getFormValues, initialize, isDirty } from "redux-form";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import { withUiDataList } from "components/uiData/UiDataListHOC";
+import { withUiDataList } from "@/components/uiData/UiDataListHOC";
 import BasicInformation from "./sections/BasicInformation";
 import BasicInformationEdit from "./sections/BasicInformationEdit";
 import Conditions from "./sections/Conditions";
 import ConditionsEdit from "./sections/ConditionsEdit";
 import Compensations from "./sections/Compensations";
 import CompensationsEdit from "./sections/CompensationsEdit";
-import ConfirmationModal from "components/modal/ConfirmationModal";
-import ContentContainer from "components/content/ContentContainer";
+import ConfirmationModal from "@/components/modal/ConfirmationModal";
+import ContentContainer from "@/components/content/ContentContainer";
 import Contracts from "./sections/Contracts";
 import ContractsEdit from "./sections/ContractsEdit";
-import ControlButtonBar from "components/controlButtons/ControlButtonBar";
-import ControlButtons from "components/controlButtons/ControlButtons";
+import ControlButtonBar from "@/components/controlButtons/ControlButtonBar";
+import ControlButtons from "@/components/controlButtons/ControlButtons";
 import Decisions from "./sections/Decisions";
 import DecisionsEdit from "./sections/DecisionsEdit";
-import Divider from "components/content/Divider";
-import FullWidthContainer from "components/content/FullWidthContainer";
+import Divider from "@/components/content/Divider";
+import FullWidthContainer from "@/components/content/FullWidthContainer";
 import InvoicesR from "./sections/InvoicesR";
 // import Invoices from './sections/Invoices';
 // import InvoicesEdit from './sections/InvoicesEdit';
-import { ButtonColors } from "components/enums";
-import { fetchAttributes as fetchLandUseInvoiceAttributes } from "landUseInvoices/actions";
+import { ButtonColors } from "@/components/enums";
+import { fetchAttributes as fetchLandUseInvoiceAttributes } from "@/landUseInvoices/actions";
 import LandUseContractMap from "./sections/LandUseContractMap";
 import Litigants from "./sections/Litigants";
 import LitigantsEdit from "./sections/LitigantsEdit";
-import Loader from "components/loader/Loader";
-import PageContainer from "components/content/PageContainer";
-import PageNavigationWrapper from "components/content/PageNavigationWrapper";
-import Tabs from "components/tabs/Tabs";
-import TabContent from "components/tabs/TabContent";
-import TabPane from "components/tabs/TabPane";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { fetchInvoicesByLandUseContract } from "landUseInvoices/actions";
-import { getInvoicesByLandUseContractId, getIsFetchingAttributes as getIsFetchingLandUseInvoiceAttributes, getAttributes as getLandUseInvoiceAttributes } from "landUseInvoices/selectors";
-import { clearFormValidFlags, editLandUseContract, fetchSingleLandUseContract, hideEditMode, receiveFormValidFlags, receiveIsSaveClicked, receiveSingleLandUseContract, showEditMode, deleteLandUseContract } from "landUseContract/actions";
-import { ConfirmationModalTexts, FormNames } from "enums";
-import { addLitigantsFormValuesToPayload, clearUnsavedChanges, getContentLandUseContractIdentifier, getContentBasicInformation, getContentCompensations, getContentContracts, getContentDecisions, getContentInvoices, getContentLitigants, getContentConditions, convertCompensationValuesToDecimalNumber } from "landUseContract/helpers";
-import { getSearchQuery, getUrlParams, isArchived, scrollToTopPage, setPageTitle } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getCurrentLandUseContract, getIsEditMode, getIsFormValidById, getIsFormValidFlags, getIsSaveClicked, getIsFetching } from "landUseContract/selectors";
-import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors";
-import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "util/storage";
-import { withLandUseContractAttributes } from "components/attributes/LandUseContractAttributes";
+import Loader from "@/components/loader/Loader";
+import PageContainer from "@/components/content/PageContainer";
+import PageNavigationWrapper from "@/components/content/PageNavigationWrapper";
+import Tabs from "@/components/tabs/Tabs";
+import TabContent from "@/components/tabs/TabContent";
+import TabPane from "@/components/tabs/TabPane";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { fetchInvoicesByLandUseContract } from "@/landUseInvoices/actions";
+import { getInvoicesByLandUseContractId, getIsFetchingAttributes as getIsFetchingLandUseInvoiceAttributes, getAttributes as getLandUseInvoiceAttributes } from "@/landUseInvoices/selectors";
+import { clearFormValidFlags, editLandUseContract, fetchSingleLandUseContract, hideEditMode, receiveFormValidFlags, receiveIsSaveClicked, receiveSingleLandUseContract, showEditMode, deleteLandUseContract } from "@/landUseContract/actions";
+import { ConfirmationModalTexts, FormNames } from "@/enums";
+import { addLitigantsFormValuesToPayload, clearUnsavedChanges, getContentLandUseContractIdentifier, getContentBasicInformation, getContentCompensations, getContentContracts, getContentDecisions, getContentInvoices, getContentLitigants, getContentConditions, convertCompensationValuesToDecimalNumber } from "@/landUseContract/helpers";
+import { getSearchQuery, getUrlParams, isArchived, scrollToTopPage, setPageTitle } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getCurrentLandUseContract, getIsEditMode, getIsFormValidById, getIsFormValidFlags, getIsSaveClicked, getIsFetching } from "@/landUseContract/selectors";
+import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors";
+import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "@/util/storage";
+import { withLandUseContractAttributes } from "@/components/attributes/LandUseContractAttributes";
 import type { Attributes } from "types";
-import type { LandUseContract } from "landUseContract/types";
-import type { UsersPermissions } from "usersPermissions/types";
-import type { InvoiceList } from "landUseInvoices/types";
+import type { LandUseContract } from "@/landUseContract/types";
+import type { UsersPermissions } from "@/usersPermissions/types";
+import type { InvoiceList } from "@/landUseInvoices/types";
 type Props = {
   basicInformationFormValues: Record<string, any>;
   change: (...args: Array<any>) => any;
diff --git a/src/landUseContract/components/createLandUseContract/CreateLandUseContractForm.tsx b/src/landUseContract/components/createLandUseContract/CreateLandUseContractForm.tsx
index 7ce73de64..79d5f5ad2 100644
--- a/src/landUseContract/components/createLandUseContract/CreateLandUseContractForm.tsx
+++ b/src/landUseContract/components/createLandUseContract/CreateLandUseContractForm.tsx
@@ -4,18 +4,18 @@ import { change, formValueSelector, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
 import get from "lodash/get";
-import { getDistrictsByMunicipality } from "district/selectors";
-import Button from "components/button/Button";
-import FormField from "components/form/FormField";
-import ModalButtonWrapper from "components/modal/ModalButtonWrapper";
-import { fetchDistrictsByMunicipality } from "district/actions";
-import { FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import { getAttributes } from "landUseContract/selectors";
-import { getDistrictOptions } from "district/helpers";
-import { getFieldOptions } from "util/helpers";
+import { getDistrictsByMunicipality } from "@/district/selectors";
+import Button from "@/components/button/Button";
+import FormField from "@/components/form/FormField";
+import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper";
+import { fetchDistrictsByMunicipality } from "@/district/actions";
+import { FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { getAttributes } from "@/landUseContract/selectors";
+import { getDistrictOptions } from "@/district/helpers";
+import { getFieldOptions } from "@/util/helpers";
 import type { Attributes } from "types";
-import type { DistrictList } from "district/types";
+import type { DistrictList } from "@/district/types";
 type Props = {
   attributes: Attributes;
   change: (...args: Array<any>) => any;
diff --git a/src/landUseContract/components/createLandUseContract/CreateLandUseContractModal.tsx b/src/landUseContract/components/createLandUseContract/CreateLandUseContractModal.tsx
index 9abeee854..656be0c5f 100644
--- a/src/landUseContract/components/createLandUseContract/CreateLandUseContractModal.tsx
+++ b/src/landUseContract/components/createLandUseContract/CreateLandUseContractModal.tsx
@@ -1,6 +1,6 @@
 import React, { Component } from "react";
 import CreateLandUseContractForm from "./CreateLandUseContractForm";
-import Modal from "components/modal/Modal";
+import Modal from "@/components/modal/Modal";
 type Props = {
   isOpen: boolean;
   onClose: (...args: Array<any>) => any;
diff --git a/src/landUseContract/components/search/Search.tsx b/src/landUseContract/components/search/Search.tsx
index 7eceefe40..d221457a7 100644
--- a/src/landUseContract/components/search/Search.tsx
+++ b/src/landUseContract/components/search/Search.tsx
@@ -5,10 +5,10 @@ import { Row, Column } from "react-foundation";
 import debounce from "lodash/debounce";
 import flowRight from "lodash/flowRight";
 import isEqual from "lodash/isEqual";
-import FormField from "components/form/FormField";
-import SearchClearLink from "components/search/SearchClearLink";
-import SearchContainer from "components/search/SearchContainer";
-import { FieldTypes, FormNames } from "enums";
+import FormField from "@/components/form/FormField";
+import SearchClearLink from "@/components/search/SearchClearLink";
+import SearchContainer from "@/components/search/SearchContainer";
+import { FieldTypes, FormNames } from "@/enums";
 type Props = {
   formValues: Record<string, any>;
   handleSubmit: (...args: Array<any>) => any;
diff --git a/src/landUseContract/components/sections/AddressItemEdit.tsx b/src/landUseContract/components/sections/AddressItemEdit.tsx
index 01e81f329..0eb7d42b4 100644
--- a/src/landUseContract/components/sections/AddressItemEdit.tsx
+++ b/src/landUseContract/components/sections/AddressItemEdit.tsx
@@ -4,14 +4,14 @@ import { formValueSelector, change, reduxForm } from "redux-form";
 import flowRight from "lodash/flowRight";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
-import Authorization from "components/authorization/Authorization";
-import FormField from "components/form/FormField";
-import { FieldTypes, FormNames } from "enums";
-import RemoveButton from "components/form/RemoveButton";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import FormField from "@/components/form/FormField";
+import { FieldTypes, FormNames } from "@/enums";
+import RemoveButton from "@/components/form/RemoveButton";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
-import { isFieldAllowedToRead, isEmptyValue } from "util/helpers";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
+import { isFieldAllowedToRead, isEmptyValue } from "@/util/helpers";
 type Props = {
   attributes: Attributes;
   disabled: boolean;
diff --git a/src/landUseContract/components/sections/BasicInformation.tsx b/src/landUseContract/components/sections/BasicInformation.tsx
index 2c0598345..6c8492e49 100644
--- a/src/landUseContract/components/sections/BasicInformation.tsx
+++ b/src/landUseContract/components/sections/BasicInformation.tsx
@@ -2,27 +2,27 @@ import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
-import Authorization from "components/authorization/Authorization";
-import Collapse from "components/collapse/Collapse";
-import Divider from "components/content/Divider";
-import ExternalLink from "components/links/ExternalLink";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import ListItem from "components/content/ListItem";
-import ListItems from "components/content/ListItems";
-import SubTitle from "components/content/SubTitle";
-import { receiveCollapseStates } from "landUseContract/actions";
-import { FormNames, ViewModes } from "enums";
-import { LandUseAgreementAttachmentFieldPaths } from "landUseAgreementAttachment/enums";
-import { getContentBasicInformation } from "landUseContract/helpers";
-import { getUserFullName } from "users/helpers";
-import { formatDate, getFieldOptions, getLabelOfOption, getReferenceNumberLink, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes, getCollapseStateByKey, getCurrentLandUseContract } from "landUseContract/selectors";
-import { getUiDataLandUseContractKey, getUiDataLandUseAgreementAttachmentKey } from "uiData/helpers";
-import { getAttributes as getLandUseAgreementAttachmentAttributes } from "landUseAgreementAttachment/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import Collapse from "@/components/collapse/Collapse";
+import Divider from "@/components/content/Divider";
+import ExternalLink from "@/components/links/ExternalLink";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import ListItem from "@/components/content/ListItem";
+import ListItems from "@/components/content/ListItems";
+import SubTitle from "@/components/content/SubTitle";
+import { receiveCollapseStates } from "@/landUseContract/actions";
+import { FormNames, ViewModes } from "@/enums";
+import { LandUseAgreementAttachmentFieldPaths } from "@/landUseAgreementAttachment/enums";
+import { getContentBasicInformation } from "@/landUseContract/helpers";
+import { getUserFullName } from "@/users/helpers";
+import { formatDate, getFieldOptions, getLabelOfOption, getReferenceNumberLink, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes, getCollapseStateByKey, getCurrentLandUseContract } from "@/landUseContract/selectors";
+import { getUiDataLandUseContractKey, getUiDataLandUseAgreementAttachmentKey } from "@/uiData/helpers";
+import { getAttributes as getLandUseAgreementAttachmentAttributes } from "@/landUseAgreementAttachment/selectors";
 import type { Attributes } from "types";
-import type { LandUseContract } from "landUseContract/types";
-import FileDownloadLink from "components/file/FileDownloadLink";
+import type { LandUseContract } from "@/landUseContract/types";
+import FileDownloadLink from "@/components/file/FileDownloadLink";
 type Props = {
   attributes: Attributes;
   basicInformationCollapseState: boolean;
diff --git a/src/landUseContract/components/sections/BasicInformationEdit.tsx b/src/landUseContract/components/sections/BasicInformationEdit.tsx
index 0300ecf6a..1a10013d5 100644
--- a/src/landUseContract/components/sections/BasicInformationEdit.tsx
+++ b/src/landUseContract/components/sections/BasicInformationEdit.tsx
@@ -4,34 +4,34 @@ import { change, FieldArray, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
 import get from "lodash/get";
-import AddFileButton from "components/form/AddFileButton";
-import EstateIdSelectInput from "components/inputs/EstateIdSelectInput";
-import Authorization from "components/authorization/Authorization";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButtonThird from "components/form/AddButtonThird";
-import Collapse from "components/collapse/Collapse";
-import Divider from "components/content/Divider";
-import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FileDownloadLink from "components/file/FileDownloadLink";
-import FormTextTitle from "components/form/FormTextTitle";
-import RemoveButton from "components/form/RemoveButton";
-import SubTitle from "components/content/SubTitle";
-import { receiveCollapseStates, receiveFormValidFlags } from "landUseContract/actions";
-import { createLandUseAgreementAttachment, deleteLandUseAgreementAttachment } from "landUseAgreementAttachment/actions";
-import { ConfirmationModalTexts, FieldTypes, FormNames, ViewModes, Methods } from "enums";
-import { ButtonColors } from "components/enums";
-import { getAttributes, getCollapseStateByKey, getIsSaveClicked, getCurrentLandUseContract } from "landUseContract/selectors";
-import { referenceNumber } from "components/form/validations";
+import AddFileButton from "@/components/form/AddFileButton";
+import EstateIdSelectInput from "@/components/inputs/EstateIdSelectInput";
+import Authorization from "@/components/authorization/Authorization";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import Collapse from "@/components/collapse/Collapse";
+import Divider from "@/components/content/Divider";
+import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FileDownloadLink from "@/components/file/FileDownloadLink";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import RemoveButton from "@/components/form/RemoveButton";
+import SubTitle from "@/components/content/SubTitle";
+import { receiveCollapseStates, receiveFormValidFlags } from "@/landUseContract/actions";
+import { createLandUseAgreementAttachment, deleteLandUseAgreementAttachment } from "@/landUseAgreementAttachment/actions";
+import { ConfirmationModalTexts, FieldTypes, FormNames, ViewModes, Methods } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { getAttributes, getCollapseStateByKey, getIsSaveClicked, getCurrentLandUseContract } from "@/landUseContract/selectors";
+import { referenceNumber } from "@/components/form/validations";
 import AddressItemEdit from "./AddressItemEdit";
 import type { Attributes, Methods as MethodsType } from "types";
-import { getUiDataLandUseContractKey, getUiDataLandUseAgreementAttachmentKey } from "uiData/helpers";
-import { LandUseAgreementAttachmentFieldPaths } from "landUseAgreementAttachment/enums";
-import { getUserFullName } from "users/helpers";
-import { isFieldAllowedToRead, isMethodAllowed, formatDate } from "util/helpers";
-import { getMethods as getLandUseAgreementAttachmentMethods, getAttributes as getLandUseAgreementAttachmentAttributes } from "landUseAgreementAttachment/selectors";
-import type { LandUseContract } from "landUseContract/types";
+import { getUiDataLandUseContractKey, getUiDataLandUseAgreementAttachmentKey } from "@/uiData/helpers";
+import { LandUseAgreementAttachmentFieldPaths } from "@/landUseAgreementAttachment/enums";
+import { getUserFullName } from "@/users/helpers";
+import { isFieldAllowedToRead, isMethodAllowed, formatDate } from "@/util/helpers";
+import { getMethods as getLandUseAgreementAttachmentMethods, getAttributes as getLandUseAgreementAttachmentAttributes } from "@/landUseAgreementAttachment/selectors";
+import type { LandUseContract } from "@/landUseContract/types";
 type AddressesProps = {
   fields: any;
   formName: string;
@@ -150,7 +150,8 @@ const renderAreas = ({
 
           return <Row key={index}>
                   <Column>
-                    <FieldAndRemoveButtonWrapper field={<Authorization allow={isFieldAllowedToRead(attributes, 'estate_ids.child.children.estate_id')}>
+                    <FieldAndRemoveButtonWrapper field={<Authorization allow={(isFieldAllowedToRead(attributes, 'estate_ids.child.children.estate_id'))}>
+                      <>
                           <EstateIdSelectInput onChange={estate_id => {
                   if (estate_id && estate_id.value) {
                     change(`${field}.estate_id`, estate_id.value);
@@ -167,6 +168,7 @@ const renderAreas = ({
                 }}>
                             <FormField disableTouched={isSaveClicked} fieldAttributes={get(attributes, 'plots.child.children.id')} invisibleLabel name={`${field}.plot`} />
                           </div>
+                      </>
                         </Authorization>} removeButton={<RemoveButton className='third-level' onClick={handleRemove} title='Poista kohde' />} />
                   </Column>
                 </Row>;
diff --git a/src/landUseContract/components/sections/Changes.tsx b/src/landUseContract/components/sections/Changes.tsx
index 93fb2b30b..819004d26 100644
--- a/src/landUseContract/components/sections/Changes.tsx
+++ b/src/landUseContract/components/sections/Changes.tsx
@@ -2,18 +2,18 @@ import React from "react";
 import { Row, Column } from "react-foundation";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import FormTextTitle from "components/form/FormTextTitle";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import Collapse from "components/collapse/Collapse";
-import FormText from "components/form/FormText";
-import { receiveCollapseStates } from "landUseContract/actions";
-import { FormNames, ViewModes } from "enums";
-import { formatDate } from "util/helpers";
-import { getCollapseStateByKey } from "landUseContract/selectors";
-import { withWindowResize } from "components/resize/WindowResizeHandler";
-import { getDecisionById, getDecisionOptions } from "landUseContract/helpers";
-import type { LandUseContract } from "landUseContract/types";
-import DecisionLink from "components/links/DecisionLink";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import Collapse from "@/components/collapse/Collapse";
+import FormText from "@/components/form/FormText";
+import { receiveCollapseStates } from "@/landUseContract/actions";
+import { FormNames, ViewModes } from "@/enums";
+import { formatDate } from "@/util/helpers";
+import { getCollapseStateByKey } from "@/landUseContract/selectors";
+import { withWindowResize } from "@/components/resize/WindowResizeHandler";
+import { getDecisionById, getDecisionOptions } from "@/landUseContract/helpers";
+import type { LandUseContract } from "@/landUseContract/types";
+import DecisionLink from "@/components/links/DecisionLink";
 import type { Attributes } from "types";
 type Props = {
   attributes: Attributes;
diff --git a/src/landUseContract/components/sections/Compensations.tsx b/src/landUseContract/components/sections/Compensations.tsx
index af31a025a..ff4c819a5 100644
--- a/src/landUseContract/components/sections/Compensations.tsx
+++ b/src/landUseContract/components/sections/Compensations.tsx
@@ -2,25 +2,25 @@ import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
-import Authorization from "components/authorization/Authorization";
-import Divider from "components/content/Divider";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import GreenBox from "components/content/GreenBox";
-import SubTitle from "components/content/SubTitle";
-import WhiteBox from "components/content/WhiteBox";
-import { getContentCompensations } from "landUseContract/helpers";
-import { formatNumber } from "util/helpers";
-import { getUserFullName } from "users/helpers";
-import { getCurrentLandUseContract } from "landUseContract/selectors";
-import { LandUseAgreementAttachmentFieldPaths } from "landUseAgreementAttachment/enums";
-import type { LandUseContract } from "landUseContract/types";
-import { getUiDataLandUseAgreementAttachmentKey } from "uiData/helpers";
-import { getAttributes as getLandUseAgreementAttachmentAttributes } from "landUseAgreementAttachment/selectors";
-import { formatDate, isFieldAllowedToRead } from "util/helpers";
+import Authorization from "@/components/authorization/Authorization";
+import Divider from "@/components/content/Divider";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import GreenBox from "@/components/content/GreenBox";
+import SubTitle from "@/components/content/SubTitle";
+import WhiteBox from "@/components/content/WhiteBox";
+import { getContentCompensations } from "@/landUseContract/helpers";
+import { formatNumber } from "@/util/helpers";
+import { getUserFullName } from "@/users/helpers";
+import { getCurrentLandUseContract } from "@/landUseContract/selectors";
+import { LandUseAgreementAttachmentFieldPaths } from "@/landUseAgreementAttachment/enums";
+import type { LandUseContract } from "@/landUseContract/types";
+import { getUiDataLandUseAgreementAttachmentKey } from "@/uiData/helpers";
+import { getAttributes as getLandUseAgreementAttachmentAttributes } from "@/landUseAgreementAttachment/selectors";
+import { formatDate, isFieldAllowedToRead } from "@/util/helpers";
 import type { Attributes } from "types";
-import FileDownloadLink from "components/file/FileDownloadLink";
-import { getUsedPrice, getSum } from "landUseContract/helpers";
+import FileDownloadLink from "@/components/file/FileDownloadLink";
+import { getUsedPrice, getSum } from "@/landUseContract/helpers";
 type Props = {
   currentLandUseContract: LandUseContract;
   landUseAgreementAttachmentAttributes: Attributes;
diff --git a/src/landUseContract/components/sections/CompensationsEdit.tsx b/src/landUseContract/components/sections/CompensationsEdit.tsx
index d1f1d65d7..a14517be0 100644
--- a/src/landUseContract/components/sections/CompensationsEdit.tsx
+++ b/src/landUseContract/components/sections/CompensationsEdit.tsx
@@ -4,35 +4,35 @@ import { Row, Column } from "react-foundation";
 import { FieldArray, formValueSelector, reduxForm, change } from "redux-form";
 import flowRight from "lodash/flowRight";
 import get from "lodash/get";
-import Authorization from "components/authorization/Authorization";
-import AddFileButton from "components/form/AddFileButton";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButtonThird from "components/form/AddButtonThird";
-import Divider from "components/content/Divider";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import GreenBox from "components/content/GreenBox";
-import SubTitle from "components/content/SubTitle";
-import WhiteBox from "components/content/WhiteBox";
-import { receiveFormValidFlags } from "landUseContract/actions";
-import { getCurrentLandUseContract } from "landUseContract/selectors";
-import type { LandUseContract } from "landUseContract/types";
-import { FormNames } from "enums";
-import RemoveButton from "components/form/RemoveButton";
-import { ButtonColors } from "components/enums";
-import { convertStrToDecimalNumber, formatNumber } from "util/helpers";
-import { getAttributes, getIsSaveClicked } from "landUseContract/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import AddFileButton from "@/components/form/AddFileButton";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import Divider from "@/components/content/Divider";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import GreenBox from "@/components/content/GreenBox";
+import SubTitle from "@/components/content/SubTitle";
+import WhiteBox from "@/components/content/WhiteBox";
+import { receiveFormValidFlags } from "@/landUseContract/actions";
+import { getCurrentLandUseContract } from "@/landUseContract/selectors";
+import type { LandUseContract } from "@/landUseContract/types";
+import { FormNames } from "@/enums";
+import RemoveButton from "@/components/form/RemoveButton";
+import { ButtonColors } from "@/components/enums";
+import { convertStrToDecimalNumber, formatNumber } from "@/util/helpers";
+import { getAttributes, getIsSaveClicked } from "@/landUseContract/selectors";
 import UnitPricesUsedInCalculations from "./UnitPricesUsedInCalculations";
 import type { Attributes, Methods as MethodsType } from "types";
-import { getUserFullName } from "users/helpers";
-import { ConfirmationModalTexts, Methods } from "enums";
-import { formatDate, isFieldAllowedToRead, isMethodAllowed } from "util/helpers";
-import FileDownloadLink from "components/file/FileDownloadLink";
-import { getUiDataLandUseAgreementAttachmentKey } from "uiData/helpers";
-import { getMethods as getLandUseAgreementAttachmentMethods, getAttributes as getLandUseAgreementAttachmentAttributes } from "landUseAgreementAttachment/selectors";
-import { LandUseAgreementAttachmentFieldPaths } from "landUseAgreementAttachment/enums";
-import { createLandUseAgreementAttachment, deleteLandUseAgreementAttachment } from "landUseAgreementAttachment/actions";
+import { getUserFullName } from "@/users/helpers";
+import { ConfirmationModalTexts, Methods } from "@/enums";
+import { formatDate, isFieldAllowedToRead, isMethodAllowed } from "@/util/helpers";
+import FileDownloadLink from "@/components/file/FileDownloadLink";
+import { getUiDataLandUseAgreementAttachmentKey } from "@/uiData/helpers";
+import { getMethods as getLandUseAgreementAttachmentMethods, getAttributes as getLandUseAgreementAttachmentAttributes } from "@/landUseAgreementAttachment/selectors";
+import { LandUseAgreementAttachmentFieldPaths } from "@/landUseAgreementAttachment/enums";
+import { createLandUseAgreementAttachment, deleteLandUseAgreementAttachment } from "@/landUseAgreementAttachment/actions";
 type InvoicesProps = {
   attributes: Attributes;
   fields: any;
diff --git a/src/landUseContract/components/sections/ConditionItemEdit.tsx b/src/landUseContract/components/sections/ConditionItemEdit.tsx
index 93ccd3ad5..d0270f877 100644
--- a/src/landUseContract/components/sections/ConditionItemEdit.tsx
+++ b/src/landUseContract/components/sections/ConditionItemEdit.tsx
@@ -3,11 +3,11 @@ import { connect } from "react-redux";
 import { formValueSelector } from "redux-form";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
-import FormField from "components/form/FormField";
-import RemoveButton from "components/form/RemoveButton";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import FormField from "@/components/form/FormField";
+import RemoveButton from "@/components/form/RemoveButton";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   attributes: Attributes;
   disabled: boolean;
diff --git a/src/landUseContract/components/sections/Conditions.tsx b/src/landUseContract/components/sections/Conditions.tsx
index 73b7b804b..d113a6310 100644
--- a/src/landUseContract/components/sections/Conditions.tsx
+++ b/src/landUseContract/components/sections/Conditions.tsx
@@ -1,17 +1,17 @@
 import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
-import Collapse from "components/collapse/Collapse";
-import Divider from "components/content/Divider";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import { receiveCollapseStates } from "landUseContract/actions";
-import { FormNames, ViewModes } from "enums";
-import { getAttributes, getCollapseStateByKey, getCurrentLandUseContract } from "landUseContract/selectors";
+import Collapse from "@/components/collapse/Collapse";
+import Divider from "@/components/content/Divider";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import { receiveCollapseStates } from "@/landUseContract/actions";
+import { FormNames, ViewModes } from "@/enums";
+import { getAttributes, getCollapseStateByKey, getCurrentLandUseContract } from "@/landUseContract/selectors";
 import type { Attributes } from "types";
-import type { LandUseContract } from "landUseContract/types";
-import { getContentConditions } from "landUseContract/helpers";
-import { getFieldOptions, getLabelOfOption, formatDate } from "util/helpers";
+import type { LandUseContract } from "@/landUseContract/types";
+import { getContentConditions } from "@/landUseContract/helpers";
+import { getFieldOptions, getLabelOfOption, formatDate } from "@/util/helpers";
 type Props = {
   attributes: Attributes;
   ConditionsCollapseState: boolean;
diff --git a/src/landUseContract/components/sections/ConditionsEdit.tsx b/src/landUseContract/components/sections/ConditionsEdit.tsx
index 129e46ee6..e2486463f 100644
--- a/src/landUseContract/components/sections/ConditionsEdit.tsx
+++ b/src/landUseContract/components/sections/ConditionsEdit.tsx
@@ -3,15 +3,15 @@ import { connect } from "react-redux";
 import { FieldArray, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import { ButtonColors } from "components/enums";
-import FormTextTitle from "components/form/FormTextTitle";
-import AddButtonThird from "components/form/AddButtonThird";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import Collapse from "components/collapse/Collapse";
-import Divider from "components/content/Divider";
-import { receiveCollapseStates, receiveFormValidFlags } from "landUseContract/actions";
-import { FormNames, ViewModes } from "enums";
-import { getAttributes, getCollapseStateByKey, getIsSaveClicked } from "landUseContract/selectors";
+import { ButtonColors } from "@/components/enums";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import Collapse from "@/components/collapse/Collapse";
+import Divider from "@/components/content/Divider";
+import { receiveCollapseStates, receiveFormValidFlags } from "@/landUseContract/actions";
+import { FormNames, ViewModes } from "@/enums";
+import { getAttributes, getCollapseStateByKey, getIsSaveClicked } from "@/landUseContract/selectors";
 import type { Attributes } from "types";
 import ConditionItemEdit from "./ConditionItemEdit";
 type ConditionsProps = {
diff --git a/src/landUseContract/components/sections/ContractItem.tsx b/src/landUseContract/components/sections/ContractItem.tsx
index e88642838..c8aa8de9e 100644
--- a/src/landUseContract/components/sections/ContractItem.tsx
+++ b/src/landUseContract/components/sections/ContractItem.tsx
@@ -1,15 +1,15 @@
 import React from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
-import Collapse from "components/collapse/Collapse";
-import FormTitleAndText from "components/form/FormTitleAndText";
-import { receiveCollapseStates } from "landUseContract/actions";
-import { FormNames, ViewModes } from "enums";
-import { formatDate, getLabelOfOption } from "util/helpers";
-import { getCollapseStateByKey } from "landUseContract/selectors";
+import Collapse from "@/components/collapse/Collapse";
+import FormTitleAndText from "@/components/form/FormTitleAndText";
+import { receiveCollapseStates } from "@/landUseContract/actions";
+import { FormNames, ViewModes } from "@/enums";
+import { formatDate, getLabelOfOption } from "@/util/helpers";
+import { getCollapseStateByKey } from "@/landUseContract/selectors";
 import Warrants from "./Warrants";
 import Changes from "./Changes";
-import type { LandUseContract } from "landUseContract/types";
+import type { LandUseContract } from "@/landUseContract/types";
 type Props = {
   attributes: Record<string, any>;
   collapseState: boolean;
diff --git a/src/landUseContract/components/sections/ContractItemEdit.tsx b/src/landUseContract/components/sections/ContractItemEdit.tsx
index 1ae07c46f..5e6d62366 100644
--- a/src/landUseContract/components/sections/ContractItemEdit.tsx
+++ b/src/landUseContract/components/sections/ContractItemEdit.tsx
@@ -4,26 +4,26 @@ import { FieldArray, formValueSelector } from "redux-form";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
-import { ButtonColors } from "components/enums";
-import FormText from "components/form/FormText";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import ActionButtonWrapper from "components/form/ActionButtonWrapper";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import BoxItem from "components/content/BoxItem";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import Collapse from "components/collapse/Collapse";
-import FormField from "components/form/FormField";
-import { receiveCollapseStates } from "landUseContract/actions";
-import RemoveButton from "components/form/RemoveButton";
-import { FormNames, ViewModes, ConfirmationModalTexts } from "enums";
-import { getLabelOfOption } from "util/helpers";
-import { getCollapseStateByKey } from "landUseContract/selectors";
-import { getFieldAttributes } from "util/helpers";
-import DecisionLink from "components/links/DecisionLink";
-import type { LandUseContract } from "landUseContract/types";
+import { ButtonColors } from "@/components/enums";
+import FormText from "@/components/form/FormText";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import ActionButtonWrapper from "@/components/form/ActionButtonWrapper";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import BoxItem from "@/components/content/BoxItem";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import Collapse from "@/components/collapse/Collapse";
+import FormField from "@/components/form/FormField";
+import { receiveCollapseStates } from "@/landUseContract/actions";
+import RemoveButton from "@/components/form/RemoveButton";
+import { FormNames, ViewModes, ConfirmationModalTexts } from "@/enums";
+import { getLabelOfOption } from "@/util/helpers";
+import { getCollapseStateByKey } from "@/landUseContract/selectors";
+import { getFieldAttributes } from "@/util/helpers";
+import DecisionLink from "@/components/links/DecisionLink";
+import type { LandUseContract } from "@/landUseContract/types";
 import type { Attributes } from "types";
-import { getDecisionById } from "landUseContract/helpers";
+import { getDecisionById } from "@/landUseContract/helpers";
 type ContractChangesProps = {
   attributes: Attributes;
   collapseState: boolean;
diff --git a/src/landUseContract/components/sections/Contracts.tsx b/src/landUseContract/components/sections/Contracts.tsx
index 0043acdd2..7c65a31bb 100644
--- a/src/landUseContract/components/sections/Contracts.tsx
+++ b/src/landUseContract/components/sections/Contracts.tsx
@@ -1,12 +1,12 @@
 import React from "react";
 import { connect } from "react-redux";
 import ContractItem from "./ContractItem";
-import FormText from "components/form/FormText";
-import { getContentContracts } from "landUseContract/helpers";
-import { getFieldOptions } from "util/helpers";
-import { getAttributes, getCurrentLandUseContract } from "landUseContract/selectors";
+import FormText from "@/components/form/FormText";
+import { getContentContracts } from "@/landUseContract/helpers";
+import { getFieldOptions } from "@/util/helpers";
+import { getAttributes, getCurrentLandUseContract } from "@/landUseContract/selectors";
 import type { Attributes } from "types";
-import type { LandUseContract } from "landUseContract/types";
+import type { LandUseContract } from "@/landUseContract/types";
 type Props = {
   attributes: Attributes;
   currentLandUseContract: LandUseContract;
diff --git a/src/landUseContract/components/sections/ContractsEdit.tsx b/src/landUseContract/components/sections/ContractsEdit.tsx
index 44e9737b1..f1359d835 100644
--- a/src/landUseContract/components/sections/ContractsEdit.tsx
+++ b/src/landUseContract/components/sections/ContractsEdit.tsx
@@ -3,18 +3,18 @@ import { connect } from "react-redux";
 import { FieldArray, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButton from "components/form/AddButton";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButton from "@/components/form/AddButton";
 import ContractItemEdit from "./ContractItemEdit";
-import { receiveFormValidFlags } from "landUseContract/actions";
-import { ConfirmationModalTexts, FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import { getContentContracts } from "landUseContract/helpers";
-import { getFieldOptions } from "util/helpers";
-import { getAttributes, getCurrentLandUseContract, getErrorsByFormName, getIsSaveClicked } from "landUseContract/selectors";
-import { getDecisionOptions } from "landUseContract/helpers";
+import { receiveFormValidFlags } from "@/landUseContract/actions";
+import { ConfirmationModalTexts, FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { getContentContracts } from "@/landUseContract/helpers";
+import { getFieldOptions } from "@/util/helpers";
+import { getAttributes, getCurrentLandUseContract, getErrorsByFormName, getIsSaveClicked } from "@/landUseContract/selectors";
+import { getDecisionOptions } from "@/landUseContract/helpers";
 import type { Attributes } from "types";
-import type { LandUseContract } from "landUseContract/types";
+import type { LandUseContract } from "@/landUseContract/types";
 type ContractsProps = {
   attributes: Attributes;
   contractsData: Array<Record<string, any>>;
diff --git a/src/landUseContract/components/sections/CreateAndCreditInvoiceR.tsx b/src/landUseContract/components/sections/CreateAndCreditInvoiceR.tsx
index 0f9bb610a..ae9c5ae0a 100644
--- a/src/landUseContract/components/sections/CreateAndCreditInvoiceR.tsx
+++ b/src/landUseContract/components/sections/CreateAndCreditInvoiceR.tsx
@@ -3,27 +3,27 @@ import { connect } from "react-redux";
 import scrollToComponent from "react-scroll-to-component";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import AddButton from "components/form/AddButton";
-import Authorization from "components/authorization/Authorization";
-import Button from "components/button/Button";
+import AddButton from "@/components/form/AddButton";
+import Authorization from "@/components/authorization/Authorization";
+import Button from "@/components/button/Button";
 import CreditInvoiceForm from "./forms/CreditInvoiceForm";
 import NewInvoiceForm from "./forms/NewInvoiceForm";
-import { createCharge } from "landUseInvoices/actions";
-import { createInvoice, creditInvoice, deleteInvoice, receiveIsCreateClicked, receiveIsCreateInvoicePanelOpen, receiveIsCreditClicked, receiveIsCreditInvoicePanelOpen } from "landUseInvoices/actions";
-import { creditInvoiceSet } from "invoiceSets/actions";
-import { ButtonColors } from "components/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getPayloadCreditInvoice } from "invoices/helpers";
-import { getCreditInvoiceSetPayload } from "invoiceSets/helpers";
-import { getPayloadCreateInvoice } from "landUseContract/helpers";
-import { hasPermissions } from "util/helpers";
-import { getCurrentLandUseContract } from "landUseContract/selectors";
-import { getIsCreateInvoicePanelOpen, getIsCreditInvoicePanelOpen, getInvoicesByLandUseContractId } from "landUseInvoices/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { AppConsumer, ActionTypes } from "app/AppContext";
-import { ConfirmationModalTexts } from "enums";
-import type { LandUseContract } from "landUseInvoices/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import { createCharge } from "@/landUseInvoices/actions";
+import { createInvoice, creditInvoice, deleteInvoice, receiveIsCreateClicked, receiveIsCreateInvoicePanelOpen, receiveIsCreditClicked, receiveIsCreditInvoicePanelOpen } from "@/landUseInvoices/actions";
+import { creditInvoiceSet } from "@/invoiceSets/actions";
+import { ButtonColors } from "@/components/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getPayloadCreditInvoice } from "@/invoices/helpers";
+import { getCreditInvoiceSetPayload } from "@/invoiceSets/helpers";
+import { getPayloadCreateInvoice } from "@/landUseContract/helpers";
+import { hasPermissions } from "@/util/helpers";
+import { getCurrentLandUseContract } from "@/landUseContract/selectors";
+import { getIsCreateInvoicePanelOpen, getIsCreditInvoicePanelOpen, getInvoicesByLandUseContractId } from "@/landUseInvoices/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { AppConsumer, ActionTypes } from "@/app/AppContext";
+import { ConfirmationModalTexts } from "@/enums";
+import type { LandUseContract } from "@/landUseInvoices/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   createCharge: (...args: Array<any>) => any;
   createInvoice: (...args: Array<any>) => any;
diff --git a/src/landUseContract/components/sections/DecisionConditions.tsx b/src/landUseContract/components/sections/DecisionConditions.tsx
index 3e0f21c3d..d57adb2da 100644
--- a/src/landUseContract/components/sections/DecisionConditions.tsx
+++ b/src/landUseContract/components/sections/DecisionConditions.tsx
@@ -2,17 +2,17 @@ import React from "react";
 import { Row, Column } from "react-foundation";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import BoxItem from "components/content/BoxItem";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import Collapse from "components/collapse/Collapse";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import FormTitleAndText from "components/form/FormTitleAndText";
-import { receiveCollapseStates } from "landUseContract/actions";
-import { FormNames, ViewModes } from "enums";
-import { formatDate, getFieldOptions, getLabelOfOption } from "util/helpers";
-import { getCollapseStateByKey } from "landUseContract/selectors";
-import { withWindowResize } from "components/resize/WindowResizeHandler";
+import BoxItem from "@/components/content/BoxItem";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import Collapse from "@/components/collapse/Collapse";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import FormTitleAndText from "@/components/form/FormTitleAndText";
+import { receiveCollapseStates } from "@/landUseContract/actions";
+import { FormNames, ViewModes } from "@/enums";
+import { formatDate, getFieldOptions, getLabelOfOption } from "@/util/helpers";
+import { getCollapseStateByKey } from "@/landUseContract/selectors";
+import { withWindowResize } from "@/components/resize/WindowResizeHandler";
 import type { Attributes } from "types";
 type Props = {
   attributes: Attributes;
diff --git a/src/landUseContract/components/sections/DecisionItem.tsx b/src/landUseContract/components/sections/DecisionItem.tsx
index 7eee1ca1f..05e42bea7 100644
--- a/src/landUseContract/components/sections/DecisionItem.tsx
+++ b/src/landUseContract/components/sections/DecisionItem.tsx
@@ -1,14 +1,14 @@
 import React from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
-import Collapse from "components/collapse/Collapse";
+import Collapse from "@/components/collapse/Collapse";
 import DecisionConditions from "./DecisionConditions";
-import ExternalLink from "components/links/ExternalLink";
-import FormTitleAndText from "components/form/FormTitleAndText";
-import { receiveCollapseStates } from "landUseContract/actions";
-import { FormNames, ViewModes } from "enums";
-import { formatDate, getFieldOptions, getLabelOfOption, getReferenceNumberLink } from "util/helpers";
-import { getCollapseStateByKey } from "landUseContract/selectors";
+import ExternalLink from "@/components/links/ExternalLink";
+import FormTitleAndText from "@/components/form/FormTitleAndText";
+import { receiveCollapseStates } from "@/landUseContract/actions";
+import { FormNames, ViewModes } from "@/enums";
+import { formatDate, getFieldOptions, getLabelOfOption, getReferenceNumberLink } from "@/util/helpers";
+import { getCollapseStateByKey } from "@/landUseContract/selectors";
 import type { Attributes } from "types";
 type Props = {
   attributes: Attributes;
diff --git a/src/landUseContract/components/sections/DecisionItemEdit.tsx b/src/landUseContract/components/sections/DecisionItemEdit.tsx
index 8a8251863..84d672b5c 100644
--- a/src/landUseContract/components/sections/DecisionItemEdit.tsx
+++ b/src/landUseContract/components/sections/DecisionItemEdit.tsx
@@ -5,24 +5,24 @@ import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import ActionButtonWrapper from "components/form/ActionButtonWrapper";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import BoxItem from "components/content/BoxItem";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import Collapse from "components/collapse/Collapse";
-import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper";
-import FormField from "components/form/FormField";
-import FormTextTitle from "components/form/FormTextTitle";
-import RemoveButton from "components/form/RemoveButton";
-import { receiveCollapseStates } from "landUseContract/actions";
-import { ConfirmationModalTexts, FieldTypes, FormNames, ViewModes } from "enums";
-import { ButtonColors } from "components/enums";
-import { getFieldAttributes, getFieldOptions, getLabelOfOption, isFieldRequired } from "util/helpers";
-import { getCollapseStateByKey } from "landUseContract/selectors";
-import { referenceNumber } from "components/form/validations";
-import { withWindowResize } from "components/resize/WindowResizeHandler";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import ActionButtonWrapper from "@/components/form/ActionButtonWrapper";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import BoxItem from "@/components/content/BoxItem";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import Collapse from "@/components/collapse/Collapse";
+import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper";
+import FormField from "@/components/form/FormField";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import RemoveButton from "@/components/form/RemoveButton";
+import { receiveCollapseStates } from "@/landUseContract/actions";
+import { ConfirmationModalTexts, FieldTypes, FormNames, ViewModes } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { getFieldAttributes, getFieldOptions, getLabelOfOption, isFieldRequired } from "@/util/helpers";
+import { getCollapseStateByKey } from "@/landUseContract/selectors";
+import { referenceNumber } from "@/components/form/validations";
+import { withWindowResize } from "@/components/resize/WindowResizeHandler";
 import type { Attributes } from "types";
 type DecisionConditionsProps = {
   attributes: Attributes;
diff --git a/src/landUseContract/components/sections/Decisions.tsx b/src/landUseContract/components/sections/Decisions.tsx
index c835c9f74..e34d5b026 100644
--- a/src/landUseContract/components/sections/Decisions.tsx
+++ b/src/landUseContract/components/sections/Decisions.tsx
@@ -1,10 +1,10 @@
 import React from "react";
 import { connect } from "react-redux";
 import DecisionItem from "./DecisionItem";
-import { getContentDecisions } from "landUseContract/helpers";
-import { getAttributes, getCurrentLandUseContract } from "landUseContract/selectors";
+import { getContentDecisions } from "@/landUseContract/helpers";
+import { getAttributes, getCurrentLandUseContract } from "@/landUseContract/selectors";
 import type { Attributes } from "types";
-import type { LandUseContract } from "landUseContract/types";
+import type { LandUseContract } from "@/landUseContract/types";
 type Props = {
   attributes: Attributes;
   currentLandUseContract: LandUseContract;
diff --git a/src/landUseContract/components/sections/DecisionsEdit.tsx b/src/landUseContract/components/sections/DecisionsEdit.tsx
index ce3da30a6..534babd44 100644
--- a/src/landUseContract/components/sections/DecisionsEdit.tsx
+++ b/src/landUseContract/components/sections/DecisionsEdit.tsx
@@ -3,16 +3,16 @@ import { connect } from "react-redux";
 import { FieldArray, getFormValues, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButton from "components/form/AddButton";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButton from "@/components/form/AddButton";
 import DecisionItemEdit from "./DecisionItemEdit";
-import { receiveFormValidFlags } from "landUseContract/actions";
-import { ConfirmationModalTexts, FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import { getContentDecisions } from "landUseContract/helpers";
-import { getAttributes, getCurrentLandUseContract, getErrorsByFormName, getIsSaveClicked } from "landUseContract/selectors";
+import { receiveFormValidFlags } from "@/landUseContract/actions";
+import { ConfirmationModalTexts, FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { getContentDecisions } from "@/landUseContract/helpers";
+import { getAttributes, getCurrentLandUseContract, getErrorsByFormName, getIsSaveClicked } from "@/landUseContract/selectors";
 import type { Attributes } from "types";
-import type { LandUseContract } from "landUseContract/types";
+import type { LandUseContract } from "@/landUseContract/types";
 type DecisionsProps = {
   attributes: Attributes;
   decisionsData: Array<Record<string, any>>;
diff --git a/src/landUseContract/components/sections/InvoiceNotesR.tsx b/src/landUseContract/components/sections/InvoiceNotesR.tsx
index 8463e1a4a..8ec030a89 100644
--- a/src/landUseContract/components/sections/InvoiceNotesR.tsx
+++ b/src/landUseContract/components/sections/InvoiceNotesR.tsx
@@ -3,27 +3,27 @@ import { Row, Column } from "react-foundation";
 import { connect } from "react-redux";
 import { FieldArray, formValueSelector, reduxForm } from "redux-form";
 import flowRight from "lodash/flowRight";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButton from "components/form/AddButton";
-import Authorization from "components/authorization/Authorization";
-import Button from "components/button/Button";
-import ButtonWrapper from "components/content/ButtonWrapper";
-import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import ListItem from "components/content/ListItem";
-import ListItems from "components/content/ListItems";
-import RemoveButton from "components/form/RemoveButton";
-import { patchLeaseInvoiceNotes } from "leases/actions";
-import { ConfirmationModalTexts, FieldTypes, FormNames, Methods } from "enums";
-import { ButtonColors } from "components/enums";
-import { InvoiceNoteFieldPaths, InvoiceNoteFieldTitles } from "invoiceNote/enums";
-import { formatDate, getFieldAttributes, isFieldAllowedToRead, isMethodAllowed } from "util/helpers";
-import { getAttributes as getInvoiceNoteAttributes, getMethods as getInvoiceNoteMethods } from "invoiceNote/selectors";
-import { getCurrentLease } from "leases/selectors";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButton from "@/components/form/AddButton";
+import Authorization from "@/components/authorization/Authorization";
+import Button from "@/components/button/Button";
+import ButtonWrapper from "@/components/content/ButtonWrapper";
+import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import ListItem from "@/components/content/ListItem";
+import ListItems from "@/components/content/ListItems";
+import RemoveButton from "@/components/form/RemoveButton";
+import { patchLeaseInvoiceNotes } from "@/leases/actions";
+import { ConfirmationModalTexts, FieldTypes, FormNames, Methods } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { InvoiceNoteFieldPaths, InvoiceNoteFieldTitles } from "@/invoiceNote/enums";
+import { formatDate, getFieldAttributes, isFieldAllowedToRead, isMethodAllowed } from "@/util/helpers";
+import { getAttributes as getInvoiceNoteAttributes, getMethods as getInvoiceNoteMethods } from "@/invoiceNote/selectors";
+import { getCurrentLease } from "@/leases/selectors";
 import type { Attributes, Methods as MethodsType } from "types";
-import type { Lease } from "leases/types";
+import type { Lease } from "@/leases/types";
 type ReadOnlyProps = {
   invoiceNoteAttributes: Attributes;
   invoiceNotes: Array<Record<string, any>>;
diff --git a/src/landUseContract/components/sections/InvoicePanelR.tsx b/src/landUseContract/components/sections/InvoicePanelR.tsx
index 8aff982a4..4b4a5ca5d 100644
--- a/src/landUseContract/components/sections/InvoicePanelR.tsx
+++ b/src/landUseContract/components/sections/InvoicePanelR.tsx
@@ -2,19 +2,19 @@ import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import { getFormValues, isValid } from "redux-form";
 import isEmpty from "lodash/isEmpty";
-import Authorization from "components/authorization/Authorization";
-import Button from "components/button/Button";
+import Authorization from "@/components/authorization/Authorization";
+import Button from "@/components/button/Button";
 import EditInvoiceForm from "./forms/EditInvoiceForm";
 import InvoiceTemplateR from "./InvoiceTemplateR";
-import TablePanelContainer from "components/table/TablePanelContainer";
-import { receiveIsEditClicked } from "invoices/actions";
-import { FormNames, Methods } from "enums";
-import { ButtonColors } from "components/enums";
-import { isMethodAllowed } from "util/helpers";
-import { getInvoicesByLandUseContractId, getIsEditClicked, getMethods as getInvoiceMethods } from "landUseInvoices/selectors";
-import { getCurrentLandUseContract } from "landUseContract/selectors";
+import TablePanelContainer from "@/components/table/TablePanelContainer";
+import { receiveIsEditClicked } from "@/invoices/actions";
+import { FormNames, Methods } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { isMethodAllowed } from "@/util/helpers";
+import { getInvoicesByLandUseContractId, getIsEditClicked, getMethods as getInvoiceMethods } from "@/landUseInvoices/selectors";
+import { getCurrentLandUseContract } from "@/landUseContract/selectors";
 import type { Methods as MethodsType } from "types";
-import type { Invoice, InvoiceList } from "invoices/types";
+import type { Invoice, InvoiceList } from "@/invoices/types";
 type Props = {
   formValues: Record<string, any>;
   invoice: Invoice | null | undefined;
@@ -86,8 +86,10 @@ class InvoicePanelR extends PureComponent<Props, State> {
       interestInvoiceFor
     } = this.state;
     return <TablePanelContainer innerRef={this.setComponentRef} footer={invoice && !invoice.sap_id && <Authorization allow={isMethodAllowed(invoiceMethods, Methods.PATCH)}>
+            <>
             <Button className={ButtonColors.SECONDARY} onClick={onClose} text='Peruuta' />
             <Button className={ButtonColors.SUCCESS} disabled={isEditClicked || !valid} onClick={this.handleSave} text='Tallenna' />
+            </>
           </Authorization>} onClose={onClose} title='Laskun tiedot'>
         {isMethodAllowed(invoiceMethods, Methods.PATCH) && (!invoice || !invoice.sap_id) ? <EditInvoiceForm creditedInvoice={creditedInvoice} interestInvoiceFor={interestInvoiceFor} invoice={invoice} initialValues={{ ...invoice
       }} onInvoiceLinkClick={onInvoiceLinkClick} relativeTo={this.component} /> : <InvoiceTemplateR creditedInvoice={creditedInvoice} interestInvoiceFor={interestInvoiceFor} invoice={invoice} onInvoiceLinkClick={onInvoiceLinkClick} relativeTo={this.component} />}
diff --git a/src/landUseContract/components/sections/InvoiceTableAndPanelR.tsx b/src/landUseContract/components/sections/InvoiceTableAndPanelR.tsx
index 1aec18c4b..b638d3393 100644
--- a/src/landUseContract/components/sections/InvoiceTableAndPanelR.tsx
+++ b/src/landUseContract/components/sections/InvoiceTableAndPanelR.tsx
@@ -4,26 +4,26 @@ import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import { withRouter } from "react-router";
 import { initialize } from "redux-form";
-import AmountWithVat from "components/vat/AmountWithVat";
-import FormText from "components/form/FormText";
+import AmountWithVat from "@/components/vat/AmountWithVat";
+import FormText from "@/components/form/FormText";
 import InvoicePanelR from "./InvoicePanelR";
-import SingleRadioInput from "components/inputs/SingleRadioInput";
-import SortableTable from "components/table/SortableTable";
-import TableAndPanelWrapper from "components/table/TableAndPanelWrapper";
-import { clearPatchedInvoice, patchInvoice } from "landUseInvoices/actions";
-import { FormNames, KeyCodes, TableSortOrder } from "enums";
-import { getCurrentLandUseContract } from "landUseContract/selectors";
-import { InvoiceFieldPaths, InvoiceFieldTitles, InvoiceRowsFieldPaths, InvoiceRowsFieldTitles, InvoiceType } from "landUseInvoices/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getContactFullName } from "contacts/helpers";
-import { formatReceivableTypesString, getContentIncoive, getContentInvoices, getPayloadEditInvoice, isInvoiceOverdue } from "landUseInvoices/helpers";
-import { findReactById, formatDate, getFieldOptions, getLabelOfOption, hasPermissions, isFieldAllowedToRead, sortByOptionsAsc, sortByOptionsDesc, sortNumberByKeyAsc, sortNumberByKeyDesc, sortStringAsc, sortStringDesc } from "util/helpers";
-import { getAttributes as getInvoiceAttributes, getPatchedInvoice } from "landUseInvoices/selectors";
-import { getInvoicesByLandUseContractId } from "landUseInvoices/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import type { Invoice, InvoiceList } from "invoices/types";
+import SingleRadioInput from "@/components/inputs/SingleRadioInput";
+import SortableTable from "@/components/table/SortableTable";
+import TableAndPanelWrapper from "@/components/table/TableAndPanelWrapper";
+import { clearPatchedInvoice, patchInvoice } from "@/landUseInvoices/actions";
+import { FormNames, KeyCodes, TableSortOrder } from "@/enums";
+import { getCurrentLandUseContract } from "@/landUseContract/selectors";
+import { InvoiceFieldPaths, InvoiceFieldTitles, InvoiceRowsFieldPaths, InvoiceRowsFieldTitles, InvoiceType } from "@/landUseInvoices/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getContactFullName } from "@/contacts/helpers";
+import { formatReceivableTypesString, getContentIncoive, getContentInvoices, getPayloadEditInvoice, isInvoiceOverdue } from "@/landUseInvoices/helpers";
+import { findReactById, formatDate, getFieldOptions, getLabelOfOption, hasPermissions, isFieldAllowedToRead, sortByOptionsAsc, sortByOptionsDesc, sortNumberByKeyAsc, sortNumberByKeyDesc, sortStringAsc, sortStringDesc } from "@/util/helpers";
+import { getAttributes as getInvoiceAttributes, getPatchedInvoice } from "@/landUseInvoices/selectors";
+import { getInvoicesByLandUseContractId } from "@/landUseInvoices/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import type { Invoice, InvoiceList } from "@/invoices/types";
 import type { Attributes } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   clearPatchedInvoice: (...args: Array<any>) => any;
   initialize: (...args: Array<any>) => any;
diff --git a/src/landUseContract/components/sections/InvoiceTemplateR.tsx b/src/landUseContract/components/sections/InvoiceTemplateR.tsx
index 25847b816..2dd9af266 100644
--- a/src/landUseContract/components/sections/InvoiceTemplateR.tsx
+++ b/src/landUseContract/components/sections/InvoiceTemplateR.tsx
@@ -2,19 +2,19 @@ import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import AmountWithVat from "components/vat/AmountWithVat";
-import Authorization from "components/authorization/Authorization";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
+import AmountWithVat from "@/components/vat/AmountWithVat";
+import Authorization from "@/components/authorization/Authorization";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
 import InvoiceRows from "./forms/InvoiceRows";
-import ListItem from "components/content/ListItem";
-import ListItems from "components/content/ListItems";
-import SubTitle from "components/content/SubTitle";
-import { InvoiceCreditInvoicesFieldPaths, InvoiceCreditInvoicesFieldTitles, InvoiceFieldPaths, InvoiceFieldTitles, InvoiceInterestInvoicesFieldPaths, InvoiceInterestInvoicesFieldTitles, InvoicePaymentsFieldPaths, InvoicePaymentsFieldTitles, InvoiceRowsFieldPaths, InvoiceType } from "invoices/enums";
-import { getUiDataInvoiceKey } from "uiData/helpers";
-import { formatDate, formatDateRange, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "util/helpers";
-import { getContactFullName } from "contacts/helpers";
-import { getAttributes as getInvoiceAttributes } from "invoices/selectors";
+import ListItem from "@/components/content/ListItem";
+import ListItems from "@/components/content/ListItems";
+import SubTitle from "@/components/content/SubTitle";
+import { InvoiceCreditInvoicesFieldPaths, InvoiceCreditInvoicesFieldTitles, InvoiceFieldPaths, InvoiceFieldTitles, InvoiceInterestInvoicesFieldPaths, InvoiceInterestInvoicesFieldTitles, InvoicePaymentsFieldPaths, InvoicePaymentsFieldTitles, InvoiceRowsFieldPaths, InvoiceType } from "@/invoices/enums";
+import { getUiDataInvoiceKey } from "@/uiData/helpers";
+import { formatDate, formatDateRange, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers";
+import { getContactFullName } from "@/contacts/helpers";
+import { getAttributes as getInvoiceAttributes } from "@/invoices/selectors";
 import type { Attributes } from "types";
 type Props = {
   creditedInvoice: Record<string, any> | null | undefined;
@@ -70,90 +70,110 @@ const InvoiceTemplateR = ({
       <Row>
         <Column small={8}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.RECIPIENT)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.RECIPIENT)}>
               {InvoiceFieldTitles.RECIPIENT}
             </FormTextTitle>
             <FormText>{invoice ? getContactFullName(invoice.recipientFull) : '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.NUMBER)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.NUMBER)}>
               {InvoiceFieldTitles.NUMBER}
             </FormTextTitle>
             <FormText>{invoice && invoice.number || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.SENT_TO_SAP_AT)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.SENT_TO_SAP_AT)}>
               {InvoiceFieldTitles.SENT_TO_SAP_AT}
             </FormTextTitle>
             <FormText>{invoice && formatDate(invoice.sent_to_sap_at) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.DUE_DATE)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.DUE_DATE)}>
               {InvoiceFieldTitles.DUE_DATE}
             </FormTextTitle>
             <FormText>{invoice && formatDate(invoice.due_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.ADJUSTED_DUE_DATE)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.ADJUSTED_DUE_DATE)}>
               {InvoiceFieldTitles.ADJUSTED_DUE_DATE}
             </FormTextTitle>
             <FormText>{invoice && formatDate(invoice.adjusted_due_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.INVOICING_DATE)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.INVOICING_DATE)}>
               {InvoiceFieldTitles.INVOICING_DATE}
             </FormTextTitle>
             <FormText>{invoice && formatDate(invoice.invoicing_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.STATE)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.STATE)}>
               {InvoiceFieldTitles.STATE}
             </FormTextTitle>
             <FormText>{invoice && getLabelOfOption(stateOptions, invoice.state) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.BILLING_PERIOD_END_DATE) || isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.BILLING_PERIOD_START_DATE)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.BILLING_PERIOD)}>
               {InvoiceFieldTitles.BILLING_PERIOD}
             </FormTextTitle>
             <FormText>{invoice && formatDateRange(invoice.billing_period_start_date, invoice.billing_period_end_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.POSTPONE_DATE)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.POSTPONE_DATE)}>
               {InvoiceFieldTitles.POSTPONE_DATE}
             </FormTextTitle>
             <FormText>{invoice && formatDate(invoice.postpone_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.TOTAL_AMOUNT)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.TOTAL_AMOUNT)}>
               {InvoiceFieldTitles.TOTAL_AMOUNT}
             </FormTextTitle>
             <FormText>{invoice && !isEmptyValue(invoice.total_amount) ? <AmountWithVat amount={invoice.total_amount} date={invoice.due_date} /> : '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={4}>
@@ -164,11 +184,13 @@ const InvoiceTemplateR = ({
         </Column>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.BILLED_AMOUNT)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.BILLED_AMOUNT)}>
               {InvoiceFieldTitles.BILLED_AMOUNT}
             </FormTextTitle>
             <FormText>{invoice && !isEmptyValue(invoice.billed_amount) ? <AmountWithVat amount={invoice.billed_amount} date={invoice.due_date} /> : '-'}
             </FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
@@ -180,7 +202,7 @@ const InvoiceTemplateR = ({
           <Row>
             <Column small={12} medium={8}>
               <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoicePaymentsFieldPaths.PAYMENTS)}>
-
+                <>
                 {!payments.length && <FormText>Ei maksuja</FormText>}
                 {!!payments.length && <ListItems>
                     <Row>
@@ -215,15 +237,18 @@ const InvoiceTemplateR = ({
                         </Row>;
               })}
                   </ListItems>}
+                </>
               </Authorization>
             </Column>
             <Column small={6} medium={4}>
               <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.OUTSTANDING_AMOUNT)}>
+                <>
                 <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.OUTSTANDING_AMOUNT)}>
                   {InvoiceFieldTitles.OUTSTANDING_AMOUNT}
                 </FormTextTitle>
                 <FormText>{invoice && !isEmptyValue(invoice.outstanding_amount) ? <AmountWithVat amount={invoice.outstanding_amount} date={invoice.due_date} /> : '-'}
                 </FormText>
+                </>
               </Authorization>
             </Column>
           </Row>
@@ -231,26 +256,32 @@ const InvoiceTemplateR = ({
       {showOldInvoiceInfo && <Row>
           <Column small={4}>
             <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.PAYMENT_NOTIFICATION_DATE)}>
+              <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.PAYMENT_NOTIFICATION_DATE)}>
                 {InvoiceFieldTitles.PAYMENT_NOTIFICATION_DATE}
               </FormTextTitle>
               <FormText>{invoice && formatDate(invoice.payment_notification_date) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={4}>
             <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.COLLECTION_CHARGE)}>
+              <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.COLLECTION_CHARGE)}>
                 {InvoiceFieldTitles.COLLECTION_CHARGE}
               </FormTextTitle>
               <FormText>{invoice && !isEmptyValue(invoice.collection_charge) ? `${formatNumber(invoice.collection_charge)} €` : '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={4}>
             <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.PAYMENT_NOTIFICATION_CATALOG_DATE)}>
+              <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.PAYMENT_NOTIFICATION_CATALOG_DATE)}>
                 {InvoiceFieldTitles.PAYMENT_NOTIFICATION_CATALOG_DATE}
               </FormTextTitle>
               <FormText>{invoice && formatDate(invoice.payment_notification_catalog_date) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
         </Row>}
@@ -258,45 +289,55 @@ const InvoiceTemplateR = ({
       <Row>
         <Column small={4}>
           {showOldInvoiceInfo && <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.DELIVERY_METHOD)}>
+            <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.DELIVERY_METHOD)}>
                 {InvoiceFieldTitles.DELIVERY_METHOD}
               </FormTextTitle>
               <FormText>{invoice && getLabelOfOption(deliveryMethodOptions, invoice.delivery_method) || '-'}</FormText>
+            </>
             </Authorization>}
         </Column>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.TYPE)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.TYPE)}>
               {InvoiceFieldTitles.TYPE}
             </FormTextTitle>
             <FormText>{invoice && getLabelOfOption(typeOptions, invoice.type) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={4}>
           {creditedInvoice && <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.CREDITED_INVOICE)}>
+            <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.CREDITED_INVOICE)}>
                 {InvoiceFieldTitles.CREDITED_INVOICE}
               </FormTextTitle>
               <FormText>{<a className='no-margin' onKeyDown={handleCreditedInvoiceKeyDown} onClick={handleCreditedInvoiceClick} tabIndex={0}>{creditedInvoice.number ? creditedInvoice.number : 'Numeroimaton'}</a>}</FormText>
+            </>
             </Authorization>}
         </Column>
         <Column small={4}>
           {interestInvoiceFor && <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.INTEREST_INVOICE_FOR)}>
+              <>
               <FormTextTitle relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.INTEREST_INVOICE_FOR)}>
                 {InvoiceFieldTitles.INTEREST_INVOICE_FOR}
               </FormTextTitle>
               <FormText>{<a className='no-margin' onKeyDown={handleInterestInvoiceForKeyDown} onClick={handleInterestInvoiceForClick} tabIndex={0}>{interestInvoiceFor.number ? interestInvoiceFor.number : 'Numeroimaton'}</a>}
               </FormText>
+              </>
             </Authorization>}
         </Column>
       </Row>
       <Row>
         <Column small={12}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.NOTES)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.NOTES)}>
               {InvoiceFieldTitles.NOTES}
             </FormTextTitle>
             <FormText>{invoice && invoice.notes || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
diff --git a/src/landUseContract/components/sections/Invoices.tsx b/src/landUseContract/components/sections/Invoices.tsx
index 6a7616a3b..ab7d9fdd4 100644
--- a/src/landUseContract/components/sections/Invoices.tsx
+++ b/src/landUseContract/components/sections/Invoices.tsx
@@ -1,14 +1,14 @@
 import React from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
-import FormTextTitle from "components/form/FormTextTitle";
-import GreenBox from "components/content/GreenBox";
-import ListItem from "components/content/ListItem";
-import ListItems from "components/content/ListItems";
-import { getContentInvoices } from "landUseContract/helpers";
-import { formatDate, formatNumber } from "util/helpers";
-import { getCurrentLandUseContract } from "landUseContract/selectors";
-import type { LandUseContract } from "landUseContract/types";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import GreenBox from "@/components/content/GreenBox";
+import ListItem from "@/components/content/ListItem";
+import ListItems from "@/components/content/ListItems";
+import { getContentInvoices } from "@/landUseContract/helpers";
+import { formatDate, formatNumber } from "@/util/helpers";
+import { getCurrentLandUseContract } from "@/landUseContract/selectors";
+import type { LandUseContract } from "@/landUseContract/types";
 type Props = {
   currentLandUseContract: LandUseContract;
 };
diff --git a/src/landUseContract/components/sections/InvoicesEdit.tsx b/src/landUseContract/components/sections/InvoicesEdit.tsx
index ebce43c99..811b508cc 100644
--- a/src/landUseContract/components/sections/InvoicesEdit.tsx
+++ b/src/landUseContract/components/sections/InvoicesEdit.tsx
@@ -4,17 +4,17 @@ import { FieldArray, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
 import get from "lodash/get";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButtonThird from "components/form/AddButtonThird";
-import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper";
-import FormField from "components/form/FormField";
-import FormTextTitle from "components/form/FormTextTitle";
-import GreenBox from "components/content/GreenBox";
-import RemoveButton from "../../../components/form/RemoveButton";
-import { receiveFormValidFlags } from "landUseContract/actions";
-import { ConfirmationModalTexts, FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import { getAttributes, getIsSaveClicked } from "landUseContract/selectors";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper";
+import FormField from "@/components/form/FormField";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import GreenBox from "@/components/content/GreenBox";
+import RemoveButton from "@/../../components/form/RemoveButton";
+import { receiveFormValidFlags } from "@/landUseContract/actions";
+import { ConfirmationModalTexts, FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { getAttributes, getIsSaveClicked } from "@/landUseContract/selectors";
 import type { Attributes } from "types";
 type InvoicesProps = {
   attributes: Attributes;
diff --git a/src/landUseContract/components/sections/InvoicesR.tsx b/src/landUseContract/components/sections/InvoicesR.tsx
index 6eefd1c59..3cfb96e36 100644
--- a/src/landUseContract/components/sections/InvoicesR.tsx
+++ b/src/landUseContract/components/sections/InvoicesR.tsx
@@ -3,25 +3,25 @@ import { connect } from "react-redux";
 import { withRouter } from "react-router";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import { AppConsumer } from "app/AppContext";
-import Authorization from "components/authorization/Authorization";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import Collapse from "components/collapse/Collapse";
+import { AppConsumer } from "@/app/AppContext";
+import Authorization from "@/components/authorization/Authorization";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import Collapse from "@/components/collapse/Collapse";
 import CreateAndCreditInvoiceR from "./CreateAndCreditInvoiceR";
-import Divider from "components/content/Divider";
+import Divider from "@/components/content/Divider";
 import InvoiceTableAndPanelR from "./InvoiceTableAndPanelR";
-import Title from "components/content/Title";
-import { receiveCollapseStates, receiveInvoiceToCredit } from "landUseInvoices/actions";
-import { PermissionMissingTexts, ViewModes } from "enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { hasPermissions } from "util/helpers";
-import { LeaseInvoicingFieldTitles } from "leases/enums";
+import Title from "@/components/content/Title";
+import { receiveCollapseStates, receiveInvoiceToCredit } from "@/landUseInvoices/actions";
+import { PermissionMissingTexts, ViewModes } from "@/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { hasPermissions } from "@/util/helpers";
+import { LeaseInvoicingFieldTitles } from "@/leases/enums";
 // TODO
-import { getCurrentLandUseContract } from "landUseContract/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import type { LandUseContract } from "landUseContract/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
-import { getInvoiceToCredit } from "landUseInvoices/selectors";
+import { getCurrentLandUseContract } from "@/landUseContract/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import type { LandUseContract } from "@/landUseContract/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
+import { getInvoiceToCredit } from "@/landUseInvoices/selectors";
 type Props = {
   currentLandUseContract: LandUseContract;
   invoicesCollapseState: boolean;
diff --git a/src/landUseContract/components/sections/LandUseContractMap.tsx b/src/landUseContract/components/sections/LandUseContractMap.tsx
index 8f59ce25c..eabbf69cf 100644
--- a/src/landUseContract/components/sections/LandUseContractMap.tsx
+++ b/src/landUseContract/components/sections/LandUseContractMap.tsx
@@ -2,16 +2,16 @@ import React, { Component } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import AreaNotesEditMap from "areaNote/components/AreaNotesEditMap";
-import AreaNotesLayer from "areaNote/components/AreaNotesLayer";
-import { fetchAreaNoteList } from "areaNote/actions";
-import { UsersPermissions } from "usersPermissions/enums";
-import { hasPermissions } from "util/helpers";
-import { getAreaNoteList } from "areaNote/selectors";
-import { getAttributes as getRentBasisAttributes, getRentBasis } from "rentbasis/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import type { AreaNoteList } from "areaNote/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import AreaNotesEditMap from "@/areaNote/components/AreaNotesEditMap";
+import AreaNotesLayer from "@/areaNote/components/AreaNotesLayer";
+import { fetchAreaNoteList } from "@/areaNote/actions";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { hasPermissions } from "@/util/helpers";
+import { getAreaNoteList } from "@/areaNote/selectors";
+import { getAttributes as getRentBasisAttributes, getRentBasis } from "@/rentbasis/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import type { AreaNoteList } from "@/areaNote/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   areaNotes: AreaNoteList;
   fetchAreaNoteList: (...args: Array<any>) => any;
diff --git a/src/landUseContract/components/sections/Litigant.tsx b/src/landUseContract/components/sections/Litigant.tsx
index defc42aa9..ec267bd2c 100644
--- a/src/landUseContract/components/sections/Litigant.tsx
+++ b/src/landUseContract/components/sections/Litigant.tsx
@@ -2,15 +2,15 @@ import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import get from "lodash/get";
 import { Column } from "react-foundation";
-import Collapse from "components/collapse/Collapse";
-import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle";
+import Collapse from "@/components/collapse/Collapse";
+import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle";
 import LitigantBillingPerson from "./LitigantBillingPerson";
 import LitigantItem from "./LitigantItem";
-import { receiveCollapseStates } from "landUseContract/actions";
-import { FormNames, ViewModes } from "enums";
-import { getContactFullName } from "contacts/helpers";
-import { formatDateRange, isActive, isArchived } from "util/helpers";
-import { getCollapseStateByKey } from "landUseContract/selectors";
+import { receiveCollapseStates } from "@/landUseContract/actions";
+import { FormNames, ViewModes } from "@/enums";
+import { getContactFullName } from "@/contacts/helpers";
+import { formatDateRange, isActive, isArchived } from "@/util/helpers";
+import { getCollapseStateByKey } from "@/landUseContract/selectors";
 type Props = {
   collapseState: boolean;
   litigant: Record<string, any>;
diff --git a/src/landUseContract/components/sections/LitigantBillingPerson.tsx b/src/landUseContract/components/sections/LitigantBillingPerson.tsx
index 11d3b6bf8..39fd929c4 100644
--- a/src/landUseContract/components/sections/LitigantBillingPerson.tsx
+++ b/src/landUseContract/components/sections/LitigantBillingPerson.tsx
@@ -1,21 +1,21 @@
 import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
-import Collapse from "components/collapse/Collapse";
-import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle";
-import ContactTemplate from "contacts/components/templates/ContactTemplate";
-import ExternalLink from "components/links/ExternalLink";
-import FormTitleAndText from "components/form/FormTitleAndText";
-import FormWrapper from "components/form/FormWrapper";
-import FormWrapperLeft from "components/form/FormWrapperLeft";
-import FormWrapperRight from "components/form/FormWrapperRight";
-import SubTitle from "components/content/SubTitle";
-import { receiveCollapseStates } from "landUseContract/actions";
-import { FormNames, ViewModes } from "enums";
-import { getContactFullName } from "contacts/helpers";
-import { formatDate, formatDateRange, isActive, isArchived } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getCollapseStateByKey } from "landUseContract/selectors";
+import Collapse from "@/components/collapse/Collapse";
+import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle";
+import ContactTemplate from "@/contacts/components/templates/ContactTemplate";
+import ExternalLink from "@/components/links/ExternalLink";
+import FormTitleAndText from "@/components/form/FormTitleAndText";
+import FormWrapper from "@/components/form/FormWrapper";
+import FormWrapperLeft from "@/components/form/FormWrapperLeft";
+import FormWrapperRight from "@/components/form/FormWrapperRight";
+import SubTitle from "@/components/content/SubTitle";
+import { receiveCollapseStates } from "@/landUseContract/actions";
+import { FormNames, ViewModes } from "@/enums";
+import { getContactFullName } from "@/contacts/helpers";
+import { formatDate, formatDateRange, isActive, isArchived } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getCollapseStateByKey } from "@/landUseContract/selectors";
 type Props = {
   billingPerson: Record<string, any>;
   collapseState: boolean;
diff --git a/src/landUseContract/components/sections/LitigantBillingPersonEdit.tsx b/src/landUseContract/components/sections/LitigantBillingPersonEdit.tsx
index eb8a0c9fd..145400181 100644
--- a/src/landUseContract/components/sections/LitigantBillingPersonEdit.tsx
+++ b/src/landUseContract/components/sections/LitigantBillingPersonEdit.tsx
@@ -4,22 +4,22 @@ import { Row, Column } from "react-foundation";
 import { connect } from "react-redux";
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
-import AddButtonThird from "components/form/AddButtonThird";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import Collapse from "components/collapse/Collapse";
-import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle";
-import ContactTemplate from "contacts/components/templates/ContactTemplate";
-import EditButton from "components/form/EditButton";
-import FormField from "components/form/FormField";
-import FormWrapper from "components/form/FormWrapper";
-import FormWrapperLeft from "components/form/FormWrapperLeft";
-import FormWrapperRight from "components/form/FormWrapperRight";
-import SubTitle from "components/content/SubTitle";
-import { initializeContactForm, receiveContactModalSettings, receiveIsSaveClicked, showContactModal } from "contacts/actions";
-import { receiveCollapseStates } from "landUseContract/actions";
-import { FieldTypes, FormNames, ViewModes } from "enums";
-import { findItemById, formatDateRange, getFieldAttributes, isActive, isArchived } from "util/helpers";
-import { getAttributes, getCollapseStateByKey, getErrorsByFormName, getIsSaveClicked } from "landUseContract/selectors";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import Collapse from "@/components/collapse/Collapse";
+import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle";
+import ContactTemplate from "@/contacts/components/templates/ContactTemplate";
+import EditButton from "@/components/form/EditButton";
+import FormField from "@/components/form/FormField";
+import FormWrapper from "@/components/form/FormWrapper";
+import FormWrapperLeft from "@/components/form/FormWrapperLeft";
+import FormWrapperRight from "@/components/form/FormWrapperRight";
+import SubTitle from "@/components/content/SubTitle";
+import { initializeContactForm, receiveContactModalSettings, receiveIsSaveClicked, showContactModal } from "@/contacts/actions";
+import { receiveCollapseStates } from "@/landUseContract/actions";
+import { FieldTypes, FormNames, ViewModes } from "@/enums";
+import { findItemById, formatDateRange, getFieldAttributes, isActive, isArchived } from "@/util/helpers";
+import { getAttributes, getCollapseStateByKey, getErrorsByFormName, getIsSaveClicked } from "@/landUseContract/selectors";
 import type { Attributes } from "types";
 type Props = {
   attributes: Attributes;
diff --git a/src/landUseContract/components/sections/LitigantItem.tsx b/src/landUseContract/components/sections/LitigantItem.tsx
index 9327ce8fc..16600cb89 100644
--- a/src/landUseContract/components/sections/LitigantItem.tsx
+++ b/src/landUseContract/components/sections/LitigantItem.tsx
@@ -1,16 +1,16 @@
 import React, { Fragment } from "react";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
-import ContactTemplate from "contacts/components/templates/ContactTemplate";
-import ExternalLink from "components/links/ExternalLink";
-import FormTitleAndText from "components/form/FormTitleAndText";
-import FormWrapper from "components/form/FormWrapper";
-import FormWrapperLeft from "components/form/FormWrapperLeft";
-import FormWrapperRight from "components/form/FormWrapperRight";
-import SubTitle from "components/content/SubTitle";
-import { getContactFullName } from "contacts/helpers";
-import { formatDate } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
+import ContactTemplate from "@/contacts/components/templates/ContactTemplate";
+import ExternalLink from "@/components/links/ExternalLink";
+import FormTitleAndText from "@/components/form/FormTitleAndText";
+import FormWrapper from "@/components/form/FormWrapper";
+import FormWrapperLeft from "@/components/form/FormWrapperLeft";
+import FormWrapperRight from "@/components/form/FormWrapperRight";
+import SubTitle from "@/components/content/SubTitle";
+import { getContactFullName } from "@/contacts/helpers";
+import { formatDate } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
 type Props = {
   contact: Record<string, any> | null | undefined;
   litigant: Record<string, any>;
diff --git a/src/landUseContract/components/sections/LitigantItemEdit.tsx b/src/landUseContract/components/sections/LitigantItemEdit.tsx
index d91a37970..e4858f5cb 100644
--- a/src/landUseContract/components/sections/LitigantItemEdit.tsx
+++ b/src/landUseContract/components/sections/LitigantItemEdit.tsx
@@ -4,26 +4,26 @@ import { FieldArray, formValueSelector } from "redux-form";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import AddButtonThird from "components/form/AddButtonThird";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import Collapse from "components/collapse/Collapse";
-import ContactTemplate from "contacts/components/templates/ContactTemplate";
-import EditButton from "components/form/EditButton";
-import FormField from "components/form/FormField";
-import FormWrapper from "components/form/FormWrapper";
-import FormWrapperLeft from "components/form/FormWrapperLeft";
-import FormWrapperRight from "components/form/FormWrapperRight";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import Collapse from "@/components/collapse/Collapse";
+import ContactTemplate from "@/contacts/components/templates/ContactTemplate";
+import EditButton from "@/components/form/EditButton";
+import FormField from "@/components/form/FormField";
+import FormWrapper from "@/components/form/FormWrapper";
+import FormWrapperLeft from "@/components/form/FormWrapperLeft";
+import FormWrapperRight from "@/components/form/FormWrapperRight";
 import LitigantBillingPersonEdit from "./LitigantBillingPersonEdit";
-import SubTitle from "components/content/SubTitle";
-import { initializeContactForm, receiveContactModalSettings, receiveIsSaveClicked, showContactModal } from "contacts/actions";
-import { receiveCollapseStates } from "landUseContract/actions";
-import { ConfirmationModalTexts, FieldTypes, FormNames, ViewModes } from "enums";
-import { ButtonColors } from "components/enums";
-import { getContactFullName } from "contacts/helpers";
-import { findItemById, isActive, isArchived } from "util/helpers";
-import { getAttributes, getCollapseStateByKey, getErrorsByFormName, getIsSaveClicked } from "landUseContract/selectors";
+import SubTitle from "@/components/content/SubTitle";
+import { initializeContactForm, receiveContactModalSettings, receiveIsSaveClicked, showContactModal } from "@/contacts/actions";
+import { receiveCollapseStates } from "@/landUseContract/actions";
+import { ConfirmationModalTexts, FieldTypes, FormNames, ViewModes } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { getContactFullName } from "@/contacts/helpers";
+import { findItemById, isActive, isArchived } from "@/util/helpers";
+import { getAttributes, getCollapseStateByKey, getErrorsByFormName, getIsSaveClicked } from "@/landUseContract/selectors";
 import type { Attributes } from "types";
 type BillingPersonsProps = {
   fields: any;
diff --git a/src/landUseContract/components/sections/Litigants.tsx b/src/landUseContract/components/sections/Litigants.tsx
index 026049301..0dabf92de 100644
--- a/src/landUseContract/components/sections/Litigants.tsx
+++ b/src/landUseContract/components/sections/Litigants.tsx
@@ -1,15 +1,15 @@
 import React, { Fragment, PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import FormText from "components/form/FormText";
+import FormText from "@/components/form/FormText";
 import Litigant from "./Litigant";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import { isArchived } from "util/helpers";
-import { getContentLitigants } from "landUseContract/helpers";
-import { getCurrentLandUseContract } from "landUseContract/selectors";
-import { withContactAttributes } from "components/attributes/ContactAttributes";
-import type { LandUseContract } from "landUseContract/types";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import { isArchived } from "@/util/helpers";
+import { getContentLitigants } from "@/landUseContract/helpers";
+import { getCurrentLandUseContract } from "@/landUseContract/selectors";
+import { withContactAttributes } from "@/components/attributes/ContactAttributes";
+import type { LandUseContract } from "@/landUseContract/types";
 type Props = {
   currentLandUseContract: LandUseContract;
   isFetchingContactAttributes: boolean;
diff --git a/src/landUseContract/components/sections/LitigantsEdit.tsx b/src/landUseContract/components/sections/LitigantsEdit.tsx
index 2ab3bb730..f3fa92b1f 100644
--- a/src/landUseContract/components/sections/LitigantsEdit.tsx
+++ b/src/landUseContract/components/sections/LitigantsEdit.tsx
@@ -3,27 +3,27 @@ import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
 import { FieldArray, getFormValues, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButton from "components/form/AddButton";
-import ContactModal from "contacts/components/ContactModal";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButton from "@/components/form/AddButton";
+import ContactModal from "@/contacts/components/ContactModal";
 import LitigantItemEdit from "./LitigantItemEdit";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import { createContactOnModal as createContact, editContactOnModal as editContact, hideContactModal, receiveContactModalSettings, receiveIsSaveClicked } from "contacts/actions";
-import { receiveFormValidFlags } from "landUseContract/actions";
-import { ConfirmationModalTexts, FormNames } from "enums";
-import { ContactTypes } from "contacts/enums";
-import { ButtonColors } from "components/enums";
-import { validateLitigantForm } from "landUseContract/formValidators";
-import { getContentContact } from "contacts/helpers";
-import { getContentLitigants } from "landUseContract/helpers";
-import { isEmptyValue } from "util/helpers";
-import { contactExists } from "contacts/requestsAsync";
-import { getContactModalSettings, getIsContactFormValid, getIsContactModalOpen, getIsFetching as getIsFetchingContact } from "contacts/selectors";
-import { getCurrentLandUseContract } from "landUseContract/selectors";
-import { withContactAttributes } from "components/attributes/ContactAttributes";
-import type { ContactModalSettings } from "contacts/types";
-import type { LandUseContract } from "landUseContract/types";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import { createContactOnModal as createContact, editContactOnModal as editContact, hideContactModal, receiveContactModalSettings, receiveIsSaveClicked } from "@/contacts/actions";
+import { receiveFormValidFlags } from "@/landUseContract/actions";
+import { ConfirmationModalTexts, FormNames } from "@/enums";
+import { ContactTypes } from "@/contacts/enums";
+import { ButtonColors } from "@/components/enums";
+import { validateLitigantForm } from "@/landUseContract/formValidators";
+import { getContentContact } from "@/contacts/helpers";
+import { getContentLitigants } from "@/landUseContract/helpers";
+import { isEmptyValue } from "@/util/helpers";
+import { contactExists } from "@/contacts/requestsAsync";
+import { getContactModalSettings, getIsContactFormValid, getIsContactModalOpen, getIsFetching as getIsFetchingContact } from "@/contacts/selectors";
+import { getCurrentLandUseContract } from "@/landUseContract/selectors";
+import { withContactAttributes } from "@/components/attributes/ContactAttributes";
+import type { ContactModalSettings } from "@/contacts/types";
+import type { LandUseContract } from "@/landUseContract/types";
 type LitigantsProps = {
   archived: boolean;
   fields: any;
diff --git a/src/landUseContract/components/sections/UnitPricesUsedInCalculations.tsx b/src/landUseContract/components/sections/UnitPricesUsedInCalculations.tsx
index 9b7568240..82c34a0b7 100644
--- a/src/landUseContract/components/sections/UnitPricesUsedInCalculations.tsx
+++ b/src/landUseContract/components/sections/UnitPricesUsedInCalculations.tsx
@@ -3,12 +3,12 @@ import { connect } from "react-redux";
 import { formValueSelector, change } from "redux-form";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
-import FormField from "components/form/FormField";
-import RemoveButton from "components/form/RemoveButton";
+import FormField from "@/components/form/FormField";
+import RemoveButton from "@/components/form/RemoveButton";
 import type { Attributes } from "types";
-import { getUsedPrice, getSum } from "landUseContract/helpers";
-import FormText from "components/form/FormText";
-import { formatNumber } from "util/helpers";
+import { getUsedPrice, getSum } from "@/landUseContract/helpers";
+import FormText from "@/components/form/FormText";
+import { formatNumber } from "@/util/helpers";
 type Props = {
   attributes: Attributes;
   field: any;
diff --git a/src/landUseContract/components/sections/Warrants.tsx b/src/landUseContract/components/sections/Warrants.tsx
index af91718f1..ed2e17914 100644
--- a/src/landUseContract/components/sections/Warrants.tsx
+++ b/src/landUseContract/components/sections/Warrants.tsx
@@ -2,15 +2,15 @@ import React from "react";
 import { Row, Column } from "react-foundation";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import FormTextTitle from "components/form/FormTextTitle";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import Collapse from "components/collapse/Collapse";
-import FormText from "components/form/FormText";
-import { receiveCollapseStates } from "landUseContract/actions";
-import { FormNames, ViewModes } from "enums";
-import { formatDate, formatNumber, isEmptyValue, getFieldOptions, getLabelOfOption } from "util/helpers";
-import { getCollapseStateByKey } from "landUseContract/selectors";
-import { withWindowResize } from "components/resize/WindowResizeHandler";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import Collapse from "@/components/collapse/Collapse";
+import FormText from "@/components/form/FormText";
+import { receiveCollapseStates } from "@/landUseContract/actions";
+import { FormNames, ViewModes } from "@/enums";
+import { formatDate, formatNumber, isEmptyValue, getFieldOptions, getLabelOfOption } from "@/util/helpers";
+import { getCollapseStateByKey } from "@/landUseContract/selectors";
+import { withWindowResize } from "@/components/resize/WindowResizeHandler";
 import type { Attributes } from "types";
 type Props = {
   attributes: Attributes;
diff --git a/src/landUseContract/components/sections/forms/CreditInvoiceForm.tsx b/src/landUseContract/components/sections/forms/CreditInvoiceForm.tsx
index cd6716f09..a427d1578 100644
--- a/src/landUseContract/components/sections/forms/CreditInvoiceForm.tsx
+++ b/src/landUseContract/components/sections/forms/CreditInvoiceForm.tsx
@@ -3,21 +3,21 @@ import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import { formValueSelector, getFormValues, reduxForm } from "redux-form";
 import flowRight from "lodash/flowRight";
-import Authorization from "components/authorization/Authorization";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import Button from "components/button/Button";
-import CloseButton from "components/button/CloseButton";
-import FormField from "components/form/FormField";
-import WhiteBox from "components/content/WhiteBox";
-import { receiveIsCreditClicked } from "invoices/actions";
-import { CreditInvoiceOptions, CreditInvoiceSetOptions } from "landUseContract/constants";
-import { FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import { InvoiceFieldPaths, InvoiceFieldTitles, InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "landUseInvoices/enums";
-import { CreditInvoiceOptions as CreditInvoiceOptionsEnum } from "landUseContract/enums";
-import { getUiDataCreditInvoiceKey } from "uiData/helpers";
-import { addEmptyOption, getFieldAttributes, getFieldOptions, getLabelOfOption, isFieldAllowedToEdit, sortStringByKeyAsc } from "util/helpers";
-import { getAttributes as getInvoiceAttributes, getIsCreditClicked } from "landUseInvoices/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import Button from "@/components/button/Button";
+import CloseButton from "@/components/button/CloseButton";
+import FormField from "@/components/form/FormField";
+import WhiteBox from "@/components/content/WhiteBox";
+import { receiveIsCreditClicked } from "@/invoices/actions";
+import { CreditInvoiceOptions, CreditInvoiceSetOptions } from "@/landUseContract/constants";
+import { FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { InvoiceFieldPaths, InvoiceFieldTitles, InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "@/landUseInvoices/enums";
+import { CreditInvoiceOptions as CreditInvoiceOptionsEnum } from "@/landUseContract/enums";
+import { getUiDataCreditInvoiceKey } from "@/uiData/helpers";
+import { addEmptyOption, getFieldAttributes, getFieldOptions, getLabelOfOption, isFieldAllowedToEdit, sortStringByKeyAsc } from "@/util/helpers";
+import { getAttributes as getInvoiceAttributes, getIsCreditClicked } from "@/landUseInvoices/selectors";
 import type { Attributes } from "types";
 type Props = {
   formValues: Record<string, any>;
diff --git a/src/landUseContract/components/sections/forms/EditInvoiceForm.tsx b/src/landUseContract/components/sections/forms/EditInvoiceForm.tsx
index fca23a80f..1921d3ed6 100644
--- a/src/landUseContract/components/sections/forms/EditInvoiceForm.tsx
+++ b/src/landUseContract/components/sections/forms/EditInvoiceForm.tsx
@@ -3,35 +3,35 @@ import { Row, Column } from "react-foundation";
 import { connect } from "react-redux";
 import { FieldArray, formValueSelector, reduxForm } from "redux-form";
 import flowRight from "lodash/flowRight";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButtonThird from "components/form/AddButtonThird";
-import AmountWithVat from "components/vat/AmountWithVat";
-import Authorization from "components/authorization/Authorization";
-import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import AmountWithVat from "@/components/vat/AmountWithVat";
+import Authorization from "@/components/authorization/Authorization";
+import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
 import InvoiceRowsEdit from "./InvoiceRowsEdit";
-import RemoveButton from "components/form/RemoveButton";
-import SubTitle from "components/content/SubTitle";
-import { ConfirmationModalTexts, FieldTypes, FormNames } from "enums";
-import SendupButton from "components/button/SendupButton";
-import { ButtonColors } from "components/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getRecipientOptionsFromLitigants } from "landUseContract/helpers";
-import { exportInvoiceToLaskeAndUpdateList } from "landUseInvoices/actions";
-import { InvoiceCreditInvoicesFieldPaths, InvoiceCreditInvoicesFieldTitles, InvoiceFieldPaths, InvoiceFieldTitles, InvoiceInterestInvoicesFieldPaths, InvoiceInterestInvoicesFieldTitles, InvoicePaymentsFieldPaths, InvoicePaymentsFieldTitles, InvoiceRowsFieldPaths, InvoiceType } from "landUseInvoices/enums";
-import { validateInvoiceForm } from "leases/formValidators";
-import { getContactFullName } from "contacts/helpers";
-import { isInvoiceBillingPeriodRequired } from "landUseInvoices/helpers";
-import { getUiDataInvoiceKey } from "uiData/helpers";
-import { formatDate, formatNumber, getFieldAttributes, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired, hasPermissions } from "util/helpers";
-import { getAttributes as getInvoiceAttributes, getIsEditClicked } from "landUseInvoices/selectors";
-import { getCurrentLandUseContract } from "landUseContract/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import RemoveButton from "@/components/form/RemoveButton";
+import SubTitle from "@/components/content/SubTitle";
+import { ConfirmationModalTexts, FieldTypes, FormNames } from "@/enums";
+import SendupButton from "@/components/button/SendupButton";
+import { ButtonColors } from "@/components/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getRecipientOptionsFromLitigants } from "@/landUseContract/helpers";
+import { exportInvoiceToLaskeAndUpdateList } from "@/landUseInvoices/actions";
+import { InvoiceCreditInvoicesFieldPaths, InvoiceCreditInvoicesFieldTitles, InvoiceFieldPaths, InvoiceFieldTitles, InvoiceInterestInvoicesFieldPaths, InvoiceInterestInvoicesFieldTitles, InvoicePaymentsFieldPaths, InvoicePaymentsFieldTitles, InvoiceRowsFieldPaths, InvoiceType } from "@/landUseInvoices/enums";
+import { validateInvoiceForm } from "@/leases/formValidators";
+import { getContactFullName } from "@/contacts/helpers";
+import { isInvoiceBillingPeriodRequired } from "@/landUseInvoices/helpers";
+import { getUiDataInvoiceKey } from "@/uiData/helpers";
+import { formatDate, formatNumber, getFieldAttributes, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired, hasPermissions } from "@/util/helpers";
+import { getAttributes as getInvoiceAttributes, getIsEditClicked } from "@/landUseInvoices/selectors";
+import { getCurrentLandUseContract } from "@/landUseContract/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { LandUseContract } from "landUseContract/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { LandUseContract } from "@/landUseContract/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type PaymentsProps = {
   attributes: Attributes;
   fields: any;
@@ -195,28 +195,34 @@ const EditInvoiceForm = ({
       <Row>
         <Column small={8}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.RECIPIENT)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.RECIPIENT)}>
               {InvoiceFieldTitles.RECIPIENT}
             </FormTextTitle>
             <FormText>{invoice ? getContactFullName(invoice.recipientFull) : '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.NUMBER)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.NUMBER)}>
               {InvoiceFieldTitles.NUMBER}
             </FormTextTitle>
             <FormText>{invoice && invoice.number || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.SENT_TO_SAP_AT)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.SENT_TO_SAP_AT)}>
               {InvoiceFieldTitles.SENT_TO_SAP_AT}
             </FormTextTitle>
             <FormText>{invoice && formatDate(invoice.sent_to_sap_at) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={4}>
@@ -233,36 +239,44 @@ const EditInvoiceForm = ({
           }} enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.DUE_DATE)} />
             </Authorization>}
           {invoice && invoice.type === InvoiceType.CREDIT_NOTE && <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.DUE_DATE)}>
+              <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.DUE_DATE)}>
                 {InvoiceFieldTitles.DUE_DATE}
               </FormTextTitle>
               <FormText>{invoice && formatDate(invoice.due_date) || '-'}</FormText>
+              </>
             </Authorization>}
         </Column>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.ADJUSTED_DUE_DATE)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.ADJUSTED_DUE_DATE)}>
               {InvoiceFieldTitles.ADJUSTED_DUE_DATE}
             </FormTextTitle>
             <FormText>{invoice && formatDate(invoice.adjusted_due_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.INVOICING_DATE)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.INVOICING_DATE)}>
               {InvoiceFieldTitles.INVOICING_DATE}
             </FormTextTitle>
             <FormText>{invoice && formatDate(invoice.invoicing_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.STATE)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.STATE)}>
               {InvoiceFieldTitles.STATE}
             </FormTextTitle>
             <FormText>{invoice && getLabelOfOption(stateOptions, invoice.state) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={4}>
@@ -303,20 +317,24 @@ const EditInvoiceForm = ({
           }} />
             </Authorization>}
           {invoice && invoice.type === InvoiceType.CREDIT_NOTE && <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.POSTPONE_DATE)}>
+            <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.POSTPONE_DATE)}>
                 {InvoiceFieldTitles.POSTPONE_DATE}
               </FormTextTitle>
               <FormText>{invoice && formatDate(invoice.postpone_date) || '-'}</FormText>
+            </>
             </Authorization>}
         </Column>
       </Row>
       <Row>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.TOTAL_AMOUNT)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.TOTAL_AMOUNT)}>
               {InvoiceFieldTitles.TOTAL_AMOUNT}
             </FormTextTitle>
             <FormText>{invoice && !isEmptyValue(invoice.total_amount) ? <AmountWithVat amount={invoice.total_amount} date={invoice.due_date} /> : '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={4}>
@@ -327,11 +345,13 @@ const EditInvoiceForm = ({
         </Column>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.BILLED_AMOUNT)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.BILLED_AMOUNT)}>
               {InvoiceFieldTitles.BILLED_AMOUNT}
             </FormTextTitle>
             <FormText>{invoice && !isEmptyValue(invoice.billed_amount) ? <AmountWithVat amount={invoice.billed_amount} date={invoice.due_date} /> : '-'}
             </FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
@@ -349,11 +369,13 @@ const EditInvoiceForm = ({
             </Column>
             <Column small={6} medium={4}>
               <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.OUTSTANDING_AMOUNT)}>
+                <>
                 <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.OUTSTANDING_AMOUNT)}>
                   {InvoiceFieldTitles.OUTSTANDING_AMOUNT}
                 </FormTextTitle>
                 <FormText>{invoice && !isEmptyValue(invoice.outstanding_amount) ? <AmountWithVat amount={invoice.outstanding_amount} date={invoice.due_date} /> : '-'}
                 </FormText>
+                </>
               </Authorization>
             </Column>
           </Row>
@@ -362,63 +384,77 @@ const EditInvoiceForm = ({
       {showOldInvoiceInfo && <Row>
           <Column small={4}>
             <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.PAYMENT_NOTIFICATION_DATE)}>
+              <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.PAYMENT_NOTIFICATION_DATE)}>
                 {InvoiceFieldTitles.PAYMENT_NOTIFICATION_DATE}
               </FormTextTitle>
               <FormText>{invoice && formatDate(invoice.payment_notification_date) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={4}>
             <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.COLLECTION_CHARGE)}>
+              <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.COLLECTION_CHARGE)}>
                 {InvoiceFieldTitles.COLLECTION_CHARGE}
               </FormTextTitle>
               <FormText>{invoice && !isEmptyValue(invoice.collection_charge) ? `${formatNumber(invoice.collection_charge)} €` : '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={4}>
             <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.PAYMENT_NOTIFICATION_CATALOG_DATE)}>
+              <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.PAYMENT_NOTIFICATION_CATALOG_DATE)}>
                 {InvoiceFieldTitles.PAYMENT_NOTIFICATION_CATALOG_DATE}
               </FormTextTitle>
               <FormText>{invoice && formatDate(invoice.payment_notification_catalog_date) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
         </Row>}
       <Row>
         <Column small={4}>
           {showOldInvoiceInfo && <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.DELIVERY_METHOD)}>
+            <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.DELIVERY_METHOD)}>
                 {InvoiceFieldTitles.DELIVERY_METHOD}
               </FormTextTitle>
               <FormText>{invoice && getLabelOfOption(deliveryMethodOptions, invoice.delivery_method) || '-'}</FormText>
+            </>
             </Authorization>}
         </Column>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.TYPE)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.TYPE)}>
               {InvoiceFieldTitles.TYPE}
             </FormTextTitle>
             <FormText>{invoice && getLabelOfOption(typeOptions, invoice.type) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
 
         <Column small={4}>
           {creditedInvoice && <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.CREDITED_INVOICE)}>
+              <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.CREDITED_INVOICE)}>
                 {InvoiceFieldTitles.CREDITED_INVOICE}
               </FormTextTitle>
               <FormText>{<a className='no-margin' onKeyDown={handleCreditedInvoiceKeyDown} onClick={handleCreditedInvoiceClick} tabIndex={0}>{creditedInvoice && creditedInvoice.number ? creditedInvoice.number : 'Numeroimaton'}</a>}
               </FormText>
+              </>
             </Authorization>}
         </Column>
         <Column small={4}>
           {interestInvoiceFor && <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.INTEREST_INVOICE_FOR)}>
+              <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.INTEREST_INVOICE_FOR)}>
                 {InvoiceFieldTitles.INTEREST_INVOICE_FOR}
               </FormTextTitle>
               <FormText>{<a className='no-margin' onKeyDown={handleInterestInvoiceForKeyDown} onClick={handleInterestInvoiceForClick} tabIndex={0}>{interestInvoiceFor.number ? interestInvoiceFor.number : 'Numeroimaton'}</a>}
               </FormText>
+              </>
             </Authorization>}
         </Column>
       </Row>
diff --git a/src/landUseContract/components/sections/forms/InvoiceRows.tsx b/src/landUseContract/components/sections/forms/InvoiceRows.tsx
index e1848d230..257942b49 100644
--- a/src/landUseContract/components/sections/forms/InvoiceRows.tsx
+++ b/src/landUseContract/components/sections/forms/InvoiceRows.tsx
@@ -1,18 +1,18 @@
 import React from "react";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
-import AmountWithVat from "components/vat/AmountWithVat";
-import Authorization from "components/authorization/Authorization";
-import BoxItem from "components/content/BoxItem";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import SubTitle from "components/content/SubTitle";
-import { InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "invoices/enums";
-import { getContactFullName } from "contacts/helpers";
-import { getContentTenant } from "leases/helpers";
-import { getUiDataInvoiceKey } from "uiData/helpers";
-import { formatDate, getLabelOfOption, isFieldAllowedToRead } from "util/helpers";
+import AmountWithVat from "@/components/vat/AmountWithVat";
+import Authorization from "@/components/authorization/Authorization";
+import BoxItem from "@/components/content/BoxItem";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import SubTitle from "@/components/content/SubTitle";
+import { InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "@/invoices/enums";
+import { getContactFullName } from "@/contacts/helpers";
+import { getContentTenant } from "@/leases/helpers";
+import { getUiDataInvoiceKey } from "@/uiData/helpers";
+import { formatDate, getLabelOfOption, isFieldAllowedToRead } from "@/util/helpers";
 import type { Attributes } from "types";
 type Props = {
   invoiceAttributes: Attributes;
@@ -43,51 +43,63 @@ const InvoiceRows = ({
                   <Row>
                     <Column small={4}>
                       <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceRowsFieldPaths.TENANT)}>
+                        <>
                         <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceRowsFieldPaths.TENANT)}>
                           {InvoiceRowsFieldTitles.TENANT}
                         </FormTextTitle>
                         <FormText>{getContactFullName(contact) || '-'}</FormText>
+                        </>
                       </Authorization>
                     </Column>
                     <Column small={4}>
                       <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceRowsFieldPaths.RECEIVABLE_TYPE)}>
+                        <>
                         <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceRowsFieldPaths.RECEIVABLE_TYPE)}>
                           {InvoiceRowsFieldTitles.RECEIVABLE_TYPE}
                         </FormTextTitle>
                         <FormText>{getLabelOfOption(receivableTypeOptions, row.receivable_type) || '-'}</FormText>
+                        </>
                       </Authorization>
                     </Column>
                     <Column small={4}>
                       <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceRowsFieldPaths.AMOUNT)}>
+                        <>
                         <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceRowsFieldPaths.AMOUNT)}>
                           {InvoiceRowsFieldTitles.AMOUNT}
                         </FormTextTitle>
                         <FormText>{row.amount ? <AmountWithVat amount={row.amount} date={invoiceDate} /> : '-'}
                         </FormText>
+                        </>
                       </Authorization>
                     </Column>
                     <Column small={4}>
                       <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceRowsFieldPaths.BILLING_PERIOD_START_DATE)}>
+                        <>
                         <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceRowsFieldPaths.BILLING_PERIOD_START_DATE)}>
                           {InvoiceRowsFieldTitles.BILLING_PERIOD_START_DATE}
                         </FormTextTitle>
                         <FormText>{formatDate(row.billing_period_start_date) || '-'}</FormText>
+                        </>
                       </Authorization>
                     </Column>
                     <Column small={4}>
                       <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceRowsFieldPaths.BILLING_PERIOD_END_DATE)}>
+                        <>
                         <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceRowsFieldPaths.BILLING_PERIOD_END_DATE)}>
                           {InvoiceRowsFieldTitles.BILLING_PERIOD_END_DATE}
                         </FormTextTitle>
                         <FormText>{formatDate(row.billing_period_end_date) || '-'}</FormText>
+                        </>
                       </Authorization>
                     </Column>
                     <Column small={4}>
                       <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceRowsFieldPaths.DESCRIPTION)}>
+                        <>
                         <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceRowsFieldPaths.DESCRIPTION)}>
                           {InvoiceRowsFieldTitles.DESCRIPTION}
                         </FormTextTitle>
                         <FormText>{row.description || '-'}</FormText>
+                        </>
                       </Authorization>
                     </Column>
                   </Row>
diff --git a/src/landUseContract/components/sections/forms/InvoiceRowsEdit.tsx b/src/landUseContract/components/sections/forms/InvoiceRowsEdit.tsx
index 1c7278898..281bae07b 100644
--- a/src/landUseContract/components/sections/forms/InvoiceRowsEdit.tsx
+++ b/src/landUseContract/components/sections/forms/InvoiceRowsEdit.tsx
@@ -2,21 +2,21 @@ import React, { Fragment, ReactElement } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import { formValueSelector } from "redux-form";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import ActionButtonWrapper from "components/form/ActionButtonWrapper";
-import AddButtonThird from "components/form/AddButtonThird";
-import Authorization from "components/authorization/Authorization";
-import BoxItem from "components/content/BoxItem";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import FormField from "components/form/FormField";
-import RemoveButton from "components/form/RemoveButton";
-import SubTitle from "components/content/SubTitle";
-import { ConfirmationModalTexts, FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import { InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "landUseInvoices/enums";
-import { getUiDataInvoiceKey } from "uiData/helpers";
-import { getFieldAttributes, isFieldAllowedToEdit, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes as getInvoiceAttributes } from "landUseInvoices/selectors";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import ActionButtonWrapper from "@/components/form/ActionButtonWrapper";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import Authorization from "@/components/authorization/Authorization";
+import BoxItem from "@/components/content/BoxItem";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import FormField from "@/components/form/FormField";
+import RemoveButton from "@/components/form/RemoveButton";
+import SubTitle from "@/components/content/SubTitle";
+import { ConfirmationModalTexts, FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "@/landUseInvoices/enums";
+import { getUiDataInvoiceKey } from "@/uiData/helpers";
+import { getFieldAttributes, isFieldAllowedToEdit, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes as getInvoiceAttributes } from "@/landUseInvoices/selectors";
 // import {getReceivableTypes} from 'src/leaseCreateCharge/selectors';
 import type { Attributes } from "types";
 // import {receivableTypesFromAttributes, receivableTypeFromRows} from 'src/leaseCreateCharge/helpers';
diff --git a/src/landUseContract/components/sections/forms/NewInvoiceForm.tsx b/src/landUseContract/components/sections/forms/NewInvoiceForm.tsx
index 8f53082bd..c9375c0ba 100644
--- a/src/landUseContract/components/sections/forms/NewInvoiceForm.tsx
+++ b/src/landUseContract/components/sections/forms/NewInvoiceForm.tsx
@@ -3,27 +3,27 @@ import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import { getFormValues, reduxForm, FieldArray } from "redux-form";
 import flowRight from "lodash/flowRight";
-import Authorization from "components/authorization/Authorization";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import Button from "components/button/Button";
-import CloseButton from "components/button/CloseButton";
-import RemoveButton from "components/form/RemoveButton";
-import FormField from "components/form/FormField";
-import WhiteBox from "components/content/WhiteBox";
-import { receiveIsCreateClicked } from "landUseInvoices/actions";
-import { ConfirmationModalTexts, FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import SubTitle from "components/content/SubTitle";
+import Authorization from "@/components/authorization/Authorization";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import Button from "@/components/button/Button";
+import CloseButton from "@/components/button/CloseButton";
+import RemoveButton from "@/components/form/RemoveButton";
+import FormField from "@/components/form/FormField";
+import WhiteBox from "@/components/content/WhiteBox";
+import { receiveIsCreateClicked } from "@/landUseInvoices/actions";
+import { ConfirmationModalTexts, FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import SubTitle from "@/components/content/SubTitle";
 // import {InvoiceFieldPaths, InvoiceFieldTitles} from 'src/invoices/enums'; // TODO MAKE OWN ENUMS
-import { validateLandUseInvoiceForm } from "landUseContract/formValidators";
-import { getFieldAttributes, isFieldAllowedToEdit } from "util/helpers";
-import { getAttributes as getInvoiceAttributes, getIsCreateClicked } from "landUseInvoices/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { getRecipientOptionsFromLitigants } from "landUseContract/helpers";
+import { validateLandUseInvoiceForm } from "@/landUseContract/formValidators";
+import { getFieldAttributes, isFieldAllowedToEdit } from "@/util/helpers";
+import { getAttributes as getInvoiceAttributes, getIsCreateClicked } from "@/landUseInvoices/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { getRecipientOptionsFromLitigants } from "@/landUseContract/helpers";
 import type { Attributes } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButtonThird from "components/form/AddButtonThird";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButtonThird from "@/components/form/AddButtonThird";
 type InvoiceRowsProps = {
   fields: any;
   invoiceAttributes: Attributes;
diff --git a/src/landUseContract/formValidators.ts b/src/landUseContract/formValidators.ts
index ad797ed54..707cca28b 100644
--- a/src/landUseContract/formValidators.ts
+++ b/src/landUseContract/formValidators.ts
@@ -1,7 +1,7 @@
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
-import { dateGreaterOrEqual } from "components/form/validations";
-import { required } from "components/form/validations";
+import { dateGreaterOrEqual } from "@/components/form/validations";
+import { required } from "@/components/form/validations";
 
 /** 
  * Get litigant errors
diff --git a/src/landUseContract/helpers.ts b/src/landUseContract/helpers.ts
index 28b9ac285..c9e0a9f63 100644
--- a/src/landUseContract/helpers.ts
+++ b/src/landUseContract/helpers.ts
@@ -1,15 +1,15 @@
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
 import { isDirty } from "redux-form";
-import { FormNames } from "enums";
+import { FormNames } from "@/enums";
 import { LitigantContactType } from "./enums";
-import { getContentUser } from "users/helpers";
-import { fixedLengthNumber, getApiResponseResults, isArchived, sortStringByKeyDesc, addEmptyOption, formatDate, convertStrToDecimalNumber } from "util/helpers";
-import { getIsEditMode } from "landUseContract/selectors";
-import { removeSessionStorageItem } from "util/storage";
-import { getContactFullName, getContentContact } from "contacts/helpers";
+import { getContentUser } from "@/users/helpers";
+import { fixedLengthNumber, getApiResponseResults, isArchived, sortStringByKeyDesc, addEmptyOption, formatDate, convertStrToDecimalNumber } from "@/util/helpers";
+import { getIsEditMode } from "@/landUseContract/selectors";
+import { removeSessionStorageItem } from "@/util/storage";
+import { getContactFullName, getContentContact } from "@/contacts/helpers";
 import type { LandUseContract } from "./types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 
 /** 
  * Get land use contract identifier
diff --git a/src/landUseContract/spec.ts b/src/landUseContract/landUseContract.spec.ts
similarity index 99%
rename from src/landUseContract/spec.ts
rename to src/landUseContract/landUseContract.spec.ts
index 7813e3e87..814e03db7 100644
--- a/src/landUseContract/spec.ts
+++ b/src/landUseContract/landUseContract.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchAttributes, receiveAttributes, fetchLandUseContractList, receiveLandUseContractList, fetchSingleLandUseContract, receiveSingleLandUseContract, createLandUseContract, editLandUseContract, notFound, receiveIsSaveClicked, hideEditMode, showEditMode, receiveFormValidFlags, clearFormValidFlags, receiveCollapseStates, receiveMethods, fetchSingleLandUseContractAfterEdit, attributesNotFound, deleteLandUseContract } from "./actions";
 import landUseContractReducer from "./reducer";
 import type { LandUseContractState } from "./types";
diff --git a/src/landUseContract/reducer.ts b/src/landUseContract/reducer.ts
index 2998acbcf..2ee612934 100644
--- a/src/landUseContract/reducer.ts
+++ b/src/landUseContract/reducer.ts
@@ -1,7 +1,7 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
 import merge from "lodash/merge";
-import { FormNames } from "enums";
+import { FormNames } from "@/enums";
 import type { Attributes, Reducer, Methods } from "types";
 import type { LandUseContract, LandUseContractList, ReceiveAttributesAction, ReceiveFormValidFlagsAction, ReceiveLandUseContractListAction, ReceiveSingleLandUseContractAction, ReceiveIsSaveClickedAction, ReceiveCollapseStatesAction, ReceiveMethodsAction } from "./types";
 const attributesReducer: Reducer<Attributes> = handleActions({
diff --git a/src/landUseContract/requests.ts b/src/landUseContract/requests.ts
index 41354e828..728d5b763 100644
--- a/src/landUseContract/requests.ts
+++ b/src/landUseContract/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 import type { LandUseContract } from "./types";
 export const createLandUseContract = (landUseContract: LandUseContract): Generator<any, any, any> => {
   const body = JSON.stringify(landUseContract);
diff --git a/src/landUseContract/requestsAsync.ts b/src/landUseContract/requestsAsync.ts
index df1a5de91..2cd6fd1bc 100644
--- a/src/landUseContract/requestsAsync.ts
+++ b/src/landUseContract/requestsAsync.ts
@@ -1,5 +1,5 @@
-import createUrl from "api/createUrl";
-import callApiAsync from "api/callApiAsync";
+import createUrl from "@/api/createUrl";
+import callApiAsync from "@/api/callApiAsync";
 export const fetchEstateIdList = async (query?: Record<string, any>) => {
   const {
     response: {
diff --git a/src/landUseContract/saga.ts b/src/landUseContract/saga.ts
index 8c22cf16e..322127b56 100644
--- a/src/landUseContract/saga.ts
+++ b/src/landUseContract/saga.ts
@@ -1,10 +1,10 @@
 import { all, fork, put, takeLatest, call } from "redux-saga/effects";
 import { push } from "react-router-redux";
 import { SubmissionError } from "redux-form";
-import { displayUIMessage, getSearchQuery, getUrlParams } from "util/helpers";
+import { displayUIMessage, getSearchQuery, getUrlParams } from "@/util/helpers";
 import { hideEditMode, receiveAttributes, receiveLandUseContractList, receiveSingleLandUseContract, notFound, receiveIsSaveClicked, attributesNotFound, receiveMethods, fetchSingleLandUseContractAfterEdit } from "./actions";
-import { receiveError } from "api/actions";
-import { getRouteById, Routes } from "root/routes";
+import { receiveError } from "@/api/actions";
+import { getRouteById, Routes } from "@/root/routes";
 import { createLandUseContract, fetchAttributes, fetchLandUseContracts, fetchSingleLandUseContract, editLandUseContract, deleteLandUseContract } from "./requests";
 
 // import attributesMockData from './attributes-mock-data.json';
diff --git a/src/landUseContract/selectors.ts b/src/landUseContract/selectors.ts
index 5c222e773..48bf0ce4a 100644
--- a/src/landUseContract/selectors.ts
+++ b/src/landUseContract/selectors.ts
@@ -1,7 +1,7 @@
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
-import type { Attributes, Selector, Methods } from "../types";
-import type { RootState } from "root/types";
+import type { Attributes, Selector, Methods } from "@/types";
+import type { RootState } from "@/root/types";
 import type { LandUseContract, LandUseContractList } from "./types";
 export const getAttributes: Selector<Attributes, void> = (state: RootState): Attributes => state.landUseContract.attributes;
 export const getMethods: Selector<Attributes, void> = (state: RootState): Methods => state.landUseContract.methods;
diff --git a/src/landUseContract/types.ts b/src/landUseContract/types.ts
index 4f04f007b..3170ddd0a 100644
--- a/src/landUseContract/types.ts
+++ b/src/landUseContract/types.ts
@@ -1,4 +1,4 @@
-import type { Action, Attributes, Methods } from "../types";
+import type { Action, Attributes, Methods } from "@/types";
 export type LandUseContractState = {
   attributes: Attributes;
   current: LandUseContract;
diff --git a/src/landUseInvoices/actions.ts b/src/landUseInvoices/actions.ts
index 23207a30d..d3ea17faa 100644
--- a/src/landUseInvoices/actions.ts
+++ b/src/landUseInvoices/actions.ts
@@ -1,7 +1,7 @@
 import { createAction } from "redux-actions";
 import type { Attributes, Methods } from "types";
 import type { CreateChargePayload, FetchAttributesAction, ReceiveAttributesAction, ReceiveMethodsAction, InvoiceAttributesNotFoundAction, Invoice, InvoiceListMap, FetchInvoicesByLandUseContractAction, ReceiveInvoicesByLandUseContractAction, CreateInvoiceAction, CreditInvoiceAction, PatchInvoiceAction, ExportInvoiceToLaskeAndUpdateListAction, ExportInvoiceToLaskeAndUpdateListPayload, ReceivePatchedInvoiceAction, ClearPatchedInvoiceAction, InvoiceNotFoundAction, ReceiveInvoiceToCreditAction, ReceiveIsCreateInvoicePanelOpenAction, ReceiveIsCreditInvoicePanelOpenAction, ReceiveIsCreateClickedAction, ReceiveIsCreditClickedAction, ReceiveIsEditClickedAction, DeleteInvoiceAction, ReceiveCollapseStatesAction, StartInvoicingAction, StopInvoicingAction, CreateChargeAction } from "./types";
-import type { LandUseContractId } from "landUseInvoices/types";
+import type { LandUseContractId } from "@/landUseInvoices/types";
 export const fetchAttributes = (): FetchAttributesAction => createAction('mvj/landUseInvoices/FETCH_ATTRIBUTES')();
 export const receiveAttributes = (attributes: Attributes): ReceiveAttributesAction => createAction('mvj/landUseInvoices/RECEIVE_ATTRIBUTES')(attributes);
 export const receiveMethods = (methods: Methods): ReceiveMethodsAction => createAction('mvj/landUseInvoices/RECEIVE_METHODS')(methods);
diff --git a/src/landUseInvoices/helpers.ts b/src/landUseInvoices/helpers.ts
index 1563300f0..dc07f05a5 100644
--- a/src/landUseInvoices/helpers.ts
+++ b/src/landUseInvoices/helpers.ts
@@ -1,9 +1,9 @@
 import isPast from "date-fns/isPast";
 import forEach from "lodash/forEach";
 import get from "lodash/get";
-import { CreditInvoiceOptions } from "leases/enums";
+import { CreditInvoiceOptions } from "@/leases/enums";
 import { InvoiceState, InvoiceType, ReceivableTypes } from "./enums";
-import { convertStrToDecimalNumber, getLabelOfOption, sortStringAsc } from "util/helpers";
+import { convertStrToDecimalNumber, getLabelOfOption, sortStringAsc } from "@/util/helpers";
 
 /**
  * Get payments of single invoice to show on UI
diff --git a/src/landUseInvoices/spec.ts b/src/landUseInvoices/landUseInvoices.spec.ts
similarity index 99%
rename from src/landUseInvoices/spec.ts
rename to src/landUseInvoices/landUseInvoices.spec.ts
index 814a5ce25..2952e664e 100644
--- a/src/landUseInvoices/spec.ts
+++ b/src/landUseInvoices/landUseInvoices.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { receiveAttributes, receiveMethods, fetchAttributes, attributesNotFound, receiveInvoicesByLandUseContract, receiveIsCreateInvoicePanelOpen, receiveIsCreditInvoicePanelOpen, receiveIsCreateClicked, receiveIsCreditClicked, receiveIsEditClicked, fetchInvoicesByLandUseContract, createInvoice, patchInvoice, exportInvoiceToLaskeAndUpdateList, receivePatchedInvoice, clearPatchedInvoice, notFound, receiveInvoiceToCredit, creditInvoice, deleteInvoice, receiveCollapseStates, startInvoicing, stopInvoicing } from "./actions";
 import invoiceReducer from "./reducer";
 import type { LandUseInvoicesState } from "./types";
diff --git a/src/landUseInvoices/reducer.ts b/src/landUseInvoices/reducer.ts
index 800cdde08..f2cb3cb9c 100644
--- a/src/landUseInvoices/reducer.ts
+++ b/src/landUseInvoices/reducer.ts
@@ -1,7 +1,7 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
 import merge from "lodash/merge";
-import type { Attributes, Methods, Reducer } from "../types";
+import type { Attributes, Methods, Reducer } from "@/types";
 import type { ReceiveAttributesAction, ReceiveMethodsAction, Invoice, InvoiceListMap, ReceiveInvoicesByLandUseContractAction, ReceiveInvoiceToCreditAction, ReceiveIsCreateInvoicePanelOpenAction, ReceiveIsCreditInvoicePanelOpenAction, ReceiveIsCreateClickedAction, ReceiveIsCreditClickedAction, ReceiveIsEditClickedAction, ReceivePatchedInvoiceAction, ReceiveCollapseStatesAction } from "./types";
 const isFetchingReducer: Reducer<boolean> = handleActions({
   'mvj/landUseInvoices/CREATE': () => true,
diff --git a/src/landUseInvoices/requests.ts b/src/landUseInvoices/requests.ts
index 1be8fbfaa..e98196dd1 100644
--- a/src/landUseInvoices/requests.ts
+++ b/src/landUseInvoices/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 import type { Invoice, InvoiceId } from "./types";
 export const fetchAttributes = () => {
   return callApi(new Request(createUrl('land_use_agreement_invoice/'), {
diff --git a/src/landUseInvoices/saga.ts b/src/landUseInvoices/saga.ts
index 0a1f0a794..2ae7d6daf 100644
--- a/src/landUseInvoices/saga.ts
+++ b/src/landUseInvoices/saga.ts
@@ -1,11 +1,11 @@
 import { all, call, fork, put, select, takeLatest } from "redux-saga/effects";
 import { SubmissionError } from "redux-form";
-import { receiveSingleLandUseContract } from "landUseContract/actions";
+import { receiveSingleLandUseContract } from "@/landUseContract/actions";
 import { fetchInvoicesByLandUseContract, receiveAttributes, receiveMethods, attributesNotFound, receiveInvoicesByLandUseContract, receiveIsCreateInvoicePanelOpen, receiveIsEditClicked, receivePatchedInvoice, notFound, receiveIsCreditInvoicePanelOpen, receiveInvoiceToCredit } from "./actions";
-import { receiveError } from "api/actions";
-import { displayUIMessage } from "util/helpers";
+import { receiveError } from "@/api/actions";
+import { displayUIMessage } from "@/util/helpers";
 import { fetchAttributes, createInvoice, patchInvoice, deleteInvoice, fetchInvoices, exportInvoiceToLaske, creditInvoice } from "./requests";
-import { getCurrentLandUseContract } from "landUseContract/selectors";
+import { getCurrentLandUseContract } from "@/landUseContract/selectors";
 
 function* fetchAttributesSaga(): Generator<any, any, any> {
   try {
diff --git a/src/landUseInvoices/selectors.ts b/src/landUseInvoices/selectors.ts
index cd0be5ceb..2119a6ba7 100644
--- a/src/landUseInvoices/selectors.ts
+++ b/src/landUseInvoices/selectors.ts
@@ -1,6 +1,6 @@
 import get from "lodash/get";
 import type { Attributes, Methods, Selector } from "types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 import type { Invoice, InvoiceList } from "./types";
 export type LandUseContractId = number;
 export const getIsFetching: Selector<boolean, void> = (state: RootState): boolean => state.landUseInvoice.isFetching;
diff --git a/src/leaseAreaAttachment/requests.ts b/src/leaseAreaAttachment/requests.ts
index 3cb185cd3..a346e7b76 100644
--- a/src/leaseAreaAttachment/requests.ts
+++ b/src/leaseAreaAttachment/requests.ts
@@ -1,6 +1,6 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
-import callUploadRequest from "api/callUploadRequest";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
+import callUploadRequest from "@/api/callUploadRequest";
 import type { CreateLeaseAreaAttachmentPayload } from "./types";
 export const createLeaseAreaAttachment = (payload: CreateLeaseAreaAttachmentPayload): Generator<any, any, any> => {
   const formData = new FormData();
diff --git a/src/leaseAreaAttachment/saga.ts b/src/leaseAreaAttachment/saga.ts
index 64c40e9c2..6e8675099 100644
--- a/src/leaseAreaAttachment/saga.ts
+++ b/src/leaseAreaAttachment/saga.ts
@@ -1,8 +1,8 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { SubmissionError } from "redux-form";
-import { fetchSingleLeaseAfterEdit } from "leases/actions";
-import { receiveError } from "api/actions";
-import { displayUIMessage } from "util/helpers";
+import { fetchSingleLeaseAfterEdit } from "@/leases/actions";
+import { receiveError } from "@/api/actions";
+import { displayUIMessage } from "@/util/helpers";
 import { createLeaseAreaAttachment, deleteLeaseAreaAttachment } from "./requests";
 
 function* createLeaseAreaAttachmentSaga({
diff --git a/src/leaseAreaAttachment/types.ts b/src/leaseAreaAttachment/types.ts
index f742e6246..dd164597c 100644
--- a/src/leaseAreaAttachment/types.ts
+++ b/src/leaseAreaAttachment/types.ts
@@ -1,5 +1,5 @@
 import type { Action } from "types";
-import type { LeaseId } from "leases/types";
+import type { LeaseId } from "@/leases/types";
 export type CreateLeaseAreaAttachmentPayload = {
   lease: LeaseId;
   data: {
diff --git a/src/leaseCreateCharge/helpers.ts b/src/leaseCreateCharge/helpers.ts
index 3fd23d54b..f4d5d946e 100644
--- a/src/leaseCreateCharge/helpers.ts
+++ b/src/leaseCreateCharge/helpers.ts
@@ -1,5 +1,5 @@
 import get from "lodash/get";
-import { convertStrToDecimalNumber } from "util/helpers";
+import { convertStrToDecimalNumber } from "@/util/helpers";
 
 /**
  * Get lease create charge rows payload data for API
diff --git a/src/leaseCreateCharge/spec.ts b/src/leaseCreateCharge/leaseCreateCharge.spec.ts
similarity index 98%
rename from src/leaseCreateCharge/spec.ts
rename to src/leaseCreateCharge/leaseCreateCharge.spec.ts
index 3c4e390ef..f6f869afc 100644
--- a/src/leaseCreateCharge/spec.ts
+++ b/src/leaseCreateCharge/leaseCreateCharge.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchAttributes, attributesNotFound, receiveAttributes, fetchReceivableTypes, receivableTypesNotFound, receiveReceivableTypes } from "./actions";
 import leaseCreateChargeReducer from "./reducer";
 import type { LeaseCreateChargeState } from "./types";
@@ -65,11 +65,8 @@ describe('Lease create charge', () => {
       });
     });
   });
-  // $FlowFixMe
   describe('Helpers', () => {
-    // $FlowFixMe
     describe('receivableTypesFromAttributes', () => {
-      // $FlowFixMe
       it('should filter only active receivableTypes as choices', () => {
         const dummyFieldAttributes = {
           type: "field",
diff --git a/src/leaseCreateCharge/reducer.ts b/src/leaseCreateCharge/reducer.ts
index 7ad4fcca8..3ac82b922 100644
--- a/src/leaseCreateCharge/reducer.ts
+++ b/src/leaseCreateCharge/reducer.ts
@@ -1,7 +1,7 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
 import type { Attributes, Reducer } from "types";
-import type { ReceiveAttributesAction, ReceiveReceivableTypesAction } from "leaseCreateCharge/types";
+import type { ReceiveAttributesAction, ReceiveReceivableTypesAction } from "@/leaseCreateCharge/types";
 const isFetchingAttributesReducer: Reducer<boolean> = handleActions({
   'mvj/leaseCreateCharge/FETCH_ATTRIBUTES': () => true,
   'mvj/leaseCreateCharge/RECEIVE_ATTRIBUTES': () => false,
diff --git a/src/leaseCreateCharge/requests.ts b/src/leaseCreateCharge/requests.ts
index a34c4ae6b..022b65d92 100644
--- a/src/leaseCreateCharge/requests.ts
+++ b/src/leaseCreateCharge/requests.ts
@@ -1,6 +1,6 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
-import { store } from "../root/startApp";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
+import { store } from "@/index";
 import { getCurrentLease } from '../leases/selectors';
 export const fetchAttributes = (): Generator<any, any, any> => {
   return callApi(new Request(createUrl(`lease_create_charge/`), {
diff --git a/src/leaseCreateCharge/saga.ts b/src/leaseCreateCharge/saga.ts
index 26b8807fb..37d4cb5a7 100644
--- a/src/leaseCreateCharge/saga.ts
+++ b/src/leaseCreateCharge/saga.ts
@@ -1,6 +1,6 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { receiveAttributes, attributesNotFound, receiveReceivableTypes, receivableTypesNotFound } from "./actions";
-import { receiveError } from "api/actions";
+import { receiveError } from "@/api/actions";
 import { fetchAttributes, fetchReceivableTypes } from "./requests";
 
 function* fetchAttributesSaga(): Generator<any, any, any> {
diff --git a/src/leaseCreateCharge/selectors.ts b/src/leaseCreateCharge/selectors.ts
index efe486e57..6b1f837af 100644
--- a/src/leaseCreateCharge/selectors.ts
+++ b/src/leaseCreateCharge/selectors.ts
@@ -1,5 +1,5 @@
 import type { Attributes, Selector } from "types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 export const getIsFetchingAttributes: Selector<boolean, void> = (state: RootState): boolean => state.leaseCreateCharge.isFetchingAttributes;
 export const getAttributes: Selector<Attributes, void> = (state: RootState): Attributes => state.leaseCreateCharge.attributes;
 export const getIsFetchingReceivableTypes: Selector<boolean, void> = (state: RootState): boolean => state.leaseCreateCharge.isFetchingReceivableTypes;
diff --git a/src/leaseInspectionAttachment/requests.ts b/src/leaseInspectionAttachment/requests.ts
index a219d92da..03b0acc40 100644
--- a/src/leaseInspectionAttachment/requests.ts
+++ b/src/leaseInspectionAttachment/requests.ts
@@ -1,6 +1,6 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
-import callUploadRequest from "api/callUploadRequest";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
+import callUploadRequest from "@/api/callUploadRequest";
 import type { CreateLeaseInspectionAttachmentPayload } from "./types";
 export const createLeaseInspectionAttachment = (payload: CreateLeaseInspectionAttachmentPayload): Generator<any, any, any> => {
   const formData = new FormData();
diff --git a/src/leaseInspectionAttachment/saga.ts b/src/leaseInspectionAttachment/saga.ts
index 5e52b92ed..c45e320f8 100644
--- a/src/leaseInspectionAttachment/saga.ts
+++ b/src/leaseInspectionAttachment/saga.ts
@@ -1,8 +1,8 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { SubmissionError } from "redux-form";
-import { fetchSingleLeaseAfterEdit } from "leases/actions";
-import { receiveError } from "api/actions";
-import { displayUIMessage } from "util/helpers";
+import { fetchSingleLeaseAfterEdit } from "@/leases/actions";
+import { receiveError } from "@/api/actions";
+import { displayUIMessage } from "@/util/helpers";
 import { createLeaseInspectionAttachment, deleteLeaseInspectionAttachment } from "./requests";
 
 function* createLeaseInspectionAttachmentSaga({
diff --git a/src/leaseInspectionAttachment/types.ts b/src/leaseInspectionAttachment/types.ts
index 9d3bb9b09..87fa2e18c 100644
--- a/src/leaseInspectionAttachment/types.ts
+++ b/src/leaseInspectionAttachment/types.ts
@@ -1,5 +1,5 @@
 import type { Action } from "types";
-import type { LeaseId } from "leases/types";
+import type { LeaseId } from "@/leases/types";
 export type CreateLeaseInspectionAttachmentPayload = {
   lease: LeaseId;
   data: {
diff --git a/src/leaseStatisticReport/components/LeaseInvoicingConfirmationReport.tsx b/src/leaseStatisticReport/components/LeaseInvoicingConfirmationReport.tsx
index 2944f90ed..cf2129b33 100644
--- a/src/leaseStatisticReport/components/LeaseInvoicingConfirmationReport.tsx
+++ b/src/leaseStatisticReport/components/LeaseInvoicingConfirmationReport.tsx
@@ -3,25 +3,25 @@ import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import { TableSortOrder } from "enums";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import SortableTable from "components/table/SortableTable";
-import FormText from "components/form/FormText";
-import ExcelLink from "components/excel/ExcelLink";
-import { getApiResponseResults, hasPermissions, getLabelOfOption, sortNumberByKeyAsc, sortNumberByKeyDesc, sortStringByKeyAsc, sortStringByKeyDesc } from "util/helpers";
-import { LeaseStatisticReportFormatOptions } from "leaseStatisticReport/enums";
-import { getDisplayName, getFormattedValue, getOutputFields, getReportTypeOptions } from "leaseStatisticReport/helpers";
-import { getIsFetchingLeaseInvoicingConfirmationReport, getLeaseInvoicingConfirmationReport, getPayload } from "leaseStatisticReport/selectors";
+import { TableSortOrder } from "@/enums";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import SortableTable from "@/components/table/SortableTable";
+import FormText from "@/components/form/FormText";
+import ExcelLink from "@/components/excel/ExcelLink";
+import { getApiResponseResults, hasPermissions, getLabelOfOption, sortNumberByKeyAsc, sortNumberByKeyDesc, sortStringByKeyAsc, sortStringByKeyDesc } from "@/util/helpers";
+import { LeaseStatisticReportFormatOptions } from "@/leaseStatisticReport/enums";
+import { getDisplayName, getFormattedValue, getOutputFields, getReportTypeOptions } from "@/leaseStatisticReport/helpers";
+import { getIsFetchingLeaseInvoicingConfirmationReport, getLeaseInvoicingConfirmationReport, getPayload } from "@/leaseStatisticReport/selectors";
 import type { Attributes, Reports } from "types";
-import type { LeaseInvoicingConfirmationReport as LeaseInvoicingConfirmationReportsType } from "leaseStatisticReport/types";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { UsersPermissions } from "usersPermissions/enums";
-import { PermissionMissingTexts } from "enums";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
-import { withLeaseInvoicingConfirmationReportAttributes } from "components/attributes/LeaseInvoicingConfirmationReportAttributes";
-import type { ReportOptions } from "leaseStatisticReport/types";
+import type { LeaseInvoicingConfirmationReport as LeaseInvoicingConfirmationReportsType } from "@/leaseStatisticReport/types";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { PermissionMissingTexts } from "@/enums";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
+import { withLeaseInvoicingConfirmationReportAttributes } from "@/components/attributes/LeaseInvoicingConfirmationReportAttributes";
+import type { ReportOptions } from "@/leaseStatisticReport/types";
 type Props = {
   isFetchingLeaseInvoicingConfirmationReportAttributes: boolean;
   leaseInvoicingConfirmationReportAttributes: Attributes;
diff --git a/src/leaseStatisticReport/components/LeaseStatisticReportForm.tsx b/src/leaseStatisticReport/components/LeaseStatisticReportForm.tsx
index c05c5f4d7..999ecb977 100644
--- a/src/leaseStatisticReport/components/LeaseStatisticReportForm.tsx
+++ b/src/leaseStatisticReport/components/LeaseStatisticReportForm.tsx
@@ -3,19 +3,19 @@ import { connect } from "react-redux";
 import { formValueSelector, destroy, getFormValues, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import Button from "components/button/Button";
-import { ButtonColors } from "components/enums";
-import FormField from "components/form/FormField";
-import { FieldTypes, FormNames } from "enums";
-import { withLeaseStatisticReportAttributes } from "components/attributes/LeaseStatisticReportAttributes";
-import Authorization from "components/authorization/Authorization";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import { getFieldAttributes, isFieldAllowedToEdit } from "util/helpers";
-import { LeaseStatisticReportPaths, LeaseStatisticReportTitles } from "leaseStatisticReport/enums";
-import { getReportTypeOptions, getReportUrl, getPayload, getFields, getQueryParams, formatType } from "leaseStatisticReport/helpers";
-import { fetchReportData, setOptions, sendReportToMail, fetchOptions, setPayload } from "leaseStatisticReport/actions";
-import { getAttributes as getLeaseStatisticReportAttributes, getOptions, getIsFetchingOptions } from "leaseStatisticReport/selectors";
+import Button from "@/components/button/Button";
+import { ButtonColors } from "@/components/enums";
+import FormField from "@/components/form/FormField";
+import { FieldTypes, FormNames } from "@/enums";
+import { withLeaseStatisticReportAttributes } from "@/components/attributes/LeaseStatisticReportAttributes";
+import Authorization from "@/components/authorization/Authorization";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import { getFieldAttributes, isFieldAllowedToEdit } from "@/util/helpers";
+import { LeaseStatisticReportPaths, LeaseStatisticReportTitles } from "@/leaseStatisticReport/enums";
+import { getReportTypeOptions, getReportUrl, getPayload, getFields, getQueryParams, formatType } from "@/leaseStatisticReport/helpers";
+import { fetchReportData, setOptions, sendReportToMail, fetchOptions, setPayload } from "@/leaseStatisticReport/actions";
+import { getAttributes as getLeaseStatisticReportAttributes, getOptions, getIsFetchingOptions } from "@/leaseStatisticReport/selectors";
 import type { Attributes, Reports } from "types";
 type Props = {
   leaseStatisticReportAttributes: Attributes;
diff --git a/src/leaseStatisticReport/components/LeaseStatisticReportPage.tsx b/src/leaseStatisticReport/components/LeaseStatisticReportPage.tsx
index c16b92401..9864b2e4f 100644
--- a/src/leaseStatisticReport/components/LeaseStatisticReportPage.tsx
+++ b/src/leaseStatisticReport/components/LeaseStatisticReportPage.tsx
@@ -3,27 +3,27 @@ import { connect } from "react-redux";
 import { withRouter } from "react-router";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import ContentContainer from "components/content/ContentContainer";
-import Divider from "components/content/Divider";
-import Loader from "components/loader/Loader";
-import PageContainer from "components/content/PageContainer";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { PermissionMissingTexts } from "enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { hasPermissions, setPageTitle } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getReportTypeOptions } from "leaseStatisticReport/helpers";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import ContentContainer from "@/components/content/ContentContainer";
+import Divider from "@/components/content/Divider";
+import Loader from "@/components/loader/Loader";
+import PageContainer from "@/components/content/PageContainer";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { PermissionMissingTexts } from "@/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { hasPermissions, setPageTitle } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getReportTypeOptions } from "@/leaseStatisticReport/helpers";
 import LeaseStatisticReportForm from "./LeaseStatisticReportForm";
 import LeaseInvoicingConfirmationReport from "./LeaseInvoicingConfirmationReport";
-import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 import type { Reports } from "types";
-import GreenBox from "components/content/GreenBox";
-import SubTitle from "components/content/SubTitle";
-import { getIsFetchingReportData, getPayload, getReports } from "leaseStatisticReport/selectors";
-import { getReportData } from "leaseStatisticReport/selectors";
-import { getLabelOfOption } from "util/helpers";
+import GreenBox from "@/components/content/GreenBox";
+import SubTitle from "@/components/content/SubTitle";
+import { getIsFetchingReportData, getPayload, getReports } from "@/leaseStatisticReport/selectors";
+import { getReportData } from "@/leaseStatisticReport/selectors";
+import { getLabelOfOption } from "@/util/helpers";
 type Props = {
   isFetchingUsersPermissions: boolean;
   isFetchingReportData: boolean;
diff --git a/src/leaseStatisticReport/helpers.ts b/src/leaseStatisticReport/helpers.ts
index fcc37d050..a312b9cd0 100644
--- a/src/leaseStatisticReport/helpers.ts
+++ b/src/leaseStatisticReport/helpers.ts
@@ -1,9 +1,9 @@
 import get from "lodash/get";
 import format from "date-fns/format";
-import { formatDate, formatNumber } from "util/helpers";
-import { LeaseStatisticReportFormatOptions } from "leaseStatisticReport/enums";
-import type { Reports } from "types";
-import { FieldTypes } from "enums";
+import { formatDate, formatNumber } from "@/util/helpers";
+import { LeaseStatisticReportFormatOptions } from "@/leaseStatisticReport/enums";
+import type { Reports } from "@/types";
+import { FieldTypes } from "@/enums";
 import type { ReportOptions, ReportOutputField } from "./types";
 
 /**
diff --git a/src/leaseStatisticReport/spec.ts b/src/leaseStatisticReport/leaseStatisticReport.spec.ts
similarity index 99%
rename from src/leaseStatisticReport/spec.ts
rename to src/leaseStatisticReport/leaseStatisticReport.spec.ts
index 602d033b3..324342e10 100644
--- a/src/leaseStatisticReport/spec.ts
+++ b/src/leaseStatisticReport/leaseStatisticReport.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchAttributes, attributesNotFound, receiveAttributes, fetchLeaseInvoicingConfirmationReportAttributes, leaseInvoicingConfirmationReportAttributesNotFound, receiveLeaseInvoicingConfirmationReportAttributes, fetchLeaseInvoicingConfrimationReports, notFoundLeaseInvoicingConfrimationReports, receiveLeaseInvoicingConfrimationReports, fetchReports, reportsNotFound, receiveReports, fetchReportData, receiveReportData, reportDataNotFound, setOptions, setPayload, sendReportToMail, noMailSent, mailSent, fetchOptions, receiveOptions, optionsNotFound } from "./actions";
 import leaseStatisticReport from "./reducer";
 import type { LeaseStatisticReportState } from "./types";
diff --git a/src/leaseStatisticReport/reducer.ts b/src/leaseStatisticReport/reducer.ts
index 4616db9b2..77be4888e 100644
--- a/src/leaseStatisticReport/reducer.ts
+++ b/src/leaseStatisticReport/reducer.ts
@@ -1,6 +1,6 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
-import type { Attributes, Reducer, ApiResponse, Reports } from "../types";
+import type { Attributes, Reducer, ApiResponse, Reports } from "@/types";
 import type { ReceiveAttributesAction, ReceiveLeaseInvoicingConfirmationReportAttributesAction, ReceiveLeaseInvoicingConfrimationReportsAction, ReceiveReportsAction, ReceiveReportDataAction, SetOptionsAction, SetPayloadAction, ReceiveOptionsAction } from "./types";
 const isFetchingAttributesReducer: Reducer<boolean> = handleActions({
   'mvj/leaseStatisticReport/FETCH_ATTRIBUTES': () => true,
diff --git a/src/leaseStatisticReport/requests.ts b/src/leaseStatisticReport/requests.ts
index 7acfe8028..9a34a7f94 100644
--- a/src/leaseStatisticReport/requests.ts
+++ b/src/leaseStatisticReport/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 import { parseServiceUnitQuery } from "./helpers";
 
 export const fetchAttributes = (): Generator<any, any, any> => {
diff --git a/src/leaseStatisticReport/saga.ts b/src/leaseStatisticReport/saga.ts
index fa01130ac..6201ed377 100644
--- a/src/leaseStatisticReport/saga.ts
+++ b/src/leaseStatisticReport/saga.ts
@@ -2,8 +2,8 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { SubmissionError } from "redux-form";
 import { receiveAttributes, attributesNotFound, receiveLeaseInvoicingConfirmationReportAttributes, leaseInvoicingConfirmationReportAttributesNotFound, receiveLeaseInvoicingConfrimationReports, notFoundLeaseInvoicingConfrimationReports, receiveReports, reportsNotFound, receiveReportData, reportDataNotFound, mailSent, noMailSent, receiveOptions, optionsNotFound } from "./actions";
 import { fetchAttributes, fetchLeaseInvoicingConfirmationReportAttributes, fetchLeaseInvoicingConfrimationReports, fetchReports, fetchReportData, sendReportToMail, fetchOptions } from "./requests";
-import { receiveError } from "../api/actions";
-import { displayUIMessage } from "util/helpers";
+import { receiveError } from "@/api/actions";
+import { displayUIMessage } from "@/util/helpers";
 
 function* fetchAttributesSaga(): Generator<any, any, any> {
   try {
diff --git a/src/leaseStatisticReport/selectors.ts b/src/leaseStatisticReport/selectors.ts
index e1bd8627f..819d9dfbe 100644
--- a/src/leaseStatisticReport/selectors.ts
+++ b/src/leaseStatisticReport/selectors.ts
@@ -1,5 +1,5 @@
 import type { Attributes, Selector, Reports } from "types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 export const getIsFetchingAttributes: Selector<boolean, void> = (state: RootState): boolean => state.leaseStatisticReport.isFetchingAttributes;
 export const getAttributes: Selector<Attributes, void> = (state: RootState): Attributes => state.leaseStatisticReport.attributes;
 export const getIsFetchingLeaseInvoicingConfirmationReportAttributes: Selector<boolean, void> = (state: RootState): boolean => state.leaseStatisticReport.isFetchingLeaseInvoicingConfirmationReportAttributes;
diff --git a/src/leaseStatisticReport/types.ts b/src/leaseStatisticReport/types.ts
index 8e5592e0a..2a887b2ea 100644
--- a/src/leaseStatisticReport/types.ts
+++ b/src/leaseStatisticReport/types.ts
@@ -1,4 +1,4 @@
-import type { Action, Attributes, ApiResponse, Reports } from "../types";
+import type { Action, Attributes, ApiResponse, Reports } from "@/types";
 export type LeaseStatisticReportState = {
   attributes: Attributes;
   isFetchingAttributes: boolean;
diff --git a/src/leaseType/spec.ts b/src/leaseType/leaseType.spec.ts
similarity index 96%
rename from src/leaseType/spec.ts
rename to src/leaseType/leaseType.spec.ts
index 1a7640a69..0250a8736 100644
--- a/src/leaseType/spec.ts
+++ b/src/leaseType/leaseType.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchLeaseTypes, receiveLeaseTypes, notFound } from "./actions";
 import leaseTypeReducer from "./reducer";
 import type { LeaseTypeState } from "./types";
diff --git a/src/leaseType/reducer.ts b/src/leaseType/reducer.ts
index bcce2d178..899052f28 100644
--- a/src/leaseType/reducer.ts
+++ b/src/leaseType/reducer.ts
@@ -1,7 +1,7 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
 import type { Reducer } from "types";
-import type { LeaseTypeList, ReceiveLeaseTypesAction } from "leaseType/types";
+import type { LeaseTypeList, ReceiveLeaseTypesAction } from "@/leaseType/types";
 const isFetchingReducer: Reducer<boolean> = handleActions({
   'mvj/leaseType/FETCH_ALL': () => true,
   'mvj/leaseType/NOT_FOUND': () => false,
diff --git a/src/leaseType/requests.ts b/src/leaseType/requests.ts
index 1eccf4d9d..459b0f1d6 100644
--- a/src/leaseType/requests.ts
+++ b/src/leaseType/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 export const fetchLeaseTypes = (): Generator<any, any, any> => {
   return callApi(new Request(createUrl('lease_type/?limit=10000')));
 };
\ No newline at end of file
diff --git a/src/leaseType/saga.ts b/src/leaseType/saga.ts
index 59afec455..075086aff 100644
--- a/src/leaseType/saga.ts
+++ b/src/leaseType/saga.ts
@@ -1,6 +1,6 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { notFound, receiveLeaseTypes } from "./actions";
-import { receiveError } from "api/actions";
+import { receiveError } from "@/api/actions";
 import { fetchLeaseTypes } from "./requests";
 
 function* fetchLeaseTypesSaga(): Generator<any, any, any> {
diff --git a/src/leaseType/selectors.ts b/src/leaseType/selectors.ts
index 3b81db1f1..875f617bd 100644
--- a/src/leaseType/selectors.ts
+++ b/src/leaseType/selectors.ts
@@ -1,5 +1,5 @@
-import type { RootState } from "../root/types";
-import type { Selector } from "../types";
+import type { RootState } from "@/root/types";
+import type { Selector } from "@/types";
 import type { LeaseTypeList } from "./types";
 export const getIsFetching: Selector<boolean, void> = (state: RootState): boolean => state.leaseType.isFetching;
 export const getLeaseTypeList: Selector<LeaseTypeList, void> = (state: RootState): LeaseTypeList => state.leaseType.list;
\ No newline at end of file
diff --git a/src/leaseType/types.ts b/src/leaseType/types.ts
index 8c5490ce8..e69ee4337 100644
--- a/src/leaseType/types.ts
+++ b/src/leaseType/types.ts
@@ -1,4 +1,4 @@
-import type { Action } from "../types";
+import type { Action } from "@/types";
 export type LeaseTypeList = Array<Record<string, any>>;
 export type LeaseTypeState = {
   isFetching: boolean;
diff --git a/src/leaseholdTransfer/actions.ts b/src/leaseholdTransfer/actions.ts
index 86d7b8132..02fc12218 100644
--- a/src/leaseholdTransfer/actions.ts
+++ b/src/leaseholdTransfer/actions.ts
@@ -1,6 +1,6 @@
 import { createAction } from "redux-actions";
 import type { Attributes, Methods } from "types";
-import type { FetchAttributesAction, ReceiveAttributesAction, ReceiveMethodsAction, AttributesNotFoundAction, LeaseholdTransferList, FetchLeaseholdTransferListAction, ReceiveLeaseholdTransferListAction, DeleteAndUpdateLeaseholdTrasferPayload, DeleteLeaseholdTransferAndUpdateListAction, NotFoundAction } from "leaseholdTransfer/types";
+import type { FetchAttributesAction, ReceiveAttributesAction, ReceiveMethodsAction, AttributesNotFoundAction, LeaseholdTransferList, FetchLeaseholdTransferListAction, ReceiveLeaseholdTransferListAction, DeleteAndUpdateLeaseholdTrasferPayload, DeleteLeaseholdTransferAndUpdateListAction, NotFoundAction } from "@/leaseholdTransfer/types";
 export const fetchAttributes = (): FetchAttributesAction => createAction('mvj/leaseholdTransfer/FETCH_ATTRIBUTES')();
 export const receiveAttributes = (attributes: Attributes): ReceiveAttributesAction => createAction('mvj/leaseholdTransfer/RECEIVE_ATTRIBUTES')(attributes);
 export const receiveMethods = (methods: Methods): ReceiveMethodsAction => createAction('mvj/leaseholdTransfer/RECEIVE_METHODS')(methods);
diff --git a/src/leaseholdTransfer/components/LeaseholdTransferListPage.tsx b/src/leaseholdTransfer/components/LeaseholdTransferListPage.tsx
index a525f588c..a2e4782ce 100644
--- a/src/leaseholdTransfer/components/LeaseholdTransferListPage.tsx
+++ b/src/leaseholdTransfer/components/LeaseholdTransferListPage.tsx
@@ -5,31 +5,31 @@ import { initialize } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import PageContainer from "components/content/PageContainer";
-import Pagination from "components/table/Pagination";
-import RemoveButton from "components/form/RemoveButton";
-import Search from "leaseholdTransfer/components/search/Search";
-import SortableTable from "components/table/SortableTable";
-import TableFilters from "components/table/TableFilters";
-import TableWrapper from "components/table/TableWrapper";
-import { deleteLeaseholdTransferAndUpdateList, fetchLeaseholdTransferList } from "leaseholdTransfer/actions";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { LIST_TABLE_PAGE_SIZE } from "util/constants";
-import { DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER } from "leaseholdTransfer/constants";
-import { ConfirmationModalTexts, FormNames, Methods, PermissionMissingTexts } from "enums";
-import { ButtonColors } from "components/enums";
-import { LeaseholdTransferFieldPaths, LeaseholdTransferFieldTitles } from "leaseholdTransfer/enums";
-import { getContentLeaseholdTransfers, mapLeaseholdTransferSearchFilters } from "leaseholdTransfer/helpers";
-import { formatDate, getApiResponseCount, getApiResponseMaxPage, getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, setPageTitle } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getIsFetching, getLeaseholdTransferList } from "leaseholdTransfer/selectors";
-import { withLeaseholdTransferAttributes } from "components/attributes/LeaseholdTransferAttributes";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import PageContainer from "@/components/content/PageContainer";
+import Pagination from "@/components/table/Pagination";
+import RemoveButton from "@/components/form/RemoveButton";
+import Search from "@/leaseholdTransfer/components/search/Search";
+import SortableTable from "@/components/table/SortableTable";
+import TableFilters from "@/components/table/TableFilters";
+import TableWrapper from "@/components/table/TableWrapper";
+import { deleteLeaseholdTransferAndUpdateList, fetchLeaseholdTransferList } from "@/leaseholdTransfer/actions";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { LIST_TABLE_PAGE_SIZE } from "@/util/constants";
+import { DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER } from "@/leaseholdTransfer/constants";
+import { ConfirmationModalTexts, FormNames, Methods, PermissionMissingTexts } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { LeaseholdTransferFieldPaths, LeaseholdTransferFieldTitles } from "@/leaseholdTransfer/enums";
+import { getContentLeaseholdTransfers, mapLeaseholdTransferSearchFilters } from "@/leaseholdTransfer/helpers";
+import { formatDate, getApiResponseCount, getApiResponseMaxPage, getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, setPageTitle } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getIsFetching, getLeaseholdTransferList } from "@/leaseholdTransfer/selectors";
+import { withLeaseholdTransferAttributes } from "@/components/attributes/LeaseholdTransferAttributes";
 import type { Attributes, Methods as MethodsType } from "types";
-import type { LeaseholdTransferList } from "leaseholdTransfer/types";
+import type { LeaseholdTransferList } from "@/leaseholdTransfer/types";
 type Props = {
   deleteLeaseholdTransferAndUpdateList: (...args: Array<any>) => any;
   fetchLeaseholdTransferList: (...args: Array<any>) => any;
diff --git a/src/leaseholdTransfer/components/search/Search.tsx b/src/leaseholdTransfer/components/search/Search.tsx
index 347605f6c..1428c4e65 100644
--- a/src/leaseholdTransfer/components/search/Search.tsx
+++ b/src/leaseholdTransfer/components/search/Search.tsx
@@ -5,10 +5,10 @@ import { Row, Column } from "react-foundation";
 import debounce from "lodash/debounce";
 import flowRight from "lodash/flowRight";
 import isEqual from "lodash/isEqual";
-import FormField from "components/form/FormField";
-import SearchClearLink from "components/search/SearchClearLink";
-import SearchContainer from "components/search/SearchContainer";
-import { FieldTypes, FormNames } from "enums";
+import FormField from "@/components/form/FormField";
+import SearchClearLink from "@/components/search/SearchClearLink";
+import SearchContainer from "@/components/search/SearchContainer";
+import { FieldTypes, FormNames } from "@/enums";
 type Props = {
   formValues: Record<string, any>;
   handleSubmit: (...args: Array<any>) => any;
diff --git a/src/leaseholdTransfer/constants.ts b/src/leaseholdTransfer/constants.ts
index 8d041867d..d8e532738 100644
--- a/src/leaseholdTransfer/constants.ts
+++ b/src/leaseholdTransfer/constants.ts
@@ -1,4 +1,4 @@
-import { TableSortOrder } from "enums";
+import { TableSortOrder } from "@/enums";
 
 /**
  * Default sort key of leasehold transfer list page
diff --git a/src/leaseholdTransfer/helpers.ts b/src/leaseholdTransfer/helpers.ts
index 67b9e89e3..550f8bd12 100644
--- a/src/leaseholdTransfer/helpers.ts
+++ b/src/leaseholdTransfer/helpers.ts
@@ -1,8 +1,8 @@
 import get from "lodash/get";
-import { LeaseholdTransferPartyTypes } from "leaseholdTransfer/enums";
-import { TableSortOrder } from "enums";
-import { getApiResponseResults } from "util/helpers";
-import type { LeaseholdTransferList } from "leaseholdTransfer/types";
+import { LeaseholdTransferPartyTypes } from "@/leaseholdTransfer/enums";
+import { TableSortOrder } from "@/enums";
+import { getApiResponseResults } from "@/util/helpers";
+import type { LeaseholdTransferList } from "@/leaseholdTransfer/types";
 
 /**
 * Map leasehold transfer search filters for API
diff --git a/src/leaseholdTransfer/spec.ts b/src/leaseholdTransfer/leaseholdTransfer.spec.ts
similarity index 98%
rename from src/leaseholdTransfer/spec.ts
rename to src/leaseholdTransfer/leaseholdTransfer.spec.ts
index 02275954b..333753ace 100644
--- a/src/leaseholdTransfer/spec.ts
+++ b/src/leaseholdTransfer/leaseholdTransfer.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { receiveAttributes, receiveMethods, fetchAttributes, attributesNotFound, fetchLeaseholdTransferList, receiveLeaseholdTransferList, deleteLeaseholdTransferAndUpdateList, notFound } from "./actions";
 import leaseholdTransferReducer from "./reducer";
 import type { LeaseholdTransferState } from "./types";
diff --git a/src/leaseholdTransfer/reducer.ts b/src/leaseholdTransfer/reducer.ts
index af7b32023..4dcb9a711 100644
--- a/src/leaseholdTransfer/reducer.ts
+++ b/src/leaseholdTransfer/reducer.ts
@@ -1,7 +1,7 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
 import type { Attributes, Methods, Reducer } from "types";
-import type { LeaseholdTransferList, ReceiveAttributesAction, ReceiveMethodsAction, ReceiveLeaseholdTransferListAction } from "leaseholdTransfer/types";
+import type { LeaseholdTransferList, ReceiveAttributesAction, ReceiveMethodsAction, ReceiveLeaseholdTransferListAction } from "@/leaseholdTransfer/types";
 const isFetchingAttributesReducer: Reducer<boolean> = handleActions({
   'mvj/leaseholdTransfer/FETCH_ATTRIBUTES': () => true,
   'mvj/leaseholdTransfer/RECEIVE_METHODS': () => false,
diff --git a/src/leaseholdTransfer/requests.ts b/src/leaseholdTransfer/requests.ts
index 7dc5dd2f6..1a29d63fa 100644
--- a/src/leaseholdTransfer/requests.ts
+++ b/src/leaseholdTransfer/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 export const fetchAttributes = () => {
   return callApi(new Request(createUrl('leasehold_transfer/'), {
     method: 'OPTIONS'
diff --git a/src/leaseholdTransfer/saga.ts b/src/leaseholdTransfer/saga.ts
index 33d8b2d14..e568522aa 100644
--- a/src/leaseholdTransfer/saga.ts
+++ b/src/leaseholdTransfer/saga.ts
@@ -1,7 +1,7 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { receiveAttributes, receiveMethods, attributesNotFound, fetchLeaseholdTransferList as fetchLeaseholdTransferListAction, receiveLeaseholdTransferList, notFound } from "./actions";
-import { receiveError } from "api/actions";
-import { displayUIMessage } from "util/helpers";
+import { receiveError } from "@/api/actions";
+import { displayUIMessage } from "@/util/helpers";
 import { deleteLeaseholdTransfer, fetchAttributes, fetchLeaseholdTransferList } from "./requests";
 
 function* fetchAttributesSaga(): Generator<any, any, any> {
diff --git a/src/leaseholdTransfer/selectors.ts b/src/leaseholdTransfer/selectors.ts
index 6542739d8..e84a032d8 100644
--- a/src/leaseholdTransfer/selectors.ts
+++ b/src/leaseholdTransfer/selectors.ts
@@ -1,6 +1,6 @@
 import type { Attributes, Methods, Selector } from "types";
-import type { LeaseholdTransferList } from "leaseholdTransfer/types";
-import type { RootState } from "root/types";
+import type { LeaseholdTransferList } from "@/leaseholdTransfer/types";
+import type { RootState } from "@/root/types";
 export const getIsFetchingAttributes: Selector<boolean, void> = (state: RootState): boolean => state.leaseholdTransfer.isFetchingAttributes;
 export const getAttributes: Selector<Attributes, void> = (state: RootState): Attributes => state.leaseholdTransfer.attributes;
 export const getMethods: Selector<Methods, void> = (state: RootState): Methods => state.leaseholdTransfer.methods;
diff --git a/src/leases/components/LeaseListPage.tsx b/src/leases/components/LeaseListPage.tsx
index 97d45a44d..8da0c0179 100644
--- a/src/leases/components/LeaseListPage.tsx
+++ b/src/leases/components/LeaseListPage.tsx
@@ -7,54 +7,54 @@ import { Row, Column } from "react-foundation";
 import debounce from "lodash/debounce";
 import isArray from "lodash/isArray";
 import isEmpty from "lodash/isEmpty";
-import FieldTypeSelect from "components/form/FieldTypeSelect";
-import SearchInputColumn from "components/search/SearchInputColumn";
-import SearchLabel from "components/search/SearchLabel";
-import SearchLabelColumn from "components/search/SearchLabelColumn";
-import SearchRow from "components/search/SearchRow";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import Authorization from "components/authorization/Authorization";
-import AuthorizationError from "components/authorization/AuthorizationError";
+import FieldTypeSelect from "@/components/form/FieldTypeSelect";
+import SearchInputColumn from "@/components/search/SearchInputColumn";
+import SearchLabel from "@/components/search/SearchLabel";
+import SearchLabelColumn from "@/components/search/SearchLabelColumn";
+import SearchRow from "@/components/search/SearchRow";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import Authorization from "@/components/authorization/Authorization";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
 import CreateLeaseModal from "./createLease/CreateLeaseModal";
-import IconRadioButtons from "components/button/IconRadioButtons";
-import LeaseListMap from "leases/components/leaseSections/map/LeaseListMap";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import MapIcon from "components/icons/MapIcon";
-import PageContainer from "components/content/PageContainer";
-import Pagination from "components/table/Pagination";
+import IconRadioButtons from "@/components/button/IconRadioButtons";
+import LeaseListMap from "@/leases/components/leaseSections/map/LeaseListMap";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import MapIcon from "@/components/icons/MapIcon";
+import PageContainer from "@/components/content/PageContainer";
+import Pagination from "@/components/table/Pagination";
 import Search from "./search/Search";
-import SortableTable from "components/table/SortableTable";
-import TableFilters from "components/table/TableFilters";
-import TableIcon from "components/icons/TableIcon";
-import TableFilterWrapper from "components/table/TableFilterWrapper";
-import TableWrapper from "components/table/TableWrapper";
-import VisualisationTypeWrapper from "components/table/VisualisationTypeWrapper";
-import { fetchAreaNoteList } from "areaNote/actions";
-import { fetchServiceUnits } from "serviceUnits/actions";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { createLease, fetchLeases, fetchLeasesByBBox } from "leases/actions";
-import { fetchLessors } from "lessor/actions";
-import { LIST_TABLE_PAGE_SIZE } from "util/constants";
-import { DEFAULT_LEASE_STATES, DEFAULT_ONLY_ACTIVE_LEASES, DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER, MAX_ZOOM_LEVEL_TO_FETCH_LEASES, BOUNDING_BOX_FOR_SEARCH_QUERY, leaseStateFilterOptions } from "leases/constants";
-import { FormNames, Methods, PermissionMissingTexts } from "enums";
-import { LeaseAreasFieldPaths, LeaseAreaAddressesFieldPaths, LeaseFieldPaths, LeaseFieldTitles, LeaseTenantsFieldPaths } from "leases/enums";
-import { getContentLeaseListResults, mapLeaseSearchFilters } from "leases/helpers";
-import { formatDate, getApiResponseCount, getApiResponseMaxPage, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, setPageTitle } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getAreaNoteList, getMethods as getAreaNoteMethods } from "areaNote/selectors";
-import { getIsFetching, getIsFetchingByBBox, getLeasesList } from "leases/selectors";
-import { getLessorList } from "lessor/selectors";
-import { getUsersPermissions, getUserActiveServiceUnit } from "usersPermissions/selectors";
-import { withLeaseAttributes } from "components/attributes/LeaseAttributes";
-import { withUiDataList } from "components/uiData/UiDataListHOC";
-import { getServiceUnits, getIsFetching as getIsFetchingServiceUnits } from "serviceUnits/selectors";
+import SortableTable from "@/components/table/SortableTable";
+import TableFilters from "@/components/table/TableFilters";
+import TableIcon from "@/components/icons/TableIcon";
+import TableFilterWrapper from "@/components/table/TableFilterWrapper";
+import TableWrapper from "@/components/table/TableWrapper";
+import VisualisationTypeWrapper from "@/components/table/VisualisationTypeWrapper";
+import { fetchAreaNoteList } from "@/areaNote/actions";
+import { fetchServiceUnits } from "@/serviceUnits/actions";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { createLease, fetchLeases, fetchLeasesByBBox } from "@/leases/actions";
+import { fetchLessors } from "@/lessor/actions";
+import { LIST_TABLE_PAGE_SIZE } from "@/util/constants";
+import { DEFAULT_LEASE_STATES, DEFAULT_ONLY_ACTIVE_LEASES, DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER, MAX_ZOOM_LEVEL_TO_FETCH_LEASES, BOUNDING_BOX_FOR_SEARCH_QUERY, leaseStateFilterOptions } from "@/leases/constants";
+import { FormNames, Methods, PermissionMissingTexts } from "@/enums";
+import { LeaseAreasFieldPaths, LeaseAreaAddressesFieldPaths, LeaseFieldPaths, LeaseFieldTitles, LeaseTenantsFieldPaths } from "@/leases/enums";
+import { getContentLeaseListResults, mapLeaseSearchFilters } from "@/leases/helpers";
+import { formatDate, getApiResponseCount, getApiResponseMaxPage, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, setPageTitle } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getAreaNoteList, getMethods as getAreaNoteMethods } from "@/areaNote/selectors";
+import { getIsFetching, getIsFetchingByBBox, getLeasesList } from "@/leases/selectors";
+import { getLessorList } from "@/lessor/selectors";
+import { getUsersPermissions, getUserActiveServiceUnit } from "@/usersPermissions/selectors";
+import { withLeaseAttributes } from "@/components/attributes/LeaseAttributes";
+import { withUiDataList } from "@/components/uiData/UiDataListHOC";
+import { getServiceUnits, getIsFetching as getIsFetchingServiceUnits } from "@/serviceUnits/selectors";
 import type { Attributes, Methods as MethodsType } from "types";
-import type { AreaNoteList } from "areaNote/types";
-import type { LeaseList } from "leases/types";
-import type { LessorList } from "lessor/types";
-import type { ServiceUnits } from "serviceUnits/types";
-import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "usersPermissions/types";
+import type { AreaNoteList } from "@/areaNote/types";
+import type { LeaseList } from "@/leases/types";
+import type { LessorList } from "@/lessor/types";
+import type { ServiceUnits } from "@/serviceUnits/types";
+import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "@/usersPermissions/types";
 const VisualizationTypes = {
   MAP: 'map',
   TABLE: 'table'
diff --git a/src/leases/components/LeasePage.tsx b/src/leases/components/LeasePage.tsx
index 015b188d5..c78cd559b 100644
--- a/src/leases/components/LeasePage.tsx
+++ b/src/leases/components/LeasePage.tsx
@@ -5,69 +5,69 @@ import { change, destroy, getFormValues, initialize, isDirty } from "redux-form"
 import { withRouter } from "react-router";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import Authorization from "components/authorization/Authorization";
-import AuthorizationError from "components/authorization/AuthorizationError";
+import Authorization from "@/components/authorization/Authorization";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
 import CommentPanel from "./leaseSections/comments/CommentPanel";
-import ConfirmationModal from "components/modal/ConfirmationModal";
+import ConfirmationModal from "@/components/modal/ConfirmationModal";
 import Constructability from "./leaseSections/constructability/Constructability";
 import ConstructabilityEdit from "./leaseSections/constructability/ConstructabilityEdit";
-import ContentContainer from "components/content/ContentContainer";
-import ControlButtons from "components/controlButtons/ControlButtons";
-import ControlButtonBar from "components/controlButtons/ControlButtonBar";
+import ContentContainer from "@/components/content/ContentContainer";
+import ControlButtons from "@/components/controlButtons/ControlButtons";
+import ControlButtonBar from "@/components/controlButtons/ControlButtonBar";
 import DecisionsMain from "./leaseSections/contract/DecisionsMain";
 import DecisionsMainEdit from "./leaseSections/contract/DecisionsMainEdit";
-import FullWidthContainer from "components/content/FullWidthContainer";
+import FullWidthContainer from "@/components/content/FullWidthContainer";
 import Invoices from "./leaseSections/invoice/Invoices";
 import LeaseAreas from "./leaseSections/leaseArea/LeaseAreas";
 import LeaseAreasEdit from "./leaseSections/leaseArea/LeaseAreasEdit";
 import LeaseAuditLog from "./leaseSections/auditLog/LeaseAuditLog";
 import LeaseInfo from "./leaseSections/leaseInfo/LeaseInfo";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import PageContainer from "components/content/PageContainer";
-import PageNavigationWrapper from "components/content/PageNavigationWrapper";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import PageContainer from "@/components/content/PageContainer";
+import PageNavigationWrapper from "@/components/content/PageNavigationWrapper";
 import Rents from "./leaseSections/rent/Rents";
 import RentsEdit from "./leaseSections/rent/RentsEdit";
 import SingleLeaseMap from "./leaseSections/map/SingleLeaseMap";
 import Summary from "./leaseSections/summary/Summary";
 import SummaryEdit from "./leaseSections/summary/SummaryEdit";
-import Tabs from "components/tabs/Tabs";
-import TabPane from "components/tabs/TabPane";
-import TabContent from "components/tabs/TabContent";
+import Tabs from "@/components/tabs/Tabs";
+import TabPane from "@/components/tabs/TabPane";
+import TabContent from "@/components/tabs/TabContent";
 import TenantsEdit from "./leaseSections/tenant/TenantsEdit";
 import Tenants from "./leaseSections/tenant/Tenants";
-import { fetchCommentsByLease } from "comments/actions";
-import { fetchInvoicesByLease } from "invoices/actions";
-import { clearFormValidFlags, deleteLease, fetchSingleLease, hideEditMode, patchLease, receiveSingleLease, receiveFormValidFlags, receiveIsSaveClicked, showEditMode } from "leases/actions";
-import { fetchLeaseTypes } from "leaseType/actions";
-import { clearPreviewInvoices } from "previewInvoices/actions";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { fetchVats } from "vat/actions";
-import { ConfirmationModalTexts, FormNames, Methods, PermissionMissingTexts } from "enums";
-import { LeaseAreasFieldPaths, LeaseBasisOfRentsFieldPaths, LeaseContractsFieldPaths, LeaseDecisionsFieldPaths, LeaseInspectionsFieldPaths, LeaseRentsFieldPaths, LeaseTenantsFieldPaths } from "leases/enums";
-import { ButtonColors } from "components/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { clearUnsavedChanges, getContentLeaseIdentifier } from "leases/helpers";
-import { addAreasFormValuesToPayload, addConstructabilityFormValuesToPayload, addContractsFormValuesToPayload, addDecisionsFormValuesToPayload, addInspectionsFormValuesToPayload, addRentsFormValuesToPayload, addSummaryFormValuesToPayload, addTenantsFormValuesToPayload, getContentBasisOfRents, getContentContracts, getContentConstructabilityAreas, getContentDecisions, getContentInspections, getContentLeaseAreas, getContentRents, getContentLeaseSummary, getContentTenants, isUserAllowedToDeleteEmptyLease } from "leases/helpers";
-import { getSearchQuery, getUrlParams, hasPermissions, isArchived, isFieldAllowedToRead, isMethodAllowed, scrollToTopPage, setPageTitle } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getLoggedInUser } from "auth/selectors";
-import { getCommentsByLease } from "comments/selectors";
-import { getInvoicesByLease } from "invoices/selectors";
-import { getCurrentLease, getIsEditMode, getIsFetching, getIsFormValidById, getIsFormValidFlags, getIsSaveClicked, getIsSaving } from "leases/selectors";
-import { getLeaseTypeList } from "leaseType/selectors";
-import { getVats } from "vat/selectors";
-import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "util/storage";
-import { withLeasePageAttributes } from "components/attributes/LeasePageAttributes";
-import { withUiDataList } from "components/uiData/UiDataListHOC";
-import { getUserActiveServiceUnit } from "usersPermissions/selectors";
+import { fetchCommentsByLease } from "@/comments/actions";
+import { fetchInvoicesByLease } from "@/invoices/actions";
+import { clearFormValidFlags, deleteLease, fetchSingleLease, hideEditMode, patchLease, receiveSingleLease, receiveFormValidFlags, receiveIsSaveClicked, showEditMode } from "@/leases/actions";
+import { fetchLeaseTypes } from "@/leaseType/actions";
+import { clearPreviewInvoices } from "@/previewInvoices/actions";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { fetchVats } from "@/vat/actions";
+import { ConfirmationModalTexts, FormNames, Methods, PermissionMissingTexts } from "@/enums";
+import { LeaseAreasFieldPaths, LeaseBasisOfRentsFieldPaths, LeaseContractsFieldPaths, LeaseDecisionsFieldPaths, LeaseInspectionsFieldPaths, LeaseRentsFieldPaths, LeaseTenantsFieldPaths } from "@/leases/enums";
+import { ButtonColors } from "@/components/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { clearUnsavedChanges, getContentLeaseIdentifier } from "@/leases/helpers";
+import { addAreasFormValuesToPayload, addConstructabilityFormValuesToPayload, addContractsFormValuesToPayload, addDecisionsFormValuesToPayload, addInspectionsFormValuesToPayload, addRentsFormValuesToPayload, addSummaryFormValuesToPayload, addTenantsFormValuesToPayload, getContentBasisOfRents, getContentContracts, getContentConstructabilityAreas, getContentDecisions, getContentInspections, getContentLeaseAreas, getContentRents, getContentLeaseSummary, getContentTenants, isUserAllowedToDeleteEmptyLease } from "@/leases/helpers";
+import { getSearchQuery, getUrlParams, hasPermissions, isArchived, isFieldAllowedToRead, isMethodAllowed, scrollToTopPage, setPageTitle } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getLoggedInUser } from "@/auth/selectors";
+import { getCommentsByLease } from "@/comments/selectors";
+import { getInvoicesByLease } from "@/invoices/selectors";
+import { getCurrentLease, getIsEditMode, getIsFetching, getIsFormValidById, getIsFormValidFlags, getIsSaveClicked, getIsSaving } from "@/leases/selectors";
+import { getLeaseTypeList } from "@/leaseType/selectors";
+import { getVats } from "@/vat/selectors";
+import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "@/util/storage";
+import { withLeasePageAttributes } from "@/components/attributes/LeasePageAttributes";
+import { withUiDataList } from "@/components/uiData/UiDataListHOC";
+import { getUserActiveServiceUnit } from "@/usersPermissions/selectors";
 import type { Attributes, Methods as MethodsType } from "types";
-import type { CommentList } from "comments/types";
-import type { InvoiceList } from "invoices/types";
-import type { Lease } from "leases/types";
-import type { LeaseTypeList } from "leaseType/types";
-import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "usersPermissions/types";
-import type { VatList } from "vat/types";
+import type { CommentList } from "@/comments/types";
+import type { InvoiceList } from "@/invoices/types";
+import type { Lease } from "@/leases/types";
+import type { LeaseTypeList } from "@/leaseType/types";
+import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "@/usersPermissions/types";
+import type { VatList } from "@/vat/types";
 type Props = {
   areasFormValues: Record<string, any>;
   change: (...args: Array<any>) => any;
diff --git a/src/leases/components/createLease/CreateLeaseForm.tsx b/src/leases/components/createLease/CreateLeaseForm.tsx
index f9ef2fb8b..481fa8bbf 100644
--- a/src/leases/components/createLease/CreateLeaseForm.tsx
+++ b/src/leases/components/createLease/CreateLeaseForm.tsx
@@ -3,28 +3,28 @@ import { connect } from "react-redux";
 import { change, formValueSelector, getFormValues, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import Authorization from "components/authorization/Authorization";
-import Button from "components/button/Button";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import ModalButtonWrapper from "components/modal/ModalButtonWrapper";
-import { fetchDistrictsByMunicipality } from "district/actions";
-import { FieldTypes, FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import { LeaseFieldPaths, LeaseFieldTitles } from "leases/enums";
-import { filterOptionsByLabel } from "components/form/filter";
-import { getDistrictOptions } from "district/helpers";
-import { getPayloadCreateLease } from "leases/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getFieldAttributes, isFieldAllowedToEdit } from "util/helpers";
-import { getDistrictsByMunicipality, getIsFetching as getIsFetchingDistricts } from "district/selectors";
-import { getAttributes as getLeaseAttributes } from "leases/selectors";
-import { referenceNumber } from "components/form/validations";
-import { getUserActiveServiceUnit } from "usersPermissions/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import Button from "@/components/button/Button";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper";
+import { fetchDistrictsByMunicipality } from "@/district/actions";
+import { FieldTypes, FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { LeaseFieldPaths, LeaseFieldTitles } from "@/leases/enums";
+import { filterOptionsByLabel } from "@/components/form/filter";
+import { getDistrictOptions } from "@/district/helpers";
+import { getPayloadCreateLease } from "@/leases/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getFieldAttributes, isFieldAllowedToEdit } from "@/util/helpers";
+import { getDistrictsByMunicipality, getIsFetching as getIsFetchingDistricts } from "@/district/selectors";
+import { getAttributes as getLeaseAttributes } from "@/leases/selectors";
+import { referenceNumber } from "@/components/form/validations";
+import { getUserActiveServiceUnit } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { DistrictList } from "district/types";
-import type { UserServiceUnit } from "usersPermissions/types";
+import type { DistrictList } from "@/district/types";
+import type { UserServiceUnit } from "@/usersPermissions/types";
 type OwnProps = {
   onClose: (...args: Array<any>) => any;
   onSubmit: (...args: Array<any>) => any;
@@ -130,10 +130,12 @@ class CreateLeaseForm extends Component<Props> {
           </Column>
           <Column small={4}>
             <Authorization allow={isFieldAllowedToEdit(leaseAttributes, LeaseFieldPaths.SERVICE_UNIT)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.SERVICE_UNIT)}>
                 {LeaseFieldTitles.SERVICE_UNIT}
               </FormTextTitle>
               <FormText>{userActiveServiceUnit.name ? userActiveServiceUnit.name : '-'}</FormText>
+              </>
             </Authorization>
           </Column>
         </Row>
diff --git a/src/leases/components/createLease/CreateLeaseModal.tsx b/src/leases/components/createLease/CreateLeaseModal.tsx
index a69de0d9d..5457acd2b 100644
--- a/src/leases/components/createLease/CreateLeaseModal.tsx
+++ b/src/leases/components/createLease/CreateLeaseModal.tsx
@@ -1,7 +1,7 @@
 import { $Shape } from "utility-types";
 import React, { Component } from "react";
 import CreateLeaseForm from "./CreateLeaseForm";
-import Modal from "components/modal/Modal";
+import Modal from "@/components/modal/Modal";
 type Props = {
   allowToChangeRelateTo?: boolean;
   isOpen: boolean;
@@ -25,7 +25,7 @@ class CreateLease extends Component<Props> {
     this.form = element;
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       allowToChangeRelateTo,
       isOpen,
diff --git a/src/leases/components/leaseSections/auditLog/LeaseAuditLog.tsx b/src/leases/components/leaseSections/auditLog/LeaseAuditLog.tsx
index 4d8930d80..3fdf7ff11 100644
--- a/src/leases/components/leaseSections/auditLog/LeaseAuditLog.tsx
+++ b/src/leases/components/leaseSections/auditLog/LeaseAuditLog.tsx
@@ -1,21 +1,21 @@
 import React, { Fragment, PureComponent } from "react";
 import { connect } from "react-redux";
 import isEmpty from "lodash/isEmpty";
-import AuditLogTable from "components/auditLog/AuditLogTable";
-import Divider from "components/content/Divider";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import Pagination from "components/table/Pagination";
-import TableWrapper from "components/table/TableWrapper";
-import Title from "components/content/Title";
-import { fetchAuditLogByLease } from "auditLog/actions";
-import { LIST_TABLE_PAGE_SIZE } from "util/constants";
-import { LeaseFieldPaths, LeaseFieldTitles } from "leases/enums";
-import { getApiResponseCount, getApiResponseMaxPage, getApiResponseResults } from "util/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getAuditLogByLease, getIsFetchingByLease } from "auditLog/selectors";
-import { getIsEditMode } from "leases/selectors";
-import type { AuditLogList } from "auditLog/types";
+import AuditLogTable from "@/components/auditLog/AuditLogTable";
+import Divider from "@/components/content/Divider";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import Pagination from "@/components/table/Pagination";
+import TableWrapper from "@/components/table/TableWrapper";
+import Title from "@/components/content/Title";
+import { fetchAuditLogByLease } from "@/auditLog/actions";
+import { LIST_TABLE_PAGE_SIZE } from "@/util/constants";
+import { LeaseFieldPaths, LeaseFieldTitles } from "@/leases/enums";
+import { getApiResponseCount, getApiResponseMaxPage, getApiResponseResults } from "@/util/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getAuditLogByLease, getIsFetchingByLease } from "@/auditLog/selectors";
+import { getIsEditMode } from "@/leases/selectors";
+import type { AuditLogList } from "@/auditLog/types";
 type Props = {
   auditLogList: AuditLogList;
   fetchAuditLogByLease: (...args: Array<any>) => any;
diff --git a/src/leases/components/leaseSections/comments/Comment.tsx b/src/leases/components/leaseSections/comments/Comment.tsx
index a4c21c55e..aa738b41b 100644
--- a/src/leases/components/leaseSections/comments/Comment.tsx
+++ b/src/leases/components/leaseSections/comments/Comment.tsx
@@ -1,15 +1,15 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
-import Button from "components/button/Button";
-import EditButton from "components/button/EditButton";
-import ShowMore from "components/showMore/ShowMore";
-import TextAreaInput from "components/inputs/TextAreaInput";
-import { editComment, hideEditModeById, showEditModeById } from "comments/actions";
-import { ButtonColors } from "components/enums";
-import { getPayloadComment } from "comments/helpers";
-import { formatDate } from "util/helpers";
-import { getIsEditModeById } from "comments/selectors";
+import Button from "@/components/button/Button";
+import EditButton from "@/components/button/EditButton";
+import ShowMore from "@/components/showMore/ShowMore";
+import TextAreaInput from "@/components/inputs/TextAreaInput";
+import { editComment, hideEditModeById, showEditModeById } from "@/comments/actions";
+import { ButtonColors } from "@/components/enums";
+import { getPayloadComment } from "@/comments/helpers";
+import { formatDate } from "@/util/helpers";
+import { getIsEditModeById } from "@/comments/selectors";
 type Props = {
   allowEdit: boolean;
   comment: Record<string, any>;
diff --git a/src/leases/components/leaseSections/comments/CommentPanel.tsx b/src/leases/components/leaseSections/comments/CommentPanel.tsx
index 0d8581a8f..13bdbd1bf 100644
--- a/src/leases/components/leaseSections/comments/CommentPanel.tsx
+++ b/src/leases/components/leaseSections/comments/CommentPanel.tsx
@@ -5,26 +5,26 @@ import { withRouter } from "react-router";
 import classNames from "classnames";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import Authorization from "components/authorization/Authorization";
-import CheckboxInput from "components/inputs/CheckboxInput";
-import CloseButton from "components/button/CloseButton";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import Authorization from "@/components/authorization/Authorization";
+import CheckboxInput from "@/components/inputs/CheckboxInput";
+import CloseButton from "@/components/button/CloseButton";
 import Comment from "./Comment";
-import FormText from "components/form/FormText";
+import FormText from "@/components/form/FormText";
 import NewCommentForm from "./NewCommentForm";
-import { clearEditFlags, createComment, receiveIsSaveClicked } from "comments/actions";
-import { ConfirmationModalTexts, FormNames, Methods } from "enums";
-import { ButtonColors } from "components/enums";
-import { CommentFieldPaths } from "comments/enums";
-import { getFieldOptions, isFieldAllowedToEdit, isMethodAllowed, sortStringByKeyDesc } from "util/helpers";
-import { getContentComments } from "comments/helpers";
-import { getAttributes as getCommentAttributes, getCommentsByLease, getEditModeFlags, getMethods as getCommentMethods } from "comments/selectors";
-import { getCurrentLease } from "leases/selectors";
-import { getUserActiveServiceUnit } from "usersPermissions/selectors";
+import { clearEditFlags, createComment, receiveIsSaveClicked } from "@/comments/actions";
+import { ConfirmationModalTexts, FormNames, Methods } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { CommentFieldPaths } from "@/comments/enums";
+import { getFieldOptions, isFieldAllowedToEdit, isMethodAllowed, sortStringByKeyDesc } from "@/util/helpers";
+import { getContentComments } from "@/comments/helpers";
+import { getAttributes as getCommentAttributes, getCommentsByLease, getEditModeFlags, getMethods as getCommentMethods } from "@/comments/selectors";
+import { getCurrentLease } from "@/leases/selectors";
+import { getUserActiveServiceUnit } from "@/usersPermissions/selectors";
 import type { Attributes, Methods as MethodsType } from "types";
-import type { CommentList } from "comments/types";
-import type { Lease } from "leases/types";
-import type { UserServiceUnit } from "usersPermissions/types";
+import type { CommentList } from "@/comments/types";
+import type { Lease } from "@/leases/types";
+import type { UserServiceUnit } from "@/usersPermissions/types";
 type Props = {
   clearEditFlags: (...args: Array<any>) => any;
   commentAttributes: Attributes;
diff --git a/src/leases/components/leaseSections/comments/NewCommentForm.tsx b/src/leases/components/leaseSections/comments/NewCommentForm.tsx
index 676826915..25bd71994 100644
--- a/src/leases/components/leaseSections/comments/NewCommentForm.tsx
+++ b/src/leases/components/leaseSections/comments/NewCommentForm.tsx
@@ -2,18 +2,18 @@ import React from "react";
 import { connect } from "react-redux";
 import { formValueSelector, reduxForm } from "redux-form";
 import flowRight from "lodash/flowRight";
-import Authorization from "components/authorization/Authorization";
-import Button from "components/button/Button";
-import FormField from "components/form/FormField";
-import { receiveIsSaveClicked } from "comments/actions";
-import { FieldTypes, FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import { CommentFieldPaths, CommentFieldTitles } from "comments/enums";
-import { getUiDataCommentKey } from "uiData/helpers";
-import { getFieldAttributes, isFieldAllowedToEdit } from "util/helpers";
-import { getAttributes as getCommentAttributes, getIsSaveClicked } from "comments/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import Button from "@/components/button/Button";
+import FormField from "@/components/form/FormField";
+import { receiveIsSaveClicked } from "@/comments/actions";
+import { FieldTypes, FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { CommentFieldPaths, CommentFieldTitles } from "@/comments/enums";
+import { getUiDataCommentKey } from "@/uiData/helpers";
+import { getFieldAttributes, isFieldAllowedToEdit } from "@/util/helpers";
+import { getAttributes as getCommentAttributes, getIsSaveClicked } from "@/comments/selectors";
 import type { Attributes } from "types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 type Props = {
   commentAttributes: Attributes;
   isSaveClicked: boolean;
diff --git a/src/leases/components/leaseSections/constructability/Comment.tsx b/src/leases/components/leaseSections/constructability/Comment.tsx
index 9026be801..5340240f5 100644
--- a/src/leases/components/leaseSections/constructability/Comment.tsx
+++ b/src/leases/components/leaseSections/constructability/Comment.tsx
@@ -2,15 +2,15 @@ import React from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import classNames from "classnames";
-import Authorization from "components/authorization/Authorization";
-import BoxItem from "components/content/BoxItem";
-import ExternalLink from "components/links/ExternalLink";
-import FormText from "components/form/FormText";
-import ListItem from "components/content/ListItem";
-import { LeaseConstructabilityDescriptionsFieldPaths } from "leases/enums";
-import { formatDate, getReferenceNumberLink, isFieldAllowedToRead } from "util/helpers";
-import { getUserFullName } from "users/helpers";
-import { getAttributes as getLeaseAttributes } from "leases/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import BoxItem from "@/components/content/BoxItem";
+import ExternalLink from "@/components/links/ExternalLink";
+import FormText from "@/components/form/FormText";
+import ListItem from "@/components/content/ListItem";
+import { LeaseConstructabilityDescriptionsFieldPaths } from "@/leases/enums";
+import { formatDate, getReferenceNumberLink, isFieldAllowedToRead } from "@/util/helpers";
+import { getUserFullName } from "@/users/helpers";
+import { getAttributes as getLeaseAttributes } from "@/leases/selectors";
 import type { Attributes } from "types";
 type Props = {
   className?: string;
diff --git a/src/leases/components/leaseSections/constructability/Comments.tsx b/src/leases/components/leaseSections/constructability/Comments.tsx
index e3db700ff..1712d2cd0 100644
--- a/src/leases/components/leaseSections/constructability/Comments.tsx
+++ b/src/leases/components/leaseSections/constructability/Comments.tsx
@@ -1,10 +1,10 @@
 import React, { Fragment } from "react";
-import BoxItemContainer from "components/content/BoxItemContainer";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
 import Comment from "./Comment";
-import FormText from "components/form/FormText";
-import SubTitle from "components/content/SubTitle";
-import { LeaseConstructabilityDescriptionsFieldPaths, LeaseConstructabilityDescriptionsFieldTitles } from "leases/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
+import FormText from "@/components/form/FormText";
+import SubTitle from "@/components/content/SubTitle";
+import { LeaseConstructabilityDescriptionsFieldPaths, LeaseConstructabilityDescriptionsFieldTitles } from "@/leases/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
 type Props = {
   commentClassName?: string;
   comments: Array<Record<string, any>>;
diff --git a/src/leases/components/leaseSections/constructability/Constructability.tsx b/src/leases/components/leaseSections/constructability/Constructability.tsx
index d3664bc0b..61fd5e07c 100644
--- a/src/leases/components/leaseSections/constructability/Constructability.tsx
+++ b/src/leases/components/leaseSections/constructability/Constructability.tsx
@@ -1,17 +1,17 @@
 import React, { Fragment, PureComponent } from "react";
 import { connect } from "react-redux";
 import ConstructabilityItem from "./ConstructabilityItem";
-import Divider from "components/content/Divider";
-import FormText from "components/form/FormText";
+import Divider from "@/components/content/Divider";
+import FormText from "@/components/form/FormText";
 import SendEmail from "./SendEmail";
-import Title from "components/content/Title";
-import { LeaseAreasFieldPaths, LeaseAreasFieldTitles } from "leases/enums";
-import { getContentConstructabilityAreas } from "leases/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getFieldOptions } from "util/helpers";
-import { getAttributes, getCurrentLease } from "leases/selectors";
+import Title from "@/components/content/Title";
+import { LeaseAreasFieldPaths, LeaseAreasFieldTitles } from "@/leases/enums";
+import { getContentConstructabilityAreas } from "@/leases/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getFieldOptions } from "@/util/helpers";
+import { getAttributes, getCurrentLease } from "@/leases/selectors";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
+import type { Lease } from "@/leases/types";
 type Props = {
   attributes: Attributes;
   currentLease: Lease;
diff --git a/src/leases/components/leaseSections/constructability/ConstructabilityEdit.tsx b/src/leases/components/leaseSections/constructability/ConstructabilityEdit.tsx
index 7abb8f8e6..0427eb742 100644
--- a/src/leases/components/leaseSections/constructability/ConstructabilityEdit.tsx
+++ b/src/leases/components/leaseSections/constructability/ConstructabilityEdit.tsx
@@ -3,19 +3,19 @@ import { connect } from "react-redux";
 import { FieldArray, reduxForm } from "redux-form";
 import flowRight from "lodash/flowRight";
 import ConstructabilityItemEdit from "./ConstructabilityItemEdit";
-import Divider from "components/content/Divider";
-import FormText from "components/form/FormText";
+import Divider from "@/components/content/Divider";
+import FormText from "@/components/form/FormText";
 import SendEmail from "./SendEmail";
-import Title from "components/content/Title";
-import { receiveFormValidFlags } from "leases/actions";
-import { FormNames } from "enums";
-import { LeaseAreasFieldPaths, LeaseAreasFieldTitles } from "leases/enums";
-import { getContentConstructabilityAreas } from "leases/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getFieldOptions } from "util/helpers";
-import { getAttributes, getCurrentLease, getErrorsByFormName, getIsSaveClicked } from "leases/selectors";
+import Title from "@/components/content/Title";
+import { receiveFormValidFlags } from "@/leases/actions";
+import { FormNames } from "@/enums";
+import { LeaseAreasFieldPaths, LeaseAreasFieldTitles } from "@/leases/enums";
+import { getContentConstructabilityAreas } from "@/leases/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getFieldOptions } from "@/util/helpers";
+import { getAttributes, getCurrentLease, getErrorsByFormName, getIsSaveClicked } from "@/leases/selectors";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
+import type { Lease } from "@/leases/types";
 type AreaProps = {
   attributes: Attributes;
   constructabilityStateOptions: Array<Record<string, any>>;
diff --git a/src/leases/components/leaseSections/constructability/ConstructabilityItem.tsx b/src/leases/components/leaseSections/constructability/ConstructabilityItem.tsx
index 4783d7dbd..0b91616d1 100644
--- a/src/leases/components/leaseSections/constructability/ConstructabilityItem.tsx
+++ b/src/leases/components/leaseSections/constructability/ConstructabilityItem.tsx
@@ -2,23 +2,23 @@ import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
-import Authorization from "components/authorization/Authorization";
-import Collapse from "components/collapse/Collapse";
-import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle";
+import Authorization from "@/components/authorization/Authorization";
+import Collapse from "@/components/collapse/Collapse";
+import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle";
 import Comments from "./Comments";
-import FileDownloadLink from "components/file/FileDownloadLink";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
+import FileDownloadLink from "@/components/file/FileDownloadLink";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
 import StatusIndicator from "./StatusIndicator";
-import SubTitle from "components/content/SubTitle";
-import { receiveCollapseStates } from "leases/actions";
-import { FormNames, ViewModes } from "enums";
-import { LeaseAreaAddressesFieldPaths, LeaseAreaAttachmentsFieldPaths, LeaseAreaAttachmentsFieldTitles, LeaseAreasFieldPaths, LeaseAreasFieldTitles, LeaseConstructabilityDescriptionsFieldPaths } from "leases/enums";
-import { getFullAddress } from "leases/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatDate, formatNumber, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "util/helpers";
-import { getUserFullName } from "users/helpers";
-import { getAttributes, getCollapseStateByKey } from "leases/selectors";
+import SubTitle from "@/components/content/SubTitle";
+import { receiveCollapseStates } from "@/leases/actions";
+import { FormNames, ViewModes } from "@/enums";
+import { LeaseAreaAddressesFieldPaths, LeaseAreaAttachmentsFieldPaths, LeaseAreaAttachmentsFieldTitles, LeaseAreasFieldPaths, LeaseAreasFieldTitles, LeaseConstructabilityDescriptionsFieldPaths } from "@/leases/enums";
+import { getFullAddress } from "@/leases/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatDate, formatNumber, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers";
+import { getUserFullName } from "@/users/helpers";
+import { getAttributes, getCollapseStateByKey } from "@/leases/selectors";
 import type { Attributes } from "types";
 const formName = FormNames.LEASE_CONSTRUCTABILITY;
 type Props = {
@@ -119,26 +119,32 @@ const ConstructabilityItem = ({
         <Row>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreasFieldPaths.PRECONSTRUCTION_STATE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreasFieldPaths.PRECONSTRUCTION_STATE)}>
                 {LeaseAreasFieldTitles.PRECONSTRUCTION_STATE}
               </FormTextTitle>
               <FormText>{getLabelOfOption(constructabilityStateOptions, area.preconstruction_state) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreasFieldPaths.PRECONSTRUCTION_ESTIMATED_CONSTRUCTION_READINESS_MOMENT)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreasFieldPaths.PRECONSTRUCTION_ESTIMATED_CONSTRUCTION_READINESS_MOMENT)}>
                 {LeaseAreasFieldTitles.PRECONSTRUCTION_ESTIMATED_CONSTRUCTION_READINESS_MOMENT}
               </FormTextTitle>
               <FormText>{area.preconstruction_estimated_construction_readiness_moment || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={4} offsetOnLarge={1} large={2}>
             <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreasFieldPaths.PRECONSTRUCTION_INSPECTION_MOMENT)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreasFieldPaths.PRECONSTRUCTION_INSPECTION_MOMENT)}>
                 {LeaseAreasFieldTitles.PRECONSTRUCTION_INSPECTION_MOMENT}
               </FormTextTitle>
               <FormText>{area.preconstruction_inspection_moment || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
         </Row>
@@ -155,10 +161,12 @@ const ConstructabilityItem = ({
         <Row>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreasFieldPaths.DEMOLITION_STATE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreasFieldPaths.DEMOLITION_STATE)}>
                 {LeaseAreasFieldTitles.DEMOLITION_STATE}
               </FormTextTitle>
               <FormText>{getLabelOfOption(constructabilityStateOptions, area.demolition_state) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
         </Row>
@@ -175,47 +183,58 @@ const ConstructabilityItem = ({
         <Row>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreasFieldPaths.POLLUTED_LAND_STATE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreasFieldPaths.POLLUTED_LAND_STATE)}>
                 {LeaseAreasFieldTitles.POLLUTED_LAND_STATE}
               </FormTextTitle>
               <FormText>{getLabelOfOption(constructabilityStateOptions, area.polluted_land_state) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={3} large={2}>
             <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreasFieldPaths.POLLUTED_LAND_RENT_CONDITION_STATE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreasFieldPaths.POLLUTED_LAND_RENT_CONDITION_STATE)}>
                 {LeaseAreasFieldTitles.POLLUTED_LAND_RENT_CONDITION_STATE}
               </FormTextTitle>
               <FormText>{getLabelOfOption(pollutedLandRentConditionStateOptions, area.polluted_land_rent_condition_state) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={3} large={2}>
             <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreasFieldPaths.POLLUTED_LAND_RENT_CONDITION_DATE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreasFieldPaths.POLLUTED_LAND_RENT_CONDITION_STATE)}>
                 {LeaseAreasFieldTitles.POLLUTED_LAND_RENT_CONDITION_DATE}
               </FormTextTitle>
               <FormText>{formatDate(area.polluted_land_rent_condition_date) || '–'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={3} large={2}>
             <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreasFieldPaths.POLLUTED_LAND_PLANNER)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreasFieldPaths.POLLUTED_LAND_PLANNER)}>
                 {LeaseAreasFieldTitles.POLLUTED_LAND_PLANNER}
               </FormTextTitle>
               <FormText>{getUserFullName(area.polluted_land_planner) || '–'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={3} large={2}>
             <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreasFieldPaths.POLLUTED_LAND_PROJECTWISE_NUMBER)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreasFieldPaths.POLLUTED_LAND_PROJECTWISE_NUMBER)}>
                 {LeaseAreasFieldTitles.POLLUTED_LAND_PROJECTWISE_NUMBER}
               </FormTextTitle>
               <FormText>{area.polluted_land_projectwise_number || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
         </Row>
 
         <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreaAttachmentsFieldPaths.ATTACHMENTS)}>
+          <>
           <SubTitle uiDataKey={getUiDataLeaseKey(LeaseAreasFieldPaths.POLLUTED_LAND_MATTI_REPORTS)}>
             {LeaseAreasFieldTitles.POLLUTED_LAND_MATTI_REPORTS}
           </SubTitle>
@@ -261,6 +280,7 @@ const ConstructabilityItem = ({
                   </Row>;
           })}
             </Fragment>}
+          </>
         </Authorization>
 
         <Authorization allow={isFieldAllowedToRead(attributes, LeaseConstructabilityDescriptionsFieldPaths.CONSTRUCTABILITY_DESCRIPTIONS)}>
@@ -276,39 +296,48 @@ const ConstructabilityItem = ({
         <Row>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreasFieldPaths.CONSTRUCTABILITY_REPORT_STATE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreasFieldPaths.CONSTRUCTABILITY_REPORT_STATE)}>
                 {LeaseAreasFieldTitles.CONSTRUCTABILITY_REPORT_STATE}
               </FormTextTitle>
               <FormText>{getLabelOfOption(constructabilityStateOptions, area.constructability_report_state) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={3} large={2}>
             <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreasFieldPaths.CONSTRUCTABILITY_REPORT_INVESTIGATION_STATE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreasFieldPaths.CONSTRUCTABILITY_REPORT_INVESTIGATION_STATE)}>
                 {LeaseAreasFieldTitles.CONSTRUCTABILITY_REPORT_INVESTIGATION_STATE}
               </FormTextTitle>
               <FormText>{getLabelOfOption(constructabilityReportInvestigationStateOptions, area.constructability_report_investigation_state) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={3} large={2}>
             <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreasFieldPaths.CONSTRUCTABILITY_REPORT_SIGNING_DATE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreasFieldPaths.CONSTRUCTABILITY_REPORT_SIGNING_DATE)}>
                 {LeaseAreasFieldTitles.CONSTRUCTABILITY_REPORT_SIGNING_DATE}
               </FormTextTitle>
               <FormText>{formatDate(area.constructability_report_signing_date) || '–'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={3} large={2}>
             <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreasFieldPaths.CONSTRUCTABILITY_REPORT_SIGNER)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreasFieldPaths.CONSTRUCTABILITY_REPORT_SIGNER)}>
                 {LeaseAreasFieldTitles.CONSTRUCTABILITY_REPORT_SIGNER}
               </FormTextTitle>
               <FormText>{area.constructability_report_signer || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
         </Row>
 
         <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreaAttachmentsFieldPaths.ATTACHMENTS)}>
+          <>
           <SubTitle uiDataKey={getUiDataLeaseKey(LeaseAreasFieldPaths.CONSTRUCTABILITY_REPORT_GEOTECHNICAL_ATTACHMENTS)}>
             {LeaseAreasFieldTitles.CONSTRUCTABILITY_REPORT_GEOTECHNICAL_ATTACHMENTS}
           </SubTitle>
@@ -353,6 +382,7 @@ const ConstructabilityItem = ({
                   </Row>;
           })}
             </Fragment>}
+          </>
         </Authorization>
 
         <Authorization allow={isFieldAllowedToRead(attributes, LeaseConstructabilityDescriptionsFieldPaths.CONSTRUCTABILITY_DESCRIPTIONS)}>
@@ -368,10 +398,12 @@ const ConstructabilityItem = ({
         <Row>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreasFieldPaths.OTHER_STATE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreasFieldPaths.OTHER_STATE)}>
                 {LeaseAreasFieldTitles.OTHER_STATE}
               </FormTextTitle>
               <FormText>{getLabelOfOption(constructabilityStateOptions, area.other_state) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
         </Row>
@@ -382,7 +414,7 @@ const ConstructabilityItem = ({
     </Collapse>;
 };
 
-export default connect((state, props) => {
+export default connect((state, props: Props) => {
   const id = get(props, 'area.id');
   return {
     areaCollapseState: getCollapseStateByKey(state, `${ViewModes.READONLY}.${formName}.${id}.area`),
diff --git a/src/leases/components/leaseSections/constructability/ConstructabilityItemEdit.tsx b/src/leases/components/leaseSections/constructability/ConstructabilityItemEdit.tsx
index fc6dbfb8e..984ef12b5 100644
--- a/src/leases/components/leaseSections/constructability/ConstructabilityItemEdit.tsx
+++ b/src/leases/components/leaseSections/constructability/ConstructabilityItemEdit.tsx
@@ -4,38 +4,38 @@ import { Row, Column } from "react-foundation";
 import { FieldArray, formValueSelector } from "redux-form";
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButtonThird from "components/form/AddButtonThird";
-import AddFileButton from "components/form/AddFileButton";
-import Authorization from "components/authorization/Authorization";
-import Collapse from "components/collapse/Collapse";
-import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import AddFileButton from "@/components/form/AddFileButton";
+import Authorization from "@/components/authorization/Authorization";
+import Collapse from "@/components/collapse/Collapse";
+import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle";
 import Comments from "./Comments";
-import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper";
-import FileDownloadLink from "components/file/FileDownloadLink";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import RemoveButton from "components/form/RemoveButton";
+import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper";
+import FileDownloadLink from "@/components/file/FileDownloadLink";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import RemoveButton from "@/components/form/RemoveButton";
 import StatusIndicator from "./StatusIndicator";
-import SubTitle from "components/content/SubTitle";
-import { receiveCollapseStates } from "leases/actions";
-import { createLeaseAreaAttachment, deleteLeaseAreaAttachment } from "leaseAreaAttachment/actions";
-import { ConfirmationModalTexts, FieldTypes, FormNames, ViewModes } from "enums";
-import { ButtonColors } from "components/enums";
-import { LeaseAreaAddressesFieldPaths, LeaseAreaAttachmentsFieldPaths, LeaseAreaAttachmentsFieldTitles, LeaseAreasFieldPaths, LeaseAreasFieldTitles, LeaseConstructabilityDescriptionsFieldPaths, LeaseConstructabilityDescriptionsFieldTitles } from "leases/enums";
-import { LeaseAreaAttachmentTypes } from "leaseAreaAttachment/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getFullAddress } from "leases/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getUserFullName } from "users/helpers";
-import { formatDate, formatNumber, getFieldAttributes, getLabelOfOption, hasPermissions, isEmptyValue, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "util/helpers";
-import { getAttributes, getCollapseStateByKey, getCurrentLease } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { referenceNumber } from "components/form/validations";
+import SubTitle from "@/components/content/SubTitle";
+import { receiveCollapseStates } from "@/leases/actions";
+import { createLeaseAreaAttachment, deleteLeaseAreaAttachment } from "@/leaseAreaAttachment/actions";
+import { ConfirmationModalTexts, FieldTypes, FormNames, ViewModes } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { LeaseAreaAddressesFieldPaths, LeaseAreaAttachmentsFieldPaths, LeaseAreaAttachmentsFieldTitles, LeaseAreasFieldPaths, LeaseAreasFieldTitles, LeaseConstructabilityDescriptionsFieldPaths, LeaseConstructabilityDescriptionsFieldTitles } from "@/leases/enums";
+import { LeaseAreaAttachmentTypes } from "@/leaseAreaAttachment/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getFullAddress } from "@/leases/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getUserFullName } from "@/users/helpers";
+import { formatDate, formatNumber, getFieldAttributes, getLabelOfOption, hasPermissions, isEmptyValue, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "@/util/helpers";
+import { getAttributes, getCollapseStateByKey, getCurrentLease } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { referenceNumber } from "@/components/form/validations";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { Lease } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 
 const getPreconstructionErrors = (errors: Record<string, any> | null | undefined, area: string) => {
   return { ...get(errors, `${area}.preconstruction_state`, {}),
diff --git a/src/leases/components/leaseSections/constructability/SendEmail.tsx b/src/leases/components/leaseSections/constructability/SendEmail.tsx
index 929f3fac5..5257a9cfe 100644
--- a/src/leases/components/leaseSections/constructability/SendEmail.tsx
+++ b/src/leases/components/leaseSections/constructability/SendEmail.tsx
@@ -1,24 +1,24 @@
 import React, { Fragment, PureComponent } from "react";
 import { Row, Column } from "react-foundation";
 import { connect } from "react-redux";
-import Authorization from "components/authorization/Authorization";
-import Button from "components/button/Button";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import ListItem from "components/content/ListItem";
+import Authorization from "@/components/authorization/Authorization";
+import Button from "@/components/button/Button";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import ListItem from "@/components/content/ListItem";
 import SendEmailModal from "./SendEmailModal";
-import { sendEmail } from "leases/actions";
-import { ButtonColors } from "components/enums";
-import { SendEmailTypes } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getContentConstructabilityEmail, getContentEmailLogs } from "leases/helpers";
-import { getUserFullName } from "users/helpers";
-import { formatDate, hasPermissions } from "util/helpers";
-import { getLoggedInUser } from "auth/selectors";
-import { getCurrentLease } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import type { Lease } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import { sendEmail } from "@/leases/actions";
+import { ButtonColors } from "@/components/enums";
+import { SendEmailTypes } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getContentConstructabilityEmail, getContentEmailLogs } from "@/leases/helpers";
+import { getUserFullName } from "@/users/helpers";
+import { formatDate, hasPermissions } from "@/util/helpers";
+import { getLoggedInUser } from "@/auth/selectors";
+import { getCurrentLease } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import type { Lease } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   currentLease: Lease;
   loggedUser: Record<string, any>;
@@ -100,6 +100,7 @@ class SendEmail extends PureComponent<Props, State> {
           </Column>
           <Column small={12} medium={8} large={9}>
             <Authorization allow={hasPermissions(usersPermissions, UsersPermissions.VIEW_LEASE_LEASE_AREAS) || hasPermissions(usersPermissions, UsersPermissions.CHANGE_LEASE_LEASE_AREAS)}>
+              <>
               {!emailLogs.length && <FormText>Ei lähetettyjä sähköposteja</FormText>}
               {!!emailLogs.length && <div className='constructability__send-email_sent-emails'>
                   <Row>
@@ -127,6 +128,7 @@ class SendEmail extends PureComponent<Props, State> {
                       </Row>;
               })}
                 </div>}
+              </>
             </Authorization>
           </Column>
         </Row>
diff --git a/src/leases/components/leaseSections/constructability/SendEmailModal.tsx b/src/leases/components/leaseSections/constructability/SendEmailModal.tsx
index fd540b2f6..8569b15f2 100644
--- a/src/leases/components/leaseSections/constructability/SendEmailModal.tsx
+++ b/src/leases/components/leaseSections/constructability/SendEmailModal.tsx
@@ -1,15 +1,15 @@
 import React, { PureComponent } from "react";
 import debounce from "lodash/debounce";
-import Button from "components/button/Button";
+import Button from "@/components/button/Button";
 import DualListBox from "react-dual-listbox";
-import FormText from "components/form/FormText";
-import Modal from "components/modal/Modal";
-import ModalButtonWrapper from "components/modal/ModalButtonWrapper";
-import TextAreaInput from "components/inputs/TextAreaInput";
-import { fetchUsers } from "users/requestsAsync";
-import { ButtonColors } from "components/enums";
-import { getUserOptions } from "users/helpers";
-import { sortStringByKeyAsc } from "util/helpers";
+import FormText from "@/components/form/FormText";
+import Modal from "@/components/modal/Modal";
+import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper";
+import TextAreaInput from "@/components/inputs/TextAreaInput";
+import { fetchUsers } from "@/users/requestsAsync";
+import { ButtonColors } from "@/components/enums";
+import { getUserOptions } from "@/users/helpers";
+import { sortStringByKeyAsc } from "@/util/helpers";
 type FilterProps = {
   available: string;
   selected: string;
diff --git a/src/leases/components/leaseSections/constructability/StatusIndicator.tsx b/src/leases/components/leaseSections/constructability/StatusIndicator.tsx
index dcb024120..ca7958a29 100644
--- a/src/leases/components/leaseSections/constructability/StatusIndicator.tsx
+++ b/src/leases/components/leaseSections/constructability/StatusIndicator.tsx
@@ -1,7 +1,7 @@
 import React, { Fragment } from "react";
 import classnames from "classnames";
-import { ConstructabilityStatus } from "leases/enums";
-import { getLabelOfOption } from "util/helpers";
+import { ConstructabilityStatus } from "@/leases/enums";
+import { getLabelOfOption } from "@/util/helpers";
 type StatusIndicatorProps = {
   researchState: string;
   stateOptions: Array<Record<string, any>>;
diff --git a/src/leases/components/leaseSections/contract/AttachDecisionModal.tsx b/src/leases/components/leaseSections/contract/AttachDecisionModal.tsx
index 1a9bcaba7..c77c46a54 100644
--- a/src/leases/components/leaseSections/contract/AttachDecisionModal.tsx
+++ b/src/leases/components/leaseSections/contract/AttachDecisionModal.tsx
@@ -1,15 +1,15 @@
 import React, { PureComponent } from "react";
 import debounce from "lodash/debounce";
-import Button from "components/button/Button";
-import CheckboxInput from "components/inputs/CheckboxInput";
+import Button from "@/components/button/Button";
+import CheckboxInput from "@/components/inputs/CheckboxInput";
 import DualListBox from "react-dual-listbox";
-import FormText from "components/form/FormText";
-import Modal from "components/modal/Modal";
-import ModalButtonWrapper from "components/modal/ModalButtonWrapper";
-import { fetchLeases } from "leases/requestsAsync";
-import { ButtonColors } from "components/enums";
-import { getContentLeaseOption } from "leases/helpers";
-import { sortStringByKeyAsc } from "util/helpers";
+import FormText from "@/components/form/FormText";
+import Modal from "@/components/modal/Modal";
+import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper";
+import { fetchLeases } from "@/leases/requestsAsync";
+import { ButtonColors } from "@/components/enums";
+import { getContentLeaseOption } from "@/leases/helpers";
+import { sortStringByKeyAsc } from "@/util/helpers";
 type FilterProps = {
   available: string;
   selected: string;
diff --git a/src/leases/components/leaseSections/contract/Collateral.tsx b/src/leases/components/leaseSections/contract/Collateral.tsx
index 11c320d91..f8e309329 100644
--- a/src/leases/components/leaseSections/contract/Collateral.tsx
+++ b/src/leases/components/leaseSections/contract/Collateral.tsx
@@ -2,14 +2,14 @@ import React, { Fragment } from "react";
 import { Row, Column } from "react-foundation";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import Authorization from "components/authorization/Authorization";
-import BoxItem from "components/content/BoxItem";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import { CollateralTypes, LeaseContractCollateralsFieldPaths, LeaseContractCollateralsFieldTitles } from "leases/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatDate, formatNumber, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes } from "leases/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import BoxItem from "@/components/content/BoxItem";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import { CollateralTypes, LeaseContractCollateralsFieldPaths, LeaseContractCollateralsFieldTitles } from "@/leases/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatDate, formatNumber, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes } from "@/leases/selectors";
 import type { Attributes } from "types";
 type EmptyProps = {
   attributes: Attributes;
@@ -26,10 +26,12 @@ const CollateralEmpty = ({
       <Row>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractCollateralsFieldPaths.TYPE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractCollateralsFieldPaths.TYPE)}>
               {LeaseContractCollateralsFieldTitles.TYPE}
             </FormTextTitle>
             <FormText>{getLabelOfOption(typeOptions, collateral.type) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
@@ -51,44 +53,54 @@ const CollateralFinancialGuarantee = ({
       <Row>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractCollateralsFieldPaths.TYPE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractCollateralsFieldPaths.TYPE)}>
               {LeaseContractCollateralsFieldTitles.TYPE}
             </FormTextTitle>
             <FormText>{getLabelOfOption(typeOptions, collateral.type) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractCollateralsFieldPaths.TOTAL_AMOUNT)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractCollateralsFieldPaths.TOTAL_AMOUNT)}>
               {LeaseContractCollateralsFieldTitles.TOTAL_AMOUNT}
             </FormTextTitle>
             <FormText>{!isEmptyValue(collateral.total_amount) ? `${formatNumber(collateral.total_amount)} €` : '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractCollateralsFieldPaths.PAID_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractCollateralsFieldPaths.PAID_DATE)}>
               {LeaseContractCollateralsFieldTitles.PAID_DATE}
             </FormTextTitle>
             <FormText>{formatDate(collateral.paid_date) || '–'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractCollateralsFieldPaths.RETURNED_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractCollateralsFieldPaths.RETURNED_DATE)}>
               {LeaseContractCollateralsFieldTitles.RETURNED_DATE}
             </FormTextTitle>
             <FormText>{formatDate(collateral.returned_date) || '–'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         <Column small={12}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractCollateralsFieldPaths.NOTE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractCollateralsFieldPaths.NOTE)}>
               {LeaseContractCollateralsFieldTitles.NOTE}
             </FormTextTitle>
             <FormText>{collateral.note || '–'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
@@ -110,60 +122,74 @@ const CollateralMortgageDocument = ({
       <Row>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractCollateralsFieldPaths.TYPE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractCollateralsFieldPaths.TYPE)}>
               {LeaseContractCollateralsFieldTitles.TYPE}
             </FormTextTitle>
             <FormText>{getLabelOfOption(typeOptions, collateral.type) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractCollateralsFieldPaths.NUMBER)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractCollateralsFieldPaths.NUMBER_MORTGAGE_DOCUMENT)}>
               {LeaseContractCollateralsFieldTitles.NUMBER_MORTGAGE_DOCUMENT}
             </FormTextTitle>
             <FormText>{collateral.number || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractCollateralsFieldPaths.DEED_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractCollateralsFieldPaths.DEED_DATE)}>
               {LeaseContractCollateralsFieldTitles.DEED_DATE}
             </FormTextTitle>
             <FormText>{formatDate(collateral.deed_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractCollateralsFieldPaths.START_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractCollateralsFieldPaths.START_DATE)}>
               {LeaseContractCollateralsFieldTitles.START_DATE}
             </FormTextTitle>
             <FormText>{formatDate(collateral.start_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractCollateralsFieldPaths.END_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractCollateralsFieldPaths.END_DATE)}>
               {LeaseContractCollateralsFieldTitles.END_DATE}
             </FormTextTitle>
             <FormText>{formatDate(collateral.end_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractCollateralsFieldPaths.TOTAL_AMOUNT)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractCollateralsFieldPaths.TOTAL_AMOUNT)}>
               {LeaseContractCollateralsFieldTitles.TOTAL_AMOUNT}
             </FormTextTitle>
             <FormText>{!isEmptyValue(collateral.total_amount) ? `${formatNumber(collateral.total_amount)} €` : '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         <Column small={12}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractCollateralsFieldPaths.NOTE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractCollateralsFieldPaths.NOTE)}>
               {LeaseContractCollateralsFieldTitles.NOTE}
             </FormTextTitle>
             <FormText>{collateral.note || '–'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
@@ -185,68 +211,84 @@ const CollateralOther = ({
       <Row>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractCollateralsFieldPaths.TYPE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractCollateralsFieldPaths.TYPE)}>
               {LeaseContractCollateralsFieldTitles.TYPE}
             </FormTextTitle>
             <FormText>{getLabelOfOption(typeOptions, collateral.type) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractCollateralsFieldPaths.OTHER_TYPE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractCollateralsFieldPaths.OTHER_TYPE)}>
               {LeaseContractCollateralsFieldTitles.OTHER_TYPE}
             </FormTextTitle>
             <FormText>{collateral.other_type || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractCollateralsFieldPaths.NUMBER)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractCollateralsFieldPaths.NUMBER)}>
               {LeaseContractCollateralsFieldTitles.NUMBER}
             </FormTextTitle>
             <FormText>{collateral.number || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractCollateralsFieldPaths.START_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractCollateralsFieldPaths.START_DATE)}>
               {LeaseContractCollateralsFieldTitles.START_DATE}
             </FormTextTitle>
             <FormText>{formatDate(collateral.start_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractCollateralsFieldPaths.END_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractCollateralsFieldPaths.END_DATE)}>
               {LeaseContractCollateralsFieldTitles.END_DATE}
             </FormTextTitle>
             <FormText>{formatDate(collateral.end_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractCollateralsFieldPaths.TOTAL_AMOUNT)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractCollateralsFieldPaths.TOTAL_AMOUNT)}>
               {LeaseContractCollateralsFieldTitles.TOTAL_AMOUNT}
             </FormTextTitle>
             <FormText>{!isEmptyValue(collateral.total_amount) ? `${formatNumber(collateral.total_amount)} €` : '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractCollateralsFieldPaths.RETURNED_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractCollateralsFieldPaths.RETURNED_DATE)}>
               {LeaseContractCollateralsFieldTitles.RETURNED_DATE}
             </FormTextTitle>
             <FormText>{formatDate(collateral.returned_date) || '–'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={8} large={10}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractCollateralsFieldPaths.NOTE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractCollateralsFieldPaths.NOTE)}>
               {LeaseContractCollateralsFieldTitles.NOTE}
             </FormTextTitle>
             <FormText>{collateral.note || '–'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
diff --git a/src/leases/components/leaseSections/contract/CollateralEdit.tsx b/src/leases/components/leaseSections/contract/CollateralEdit.tsx
index 73783a30a..c9cec4a90 100644
--- a/src/leases/components/leaseSections/contract/CollateralEdit.tsx
+++ b/src/leases/components/leaseSections/contract/CollateralEdit.tsx
@@ -3,21 +3,21 @@ import { Row, Column } from "react-foundation";
 import { formValueSelector } from "redux-form";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import ActionButtonWrapper from "components/form/ActionButtonWrapper";
-import Authorization from "components/authorization/Authorization";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import BoxItem from "components/content/BoxItem";
-import FormField from "components/form/FormField";
-import RemoveButton from "components/form/RemoveButton";
-import { FormNames } from "enums";
-import { CollateralTypes, LeaseContractCollateralsFieldPaths, LeaseContractCollateralsFieldTitles } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getFieldAttributes, hasPermissions, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes, getIsSaveClicked } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import ActionButtonWrapper from "@/components/form/ActionButtonWrapper";
+import Authorization from "@/components/authorization/Authorization";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import BoxItem from "@/components/content/BoxItem";
+import FormField from "@/components/form/FormField";
+import RemoveButton from "@/components/form/RemoveButton";
+import { FormNames } from "@/enums";
+import { CollateralTypes, LeaseContractCollateralsFieldPaths, LeaseContractCollateralsFieldTitles } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getFieldAttributes, hasPermissions, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes, getIsSaveClicked } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type EmptyProps = {
   attributes: Attributes;
   field: string;
diff --git a/src/leases/components/leaseSections/contract/ContractFileModal.tsx b/src/leases/components/leaseSections/contract/ContractFileModal.tsx
index acaf4da99..01dd541ff 100644
--- a/src/leases/components/leaseSections/contract/ContractFileModal.tsx
+++ b/src/leases/components/leaseSections/contract/ContractFileModal.tsx
@@ -1,19 +1,19 @@
 import React, { Fragment, PureComponent } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
-import Button from "components/button/Button";
-import FileDownloadLink from "components/file/FileDownloadLink";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import Modal from "components/modal/Modal";
-import ModalButtonWrapper from "components/modal/ModalButtonWrapper";
-import { ButtonColors } from "components/enums";
-import { fetchContractFilesById } from "contractFile/actions";
-import createUrlWithoutVersionSuffix from "api/createUrlWithoutVersionSuffix";
-import { humanReadableByteCount } from "util/helpers";
-import { getContractFilesById, getIsFetchingById } from "contractFile/selectors";
+import Button from "@/components/button/Button";
+import FileDownloadLink from "@/components/file/FileDownloadLink";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import Modal from "@/components/modal/Modal";
+import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper";
+import { ButtonColors } from "@/components/enums";
+import { fetchContractFilesById } from "@/contractFile/actions";
+import createUrlWithoutVersionSuffix from "@/api/createUrlWithoutVersionSuffix";
+import { humanReadableByteCount } from "@/util/helpers";
+import { getContractFilesById, getIsFetchingById } from "@/contractFile/selectors";
 type Props = {
   contractId: number;
   fetchContractFilesById: (...args: Array<any>) => any;
diff --git a/src/leases/components/leaseSections/contract/ContractItem.tsx b/src/leases/components/leaseSections/contract/ContractItem.tsx
index 3fab6450c..0d002ca97 100644
--- a/src/leases/components/leaseSections/contract/ContractItem.tsx
+++ b/src/leases/components/leaseSections/contract/ContractItem.tsx
@@ -2,25 +2,25 @@ import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
-import Authorization from "components/authorization/Authorization";
-import BoxItem from "components/content/BoxItem";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import Collapse from "components/collapse/Collapse";
-import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle";
+import Authorization from "@/components/authorization/Authorization";
+import BoxItem from "@/components/content/BoxItem";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import Collapse from "@/components/collapse/Collapse";
+import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle";
 import Collateral from "./Collateral";
-import DecisionLink from "components/links/DecisionLink";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import KtjLink from "components/ktj/KtjLink";
-import { receiveCollapseStates } from "leases/actions";
-import { FormNames, ViewModes } from "enums";
-import { LeaseContractChangesFieldPaths, LeaseContractChangesFieldTitles, LeaseContractsFieldPaths, LeaseContractsFieldTitles, LeaseContractCollateralsFieldPaths, LeaseContractCollateralsFieldTitles } from "leases/enums";
-import { getDecisionById, getDecisionOptions } from "leases/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatDate, getFieldOptions, getLabelOfOption, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes, getCollapseStateByKey, getCurrentLease } from "leases/selectors";
+import DecisionLink from "@/components/links/DecisionLink";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import KtjLink from "@/components/ktj/KtjLink";
+import { receiveCollapseStates } from "@/leases/actions";
+import { FormNames, ViewModes } from "@/enums";
+import { LeaseContractChangesFieldPaths, LeaseContractChangesFieldTitles, LeaseContractsFieldPaths, LeaseContractsFieldTitles, LeaseContractCollateralsFieldPaths, LeaseContractCollateralsFieldTitles } from "@/leases/enums";
+import { getDecisionById, getDecisionOptions } from "@/leases/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatDate, getFieldOptions, getLabelOfOption, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes, getCollapseStateByKey, getCurrentLease } from "@/leases/selectors";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
+import type { Lease } from "@/leases/types";
 const formName = FormNames.LEASE_CONTRACTS;
 type Props = {
   attributes: Attributes;
@@ -83,111 +83,139 @@ const ContractItem = ({
             </Authorization>
           </Column>
         </Fragment>} headerTitle={<Authorization allow={isFieldAllowedToRead(attributes, LeaseContractsFieldPaths.TYPE)}>
+          <>
           {getLabelOfOption(typeOptions, contract.type)} {get(contract, 'contract_number')}
+          </>
         </Authorization>} onToggle={handleContractCollapseToggle}>
       <Row>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractsFieldPaths.TYPE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractsFieldPaths.TYPE)}>
               {LeaseContractsFieldTitles.TYPE}
             </FormTextTitle>
             <FormText>{getLabelOfOption(typeOptions, contract.type) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractsFieldPaths.CONTRACT_NUMBER)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractsFieldPaths.CONTRACT_NUMBER)}>
               {LeaseContractsFieldTitles.CONTRACT_NUMBER}
             </FormTextTitle>
             <FormText>{contract.contract_number ? <a onClick={handleShowContractFileModal}>{contract.contract_number}</a> : '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractsFieldPaths.SIGNING_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractsFieldPaths.SIGNING_DATE)}>
               {LeaseContractsFieldTitles.SIGNING_DATE}
             </FormTextTitle>
             <FormText>{formatDate(contract.signing_date) || '–'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={12} large={6}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractsFieldPaths.SIGNING_NOTE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractsFieldPaths.SIGNING_NOTE)}>
               {LeaseContractsFieldTitles.SIGNING_NOTE}
             </FormTextTitle>
             <FormText>{contract.signing_note || '–'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractsFieldPaths.SIGN_BY_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractsFieldPaths.SIGN_BY_DATE)}>
               {LeaseContractsFieldTitles.SIGN_BY_DATE}
             </FormTextTitle>
             <FormText>{formatDate(contract.sign_by_date) || '–'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractsFieldPaths.FIRST_CALL_SENT)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractsFieldPaths.FIRST_CALL_SENT)}>
               {LeaseContractsFieldTitles.FIRST_CALL_SENT}
             </FormTextTitle>
             <FormText>{formatDate(contract.first_call_sent) || '–'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractsFieldPaths.SECOND_CALL_SENT)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractsFieldPaths.SECOND_CALL_SENT)}>
               {LeaseContractsFieldTitles.SECOND_CALL_SENT}
             </FormTextTitle>
             <FormText>{formatDate(contract.second_call_sent) || '–'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractsFieldPaths.THIRD_CALL_SENT)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractsFieldPaths.THIRD_CALL_SENT)}>
               {LeaseContractsFieldTitles.THIRD_CALL_SENT}
             </FormTextTitle>
             <FormText>{formatDate(contract.third_call_sent) || '–'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         {contract.is_readjustment_decision && <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractsFieldPaths.IS_READJUSTMENT_DECISION)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractsFieldPaths.IS_READJUSTMENT_DECISION)}>
                 {LeaseContractsFieldTitles.IS_READJUSTMENT_DECISION}
               </FormTextTitle>
               <FormText>{'Kyllä'}</FormText>
+              </>
             </Authorization>
           </Column>}
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractsFieldPaths.INSTITUTION_IDENTIFIER)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractsFieldPaths.INSTITUTION_IDENTIFIER)}>
               {LeaseContractsFieldTitles.INSTITUTION_IDENTIFIER}
             </FormTextTitle>
             <FormText>{contract.institution_identifier || '–'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractsFieldPaths.DECISION)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractsFieldPaths.DECISION)}>
               {LeaseContractsFieldTitles.DECISION}
             </FormTextTitle>
             <DecisionLink decision={decision} decisionOptions={decisionOptions} />
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractsFieldPaths.KTJ_LINK)}>
+            <>
             <FormTextTitle>{LeaseContractsFieldTitles.KTJ_LINK}</FormTextTitle>
             {contract.institution_identifier ? <KtjLink fileKey='vuokraoikeustodistus' fileName='vuokraoikeustodistus' identifier={contract.institution_identifier} idKey='kohdetunnus' label='Vuokraoikeustodistus' /> : <FormText>-</FormText>}
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractsFieldPaths.KTJ_LINK)}>
+            <>
             <FormTextTitle>{LeaseContractsFieldTitles.ENCUMBRANCE}</FormTextTitle>
             {contract.institution_identifier ? <KtjLink fileKey='rasitustodistus' fileName='rasitustodistus' identifier={contract.institution_identifier} idKey='kohdetunnus' label='Rasitustodistus' /> : <FormText>-</FormText>}
+            </>
           </Authorization>
         </Column>
       </Row>
@@ -202,60 +230,74 @@ const ContractItem = ({
                     <Row>
                       <Column small={6} medium={4} large={2}>
                         <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractChangesFieldPaths.SIGNING_DATE)}>
+                          <>
                           <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractChangesFieldPaths.SIGNING_DATE)}>
                             {LeaseContractChangesFieldTitles.SIGNING_DATE}
                           </FormTextTitle>
                           <FormText>{formatDate(change.signing_date) || '–'}</FormText>
+                          </>
                         </Authorization>
                       </Column>
                       <Column small={6} medium={4} large={2}>
                         <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractChangesFieldPaths.SIGN_BY_DATE)}>
+                          <>
                           <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractChangesFieldPaths.SIGN_BY_DATE)}>
                             {LeaseContractChangesFieldTitles.SIGN_BY_DATE}
                           </FormTextTitle>
                           <FormText>{formatDate(change.sign_by_date) || '–'}</FormText>
+                          </>
                         </Authorization>
                       </Column>
                       <Column small={6} medium={4} large={2}>
                         <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractChangesFieldPaths.FIRST_CALL_SENT)}>
+                          <>
                           <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractChangesFieldPaths.FIRST_CALL_SENT)}>
                             {LeaseContractChangesFieldTitles.FIRST_CALL_SENT}
                           </FormTextTitle>
                           <FormText>{formatDate(change.first_call_sent) || '–'}</FormText>
+                          </>
                         </Authorization>
                       </Column>
                       <Column small={6} medium={4} large={2}>
                         <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractChangesFieldPaths.SECOND_CALL_SENT)}>
+                          <>
                           <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractChangesFieldPaths.SECOND_CALL_SENT)}>
                             {LeaseContractChangesFieldTitles.SECOND_CALL_SENT}
                           </FormTextTitle>
                           <FormText>{formatDate(change.second_call_sent) || '–'}</FormText>
+                          </>
                         </Authorization>
                       </Column>
                       <Column small={6} medium={4} large={2}>
                         <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractChangesFieldPaths.THIRD_CALL_SENT)}>
+                          <>
                           <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractChangesFieldPaths.THIRD_CALL_SENT)}>
                             {LeaseContractChangesFieldTitles.THIRD_CALL_SENT}
                           </FormTextTitle>
                           <FormText>{formatDate(change.third_call_sent) || '–'}</FormText>
+                          </>
                         </Authorization>
                       </Column>
                     </Row>
                     <Row>
                       <Column small={6} medium={4} large={2}>
                         <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractChangesFieldPaths.DECISION)}>
+                          <>
                           <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractChangesFieldPaths.DECISION)}>
                             {LeaseContractChangesFieldTitles.DECISION}
                           </FormTextTitle>
                           <DecisionLink decision={decision} decisionOptions={decisionOptions} />
+                          </>
                         </Authorization>
                       </Column>
                       <Column small={6} medium={8} large={10}>
                         <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractChangesFieldPaths.DESCRIPTION)}>
+                          <>
                           <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseContractChangesFieldPaths.DESCRIPTION)}>
                             {LeaseContractChangesFieldTitles.DESCRIPTION}
                           </FormTextTitle>
                           <FormText>{change.description || '–'}</FormText>
+                          </>
                         </Authorization>
                       </Column>
                     </Row>
diff --git a/src/leases/components/leaseSections/contract/ContractItemEdit.tsx b/src/leases/components/leaseSections/contract/ContractItemEdit.tsx
index 839839d12..f257fa30a 100644
--- a/src/leases/components/leaseSections/contract/ContractItemEdit.tsx
+++ b/src/leases/components/leaseSections/contract/ContractItemEdit.tsx
@@ -4,37 +4,37 @@ import { FieldArray, formValueSelector } from "redux-form";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import ActionButtonWrapper from "components/form/ActionButtonWrapper";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import Authorization from "components/authorization/Authorization";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import BoxItem from "components/content/BoxItem";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import Collapse from "components/collapse/Collapse";
-import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import ActionButtonWrapper from "@/components/form/ActionButtonWrapper";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import Authorization from "@/components/authorization/Authorization";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import BoxItem from "@/components/content/BoxItem";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import Collapse from "@/components/collapse/Collapse";
+import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle";
 import CollateralEdit from "./CollateralEdit";
-import DecisionLink from "components/links/DecisionLink";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import KtjLink from "components/ktj/KtjLink";
-import RemoveButton from "components/form/RemoveButton";
-import { receiveCollapseStates, fetchLeasesForContractNumber } from "leases/actions";
-import { ConfirmationModalTexts, FormNames, ViewModes } from "enums";
-import { ButtonColors } from "components/enums";
-import { LeaseContractChangesFieldPaths, LeaseContractChangesFieldTitles, LeaseContractCollateralsFieldPaths, LeaseContractCollateralsFieldTitles, LeaseContractsFieldPaths, LeaseContractsFieldTitles } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getDecisionById, getLeasesWithContractNumber } from "leases/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatDate, getFieldAttributes, getFieldOptions, getLabelOfOption, hasPermissions, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes, getCollapseStateByKey, getCurrentLease, getErrorsByFormName, getIsSaveClicked, getIsFetchingLeasesForContractNumbers, getLeasesForContractNumbers } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import WarningContainer from "components/content/WarningContainer";
-import WarningField from "components/form/WarningField";
+import DecisionLink from "@/components/links/DecisionLink";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import KtjLink from "@/components/ktj/KtjLink";
+import RemoveButton from "@/components/form/RemoveButton";
+import { receiveCollapseStates, fetchLeasesForContractNumber } from "@/leases/actions";
+import { ConfirmationModalTexts, FormNames, ViewModes } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { LeaseContractChangesFieldPaths, LeaseContractChangesFieldTitles, LeaseContractCollateralsFieldPaths, LeaseContractCollateralsFieldTitles, LeaseContractsFieldPaths, LeaseContractsFieldTitles } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getDecisionById, getLeasesWithContractNumber } from "@/leases/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatDate, getFieldAttributes, getFieldOptions, getLabelOfOption, hasPermissions, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes, getCollapseStateByKey, getCurrentLease, getErrorsByFormName, getIsSaveClicked, getIsFetchingLeasesForContractNumbers, getLeasesForContractNumbers } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import WarningContainer from "@/components/content/WarningContainer";
+import WarningField from "@/components/form/WarningField";
 import type { Attributes } from "types";
-import type { Lease, LeaseList } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { Lease, LeaseList } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type ContractChangesProps = {
   attributes: Attributes;
   collapseState: boolean;
@@ -380,6 +380,7 @@ class ContractItemEdit extends Component<Props> {
             </Column>
             <Column small={6} medium={4} large={4}>
               <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractsFieldPaths.CONTRACT_NUMBER)}>
+                <>
                 {contractNumber && leasesWithContractNumber && contract && contractNumber !== contract.contract_number && <WarningContainer>
                   <WarningField meta={{
                   warning: 'Sopimusnumero käytössä!'
@@ -393,6 +394,7 @@ class ContractItemEdit extends Component<Props> {
                 <FormField disableTouched={isSaveClicked} fieldAttributes={getFieldAttributes(attributes, LeaseContractsFieldPaths.CONTRACT_NUMBER)} name={`${field}.contract_number`} readOnlyValueRenderer={contractNumberReadOnlyRenderer} overrideValues={{
                 label: LeaseContractsFieldTitles.CONTRACT_NUMBER
               }} enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseContractsFieldPaths.CONTRACT_NUMBER)} />
+                </>
               </Authorization>
             </Column>
             <Column small={6} medium={4} large={2}>
@@ -458,16 +460,20 @@ class ContractItemEdit extends Component<Props> {
             </Column>
             <Column small={6} medium={4} large={2}>
               <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractsFieldPaths.INSTITUTION_IDENTIFIER)}>
+                <>
                 <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseContractsFieldPaths.KTJ_LINK)}>
                   {LeaseContractsFieldTitles.KTJ_LINK}
                 </FormTextTitle>
                 {savedContract && savedContract.institution_identifier ? <KtjLink fileKey='vuokraoikeustodistus' fileName='vuokraoikeustodistus' identifier={savedContract.institution_identifier} idKey='kohdetunnus' label='Vuokraoikeustodistus' /> : <FormText>-</FormText>}
+                </>
               </Authorization>
             </Column>
             <Column small={6} medium={4} large={2}>
               <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractsFieldPaths.KTJ_LINK)}>
+                <>
                 <FormTextTitle>{LeaseContractsFieldTitles.ENCUMBRANCE}</FormTextTitle>
                 {savedContract && savedContract.institution_identifier ? <KtjLink fileKey='rasitustodistus' fileName='rasitustodistus' identifier={savedContract.institution_identifier} idKey='kohdetunnus' label='Rasitustodistus' /> : <FormText>-</FormText>}
+                </>
               </Authorization>
             </Column>
           </Row>
@@ -496,7 +502,7 @@ class ContractItemEdit extends Component<Props> {
 
 const formName = FormNames.LEASE_CONTRACTS;
 const selector = formValueSelector(formName);
-export default connect((state, props) => {
+export default connect((state, props: Props) => {
   const id = selector(state, `${props.field}.id`);
   const newState: any = {
     attributes: getAttributes(state),
diff --git a/src/leases/components/leaseSections/contract/Contracts.tsx b/src/leases/components/leaseSections/contract/Contracts.tsx
index 77f7a4564..bb8484e84 100644
--- a/src/leases/components/leaseSections/contract/Contracts.tsx
+++ b/src/leases/components/leaseSections/contract/Contracts.tsx
@@ -2,13 +2,13 @@ import React, { Fragment, PureComponent } from "react";
 import { connect } from "react-redux";
 import ContractFileModal from "./ContractFileModal";
 import ContractItem from "./ContractItem";
-import FormText from "components/form/FormText";
-import { LeaseContractsFieldPaths } from "leases/enums";
-import { getContentContracts } from "leases/helpers";
-import { getFieldOptions } from "util/helpers";
-import { getAttributes, getCurrentLease } from "leases/selectors";
+import FormText from "@/components/form/FormText";
+import { LeaseContractsFieldPaths } from "@/leases/enums";
+import { getContentContracts } from "@/leases/helpers";
+import { getFieldOptions } from "@/util/helpers";
+import { getAttributes, getCurrentLease } from "@/leases/selectors";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
+import type { Lease } from "@/leases/types";
 type Props = {
   attributes: Attributes;
   currentLease: Lease;
diff --git a/src/leases/components/leaseSections/contract/ContractsEdit.tsx b/src/leases/components/leaseSections/contract/ContractsEdit.tsx
index 26c1dff43..2f28ccf4d 100644
--- a/src/leases/components/leaseSections/contract/ContractsEdit.tsx
+++ b/src/leases/components/leaseSections/contract/ContractsEdit.tsx
@@ -3,24 +3,24 @@ import { connect } from "react-redux";
 import { FieldArray, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButton from "components/form/AddButton";
-import Authorization from "components/authorization/Authorization";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButton from "@/components/form/AddButton";
+import Authorization from "@/components/authorization/Authorization";
 import ContractFileModal from "./ContractFileModal";
 import ContractItemEdit from "./ContractItemEdit";
-import FormText from "components/form/FormText";
-import { receiveFormValidFlags } from "leases/actions";
-import { ConfirmationModalTexts, FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { validateContractForm } from "leases/formValidators";
-import { getContentContracts, getDecisionOptions } from "leases/helpers";
-import { hasPermissions } from "util/helpers";
-import { getCurrentLease } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import FormText from "@/components/form/FormText";
+import { receiveFormValidFlags } from "@/leases/actions";
+import { ConfirmationModalTexts, FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { validateContractForm } from "@/leases/formValidators";
+import { getContentContracts, getDecisionOptions } from "@/leases/helpers";
+import { hasPermissions } from "@/util/helpers";
+import { getCurrentLease } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { Lease } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type ContractsProps = {
   decisionOptions: Array<Record<string, any>>;
   fields: any;
diff --git a/src/leases/components/leaseSections/contract/DecisionConditionsEdit.tsx b/src/leases/components/leaseSections/contract/DecisionConditionsEdit.tsx
index 9d3878bc0..e665bb047 100644
--- a/src/leases/components/leaseSections/contract/DecisionConditionsEdit.tsx
+++ b/src/leases/components/leaseSections/contract/DecisionConditionsEdit.tsx
@@ -4,30 +4,30 @@ import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import ActionButtonWrapper from "components/form/ActionButtonWrapper";
-import Authorization from "components/authorization/Authorization";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import BoxItem from "components/content/BoxItem";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import Collapse from "components/collapse/Collapse";
-import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import RemoveButton from "components/form/RemoveButton";
-import { ConfirmationModalTexts, FieldTypes } from "enums";
-import { ButtonColors } from "components/enums";
-import { LeaseDecisionConditionsFieldPaths, LeaseDecisionConditionsFieldTitles } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getFieldAttributes, hasPermissions, isFieldAllowedToRead, isFieldRequired } from "util/helpers";
-import { getAttributes } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { withWindowResize } from "components/resize/WindowResizeHandler";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import ActionButtonWrapper from "@/components/form/ActionButtonWrapper";
+import Authorization from "@/components/authorization/Authorization";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import BoxItem from "@/components/content/BoxItem";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import Collapse from "@/components/collapse/Collapse";
+import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import RemoveButton from "@/components/form/RemoveButton";
+import { ConfirmationModalTexts, FieldTypes } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { LeaseDecisionConditionsFieldPaths, LeaseDecisionConditionsFieldTitles } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getFieldAttributes, hasPermissions, isFieldAllowedToRead, isFieldRequired } from "@/util/helpers";
+import { getAttributes } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { withWindowResize } from "@/components/resize/WindowResizeHandler";
 import type { Attributes } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   attributes: Attributes;
   collapseState: boolean;
diff --git a/src/leases/components/leaseSections/contract/DecisionItem.tsx b/src/leases/components/leaseSections/contract/DecisionItem.tsx
index b13e78564..fa90bc771 100644
--- a/src/leases/components/leaseSections/contract/DecisionItem.tsx
+++ b/src/leases/components/leaseSections/contract/DecisionItem.tsx
@@ -2,21 +2,21 @@ import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import Authorization from "components/authorization/Authorization";
-import BoxItem from "components/content/BoxItem";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import Collapse from "components/collapse/Collapse";
-import ExternalLink from "components/links/ExternalLink";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import ShowMore from "components/showMore/ShowMore";
-import { receiveCollapseStates } from "leases/actions";
-import { FormNames, ViewModes } from "enums";
-import { LeaseDecisionConditionsFieldPaths, LeaseDecisionConditionsFieldTitles, LeaseDecisionsFieldPaths, LeaseDecisionsFieldTitles } from "leases/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatDate, getLabelOfOption, getReferenceNumberLink, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes, getCollapseStateByKey } from "leases/selectors";
-import { withWindowResize } from "components/resize/WindowResizeHandler";
+import Authorization from "@/components/authorization/Authorization";
+import BoxItem from "@/components/content/BoxItem";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import Collapse from "@/components/collapse/Collapse";
+import ExternalLink from "@/components/links/ExternalLink";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import ShowMore from "@/components/showMore/ShowMore";
+import { receiveCollapseStates } from "@/leases/actions";
+import { FormNames, ViewModes } from "@/enums";
+import { LeaseDecisionConditionsFieldPaths, LeaseDecisionConditionsFieldTitles, LeaseDecisionsFieldPaths, LeaseDecisionsFieldTitles } from "@/leases/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatDate, getLabelOfOption, getReferenceNumberLink, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes, getCollapseStateByKey } from "@/leases/selectors";
+import { withWindowResize } from "@/components/resize/WindowResizeHandler";
 import type { Attributes } from "types";
 const formName = FormNames.LEASE_DECISIONS;
 type Props = {
@@ -80,52 +80,64 @@ const DecisionItem = ({
       <Row>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseDecisionsFieldPaths.DECISION_MAKER)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseDecisionsFieldPaths.DECISION_MAKER)}>
               {LeaseDecisionsFieldTitles.DECISION_MAKER}
             </FormTextTitle>
             <FormText>{getLabelOfOption(decisionMakerOptions, decision.decision_maker) || '–'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseDecisionsFieldPaths.DECISION_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseDecisionsFieldPaths.DECISION_DATE)}>
               {LeaseDecisionsFieldTitles.DECISION_DATE}
             </FormTextTitle>
             <FormText>{formatDate(decision.decision_date) || '–'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={1}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseDecisionsFieldPaths.SECTION)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseDecisionsFieldPaths.SECTION)}>
               {LeaseDecisionsFieldTitles.SECTION}
             </FormTextTitle>
             <FormText>{decision.section ? `${decision.section} §` : '–'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={8} large={3}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseDecisionsFieldPaths.TYPE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseDecisionsFieldPaths.TYPE)}>
               {LeaseDecisionsFieldTitles.TYPE}
             </FormTextTitle>
             <FormText>{getLabelOfOption(typeOptions, decision.type) || '–'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseDecisionsFieldPaths.REFERENCE_NUMBER)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseDecisionsFieldPaths.REFERENCE_NUMBER)}>
               {LeaseDecisionsFieldTitles.REFERENCE_NUMBER}
             </FormTextTitle>
             {decision.reference_number ? <ExternalLink href={getReferenceNumberLink(decision.reference_number)} text={decision.reference_number} /> : <FormText>-</FormText>}
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         <Column small={12}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseDecisionsFieldPaths.DESCRIPTION)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseDecisionsFieldPaths.DESCRIPTION)}>
               {LeaseDecisionsFieldTitles.DESCRIPTION}
             </FormTextTitle>
             <FormText>{decision.description || '–'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
@@ -197,38 +209,46 @@ const DecisionItem = ({
                       <Row>
                         <Column small={6} medium={4}>
                           <Authorization allow={isFieldAllowedToRead(attributes, LeaseDecisionConditionsFieldPaths.TYPE)}>
+                            <>
                             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseDecisionConditionsFieldPaths.TYPE)}>
                               {LeaseDecisionConditionsFieldTitles.TYPE}
                             </FormTextTitle>
                             <FormText>{getLabelOfOption(conditionTypeOptions, condition.type) || '–'}</FormText>
+                            </>
                           </Authorization>
                         </Column>
                         <Column small={6} medium={4}>
                           <Authorization allow={isFieldAllowedToRead(attributes, LeaseDecisionConditionsFieldPaths.SUPERVISION_DATE)}>
+                            <>
                             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseDecisionConditionsFieldPaths.SUPERVISION_DATE)}>
                               {LeaseDecisionConditionsFieldTitles.SUPERVISION_DATE}
                             </FormTextTitle>
                             <FormText className={condition.supervision_date && !condition.supervised_date ? 'alert' : ''}>
                               {condition.supervision_date ? <span><i />{formatDate(condition.supervision_date)}</span> : '–'}
                             </FormText>
+                            </>
                           </Authorization>
                         </Column>
                         <Column small={6} medium={4}>
                           <Authorization allow={isFieldAllowedToRead(attributes, LeaseDecisionConditionsFieldPaths.SUPERVISED_DATE)}>
+                            <>
                             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseDecisionConditionsFieldPaths.SUPERVISED_DATE)}>
                               {LeaseDecisionConditionsFieldTitles.SUPERVISED_DATE}
                             </FormTextTitle>
                             <FormText className={condition.supervised_date ? 'success' : ''}>
                               {condition.supervised_date ? <span><i />{formatDate(condition.supervised_date)}</span> : '–'}
                             </FormText>
+                            </>
                           </Authorization>
                         </Column>
                         <Column small={12} medium={12}>
                           <Authorization allow={isFieldAllowedToRead(attributes, LeaseDecisionConditionsFieldPaths.DESCRIPTION)}>
+                            <>
                             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseDecisionConditionsFieldPaths.DESCRIPTION)}>
                               {LeaseDecisionConditionsFieldTitles.DESCRIPTION}
                             </FormTextTitle>
                             <ShowMore className='no-margin' text={condition.description || '–'} />
+                            </>
                           </Authorization>
                         </Column>
                       </Row>
@@ -241,7 +261,7 @@ const DecisionItem = ({
     </Collapse>;
 };
 
-export default flowRight(withWindowResize, connect((state, props) => {
+export default flowRight(withWindowResize, connect((state, props: Props) => {
   const id = props.decision.id;
   return {
     attributes: getAttributes(state),
diff --git a/src/leases/components/leaseSections/contract/DecisionItemEdit.tsx b/src/leases/components/leaseSections/contract/DecisionItemEdit.tsx
index 4c4569a1e..3b0a70704 100644
--- a/src/leases/components/leaseSections/contract/DecisionItemEdit.tsx
+++ b/src/leases/components/leaseSections/contract/DecisionItemEdit.tsx
@@ -4,24 +4,24 @@ import { FieldArray, formValueSelector } from "redux-form";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
-import Authorization from "components/authorization/Authorization";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import Collapse from "components/collapse/Collapse";
+import Authorization from "@/components/authorization/Authorization";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import Collapse from "@/components/collapse/Collapse";
 import DecisionConditionsEdit from "./DecisionConditionsEdit";
-import FormField from "components/form/FormField";
-import { receiveCollapseStates } from "leases/actions";
-import { FieldTypes, FormNames, ViewModes } from "enums";
-import { LeaseDecisionConditionsFieldPaths, LeaseDecisionsFieldPaths, LeaseDecisionsFieldTitles } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getDecisionById } from "leases/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatDate, getFieldAttributes, getFieldOptions, getLabelOfOption, hasPermissions, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes, getCollapseStateByKey, getCurrentLease, getErrorsByFormName, getIsSaveClicked } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { referenceNumber } from "components/form/validations";
+import FormField from "@/components/form/FormField";
+import { receiveCollapseStates } from "@/leases/actions";
+import { FieldTypes, FormNames, ViewModes } from "@/enums";
+import { LeaseDecisionConditionsFieldPaths, LeaseDecisionsFieldPaths, LeaseDecisionsFieldTitles } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getDecisionById } from "@/leases/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatDate, getFieldAttributes, getFieldOptions, getLabelOfOption, hasPermissions, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes, getCollapseStateByKey, getCurrentLease, getErrorsByFormName, getIsSaveClicked } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { referenceNumber } from "@/components/form/validations";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { Lease } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   attributes: Attributes;
   conditionsCollapseState: boolean;
diff --git a/src/leases/components/leaseSections/contract/Decisions.tsx b/src/leases/components/leaseSections/contract/Decisions.tsx
index a8c0556f7..7b2ef9934 100644
--- a/src/leases/components/leaseSections/contract/Decisions.tsx
+++ b/src/leases/components/leaseSections/contract/Decisions.tsx
@@ -1,13 +1,13 @@
 import React, { Fragment, PureComponent } from "react";
 import { connect } from "react-redux";
 import DecisionItem from "./DecisionItem";
-import FormText from "components/form/FormText";
-import { LeaseDecisionConditionsFieldPaths, LeaseDecisionsFieldPaths } from "leases/enums";
-import { getContentDecisions } from "leases/helpers";
-import { getFieldOptions } from "util/helpers";
-import { getAttributes, getCurrentLease } from "leases/selectors";
+import FormText from "@/components/form/FormText";
+import { LeaseDecisionConditionsFieldPaths, LeaseDecisionsFieldPaths } from "@/leases/enums";
+import { getContentDecisions } from "@/leases/helpers";
+import { getFieldOptions } from "@/util/helpers";
+import { getAttributes, getCurrentLease } from "@/leases/selectors";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
+import type { Lease } from "@/leases/types";
 type Props = {
   attributes: Attributes;
   currentLease: Lease;
diff --git a/src/leases/components/leaseSections/contract/DecisionsEdit.tsx b/src/leases/components/leaseSections/contract/DecisionsEdit.tsx
index dd37e212b..15452f634 100644
--- a/src/leases/components/leaseSections/contract/DecisionsEdit.tsx
+++ b/src/leases/components/leaseSections/contract/DecisionsEdit.tsx
@@ -3,21 +3,21 @@ import { connect } from "react-redux";
 import { FieldArray, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButton from "components/form/AddButton";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButton from "@/components/form/AddButton";
 import AttachDecisionModal from "./AttachDecisionModal";
-import Authorization from "components/authorization/Authorization";
+import Authorization from "@/components/authorization/Authorization";
 import DecisionItemEdit from "./DecisionItemEdit";
-import FormText from "components/form/FormText";
-import { copyDecisionToLeases, hideAttachDecisionModal, receiveFormValidFlags, showAttachDecisionModal } from "leases/actions";
-import { ConfirmationModalTexts, FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { hasPermissions } from "util/helpers";
-import { getCurrentLease, getIsAttachDecisionModalOpen } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import type { Lease } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import FormText from "@/components/form/FormText";
+import { copyDecisionToLeases, hideAttachDecisionModal, receiveFormValidFlags, showAttachDecisionModal } from "@/leases/actions";
+import { ConfirmationModalTexts, FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { hasPermissions } from "@/util/helpers";
+import { getCurrentLease, getIsAttachDecisionModalOpen } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import type { Lease } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type DecisionsProps = {
   fields: any;
   onAttach: (...args: Array<any>) => any;
diff --git a/src/leases/components/leaseSections/contract/DecisionsMain.tsx b/src/leases/components/leaseSections/contract/DecisionsMain.tsx
index db70aefb1..da9161543 100644
--- a/src/leases/components/leaseSections/contract/DecisionsMain.tsx
+++ b/src/leases/components/leaseSections/contract/DecisionsMain.tsx
@@ -1,15 +1,15 @@
 import React, { Fragment } from "react";
 import { connect } from "react-redux";
-import Authorization from "components/authorization/Authorization";
+import Authorization from "@/components/authorization/Authorization";
 import Contracts from "./Contracts";
 import Decisions from "./Decisions";
-import Divider from "components/content/Divider";
+import Divider from "@/components/content/Divider";
 import Inspections from "./Inspections";
-import Title from "components/content/Title";
-import { LeaseContractsFieldPaths, LeaseContractsFieldTitles, LeaseDecisionsFieldPaths, LeaseDecisionsFieldTitles, LeaseInspectionsFieldPaths, LeaseInspectionsFieldTitles } from "leases/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { isFieldAllowedToRead } from "util/helpers";
-import { getAttributes } from "leases/selectors";
+import Title from "@/components/content/Title";
+import { LeaseContractsFieldPaths, LeaseContractsFieldTitles, LeaseDecisionsFieldPaths, LeaseDecisionsFieldTitles, LeaseInspectionsFieldPaths, LeaseInspectionsFieldTitles } from "@/leases/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes } from "@/leases/selectors";
 import type { Attributes } from "types";
 type Props = {
   attributes: Attributes;
@@ -20,27 +20,33 @@ const DecisionsMain = ({
 }: Props) => {
   return <Fragment>
       <Authorization allow={isFieldAllowedToRead(attributes, LeaseDecisionsFieldPaths.DECISIONS)}>
+        <>
         <Title uiDataKey={getUiDataLeaseKey(LeaseDecisionsFieldPaths.DECISIONS)}>
           {LeaseDecisionsFieldTitles.DECISIONS}
         </Title>
         <Divider />
         <Decisions />
+        </>
       </Authorization>
 
       <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractsFieldPaths.CONTRACTS)}>
+        <>
         <Title uiDataKey={getUiDataLeaseKey(LeaseContractsFieldPaths.CONTRACTS)}>
           {LeaseContractsFieldTitles.CONTRACTS}
         </Title>
         <Divider />
         <Contracts />
+        </>
       </Authorization>
 
       <Authorization allow={isFieldAllowedToRead(attributes, LeaseInspectionsFieldPaths.INSPECTIONS)}>
+        <>
         <Title uiDataKey={getUiDataLeaseKey(LeaseInspectionsFieldPaths.INSPECTIONS)}>
           {LeaseInspectionsFieldTitles.INSPECTIONS}
         </Title>
         <Divider />
         <Inspections />
+        </>
       </Authorization>
     </Fragment>;
 };
diff --git a/src/leases/components/leaseSections/contract/DecisionsMainEdit.tsx b/src/leases/components/leaseSections/contract/DecisionsMainEdit.tsx
index cfd0a7fdd..a56352686 100644
--- a/src/leases/components/leaseSections/contract/DecisionsMainEdit.tsx
+++ b/src/leases/components/leaseSections/contract/DecisionsMainEdit.tsx
@@ -1,15 +1,15 @@
 import React, { Fragment } from "react";
 import { connect } from "react-redux";
-import Authorization from "components/authorization/Authorization";
+import Authorization from "@/components/authorization/Authorization";
 import ContractsEdit from "./ContractsEdit";
 import DecisionsEdit from "./DecisionsEdit";
-import Divider from "components/content/Divider";
+import Divider from "@/components/content/Divider";
 import InspectionsEdit from "./InspectionsEdit";
-import Title from "components/content/Title";
-import { LeaseContractsFieldPaths, LeaseContractsFieldTitles, LeaseDecisionsFieldPaths, LeaseDecisionsFieldTitles, LeaseInspectionsFieldPaths, LeaseInspectionsFieldTitles } from "leases/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { isFieldAllowedToRead } from "util/helpers";
-import { getAttributes } from "leases/selectors";
+import Title from "@/components/content/Title";
+import { LeaseContractsFieldPaths, LeaseContractsFieldTitles, LeaseDecisionsFieldPaths, LeaseDecisionsFieldTitles, LeaseInspectionsFieldPaths, LeaseInspectionsFieldTitles } from "@/leases/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes } from "@/leases/selectors";
 import type { Attributes } from "types";
 type Props = {
   attributes: Attributes;
@@ -20,27 +20,33 @@ const DecisionsMainEdit = ({
 }: Props) => {
   return <Fragment>
       <Authorization allow={isFieldAllowedToRead(attributes, LeaseDecisionsFieldPaths.DECISIONS)}>
+        <>
         <Title enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseDecisionsFieldPaths.DECISIONS)}>
           {LeaseDecisionsFieldTitles.DECISIONS}
         </Title>
         <Divider />
         <DecisionsEdit />
+        </>
       </Authorization>
 
       <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractsFieldPaths.CONTRACTS)}>
+        <>
         <Title enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseContractsFieldPaths.CONTRACTS)}>
           {LeaseContractsFieldTitles.CONTRACTS}
         </Title>
         <Divider />
         <ContractsEdit />
+        </>
       </Authorization>
 
       <Authorization allow={isFieldAllowedToRead(attributes, LeaseInspectionsFieldPaths.INSPECTIONS)}>
+        <>
         <Title enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseInspectionsFieldPaths.INSPECTIONS)}>
           {LeaseInspectionsFieldTitles.INSPECTIONS}
         </Title>
         <Divider />
         <InspectionsEdit />
+        </>
       </Authorization>
     </Fragment>;
 };
diff --git a/src/leases/components/leaseSections/contract/InspectionItem.tsx b/src/leases/components/leaseSections/contract/InspectionItem.tsx
index 1a937d7f4..ee84dc00c 100644
--- a/src/leases/components/leaseSections/contract/InspectionItem.tsx
+++ b/src/leases/components/leaseSections/contract/InspectionItem.tsx
@@ -1,15 +1,15 @@
 import React, { Fragment } from "react";
 import { Row, Column } from "react-foundation";
-import Authorization from "components/authorization/Authorization";
-import FileDownloadLink from "components/file/FileDownloadLink";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import ShowMore from "components/showMore/ShowMore";
-import SubTitle from "components/content/SubTitle";
-import { LeaseInspectionAttachmentsFieldPaths, LeaseInspectionAttachmentsFieldTitles, LeaseInspectionsFieldPaths, LeaseInspectionsFieldTitles } from "leases/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatDate, isFieldAllowedToRead } from "util/helpers";
-import { getUserFullName } from "users/helpers";
+import Authorization from "@/components/authorization/Authorization";
+import FileDownloadLink from "@/components/file/FileDownloadLink";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import ShowMore from "@/components/showMore/ShowMore";
+import SubTitle from "@/components/content/SubTitle";
+import { LeaseInspectionAttachmentsFieldPaths, LeaseInspectionAttachmentsFieldTitles, LeaseInspectionsFieldPaths, LeaseInspectionsFieldTitles } from "@/leases/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatDate, isFieldAllowedToRead } from "@/util/helpers";
+import { getUserFullName } from "@/users/helpers";
 import type { Attributes } from "types";
 type Props = {
   inspection: Record<string, any>;
@@ -25,39 +25,48 @@ const InspectionItem = ({
       <Row>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseInspectionsFieldPaths.INSPECTOR)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseInspectionsFieldPaths.INSPECTOR)}>
               {LeaseInspectionsFieldTitles.INSPECTOR}
             </FormTextTitle>
             <FormText>{inspection.inspector || '–'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseInspectionsFieldPaths.SUPERVISION_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseInspectionsFieldPaths.SUPERVISION_DATE)}>
               {LeaseInspectionsFieldTitles.SUPERVISION_DATE}
             </FormTextTitle>
             <FormText className={inspection.supervision_date && !inspection.supervised_date ? 'alert' : ''}>{inspection.supervision_date ? <span><i />{formatDate(inspection.supervision_date)}</span> : '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseInspectionsFieldPaths.SUPERVISED_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseInspectionsFieldPaths.SUPERVISED_DATE)}>
               {LeaseInspectionsFieldTitles.SUPERVISED_DATE}
             </FormTextTitle>
             <FormText className={inspection.supervised_date ? 'success' : ''}>{inspection.supervised_date ? <span><i />{formatDate(inspection.supervised_date)}</span> : '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={12} large={6}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseInspectionsFieldPaths.DESCRIPTION)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseInspectionsFieldPaths.DESCRIPTION)}>
               {LeaseInspectionsFieldTitles.DESCRIPTION}
             </FormTextTitle>
             <ShowMore text={inspection.description || '–'} />
+            </>
           </Authorization>
         </Column>
       </Row>
 
       <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseInspectionAttachmentsFieldPaths.ATTACHMENTS)}>
+        <>
         <SubTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseInspectionAttachmentsFieldPaths.ATTACHMENTS)}>
           {LeaseInspectionAttachmentsFieldTitles.ATTACHMENTS}
         </SubTitle>
@@ -104,6 +113,7 @@ const InspectionItem = ({
                 </Row>;
         })}
           </Fragment>}
+        </>
       </Authorization>
     </Fragment>;
 };
diff --git a/src/leases/components/leaseSections/contract/InspectionItemEdit.tsx b/src/leases/components/leaseSections/contract/InspectionItemEdit.tsx
index db3d6ab08..235bf79be 100644
--- a/src/leases/components/leaseSections/contract/InspectionItemEdit.tsx
+++ b/src/leases/components/leaseSections/contract/InspectionItemEdit.tsx
@@ -2,31 +2,31 @@ import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { formValueSelector } from "redux-form";
 import { Row, Column } from "react-foundation";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import ActionButtonWrapper from "components/form/ActionButtonWrapper";
-import AddFileButton from "components/form/AddFileButton";
-import Authorization from "components/authorization/Authorization";
-import BoxItem from "components/content/BoxItem";
-import FileDownloadLink from "components/file/FileDownloadLink";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import RemoveButton from "components/form/RemoveButton";
-import SubTitle from "components/content/SubTitle";
-import { createLeaseInspectionAttachment, deleteLeaseInspectionAttachment } from "leaseInspectionAttachment/actions";
-import { ConfirmationModalTexts, FieldTypes, FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import { LeaseInspectionAttachmentsFieldPaths, LeaseInspectionAttachmentsFieldTitles, LeaseInspectionsFieldPaths, LeaseInspectionsFieldTitles } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getContentInspections } from "leases/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getUserFullName } from "users/helpers";
-import { findItemById, formatDate, getFieldAttributes, hasPermissions, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes as getLeaseAttributes, getCurrentLease, getIsSaveClicked } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import ActionButtonWrapper from "@/components/form/ActionButtonWrapper";
+import AddFileButton from "@/components/form/AddFileButton";
+import Authorization from "@/components/authorization/Authorization";
+import BoxItem from "@/components/content/BoxItem";
+import FileDownloadLink from "@/components/file/FileDownloadLink";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import RemoveButton from "@/components/form/RemoveButton";
+import SubTitle from "@/components/content/SubTitle";
+import { createLeaseInspectionAttachment, deleteLeaseInspectionAttachment } from "@/leaseInspectionAttachment/actions";
+import { ConfirmationModalTexts, FieldTypes, FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { LeaseInspectionAttachmentsFieldPaths, LeaseInspectionAttachmentsFieldTitles, LeaseInspectionsFieldPaths, LeaseInspectionsFieldTitles } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getContentInspections } from "@/leases/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getUserFullName } from "@/users/helpers";
+import { findItemById, formatDate, getFieldAttributes, hasPermissions, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes, getCurrentLease, getIsSaveClicked } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { Lease } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   createLeaseInspectionAttachment: (...args: Array<any>) => any;
   currentLease: Lease;
@@ -115,6 +115,7 @@ const InspectionItemEdit = ({
               </Column>
             </Row>
             {inspectionId && <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseInspectionAttachmentsFieldPaths.ATTACHMENTS)}>
+                <>
                 <SubTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseInspectionAttachmentsFieldPaths.ATTACHMENTS)}>
                   {LeaseInspectionAttachmentsFieldTitles.ATTACHMENTS}
                 </SubTitle>
@@ -186,6 +187,7 @@ const InspectionItemEdit = ({
                 <Authorization allow={hasPermissions(usersPermissions, UsersPermissions.ADD_INSPECTIONATTACHMENT)}>
                   <AddFileButton label='Lisää tiedosto' name={`add_inspection_attachment_button_${inspectionId}`} onChange={handleAddInspectionAttachment} />
                 </Authorization>
+                </>
               </Authorization>}
           </BoxItem>;
     }}
diff --git a/src/leases/components/leaseSections/contract/Inspections.tsx b/src/leases/components/leaseSections/contract/Inspections.tsx
index 03ae0a255..d745e3263 100644
--- a/src/leases/components/leaseSections/contract/Inspections.tsx
+++ b/src/leases/components/leaseSections/contract/Inspections.tsx
@@ -1,15 +1,15 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import BoxItem from "components/content/BoxItem";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import FormText from "components/form/FormText";
-import GreenBox from "components/content/GreenBox";
+import BoxItem from "@/components/content/BoxItem";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import FormText from "@/components/form/FormText";
+import GreenBox from "@/components/content/GreenBox";
 import InspectionItem from "./InspectionItem";
-import { getContentInspections } from "leases/helpers";
-import { getAttributes as getLeaseAttributes, getCurrentLease } from "leases/selectors";
+import { getContentInspections } from "@/leases/helpers";
+import { getAttributes as getLeaseAttributes, getCurrentLease } from "@/leases/selectors";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
+import type { Lease } from "@/leases/types";
 type Props = {
   currentLease: Lease;
   leaseAttributes: Attributes;
diff --git a/src/leases/components/leaseSections/contract/InspectionsEdit.tsx b/src/leases/components/leaseSections/contract/InspectionsEdit.tsx
index 8fc91ce06..13812f8de 100644
--- a/src/leases/components/leaseSections/contract/InspectionsEdit.tsx
+++ b/src/leases/components/leaseSections/contract/InspectionsEdit.tsx
@@ -3,25 +3,25 @@ import flowRight from "lodash/flowRight";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import { FieldArray, reduxForm } from "redux-form";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import Authorization from "components/authorization/Authorization";
-import { getLoggedInUser } from "auth/selectors";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import FormText from "components/form/FormText";
-import GreenBox from "components/content/GreenBox";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import Authorization from "@/components/authorization/Authorization";
+import { getLoggedInUser } from "@/auth/selectors";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import FormText from "@/components/form/FormText";
+import GreenBox from "@/components/content/GreenBox";
 import InspectionItemEdit from "./InspectionItemEdit";
-import { receiveFormValidFlags } from "leases/actions";
-import { ConfirmationModalTexts, FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import { LeaseInspectionsFieldPaths } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { hasPermissions, isFieldAllowedToEdit } from "util/helpers";
-import { getAttributes as getLeaseAttributes } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import { receiveFormValidFlags } from "@/leases/actions";
+import { ConfirmationModalTexts, FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { LeaseInspectionsFieldPaths } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { hasPermissions, isFieldAllowedToEdit } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import get from "lodash/get";
 import type { Attributes } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type InspectionsProps = {
   fields: any;
   isSaveClicked: boolean;
diff --git a/src/leases/components/leaseSections/invoice/CollectionCourtDecisionPanel.tsx b/src/leases/components/leaseSections/invoice/CollectionCourtDecisionPanel.tsx
index c683b8aed..024337024 100644
--- a/src/leases/components/leaseSections/invoice/CollectionCourtDecisionPanel.tsx
+++ b/src/leases/components/leaseSections/invoice/CollectionCourtDecisionPanel.tsx
@@ -3,18 +3,18 @@ import { connect } from "react-redux";
 import { formValueSelector, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import Authorization from "components/authorization/Authorization";
-import Button from "components/button/Button";
-import FileInput from "components/file/FileInput";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import ButtonWrapper from "components/content/ButtonWrapper";
-import { FormNames } from "enums";
-import { CollectionCourtDecisionFieldPaths, CollectionCourtDecisionFieldTitles } from "collectionCourtDecision/enums";
-import { ButtonColors } from "components/enums";
-import { getFieldAttributes, isFieldAllowedToEdit } from "util/helpers";
-import { getAttributes as getCollectionCourtDecisionAttributes } from "collectionCourtDecision/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import Button from "@/components/button/Button";
+import FileInput from "@/components/file/FileInput";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import ButtonWrapper from "@/components/content/ButtonWrapper";
+import { FormNames } from "@/enums";
+import { CollectionCourtDecisionFieldPaths, CollectionCourtDecisionFieldTitles } from "@/collectionCourtDecision/enums";
+import { ButtonColors } from "@/components/enums";
+import { getFieldAttributes, isFieldAllowedToEdit } from "@/util/helpers";
+import { getAttributes as getCollectionCourtDecisionAttributes } from "@/collectionCourtDecision/selectors";
 import type { Attributes } from "types";
 type Props = {
   collectionCourtDecisionAttributes: Attributes;
diff --git a/src/leases/components/leaseSections/invoice/CreateAndCreditInvoice.tsx b/src/leases/components/leaseSections/invoice/CreateAndCreditInvoice.tsx
index c1ccdf3f5..bd884ed47 100644
--- a/src/leases/components/leaseSections/invoice/CreateAndCreditInvoice.tsx
+++ b/src/leases/components/leaseSections/invoice/CreateAndCreditInvoice.tsx
@@ -3,28 +3,28 @@ import { connect } from "react-redux";
 import scrollToComponent from "react-scroll-to-component";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import AddButton from "components/form/AddButton";
-import Authorization from "components/authorization/Authorization";
-import Button from "components/button/Button";
+import AddButton from "@/components/form/AddButton";
+import Authorization from "@/components/authorization/Authorization";
+import Button from "@/components/button/Button";
 import CreditInvoiceForm from "./forms/CreditInvoiceForm";
 import NewInvoiceForm from "./forms/NewInvoiceForm";
-import { createCharge } from "leases/actions";
-import { createInvoice, creditInvoice, deleteInvoice, receiveIsCreateClicked, receiveIsCreateInvoicePanelOpen, receiveIsCreditClicked, receiveIsCreditInvoicePanelOpen } from "invoices/actions";
-import { creditInvoiceSet } from "invoiceSets/actions";
-import { ButtonColors } from "components/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { RecipientOptions } from "leases/enums";
-import { getPayloadCreateInvoice, getPayloadCreditInvoice } from "invoices/helpers";
-import { getCreditInvoiceSetPayload } from "invoiceSets/helpers";
-import { getPayloadLeaseCreateCharge } from "leaseCreateCharge/helpers";
-import { hasPermissions } from "util/helpers";
-import { getCurrentLease } from "leases/selectors";
-import { getIsCreateInvoicePanelOpen, getIsCreditInvoicePanelOpen } from "invoices/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { AppConsumer, ActionTypes } from "app/AppContext";
-import { ConfirmationModalTexts } from "enums";
-import type { Lease } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import { createCharge } from "@/leases/actions";
+import { createInvoice, creditInvoice, deleteInvoice, receiveIsCreateClicked, receiveIsCreateInvoicePanelOpen, receiveIsCreditClicked, receiveIsCreditInvoicePanelOpen } from "@/invoices/actions";
+import { creditInvoiceSet } from "@/invoiceSets/actions";
+import { ButtonColors } from "@/components/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { RecipientOptions } from "@/leases/enums";
+import { getPayloadCreateInvoice, getPayloadCreditInvoice } from "@/invoices/helpers";
+import { getCreditInvoiceSetPayload } from "@/invoiceSets/helpers";
+import { getPayloadLeaseCreateCharge } from "@/leaseCreateCharge/helpers";
+import { hasPermissions } from "@/util/helpers";
+import { getCurrentLease } from "@/leases/selectors";
+import { getIsCreateInvoicePanelOpen, getIsCreditInvoicePanelOpen } from "@/invoices/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { AppConsumer, ActionTypes } from "@/app/AppContext";
+import { ConfirmationModalTexts } from "@/enums";
+import type { Lease } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   createCharge: (...args: Array<any>) => any;
   createInvoice: (...args: Array<any>) => any;
diff --git a/src/leases/components/leaseSections/invoice/CreateCollectionLetter.tsx b/src/leases/components/leaseSections/invoice/CreateCollectionLetter.tsx
index cd8cf69cc..7d01e9afc 100644
--- a/src/leases/components/leaseSections/invoice/CreateCollectionLetter.tsx
+++ b/src/leases/components/leaseSections/invoice/CreateCollectionLetter.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import CreateCollectionLetterForm from "./forms/CreateCollectionLetterForm";
-import GreenBox from "components/content/GreenBox";
-import SubTitle from "components/content/SubTitle";
-import { CreateCollectionLetterFieldPaths, CreateCollectionLetterFieldTitles } from "createCollectionLetter/enums";
-import { getUiDataCreateCollectionLetterKey } from "uiData/helpers";
+import GreenBox from "@/components/content/GreenBox";
+import SubTitle from "@/components/content/SubTitle";
+import { CreateCollectionLetterFieldPaths, CreateCollectionLetterFieldTitles } from "@/createCollectionLetter/enums";
+import { getUiDataCreateCollectionLetterKey } from "@/uiData/helpers";
 
 const CreateCollectionLetter = () => {
   return <GreenBox className='with-top-margin'>
diff --git a/src/leases/components/leaseSections/invoice/DebtCollection.tsx b/src/leases/components/leaseSections/invoice/DebtCollection.tsx
index 68b0bb56e..01dada8b7 100644
--- a/src/leases/components/leaseSections/invoice/DebtCollection.tsx
+++ b/src/leases/components/leaseSections/invoice/DebtCollection.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import DebtCollectionForm from "./forms/DebtCollectionForm";
-import GreenBox from "components/content/GreenBox";
+import GreenBox from "@/components/content/GreenBox";
 
 const DebtCollection = () => <GreenBox>
     <DebtCollectionForm />
diff --git a/src/leases/components/leaseSections/invoice/InvoiceNotes.tsx b/src/leases/components/leaseSections/invoice/InvoiceNotes.tsx
index ee8583da8..9963518a2 100644
--- a/src/leases/components/leaseSections/invoice/InvoiceNotes.tsx
+++ b/src/leases/components/leaseSections/invoice/InvoiceNotes.tsx
@@ -3,27 +3,27 @@ import { Row, Column } from "react-foundation";
 import { connect } from "react-redux";
 import { FieldArray, formValueSelector, reduxForm } from "redux-form";
 import flowRight from "lodash/flowRight";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButton from "components/form/AddButton";
-import Authorization from "components/authorization/Authorization";
-import Button from "components/button/Button";
-import ButtonWrapper from "components/content/ButtonWrapper";
-import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import ListItem from "components/content/ListItem";
-import ListItems from "components/content/ListItems";
-import RemoveButton from "components/form/RemoveButton";
-import { patchLeaseInvoiceNotes } from "leases/actions";
-import { ConfirmationModalTexts, FieldTypes, FormNames, Methods } from "enums";
-import { ButtonColors } from "components/enums";
-import { InvoiceNoteFieldPaths, InvoiceNoteFieldTitles } from "invoiceNote/enums";
-import { formatDate, getFieldAttributes, isFieldAllowedToRead, isMethodAllowed } from "util/helpers";
-import { getAttributes as getInvoiceNoteAttributes, getMethods as getInvoiceNoteMethods } from "invoiceNote/selectors";
-import { getCurrentLease } from "leases/selectors";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButton from "@/components/form/AddButton";
+import Authorization from "@/components/authorization/Authorization";
+import Button from "@/components/button/Button";
+import ButtonWrapper from "@/components/content/ButtonWrapper";
+import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import ListItem from "@/components/content/ListItem";
+import ListItems from "@/components/content/ListItems";
+import RemoveButton from "@/components/form/RemoveButton";
+import { patchLeaseInvoiceNotes } from "@/leases/actions";
+import { ConfirmationModalTexts, FieldTypes, FormNames, Methods } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { InvoiceNoteFieldPaths, InvoiceNoteFieldTitles } from "@/invoiceNote/enums";
+import { formatDate, getFieldAttributes, isFieldAllowedToRead, isMethodAllowed } from "@/util/helpers";
+import { getAttributes as getInvoiceNoteAttributes, getMethods as getInvoiceNoteMethods } from "@/invoiceNote/selectors";
+import { getCurrentLease } from "@/leases/selectors";
 import type { Attributes, Methods as MethodsType } from "types";
-import type { Lease } from "leases/types";
+import type { Lease } from "@/leases/types";
 type ReadOnlyProps = {
   invoiceNoteAttributes: Attributes;
   invoiceNotes: Array<Record<string, any>>;
diff --git a/src/leases/components/leaseSections/invoice/InvoicePanel.tsx b/src/leases/components/leaseSections/invoice/InvoicePanel.tsx
index f10e9d445..783dbbcf0 100644
--- a/src/leases/components/leaseSections/invoice/InvoicePanel.tsx
+++ b/src/leases/components/leaseSections/invoice/InvoicePanel.tsx
@@ -2,19 +2,19 @@ import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import { getFormValues, isValid } from "redux-form";
 import isEmpty from "lodash/isEmpty";
-import Authorization from "components/authorization/Authorization";
-import Button from "components/button/Button";
+import Authorization from "@/components/authorization/Authorization";
+import Button from "@/components/button/Button";
 import EditInvoiceForm from "./forms/EditInvoiceForm";
 import InvoiceTemplate from "./InvoiceTemplate";
-import TablePanelContainer from "components/table/TablePanelContainer";
-import { receiveIsEditClicked } from "invoices/actions";
-import { FormNames, Methods } from "enums";
-import { ButtonColors } from "components/enums";
-import { isMethodAllowed } from "util/helpers";
-import { getInvoicesByLease, getIsEditClicked, getMethods as getInvoiceMethods } from "invoices/selectors";
-import { getCurrentLease } from "leases/selectors";
+import TablePanelContainer from "@/components/table/TablePanelContainer";
+import { receiveIsEditClicked } from "@/invoices/actions";
+import { FormNames, Methods } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { isMethodAllowed } from "@/util/helpers";
+import { getInvoicesByLease, getIsEditClicked, getMethods as getInvoiceMethods } from "@/invoices/selectors";
+import { getCurrentLease } from "@/leases/selectors";
 import type { Methods as MethodsType } from "types";
-import type { Invoice, InvoiceList } from "invoices/types";
+import type { Invoice, InvoiceList } from "@/invoices/types";
 
 type Props = {
   formValues: Record<string, any>;
@@ -87,18 +87,16 @@ class InvoicePanel extends PureComponent<Props, State> {
       creditedInvoice,
       interestInvoiceFor
     } = this.state;
-    const automaticallyGenerated = invoice && invoice.generated;
     
     return (
     <TablePanelContainer 
       innerRef={this.setComponentRef}
       footer={invoice && !invoice.sap_id && 
         <Authorization allow={isMethodAllowed(invoiceMethods, Methods.PATCH)}>
-          <Button className={ButtonColors.SECONDARY} onClick={onClose} text='Peruuta' />
-          {automaticallyGenerated 
-            ? <p className="invoice-panel__error-text">Automaattisesti luotuja laskuja ei voi muokata.</p>
-            : <Button className={ButtonColors.SUCCESS} disabled={isEditClicked || !valid} onClick={this.handleSave} text='Tallenna' />
-          }
+          <>
+            <Button className={ButtonColors.SECONDARY} onClick={onClose} text='Peruuta' />
+            <Button className={ButtonColors.SUCCESS} disabled={isEditClicked || !valid} onClick={this.handleSave} text='Tallenna' />
+          </>
         </Authorization>}
       onClose={onClose} 
       title='Laskun tiedot'>
diff --git a/src/leases/components/leaseSections/invoice/InvoiceTableAndPanel.tsx b/src/leases/components/leaseSections/invoice/InvoiceTableAndPanel.tsx
index 8e99a8115..f2b13571d 100644
--- a/src/leases/components/leaseSections/invoice/InvoiceTableAndPanel.tsx
+++ b/src/leases/components/leaseSections/invoice/InvoiceTableAndPanel.tsx
@@ -4,27 +4,27 @@ import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import { withRouter } from "react-router";
 import { initialize } from "redux-form";
-import AmountWithVat from "components/vat/AmountWithVat";
-import FormText from "components/form/FormText";
+import AmountWithVat from "@/components/vat/AmountWithVat";
+import FormText from "@/components/form/FormText";
 import InvoicePanel from "./InvoicePanel";
-import SingleRadioInput from "components/inputs/SingleRadioInput";
-import SortableTable from "components/table/SortableTable";
-import TableAndPanelWrapper from "components/table/TableAndPanelWrapper";
-import { clearPatchedInvoice, patchInvoice } from "invoices/actions";
-import { FormNames, KeyCodes, TableSortOrder } from "enums";
-import { InvoiceFieldPaths, InvoiceFieldTitles, InvoiceRowsFieldPaths, InvoiceRowsFieldTitles, InvoiceType } from "invoices/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getContactFullName } from "contacts/helpers";
-import { formatReceivableTypesString, getContentIncoive, getContentInvoices, getPayloadEditInvoice, isInvoiceOverdue } from "invoices/helpers";
-import { findReactById, formatDate, formatDateRange, formatNumber, getFieldOptions, getLabelOfOption, hasPermissions, isFieldAllowedToRead, sortByOptionsAsc, sortByOptionsDesc, sortNumberByKeyAsc, sortNumberByKeyDesc, sortStringAsc, sortStringDesc } from "util/helpers";
-import { getAttributes as getInvoiceAttributes, getInvoicesByLease, getPatchedInvoice } from "invoices/selectors";
-import { getInvoiceSetsByLease } from "invoiceSets/selectors";
-import { getCurrentLease } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import type { Invoice, InvoiceList } from "invoices/types";
-import type { InvoiceSetList } from "invoiceSets/types";
+import SingleRadioInput from "@/components/inputs/SingleRadioInput";
+import SortableTable from "@/components/table/SortableTable";
+import TableAndPanelWrapper from "@/components/table/TableAndPanelWrapper";
+import { clearPatchedInvoice, patchInvoice } from "@/invoices/actions";
+import { FormNames, KeyCodes, TableSortOrder } from "@/enums";
+import { InvoiceFieldPaths, InvoiceFieldTitles, InvoiceRowsFieldPaths, InvoiceRowsFieldTitles, InvoiceType } from "@/invoices/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getContactFullName } from "@/contacts/helpers";
+import { formatReceivableTypesString, getContentIncoive, getContentInvoices, getPayloadEditInvoice, isInvoiceOverdue } from "@/invoices/helpers";
+import { findReactById, formatDate, formatDateRange, formatNumber, getFieldOptions, getLabelOfOption, hasPermissions, isFieldAllowedToRead, sortByOptionsAsc, sortByOptionsDesc, sortNumberByKeyAsc, sortNumberByKeyDesc, sortStringAsc, sortStringDesc } from "@/util/helpers";
+import { getAttributes as getInvoiceAttributes, getInvoicesByLease, getPatchedInvoice } from "@/invoices/selectors";
+import { getInvoiceSetsByLease } from "@/invoiceSets/selectors";
+import { getCurrentLease } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import type { Invoice, InvoiceList } from "@/invoices/types";
+import type { InvoiceSetList } from "@/invoiceSets/types";
 import type { Attributes } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   clearPatchedInvoice: (...args: Array<any>) => any;
   initialize: (...args: Array<any>) => any;
diff --git a/src/leases/components/leaseSections/invoice/InvoiceTemplate.tsx b/src/leases/components/leaseSections/invoice/InvoiceTemplate.tsx
index 9e176f107..e2d03d87e 100644
--- a/src/leases/components/leaseSections/invoice/InvoiceTemplate.tsx
+++ b/src/leases/components/leaseSections/invoice/InvoiceTemplate.tsx
@@ -2,19 +2,19 @@ import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import AmountWithVat from "components/vat/AmountWithVat";
-import Authorization from "components/authorization/Authorization";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
+import AmountWithVat from "@/components/vat/AmountWithVat";
+import Authorization from "@/components/authorization/Authorization";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
 import InvoiceRows from "./forms/InvoiceRows";
-import ListItem from "components/content/ListItem";
-import ListItems from "components/content/ListItems";
-import SubTitle from "components/content/SubTitle";
-import { InvoiceCreditInvoicesFieldPaths, InvoiceCreditInvoicesFieldTitles, InvoiceFieldPaths, InvoiceFieldTitles, InvoiceInterestInvoicesFieldPaths, InvoiceInterestInvoicesFieldTitles, InvoicePaymentsFieldPaths, InvoicePaymentsFieldTitles, InvoiceRowsFieldPaths, InvoiceType } from "invoices/enums";
-import { getUiDataInvoiceKey } from "uiData/helpers";
-import { formatDate, formatDateRange, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "util/helpers";
-import { getContactFullName } from "contacts/helpers";
-import { getAttributes as getInvoiceAttributes } from "invoices/selectors";
+import ListItem from "@/components/content/ListItem";
+import ListItems from "@/components/content/ListItems";
+import SubTitle from "@/components/content/SubTitle";
+import { InvoiceCreditInvoicesFieldPaths, InvoiceCreditInvoicesFieldTitles, InvoiceFieldPaths, InvoiceFieldTitles, InvoiceInterestInvoicesFieldPaths, InvoiceInterestInvoicesFieldTitles, InvoicePaymentsFieldPaths, InvoicePaymentsFieldTitles, InvoiceRowsFieldPaths, InvoiceType } from "@/invoices/enums";
+import { getUiDataInvoiceKey } from "@/uiData/helpers";
+import { formatDate, formatDateRange, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers";
+import { getContactFullName } from "@/contacts/helpers";
+import { getAttributes as getInvoiceAttributes } from "@/invoices/selectors";
 import type { Attributes } from "types";
 type Props = {
   creditedInvoice: Record<string, any> | null | undefined;
@@ -70,90 +70,110 @@ const InvoiceTemplate = ({
       <Row>
         <Column small={8}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.RECIPIENT)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.RECIPIENT)}>
               {InvoiceFieldTitles.RECIPIENT}
             </FormTextTitle>
             <FormText>{invoice ? getContactFullName(invoice.recipientFull) : '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.NUMBER)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.NUMBER)}>
               {InvoiceFieldTitles.NUMBER}
             </FormTextTitle>
             <FormText>{invoice && invoice.number || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.SENT_TO_SAP_AT)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.SENT_TO_SAP_AT)}>
               {InvoiceFieldTitles.SENT_TO_SAP_AT}
             </FormTextTitle>
             <FormText>{invoice && formatDate(invoice.sent_to_sap_at) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.DUE_DATE)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.DUE_DATE)}>
               {InvoiceFieldTitles.DUE_DATE}
             </FormTextTitle>
             <FormText>{invoice && formatDate(invoice.due_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.ADJUSTED_DUE_DATE)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.ADJUSTED_DUE_DATE)}>
               {InvoiceFieldTitles.ADJUSTED_DUE_DATE}
             </FormTextTitle>
             <FormText>{invoice && formatDate(invoice.adjusted_due_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.INVOICING_DATE)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.INVOICING_DATE)}>
               {InvoiceFieldTitles.INVOICING_DATE}
             </FormTextTitle>
             <FormText>{invoice && formatDate(invoice.invoicing_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.STATE)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.STATE)}>
               {InvoiceFieldTitles.STATE}
             </FormTextTitle>
             <FormText>{invoice && getLabelOfOption(stateOptions, invoice.state) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.BILLING_PERIOD_END_DATE) || isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.BILLING_PERIOD_START_DATE)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.BILLING_PERIOD)}>
               {InvoiceFieldTitles.BILLING_PERIOD}
             </FormTextTitle>
             <FormText>{invoice && formatDateRange(invoice.billing_period_start_date, invoice.billing_period_end_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.POSTPONE_DATE)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.POSTPONE_DATE)}>
               {InvoiceFieldTitles.POSTPONE_DATE}
             </FormTextTitle>
             <FormText>{invoice && formatDate(invoice.postpone_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.TOTAL_AMOUNT)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.TOTAL_AMOUNT)}>
               {InvoiceFieldTitles.TOTAL_AMOUNT}
             </FormTextTitle>
             <FormText>{invoice && !isEmptyValue(invoice.total_amount) ? <AmountWithVat amount={invoice.total_amount} date={invoice.due_date} /> : '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={4}>
@@ -164,11 +184,13 @@ const InvoiceTemplate = ({
         </Column>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.BILLED_AMOUNT)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.BILLED_AMOUNT)}>
               {InvoiceFieldTitles.BILLED_AMOUNT}
             </FormTextTitle>
             <FormText>{invoice && !isEmptyValue(invoice.billed_amount) ? <AmountWithVat amount={invoice.billed_amount} date={invoice.due_date} /> : '-'}
             </FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
@@ -180,7 +202,7 @@ const InvoiceTemplate = ({
           <Row>
             <Column small={12} medium={8}>
               <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoicePaymentsFieldPaths.PAYMENTS)}>
-
+                <>
                 {!payments.length && <FormText>Ei maksuja</FormText>}
                 {!!payments.length && <ListItems>
                     <Row>
@@ -215,15 +237,18 @@ const InvoiceTemplate = ({
                         </Row>;
               })}
                   </ListItems>}
+                </>
               </Authorization>
             </Column>
             <Column small={6} medium={4}>
               <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.OUTSTANDING_AMOUNT)}>
+                <>
                 <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.OUTSTANDING_AMOUNT)}>
                   {InvoiceFieldTitles.OUTSTANDING_AMOUNT}
                 </FormTextTitle>
                 <FormText>{invoice && !isEmptyValue(invoice.outstanding_amount) ? <AmountWithVat amount={invoice.outstanding_amount} date={invoice.due_date} /> : '-'}
                 </FormText>
+                </>
               </Authorization>
             </Column>
           </Row>
@@ -231,26 +256,32 @@ const InvoiceTemplate = ({
       {showOldInvoiceInfo && <Row>
           <Column small={4}>
             <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.PAYMENT_NOTIFICATION_DATE)}>
+              <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.PAYMENT_NOTIFICATION_DATE)}>
                 {InvoiceFieldTitles.PAYMENT_NOTIFICATION_DATE}
               </FormTextTitle>
               <FormText>{invoice && formatDate(invoice.payment_notification_date) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={4}>
             <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.COLLECTION_CHARGE)}>
+              <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.COLLECTION_CHARGE)}>
                 {InvoiceFieldTitles.COLLECTION_CHARGE}
               </FormTextTitle>
               <FormText>{invoice && !isEmptyValue(invoice.collection_charge) ? `${formatNumber(invoice.collection_charge)} €` : '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={4}>
             <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.PAYMENT_NOTIFICATION_CATALOG_DATE)}>
+              <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.PAYMENT_NOTIFICATION_CATALOG_DATE)}>
                 {InvoiceFieldTitles.PAYMENT_NOTIFICATION_CATALOG_DATE}
               </FormTextTitle>
               <FormText>{invoice && formatDate(invoice.payment_notification_catalog_date) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
         </Row>}
@@ -258,45 +289,55 @@ const InvoiceTemplate = ({
       <Row>
         <Column small={4}>
           {showOldInvoiceInfo && <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.DELIVERY_METHOD)}>
+              <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.DELIVERY_METHOD)}>
                 {InvoiceFieldTitles.DELIVERY_METHOD}
               </FormTextTitle>
               <FormText>{invoice && getLabelOfOption(deliveryMethodOptions, invoice.delivery_method) || '-'}</FormText>
+              </>
             </Authorization>}
         </Column>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.TYPE)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.TYPE)}>
               {InvoiceFieldTitles.TYPE}
             </FormTextTitle>
             <FormText>{invoice && getLabelOfOption(typeOptions, invoice.type) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={4}>
           {creditedInvoice && <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.CREDITED_INVOICE)}>
+              <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.CREDITED_INVOICE)}>
                 {InvoiceFieldTitles.CREDITED_INVOICE}
               </FormTextTitle>
               <FormText>{<a className='no-margin' onKeyDown={handleCreditedInvoiceKeyDown} onClick={handleCreditedInvoiceClick} tabIndex={0}>{creditedInvoice.number ? creditedInvoice.number : 'Numeroimaton'}</a>}</FormText>
+              </>
             </Authorization>}
         </Column>
         <Column small={4}>
           {interestInvoiceFor && <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.INTEREST_INVOICE_FOR)}>
+              <>
               <FormTextTitle relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.INTEREST_INVOICE_FOR)}>
                 {InvoiceFieldTitles.INTEREST_INVOICE_FOR}
               </FormTextTitle>
               <FormText>{<a className='no-margin' onKeyDown={handleInterestInvoiceForKeyDown} onClick={handleInterestInvoiceForClick} tabIndex={0}>{interestInvoiceFor.number ? interestInvoiceFor.number : 'Numeroimaton'}</a>}
               </FormText>
+              </>
             </Authorization>}
         </Column>
       </Row>
       <Row>
         <Column small={12}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.NOTES)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.NOTES)}>
               {InvoiceFieldTitles.NOTES}
             </FormTextTitle>
             <FormText>{invoice && invoice.notes || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
diff --git a/src/leases/components/leaseSections/invoice/Invoices.tsx b/src/leases/components/leaseSections/invoice/Invoices.tsx
index 5c443eee8..a61916a20 100644
--- a/src/leases/components/leaseSections/invoice/Invoices.tsx
+++ b/src/leases/components/leaseSections/invoice/Invoices.tsx
@@ -3,48 +3,48 @@ import { connect } from "react-redux";
 import { withRouter } from "react-router";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import Authorization from "components/authorization/Authorization";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import Button from "components/button/Button";
-import Collapse from "components/collapse/Collapse";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import Authorization from "@/components/authorization/Authorization";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import Button from "@/components/button/Button";
+import Collapse from "@/components/collapse/Collapse";
 import CreateAndCreditInvoice from "./CreateAndCreditInvoice";
 import CreateCollectionLetter from "./CreateCollectionLetter";
 import DebtCollection from "./DebtCollection";
-import Divider from "components/content/Divider";
+import Divider from "@/components/content/Divider";
 import InvoiceNotes from "./InvoiceNotes";
-import InvoiceSimulator from "components/invoice-simulator/InvoiceSimulator";
+import InvoiceSimulator from "@/components/invoice-simulator/InvoiceSimulator";
 import InvoiceTableAndPanel from "./InvoiceTableAndPanel";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import SuccessField from "components/form/SuccessField";
-import Title from "components/content/Title";
-import WarningContainer from "components/content/WarningContainer";
-import WarningField from "components/form/WarningField";
-import { fetchCollectionCourtDecisionsByLease } from "collectionCourtDecision/actions";
-import { fetchCollectionLettersByLease } from "collectionLetter/actions";
-import { fetchCollectionNotesByLease } from "collectionNote/actions";
-import { fetchInvoiceSetsByLease } from "invoiceSets/actions";
-import { receiveInvoiceToCredit, receiveIsCreateInvoicePanelOpen, receiveIsCreditInvoicePanelOpen } from "invoices/actions";
-import { receiveCollapseStates, startInvoicing, stopInvoicing } from "leases/actions";
-import { ConfirmationModalTexts, PermissionMissingTexts, ViewModes } from "enums";
-import { ButtonColors } from "components/enums";
-import { LeaseInvoiceNotesFieldPaths, LeaseInvoiceNotesFieldTitles, LeaseInvoicingFieldPaths, LeaseInvoicingFieldTitles, LeaseRentsFieldPaths } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getContentInvoiceNotes } from "leases/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { hasPermissions, isFieldAllowedToRead } from "util/helpers";
-import { getCollectionCourtDecisionsByLease } from "collectionCourtDecision/selectors";
-import { getCollectionLettersByLease } from "collectionLetter/selectors";
-import { getCollectionNotesByLease } from "collectionNote/selectors";
-import { getInvoiceToCredit } from "invoices/selectors";
-import { getInvoiceSetsByLease } from "invoiceSets/selectors";
-import { getAttributes as getLeaseAttributes, getCollapseStateByKey, getCurrentLease } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { withLeaseInvoiceTabAttributes } from "components/attributes/LeaseInvoiceTabAttributes";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import SuccessField from "@/components/form/SuccessField";
+import Title from "@/components/content/Title";
+import WarningContainer from "@/components/content/WarningContainer";
+import WarningField from "@/components/form/WarningField";
+import { fetchCollectionCourtDecisionsByLease } from "@/collectionCourtDecision/actions";
+import { fetchCollectionLettersByLease } from "@/collectionLetter/actions";
+import { fetchCollectionNotesByLease } from "@/collectionNote/actions";
+import { fetchInvoiceSetsByLease } from "@/invoiceSets/actions";
+import { receiveInvoiceToCredit, receiveIsCreateInvoicePanelOpen, receiveIsCreditInvoicePanelOpen } from "@/invoices/actions";
+import { receiveCollapseStates, startInvoicing, stopInvoicing } from "@/leases/actions";
+import { ConfirmationModalTexts, PermissionMissingTexts, ViewModes } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { LeaseInvoiceNotesFieldPaths, LeaseInvoiceNotesFieldTitles, LeaseInvoicingFieldPaths, LeaseInvoicingFieldTitles, LeaseRentsFieldPaths } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getContentInvoiceNotes } from "@/leases/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { hasPermissions, isFieldAllowedToRead } from "@/util/helpers";
+import { getCollectionCourtDecisionsByLease } from "@/collectionCourtDecision/selectors";
+import { getCollectionLettersByLease } from "@/collectionLetter/selectors";
+import { getCollectionNotesByLease } from "@/collectionNote/selectors";
+import { getInvoiceToCredit } from "@/invoices/selectors";
+import { getInvoiceSetsByLease } from "@/invoiceSets/selectors";
+import { getAttributes as getLeaseAttributes, getCollapseStateByKey, getCurrentLease } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { withLeaseInvoiceTabAttributes } from "@/components/attributes/LeaseInvoiceTabAttributes";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { Lease } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   collectionCourtDecisions: Array<Record<string, any>> | null | undefined;
   collectionLetters: Array<Record<string, any>> | null | undefined;
@@ -267,6 +267,7 @@ class Invoices extends PureComponent<Props, State> {
                 </Collapse>
               </Authorization>
               <Authorization allow={hasPermissions(usersPermissions, UsersPermissions.VIEW_COLLECTIONCOURTDECISION) || hasPermissions(usersPermissions, UsersPermissions.VIEW_COLLECTIONLETTER) || hasPermissions(usersPermissions, UsersPermissions.VIEW_COLLECTIONNOTE)}>
+                <>
                 <Title enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseInvoicingFieldPaths.DEBT_COLLECTION)}>
                   {LeaseInvoicingFieldTitles.DEBT_COLLECTION}
                 </Title>
@@ -275,6 +276,7 @@ class Invoices extends PureComponent<Props, State> {
                 <Authorization allow={hasPermissions(usersPermissions, UsersPermissions.ADD_COLLECTIONLETTER)}>
                   <CreateCollectionLetter />
                 </Authorization>
+                </>
               </Authorization>
             </Fragment>;
       }}
diff --git a/src/leases/components/leaseSections/invoice/forms/CollectionLetterInvoiceRow.tsx b/src/leases/components/leaseSections/invoice/forms/CollectionLetterInvoiceRow.tsx
index 3ecd401ea..d06aca579 100644
--- a/src/leases/components/leaseSections/invoice/forms/CollectionLetterInvoiceRow.tsx
+++ b/src/leases/components/leaseSections/invoice/forms/CollectionLetterInvoiceRow.tsx
@@ -4,19 +4,19 @@ import { formValueSelector } from "redux-form";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
-import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import RemoveButton from "components/form/RemoveButton";
-import { fetchPenaltyInterestByInvoice } from "penaltyInterest/actions";
-import { FormNames } from "enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { convertStrToDecimalNumber, formatNumber, hasPermissions } from "util/helpers";
-import { getIsFetchingByInvoice, getPenaltyInterestByInvoice } from "penaltyInterest/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import RemoveButton from "@/components/form/RemoveButton";
+import { fetchPenaltyInterestByInvoice } from "@/penaltyInterest/actions";
+import { FormNames } from "@/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { convertStrToDecimalNumber, formatNumber, hasPermissions } from "@/util/helpers";
+import { getIsFetchingByInvoice, getPenaltyInterestByInvoice } from "@/penaltyInterest/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   field: any;
   collectionCharge: string;
diff --git a/src/leases/components/leaseSections/invoice/forms/CollectionLetterTotalRow.tsx b/src/leases/components/leaseSections/invoice/forms/CollectionLetterTotalRow.tsx
index eb79f059e..2f700e072 100644
--- a/src/leases/components/leaseSections/invoice/forms/CollectionLetterTotalRow.tsx
+++ b/src/leases/components/leaseSections/invoice/forms/CollectionLetterTotalRow.tsx
@@ -3,10 +3,10 @@ import { connect } from "react-redux";
 import { formValueSelector } from "redux-form";
 import { Row, Column } from "react-foundation";
 import isEmpty from "lodash/isEmpty";
-import FormText from "components/form/FormText";
-import { FormNames } from "enums";
-import { convertStrToDecimalNumber, formatNumber } from "util/helpers";
-import { getPenaltyInterestByInvoice } from "penaltyInterest/selectors";
+import FormText from "@/components/form/FormText";
+import { FormNames } from "@/enums";
+import { convertStrToDecimalNumber, formatNumber } from "@/util/helpers";
+import { getPenaltyInterestByInvoice } from "@/penaltyInterest/selectors";
 type OwnProps = {
   selectedInvoices: Array<Record<string, any>>;
   fields: any;
diff --git a/src/leases/components/leaseSections/invoice/forms/CreateCollectionLetterForm.tsx b/src/leases/components/leaseSections/invoice/forms/CreateCollectionLetterForm.tsx
index 9e2a6393b..a594f1cb7 100644
--- a/src/leases/components/leaseSections/invoice/forms/CreateCollectionLetterForm.tsx
+++ b/src/leases/components/leaseSections/invoice/forms/CreateCollectionLetterForm.tsx
@@ -4,28 +4,28 @@ import { FieldArray, formValueSelector, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import createUrl from "api/createUrl";
-import AddButtonThird from "components/form/AddButtonThird";
-import Authorization from "components/authorization/Authorization";
+import createUrl from "@/api/createUrl";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import Authorization from "@/components/authorization/Authorization";
 import CollectionLetterInvoiceRow from "./CollectionLetterInvoiceRow";
 import CollectionLetterTotalRow from "./CollectionLetterTotalRow";
-import Divider from "components/content/Divider";
-import FileDownloadButton from "components/file/FileDownloadButton";
-import FormField from "components/form/FormField";
-import FormTextTitle from "components/form/FormTextTitle";
-import SubTitle from "components/content/SubTitle";
-import { FieldTypes, FormNames } from "enums";
-import { CreateCollectionLetterFieldPaths, CreateCollectionLetterFieldTitles } from "createCollectionLetter/enums";
-import { InvoiceType } from "invoices/enums";
-import { PenaltyInterestFieldPaths, PenaltyInterestFieldTitles } from "penaltyInterest/enums";
-import { getInvoiceTenantOptions } from "leases/helpers";
-import { getUiDataCreateCollectionLetterKey, getUiDataPenaltyInterestKey } from "uiData/helpers";
-import { convertStrToDecimalNumber, formatDate, formatDateRange, getFieldAttributes, isFieldAllowedToEdit, sortStringByKeyDesc } from "util/helpers";
-import { getAttributes as getCreateCollectionLetterAttributes } from "createCollectionLetter/selectors";
-import { getInvoicesByLease } from "invoices/selectors";
-import { getCurrentLease } from "leases/selectors";
+import Divider from "@/components/content/Divider";
+import FileDownloadButton from "@/components/file/FileDownloadButton";
+import FormField from "@/components/form/FormField";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import SubTitle from "@/components/content/SubTitle";
+import { FieldTypes, FormNames } from "@/enums";
+import { CreateCollectionLetterFieldPaths, CreateCollectionLetterFieldTitles } from "@/createCollectionLetter/enums";
+import { InvoiceType } from "@/invoices/enums";
+import { PenaltyInterestFieldPaths, PenaltyInterestFieldTitles } from "@/penaltyInterest/enums";
+import { getInvoiceTenantOptions } from "@/leases/helpers";
+import { getUiDataCreateCollectionLetterKey, getUiDataPenaltyInterestKey } from "@/uiData/helpers";
+import { convertStrToDecimalNumber, formatDate, formatDateRange, getFieldAttributes, isFieldAllowedToEdit, sortStringByKeyDesc } from "@/util/helpers";
+import { getAttributes as getCreateCollectionLetterAttributes } from "@/createCollectionLetter/selectors";
+import { getInvoicesByLease } from "@/invoices/selectors";
+import { getCurrentLease } from "@/leases/selectors";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
+import type { Lease } from "@/leases/types";
 type InvoicesProps = {
   disableDirty?: boolean;
   fields: any;
@@ -180,10 +180,12 @@ class CreateCollectionLetterForm extends PureComponent<Props, State> {
         <Row>
           <Column small={12}>
             <Authorization allow={isFieldAllowedToEdit(createCollectionLetterAttributes, CreateCollectionLetterFieldPaths.INVOICES)}>
+              <>
               <SubTitle enableUiDataEdit uiDataKey={getUiDataCreateCollectionLetterKey(CreateCollectionLetterFieldPaths.INVOICES)}>
                 {CreateCollectionLetterFieldTitles.INVOICES}
               </SubTitle>
               <FieldArray selectedInvoices={selectedInvoices} disableDirty component={renderInvoices} invoiceOptions={invoiceOptions} name='invoice' />
+              </>
             </Authorization>
           </Column>
           <Column small={12} style={{
diff --git a/src/leases/components/leaseSections/invoice/forms/CreditInvoiceForm.tsx b/src/leases/components/leaseSections/invoice/forms/CreditInvoiceForm.tsx
index 2a00d5b29..e4e6b1fb5 100644
--- a/src/leases/components/leaseSections/invoice/forms/CreditInvoiceForm.tsx
+++ b/src/leases/components/leaseSections/invoice/forms/CreditInvoiceForm.tsx
@@ -3,21 +3,21 @@ import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import { formValueSelector, getFormValues, reduxForm } from "redux-form";
 import flowRight from "lodash/flowRight";
-import Authorization from "components/authorization/Authorization";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import Button from "components/button/Button";
-import CloseButton from "components/button/CloseButton";
-import FormField from "components/form/FormField";
-import WhiteBox from "components/content/WhiteBox";
-import { receiveIsCreditClicked } from "invoices/actions";
-import { CreditInvoiceOptions, CreditInvoiceSetOptions } from "leases/constants";
-import { FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import { InvoiceFieldPaths, InvoiceFieldTitles, InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "invoices/enums";
-import { CreditInvoiceOptions as CreditInvoiceOptionsEnum } from "leases/enums";
-import { getUiDataCreditInvoiceKey } from "uiData/helpers";
-import { addEmptyOption, getFieldAttributes, getFieldOptions, getLabelOfOption, isFieldAllowedToEdit, sortStringByKeyAsc } from "util/helpers";
-import { getAttributes as getInvoiceAttributes, getIsCreditClicked } from "invoices/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import Button from "@/components/button/Button";
+import CloseButton from "@/components/button/CloseButton";
+import FormField from "@/components/form/FormField";
+import WhiteBox from "@/components/content/WhiteBox";
+import { receiveIsCreditClicked } from "@/invoices/actions";
+import { CreditInvoiceOptions, CreditInvoiceSetOptions } from "@/leases/constants";
+import { FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { InvoiceFieldPaths, InvoiceFieldTitles, InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "@/invoices/enums";
+import { CreditInvoiceOptions as CreditInvoiceOptionsEnum } from "@/leases/enums";
+import { getUiDataCreditInvoiceKey } from "@/uiData/helpers";
+import { addEmptyOption, getFieldAttributes, getFieldOptions, getLabelOfOption, isFieldAllowedToEdit, sortStringByKeyAsc } from "@/util/helpers";
+import { getAttributes as getInvoiceAttributes, getIsCreditClicked } from "@/invoices/selectors";
 import type { Attributes } from "types";
 type Props = {
   formValues: Record<string, any>;
diff --git a/src/leases/components/leaseSections/invoice/forms/DebtCollectionForm.tsx b/src/leases/components/leaseSections/invoice/forms/DebtCollectionForm.tsx
index cf8edcd0e..28346f6db 100644
--- a/src/leases/components/leaseSections/invoice/forms/DebtCollectionForm.tsx
+++ b/src/leases/components/leaseSections/invoice/forms/DebtCollectionForm.tsx
@@ -4,49 +4,49 @@ import { FieldArray, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import ActionButtonWrapper from "components/form/ActionButtonWrapper";
-import AddButtonThird from "components/form/AddButtonThird";
-import AddFileButton from "components/form/AddFileButton";
-import Authorization from "components/authorization/Authorization";
-import BoxItem from "components/content/BoxItem";
-import BoxItemContainer from "components/content/BoxItemContainer";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import ActionButtonWrapper from "@/components/form/ActionButtonWrapper";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import AddFileButton from "@/components/form/AddFileButton";
+import Authorization from "@/components/authorization/Authorization";
+import BoxItem from "@/components/content/BoxItem";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
 import CollectionCourtDecisionPanel from "../CollectionCourtDecisionPanel";
-import DecisionLink from "components/links/DecisionLink";
+import DecisionLink from "@/components/links/DecisionLink";
 import NewCollectionNote from "./NewCollectionNote";
-import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper";
-import FileDownloadLink from "components/file/FileDownloadLink";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import RemoveButton from "components/form/RemoveButton";
-import ShowMore from "components/showMore/ShowMore";
-import SubTitle from "components/content/SubTitle";
-import { deleteCollectionCourtDecision, hideCollectionCourtDecisionPanel, showCollectionCourtDecisionPanel, uploadCollectionCourtDecision } from "collectionCourtDecision/actions";
-import { deleteCollectionLetter, uploadCollectionLetter } from "collectionLetter/actions";
-import { createCollectionNote, deleteCollectionNote } from "collectionNote/actions";
-import { ConfirmationModalTexts, FormNames } from "enums";
-import { CollectionCourtDecisionFieldPaths, CollectionCourtDecisionFieldTitles } from "collectionCourtDecision/enums";
-import { CollectionLetterFieldPaths, CollectionLetterFieldTitles } from "collectionLetter/enums";
-import { CollectionNoteFieldPaths, CollectionNoteFieldTitles } from "collectionNote/enums";
-import { ButtonColors } from "components/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { LeaseDecisionsFieldPaths, LeaseDecisionsFieldTitles } from "leases/enums";
-import { getUserFullName } from "users/helpers";
-import { getContentDebtCollectionDecisions, getDecisionOptions } from "leases/helpers";
-import { getUiDataCollectionCourtDecisionKey, getUiDataCollectionLetterKey, getUiDataCollectionNoteKey, getUiDataLeaseKey } from "uiData/helpers";
-import { formatDate, hasPermissions, isFieldAllowedToRead, isFieldRequired, sortStringByKeyAsc } from "util/helpers";
-import { getAttributes as getCollectionCourtDecisionAttributes, getCollectionCourtDecisionsByLease, getIsCollectionCourtDecisionPanelOpen } from "collectionCourtDecision/selectors";
-import { getAttributes as getCollectionLetterAttributes, getCollectionLettersByLease } from "collectionLetter/selectors";
-import { getAttributes as getCollectionNoteAttributes } from "collectionNote/selectors";
-import { getCollectionNotesByLease } from "collectionNote/selectors";
-import { getAttributes as getLeaseAttributes, getCurrentLease } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { withWindowResize } from "components/resize/WindowResizeHandler";
+import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper";
+import FileDownloadLink from "@/components/file/FileDownloadLink";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import RemoveButton from "@/components/form/RemoveButton";
+import ShowMore from "@/components/showMore/ShowMore";
+import SubTitle from "@/components/content/SubTitle";
+import { deleteCollectionCourtDecision, hideCollectionCourtDecisionPanel, showCollectionCourtDecisionPanel, uploadCollectionCourtDecision } from "@/collectionCourtDecision/actions";
+import { deleteCollectionLetter, uploadCollectionLetter } from "@/collectionLetter/actions";
+import { createCollectionNote, deleteCollectionNote } from "@/collectionNote/actions";
+import { ConfirmationModalTexts, FormNames } from "@/enums";
+import { CollectionCourtDecisionFieldPaths, CollectionCourtDecisionFieldTitles } from "@/collectionCourtDecision/enums";
+import { CollectionLetterFieldPaths, CollectionLetterFieldTitles } from "@/collectionLetter/enums";
+import { CollectionNoteFieldPaths, CollectionNoteFieldTitles } from "@/collectionNote/enums";
+import { ButtonColors } from "@/components/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { LeaseDecisionsFieldPaths, LeaseDecisionsFieldTitles } from "@/leases/enums";
+import { getUserFullName } from "@/users/helpers";
+import { getContentDebtCollectionDecisions, getDecisionOptions } from "@/leases/helpers";
+import { getUiDataCollectionCourtDecisionKey, getUiDataCollectionLetterKey, getUiDataCollectionNoteKey, getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatDate, hasPermissions, isFieldAllowedToRead, isFieldRequired, sortStringByKeyAsc } from "@/util/helpers";
+import { getAttributes as getCollectionCourtDecisionAttributes, getCollectionCourtDecisionsByLease, getIsCollectionCourtDecisionPanelOpen } from "@/collectionCourtDecision/selectors";
+import { getAttributes as getCollectionLetterAttributes, getCollectionLettersByLease } from "@/collectionLetter/selectors";
+import { getAttributes as getCollectionNoteAttributes } from "@/collectionNote/selectors";
+import { getCollectionNotesByLease } from "@/collectionNote/selectors";
+import { getAttributes as getLeaseAttributes, getCurrentLease } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { withWindowResize } from "@/components/resize/WindowResizeHandler";
 import type { Attributes } from "types";
-import type { CollectionCourtDecisionId } from "collectionCourtDecision/types";
-import type { CollectionLetterId } from "collectionLetter/types";
-import type { Lease } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { CollectionCourtDecisionId } from "@/collectionCourtDecision/types";
+import type { CollectionLetterId } from "@/collectionLetter/types";
+import type { Lease } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type NotesProps = {
   fields: any;
   onCreate: (...args: Array<any>) => any;
@@ -476,18 +476,22 @@ class DebtCollectionForm extends PureComponent<Props, State> {
                               <Row>
                                 <Column small={6}>
                                   <Authorization allow={isFieldAllowedToRead(collectionCourtDecisionAttributes, CollectionCourtDecisionFieldPaths.FILE)}>
+                                    <>
                                     <FormTextTitle enableUiDataEdit uiDataKey={getUiDataCollectionCourtDecisionKey(CollectionCourtDecisionFieldPaths.FILE)}>
                                       {CollectionCourtDecisionFieldTitles.FILE}
                                     </FormTextTitle>
                                     <FileDownloadLink fileUrl={collectionCourtDecision.file} label={collectionCourtDecision.filename} />
+                                    </>
                                   </Authorization>
                                 </Column>
                                 <Column small={3}>
                                   <Authorization allow={isFieldAllowedToRead(collectionCourtDecisionAttributes, CollectionCourtDecisionFieldPaths.UPLOADED_AT)}>
+                                    <>
                                     <FormTextTitle enableUiDataEdit uiDataKey={getUiDataCollectionCourtDecisionKey(CollectionCourtDecisionFieldPaths.UPLOADED_AT)}>
                                       {CollectionCourtDecisionFieldTitles.UPLOADED_AT}
                                     </FormTextTitle>
                                     <FormText>{formatDate(collectionCourtDecision.uploaded_at) || '-'}</FormText>
+                                    </>
                                   </Authorization>
                                 </Column>
                                 <Column small={3}>
diff --git a/src/leases/components/leaseSections/invoice/forms/EditInvoiceForm.tsx b/src/leases/components/leaseSections/invoice/forms/EditInvoiceForm.tsx
index 46c87c9d3..146f98d73 100644
--- a/src/leases/components/leaseSections/invoice/forms/EditInvoiceForm.tsx
+++ b/src/leases/components/leaseSections/invoice/forms/EditInvoiceForm.tsx
@@ -3,35 +3,35 @@ import { Row, Column } from "react-foundation";
 import { connect } from "react-redux";
 import { FieldArray, formValueSelector, reduxForm } from "redux-form";
 import flowRight from "lodash/flowRight";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButtonThird from "components/form/AddButtonThird";
-import AmountWithVat from "components/vat/AmountWithVat";
-import Authorization from "components/authorization/Authorization";
-import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import AmountWithVat from "@/components/vat/AmountWithVat";
+import Authorization from "@/components/authorization/Authorization";
+import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
 import InvoiceRowsEdit from "./InvoiceRowsEdit";
-import RemoveButton from "components/form/RemoveButton";
-import SendupButton from "components/button/SendupButton";
-import SubTitle from "components/content/SubTitle";
-import { exportInvoiceToLaskeAndUpdateList } from "invoices/actions";
-import { ConfirmationModalTexts, FieldTypes, FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import { InvoiceCreditInvoicesFieldPaths, InvoiceCreditInvoicesFieldTitles, InvoiceFieldPaths, InvoiceFieldTitles, InvoiceInterestInvoicesFieldPaths, InvoiceInterestInvoicesFieldTitles, InvoicePaymentsFieldPaths, InvoicePaymentsFieldTitles, InvoiceRowsFieldPaths, InvoiceType } from "invoices/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { validateInvoiceForm } from "leases/formValidators";
-import { getContactFullName } from "contacts/helpers";
-import { isInvoiceBillingPeriodRequired } from "invoices/helpers";
-import { getInvoiceTenantOptions } from "leases/helpers";
-import { getUiDataInvoiceKey } from "uiData/helpers";
-import { formatDate, formatNumber, getFieldAttributes, getFieldOptions, getLabelOfOption, hasPermissions, isEmptyValue, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "util/helpers";
-import { getAttributes as getInvoiceAttributes, getIsEditClicked } from "invoices/selectors";
-import { getCurrentLease } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import RemoveButton from "@/components/form/RemoveButton";
+import SendupButton from "@/components/button/SendupButton";
+import SubTitle from "@/components/content/SubTitle";
+import { exportInvoiceToLaskeAndUpdateList } from "@/invoices/actions";
+import { ConfirmationModalTexts, FieldTypes, FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { InvoiceCreditInvoicesFieldPaths, InvoiceCreditInvoicesFieldTitles, InvoiceFieldPaths, InvoiceFieldTitles, InvoiceInterestInvoicesFieldPaths, InvoiceInterestInvoicesFieldTitles, InvoicePaymentsFieldPaths, InvoicePaymentsFieldTitles, InvoiceRowsFieldPaths, InvoiceType } from "@/invoices/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { validateInvoiceForm } from "@/leases/formValidators";
+import { getContactFullName } from "@/contacts/helpers";
+import { isInvoiceBillingPeriodRequired } from "@/invoices/helpers";
+import { getInvoiceTenantOptions } from "@/leases/helpers";
+import { getUiDataInvoiceKey } from "@/uiData/helpers";
+import { formatDate, formatNumber, getFieldAttributes, getFieldOptions, getLabelOfOption, hasPermissions, isEmptyValue, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "@/util/helpers";
+import { getAttributes as getInvoiceAttributes, getIsEditClicked } from "@/invoices/selectors";
+import { getCurrentLease } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { Lease } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type PaymentsProps = {
   attributes: Attributes;
   fields: any;
@@ -194,28 +194,34 @@ const EditInvoiceForm = ({
       <Row>
         <Column small={8}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.RECIPIENT)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.RECIPIENT)}>
               {InvoiceFieldTitles.RECIPIENT}
             </FormTextTitle>
             <FormText>{invoice ? getContactFullName(invoice.recipientFull) : '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.NUMBER)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.NUMBER)}>
               {InvoiceFieldTitles.NUMBER}
             </FormTextTitle>
             <FormText>{invoice && invoice.number || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.SENT_TO_SAP_AT)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.SENT_TO_SAP_AT)}>
               {InvoiceFieldTitles.SENT_TO_SAP_AT}
             </FormTextTitle>
             <FormText>{invoice && formatDate(invoice.sent_to_sap_at) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={4}>
@@ -232,36 +238,44 @@ const EditInvoiceForm = ({
           }} enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.DUE_DATE)} />
             </Authorization>}
           {invoice && invoice.type === InvoiceType.CREDIT_NOTE && <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.DUE_DATE)}>
+              <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.DUE_DATE)}>
                 {InvoiceFieldTitles.DUE_DATE}
               </FormTextTitle>
               <FormText>{invoice && formatDate(invoice.due_date) || '-'}</FormText>
+              </>
             </Authorization>}
         </Column>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.ADJUSTED_DUE_DATE)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.ADJUSTED_DUE_DATE)}>
               {InvoiceFieldTitles.ADJUSTED_DUE_DATE}
             </FormTextTitle>
             <FormText>{invoice && formatDate(invoice.adjusted_due_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.INVOICING_DATE)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.INVOICING_DATE)}>
               {InvoiceFieldTitles.INVOICING_DATE}
             </FormTextTitle>
             <FormText>{invoice && formatDate(invoice.invoicing_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.STATE)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.STATE)}>
               {InvoiceFieldTitles.STATE}
             </FormTextTitle>
             <FormText>{invoice && getLabelOfOption(stateOptions, invoice.state) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={4}>
@@ -302,20 +316,24 @@ const EditInvoiceForm = ({
           }} />
             </Authorization>}
           {invoice && invoice.type === InvoiceType.CREDIT_NOTE && <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.POSTPONE_DATE)}>
+              <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.POSTPONE_DATE)}>
                 {InvoiceFieldTitles.POSTPONE_DATE}
               </FormTextTitle>
               <FormText>{invoice && formatDate(invoice.postpone_date) || '-'}</FormText>
+              </>
             </Authorization>}
         </Column>
       </Row>
       <Row>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.TOTAL_AMOUNT)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.TOTAL_AMOUNT)}>
               {InvoiceFieldTitles.TOTAL_AMOUNT}
             </FormTextTitle>
             <FormText>{invoice && !isEmptyValue(invoice.total_amount) ? <AmountWithVat amount={invoice.total_amount} date={invoice.due_date} /> : '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={4}>
@@ -326,11 +344,13 @@ const EditInvoiceForm = ({
         </Column>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.BILLED_AMOUNT)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.BILLED_AMOUNT)}>
               {InvoiceFieldTitles.BILLED_AMOUNT}
             </FormTextTitle>
             <FormText>{invoice && !isEmptyValue(invoice.billed_amount) ? <AmountWithVat amount={invoice.billed_amount} date={invoice.due_date} /> : '-'}
             </FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
@@ -348,11 +368,13 @@ const EditInvoiceForm = ({
             </Column>
             <Column small={6} medium={4}>
               <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.OUTSTANDING_AMOUNT)}>
+                <>
                 <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.OUTSTANDING_AMOUNT)}>
                   {InvoiceFieldTitles.OUTSTANDING_AMOUNT}
                 </FormTextTitle>
                 <FormText>{invoice && !isEmptyValue(invoice.outstanding_amount) ? <AmountWithVat amount={invoice.outstanding_amount} date={invoice.due_date} /> : '-'}
                 </FormText>
+                </>
               </Authorization>
             </Column>
           </Row>
@@ -361,63 +383,77 @@ const EditInvoiceForm = ({
       {showOldInvoiceInfo && <Row>
           <Column small={4}>
             <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.PAYMENT_NOTIFICATION_DATE)}>
+              <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.PAYMENT_NOTIFICATION_DATE)}>
                 {InvoiceFieldTitles.PAYMENT_NOTIFICATION_DATE}
               </FormTextTitle>
               <FormText>{invoice && formatDate(invoice.payment_notification_date) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={4}>
             <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.COLLECTION_CHARGE)}>
+              <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.COLLECTION_CHARGE)}>
                 {InvoiceFieldTitles.COLLECTION_CHARGE}
               </FormTextTitle>
               <FormText>{invoice && !isEmptyValue(invoice.collection_charge) ? `${formatNumber(invoice.collection_charge)} €` : '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={4}>
             <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.PAYMENT_NOTIFICATION_CATALOG_DATE)}>
+              <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.PAYMENT_NOTIFICATION_CATALOG_DATE)}>
                 {InvoiceFieldTitles.PAYMENT_NOTIFICATION_CATALOG_DATE}
               </FormTextTitle>
               <FormText>{invoice && formatDate(invoice.payment_notification_catalog_date) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
         </Row>}
       <Row>
         <Column small={4}>
           {showOldInvoiceInfo && <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.DELIVERY_METHOD)}>
+              <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.DELIVERY_METHOD)}>
                 {InvoiceFieldTitles.DELIVERY_METHOD}
               </FormTextTitle>
               <FormText>{invoice && getLabelOfOption(deliveryMethodOptions, invoice.delivery_method) || '-'}</FormText>
+              </>
             </Authorization>}
         </Column>
         <Column small={4}>
           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.TYPE)}>
+            <>
             <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.TYPE)}>
               {InvoiceFieldTitles.TYPE}
             </FormTextTitle>
             <FormText>{invoice && getLabelOfOption(typeOptions, invoice.type) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
 
         <Column small={4}>
           {creditedInvoice && <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.CREDITED_INVOICE)}>
+              <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.CREDITED_INVOICE)}>
                 {InvoiceFieldTitles.CREDITED_INVOICE}
               </FormTextTitle>
               <FormText>{<a className='no-margin' onKeyDown={handleCreditedInvoiceKeyDown} onClick={handleCreditedInvoiceClick} tabIndex={0}>{creditedInvoice && creditedInvoice.number ? creditedInvoice.number : 'Numeroimaton'}</a>}
               </FormText>
+              </>
             </Authorization>}
         </Column>
         <Column small={4}>
           {interestInvoiceFor && <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.INTEREST_INVOICE_FOR)}>
+              <>
               <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceFieldPaths.INTEREST_INVOICE_FOR)}>
                 {InvoiceFieldTitles.INTEREST_INVOICE_FOR}
               </FormTextTitle>
               <FormText>{<a className='no-margin' onKeyDown={handleInterestInvoiceForKeyDown} onClick={handleInterestInvoiceForClick} tabIndex={0}>{interestInvoiceFor.number ? interestInvoiceFor.number : 'Numeroimaton'}</a>}
               </FormText>
+              </>
             </Authorization>}
         </Column>
       </Row>
diff --git a/src/leases/components/leaseSections/invoice/forms/InvoiceRows.tsx b/src/leases/components/leaseSections/invoice/forms/InvoiceRows.tsx
index e1848d230..257942b49 100644
--- a/src/leases/components/leaseSections/invoice/forms/InvoiceRows.tsx
+++ b/src/leases/components/leaseSections/invoice/forms/InvoiceRows.tsx
@@ -1,18 +1,18 @@
 import React from "react";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
-import AmountWithVat from "components/vat/AmountWithVat";
-import Authorization from "components/authorization/Authorization";
-import BoxItem from "components/content/BoxItem";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import SubTitle from "components/content/SubTitle";
-import { InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "invoices/enums";
-import { getContactFullName } from "contacts/helpers";
-import { getContentTenant } from "leases/helpers";
-import { getUiDataInvoiceKey } from "uiData/helpers";
-import { formatDate, getLabelOfOption, isFieldAllowedToRead } from "util/helpers";
+import AmountWithVat from "@/components/vat/AmountWithVat";
+import Authorization from "@/components/authorization/Authorization";
+import BoxItem from "@/components/content/BoxItem";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import SubTitle from "@/components/content/SubTitle";
+import { InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "@/invoices/enums";
+import { getContactFullName } from "@/contacts/helpers";
+import { getContentTenant } from "@/leases/helpers";
+import { getUiDataInvoiceKey } from "@/uiData/helpers";
+import { formatDate, getLabelOfOption, isFieldAllowedToRead } from "@/util/helpers";
 import type { Attributes } from "types";
 type Props = {
   invoiceAttributes: Attributes;
@@ -43,51 +43,63 @@ const InvoiceRows = ({
                   <Row>
                     <Column small={4}>
                       <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceRowsFieldPaths.TENANT)}>
+                        <>
                         <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceRowsFieldPaths.TENANT)}>
                           {InvoiceRowsFieldTitles.TENANT}
                         </FormTextTitle>
                         <FormText>{getContactFullName(contact) || '-'}</FormText>
+                        </>
                       </Authorization>
                     </Column>
                     <Column small={4}>
                       <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceRowsFieldPaths.RECEIVABLE_TYPE)}>
+                        <>
                         <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceRowsFieldPaths.RECEIVABLE_TYPE)}>
                           {InvoiceRowsFieldTitles.RECEIVABLE_TYPE}
                         </FormTextTitle>
                         <FormText>{getLabelOfOption(receivableTypeOptions, row.receivable_type) || '-'}</FormText>
+                        </>
                       </Authorization>
                     </Column>
                     <Column small={4}>
                       <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceRowsFieldPaths.AMOUNT)}>
+                        <>
                         <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceRowsFieldPaths.AMOUNT)}>
                           {InvoiceRowsFieldTitles.AMOUNT}
                         </FormTextTitle>
                         <FormText>{row.amount ? <AmountWithVat amount={row.amount} date={invoiceDate} /> : '-'}
                         </FormText>
+                        </>
                       </Authorization>
                     </Column>
                     <Column small={4}>
                       <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceRowsFieldPaths.BILLING_PERIOD_START_DATE)}>
+                        <>
                         <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceRowsFieldPaths.BILLING_PERIOD_START_DATE)}>
                           {InvoiceRowsFieldTitles.BILLING_PERIOD_START_DATE}
                         </FormTextTitle>
                         <FormText>{formatDate(row.billing_period_start_date) || '-'}</FormText>
+                        </>
                       </Authorization>
                     </Column>
                     <Column small={4}>
                       <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceRowsFieldPaths.BILLING_PERIOD_END_DATE)}>
+                        <>
                         <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceRowsFieldPaths.BILLING_PERIOD_END_DATE)}>
                           {InvoiceRowsFieldTitles.BILLING_PERIOD_END_DATE}
                         </FormTextTitle>
                         <FormText>{formatDate(row.billing_period_end_date) || '-'}</FormText>
+                        </>
                       </Authorization>
                     </Column>
                     <Column small={4}>
                       <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceRowsFieldPaths.DESCRIPTION)}>
+                        <>
                         <FormTextTitle enableUiDataEdit relativeTo={relativeTo} uiDataKey={getUiDataInvoiceKey(InvoiceRowsFieldPaths.DESCRIPTION)}>
                           {InvoiceRowsFieldTitles.DESCRIPTION}
                         </FormTextTitle>
                         <FormText>{row.description || '-'}</FormText>
+                        </>
                       </Authorization>
                     </Column>
                   </Row>
diff --git a/src/leases/components/leaseSections/invoice/forms/InvoiceRowsEdit.tsx b/src/leases/components/leaseSections/invoice/forms/InvoiceRowsEdit.tsx
index ab46b4662..689a7f800 100644
--- a/src/leases/components/leaseSections/invoice/forms/InvoiceRowsEdit.tsx
+++ b/src/leases/components/leaseSections/invoice/forms/InvoiceRowsEdit.tsx
@@ -2,25 +2,25 @@ import React, { Fragment, ReactElement } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import { formValueSelector } from "redux-form";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import ActionButtonWrapper from "components/form/ActionButtonWrapper";
-import AddButtonThird from "components/form/AddButtonThird";
-import Authorization from "components/authorization/Authorization";
-import BoxItem from "components/content/BoxItem";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import FormField from "components/form/FormField";
-import RemoveButton from "components/form/RemoveButton";
-import SubTitle from "components/content/SubTitle";
-import { ConfirmationModalTexts, FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import { InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "invoices/enums";
-import { getUiDataInvoiceKey } from "uiData/helpers";
-import { getFieldAttributes, isFieldAllowedToEdit, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes as getInvoiceAttributes } from "invoices/selectors";
-import { getReceivableTypes } from "leaseCreateCharge/selectors";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import ActionButtonWrapper from "@/components/form/ActionButtonWrapper";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import Authorization from "@/components/authorization/Authorization";
+import BoxItem from "@/components/content/BoxItem";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import FormField from "@/components/form/FormField";
+import RemoveButton from "@/components/form/RemoveButton";
+import SubTitle from "@/components/content/SubTitle";
+import { ConfirmationModalTexts, FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "@/invoices/enums";
+import { getUiDataInvoiceKey } from "@/uiData/helpers";
+import { getFieldAttributes, isFieldAllowedToEdit, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes as getInvoiceAttributes } from "@/invoices/selectors";
+import { getReceivableTypes } from "@/leaseCreateCharge/selectors";
 import type { Attributes } from "types";
-import { receivableTypesFromAttributes, receivableTypeFromRows } from "leaseCreateCharge/helpers";
-import Loader from "components/loader/Loader";
+import { receivableTypesFromAttributes, receivableTypeFromRows } from "@/leaseCreateCharge/helpers";
+import Loader from "@/components/loader/Loader";
 type Props = {
   fields: any;
   invoiceAttributes: Attributes;
diff --git a/src/leases/components/leaseSections/invoice/forms/NewCollectionNote.tsx b/src/leases/components/leaseSections/invoice/forms/NewCollectionNote.tsx
index 20465dee8..4e920f86f 100644
--- a/src/leases/components/leaseSections/invoice/forms/NewCollectionNote.tsx
+++ b/src/leases/components/leaseSections/invoice/forms/NewCollectionNote.tsx
@@ -2,14 +2,14 @@ import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { formValueSelector } from "redux-form";
 import { Row, Column } from "react-foundation";
-import Authorization from "components/authorization/Authorization";
-import Button from "components/button/Button";
-import FormField from "components/form/FormField";
-import { FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import { CollectionNoteFieldPaths, CollectionNoteFieldTitles } from "collectionNote/enums";
-import { getFieldAttributes, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes as getCollectionNoteAttributes } from "collectionNote/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import Button from "@/components/button/Button";
+import FormField from "@/components/form/FormField";
+import { FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { CollectionNoteFieldPaths, CollectionNoteFieldTitles } from "@/collectionNote/enums";
+import { getFieldAttributes, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes as getCollectionNoteAttributes } from "@/collectionNote/selectors";
 import type { Attributes } from "types";
 type Props = {
   collectionNoteAttributes: Attributes;
diff --git a/src/leases/components/leaseSections/invoice/forms/NewInvoiceForm.tsx b/src/leases/components/leaseSections/invoice/forms/NewInvoiceForm.tsx
index 8c9bdc4fb..780babded 100644
--- a/src/leases/components/leaseSections/invoice/forms/NewInvoiceForm.tsx
+++ b/src/leases/components/leaseSections/invoice/forms/NewInvoiceForm.tsx
@@ -3,38 +3,38 @@ import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import { FieldArray, formValueSelector, getFormValues, reduxForm } from "redux-form";
 import flowRight from "lodash/flowRight";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButtonThird from "components/form/AddButtonThird";
-import Authorization from "components/authorization/Authorization";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import Button from "components/button/Button";
-import CloseButton from "components/button/CloseButton";
-import FormField from "components/form/FormField";
-import FormTextTitle from "components/form/FormTextTitle";
-import RemoveButton from "components/form/RemoveButton";
-import SubTitle from "components/content/SubTitle";
-import WhiteBox from "components/content/WhiteBox";
-import { receiveIsCreateClicked } from "invoices/actions";
-import { ConfirmationModalTexts, FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import { InvoiceFieldPaths, InvoiceFieldTitles, InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "invoices/enums";
-import { LeaseCreateChargeFieldPaths, LeaseCreateChargeRowsFieldPaths } from "leaseCreateCharge/enums";
-import { RecipientOptions } from "leases/enums";
-import { receivableTypesFromAttributes } from "leaseCreateCharge/helpers";
-import { UsersPermissions } from "usersPermissions/enums";
-import { validateInvoiceForm } from "leases/formValidators";
-import { isInvoiceBillingPeriodRequired } from "invoices/helpers";
-import { getInvoiceRecipientOptions } from "leases/helpers";
-import { getUiDataCreateChargeKey } from "uiData/helpers";
-import { getFieldAttributes, hasPermissions, isFieldAllowedToEdit, isFieldRequired } from "util/helpers";
-import { getAttributes as getInvoiceAttributes, getIsCreateClicked } from "invoices/selectors";
-import { getCurrentLease } from "leases/selectors";
-import { getAttributes as getLeaseCreateCrargeAttributes, getReceivableTypes } from "leaseCreateCharge/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import Authorization from "@/components/authorization/Authorization";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import Button from "@/components/button/Button";
+import CloseButton from "@/components/button/CloseButton";
+import FormField from "@/components/form/FormField";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import RemoveButton from "@/components/form/RemoveButton";
+import SubTitle from "@/components/content/SubTitle";
+import WhiteBox from "@/components/content/WhiteBox";
+import { receiveIsCreateClicked } from "@/invoices/actions";
+import { ConfirmationModalTexts, FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { InvoiceFieldPaths, InvoiceFieldTitles, InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "@/invoices/enums";
+import { LeaseCreateChargeFieldPaths, LeaseCreateChargeRowsFieldPaths } from "@/leaseCreateCharge/enums";
+import { RecipientOptions } from "@/leases/enums";
+import { receivableTypesFromAttributes } from "@/leaseCreateCharge/helpers";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { validateInvoiceForm } from "@/leases/formValidators";
+import { isInvoiceBillingPeriodRequired } from "@/invoices/helpers";
+import { getInvoiceRecipientOptions } from "@/leases/helpers";
+import { getUiDataCreateChargeKey } from "@/uiData/helpers";
+import { getFieldAttributes, hasPermissions, isFieldAllowedToEdit, isFieldRequired } from "@/util/helpers";
+import { getAttributes as getInvoiceAttributes, getIsCreateClicked } from "@/invoices/selectors";
+import { getCurrentLease } from "@/leases/selectors";
+import { getAttributes as getLeaseCreateCrargeAttributes, getReceivableTypes } from "@/leaseCreateCharge/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
-import Loader from "components/loader/Loader";
+import type { Lease } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
+import Loader from "@/components/loader/Loader";
 type InvoiceRowsProps = {
   fields: any;
   invoiceAttributes: Attributes;
@@ -204,22 +204,26 @@ const NewInvoiceForm = ({
             </Column>
             <Column small={6} medium={4} large={2}>
               <Authorization allow={useLeaseCreateChargeEndpoint ? isFieldAllowedToEdit(leaseCreateChargeAttributes, LeaseCreateChargeFieldPaths.BILLING_PERIOD_START_DATE) : isFieldAllowedToEdit(invoiceAttributes, InvoiceFieldPaths.BILLING_PERIOD_START_DATE)}>
+                <>
                 <FormTextTitle required={billingPeriodRequired} enableUiDataEdit uiDataKey={getUiDataCreateChargeKey(LeaseCreateChargeFieldPaths.BILLING_PERIOD_START_DATE)}>
                   {InvoiceFieldTitles.BILLING_PERIOD_START_DATE}
                 </FormTextTitle>
                 <FormField disableTouched={isCreateClicked} fieldAttributes={useLeaseCreateChargeEndpoint ? getFieldAttributes(leaseCreateChargeAttributes, LeaseCreateChargeFieldPaths.BILLING_PERIOD_START_DATE) : getFieldAttributes(invoiceAttributes, InvoiceFieldPaths.BILLING_PERIOD_START_DATE)} name='billing_period_start_date' invisibleLabel overrideValues={{
                 label: InvoiceFieldTitles.BILLING_PERIOD_START_DATE
               }} />
+                </>
               </Authorization>
             </Column>
             <Column small={6} medium={4} large={2}>
               <Authorization allow={useLeaseCreateChargeEndpoint ? isFieldAllowedToEdit(leaseCreateChargeAttributes, LeaseCreateChargeFieldPaths.BILLING_PERIOD_END_DATE) : isFieldAllowedToEdit(invoiceAttributes, InvoiceFieldPaths.BILLING_PERIOD_END_DATE)}>
+                <>
                 <FormTextTitle required={billingPeriodRequired} enableUiDataEdit uiDataKey={getUiDataCreateChargeKey(LeaseCreateChargeFieldPaths.BILLING_PERIOD_END_DATE)}>
                   {InvoiceFieldTitles.BILLING_PERIOD_END_DATE}
                 </FormTextTitle>
                 <FormField disableTouched={isCreateClicked} fieldAttributes={useLeaseCreateChargeEndpoint ? getFieldAttributes(leaseCreateChargeAttributes, LeaseCreateChargeFieldPaths.BILLING_PERIOD_END_DATE) : getFieldAttributes(invoiceAttributes, InvoiceFieldPaths.BILLING_PERIOD_END_DATE)} name='billing_period_end_date' invisibleLabel overrideValues={{
                 label: InvoiceFieldTitles.BILLING_PERIOD_END_DATE
               }} />
+                </>
               </Authorization>
             </Column>
           </Row>
diff --git a/src/leases/components/leaseSections/leaseArea/ArchiveAreaModal.tsx b/src/leases/components/leaseSections/leaseArea/ArchiveAreaModal.tsx
index c1dc97952..989765b37 100644
--- a/src/leases/components/leaseSections/leaseArea/ArchiveAreaModal.tsx
+++ b/src/leases/components/leaseSections/leaseArea/ArchiveAreaModal.tsx
@@ -3,17 +3,17 @@ import { connect } from "react-redux";
 import { formValueSelector, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import Authorization from "components/authorization/Authorization";
-import Button from "components/button/Button";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import Modal from "components/modal/Modal";
-import { ConfirmationModalTexts, FormNames } from "enums";
-import { LeaseAreasFieldPaths, LeaseAreasFieldTitles } from "leases/enums";
-import { ButtonColors } from "components/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getFieldAttributes, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes } from "leases/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import Button from "@/components/button/Button";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import Modal from "@/components/modal/Modal";
+import { ConfirmationModalTexts, FormNames } from "@/enums";
+import { LeaseAreasFieldPaths, LeaseAreasFieldTitles } from "@/leases/enums";
+import { ButtonColors } from "@/components/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getFieldAttributes, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes } from "@/leases/selectors";
 import type { Attributes } from "types";
 type Props = {
   archivedNote: string;
diff --git a/src/leases/components/leaseSections/leaseArea/CustomDetailedPlan.tsx b/src/leases/components/leaseSections/leaseArea/CustomDetailedPlan.tsx
index cbd77e758..f3adc037e 100644
--- a/src/leases/components/leaseSections/leaseArea/CustomDetailedPlan.tsx
+++ b/src/leases/components/leaseSections/leaseArea/CustomDetailedPlan.tsx
@@ -3,17 +3,17 @@ import { connect } from "react-redux";
 import { withRouter } from "react-router";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import Authorization from "components/authorization/Authorization";
-import BoxItem from "components/content/BoxItem";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import ExternalLink from "components/links/ExternalLink";
-import { LeaseAreaCustomDetailedPlanFieldPaths, LeaseAreaCustomDetailedPlanFieldTitles, LeaseAreaUsageDistributionFieldTitles, LeaseAreaUsageDistributionFieldPaths, LeaseAreaCustomDetailedPlanInfoLinksFieldPaths, LeaseAreaCustomDetailedPlanInfoLinksFieldTitles } from "leases/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes } from "leases/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import BoxItem from "@/components/content/BoxItem";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import ExternalLink from "@/components/links/ExternalLink";
+import { LeaseAreaCustomDetailedPlanFieldPaths, LeaseAreaCustomDetailedPlanFieldTitles, LeaseAreaUsageDistributionFieldTitles, LeaseAreaUsageDistributionFieldPaths, LeaseAreaCustomDetailedPlanInfoLinksFieldPaths, LeaseAreaCustomDetailedPlanInfoLinksFieldTitles } from "@/leases/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes } from "@/leases/selectors";
 import type { Attributes } from "types";
-import SubTitle from "components/content/SubTitle";
+import SubTitle from "@/components/content/SubTitle";
 type OwnProps = {
   customDetailedPlan: Record<string, any>;
 };
@@ -33,98 +33,120 @@ const CustomDetailedPlan = ({
       <Row>
         <Column small={12} medium={4} large={4}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreaCustomDetailedPlanFieldPaths.IDENTIFIER)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreaCustomDetailedPlanFieldPaths.IDENTIFIER)}>
               {LeaseAreaCustomDetailedPlanFieldTitles.IDENTIFIER}
             </FormTextTitle>
             <FormText>{customDetailedPlan.identifier || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={12} medium={4} large={4}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreaCustomDetailedPlanFieldPaths.INTENDED_USE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreaCustomDetailedPlanFieldPaths.INTENDED_USE)}>
               {LeaseAreaCustomDetailedPlanFieldTitles.INTENDED_USE}
             </FormTextTitle>
             <FormText>{getLabelOfOption(intendedUseOptions, customDetailedPlan.intended_use) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={12} medium={4} large={4}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreaCustomDetailedPlanFieldPaths.ADDRESS)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreaCustomDetailedPlanFieldPaths.ADDRESS)}>
               {LeaseAreaCustomDetailedPlanFieldTitles.ADDRESS}
             </FormTextTitle>
             <FormText>{customDetailedPlan.address || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         <Column small={12} medium={4} large={4}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreaCustomDetailedPlanFieldPaths.AREA)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreaCustomDetailedPlanFieldPaths.AREA)}>
               {LeaseAreaCustomDetailedPlanFieldTitles.AREA}
             </FormTextTitle>
             <FormText>{!isEmptyValue(customDetailedPlan.area) ? `${formatNumber(customDetailedPlan.area)} m²` : '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={12} medium={4} large={4}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreaCustomDetailedPlanFieldPaths.STATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreaCustomDetailedPlanFieldPaths.STATE)}>
               {LeaseAreaCustomDetailedPlanFieldTitles.STATE}
             </FormTextTitle>
             <FormText>{getLabelOfOption(stateOptions, customDetailedPlan.state) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={12} medium={4} large={4}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreaCustomDetailedPlanFieldPaths.TYPE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreaCustomDetailedPlanFieldPaths.TYPE)}>
               {LeaseAreaCustomDetailedPlanFieldTitles.TYPE}
             </FormTextTitle>
             <FormText>{getLabelOfOption(typeOptions, customDetailedPlan.type) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         <Column small={12} medium={4} large={4}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreaCustomDetailedPlanFieldPaths.DETAILED_PLAN)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreaCustomDetailedPlanFieldPaths.DETAILED_PLAN)}>
               {LeaseAreaCustomDetailedPlanFieldTitles.DETAILED_PLAN}
             </FormTextTitle>
             <FormText>{customDetailedPlan.detailed_plan || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={12} medium={4} large={4}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreaCustomDetailedPlanFieldPaths.DETAILED_PLAN_LATEST_PROCESSING_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreaCustomDetailedPlanFieldPaths.DETAILED_PLAN_LATEST_PROCESSING_DATE)}>
               {LeaseAreaCustomDetailedPlanFieldTitles.DETAILED_PLAN_LATEST_PROCESSING_DATE}
             </FormTextTitle>
             <FormText>{formatDate(customDetailedPlan.detailed_plan_latest_processing_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={12} medium={4} large={4}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreaCustomDetailedPlanFieldPaths.DETAILED_PLAN_LATEST_PROCESSING_DATE_NOTE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreaCustomDetailedPlanFieldPaths.DETAILED_PLAN_LATEST_PROCESSING_DATE_NOTE)}>
               {LeaseAreaCustomDetailedPlanFieldTitles.DETAILED_PLAN_LATEST_PROCESSING_DATE_NOTE}
             </FormTextTitle>
             <FormText>{customDetailedPlan.detailed_plan_latest_processing_date_note || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         <Column small={12} medium={4} large={4}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreaCustomDetailedPlanFieldPaths.RENT_BUILD_PERMISSION)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreaCustomDetailedPlanFieldPaths.RENT_BUILD_PERMISSION)}>
               {LeaseAreaCustomDetailedPlanFieldTitles.RENT_BUILD_PERMISSION}
             </FormTextTitle>
             <FormText>
               {!isEmptyValue(customDetailedPlan.rent_build_permission) ? `${formatNumber(customDetailedPlan.rent_build_permission)} k-m²` : '-'}
             </FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={12} medium={4} large={4}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreaCustomDetailedPlanFieldPaths.PRECONSTRUCTION_ESTIMATED_CONSTRUCTION_READINESS_MOMENT)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreaCustomDetailedPlanFieldPaths.PRECONSTRUCTION_ESTIMATED_CONSTRUCTION_READINESS_MOMENT)}>
               {LeaseAreaCustomDetailedPlanFieldTitles.PRECONSTRUCTION_ESTIMATED_CONSTRUCTION_READINESS_MOMENT}
             </FormTextTitle>
             <FormText>{customDetailedPlan.preconstruction_estimated_construction_readiness_moment || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
diff --git a/src/leases/components/leaseSections/leaseArea/CustomDetailedPlanEdit.tsx b/src/leases/components/leaseSections/leaseArea/CustomDetailedPlanEdit.tsx
index 94affa2e6..b0bfce58b 100644
--- a/src/leases/components/leaseSections/leaseArea/CustomDetailedPlanEdit.tsx
+++ b/src/leases/components/leaseSections/leaseArea/CustomDetailedPlanEdit.tsx
@@ -4,27 +4,27 @@ import { withRouter } from "react-router";
 import { FieldArray, reduxForm, change } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import BoxItem from "components/content/BoxItem";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import ActionButtonWrapper from "components/form/ActionButtonWrapper";
-import Authorization from "components/authorization/Authorization";
-import FormText from "components/form/FormText";
-import FormField from "components/form/FormField";
-import RemoveButton from "components/form/RemoveButton";
-import { ButtonColors } from "components/enums";
-import { ConfirmationModalTexts } from "enums";
-import { FormNames } from "enums";
-import { LeaseAreaCustomDetailedPlanFieldPaths, LeaseAreaCustomDetailedPlanFieldTitles, LeaseAreaUsageDistributionFieldPaths, LeaseAreaUsageDistributionFieldTitles, LeaseAreaCustomDetailedPlanInfoLinksFieldPaths, LeaseAreaCustomDetailedPlanInfoLinksFieldTitles } from "leases/enums";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import BoxItem from "@/components/content/BoxItem";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import ActionButtonWrapper from "@/components/form/ActionButtonWrapper";
+import Authorization from "@/components/authorization/Authorization";
+import FormText from "@/components/form/FormText";
+import FormField from "@/components/form/FormField";
+import RemoveButton from "@/components/form/RemoveButton";
+import { ButtonColors } from "@/components/enums";
+import { ConfirmationModalTexts } from "@/enums";
+import { FormNames } from "@/enums";
+import { LeaseAreaCustomDetailedPlanFieldPaths, LeaseAreaCustomDetailedPlanFieldTitles, LeaseAreaUsageDistributionFieldPaths, LeaseAreaUsageDistributionFieldTitles, LeaseAreaCustomDetailedPlanInfoLinksFieldPaths, LeaseAreaCustomDetailedPlanInfoLinksFieldTitles } from "@/leases/enums";
 import type { Attributes } from "types";
-import { UsersPermissions } from "usersPermissions/enums";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getAttributes } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { getFieldAttributes, hasPermissions, isFieldAllowedToEdit, isFieldAllowedToRead } from "util/helpers";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getAttributes } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { getFieldAttributes, hasPermissions, isFieldAllowedToEdit, isFieldAllowedToRead } from "@/util/helpers";
 type UsageDistributionsProps = {
   attributes: Attributes;
   buttonTitle: string;
@@ -46,7 +46,7 @@ const renderUsageDistributions = ({
   isSaveClicked,
   noDataText,
   usersPermissions
-}: UsageDistributionsProps): React.ReactNode => {
+}: UsageDistributionsProps): JSX.Element => {
   const handleAdd = () => {
     fields.push({
       usage_distributions: [{}]
@@ -151,7 +151,7 @@ const renderInfoLinks = ({
   isSaveClicked,
   noDataText,
   usersPermissions
-}: InfoLinksProps): React.ReactNode => {
+}: InfoLinksProps): JSX.Element => {
   const handleAdd = () => {
     fields.push({
       info_links: [{}]
@@ -408,7 +408,7 @@ class CustomDetailedPlanEdit extends PureComponent<Props> {
 }
 
 const formName = FormNames.LEASE_AREAS;
-export default (flowRight( // $FlowFixMe
+export default (flowRight(
 withRouter, connect(state => {
   return {
     attributes: getAttributes(state),
diff --git a/src/leases/components/leaseSections/leaseArea/LeaseArea.tsx b/src/leases/components/leaseSections/leaseArea/LeaseArea.tsx
index 8dea8d9a7..0af226978 100644
--- a/src/leases/components/leaseSections/leaseArea/LeaseArea.tsx
+++ b/src/leases/components/leaseSections/leaseArea/LeaseArea.tsx
@@ -6,22 +6,22 @@ import { Link } from "react-router-dom";
 import flowRight from "lodash/flowRight";
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
-import Authorization from "components/authorization/Authorization";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import Collapse from "components/collapse/Collapse";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import ListItem from "components/content/ListItem";
-import ListItems from "components/content/ListItems";
+import Authorization from "@/components/authorization/Authorization";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import Collapse from "@/components/collapse/Collapse";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import ListItem from "@/components/content/ListItem";
+import ListItems from "@/components/content/ListItems";
 import PlanUnitItem from "./PlanUnitItem";
 import PlotItem from "./PlotItem";
-import SubTitle from "components/content/SubTitle";
-import { receiveCollapseStates } from "leases/actions";
-import { FormNames, ViewModes } from "enums";
-import { LeaseAreaAddressesFieldPaths, LeaseAreaAddressesFieldTitles, LeaseAreasFieldPaths, LeaseAreasFieldTitles, LeaseAreaCustomDetailedPlanFieldPaths, LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths } from "leases/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatNumber, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isEmptyValue, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes, getCollapseStateByKey, getIsEditMode } from "leases/selectors";
+import SubTitle from "@/components/content/SubTitle";
+import { receiveCollapseStates } from "@/leases/actions";
+import { FormNames, ViewModes } from "@/enums";
+import { LeaseAreaAddressesFieldPaths, LeaseAreaAddressesFieldTitles, LeaseAreasFieldPaths, LeaseAreasFieldTitles, LeaseAreaCustomDetailedPlanFieldPaths, LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths } from "@/leases/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatNumber, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes, getCollapseStateByKey, getIsEditMode } from "@/leases/selectors";
 import type { Attributes } from "types";
 import CustomDetailedPlan from "./CustomDetailedPlan";
 type Props = {
@@ -103,34 +103,42 @@ const LeaseArea = ({
       <Row>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreasFieldPaths.IDENTIFIER)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreasFieldPaths.IDENTIFIER)}>
               {LeaseAreasFieldTitles.IDENTIFIER}
             </FormTextTitle>
             <FormText>{area.identifier || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreasFieldPaths.TYPE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreasFieldPaths.TYPE)}>
               {LeaseAreasFieldTitles.TYPE}
             </FormTextTitle>
             <FormText>{getLabelOfOption(typeOptions, area.type) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreasFieldPaths.AREA)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreasFieldPaths.AREA)}>
               {LeaseAreasFieldTitles.AREA}
             </FormTextTitle>
             <FormText>{!isEmptyValue(area.area) ? `${formatNumber(area.area)} m²` : '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreasFieldPaths.LOCATION)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreasFieldPaths.LOCATION)}>
               {LeaseAreasFieldTitles.LOCATION}
             </FormTextTitle>
             <FormText>{getLabelOfOption(locationOptions, area.location) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
@@ -140,6 +148,7 @@ const LeaseArea = ({
         </Column>
       </Row>
       <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreaAddressesFieldPaths.ADDRESSES)}>
+        <>
         <SubTitle uiDataKey={getUiDataLeaseKey(LeaseAreaAddressesFieldPaths.ADDRESSES)}>
           {LeaseAreaAddressesFieldTitles.ADDRESSES}
         </SubTitle>
@@ -202,6 +211,7 @@ const LeaseArea = ({
           })}
             </ListItems>
           </Fragment>}
+        </>
       </Authorization>
 
       <Authorization allow={isFieldAllowedToRead(attributes, LeasePlotsFieldPaths.PLOTS)}>
diff --git a/src/leases/components/leaseSections/leaseArea/LeaseAreaEdit.tsx b/src/leases/components/leaseSections/leaseArea/LeaseAreaEdit.tsx
index f06523659..ad6d93a2d 100644
--- a/src/leases/components/leaseSections/leaseArea/LeaseAreaEdit.tsx
+++ b/src/leases/components/leaseSections/leaseArea/LeaseAreaEdit.tsx
@@ -7,32 +7,32 @@ import { Link } from "react-router-dom";
 import flowRight from "lodash/flowRight";
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import AddButtonThird from "components/form/AddButtonThird";
-import Authorization from "components/authorization/Authorization";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import Collapse from "components/collapse/Collapse";
-import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import Authorization from "@/components/authorization/Authorization";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import Collapse from "@/components/collapse/Collapse";
+import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
 import PlanUnitItemEdit from "./PlanUnitItemEdit";
 import PlotItemEdit from "./PlotItemEdit";
-import RemoveButton from "components/form/RemoveButton";
-import SubTitle from "components/content/SubTitle";
-import { receiveCollapseStates } from "leases/actions";
-import { ConfirmationModalTexts, FieldTypes, FormNames, ViewModes } from "enums";
-import { ButtonColors } from "components/enums";
-import { LeaseAreaAddressesFieldPaths, LeaseAreaAddressesFieldTitles, LeaseAreasFieldPaths, LeaseAreasFieldTitles, LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths, LeaseAreaCustomDetailedPlanFieldPaths } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getFieldAttributes, getSearchQuery, getUrlParams, hasPermissions, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "util/helpers";
-import { getAttributes, getCollapseStateByKey, getErrorsByFormName, getIsSaveClicked } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import RemoveButton from "@/components/form/RemoveButton";
+import SubTitle from "@/components/content/SubTitle";
+import { receiveCollapseStates } from "@/leases/actions";
+import { ConfirmationModalTexts, FieldTypes, FormNames, ViewModes } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { LeaseAreaAddressesFieldPaths, LeaseAreaAddressesFieldTitles, LeaseAreasFieldPaths, LeaseAreasFieldTitles, LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths, LeaseAreaCustomDetailedPlanFieldPaths } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getFieldAttributes, getSearchQuery, getUrlParams, hasPermissions, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "@/util/helpers";
+import { getAttributes, getCollapseStateByKey, getErrorsByFormName, getIsSaveClicked } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 import CustomDetailedPlanEdit from "./CustomDetailedPlanEdit";
 type PlanUnitsProps = {
   attributes: Attributes;
diff --git a/src/leases/components/leaseSections/leaseArea/LeaseAreaWithArchiceInfo.tsx b/src/leases/components/leaseSections/leaseArea/LeaseAreaWithArchiceInfo.tsx
index a7ddc658b..784e685b9 100644
--- a/src/leases/components/leaseSections/leaseArea/LeaseAreaWithArchiceInfo.tsx
+++ b/src/leases/components/leaseSections/leaseArea/LeaseAreaWithArchiceInfo.tsx
@@ -2,20 +2,20 @@ import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
-import Authorization from "components/authorization/Authorization";
-import Collapse from "components/collapse/Collapse";
-import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle";
-import Divider from "components/content/Divider";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
+import Authorization from "@/components/authorization/Authorization";
+import Collapse from "@/components/collapse/Collapse";
+import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle";
+import Divider from "@/components/content/Divider";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
 import LeaseArea from "./LeaseArea";
-import { receiveCollapseStates } from "leases/actions";
-import { FormNames, ViewModes } from "enums";
-import { LeaseAreaAddressesFieldPaths, LeaseAreasFieldPaths, LeaseAreasFieldTitles } from "leases/enums";
-import { getFullAddress } from "leases/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes, getCollapseStateByKey } from "leases/selectors";
+import { receiveCollapseStates } from "@/leases/actions";
+import { FormNames, ViewModes } from "@/enums";
+import { LeaseAreaAddressesFieldPaths, LeaseAreasFieldPaths, LeaseAreasFieldTitles } from "@/leases/enums";
+import { getFullAddress } from "@/leases/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes, getCollapseStateByKey } from "@/leases/selectors";
 import type { Attributes } from "types";
 type Props = {
   area: Record<string, any>;
@@ -81,26 +81,32 @@ const LeaseAreaWithArchiveInfo = ({
       {!!archived && <Row>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreasFieldPaths.ARCHIVED_AT)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreasFieldPaths.ARCHIVED_AT)}>
                 {LeaseAreasFieldTitles.ARCHIVED_AT}
               </FormTextTitle>
               <FormText>{formatDate(area.archived_at) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreasFieldPaths.ARCHIVED_DECISION)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreasFieldPaths.ARCHIVED_DECISION)}>
                 {LeaseAreasFieldTitles.ARCHIVED_DECISION}
               </FormTextTitle>
               <FormText>{getLabelOfOption(decisionOptions, area.archived_decision) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={12} medium={4} large={8}>
             <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreasFieldPaths.ARCHIVED_NOTE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreasFieldPaths.ARCHIVED_NOTE)}>
                 {LeaseAreasFieldTitles.ARCHIVED_NOTE}
               </FormTextTitle>
               <FormText>{area.archived_note || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
         </Row>}
diff --git a/src/leases/components/leaseSections/leaseArea/LeaseAreaWithArchiveInfoEdit.tsx b/src/leases/components/leaseSections/leaseArea/LeaseAreaWithArchiveInfoEdit.tsx
index 0f6455b7d..92e7f3387 100644
--- a/src/leases/components/leaseSections/leaseArea/LeaseAreaWithArchiveInfoEdit.tsx
+++ b/src/leases/components/leaseSections/leaseArea/LeaseAreaWithArchiveInfoEdit.tsx
@@ -4,27 +4,27 @@ import { formValueSelector } from "redux-form";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
-import Authorization from "components/authorization/Authorization";
-import Collapse from "components/collapse/Collapse";
-import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle";
-import Divider from "components/content/Divider";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
+import Authorization from "@/components/authorization/Authorization";
+import Collapse from "@/components/collapse/Collapse";
+import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle";
+import Divider from "@/components/content/Divider";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
 import LeaseArea from "./LeaseArea";
 import LeaseAreaEdit from "./LeaseAreaEdit";
-import { receiveCollapseStates } from "leases/actions";
-import { FormNames, ViewModes } from "enums";
-import { LeaseAreasFieldPaths, LeaseAreasFieldTitles, LeaseAreaAddressesFieldPaths } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getFullAddress, getLeaseAreaById } from "leases/helpers";
-import { formatDate, formatNumber, getFieldAttributes, getFieldOptions, getLabelOfOption, hasPermissions, isFieldAllowedToEdit, isFieldAllowedToRead } from "util/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getAttributes, getCollapseStateByKey, getCurrentLease, getErrorsByFormName, getIsSaveClicked } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import { receiveCollapseStates } from "@/leases/actions";
+import { FormNames, ViewModes } from "@/enums";
+import { LeaseAreasFieldPaths, LeaseAreasFieldTitles, LeaseAreaAddressesFieldPaths } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getFullAddress, getLeaseAreaById } from "@/leases/helpers";
+import { formatDate, formatNumber, getFieldAttributes, getFieldOptions, getLabelOfOption, hasPermissions, isFieldAllowedToEdit, isFieldAllowedToRead } from "@/util/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getAttributes, getCollapseStateByKey, getCurrentLease, getErrorsByFormName, getIsSaveClicked } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { Lease } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   archivedAt: string | null | undefined;
   areaCollapseState: boolean;
@@ -124,10 +124,12 @@ const LeaseAreaWithArchiveInfoEdit = ({
       {!isActive && <Row>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreasFieldPaths.ARCHIVED_AT)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseAreasFieldPaths.ARCHIVED_AT)}>
                 {LeaseAreasFieldTitles.ARCHIVED_AT}
               </FormTextTitle>
               <FormText>{formatDate(archivedAt) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={4} large={2}>
diff --git a/src/leases/components/leaseSections/leaseArea/LeaseAreas.tsx b/src/leases/components/leaseSections/leaseArea/LeaseAreas.tsx
index 283728854..aa6f793be 100644
--- a/src/leases/components/leaseSections/leaseArea/LeaseAreas.tsx
+++ b/src/leases/components/leaseSections/leaseArea/LeaseAreas.tsx
@@ -1,18 +1,18 @@
 import React from "react";
 import { connect } from "react-redux";
-import Authorization from "components/authorization/Authorization";
-import Divider from "components/content/Divider";
-import FormText from "components/form/FormText";
+import Authorization from "@/components/authorization/Authorization";
+import Divider from "@/components/content/Divider";
+import FormText from "@/components/form/FormText";
 import LeaseAreaWithArchiceInfo from "./LeaseAreaWithArchiceInfo";
-import Title from "components/content/Title";
-import WarningContainer from "components/content/WarningContainer";
-import { LeaseAreasFieldPaths } from "leases/enums";
-import { calculateAreasSum, getContentLeaseAreas, getDecisionOptions } from "leases/helpers";
-import { formatNumber, isFieldAllowedToRead } from "util/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getAttributes, getCurrentLease } from "leases/selectors";
+import Title from "@/components/content/Title";
+import WarningContainer from "@/components/content/WarningContainer";
+import { LeaseAreasFieldPaths } from "@/leases/enums";
+import { calculateAreasSum, getContentLeaseAreas, getDecisionOptions } from "@/leases/helpers";
+import { formatNumber, isFieldAllowedToRead } from "@/util/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getAttributes, getCurrentLease } from "@/leases/selectors";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
+import type { Lease } from "@/leases/types";
 type Props = {
   attributes: Attributes;
   currentLease: Lease;
diff --git a/src/leases/components/leaseSections/leaseArea/LeaseAreasEdit.tsx b/src/leases/components/leaseSections/leaseArea/LeaseAreasEdit.tsx
index 23c5f8031..1e58a4f93 100644
--- a/src/leases/components/leaseSections/leaseArea/LeaseAreasEdit.tsx
+++ b/src/leases/components/leaseSections/leaseArea/LeaseAreasEdit.tsx
@@ -3,29 +3,29 @@ import { connect } from "react-redux";
 import { FieldArray, formValueSelector, getFormValues, initialize, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButton from "components/form/AddButton";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButton from "@/components/form/AddButton";
 import ArchiveAreaModal from "./ArchiveAreaModal";
-import Authorization from "components/authorization/Authorization";
-import Button from "components/button/Button";
-import Divider from "components/content/Divider";
+import Authorization from "@/components/authorization/Authorization";
+import Button from "@/components/button/Button";
+import Divider from "@/components/content/Divider";
 import LeaseAreaWithArchiveInfoEdit from "./LeaseAreaWithArchiveInfoEdit";
-import Title from "components/content/Title";
-import WarningContainer from "components/content/WarningContainer";
-import { copyAreasToContract, receiveFormValidFlags } from "leases/actions";
-import { ConfirmationModalTexts, FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import { AreaLocation, LeaseAreasFieldPaths } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { calculateAreasSum, getContentLeaseAreas, getDecisionOptions, getLeaseAreaById } from "leases/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatNumber, hasPermissions, isFieldAllowedToEdit, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes as getLeaseAttributes, getCurrentLease } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { store } from "root/startApp";
+import Title from "@/components/content/Title";
+import WarningContainer from "@/components/content/WarningContainer";
+import { copyAreasToContract, receiveFormValidFlags } from "@/leases/actions";
+import { ConfirmationModalTexts, FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { AreaLocation, LeaseAreasFieldPaths } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { calculateAreasSum, getContentLeaseAreas, getDecisionOptions, getLeaseAreaById } from "@/leases/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatNumber, hasPermissions, isFieldAllowedToEdit, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes, getCurrentLease } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { store } from "@/index";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { Lease } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type AreaItemProps = {
   decisionOptions: Array<Record<string, any>>;
   fields: any;
@@ -307,7 +307,9 @@ class LeaseAreasEdit extends PureComponent<Props, State> {
                     <Button className={ButtonColors.NEUTRAL} onClick={handleCopyAreasToContract} text='Kopioi sopimukseen' />
                   </Authorization>}>
                 <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseAreasFieldPaths.AREA)}>
+                  <>
                   Kokonaispinta-ala {formatNumber(areasSum) || '-'} m<sup>2</sup>
+                  </>
                 </Authorization>
               </WarningContainer>
               <Divider />
diff --git a/src/leases/components/leaseSections/leaseArea/PlanUnitItem.tsx b/src/leases/components/leaseSections/leaseArea/PlanUnitItem.tsx
index 6d4a17a61..34e1800a2 100644
--- a/src/leases/components/leaseSections/leaseArea/PlanUnitItem.tsx
+++ b/src/leases/components/leaseSections/leaseArea/PlanUnitItem.tsx
@@ -6,18 +6,18 @@ import { Link } from "react-router-dom";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import Authorization from "components/authorization/Authorization";
-import BoxItem from "components/content/BoxItem";
-import ExternalLink from "components/links/ExternalLink";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import { LeasePlanUnitsFieldPaths, LeasePlanUnitsFieldTitles, LeaseAreaUsageDistributionFieldPaths, LeaseAreaUsageDistributionFieldTitles } from "leases/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isEmptyValue, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes } from "leases/selectors";
-import { createPTPPlanReportUrl, createPTPPlotDivisionUrl } from "util/helpers";
+import Authorization from "@/components/authorization/Authorization";
+import BoxItem from "@/components/content/BoxItem";
+import ExternalLink from "@/components/links/ExternalLink";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import { LeasePlanUnitsFieldPaths, LeasePlanUnitsFieldTitles, LeaseAreaUsageDistributionFieldPaths, LeaseAreaUsageDistributionFieldTitles } from "@/leases/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes } from "@/leases/selectors";
+import { createPTPPlanReportUrl, createPTPPlotDivisionUrl } from "@/util/helpers";
 import type { Attributes } from "types";
-import SubTitle from "components/content/SubTitle";
+import SubTitle from "@/components/content/SubTitle";
 type OwnProps = {
   areaArchived: boolean;
   planUnit: Record<string, any>;
@@ -54,18 +54,22 @@ const PlanUnitItem = ({
       <Row>
         <Column small={12} medium={8} large={8}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeasePlanUnitsFieldPaths.IDENTIFIER)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeasePlanUnitsFieldPaths.IDENTIFIER)}>
               {LeasePlanUnitsFieldTitles.IDENTIFIER}
             </FormTextTitle>
             <FormText>{planUnit.identifier || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={12} medium={2} large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeasePlanUnitsFieldPaths.IS_MASTER)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeasePlanUnitsFieldPaths.IS_MASTER)}>
               {LeasePlanUnitsFieldTitles.IS_MASTER}
             </FormTextTitle>
             <FormText>{planUnit.is_master ? 'Kyllä' : 'Ei'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={12} medium={3} large={3}>
@@ -78,98 +82,120 @@ const PlanUnitItem = ({
       <Row>
         <Column small={12} medium={6} large={3}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeasePlanUnitsFieldPaths.AREA)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeasePlanUnitsFieldPaths.AREA)}>
               {LeasePlanUnitsFieldTitles.AREA}
             </FormTextTitle>
             <FormText>{!isEmptyValue(planUnit.area) ? `${formatNumber(planUnit.area)} m²` : '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={12} medium={6} large={3}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeasePlanUnitsFieldPaths.SECTION_AREA)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeasePlanUnitsFieldPaths.SECTION_AREA)}>
               {LeasePlanUnitsFieldTitles.SECTION_AREA}
             </FormTextTitle>
             <FormText>{!isEmptyValue(planUnit.section_area) ? `${formatNumber(planUnit.section_area)} m²` : '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         <Column small={12} medium={6} large={3}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeasePlanUnitsFieldPaths.DETAILED_PLAN_IDENTIFIER)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeasePlanUnitsFieldPaths.DETAILED_PLAN_IDENTIFIER)}>
               {LeasePlanUnitsFieldTitles.DETAILED_PLAN_IDENTIFIER}
             </FormTextTitle>
             {planUnit.detailed_plan_identifier ? <ExternalLink href={createPTPPlanReportUrl(planUnit.detailed_plan_identifier)} text={planUnit.detailed_plan_identifier} /> : <FormText>-</FormText>}
+            </>
           </Authorization>
         </Column>
         <Column small={12} medium={6} large={3}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeasePlanUnitsFieldPaths.DETAILED_PLAN_LATEST_PROCESSING_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeasePlanUnitsFieldPaths.DETAILED_PLAN_LATEST_PROCESSING_DATE)}>
               {LeasePlanUnitsFieldTitles.DETAILED_PLAN_LATEST_PROCESSING_DATE}
             </FormTextTitle>
             <FormText>{formatDate(planUnit.detailed_plan_latest_processing_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         <Column>
           <Authorization allow={isFieldAllowedToRead(attributes, LeasePlanUnitsFieldPaths.DETAILED_PLAN_LATEST_PROCESSING_DATE_NOTE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeasePlanUnitsFieldPaths.DETAILED_PLAN_LATEST_PROCESSING_DATE_NOTE)}>
               {LeasePlanUnitsFieldTitles.DETAILED_PLAN_LATEST_PROCESSING_DATE_NOTE}
             </FormTextTitle>
             <FormText>{planUnit.detailed_plan_latest_processing_date_note || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         <Column small={12} medium={6} large={3}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeasePlanUnitsFieldPaths.PLOT_DIVISION_IDENTIFIER)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeasePlanUnitsFieldPaths.PLOT_DIVISION_IDENTIFIER)}>
               {LeasePlanUnitsFieldTitles.PLOT_DIVISION_IDENTIFIER}
             </FormTextTitle>
             {planUnit.plot_division_identifier ? <ExternalLink href={createPTPPlotDivisionUrl(planUnit.plot_division_identifier)} text={planUnit.plot_division_identifier} /> : <FormText>-</FormText>}
+            </>
           </Authorization>
         </Column>
         <Column small={12} medium={6} large={3}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeasePlanUnitsFieldPaths.PLOT_DIVISION_STATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeasePlanUnitsFieldPaths.PLOT_DIVISION_STATE)}>
               {LeasePlanUnitsFieldTitles.PLOT_DIVISION_STATE}
             </FormTextTitle>
             <FormText>{getLabelOfOption(plotDivisionStateOptions, planUnit.plot_division_state) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={12} medium={12} large={6}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeasePlanUnitsFieldPaths.PLOT_DIVISION_EFFECTIVE_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeasePlanUnitsFieldPaths.PLOT_DIVISION_EFFECTIVE_DATE)}>
               {LeasePlanUnitsFieldTitles.PLOT_DIVISION_EFFECTIVE_DATE}
             </FormTextTitle>
             <FormText>{formatDate(planUnit.plot_division_effective_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
       <Row>
         <Column small={12} medium={6} large={3}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeasePlanUnitsFieldPaths.PLAN_UNIT_TYPE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeasePlanUnitsFieldPaths.PLAN_UNIT_TYPE)}>
               {LeasePlanUnitsFieldTitles.PLAN_UNIT_TYPE}
             </FormTextTitle>
             <FormText>{getLabelOfOption(planUnitTypeOptions, planUnit.plan_unit_type) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={12} medium={6} large={3}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeasePlanUnitsFieldPaths.PLAN_UNIT_STATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeasePlanUnitsFieldPaths.PLAN_UNIT_STATE)}>
               {LeasePlanUnitsFieldTitles.PLAN_UNIT_STATE}
             </FormTextTitle>
             <FormText>{getLabelOfOption(planUnitStateOptions, planUnit.plan_unit_state) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={12} medium={12} large={6}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeasePlanUnitsFieldPaths.PLAN_UNIT_INTENDED_USE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeasePlanUnitsFieldPaths.PLAN_UNIT_INTENDED_USE)}>
               {LeasePlanUnitsFieldTitles.PLAN_UNIT_INTENDED_USE}
             </FormTextTitle>
             <FormText>{getLabelOfOption(planUnitIntendedUseOptions, planUnit.plan_unit_intended_use) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
diff --git a/src/leases/components/leaseSections/leaseArea/PlanUnitItemEdit.tsx b/src/leases/components/leaseSections/leaseArea/PlanUnitItemEdit.tsx
index 70cd38739..a346be18c 100644
--- a/src/leases/components/leaseSections/leaseArea/PlanUnitItemEdit.tsx
+++ b/src/leases/components/leaseSections/leaseArea/PlanUnitItemEdit.tsx
@@ -6,21 +6,21 @@ import { Link } from "react-router-dom";
 import { formValueSelector, change, reduxForm } from "redux-form";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import ActionButtonWrapper from "components/form/ActionButtonWrapper";
-import Authorization from "components/authorization/Authorization";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import BoxItem from "components/content/BoxItem";
-import FormField from "components/form/FormField";
-import RemoveButton from "components/form/RemoveButton";
-import { FormNames } from "enums";
-import { LeasePlanUnitsFieldPaths, LeasePlanUnitsFieldTitles } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getFieldAttributes, getSearchQuery, getUrlParams, hasPermissions, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import ActionButtonWrapper from "@/components/form/ActionButtonWrapper";
+import Authorization from "@/components/authorization/Authorization";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import BoxItem from "@/components/content/BoxItem";
+import FormField from "@/components/form/FormField";
+import RemoveButton from "@/components/form/RemoveButton";
+import { FormNames } from "@/enums";
+import { LeasePlanUnitsFieldPaths, LeasePlanUnitsFieldTitles } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getFieldAttributes, getSearchQuery, getUrlParams, hasPermissions, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   attributes: Attributes;
   field: string;
diff --git a/src/leases/components/leaseSections/leaseArea/PlotItem.tsx b/src/leases/components/leaseSections/leaseArea/PlotItem.tsx
index 99e094db1..2ee74cae9 100644
--- a/src/leases/components/leaseSections/leaseArea/PlotItem.tsx
+++ b/src/leases/components/leaseSections/leaseArea/PlotItem.tsx
@@ -5,16 +5,16 @@ import { Link } from "react-router-dom";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import Authorization from "components/authorization/Authorization";
-import BoxItem from "components/content/BoxItem";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import KtjLink from "components/ktj/KtjLink";
-import SubTitle from "components/content/SubTitle";
-import { LeasePlotsFieldPaths, LeasePlotsFieldTitles, PlotType } from "leases/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isEmptyValue, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes } from "leases/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import BoxItem from "@/components/content/BoxItem";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import KtjLink from "@/components/ktj/KtjLink";
+import SubTitle from "@/components/content/SubTitle";
+import { LeasePlotsFieldPaths, LeasePlotsFieldTitles, PlotType } from "@/leases/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes } from "@/leases/selectors";
 import type { Attributes } from "types";
 type Props = {
   areaArchived: boolean;
@@ -47,18 +47,22 @@ const PlotItem = ({
       <Row>
         <Column small={12} medium={6} large={6}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeasePlotsFieldPaths.IDENTIFIER)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeasePlotsFieldPaths.IDENTIFIER)}>
               {LeasePlotsFieldTitles.IDENTIFIER}
             </FormTextTitle>
             <FormText><strong>{plot.identifier || '-'}</strong></FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={12} medium={3} large={3}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeasePlotsFieldPaths.TYPE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeasePlotsFieldPaths.TYPE)}>
               {LeasePlotsFieldTitles.TYPE}
             </FormTextTitle>
             <FormText>{getLabelOfOption(typeOptions, plot.type) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={12} medium={3} large={3}>
@@ -71,34 +75,42 @@ const PlotItem = ({
       <Row>
         <Column small={12} medium={6} large={3}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeasePlotsFieldPaths.AREA)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeasePlotsFieldPaths.AREA)}>
               {LeasePlotsFieldTitles.AREA}
             </FormTextTitle>
             <FormText>{!isEmptyValue(plot.area) ? `${formatNumber(plot.area)} m²` : '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={12} medium={6} large={3}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeasePlotsFieldPaths.SECTION_AREA)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeasePlotsFieldPaths.SECTION_AREA)}>
               {LeasePlotsFieldTitles.SECTION_AREA}
             </FormTextTitle>
             <FormText>{!isEmptyValue(plot.section_area) ? `${formatNumber(plot.section_area)} m²` : '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={12} medium={6} large={3}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeasePlotsFieldPaths.REGISTRATION_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeasePlotsFieldPaths.REGISTRATION_DATE)}>
               {LeasePlotsFieldTitles.REGISTRATION_DATE}
             </FormTextTitle>
             <FormText>{formatDate(plot.registration_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={12} medium={6} large={3}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeasePlotsFieldPaths.REPEAL_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeasePlotsFieldPaths.REPEAL_DATE)}>
               {LeasePlotsFieldTitles.REPEAL_DATE}
             </FormTextTitle>
             <FormText>{formatDate(plot.repeal_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
diff --git a/src/leases/components/leaseSections/leaseArea/PlotItemEdit.tsx b/src/leases/components/leaseSections/leaseArea/PlotItemEdit.tsx
index bb29130b7..df378426a 100644
--- a/src/leases/components/leaseSections/leaseArea/PlotItemEdit.tsx
+++ b/src/leases/components/leaseSections/leaseArea/PlotItemEdit.tsx
@@ -6,23 +6,23 @@ import { withRouter } from "react-router";
 import { Link } from "react-router-dom";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import ActionButtonWrapper from "components/form/ActionButtonWrapper";
-import Authorization from "components/authorization/Authorization";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import BoxItem from "components/content/BoxItem";
-import FormField from "components/form/FormField";
-import KtjLink from "components/ktj/KtjLink";
-import RemoveButton from "components/form/RemoveButton";
-import SubTitle from "components/content/SubTitle";
-import { FormNames } from "enums";
-import { LeasePlotsFieldPaths, LeasePlotsFieldTitles, PlotType } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getFieldAttributes, getSearchQuery, getUrlParams, hasPermissions, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes, getIsSaveClicked } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import ActionButtonWrapper from "@/components/form/ActionButtonWrapper";
+import Authorization from "@/components/authorization/Authorization";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import BoxItem from "@/components/content/BoxItem";
+import FormField from "@/components/form/FormField";
+import KtjLink from "@/components/ktj/KtjLink";
+import RemoveButton from "@/components/form/RemoveButton";
+import SubTitle from "@/components/content/SubTitle";
+import { FormNames } from "@/enums";
+import { LeasePlotsFieldPaths, LeasePlotsFieldTitles, PlotType } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getFieldAttributes, getSearchQuery, getUrlParams, hasPermissions, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes, getIsSaveClicked } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   attributes: Attributes;
   field: string;
diff --git a/src/leases/components/leaseSections/leaseInfo/LeaseInfo.tsx b/src/leases/components/leaseSections/leaseInfo/LeaseInfo.tsx
index 18ef96787..72a1d9e4e 100644
--- a/src/leases/components/leaseSections/leaseInfo/LeaseInfo.tsx
+++ b/src/leases/components/leaseSections/leaseInfo/LeaseInfo.tsx
@@ -1,15 +1,15 @@
 import React from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
-import Authorization from "components/authorization/Authorization";
-import FormTextTitle from "components/form/FormTextTitle";
-import { LeaseFieldPaths, LeaseFieldTitles } from "leases/enums";
-import { getContentLeaseInfo } from "leases/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatDate, getFieldOptions, getLabelOfOption, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes, getCurrentLease } from "leases/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import { LeaseFieldPaths, LeaseFieldTitles } from "@/leases/enums";
+import { getContentLeaseInfo } from "@/leases/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatDate, getFieldOptions, getLabelOfOption, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes, getCurrentLease } from "@/leases/selectors";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
+import type { Lease } from "@/leases/types";
 type Props = {
   attributes: Attributes;
   currentLease: Lease;
@@ -26,50 +26,64 @@ const LeaseInfo = ({
       <Row>
         <Column large={2}>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.IDENTIFIER)}>
+            <>
             <FormTextTitle>{LeaseFieldTitles.IDENTIFIER}</FormTextTitle>
             <h1 className='lease-info__identifier'>{leaseInfo.identifier || '-'}</h1>
+            </>
           </Authorization>
         </Column>
         <Column>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.STATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.STATE)}>
               {LeaseFieldTitles.STATE}
             </FormTextTitle>
             <p className='lease-info__text'>{getLabelOfOption(stateOptions, leaseInfo.state) || '-'}</p>
+            </>
           </Authorization>
         </Column>
         <Column>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.START_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.START_DATE)}>
               {LeaseFieldTitles.START_DATE}
             </FormTextTitle>
             <p className='lease-info__text'>{formatDate(leaseInfo.start_date) || '-'}</p>
+            </>
           </Authorization>
         </Column>
         <Column>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.END_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.END_DATE)}>
               {LeaseFieldTitles.END_DATE}
             </FormTextTitle>
             <p className='lease-info__text'>{formatDate(leaseInfo.end_date) || '-'}</p>
+            </>
           </Authorization>
         </Column>
         <Column>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.START_DATE) && isFieldAllowedToRead(attributes, LeaseFieldPaths.END_DATE)}>
+            <>
             <FormTextTitle>{LeaseFieldTitles.STATUS}</FormTextTitle>
             <p className='lease-info__text'>{leaseInfo.status || '-'}</p>
+            </>
           </Authorization>
         </Column>
         <Column large={2} className='hide_narrow'>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.AREA_IDENTIFIER)}>
+            <>
             <FormTextTitle>{LeaseFieldTitles.AREA_IDENTIFIER}</FormTextTitle>
             <p className='lease-info__text'>{leaseInfo.area_identifier || '-'}</p>
+            </>
           </Authorization>
         </Column>
         <Column large={3} className='hide_narrow'>
           <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.ADDRESS)}>
+            <>
             <FormTextTitle>{LeaseFieldTitles.ADDRESS}</FormTextTitle>
             <p className='lease-info__text'>{leaseInfo.address || '-'}</p>
+            </>
           </Authorization>
         </Column>
       </Row>
diff --git a/src/leases/components/leaseSections/map/AreasLayer.tsx b/src/leases/components/leaseSections/map/AreasLayer.tsx
index 04db711c8..9f66b8091 100644
--- a/src/leases/components/leaseSections/map/AreasLayer.tsx
+++ b/src/leases/components/leaseSections/map/AreasLayer.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import { GeoJSON } from "react-leaflet";
-import { formatNumber, getLabelOfOption } from "util/helpers";
+import { formatNumber, getLabelOfOption } from "@/util/helpers";
 import type { LeafletGeoJson } from "types";
 type Props = {
   areasGeoJson: LeafletGeoJson;
diff --git a/src/leases/components/leaseSections/map/LeaseListLayer.tsx b/src/leases/components/leaseSections/map/LeaseListLayer.tsx
index 055583b6d..a07f20d18 100644
--- a/src/leases/components/leaseSections/map/LeaseListLayer.tsx
+++ b/src/leases/components/leaseSections/map/LeaseListLayer.tsx
@@ -2,9 +2,9 @@ import React from "react";
 import { withRouter } from "react-router";
 import { GeoJSON } from "react-leaflet";
 import flowRight from "lodash/flowRight";
-import { LeaseFieldTitles } from "leases/enums";
-import { formatDate, getLabelOfOption } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
+import { LeaseFieldTitles } from "@/leases/enums";
+import { formatDate, getLabelOfOption } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
 import type { LeafletGeoJson } from "types";
 type Props = {
   color: string;
diff --git a/src/leases/components/leaseSections/map/LeaseListMap.tsx b/src/leases/components/leaseSections/map/LeaseListMap.tsx
index 2fb8f49e4..dc3d59209 100644
--- a/src/leases/components/leaseSections/map/LeaseListMap.tsx
+++ b/src/leases/components/leaseSections/map/LeaseListMap.tsx
@@ -3,23 +3,23 @@ import { connect } from "react-redux";
 import { withRouter } from "react-router";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import AreaNotesLayer from "areaNote/components/AreaNotesLayer";
-import AreaNotesEditMap from "areaNote/components/AreaNotesEditMap";
+import AreaNotesLayer from "@/areaNote/components/AreaNotesLayer";
+import AreaNotesEditMap from "@/areaNote/components/AreaNotesEditMap";
 import LeaseListLayer from "./LeaseListLayer";
-import { DEFAULT_ZOOM, MAP_COLORS } from "util/constants";
-import { MAX_ZOOM_LEVEL_TO_FETCH_LEASES } from "leases/constants";
-import { LeaseFieldPaths } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getContentLeasesGeoJson } from "leases/helpers";
-import { getApiResponseResults, getFieldOptions, getUrlParams, hasPermissions } from "util/helpers";
-import { getBoundsFromBBox, getBoundsFromFeatures } from "util/map";
-import { getAreaNoteList } from "areaNote/selectors";
-import { getAttributes as getLeaseAttributes, getLeasesByBBox } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import { DEFAULT_ZOOM, MAP_COLORS } from "@/util/constants";
+import { MAX_ZOOM_LEVEL_TO_FETCH_LEASES } from "@/leases/constants";
+import { LeaseFieldPaths } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getContentLeasesGeoJson } from "@/leases/helpers";
+import { getApiResponseResults, getFieldOptions, getUrlParams, hasPermissions } from "@/util/helpers";
+import { getBoundsFromBBox, getBoundsFromFeatures } from "@/util/map";
+import { getAreaNoteList } from "@/areaNote/selectors";
+import { getAttributes as getLeaseAttributes, getLeasesByBBox } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes, LeafletGeoJson } from "types";
-import type { AreaNoteList } from "areaNote/types";
-import type { LeaseList } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { AreaNoteList } from "@/areaNote/types";
+import type { LeaseList } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 
 const getMapBounds = () => {
   const {
diff --git a/src/leases/components/leaseSections/map/PlanUnitsLayer.tsx b/src/leases/components/leaseSections/map/PlanUnitsLayer.tsx
index 80c8b5b73..95974a413 100644
--- a/src/leases/components/leaseSections/map/PlanUnitsLayer.tsx
+++ b/src/leases/components/leaseSections/map/PlanUnitsLayer.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { GeoJSON } from "react-leaflet";
-import { LeasePlanUnitsFieldTitles } from "leases/enums";
-import { formatDate, formatNumber, getLabelOfOption } from "util/helpers";
+import { LeasePlanUnitsFieldTitles } from "@/leases/enums";
+import { formatDate, formatNumber, getLabelOfOption } from "@/util/helpers";
 import type { LeafletGeoJson } from "types";
 type Props = {
   color: string;
diff --git a/src/leases/components/leaseSections/map/PlotsLayer.tsx b/src/leases/components/leaseSections/map/PlotsLayer.tsx
index 88a427fff..0b5a44cbc 100644
--- a/src/leases/components/leaseSections/map/PlotsLayer.tsx
+++ b/src/leases/components/leaseSections/map/PlotsLayer.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import { GeoJSON } from "react-leaflet";
-import { formatDate, formatNumber, getLabelOfOption } from "util/helpers";
+import { formatDate, formatNumber, getLabelOfOption } from "@/util/helpers";
 import type { LeafletGeoJson } from "types";
 type Props = {
   color: string;
diff --git a/src/leases/components/leaseSections/map/SingleLeaseMap.tsx b/src/leases/components/leaseSections/map/SingleLeaseMap.tsx
index 8f6c3eee5..034b435f3 100644
--- a/src/leases/components/leaseSections/map/SingleLeaseMap.tsx
+++ b/src/leases/components/leaseSections/map/SingleLeaseMap.tsx
@@ -3,28 +3,28 @@ import { connect } from "react-redux";
 import { withRouter } from "react-router";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import AreaNotesLayer from "areaNote/components/AreaNotesLayer";
-import AreaNotesEditMap from "areaNote/components/AreaNotesEditMap";
+import AreaNotesLayer from "@/areaNote/components/AreaNotesLayer";
+import AreaNotesEditMap from "@/areaNote/components/AreaNotesEditMap";
 import AreasLayer from "./AreasLayer";
-import Divider from "components/content/Divider";
+import Divider from "@/components/content/Divider";
 import PlanUnitsLayer from "./PlanUnitsLayer";
 import PlotsLayer from "./PlotsLayer";
-import Title from "components/content/Title";
-import { fetchAreaNoteList } from "areaNote/actions";
-import { MAP_COLORS } from "util/constants";
-import { LeaseAreasFieldPaths, LeaseFieldPaths, LeaseFieldTitles, LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getContentAreasGeoJson, getContentPlanUnitsGeoJson, getContentPlotsGeoJson, getLeaseCoordinates } from "leases/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getFieldOptions, getUrlParams, hasPermissions, isFieldAllowedToRead } from "util/helpers";
-import { getBoundsFromCoordinates, getCenterFromCoordinates } from "util/map";
-import { getAreaNoteList } from "areaNote/selectors";
-import { getAttributes as getLeaseAttributes, getCurrentLease, getIsEditMode } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import Title from "@/components/content/Title";
+import { fetchAreaNoteList } from "@/areaNote/actions";
+import { MAP_COLORS } from "@/util/constants";
+import { LeaseAreasFieldPaths, LeaseFieldPaths, LeaseFieldTitles, LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getContentAreasGeoJson, getContentPlanUnitsGeoJson, getContentPlotsGeoJson, getLeaseCoordinates } from "@/leases/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getFieldOptions, getUrlParams, hasPermissions, isFieldAllowedToRead } from "@/util/helpers";
+import { getBoundsFromCoordinates, getCenterFromCoordinates } from "@/util/map";
+import { getAreaNoteList } from "@/areaNote/selectors";
+import { getAttributes as getLeaseAttributes, getCurrentLease, getIsEditMode } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes, LeafletGeoJson } from "types";
-import type { Lease } from "leases/types";
-import type { AreaNoteList } from "areaNote/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { Lease } from "@/leases/types";
+import type { AreaNoteList } from "@/areaNote/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   areaNotes: AreaNoteList;
   currentLease: Lease;
diff --git a/src/leases/components/leaseSections/rent/BasicInfo.tsx b/src/leases/components/leaseSections/rent/BasicInfo.tsx
index 1cf29a106..cbab080ff 100644
--- a/src/leases/components/leaseSections/rent/BasicInfo.tsx
+++ b/src/leases/components/leaseSections/rent/BasicInfo.tsx
@@ -1,14 +1,14 @@
 import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
-import Authorization from "components/authorization/Authorization";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import { LeaseRentDueDatesFieldPaths, LeaseRentDueDatesFieldTitles, LeaseRentsFieldPaths, LeaseRentsFieldTitles, RentCycles, RentTypes, RentDueDateTypes } from "leases/enums";
-import { formatDueDates, formatSeasonalDate } from "leases/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes as getLeaseAttributes } from "leases/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import { LeaseRentDueDatesFieldPaths, LeaseRentDueDatesFieldTitles, LeaseRentsFieldPaths, LeaseRentsFieldTitles, RentCycles, RentTypes, RentDueDateTypes } from "@/leases/enums";
+import { formatDueDates, formatSeasonalDate } from "@/leases/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes } from "@/leases/selectors";
 import type { Attributes } from "types";
 type SeasonalDatesProps = {
   leaseAttributes: Attributes;
@@ -56,74 +56,92 @@ const BasicInfoIndexOrManual = ({
       <Row>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.TYPE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.TYPE)}>
               {LeaseRentsFieldTitles.TYPE}
             </FormTextTitle>
             <FormText>{getLabelOfOption(typeOptions, rent.type) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={3} medium={2} large={1}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.START_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.START_DATE)}>
               {LeaseRentsFieldTitles.START_DATE}
             </FormTextTitle>
             <FormText>{formatDate(rent.start_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={3} medium={2} large={1}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.END_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.END_DATE)}>
               {LeaseRentsFieldTitles.END_DATE}
             </FormTextTitle>
             <FormText>{formatDate(rent.end_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={1}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.CYCLE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.CYCLE)}>
               {LeaseRentsFieldTitles.CYCLE}
             </FormTextTitle>
             <FormText>{getLabelOfOption(cycleOptions, rent.cycle) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         {rent.type === RentTypes.INDEX && <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.INDEX_TYPE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.INDEX_TYPE)}>
                 {LeaseRentsFieldTitles.INDEX_TYPE}
               </FormTextTitle>
               <FormText>{getLabelOfOption(indexTypeOptions, rent.index_type) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>}
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.DUE_DATES_TYPE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.DUE_DATES_TYPE)}>
               {LeaseRentsFieldTitles.DUE_DATES_TYPE}
             </FormTextTitle>
             <FormText>{getLabelOfOption(dueDatesTypeOptions, rent.due_dates_type) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         {rent.due_dates_type === RentDueDateTypes.CUSTOM && <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentDueDatesFieldPaths.DUE_DATES)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentDueDatesFieldPaths.DUE_DATES)}>
                 {LeaseRentDueDatesFieldTitles.DUE_DATES}
               </FormTextTitle>
               <FormText>{rent.due_dates && !!rent.due_dates.length ? formatDueDates(rent.due_dates) : 'Ei eräpäiviä'}</FormText>
+              </>
             </Authorization>
           </Column>}
         {rent.due_dates_type === RentDueDateTypes.FIXED && <Column small={6} medium={4} large={1}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.DUE_DATES_PER_YEAR)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.DUE_DATES_PER_YEAR)}>
                 {LeaseRentsFieldTitles.DUE_DATES_PER_YEAR}
               </FormTextTitle>
               <FormText>{rent.due_dates_per_year || '-'}</FormText>
+              </>
             </Authorization>
           </Column>}
         {rent.due_dates_type === RentDueDateTypes.FIXED && <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentDueDatesFieldPaths.DUE_DATES)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.YEARLY_DUE_DATES)}>
                 {LeaseRentsFieldTitles.YEARLY_DUE_DATES}
               </FormTextTitle>
               <FormText>{rent.yearly_due_dates && !!rent.yearly_due_dates.length ? formatDueDates(rent.yearly_due_dates) : 'Ei eräpäiviä'}</FormText>
+              </>
             </Authorization>
           </Column>}
       </Row>
@@ -131,18 +149,22 @@ const BasicInfoIndexOrManual = ({
       {rent.type === RentTypes.MANUAL && <Row>
           {(rent.cycle === RentCycles.JANUARY_TO_DECEMBER || rent.cycle === RentCycles.APRIL_TO_MARCH) && <Column small={6} medium={4} large={2}>
               <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.MANUAL_RATIO)}>
+                <>
                 <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.MANUAL_RATIO)}>
                   {LeaseRentsFieldTitles.MANUAL_RATIO}
                 </FormTextTitle>
                 <FormText>{!isEmptyValue(rent.manual_ratio) ? formatNumber(rent.manual_ratio) : '-'}</FormText>
+                </>
               </Authorization>
             </Column>}
           {rent.cycle === RentCycles.APRIL_TO_MARCH && <Column small={6} medium={4} large={2}>
               <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.MANUAL_RATIO_PREVIOUS)}>
+                <>
                 <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.MANUAL_RATIO_PREVIOUS)}>
                   {LeaseRentsFieldTitles.MANUAL_RATIO_PREVIOUS}
                 </FormTextTitle>
                 <FormText>{!isEmptyValue(rent.manual_ratio_previous) ? formatNumber(rent.manual_ratio_previous) : '-'}</FormText>
+                </>
               </Authorization>
             </Column>}
         </Row>}
@@ -156,10 +178,12 @@ const BasicInfoIndexOrManual = ({
         </Column>
         <Column small={12} medium={8} large={10}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.NOTE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.NOTE)}>
               {LeaseRentsFieldTitles.NOTE}
             </FormTextTitle>
             <FormText>{rent.note || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
@@ -167,50 +191,62 @@ const BasicInfoIndexOrManual = ({
       {oldValuesVisible && <Row>
           <Column small={12} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.ELEMENTARY_INDEX) || isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.INDEX_ROUNDING)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.INDEX_ROUNDING)}>Perusindeksi/pyöristys</FormTextTitle>
               <FormText>{rent.elementary_index || '-'} / {rent.index_rounding || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={4} medium={2} large={1}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.X_VALUE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.X_VALUE)}>
                 {LeaseRentsFieldTitles.X_VALUE}
               </FormTextTitle>
               <FormText>{rent.x_value || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={4} medium={2} large={1}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.Y_VALUE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.Y_VALUE)}>
                 {LeaseRentsFieldTitles.Y_VALUE}
               </FormTextTitle>
               <FormText>{rent.y_value || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           {rent.y_value_start && <Column small={4} medium={2} large={1}>
               <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.Y_VALUE_START)}>
+                <>
                 <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.Y_VALUE_START)}>
                   {LeaseRentsFieldTitles.Y_VALUE_START}
                 </FormTextTitle>
                 <FormText>{rent.y_value_start}</FormText>
+                </>
               </Authorization>
             </Column>}
           <Column small={12} medium={4} large={2}>
             <Row>
               {rent.equalization_start_date && <Column small={6}>
                 <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.EQUALIZATION_START_DATE)}>
+                  <>
                   <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.EQUALIZATION_START_DATE)}>
                     {LeaseRentsFieldTitles.EQUALIZATION_START_DATE}
                   </FormTextTitle>
                   <FormText>{formatDate(rent.equalization_start_date)}</FormText>
+                  </>
                 </Authorization>
               </Column>}
               {rent.equalization_end_date && <Column small={6}>
                 <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.EQUALIZATION_END_DATE)}>
+                  <>
                   <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.EQUALIZATION_END_DATE)}>
                     {LeaseRentsFieldTitles.EQUALIZATION_END_DATE}
                   </FormTextTitle>
                   <FormText>{formatDate(rent.equalization_end_date)}</FormText>
+                  </>
                 </Authorization>
               </Column>}
             </Row>
@@ -228,34 +264,42 @@ const BasicInfoOneTime = ({
       <Row>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.TYPE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.TYPE)}>
               {LeaseRentsFieldTitles.TYPE}
             </FormTextTitle>
             <FormText>{getLabelOfOption(typeOptions, rent.type) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={3} medium={2} large={1}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.START_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.START_DATE)}>
               {LeaseRentsFieldTitles.START_DATE}
             </FormTextTitle>
             <FormText>{formatDate(rent.start_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={3} medium={2} large={1}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.END_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.END_DATE)}>
               {LeaseRentsFieldTitles.END_DATE}
             </FormTextTitle>
             <FormText>{formatDate(rent.end_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.AMOUNT)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.AMOUNT)}>
               {LeaseRentsFieldTitles.AMOUNT}
             </FormTextTitle>
             <FormText>{!isEmptyValue(rent.amount) ? `${formatNumber(rent.amount)} €` : '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
@@ -283,58 +327,72 @@ const BasicInfoFixed = ({
       <Row>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.TYPE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.TYPE)}>
               {LeaseRentsFieldTitles.TYPE}
             </FormTextTitle>
             <FormText>{getLabelOfOption(typeOptions, rent.type) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={3} medium={2} large={1}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.START_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.START_DATE)}>
               {LeaseRentsFieldTitles.START_DATE}
             </FormTextTitle>
             <FormText>{formatDate(rent.start_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={3} medium={2} large={1}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.END_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.END_DATE)}>
               {LeaseRentsFieldTitles.END_DATE}
             </FormTextTitle>
             <FormText>{formatDate(rent.end_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.DUE_DATES_TYPE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.DUE_DATES_TYPE)}>
               {LeaseRentsFieldTitles.DUE_DATES_TYPE}
             </FormTextTitle>
             <FormText>{getLabelOfOption(dueDatesTypeOptions, rent.due_dates_type) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         {rent.due_dates_type === RentDueDateTypes.CUSTOM && <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentDueDatesFieldPaths.DUE_DATES)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentDueDatesFieldPaths.DUE_DATES)}>
                 {LeaseRentDueDatesFieldTitles.DUE_DATES}
               </FormTextTitle>
               <FormText>{rent.due_dates && !!rent.due_dates.length ? formatDueDates(rent.due_dates) : 'Ei eräpäiviä'}</FormText>
+              </>
             </Authorization>
           </Column>}
         {rent.due_dates_type === RentDueDateTypes.FIXED && <Column small={6} medium={4} large={1}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.DUE_DATES_PER_YEAR)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.DUE_DATES_PER_YEAR)}>
                 {LeaseRentsFieldTitles.DUE_DATES_PER_YEAR}
               </FormTextTitle>
               <FormText>{rent.due_dates_per_year || '-'}</FormText>
+              </>
             </Authorization>
           </Column>}
         {rent.due_dates_type === RentDueDateTypes.FIXED && <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentDueDatesFieldPaths.DUE_DATES)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.YEARLY_DUE_DATES)}>
                 {LeaseRentsFieldTitles.YEARLY_DUE_DATES}
               </FormTextTitle>
               <FormText>{rent.yearly_due_dates && !!rent.yearly_due_dates.length ? formatDueDates(rent.yearly_due_dates) : 'Ei eräpäiviä'}</FormText>
+              </>
             </Authorization>
           </Column>}
       </Row>
@@ -348,10 +406,12 @@ const BasicInfoFixed = ({
         </Column>
         <Column small={12} medium={8} large={10}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.NOTE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.NOTE)}>
               {LeaseRentsFieldTitles.NOTE}
             </FormTextTitle>
             <FormText>{rent.note || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
@@ -367,26 +427,32 @@ const BasicInfoFree = ({
       <Row>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.TYPE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.TYPE)}>
               {LeaseRentsFieldTitles.TYPE}
             </FormTextTitle>
             <FormText>{getLabelOfOption(typeOptions, rent.type) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={3} medium={2} large={1}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.START_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.START_DATE)}>
               {LeaseRentsFieldTitles.START_DATE}
             </FormTextTitle>
             <FormText>{formatDate(rent.start_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={3} medium={2} large={1}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.END_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.END_DATE)}>
               {LeaseRentsFieldTitles.END_DATE}
             </FormTextTitle>
             <FormText>{formatDate(rent.end_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
diff --git a/src/leases/components/leaseSections/rent/BasicInfoEdit.tsx b/src/leases/components/leaseSections/rent/BasicInfoEdit.tsx
index be5f0989b..38f08294c 100644
--- a/src/leases/components/leaseSections/rent/BasicInfoEdit.tsx
+++ b/src/leases/components/leaseSections/rent/BasicInfoEdit.tsx
@@ -3,29 +3,29 @@ import { connect } from "react-redux";
 import { change, Field, FieldArray, formValueSelector } from "redux-form";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
-import AddButtonThird from "components/form/AddButtonThird";
-import Authorization from "components/authorization/Authorization";
-import ErrorField from "components/form/ErrorField";
-import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import RemoveButton from "components/form/RemoveButton";
-import { rentCustomDateOptions } from "leases/constants";
-import { FieldTypes, FormNames } from "enums";
-import { DueDatesPositions, FixedDueDates, LeaseRentDueDatesFieldPaths, LeaseRentDueDatesFieldTitles, LeaseRentsFieldPaths, LeaseRentsFieldTitles, RentCycles, RentTypes, RentDueDateTypes } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { formatDueDates, formatSeasonalDate } from "leases/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getFieldAttributes, hasPermissions, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "util/helpers";
-import { getAttributes as getLeaseAttributes, getCurrentLease } from "leases/selectors";
-import { getLeaseTypeList } from "leaseType/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { PlotSearchFieldPaths } from "plotSearch/enums";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import Authorization from "@/components/authorization/Authorization";
+import ErrorField from "@/components/form/ErrorField";
+import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import RemoveButton from "@/components/form/RemoveButton";
+import { rentCustomDateOptions } from "@/leases/constants";
+import { FieldTypes, FormNames } from "@/enums";
+import { DueDatesPositions, FixedDueDates, LeaseRentDueDatesFieldPaths, LeaseRentDueDatesFieldTitles, LeaseRentsFieldPaths, LeaseRentsFieldTitles, RentCycles, RentTypes, RentDueDateTypes } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { formatDueDates, formatSeasonalDate } from "@/leases/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getFieldAttributes, hasPermissions, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes, getCurrentLease } from "@/leases/selectors";
+import { getLeaseTypeList } from "@/leaseType/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { PlotSearchFieldPaths } from "@/plotSearch/enums";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
-import type { LeaseTypeList } from "leaseType/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { Lease } from "@/leases/types";
+import type { LeaseTypeList } from "@/leaseType/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 const formName = FormNames.LEASE_RENTS;
 const selector = formValueSelector(formName);
 type SeasonalDatesProps = {
@@ -37,7 +37,7 @@ type SeasonalDatesProps = {
   seasonalStartDay: string | null | undefined;
   seasonalStartMonth: string | null | undefined;
 };
-const SeasonalDates = connect((state, props) => {
+const SeasonalDates = connect((state, props: Props) => {
   return {
     seasonalEndDay: selector(state, `${props.field}.seasonal_end_day`),
     seasonalEndMonth: selector(state, `${props.field}.seasonal_end_month`),
@@ -55,6 +55,7 @@ const SeasonalDates = connect((state, props) => {
   const startText = formatSeasonalDate(seasonalStartDay, seasonalStartMonth);
   const endText = formatSeasonalDate(seasonalEndDay, seasonalEndMonth);
   return <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.SEASONAL_END_DAY) || isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.SEASONAL_END_MONTH) || isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.SEASONAL_START_DAY) || isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.SEASONAL_START_MONTH)}>
+      <>
       <Row>
         <Column small={12}>
           <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.SEASONAL_DATES)}>
@@ -100,6 +101,7 @@ const SeasonalDates = connect((state, props) => {
           <Field name="seasonalDates" component={ErrorField} showError={isSaveClicked} />
         </Column>
       </Row>
+      </>
     </Authorization>;
 });
 type DueDatesProps = {
@@ -122,6 +124,7 @@ const renderDueDates = ({
   };
 
   return <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentDueDatesFieldPaths.DUE_DATES)}>
+      <>
       <Row>
         <Column>
           <FormTextTitle required={isFieldRequired(leaseAttributes, LeaseRentDueDatesFieldPaths.DUE_DATES)} enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseRentDueDatesFieldPaths.DUE_DATES)}>
@@ -167,6 +170,7 @@ const renderDueDates = ({
           </Column>
         </Row>
       </Authorization>
+      </>
     </Authorization>;
 };
 
@@ -277,10 +281,12 @@ const BasicInfoIndexOrManual = ({
           </Column>}
         {dueDatesType === RentDueDateTypes.FIXED && <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentDueDatesFieldPaths.DUE_DATES)}>
+              <>
               <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.YEARLY_DUE_DATES)}>
                 {LeaseRentsFieldTitles.YEARLY_DUE_DATES}
               </FormTextTitle>
               <FormText>{yearlyDueDates && !!yearlyDueDates ? formatDueDates(yearlyDueDates) : '-'}</FormText>
+              </>
             </Authorization>
           </Column>}
       </Row>
@@ -442,10 +448,12 @@ const BasicInfoFixed = ({
           </Column>}
         {dueDatesType === RentDueDateTypes.FIXED && <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentDueDatesFieldPaths.DUE_DATES)}>
+              <>
               <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.YEARLY_DUE_DATES)}>
                 {LeaseRentsFieldTitles.YEARLY_DUE_DATES}
               </FormTextTitle>
               <FormText>{yearlyDueDates && !!yearlyDueDates ? formatDueDates(yearlyDueDates) : '-'}</FormText>
+              </>
             </Authorization>
           </Column>}
       </Row>
diff --git a/src/leases/components/leaseSections/rent/BasisOfRent.tsx b/src/leases/components/leaseSections/rent/BasisOfRent.tsx
index 8f1f3b4e0..6106b30e1 100644
--- a/src/leases/components/leaseSections/rent/BasisOfRent.tsx
+++ b/src/leases/components/leaseSections/rent/BasisOfRent.tsx
@@ -1,23 +1,23 @@
 import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
-import ActionButtonWrapper from "components/form/ActionButtonWrapper";
-import Authorization from "components/authorization/Authorization";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import BoxItem from "components/content/BoxItem";
-import Divider from "components/content/Divider";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import RemoveButton from "components/form/RemoveButton";
-import SubTitle from "components/content/SubTitle";
-import UnarchiveButton from "components/form/UnarchiveButton";
-import WhiteBox from "components/content/WhiteBox";
-import { BasisOfRentManagementSubventionsFieldPaths, BasisOfRentManagementSubventionsFieldTitles, BasisOfRentTemporarySubventionsFieldPaths, BasisOfRentTemporarySubventionsFieldTitles, LeaseBasisOfRentsFieldPaths, LeaseBasisOfRentsFieldTitles, SubventionTypes, CalculatorTypes, calculatorTypeOptions } from "leases/enums";
-import { getBasisOfRentAmountPerArea, calculateBasisOfRentBasicAnnualRent, calculateBasisOfRentDiscountedInitialYearRent, calculateBasisOfRentInitialYearRent, calculateBasisOfRentSubventionAmount, calculateBasisOfRentSubventionAmountCumulative, calculateBasisOfRentSubventionPercentage, calculateReLeaseDiscountPercent, calculateBasisOfRentSubventionPercent, calculateSubventionDiscountTotal, calculateSubventionDiscountTotalFromReLease, calculateTemporarySubventionDiscountPercentage, getBasisOfRentIndexValue, calculateExtraRent, calculateFieldsRent, calculateTemporaryRent, calculateBasicAnnualRentIndexed, mastCalculatorRent, calculateRackAndHeightPrice, getZonePriceFromValue } from "leases/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getUserFullName } from "users/helpers";
-import { formatDate, formatNumber, getLabelOfOption, isEmptyValue, isFieldAllowedToEdit, isFieldAllowedToRead, getFieldOptions } from "util/helpers";
-import { getAttributes as getLeaseAttributes } from "leases/selectors";
+import ActionButtonWrapper from "@/components/form/ActionButtonWrapper";
+import Authorization from "@/components/authorization/Authorization";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import BoxItem from "@/components/content/BoxItem";
+import Divider from "@/components/content/Divider";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import RemoveButton from "@/components/form/RemoveButton";
+import SubTitle from "@/components/content/SubTitle";
+import UnarchiveButton from "@/components/form/UnarchiveButton";
+import WhiteBox from "@/components/content/WhiteBox";
+import { BasisOfRentManagementSubventionsFieldPaths, BasisOfRentManagementSubventionsFieldTitles, BasisOfRentTemporarySubventionsFieldPaths, BasisOfRentTemporarySubventionsFieldTitles, LeaseBasisOfRentsFieldPaths, LeaseBasisOfRentsFieldTitles, SubventionTypes, CalculatorTypes, calculatorTypeOptions } from "@/leases/enums";
+import { getBasisOfRentAmountPerArea, calculateBasisOfRentBasicAnnualRent, calculateBasisOfRentDiscountedInitialYearRent, calculateBasisOfRentInitialYearRent, calculateBasisOfRentSubventionAmount, calculateBasisOfRentSubventionAmountCumulative, calculateBasisOfRentSubventionPercentage, calculateReLeaseDiscountPercent, calculateBasisOfRentSubventionPercent, calculateSubventionDiscountTotal, calculateSubventionDiscountTotalFromReLease, calculateTemporarySubventionDiscountPercentage, getBasisOfRentIndexValue, calculateExtraRent, calculateFieldsRent, calculateTemporaryRent, calculateBasicAnnualRentIndexed, mastCalculatorRent, calculateRackAndHeightPrice, getZonePriceFromValue } from "@/leases/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getUserFullName } from "@/users/helpers";
+import { formatDate, formatNumber, getLabelOfOption, isEmptyValue, isFieldAllowedToEdit, isFieldAllowedToRead, getFieldOptions } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes } from "@/leases/selectors";
 import type { Attributes } from "types";
 type Props = {
   areaUnitOptions: Array<Record<string, any>>;
@@ -139,42 +139,52 @@ const BasisOfRent = ({
 
   // Indeksi
   const renderIndexFormField = () => <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.INDEX)}>
+      <>
       <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.INDEX)}>
         {LeaseBasisOfRentsFieldTitles.INDEX}
       </FormTextTitle>
       <FormText>{getLabelOfOption(indexOptions, basisOfRent.index) || '-'}</FormText>
+      </>
     </Authorization>;
 
   // Yksikköhinta (ind)
   const renderUnitPriceFormField = () => <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.INDEX)}>
+      <>
       <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.UNIT_PRICE)}>
         {LeaseBasisOfRentsFieldTitles.UNIT_PRICE}
       </FormTextTitle>
       <FormText>{currentAmountPerAreaText}</FormText>
+      </>
     </Authorization>;
 
   // Tuottoprosentti
   const renderProfitMarginPercentageFormField = () => <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.PROFIT_MARGIN_PERCENTAGE)}>
+      <>
       <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.PROFIT_MARGIN_PERCENTAGE)}>
         {LeaseBasisOfRentsFieldTitles.PROFIT_MARGIN_PERCENTAGE}
       </FormTextTitle>
       <FormText>{!isEmptyValue(basisOfRent.profit_margin_percentage) ? `${formatNumber(basisOfRent.profit_margin_percentage)} %` : '-'}</FormText>
+      </>
     </Authorization>;
 
   // Perusvuosivuokra (ind 100)
   const renderBaseYearRentFormField = () => <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+      <>
       <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.BASE_YEAR_RENT)}>
         {LeaseBasisOfRentsFieldTitles.BASE_YEAR_RENT}
       </FormTextTitle>
       <FormText>{!isEmptyValue(basicAnnualRent) ? `${formatNumber(basicAnnualRent)} €/v` : '-'}</FormText>
+      </>
     </Authorization>;
 
   // Alkuvuosivuokra (ind)
   const renderInitialYearRentFormField = () => <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.INDEX) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.PROFIT_MARGIN_PERCENTAGE)}>
+      <>
       <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.INITIAL_YEAR_RENT)}>
         {LeaseBasisOfRentsFieldTitles.INITIAL_YEAR_RENT}
       </FormTextTitle>
       <FormText>{!isEmptyValue(initialYearRent) ? `${formatNumber(initialYearRent)} €/v` : '-'}</FormText>
+      </>
     </Authorization>;
 
   return <BoxItem className='no-border-on-first-child no-border-on-last-child'>
@@ -190,48 +200,62 @@ const BasisOfRent = ({
         <Row>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.TYPE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.TYPE)}>
                 Laskurin tyyppi
               </FormTextTitle>
               <FormText>{getLabelOfOption(calculatorTypeOptions, calculatorType) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           {calculatorType === CalculatorTypes.MAST && <Column large={5} medium={9} small={12}>
             <Row>
               <Column small={6} medium={4} large={2}>
                 <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+                  <>
                   <FormTextTitle>{'Laskuri'}</FormTextTitle>
                   <FormText>{`Alue`}</FormText>
+                  </>
                 </Authorization>
               </Column>
               <Column small={6} medium={4} large={2}>
                 <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+                  <>
                   <FormTextTitle>{'Hinta'}</FormTextTitle>
                   <FormText>{!isEmptyValue(basisOfRent.amount_per_area) ? `${formatNumber(basisOfRent.amount_per_area)} €` : '-'}</FormText>
+                  </>
                 </Authorization>
               </Column>
               <Column small={6} medium={4} large={2}>
                 <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+                  <>
                   <FormTextTitle>{'Kerroin'}</FormTextTitle>
                   <FormText>{`*1,5`}</FormText>
+                  </>
                 </Authorization>
               </Column>
               <Column small={6} medium={4} large={2}>
                 <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA)}>
+                  <>
                   <FormTextTitle>{'Ala/korkeus'}</FormTextTitle>
                   <FormText>{!isEmptyValue(basisOfRent.area) ? `${formatNumber(basisOfRent.area)}` : '-'}</FormText>
+                  </>
                 </Authorization>
               </Column>
               <Column small={6} medium={4} large={2}>
                 <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+                  <>
                   <FormTextTitle>{'Yksikkö'}</FormTextTitle>
                   <FormText>{`m${String.fromCharCode(178)}`}</FormText>
+                  </>
                 </Authorization>
               </Column>
               <Column small={6} medium={4} large={2}>
                 <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+                  <>
                   <FormTextTitle>{'Vuokra'}</FormTextTitle>
                   <FormText>{!isEmptyValue(mastAreaRent) ? `${formatNumber(mastAreaRent)} €` : '-'}</FormText>
+                  </>
                 </Authorization>
               </Column>
             </Row>
@@ -240,14 +264,18 @@ const BasisOfRent = ({
             return <Row key={index}>
                 <Column small={6} medium={4} large={2}>
                   <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+                    <>
                     {index === 0 && <FormText>{`Laitekaappi`}</FormText>}
                     {index === 1 && <FormText>{`Masto`}</FormText>}
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={6} medium={4} large={2}>
                   <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+                    <>
                     {index === 0 && <FormText>{`1000,00 €`}</FormText>}
                     {index === 1 && <FormText>{`600,00 €`}</FormText>}
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={6} medium={4} large={2}>
@@ -261,8 +289,10 @@ const BasisOfRent = ({
                 </Column>
                 <Column small={6} medium={4} large={2}>
                   <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+                    <>
                     {index === 0 && <FormText>{`k-m${String.fromCharCode(178)}`}</FormText>}
                     {index === 1 && <FormText>{`m`}</FormText>}
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={6} medium={4} large={2}>
@@ -275,58 +305,72 @@ const BasisOfRent = ({
           </Column>}
           {(calculatorType === CalculatorTypes.LEASE || calculatorType === CalculatorTypes.LEASE2022) && <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.INTENDED_USE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.INTENDED_USE)}>
                 {LeaseBasisOfRentsFieldTitles.INTENDED_USE}
               </FormTextTitle>
               <FormText>{getLabelOfOption(intendedUseOptions, basisOfRent.intended_use) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>}
           {calculatorType === CalculatorTypes.TEMPORARY && <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.ZONE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.ZONE)}>
                 {LeaseBasisOfRentsFieldTitles.ZONE}
               </FormTextTitle>
               <FormText>{getLabelOfOption(zoneOptions, basisOfRent.zone) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>}
           {calculatorType === CalculatorTypes.TEMPORARY && <Column small={3} medium={2} large={1}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.ZONE)}>
+              <>
               <FormTextTitle>
                 {LeaseBasisOfRentsFieldTitles.PRICE}
               </FormTextTitle>
               <FormText>{!isEmptyValue(zonePrice) ? `${formatNumber(zonePrice)} €` : '-'}</FormText>
+              </>
             </Authorization>
           </Column>}
           {(calculatorType === CalculatorTypes.ADDITIONAL_YARD || calculatorType === CalculatorTypes.FIELD) && <Column small={3} medium={2} large={1}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+              <>
               <FormTextTitle>
                 {'Hinta'}
               </FormTextTitle>
               <FormText>{!isEmptyValue(basisOfRent.amount_per_area) ? `${formatNumber(basisOfRent.amount_per_area)} €` : '-'}</FormText>
+              </>
             </Authorization>
           </Column>}
           {calculatorType === CalculatorTypes.ADDITIONAL_YARD && <Column small={3} medium={2} large={1}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA)}>
+              <>
               <FormTextTitle>
                 {'Kerroin'}
               </FormTextTitle>
               <FormText>{'* 1,5'}</FormText>
+              </>
             </Authorization>
           </Column>}
           {(calculatorType === CalculatorTypes.LEASE || calculatorType === CalculatorTypes.LEASE2022) && <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.AREA)}>
                 {LeaseBasisOfRentsFieldTitles.AREA}
               </FormTextTitle>
               <FormText>{areaText}</FormText>
+              </>
             </Authorization>
           </Column>}
           {calculatorType !== CalculatorTypes.MAST && calculatorType !== CalculatorTypes.LEASE && calculatorType !== CalculatorTypes.LEASE2022 && <Column small={3} medium={2} large={1}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.AREA)}>
                 {LeaseBasisOfRentsFieldTitles.AREA}
               </FormTextTitle>
               <FormText>{areaText}</FormText>
+              </>
             </Authorization>
           </Column>}
           {calculatorType === CalculatorTypes.ADDITIONAL_YARD && <Column small={3} medium={2} large={1} style={{
@@ -338,6 +382,7 @@ const BasisOfRent = ({
           </Column>}
           {calculatorType !== CalculatorTypes.MAST && calculatorType !== CalculatorTypes.LEASE && calculatorType !== CalculatorTypes.LEASE2022 && <Column small={3} medium={2} large={1}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+              <>
               {calculatorType === CalculatorTypes.TEMPORARY && <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.BASE_YEAR_RENT)}>
                 {'Vuokra/kk'}
               </FormTextTitle>}
@@ -347,32 +392,39 @@ const BasisOfRent = ({
               {calculatorType === CalculatorTypes.TEMPORARY && <FormText>{!isEmptyValue(rent) ? `${formatNumber(rent)} €` : '-'}</FormText>}
               {calculatorType === CalculatorTypes.ADDITIONAL_YARD && <FormText>{!isEmptyValue(rentExtra) ? `${formatNumber(rentExtra)} €` : '-'}</FormText>}
               {calculatorType === CalculatorTypes.FIELD && <FormText>{!isEmptyValue(fieldsRent) ? `${formatNumber(fieldsRent)} €` : '-'}</FormText>}
+              </>
             </Authorization>
           </Column>}
           {calculatorType !== CalculatorTypes.MAST && calculatorType !== CalculatorTypes.LEASE && calculatorType !== CalculatorTypes.LEASE2022 && <Column small={3} medium={2} large={1}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+              <>
               {calculatorType === CalculatorTypes.TEMPORARY && <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.BASE_YEAR_RENT)}>
                 {'Vuokra/vuosi'}
               </FormTextTitle>}
               {calculatorType === CalculatorTypes.TEMPORARY && <FormText>{!isEmptyValue(rent) ? `${formatNumber(rent * 12)} €` : '-'}</FormText>}
+              </>
             </Authorization>
           </Column>}
           {calculatorType !== CalculatorTypes.LEASE && calculatorType !== CalculatorTypes.LEASE2022 && calculatorType !== CalculatorTypes.MAST && <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.INDEX)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.INDEX)}>
                 {LeaseBasisOfRentsFieldTitles.INDEX}
               </FormTextTitle>
               <FormText>{getLabelOfOption(indexOptions, basisOfRent.index) || '-'}</FormText>
+              </>
             </Authorization>
           </Column>}
           {calculatorType !== CalculatorTypes.LEASE && calculatorType !== CalculatorTypes.LEASE2022 && calculatorType !== CalculatorTypes.MAST && <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+              <>
               <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.BASE_YEAR_RENT)}>
                 {LeaseBasisOfRentsFieldTitles.BASE_YEAR_RENT}
               </FormTextTitle>
               {calculatorType === CalculatorTypes.TEMPORARY && <FormText>{!isEmptyValue(temporaryRentIndexed) ? `${formatNumber(temporaryRentIndexed)} €/v` : '-'}</FormText>}
               {calculatorType === CalculatorTypes.ADDITIONAL_YARD && <FormText>{!isEmptyValue(rentExtraIndexed) ? `${formatNumber(rentExtraIndexed)} €/v` : '-'}</FormText>}
               {calculatorType === CalculatorTypes.FIELD && <FormText>{!isEmptyValue(basicAnnualFieldRentIndexed) ? `${formatNumber(basicAnnualFieldRentIndexed)} €/v` : '-'}</FormText>}
+              </>
             </Authorization>
           </Column>}
         </Row>
@@ -389,6 +441,7 @@ const BasisOfRent = ({
         </Row>}
         {calculatorType === CalculatorTypes.MAST && <Row>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+            <>
             <Column large={2} medium={4} small={6}>
             </Column>
             <Column>
@@ -412,34 +465,41 @@ const BasisOfRent = ({
                 marginTop: -15
               }}>
                   <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.INDEX)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.INDEX)}>
                       {LeaseBasisOfRentsFieldTitles.INDEX}
                     </FormTextTitle>
                     <FormText>{getLabelOfOption(indexOptions, basisOfRent.index) || '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={6} medium={4} large={2} style={{
                 marginTop: -15
               }}>
                   <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+                    <>
                     <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.BASE_YEAR_RENT)}>
                       {LeaseBasisOfRentsFieldTitles.BASE_YEAR_RENT}
                     </FormTextTitle>
                     <FormText>{!isEmptyValue(mastTotalIndexed) ? `${formatNumber(mastTotalIndexed)} €/v` : '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
               </Row>
             </Column>
+            </>
           </Authorization>
         </Row>}
 
         {calculatorType === CalculatorTypes.LEASE && <Row>
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
                 {LeaseBasisOfRentsFieldTitles.AMOUNT_PER_AREA}
               </FormTextTitle>
               <FormText>{amountPerAreaText}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={4} large={2}>{renderIndexFormField()}</Column>
@@ -461,18 +521,22 @@ const BasisOfRent = ({
           {(basisOfRent.subvention_type === SubventionTypes.FORM_OF_MANAGEMENT || basisOfRent.subvention_type === SubventionTypes.RE_LEASE) && <Row>
             <Column small={6} medium={4} large={2}>
               <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.DISCOUNT_PERCENTAGE)}>
+                <>
                 <FormTextTitle>
                   {LeaseBasisOfRentsFieldTitles.SUBVENTION_DISCOUNT_PERCENTAGE}
                 </FormTextTitle>
                 <FormText>{!isEmptyValue(discountPercentage) ? `${formatNumber(discountPercentage)} %` : '-'}</FormText>
+                </>
               </Authorization>
             </Column>
             <Column small={6} medium={4} large={2}>
               <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.DISCOUNT_PERCENTAGE)}>
+                <>
                 <FormTextTitle>
                   {LeaseBasisOfRentsFieldTitles.DISCOUNTED_INITIAL}
                 </FormTextTitle>
                 <FormText>{!isEmptyValue(subventionDiscountedInitial) ? `${formatNumber(subventionDiscountedInitial)} €/v` : '-'}</FormText>
+                </>
               </Authorization>
             </Column>
             <Column small={0} medium={4} large={8}></Column>
@@ -480,10 +544,12 @@ const BasisOfRent = ({
           {temporarySubventions && <Row>
             <Column small={12} medium={12} large={12}>
               <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.DISCOUNT_PERCENTAGE)}>
+                <>
                 <FormTextTitle>
                   {LeaseBasisOfRentsFieldTitles.TEMPORARY_DISCOUNT_PERCENTAGE}
                 </FormTextTitle>
                 <FormText>{!isEmptyValue(temporarySubventionDiscountPercentage) ? `${formatNumber(temporarySubventionDiscountPercentage)} %` : '-'}</FormText>
+                </>
               </Authorization>
             </Column>
           </Row>}
@@ -492,52 +558,64 @@ const BasisOfRent = ({
         {(calculatorType === CalculatorTypes.LEASE || calculatorType === CalculatorTypes.LEASE2022) && <Row>
           <Column small={6} medium={4} large={2} hidden>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.DISCOUNT_PERCENTAGE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.DISCOUNT_PERCENTAGE)}>
                 {LeaseBasisOfRentsFieldTitles.DISCOUNT_PERCENTAGE}
               </FormTextTitle>
               <FormText>{!isEmptyValue(basisOfRent.discount_percentage) ? `${basisOfRent.discount_percentage} %` : '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={4} large={3}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.INDEX) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.PROFIT_MARGIN_PERCENTAGE) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.DISCOUNT_PERCENTAGE)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.DISCOUNTED_INITIAL_YEAR_RENT)}>
                 {LeaseBasisOfRentsFieldTitles.DISCOUNTED_INITIAL_YEAR_RENT}
               </FormTextTitle>
               <FormText>{!isEmptyValue(discountedInitialYearRent) ? `${formatNumber(discountedInitialYearRent)} €/v` : '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={4} large={1}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.INDEX) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.PROFIT_MARGIN_PERCENTAGE) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.DISCOUNT_PERCENTAGE)}>
+              <>
               <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.DISCOUNTED_INITIAL_YEAR_RENT_PER_MONTH)}>
                 {LeaseBasisOfRentsFieldTitles.DISCOUNTED_INITIAL_YEAR_RENT_PER_MONTH}
               </FormTextTitle>
               <FormText>{!isEmptyValue(rentPerMonth) ? `${formatNumber(rentPerMonth)} €` : '-'}</FormText>
+              </>
             </Authorization>
           </Column>
           <Column small={6} medium={4} large={1}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.INDEX) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.PROFIT_MARGIN_PERCENTAGE) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.DISCOUNT_PERCENTAGE)}>
+              <>
               <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.DISCOUNTED_INITIAL_YEAR_RENT_PER_2_MONTHS)}>
                 {LeaseBasisOfRentsFieldTitles.DISCOUNTED_INITIAL_YEAR_RENT_PER_2_MONTHS}
               </FormTextTitle>
               <FormText>{!isEmptyValue(rentPer2Months) ? `${formatNumber(rentPer2Months)} €` : '-'}</FormText>
+              </>
             </Authorization>
           </Column>
 
           {showTotal && <Fragment>
             <Column small={6} medium={4} large={2}>
               <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.INDEX) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.PROFIT_MARGIN_PERCENTAGE) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.DISCOUNT_PERCENTAGE)}>
+                <>
                 <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.DISCOUNTED_INITIAL_YEAR_RENT_PER_MONTH_TOTAL)}>
                   {LeaseBasisOfRentsFieldTitles.DISCOUNTED_INITIAL_YEAR_RENT_PER_MONTH_TOTAL}
                 </FormTextTitle>
                 <FormText>{!isEmptyValue(rentPerMonthTotal) ? `${formatNumber(rentPerMonthTotal)} €` : '-'}</FormText>
+                </>
               </Authorization>
             </Column>
             <Column small={6} medium={4} large={2}>
               <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.INDEX) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.PROFIT_MARGIN_PERCENTAGE) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.DISCOUNT_PERCENTAGE)}>
+                <>
                 <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.DISCOUNTED_INITIAL_YEAR_RENT_PER_2_MONTHS_TOTAL)}>
                   {LeaseBasisOfRentsFieldTitles.DISCOUNTED_INITIAL_YEAR_RENT_PER_2_MONTHS_TOTAL}
                 </FormTextTitle>
                 <FormText>{!isEmptyValue(rentPer2MonthsTotal) ? `${formatNumber(rentPer2MonthsTotal)} €` : '-'}</FormText>
+                </>
               </Authorization>
             </Column>
           </Fragment>}
@@ -546,18 +624,22 @@ const BasisOfRent = ({
         <Row>
           {(calculatorType === CalculatorTypes.LEASE || calculatorType === CalculatorTypes.LEASE2022) && <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.PLANS_INSPECTED_AT)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.PLANS_INSPECTED_AT)}>
                 {LeaseBasisOfRentsFieldTitles.PLANS_INSPECTED_AT}
               </FormTextTitle>
               <FormText>{plansInspectedText}</FormText>
+              </>
             </Authorization>
           </Column>}
           <Column small={6} medium={4} large={2}>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.LOCKED_AT)}>
+              <>
               <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.LOCKED_AT)}>
                 {LeaseBasisOfRentsFieldTitles.LOCKED_AT}
               </FormTextTitle>
               <FormText>{lockedText}</FormText>
+              </>
             </Authorization>
           </Column>
         </Row>
@@ -566,14 +648,17 @@ const BasisOfRent = ({
             {basisOfRent.subvention_type && <Row>
               <Column small={6} medium={4} large={2}>
                 <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.SUBVENTION_TYPE)}>
+                  <>
                   <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.SUBVENTION_TYPE)}>
                     {LeaseBasisOfRentsFieldTitles.SUBVENTION_TYPE}
                   </FormTextTitle>
                   <FormText>{getLabelOfOption(subventionTypeOptions, basisOfRent.subvention_type) || '-'}</FormText>
+                  </>
                 </Authorization>
               </Column>
             </Row>}
             {basisOfRent.subvention_type === SubventionTypes.FORM_OF_MANAGEMENT && <Authorization allow={isFieldAllowedToRead(leaseAttributes, BasisOfRentManagementSubventionsFieldPaths.MANAGEMENT_SUBVENTIONS)}>
+                <>
                 <SubTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(BasisOfRentManagementSubventionsFieldPaths.MANAGEMENT_SUBVENTIONS)}>{BasisOfRentManagementSubventionsFieldTitles.MANAGEMENT_SUBVENTIONS}</SubTitle>
                 {!managementSubventions || !managementSubventions.length && <FormText>Ei hallintamuotoja</FormText>}
                 {managementSubventions && !!managementSubventions.length && <Fragment>
@@ -638,43 +723,53 @@ const BasisOfRent = ({
                         </Row>;
             })}
                   </Fragment>}
+                </>
               </Authorization>}
             {basisOfRent.subvention_type === SubventionTypes.RE_LEASE && <Row>
                 <Column small={4} large={2}>
                   <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.SUBVENTION_BASE_PERCENT)}>
+                    <>
                     <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.SUBVENTION_BASE_PERCENT)}>
                       {LeaseBasisOfRentsFieldTitles.SUBVENTION_BASE_PERCENT}
                     </FormTextTitle>
                     <FormText>{!isEmptyValue(basisOfRent.subvention_base_percent) ? `${formatNumber(basisOfRent.subvention_base_percent)} %` : '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={4} large={2}>
                   <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.SUBVENTION_GRADUATED_PERCENT)}>
+                    <>
                     <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.SUBVENTION_GRADUATED_PERCENT)}>
                       {LeaseBasisOfRentsFieldTitles.SUBVENTION_GRADUATED_PERCENT}
                     </FormTextTitle>
                     <FormText>{!isEmptyValue(basisOfRent.subvention_graduated_percent) ? `${formatNumber(basisOfRent.subvention_graduated_percent)} %` : '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={4} large={2}>
                   <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.SUBVENTION_BASE_PERCENT) || isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.SUBVENTION_BASE_PERCENT)}>
+                    <>
                     <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.SUBVENTION_RE_LEASE_DISCOUNT_PRECENT)}>
                       {LeaseBasisOfRentsFieldTitles.SUBVENTION_RE_LEASE_DISCOUNT_PRECENT}
                     </FormTextTitle>
                     <FormText>{formatNumber(reLeaseDiscountPercent)} %</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={4} large={2}>
                   <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.SUBVENTION_BASE_PERCENT) || isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.SUBVENTION_BASE_PERCENT)}>
+                    <>
                     <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.SUBVENTION_RE_LEASE_DISCOUNT_AMOUNT)}>
                       {LeaseBasisOfRentsFieldTitles.SUBVENTION_RE_LEASE_DISCOUNT_AMOUNT}
                     </FormTextTitle>
                     <FormText>{formatNumber(reLeaseDiscountAmount)} €</FormText>
+                    </>
                   </Authorization>
                 </Column>
               </Row>}
 
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, BasisOfRentTemporarySubventionsFieldPaths.TEMPORARY_SUBVENTIONS)}>
+              <>
               <SubTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(BasisOfRentTemporarySubventionsFieldPaths.TEMPORARY_SUBVENTIONS)}>
                 {BasisOfRentTemporarySubventionsFieldTitles.TEMPORARY_SUBVENTIONS}
               </SubTitle>
@@ -725,8 +820,10 @@ const BasisOfRent = ({
                       </Row>;
             })}
                 </Fragment>}
+              </>
             </Authorization>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.INDEX)}>
+              <>
               <Row>
                 <Column small={12} large={8}>
                   <Divider />
@@ -740,6 +837,7 @@ const BasisOfRent = ({
                   <FormText className='semibold'>{formatNumber(totalSubventionAmount)} €</FormText>
                 </Column>
               </Row>
+              </>
             </Authorization>
           </WhiteBox>}
       </BoxContentWrapper>
diff --git a/src/leases/components/leaseSections/rent/BasisOfRentEdit.tsx b/src/leases/components/leaseSections/rent/BasisOfRentEdit.tsx
index c5e469322..df4895d78 100644
--- a/src/leases/components/leaseSections/rent/BasisOfRentEdit.tsx
+++ b/src/leases/components/leaseSections/rent/BasisOfRentEdit.tsx
@@ -2,38 +2,38 @@ import React, { Fragment, PureComponent, ReactElement } from "react";
 import { connect } from "react-redux";
 import { change, FieldArray, formValueSelector, clearFields } from "redux-form";
 import { Row, Column } from "react-foundation";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import ActionButtonWrapper from "components/form/ActionButtonWrapper";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import AddButtonThird from "components/form/AddButtonThird";
-import ArchiveButton from "components/form/ArchiveButton";
-import Authorization from "components/authorization/Authorization";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import ActionButtonWrapper from "@/components/form/ActionButtonWrapper";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import ArchiveButton from "@/components/form/ArchiveButton";
+import Authorization from "@/components/authorization/Authorization";
 import BasisOfRent from "./BasisOfRent";
 import BasisOfRentManagementSubventionEdit from "./BasisOfRentManagementSubventionEdit";
 import BasisOfRentTemporarySubventionEdit from "./BasisOfRentTemporarySubventionEdit";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import BoxItem from "components/content/BoxItem";
-import CopyToClipboardButton from "components/form/CopyToClipboardButton";
-import Divider from "components/content/Divider";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import RemoveButton from "components/form/RemoveButton";
-import SubTitle from "components/content/SubTitle";
-import WhiteBox from "components/content/WhiteBox";
-import { ConfirmationModalTexts } from "enums";
-import { ButtonColors } from "components/enums";
-import { BasisOfRentManagementSubventionsFieldPaths, BasisOfRentManagementSubventionsFieldTitles, BasisOfRentTemporarySubventionsFieldPaths, BasisOfRentTemporarySubventionsFieldTitles, CalculatorTypes, LeaseBasisOfRentsFieldPaths, LeaseBasisOfRentsFieldTitles, SubventionTypes } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getBasisOfRentAmountPerArea, calculateAmountFromValue, calculateBasisOfRentBasicAnnualRent, calculateBasisOfRentDiscountedInitialYearRent, calculateBasisOfRentInitialYearRent, calculateBasisOfRentSubventionAmount, calculateReLeaseDiscountPercent, calculateBasicAnnualRentIndexed, calculateBasisOfRentSubventionPercent, calculateSubventionDiscountTotal, calculateSubventionDiscountTotalFromReLease, calculateTemporarySubventionDiscountPercentage, calculateExtraRent, calculateFieldsRent, calculateRackAndHeightPrice, calculateTemporaryRent, getBasisOfRentIndexValue, getBasisOfRentById, getZonePriceFromValue } from "leases/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getUserFullName } from "users/helpers";
-import { copyElementContentsToClipboard, displayUIMessage, formatDate, formatNumber, getFieldAttributes, getLabelOfOption, hasPermissions, isEmptyValue, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "util/helpers";
-import { getAttributes as getLeaseAttributes, getCurrentLease } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import BoxItem from "@/components/content/BoxItem";
+import CopyToClipboardButton from "@/components/form/CopyToClipboardButton";
+import Divider from "@/components/content/Divider";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import RemoveButton from "@/components/form/RemoveButton";
+import SubTitle from "@/components/content/SubTitle";
+import WhiteBox from "@/components/content/WhiteBox";
+import { ConfirmationModalTexts } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { BasisOfRentManagementSubventionsFieldPaths, BasisOfRentManagementSubventionsFieldTitles, BasisOfRentTemporarySubventionsFieldPaths, BasisOfRentTemporarySubventionsFieldTitles, CalculatorTypes, LeaseBasisOfRentsFieldPaths, LeaseBasisOfRentsFieldTitles, SubventionTypes } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getBasisOfRentAmountPerArea, calculateAmountFromValue, calculateBasisOfRentBasicAnnualRent, calculateBasisOfRentDiscountedInitialYearRent, calculateBasisOfRentInitialYearRent, calculateBasisOfRentSubventionAmount, calculateReLeaseDiscountPercent, calculateBasicAnnualRentIndexed, calculateBasisOfRentSubventionPercent, calculateSubventionDiscountTotal, calculateSubventionDiscountTotalFromReLease, calculateTemporarySubventionDiscountPercentage, calculateExtraRent, calculateFieldsRent, calculateRackAndHeightPrice, calculateTemporaryRent, getBasisOfRentIndexValue, getBasisOfRentById, getZonePriceFromValue } from "@/leases/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getUserFullName } from "@/users/helpers";
+import { copyElementContentsToClipboard, displayUIMessage, formatDate, formatNumber, getFieldAttributes, getLabelOfOption, hasPermissions, isEmptyValue, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes, getCurrentLease } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { Lease } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 import MastChildrenEdit from "./MastChildrenEdit";
 type ManagementSubventionsProps = {
   currentAmountPerArea: number;
@@ -738,6 +738,7 @@ class BasisOfRentEdit extends PureComponent<Props, State> {
     // Yksikköhinta (ind)
     // text input
     const renderUnitPriceFormField = (showLabel: boolean) => <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.INDEX)}>
+        <>
         {showLabel && <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.UNIT_PRICE)}>
             {LeaseBasisOfRentsFieldTitles.UNIT_PRICE}
           </FormTextTitle>}
@@ -751,6 +752,7 @@ class BasisOfRentEdit extends PureComponent<Props, State> {
       }} disabled={isLocked} name={`${field}.current_amount_per_area`} unit='€' invisibleLabel overrideValues={{
         label: LeaseBasisOfRentsFieldTitles.AMOUNT_PER_AREA
       }} />
+        </>
       </Authorization>;
 
     // Tuottoprosentti
@@ -768,10 +770,12 @@ class BasisOfRentEdit extends PureComponent<Props, State> {
     // Alkuvuosivuokra (ind)
     // Read only text
     const renderInitialYearRentFormField = () => <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.INDEX) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.PROFIT_MARGIN_PERCENTAGE)}>
+        <>
         <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.INITIAL_YEAR_RENT)}>
           {LeaseBasisOfRentsFieldTitles.INITIAL_YEAR_RENT}
         </FormTextTitle>
         <FormText>{!isEmptyValue(initialYearRent) ? `${formatNumber(initialYearRent)} €/v` : '-'}</FormText>
+        </>
       </Authorization>;
 
     // Indeksi
@@ -788,10 +792,12 @@ class BasisOfRentEdit extends PureComponent<Props, State> {
     // Perusvuosivuokra (ind 100)
     // Read only
     const renderBaseYearRentFormField = () => <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+        <>
         <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.BASE_YEAR_RENT)}>
           {LeaseBasisOfRentsFieldTitles.BASE_YEAR_RENT}
         </FormTextTitle>
         <FormText>{!isEmptyValue(basicAnnualRent) ? `${formatNumber(basicAnnualRent)} €/v` : '-'}</FormText>
+        </>
       </Authorization>;
 
     if (archived && savedBasisOfRent) {
@@ -828,9 +834,12 @@ class BasisOfRentEdit extends PureComponent<Props, State> {
             </Column>}
             {(calculatorType === CalculatorTypes.LEASE || calculatorType === CalculatorTypes.LEASE2022) && <Column small={6} medium={4} large={2}>
               <Authorization allow={isFieldAllowedToEdit(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) || isFieldAllowedToEdit(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA_UNIT)} errorComponent={<Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA)}>
+                    <>
                     <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.AREA)}>{LeaseBasisOfRentsFieldTitles.AREA}</FormTextTitle>
                     <FormText>{areaText}</FormText>
+                    </>
                   </Authorization>}>
+                <>
                 <FormTextTitle required={isFieldRequired(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA)} enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.AREA)}>
                   {LeaseBasisOfRentsFieldTitles.AREA}
                 </FormTextTitle>
@@ -855,14 +864,18 @@ class BasisOfRentEdit extends PureComponent<Props, State> {
                     </Authorization>
                   </Column>
                 </Row>
+                </>
               </Authorization>
             </Column>}
             {!!calculatorType && calculatorType !== CalculatorTypes.LEASE && calculatorType !== CalculatorTypes.LEASE2022 && <Column>
               <Row>
                 <Authorization allow={isFieldAllowedToEdit(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) || isFieldAllowedToEdit(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA_UNIT)} errorComponent={<Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA)}>
+                      <>
                       <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.AREA)}>{LeaseBasisOfRentsFieldTitles.AREA}</FormTextTitle>
                       <FormText>{areaText}</FormText>
+                      </>
                     </Authorization>}>
+                  <>
                   {calculatorType === CalculatorTypes.TEMPORARY && <Column small={6} medium={4} large={2}>
                     <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA)}>
                       <FormField disableTouched={isSaveClicked} fieldAttributes={getFieldAttributes(leaseAttributes, LeaseBasisOfRentsFieldPaths.ZONE)} name={`${field}.zone`} disabled={isLocked} overrideValues={{
@@ -890,18 +903,22 @@ class BasisOfRentEdit extends PureComponent<Props, State> {
                   </Column>}
                   {calculatorType === CalculatorTypes.TEMPORARY && <Column small={4} medium={2} large={1}>
                     <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+                      <>
                       <FormTextTitle>
                         {'Hinta'}
                       </FormTextTitle>
                       <FormText>{!isEmptyValue(zonePrice) ? `${formatNumber(zonePrice)} €` : '-'}</FormText>
+                      </>
                     </Authorization>
                   </Column>}
                   {calculatorType === CalculatorTypes.MAST && <Column large={6} medium={9} small={12}>
                       <Row>
                         <Column small={6} medium={4} large={2}>
                           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+                            <>
                             <FormTextTitle>{'Laskuri'}</FormTextTitle>
                             <FormText>{`Alue`}</FormText>
+                            </>
                           </Authorization>
                         </Column>
                         <Column small={6} medium={4} large={2}>
@@ -913,8 +930,10 @@ class BasisOfRentEdit extends PureComponent<Props, State> {
                         </Column>
                         <Column small={6} medium={4} large={2}>
                           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+                            <>
                             <FormTextTitle>{'Kerroin'}</FormTextTitle>
                             <FormText>{`*1,5`}</FormText>
+                            </>
                           </Authorization>
                         </Column>
                         <Column small={6} medium={4} large={2}>
@@ -926,14 +945,18 @@ class BasisOfRentEdit extends PureComponent<Props, State> {
                         </Column>
                         <Column small={6} medium={4} large={2}>
                           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+                            <>
                             <FormTextTitle>{'Yksikkö'}</FormTextTitle>
                             <FormText>{`m${String.fromCharCode(178)}`}</FormText>
+                            </>
                           </Authorization>
                         </Column>
                         <Column small={6} medium={4} large={2}>
                           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+                            <>
                             <FormTextTitle>{LeaseBasisOfRentsFieldTitles.RENT}</FormTextTitle>
                             <FormText>{!isEmptyValue(mastAreaRent) ? `${formatNumber(mastAreaRent)} €` : '-'}</FormText>
+                            </>
                           </Authorization>
                         </Column>
                       </Row>
@@ -967,6 +990,7 @@ class BasisOfRentEdit extends PureComponent<Props, State> {
                   </Column>}
                   {calculatorType !== CalculatorTypes.MAST && <Column small={3} medium={2} large={1}>
                     <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+                      <>
                       {calculatorType !== CalculatorTypes.TEMPORARY && <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.BASE_YEAR_RENT)}>
                           {LeaseBasisOfRentsFieldTitles.RENT_PER_YEAR}
                         </FormTextTitle>}
@@ -976,14 +1000,17 @@ class BasisOfRentEdit extends PureComponent<Props, State> {
                       {calculatorType === CalculatorTypes.TEMPORARY && <FormText>{!isEmptyValue(temporaryRent) ? `${formatNumber(temporaryRent)} €` : '-'}</FormText>}
                       {calculatorType === CalculatorTypes.ADDITIONAL_YARD && <FormText>{!isEmptyValue(rentExtra) ? `${formatNumber(rentExtra)} €` : '-'}</FormText>}
                       {calculatorType === CalculatorTypes.FIELD && <FormText>{!isEmptyValue(fieldsRent) ? `${formatNumber(fieldsRent)} €` : '-'}</FormText>}
+                      </>
                     </Authorization>
                   </Column>}
                   {calculatorType === CalculatorTypes.TEMPORARY && <Column small={3} medium={2} large={1}>
                     <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+                      <>
                       {calculatorType === CalculatorTypes.TEMPORARY && <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.BASE_YEAR_RENT)}>
                           {LeaseBasisOfRentsFieldTitles.RENT_PER_YEAR}
                         </FormTextTitle>}
                       <FormText>{!isEmptyValue(temporaryRent) ? `${formatNumber(temporaryRent * 12)} €` : '-'}</FormText>
+                      </>
                     </Authorization>
                   </Column>}
                   {calculatorType !== CalculatorTypes.MAST && <Column small={6} medium={4} large={2}>
@@ -998,14 +1025,17 @@ class BasisOfRentEdit extends PureComponent<Props, State> {
                   </Column>}
                   {calculatorType !== CalculatorTypes.MAST && <Column small={6} medium={4} large={2}>
                     <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+                      <>
                       <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.BASE_YEAR_RENT)}>
                         {LeaseBasisOfRentsFieldTitles.BASE_YEAR_RENT}
                       </FormTextTitle>
                       {calculatorType === CalculatorTypes.TEMPORARY && <FormText>{!isEmptyValue(temporaryRentIndexed) ? `${formatNumber(temporaryRentIndexed)} €/v` : '-'}</FormText>}
                       {calculatorType === CalculatorTypes.ADDITIONAL_YARD && <FormText>{!isEmptyValue(rentExtraIndexed) ? `${formatNumber(rentExtraIndexed)} €/v` : '-'}</FormText>}
                       {calculatorType === CalculatorTypes.FIELD && <FormText>{!isEmptyValue(basicAnnualFieldRentIndexed) ? `${formatNumber(basicAnnualFieldRentIndexed)} €/v` : '-'}</FormText>}
+                      </>
                     </Authorization>
                   </Column>}
+                  </>
                 </Authorization>
               </Row>
             </Column>}
@@ -1014,11 +1044,14 @@ class BasisOfRentEdit extends PureComponent<Props, State> {
           {calculatorType === CalculatorTypes.LEASE && <Row>
             <Column small={6} medium={4} large={2}>
               <Authorization allow={isFieldAllowedToEdit(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)} errorComponent={<Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+                    <>
                     <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
                       {LeaseBasisOfRentsFieldTitles.AMOUNT_PER_AREA}
                     </FormTextTitle>
                     <FormText>{amountPerAreaText}</FormText>
+                    </>
                   </Authorization>}>
+                <>
                 <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
                   <FormTextTitle required={isFieldRequired(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)} enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
                     {LeaseBasisOfRentsFieldTitles.AMOUNT_PER_AREA}
@@ -1045,6 +1078,7 @@ class BasisOfRentEdit extends PureComponent<Props, State> {
                     </Authorization>
                   </Column>
                 </Row>
+                </>
               </Authorization>
             </Column>
             <Column small={6} medium={4} large={2}>{renderIndexFormField()}</Column>
@@ -1098,10 +1132,12 @@ class BasisOfRentEdit extends PureComponent<Props, State> {
             </Column>
             <Column small={5} medium={4} large={3}>
               <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.DISCOUNT_PERCENTAGE)}>
+                <>
                 <FormTextTitle>
                   {LeaseBasisOfRentsFieldTitles.DISCOUNTED_INITIAL}
                 </FormTextTitle>
                 <FormText>{!isEmptyValue(subventionDiscountedInitial) ? `${formatNumber(subventionDiscountedInitial)} €/v` : '-'}</FormText>
+                </>
               </Authorization>
             </Column>
             <Column small={0} medium={3} large={6}></Column>
@@ -1139,43 +1175,53 @@ class BasisOfRentEdit extends PureComponent<Props, State> {
             </Column>
             <Column small={6} medium={4} large={3}>
               <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.INDEX) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.PROFIT_MARGIN_PERCENTAGE) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.DISCOUNT_PERCENTAGE)}>
+                <>
                 <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.DISCOUNTED_INITIAL_YEAR_RENT)}>
                   {LeaseBasisOfRentsFieldTitles.DISCOUNTED_INITIAL_YEAR_RENT}
                 </FormTextTitle>
                 <FormText>{!isEmptyValue(discountedInitialYearRent) ? `${formatNumber(discountedInitialYearRent)} €/v` : '-'}</FormText>
+                </>
               </Authorization>
             </Column>
             <Column small={6} medium={4} large={2}>
               <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.INDEX) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.PROFIT_MARGIN_PERCENTAGE) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.DISCOUNT_PERCENTAGE)}>
+                <>
                 <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.DISCOUNTED_INITIAL_YEAR_RENT_PER_MONTH)}>
                   {LeaseBasisOfRentsFieldTitles.DISCOUNTED_INITIAL_YEAR_RENT_PER_MONTH}
                 </FormTextTitle>
                 <FormText>{!isEmptyValue(rentPerMonth) ? `${formatNumber(rentPerMonth)} €` : '-'}</FormText>
+                </>
               </Authorization>
             </Column>
             <Column small={6} medium={4} large={2}>
               <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.INDEX) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.PROFIT_MARGIN_PERCENTAGE) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.DISCOUNT_PERCENTAGE)}>
+                <>
                 <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.DISCOUNTED_INITIAL_YEAR_RENT_PER_2_MONTHS)}>
                   {LeaseBasisOfRentsFieldTitles.DISCOUNTED_INITIAL_YEAR_RENT_PER_2_MONTHS}
                 </FormTextTitle>
                 <FormText>{!isEmptyValue(rentPer2Months) ? `${formatNumber(rentPer2Months)} €` : '-'}</FormText>
+                </>
               </Authorization>
             </Column>
             {showTotal && <Fragment>
               <Column small={6} medium={4} large={2}>
                 <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.INDEX) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.PROFIT_MARGIN_PERCENTAGE) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.DISCOUNT_PERCENTAGE)}>
+                  <>
                   <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.DISCOUNTED_INITIAL_YEAR_RENT_PER_MONTH_TOTAL)}>
                     {LeaseBasisOfRentsFieldTitles.DISCOUNTED_INITIAL_YEAR_RENT_PER_MONTH_TOTAL}
                   </FormTextTitle>
                   <FormText>{!isEmptyValue(rentPerMonthTotal) ? `${formatNumber(rentPerMonthTotal)} €` : '-'}</FormText>
+                  </>
                 </Authorization>
               </Column>
               <Column small={6} medium={4} large={2}>
                 <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.INDEX) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.PROFIT_MARGIN_PERCENTAGE) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.DISCOUNT_PERCENTAGE)}>
+                  <>
                   <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.DISCOUNTED_INITIAL_YEAR_RENT_PER_2_MONTHS_TOTAL)}>
                     {LeaseBasisOfRentsFieldTitles.DISCOUNTED_INITIAL_YEAR_RENT_PER_2_MONTHS_TOTAL}
                   </FormTextTitle>
                   <FormText>{!isEmptyValue(rentPer2MonthsTotal) ? `${formatNumber(rentPer2MonthsTotal)} €` : '-'}</FormText>
+                  </>
                 </Authorization>
               </Column>
             </Fragment>}
@@ -1183,6 +1229,7 @@ class BasisOfRentEdit extends PureComponent<Props, State> {
 
           {calculatorType === CalculatorTypes.MAST && <Row>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+              <>
               <Column large={2} medium={4} small={6}>
               </Column>
               <Column>
@@ -1192,11 +1239,13 @@ class BasisOfRentEdit extends PureComponent<Props, State> {
                   </Column>
                 </Row>
               </Column>
+              </>
             </Authorization>
           </Row>}
 
           {calculatorType === CalculatorTypes.MAST && <Row>
             <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+              <>
               <Column large={2} medium={4} small={6}>
               </Column>
               <Column>
@@ -1232,22 +1281,27 @@ class BasisOfRentEdit extends PureComponent<Props, State> {
                   marginTop: -15
                 }}>
                     <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+                      <>
                       <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.BASE_YEAR_RENT)}>
                         {LeaseBasisOfRentsFieldTitles.BASE_YEAR_RENT}
                       </FormTextTitle>
                       <FormText>{!isEmptyValue(mastTotalIndexed) ? `${formatNumber(mastTotalIndexed)} €/v` : '-'}</FormText>
+                      </>
                     </Authorization>
                   </Column>
                 </Row>
               </Column>
+              </>
             </Authorization>
           </Row>}
 
           <Row>
             {showPlansInspectedAt && (calculatorType === CalculatorTypes.LEASE || calculatorType === CalculatorTypes.LEASE2022) && <Column small={6} medium={4} large={2}>
                 <Authorization allow={isFieldAllowedToEdit(leaseAttributes, LeaseBasisOfRentsFieldPaths.PLANS_INSPECTED_AT)} errorComponent={<Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.PLANS_INSPECTED_AT)}>
+                      <>
                       <FormTextTitle>{LeaseBasisOfRentsFieldTitles.PLANS_INSPECTED_AT}</FormTextTitle>
                       <FormText>{plansInspectedAtText}</FormText>
+                      </>
                     </Authorization>}>
                   <FormField className='with-top-padding' disableTouched={isSaveClicked} fieldAttributes={savedBasisOfRent && !!savedBasisOfRent.locked_at ? { ...getFieldAttributes(leaseAttributes, LeaseBasisOfRentsFieldPaths.PLANS_INSPECTED_AT),
                 required: false,
@@ -1262,8 +1316,10 @@ class BasisOfRentEdit extends PureComponent<Props, State> {
 
             {showLockedAt && <Column small={6} medium={4} large={2}>
                 <Authorization allow={isFieldAllowedToEdit(leaseAttributes, LeaseBasisOfRentsFieldPaths.LOCKED_AT)} errorComponent={<Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.LOCKED_AT)}>
+                      <>
                       <FormTextTitle>{LeaseBasisOfRentsFieldTitles.LOCKED_AT}</FormTextTitle>
                       <FormText>{lockedAtText}</FormText>
+                      </>
                     </Authorization>}>
                   <FormField className='with-top-padding' disableTouched={isSaveClicked} fieldAttributes={{ ...getFieldAttributes(leaseAttributes, LeaseBasisOfRentsFieldPaths.LOCKED_AT),
                 type: 'checkbox-date-time'
@@ -1314,8 +1370,10 @@ class BasisOfRentEdit extends PureComponent<Props, State> {
                       </Column>
                     </Row>
                     {subventionType === SubventionTypes.FORM_OF_MANAGEMENT && (calculatorType === CalculatorTypes.LEASE || calculatorType === CalculatorTypes.LEASE2022) && <Authorization allow={isFieldAllowedToRead(leaseAttributes, BasisOfRentManagementSubventionsFieldPaths.MANAGEMENT_SUBVENTIONS)}>
+                        <>
                         <SubTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(BasisOfRentManagementSubventionsFieldPaths.MANAGEMENT_SUBVENTIONS)}>{BasisOfRentManagementSubventionsFieldTitles.MANAGEMENT_SUBVENTIONS}</SubTitle>
                         <FieldArray component={renderManagementSubventions} disabled={isLocked} formName={formName} initialYearRent={initialYearRent} currentAmountPerArea={currentAmountPerArea} leaseAttributes={leaseAttributes} name={`${field}.management_subventions`} usersPermissions={usersPermissions} />
+                        </>
                       </Authorization>}
                     {subventionType === SubventionTypes.RE_LEASE && (calculatorType === CalculatorTypes.LEASE || calculatorType === CalculatorTypes.LEASE2022) && <Row>
                         <Column small={4} large={2}>
@@ -1334,30 +1392,37 @@ class BasisOfRentEdit extends PureComponent<Props, State> {
                         </Column>
                         <Column small={4} large={2}>
                           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.SUBVENTION_BASE_PERCENT) || isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.SUBVENTION_BASE_PERCENT)}>
+                            <>
                             <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.SUBVENTION_RE_LEASE_DISCOUNT_PRECENT)}>
                               {LeaseBasisOfRentsFieldTitles.SUBVENTION_RE_LEASE_DISCOUNT_PRECENT}
                             </FormTextTitle>
                             <FormText>{formatNumber(releaseDiscountPercent)} %</FormText>
+                            </>
                           </Authorization>
                         </Column>
                         <Column small={4} large={2}>
                           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.SUBVENTION_BASE_PERCENT) || isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.SUBVENTION_BASE_PERCENT)}>
+                            <>
                             <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.SUBVENTION_RE_LEASE_DISCOUNT_AMOUNT)}>
                               {LeaseBasisOfRentsFieldTitles.SUBVENTION_RE_LEASE_DISCOUNT_AMOUNT}
                             </FormTextTitle>
                             <FormText>{formatNumber(releaseDiscountAmount)} €</FormText>
+                            </>
                           </Authorization>
                         </Column>
                       </Row>}
 
                     <Authorization allow={isFieldAllowedToRead(leaseAttributes, BasisOfRentTemporarySubventionsFieldPaths.TEMPORARY_SUBVENTIONS)}>
+                      <>
                       <SubTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(BasisOfRentTemporarySubventionsFieldPaths.TEMPORARY_SUBVENTIONS)}>
                         {BasisOfRentTemporarySubventionsFieldTitles.TEMPORARY_SUBVENTIONS}
                       </SubTitle>
                       <FieldArray component={renderTemporarySubventions} leaseAttributes={leaseAttributes} disabled={isLocked} formName={formName} initialYearRent={initialYearRent} name={`${field}.temporary_subventions`} usersPermissions={usersPermissions} managementSubventions={managementSubventions} temporarySubventions={temporarySubventions} />
+                      </>
                     </Authorization>
 
                     <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.INDEX)}>
+                      <>
                       <Row>
                         <Column small={12} large={8}>
                           <Divider />
@@ -1371,6 +1436,7 @@ class BasisOfRentEdit extends PureComponent<Props, State> {
                           <FormText className='semibold'>{formatNumber(totalSubventionAmount)} €</FormText>
                         </Column>
                       </Row>
+                      </>
                     </Authorization>
                   </WhiteBox>;
           }}
@@ -1381,7 +1447,7 @@ class BasisOfRentEdit extends PureComponent<Props, State> {
 
 }
 
-export default connect((state, props) => {
+export default connect((state, props: Props) => {
   const formName = props.formName;
   const selector = formValueSelector(formName);
   return {
diff --git a/src/leases/components/leaseSections/rent/BasisOfRentManagementSubventionEdit.tsx b/src/leases/components/leaseSections/rent/BasisOfRentManagementSubventionEdit.tsx
index 7bc6558a2..21a8cdfe9 100644
--- a/src/leases/components/leaseSections/rent/BasisOfRentManagementSubventionEdit.tsx
+++ b/src/leases/components/leaseSections/rent/BasisOfRentManagementSubventionEdit.tsx
@@ -2,19 +2,19 @@ import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import { change, formValueSelector } from "redux-form";
 import { Row, Column } from "react-foundation";
-import Authorization from "components/authorization/Authorization";
-import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import RemoveButton from "components/form/RemoveButton";
-import { BasisOfRentManagementSubventionsFieldPaths, BasisOfRentManagementSubventionsFieldTitles } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { calculateBasisOfRentSubventionAmount, calculateBasisOfRentSubventionPercentage, calculateSubventionAmountFromPercantage } from "leases/helpers";
-import { formatNumber, hasPermissions, isFieldAllowedToRead, getFieldAttributes } from "util/helpers";
-import { getAttributes as getLeaseAttributes, getIsSaveClicked } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import RemoveButton from "@/components/form/RemoveButton";
+import { BasisOfRentManagementSubventionsFieldPaths, BasisOfRentManagementSubventionsFieldTitles } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { calculateBasisOfRentSubventionAmount, calculateBasisOfRentSubventionPercentage, calculateSubventionAmountFromPercantage } from "@/leases/helpers";
+import { formatNumber, hasPermissions, isFieldAllowedToRead, getFieldAttributes } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes, getIsSaveClicked } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   currentAmountPerArea: number;
   change: (...args: Array<any>) => any;
diff --git a/src/leases/components/leaseSections/rent/BasisOfRentTemporarySubventionEdit.tsx b/src/leases/components/leaseSections/rent/BasisOfRentTemporarySubventionEdit.tsx
index ed74a5504..165bdf1e7 100644
--- a/src/leases/components/leaseSections/rent/BasisOfRentTemporarySubventionEdit.tsx
+++ b/src/leases/components/leaseSections/rent/BasisOfRentTemporarySubventionEdit.tsx
@@ -2,19 +2,19 @@ import React from "react";
 import { connect } from "react-redux";
 import { formValueSelector } from "redux-form";
 import { Row, Column } from "react-foundation";
-import Authorization from "components/authorization/Authorization";
-import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import RemoveButton from "components/form/RemoveButton";
-import { BasisOfRentTemporarySubventionsFieldPaths, BasisOfRentTemporarySubventionsFieldTitles } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { calculateBasisOfRentSubventionAmountCumulative } from "leases/helpers";
-import { formatNumber, hasPermissions, isFieldAllowedToRead, getFieldAttributes } from "util/helpers";
-import { getAttributes as getLeaseAttributes, getIsSaveClicked } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import RemoveButton from "@/components/form/RemoveButton";
+import { BasisOfRentTemporarySubventionsFieldPaths, BasisOfRentTemporarySubventionsFieldTitles } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { calculateBasisOfRentSubventionAmountCumulative } from "@/leases/helpers";
+import { formatNumber, hasPermissions, isFieldAllowedToRead, getFieldAttributes } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes, getIsSaveClicked } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   disabled: boolean;
   field: any;
diff --git a/src/leases/components/leaseSections/rent/BasisOfRents.tsx b/src/leases/components/leaseSections/rent/BasisOfRents.tsx
index 7bcba8bcd..b9fc6d66a 100644
--- a/src/leases/components/leaseSections/rent/BasisOfRents.tsx
+++ b/src/leases/components/leaseSections/rent/BasisOfRents.tsx
@@ -2,16 +2,16 @@ import React, { Fragment, PureComponent } from "react";
 import { connect } from "react-redux";
 import BasisOfRent from "./BasisOfRent";
 import CalculateRentTotal from "./CalculateRentTotal";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import FormText from "components/form/FormText";
-import GrayBox from "components/content/GrayBox";
-import GreenBox from "components/content/GreenBox";
-import { BasisOfRentManagementSubventionsFieldPaths, LeaseBasisOfRentsFieldPaths } from "leases/enums";
-import { calculateBasisOfRentTotalDiscountedInitialYearRent, getContentBasisOfRents } from "leases/helpers";
-import { getFieldOptions, isEmptyValue } from "util/helpers";
-import { getAttributes as getLeaseAttributes, getCurrentLease } from "leases/selectors";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import FormText from "@/components/form/FormText";
+import GrayBox from "@/components/content/GrayBox";
+import GreenBox from "@/components/content/GreenBox";
+import { BasisOfRentManagementSubventionsFieldPaths, LeaseBasisOfRentsFieldPaths } from "@/leases/enums";
+import { calculateBasisOfRentTotalDiscountedInitialYearRent, getContentBasisOfRents } from "@/leases/helpers";
+import { getFieldOptions, isEmptyValue } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes, getCurrentLease } from "@/leases/selectors";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
+import type { Lease } from "@/leases/types";
 type Props = {
   currentLease: Lease;
   leaseAttributes: Attributes;
diff --git a/src/leases/components/leaseSections/rent/BasisOfRentsEdit.tsx b/src/leases/components/leaseSections/rent/BasisOfRentsEdit.tsx
index ecf5f19e0..2e0babf88 100644
--- a/src/leases/components/leaseSections/rent/BasisOfRentsEdit.tsx
+++ b/src/leases/components/leaseSections/rent/BasisOfRentsEdit.tsx
@@ -3,25 +3,25 @@ import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import { change } from "redux-form";
 import classNames from "classnames";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import Authorization from "components/authorization/Authorization";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import Authorization from "@/components/authorization/Authorization";
 import BasisOfRentEdit from "./BasisOfRentEdit";
 import CalculateRentTotal from "./CalculateRentTotal";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import FormText from "components/form/FormText";
-import GrayBox from "components/content/GrayBox";
-import GreenBox from "components/content/GreenBox";
-import { ConfirmationModalTexts } from "enums";
-import { ButtonColors } from "components/enums";
-import { BasisOfRentManagementSubventionsFieldPaths, LeaseBasisOfRentsFieldPaths, calculatorTypeOptions } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { calculateBasisOfRentTotalDiscountedInitialYearRent } from "leases/helpers";
-import { getFieldOptions, hasPermissions, isEmptyValue } from "util/helpers";
-import { getAttributes as getLeaseAttributes } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import FormText from "@/components/form/FormText";
+import GrayBox from "@/components/content/GrayBox";
+import GreenBox from "@/components/content/GreenBox";
+import { ConfirmationModalTexts } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { BasisOfRentManagementSubventionsFieldPaths, LeaseBasisOfRentsFieldPaths, calculatorTypeOptions } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { calculateBasisOfRentTotalDiscountedInitialYearRent } from "@/leases/helpers";
+import { getFieldOptions, hasPermissions, isEmptyValue } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   addButtonClass?: string;
   archived: boolean;
diff --git a/src/leases/components/leaseSections/rent/CalculateRentTotal.tsx b/src/leases/components/leaseSections/rent/CalculateRentTotal.tsx
index 33a4c96cc..f51899260 100644
--- a/src/leases/components/leaseSections/rent/CalculateRentTotal.tsx
+++ b/src/leases/components/leaseSections/rent/CalculateRentTotal.tsx
@@ -1,10 +1,10 @@
 import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
-import { LeaseBasisOfRentsFieldTitles } from "leases/enums";
-import FormText from "components/form/FormText";
-import { calculateBasisOfRentDiscountedInitialYearRentsTotal, calculateInitialYearRentsTotal } from "leases/helpers";
-import { formatNumber } from "util/helpers";
+import { LeaseBasisOfRentsFieldTitles } from "@/leases/enums";
+import FormText from "@/components/form/FormText";
+import { calculateBasisOfRentDiscountedInitialYearRentsTotal, calculateInitialYearRentsTotal } from "@/leases/helpers";
+import { formatNumber } from "@/util/helpers";
 type Props = {
   basisOfRents: any;
   indexOptions: Array<Record<string, any>>;
diff --git a/src/leases/components/leaseSections/rent/ContractRentEdit.tsx b/src/leases/components/leaseSections/rent/ContractRentEdit.tsx
index 1bd33299c..95c2da49d 100644
--- a/src/leases/components/leaseSections/rent/ContractRentEdit.tsx
+++ b/src/leases/components/leaseSections/rent/ContractRentEdit.tsx
@@ -3,24 +3,24 @@ import { connect } from "react-redux";
 import { formValueSelector, change, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import ActionButtonWrapper from "components/form/ActionButtonWrapper";
-import Authorization from "components/authorization/Authorization";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import BoxItem from "components/content/BoxItem";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import RemoveButton from "components/form/RemoveButton";
-import { FormNames } from "enums";
-import { ContractRentPeriods, LeaseRentContractRentsFieldPaths, LeaseRentContractRentsFieldTitles, RentTypes } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatNumber, getFieldAttributes, getFieldOptions, getLabelOfOption, hasPermissions, isEmptyValue, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "util/helpers";
-import { getAttributes as getLeaseAttributes, getIsSaveClicked } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { withWindowResize } from "components/resize/WindowResizeHandler";
+import ActionButtonWrapper from "@/components/form/ActionButtonWrapper";
+import Authorization from "@/components/authorization/Authorization";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import BoxItem from "@/components/content/BoxItem";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import RemoveButton from "@/components/form/RemoveButton";
+import { FormNames } from "@/enums";
+import { ContractRentPeriods, LeaseRentContractRentsFieldPaths, LeaseRentContractRentsFieldTitles, RentTypes } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatNumber, getFieldAttributes, getFieldOptions, getLabelOfOption, hasPermissions, isEmptyValue, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes, getIsSaveClicked } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { withWindowResize } from "@/components/resize/WindowResizeHandler";
 import type { Attributes } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   amount: string;
   period: string;
@@ -123,6 +123,7 @@ class ContractRentEdit extends PureComponent<Props> {
 
         <Row>
           <Authorization allow={isFieldAllowedToEdit(leaseAttributes, LeaseRentContractRentsFieldPaths.BASE_AMOUNT) || isFieldAllowedToEdit(leaseAttributes, LeaseRentContractRentsFieldPaths.BASE_AMOUNT_PERIOD)} errorComponent={<Column><FormText>{getAmountText()}</FormText></Column>}>
+            <>
             <Column small={6}>
               <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentContractRentsFieldPaths.AMOUNT)}>
                 <FormField disableTouched={isSaveClicked} fieldAttributes={getFieldAttributes(leaseAttributes, LeaseRentContractRentsFieldPaths.AMOUNT)} invisibleLabel name={`${field}.amount`} unit='€' overrideValues={{
@@ -139,6 +140,7 @@ class ContractRentEdit extends PureComponent<Props> {
               }} />
               </Authorization>
             </Column>
+            </>
           </Authorization>
         </Row>
       </>;
@@ -156,6 +158,7 @@ class ContractRentEdit extends PureComponent<Props> {
 
         <Row>
           <Authorization allow={isFieldAllowedToEdit(leaseAttributes, LeaseRentContractRentsFieldPaths.BASE_AMOUNT) || isFieldAllowedToEdit(leaseAttributes, LeaseRentContractRentsFieldPaths.BASE_AMOUNT_PERIOD)} errorComponent={<Column><FormText>{getBaseAmountText()}</FormText></Column>}>
+            <>
             <Column small={6}>
               <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentContractRentsFieldPaths.BASE_AMOUNT)}>
                 <FormField disableTouched={isSaveClicked} fieldAttributes={getFieldAttributes(leaseAttributes, LeaseRentContractRentsFieldPaths.BASE_AMOUNT)} invisibleLabel name={`${field}.base_amount`} unit='€' overrideValues={{
@@ -171,6 +174,7 @@ class ContractRentEdit extends PureComponent<Props> {
               }} />
               </Authorization>
             </Column>
+            </>
           </Authorization>
         </Row>
       </>;
@@ -258,7 +262,7 @@ class ContractRentEdit extends PureComponent<Props> {
 
 const formName = FormNames.LEASE_RENTS;
 const selector = formValueSelector(formName);
-export default flowRight(withWindowResize, connect((state, props) => {
+export default flowRight(withWindowResize, connect((state, props: Props) => {
   return {
     contractRent: selector(state, props.field),
     isSaveClicked: getIsSaveClicked(state),
diff --git a/src/leases/components/leaseSections/rent/ContractRents.tsx b/src/leases/components/leaseSections/rent/ContractRents.tsx
index b462b444f..839c557de 100644
--- a/src/leases/components/leaseSections/rent/ContractRents.tsx
+++ b/src/leases/components/leaseSections/rent/ContractRents.tsx
@@ -2,17 +2,17 @@ import React, { Fragment, PureComponent } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import Authorization from "components/authorization/Authorization";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import BoxItem from "components/content/BoxItem";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import { LeaseRentContractRentsFieldPaths, LeaseRentContractRentsFieldTitles, RentTypes } from "leases/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes as getLeaseAttributes } from "leases/selectors";
-import { withWindowResize } from "components/resize/WindowResizeHandler";
+import Authorization from "@/components/authorization/Authorization";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import BoxItem from "@/components/content/BoxItem";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import { LeaseRentContractRentsFieldPaths, LeaseRentContractRentsFieldTitles, RentTypes } from "@/leases/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes } from "@/leases/selectors";
+import { withWindowResize } from "@/components/resize/WindowResizeHandler";
 import type { Attributes } from "types";
 type Props = {
   contractRents: Array<Record<string, any>>;
@@ -103,62 +103,76 @@ class ContractRents extends PureComponent<Props, State> {
           const renderFields = () => <>
                 <Column small={6} medium={4} large={2}>
                   <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentContractRentsFieldPaths.AMOUNT)}>
+                    <>
                     <FormTextTitle uiDataKey={getAmountUiDataKey()}>
                       {getAmountLabel()}
                     </FormTextTitle>
                     <FormText>{getAmountText()}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={6} medium={4} large={2}>
                   <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentContractRentsFieldPaths.INTENDED_USE)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentContractRentsFieldPaths.INTENDED_USE)}>
                       {LeaseRentContractRentsFieldTitles.INTENDED_USE}
                     </FormTextTitle>
                     <FormText>{getLabelOfOption(intendedUseOptions, contractRent.intended_use)}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 {rentType === RentTypes.INDEX2022 && <Column small={6} medium={4} large={2}>
                     <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentContractRentsFieldPaths.INDEX)}>
+                      <>
                       <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentContractRentsFieldPaths.INDEX)}>
                         {LeaseRentContractRentsFieldTitles.INDEX}
                       </FormTextTitle>
                       <FormText>{getLabelOfOption(indexOptions, contractRent.index)}</FormText>
+                      </>
                     </Authorization>
                   </Column>}
                 {(rentType === RentTypes.INDEX || rentType === RentTypes.MANUAL) && <>
                     <Column small={6} medium={4} large={3}>
                       <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentContractRentsFieldPaths.BASE_AMOUNT)}>
+                        <>
                         <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentContractRentsFieldPaths.BASE_AMOUNT)}>
                           {LeaseRentContractRentsFieldTitles.BASE_AMOUNT}
                         </FormTextTitle>
                         <FormText>{getBaseAmount() || '-'}</FormText>
+                        </>
                       </Authorization>
                     </Column>
                     <Column small={6} medium={4} large={2}>
                       <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentContractRentsFieldPaths.BASE_YEAR_RENT)}>
+                        <>
                         <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentContractRentsFieldPaths.BASE_YEAR_RENT)}>
                           {LeaseRentContractRentsFieldTitles.BASE_YEAR_RENT}
                         </FormTextTitle>
                         <FormText>
                           {!isEmptyValue(contractRent.base_year_rent) ? `${formatNumber(contractRent.base_year_rent)} €` : '-'}
                         </FormText>
+                        </>
                       </Authorization>
                     </Column>
                   </>}
                 <Column small={6} medium={4} large={1}>
                   <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentContractRentsFieldPaths.START_DATE)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentContractRentsFieldPaths.START_DATE)}>
                       {LeaseRentContractRentsFieldTitles.START_DATE}
                     </FormTextTitle>
                     <FormText>{contractRent.start_date ? formatDate(contractRent.start_date) : '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={6} medium={4} large={1}>
                   <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentContractRentsFieldPaths.END_DATE)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentContractRentsFieldPaths.END_DATE)}>
                       {LeaseRentContractRentsFieldTitles.END_DATE}
                     </FormTextTitle>
                     <FormText>{contractRent.end_date ? formatDate(contractRent.end_date) : '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
               </>;
diff --git a/src/leases/components/leaseSections/rent/ContractRentsEdit.tsx b/src/leases/components/leaseSections/rent/ContractRentsEdit.tsx
index 534aac877..0312d72fb 100644
--- a/src/leases/components/leaseSections/rent/ContractRentsEdit.tsx
+++ b/src/leases/components/leaseSections/rent/ContractRentsEdit.tsx
@@ -1,24 +1,24 @@
 import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import Authorization from "components/authorization/Authorization";
-import BoxItemContainer from "components/content/BoxItemContainer";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import Authorization from "@/components/authorization/Authorization";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
 import ContractRentEdit from "./ContractRentEdit";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import { ConfirmationModalTexts } from "enums";
-import { ButtonColors } from "components/enums";
-import { LeaseRentContractRentsFieldPaths, LeaseRentContractRentsFieldTitles, RentTypes } from "leases/enums";
-import { Breakpoints } from "foundation/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { hasPermissions, isFieldAllowedToRead, isFieldRequired } from "util/helpers";
-import { getAttributes as getLeaseAttributes } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import { ConfirmationModalTexts } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { LeaseRentContractRentsFieldPaths, LeaseRentContractRentsFieldTitles, RentTypes } from "@/leases/enums";
+import { Breakpoints } from "@/foundation/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { hasPermissions, isFieldAllowedToRead, isFieldRequired } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   fields: any;
   leaseAttributes: Attributes;
diff --git a/src/leases/components/leaseSections/rent/EqualizedRents.tsx b/src/leases/components/leaseSections/rent/EqualizedRents.tsx
index 284c83ba9..8271d0258 100644
--- a/src/leases/components/leaseSections/rent/EqualizedRents.tsx
+++ b/src/leases/components/leaseSections/rent/EqualizedRents.tsx
@@ -1,11 +1,11 @@
 import React from "react";
 import { connect } from "react-redux";
-import AmountWithVat from "components/vat/AmountWithVat";
-import SortableTable from "components/table/SortableTable";
-import { LeaseEqualizedRentsFieldPaths, LeaseEqualizedRentsFieldTitles } from "leases/enums";
-import { TableSortOrder } from "enums";
-import { formatDate, formatNumber, isFieldAllowedToRead, sortNumberByKeyAsc, sortNumberByKeyDesc } from "util/helpers";
-import { getAttributes } from "leases/selectors";
+import AmountWithVat from "@/components/vat/AmountWithVat";
+import SortableTable from "@/components/table/SortableTable";
+import { LeaseEqualizedRentsFieldPaths, LeaseEqualizedRentsFieldTitles } from "@/leases/enums";
+import { TableSortOrder } from "@/enums";
+import { formatDate, formatNumber, isFieldAllowedToRead, sortNumberByKeyAsc, sortNumberByKeyDesc } from "@/util/helpers";
+import { getAttributes } from "@/leases/selectors";
 import type { Attributes } from "types";
 type Props = {
   equalizedRents: Array<Record<string, any>>;
diff --git a/src/leases/components/leaseSections/rent/FixedInitialYearRents.tsx b/src/leases/components/leaseSections/rent/FixedInitialYearRents.tsx
index 33de609d7..7be80c826 100644
--- a/src/leases/components/leaseSections/rent/FixedInitialYearRents.tsx
+++ b/src/leases/components/leaseSections/rent/FixedInitialYearRents.tsx
@@ -2,17 +2,17 @@ import React, { Fragment, PureComponent } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import Authorization from "components/authorization/Authorization";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import BoxItem from "components/content/BoxItem";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import { LeaseRentFixedInitialYearRentsFieldPaths, LeaseRentFixedInitialYearRentsFieldTitles } from "leases/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes as getLeaseAttributes } from "leases/selectors";
-import { withWindowResize } from "components/resize/WindowResizeHandler";
+import Authorization from "@/components/authorization/Authorization";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import BoxItem from "@/components/content/BoxItem";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import { LeaseRentFixedInitialYearRentsFieldPaths, LeaseRentFixedInitialYearRentsFieldTitles } from "@/leases/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes } from "@/leases/selectors";
+import { withWindowResize } from "@/components/resize/WindowResizeHandler";
 import type { Attributes } from "types";
 type Props = {
   fixedInitialYearRents: Array<Record<string, any>>;
@@ -114,34 +114,42 @@ class FixedInitialYearRentsEdit extends PureComponent<Props, State> {
                     <Row>
                       <Column small={6} medium={3} large={2}>
                         <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentFixedInitialYearRentsFieldPaths.INTENDED_USE)}>
+                          <>
                           <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentFixedInitialYearRentsFieldPaths.INTENDED_USE)}>
                             {LeaseRentFixedInitialYearRentsFieldTitles.INTENDED_USE}
                           </FormTextTitle>
                           <FormText>{getLabelOfOption(intendedUseOptions, rent.intended_use) || '-'}</FormText>
+                          </>
                         </Authorization>
                       </Column>
                       <Column small={6} medium={3} large={2}>
                         <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentFixedInitialYearRentsFieldPaths.AMOUNT)}>
+                          <>
                           <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentFixedInitialYearRentsFieldPaths.AMOUNT)}>
                             {LeaseRentFixedInitialYearRentsFieldTitles.AMOUNT}
                           </FormTextTitle>
                           <FormText>{!isEmptyValue(rent.amount) ? `${formatNumber(rent.amount)} €` : '-'}</FormText>
+                          </>
                         </Authorization>
                       </Column>
                       <Column small={6} medium={3} large={1}>
                         <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentFixedInitialYearRentsFieldPaths.START_DATE)}>
+                          <>
                           <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentFixedInitialYearRentsFieldPaths.START_DATE)}>
                             {LeaseRentFixedInitialYearRentsFieldTitles.START_DATE}
                           </FormTextTitle>
                           <FormText>{formatDate(rent.start_date) || '-'}</FormText>
+                          </>
                         </Authorization>
                       </Column>
                       <Column small={6} medium={3} large={1}>
                         <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentFixedInitialYearRentsFieldPaths.END_DATE)}>
+                          <>
                           <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentFixedInitialYearRentsFieldPaths.END_DATE)}>
                             {LeaseRentFixedInitialYearRentsFieldTitles.END_DATE}
                           </FormTextTitle>
                           <FormText>{formatDate(rent.end_date) || '-'}</FormText>
+                          </>
                         </Authorization>
                       </Column>
                     </Row>
diff --git a/src/leases/components/leaseSections/rent/FixedInitialYearRentsEdit.tsx b/src/leases/components/leaseSections/rent/FixedInitialYearRentsEdit.tsx
index e903880c8..da78202df 100644
--- a/src/leases/components/leaseSections/rent/FixedInitialYearRentsEdit.tsx
+++ b/src/leases/components/leaseSections/rent/FixedInitialYearRentsEdit.tsx
@@ -2,29 +2,29 @@ import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import ActionButtonWrapper from "components/form/ActionButtonWrapper";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import Authorization from "components/authorization/Authorization";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import BoxItem from "components/content/BoxItem";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import RemoveButton from "components/form/RemoveButton";
-import { ConfirmationModalTexts } from "enums";
-import { ButtonColors } from "components/enums";
-import { Breakpoints } from "foundation/enums";
-import { LeaseRentFixedInitialYearRentsFieldPaths, LeaseRentFixedInitialYearRentsFieldTitles } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getFieldAttributes, hasPermissions, isFieldAllowedToRead, isFieldRequired } from "util/helpers";
-import { getAttributes as getLeaseAttributes } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { withWindowResize } from "components/resize/WindowResizeHandler";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import ActionButtonWrapper from "@/components/form/ActionButtonWrapper";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import Authorization from "@/components/authorization/Authorization";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import BoxItem from "@/components/content/BoxItem";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import RemoveButton from "@/components/form/RemoveButton";
+import { ConfirmationModalTexts } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { Breakpoints } from "@/foundation/enums";
+import { LeaseRentFixedInitialYearRentsFieldPaths, LeaseRentFixedInitialYearRentsFieldTitles } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getFieldAttributes, hasPermissions, isFieldAllowedToRead, isFieldRequired } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { withWindowResize } from "@/components/resize/WindowResizeHandler";
 import type { Attributes } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   fields: any;
   isSaveClicked: boolean;
diff --git a/src/leases/components/leaseSections/rent/IndexAdjustedRents.tsx b/src/leases/components/leaseSections/rent/IndexAdjustedRents.tsx
index 61e3ae131..2689e1e17 100644
--- a/src/leases/components/leaseSections/rent/IndexAdjustedRents.tsx
+++ b/src/leases/components/leaseSections/rent/IndexAdjustedRents.tsx
@@ -1,11 +1,11 @@
 import React from "react";
 import { connect } from "react-redux";
-import AmountWithVat from "components/vat/AmountWithVat";
-import SortableTable from "components/table/SortableTable";
-import { LeaseIndexAdjustedRentsFieldPaths, LeaseIndexAdjustedRentsFieldTitles } from "leases/enums";
-import { TableSortOrder } from "enums";
-import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isFieldAllowedToRead, sortByOptionsAsc, sortByOptionsDesc, sortNumberByKeyAsc, sortNumberByKeyDesc } from "util/helpers";
-import { getAttributes } from "leases/selectors";
+import AmountWithVat from "@/components/vat/AmountWithVat";
+import SortableTable from "@/components/table/SortableTable";
+import { LeaseIndexAdjustedRentsFieldPaths, LeaseIndexAdjustedRentsFieldTitles } from "@/leases/enums";
+import { TableSortOrder } from "@/enums";
+import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isFieldAllowedToRead, sortByOptionsAsc, sortByOptionsDesc, sortNumberByKeyAsc, sortNumberByKeyDesc } from "@/util/helpers";
+import { getAttributes } from "@/leases/selectors";
 import type { Attributes } from "types";
 type Props = {
   attributes: Attributes;
diff --git a/src/leases/components/leaseSections/rent/MastChildrenEdit.tsx b/src/leases/components/leaseSections/rent/MastChildrenEdit.tsx
index e704ce802..372b1de13 100644
--- a/src/leases/components/leaseSections/rent/MastChildrenEdit.tsx
+++ b/src/leases/components/leaseSections/rent/MastChildrenEdit.tsx
@@ -2,14 +2,14 @@ import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { formValueSelector } from "redux-form";
 import { Row, Column } from "react-foundation";
-import Authorization from "components/authorization/Authorization";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import { isFieldAllowedToRead, getFieldAttributes, formatNumber, isEmptyValue } from "util/helpers";
-import { getAttributes as getLeaseAttributes, getIsSaveClicked } from "leases/selectors";
-import { LeaseBasisOfRentsFieldPaths } from "leases/enums";
+import Authorization from "@/components/authorization/Authorization";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import { isFieldAllowedToRead, getFieldAttributes, formatNumber, isEmptyValue } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes, getIsSaveClicked } from "@/leases/selectors";
+import { LeaseBasisOfRentsFieldPaths } from "@/leases/enums";
 import type { Attributes } from "types";
-import { mastCalculatorRent } from "leases/helpers";
+import { mastCalculatorRent } from "@/leases/helpers";
 type Props = {
   formName: string;
   parentField: string;
@@ -33,14 +33,18 @@ const MastChildrenEdit = ({
       <Row>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+            <>
             {index === 0 && <FormText>{`Laitekaappi`}</FormText>}
             {index === 1 && <FormText>{`Masto`}</FormText>}
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+            <>
             {index === 0 && <FormText>{`1000,00 €`}</FormText>}
             {index === 1 && <FormText>{`600,00 €`}</FormText>}
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
@@ -56,8 +60,10 @@ const MastChildrenEdit = ({
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AREA) && isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.AMOUNT_PER_AREA)}>
+            <>
             {index === 0 && <FormText>{`k-m${String.fromCharCode(178)}`}</FormText>}
             {index === 1 && <FormText>{`m`}</FormText>}
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
diff --git a/src/leases/components/leaseSections/rent/PayableRents.tsx b/src/leases/components/leaseSections/rent/PayableRents.tsx
index 60bb28e1f..074543f51 100644
--- a/src/leases/components/leaseSections/rent/PayableRents.tsx
+++ b/src/leases/components/leaseSections/rent/PayableRents.tsx
@@ -1,11 +1,11 @@
 import React from "react";
 import { connect } from "react-redux";
-import AmountWithVat from "components/vat/AmountWithVat";
-import SortableTable from "components/table/SortableTable";
-import { LeasePayableRentsFieldPaths, LeasePayableRentsFieldTitles } from "leases/enums";
-import { TableSortOrder } from "enums";
-import { formatDate, formatNumber, isFieldAllowedToRead, sortNumberByKeyAsc, sortNumberByKeyDesc } from "util/helpers";
-import { getAttributes } from "leases/selectors";
+import AmountWithVat from "@/components/vat/AmountWithVat";
+import SortableTable from "@/components/table/SortableTable";
+import { LeasePayableRentsFieldPaths, LeasePayableRentsFieldTitles } from "@/leases/enums";
+import { TableSortOrder } from "@/enums";
+import { formatDate, formatNumber, isFieldAllowedToRead, sortNumberByKeyAsc, sortNumberByKeyDesc } from "@/util/helpers";
+import { getAttributes } from "@/leases/selectors";
 import type { Attributes } from "types";
 type Props = {
   leaseAttributes: Attributes;
diff --git a/src/leases/components/leaseSections/rent/RentAdjustmentEdit.tsx b/src/leases/components/leaseSections/rent/RentAdjustmentEdit.tsx
index ac1b4e783..b430271db 100644
--- a/src/leases/components/leaseSections/rent/RentAdjustmentEdit.tsx
+++ b/src/leases/components/leaseSections/rent/RentAdjustmentEdit.tsx
@@ -3,35 +3,35 @@ import { change, FieldArray } from "redux-form";
 import { connect } from "react-redux";
 import { formValueSelector } from "redux-form";
 import { Row, Column } from "react-foundation";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import ActionButtonWrapper from "components/form/ActionButtonWrapper";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import AddButtonThird from "components/form/AddButtonThird";
-import Authorization from "components/authorization/Authorization";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import BoxItem from "components/content/BoxItem";
-import DecisionLink from "components/links/DecisionLink";
-import Divider from "components/content/Divider";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import GreenBox from "components/content/GreenBox";
-import RemoveButton from "components/form/RemoveButton";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import ActionButtonWrapper from "@/components/form/ActionButtonWrapper";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import Authorization from "@/components/authorization/Authorization";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import BoxItem from "@/components/content/BoxItem";
+import DecisionLink from "@/components/links/DecisionLink";
+import Divider from "@/components/content/Divider";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import GreenBox from "@/components/content/GreenBox";
+import RemoveButton from "@/components/form/RemoveButton";
 import RentAdjustmentManagementSubventionEdit from "./RentAdjustmentManagementSubventionEdit";
 import RentAdjustmentTemporarySubventionEdit from "./RentAdjustmentTemporarySubventionEdit";
-import SubTitle from "components/content/SubTitle";
-import { ConfirmationModalTexts, FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import { LeaseRentAdjustmentsFieldPaths, LeaseRentAdjustmentsFieldTitles, RentAdjustmentManagementSubventionsFieldPaths, RentAdjustmentManagementSubventionsFieldTitles, RentAdjustmentTemporarySubventionsFieldPaths, RentAdjustmentTemporarySubventionsFieldTitles, RentAdjustmentAmountTypes, RentAdjustmentTypes, SubventionTypes } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { calculateReLeaseDiscountPercent, calculateRentAdjustmentSubventionPercentCumulative, getDecisionById, hasSubventionDataChanged, hasSubventionValues, isSubventionTypeSpecified } from "leases/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatNumber, getFieldAttributes, getLabelOfOption, hasPermissions, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "util/helpers";
-import { getAttributes as getLeaseAttributes, getCurrentLease } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import SubTitle from "@/components/content/SubTitle";
+import { ConfirmationModalTexts, FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { LeaseRentAdjustmentsFieldPaths, LeaseRentAdjustmentsFieldTitles, RentAdjustmentManagementSubventionsFieldPaths, RentAdjustmentManagementSubventionsFieldTitles, RentAdjustmentTemporarySubventionsFieldPaths, RentAdjustmentTemporarySubventionsFieldTitles, RentAdjustmentAmountTypes, RentAdjustmentTypes, SubventionTypes } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { calculateReLeaseDiscountPercent, calculateRentAdjustmentSubventionPercentCumulative, getDecisionById, hasSubventionDataChanged, hasSubventionValues, isSubventionTypeSpecified } from "@/leases/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatNumber, getFieldAttributes, getLabelOfOption, hasPermissions, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes, getCurrentLease } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { Lease } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type ManagementSubventionsProps = {
   fields: any;
   leaseAttributes: Attributes;
@@ -318,12 +318,14 @@ class RentAdjustmentsEdit extends PureComponent<Props> {
             </Column>
             <Column small={6} medium={4} large={2}>
               <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentAdjustmentsFieldPaths.FULL_AMOUNT)}>
+                <>
                 <FormTextTitle required={isFieldRequired(leaseAttributes, LeaseRentAdjustmentsFieldPaths.FULL_AMOUNT) || isFieldRequired(leaseAttributes, LeaseRentAdjustmentsFieldPaths.AMOUNT_TYPE)} enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseRentAdjustmentsFieldPaths.FULL_AMOUNT)}>
                   {LeaseRentAdjustmentsFieldTitles.FULL_AMOUNT}
                 </FormTextTitle>
 
                 <Row>
                   <Authorization allow={isFieldAllowedToEdit(leaseAttributes, LeaseRentAdjustmentsFieldPaths.FULL_AMOUNT) || isFieldAllowedToEdit(leaseAttributes, LeaseRentAdjustmentsFieldPaths.AMOUNT_TYPE)} errorComponent={<Column><FormText>{this.getFullAmountText()}</FormText></Column>}>
+                    <>
                     <Column small={6}>
                       <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentAdjustmentsFieldPaths.FULL_AMOUNT)}>
                         <FormField disabled={type === RentAdjustmentTypes.DISCOUNT && showSubventions} disableTouched={isSaveClicked} fieldAttributes={getFieldAttributes(leaseAttributes, LeaseRentAdjustmentsFieldPaths.FULL_AMOUNT)} invisibleLabel name={`${field}.full_amount`} overrideValues={{
@@ -338,8 +340,10 @@ class RentAdjustmentsEdit extends PureComponent<Props> {
                       }} />
                       </Authorization>
                     </Column>
+                    </>
                   </Authorization>
                 </Row>
+                </>
               </Authorization>
             </Column>
             <Column small={6} medium={4} large={2}>
@@ -410,8 +414,10 @@ class RentAdjustmentsEdit extends PureComponent<Props> {
                       </Column>
                     </Row>
                     {subventionType === SubventionTypes.FORM_OF_MANAGEMENT && <Authorization allow={isFieldAllowedToRead(leaseAttributes, RentAdjustmentManagementSubventionsFieldPaths.MANAGEMENT_SUBVENTIONS)}>
+                        <>
                         <SubTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(RentAdjustmentManagementSubventionsFieldPaths.MANAGEMENT_SUBVENTIONS)}>{RentAdjustmentManagementSubventionsFieldTitles.MANAGEMENT_SUBVENTIONS}</SubTitle>
                         <FieldArray component={renderManagementSubventions} leaseAttributes={leaseAttributes} name={`${field}.management_subventions`} usersPermissions={usersPermissions} />
+                        </>
                       </Authorization>}
                     {subventionType === SubventionTypes.RE_LEASE && <Row>
                         <Column small={6} medium={4} large={2}>
@@ -430,19 +436,23 @@ class RentAdjustmentsEdit extends PureComponent<Props> {
                         </Column>
                         <Column small={6} medium={4} large={2}>
                           <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentAdjustmentsFieldPaths.SUBVENTION_BASE_PERCENT) || isFieldAllowedToRead(leaseAttributes, LeaseRentAdjustmentsFieldPaths.SUBVENTION_BASE_PERCENT)}>
+                            <>
                             <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseRentAdjustmentsFieldPaths.SUBVENTION_RE_LEASE_DISCOUNT_PRECENT)}>
                               {LeaseRentAdjustmentsFieldTitles.SUBVENTION_RE_LEASE_DISCOUNT_PRECENT}
                             </FormTextTitle>
                             <FormText>{formatNumber(this.calculateReLeaseDiscountPercent()) || '-'} %</FormText>
+                            </>
                           </Authorization>
                         </Column>
                       </Row>}
 
                     <Authorization allow={isFieldAllowedToRead(leaseAttributes, RentAdjustmentTemporarySubventionsFieldPaths.TEMPORARY_SUBVENTIONS)}>
+                      <>
                       <SubTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(RentAdjustmentTemporarySubventionsFieldPaths.TEMPORARY_SUBVENTIONS)}>
                         {RentAdjustmentTemporarySubventionsFieldTitles.TEMPORARY_SUBVENTIONS}
                       </SubTitle>
                       <FieldArray component={renderTemporarySubventions} leaseAttributes={leaseAttributes} name={`${field}.temporary_subventions`} usersPermissions={usersPermissions} />
+                      </>
                     </Authorization>
 
                     <Row>
@@ -469,7 +479,7 @@ class RentAdjustmentsEdit extends PureComponent<Props> {
 
 const formName = FormNames.LEASE_RENTS;
 const selector = formValueSelector(formName);
-export default connect((state, props) => {
+export default connect((state, props: Props) => {
   return {
     amountType: selector(state, `${props.field}.amount_type`),
     currentLease: getCurrentLease(state),
diff --git a/src/leases/components/leaseSections/rent/RentAdjustmentManagementSubventionEdit.tsx b/src/leases/components/leaseSections/rent/RentAdjustmentManagementSubventionEdit.tsx
index 47224e5a7..65aa7bd2e 100644
--- a/src/leases/components/leaseSections/rent/RentAdjustmentManagementSubventionEdit.tsx
+++ b/src/leases/components/leaseSections/rent/RentAdjustmentManagementSubventionEdit.tsx
@@ -1,17 +1,17 @@
 import React from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
-import Authorization from "components/authorization/Authorization";
-import FormField from "components/form/FormField";
-import RemoveButton from "components/form/RemoveButton";
-import { RentAdjustmentManagementSubventionsFieldPaths, RentAdjustmentManagementSubventionsFieldTitles } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { hasPermissions, isFieldAllowedToRead, getFieldAttributes } from "util/helpers";
-import { getAttributes as getLeaseAttributes, getIsSaveClicked } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import FormField from "@/components/form/FormField";
+import RemoveButton from "@/components/form/RemoveButton";
+import { RentAdjustmentManagementSubventionsFieldPaths, RentAdjustmentManagementSubventionsFieldTitles } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { hasPermissions, isFieldAllowedToRead, getFieldAttributes } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes, getIsSaveClicked } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   field: any;
   isSaveClicked: boolean;
diff --git a/src/leases/components/leaseSections/rent/RentAdjustmentTemporarySubventionEdit.tsx b/src/leases/components/leaseSections/rent/RentAdjustmentTemporarySubventionEdit.tsx
index 67070e9ea..4f11166ec 100644
--- a/src/leases/components/leaseSections/rent/RentAdjustmentTemporarySubventionEdit.tsx
+++ b/src/leases/components/leaseSections/rent/RentAdjustmentTemporarySubventionEdit.tsx
@@ -1,17 +1,17 @@
 import React from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
-import Authorization from "components/authorization/Authorization";
-import FormField from "components/form/FormField";
-import RemoveButton from "components/form/RemoveButton";
-import { RentAdjustmentTemporarySubventionsFieldPaths, RentAdjustmentTemporarySubventionsFieldTitles } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { hasPermissions, isFieldAllowedToRead, getFieldAttributes } from "util/helpers";
-import { getAttributes as getLeaseAttributes, getIsSaveClicked } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import FormField from "@/components/form/FormField";
+import RemoveButton from "@/components/form/RemoveButton";
+import { RentAdjustmentTemporarySubventionsFieldPaths, RentAdjustmentTemporarySubventionsFieldTitles } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { hasPermissions, isFieldAllowedToRead, getFieldAttributes } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes, getIsSaveClicked } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   field: any;
   isSaveClicked: boolean;
diff --git a/src/leases/components/leaseSections/rent/RentAdjustments.tsx b/src/leases/components/leaseSections/rent/RentAdjustments.tsx
index 554f162b8..0117fc6b0 100644
--- a/src/leases/components/leaseSections/rent/RentAdjustments.tsx
+++ b/src/leases/components/leaseSections/rent/RentAdjustments.tsx
@@ -1,22 +1,22 @@
 import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
-import Authorization from "components/authorization/Authorization";
-import BoxItem from "components/content/BoxItem";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import DecisionLink from "components/links/DecisionLink";
-import Divider from "components/content/Divider";
-import GreenBox from "components/content/GreenBox";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import SubTitle from "components/content/SubTitle";
-import { LeaseRentAdjustmentsFieldPaths, LeaseRentAdjustmentsFieldTitles, RentAdjustmentManagementSubventionsFieldPaths, RentAdjustmentManagementSubventionsFieldTitles, RentAdjustmentAmountTypes, RentAdjustmentTypes, SubventionTypes, RentAdjustmentTemporarySubventionsFieldPaths, RentAdjustmentTemporarySubventionsFieldTitles } from "leases/enums";
-import { calculateReLeaseDiscountPercent, getDecisionById, getDecisionOptions } from "leases/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes as getLeaseAttributes, getCurrentLease } from "leases/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import BoxItem from "@/components/content/BoxItem";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import DecisionLink from "@/components/links/DecisionLink";
+import Divider from "@/components/content/Divider";
+import GreenBox from "@/components/content/GreenBox";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import SubTitle from "@/components/content/SubTitle";
+import { LeaseRentAdjustmentsFieldPaths, LeaseRentAdjustmentsFieldTitles, RentAdjustmentManagementSubventionsFieldPaths, RentAdjustmentManagementSubventionsFieldTitles, RentAdjustmentAmountTypes, RentAdjustmentTypes, SubventionTypes, RentAdjustmentTemporarySubventionsFieldPaths, RentAdjustmentTemporarySubventionsFieldTitles } from "@/leases/enums";
+import { calculateReLeaseDiscountPercent, getDecisionById, getDecisionOptions } from "@/leases/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes, getCurrentLease } from "@/leases/selectors";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
+import type { Lease } from "@/leases/types";
 type Props = {
   currentLease: Lease;
   leaseAttributes: Attributes;
@@ -55,28 +55,34 @@ const RentAdjustments = ({
               <Row>
                 <Column small={6} medium={4} large={2}>
                   <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentAdjustmentsFieldPaths.TYPE)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentAdjustmentsFieldPaths.TYPE)}>
                       {LeaseRentAdjustmentsFieldTitles.TYPE}
                     </FormTextTitle>
                     <FormText>{getLabelOfOption(typeOptions, adjustment.type) || '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={6} medium={4} large={2}>
                   <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentAdjustmentsFieldPaths.INTENDED_USE)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentAdjustmentsFieldPaths.INTENDED_USE)}>
                       {LeaseRentAdjustmentsFieldTitles.INTENDED_USE}
                     </FormTextTitle>
                     <FormText>{getLabelOfOption(intendedUseOptions, adjustment.intended_use) || '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={6} medium={4} large={2}>
                   <Row>
                     <Column small={6}>
                       <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentAdjustmentsFieldPaths.START_DATE)}>
+                        <>
                         <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentAdjustmentsFieldPaths.START_DATE)}>
                           {LeaseRentAdjustmentsFieldTitles.START_DATE}
                         </FormTextTitle>
                         <FormText>{formatDate(adjustment.start_date) || '-'}</FormText>
+                        </>
                       </Authorization>
                     </Column>
                     <Column small={6}>
@@ -93,10 +99,12 @@ const RentAdjustments = ({
                 </Column>
                 <Column small={6} medium={4} large={2}>
                   <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentAdjustmentsFieldPaths.FULL_AMOUNT)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentAdjustmentsFieldPaths.FULL_AMOUNT)}>
                       {LeaseRentAdjustmentsFieldTitles.FULL_AMOUNT}
                     </FormTextTitle>
                     <FormText>{getFullAmountText(adjustment) || '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={6} medium={4} large={2}>
@@ -111,10 +119,12 @@ const RentAdjustments = ({
                 </Column>
                 <Column small={6} medium={4} large={2}>
                   <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentAdjustmentsFieldPaths.DECISION)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentAdjustmentsFieldPaths.DECISION)}>
                       {LeaseRentAdjustmentsFieldTitles.DECISION}
                     </FormTextTitle>
                     <DecisionLink decision={decision} decisionOptions={decisionOptions} />
+                    </>
                   </Authorization>
                 </Column>
               </Row>
@@ -134,14 +144,17 @@ const RentAdjustments = ({
                   <Row>
                     <Column small={6} medium={4} large={2}>
                       <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentAdjustmentsFieldPaths.SUBVENTION_TYPE)}>
+                        <>
                         <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseRentAdjustmentsFieldPaths.SUBVENTION_TYPE)}>
                           {LeaseRentAdjustmentsFieldTitles.SUBVENTION_TYPE}
                         </FormTextTitle>
                         <FormText>{getLabelOfOption(subventionTypeOptions, adjustment.subvention_type) || '-'}</FormText>
+                        </>
                       </Authorization>
                     </Column>
                   </Row>
                   {adjustment.subvention_type === SubventionTypes.FORM_OF_MANAGEMENT && <Authorization allow={isFieldAllowedToRead(leaseAttributes, RentAdjustmentManagementSubventionsFieldPaths.MANAGEMENT_SUBVENTIONS)}>
+                      <>
                       <SubTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(RentAdjustmentManagementSubventionsFieldPaths.MANAGEMENT_SUBVENTIONS)}>{RentAdjustmentManagementSubventionsFieldTitles.MANAGEMENT_SUBVENTIONS}</SubTitle>
                       {!managementSubventions || !managementSubventions.length && <FormText>Ei hallintamuotoja</FormText>}
                       {managementSubventions && managementSubventions.length && <Fragment>
@@ -175,36 +188,43 @@ const RentAdjustments = ({
                               </Column>
                             </Row>)}
                         </Fragment>}
-
+                        </>
                     </Authorization>}
                   {adjustment.subvention_type === SubventionTypes.RE_LEASE && <Row>
                       <Column small={6} medium={4} large={2}>
                         <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentAdjustmentsFieldPaths.SUBVENTION_BASE_PERCENT)}>
+                          <>
                           <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseRentAdjustmentsFieldPaths.SUBVENTION_BASE_PERCENT)}>
                             {LeaseRentAdjustmentsFieldTitles.SUBVENTION_BASE_PERCENT}
                           </FormTextTitle>
                           <FormText>{!isEmptyValue(adjustment.subvention_base_percent) ? `${formatNumber(adjustment.subvention_base_percent)} %` : '-'}</FormText>
+                          </>
                         </Authorization>
                       </Column>
                       <Column small={6} medium={4} large={2}>
                         <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentAdjustmentsFieldPaths.SUBVENTION_GRADUATED_PERCENT)}>
+                          <>
                           <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseRentAdjustmentsFieldPaths.SUBVENTION_GRADUATED_PERCENT)}>
                             {LeaseRentAdjustmentsFieldTitles.SUBVENTION_GRADUATED_PERCENT}
                           </FormTextTitle>
                           <FormText>{!isEmptyValue(adjustment.subvention_graduated_percent) ? `${formatNumber(adjustment.subvention_graduated_percent)} %` : '-'}</FormText>
+                          </>
                         </Authorization>
                       </Column>
                       <Column small={6} medium={4} large={2}>
                         <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentAdjustmentsFieldPaths.SUBVENTION_BASE_PERCENT) || isFieldAllowedToRead(leaseAttributes, LeaseRentAdjustmentsFieldPaths.SUBVENTION_BASE_PERCENT)}>
+                          <>
                           <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseRentAdjustmentsFieldPaths.SUBVENTION_RE_LEASE_DISCOUNT_PRECENT)}>
                             {LeaseRentAdjustmentsFieldTitles.SUBVENTION_RE_LEASE_DISCOUNT_PRECENT}
                           </FormTextTitle>
                           <FormText>{formatNumber(getReLeaseDiscountPercent())} %</FormText>
+                          </>
                         </Authorization>
                       </Column>
                     </Row>}
 
                   <Authorization allow={isFieldAllowedToRead(leaseAttributes, RentAdjustmentTemporarySubventionsFieldPaths.TEMPORARY_SUBVENTIONS)}>
+                    <>
                     <SubTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(RentAdjustmentTemporarySubventionsFieldPaths.TEMPORARY_SUBVENTIONS)}>
                       {RentAdjustmentTemporarySubventionsFieldTitles.TEMPORARY_SUBVENTIONS}
                     </SubTitle>
@@ -240,6 +260,7 @@ const RentAdjustments = ({
                             </Column>
                           </Row>)}
                       </Fragment>}
+                    </>
                   </Authorization>
 
                   <Row>
diff --git a/src/leases/components/leaseSections/rent/RentAdjustmentsEdit.tsx b/src/leases/components/leaseSections/rent/RentAdjustmentsEdit.tsx
index 5aec13e16..45e8d8200 100644
--- a/src/leases/components/leaseSections/rent/RentAdjustmentsEdit.tsx
+++ b/src/leases/components/leaseSections/rent/RentAdjustmentsEdit.tsx
@@ -6,25 +6,25 @@ import addMonths from "date-fns/addMonths";
 import format from "date-fns/format";
 import isAfter from "date-fns/isAfter";
 import subDays from "date-fns/subDays";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import Authorization from "components/authorization/Authorization";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import DecisionLink from "components/links/DecisionLink";
-import FormText from "components/form/FormText";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import Authorization from "@/components/authorization/Authorization";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import DecisionLink from "@/components/links/DecisionLink";
+import FormText from "@/components/form/FormText";
 import RentAdjustmentEdit from "./RentAdjustmentEdit";
 import SteppedDiscountModal from "./SteppedDiscountModal";
-import { ConfirmationModalTexts, FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import { LeaseRentAdjustmentsFieldPaths, RentAdjustmentAmountTypes, RentAdjustmentTypes } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getDecisionById, getDecisionOptions } from "leases/helpers";
-import { convertStrToDecimalNumber, formatNumber, getFieldOptions, hasPermissions } from "util/helpers";
-import { getAttributes as getLeaseAttributes, getCurrentLease } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import { ConfirmationModalTexts, FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { LeaseRentAdjustmentsFieldPaths, RentAdjustmentAmountTypes, RentAdjustmentTypes } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getDecisionById, getDecisionOptions } from "@/leases/helpers";
+import { convertStrToDecimalNumber, formatNumber, getFieldOptions, hasPermissions } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes, getCurrentLease } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { Lease } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   adjustments: Array<Record<string, any>>;
   currentLease: Lease;
diff --git a/src/leases/components/leaseSections/rent/RentItem.tsx b/src/leases/components/leaseSections/rent/RentItem.tsx
index f7fa9d08c..00b09fe7f 100644
--- a/src/leases/components/leaseSections/rent/RentItem.tsx
+++ b/src/leases/components/leaseSections/rent/RentItem.tsx
@@ -2,22 +2,22 @@ import React from "react";
 import { connect } from "react-redux";
 import { Column } from "react-foundation";
 import get from "lodash/get";
-import Authorization from "components/authorization/Authorization";
+import Authorization from "@/components/authorization/Authorization";
 import BasicInfo from "./BasicInfo";
-import Collapse from "components/collapse/Collapse";
-import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle";
+import Collapse from "@/components/collapse/Collapse";
+import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle";
 import ContractRents from "./ContractRents";
 import EqualizedRents from "./EqualizedRents";
 import FixedInitialYearRents from "./FixedInitialYearRents";
 import IndexAdjustedRents from "./IndexAdjustedRents";
 import PayableRents from "./PayableRents";
 import RentAdjustments from "./RentAdjustments";
-import { receiveCollapseStates } from "leases/actions";
-import { FormNames, ViewModes } from "enums";
-import { LeaseRentsFieldPaths, LeaseRentFixedInitialYearRentsFieldPaths, LeaseRentFixedInitialYearRentsFieldTitles, LeaseRentContractRentsFieldPaths, LeaseRentContractRentsFieldTitles, LeaseIndexAdjustedRentsFieldPaths, LeaseIndexAdjustedRentsFieldTitles, LeaseRentAdjustmentsFieldPaths, LeaseRentAdjustmentsFieldTitles, LeasePayableRentsFieldPaths, LeasePayableRentsFieldTitles, LeaseEqualizedRentsFieldPaths, LeaseEqualizedRentsFieldTitles, RentTypes } from "leases/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatDateRange, getFieldOptions, getLabelOfOption, isActive, isArchived, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes as getLeaseAttributes, getCollapseStateByKey } from "leases/selectors";
+import { receiveCollapseStates } from "@/leases/actions";
+import { FormNames, ViewModes } from "@/enums";
+import { LeaseRentsFieldPaths, LeaseRentFixedInitialYearRentsFieldPaths, LeaseRentFixedInitialYearRentsFieldTitles, LeaseRentContractRentsFieldPaths, LeaseRentContractRentsFieldTitles, LeaseIndexAdjustedRentsFieldPaths, LeaseIndexAdjustedRentsFieldTitles, LeaseRentAdjustmentsFieldPaths, LeaseRentAdjustmentsFieldTitles, LeasePayableRentsFieldPaths, LeasePayableRentsFieldTitles, LeaseEqualizedRentsFieldPaths, LeaseEqualizedRentsFieldTitles, RentTypes } from "@/leases/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatDateRange, getFieldOptions, getLabelOfOption, isActive, isArchived, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes, getCollapseStateByKey } from "@/leases/selectors";
 import type { Attributes } from "types";
 const formName = FormNames.LEASE_RENTS;
 type Props = {
diff --git a/src/leases/components/leaseSections/rent/RentItemEdit.tsx b/src/leases/components/leaseSections/rent/RentItemEdit.tsx
index 7c40b6530..e9f7edd71 100644
--- a/src/leases/components/leaseSections/rent/RentItemEdit.tsx
+++ b/src/leases/components/leaseSections/rent/RentItemEdit.tsx
@@ -4,27 +4,27 @@ import { change, FieldArray, formValueSelector, FormSection } from "redux-form";
 import { Column } from "react-foundation";
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
-import Authorization from "components/authorization/Authorization";
+import Authorization from "@/components/authorization/Authorization";
 import BasicInfoEdit from "./BasicInfoEdit";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import Collapse from "components/collapse/Collapse";
-import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import Collapse from "@/components/collapse/Collapse";
+import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle";
 import ContractRentsEdit from "./ContractRentsEdit";
 import EqualizedRents from "./EqualizedRents";
 import FixedInitialYearRentsEdit from "./FixedInitialYearRentsEdit";
 import IndexAdjustedRents from "./IndexAdjustedRents";
 import PayableRents from "./PayableRents";
 import RentAdjustmentsEdit from "./RentAdjustmentsEdit";
-import { receiveCollapseStates } from "leases/actions";
-import { FormNames, ViewModes } from "enums";
-import { ContractRentPeriods, LeaseRentsFieldPaths, LeaseRentFixedInitialYearRentsFieldPaths, LeaseRentFixedInitialYearRentsFieldTitles, LeaseRentContractRentsFieldPaths, LeaseRentContractRentsFieldTitles, LeaseIndexAdjustedRentsFieldPaths, LeaseIndexAdjustedRentsFieldTitles, LeaseRentAdjustmentsFieldPaths, LeaseRentAdjustmentsFieldTitles, LeasePayableRentsFieldPaths, LeasePayableRentsFieldTitles, LeaseEqualizedRentsFieldPaths, LeaseEqualizedRentsFieldTitles, RentDueDateTypes, RentTypes } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatDateRange, getFieldOptions, getLabelOfOption, hasPermissions, isActive, isArchived, isEmptyValue, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes as getLeaseAttributes, getCollapseStateByKey, getErrorsByFormName, getIsSaveClicked } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import { receiveCollapseStates } from "@/leases/actions";
+import { FormNames, ViewModes } from "@/enums";
+import { ContractRentPeriods, LeaseRentsFieldPaths, LeaseRentFixedInitialYearRentsFieldPaths, LeaseRentFixedInitialYearRentsFieldTitles, LeaseRentContractRentsFieldPaths, LeaseRentContractRentsFieldTitles, LeaseIndexAdjustedRentsFieldPaths, LeaseIndexAdjustedRentsFieldTitles, LeaseRentAdjustmentsFieldPaths, LeaseRentAdjustmentsFieldTitles, LeasePayableRentsFieldPaths, LeasePayableRentsFieldTitles, LeaseEqualizedRentsFieldPaths, LeaseEqualizedRentsFieldTitles, RentDueDateTypes, RentTypes } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatDateRange, getFieldOptions, getLabelOfOption, hasPermissions, isActive, isArchived, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes, getCollapseStateByKey, getErrorsByFormName, getIsSaveClicked } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   change: (...args: Array<any>) => any;
   contractRentsCollapseState: boolean;
diff --git a/src/leases/components/leaseSections/rent/Rents.tsx b/src/leases/components/leaseSections/rent/Rents.tsx
index cf42e6650..1a1a0d783 100644
--- a/src/leases/components/leaseSections/rent/Rents.tsx
+++ b/src/leases/components/leaseSections/rent/Rents.tsx
@@ -2,29 +2,29 @@ import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { withRouter } from "react-router";
 import flowRight from "lodash/flowRight";
-import Authorization from "components/authorization/Authorization";
+import Authorization from "@/components/authorization/Authorization";
 import BasisOfRents from "./BasisOfRents";
-import Divider from "components/content/Divider";
-import FormText from "components/form/FormText";
-import GreenBox from "components/content/GreenBox";
-import RentCalculator from "components/rent-calculator/RentCalculator";
+import Divider from "@/components/content/Divider";
+import FormText from "@/components/form/FormText";
+import GreenBox from "@/components/content/GreenBox";
+import RentCalculator from "@/components/rent-calculator/RentCalculator";
 import RentItem from "./RentItem";
-import SuccessField from "components/form/SuccessField";
-import Title from "components/content/Title";
-import WarningContainer from "components/content/WarningContainer";
-import WarningField from "components/form/WarningField";
-import { RentCalculatorFieldPaths, RentCalculatorFieldTitles } from "components/enums";
-import { LeaseBasisOfRentsFieldPaths, LeaseBasisOfRentsFieldTitles, LeaseRentsFieldPaths, LeaseRentsFieldTitles } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getContentRents, getRentWarnings } from "leases/helpers";
-import { hasPermissions, isArchived, isFieldAllowedToRead } from "util/helpers";
-import { getUiDataLeaseKey, getUiDataRentCalculatorKey } from "uiData/helpers";
-import { getAttributes as getLeaseAttributes, getCurrentLease } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import SuccessField from "@/components/form/SuccessField";
+import Title from "@/components/content/Title";
+import WarningContainer from "@/components/content/WarningContainer";
+import WarningField from "@/components/form/WarningField";
+import { RentCalculatorFieldPaths, RentCalculatorFieldTitles } from "@/components/enums";
+import { LeaseBasisOfRentsFieldPaths, LeaseBasisOfRentsFieldTitles, LeaseRentsFieldPaths, LeaseRentsFieldTitles } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getContentRents, getRentWarnings } from "@/leases/helpers";
+import { hasPermissions, isArchived, isFieldAllowedToRead } from "@/util/helpers";
+import { getUiDataLeaseKey, getUiDataRentCalculatorKey } from "@/uiData/helpers";
+import { getAttributes as getLeaseAttributes, getCurrentLease } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { RootState } from "root/types";
-import type { Lease } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { RootState } from "@/root/types";
+import type { Lease } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   currentLease: Lease;
   leaseAttributes: Attributes;
@@ -64,6 +64,7 @@ const Rents = ({
       <Divider />
 
       <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.RENTS)}>
+        <>
         {!rents || !rents.length && <FormText className='no-margin'>Ei vuokria</FormText>}
         {rents && !!rents.length && rents.map(rent => {
         return <RentItem key={rent.id} rent={rent} rents={rents} />;
@@ -74,9 +75,11 @@ const Rents = ({
         marginBottom: 5
       }}>Arkisto</h3>}
         {!!rentsArchived.length && rentsArchived.map(rent => <RentItem key={rent.id} rent={rent} rents={rents} />)}
+        </>
       </Authorization>
 
       <Authorization allow={hasPermissions(usersPermissions, UsersPermissions.VIEW_INVOICE)}>
+        <>
         <Title uiDataKey={getUiDataRentCalculatorKey(RentCalculatorFieldPaths.RENT_CALCULATOR)}>
           {RentCalculatorFieldTitles.RENT_CALCULATOR}
         </Title>
@@ -84,14 +87,17 @@ const Rents = ({
         <GreenBox>
           <RentCalculator />
         </GreenBox>
+        </>
       </Authorization>
 
       <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.BASIS_OF_RENTS)}>
+        <>
         <Title uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.BASIS_OF_RENTS)}>
           {LeaseBasisOfRentsFieldTitles.BASIS_OF_RENTS}
         </Title>
         <Divider />
         <BasisOfRents />
+        </>
       </Authorization>
     </Fragment>;
 };
diff --git a/src/leases/components/leaseSections/rent/RentsEdit.tsx b/src/leases/components/leaseSections/rent/RentsEdit.tsx
index 4ae5d167b..ef741b82c 100644
--- a/src/leases/components/leaseSections/rent/RentsEdit.tsx
+++ b/src/leases/components/leaseSections/rent/RentsEdit.tsx
@@ -4,34 +4,34 @@ import { withRouter } from "react-router";
 import { Field, FieldArray, formValueSelector, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButton from "components/form/AddButton";
-import Authorization from "components/authorization/Authorization";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButton from "@/components/form/AddButton";
+import Authorization from "@/components/authorization/Authorization";
 import BasisOfRentsEdit from "./BasisOfRentsEdit";
-import Button from "components/button/Button";
-import Divider from "components/content/Divider";
-import FormText from "components/form/FormText";
-import GreenBox from "components/content/GreenBox";
-import RentCalculator from "components/rent-calculator/RentCalculator";
+import Button from "@/components/button/Button";
+import Divider from "@/components/content/Divider";
+import FormText from "@/components/form/FormText";
+import GreenBox from "@/components/content/GreenBox";
+import RentCalculator from "@/components/rent-calculator/RentCalculator";
 import RentItemEdit from "./RentItemEdit";
-import SuccessField from "components/form/SuccessField";
-import Title from "components/content/Title";
-import WarningContainer from "components/content/WarningContainer";
-import WarningField from "components/form/WarningField";
-import { receiveFormValidFlags, setRentInfoComplete, setRentInfoUncomplete } from "leases/actions";
-import { ConfirmationModalTexts, FormNames } from "enums";
-import { ButtonColors, RentCalculatorFieldPaths, RentCalculatorFieldTitles } from "components/enums";
-import { LeaseBasisOfRentsFieldPaths, LeaseBasisOfRentsFieldTitles, LeaseRentsFieldPaths, LeaseRentsFieldTitles } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { validateRentForm, warnRentForm } from "leases/formValidators";
-import { getContentRents } from "leases/helpers";
-import { getUiDataLeaseKey, getUiDataRentCalculatorKey } from "uiData/helpers";
-import { hasPermissions, isArchived, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes as getLeaseAttributes, getCurrentLease, getErrorsByFormName, getIsSaveClicked } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import SuccessField from "@/components/form/SuccessField";
+import Title from "@/components/content/Title";
+import WarningContainer from "@/components/content/WarningContainer";
+import WarningField from "@/components/form/WarningField";
+import { receiveFormValidFlags, setRentInfoComplete, setRentInfoUncomplete } from "@/leases/actions";
+import { ConfirmationModalTexts, FormNames } from "@/enums";
+import { ButtonColors, RentCalculatorFieldPaths, RentCalculatorFieldTitles } from "@/components/enums";
+import { LeaseBasisOfRentsFieldPaths, LeaseBasisOfRentsFieldTitles, LeaseRentsFieldPaths, LeaseRentsFieldTitles } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { validateRentForm, warnRentForm } from "@/leases/formValidators";
+import { getContentRents } from "@/leases/helpers";
+import { getUiDataLeaseKey, getUiDataRentCalculatorKey } from "@/uiData/helpers";
+import { hasPermissions, isArchived, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes, getCurrentLease, getErrorsByFormName, getIsSaveClicked } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { Lease } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type WarningsProps = {
   leaseAttributes: Attributes;
   meta: Record<string, any>;
@@ -262,6 +262,7 @@ class RentsEdit extends PureComponent<Props, State> {
 
         return <form>
               <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseRentsFieldPaths.RENTS)}>
+                <>
                 <Title enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseRentsFieldPaths.RENTS)}>
                   {LeaseRentsFieldTitles.RENTS}
                 </Title>
@@ -287,9 +288,11 @@ class RentsEdit extends PureComponent<Props, State> {
               /* Archived rents */
             }
                 <FieldArray component={renderRents} archived={true} name='rentsArchived' rents={rentsArchived} usersPermissions={usersPermissions} />
+                </>
               </Authorization>
 
               <Authorization allow={hasPermissions(usersPermissions, UsersPermissions.VIEW_INVOICE)}>
+                <>
                 <Title enableUiDataEdit uiDataKey={getUiDataRentCalculatorKey(RentCalculatorFieldPaths.RENT_CALCULATOR)}>
                   {RentCalculatorFieldTitles.RENT_CALCULATOR}
                 </Title>
@@ -297,9 +300,11 @@ class RentsEdit extends PureComponent<Props, State> {
                 <GreenBox>
                   <RentCalculator />
                 </GreenBox>
+                </>
               </Authorization>
 
               <Authorization allow={isFieldAllowedToRead(leaseAttributes, LeaseBasisOfRentsFieldPaths.BASIS_OF_RENTS)}>
+                <>
                 <Title enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseBasisOfRentsFieldPaths.BASIS_OF_RENTS)}>
                   {LeaseBasisOfRentsFieldTitles.BASIS_OF_RENTS}
                 </Title>
@@ -307,6 +312,7 @@ class RentsEdit extends PureComponent<Props, State> {
                 <FieldArray ref={this.setActiveBasisOfRentsRef} archived={false} basisOfRents={editedActiveBasisOfRents} component={BasisOfRentsEdit} formName={formName} isSaveClicked={isSaveClicked} name="basis_of_rents" onArchive={this.handleArchive} forwardRef />
 
                 <FieldArray ref={this.setArchivedBasisOfRentsRef} archived={true} basisOfRents={editedArchivedBasisOfRents} component={BasisOfRentsEdit} formName={formName} isSaveClicked={isSaveClicked} name="basis_of_rents_archived" onUnarchive={this.handleUnarchive} forwardRef />
+                </>
               </Authorization>
             </form>;
       }}
diff --git a/src/leases/components/leaseSections/rent/SteppedDiscountForm.tsx b/src/leases/components/leaseSections/rent/SteppedDiscountForm.tsx
index c2e2a5d7a..4d5bdf345 100644
--- a/src/leases/components/leaseSections/rent/SteppedDiscountForm.tsx
+++ b/src/leases/components/leaseSections/rent/SteppedDiscountForm.tsx
@@ -3,14 +3,14 @@ import { connect } from "react-redux";
 import { reduxForm } from "redux-form";
 import flowRight from "lodash/flowRight";
 import { Row, Column } from "react-foundation";
-import Authorization from "components/authorization/Authorization";
-import FormField from "components/form/FormField";
-import { FormNames } from "enums";
-import { LeaseRentAdjustmentsFieldPaths, LeaseRentAdjustmentsFieldTitles } from "leases/enums";
-import { validateSteppedDiscountForm } from "leases/formValidators";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getFieldAttributes, isFieldAllowedToEdit } from "util/helpers";
-import { getAttributes as getLeaseAttributes } from "leases/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import FormField from "@/components/form/FormField";
+import { FormNames } from "@/enums";
+import { LeaseRentAdjustmentsFieldPaths, LeaseRentAdjustmentsFieldTitles } from "@/leases/enums";
+import { validateSteppedDiscountForm } from "@/leases/formValidators";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getFieldAttributes, isFieldAllowedToEdit } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes } from "@/leases/selectors";
 import type { Attributes } from "types";
 type Props = {
   decisionOptions: Array<Record<string, any>>;
@@ -42,6 +42,7 @@ const SteppedDiscountForm = ({
       </Row>
       <Row>
         <Authorization allow={isFieldAllowedToEdit(leaseAttributes, LeaseRentAdjustmentsFieldPaths.FULL_AMOUNT)}>
+          <>
           <Column small={6} medium={4} large={4}>
             <FormField fieldAttributes={{
             max_digits: 10,
@@ -72,6 +73,7 @@ const SteppedDiscountForm = ({
             label: LeaseRentAdjustmentsFieldTitles.PERCANTAGE_FINAL
           }} />
           </Column>
+          </>
         </Authorization>
       </Row>
       <Row>
diff --git a/src/leases/components/leaseSections/rent/SteppedDiscountModal.tsx b/src/leases/components/leaseSections/rent/SteppedDiscountModal.tsx
index d0eb7d5d2..ff65344ac 100644
--- a/src/leases/components/leaseSections/rent/SteppedDiscountModal.tsx
+++ b/src/leases/components/leaseSections/rent/SteppedDiscountModal.tsx
@@ -2,12 +2,12 @@ import React from "react";
 import { getFormValues, isValid } from "redux-form";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import Button from "components/button/Button";
-import Modal from "components/modal/Modal";
-import ModalButtonWrapper from "components/modal/ModalButtonWrapper";
+import Button from "@/components/button/Button";
+import Modal from "@/components/modal/Modal";
+import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper";
 import SteppedDiscountForm from "./SteppedDiscountForm";
-import { FormNames } from "enums";
-import { ButtonColors } from "components/enums";
+import { FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
 type Props = {
   decisionOptions: Array<Record<string, any>>;
   formValues: Record<string, any>;
diff --git a/src/leases/components/leaseSections/summary/LeaseHistory.tsx b/src/leases/components/leaseSections/summary/LeaseHistory.tsx
index 81c772d80..f4f143ed3 100644
--- a/src/leases/components/leaseSections/summary/LeaseHistory.tsx
+++ b/src/leases/components/leaseSections/summary/LeaseHistory.tsx
@@ -1,15 +1,15 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import LeaseHistoryItem from "./LeaseHistoryItem";
-import TitleH3 from "components/content/TitleH3";
-import { LeaseFieldPaths, LeaseFieldTitles, LeaseHistoryContentTypes, LeaseHistoryItemTypes } from "leases/enums";
-import { getContentRelatedLeasesFrom, getContentRelatedLeasesTo, sortRelatedLeasesFrom } from "leases/helpers";
-import { getFieldOptions } from "util/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getAttributes as getLeaseAttributes, getCurrentLease } from "leases/selectors";
+import TitleH3 from "@/components/content/TitleH3";
+import { LeaseFieldPaths, LeaseFieldTitles, LeaseHistoryContentTypes, LeaseHistoryItemTypes } from "@/leases/enums";
+import { getContentRelatedLeasesFrom, getContentRelatedLeasesTo, sortRelatedLeasesFrom } from "@/leases/helpers";
+import { getFieldOptions } from "@/util/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getAttributes as getLeaseAttributes, getCurrentLease } from "@/leases/selectors";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
-import { restructureLease, sortRelatedHistoryItems } from "leases/helpers";
+import type { Lease } from "@/leases/types";
+import { restructureLease, sortRelatedHistoryItems } from "@/leases/helpers";
 type Props = {
   currentLease: Lease;
   leaseAttributes: Attributes;
diff --git a/src/leases/components/leaseSections/summary/LeaseHistoryEdit.tsx b/src/leases/components/leaseSections/summary/LeaseHistoryEdit.tsx
index 2848f2b80..10f32baee 100644
--- a/src/leases/components/leaseSections/summary/LeaseHistoryEdit.tsx
+++ b/src/leases/components/leaseSections/summary/LeaseHistoryEdit.tsx
@@ -2,31 +2,31 @@ import React, { Component } from "react";
 import { Row, Column } from "react-foundation";
 import { connect } from "react-redux";
 import { initialize } from "redux-form";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import Authorization from "components/authorization/Authorization";
-import CreateLeaseModal from "leases/components/createLease/CreateLeaseModal";
-import FormFieldLabel from "components/form/FormFieldLabel";
-import LeaseSelectInput from "components/inputs/LeaseSelectInput";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import Authorization from "@/components/authorization/Authorization";
+import CreateLeaseModal from "@/leases/components/createLease/CreateLeaseModal";
+import FormFieldLabel from "@/components/form/FormFieldLabel";
+import LeaseSelectInput from "@/components/inputs/LeaseSelectInput";
 import LeaseHistoryItem from "./LeaseHistoryItem";
-import TitleH3 from "components/content/TitleH3";
-import { createLease, hideCreateModal, showCreateModal } from "leases/actions";
-import { createReleatedLease, deleteReleatedLease, createRelatedPlotApplication, deleteRelatedPlotApplication } from "relatedLease/actions";
-import { ConfirmationModalTexts, FormNames, Methods } from "enums";
-import { ButtonColors } from "components/enums";
-import { LeaseFieldPaths, LeaseFieldTitles, LeaseHistoryContentTypes, LeaseHistoryItemTypes, RelationTypes } from "leases/enums";
-import { RelatedLeasePaths } from "relatedLease/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getContentRelatedLeasesFrom, getContentRelatedLeasesTo, isAnyLeaseFormDirty, sortRelatedLeasesFrom } from "leases/helpers";
-import { getUiDataLeaseKey, getUiDataRelatedLeaseKey } from "uiData/helpers";
-import { getFieldOptions, hasPermissions, isMethodAllowed } from "util/helpers";
-import { getAttributes as getLeaseAttributes, getMethods as getLeaseMethods, getCurrentLease, getIsCreateModalOpen } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import TitleH3 from "@/components/content/TitleH3";
+import { createLease, hideCreateModal, showCreateModal } from "@/leases/actions";
+import { createReleatedLease, deleteReleatedLease, createRelatedPlotApplication, deleteRelatedPlotApplication } from "@/relatedLease/actions";
+import { ConfirmationModalTexts, FormNames, Methods } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { LeaseFieldPaths, LeaseFieldTitles, LeaseHistoryContentTypes, LeaseHistoryItemTypes, RelationTypes } from "@/leases/enums";
+import { RelatedLeasePaths } from "@/relatedLease/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getContentRelatedLeasesFrom, getContentRelatedLeasesTo, isAnyLeaseFormDirty, sortRelatedLeasesFrom } from "@/leases/helpers";
+import { getUiDataLeaseKey, getUiDataRelatedLeaseKey } from "@/uiData/helpers";
+import { getFieldOptions, hasPermissions, isMethodAllowed } from "@/util/helpers";
+import { getAttributes as getLeaseAttributes, getMethods as getLeaseMethods, getCurrentLease, getIsCreateModalOpen } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes, Methods as MethodsType } from "types";
-import type { Lease } from "leases/types";
-import { restructureLease, sortRelatedHistoryItems } from "leases/helpers";
-import PlotApplication from "plotApplications/components/PlotApplication";
-import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "usersPermissions/types";
+import type { Lease } from "@/leases/types";
+import { restructureLease, sortRelatedHistoryItems } from "@/leases/helpers";
+import PlotApplication from "@/plotApplications/components/PlotApplication";
+import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "@/usersPermissions/types";
 type Props = {
   createLease: (...args: Array<any>) => any;
   createReleatedLease: (...args: Array<any>) => any;
diff --git a/src/leases/components/leaseSections/summary/LeaseHistoryItem.tsx b/src/leases/components/leaseSections/summary/LeaseHistoryItem.tsx
index bb7185010..8c72e0e82 100644
--- a/src/leases/components/leaseSections/summary/LeaseHistoryItem.tsx
+++ b/src/leases/components/leaseSections/summary/LeaseHistoryItem.tsx
@@ -1,22 +1,22 @@
 import React from "react";
 import { connect } from "react-redux";
 import classNames from "classnames";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AccordionIcon from "components/icons/AccordionIcon";
-import Authorization from "components/authorization/Authorization";
-import ExternalLink from "components/links/ExternalLink";
-import FormText from "components/form/FormText";
-import RemoveButton from "components/form/RemoveButton";
-import { ConfirmationModalTexts } from "enums";
-import { LeaseHistoryItemTypes } from "leases/enums";
-import { ButtonColors } from "components/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getContentLeaseIdentifier, getTitleText } from "leases/helpers";
-import { formatDate, getLabelOfOption, hasPermissions } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import type { Lease } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AccordionIcon from "@/components/icons/AccordionIcon";
+import Authorization from "@/components/authorization/Authorization";
+import ExternalLink from "@/components/links/ExternalLink";
+import FormText from "@/components/form/FormText";
+import RemoveButton from "@/components/form/RemoveButton";
+import { ConfirmationModalTexts } from "@/enums";
+import { LeaseHistoryItemTypes } from "@/leases/enums";
+import { ButtonColors } from "@/components/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getContentLeaseIdentifier, getTitleText } from "@/leases/helpers";
+import { formatDate, getLabelOfOption, hasPermissions } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import type { Lease } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   active?: boolean;
   indented?: boolean;
diff --git a/src/leases/components/leaseSections/summary/Summary.tsx b/src/leases/components/leaseSections/summary/Summary.tsx
index 9a28eaee9..006f20849 100644
--- a/src/leases/components/leaseSections/summary/Summary.tsx
+++ b/src/leases/components/leaseSections/summary/Summary.tsx
@@ -2,34 +2,34 @@ import React, { Fragment, PureComponent } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
-import Authorization from "components/authorization/Authorization";
-import Collapse from "components/collapse/Collapse";
-import Divider from "components/content/Divider";
-import ExternalLink from "components/links/ExternalLink";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import ListItem from "components/content/ListItem";
-import ListItems from "components/content/ListItems";
+import Authorization from "@/components/authorization/Authorization";
+import Collapse from "@/components/collapse/Collapse";
+import Divider from "@/components/content/Divider";
+import ExternalLink from "@/components/links/ExternalLink";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import ListItem from "@/components/content/ListItem";
+import ListItems from "@/components/content/ListItems";
 import LeaseHistory from "./LeaseHistory";
-import ShowMore from "components/showMore/ShowMore";
+import ShowMore from "@/components/showMore/ShowMore";
 import SummaryLeaseInfo from "./SummaryLeaseInfo";
-import Title from "components/content/Title";
-import WarningContainer from "components/content/WarningContainer";
-import { receiveCollapseStates } from "leases/actions";
-import { FormNames, ViewModes } from "enums";
-import { LeaseContractsFieldPaths, LeaseFieldTitles, LeaseFieldPaths } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getContactFullName } from "contacts/helpers";
-import { getContentLeaseSummary } from "leases/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, getReferenceNumberLink, hasPermissions, isEmptyValue, isFieldAllowedToRead } from "util/helpers";
-import { getUserFullName } from "users/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getAttributes, getCollapseStateByKey, getCurrentLease } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import Title from "@/components/content/Title";
+import WarningContainer from "@/components/content/WarningContainer";
+import { receiveCollapseStates } from "@/leases/actions";
+import { FormNames, ViewModes } from "@/enums";
+import { LeaseContractsFieldPaths, LeaseFieldTitles, LeaseFieldPaths } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getContactFullName } from "@/contacts/helpers";
+import { getContentLeaseSummary } from "@/leases/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, getReferenceNumberLink, hasPermissions, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers";
+import { getUserFullName } from "@/users/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getAttributes, getCollapseStateByKey, getCurrentLease } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes } from "types";
-import type { Lease } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { Lease } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   attributes: Attributes;
   collapseStateBasic: boolean;
@@ -172,44 +172,54 @@ class Summary extends PureComponent<Props, State> {
               <Row>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.STATE)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.STATE)}>
                       {LeaseFieldTitles.STATE}
                     </FormTextTitle>
                     <FormText>{getLabelOfOption(stateOptions, summary.state) || '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.START_DATE)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.START_DATE)}>
                       {LeaseFieldTitles.START_DATE}
                     </FormTextTitle>
                     <FormText>{formatDate(summary.start_date) || '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.END_DATE)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.END_DATE)}>
                       {LeaseFieldTitles.END_DATE}
                     </FormTextTitle>
                     <FormText>{formatDate(summary.end_date) || '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
               </Row>
               <Row>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.LESSOR)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.LESSOR)}>
                       {LeaseFieldTitles.LESSOR}
                     </FormTextTitle>
                     <FormText>{getContactFullName(summary.lessor) || '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.PREPARER)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.PREPARER)}>
                       {LeaseFieldTitles.PREPARER}
                     </FormTextTitle>
                     <FormText>{getUserFullName(summary.preparer) || '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.CLASSIFICATION)}>
@@ -222,74 +232,91 @@ class Summary extends PureComponent<Props, State> {
                 </Authorization>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.SERVICE_UNIT)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.SERVICE_UNIT)}>
                       {LeaseFieldTitles.SERVICE_UNIT}
                     </FormTextTitle>
                     <FormText>{summary.service_unit && summary.service_unit.name ? summary.service_unit.name : '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
               </Row>
               <Row>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.INTENDED_USE)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.INTENDED_USE)}>
                       {LeaseFieldTitles.INTENDED_USE}
                     </FormTextTitle>
                     <FormText>{(summary.intended_use && summary.intended_use.name) || '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={12} medium={6} large={8}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.INTENDED_USE_NOTE)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.INTENDED_USE_NOTE)}>
                       {LeaseFieldTitles.INTENDED_USE_NOTE}
                     </FormTextTitle>
                     <ShowMore text={summary.intended_use_note || '-'} />
+                    </>
                   </Authorization>
                 </Column>
               </Row>
               <Row>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.FINANCING)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.FINANCING)}>
                       {LeaseFieldTitles.FINANCING}
                     </FormTextTitle>
                     <FormText>{getLabelOfOption(financingOptions, summary.financing) || '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.MANAGEMENT)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.MANAGEMENT)}>
                       {LeaseFieldTitles.MANAGEMENT}
                     </FormTextTitle>
                     <FormText>{getLabelOfOption(managementOptions, summary.management) || '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.TRANSFERABLE)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.TRANSFERABLE)}>
                       {LeaseFieldTitles.TRANSFERABLE}
                     </FormTextTitle>
                     <FormText>{summary.transferable ? 'Kyllä' : 'Ei'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.HITAS)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.HITAS)}>
                       {LeaseFieldTitles.HITAS}
                     </FormTextTitle>
                     <FormText>{getLabelOfOption(hitasOptions, summary.hitas) || '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.RESERVATION_PROCEDURE)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.RESERVATION_PROCEDURE)}>
                       {LeaseFieldTitles.RESERVATION_PROCEDURE}
                     </FormTextTitle>
                     <FormText>{getLabelOfOption(reservationProcedureOptions, summary.reservation_procedure) || '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={hasPermissions(usersPermissions, UsersPermissions.VIEW_BASISOFRENT)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.MATCHING_BASIS_OF_RENTS)}>
                       {LeaseFieldTitles.MATCHING_BASIS_OF_RENTS}
                     </FormTextTitle>
@@ -310,10 +337,12 @@ class Summary extends PureComponent<Props, State> {
                               </ListItem>);
                     })}
                         </ListItems>}
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={hasPermissions(usersPermissions, UsersPermissions.VIEW_INFILLDEVELOPMENTCOMPENSATION)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.INFILL_DEVELOPMENT_COMPENSATIONS)}>
                       {LeaseFieldTitles.INFILL_DEVELOPMENT_COMPENSATIONS}
                     </FormTextTitle>
@@ -322,78 +351,95 @@ class Summary extends PureComponent<Props, State> {
                             <ExternalLink className='no-margin' href={`${getRouteById(Routes.INFILL_DEVELOPMENTS)}/${item.id}`} text={item.name || item.id} />
                           </ListItem>)}
                       </ListItems>}
+                    </>
                   </Authorization>
                 </Column>
               </Row>
               <Row>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.NOTICE_PERIOD)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.NOTICE_PERIOD)}>
                       {LeaseFieldTitles.NOTICE_PERIOD}
                     </FormTextTitle>
                     <FormText>{getLabelOfOption(noticePeriodOptions, summary.notice_period) || '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={12} medium={6} large={8}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.NOTICE_NOTE)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.NOTICE_NOTE)}>
                       {LeaseFieldTitles.NOTICE_NOTE}
                     </FormTextTitle>
                     <ShowMore text={summary.notice_note || '-'} />
+                    </>
                   </Authorization>
                 </Column>
               </Row>
               <Row>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.REFERENCE_NUMBER)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.REFERENCE_NUMBER)}>
                       {LeaseFieldTitles.REFERENCE_NUMBER}
                     </FormTextTitle>
                     <FormText>{summary.reference_number ? <ExternalLink className='no-margin' href={getReferenceNumberLink(summary.reference_number)} text={summary.reference_number} /> : '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={12} medium={6} large={8}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.NOTE)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.NOTE)}>
                       {LeaseFieldTitles.NOTE}
                     </FormTextTitle>
                     <ShowMore text={summary.note || '-'} />
+                    </>
                   </Authorization>
                 </Column>
               </Row>
               <Row>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractsFieldPaths.CONTRACT_NUMBER)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.CONTRACT_NUMBERS)}>
                       {LeaseFieldTitles.CONTRACT_NUMBERS}
                     </FormTextTitle>
                     <FormText>{summary.contract_numbers || '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.IS_SUBJECT_TO_VAT)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.IS_SUBJECT_TO_VAT)}>
                       {LeaseFieldTitles.IS_SUBJECT_TO_VAT}
                     </FormTextTitle>
                     <FormText>{summary.is_subject_to_vat ? 'Kyllä' : 'Ei'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={12} medium={6} large={4}>
                   {summary.arrangement_decision && <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractsFieldPaths.CONTRACTS)}>
+                    <>
                       <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.ARRANGEMENT_DECISION)}>
                         {LeaseFieldTitles.ARRANGEMENT_DECISION}
                       </FormTextTitle>
                       <FormText>{summary.arrangement_decision ? 'Kyllä' : 'Ei'}</FormText>
+                    </>
                     </Authorization>}
                 </Column>
               </Row>
               <Row>
                 <Column small={12} medium={6} large={8}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.INTERNAL_ORDER)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.INTERNAL_ORDER)}>
                       {LeaseFieldTitles.INTERNAL_ORDER}
                     </FormTextTitle>
                     <ShowMore text={summary.internal_order || '-'} />
+                    </>
                   </Authorization>
                 </Column>
               </Row>
@@ -405,70 +451,86 @@ class Summary extends PureComponent<Props, State> {
               <Row>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.SPECIAL_PROJECT)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.SPECIAL_PROJECT)}>
                       {LeaseFieldTitles.SPECIAL_PROJECT}
                     </FormTextTitle>
                     <FormText>{getLabelOfOption(specialProjectOptions, summary.special_project) || '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.SUPPORTIVE_HOUSING)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.SUPPORTIVE_HOUSING)}>
                       {LeaseFieldTitles.SUPPORTIVE_HOUSING}
                     </FormTextTitle>
                     <FormText>{getLabelOfOption(supportiveHousingOptions, summary.supportive_housing) || '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.STATISTICAL_USE)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.STATISTICAL_USE)}>
                       {LeaseFieldTitles.STATISTICAL_USE}
                     </FormTextTitle>
                     <FormText>{getLabelOfOption(statisticalUseOptions, summary.statistical_use) || '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
               </Row>
               <Row>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.REAL_ESTATE_DEVELOPER)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.REAL_ESTATE_DEVELOPER)}>
                       {LeaseFieldTitles.REAL_ESTATE_DEVELOPER}
                     </FormTextTitle>
                     <FormText>{summary.real_estate_developer || '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.CONVEYANCE_NUMBER)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.CONVEYANCE_NUMBER)}>
                       {LeaseFieldTitles.CONVEYANCE_NUMBER}
                     </FormTextTitle>
                     <FormText>{summary.conveyance_number || '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.BUILDING_SELLING_PRICE)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.BUILDING_SELLING_PRICE)}>
                       {LeaseFieldTitles.BUILDING_SELLING_PRICE}
                     </FormTextTitle>
                     <FormText>{!isEmptyValue(summary.building_selling_price) ? `${formatNumber(summary.building_selling_price)} €` : '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
               </Row>
               <Row>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.REGULATED)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.REGULATED)}>
                       {LeaseFieldTitles.REGULATED}
                     </FormTextTitle>
                     <FormText>{summary.regulated ? 'Kyllä' : 'Ei'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.REGULATION)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.REGULATION)}>
                       {LeaseFieldTitles.REGULATION}
                     </FormTextTitle>
                     <FormText>{getLabelOfOption(regulationOptions, summary.regulation) || '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
               </Row>
diff --git a/src/leases/components/leaseSections/summary/SummaryEdit.tsx b/src/leases/components/leaseSections/summary/SummaryEdit.tsx
index d77a27660..22d266290 100644
--- a/src/leases/components/leaseSections/summary/SummaryEdit.tsx
+++ b/src/leases/components/leaseSections/summary/SummaryEdit.tsx
@@ -5,34 +5,34 @@ import { formValueSelector, reduxForm } from "redux-form";
 import flowRight from "lodash/flowRight";
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
-import Authorization from "components/authorization/Authorization";
-import Collapse from "components/collapse/Collapse";
-import Divider from "components/content/Divider";
-import ExternalLink from "components/links/ExternalLink";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import ListItem from "components/content/ListItem";
-import ListItems from "components/content/ListItems";
+import Authorization from "@/components/authorization/Authorization";
+import Collapse from "@/components/collapse/Collapse";
+import Divider from "@/components/content/Divider";
+import ExternalLink from "@/components/links/ExternalLink";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import ListItem from "@/components/content/ListItem";
+import ListItems from "@/components/content/ListItems";
 import LeaseHistoryEdit from "./LeaseHistoryEdit";
 import SummaryLeaseInfo from "./SummaryLeaseInfo";
-import Title from "components/content/Title";
-import WarningContainer from "components/content/WarningContainer";
-import { receiveCollapseStates, receiveFormValidFlags } from "leases/actions";
-import { FieldTypes, FormNames, ViewModes } from "enums";
-import { LeaseContractsFieldPaths, LeaseFieldTitles, LeaseFieldPaths } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { validateSummaryForm } from "leases/formValidators";
-import { getContentLeaseSummary } from "leases/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getFieldAttributes, getFieldOptions, getLabelOfOption, getReferenceNumberLink, hasPermissions, isFieldAllowedToRead, isFieldAllowedToEdit } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getAttributes, getCollapseStateByKey, getCurrentLease, getErrorsByFormName, getIsSaveClicked } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { internalOrder, referenceNumber } from "components/form/validations";
+import Title from "@/components/content/Title";
+import WarningContainer from "@/components/content/WarningContainer";
+import { receiveCollapseStates, receiveFormValidFlags } from "@/leases/actions";
+import { FieldTypes, FormNames, ViewModes } from "@/enums";
+import { LeaseContractsFieldPaths, LeaseFieldTitles, LeaseFieldPaths } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { validateSummaryForm } from "@/leases/formValidators";
+import { getContentLeaseSummary } from "@/leases/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getFieldAttributes, getFieldOptions, getLabelOfOption, getReferenceNumberLink, hasPermissions, isFieldAllowedToRead, isFieldAllowedToEdit } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getAttributes, getCollapseStateByKey, getCurrentLease, getErrorsByFormName, getIsSaveClicked } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { internalOrder, referenceNumber } from "@/components/form/validations";
 import type { Attributes, Methods as MethodsType } from "types";
-import type { Lease } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "usersPermissions/types";
+import type { Lease } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "@/usersPermissions/types";
 type Props = {
   attributes: Attributes;
   collapseStateBasic: boolean;
@@ -197,10 +197,12 @@ class SummaryEdit extends PureComponent<Props, State> {
                 </Column>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseFieldPaths.SERVICE_UNIT)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.SERVICE_UNIT)}>
                       {LeaseFieldTitles.SERVICE_UNIT}
                     </FormTextTitle>
                     <FormText>{summary.service_unit ? summary.service_unit.name || summary.service_unit.id : '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
               </Row>
@@ -259,6 +261,7 @@ class SummaryEdit extends PureComponent<Props, State> {
                 </Column>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={hasPermissions(usersPermissions, UsersPermissions.VIEW_BASISOFRENT)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.MATCHING_BASIS_OF_RENTS)}>
                       {LeaseFieldTitles.MATCHING_BASIS_OF_RENTS}
                     </FormTextTitle>
@@ -269,10 +272,12 @@ class SummaryEdit extends PureComponent<Props, State> {
                             </ListItem>);
                     })}
                       </ListItems>}
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={hasPermissions(usersPermissions, UsersPermissions.VIEW_INFILLDEVELOPMENTCOMPENSATION)}>
+                    <>
                     <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.INFILL_DEVELOPMENT_COMPENSATIONS)}>
                       {LeaseFieldTitles.INFILL_DEVELOPMENT_COMPENSATIONS}
                     </FormTextTitle>
@@ -281,6 +286,7 @@ class SummaryEdit extends PureComponent<Props, State> {
                             <ExternalLink className='no-margin' href={`${getRouteById(Routes.INFILL_DEVELOPMENTS)}/${item.id}`} text={item.name || item.id} />
                           </ListItem>)}
                       </ListItems>}
+                          </>
                   </Authorization>
                 </Column>
               </Row>
@@ -321,10 +327,12 @@ class SummaryEdit extends PureComponent<Props, State> {
               <Row>
                 <Column small={12} medium={6} large={4}>
                   <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractsFieldPaths.CONTRACT_NUMBER)}>
+                    <>
                     <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.CONTRACT_NUMBERS)}>
                       {LeaseFieldTitles.CONTRACT_NUMBERS}
                     </FormTextTitle>
                     <FormText>{summary.contract_numbers || '-'}</FormText>
+                    </>
                   </Authorization>
                 </Column>
                 <Column small={12} medium={6} large={4}>
@@ -336,10 +344,12 @@ class SummaryEdit extends PureComponent<Props, State> {
                 </Column>
                 <Column small={12} medium={6} large={4}>
                   {summary.arrangement_decision && <Authorization allow={isFieldAllowedToRead(attributes, LeaseContractsFieldPaths.CONTRACTS)}>
+                      <>
                       <FormTextTitle enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseFieldPaths.ARRANGEMENT_DECISION)}>
                         {LeaseFieldTitles.ARRANGEMENT_DECISION}
                       </FormTextTitle>
                       <FormText>{summary.arrangement_decision ? 'Kyllä' : 'Ei'}</FormText>
+                      </>
                     </Authorization>}
                 </Column>
               </Row>
diff --git a/src/leases/components/leaseSections/summary/SummaryLeaseInfo.tsx b/src/leases/components/leaseSections/summary/SummaryLeaseInfo.tsx
index df048a048..08157bfa1 100644
--- a/src/leases/components/leaseSections/summary/SummaryLeaseInfo.tsx
+++ b/src/leases/components/leaseSections/summary/SummaryLeaseInfo.tsx
@@ -4,36 +4,36 @@ import { Row, Column } from "react-foundation";
 import classNames from "classnames";
 import flowRight from "lodash/flowRight";
 import get from "lodash/get";
-import AmountWithVat from "components/vat/AmountWithVat";
-import Authorization from "components/authorization/Authorization";
-import BoxItem from "components/content/BoxItem";
-import BoxItemContainer from "components/content/BoxItemContainer";
+import AmountWithVat from "@/components/vat/AmountWithVat";
+import Authorization from "@/components/authorization/Authorization";
+import BoxItem from "@/components/content/BoxItem";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
 import Comments from "../constructability/Comments";
-import ErrorBlock from "components/form/ErrorBlock";
-import ExternalLink from "components/links/ExternalLink";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import ListItem from "components/content/ListItem";
-import ListItems from "components/content/ListItems";
-import SubTitle from "components/content/SubTitle";
-import { Methods } from "enums";
-import { AreaNoteFieldTitles } from "areaNote/enums";
-import { InvoiceFieldPaths, InvoiceFieldTitles } from "invoices/enums";
-import { ConstructabilityStatus, LeaseAreaAddressesFieldPaths, LeaseAreasFieldPaths } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getContactFullName } from "contacts/helpers";
-import { getContentOverdueInvoices } from "invoices/helpers";
-import { getContentLeaseSummary, getFullAddress, getTenantShareWarnings } from "leases/helpers";
-import { getUserFullName } from "users/helpers";
-import { formatDate, formatDateRange, getFieldOptions, getLabelOfOption, hasPermissions, isFieldAllowedToRead, isMethodAllowed } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getAttributes as getInvoiceAttributes, getInvoicesByLease, getMethods as getInvoiceMethods } from "invoices/selectors";
-import { getAttributes, getCurrentLease } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { withWindowResize } from "components/resize/WindowResizeHandler";
+import ErrorBlock from "@/components/form/ErrorBlock";
+import ExternalLink from "@/components/links/ExternalLink";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import ListItem from "@/components/content/ListItem";
+import ListItems from "@/components/content/ListItems";
+import SubTitle from "@/components/content/SubTitle";
+import { Methods } from "@/enums";
+import { AreaNoteFieldTitles } from "@/areaNote/enums";
+import { InvoiceFieldPaths, InvoiceFieldTitles } from "@/invoices/enums";
+import { ConstructabilityStatus, LeaseAreaAddressesFieldPaths, LeaseAreasFieldPaths } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getContactFullName } from "@/contacts/helpers";
+import { getContentOverdueInvoices } from "@/invoices/helpers";
+import { getContentLeaseSummary, getFullAddress, getTenantShareWarnings } from "@/leases/helpers";
+import { getUserFullName } from "@/users/helpers";
+import { formatDate, formatDateRange, getFieldOptions, getLabelOfOption, hasPermissions, isFieldAllowedToRead, isMethodAllowed } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getAttributes as getInvoiceAttributes, getInvoicesByLease, getMethods as getInvoiceMethods } from "@/invoices/selectors";
+import { getAttributes, getCurrentLease } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { withWindowResize } from "@/components/resize/WindowResizeHandler";
 import type { Attributes, Methods as MethodsType } from "types";
-import type { Lease } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { Lease } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type StatusIndicatorProps = {
   researchState: string;
   stateOptions: Array<Record<string, any>>;
@@ -163,6 +163,7 @@ const SummaryLeaseInfo = ({
       <Tenants largeScreen={largeScreen} tenants={tenants} tenantWarnings={tenantWarnings} />
 
       <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreasFieldPaths.LEASE_AREAS)}>
+        <>
         <SubTitle>Vuokrakohteet</SubTitle>
         {!leaseAreas.length && <FormText>Ei vuokrakohteita</FormText>}
         {!!leaseAreas.length && <Fragment>
@@ -199,9 +200,11 @@ const SummaryLeaseInfo = ({
                 </ListItems>;
         })}
           </Fragment>}
+        </>
       </Authorization>
 
       <Authorization allow={isFieldAllowedToRead(attributes, LeaseAreasFieldPaths.LEASE_AREAS)}>
+        <>
         <SubTitle>Rakentamiskelpoisuus</SubTitle>
         {!constructabilityAreas.length && <FormText>Ei vuokrakohteita</FormText>}
         {!!constructabilityAreas.length && constructabilityAreas.map((area, index) => {
@@ -283,6 +286,7 @@ const SummaryLeaseInfo = ({
               </Authorization>
             </ListItems>;
       })}
+        </>
       </Authorization>
 
       <Authorization allow={hasPermissions(usersPermissions, UsersPermissions.VIEW_LEASE_LEASE_AREAS) || hasPermissions(usersPermissions, UsersPermissions.CHANGE_LEASE_LEASE_AREAS)}>
@@ -389,32 +393,42 @@ const SummaryLeaseInfo = ({
                       <Row>
                         <Column small={6}>
                           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.RECIPIENT)}>
+                            <>
                             <FormTextTitle>{InvoiceFieldTitles.RECIPIENT}</FormTextTitle>
                             <FormText>{getContactFullName(invoice.recipientFull) || '-'}</FormText>
+                            </>
                           </Authorization>
                         </Column>
                         <Column small={6}>
                           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.DUE_DATE)}>
+                            <>
                             <FormTextTitle>{InvoiceFieldTitles.DUE_DATE}</FormTextTitle>
                             <FormText>{formatDate(invoice.due_date) || '-'}</FormText>
+                            </>
                           </Authorization>
                         </Column>
                         <Column small={6}>
                           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.NUMBER)}>
+                            <>
                             <FormTextTitle>{InvoiceFieldTitles.NUMBER}</FormTextTitle>
                             <FormText>{invoice.number || '-'}</FormText>
+                            </>
                           </Authorization>
                         </Column>
                         <Column small={6}>
                           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.BILLING_PERIOD_START_DATE) || isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.BILLING_PERIOD_END_DATE)}>
+                            <>
                             <FormTextTitle>{InvoiceFieldTitles.BILLING_PERIOD}</FormTextTitle>
                             <FormText>{formatDateRange(invoice.billing_period_start_date, invoice.billing_period_end_date) || '-'}</FormText>
+                            </>
                           </Authorization>
                         </Column>
                         <Column small={6}>
                           <Authorization allow={isFieldAllowedToRead(invoiceAttributes, InvoiceFieldPaths.OUTSTANDING_AMOUNT)}>
+                            <>
                             <FormTextTitle>{InvoiceFieldTitles.OUTSTANDING_AMOUNT}</FormTextTitle>
                             <FormText><AmountWithVat amount={invoice.outstanding_amount || 0} date={invoice.due_date} /></FormText>
+                            </>
                           </Authorization>
                         </Column>
                       </Row>
diff --git a/src/leases/components/leaseSections/tenant/OtherTenantItem.tsx b/src/leases/components/leaseSections/tenant/OtherTenantItem.tsx
index 4325b4127..d56141b22 100644
--- a/src/leases/components/leaseSections/tenant/OtherTenantItem.tsx
+++ b/src/leases/components/leaseSections/tenant/OtherTenantItem.tsx
@@ -2,25 +2,25 @@ import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import get from "lodash/get";
 import { Row, Column } from "react-foundation";
-import Authorization from "components/authorization/Authorization";
-import Collapse from "components/collapse/Collapse";
-import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle";
-import ContactTemplate from "contacts/components/templates/ContactTemplate";
-import ExternalLink from "components/links/ExternalLink";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import FormWrapper from "components/form/FormWrapper";
-import FormWrapperLeft from "components/form/FormWrapperLeft";
-import FormWrapperRight from "components/form/FormWrapperRight";
-import SubTitle from "components/content/SubTitle";
-import { receiveCollapseStates } from "leases/actions";
-import { FormNames, ViewModes } from "enums";
-import { LeaseTenantContactSetFieldPaths, LeaseTenantContactSetFieldTitles } from "leases/enums";
-import { getContactFullName } from "contacts/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatDate, formatDateRange, getFieldOptions, getLabelOfOption, isActive, isArchived, isFieldAllowedToRead } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getAttributes, getCollapseStateByKey } from "leases/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import Collapse from "@/components/collapse/Collapse";
+import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle";
+import ContactTemplate from "@/contacts/components/templates/ContactTemplate";
+import ExternalLink from "@/components/links/ExternalLink";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import FormWrapper from "@/components/form/FormWrapper";
+import FormWrapperLeft from "@/components/form/FormWrapperLeft";
+import FormWrapperRight from "@/components/form/FormWrapperRight";
+import SubTitle from "@/components/content/SubTitle";
+import { receiveCollapseStates } from "@/leases/actions";
+import { FormNames, ViewModes } from "@/enums";
+import { LeaseTenantContactSetFieldPaths, LeaseTenantContactSetFieldTitles } from "@/leases/enums";
+import { getContactFullName } from "@/contacts/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatDate, formatDateRange, getFieldOptions, getLabelOfOption, isActive, isArchived, isFieldAllowedToRead } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getAttributes, getCollapseStateByKey } from "@/leases/selectors";
 import type { Attributes } from "types";
 type Props = {
   attributes: Attributes;
@@ -70,12 +70,14 @@ const OtherTenantItem = ({
           <Row>
             <Column small={12} medium={6} large={8}>
               <Authorization allow={isFieldAllowedToRead(attributes, LeaseTenantContactSetFieldPaths.CONTACT)}>
+                <>
                 <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseTenantContactSetFieldPaths.CONTACT)}>
                   {LeaseTenantContactSetFieldTitles.CONTACT}
                 </FormTextTitle>
                 <FormText>
                   {contact ? <ExternalLink className='no-margin' href={`${getRouteById(Routes.CONTACTS)}/${contact.id}`} text={getContactFullName(contact)} /> : '-'}
                 </FormText>
+                </>
               </Authorization>
             </Column>
           </Row>
@@ -84,18 +86,22 @@ const OtherTenantItem = ({
           <Row>
             <Column small={6} medium={3} large={2}>
               <Authorization allow={isFieldAllowedToRead(attributes, LeaseTenantContactSetFieldPaths.START_DATE)}>
+                <>
                 <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseTenantContactSetFieldPaths.START_DATE)}>
                   {LeaseTenantContactSetFieldTitles.START_DATE}
                 </FormTextTitle>
                 <FormText>{formatDate(tenant.start_date)}</FormText>
+                </>
               </Authorization>
             </Column>
             <Column small={6} medium={3} large={2}>
               <Authorization allow={isFieldAllowedToRead(attributes, LeaseTenantContactSetFieldPaths.END_DATE)}>
+                <>
                 <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseTenantContactSetFieldPaths.END_DATE)}>
                   {LeaseTenantContactSetFieldTitles.END_DATE}
                 </FormTextTitle>
                 <FormText>{formatDate(tenant.end_date)}</FormText>
+                </>
               </Authorization>
             </Column>
           </Row>
@@ -103,13 +109,15 @@ const OtherTenantItem = ({
       </FormWrapper>
 
       <Authorization allow={isFieldAllowedToRead(attributes, LeaseTenantContactSetFieldPaths.CONTACT)}>
+        <>
         <SubTitle>Asiakkaan tiedot</SubTitle>
         <ContactTemplate contact={contact} />
+        </>
       </Authorization>
     </Collapse>;
 };
 
-export default connect((state, props) => {
+export default connect((state, props: Props) => {
   const id = props.tenant.id;
   return {
     attributes: getAttributes(state),
diff --git a/src/leases/components/leaseSections/tenant/OtherTenantItemEdit.tsx b/src/leases/components/leaseSections/tenant/OtherTenantItemEdit.tsx
index 64d6c95fd..f68a424f4 100644
--- a/src/leases/components/leaseSections/tenant/OtherTenantItemEdit.tsx
+++ b/src/leases/components/leaseSections/tenant/OtherTenantItemEdit.tsx
@@ -5,30 +5,30 @@ import { connect } from "react-redux";
 import classNames from "classnames";
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
-import AddButtonThird from "components/form/AddButtonThird";
-import Authorization from "components/authorization/Authorization";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import Collapse from "components/collapse/Collapse";
-import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle";
-import ContactTemplate from "contacts/components/templates/ContactTemplate";
-import EditButton from "components/form/EditButton";
-import FormField from "components/form/FormField";
-import FormWrapper from "components/form/FormWrapper";
-import FormWrapperLeft from "components/form/FormWrapperLeft";
-import FormWrapperRight from "components/form/FormWrapperRight";
-import SubTitle from "components/content/SubTitle";
-import { initializeContactForm, receiveContactModalSettings, receiveIsSaveClicked, showContactModal } from "contacts/actions";
-import { receiveCollapseStates } from "leases/actions";
-import { FieldTypes, FormNames, Methods, ViewModes } from "enums";
-import { LeaseTenantContactSetFieldPaths, LeaseTenantContactSetFieldTitles, TenantContactType } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatDateRange, hasPermissions, isActive, isArchived, isFieldAllowedToRead, isMethodAllowed } from "util/helpers";
-import { getMethods as getContactMethods } from "contacts/selectors";
-import { getAttributes, getCollapseStateByKey, getErrorsByFormName, getIsSaveClicked } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import Authorization from "@/components/authorization/Authorization";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import Collapse from "@/components/collapse/Collapse";
+import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle";
+import ContactTemplate from "@/contacts/components/templates/ContactTemplate";
+import EditButton from "@/components/form/EditButton";
+import FormField from "@/components/form/FormField";
+import FormWrapper from "@/components/form/FormWrapper";
+import FormWrapperLeft from "@/components/form/FormWrapperLeft";
+import FormWrapperRight from "@/components/form/FormWrapperRight";
+import SubTitle from "@/components/content/SubTitle";
+import { initializeContactForm, receiveContactModalSettings, receiveIsSaveClicked, showContactModal } from "@/contacts/actions";
+import { receiveCollapseStates } from "@/leases/actions";
+import { FieldTypes, FormNames, Methods, ViewModes } from "@/enums";
+import { LeaseTenantContactSetFieldPaths, LeaseTenantContactSetFieldTitles, TenantContactType } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatDateRange, hasPermissions, isActive, isArchived, isFieldAllowedToRead, isMethodAllowed } from "@/util/helpers";
+import { getMethods as getContactMethods } from "@/contacts/selectors";
+import { getAttributes, getCollapseStateByKey, getErrorsByFormName, getIsSaveClicked } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes, Methods as MethodsType } from "types";
-import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "usersPermissions/types";
+import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "@/usersPermissions/types";
 type Props = {
   attributes: Attributes;
   collapseState: boolean;
@@ -176,12 +176,14 @@ const OtherTenantItemEdit = ({
         </FormWrapper>
 
         <Authorization allow={isFieldAllowedToRead(attributes, LeaseTenantContactSetFieldPaths.CONTACT)}>
+          <>
           {!!contact && <SubTitle>Asiakkaan tiedot
               <Authorization allow={isMethodAllowed(contactMethods, Methods.PATCH)}>
                 <EditButton className='inline-button' onClick={handleEditClick} title='Muokkaa asiakasta' />
               </Authorization>
             </SubTitle>}
           <ContactTemplate contact={contact} />
+          </>
         </Authorization>
       </BoxContentWrapper>
     </Collapse>;
diff --git a/src/leases/components/leaseSections/tenant/Tenant.tsx b/src/leases/components/leaseSections/tenant/Tenant.tsx
index ee6027e7a..40437cdc4 100644
--- a/src/leases/components/leaseSections/tenant/Tenant.tsx
+++ b/src/leases/components/leaseSections/tenant/Tenant.tsx
@@ -2,17 +2,17 @@ import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import get from "lodash/get";
 import { Column } from "react-foundation";
-import Authorization from "components/authorization/Authorization";
-import Collapse from "components/collapse/Collapse";
-import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle";
+import Authorization from "@/components/authorization/Authorization";
+import Collapse from "@/components/collapse/Collapse";
+import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle";
 import OtherTenantItem from "./OtherTenantItem";
 import TenantItem from "./TenantItem";
-import { receiveCollapseStates } from "leases/actions";
-import { LeaseTenantsFieldPaths, LeaseTenantsFieldTitles, LeaseTenantContactSetFieldPaths } from "leases/enums";
-import { FormNames, ViewModes } from "enums";
-import { getContactFullName } from "contacts/helpers";
-import { formatDateRange, isActive, isArchived, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes, getCollapseStateByKey } from "leases/selectors";
+import { receiveCollapseStates } from "@/leases/actions";
+import { LeaseTenantsFieldPaths, LeaseTenantsFieldTitles, LeaseTenantContactSetFieldPaths } from "@/leases/enums";
+import { FormNames, ViewModes } from "@/enums";
+import { getContactFullName } from "@/contacts/helpers";
+import { formatDateRange, isActive, isArchived, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes, getCollapseStateByKey } from "@/leases/selectors";
 import type { Attributes } from "types";
 type Props = {
   attributes: Attributes;
@@ -65,11 +65,13 @@ const Tenant = ({
           {getContactFullName(contact)}
         </Authorization>} onToggle={handleCollapseToggle}>
       <Authorization allow={isFieldAllowedToRead(attributes, LeaseTenantContactSetFieldPaths.TENANTCONTACT_SET)}>
+        <>
         <TenantItem contact={contact} tenant={tenant} />
 
         {!!billingPersons.length && billingPersons.map(person => <OtherTenantItem key={person.id} tenant={person} />)}
 
         {!!contactPersons.length && contactPersons.map(person => <OtherTenantItem key={person.id} tenant={person} />)}
+        </>
       </Authorization>
     </Collapse>;
 };
diff --git a/src/leases/components/leaseSections/tenant/TenantItem.tsx b/src/leases/components/leaseSections/tenant/TenantItem.tsx
index 7f33417cc..32db9023e 100644
--- a/src/leases/components/leaseSections/tenant/TenantItem.tsx
+++ b/src/leases/components/leaseSections/tenant/TenantItem.tsx
@@ -2,21 +2,21 @@ import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
-import Authorization from "components/authorization/Authorization";
-import ContactTemplate from "contacts/components/templates/ContactTemplate";
-import ExternalLink from "components/links/ExternalLink";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import FormWrapper from "components/form/FormWrapper";
-import FormWrapperLeft from "components/form/FormWrapperLeft";
-import FormWrapperRight from "components/form/FormWrapperRight";
-import SubTitle from "components/content/SubTitle";
-import { LeaseTenantsFieldPaths, LeaseTenantsFieldTitles, LeaseTenantContactSetFieldPaths, LeaseTenantContactSetFieldTitles, LeaseTenantRentSharesFieldPaths, LeaseTenantRentSharesFieldTitles } from "leases/enums";
-import { getContactFullName } from "contacts/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatDate, getFieldOptions, getLabelOfOption, isFieldAllowedToRead } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getAttributes } from "leases/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import ContactTemplate from "@/contacts/components/templates/ContactTemplate";
+import ExternalLink from "@/components/links/ExternalLink";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import FormWrapper from "@/components/form/FormWrapper";
+import FormWrapperLeft from "@/components/form/FormWrapperLeft";
+import FormWrapperRight from "@/components/form/FormWrapperRight";
+import SubTitle from "@/components/content/SubTitle";
+import { LeaseTenantsFieldPaths, LeaseTenantsFieldTitles, LeaseTenantContactSetFieldPaths, LeaseTenantContactSetFieldTitles, LeaseTenantRentSharesFieldPaths, LeaseTenantRentSharesFieldTitles } from "@/leases/enums";
+import { getContactFullName } from "@/contacts/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatDate, getFieldOptions, getLabelOfOption, isFieldAllowedToRead } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getAttributes } from "@/leases/selectors";
 import type { Attributes } from "types";
 type RentSharesProps = {
   attributes: Attributes;
@@ -88,12 +88,14 @@ const TenantItem = ({
           <Row>
             <Column small={12}>
               <Authorization allow={isFieldAllowedToRead(attributes, LeaseTenantContactSetFieldPaths.CONTACT)}>
+                <>
                 <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseTenantContactSetFieldPaths.CONTACT)}>
                   {LeaseTenantContactSetFieldTitles.CONTACT}
                 </FormTextTitle>
                 <FormText>
                   {contact ? <ExternalLink className='no-margin' href={`${getRouteById(Routes.CONTACTS)}/${contact.id}`} text={getContactFullName(contact)} /> : '-'}
                 </FormText>
+                </>
               </Authorization>
             </Column>
           </Row>
@@ -101,10 +103,12 @@ const TenantItem = ({
           <Row>
             <Column>
               <Authorization allow={isFieldAllowedToRead(attributes, LeaseTenantsFieldPaths.REFERENCE)}>
+                <>
                 <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseTenantsFieldPaths.REFERENCE)}>
                   {LeaseTenantsFieldTitles.REFERENCE}
                 </FormTextTitle>
                 <FormText>{tenant.reference || '-'}</FormText>
+                </>
               </Authorization>
             </Column>
           </Row>
@@ -113,26 +117,32 @@ const TenantItem = ({
           <Row>
             <Column small={12} medium={6} large={4}>
               <Authorization allow={isFieldAllowedToRead(attributes, LeaseTenantsFieldPaths.SHARE_DENOMINATOR) && isFieldAllowedToRead(attributes, LeaseTenantsFieldPaths.SHARE_NUMERATOR)}>
+                <>
                 <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseTenantsFieldPaths.SHARE_FRACTION)}>
                   {LeaseTenantsFieldTitles.SHARE_FRACTION}
                 </FormTextTitle>
                 <FormText>{tenant.share_numerator || ''} / {tenant.share_denominator || ''}</FormText>
+                </>
               </Authorization>
             </Column>
             <Column small={6} medium={3} large={2}>
               <Authorization allow={isFieldAllowedToRead(attributes, LeaseTenantContactSetFieldPaths.START_DATE)}>
+                <>
                 <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseTenantContactSetFieldPaths.START_DATE)}>
                   {LeaseTenantContactSetFieldTitles.START_DATE}
                 </FormTextTitle>
                 <FormText>{formatDate(get(tenant, 'tenant.start_date'))}</FormText>
+                </>
               </Authorization>
             </Column>
             <Column small={6} medium={3} large={2}>
               <Authorization allow={isFieldAllowedToRead(attributes, LeaseTenantContactSetFieldPaths.END_DATE)}>
+                <>
                 <FormTextTitle uiDataKey={getUiDataLeaseKey(LeaseTenantContactSetFieldPaths.END_DATE)}>
                   {LeaseTenantContactSetFieldTitles.END_DATE}
                 </FormTextTitle>
                 <FormText>{formatDate(get(tenant, 'tenant.end_date'))}</FormText>
+                </>
               </Authorization>
             </Column>
           </Row>
@@ -148,8 +158,10 @@ const TenantItem = ({
       </FormWrapper>
 
       <Authorization allow={isFieldAllowedToRead(attributes, LeaseTenantContactSetFieldPaths.CONTACT)}>
+        <>
         <SubTitle>Asiakkaan tiedot</SubTitle>
         <ContactTemplate contact={contact} />
+        </>
       </Authorization>
     </Fragment>;
 };
diff --git a/src/leases/components/leaseSections/tenant/TenantItemEdit.tsx b/src/leases/components/leaseSections/tenant/TenantItemEdit.tsx
index d1137e7ef..71030f283 100644
--- a/src/leases/components/leaseSections/tenant/TenantItemEdit.tsx
+++ b/src/leases/components/leaseSections/tenant/TenantItemEdit.tsx
@@ -4,39 +4,39 @@ import { FieldArray, formValueSelector } from "redux-form";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import AddButtonThird from "components/form/AddButtonThird";
-import Authorization from "components/authorization/Authorization";
-import BoxContentWrapper from "components/content/BoxContentWrapper";
-import Collapse from "components/collapse/Collapse";
-import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle";
-import ContactTemplate from "contacts/components/templates/ContactTemplate";
-import EditButton from "components/form/EditButton";
-import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import FormWrapper from "components/form/FormWrapper";
-import FormWrapperLeft from "components/form/FormWrapperLeft";
-import FormWrapperRight from "components/form/FormWrapperRight";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import Authorization from "@/components/authorization/Authorization";
+import BoxContentWrapper from "@/components/content/BoxContentWrapper";
+import Collapse from "@/components/collapse/Collapse";
+import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle";
+import ContactTemplate from "@/contacts/components/templates/ContactTemplate";
+import EditButton from "@/components/form/EditButton";
+import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import FormWrapper from "@/components/form/FormWrapper";
+import FormWrapperLeft from "@/components/form/FormWrapperLeft";
+import FormWrapperRight from "@/components/form/FormWrapperRight";
 import OtherTenantItemEdit from "./OtherTenantItemEdit";
-import RemoveButton from "components/form/RemoveButton";
-import SubTitle from "components/content/SubTitle";
-import { initializeContactForm, receiveContactModalSettings, receiveIsSaveClicked, showContactModal } from "contacts/actions";
-import { receiveCollapseStates } from "leases/actions";
-import { ButtonColors } from "components/enums";
-import { ConfirmationModalTexts, FieldTypes, FormNames, Methods, ViewModes } from "enums";
-import { LeaseTenantContactSetFieldPaths, LeaseTenantContactSetFieldTitles, LeaseTenantRentSharesFieldPaths, LeaseTenantRentSharesFieldTitles, LeaseTenantsFieldPaths, LeaseTenantsFieldTitles, TenantContactType } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getContactFullName } from "contacts/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { formatDateRange, getFieldAttributes, hasPermissions, isActive, isArchived, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired, isMethodAllowed } from "util/helpers";
-import { getMethods as getContactMethods } from "contacts/selectors";
-import { getAttributes, getCollapseStateByKey, getErrorsByFormName, getIsSaveClicked } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import RemoveButton from "@/components/form/RemoveButton";
+import SubTitle from "@/components/content/SubTitle";
+import { initializeContactForm, receiveContactModalSettings, receiveIsSaveClicked, showContactModal } from "@/contacts/actions";
+import { receiveCollapseStates } from "@/leases/actions";
+import { ButtonColors } from "@/components/enums";
+import { ConfirmationModalTexts, FieldTypes, FormNames, Methods, ViewModes } from "@/enums";
+import { LeaseTenantContactSetFieldPaths, LeaseTenantContactSetFieldTitles, LeaseTenantRentSharesFieldPaths, LeaseTenantRentSharesFieldTitles, LeaseTenantsFieldPaths, LeaseTenantsFieldTitles, TenantContactType } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getContactFullName } from "@/contacts/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { formatDateRange, getFieldAttributes, hasPermissions, isActive, isArchived, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired, isMethodAllowed } from "@/util/helpers";
+import { getMethods as getContactMethods } from "@/contacts/selectors";
+import { getAttributes, getCollapseStateByKey, getErrorsByFormName, getIsSaveClicked } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes, Methods as MethodsType } from "types";
-import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "usersPermissions/types";
+import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "@/usersPermissions/types";
 type RentSharesProps = {
   archived: boolean;
   attributes: Attributes;
@@ -333,6 +333,7 @@ const TenantItemEdit = ({
             <Row>
               <Column small={12} medium={6} large={4}>
                 <Authorization allow={isFieldAllowedToRead(attributes, LeaseTenantsFieldPaths.SHARE_DENOMINATOR) && isFieldAllowedToRead(attributes, LeaseTenantsFieldPaths.SHARE_NUMERATOR)}>
+                  <>
                   <FormTextTitle required={isFieldRequired(attributes, LeaseTenantsFieldPaths.SHARE_NUMERATOR) || isFieldRequired(attributes, LeaseTenantsFieldPaths.SHARE_DENOMINATOR)} enableUiDataEdit uiDataKey={getUiDataLeaseKey(LeaseTenantsFieldPaths.SHARE_FRACTION)}>
                     {LeaseTenantsFieldTitles.SHARE_FRACTION}
                   </FormTextTitle>
@@ -354,6 +355,7 @@ const TenantItemEdit = ({
                       </Column>
                     </Row>
                   </Authorization>
+                  </>
                 </Authorization>
               </Column>
               <Column small={6} medium={3} large={2}>
@@ -384,6 +386,7 @@ const TenantItemEdit = ({
       </BoxContentWrapper>
 
       <Authorization allow={isFieldAllowedToRead(attributes, LeaseTenantContactSetFieldPaths.TENANTCONTACT_SET)}>
+        <>
         {!!contact && <SubTitle>Asiakkaan tiedot
             <Authorization allow={isMethodAllowed(contactMethods, Methods.PATCH)}>
               <EditButton className='inline-button' onClick={handleEditClick} title='Muokkaa asiakasta' />
@@ -394,6 +397,7 @@ const TenantItemEdit = ({
         <FieldArray component={renderOtherTenants} contactType={TenantContactType.BILLING} name={`${field}.billing_persons`} serviceUnit={serviceUnit} showAddButton={!archived} tenant={savedTenant} usersPermissions={usersPermissions} />
 
         <FieldArray component={renderOtherTenants} contactType={TenantContactType.CONTACT} name={`${field}.contact_persons`} serviceUnit={serviceUnit} showAddButton={!archived} tenant={savedTenant} usersPermissions={usersPermissions} />
+        </>
       </Authorization>
     </Collapse>;
 };
diff --git a/src/leases/components/leaseSections/tenant/Tenants.tsx b/src/leases/components/leaseSections/tenant/Tenants.tsx
index 0a887b1b5..f015b5228 100644
--- a/src/leases/components/leaseSections/tenant/Tenants.tsx
+++ b/src/leases/components/leaseSections/tenant/Tenants.tsx
@@ -1,21 +1,21 @@
 import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import Divider from "components/content/Divider";
-import FormText from "components/form/FormText";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
+import Divider from "@/components/content/Divider";
+import FormText from "@/components/form/FormText";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
 import Tenant from "./Tenant";
-import Title from "components/content/Title";
-import WarningContainer from "components/content/WarningContainer";
-import WarningField from "components/form/WarningField";
-import { LeaseTenantsFieldPaths, LeaseTenantsFieldTitles } from "leases/enums";
-import { getContentTenants, getTenantShareWarnings } from "leases/helpers";
-import { isArchived } from "util/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getCurrentLease } from "leases/selectors";
-import { withContactAttributes } from "components/attributes/ContactAttributes";
-import type { Lease } from "leases/types";
+import Title from "@/components/content/Title";
+import WarningContainer from "@/components/content/WarningContainer";
+import WarningField from "@/components/form/WarningField";
+import { LeaseTenantsFieldPaths, LeaseTenantsFieldTitles } from "@/leases/enums";
+import { getContentTenants, getTenantShareWarnings } from "@/leases/helpers";
+import { isArchived } from "@/util/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getCurrentLease } from "@/leases/selectors";
+import { withContactAttributes } from "@/components/attributes/ContactAttributes";
+import type { Lease } from "@/leases/types";
 type Props = {
   currentLease: Lease;
   isFetchingContactAttributes: boolean;
diff --git a/src/leases/components/leaseSections/tenant/TenantsEdit.tsx b/src/leases/components/leaseSections/tenant/TenantsEdit.tsx
index 765ae4c52..38f56ff83 100644
--- a/src/leases/components/leaseSections/tenant/TenantsEdit.tsx
+++ b/src/leases/components/leaseSections/tenant/TenantsEdit.tsx
@@ -3,40 +3,40 @@ import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
 import { Field, FieldArray, getFormValues, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import Authorization from "components/authorization/Authorization";
-import AddButton from "components/form/AddButton";
-import ContactModal from "contacts/components/ContactModal";
-import Divider from "components/content/Divider";
-import FormText from "components/form/FormText";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import Authorization from "@/components/authorization/Authorization";
+import AddButton from "@/components/form/AddButton";
+import ContactModal from "@/contacts/components/ContactModal";
+import Divider from "@/components/content/Divider";
+import FormText from "@/components/form/FormText";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
 import TenantItemEdit from "./TenantItemEdit";
-import Title from "components/content/Title";
-import WarningContainer from "components/content/WarningContainer";
-import WarningField from "components/form/WarningField";
-import { createContactOnModal as createContact, editContactOnModal as editContact, hideContactModal, receiveContactModalSettings, receiveIsSaveClicked } from "contacts/actions";
-import { receiveFormValidFlags } from "leases/actions";
-import { ContactTypes } from "contacts/enums";
-import { ButtonColors } from "components/enums";
-import { ConfirmationModalTexts, FormNames } from "enums";
-import { LeaseTenantsFieldPaths, LeaseTenantsFieldTitles } from "leases/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { Methods } from "enums";
-import { validateTenantForm, warnTenantForm } from "leases/formValidators";
-import { hasPermissions, isArchived, isEmptyValue, isFieldAllowedToEdit, isMethodAllowed } from "util/helpers";
-import { getContentContact } from "contacts/helpers";
-import { getContentTenants } from "leases/helpers";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { contactExists } from "contacts/requestsAsync";
-import { getMethods as getContactMethods, getContactModalSettings, getIsContactFormValid, getIsContactModalOpen, getIsFetching as getIsFetchingContact } from "contacts/selectors";
-import { getAttributes as getLeaseAttributes, getCurrentLease } from "leases/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { withContactAttributes } from "components/attributes/ContactAttributes";
+import Title from "@/components/content/Title";
+import WarningContainer from "@/components/content/WarningContainer";
+import WarningField from "@/components/form/WarningField";
+import { createContactOnModal as createContact, editContactOnModal as editContact, hideContactModal, receiveContactModalSettings, receiveIsSaveClicked } from "@/contacts/actions";
+import { receiveFormValidFlags } from "@/leases/actions";
+import { ContactTypes } from "@/contacts/enums";
+import { ButtonColors } from "@/components/enums";
+import { ConfirmationModalTexts, FormNames } from "@/enums";
+import { LeaseTenantsFieldPaths, LeaseTenantsFieldTitles } from "@/leases/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { Methods } from "@/enums";
+import { validateTenantForm, warnTenantForm } from "@/leases/formValidators";
+import { hasPermissions, isArchived, isEmptyValue, isFieldAllowedToEdit, isMethodAllowed } from "@/util/helpers";
+import { getContentContact } from "@/contacts/helpers";
+import { getContentTenants } from "@/leases/helpers";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { contactExists } from "@/contacts/requestsAsync";
+import { getMethods as getContactMethods, getContactModalSettings, getIsContactFormValid, getIsContactModalOpen, getIsFetching as getIsFetchingContact } from "@/contacts/selectors";
+import { getAttributes as getLeaseAttributes, getCurrentLease } from "@/leases/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { withContactAttributes } from "@/components/attributes/ContactAttributes";
 import type { Attributes, Methods as MethodsType } from "types";
-import type { ContactModalSettings } from "contacts/types";
-import type { Lease } from "leases/types";
-import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "usersPermissions/types";
+import type { ContactModalSettings } from "@/contacts/types";
+import type { Lease } from "@/leases/types";
+import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "@/usersPermissions/types";
 type WarningsProps = {
   meta: Record<string, any>;
 };
diff --git a/src/leases/components/search/Search.tsx b/src/leases/components/search/Search.tsx
index 0f0a35caa..0ff15755d 100644
--- a/src/leases/components/search/Search.tsx
+++ b/src/leases/components/search/Search.tsx
@@ -7,25 +7,25 @@ import debounce from "lodash/debounce";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
 import isEqual from "lodash/isEqual";
-import FormField from "components/form/FormField";
-import SearchChangeTypeLink from "components/search/SearchChangeTypeLink";
-import SearchClearLink from "components/search/SearchClearLink";
-import SearchContainer from "components/search/SearchContainer";
-import SearchInputColumn from "components/search/SearchInputColumn";
-import SearchLabel from "components/search/SearchLabel";
-import SearchLabelColumn from "components/search/SearchLabelColumn";
-import SearchRow from "components/search/SearchRow";
-import { fetchDistrictsByMunicipality } from "district/actions";
-import { FieldTypes, FormNames } from "enums";
-import { LeaseDecisionsFieldPaths, LeaseFieldPaths, LeaseTenantContactSetFieldPaths } from "leases/enums";
-import { getContactOptions } from "contacts/helpers";
-import { getDistrictOptions } from "district/helpers";
-import { addEmptyOption, getFieldOptions, getUrlParams } from "util/helpers";
-import { getDistrictsByMunicipality } from "district/selectors";
-import { getAttributes as getLeaseAttributes, getIsFetchingAttributes } from "leases/selectors";
-import { getLessorList } from "lessor/selectors";
+import FormField from "@/components/form/FormField";
+import SearchChangeTypeLink from "@/components/search/SearchChangeTypeLink";
+import SearchClearLink from "@/components/search/SearchClearLink";
+import SearchContainer from "@/components/search/SearchContainer";
+import SearchInputColumn from "@/components/search/SearchInputColumn";
+import SearchLabel from "@/components/search/SearchLabel";
+import SearchLabelColumn from "@/components/search/SearchLabelColumn";
+import SearchRow from "@/components/search/SearchRow";
+import { fetchDistrictsByMunicipality } from "@/district/actions";
+import { FieldTypes, FormNames } from "@/enums";
+import { LeaseDecisionsFieldPaths, LeaseFieldPaths, LeaseTenantContactSetFieldPaths } from "@/leases/enums";
+import { getContactOptions } from "@/contacts/helpers";
+import { getDistrictOptions } from "@/district/helpers";
+import { addEmptyOption, getFieldOptions, getUrlParams } from "@/util/helpers";
+import { getDistrictsByMunicipality } from "@/district/selectors";
+import { getAttributes as getLeaseAttributes, getIsFetchingAttributes } from "@/leases/selectors";
+import { getLessorList } from "@/lessor/selectors";
 import type { Attributes } from "types";
-import type { LessorList } from "lessor/types";
+import type { LessorList } from "@/lessor/types";
 type Props = {
   anyTouched: boolean;
   change: (...args: Array<any>) => any;
diff --git a/src/leases/constants.ts b/src/leases/constants.ts
index b88862f01..f612e0114 100644
--- a/src/leases/constants.ts
+++ b/src/leases/constants.ts
@@ -1,4 +1,4 @@
-import { TableSortOrder } from "enums";
+import { TableSortOrder } from "@/enums";
 import { CreditInvoiceOptions as CreditInvoiceOptionsEnum, RentDueDateTypes, SteppedDiscountAmountTypes } from "./enums";
 
 /**
diff --git a/src/leases/enums.ts b/src/leases/enums.ts
index 4b4bb3d3b..6943ff54a 100644
--- a/src/leases/enums.ts
+++ b/src/leases/enums.ts
@@ -1,4 +1,4 @@
-import { getDayMonth } from "util/date";
+import { getDayMonth } from "@/util/date";
 
 /**
  * Area location enumerable.
diff --git a/src/leases/formValidators.ts b/src/leases/formValidators.ts
index cbb64ec67..73b168bdb 100644
--- a/src/leases/formValidators.ts
+++ b/src/leases/formValidators.ts
@@ -1,13 +1,13 @@
 import format from "date-fns/format";
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
-import { store } from "root/startApp";
+import { store } from "@/index";
 import { RentAdjustmentAmountTypes, RentCycles, RentDueDateTypes, RentTypes } from "./enums";
-import { getRentWarnings, getTenantRentShareWarnings, getTenantShareWarnings } from "leases/helpers";
-import { getAttributes as getLeaseAttributes } from "leases/selectors";
-import { dateGreaterOrEqual } from "components/form/validations";
-import { isInvoiceBillingPeriodRequired } from "invoices/helpers";
-import { required } from "components/form/validations";
+import { getRentWarnings, getTenantRentShareWarnings, getTenantShareWarnings } from "@/leases/helpers";
+import { getAttributes as getLeaseAttributes } from "@/leases/selectors";
+import { dateGreaterOrEqual } from "@/components/form/validations";
+import { isInvoiceBillingPeriodRequired } from "@/invoices/helpers";
+import { required } from "@/components/form/validations";
 
 /** 
  * Validate summary form
diff --git a/src/leases/helpers.ts b/src/leases/helpers.ts
index b298371dd..f4daa249b 100644
--- a/src/leases/helpers.ts
+++ b/src/leases/helpers.ts
@@ -5,24 +5,24 @@ import isArray from "lodash/isArray";
 import isEmpty from "lodash/isEmpty";
 import isEqual from "lodash/isEqual";
 import { isDirty } from "redux-form";
-import { getSplittedDateRangesWithItems, sortByStartAndEndDateDesc } from "util/date";
-import { FormNames, TableSortOrder } from "enums";
+import { getSplittedDateRangesWithItems, sortByStartAndEndDateDesc } from "@/util/date";
+import { FormNames, TableSortOrder } from "@/enums";
 import { CollateralTypes, ConstructabilityType, DecisionTypeKinds, LeaseState, LeaseTenantRentSharesFieldPaths, LeaseStatus, RecipientOptions, RelationTypes, RentAdjustmentAmountTypes, RentCycles, RentDueDateTypes, RentTypes, SubventionTypes, TenantContactType } from "./enums";
-import { CalculatorTypes } from "leases/enums";
-import { LeaseAreaAttachmentTypes } from "leaseAreaAttachment/enums";
-import { getContactFullName, getContentContact } from "contacts/helpers";
-import { getContentLessor } from "lessor/helpers";
-import { getContentPropertyIdentifiers } from "rentbasis/helpers";
-import { getContentUser } from "users/helpers";
-import { addEmptyOption, convertStrToDecimalNumber, fixedLengthNumber, formatDate, formatDateRange, getApiResponseResults, getFieldOptions, getLabelOfOption, isDecimalNumberStr, isEmptyValue, isActive, isActiveOrFuture, isArchived, sortStringAsc, sortStringByKeyAsc, sortStringByKeyDesc } from "util/helpers";
-import { getCoordinatesOfGeometry } from "util/map";
+import { CalculatorTypes } from "@/leases/enums";
+import { LeaseAreaAttachmentTypes } from "@/leaseAreaAttachment/enums";
+import { getContactFullName, getContentContact } from "@/contacts/helpers";
+import { getContentLessor } from "@/lessor/helpers";
+import { getContentPropertyIdentifiers } from "@/rentbasis/helpers";
+import { getContentUser } from "@/users/helpers";
+import { addEmptyOption, convertStrToDecimalNumber, fixedLengthNumber, formatDate, formatDateRange, getApiResponseResults, getFieldOptions, getLabelOfOption, isDecimalNumberStr, isEmptyValue, isActive, isActiveOrFuture, isArchived, sortStringAsc, sortStringByKeyAsc, sortStringByKeyDesc } from "@/util/helpers";
+import { getCoordinatesOfGeometry } from "@/util/map";
 import { getIsEditMode } from "./selectors";
-import { removeSessionStorageItem } from "util/storage";
+import { removeSessionStorageItem } from "@/util/storage";
 import type { Lease, IntendedUse } from "./types";
-import type { CommentList } from "comments/types";
+import type { CommentList } from "@/comments/types";
 import type { Attributes, LeafletFeature, LeafletGeoJson } from "types";
-import type { RootState } from "root/types";
-import type { LeaseList } from "leases/types";
+import type { RootState } from "@/root/types";
+import type { LeaseList } from "@/leases/types";
 
 /**
  * Test is lease empty
@@ -912,7 +912,6 @@ export const getTenantRentShareWarnings = (tenants: Array<Record<string, any>>,
     });
     rentShares.forEach(rentShare => {
       if (rentShare.intended_use != null) {
-        // $FlowFixMe[method-unbinding] This seems to be a bug on flow.. https://github.com/facebook/flow/issues/8689
         if (Object.prototype.hasOwnProperty.call(sharesByIntendedUse, rentShare.intended_use)) {
           sharesByIntendedUse[rentShare.intended_use].push(rentShare);
         } else {
diff --git a/src/leases/spec.ts b/src/leases/leases.spec.ts
similarity index 99%
rename from src/leases/spec.ts
rename to src/leases/leases.spec.ts
index 534fc356a..b75df3351 100644
--- a/src/leases/spec.ts
+++ b/src/leases/leases.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { attributesNotFound, clearFormValidFlags, copyAreasToContract, copyDecisionToLeases, createCharge, createLease, createLeaseAndUpdateCurrentLease, deleteLease, fetchAttributes, fetchLeaseById, fetchLeases, fetchLeasesByBBox, fetchSingleLease, fetchSingleLeaseAfterEdit, hideAttachDecisionModal, hideCreateModal, hideEditMode, notFound, notFoundByBBox, notFoundById, patchLease, patchLeaseInvoiceNotes, receiveAttributes, receiveCollapseStates, receiveFormValidFlags, receiveIsSaveClicked, receiveLeaseById, receiveLeases, receiveLeasesByBBox, receiveMethods, receiveSingleLease, sendEmail, setRentInfoComplete, setRentInfoUncomplete, showAttachDecisionModal, showCreateModal, showEditMode, startInvoicing, stopInvoicing, fetchLeasesForContractNumber, receiveLeasesForContractNumbers } from "./actions";
 import leasesReducer from "./reducer";
 import type { LeaseState } from "./types";
diff --git a/src/leases/reducer.ts b/src/leases/reducer.ts
index 829c5a558..6cac369dd 100644
--- a/src/leases/reducer.ts
+++ b/src/leases/reducer.ts
@@ -1,9 +1,9 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
 import merge from "lodash/merge";
-import { FormNames } from "enums";
+import { FormNames } from "@/enums";
 import type { Attributes, Methods, Reducer } from "types";
-import type { Lease, LeaseList, ReceiveAttributesAction, ReceiveMethodsAction, ReceiveLeasesAction, ReceiveLeasesByBBoxAction, ReceiveSingleLeaseAction, FetchLeaseByIdAction, ReceiveLeaseByIdAction, LeaseNotFoundByIdAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ReceiveCollapseStatesAction, ReceiveLeasesForContractNumbersAction } from "leases/types";
+import type { Lease, LeaseList, ReceiveAttributesAction, ReceiveMethodsAction, ReceiveLeasesAction, ReceiveLeasesByBBoxAction, ReceiveSingleLeaseAction, FetchLeaseByIdAction, ReceiveLeaseByIdAction, LeaseNotFoundByIdAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ReceiveCollapseStatesAction, ReceiveLeasesForContractNumbersAction } from "@/leases/types";
 const isAttachDecisionModalOpenReducer: Reducer<boolean> = handleActions({
   'mvj/leases/HIDE_ATTACH_DECISION_MODAL': () => false,
   'mvj/leases/SHOW_ATTACH_DECISION_MODAL': () => true
diff --git a/src/leases/requests.ts b/src/leases/requests.ts
index 927aa5352..8c830380f 100644
--- a/src/leases/requests.ts
+++ b/src/leases/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "../api/callApi";
-import createUrl, { standardStringifyQuery } from "../api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl, { standardStringifyQuery } from "@/api/createUrl";
 import type { CreateChargePayload, Lease, LeaseId, SendEmailPayload } from "./types";
 export const fetchAttributes = (): Generator<any, any, any> => {
   return callApi(new Request(createUrl('lease/'), {
diff --git a/src/leases/requestsAsync.ts b/src/leases/requestsAsync.ts
index ee1ce66c3..7ba39f8f3 100644
--- a/src/leases/requestsAsync.ts
+++ b/src/leases/requestsAsync.ts
@@ -1,5 +1,5 @@
-import createUrl from "api/createUrl";
-import callApiAsync from "api/callApiAsync";
+import createUrl from "@/api/createUrl";
+import callApiAsync from "@/api/callApiAsync";
 import type { IntendedUse } from "./types";
 export const fetchLeases = async (query?: Record<string, any>) => {
   const {
diff --git a/src/leases/saga.ts b/src/leases/saga.ts
index ee7b772c0..a742c21cd 100644
--- a/src/leases/saga.ts
+++ b/src/leases/saga.ts
@@ -1,12 +1,12 @@
 import { all, call, fork, put, select, takeEvery, takeLatest } from "redux-saga/effects";
 import { push } from "react-router-redux";
 import { SubmissionError } from "redux-form";
-import { getRouteById, Routes } from "root/routes";
+import { getRouteById, Routes } from "@/root/routes";
 import { fetchSingleLeaseAfterEdit, hideAttachDecisionModal, hideCreateModal, hideEditMode, attributesNotFound, notFound, notFoundByBBox, notFoundById, receiveAttributes, receiveMethods, receiveIsSaveClicked, receiveLeases, receiveLeasesByBBox, receiveSingleLease, receiveLeaseById, receiveLeasesForContractNumbers } from "./actions";
-import { receiveError } from "api/actions";
-import { fetchInvoicesByLease, receiveIsCreateInvoicePanelOpen } from "invoices/actions";
-import { fetchInvoiceSetsByLease } from "invoiceSets/actions";
-import { displayUIMessage, getSearchQuery, getUrlParams } from "util/helpers";
+import { receiveError } from "@/api/actions";
+import { fetchInvoicesByLease, receiveIsCreateInvoicePanelOpen } from "@/invoices/actions";
+import { fetchInvoiceSetsByLease } from "@/invoiceSets/actions";
+import { displayUIMessage, getSearchQuery, getUrlParams } from "@/util/helpers";
 import { copyAreasToContract, copyDecisionToLeases, createCharge, createLease, deleteLease, fetchAttributes, fetchLeases, fetchSingleLease, patchLease, sendEmail, startInvoicing, stopInvoicing, setRentInfoComplete, setRentInfoUncomplete } from "./requests";
 import { getCurrentLease } from "./selectors";
 
diff --git a/src/leases/selectors.ts b/src/leases/selectors.ts
index 01beac5cf..a2272786a 100644
--- a/src/leases/selectors.ts
+++ b/src/leases/selectors.ts
@@ -1,6 +1,6 @@
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 import type { Attributes, Methods, Selector } from "types";
 import type { LeaseId, Lease, LeaseList } from "./types";
 export const getIsAttachDecisionModalOpen: Selector<boolean, void> = (state: RootState): boolean => state.lease.isAttachDecisionModalOpen;
diff --git a/src/leases/types.ts b/src/leases/types.ts
index de8d893e0..33b968b41 100644
--- a/src/leases/types.ts
+++ b/src/leases/types.ts
@@ -1,5 +1,5 @@
-import type { Action, ApiResponse, Attributes, Methods } from "../types";
-import type { ServiceUnit } from "serviceUnits/types";
+import type { Action, ApiResponse, Attributes, Methods } from "@/types";
+import type { ServiceUnit } from "@/serviceUnits/types";
 export type LeaseState = {
   attributes: Attributes;
   byId: Record<string, any>;
diff --git a/src/lessor/helpers.ts b/src/lessor/helpers.ts
index a3e1e5f46..de5122c96 100644
--- a/src/lessor/helpers.ts
+++ b/src/lessor/helpers.ts
@@ -1,4 +1,4 @@
-import { getContactFullName } from "contacts/helpers";
+import { getContactFullName } from "@/contacts/helpers";
 
 /**
  * Get content lessor
diff --git a/src/lessor/spec.ts b/src/lessor/lessor.spec.ts
similarity index 94%
rename from src/lessor/spec.ts
rename to src/lessor/lessor.spec.ts
index 1149cd689..82dd0f766 100644
--- a/src/lessor/spec.ts
+++ b/src/lessor/lessor.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchLessors, receiveLessors } from "./actions";
 import lessorReducer from "./reducer";
 import type { LessorState } from "./types";
diff --git a/src/lessor/reducer.ts b/src/lessor/reducer.ts
index 43ecab28c..5f7cec8e1 100644
--- a/src/lessor/reducer.ts
+++ b/src/lessor/reducer.ts
@@ -1,7 +1,7 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
 import type { Reducer } from "types";
-import type { LessorList, ReceiveLessorsAction } from "lessor/types";
+import type { LessorList, ReceiveLessorsAction } from "@/lessor/types";
 const listReducer: Reducer<Record<string, any>> = handleActions({
   ['mvj/lessors/RECEIVE_ALL']: (state: LessorList, {
     payload
diff --git a/src/lessor/saga.ts b/src/lessor/saga.ts
index efe0cc22e..cde8bbd12 100644
--- a/src/lessor/saga.ts
+++ b/src/lessor/saga.ts
@@ -1,6 +1,6 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { receiveLessors } from "./actions";
-import { fetchContacts } from "contacts/requests";
+import { fetchContacts } from "@/contacts/requests";
 
 function* fetchLessorsSaga({
   payload: params,
diff --git a/src/lessor/selectors.ts b/src/lessor/selectors.ts
index d48b61bf5..db67d05ff 100644
--- a/src/lessor/selectors.ts
+++ b/src/lessor/selectors.ts
@@ -1,4 +1,4 @@
 import type { Selector } from "types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 import type { LessorList } from "./types";
 export const getLessorList: Selector<LessorList, void> = (state: RootState): LessorList => state.lessor.list;
\ No newline at end of file
diff --git a/src/lessor/types.ts b/src/lessor/types.ts
index 5da3beee3..ccd931953 100644
--- a/src/lessor/types.ts
+++ b/src/lessor/types.ts
@@ -1,4 +1,4 @@
-import type { Action } from "../types";
+import type { Action } from "@/types";
 export type LessorState = {
   list: LessorList;
 };
diff --git a/src/main.scss b/src/main.scss
index b2b89f403..f6630813b 100644
--- a/src/main.scss
+++ b/src/main.scss
@@ -1,18 +1,18 @@
 @import "./styles/fonts";
 @import "./styles/variables";
-@import "~foundation-sites/scss/foundation";
+@import "foundation-sites/scss/foundation";
 @include foundation-everything(true);
 @include foundation-flex-grid;
 
-@import '~react-leaflet-fullscreen/dist/styles.css';
+@import "../node_modules/react-leaflet-fullscreen/dist/styles.css";
 @import "styles/mixins";
 
 // Vendor
-@import "~react-redux-toastr/src/styles/index";
-@import "~react-datepicker/dist/react-datepicker.css";
-@import '../node_modules/leaflet-draw/dist/leaflet.draw.css';
-@import 'node_modules/react-dual-listbox/src/scss/react-dual-listbox.scss';
-@import '~font-awesome/css/font-awesome.css';
+@import "../node_modules/react-redux-toastr/src/styles/index";
+@import "../node_modules/react-datepicker/dist/react-datepicker.css";
+@import "../node_modules/leaflet-draw/dist/leaflet.draw.css";
+@import "../node_modules/react-dual-listbox/src/scss/react-dual-listbox.scss";
+@import "../node_modules/font-awesome/css/font-awesome.css";
 
 // Components
 @import "components/authorization/authorization";
diff --git a/src/penaltyInterest/actions.ts b/src/penaltyInterest/actions.ts
index 755ed0077..d65cfddb1 100644
--- a/src/penaltyInterest/actions.ts
+++ b/src/penaltyInterest/actions.ts
@@ -1,5 +1,5 @@
 import { createAction } from "redux-actions";
-import type { InvoiceId } from "invoices/types";
+import type { InvoiceId } from "@/invoices/types";
 import type { FetchPenaltyInterestByInvoiceAction, ReceivePenaltyInterestByInvoiceAction, PenaltyInterestNotFoundByInvoiceAction } from "./types";
 export const fetchPenaltyInterestByInvoice = (invoiceId: InvoiceId): FetchPenaltyInterestByInvoiceAction => createAction('mvj/penaltyInterest/FETCH_BY_INVOICE')(invoiceId);
 export const receivePenaltyInterestByInvoice = (penaltyInterest: Record<string, any>): ReceivePenaltyInterestByInvoiceAction => createAction('mvj/penaltyInterest/RECEIVE_BY_INVOICE')(penaltyInterest);
diff --git a/src/penaltyInterest/spec.ts b/src/penaltyInterest/penaltyInterest.spec.ts
similarity index 97%
rename from src/penaltyInterest/spec.ts
rename to src/penaltyInterest/penaltyInterest.spec.ts
index ee5361d2e..de43f4251 100644
--- a/src/penaltyInterest/spec.ts
+++ b/src/penaltyInterest/penaltyInterest.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchPenaltyInterestByInvoice, receivePenaltyInterestByInvoice, penaltyInterestNotFoundByInvoice } from "./actions";
 import penaltyInterestReducer from "./reducer";
 import type { PenaltyInterestState } from "./types";
diff --git a/src/penaltyInterest/reducer.ts b/src/penaltyInterest/reducer.ts
index cfbb9e534..e9aba4562 100644
--- a/src/penaltyInterest/reducer.ts
+++ b/src/penaltyInterest/reducer.ts
@@ -1,7 +1,7 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
 import type { Reducer } from "types";
-import type { FetchPenaltyInterestByInvoiceAction, ReceivePenaltyInterestByInvoiceAction, PenaltyInterestNotFoundByInvoiceAction } from "penaltyInterest/types";
+import type { FetchPenaltyInterestByInvoiceAction, ReceivePenaltyInterestByInvoiceAction, PenaltyInterestNotFoundByInvoiceAction } from "@/penaltyInterest/types";
 const isFetchingByInvoiceReducer: Reducer<Record<string, any>> = handleActions({
   ['mvj/penaltyInterest/FETCH_BY_INVOICE']: (state: Record<string, any>, {
     payload: invoice
diff --git a/src/penaltyInterest/requests.ts b/src/penaltyInterest/requests.ts
index 0331e44cd..3adc8dc4c 100644
--- a/src/penaltyInterest/requests.ts
+++ b/src/penaltyInterest/requests.ts
@@ -1,6 +1,6 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
-import type { InvoiceId } from "invoices/types";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
+import type { InvoiceId } from "@/invoices/types";
 export const fetchPenaltyInterestByInvoice = (invoice: InvoiceId): Generator<any, any, any> => {
   return callApi(new Request(createUrl(`invoice_calculate_penalty_interest/?invoice=${invoice}`)));
 };
\ No newline at end of file
diff --git a/src/penaltyInterest/saga.ts b/src/penaltyInterest/saga.ts
index 36eac247f..6c2395ceb 100644
--- a/src/penaltyInterest/saga.ts
+++ b/src/penaltyInterest/saga.ts
@@ -1,6 +1,6 @@
 import { all, call, fork, put, takeEvery } from "redux-saga/effects";
 import { receivePenaltyInterestByInvoice, penaltyInterestNotFoundByInvoice } from "./actions";
-import { receiveError } from "api/actions";
+import { receiveError } from "@/api/actions";
 import { fetchPenaltyInterestByInvoice } from "./requests";
 
 function* fetchPenaltyInterestByInvoiceSaga({
diff --git a/src/penaltyInterest/selectors.ts b/src/penaltyInterest/selectors.ts
index 85e52ea81..b9b124644 100644
--- a/src/penaltyInterest/selectors.ts
+++ b/src/penaltyInterest/selectors.ts
@@ -1,5 +1,5 @@
 import type { Selector } from "types";
-import type { RootState } from "root/types";
-import type { InvoiceId } from "invoices/types";
+import type { RootState } from "@/root/types";
+import type { InvoiceId } from "@/invoices/types";
 export const getPenaltyInterestByInvoice: Selector<boolean, InvoiceId> = (state: RootState, id: InvoiceId): boolean => state.penaltyInterest.byInvoice[id];
 export const getIsFetchingByInvoice: Selector<boolean, InvoiceId> = (state: RootState, id: InvoiceId): boolean => state.penaltyInterest.isFetchingByInvoice[id];
\ No newline at end of file
diff --git a/src/penaltyInterest/types.ts b/src/penaltyInterest/types.ts
index 389d062e5..a48cc960c 100644
--- a/src/penaltyInterest/types.ts
+++ b/src/penaltyInterest/types.ts
@@ -1,5 +1,5 @@
 import type { Action } from "types";
-import type { InvoiceId } from "invoices/types";
+import type { InvoiceId } from "@/invoices/types";
 export type PenaltyInterestState = {
   byInvoice: Record<string, any>;
   isFetchingByInvoice: Record<string, any>;
diff --git a/src/plotApplications/actions.ts b/src/plotApplications/actions.ts
index d28b01e11..8a14a49e5 100644
--- a/src/plotApplications/actions.ts
+++ b/src/plotApplications/actions.ts
@@ -1,5 +1,5 @@
 import { createAction } from "redux-actions";
-import type { ApplicationRelatedFormNotFoundAction, ApplicationRelatedPlotSearchNotFoundAction, ApplicationsNotFoundAction, BatchEditPlotApplicationModelsAction, ClearFormValidFlagsAction, CreatePlotApplicationOpeningRecordAction, CreatePlotApplicationAction, DeleteTargetInfoCheckMeetingMemoAction, EditPlotApplicationAction, FetchApplicationRelatedFormAction, FetchApplicationRelatedPlotSearchAction, FetchPlotApplicationsByBBoxAction, FetchPlotApplicationsListAction, FetchPlotSearchSubtypesAction, FetchSinglePlotApplicationAction, FetchTargetInfoChecksForPlotSearchAction, HideEditModeAction, InfoCheckBatchEditData, InfoCheckBatchEditErrors, InitializeFormEntriesForApplicationAction, NotFoundByBBoxAction, PlotApplication, PlotApplicationsList, PlotSearchSubtypesNotFoundAction, ReceiveApplicationRelatedFormAction, ReceiveApplicationRelatedPlotSearchAction, ReceiveCollapseStatesAction, ReceiveFileOperationFinishedAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ReceivePlotApplicationInfoCheckBatchEditFailureAction, ReceivePlotApplicationInfoCheckBatchEditSuccessAction, ReceivePlotApplicationSavedAction, ReceivePlotApplicationSaveFailedAction, ReceivePlotApplicationsByBBoxAction, ReceivePlotApplicationsListAction, ReceivePlotSearchSubtypesAction, ReceiveSinglePlotApplicationAction, ReceiveTargetInfoCheckMeetingMemoUploadedAction, ReceiveTargetInfoChecksForPlotSearchAction, SinglePlotApplicationNotAllowedAction, SinglePlotApplicationNotFoundAction, SetCurrentEditorTargetsAction, ShowEditModeAction, TargetInfoCheckMeetingMemoDeleteFailedAction, TargetInfoCheckMeetingMemoUploadFailedAction, TargetInfoChecksForPlotSearchNotFoundAction, UploadTargetInfoCheckMeetingMemoAction } from "plotApplications/types";
+import type { ApplicationRelatedFormNotFoundAction, ApplicationRelatedPlotSearchNotFoundAction, ApplicationsNotFoundAction, BatchEditPlotApplicationModelsAction, ClearFormValidFlagsAction, CreatePlotApplicationOpeningRecordAction, CreatePlotApplicationAction, DeleteTargetInfoCheckMeetingMemoAction, EditPlotApplicationAction, FetchApplicationRelatedFormAction, FetchApplicationRelatedPlotSearchAction, FetchPlotApplicationsByBBoxAction, FetchPlotApplicationsListAction, FetchPlotSearchSubtypesAction, FetchSinglePlotApplicationAction, FetchTargetInfoChecksForPlotSearchAction, HideEditModeAction, InfoCheckBatchEditData, InfoCheckBatchEditErrors, InitializeFormEntriesForApplicationAction, NotFoundByBBoxAction, PlotApplication, PlotApplicationsList, PlotSearchSubtypesNotFoundAction, ReceiveApplicationRelatedFormAction, ReceiveApplicationRelatedPlotSearchAction, ReceiveCollapseStatesAction, ReceiveFileOperationFinishedAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ReceivePlotApplicationInfoCheckBatchEditFailureAction, ReceivePlotApplicationInfoCheckBatchEditSuccessAction, ReceivePlotApplicationSavedAction, ReceivePlotApplicationSaveFailedAction, ReceivePlotApplicationsByBBoxAction, ReceivePlotApplicationsListAction, ReceivePlotSearchSubtypesAction, ReceiveSinglePlotApplicationAction, ReceiveTargetInfoCheckMeetingMemoUploadedAction, ReceiveTargetInfoChecksForPlotSearchAction, SinglePlotApplicationNotAllowedAction, SinglePlotApplicationNotFoundAction, SetCurrentEditorTargetsAction, ShowEditModeAction, TargetInfoCheckMeetingMemoDeleteFailedAction, TargetInfoCheckMeetingMemoUploadFailedAction, TargetInfoChecksForPlotSearchNotFoundAction, UploadTargetInfoCheckMeetingMemoAction } from "@/plotApplications/types";
 export const fetchPlotApplicationsList = (search: string): FetchPlotApplicationsListAction => createAction('mvj/plotApplications/FETCH_ALL')(search);
 export const receivePlotApplicationsList = (list: PlotApplicationsList): ReceivePlotApplicationsListAction => createAction('mvj/plotApplications/RECEIVE_ALL')(list);
 export const fetchSinglePlotApplication = (id: number): FetchSinglePlotApplicationAction => createAction('mvj/plotApplications/FETCH_SINGLE')(id);
diff --git a/src/plotApplications/components/PlotApplication.tsx b/src/plotApplications/components/PlotApplication.tsx
index a124a5999..c0b601429 100644
--- a/src/plotApplications/components/PlotApplication.tsx
+++ b/src/plotApplications/components/PlotApplication.tsx
@@ -2,34 +2,34 @@ import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import { orderBy } from "lodash";
-import Authorization from "components/authorization/Authorization";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { FormNames, ViewModes } from "enums";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import Collapse from "components/collapse/Collapse";
-import Divider from "components/content/Divider";
-import Title from "components/content/Title";
-import { getCollapseStateByKey, getCurrentPlotApplication, getIsFetchingApplicationRelatedForm, getApplicationRelatedForm } from "plotApplications/selectors";
-import { receiveCollapseStates } from "plotApplications/actions";
-import { formatDate, isFieldAllowedToRead } from "util/helpers";
-import Loader from "components/loader/Loader";
-import { reshapeSavedApplicationObject } from "plotApplications/helpers";
-import { getFieldAttributes } from "util/helpers";
-import { getApplicationRelatedPlotSearch, getIsFetchingApplicationRelatedPlotSearch } from "plotApplications/selectors";
-import ApplicationAnswersSection from "application/components/ApplicationAnswersSection";
-import PlotApplicationTargetInfoCheck from "plotApplications/components/infoCheck/PlotApplicationTargetInfoCheck";
-import PlotApplicationApplicantInfoCheck from "plotApplications/components/infoCheck/PlotApplicationApplicantInfoCheck";
-import { transformApplicantSectionTitle, transformTargetSectionTitle } from "application/helpers";
-import { getApplicationRelatedAttachments, getAttributes, getFormAttributes, getIsFetchingApplicationRelatedAttachments, getIsFetchingFormAttributes } from "application/selectors";
-import { APPLICANT_SECTION_IDENTIFIER, TARGET_SECTION_IDENTIFIER } from "application/constants";
+import Authorization from "@/components/authorization/Authorization";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { FormNames, ViewModes } from "@/enums";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import Collapse from "@/components/collapse/Collapse";
+import Divider from "@/components/content/Divider";
+import Title from "@/components/content/Title";
+import { getCollapseStateByKey, getCurrentPlotApplication, getIsFetchingApplicationRelatedForm, getApplicationRelatedForm } from "@/plotApplications/selectors";
+import { receiveCollapseStates } from "@/plotApplications/actions";
+import { formatDate, isFieldAllowedToRead } from "@/util/helpers";
+import Loader from "@/components/loader/Loader";
+import { reshapeSavedApplicationObject } from "@/plotApplications/helpers";
+import { getFieldAttributes } from "@/util/helpers";
+import { getApplicationRelatedPlotSearch, getIsFetchingApplicationRelatedPlotSearch } from "@/plotApplications/selectors";
+import ApplicationAnswersSection from "@/application/components/ApplicationAnswersSection";
+import PlotApplicationTargetInfoCheck from "@/plotApplications/components/infoCheck/PlotApplicationTargetInfoCheck";
+import PlotApplicationApplicantInfoCheck from "@/plotApplications/components/infoCheck/PlotApplicationApplicantInfoCheck";
+import { transformApplicantSectionTitle, transformTargetSectionTitle } from "@/application/helpers";
+import { getApplicationRelatedAttachments, getAttributes, getFormAttributes, getIsFetchingApplicationRelatedAttachments, getIsFetchingFormAttributes } from "@/application/selectors";
+import { APPLICANT_SECTION_IDENTIFIER, TARGET_SECTION_IDENTIFIER } from "@/application/constants";
 import type { Attributes } from "types";
-import type { PlotApplication as PlotApplicationType } from "plotApplications/types";
-import type { SectionExtraComponentProps } from "application/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
-import { PlotApplicationOpeningRecordLabels, PlotApplicationOpeningRecordPaths } from "plotApplications/enums";
-import { getHoursAndMinutes } from "util/date";
-import { getContentUser } from "users/helpers";
+import type { PlotApplication as PlotApplicationType } from "@/plotApplications/types";
+import type { SectionExtraComponentProps } from "@/application/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
+import { PlotApplicationOpeningRecordLabels, PlotApplicationOpeningRecordPaths } from "@/plotApplications/enums";
+import { getHoursAndMinutes } from "@/util/date";
+import { getContentUser } from "@/users/helpers";
 type OwnProps = {};
 type Props = {
   usersPermissions: UsersPermissionsType;
diff --git a/src/plotApplications/components/PlotApplicationCreate.tsx b/src/plotApplications/components/PlotApplicationCreate.tsx
index d0fa6b48f..ddadc1b3b 100644
--- a/src/plotApplications/components/PlotApplicationCreate.tsx
+++ b/src/plotApplications/components/PlotApplicationCreate.tsx
@@ -5,30 +5,30 @@ import { reduxForm, initialize, change, getFormValues } from "redux-form";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
 import get from "lodash/get";
-import Authorization from "components/authorization/Authorization";
-import { FormNames, ViewModes } from "enums";
-import Collapse from "components/collapse/Collapse";
-import Divider from "components/content/Divider";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import Title from "components/content/Title";
-import FormField from "components/form/FormField";
-import { receiveCollapseStates, receiveIsSaveClicked } from "plotApplications/actions";
-import { getCollapseStateByKey, getIsSaveClicked, getErrorsByFormName } from "plotApplications/selectors";
-import { getInitialApplication, getSectionTargetFromMeta } from "plotApplications/helpers";
-import { getIsFetching as getIsFetchingPlotSearchList, getIsFetchingForm, getPlotSearchList } from "plotSearch/selectors";
-import { getCurrentEditorTargets, getCurrentPlotApplication } from "plotApplications/selectors";
-import ApplicationSubsection from "application/components/ApplicationSubsection";
-import { receiveFormValidFlags, receiveSinglePlotApplication, setCurrentEditorTargets } from "plotApplications/actions";
-import Loader from "components/loader/Loader";
-import { getAttributes, getFieldTypeMapping, getFormAttributes, getIsFetchingApplicantInfoCheckAttributes, getIsFetchingAttachmentAttributes, getIsFetchingFormAttributes } from "application/selectors";
-import { getInitialApplicationForm, getSectionTemplate, getTargetTitle } from "application/helpers";
-import { fetchAttachmentAttributes, fetchFormAttributes, fetchPendingUploads } from "application/actions";
-import { TARGET_SECTION_IDENTIFIER } from "application/constants";
+import Authorization from "@/components/authorization/Authorization";
+import { FormNames, ViewModes } from "@/enums";
+import Collapse from "@/components/collapse/Collapse";
+import Divider from "@/components/content/Divider";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import Title from "@/components/content/Title";
+import FormField from "@/components/form/FormField";
+import { receiveCollapseStates, receiveIsSaveClicked } from "@/plotApplications/actions";
+import { getCollapseStateByKey, getIsSaveClicked, getErrorsByFormName } from "@/plotApplications/selectors";
+import { getInitialApplication, getSectionTargetFromMeta } from "@/plotApplications/helpers";
+import { getIsFetching as getIsFetchingPlotSearchList, getIsFetchingForm, getPlotSearchList } from "@/plotSearch/selectors";
+import { getCurrentEditorTargets, getCurrentPlotApplication } from "@/plotApplications/selectors";
+import ApplicationSubsection from "@/application/components/ApplicationSubsection";
+import { receiveFormValidFlags, receiveSinglePlotApplication, setCurrentEditorTargets } from "@/plotApplications/actions";
+import Loader from "@/components/loader/Loader";
+import { getAttributes, getFieldTypeMapping, getFormAttributes, getIsFetchingApplicantInfoCheckAttributes, getIsFetchingAttachmentAttributes, getIsFetchingFormAttributes } from "@/application/selectors";
+import { getInitialApplicationForm, getSectionTemplate, getTargetTitle } from "@/application/helpers";
+import { fetchAttachmentAttributes, fetchFormAttributes, fetchPendingUploads } from "@/application/actions";
+import { TARGET_SECTION_IDENTIFIER } from "@/application/constants";
 import type { Attributes } from "types";
-import type { PlotSearchList } from "plotSearch/types";
-import type { PlotApplication } from "plotApplications/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
-import { validateApplicationForm } from "application/formValidation";
+import type { PlotSearchList } from "@/plotSearch/types";
+import type { PlotApplication } from "@/plotApplications/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
+import { validateApplicationForm } from "@/application/formValidation";
 type OwnProps = {};
 type Props = OwnProps & {
   attributes: Attributes;
diff --git a/src/plotApplications/components/PlotApplicationCreatePage.tsx b/src/plotApplications/components/PlotApplicationCreatePage.tsx
index 612d62076..8c276e92b 100644
--- a/src/plotApplications/components/PlotApplicationCreatePage.tsx
+++ b/src/plotApplications/components/PlotApplicationCreatePage.tsx
@@ -6,35 +6,35 @@ import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
 import { initialize, isDirty, destroy, getFormValues } from "redux-form";
 import type { ContextRouter } from "react-router";
-import { FormNames } from "enums";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import FullWidthContainer from "components/content/FullWidthContainer";
-import PageContainer from "components/content/PageContainer";
-import Loader from "components/loader/Loader";
-import TabContent from "components/tabs/TabContent";
-import TabPane from "components/tabs/TabPane";
-import Tabs from "components/tabs/Tabs";
-import ContentContainer from "components/content/ContentContainer";
-import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors";
-import PageNavigationWrapper from "components/content/PageNavigationWrapper";
-import ControlButtonBar from "components/controlButtons/ControlButtonBar";
-import ControlButtons from "components/controlButtons/ControlButtons";
-import { withPlotApplicationsAttributes } from "components/attributes/PlotApplicationsAttributes";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { getRouteById, Routes } from "root/routes";
-import { Methods, PermissionMissingTexts } from "enums";
-import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "util/storage";
-import { getIsFetching, getCurrentPlotApplication, getIsSaveClicked, getIsFormValidById, getIsFormValidFlags, getIsPerformingFileOperation, getIsSaving } from "plotApplications/selectors";
-import { fetchSinglePlotApplication, showEditMode, receiveIsSaveClicked, hideEditMode, clearFormValidFlags, receiveFormValidFlags, editPlotApplication, createPlotApplication } from "plotApplications/actions";
-import { getUrlParams, setPageTitle, isMethodAllowed, getSearchQuery, scrollToTopPage } from "util/helpers";
-import PlotApplicationInfo from "plotApplications/components/PlotApplicationInfo";
-import { fetchPlotSearchList } from "plotSearch/actions";
-import { getPlotSearchList, getIsFetching as getIsFetchingPlotSearchList } from "plotSearch/selectors";
-import { preparePlotApplicationForSubmission } from "plotApplications/helpers";
-import PlotApplicationCreate from "plotApplications/components/PlotApplicationCreate";
-import type { PlotApplication as PlotApplicationType } from "plotApplications/types";
+import { FormNames } from "@/enums";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import FullWidthContainer from "@/components/content/FullWidthContainer";
+import PageContainer from "@/components/content/PageContainer";
+import Loader from "@/components/loader/Loader";
+import TabContent from "@/components/tabs/TabContent";
+import TabPane from "@/components/tabs/TabPane";
+import Tabs from "@/components/tabs/Tabs";
+import ContentContainer from "@/components/content/ContentContainer";
+import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors";
+import PageNavigationWrapper from "@/components/content/PageNavigationWrapper";
+import ControlButtonBar from "@/components/controlButtons/ControlButtonBar";
+import ControlButtons from "@/components/controlButtons/ControlButtons";
+import { withPlotApplicationsAttributes } from "@/components/attributes/PlotApplicationsAttributes";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { getRouteById, Routes } from "@/root/routes";
+import { Methods, PermissionMissingTexts } from "@/enums";
+import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "@/util/storage";
+import { getIsFetching, getCurrentPlotApplication, getIsSaveClicked, getIsFormValidById, getIsFormValidFlags, getIsPerformingFileOperation, getIsSaving } from "@/plotApplications/selectors";
+import { fetchSinglePlotApplication, showEditMode, receiveIsSaveClicked, hideEditMode, clearFormValidFlags, receiveFormValidFlags, editPlotApplication, createPlotApplication } from "@/plotApplications/actions";
+import { getUrlParams, setPageTitle, isMethodAllowed, getSearchQuery, scrollToTopPage } from "@/util/helpers";
+import PlotApplicationInfo from "@/plotApplications/components/PlotApplicationInfo";
+import { fetchPlotSearchList } from "@/plotSearch/actions";
+import { getPlotSearchList, getIsFetching as getIsFetchingPlotSearchList } from "@/plotSearch/selectors";
+import { preparePlotApplicationForSubmission } from "@/plotApplications/helpers";
+import PlotApplicationCreate from "@/plotApplications/components/PlotApplicationCreate";
+import type { PlotApplication as PlotApplicationType } from "@/plotApplications/types";
 import type { Attributes, Methods as MethodsType } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type OwnProps = ContextRouter;
 type Props = OwnProps & {
   clearFormValidFlags: (...args: Array<any>) => any;
diff --git a/src/plotApplications/components/PlotApplicationEdit.tsx b/src/plotApplications/components/PlotApplicationEdit.tsx
index 13d509d5e..90304bc77 100644
--- a/src/plotApplications/components/PlotApplicationEdit.tsx
+++ b/src/plotApplications/components/PlotApplicationEdit.tsx
@@ -1,24 +1,24 @@
 import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import { orderBy } from "lodash";
-import { getApplicationRelatedForm, getApplicationRelatedPlotSearch, getCurrentPlotApplication, getIsFetchingApplicationRelatedPlotSearch } from "plotApplications/selectors";
-import { reshapeSavedApplicationObject } from "plotApplications/helpers";
-import { getFieldAttributes } from "util/helpers";
-import { getIsFetchingForm } from "plotSearch/selectors";
-import ApplicationAnswersSection from "application/components/ApplicationAnswersSection";
-import Loader from "components/loader/Loader";
-import Title from "components/content/Title";
-import Divider from "components/content/Divider";
-import PlotApplicationTargetInfoCheckEdit from "plotApplications/components/infoCheck/PlotApplicationTargetInfoCheckEdit";
-import PlotApplicationApplicantInfoCheckEdit from "plotApplications/components/infoCheck/PlotApplicationApplicantInfoCheckEdit";
-import { transformApplicantSectionTitle, transformTargetSectionTitle } from "application/helpers";
-import { getApplicationRelatedAttachments, getFormAttributes, getIsFetchingApplicationRelatedAttachments, getIsFetchingFormAttributes } from "application/selectors";
-import { APPLICANT_SECTION_IDENTIFIER, TARGET_SECTION_IDENTIFIER } from "application/constants";
-import Collapse from "components/collapse/Collapse";
-import PlotApplicationOpeningRecordForm from "plotApplications/components/PlotApplicationOpeningRecordForm";
-import type { RootState } from "root/types";
-import type { PlotApplication } from "plotApplications/types";
-import type { SectionExtraComponentProps } from "application/types";
+import { getApplicationRelatedForm, getApplicationRelatedPlotSearch, getCurrentPlotApplication, getIsFetchingApplicationRelatedPlotSearch } from "@/plotApplications/selectors";
+import { reshapeSavedApplicationObject } from "@/plotApplications/helpers";
+import { getFieldAttributes } from "@/util/helpers";
+import { getIsFetchingForm } from "@/plotSearch/selectors";
+import ApplicationAnswersSection from "@/application/components/ApplicationAnswersSection";
+import Loader from "@/components/loader/Loader";
+import Title from "@/components/content/Title";
+import Divider from "@/components/content/Divider";
+import PlotApplicationTargetInfoCheckEdit from "@/plotApplications/components/infoCheck/PlotApplicationTargetInfoCheckEdit";
+import PlotApplicationApplicantInfoCheckEdit from "@/plotApplications/components/infoCheck/PlotApplicationApplicantInfoCheckEdit";
+import { transformApplicantSectionTitle, transformTargetSectionTitle } from "@/application/helpers";
+import { getApplicationRelatedAttachments, getFormAttributes, getIsFetchingApplicationRelatedAttachments, getIsFetchingFormAttributes } from "@/application/selectors";
+import { APPLICANT_SECTION_IDENTIFIER, TARGET_SECTION_IDENTIFIER } from "@/application/constants";
+import Collapse from "@/components/collapse/Collapse";
+import PlotApplicationOpeningRecordForm from "@/plotApplications/components/PlotApplicationOpeningRecordForm";
+import type { RootState } from "@/root/types";
+import type { PlotApplication } from "@/plotApplications/types";
+import type { SectionExtraComponentProps } from "@/application/types";
 import type { Attributes } from "types";
 type OwnProps = {};
 type Props = OwnProps & {
diff --git a/src/plotApplications/components/PlotApplicationInfo.tsx b/src/plotApplications/components/PlotApplicationInfo.tsx
index 1b1610b08..10620d5cd 100644
--- a/src/plotApplications/components/PlotApplicationInfo.tsx
+++ b/src/plotApplications/components/PlotApplicationInfo.tsx
@@ -6,7 +6,7 @@ type Props = {
 
 const PlotApplicationInfo = ({
   title
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   return <div className='lease-info'>
       <Row>
         <Column>
diff --git a/src/plotApplications/components/PlotApplicationOpeningRecordForm.tsx b/src/plotApplications/components/PlotApplicationOpeningRecordForm.tsx
index ce910b58e..f35844d53 100644
--- a/src/plotApplications/components/PlotApplicationOpeningRecordForm.tsx
+++ b/src/plotApplications/components/PlotApplicationOpeningRecordForm.tsx
@@ -4,16 +4,16 @@ import { Column, Row } from "react-foundation";
 import { get } from "lodash/object";
 import { flowRight } from "lodash/util";
 import { connect } from "react-redux";
-import FormField from "components/form/FormField";
-import type { RootState } from "root/types";
-import { getAttributes } from "application/selectors";
+import FormField from "@/components/form/FormField";
+import type { RootState } from "@/root/types";
+import { getAttributes } from "@/application/selectors";
 import type { Attributes } from "types";
-import { FieldTypes, FormNames } from "enums";
-import { getCurrentPlotApplication, getIsSaveClicked } from "plotApplications/selectors";
-import { getContentUser } from "users/helpers";
-import { PlotApplicationOpeningRecordLabels, PlotApplicationOpeningRecordPaths } from "plotApplications/enums";
-import { isFieldAllowedToRead } from "util/helpers";
-import Authorization from "components/authorization/Authorization";
+import { FieldTypes, FormNames } from "@/enums";
+import { getCurrentPlotApplication, getIsSaveClicked } from "@/plotApplications/selectors";
+import { getContentUser } from "@/users/helpers";
+import { PlotApplicationOpeningRecordLabels, PlotApplicationOpeningRecordPaths } from "@/plotApplications/enums";
+import { isFieldAllowedToRead } from "@/util/helpers";
+import Authorization from "@/components/authorization/Authorization";
 type Props = {};
 type InnerProps = Props & {
   attributes: Attributes;
@@ -48,7 +48,7 @@ class PlotApplicationOpeningRecordForm extends Component<InnerProps> {
     }
   }
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       attributes,
       isSaveClicked
diff --git a/src/plotApplications/components/PlotApplicationPage.tsx b/src/plotApplications/components/PlotApplicationPage.tsx
index 09a8dfb3f..e9ab758a0 100644
--- a/src/plotApplications/components/PlotApplicationPage.tsx
+++ b/src/plotApplications/components/PlotApplicationPage.tsx
@@ -7,41 +7,41 @@ import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
 import { initialize, isDirty, destroy, getFormValues, isValid, change } from "redux-form";
 import type { ContextRouter } from "react-router";
-import { FormNames } from "enums";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import FullWidthContainer from "components/content/FullWidthContainer";
-import PageContainer from "components/content/PageContainer";
-import { ButtonColors } from "components/enums";
-import Loader from "components/loader/Loader";
-import TabContent from "components/tabs/TabContent";
-import TabPane from "components/tabs/TabPane";
-import Tabs from "components/tabs/Tabs";
-import ContentContainer from "components/content/ContentContainer";
-import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
-import PageNavigationWrapper from "components/content/PageNavigationWrapper";
-import ControlButtonBar from "components/controlButtons/ControlButtonBar";
-import ControlButtons from "components/controlButtons/ControlButtons";
-import { withPlotApplicationsAttributes } from "components/attributes/PlotApplicationsAttributes";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { getRouteById, Routes } from "root/routes";
-import { ConfirmationModalTexts, Methods, PermissionMissingTexts } from "enums";
-import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "util/storage";
-import { getIsFetching, getCurrentPlotApplication, getIsEditMode, getIsSaveClicked, getIsFormValidFlags, getIsPerformingFileOperation, getIsSaving, getIsSingleAllowed, getApplicationRelatedPlotSearch, getApplicationApplicantInfoCheckData, getApplicationTargetInfoCheckData } from "plotApplications/selectors";
-import { fetchSinglePlotApplication, showEditMode, receiveIsSaveClicked, hideEditMode, clearFormValidFlags, receiveFormValidFlags, batchEditApplicationModels } from "plotApplications/actions";
-import type { PlotApplication as PlotApplicationType } from "plotApplications/types";
-import { getUrlParams, setPageTitle, isMethodAllowed, getSearchQuery, scrollToTopPage } from "util/helpers";
+import { FormNames } from "@/enums";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import FullWidthContainer from "@/components/content/FullWidthContainer";
+import PageContainer from "@/components/content/PageContainer";
+import { ButtonColors } from "@/components/enums";
+import Loader from "@/components/loader/Loader";
+import TabContent from "@/components/tabs/TabContent";
+import TabPane from "@/components/tabs/TabPane";
+import Tabs from "@/components/tabs/Tabs";
+import ContentContainer from "@/components/content/ContentContainer";
+import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
+import PageNavigationWrapper from "@/components/content/PageNavigationWrapper";
+import ControlButtonBar from "@/components/controlButtons/ControlButtonBar";
+import ControlButtons from "@/components/controlButtons/ControlButtons";
+import { withPlotApplicationsAttributes } from "@/components/attributes/PlotApplicationsAttributes";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { getRouteById, Routes } from "@/root/routes";
+import { ConfirmationModalTexts, Methods, PermissionMissingTexts } from "@/enums";
+import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "@/util/storage";
+import { getIsFetching, getCurrentPlotApplication, getIsEditMode, getIsSaveClicked, getIsFormValidFlags, getIsPerformingFileOperation, getIsSaving, getIsSingleAllowed, getApplicationRelatedPlotSearch, getApplicationApplicantInfoCheckData, getApplicationTargetInfoCheckData } from "@/plotApplications/selectors";
+import { fetchSinglePlotApplication, showEditMode, receiveIsSaveClicked, hideEditMode, clearFormValidFlags, receiveFormValidFlags, batchEditApplicationModels } from "@/plotApplications/actions";
+import type { PlotApplication as PlotApplicationType } from "@/plotApplications/types";
+import { getUrlParams, setPageTitle, isMethodAllowed, getSearchQuery, scrollToTopPage } from "@/util/helpers";
 import type { Attributes, Methods as MethodsType } from "types";
-import PlotApplicationInfo from "plotApplications/components/PlotApplicationInfo";
-import PlotApplication from "plotApplications/components/PlotApplication";
-import PlotApplicationEdit from "plotApplications/components/PlotApplicationEdit";
-import { getPlotSearchList } from "plotSearch/selectors";
-import { getInitialTargetInfoCheckValues, getTargetInfoCheckFormName } from "plotApplications/helpers";
-import type { PlotSearch } from "plotSearch/types";
-import type { InfoCheckBatchEditData } from "plotApplications/types";
-import { clearUnsavedChanges } from "contacts/helpers";
-import ConfirmationModal from "components/modal/ConfirmationModal";
-import { getApplicantInfoCheckFormName, getApplicantInfoCheckItems, prepareApplicantInfoCheckForSubmission } from "application/helpers";
+import PlotApplicationInfo from "@/plotApplications/components/PlotApplicationInfo";
+import PlotApplication from "@/plotApplications/components/PlotApplication";
+import PlotApplicationEdit from "@/plotApplications/components/PlotApplicationEdit";
+import { getPlotSearchList } from "@/plotSearch/selectors";
+import { getInitialTargetInfoCheckValues, getTargetInfoCheckFormName } from "@/plotApplications/helpers";
+import type { PlotSearch } from "@/plotSearch/types";
+import type { InfoCheckBatchEditData } from "@/plotApplications/types";
+import { clearUnsavedChanges } from "@/contacts/helpers";
+import ConfirmationModal from "@/components/modal/ConfirmationModal";
+import { getApplicantInfoCheckFormName, getApplicantInfoCheckItems, prepareApplicantInfoCheckForSubmission } from "@/application/helpers";
 type OwnProps = {};
 type Props = ContextRouter & OwnProps & {
   clearFormValidFlags: (...args: Array<any>) => any;
diff --git a/src/plotApplications/components/PlotApplicationsListOpeningModal.tsx b/src/plotApplications/components/PlotApplicationsListOpeningModal.tsx
index 04fabcb5a..d90c38aa0 100644
--- a/src/plotApplications/components/PlotApplicationsListOpeningModal.tsx
+++ b/src/plotApplications/components/PlotApplicationsListOpeningModal.tsx
@@ -1,16 +1,16 @@
 import React, { Component } from "react";
 import { connect } from "react-redux";
-import Modal from "components/modal/Modal";
-import ModalButtonWrapper from "components/modal/ModalButtonWrapper";
-import Button from "components/button/Button";
-import { createPlotApplicationOpeningRecord } from "plotApplications/actions";
-import { getLoggedInUser } from "auth/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getHoursAndMinutes } from "util/date";
-import { formatDate, hasPermissions } from "util/helpers";
-import type { RootState } from "root/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import Modal from "@/components/modal/Modal";
+import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper";
+import Button from "@/components/button/Button";
+import { createPlotApplicationOpeningRecord } from "@/plotApplications/actions";
+import { getLoggedInUser } from "@/auth/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getHoursAndMinutes } from "@/util/date";
+import { formatDate, hasPermissions } from "@/util/helpers";
+import type { RootState } from "@/root/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   isOpen: boolean;
   onClose: (...args: Array<any>) => any;
@@ -32,7 +32,7 @@ class PlotApplicationsListOpeningModal extends Component<InnerProps> {
     createPlotApplicationOpeningRecord(data?.id, currentUser);
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       isOpen,
       onClose,
diff --git a/src/plotApplications/components/PlotApplicationsListPage.tsx b/src/plotApplications/components/PlotApplicationsListPage.tsx
index d3190ad63..130d2b103 100644
--- a/src/plotApplications/components/PlotApplicationsListPage.tsx
+++ b/src/plotApplications/components/PlotApplicationsListPage.tsx
@@ -7,38 +7,38 @@ import { withRouter } from "react-router";
 import type { ContextRouter } from "react-router";
 import { Row, Column } from "react-foundation";
 import { initialize } from "redux-form";
-import Search from "plotApplications/components/search/Search";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { fetchPlotApplicationsList, fetchPlotApplicationsByBBox } from "plotApplications/actions";
-import Authorization from "components/authorization/Authorization";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import IconRadioButtons from "components/button/IconRadioButtons";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import { LIST_TABLE_PAGE_SIZE } from "util/constants";
-import ExternalLink from "components/links/ExternalLink";
-import SortableTable from "components/table/SortableTable";
-import TableFilters from "components/table/TableFilters";
-import TableFilterWrapper from "components/table/TableFilterWrapper";
-import TableWrapper from "components/table/TableWrapper";
-import TableIcon from "components/icons/TableIcon";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import { getRouteById, Routes } from "root/routes";
-import { FormNames, Methods, PermissionMissingTexts } from "enums";
-import PageContainer from "components/content/PageContainer";
-import { withPlotApplicationsAttributes } from "components/attributes/PlotApplicationsAttributes";
-import Pagination from "components/table/Pagination";
-import VisualisationTypeWrapper from "components/table/VisualisationTypeWrapper";
-import MapIcon from "components/icons/MapIcon";
-import { getContentPlotApplicationsListResults } from "plotApplications/helpers";
-import { isMethodAllowed, getUrlParams, setPageTitle, getApiResponseCount, getApiResponseMaxPage, getSearchQuery } from "util/helpers";
-import { getIsFetching, getPlotApplicationsList, getIsFetchingByBBox } from "plotApplications/selectors";
-import { DEFAULT_PLOT_APPLICATIONS_STATES, BOUNDING_BOX_FOR_SEARCH_QUERY, MAX_ZOOM_LEVEL_TO_FETCH_LEASES } from "plotApplications/constants";
+import Search from "@/plotApplications/components/search/Search";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { fetchPlotApplicationsList, fetchPlotApplicationsByBBox } from "@/plotApplications/actions";
+import Authorization from "@/components/authorization/Authorization";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import IconRadioButtons from "@/components/button/IconRadioButtons";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import { LIST_TABLE_PAGE_SIZE } from "@/util/constants";
+import ExternalLink from "@/components/links/ExternalLink";
+import SortableTable from "@/components/table/SortableTable";
+import TableFilters from "@/components/table/TableFilters";
+import TableFilterWrapper from "@/components/table/TableFilterWrapper";
+import TableWrapper from "@/components/table/TableWrapper";
+import TableIcon from "@/components/icons/TableIcon";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import { getRouteById, Routes } from "@/root/routes";
+import { FormNames, Methods, PermissionMissingTexts } from "@/enums";
+import PageContainer from "@/components/content/PageContainer";
+import { withPlotApplicationsAttributes } from "@/components/attributes/PlotApplicationsAttributes";
+import Pagination from "@/components/table/Pagination";
+import VisualisationTypeWrapper from "@/components/table/VisualisationTypeWrapper";
+import MapIcon from "@/components/icons/MapIcon";
+import { getContentPlotApplicationsListResults } from "@/plotApplications/helpers";
+import { isMethodAllowed, getUrlParams, setPageTitle, getApiResponseCount, getApiResponseMaxPage, getSearchQuery } from "@/util/helpers";
+import { getIsFetching, getPlotApplicationsList, getIsFetchingByBBox } from "@/plotApplications/selectors";
+import { DEFAULT_PLOT_APPLICATIONS_STATES, BOUNDING_BOX_FOR_SEARCH_QUERY, MAX_ZOOM_LEVEL_TO_FETCH_LEASES } from "@/plotApplications/constants";
 import type { Attributes, Methods as MethodsType } from "types";
-import { fetchPlotSearchList, fetchAttributes as fetchPlotSearchAttributes } from "plotSearch/actions";
-import ApplicationListMap from "plotApplications/components/map/ApplicationListMap";
-import { getPlotApplicationsListByBBox } from "plotApplications/selectors";
-import PlotApplicationsListOpeningModal from "plotApplications/components/PlotApplicationsListOpeningModal";
+import { fetchPlotSearchList, fetchAttributes as fetchPlotSearchAttributes } from "@/plotSearch/actions";
+import ApplicationListMap from "@/plotApplications/components/map/ApplicationListMap";
+import { getPlotApplicationsListByBBox } from "@/plotApplications/selectors";
+import PlotApplicationsListOpeningModal from "@/plotApplications/components/PlotApplicationsListOpeningModal";
 const VisualizationTypes = {
   MAP: 'map',
   TABLE: 'table'
diff --git a/src/plotApplications/components/exportModal/PlotSearchExportModal.tsx b/src/plotApplications/components/exportModal/PlotSearchExportModal.tsx
index 0725e6710..cf5637ced 100644
--- a/src/plotApplications/components/exportModal/PlotSearchExportModal.tsx
+++ b/src/plotApplications/components/exportModal/PlotSearchExportModal.tsx
@@ -2,19 +2,19 @@ import React, { Component } from "react";
 import { flowRight } from "lodash/util";
 import { change, formValueSelector, reduxForm } from "redux-form";
 import { connect } from "react-redux";
-import Modal from "components/modal/Modal";
-import ModalButtonWrapper from "components/modal/ModalButtonWrapper";
-import Button from "components/button/Button";
-import { ButtonColors } from "components/enums";
-import FormField from "components/form/FormField";
-import { FieldTypes } from "enums";
-import FileDownloadButton from "components/file/FileDownloadButton";
-import createUrl from "api/createUrl";
-import type { Column } from "components/table/SortableTable";
-import PlotSearchExportModalTargetTable from "plotApplications/components/exportModal/PlotSearchExportModalTargetTable";
-import { fetchTargetInfoChecksForPlotSearch } from "plotApplications/actions";
-import { getIsFetchingTargetInfoChecksForCurrentPlotSearch, getTargetInfoChecksForCurrentPlotSearch } from "plotApplications/selectors";
-import Loader from "components/loader/Loader";
+import Modal from "@/components/modal/Modal";
+import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper";
+import Button from "@/components/button/Button";
+import { ButtonColors } from "@/components/enums";
+import FormField from "@/components/form/FormField";
+import { FieldTypes } from "@/enums";
+import FileDownloadButton from "@/components/file/FileDownloadButton";
+import createUrl from "@/api/createUrl";
+import type { Column } from "@/components/table/SortableTable";
+import PlotSearchExportModalTargetTable from "@/plotApplications/components/exportModal/PlotSearchExportModalTargetTable";
+import { fetchTargetInfoChecksForPlotSearch } from "@/plotApplications/actions";
+import { getIsFetchingTargetInfoChecksForCurrentPlotSearch, getTargetInfoChecksForCurrentPlotSearch } from "@/plotApplications/selectors";
+import Loader from "@/components/loader/Loader";
 type OwnProps = {
   isOpen: boolean;
   onClose: () => void;
@@ -109,7 +109,7 @@ class PlotSearchExportModal extends Component<Props> {
     change('selectedItemIds', Array.from(newSelectedIds));
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       isOpen,
       onClose,
@@ -120,7 +120,7 @@ class PlotSearchExportModal extends Component<Props> {
       items,
       isFetching
     } = this.props;
-    let guideText: React.ReactNode = <p>Voit tulostaa hakemuksien tietoja tiedostoon. Aloita valitsemalla tulostusalue.</p>;
+    let guideText: JSX.Element = <p>Voit tulostaa hakemuksien tietoja tiedostoon. Aloita valitsemalla tulostusalue.</p>;
     let columns: Array<Column> = [];
     let downloadUrl = '';
 
diff --git a/src/plotApplications/components/exportModal/PlotSearchExportModalTargetTable.tsx b/src/plotApplications/components/exportModal/PlotSearchExportModalTargetTable.tsx
index c5d6d3b8a..6d1481281 100644
--- a/src/plotApplications/components/exportModal/PlotSearchExportModalTargetTable.tsx
+++ b/src/plotApplications/components/exportModal/PlotSearchExportModalTargetTable.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import { groupBy } from "lodash/collection";
-import SortableTable from "components/table/SortableTable";
-import FormField from "components/form/FormField";
-import { FieldTypes } from "enums";
-import type { Column } from "components/table/SortableTable";
+import SortableTable from "@/components/table/SortableTable";
+import FormField from "@/components/form/FormField";
+import { FieldTypes } from "@/enums";
+import type { Column } from "@/components/table/SortableTable";
 type Props = {
   items: Array<Record<string, any>>;
   onItemChange: (arg0: Record<string, any>, arg1: boolean) => void;
@@ -18,7 +18,7 @@ type CheckboxProps = {
 const PlotSearchExportModalTargetTableCheckbox = ({
   item,
   onItemChange
-}: CheckboxProps): React.ReactNode => {
+}: CheckboxProps): JSX.Element => {
   return <FormField name={`items.${item.application_identifier}`} fieldAttributes={{
     type: FieldTypes.CHECKBOX,
     label: 'Valitse hakemus ' + item.application_identifier,
@@ -36,7 +36,7 @@ const PlotSearchExportModalTargetTable = ({
   onItemChange,
   columns,
   firstCheckboxOnly
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   const groupedItems = groupBy(items, 'answer_id');
   return <SortableTable listTable className="PlotSearchExportModalTargetTable" data={Object.keys(groupedItems).map(name => {
     const group = groupedItems[name];
diff --git a/src/plotApplications/components/infoCheck/PlotApplicationApplicantInfoCheck.tsx b/src/plotApplications/components/infoCheck/PlotApplicationApplicantInfoCheck.tsx
index 0f300e611..0f24b13e8 100644
--- a/src/plotApplications/components/infoCheck/PlotApplicationApplicantInfoCheck.tsx
+++ b/src/plotApplications/components/infoCheck/PlotApplicationApplicantInfoCheck.tsx
@@ -1,14 +1,14 @@
 import React, { PureComponent } from "react";
 import { Column, Row } from "react-foundation";
 import { connect } from "react-redux";
-import { getFieldOptions, getLabelOfOption } from "util/helpers";
-import { getUserFullName } from "users/helpers";
+import { getFieldOptions, getLabelOfOption } from "@/util/helpers";
+import { getUserFullName } from "@/users/helpers";
 import type { Attributes } from "types";
-import PlotApplicationInfoCheckCollapse from "plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse";
-import { getApplicationApplicantInfoCheckData } from "plotApplications/selectors";
-import ApplicantInfoCheck from "application/components/infoCheck/ApplicantInfoCheck";
-import { getApplicantInfoCheckAttributes } from "application/selectors";
-import { getApplicantInfoCheckItems } from "application/helpers";
+import PlotApplicationInfoCheckCollapse from "@/plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse";
+import { getApplicationApplicantInfoCheckData } from "@/plotApplications/selectors";
+import ApplicantInfoCheck from "@/application/components/infoCheck/ApplicantInfoCheck";
+import { getApplicantInfoCheckAttributes } from "@/application/selectors";
+import { getApplicantInfoCheckItems } from "@/application/helpers";
 type OwnProps = {
   section: Record<string, any>;
   identifier: string;
@@ -20,15 +20,17 @@ type Props = OwnProps & {
 };
 
 class PlotApplicationApplicantInfoCheck extends PureComponent<Props> {
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       infoCheckAttributes,
       infoCheckData
     } = this.props;
     const infoCheckStateOptions = getFieldOptions(infoCheckAttributes, 'state');
     return <PlotApplicationInfoCheckCollapse className="PlotApplicationApplicantInfoCheck" headerTitle="Hakijan käsittelytiedot">
+        <>
         <h4>Tarkistettavat dokumentit</h4>
         <ApplicantInfoCheck infoChecks={infoCheckData} infoCheckStateOptions={infoCheckStateOptions} />
+        </>
       </PlotApplicationInfoCheckCollapse>;
   }
 
diff --git a/src/plotApplications/components/infoCheck/PlotApplicationApplicantInfoCheckEdit.tsx b/src/plotApplications/components/infoCheck/PlotApplicationApplicantInfoCheckEdit.tsx
index d9f851b64..833129042 100644
--- a/src/plotApplications/components/infoCheck/PlotApplicationApplicantInfoCheckEdit.tsx
+++ b/src/plotApplications/components/infoCheck/PlotApplicationApplicantInfoCheckEdit.tsx
@@ -2,11 +2,11 @@ import React, { PureComponent } from "react";
 import { connect } from "react-redux";
 import { change } from "redux-form";
 import type { Attributes } from "types";
-import PlotApplicationInfoCheckCollapse from "plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse";
-import { getApplicantInfoCheckSubmissionErrors, getApplicationApplicantInfoCheckData } from "plotApplications/selectors";
-import { getApplicantInfoCheckAttributes } from "application/selectors";
-import ApplicantInfoCheckEdit from "application/components/infoCheck/ApplicantInfoCheckEdit";
-import { getApplicantInfoCheckFormName } from "application/helpers";
+import PlotApplicationInfoCheckCollapse from "@/plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse";
+import { getApplicantInfoCheckSubmissionErrors, getApplicationApplicantInfoCheckData } from "@/plotApplications/selectors";
+import { getApplicantInfoCheckAttributes } from "@/application/selectors";
+import ApplicantInfoCheckEdit from "@/application/components/infoCheck/ApplicantInfoCheckEdit";
+import { getApplicantInfoCheckFormName } from "@/application/helpers";
 type OwnProps = {
   section: Record<string, any>;
   identifier: string;
@@ -24,21 +24,23 @@ type Props = OwnProps & {
 };
 
 class PlotApplicationApplicantInfoCheck extends PureComponent<Props> {
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       infoCheckIds,
       answer,
       submissionErrors
     } = this.props;
     return <PlotApplicationInfoCheckCollapse className="PlotApplicationApplicantInfoCheckEdit" headerTitle="Hakijan käsittelytiedot">
+        <>
         <h4>Tarkistettavat dokumentit</h4>
         <ApplicantInfoCheckEdit infoCheckIds={infoCheckIds} answer={answer} submissionErrors={submissionErrors} />
+        </>
       </PlotApplicationInfoCheckCollapse>;
   }
 
 }
 
-export default (connect((state, props) => {
+export default (connect((state, props: Props) => {
   const formName = getApplicantInfoCheckFormName(props.identifier);
   const infoCheckIds = getApplicationApplicantInfoCheckData(state).filter(item => item.entry === props.identifier).map(item => item.id);
   return {
diff --git a/src/plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse.tsx b/src/plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse.tsx
index f016db05c..3804b8aea 100644
--- a/src/plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse.tsx
+++ b/src/plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse.tsx
@@ -1,8 +1,8 @@
 import React from "react";
 import classNames from "classnames";
-import Collapse from "components/collapse/Collapse";
+import Collapse from "@/components/collapse/Collapse";
 type Props = {
-  children?: React.ReactNode | null | undefined;
+  children?: JSX.Element | null | undefined;
   className?: string;
   headerTitle: string;
 };
diff --git a/src/plotApplications/components/infoCheck/PlotApplicationTargetInfoCheck.tsx b/src/plotApplications/components/infoCheck/PlotApplicationTargetInfoCheck.tsx
index 80af3ebe4..2da002df4 100644
--- a/src/plotApplications/components/infoCheck/PlotApplicationTargetInfoCheck.tsx
+++ b/src/plotApplications/components/infoCheck/PlotApplicationTargetInfoCheck.tsx
@@ -3,19 +3,19 @@ import { Column, Row } from "react-foundation";
 import flowRight from "lodash/flowRight";
 import { connect } from "react-redux";
 import get from "lodash/get";
-import { formatDate, getFieldOptions, getLabelOfOption, isFieldAllowedToRead } from "util/helpers";
-import Authorization from "components/authorization/Authorization";
-import FormTextTitle from "components/form/FormTextTitle";
-import FormText from "components/form/FormText";
-import FileDownloadLink from "components/file/FileDownloadLink";
-import type { RootState } from "root/types";
+import { formatDate, getFieldOptions, getLabelOfOption, isFieldAllowedToRead } from "@/util/helpers";
+import Authorization from "@/components/authorization/Authorization";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import FormText from "@/components/form/FormText";
+import FileDownloadLink from "@/components/file/FileDownloadLink";
+import type { RootState } from "@/root/types";
 import type { Attributes } from "types";
-import { getUserFullName } from "users/helpers";
-import PlotApplicationInfoCheckCollapse from "plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse";
-import { getApplicationRelatedPlotSearch, getApplicationTargetInfoCheckData } from "plotApplications/selectors";
-import { PlotApplicationTargetInfoCheckFieldPaths, PlotApplicationTargetInfoCheckFieldTitles } from "plotApplications/enums";
-import { getInitialTargetInfoCheckValues, getMeetingMemoDownloadLink } from "plotApplications/helpers";
-import { getAttributes } from "application/selectors";
+import { getUserFullName } from "@/users/helpers";
+import PlotApplicationInfoCheckCollapse from "@/plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse";
+import { getApplicationRelatedPlotSearch, getApplicationTargetInfoCheckData } from "@/plotApplications/selectors";
+import { PlotApplicationTargetInfoCheckFieldPaths, PlotApplicationTargetInfoCheckFieldTitles } from "@/plotApplications/enums";
+import { getInitialTargetInfoCheckValues, getMeetingMemoDownloadLink } from "@/plotApplications/helpers";
+import { getAttributes } from "@/application/selectors";
 type TargetSubFieldSetProps = {
   values: any;
   attributes: Attributes;
@@ -176,7 +176,7 @@ type Props = OwnProps & {
 };
 
 class PlotApplicationTargetInfoCheck extends PureComponent<Props> {
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       attributes,
       values
diff --git a/src/plotApplications/components/infoCheck/PlotApplicationTargetInfoCheckEdit.tsx b/src/plotApplications/components/infoCheck/PlotApplicationTargetInfoCheckEdit.tsx
index 9fcf85380..fb707d699 100644
--- a/src/plotApplications/components/infoCheck/PlotApplicationTargetInfoCheckEdit.tsx
+++ b/src/plotApplications/components/infoCheck/PlotApplicationTargetInfoCheckEdit.tsx
@@ -4,30 +4,30 @@ import flowRight from "lodash/flowRight";
 import { connect } from "react-redux";
 import get from "lodash/get";
 import { FieldArray, getFormValues, reduxForm } from "redux-form";
-import FormField from "components/form/FormField";
-import { formatDate, getFieldAttributes, isFieldAllowedToRead } from "util/helpers";
-import Authorization from "components/authorization/Authorization";
-import RemoveButton from "components/form/RemoveButton";
-import FormTextTitle from "components/form/FormTextTitle";
-import { ButtonColors } from "components/enums";
-import AddButtonThird from "components/form/AddButtonThird";
-import FormFieldLabel from "components/form/FormFieldLabel";
-import AddFileButton from "components/form/AddFileButton";
-import FormText from "components/form/FormText";
-import FileDownloadLink from "components/file/FileDownloadLink";
-import type { RootState } from "root/types";
+import FormField from "@/components/form/FormField";
+import { formatDate, getFieldAttributes, isFieldAllowedToRead } from "@/util/helpers";
+import Authorization from "@/components/authorization/Authorization";
+import RemoveButton from "@/components/form/RemoveButton";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import { ButtonColors } from "@/components/enums";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import FormFieldLabel from "@/components/form/FormFieldLabel";
+import AddFileButton from "@/components/form/AddFileButton";
+import FormText from "@/components/form/FormText";
+import FileDownloadLink from "@/components/file/FileDownloadLink";
+import type { RootState } from "@/root/types";
 import type { Attributes } from "types";
-import { getUserFullName } from "users/helpers";
-import { ConfirmationModalTexts, FieldTypes } from "enums";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import PlotApplicationInfoCheckCollapse from "plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse";
-import { getIsPerformingFileOperation, getIsSaveClicked, getIsSaving, getTargetInfoCheckSubmissionErrors } from "plotApplications/selectors";
-import { PlotApplicationTargetInfoCheckFieldPaths, PlotApplicationTargetInfoCheckFieldTitles } from "plotApplications/enums";
-import { getMeetingMemoDownloadLink, getTargetInfoCheckFormName } from "plotApplications/helpers";
-import { deleteTargetInfoCheckMeetingMemo, uploadTargetInfoCheckMeetingMemo } from "plotApplications/actions";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import Loader from "components/loader/Loader";
-import { getAttributes } from "application/selectors";
+import { getUserFullName } from "@/users/helpers";
+import { ConfirmationModalTexts, FieldTypes } from "@/enums";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import PlotApplicationInfoCheckCollapse from "@/plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse";
+import { getIsPerformingFileOperation, getIsSaveClicked, getIsSaving, getTargetInfoCheckSubmissionErrors } from "@/plotApplications/selectors";
+import { PlotApplicationTargetInfoCheckFieldPaths, PlotApplicationTargetInfoCheckFieldTitles } from "@/plotApplications/enums";
+import { getMeetingMemoDownloadLink, getTargetInfoCheckFormName } from "@/plotApplications/helpers";
+import { deleteTargetInfoCheckMeetingMemo, uploadTargetInfoCheckMeetingMemo } from "@/plotApplications/actions";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import Loader from "@/components/loader/Loader";
+import { getAttributes } from "@/application/selectors";
 type TargetSubFieldSetProps = {
   fields: any;
   attributes: Attributes;
@@ -318,7 +318,7 @@ type Props = OwnProps & {
 };
 
 class PlotApplicationTargetInfoCheck extends PureComponent<Props> {
-  renderErrors(): React.ReactNode {
+  renderErrors(): JSX.Element {
     const {
       submissionErrors
     } = this.props;
@@ -360,7 +360,7 @@ class PlotApplicationTargetInfoCheck extends PureComponent<Props> {
     </FormText>;
   }
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       attributes,
       formValues,
@@ -371,6 +371,7 @@ class PlotApplicationTargetInfoCheck extends PureComponent<Props> {
     } = this.props;
     const targetInfoCheck = formValues?.id;
     return <PlotApplicationInfoCheckCollapse className="PlotApplicationTargetInfoCheckEdit" headerTitle="Kohteen käsittelytiedot">
+        <>
         <form>
           <Row>
             <Authorization allow={isFieldAllowedToRead(attributes, PlotApplicationTargetInfoCheckFieldPaths.RESERVED)}>
@@ -457,6 +458,7 @@ class PlotApplicationTargetInfoCheck extends PureComponent<Props> {
           </Row>
         </form>
         {submissionErrors && this.renderErrors()}
+        </>
       </PlotApplicationInfoCheckCollapse>;
   }
 
diff --git a/src/plotApplications/components/map/ApplicationListMap.tsx b/src/plotApplications/components/map/ApplicationListMap.tsx
index 2c97cd7ae..0f5f35c89 100644
--- a/src/plotApplications/components/map/ApplicationListMap.tsx
+++ b/src/plotApplications/components/map/ApplicationListMap.tsx
@@ -3,20 +3,20 @@ import { connect } from "react-redux";
 import { withRouter } from "react-router";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import AreaNotesEditMap from "areaNote/components/AreaNotesEditMap";
-import TargetListLayer from "plotApplications/components/map/TargetListLayer";
-import { DEFAULT_ZOOM, MAP_COLORS } from "util/constants";
-import { MAX_ZOOM_LEVEL_TO_FETCH_LEASES } from "leases/constants";
-import { getApplicationTargetGeoJson } from "plotApplications/helpers";
-import { getApiResponseResults, getUrlParams } from "util/helpers";
-import { getBoundsFromBBox, getBoundsFromFeatures } from "util/map";
-import { getAreaNoteList } from "areaNote/selectors";
-import { getApplicationsByBBox } from "plotApplications/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import AreaNotesEditMap from "@/areaNote/components/AreaNotesEditMap";
+import TargetListLayer from "@/plotApplications/components/map/TargetListLayer";
+import { DEFAULT_ZOOM, MAP_COLORS } from "@/util/constants";
+import { MAX_ZOOM_LEVEL_TO_FETCH_LEASES } from "@/leases/constants";
+import { getApplicationTargetGeoJson } from "@/plotApplications/helpers";
+import { getApiResponseResults, getUrlParams } from "@/util/helpers";
+import { getBoundsFromBBox, getBoundsFromFeatures } from "@/util/map";
+import { getAreaNoteList } from "@/areaNote/selectors";
+import { getApplicationsByBBox } from "@/plotApplications/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { LeafletGeoJson } from "types";
-import type { AreaNoteList } from "areaNote/types";
-import type { PlotApplicationsList } from "plotApplications/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { AreaNoteList } from "@/areaNote/types";
+import type { PlotApplicationsList } from "@/plotApplications/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 
 const getMapBounds = () => {
   const {
diff --git a/src/plotApplications/components/map/TargetListLayer.tsx b/src/plotApplications/components/map/TargetListLayer.tsx
index 6787d4ac5..10ccee16f 100644
--- a/src/plotApplications/components/map/TargetListLayer.tsx
+++ b/src/plotApplications/components/map/TargetListLayer.tsx
@@ -3,7 +3,7 @@ import { withRouter } from "react-router";
 import { FeatureGroup, GeoJSON, Popup } from "react-leaflet";
 import flowRight from "lodash/flowRight";
 import { Link } from "react-router-dom";
-import { getRouteById, Routes } from "root/routes";
+import { getRouteById, Routes } from "@/root/routes";
 import type { LeafletGeoJson } from "types";
 type OwnProps = {
   color: string;
diff --git a/src/plotApplications/components/search/Search.tsx b/src/plotApplications/components/search/Search.tsx
index fa5557ec0..bf82cafa6 100644
--- a/src/plotApplications/components/search/Search.tsx
+++ b/src/plotApplications/components/search/Search.tsx
@@ -7,22 +7,22 @@ import debounce from "lodash/debounce";
 import flowRight from "lodash/flowRight";
 import isEqual from "lodash/isEqual";
 import isEmpty from "lodash/isEmpty";
-import { getUrlParams, getFieldOptions } from "util/helpers";
-import { getAttributes as getPlotSearchAttributes, getPlotSearchList } from "plotSearch/selectors";
-import FormField from "components/form/FormField";
-import SearchClearLink from "components/search/SearchClearLink";
-import SearchChangeTypeLink from "components/search/SearchChangeTypeLink";
-import SearchContainer from "components/search/SearchContainer";
-import SearchRow from "components/search/SearchRow";
-import SearchLabelColumn from "components/search/SearchLabelColumn";
-import SearchLabel from "components/search/SearchLabel";
-import SearchInputColumn from "components/search/SearchInputColumn";
-import { FieldTypes, FormNames } from "enums";
-import { PlotSearchFieldPaths } from "plotSearch/enums";
-import type { PlotSearchList } from "plotSearch/types";
+import { getUrlParams, getFieldOptions } from "@/util/helpers";
+import { getAttributes as getPlotSearchAttributes, getPlotSearchList } from "@/plotSearch/selectors";
+import FormField from "@/components/form/FormField";
+import SearchClearLink from "@/components/search/SearchClearLink";
+import SearchChangeTypeLink from "@/components/search/SearchChangeTypeLink";
+import SearchContainer from "@/components/search/SearchContainer";
+import SearchRow from "@/components/search/SearchRow";
+import SearchLabelColumn from "@/components/search/SearchLabelColumn";
+import SearchLabel from "@/components/search/SearchLabel";
+import SearchInputColumn from "@/components/search/SearchInputColumn";
+import { FieldTypes, FormNames } from "@/enums";
+import { PlotSearchFieldPaths } from "@/plotSearch/enums";
+import type { PlotSearchList } from "@/plotSearch/types";
 import type { Attributes } from "types";
-import { fetchPlotSearchSubtypes } from "plotApplications/actions";
-import { getPlotSearchSubTypes } from "plotApplications/selectors";
+import { fetchPlotSearchSubtypes } from "@/plotApplications/actions";
+import { getPlotSearchSubTypes } from "@/plotApplications/selectors";
 type OwnProps = {
   isSearchInitialized: boolean;
   onSearch: (...args: Array<any>) => any;
@@ -116,7 +116,6 @@ class Search extends Component<Props, State> {
     delete searchQuery.zoom;
     const keys = Object.keys(searchQuery);
 
-    // $FlowFixMe[method-unbinding] https://github.com/facebook/flow/issues/8689
     if (!keys.length || keys.length === 1 && Object.prototype.hasOwnProperty.call(searchQuery, 'search')) {
       return true;
     }
diff --git a/src/plotApplications/constants.ts b/src/plotApplications/constants.ts
index 3b0e3252b..d3c26b5ad 100644
--- a/src/plotApplications/constants.ts
+++ b/src/plotApplications/constants.ts
@@ -1,4 +1,4 @@
-import { TableSortOrder } from "enums";
+import { TableSortOrder } from "@/enums";
 
 /**
  * Default plotApplications states value for plotSearch list search
diff --git a/src/plotApplications/helpers.ts b/src/plotApplications/helpers.ts
index 6df73f7ac..2cc7224e0 100644
--- a/src/plotApplications/helpers.ts
+++ b/src/plotApplications/helpers.ts
@@ -1,17 +1,17 @@
 import get from "lodash/get";
 import _ from "lodash";
 import { formValueSelector } from "redux-form";
-import { getApiResponseResults, getFieldAttributes } from "util/helpers";
-import createUrl from "api/createUrl";
-import { store } from "root/startApp";
-import { FormNames } from "enums";
-import { getCurrentEditorTargets } from "plotApplications/selectors";
-import { getTargetTitle, getTargetType, prepareApplicationForSubmission } from "application/helpers";
-import { TargetIdentifierTypes } from "application/enums";
+import { getApiResponseResults, getFieldAttributes } from "@/util/helpers";
+import createUrl from "@/api/createUrl";
+import { store } from "@/index";
+import { FormNames } from "@/enums";
+import { getCurrentEditorTargets } from "@/plotApplications/selectors";
+import { getTargetTitle, getTargetType, prepareApplicationForSubmission } from "@/application/helpers";
+import { TargetIdentifierTypes } from "@/application/enums";
 import type { Attributes, LeafletFeature, LeafletGeoJson } from "types";
-import type { ApplicationFormState } from "plotApplications/types";
-import type { PlotSearch } from "plotSearch/types";
-import type { Form } from "application/types";
+import type { ApplicationFormState } from "@/plotApplications/types";
+import type { PlotSearch } from "@/plotSearch/types";
+import type { Form } from "@/application/types";
 
 /**
  * Get plotApplication list results
diff --git a/src/plotApplications/spec.ts b/src/plotApplications/plotApplications.spec.ts
similarity index 95%
rename from src/plotApplications/spec.ts
rename to src/plotApplications/plotApplications.spec.ts
index 1c561d98a..83194e133 100644
--- a/src/plotApplications/spec.ts
+++ b/src/plotApplications/plotApplications.spec.ts
@@ -1,7 +1,7 @@
-import { expect } from "chai";
-import { fetchPlotApplicationsList, receivePlotApplicationsList, fetchSinglePlotApplication, receiveSinglePlotApplication, hideEditMode, showEditMode, receiveIsSaveClicked, receiveCollapseStates, receiveFormValidFlags, clearFormValidFlags, editPlotApplication } from "plotApplications/actions";
-import plotApplicationReducer from "plotApplications/reducer";
-import type { PlotApplicationsState } from "plotApplications/types";
+import { describe, expect, it } from "vitest";
+import { fetchPlotApplicationsList, receivePlotApplicationsList, fetchSinglePlotApplication, receiveSinglePlotApplication, hideEditMode, showEditMode, receiveIsSaveClicked, receiveCollapseStates, receiveFormValidFlags, clearFormValidFlags, editPlotApplication } from "@/plotApplications/actions";
+import plotApplicationReducer from "@/plotApplications/reducer";
+import type { PlotApplicationsState } from "@/plotApplications/types";
 const baseState: PlotApplicationsState = {
   currentEditorTargets: [],
   form: null,
diff --git a/src/plotApplications/reducer.ts b/src/plotApplications/reducer.ts
index c18045f6e..17dfe167e 100644
--- a/src/plotApplications/reducer.ts
+++ b/src/plotApplications/reducer.ts
@@ -3,9 +3,9 @@ import type { Action } from "redux";
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
 import { sortBy } from "lodash/collection";
-import { FormNames } from "enums";
+import { FormNames } from "@/enums";
 import type { Attributes, Reducer } from "types";
-import type { InfoCheckBatchEditErrors, PlotApplication, PlotApplicationsList, PlotApplicationsState, ReceiveApplicationRelatedFormAction, ReceiveApplicationRelatedPlotSearchAction, ReceiveCollapseStatesAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ReceivePlotApplicationInfoCheckBatchEditFailureAction, ReceivePlotApplicationsByBBoxAction, ReceivePlotApplicationsListAction, ReceivePlotSearchSubtypesAction, ReceiveSinglePlotApplicationAction, ReceiveTargetInfoCheckAttributesAction, ReceiveTargetInfoChecksForPlotSearchAction } from "plotApplications/types";
+import type { InfoCheckBatchEditErrors, PlotApplication, PlotApplicationsList, PlotApplicationsState, ReceiveApplicationRelatedFormAction, ReceiveApplicationRelatedPlotSearchAction, ReceiveCollapseStatesAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ReceivePlotApplicationInfoCheckBatchEditFailureAction, ReceivePlotApplicationsByBBoxAction, ReceivePlotApplicationsListAction, ReceivePlotSearchSubtypesAction, ReceiveSinglePlotApplicationAction, ReceiveTargetInfoCheckAttributesAction, ReceiveTargetInfoChecksForPlotSearchAction } from "@/plotApplications/types";
 const isFetchingReducer: Reducer<boolean> = handleActions({
   ['mvj/plotApplications/FETCH_ALL']: () => true,
   ['mvj/plotApplications/RECEIVE_ALL']: () => false,
diff --git a/src/plotApplications/requests.ts b/src/plotApplications/requests.ts
index 720a03d66..83c130622 100644
--- a/src/plotApplications/requests.ts
+++ b/src/plotApplications/requests.ts
@@ -1,6 +1,6 @@
-import callApi from "api/callApi";
-import createUrl from "api/createUrl";
-import callUploadRequest from "api/callUploadRequest";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
+import callUploadRequest from "@/api/callUploadRequest";
 export const fetchPlotApplications = (params: Record<string, any> | null | undefined): Generator<any, any, any> => {
   return callApi(new Request(createUrl('answer/', params)));
 };
diff --git a/src/plotApplications/saga.ts b/src/plotApplications/saga.ts
index 158162751..320398b11 100644
--- a/src/plotApplications/saga.ts
+++ b/src/plotApplications/saga.ts
@@ -1,16 +1,16 @@
 import { all, call, fork, put, select, takeEvery, takeLatest } from "redux-saga/effects";
 import { SubmissionError } from "redux-form";
 import { push } from "react-router-redux";
-import { displayUIMessage } from "util/helpers";
-import { applicationRelatedFormNotFound, applicationRelatedPlotSearchNotFound, applicationsNotFound, fetchApplicationRelatedForm, fetchApplicationRelatedPlotSearch, fetchSinglePlotApplication, hideEditMode, notFoundByBBox, plotSearchSubtypesNotFound, receiveApplicationRelatedForm, receiveApplicationRelatedPlotSearch, receiveBatchInfoCheckEditFailure, receiveBatchInfoCheckEditSuccess, receiveFileOperationFinished, receivePlotApplicationSaved, receivePlotApplicationSaveFailed, receivePlotApplicationsByBBox, receivePlotApplicationsList, receivePlotSearchSubtypes, receiveSinglePlotApplication, receiveTargetInfoCheckMeetingMemoUploaded, receiveTargetInfoChecksForPlotSearch, showEditMode, singlePlotApplicationNotAllowed, singlePlotApplicationNotFound, targetInfoCheckMeetingMemoDeleteFailed, targetInfoCheckMeetingMemoUploadFailed, targetInfoChecksForPlotSearchNotFound } from "plotApplications/actions";
-import { receiveError } from "api/actions";
-import { createMeetingMemoRequest, createOpeningRecordRequest, deleteMeetingMemoRequest, editApplicantInfoCheckItemRequest, editOpeningRecordRequest, editTargetInfoCheckItemRequest, fetchPlotApplications, fetchPlotSearchSubtypesRequest, fetchSinglePlotApplication as fetchSinglePlotApplicationRequest, fetchTargetInfoChecksForPlotSearchRequest } from "plotApplications/requests";
-import { fetchFormRequest, fetchSinglePlotSearch } from "plotSearch/requests";
-import { getRouteById, Routes } from "root/routes";
-import { getCurrentPlotApplication } from "plotApplications/selectors";
-import { fetchApplicantInfoCheckAttributes, fetchApplicationRelatedAttachments, fetchFormAttributes, receiveUpdatedApplicantInfoCheckItem, receiveUpdatedTargetInfoCheckItem } from "application/actions";
-import { createApplicationRequest, editApplicationRequest } from "application/requests";
-import type { BatchEditPlotApplicationModelsAction, DeleteTargetInfoCheckMeetingMemoAction, InfoCheckBatchEditErrors, PlotApplication, UploadTargetInfoCheckMeetingMemoAction } from "plotApplications/types";
+import { displayUIMessage } from "@/util/helpers";
+import { applicationRelatedFormNotFound, applicationRelatedPlotSearchNotFound, applicationsNotFound, fetchApplicationRelatedForm, fetchApplicationRelatedPlotSearch, fetchSinglePlotApplication, hideEditMode, notFoundByBBox, plotSearchSubtypesNotFound, receiveApplicationRelatedForm, receiveApplicationRelatedPlotSearch, receiveBatchInfoCheckEditFailure, receiveBatchInfoCheckEditSuccess, receiveFileOperationFinished, receivePlotApplicationSaved, receivePlotApplicationSaveFailed, receivePlotApplicationsByBBox, receivePlotApplicationsList, receivePlotSearchSubtypes, receiveSinglePlotApplication, receiveTargetInfoCheckMeetingMemoUploaded, receiveTargetInfoChecksForPlotSearch, showEditMode, singlePlotApplicationNotAllowed, singlePlotApplicationNotFound, targetInfoCheckMeetingMemoDeleteFailed, targetInfoCheckMeetingMemoUploadFailed, targetInfoChecksForPlotSearchNotFound } from "@/plotApplications/actions";
+import { receiveError } from "@/api/actions";
+import { createMeetingMemoRequest, createOpeningRecordRequest, deleteMeetingMemoRequest, editApplicantInfoCheckItemRequest, editOpeningRecordRequest, editTargetInfoCheckItemRequest, fetchPlotApplications, fetchPlotSearchSubtypesRequest, fetchSinglePlotApplication as fetchSinglePlotApplicationRequest, fetchTargetInfoChecksForPlotSearchRequest } from "@/plotApplications/requests";
+import { fetchFormRequest, fetchSinglePlotSearch } from "@/plotSearch/requests";
+import { getRouteById, Routes } from "@/root/routes";
+import { getCurrentPlotApplication } from "@/plotApplications/selectors";
+import { fetchApplicantInfoCheckAttributes, fetchApplicationRelatedAttachments, fetchFormAttributes, receiveUpdatedApplicantInfoCheckItem, receiveUpdatedTargetInfoCheckItem } from "@/application/actions";
+import { createApplicationRequest, editApplicationRequest } from "@/application/requests";
+import type { BatchEditPlotApplicationModelsAction, DeleteTargetInfoCheckMeetingMemoAction, InfoCheckBatchEditErrors, PlotApplication, UploadTargetInfoCheckMeetingMemoAction } from "@/plotApplications/types";
 
 function* fetchPlotApplicationsSaga({
   payload: query,
diff --git a/src/plotApplications/selectors.ts b/src/plotApplications/selectors.ts
index cbac7b073..6132d9166 100644
--- a/src/plotApplications/selectors.ts
+++ b/src/plotApplications/selectors.ts
@@ -1,9 +1,9 @@
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
 import type { Selector } from "types";
-import type { RootState } from "root/types";
-import type { InfoCheckBatchEditErrorsItem, PlotApplication, PlotApplicationsList } from "plotApplications/types";
-import type { PlotSearch } from "plotSearch/types";
+import type { RootState } from "@/root/types";
+import type { InfoCheckBatchEditErrorsItem, PlotApplication, PlotApplicationsList } from "@/plotApplications/types";
+import type { PlotSearch } from "@/plotSearch/types";
 export const getApplicationsByBBox: Selector<PlotApplicationsList, void> = (state: RootState): PlotApplicationsList => state.plotApplications.listByBBox;
 export const getIsFetching: Selector<boolean, void> = (state: RootState): boolean => state.plotApplications.isFetching;
 export const getIsFetchingByBBox: Selector<boolean, void> = (state: RootState): boolean => state.plotApplications.isFetchingByBBox;
diff --git a/src/plotApplications/types.ts b/src/plotApplications/types.ts
index c86aeeb7d..802399844 100644
--- a/src/plotApplications/types.ts
+++ b/src/plotApplications/types.ts
@@ -1,6 +1,6 @@
 import type { Action, Attributes } from "types";
-import type { PlotSearch } from "plotSearch/types";
-import type { ApplicationFormSection } from "application/types";
+import type { PlotSearch } from "@/plotSearch/types";
+import type { ApplicationFormSection } from "@/application/types";
 export type PlotApplicationsState = {
   isFetching: boolean;
   list: PlotApplicationsList;
diff --git a/src/plotSearch/actions.ts b/src/plotSearch/actions.ts
index 547046efe..4d5d82836 100644
--- a/src/plotSearch/actions.ts
+++ b/src/plotSearch/actions.ts
@@ -1,6 +1,6 @@
 import { createAction } from "redux-actions";
 import type { Attributes, Methods } from "types";
-import type { AddPlanUnitDecisionsAction, BatchCreateReservationIdentifiersAction, ClearFormValidFlagsAction, CreatePlotSearchAction, CustomDetailedPlan, CustomDetailedPlanAttributesNotFoundAction, CustomDetailedPlanNotFoundAction, DeletePlotSearchAction, EditFormAction, EditPlotSearchAction, FetchAttributesAction, FetchCustomDetailedPlanAction, FetchCustomDetailedPlanAttributesAction, FetchFormAction, FetchPlanUnitAction, FetchPlanUnitAttributesAction, FetchPlotSearchListAction, FetchPlotSearchStagesAction, FetchPlotSearchSubtypesAction, FetchReservationIdentifierUnitListsAction, FetchSinglePlotSearchAction, FetchSinglePlotSearchAfterEditAction, FetchSinglePlotSearchAfterEditPayload, FetchTemplateFormsAction, FormNotFoundAction, HideEditModeAction, NullPlanUnitsAction, PlanUnit, PlanUnitAttributesNotFoundAction, PlanUnitNotFoundAction, PlotSearch, PlotSearchAttributesNotFoundAction, PlotSearchId, PlotSearchList, PlotSearchNotFoundAction, PlotSearchStagesNotFoundAction, PlotSearchSubtypesNotFoundAction, ReceiveAttributesAction, ReceiveCollapseStatesAction, ReceiveCustomDetailedPlanAttributesAction, ReceiveFormAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ReceiveMethodsAction, ReceivePlanUnitAttributesAction, ReceivePlotSearchListAction, ReceivePlotSearchStagesAction, ReceivePlotSearchSubtypesAction, ReceiveReservationIdentifierUnitListsAction, ReceiveSingleCustomDetailedPlanAction, ReceiveSinglePlanUnitAction, ReceiveSinglePlotSearchAction, ReceiveTemplateFormsAction, RemovePlanUnitDecisionsAction, ReservationIdentifiersCreatedAction, ReservationIdentifiersCreationFailedAction, ReservationIdentifierUnitListsNotFoundAction, CreateDirectReservationLinkAction, DirectReservationLinkCreatedAction, DirectReservationLinkCreationFailedAction, ResetPlanUnitDecisionsAction, ShowEditModeAction, TemplateFormsNotFoundAction, ClearSectionEditorCollapseStatesAction, SetSectionEditorCollapseStateAction, InitializeSectionEditorCollapseStatesAction, ReceivePlotSearchRelatedApplicationsAction, FetchPlotSearchRelatedApplicationsAction, PlotSearchRelatedApplicationsNotFoundAction } from "plotSearch/types";
+import type { AddPlanUnitDecisionsAction, BatchCreateReservationIdentifiersAction, ClearFormValidFlagsAction, CreatePlotSearchAction, CustomDetailedPlan, CustomDetailedPlanAttributesNotFoundAction, CustomDetailedPlanNotFoundAction, DeletePlotSearchAction, EditFormAction, EditPlotSearchAction, FetchAttributesAction, FetchCustomDetailedPlanAction, FetchCustomDetailedPlanAttributesAction, FetchFormAction, FetchPlanUnitAction, FetchPlanUnitAttributesAction, FetchPlotSearchListAction, FetchPlotSearchStagesAction, FetchPlotSearchSubtypesAction, FetchReservationIdentifierUnitListsAction, FetchSinglePlotSearchAction, FetchSinglePlotSearchAfterEditAction, FetchSinglePlotSearchAfterEditPayload, FetchTemplateFormsAction, FormNotFoundAction, HideEditModeAction, NullPlanUnitsAction, PlanUnit, PlanUnitAttributesNotFoundAction, PlanUnitNotFoundAction, PlotSearch, PlotSearchAttributesNotFoundAction, PlotSearchId, PlotSearchList, PlotSearchNotFoundAction, PlotSearchStagesNotFoundAction, PlotSearchSubtypesNotFoundAction, ReceiveAttributesAction, ReceiveCollapseStatesAction, ReceiveCustomDetailedPlanAttributesAction, ReceiveFormAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ReceiveMethodsAction, ReceivePlanUnitAttributesAction, ReceivePlotSearchListAction, ReceivePlotSearchStagesAction, ReceivePlotSearchSubtypesAction, ReceiveReservationIdentifierUnitListsAction, ReceiveSingleCustomDetailedPlanAction, ReceiveSinglePlanUnitAction, ReceiveSinglePlotSearchAction, ReceiveTemplateFormsAction, RemovePlanUnitDecisionsAction, ReservationIdentifiersCreatedAction, ReservationIdentifiersCreationFailedAction, ReservationIdentifierUnitListsNotFoundAction, CreateDirectReservationLinkAction, DirectReservationLinkCreatedAction, DirectReservationLinkCreationFailedAction, ResetPlanUnitDecisionsAction, ShowEditModeAction, TemplateFormsNotFoundAction, ClearSectionEditorCollapseStatesAction, SetSectionEditorCollapseStateAction, InitializeSectionEditorCollapseStatesAction, ReceivePlotSearchRelatedApplicationsAction, FetchPlotSearchRelatedApplicationsAction, PlotSearchRelatedApplicationsNotFoundAction } from "@/plotSearch/types";
 export const fetchAttributes = (): FetchAttributesAction => createAction('mvj/plotSearch/FETCH_ATTRIBUTES')();
 export const receiveMethods = (methods: Methods): ReceiveMethodsAction => createAction('mvj/plotSearch/RECEIVE_METHODS')(methods);
 export const attributesNotFound = (): PlotSearchAttributesNotFoundAction => createAction('mvj/plotSearch/ATTRIBUTES_NOT_FOUND')();
diff --git a/src/plotSearch/components/CreatePlotSearchForm.tsx b/src/plotSearch/components/CreatePlotSearchForm.tsx
index 1968ad92e..f6d7a30eb 100644
--- a/src/plotSearch/components/CreatePlotSearchForm.tsx
+++ b/src/plotSearch/components/CreatePlotSearchForm.tsx
@@ -4,13 +4,13 @@ import { change, formValueSelector, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
 import get from "lodash/get";
-import Button from "components/button/Button";
-import FormField from "components/form/FormField";
-import ModalButtonWrapper from "components/modal/ModalButtonWrapper";
-import { FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import { getAttributes } from "plotSearch/selectors";
-import { PlotSearchFieldTitles } from "plotSearch/enums";
+import Button from "@/components/button/Button";
+import FormField from "@/components/form/FormField";
+import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper";
+import { FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { getAttributes } from "@/plotSearch/selectors";
+import { PlotSearchFieldTitles } from "@/plotSearch/enums";
 import type { Attributes } from "types";
 type OwnProps = {
   onClose: (...args: Array<any>) => any;
diff --git a/src/plotSearch/components/CreatePlotSearchModal.tsx b/src/plotSearch/components/CreatePlotSearchModal.tsx
index 1f0048325..6fd11efa6 100644
--- a/src/plotSearch/components/CreatePlotSearchModal.tsx
+++ b/src/plotSearch/components/CreatePlotSearchModal.tsx
@@ -1,6 +1,6 @@
 import React, { Component } from "react";
-import CreatePlotSearchForm from "plotSearch/components/CreatePlotSearchForm";
-import Modal from "components/modal/Modal";
+import CreatePlotSearchForm from "@/plotSearch/components/CreatePlotSearchForm";
+import Modal from "@/components/modal/Modal";
 type Props = {
   isOpen: boolean;
   onClose: (...args: Array<any>) => any;
@@ -20,7 +20,7 @@ class CreatePlotSearchModal extends Component<Props> {
     this.form = element;
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       isOpen,
       onClose,
diff --git a/src/plotSearch/components/PlotSearchListPage.tsx b/src/plotSearch/components/PlotSearchListPage.tsx
index b79b083eb..15ac69fd4 100644
--- a/src/plotSearch/components/PlotSearchListPage.tsx
+++ b/src/plotSearch/components/PlotSearchListPage.tsx
@@ -5,37 +5,37 @@ import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import { initialize } from "redux-form";
 import { withRouter } from "react-router";
-import Authorization from "components/authorization/Authorization";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import { FormNames, Methods, PermissionMissingTexts } from "enums";
-import ExternalLink from "components/links/ExternalLink";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import IconRadioButtons from "components/button/IconRadioButtons";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import MapIcon from "components/icons/MapIcon";
-import PageContainer from "components/content/PageContainer";
-import Pagination from "components/table/Pagination";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import Search from "plotSearch/components/search/Search";
-import { LIST_TABLE_PAGE_SIZE } from "util/constants";
-import SortableTable from "components/table/SortableTable";
-import TableFilters from "components/table/TableFilters";
-import TableFilterWrapper from "components/table/TableFilterWrapper";
-import TableWrapper from "components/table/TableWrapper";
-import TableIcon from "components/icons/TableIcon";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
-import VisualisationTypeWrapper from "components/table/VisualisationTypeWrapper";
-import { createPlotSearch, fetchPlotSearchList } from "plotSearch/actions";
-import { getIsFetching, getPlotSearchList } from "plotSearch/selectors";
-import { getRouteById, Routes } from "root/routes";
-import { formatDate, getLabelOfOption, setPageTitle, getFieldOptions, getSearchQuery, getApiResponseCount, getApiResponseMaxPage, getUrlParams, isMethodAllowed } from "util/helpers";
-import { DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER, DEFAULT_PLOT_SEARCH_STATES } from "plotSearch/constants";
-import { getContentPlotSearchListResults } from "plotSearch/helpers";
-import type { PlotSearch, PlotSearchList } from "plotSearch/types";
-import CreatePlotSearchModal from "plotSearch/components/CreatePlotSearchModal";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import { withPlotSearchAttributes } from "components/attributes/PlotSearchAttributes";
+import Authorization from "@/components/authorization/Authorization";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import { FormNames, Methods, PermissionMissingTexts } from "@/enums";
+import ExternalLink from "@/components/links/ExternalLink";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import IconRadioButtons from "@/components/button/IconRadioButtons";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import MapIcon from "@/components/icons/MapIcon";
+import PageContainer from "@/components/content/PageContainer";
+import Pagination from "@/components/table/Pagination";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import Search from "@/plotSearch/components/search/Search";
+import { LIST_TABLE_PAGE_SIZE } from "@/util/constants";
+import SortableTable from "@/components/table/SortableTable";
+import TableFilters from "@/components/table/TableFilters";
+import TableFilterWrapper from "@/components/table/TableFilterWrapper";
+import TableWrapper from "@/components/table/TableWrapper";
+import TableIcon from "@/components/icons/TableIcon";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
+import VisualisationTypeWrapper from "@/components/table/VisualisationTypeWrapper";
+import { createPlotSearch, fetchPlotSearchList } from "@/plotSearch/actions";
+import { getIsFetching, getPlotSearchList } from "@/plotSearch/selectors";
+import { getRouteById, Routes } from "@/root/routes";
+import { formatDate, getLabelOfOption, setPageTitle, getFieldOptions, getSearchQuery, getApiResponseCount, getApiResponseMaxPage, getUrlParams, isMethodAllowed } from "@/util/helpers";
+import { DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER, DEFAULT_PLOT_SEARCH_STATES } from "@/plotSearch/constants";
+import { getContentPlotSearchListResults } from "@/plotSearch/helpers";
+import type { PlotSearch, PlotSearchList } from "@/plotSearch/types";
+import CreatePlotSearchModal from "@/plotSearch/components/CreatePlotSearchModal";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import { withPlotSearchAttributes } from "@/components/attributes/PlotSearchAttributes";
 import type { Attributes, Methods as MethodsType } from "types";
 const VisualizationTypes = {
   MAP: 'map',
diff --git a/src/plotSearch/components/PlotSearchPage.tsx b/src/plotSearch/components/PlotSearchPage.tsx
index 9c3627617..31e5a3bbd 100644
--- a/src/plotSearch/components/PlotSearchPage.tsx
+++ b/src/plotSearch/components/PlotSearchPage.tsx
@@ -5,46 +5,46 @@ import { withRouter } from "react-router";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
 import { change, getFormValues, initialize, destroy, isDirty } from "redux-form";
-import { withUiDataList } from "components/uiData/UiDataListHOC";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import Loader from "components/loader/Loader";
-import ContentContainer from "components/content/ContentContainer";
-import ControlButtonBar from "components/controlButtons/ControlButtonBar";
-import ControlButtons from "components/controlButtons/ControlButtons";
-import ConfirmationModal from "components/modal/ConfirmationModal";
-import FullWidthContainer from "components/content/FullWidthContainer";
-import PageContainer from "components/content/PageContainer";
-import PageNavigationWrapper from "components/content/PageNavigationWrapper";
-import TabContent from "components/tabs/TabContent";
-import TabPane from "components/tabs/TabPane";
-import Tabs from "components/tabs/Tabs";
-import { getRouteById, Routes } from "root/routes";
-import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors";
-import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "util/storage";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { getIsEditMode, getCurrentPlotSearch, getIsSaveClicked, getIsFormValidById, getIsFormValidFlags, getIsFetching, getForm, getIsFetchingAnyPlanUnits, getIsFetchingPlanUnitAttributes, areTargetsAllowedToHaveType, isLockedForModifications, isFetchingStages, getIsFetchingSubtypes, getIsFetchingRelatedApplications } from "plotSearch/selectors";
-import { editPlotSearch, hideEditMode, showEditMode, clearFormValidFlags, fetchSinglePlotSearch, receiveIsSaveClicked, receiveSinglePlotSearch, receiveFormValidFlags, deletePlotSearch, fetchPlotSearchRelatedApplications } from "plotSearch/actions";
-import { FormNames, ConfirmationModalTexts, Methods, PermissionMissingTexts } from "enums";
-import { ButtonColors } from "components/enums";
-import { getUrlParams, getSearchQuery, setPageTitle, scrollToTopPage, isMethodAllowed } from "util/helpers";
-import { getContentBasicInformation, getContentApplication, clearUnsavedChanges, cleanTargets, cleanDecisions } from "plotSearch/helpers";
-import PlotSearchInfo from "plotSearch/components/plotSearchSections/plotSearchInfo/PlotSearchInfo";
-import BasicInfo from "plotSearch/components/plotSearchSections/basicInfo/BasicInfo";
-import BasicInfoEdit from "plotSearch/components/plotSearchSections/basicInfo/BasicInfoEdit";
-import Application from "plotSearch/components/plotSearchSections/application/Application";
-import ApplicationEdit from "plotSearch/components/plotSearchSections/application/ApplicationEdit";
-import ApplicationMap from "plotSearch/components/plotSearchSections/map/ApplicationMap";
-import { withPlotSearchAttributes } from "components/attributes/PlotSearchAttributes";
-import { FIELDS_LOCKED_FOR_EDITING } from "plotSearch/constants";
-import PlotSearchExportModal from "plotApplications/components/exportModal/PlotSearchExportModal";
-import ReservationIdentifiersModal from "plotSearch/components/reservationIdentifiers/ReservationIdentifiersModal";
-import DirectReservationLinkModal from "plotSearch/components/directReservationLinkModal/DirectReservationLinkModal";
-import { fetchAttributes as fetchApplicationAttributes } from "application/actions";
-import { getIsFetchingAttributes as getIsFetchingApplicationAttributes } from "application/selectors";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import { withUiDataList } from "@/components/uiData/UiDataListHOC";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import Loader from "@/components/loader/Loader";
+import ContentContainer from "@/components/content/ContentContainer";
+import ControlButtonBar from "@/components/controlButtons/ControlButtonBar";
+import ControlButtons from "@/components/controlButtons/ControlButtons";
+import ConfirmationModal from "@/components/modal/ConfirmationModal";
+import FullWidthContainer from "@/components/content/FullWidthContainer";
+import PageContainer from "@/components/content/PageContainer";
+import PageNavigationWrapper from "@/components/content/PageNavigationWrapper";
+import TabContent from "@/components/tabs/TabContent";
+import TabPane from "@/components/tabs/TabPane";
+import Tabs from "@/components/tabs/Tabs";
+import { getRouteById, Routes } from "@/root/routes";
+import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors";
+import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "@/util/storage";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { getIsEditMode, getCurrentPlotSearch, getIsSaveClicked, getIsFormValidById, getIsFormValidFlags, getIsFetching, getForm, getIsFetchingAnyPlanUnits, getIsFetchingPlanUnitAttributes, areTargetsAllowedToHaveType, isLockedForModifications, isFetchingStages, getIsFetchingSubtypes, getIsFetchingRelatedApplications } from "@/plotSearch/selectors";
+import { editPlotSearch, hideEditMode, showEditMode, clearFormValidFlags, fetchSinglePlotSearch, receiveIsSaveClicked, receiveSinglePlotSearch, receiveFormValidFlags, deletePlotSearch, fetchPlotSearchRelatedApplications } from "@/plotSearch/actions";
+import { FormNames, ConfirmationModalTexts, Methods, PermissionMissingTexts } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { getUrlParams, getSearchQuery, setPageTitle, scrollToTopPage, isMethodAllowed } from "@/util/helpers";
+import { getContentBasicInformation, getContentApplication, clearUnsavedChanges, cleanTargets, cleanDecisions } from "@/plotSearch/helpers";
+import PlotSearchInfo from "@/plotSearch/components/plotSearchSections/plotSearchInfo/PlotSearchInfo";
+import BasicInfo from "@/plotSearch/components/plotSearchSections/basicInfo/BasicInfo";
+import BasicInfoEdit from "@/plotSearch/components/plotSearchSections/basicInfo/BasicInfoEdit";
+import Application from "@/plotSearch/components/plotSearchSections/application/Application";
+import ApplicationEdit from "@/plotSearch/components/plotSearchSections/application/ApplicationEdit";
+import ApplicationMap from "@/plotSearch/components/plotSearchSections/map/ApplicationMap";
+import { withPlotSearchAttributes } from "@/components/attributes/PlotSearchAttributes";
+import { FIELDS_LOCKED_FOR_EDITING } from "@/plotSearch/constants";
+import PlotSearchExportModal from "@/plotApplications/components/exportModal/PlotSearchExportModal";
+import ReservationIdentifiersModal from "@/plotSearch/components/reservationIdentifiers/ReservationIdentifiersModal";
+import DirectReservationLinkModal from "@/plotSearch/components/directReservationLinkModal/DirectReservationLinkModal";
+import { fetchAttributes as fetchApplicationAttributes } from "@/application/actions";
+import { getIsFetchingAttributes as getIsFetchingApplicationAttributes } from "@/application/selectors";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 import type { Attributes, Methods as MethodType } from "types";
-import type { PlotSearch } from "plotSearch/types";
-import type { Form } from "application/types";
+import type { PlotSearch } from "@/plotSearch/types";
+import type { Form } from "@/application/types";
 type OwnProps = {};
 type Props = OwnProps & {
   applicationFormValues: Record<string, any>;
diff --git a/src/plotSearch/components/directReservationLinkModal/DirectReservationLinkModal.tsx b/src/plotSearch/components/directReservationLinkModal/DirectReservationLinkModal.tsx
index 22c1969f1..ec6849cd4 100644
--- a/src/plotSearch/components/directReservationLinkModal/DirectReservationLinkModal.tsx
+++ b/src/plotSearch/components/directReservationLinkModal/DirectReservationLinkModal.tsx
@@ -3,18 +3,18 @@ import { flowRight } from "lodash/util";
 import { connect } from "react-redux";
 import { FieldArray, getFormValues, reduxForm, change, initialize } from "redux-form";
 import { Row, Column } from "react-foundation";
-import Modal from "components/modal/Modal";
-import ModalButtonWrapper from "components/modal/ModalButtonWrapper";
-import Button from "components/button/Button";
-import { ButtonColors } from "components/enums";
-import { FormNames } from "enums";
-import FormField from "components/form/FormField";
-import { FieldTypes } from "enums";
-import FormFieldLabel from "components/form/FormFieldLabel";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import Loader from "components/loader/Loader";
-import { getIsCreatingDirectReservationLink } from "plotSearch/selectors";
-import { createDirectReservationLink } from "plotSearch/actions";
+import Modal from "@/components/modal/Modal";
+import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper";
+import Button from "@/components/button/Button";
+import { ButtonColors } from "@/components/enums";
+import { FormNames } from "@/enums";
+import FormField from "@/components/form/FormField";
+import { FieldTypes } from "@/enums";
+import FormFieldLabel from "@/components/form/FormFieldLabel";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import Loader from "@/components/loader/Loader";
+import { getIsCreatingDirectReservationLink } from "@/plotSearch/selectors";
+import { createDirectReservationLink } from "@/plotSearch/actions";
 type OwnProps = {
   isOpen: boolean;
   onClose: () => void;
@@ -39,7 +39,7 @@ const renderTargets = ({
   targets,
   change,
   formValues
-}: RenderTargetProps): React.ReactNode => <Fragment>
+}: RenderTargetProps): JSX.Element => <Fragment>
   {!!targets && targets.map(target => {
     const targetIdentifier = target.plan_unit && target.plan_unit.identifier || target.custom_detailed_plan && target.custom_detailed_plan.identifier;
     let isChecked = false;
@@ -111,7 +111,7 @@ class DirectReservationLinkModal extends Component<Props> {
     });
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       isOpen,
       onClose,
diff --git a/src/plotSearch/components/plotSearchSections/application/Application.tsx b/src/plotSearch/components/plotSearchSections/application/Application.tsx
index 373720410..daef5f59b 100644
--- a/src/plotSearch/components/plotSearchSections/application/Application.tsx
+++ b/src/plotSearch/components/plotSearchSections/application/Application.tsx
@@ -1,17 +1,17 @@
 import React, { Fragment, PureComponent } from "react";
 import { connect } from "react-redux";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import Loader from "components/loader/Loader";
-import { FormNames, ViewModes } from "enums";
-import Divider from "components/content/Divider";
-import Title from "components/content/Title";
-import { getCollapseStateByKey, getIsFetchingForm, getForm, getIsFetchingTemplateForms } from "plotSearch/selectors";
-import { receiveCollapseStates } from "plotSearch/actions";
-import { ApplicationFieldTitles } from "plotSearch/enums";
-import ApplicationPreviewSection from "plotSearch/components/plotSearchSections/application/ApplicationPreviewSection";
-import FormText from "components/form/FormText";
-import { getIsFetchingFormAttributes } from "application/selectors";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import Loader from "@/components/loader/Loader";
+import { FormNames, ViewModes } from "@/enums";
+import Divider from "@/components/content/Divider";
+import Title from "@/components/content/Title";
+import { getCollapseStateByKey, getIsFetchingForm, getForm, getIsFetchingTemplateForms } from "@/plotSearch/selectors";
+import { receiveCollapseStates } from "@/plotSearch/actions";
+import { ApplicationFieldTitles } from "@/plotSearch/enums";
+import ApplicationPreviewSection from "@/plotSearch/components/plotSearchSections/application/ApplicationPreviewSection";
+import FormText from "@/components/form/FormText";
+import { getIsFetchingFormAttributes } from "@/application/selectors";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type OwnProps = {};
 type Props = OwnProps & {
   usersPermissions: UsersPermissionsType;
diff --git a/src/plotSearch/components/plotSearchSections/application/ApplicationEdit.tsx b/src/plotSearch/components/plotSearchSections/application/ApplicationEdit.tsx
index f4e5d2ed5..49c5fd344 100644
--- a/src/plotSearch/components/plotSearchSections/application/ApplicationEdit.tsx
+++ b/src/plotSearch/components/plotSearchSections/application/ApplicationEdit.tsx
@@ -5,29 +5,29 @@ import { reduxForm, formValues } from "redux-form";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
 import get from "lodash/get";
-import TitleH3 from "components/content/TitleH3";
-import WhiteBox from "components/content/WhiteBox";
-import Collapse from "components/collapse/Collapse";
-import Divider from "components/content/Divider";
-import { getUiDataLeaseKey } from "uiData/helpers";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { ApplicationFieldPaths, ApplicationFieldTitles } from "plotSearch/enums";
-import Title from "components/content/Title";
-import { FormNames, ViewModes } from "enums";
-import FormField from "components/form/FormField";
-import { receiveCollapseStates } from "plotSearch/actions";
-import { getAttributes, getCollapseStateByKey, getIsSaveClicked, getErrorsByFormName, getIsFetchingTemplateForms, getTemplateForms, getCurrentPlotSearch, getForm, isLockedForModifications } from "plotSearch/selectors";
-import EditPlotApplicationSectionModal from "plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionModal";
-import Loader from "components/loader/Loader";
-import ApplicationPreviewSection from "plotSearch/components/plotSearchSections/application/ApplicationPreviewSection";
-import { hasMinimumRequiredFieldsFilled } from "plotSearch/helpers";
-import WarningField from "components/form/WarningField";
-import { getFormAttributes, getIsFetchingFormAttributes } from "application/selectors";
-import { fetchFormAttributes } from "application/actions";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import TitleH3 from "@/components/content/TitleH3";
+import WhiteBox from "@/components/content/WhiteBox";
+import Collapse from "@/components/collapse/Collapse";
+import Divider from "@/components/content/Divider";
+import { getUiDataLeaseKey } from "@/uiData/helpers";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { ApplicationFieldPaths, ApplicationFieldTitles } from "@/plotSearch/enums";
+import Title from "@/components/content/Title";
+import { FormNames, ViewModes } from "@/enums";
+import FormField from "@/components/form/FormField";
+import { receiveCollapseStates } from "@/plotSearch/actions";
+import { getAttributes, getCollapseStateByKey, getIsSaveClicked, getErrorsByFormName, getIsFetchingTemplateForms, getTemplateForms, getCurrentPlotSearch, getForm, isLockedForModifications } from "@/plotSearch/selectors";
+import EditPlotApplicationSectionModal from "@/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionModal";
+import Loader from "@/components/loader/Loader";
+import ApplicationPreviewSection from "@/plotSearch/components/plotSearchSections/application/ApplicationPreviewSection";
+import { hasMinimumRequiredFieldsFilled } from "@/plotSearch/helpers";
+import WarningField from "@/components/form/WarningField";
+import { getFormAttributes, getIsFetchingFormAttributes } from "@/application/selectors";
+import { fetchFormAttributes } from "@/application/actions";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 import type { Attributes } from "types";
-import type { PlotSearch } from "plotSearch/types";
-import type { Form } from "application/types";
+import type { PlotSearch } from "@/plotSearch/types";
+import type { Form } from "@/application/types";
 type OwnProps = {};
 type Props = OwnProps & {
   collapseStateBasic: boolean;
diff --git a/src/plotSearch/components/plotSearchSections/application/ApplicationPreviewSection.tsx b/src/plotSearch/components/plotSearchSections/application/ApplicationPreviewSection.tsx
index 821cf3d49..aad47805d 100644
--- a/src/plotSearch/components/plotSearchSections/application/ApplicationPreviewSection.tsx
+++ b/src/plotSearch/components/plotSearchSections/application/ApplicationPreviewSection.tsx
@@ -5,17 +5,17 @@ import flowRight from "lodash/flowRight";
 import get from "lodash/get";
 import classNames from "classnames";
 import { connect } from "react-redux";
-import { FormNames } from "enums";
-import SubTitle from "components/content/SubTitle";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import FormField from "components/form/FormField";
-import FormHintText from "components/form/FormHintText";
-import AddButtonThird from "components/form/AddButtonThird";
-import Collapse from "components/collapse/Collapse";
-import Button from "components/button/Button";
-import { ButtonColors } from "components/enums";
-import { getFormAttributes } from "application/selectors";
+import { FormNames } from "@/enums";
+import SubTitle from "@/components/content/SubTitle";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import FormField from "@/components/form/FormField";
+import FormHintText from "@/components/form/FormHintText";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import Collapse from "@/components/collapse/Collapse";
+import Button from "@/components/button/Button";
+import { ButtonColors } from "@/components/enums";
+import { getFormAttributes } from "@/application/selectors";
 import type { Attributes } from "types";
 type OwnProps = {
   section: Record<string, any>;
diff --git a/src/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionFieldForm.tsx b/src/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionFieldForm.tsx
index 2cbed5ec6..fbfa90c71 100644
--- a/src/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionFieldForm.tsx
+++ b/src/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionFieldForm.tsx
@@ -3,22 +3,22 @@ import { connect } from "react-redux";
 import { Column, Row } from "react-foundation";
 import get from "lodash/get";
 import { change, FieldArray, formValueSelector } from "redux-form";
-import FormField from "components/form/FormField";
-import InfoIcon from "components/icons/InfoIcon";
-import Tooltip from "components/tooltip/Tooltip";
-import { FieldTypes, FormNames } from "enums";
-import TooltipToggleButton from "components/tooltip/TooltipToggleButton";
-import TooltipWrapper from "components/tooltip/TooltipWrapper";
-import { getFieldTypeMapping, getFormAttributes } from "application/selectors";
-import SubTitle from "components/content/SubTitle";
-import { generateFieldIdentifierFromName } from "plotSearch/helpers";
-import { FIELD_TYPE_FEATURES_BY_FIELD_TYPE_NAME, FieldTypeFeatures, FieldTypeLabels } from "plotSearch/constants";
-import IconButton from "components/button/IconButton";
-import TrashIcon from "components/icons/TrashIcon";
-import AddIcon from "components/icons/AddIcon";
-import EditIcon from "components/icons/EditIcon";
-import MoveUpIcon from "components/icons/MoveUpIcon";
-import MoveDownIcon from "components/icons/MoveDownIcon";
+import FormField from "@/components/form/FormField";
+import InfoIcon from "@/components/icons/InfoIcon";
+import Tooltip from "@/components/tooltip/Tooltip";
+import { FieldTypes, FormNames } from "@/enums";
+import TooltipToggleButton from "@/components/tooltip/TooltipToggleButton";
+import TooltipWrapper from "@/components/tooltip/TooltipWrapper";
+import { getFieldTypeMapping, getFormAttributes } from "@/application/selectors";
+import SubTitle from "@/components/content/SubTitle";
+import { generateFieldIdentifierFromName } from "@/plotSearch/helpers";
+import { FIELD_TYPE_FEATURES_BY_FIELD_TYPE_NAME, FieldTypeFeatures, FieldTypeLabels } from "@/plotSearch/constants";
+import IconButton from "@/components/button/IconButton";
+import TrashIcon from "@/components/icons/TrashIcon";
+import AddIcon from "@/components/icons/AddIcon";
+import EditIcon from "@/components/icons/EditIcon";
+import MoveUpIcon from "@/components/icons/MoveUpIcon";
+import MoveDownIcon from "@/components/icons/MoveDownIcon";
 import type { Attributes } from "types";
 type ChoiceProps = {
   attributes: Attributes;
@@ -40,7 +40,7 @@ const EditPlotApplicationSectionFieldChoice = ({
   onChoiceValuesChanged,
   autoFillValues,
   protectedValues
-}: ChoiceProps): React.ReactNode => {
+}: ChoiceProps): JSX.Element => {
   const choiceRefs = useRef({});
 
   const getDataMapBase = (): Record<string, any> => fields.getAll().reduce((acc, item) => ({ ...acc,
diff --git a/src/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionForm.tsx b/src/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionForm.tsx
index f5f2b098e..b9026049d 100644
--- a/src/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionForm.tsx
+++ b/src/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionForm.tsx
@@ -6,28 +6,28 @@ import flowRight from "lodash/flowRight";
 import get from "lodash/get";
 import classNames from "classnames";
 import { FieldArray } from "redux-form";
-import Button from "components/button/Button";
-import FormField from "components/form/FormField";
-import ModalButtonWrapper from "components/modal/ModalButtonWrapper";
-import { ConfirmationModalTexts, FieldTypes, FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import EditPlotApplicationSectionFieldForm from "plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionFieldForm";
-import Collapse from "components/collapse/Collapse";
-import SubTitle from "components/content/SubTitle";
-import { getFieldTypeMapping, getFormAttributes } from "application/selectors";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import IconButton from "components/button/IconButton";
-import TrashIcon from "components/icons/TrashIcon";
-import MoveUpIcon from "components/icons/MoveUpIcon";
-import MoveDownIcon from "components/icons/MoveDownIcon";
+import Button from "@/components/button/Button";
+import FormField from "@/components/form/FormField";
+import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper";
+import { ConfirmationModalTexts, FieldTypes, FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import EditPlotApplicationSectionFieldForm from "@/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionFieldForm";
+import Collapse from "@/components/collapse/Collapse";
+import SubTitle from "@/components/content/SubTitle";
+import { getFieldTypeMapping, getFormAttributes } from "@/application/selectors";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import IconButton from "@/components/button/IconButton";
+import TrashIcon from "@/components/icons/TrashIcon";
+import MoveUpIcon from "@/components/icons/MoveUpIcon";
+import MoveDownIcon from "@/components/icons/MoveDownIcon";
 import type { Attributes } from "types";
-import type { FormSection } from "application/types";
-import { generateSectionIdentifierFromName, getDefaultNewFormField, getDefaultNewFormSection, getInitialFormSectionEditorData, transformCommittedFormSectionEditorData } from "plotSearch/helpers";
-import { APPLICANT_SECTION_IDENTIFIER } from "application/constants";
-import { getSectionEditorCollapseStates } from "plotSearch/selectors";
-import { clearSectionEditorCollapseStates, initializeSectionEditorCollapseStates, setSectionEditorCollapseState } from "plotSearch/actions";
+import type { FormSection } from "@/application/types";
+import { generateSectionIdentifierFromName, getDefaultNewFormField, getDefaultNewFormSection, getInitialFormSectionEditorData, transformCommittedFormSectionEditorData } from "@/plotSearch/helpers";
+import { APPLICANT_SECTION_IDENTIFIER } from "@/application/constants";
+import { getSectionEditorCollapseStates } from "@/plotSearch/selectors";
+import { clearSectionEditorCollapseStates, initializeSectionEditorCollapseStates, setSectionEditorCollapseState } from "@/plotSearch/actions";
 import { uniq } from "lodash/array";
-import ErrorBlock from "components/form/ErrorBlock";
+import ErrorBlock from "@/components/form/ErrorBlock";
 type SectionFieldProps = {
   disabled: boolean;
   fields: any;
@@ -51,7 +51,7 @@ const EditPlotApplicationSectionFormSectionFields = ({
   setSectionEditorCollapseState,
   meta // usersPermissions,
 
-}: SectionFieldProps): React.ReactNode => {
+}: SectionFieldProps): JSX.Element => {
   const fieldRefs = useRef({});
 
   const handleRemove = (index: number) => {
@@ -131,7 +131,7 @@ const EditPlotApplicationSectionFormSectionSubsections = ({
   collapseStates,
   setSectionEditorCollapseState,
   meta
-}: SectionSubsectionProps): React.ReactNode => {
+}: SectionSubsectionProps): JSX.Element => {
   const handleRemove = (index: number) => {
     dispatch({
       type: ActionTypes.SHOW_CONFIRMATION_MODAL,
@@ -206,7 +206,7 @@ type SubsectionWrapperProps = {
   attributes: Attributes;
   sectionPath: string;
   subsection: FormSection;
-  children: React.ReactNode;
+  children: JSX.Element;
   stagedSectionValues: Record<string, any>;
   peerSectionIdentifiers: Array<string>;
   change: (...args: Array<any>) => any;
@@ -369,6 +369,7 @@ const EditPlotApplicationSectionFormSubsection: React.ComponentType<SubsectionPr
   const fieldIdentifiers = subsection.fields.map(field => field.identifier);
   const Wrapper = level > 1 ? EditPlotApplicationSectionFormSubsectionSecondLevelWrapper : EditPlotApplicationSectionFormSubsectionFirstLevelWrapper;
   return <Wrapper level={level} attributes={attributes} sectionPath={sectionPath} subsection={subsection} stagedSectionValues={stagedSectionValues} peerSectionIdentifiers={peerSectionIdentifiers} change={change} onDelete={onDelete} onMoveUp={onMoveUp} onMoveDown={onMoveDown} isApplicantSecondLevelSubsection={stagedSectionValues.identifier === APPLICANT_SECTION_IDENTIFIER && level === 2} collapseStates={collapseStates} setSectionEditorCollapseState={setSectionEditorCollapseState} sectionRefs={sectionRefs}>
+    <>
     <FieldArray component={EditPlotApplicationSectionFormSectionFields} disabled={false} form={form} name={`${sectionPath}.fields`} fieldIdentifiers={fieldIdentifiers} dispatch={dispatch} collapseStates={collapseStates} setSectionEditorCollapseState={setSectionEditorCollapseState} validate={value => {
       if (value && uniq(value.map(v => v.identifier)).length < value.length) {
         return 'Kahdella kentällä ei saa olla samaa sisäistä tunnusta!';
@@ -379,6 +380,7 @@ const EditPlotApplicationSectionFormSubsection: React.ComponentType<SubsectionPr
         return 'Kahdella osiolla ei saa olla samaa sisäistä tunnusta!';
       }
     }} />
+    </>
   </Wrapper>;
 };
 
diff --git a/src/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionModal.tsx b/src/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionModal.tsx
index ea54b63e2..30c1f8bb7 100644
--- a/src/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionModal.tsx
+++ b/src/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionModal.tsx
@@ -1,6 +1,6 @@
 import React, { Component } from "react";
-import Modal from "components/modal/Modal";
-import EditPlotApplicationSectionForm from "plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionForm";
+import Modal from "@/components/modal/Modal";
+import EditPlotApplicationSectionForm from "@/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionForm";
 type Props = {
   isOpen: boolean;
   onClose: (...args: Array<any>) => any;
@@ -21,7 +21,7 @@ class EditPlotApplicationSectionModal extends Component<Props> {
     this.form = element;
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       isOpen,
       onClose,
diff --git a/src/plotSearch/components/plotSearchSections/basicInfo/BasicInfo.tsx b/src/plotSearch/components/plotSearchSections/basicInfo/BasicInfo.tsx
index 21e9b2a37..084efbd3f 100644
--- a/src/plotSearch/components/plotSearchSections/basicInfo/BasicInfo.tsx
+++ b/src/plotSearch/components/plotSearchSections/basicInfo/BasicInfo.tsx
@@ -1,32 +1,32 @@
 import React, { Fragment, PureComponent } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
-import Authorization from "components/authorization/Authorization";
-import { getUserFullName } from "users/helpers";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { FormNames, ViewModes } from "enums";
-import ExternalLink from "components/links/ExternalLink";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import Collapse from "components/collapse/Collapse";
-import Divider from "components/content/Divider";
-import Title from "components/content/Title";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
-import { getAttributes, getCollapseStateByKey, getCurrentPlotSearch, getPlanUnit, getPlotSearchSubTypes, getRelatedApplications } from "plotSearch/selectors";
-import { receiveCollapseStates } from "plotSearch/actions";
-import { PlotSearchFieldTitles, PlotSearchStageTypes } from "plotSearch/enums";
-import { getContentBasicInformation, formatDecisionName } from "plotSearch/helpers";
-import { getUiDataPlotSearchKey } from "uiData/helpers";
-import { getFieldOptions, getLabelOfOption, formatDate, isFieldAllowedToRead } from "util/helpers";
-import { getHoursAndMinutes } from "util/date";
-import { PlotSearchFieldPaths } from "plotSearch/enums";
+import Authorization from "@/components/authorization/Authorization";
+import { getUserFullName } from "@/users/helpers";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { FormNames, ViewModes } from "@/enums";
+import ExternalLink from "@/components/links/ExternalLink";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import Collapse from "@/components/collapse/Collapse";
+import Divider from "@/components/content/Divider";
+import Title from "@/components/content/Title";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
+import { getAttributes, getCollapseStateByKey, getCurrentPlotSearch, getPlanUnit, getPlotSearchSubTypes, getRelatedApplications } from "@/plotSearch/selectors";
+import { receiveCollapseStates } from "@/plotSearch/actions";
+import { PlotSearchFieldTitles, PlotSearchStageTypes } from "@/plotSearch/enums";
+import { getContentBasicInformation, formatDecisionName } from "@/plotSearch/helpers";
+import { getUiDataPlotSearchKey } from "@/uiData/helpers";
+import { getFieldOptions, getLabelOfOption, formatDate, isFieldAllowedToRead } from "@/util/helpers";
+import { getHoursAndMinutes } from "@/util/date";
+import { PlotSearchFieldPaths } from "@/plotSearch/enums";
 import type { Attributes } from "types";
-import type { PlotSearch } from "plotSearch/types";
-import { fetchPlanUnit, fetchPlanUnitAttributes, fetchCustomDetailedPlanAttributes } from "plotSearch/actions";
-import { getRouteById, Routes } from "root/routes";
-import PlotSearchTargetListing from "plotSearch/components/plotSearchSections/basicInfo/PlotSearchTargetListing";
-import DocumentsButton from "components/form/DocumentsButton";
-import Button from "components/button/Button";
+import type { PlotSearch } from "@/plotSearch/types";
+import { fetchPlanUnit, fetchPlanUnitAttributes, fetchCustomDetailedPlanAttributes } from "@/plotSearch/actions";
+import { getRouteById, Routes } from "@/root/routes";
+import PlotSearchTargetListing from "@/plotSearch/components/plotSearchSections/basicInfo/PlotSearchTargetListing";
+import DocumentsButton from "@/components/form/DocumentsButton";
+import Button from "@/components/button/Button";
 type OwnProps = {
   openExportModal: (...args: Array<any>) => any;
   openReservationIdentifiersModal: (...args: Array<any>) => any;
diff --git a/src/plotSearch/components/plotSearchSections/basicInfo/BasicInfoDecisionEdit.tsx b/src/plotSearch/components/plotSearchSections/basicInfo/BasicInfoDecisionEdit.tsx
index f5020b9fc..ad145d319 100644
--- a/src/plotSearch/components/plotSearchSections/basicInfo/BasicInfoDecisionEdit.tsx
+++ b/src/plotSearch/components/plotSearchSections/basicInfo/BasicInfoDecisionEdit.tsx
@@ -2,14 +2,14 @@ import React from "react";
 import { connect } from "react-redux";
 import { formValueSelector } from "redux-form";
 import { Row, Column } from "react-foundation";
-import Authorization from "components/authorization/Authorization";
-import RemoveButton from "components/form/RemoveButton";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { getAttributes, getIsSaveClicked } from "plotSearch/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import RemoveButton from "@/components/form/RemoveButton";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { getAttributes, getIsSaveClicked } from "@/plotSearch/selectors";
 import type { Attributes } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
-import DecisionSelectInput from "components/form/DecisionSelectInput";
-import { formatDecisionName } from "plotSearch/helpers";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
+import DecisionSelectInput from "@/components/form/DecisionSelectInput";
+import { formatDecisionName } from "@/plotSearch/helpers";
 type OwnProps = {
   disabled: boolean;
   field: any;
diff --git a/src/plotSearch/components/plotSearchSections/basicInfo/BasicInfoEdit.tsx b/src/plotSearch/components/plotSearchSections/basicInfo/BasicInfoEdit.tsx
index 8f1eabd72..21f8c50ec 100644
--- a/src/plotSearch/components/plotSearchSections/basicInfo/BasicInfoEdit.tsx
+++ b/src/plotSearch/components/plotSearchSections/basicInfo/BasicInfoEdit.tsx
@@ -5,38 +5,38 @@ import { formValueSelector, FieldArray, reduxForm, change } from "redux-form";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
 import get from "lodash/get";
-import Authorization from "components/authorization/Authorization";
-import { ConfirmationModalTexts, FieldTypes, FormNames, ViewModes } from "enums";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButtonThird from "components/form/AddButtonThird";
-import ErrorField from "components/form/ErrorField";
-import BasicInfoDecisionEdit from "plotSearch/components/plotSearchSections/basicInfo/BasicInfoDecisionEdit";
-import { ButtonColors } from "components/enums";
-import Collapse from "components/collapse/Collapse";
-import FormTextTitle from "components/form/FormTextTitle";
-import Divider from "components/content/Divider";
-import { getUiDataPlotSearchKey } from "uiData/helpers";
-import { FieldTypes as FieldTypeOptions } from "enums";
-import { isFieldAllowedToRead } from "util/helpers";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { PlotSearchFieldTitles, PlotSearchFieldPaths } from "plotSearch/enums";
-import WhiteBox from "components/content/WhiteBox";
-import SubTitle from "components/content/SubTitle";
-import Title from "components/content/Title";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
-import FormField from "components/form/FormField";
-import { receiveCollapseStates, receiveIsSaveClicked, receiveFormValidFlags, removePlanUnitDecisions, fetchCustomDetailedPlanAttributes, fetchPlanUnitAttributes } from "plotSearch/actions";
-import { getAttributes, getCollapseStateByKey, getIsSaveClicked, getErrorsByFormName, getPlotSearchSubTypes, getDecisionCandidates } from "plotSearch/selectors";
-import { filterSubTypes } from "plotSearch/helpers";
-import PlotSearchSiteEdit from "plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteEdit";
+import Authorization from "@/components/authorization/Authorization";
+import { ConfirmationModalTexts, FieldTypes, FormNames, ViewModes } from "@/enums";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import ErrorField from "@/components/form/ErrorField";
+import BasicInfoDecisionEdit from "@/plotSearch/components/plotSearchSections/basicInfo/BasicInfoDecisionEdit";
+import { ButtonColors } from "@/components/enums";
+import Collapse from "@/components/collapse/Collapse";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import Divider from "@/components/content/Divider";
+import { getUiDataPlotSearchKey } from "@/uiData/helpers";
+import { FieldTypes as FieldTypeOptions } from "@/enums";
+import { isFieldAllowedToRead } from "@/util/helpers";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { PlotSearchFieldTitles, PlotSearchFieldPaths } from "@/plotSearch/enums";
+import WhiteBox from "@/components/content/WhiteBox";
+import SubTitle from "@/components/content/SubTitle";
+import Title from "@/components/content/Title";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
+import FormField from "@/components/form/FormField";
+import { receiveCollapseStates, receiveIsSaveClicked, receiveFormValidFlags, removePlanUnitDecisions, fetchCustomDetailedPlanAttributes, fetchPlanUnitAttributes } from "@/plotSearch/actions";
+import { getAttributes, getCollapseStateByKey, getIsSaveClicked, getErrorsByFormName, getPlotSearchSubTypes, getDecisionCandidates } from "@/plotSearch/selectors";
+import { filterSubTypes } from "@/plotSearch/helpers";
+import PlotSearchSiteEdit from "@/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteEdit";
 import type { Attributes } from "types";
-import { hasMinimumRequiredFieldsFilled } from "plotSearch/helpers";
-import WarningField from "components/form/WarningField";
-import { getCurrentPlotSearch, getCurrentPlotSearchStage, getStages, isLockedForModifications } from "plotSearch/selectors";
-import PlotSearchTargetListing from "plotSearch/components/plotSearchSections/basicInfo/PlotSearchTargetListing";
-import { AUTOMATIC_PLOT_SEARCH_STAGES } from "plotSearch/constants";
-import { PlotSearchStageTypes } from "plotSearch/enums";
-import PlotSearchApplicationsOpeningSection from "plotSearch/components/plotSearchSections/basicInfo/PlotSearchApplicationsOpeningSection";
+import { hasMinimumRequiredFieldsFilled } from "@/plotSearch/helpers";
+import WarningField from "@/components/form/WarningField";
+import { getCurrentPlotSearch, getCurrentPlotSearchStage, getStages, isLockedForModifications } from "@/plotSearch/selectors";
+import PlotSearchTargetListing from "@/plotSearch/components/plotSearchSections/basicInfo/PlotSearchTargetListing";
+import { AUTOMATIC_PLOT_SEARCH_STAGES } from "@/plotSearch/constants";
+import { PlotSearchStageTypes } from "@/plotSearch/enums";
+import PlotSearchApplicationsOpeningSection from "@/plotSearch/components/plotSearchSections/basicInfo/PlotSearchApplicationsOpeningSection";
 type DecisionsProps = {
   attributes: Attributes;
   disabled: boolean;
diff --git a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchApplicationsOpeningSection.tsx b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchApplicationsOpeningSection.tsx
index 0e089b6a6..2e117dbe2 100644
--- a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchApplicationsOpeningSection.tsx
+++ b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchApplicationsOpeningSection.tsx
@@ -1,23 +1,23 @@
 import React, { Component } from "react";
-import { FieldTypes, FormNames } from "enums";
+import { FieldTypes, FormNames } from "@/enums";
 import { formValueSelector, reduxForm } from "redux-form";
 import { connect } from "react-redux";
 import { flowRight } from "lodash/util";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 import { Column, Row } from "react-foundation";
-import FormField from "components/form/FormField";
-import { PlotApplicationOpeningRecordLabels, PlotApplicationOpeningRecordPaths } from "plotApplications/enums";
+import FormField from "@/components/form/FormField";
+import { PlotApplicationOpeningRecordLabels, PlotApplicationOpeningRecordPaths } from "@/plotApplications/enums";
 import { get } from "lodash/object";
-import { getAttributes } from "application/selectors";
+import { getAttributes } from "@/application/selectors";
 import type { Attributes } from "types";
-import Authorization from "components/authorization/Authorization";
-import { formatDate, isFieldAllowedToRead } from "util/helpers";
-import { getCurrentPlotSearch } from "plotSearch/selectors";
-import FormTextTitle from "components/form/FormTextTitle";
-import FormText from "components/form/FormText";
-import type { PlotSearch } from "plotSearch/types";
-import Collapse from "components/collapse/Collapse";
-import { getHoursAndMinutes } from "util/date";
+import Authorization from "@/components/authorization/Authorization";
+import { formatDate, isFieldAllowedToRead } from "@/util/helpers";
+import { getCurrentPlotSearch } from "@/plotSearch/selectors";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import FormText from "@/components/form/FormText";
+import type { PlotSearch } from "@/plotSearch/types";
+import Collapse from "@/components/collapse/Collapse";
+import { getHoursAndMinutes } from "@/util/date";
 type Props = {};
 type InnerProps = Props & {
   enabled: boolean;
diff --git a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchReservationRecipients.tsx b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchReservationRecipients.tsx
index 53a670143..4642cfe2d 100644
--- a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchReservationRecipients.tsx
+++ b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchReservationRecipients.tsx
@@ -1,15 +1,15 @@
 import React, { Fragment } from "react";
 import { Column, Row } from "react-foundation";
-import FormTextTitle from "components/form/FormTextTitle";
-import FormText from "components/form/FormText";
-import { PlotSearchFieldTitles } from "plotSearch/enums";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import FormText from "@/components/form/FormText";
+import { PlotSearchFieldTitles } from "@/plotSearch/enums";
 type Props = {
   reservationRecipients: Array<Record<string, any>>;
 };
 
 const PlotSearchReservationRecipients = ({
   reservationRecipients
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   return <Row>
       <Column small={9} medium={9} large={8}>
         <FormTextTitle>
diff --git a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteCustomDetailedPlan.tsx b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteCustomDetailedPlan.tsx
index 72fcc2302..a929b0df9 100644
--- a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteCustomDetailedPlan.tsx
+++ b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteCustomDetailedPlan.tsx
@@ -2,22 +2,22 @@ import React, { PureComponent, Fragment } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
-import { receiveCollapseStates } from "plotSearch/actions";
-import { FormNames, ViewModes } from "enums";
-import { Routes, getRouteById } from "root/routes";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import Collapse from "components/collapse/Collapse";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import ExternalLink from "components/links/ExternalLink";
-import { createPTPPlanReportUrl } from "util/helpers";
-import { formatDate, getFieldOptions, getLabelOfOption } from "util/helpers";
-import { getAttributes, getCollapseStateByKey, getIsFetchingCustomDetailedPlanAttributes, getRelatedApplications } from "plotSearch/selectors";
+import { receiveCollapseStates } from "@/plotSearch/actions";
+import { FormNames, ViewModes } from "@/enums";
+import { Routes, getRouteById } from "@/root/routes";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import Collapse from "@/components/collapse/Collapse";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import ExternalLink from "@/components/links/ExternalLink";
+import { createPTPPlanReportUrl } from "@/util/helpers";
+import { formatDate, getFieldOptions, getLabelOfOption } from "@/util/helpers";
+import { getAttributes, getCollapseStateByKey, getIsFetchingCustomDetailedPlanAttributes, getRelatedApplications } from "@/plotSearch/selectors";
 import type { Attributes } from "types";
-import { PlotSearchFieldTitles } from "plotSearch/enums";
-import { getInfoLinkLanguageDisplayText } from "plotSearch/helpers";
-import PlotSearchReservationRecipients from "plotSearch/components/plotSearchSections/basicInfo/PlotSearchReservationRecipients";
+import { PlotSearchFieldTitles } from "@/plotSearch/enums";
+import { getInfoLinkLanguageDisplayText } from "@/plotSearch/helpers";
+import PlotSearchReservationRecipients from "@/plotSearch/components/plotSearchSections/basicInfo/PlotSearchReservationRecipients";
 type OwnProps = {
   plotSearchSite: Record<string, any>;
   index: number;
diff --git a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteEdit.tsx b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteEdit.tsx
index f6c630bab..c8204feec 100644
--- a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteEdit.tsx
+++ b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteEdit.tsx
@@ -5,33 +5,33 @@ import { Row, Column } from "react-foundation";
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
 import flowRight from "lodash/flowRight";
-import Loader from "components/loader/Loader";
-import ExternalLink from "components/links/ExternalLink";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import PlanUnitSelectInput from "components/inputs/PlanUnitSelectInput";
-import { ActionTypes, AppConsumer } from "app/AppContext";
-import AddButtonThird from "components/form/AddButtonThird";
-import { ButtonColors } from "components/enums";
-import { ConfirmationModalTexts } from "enums";
-import Collapse from "components/collapse/Collapse";
-import FormField from "components/form/FormField";
-import { FormNames, ViewModes } from "enums";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import WarningContainer from "components/content/WarningContainer";
-import WarningField from "components/form/WarningField";
-import { createPTPPlanReportUrl } from "util/helpers";
-import { receiveCollapseStates, receiveIsSaveClicked, fetchPlanUnit, fetchCustomDetailedPlan } from "plotSearch/actions";
-import { PlotSearchFieldTitles } from "plotSearch/enums";
-import { formatDate, getFieldOptions, getLabelOfOption } from "util/helpers";
-import { areTargetsAllowedToHaveType, getAttributes, getIsSaveClicked, getCollapseStateByKey, getErrorsByFormName, getPlanUnitAttributes, getPlanUnit, getCustomDetailedPlan, getCustomDetailedPlanAttributes, getIsFetchingCustomDetailedPlanAttributes, getIsFetchingCustomDetailedPlan, getIsFetchingPlanUnit, getIsFetchingPlanUnitAttributes, getCurrentPlotSearch } from "plotSearch/selectors";
-import SuggestedEdit from "plotSearch/components/plotSearchSections/basicInfo/SuggestedEdit";
-import RemoveButton from "components/form/RemoveButton";
-import PlotSearchSiteEditCustomDetailedPlan from "plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteEditCustomDetailedPlan";
-import { TargetIdentifierTypes } from "application/enums";
+import Loader from "@/components/loader/Loader";
+import ExternalLink from "@/components/links/ExternalLink";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import PlanUnitSelectInput from "@/components/inputs/PlanUnitSelectInput";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import { ButtonColors } from "@/components/enums";
+import { ConfirmationModalTexts } from "@/enums";
+import Collapse from "@/components/collapse/Collapse";
+import FormField from "@/components/form/FormField";
+import { FormNames, ViewModes } from "@/enums";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import WarningContainer from "@/components/content/WarningContainer";
+import WarningField from "@/components/form/WarningField";
+import { createPTPPlanReportUrl } from "@/util/helpers";
+import { receiveCollapseStates, receiveIsSaveClicked, fetchPlanUnit, fetchCustomDetailedPlan } from "@/plotSearch/actions";
+import { PlotSearchFieldTitles } from "@/plotSearch/enums";
+import { formatDate, getFieldOptions, getLabelOfOption } from "@/util/helpers";
+import { areTargetsAllowedToHaveType, getAttributes, getIsSaveClicked, getCollapseStateByKey, getErrorsByFormName, getPlanUnitAttributes, getPlanUnit, getCustomDetailedPlan, getCustomDetailedPlanAttributes, getIsFetchingCustomDetailedPlanAttributes, getIsFetchingCustomDetailedPlan, getIsFetchingPlanUnit, getIsFetchingPlanUnitAttributes, getCurrentPlotSearch } from "@/plotSearch/selectors";
+import SuggestedEdit from "@/plotSearch/components/plotSearchSections/basicInfo/SuggestedEdit";
+import RemoveButton from "@/components/form/RemoveButton";
+import PlotSearchSiteEditCustomDetailedPlan from "@/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteEditCustomDetailedPlan";
+import { TargetIdentifierTypes } from "@/application/enums";
 import type { Attributes } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type SuggestedProps = {
   attributes: Attributes;
   disabled: boolean;
diff --git a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteEditCustomDetailedPlan.tsx b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteEditCustomDetailedPlan.tsx
index 31e8e6e63..94811d8cc 100644
--- a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteEditCustomDetailedPlan.tsx
+++ b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteEditCustomDetailedPlan.tsx
@@ -2,18 +2,18 @@ import React, { Component } from "react";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
-import Collapse from "components/collapse/Collapse";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import ExternalLink from "components/links/ExternalLink";
-import Loader from "components/loader/Loader";
-import PlanUnitSelectInput from "components/inputs/PlanUnitSelectInput";
-import { createPTPPlanReportUrl } from "util/helpers";
-import { PlotSearchFieldTitles } from "plotSearch/enums";
-import { formatDate, getFieldOptions, getLabelOfOption } from "util/helpers";
-import { getInfoLinkLanguageDisplayText } from "plotSearch/helpers";
+import Collapse from "@/components/collapse/Collapse";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import ExternalLink from "@/components/links/ExternalLink";
+import Loader from "@/components/loader/Loader";
+import PlanUnitSelectInput from "@/components/inputs/PlanUnitSelectInput";
+import { createPTPPlanReportUrl } from "@/util/helpers";
+import { PlotSearchFieldTitles } from "@/plotSearch/enums";
+import { formatDate, getFieldOptions, getLabelOfOption } from "@/util/helpers";
+import { getInfoLinkLanguageDisplayText } from "@/plotSearch/helpers";
 import type { Attributes } from "types";
 type Props = {
   handleNew: (...args: Array<any>) => any;
diff --git a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSitePlanUnit.tsx b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSitePlanUnit.tsx
index 17c2c8830..f2b87e782 100644
--- a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSitePlanUnit.tsx
+++ b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSitePlanUnit.tsx
@@ -2,23 +2,23 @@ import React, { PureComponent, Fragment } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
-import { receiveCollapseStates } from "plotSearch/actions";
-import { FormNames, ViewModes } from "enums";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import Collapse from "components/collapse/Collapse";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import ExternalLink from "components/links/ExternalLink";
-import WarningContainer from "components/content/WarningContainer";
-import WarningField from "components/form/WarningField";
-import { createPTPPlanReportUrl } from "util/helpers";
-import { Routes, getRouteById } from "root/routes";
-import { formatDate, getFieldOptions, getLabelOfOption } from "util/helpers";
-import { getAttributes, getCollapseStateByKey, getIsFetchingPlanUnitAttributes, getRelatedApplications } from "plotSearch/selectors";
+import { receiveCollapseStates } from "@/plotSearch/actions";
+import { FormNames, ViewModes } from "@/enums";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import Collapse from "@/components/collapse/Collapse";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import ExternalLink from "@/components/links/ExternalLink";
+import WarningContainer from "@/components/content/WarningContainer";
+import WarningField from "@/components/form/WarningField";
+import { createPTPPlanReportUrl } from "@/util/helpers";
+import { Routes, getRouteById } from "@/root/routes";
+import { formatDate, getFieldOptions, getLabelOfOption } from "@/util/helpers";
+import { getAttributes, getCollapseStateByKey, getIsFetchingPlanUnitAttributes, getRelatedApplications } from "@/plotSearch/selectors";
 import type { Attributes } from "types";
-import { PlotSearchFieldTitles } from "plotSearch/enums";
-import PlotSearchReservationRecipients from "plotSearch/components/plotSearchSections/basicInfo/PlotSearchReservationRecipients";
+import { PlotSearchFieldTitles } from "@/plotSearch/enums";
+import PlotSearchReservationRecipients from "@/plotSearch/components/plotSearchSections/basicInfo/PlotSearchReservationRecipients";
 type OwnProps = {
   plotSearchSite: Record<string, any>;
   index: number;
diff --git a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchTargetListing.tsx b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchTargetListing.tsx
index 6d88bd926..cb3efc841 100644
--- a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchTargetListing.tsx
+++ b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchTargetListing.tsx
@@ -1,14 +1,14 @@
 import React from "react";
 import { Row } from "react-foundation";
 import { connect } from "react-redux";
-import { getCurrentPlotSearch, getPlanUnitAttributes, getCustomDetailedPlanAttributes } from "plotSearch/selectors";
-import type { PlotSearch } from "plotSearch/types";
-import WhiteBox from "components/content/WhiteBox";
-import SubTitle from "components/content/SubTitle";
-import { PlotSearchTargetType } from "plotSearch/enums";
+import { getCurrentPlotSearch, getPlanUnitAttributes, getCustomDetailedPlanAttributes } from "@/plotSearch/selectors";
+import type { PlotSearch } from "@/plotSearch/types";
+import WhiteBox from "@/components/content/WhiteBox";
+import SubTitle from "@/components/content/SubTitle";
+import { PlotSearchTargetType } from "@/plotSearch/enums";
 import type { Attributes } from "types";
-import PlotSearchSitePlanUnit from "plotSearch/components/plotSearchSections/basicInfo/PlotSearchSitePlanUnit";
-import PlotSearchSiteCustomDetailedPlan from "plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteCustomDetailedPlan";
+import PlotSearchSitePlanUnit from "@/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSitePlanUnit";
+import PlotSearchSiteCustomDetailedPlan from "@/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteCustomDetailedPlan";
 type OwnProps = {};
 type Props = {
   plotSearch: PlotSearch;
diff --git a/src/plotSearch/components/plotSearchSections/basicInfo/SuggestedEdit.tsx b/src/plotSearch/components/plotSearchSections/basicInfo/SuggestedEdit.tsx
index 8bc3d2353..00e669743 100644
--- a/src/plotSearch/components/plotSearchSections/basicInfo/SuggestedEdit.tsx
+++ b/src/plotSearch/components/plotSearchSections/basicInfo/SuggestedEdit.tsx
@@ -3,14 +3,14 @@ import { connect } from "react-redux";
 import { formValueSelector } from "redux-form";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
-import Authorization from "components/authorization/Authorization";
-import FormField from "components/form/FormField";
-import RemoveButton from "components/form/RemoveButton";
-import { getFieldOptions } from "util/helpers";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { getAttributes, getIsSaveClicked } from "plotSearch/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import FormField from "@/components/form/FormField";
+import RemoveButton from "@/components/form/RemoveButton";
+import { getFieldOptions } from "@/util/helpers";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { getAttributes, getIsSaveClicked } from "@/plotSearch/selectors";
 import type { Attributes } from "types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type OwnProps = {
   disabled: boolean;
   field: any;
diff --git a/src/plotSearch/components/plotSearchSections/map/ApplicationMap.tsx b/src/plotSearch/components/plotSearchSections/map/ApplicationMap.tsx
index 027be1e0e..141bfbe58 100644
--- a/src/plotSearch/components/plotSearchSections/map/ApplicationMap.tsx
+++ b/src/plotSearch/components/plotSearchSections/map/ApplicationMap.tsx
@@ -2,15 +2,15 @@ import React, { Component } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import AreaNotesEditMap from "areaNote/components/AreaNotesEditMap";
-import AreaNotesLayer from "areaNote/components/AreaNotesLayer";
-import { fetchAreaNoteList } from "areaNote/actions";
-import { UsersPermissions } from "usersPermissions/enums";
-import { hasPermissions } from "util/helpers";
-import { getAreaNoteList } from "areaNote/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import type { AreaNoteList } from "areaNote/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import AreaNotesEditMap from "@/areaNote/components/AreaNotesEditMap";
+import AreaNotesLayer from "@/areaNote/components/AreaNotesLayer";
+import { fetchAreaNoteList } from "@/areaNote/actions";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { hasPermissions } from "@/util/helpers";
+import { getAreaNoteList } from "@/areaNote/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import type { AreaNoteList } from "@/areaNote/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type OwnProps = {};
 type Props = OwnProps & {
   areaNotes: AreaNoteList;
diff --git a/src/plotSearch/components/plotSearchSections/plotSearchInfo/PlotSearchInfo.tsx b/src/plotSearch/components/plotSearchSections/plotSearchInfo/PlotSearchInfo.tsx
index 2b20f183b..d9fae6ac5 100644
--- a/src/plotSearch/components/plotSearchSections/plotSearchInfo/PlotSearchInfo.tsx
+++ b/src/plotSearch/components/plotSearchSections/plotSearchInfo/PlotSearchInfo.tsx
@@ -6,7 +6,7 @@ type Props = {
 
 const PlotSearchInfo = ({
   title
-}: Props): React.ReactNode => {
+}: Props): JSX.Element => {
   return <div className='lease-info'>
       <Row>
         <Column>
diff --git a/src/plotSearch/components/reservationIdentifiers/ReservationIdentifiersModal.tsx b/src/plotSearch/components/reservationIdentifiers/ReservationIdentifiersModal.tsx
index 0e772b786..bdc7f10ab 100644
--- a/src/plotSearch/components/reservationIdentifiers/ReservationIdentifiersModal.tsx
+++ b/src/plotSearch/components/reservationIdentifiers/ReservationIdentifiersModal.tsx
@@ -4,25 +4,25 @@ import { connect } from "react-redux";
 import { flowRight } from "lodash/util";
 import classNames from "classnames";
 import { padStart } from "lodash/string";
-import Modal from "components/modal/Modal";
-import ModalButtonWrapper from "components/modal/ModalButtonWrapper";
-import Button from "components/button/Button";
-import { ButtonColors } from "components/enums";
-import SortableTable from "components/table/SortableTable";
-import { getCurrentPlotSearch, getIsBatchCreatingReservationIdentifiers, getLastBatchReservationCreationError, getReservationIdentifierUnitLists } from "plotSearch/selectors";
-import type { PlotSearch } from "plotSearch/types";
-import EditButton from "components/form/EditButton";
-import CreateLeaseForm from "leases/components/createLease/CreateLeaseForm";
-import { FieldTypes, FormNames } from "enums";
-import { fetchAttributes as fetchLeaseAttributes } from "leases/actions";
-import { getAttributes as getLeaseAttributes } from "leases/selectors";
-import { LeaseFieldPaths, LeaseState } from "leases/enums";
-import SubTitle from "components/content/SubTitle";
-import { batchCreateReservationIdentifiers, fetchReservationIdentifierUnitLists, fetchSinglePlotSearch } from "plotSearch/actions";
-import FormField from "components/form/FormField";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import ErrorBlock from "components/form/ErrorBlock";
+import Modal from "@/components/modal/Modal";
+import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper";
+import Button from "@/components/button/Button";
+import { ButtonColors } from "@/components/enums";
+import SortableTable from "@/components/table/SortableTable";
+import { getCurrentPlotSearch, getIsBatchCreatingReservationIdentifiers, getLastBatchReservationCreationError, getReservationIdentifierUnitLists } from "@/plotSearch/selectors";
+import type { PlotSearch } from "@/plotSearch/types";
+import EditButton from "@/components/form/EditButton";
+import CreateLeaseForm from "@/leases/components/createLease/CreateLeaseForm";
+import { FieldTypes, FormNames } from "@/enums";
+import { fetchAttributes as fetchLeaseAttributes } from "@/leases/actions";
+import { getAttributes as getLeaseAttributes } from "@/leases/selectors";
+import { LeaseFieldPaths, LeaseState } from "@/leases/enums";
+import SubTitle from "@/components/content/SubTitle";
+import { batchCreateReservationIdentifiers, fetchReservationIdentifierUnitLists, fetchSinglePlotSearch } from "@/plotSearch/actions";
+import FormField from "@/components/form/FormField";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import ErrorBlock from "@/components/form/ErrorBlock";
 type OwnProps = {
   isOpen: boolean;
   onClose: () => void;
@@ -189,7 +189,7 @@ class ReservationIdentifiersModal extends Component<Props, State> {
     return `${type?.identifier || '??'}${municipality?.identifier || '?'}${padStart(district?.identifier || '??', 2, '0')}`;
   };
 
-  render(): React.ReactNode {
+  render(): JSX.Element {
     const {
       isOpen,
       onClose,
diff --git a/src/plotSearch/components/search/Search.tsx b/src/plotSearch/components/search/Search.tsx
index 5f0c5d5b3..8a402f6df 100644
--- a/src/plotSearch/components/search/Search.tsx
+++ b/src/plotSearch/components/search/Search.tsx
@@ -8,18 +8,18 @@ import flowRight from "lodash/flowRight";
 import isEqual from "lodash/isEqual";
 import isEmpty from "lodash/isEmpty";
 import type { ContextRouter } from "react-router";
-import { getFieldOptions, getUrlParams } from "util/helpers";
-import { getAttributes, getPlotSearchSubTypes } from "plotSearch/selectors";
-import FormField from "components/form/FormField";
-import SearchChangeTypeLink from "components/search/SearchChangeTypeLink";
-import SearchClearLink from "components/search/SearchClearLink";
-import SearchContainer from "components/search/SearchContainer";
-import SearchInputColumn from "components/search/SearchInputColumn";
-import SearchLabel from "components/search/SearchLabel";
-import SearchLabelColumn from "components/search/SearchLabelColumn";
-import SearchRow from "components/search/SearchRow";
-import { FieldTypes, FormNames } from "enums";
-import { PlotSearchFieldPaths } from "plotSearch/enums";
+import { getFieldOptions, getUrlParams } from "@/util/helpers";
+import { getAttributes, getPlotSearchSubTypes } from "@/plotSearch/selectors";
+import FormField from "@/components/form/FormField";
+import SearchChangeTypeLink from "@/components/search/SearchChangeTypeLink";
+import SearchClearLink from "@/components/search/SearchClearLink";
+import SearchContainer from "@/components/search/SearchContainer";
+import SearchInputColumn from "@/components/search/SearchInputColumn";
+import SearchLabel from "@/components/search/SearchLabel";
+import SearchLabelColumn from "@/components/search/SearchLabelColumn";
+import SearchRow from "@/components/search/SearchRow";
+import { FieldTypes, FormNames } from "@/enums";
+import { PlotSearchFieldPaths } from "@/plotSearch/enums";
 import type { Attributes } from "types";
 type OwnProps = {
   handleSubmit: (...args: Array<any>) => any;
diff --git a/src/plotSearch/constants.ts b/src/plotSearch/constants.ts
index b4b47b5b8..87701fa41 100644
--- a/src/plotSearch/constants.ts
+++ b/src/plotSearch/constants.ts
@@ -1,6 +1,6 @@
-import { TableSortOrder } from "enums";
-import { PlotSearchStageTypes } from "plotSearch/enums";
-import type { ProtectedFormPathsSections } from "plotSearch/types";
+import { TableSortOrder } from "@/enums";
+import { PlotSearchStageTypes } from "@/plotSearch/enums";
+import type { ProtectedFormPathsSections } from "@/plotSearch/types";
 
 /**
  * Default plotSearch states value for plotSearch list search
diff --git a/src/plotSearch/helpers.ts b/src/plotSearch/helpers.ts
index 48d4e7395..62730481e 100644
--- a/src/plotSearch/helpers.ts
+++ b/src/plotSearch/helpers.ts
@@ -3,15 +3,15 @@ import isEmpty from "lodash/isEmpty";
 import { kebabCase } from "lodash/string";
 import { cloneDeep } from "lodash/lang";
 import { formValueSelector } from "redux-form";
-import { getContentUser } from "users/helpers";
-import { removeSessionStorageItem } from "util/storage";
-import { FormNames } from "enums";
-import { formatDate, getApiResponseResults } from "util/helpers";
-import { PlotSearchTargetType } from "plotSearch/enums";
-import { FIELD_TYPE_FEATURES_BY_FIELD_TYPE_NAME, FieldTypeFeatures, PROTECTED_FORM_PATHS } from "plotSearch/constants";
-import type { PlotSearch, PlotSearchState, ProtectedFormPathsSectionNode } from "plotSearch/types";
+import { getContentUser } from "@/users/helpers";
+import { removeSessionStorageItem } from "@/util/storage";
+import { FormNames } from "@/enums";
+import { formatDate, getApiResponseResults } from "@/util/helpers";
+import { PlotSearchTargetType } from "@/plotSearch/enums";
+import { FIELD_TYPE_FEATURES_BY_FIELD_TYPE_NAME, FieldTypeFeatures, PROTECTED_FORM_PATHS } from "@/plotSearch/constants";
+import type { PlotSearch, PlotSearchState, ProtectedFormPathsSectionNode } from "@/plotSearch/types";
 import type { Attributes } from "types";
-import type { Form, FormField, FormSection } from "application/types";
+import type { Form, FormField, FormSection } from "@/application/types";
 
 /**
  * Get plotSearch basic information content
diff --git a/src/plotSearch/spec.ts b/src/plotSearch/plotSearch.spec.ts
similarity index 97%
rename from src/plotSearch/spec.ts
rename to src/plotSearch/plotSearch.spec.ts
index d8b1b9313..b05e8b850 100644
--- a/src/plotSearch/spec.ts
+++ b/src/plotSearch/plotSearch.spec.ts
@@ -1,11 +1,11 @@
-import { expect } from "chai";
-import { attributesNotFound, fetchAttributes, receiveAttributes, fetchPlotSearchList, receivePlotSearchList, fetchSinglePlotSearch, receiveSinglePlotSearch, editPlotSearch, createPlotSearch, notFound, hideEditMode, showEditMode, receiveCollapseStates, receiveIsSaveClicked, receiveFormValidFlags, clearFormValidFlags, receiveMethods, deletePlotSearch, fetchSinglePlotSearchAfterEdit, planUnitNotFound, fetchPlanUnit, receiveSinglePlanUnit, fetchPlanUnitAttributes, planUnitAttributesNotFound, receivePlanUnitAttributes, fetchPlotSearchSubtypes, plotSearchSubtypesNotFound, receivePlotSearchSubtype, nullPlanUnits, receiveForm, formNotFound, receiveTemplateForms, fetchForm, removePlanUnitDecisions, addPlanUnitDecisions, resetPlanUnitDecisions } from "plotSearch/actions";
-import mockData from "plotSearch/mock-data.json";
-import mockAttributes from "plotSearch/attributes-mock-data.json";
-import plotSearchReducer from "plotSearch/reducer";
-import type { PlotSearchState } from "plotSearch/types";
-import { isLockedForModifications } from "plotSearch/selectors";
-import { getTestRootState } from "util/testUtil";
+import { describe, expect, it } from "vitest";
+import { attributesNotFound, fetchAttributes, receiveAttributes, fetchPlotSearchList, receivePlotSearchList, fetchSinglePlotSearch, receiveSinglePlotSearch, editPlotSearch, createPlotSearch, notFound, hideEditMode, showEditMode, receiveCollapseStates, receiveIsSaveClicked, receiveFormValidFlags, clearFormValidFlags, receiveMethods, deletePlotSearch, fetchSinglePlotSearchAfterEdit, planUnitNotFound, fetchPlanUnit, receiveSinglePlanUnit, fetchPlanUnitAttributes, planUnitAttributesNotFound, receivePlanUnitAttributes, fetchPlotSearchSubtypes, plotSearchSubtypesNotFound, receivePlotSearchSubtype, nullPlanUnits, receiveForm, formNotFound, receiveTemplateForms, fetchForm, removePlanUnitDecisions, addPlanUnitDecisions, resetPlanUnitDecisions } from "@/plotSearch/actions";
+import mockData from "@/plotSearch/mock-data.json";
+import mockAttributes from "@/plotSearch/attributes-mock-data.json";
+import plotSearchReducer from "@/plotSearch/reducer";
+import type { PlotSearchState } from "@/plotSearch/types";
+import { isLockedForModifications } from "@/plotSearch/selectors";
+import { getTestRootState } from "@/util/testUtil";
 const mockForm = mockData[0].form;
 const baseState: PlotSearchState = {
   attributes: null,
diff --git a/src/plotSearch/reducer.ts b/src/plotSearch/reducer.ts
index 464a71099..873ba1823 100644
--- a/src/plotSearch/reducer.ts
+++ b/src/plotSearch/reducer.ts
@@ -1,9 +1,9 @@
 import merge from "lodash/merge";
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
-import { FormNames } from "enums";
-import { annotatePlanUnitDecision } from "plotSearch/helpers";
-import type { AddPlanUnitDecisionsAction, CustomDetailedPlan, PlanUnit, PlotSearch, PlotSearchList, PlotSearchState, ReceiveAttributesAction, ReceiveCollapseStatesAction, ReceiveFormAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ReceiveMethodsAction, ReceivePlotSearchListAction, ReceivePlotSearchStagesAction, ReceivePlotSearchSubtypesAction, ReceiveSingleCustomDetailedPlanAction, ReceiveSinglePlotSearchAction, ReceiveTemplateFormsAction, RemovePlanUnitDecisionsAction } from "plotSearch/types";
+import { FormNames } from "@/enums";
+import { annotatePlanUnitDecision } from "@/plotSearch/helpers";
+import type { AddPlanUnitDecisionsAction, CustomDetailedPlan, PlanUnit, PlotSearch, PlotSearchList, PlotSearchState, ReceiveAttributesAction, ReceiveCollapseStatesAction, ReceiveFormAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ReceiveMethodsAction, ReceivePlotSearchListAction, ReceivePlotSearchStagesAction, ReceivePlotSearchSubtypesAction, ReceiveSingleCustomDetailedPlanAction, ReceiveSinglePlotSearchAction, ReceiveTemplateFormsAction, RemovePlanUnitDecisionsAction } from "@/plotSearch/types";
 import type { Attributes, Methods, Reducer } from "types";
 const attributesReducer: Reducer<Attributes> = handleActions({
   ['mvj/plotSearch/RECEIVE_ATTRIBUTES']: (state: Attributes, {
diff --git a/src/plotSearch/requests.ts b/src/plotSearch/requests.ts
index 6bc58a1f6..97f8387a6 100644
--- a/src/plotSearch/requests.ts
+++ b/src/plotSearch/requests.ts
@@ -1,6 +1,6 @@
-import callApi from "api/callApi";
-import createUrl from "api/createUrl";
-import type { PlotSearch } from "plotSearch/types";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
+import type { PlotSearch } from "@/plotSearch/types";
 export const fetchAttributes = (): Generator<any, any, any> => {
   return callApi(new Request(createUrl('plot_search/'), {
     method: 'OPTIONS'
diff --git a/src/plotSearch/requestsAsync.ts b/src/plotSearch/requestsAsync.ts
index 63c8d9126..c021c3906 100644
--- a/src/plotSearch/requestsAsync.ts
+++ b/src/plotSearch/requestsAsync.ts
@@ -1,5 +1,5 @@
-import createUrl from "api/createUrl";
-import callApiAsync from "api/callApiAsync";
+import createUrl from "@/api/createUrl";
+import callApiAsync from "@/api/callApiAsync";
 export const fetchPlanUnitListWithIdentifiersList = async (query?: Record<string, any>): Promise<Array<Record<string, any>>> => {
   const {
     response: {
diff --git a/src/plotSearch/saga.ts b/src/plotSearch/saga.ts
index 4a4a0c143..920209377 100644
--- a/src/plotSearch/saga.ts
+++ b/src/plotSearch/saga.ts
@@ -1,15 +1,15 @@
 import { all, fork, put, takeLatest, call, takeEvery, take } from "redux-saga/effects";
 import { push } from "react-router-redux";
 import { SubmissionError } from "redux-form";
-import { displayUIMessage, getSearchQuery, getUrlParams } from "util/helpers";
-import { hideEditMode, receiveAttributes, receivePlotSearchList, receiveSinglePlotSearch, receiveMethods, attributesNotFound, notFound, receiveIsSaveClicked, fetchSinglePlotSearchAfterEdit, receivePlanUnitAttributes, planUnitAttributesNotFound, receiveSinglePlanUnit, planUnitNotFound, customDetailedPlanAttributesNotFound, customDetailedPlanNotFound, receiveCustomDetailedPlanAttributes, receiveSingleCustomDetailedPlan, receivePlotSearchSubtype, plotSearchSubtypesNotFound, nullPlanUnits, receiveForm, formNotFound, fetchTemplateForms, receiveTemplateForms, templateFormsNotFound, addPlanUnitDecisions, resetPlanUnitDecisions, editForm, receiveStages, stagesNotFound, fetchStages, reservationIdentifiersCreated, reservationIdentifiersCreationFailed, reservationIdentifierUnitListsNotFound, receiveReservationIdentifierUnitLists, directReservationLinkCreated, directReservationLinkCreationFailed, receivePlotSearchRelatedApplications, plotSearchRelatedApplicationsNotFound, fetchPlotSearchRelatedApplications } from "plotSearch/actions";
-import { receiveError } from "api/actions";
-import { getRouteById, Routes } from "root/routes";
-import { fetchAttributes, createPlotSearch, fetchPlotSearches, fetchSinglePlotSearch, editPlotSearch as editPlotSearchRequest, deletePlotSearch, fetchPlanUnitAttributes, fetchPlanUnit, fetchCustomDetailedPlanAttributes, fetchCustomDetailedPlan, fetchPlotSearchSubtypesRequest, fetchFormRequest, fetchTemplateFormsRequest, editFormRequest, fetchStagesRequest, editTargetPlotSearchRelationRequest, fetchAllMunicipalitiesRequest, fetchAllDistrictsRequest, createDirectReservationLinkRequest, fetchPlotSearchApplicationsRequest, createPlotSearchApplicationsOpeningRecords } from "plotSearch/requests";
-import { createLease } from "leases/requests";
-import { RelationTypes } from "leases/enums";
-import { fetchLeaseTypes } from "leaseType/requests";
-import { fetchFormAttributes } from "application/actions";
+import { displayUIMessage, getSearchQuery, getUrlParams } from "@/util/helpers";
+import { hideEditMode, receiveAttributes, receivePlotSearchList, receiveSinglePlotSearch, receiveMethods, attributesNotFound, notFound, receiveIsSaveClicked, fetchSinglePlotSearchAfterEdit, receivePlanUnitAttributes, planUnitAttributesNotFound, receiveSinglePlanUnit, planUnitNotFound, customDetailedPlanAttributesNotFound, customDetailedPlanNotFound, receiveCustomDetailedPlanAttributes, receiveSingleCustomDetailedPlan, receivePlotSearchSubtype, plotSearchSubtypesNotFound, nullPlanUnits, receiveForm, formNotFound, fetchTemplateForms, receiveTemplateForms, templateFormsNotFound, addPlanUnitDecisions, resetPlanUnitDecisions, editForm, receiveStages, stagesNotFound, fetchStages, reservationIdentifiersCreated, reservationIdentifiersCreationFailed, reservationIdentifierUnitListsNotFound, receiveReservationIdentifierUnitLists, directReservationLinkCreated, directReservationLinkCreationFailed, receivePlotSearchRelatedApplications, plotSearchRelatedApplicationsNotFound, fetchPlotSearchRelatedApplications } from "@/plotSearch/actions";
+import { receiveError } from "@/api/actions";
+import { getRouteById, Routes } from "@/root/routes";
+import { fetchAttributes, createPlotSearch, fetchPlotSearches, fetchSinglePlotSearch, editPlotSearch as editPlotSearchRequest, deletePlotSearch, fetchPlanUnitAttributes, fetchPlanUnit, fetchCustomDetailedPlanAttributes, fetchCustomDetailedPlan, fetchPlotSearchSubtypesRequest, fetchFormRequest, fetchTemplateFormsRequest, editFormRequest, fetchStagesRequest, editTargetPlotSearchRelationRequest, fetchAllMunicipalitiesRequest, fetchAllDistrictsRequest, createDirectReservationLinkRequest, fetchPlotSearchApplicationsRequest, createPlotSearchApplicationsOpeningRecords } from "@/plotSearch/requests";
+import { createLease } from "@/leases/requests";
+import { RelationTypes } from "@/leases/enums";
+import { fetchLeaseTypes } from "@/leaseType/requests";
+import { fetchFormAttributes } from "@/application/actions";
 
 function* fetchAttributesSaga(): Generator<any, any, any> {
   try {
diff --git a/src/plotSearch/selectors.ts b/src/plotSearch/selectors.ts
index b7cf46bef..8eb274729 100644
--- a/src/plotSearch/selectors.ts
+++ b/src/plotSearch/selectors.ts
@@ -1,11 +1,11 @@
 import get from "lodash/get";
 import isEmpty from "lodash/isEmpty";
 import type { Attributes, Methods, Selector } from "types";
-import type { RootState } from "root/types";
-import type { CustomDetailedPlan, PlanUnit, PlotSearch, PlotSearchList } from "plotSearch/types";
+import type { RootState } from "@/root/types";
+import type { CustomDetailedPlan, PlanUnit, PlotSearch, PlotSearchList } from "@/plotSearch/types";
 import { formValueSelector } from "redux-form";
-import { FormNames } from "enums";
-import { PlotSearchStageTypes } from "plotSearch/enums";
+import { FormNames } from "@/enums";
+import { PlotSearchStageTypes } from "@/plotSearch/enums";
 export const getAttributes: Selector<Attributes, void> = (state: RootState): Attributes => state.plotSearch.attributes;
 export const getIsEditMode: Selector<boolean, void> = (state: RootState): boolean => state.plotSearch.isEditMode;
 export const getCollapseStateByKey: Selector<Record<string, any> | null | undefined, string> = (state: RootState, key: string): Record<string, any> | null | undefined => {
diff --git a/src/previewInvoices/spec.ts b/src/previewInvoices/previewInvoices.spec.ts
similarity index 97%
rename from src/previewInvoices/spec.ts
rename to src/previewInvoices/previewInvoices.spec.ts
index ba1e7dc05..569e168ef 100644
--- a/src/previewInvoices/spec.ts
+++ b/src/previewInvoices/previewInvoices.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchPreviewInvoices, receivePreviewInvoices, clearPreviewInvoices, notFound } from "./actions";
 import previewInvoicesReducer from "./reducer";
 import type { PreviewInvoicesState } from "./types";
diff --git a/src/previewInvoices/reducer.ts b/src/previewInvoices/reducer.ts
index 7f16c95f4..1c3c46d75 100644
--- a/src/previewInvoices/reducer.ts
+++ b/src/previewInvoices/reducer.ts
@@ -1,7 +1,7 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
-import type { Reducer } from "../types";
-import type { PreviewInvoices, ReceivePreviewInvoicesAction } from "previewInvoices/types";
+import type { Reducer } from "@/types";
+import type { PreviewInvoices, ReceivePreviewInvoicesAction } from "@/previewInvoices/types";
 const isFetchingReducer: Reducer<boolean> = handleActions({
   'mvj/previewInvoices/FETCH_ALL': () => true,
   'mvj/previewInvoices/NOT_FOUND': () => false,
diff --git a/src/previewInvoices/requests.ts b/src/previewInvoices/requests.ts
index 480af6716..23a97e2ff 100644
--- a/src/previewInvoices/requests.ts
+++ b/src/previewInvoices/requests.ts
@@ -1,6 +1,6 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
-import { getSearchQuery } from "util/helpers";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
+import { getSearchQuery } from "@/util/helpers";
 import type { FetchPreviewInvoicesPayload } from "./types";
 export const fetchPreviewInvoices = ({
   lease,
diff --git a/src/previewInvoices/saga.ts b/src/previewInvoices/saga.ts
index b860bd866..78e80b5f2 100644
--- a/src/previewInvoices/saga.ts
+++ b/src/previewInvoices/saga.ts
@@ -1,6 +1,6 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { notFound, receivePreviewInvoices } from "./actions";
-import { receiveError } from "api/actions";
+import { receiveError } from "@/api/actions";
 import { fetchPreviewInvoices } from "./requests";
 
 function* fetchPreviewInvoicesSaga({
diff --git a/src/previewInvoices/selectors.ts b/src/previewInvoices/selectors.ts
index 561e5d6ee..db7a1afb2 100644
--- a/src/previewInvoices/selectors.ts
+++ b/src/previewInvoices/selectors.ts
@@ -1,5 +1,5 @@
 import type { Selector } from "types";
 import type { PreviewInvoices } from "./types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 export const getIsFetching: Selector<boolean, void> = (state: RootState): boolean => state.previewInvoices.isFetching;
 export const getPreviewInvoices: Selector<PreviewInvoices, void> = (state: RootState): PreviewInvoices => state.previewInvoices.list;
\ No newline at end of file
diff --git a/src/previewInvoices/types.ts b/src/previewInvoices/types.ts
index c951c02e5..f24d0bb8e 100644
--- a/src/previewInvoices/types.ts
+++ b/src/previewInvoices/types.ts
@@ -1,5 +1,5 @@
 import type { Action } from "types";
-import type { LeaseId } from "leases/types";
+import type { LeaseId } from "@/leases/types";
 export type PreviewInvoicesState = {
   isFetching: boolean;
   list: PreviewInvoices;
diff --git a/src/relatedLease/requests.ts b/src/relatedLease/requests.ts
index 4fa082958..79f086928 100644
--- a/src/relatedLease/requests.ts
+++ b/src/relatedLease/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 import type { CreateRelatedLeasePayload, CreateRelatedPlotApplicationPayload } from "./types";
 export const createRelatedLease = (payload: CreateRelatedLeasePayload): Generator<any, any, any> => {
   const body = JSON.stringify(payload);
diff --git a/src/relatedLease/saga.ts b/src/relatedLease/saga.ts
index e80c51d85..e73d88164 100644
--- a/src/relatedLease/saga.ts
+++ b/src/relatedLease/saga.ts
@@ -1,8 +1,8 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { SubmissionError } from "redux-form";
-import { receiveError } from "api/actions";
-import { fetchSingleLeaseAfterEdit } from "leases/actions";
-import { displayUIMessage } from "util/helpers";
+import { receiveError } from "@/api/actions";
+import { fetchSingleLeaseAfterEdit } from "@/leases/actions";
+import { displayUIMessage } from "@/util/helpers";
 import { createRelatedLease, createRelatedPlotApplication, deleteReleatedLease, deleteRelatedPlotApplication } from "./requests";
 
 function* createReleatedLeaseSaga({
diff --git a/src/relatedLease/types.ts b/src/relatedLease/types.ts
index 50511f4e4..f5621488c 100644
--- a/src/relatedLease/types.ts
+++ b/src/relatedLease/types.ts
@@ -1,5 +1,5 @@
 import type { Action } from "types";
-import type { LeaseId } from "leases/types";
+import type { LeaseId } from "@/leases/types";
 export type CreateRelatedLeasePayload = {
   from_lease: LeaseId;
   to_lease: LeaseId;
diff --git a/src/rentForPeriod/reducer.ts b/src/rentForPeriod/reducer.ts
index b5774fd1f..d4e8509c9 100644
--- a/src/rentForPeriod/reducer.ts
+++ b/src/rentForPeriod/reducer.ts
@@ -1,7 +1,7 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
 import isArray from "lodash/isArray";
-import type { Reducer } from "../types";
+import type { Reducer } from "@/types";
 import type { RentForPeriod, ReceiveRentForPeriodByLeaseAction, DeleteRentForPeriodByLeaseAction, ReceiveIsSaveClickedAction } from "./types";
 const isFetchingReducer: Reducer<boolean> = handleActions({
   'mvj/rentforperiod/FETCH_ALL': () => true,
diff --git a/src/rentForPeriod/spec.ts b/src/rentForPeriod/rentForPeriod.spec.ts
similarity index 98%
rename from src/rentForPeriod/spec.ts
rename to src/rentForPeriod/rentForPeriod.spec.ts
index 9ddf5c27c..56da0a94f 100644
--- a/src/rentForPeriod/spec.ts
+++ b/src/rentForPeriod/rentForPeriod.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { receiveRentForPeriodByLease, deleteRentForPeriodByLease, fetchRentForPeriodByLease, receiveIsSaveClicked, notFound } from "./actions";
 import rentForPeriodReducer from "./reducer";
 import type { RentForPeriodState } from "./types";
diff --git a/src/rentForPeriod/requests.ts b/src/rentForPeriod/requests.ts
index 803afd7a5..841c84de3 100644
--- a/src/rentForPeriod/requests.ts
+++ b/src/rentForPeriod/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 import type { FetchRentForPeriodPayload } from "./types";
 export const fetchRentForPeriod = (payload: FetchRentForPeriodPayload): Generator<any, any, any> => {
   return callApi(new Request(createUrl(`lease_rent_for_period/?lease=${payload.leaseId}&start_date=${payload.startDate}&end_date=${payload.endDate}`)));
diff --git a/src/rentForPeriod/saga.ts b/src/rentForPeriod/saga.ts
index 10fe7c64c..c060d7e70 100644
--- a/src/rentForPeriod/saga.ts
+++ b/src/rentForPeriod/saga.ts
@@ -1,7 +1,7 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { notFound, receiveIsSaveClicked, receiveRentForPeriodByLease } from "./actions";
 import { fetchRentForPeriod } from "./requests";
-import { receiveError } from "../api/actions";
+import { receiveError } from "@/api/actions";
 
 function* fetchRentForPeriodSaga({
   payload,
diff --git a/src/rentForPeriod/selectors.ts b/src/rentForPeriod/selectors.ts
index db413f35d..fa049b2fb 100644
--- a/src/rentForPeriod/selectors.ts
+++ b/src/rentForPeriod/selectors.ts
@@ -1,7 +1,7 @@
 import type { Selector } from "types";
-import type { RootState } from "../root/types";
+import type { RootState } from "@/root/types";
 import type { RentForPeriod } from "./types";
-import type { LeaseId } from "leases/types";
+import type { LeaseId } from "@/leases/types";
 export const getIsFetching: Selector<boolean, void> = (state: RootState): boolean => state.rentForPeriod.isFetching;
 export const getRentForPeriodArrayByLease: Selector<RentForPeriod, LeaseId> = (state: RootState, leaseId: LeaseId): RentForPeriod => {
   return state.rentForPeriod.byLease[leaseId];
diff --git a/src/rentForPeriod/types.ts b/src/rentForPeriod/types.ts
index cd82e5a88..144fcf8be 100644
--- a/src/rentForPeriod/types.ts
+++ b/src/rentForPeriod/types.ts
@@ -1,5 +1,5 @@
 import type { Action } from "types";
-import type { LeaseId } from "leases/types";
+import type { LeaseId } from "@/leases/types";
 export type RentForPeriodId = number;
 export type RentForPeriodState = {
   byLease: Record<string, any>;
diff --git a/src/rentbasis/components/NewRentBasisPage.tsx b/src/rentbasis/components/NewRentBasisPage.tsx
index f13e53e2a..ecebb0321 100644
--- a/src/rentbasis/components/NewRentBasisPage.tsx
+++ b/src/rentbasis/components/NewRentBasisPage.tsx
@@ -3,28 +3,28 @@ import { withRouter } from "react-router";
 import { connect } from "react-redux";
 import { getFormValues, isDirty } from "redux-form";
 import flowRight from "lodash/flowRight";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import ContentContainer from "components/content/ContentContainer";
-import ControlButtonBar from "components/controlButtons/ControlButtonBar";
-import ControlButtons from "components/controlButtons/ControlButtons";
-import FullWidthContainer from "components/content/FullWidthContainer";
-import GreenBox from "components/content/GreenBox";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import PageContainer from "components/content/PageContainer";
-import PageNavigationWrapper from "components/content/PageNavigationWrapper";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import ContentContainer from "@/components/content/ContentContainer";
+import ControlButtonBar from "@/components/controlButtons/ControlButtonBar";
+import ControlButtons from "@/components/controlButtons/ControlButtons";
+import FullWidthContainer from "@/components/content/FullWidthContainer";
+import GreenBox from "@/components/content/GreenBox";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import PageContainer from "@/components/content/PageContainer";
+import PageNavigationWrapper from "@/components/content/PageNavigationWrapper";
 import RentBasisForm from "./forms/RentBasisForm";
-import { createRentBasis, hideEditMode, receiveIsSaveClicked, showEditMode } from "rentbasis/actions";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { FormNames, Methods, PermissionMissingTexts } from "enums";
-import { getPayloadRentBasis } from "rentbasis/helpers";
-import { isMethodAllowed, setPageTitle } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getIsFormValid, getIsSaveClicked, getIsSaving } from "rentbasis/selectors";
-import { withRentBasisAttributes } from "components/attributes/RentBasisAttributes";
-import { withUiDataList } from "components/uiData/UiDataListHOC";
+import { createRentBasis, hideEditMode, receiveIsSaveClicked, showEditMode } from "@/rentbasis/actions";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { FormNames, Methods, PermissionMissingTexts } from "@/enums";
+import { getPayloadRentBasis } from "@/rentbasis/helpers";
+import { isMethodAllowed, setPageTitle } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getIsFormValid, getIsSaveClicked, getIsSaving } from "@/rentbasis/selectors";
+import { withRentBasisAttributes } from "@/components/attributes/RentBasisAttributes";
+import { withUiDataList } from "@/components/uiData/UiDataListHOC";
 import type { Methods as MethodsType } from "types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 type Props = {
   createRentBasis: (...args: Array<any>) => any;
   editedRentBasis: Record<string, any>;
diff --git a/src/rentbasis/components/RentBasisInfo.tsx b/src/rentbasis/components/RentBasisInfo.tsx
index 71537da7f..9572dcbb0 100644
--- a/src/rentbasis/components/RentBasisInfo.tsx
+++ b/src/rentbasis/components/RentBasisInfo.tsx
@@ -1,10 +1,10 @@
 import React from "react";
 import { connect } from "react-redux";
-import Authorization from "components/authorization/Authorization";
-import FormTextTitle from "components/form/FormTextTitle";
-import { RentBasisFieldPaths, RentBasisFieldTitles } from "rentbasis/enums";
-import { isFieldAllowedToRead } from "util/helpers";
-import { getAttributes as getRentBasisAttributes } from "rentbasis/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import { RentBasisFieldPaths, RentBasisFieldTitles } from "@/rentbasis/enums";
+import { isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes as getRentBasisAttributes } from "@/rentbasis/selectors";
 import type { Attributes } from "types";
 type Props = {
   identifier: string | null | undefined;
diff --git a/src/rentbasis/components/RentBasisListPage.tsx b/src/rentbasis/components/RentBasisListPage.tsx
index 5af75a28c..737e00350 100644
--- a/src/rentbasis/components/RentBasisListPage.tsx
+++ b/src/rentbasis/components/RentBasisListPage.tsx
@@ -5,30 +5,30 @@ import { Row, Column } from "react-foundation";
 import { withRouter } from "react-router";
 import flowRight from "lodash/flowRight";
 import get from "lodash/get";
-import AddButtonSecondary from "components/form/AddButtonSecondary";
-import Authorization from "components/authorization/Authorization";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import PageContainer from "components/content/PageContainer";
-import Pagination from "components/table/Pagination";
+import AddButtonSecondary from "@/components/form/AddButtonSecondary";
+import Authorization from "@/components/authorization/Authorization";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import PageContainer from "@/components/content/PageContainer";
+import Pagination from "@/components/table/Pagination";
 import Search from "./search/Search";
-import SortableTable from "components/table/SortableTable";
-import TableFilters from "components/table/TableFilters";
-import TableWrapper from "components/table/TableWrapper";
-import { fetchRentBasisList, initializeRentBasis } from "rentbasis/actions";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { LIST_TABLE_PAGE_SIZE } from "util/constants";
-import { DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER } from "rentbasis/constants";
-import { FormNames, Methods, PermissionMissingTexts } from "enums";
-import { RentBasisFieldPaths, RentBasisPropertyIdentifiersFieldPaths, RentBasisRentRatesFieldPaths } from "rentbasis/enums";
-import { mapRentBasisSearchFilters } from "rentbasis/helpers";
-import { formatDate, getApiResponseCount, getApiResponseMaxPage, getApiResponseResults, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, setPageTitle } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getIsFetching, getRentBasisList } from "rentbasis/selectors";
-import { withRentBasisAttributes } from "components/attributes/RentBasisAttributes";
+import SortableTable from "@/components/table/SortableTable";
+import TableFilters from "@/components/table/TableFilters";
+import TableWrapper from "@/components/table/TableWrapper";
+import { fetchRentBasisList, initializeRentBasis } from "@/rentbasis/actions";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { LIST_TABLE_PAGE_SIZE } from "@/util/constants";
+import { DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER } from "@/rentbasis/constants";
+import { FormNames, Methods, PermissionMissingTexts } from "@/enums";
+import { RentBasisFieldPaths, RentBasisPropertyIdentifiersFieldPaths, RentBasisRentRatesFieldPaths } from "@/rentbasis/enums";
+import { mapRentBasisSearchFilters } from "@/rentbasis/helpers";
+import { formatDate, getApiResponseCount, getApiResponseMaxPage, getApiResponseResults, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, setPageTitle } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getIsFetching, getRentBasisList } from "@/rentbasis/selectors";
+import { withRentBasisAttributes } from "@/components/attributes/RentBasisAttributes";
 import type { Attributes, Methods as MethodsType } from "types";
-import type { RentBasisList } from "rentbasis/types";
+import type { RentBasisList } from "@/rentbasis/types";
 type Props = {
   fetchRentBasisList: (...args: Array<any>) => any;
   history: Record<string, any>;
diff --git a/src/rentbasis/components/RentBasisPage.tsx b/src/rentbasis/components/RentBasisPage.tsx
index 1af7bc89a..589ee2bdb 100644
--- a/src/rentbasis/components/RentBasisPage.tsx
+++ b/src/rentbasis/components/RentBasisPage.tsx
@@ -5,44 +5,44 @@ import { withRouter } from "react-router";
 import { change, getFormValues, isDirty } from "redux-form";
 import isEmpty from "lodash/isEmpty";
 import flowRight from "lodash/flowRight";
-import Authorization from "components/authorization/Authorization";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import ConfirmationModal from "components/modal/ConfirmationModal";
-import ContentContainer from "components/content/ContentContainer";
-import ControlButtonBar from "components/controlButtons/ControlButtonBar";
-import ControlButtons from "components/controlButtons/ControlButtons";
-import Divider from "components/content/Divider";
-import FullWidthContainer from "components/content/FullWidthContainer";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import PageContainer from "components/content/PageContainer";
-import PageNavigationWrapper from "components/content/PageNavigationWrapper";
+import Authorization from "@/components/authorization/Authorization";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import ConfirmationModal from "@/components/modal/ConfirmationModal";
+import ContentContainer from "@/components/content/ContentContainer";
+import ControlButtonBar from "@/components/controlButtons/ControlButtonBar";
+import ControlButtons from "@/components/controlButtons/ControlButtons";
+import Divider from "@/components/content/Divider";
+import FullWidthContainer from "@/components/content/FullWidthContainer";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import PageContainer from "@/components/content/PageContainer";
+import PageNavigationWrapper from "@/components/content/PageNavigationWrapper";
 import RentBasisEdit from "./sections/basicInfo/RentBasisEdit";
 import RentBasisInfo from "./RentBasisInfo";
 import RentBasisReadonly from "./sections/basicInfo/RentBasisReadonly";
 import SingleRentBasisMap from "./sections/map/SingleRentBasisMap";
-import Tabs from "components/tabs/Tabs";
-import TabContent from "components/tabs/TabContent";
-import TabPane from "components/tabs/TabPane";
-import Title from "components/content/Title";
-import { editRentBasis, fetchSingleRentBasis, hideEditMode, initializeRentBasis, receiveIsSaveClicked, showEditMode } from "rentbasis/actions";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { ConfirmationModalTexts, Methods, PermissionMissingTexts } from "enums";
-import { getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, scrollToTopPage, setPageTitle } from "util/helpers";
-import { FormNames } from "enums";
-import { RentBasisFieldPaths, RentBasisFieldTitles } from "rentbasis/enums";
-import { clearUnsavedChanges, getPayloadRentBasis, getCopyOfRentBasis, getContentRentBasis } from "rentbasis/helpers";
-import { getUiDataRentBasisKey } from "uiData/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getIsEditMode, getIsFetching, getIsFormValid, getIsSaveClicked, getIsSaving, getRentBasis } from "rentbasis/selectors";
-import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors";
-import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "util/storage";
-import { withRentBasisAttributes } from "components/attributes/RentBasisAttributes";
-import { withUiDataList } from "components/uiData/UiDataListHOC";
+import Tabs from "@/components/tabs/Tabs";
+import TabContent from "@/components/tabs/TabContent";
+import TabPane from "@/components/tabs/TabPane";
+import Title from "@/components/content/Title";
+import { editRentBasis, fetchSingleRentBasis, hideEditMode, initializeRentBasis, receiveIsSaveClicked, showEditMode } from "@/rentbasis/actions";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { ConfirmationModalTexts, Methods, PermissionMissingTexts } from "@/enums";
+import { getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, scrollToTopPage, setPageTitle } from "@/util/helpers";
+import { FormNames } from "@/enums";
+import { RentBasisFieldPaths, RentBasisFieldTitles } from "@/rentbasis/enums";
+import { clearUnsavedChanges, getPayloadRentBasis, getCopyOfRentBasis, getContentRentBasis } from "@/rentbasis/helpers";
+import { getUiDataRentBasisKey } from "@/uiData/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getIsEditMode, getIsFetching, getIsFormValid, getIsSaveClicked, getIsSaving, getRentBasis } from "@/rentbasis/selectors";
+import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors";
+import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "@/util/storage";
+import { withRentBasisAttributes } from "@/components/attributes/RentBasisAttributes";
+import { withUiDataList } from "@/components/uiData/UiDataListHOC";
 import type { Attributes, Methods as MethodsType } from "types";
-import type { RentBasis } from "rentbasis/types";
-import type { RootState } from "root/types";
-import type { UsersPermissions } from "usersPermissions/types";
+import type { RentBasis } from "@/rentbasis/types";
+import type { RootState } from "@/root/types";
+import type { UsersPermissions } from "@/usersPermissions/types";
 type Props = {
   change: (...args: Array<any>) => any;
   editedRentBasis: Record<string, any>;
@@ -411,12 +411,14 @@ class RentBasisPage extends Component<Props, State> {
             <TabPane>
               <ContentContainer>
                 <Authorization allow={isFieldAllowedToRead(rentBasisAttributes, RentBasisFieldPaths.GEOMETRY)} errorComponent={<AuthorizationError text={PermissionMissingTexts.GENERAL} />}>
+                  <>
                   <Title enableUiDataEdit={isEditMode} uiDataKey={getUiDataRentBasisKey(RentBasisFieldPaths.MAP)}>
                     {RentBasisFieldTitles.MAP}
                   </Title>
                   <Divider />
 
                   <SingleRentBasisMap />
+                  </>
                 </Authorization>
               </ContentContainer>
             </TabPane>
diff --git a/src/rentbasis/components/forms/RentBasisForm.tsx b/src/rentbasis/components/forms/RentBasisForm.tsx
index 23c568388..d160bbf7e 100644
--- a/src/rentbasis/components/forms/RentBasisForm.tsx
+++ b/src/rentbasis/components/forms/RentBasisForm.tsx
@@ -2,30 +2,30 @@ import React, { Fragment, PureComponent, ReactNode } from "react";
 import { connect } from "react-redux";
 import { FieldArray, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
-import { ActionTypes, AppConsumer } from "app/AppContext";
+import { ActionTypes, AppConsumer } from "@/app/AppContext";
 import flowRight from "lodash/flowRight";
-import AddButtonThird from "components/form/AddButtonThird";
-import Authorization from "components/authorization/Authorization";
-import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper";
-import FormField from "components/form/FormField";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import RemoveButton from "components/form/RemoveButton";
-import SubTitle from "components/content/SubTitle";
-import { receiveFormValid } from "rentbasis/actions";
-import { ConfirmationModalTexts, FieldTypes, FormNames } from "enums";
-import { ButtonColors } from "components/enums";
-import { RentBasisFieldPaths, RentBasisFieldTitles, RentBasisDecisionsFieldPaths, RentBasisDecisionsFieldTitles, RentBasisPropertyIdentifiersFieldPaths, RentBasisPropertyIdentifiersFieldTitles, RentBasisRentRatesFieldPaths, RentBasisRentRatesFieldTitles } from "rentbasis/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getUiDataRentBasisKey } from "uiData/helpers";
-import { getFieldAttributes, getFieldOptions, hasPermissions, isEmptyValue, isFieldAllowedToRead, isFieldRequired } from "util/helpers";
-import { validateRentBasisForm } from "rentbasis/formValidators";
-import { getAttributes as getRentBasisAttributes, getIsFormValid, getIsSaveClicked, getRentBasisInitialValues } from "rentbasis/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
-import { referenceNumber } from "components/form/validations";
+import AddButtonThird from "@/components/form/AddButtonThird";
+import Authorization from "@/components/authorization/Authorization";
+import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper";
+import FormField from "@/components/form/FormField";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import RemoveButton from "@/components/form/RemoveButton";
+import SubTitle from "@/components/content/SubTitle";
+import { receiveFormValid } from "@/rentbasis/actions";
+import { ConfirmationModalTexts, FieldTypes, FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
+import { RentBasisFieldPaths, RentBasisFieldTitles, RentBasisDecisionsFieldPaths, RentBasisDecisionsFieldTitles, RentBasisPropertyIdentifiersFieldPaths, RentBasisPropertyIdentifiersFieldTitles, RentBasisRentRatesFieldPaths, RentBasisRentRatesFieldTitles } from "@/rentbasis/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getUiDataRentBasisKey } from "@/uiData/helpers";
+import { getFieldAttributes, getFieldOptions, hasPermissions, isEmptyValue, isFieldAllowedToRead, isFieldRequired } from "@/util/helpers";
+import { validateRentBasisForm } from "@/rentbasis/formValidators";
+import { getAttributes as getRentBasisAttributes, getIsFormValid, getIsSaveClicked, getRentBasisInitialValues } from "@/rentbasis/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
+import { referenceNumber } from "@/components/form/validations";
 import type { Attributes } from "types";
-import type { RootState } from "root/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { RootState } from "@/root/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type PropertyIdentifiersProps = {
   fields: any;
   isSaveClicked: boolean;
diff --git a/src/rentbasis/components/search/Search.tsx b/src/rentbasis/components/search/Search.tsx
index c70d37022..e3e879737 100644
--- a/src/rentbasis/components/search/Search.tsx
+++ b/src/rentbasis/components/search/Search.tsx
@@ -7,18 +7,18 @@ import flowRight from "lodash/flowRight";
 import debounce from "lodash/debounce";
 import isEmpty from "lodash/isEmpty";
 import isEqual from "lodash/isEqual";
-import FormField from "components/form/FormField";
-import SearchChangeTypeLink from "components/search/SearchChangeTypeLink";
-import SearchClearLink from "components/search/SearchClearLink";
-import SearchContainer from "components/search/SearchContainer";
-import SearchInputColumn from "components/search/SearchInputColumn";
-import SearchLabel from "components/search/SearchLabel";
-import SearchLabelColumn from "components/search/SearchLabelColumn";
-import SearchRow from "components/search/SearchRow";
-import { FieldTypes, FormNames } from "enums";
-import { RentBasisDecisionsFieldPaths } from "rentbasis/enums";
-import { getFieldOptions, getUrlParams } from "util/helpers";
-import { getAttributes as getRentBasisAttributes } from "rentbasis/selectors";
+import FormField from "@/components/form/FormField";
+import SearchChangeTypeLink from "@/components/search/SearchChangeTypeLink";
+import SearchClearLink from "@/components/search/SearchClearLink";
+import SearchContainer from "@/components/search/SearchContainer";
+import SearchInputColumn from "@/components/search/SearchInputColumn";
+import SearchLabel from "@/components/search/SearchLabel";
+import SearchLabelColumn from "@/components/search/SearchLabelColumn";
+import SearchRow from "@/components/search/SearchRow";
+import { FieldTypes, FormNames } from "@/enums";
+import { RentBasisDecisionsFieldPaths } from "@/rentbasis/enums";
+import { getFieldOptions, getUrlParams } from "@/util/helpers";
+import { getAttributes as getRentBasisAttributes } from "@/rentbasis/selectors";
 import type { Attributes } from "types";
 type Props = {
   formValues: Record<string, any>;
diff --git a/src/rentbasis/components/sections/basicInfo/RentBasisEdit.tsx b/src/rentbasis/components/sections/basicInfo/RentBasisEdit.tsx
index 855ee8301..4c5edd6cd 100644
--- a/src/rentbasis/components/sections/basicInfo/RentBasisEdit.tsx
+++ b/src/rentbasis/components/sections/basicInfo/RentBasisEdit.tsx
@@ -1,6 +1,6 @@
 import React from "react";
-import GreenBox from "components/content/GreenBox";
-import RentBasisForm from "rentbasis/components/forms/RentBasisForm";
+import GreenBox from "@/components/content/GreenBox";
+import RentBasisForm from "@/rentbasis/components/forms/RentBasisForm";
 
 const RentBasisEdit = () => <GreenBox className='no-margin'>
     <RentBasisForm />
diff --git a/src/rentbasis/components/sections/basicInfo/RentBasisReadonly.tsx b/src/rentbasis/components/sections/basicInfo/RentBasisReadonly.tsx
index 0e83120ab..aee64041e 100644
--- a/src/rentbasis/components/sections/basicInfo/RentBasisReadonly.tsx
+++ b/src/rentbasis/components/sections/basicInfo/RentBasisReadonly.tsx
@@ -2,20 +2,20 @@ import React from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
-import Authorization from "components/authorization/Authorization";
-import ExternalLink from "components/links/ExternalLink";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import GreenBox from "components/content/GreenBox";
-import ListItem from "components/content/ListItem";
-import ListItems from "components/content/ListItems";
-import SubTitle from "components/content/SubTitle";
-import { RentBasisFieldPaths, RentBasisFieldTitles, RentBasisDecisionsFieldPaths, RentBasisDecisionsFieldTitles, RentBasisPropertyIdentifiersFieldPaths, RentBasisPropertyIdentifiersFieldTitles, RentBasisRentRatesFieldPaths, RentBasisRentRatesFieldTitles } from "rentbasis/enums";
-import { getUiDataRentBasisKey } from "uiData/helpers";
-import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, getReferenceNumberLink, isEmptyValue, isFieldAllowedToRead } from "util/helpers";
-import { getAttributes as getRentBasisAttributes } from "rentbasis/selectors";
+import Authorization from "@/components/authorization/Authorization";
+import ExternalLink from "@/components/links/ExternalLink";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import GreenBox from "@/components/content/GreenBox";
+import ListItem from "@/components/content/ListItem";
+import ListItems from "@/components/content/ListItems";
+import SubTitle from "@/components/content/SubTitle";
+import { RentBasisFieldPaths, RentBasisFieldTitles, RentBasisDecisionsFieldPaths, RentBasisDecisionsFieldTitles, RentBasisPropertyIdentifiersFieldPaths, RentBasisPropertyIdentifiersFieldTitles, RentBasisRentRatesFieldPaths, RentBasisRentRatesFieldTitles } from "@/rentbasis/enums";
+import { getUiDataRentBasisKey } from "@/uiData/helpers";
+import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, getReferenceNumberLink, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers";
+import { getAttributes as getRentBasisAttributes } from "@/rentbasis/selectors";
 import type { Attributes } from "types";
-import type { RentBasis } from "rentbasis/types";
+import type { RentBasis } from "@/rentbasis/types";
 type Props = {
   rentBasis: RentBasis;
   rentBasisAttributes: Attributes;
@@ -37,28 +37,34 @@ const RentBasisReadonly = ({
       <Row>
         <Column small={6} medium={4} large={3}>
           <Authorization allow={isFieldAllowedToRead(rentBasisAttributes, RentBasisFieldPaths.PLOT_TYPE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataRentBasisKey(RentBasisFieldPaths.PLOT_TYPE)}>
               {RentBasisFieldTitles.PLOT_TYPE}
             </FormTextTitle>
             <FormText>{getLabelOfOption(plotTypeOptions, rentBasis.plot_type) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={8} large={4}>
           <Row>
             <Column small={6}>
               <Authorization allow={isFieldAllowedToRead(rentBasisAttributes, RentBasisFieldPaths.START_DATE)}>
+                <>
                 <FormTextTitle uiDataKey={getUiDataRentBasisKey(RentBasisFieldPaths.START_DATE)}>
                   {RentBasisFieldTitles.START_DATE}
                 </FormTextTitle>
                 <FormText>{formatDate(rentBasis.start_date) || '-'}</FormText>
+                </>
               </Authorization>
             </Column>
             <Column small={6}>
               <Authorization allow={isFieldAllowedToRead(rentBasisAttributes, RentBasisFieldPaths.END_DATE)}>
+                <>
                 <FormTextTitle uiDataKey={getUiDataRentBasisKey(RentBasisFieldPaths.END_DATE)}>
                   {RentBasisFieldTitles.END_DATE}
                 </FormTextTitle>
                 <FormText>{formatDate(rentBasis.end_date) || '-'}</FormText>
+                </>
               </Authorization>
             </Column>
           </Row>
@@ -68,6 +74,7 @@ const RentBasisReadonly = ({
       <Row>
         <Column small={6} medium={4} large={3}>
           <Authorization allow={isFieldAllowedToRead(rentBasisAttributes, RentBasisPropertyIdentifiersFieldPaths.PROPERTY_IDENTIFIERS)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataRentBasisKey(RentBasisPropertyIdentifiersFieldPaths.PROPERTY_IDENTIFIERS)}>
               {RentBasisPropertyIdentifiersFieldTitles.PROPERTY_IDENTIFIERS}
             </FormTextTitle>
@@ -76,30 +83,37 @@ const RentBasisReadonly = ({
                     <ListItem>{item.identifier}</ListItem>
                   </Authorization>)}
               </ListItems> : <FormText>-</FormText>}
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(rentBasisAttributes, RentBasisFieldPaths.DETAILED_PLAN_IDENTIFIER)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataRentBasisKey(RentBasisFieldPaths.DETAILED_PLAN_IDENTIFIER)}>
               {RentBasisFieldTitles.DETAILED_PLAN_IDENTIFIER}
             </FormTextTitle>
             <FormText>{rentBasis.detailed_plan_identifier || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(rentBasisAttributes, RentBasisFieldPaths.MANAGEMENT)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataRentBasisKey(RentBasisFieldPaths.MANAGEMENT)}>
               {RentBasisFieldTitles.MANAGEMENT}
             </FormTextTitle>
             <FormText>{getLabelOfOption(managementOptions, rentBasis.management) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(rentBasisAttributes, RentBasisFieldPaths.FINANCING)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataRentBasisKey(RentBasisFieldPaths.FINANCING)}>
               {RentBasisFieldTitles.FINANCING}
             </FormTextTitle>
             <FormText>{getLabelOfOption(financingOptions, rentBasis.financing) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
@@ -107,18 +121,22 @@ const RentBasisReadonly = ({
       <Row>
         <Column small={6} medium={4} large={3}>
           <Authorization allow={isFieldAllowedToRead(rentBasisAttributes, RentBasisFieldPaths.LEASE_RIGHTS_END_DATE)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataRentBasisKey(RentBasisFieldPaths.LEASE_RIGHTS_END_DATE)}>
               {RentBasisFieldTitles.LEASE_RIGHTS_END_DATE}
             </FormTextTitle>
             <FormText>{formatDate(rentBasis.lease_rights_end_date) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
         <Column small={6} medium={4} large={2}>
           <Authorization allow={isFieldAllowedToRead(rentBasisAttributes, RentBasisFieldPaths.INDEX)}>
+            <>
             <FormTextTitle uiDataKey={getUiDataRentBasisKey(RentBasisFieldPaths.INDEX)}>
               {RentBasisFieldTitles.INDEX}
             </FormTextTitle>
             <FormText>{getLabelOfOption(indexOptions, rentBasis.index) || '-'}</FormText>
+            </>
           </Authorization>
         </Column>
       </Row>
diff --git a/src/rentbasis/components/sections/map/RentBasisLayer.tsx b/src/rentbasis/components/sections/map/RentBasisLayer.tsx
index 72159ad9e..3063a71b3 100644
--- a/src/rentbasis/components/sections/map/RentBasisLayer.tsx
+++ b/src/rentbasis/components/sections/map/RentBasisLayer.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import { GeoJSON } from "react-leaflet";
-import { formatDate, getLabelOfOption } from "util/helpers";
+import { formatDate, getLabelOfOption } from "@/util/helpers";
 import type { LeafletGeoJson } from "types";
 type Props = {
   color: string;
diff --git a/src/rentbasis/components/sections/map/SingleRentBasisMap.tsx b/src/rentbasis/components/sections/map/SingleRentBasisMap.tsx
index a18f90b35..8fc110cac 100644
--- a/src/rentbasis/components/sections/map/SingleRentBasisMap.tsx
+++ b/src/rentbasis/components/sections/map/SingleRentBasisMap.tsx
@@ -2,23 +2,23 @@ import React, { Component } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import AreaNotesEditMap from "areaNote/components/AreaNotesEditMap";
-import AreaNotesLayer from "areaNote/components/AreaNotesLayer";
+import AreaNotesEditMap from "@/areaNote/components/AreaNotesEditMap";
+import AreaNotesLayer from "@/areaNote/components/AreaNotesLayer";
 import RentBasisLayer from "./RentBasisLayer";
-import { fetchAreaNoteList } from "areaNote/actions";
-import { MAP_COLORS } from "util/constants";
-import { RentBasisFieldPaths } from "rentbasis/enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { getContentRentBasisGeoJson } from "rentbasis/helpers";
-import { getFieldOptions, hasPermissions, isFieldAllowedToRead } from "util/helpers";
-import { getBoundsFromCoordinates, getCenterFromCoordinates, getCoordinatesOfGeometry } from "util/map";
-import { getAreaNoteList } from "areaNote/selectors";
-import { getAttributes as getRentBasisAttributes, getRentBasis } from "rentbasis/selectors";
-import { getUsersPermissions } from "usersPermissions/selectors";
+import { fetchAreaNoteList } from "@/areaNote/actions";
+import { MAP_COLORS } from "@/util/constants";
+import { RentBasisFieldPaths } from "@/rentbasis/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { getContentRentBasisGeoJson } from "@/rentbasis/helpers";
+import { getFieldOptions, hasPermissions, isFieldAllowedToRead } from "@/util/helpers";
+import { getBoundsFromCoordinates, getCenterFromCoordinates, getCoordinatesOfGeometry } from "@/util/map";
+import { getAreaNoteList } from "@/areaNote/selectors";
+import { getAttributes as getRentBasisAttributes, getRentBasis } from "@/rentbasis/selectors";
+import { getUsersPermissions } from "@/usersPermissions/selectors";
 import type { Attributes, LeafletGeoJson } from "types";
-import type { RentBasis } from "rentbasis/types";
-import type { AreaNoteList } from "areaNote/types";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import type { RentBasis } from "@/rentbasis/types";
+import type { AreaNoteList } from "@/areaNote/types";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   areaNotes: AreaNoteList;
   fetchAreaNoteList: (...args: Array<any>) => any;
diff --git a/src/rentbasis/constants.ts b/src/rentbasis/constants.ts
index af5eba227..c14404806 100644
--- a/src/rentbasis/constants.ts
+++ b/src/rentbasis/constants.ts
@@ -1,4 +1,4 @@
-import { TableSortOrder } from "enums";
+import { TableSortOrder } from "@/enums";
 
 /**
  * Default sort key of basis of rent list page
diff --git a/src/rentbasis/formValidators.ts b/src/rentbasis/formValidators.ts
index abcda6947..ea8e6b7f9 100644
--- a/src/rentbasis/formValidators.ts
+++ b/src/rentbasis/formValidators.ts
@@ -1,4 +1,4 @@
-import { dateGreaterOrEqual } from "components/form/validations";
+import { dateGreaterOrEqual } from "@/components/form/validations";
 
 /** 
  * Validate basis of rent form
diff --git a/src/rentbasis/helpers.ts b/src/rentbasis/helpers.ts
index aa1da0dca..0ebdc2f9a 100644
--- a/src/rentbasis/helpers.ts
+++ b/src/rentbasis/helpers.ts
@@ -1,13 +1,13 @@
 import get from "lodash/get";
 import { isDirty } from "redux-form";
 import isEmpty from "lodash/isEmpty";
-import { FormNames, TableSortOrder } from "enums";
-import { convertStrToDecimalNumber } from "util/helpers";
-import { getIsEditMode } from "rentbasis/selectors";
-import { removeSessionStorageItem } from "util/storage";
+import { FormNames, TableSortOrder } from "@/enums";
+import { convertStrToDecimalNumber } from "@/util/helpers";
+import { getIsEditMode } from "@/rentbasis/selectors";
+import { removeSessionStorageItem } from "@/util/storage";
 import type { LeafletGeoJson } from "types";
 import type { RentBasis } from "./types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 
 /**
  * Get basis of rent rent rates
diff --git a/src/rentbasis/reducer.ts b/src/rentbasis/reducer.ts
index 650870296..359941b8f 100644
--- a/src/rentbasis/reducer.ts
+++ b/src/rentbasis/reducer.ts
@@ -1,6 +1,6 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
-import type { Attributes, Methods, Reducer } from "../types";
+import type { Attributes, Methods, Reducer } from "@/types";
 import type { ReceiveAttributesAction, ReceiveMethodsAction, RentBasis, RentBasisList, ReceiveRentBasisListAction, ReceiveRentBasisInitialValuesAction, ReceiveSingleRentBasisAction, ReceiveFormValidAction, ReceiveIsSaveClickedAction } from "./types";
 const isEditModeReducer: Reducer<boolean> = handleActions({
   'mvj/rentbasis/HIDE_EDIT': () => false,
diff --git a/src/rentbasis/spec.ts b/src/rentbasis/rentbasis.spec.ts
similarity index 99%
rename from src/rentbasis/spec.ts
rename to src/rentbasis/rentbasis.spec.ts
index 123d16177..6ec24e7fd 100644
--- a/src/rentbasis/spec.ts
+++ b/src/rentbasis/rentbasis.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { receiveAttributes, receiveMethods, fetchAttributes, attributesNotFound, fetchRentBasisList, receiveRentBasisList, fetchSingleRentBasis, receiveSingleRentBasis, createRentBasis, editRentBasis, notFound, initializeRentBasis, showEditMode, hideEditMode, receiveFormValid, receiveIsSaveClicked } from "./actions";
 import rentBasisReducer from "./reducer";
 import type { RentBasisState } from "./types";
diff --git a/src/rentbasis/requests.ts b/src/rentbasis/requests.ts
index df9e1f2da..4aca261f0 100644
--- a/src/rentbasis/requests.ts
+++ b/src/rentbasis/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 import type { RentBasis, RentBasisId } from "./types";
 export const fetchAttributes = () => {
   return callApi(new Request(createUrl('basis_of_rent/'), {
diff --git a/src/rentbasis/saga.ts b/src/rentbasis/saga.ts
index 24f871543..4ddfe8139 100644
--- a/src/rentbasis/saga.ts
+++ b/src/rentbasis/saga.ts
@@ -2,10 +2,10 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { push } from "react-router-redux";
 import { SubmissionError } from "redux-form";
 import { hideEditMode, attributesNotFound, notFound, receiveAttributes, receiveMethods, receiveRentBasisList, receiveSingleRentBasis } from "./actions";
-import { receiveError } from "../api/actions";
-import { displayUIMessage } from "util/helpers";
+import { receiveError } from "@/api/actions";
+import { displayUIMessage } from "@/util/helpers";
 import { createRentBasis, editRentBasis, fetchAttributes, fetchRentBasisList, fetchSingleRentBasis } from "./requests";
-import { getRouteById, Routes } from "../root/routes";
+import { getRouteById, Routes } from "@/root/routes";
 
 function* fetchAttributesSaga(): Generator<any, any, any> {
   try {
diff --git a/src/rentbasis/selectors.ts b/src/rentbasis/selectors.ts
index e08022866..35c3989bb 100644
--- a/src/rentbasis/selectors.ts
+++ b/src/rentbasis/selectors.ts
@@ -1,5 +1,5 @@
 import type { Attributes, Methods, Selector } from "types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 import type { RentBasis, RentBasisList } from "./types";
 export const getIsEditMode: Selector<boolean, void> = (state: RootState): boolean => state.rentBasis.isEditMode;
 export const getIsFetching: Selector<boolean, void> = (state: RootState): boolean => state.rentBasis.isFetching;
diff --git a/src/root/Root.tsx b/src/root/Root.tsx
index 406f8911c..9a194cb5b 100644
--- a/src/root/Root.tsx
+++ b/src/root/Root.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import { Provider } from "react-redux";
 import { ConnectedRouter } from "connected-react-router";
 import { OidcProvider } from "redux-oidc";
-import userManager from "../auth/util/user-manager";
+import userManager from "@/auth/util/user-manager";
 import routes from "./routes";
 export type RootProps = {
   history: any;
diff --git a/src/root/configureStore.ts b/src/root/configureStore.ts
index 732323c38..1022a6c6a 100644
--- a/src/root/configureStore.ts
+++ b/src/root/configureStore.ts
@@ -5,7 +5,7 @@ import createRootReducer from "./createRootReducer";
 import createSagaMiddleware from "redux-saga";
 import createRootSaga from "./createRootSaga";
 import { loadUser } from "redux-oidc";
-import userManager from "../auth/util/user-manager";
+import userManager from "@/auth/util/user-manager";
 export const history = createBrowserHistory();
 
 // needed so Typescript doesn't complain about the window object not having the __REDUX_DEVTOOLS_EXTENSION__ property
@@ -25,15 +25,5 @@ export default (() => {
   loadUser(store, userManager);
   sagaMiddleware.run(rootSaga);
 
-  // $FlowFixMe
-  if (module.hot) {
-    // $FlowFixMe
-    module.hot.accept('./createRootReducer', () => {
-      const nextRootReducer = require('./createRootReducer').default(history);
-
-      store.replaceReducer(nextRootReducer);
-    });
-  }
-
   return store;
 });
\ No newline at end of file
diff --git a/src/root/createRootReducer.ts b/src/root/createRootReducer.ts
index e08bcc59b..c0eed24df 100644
--- a/src/root/createRootReducer.ts
+++ b/src/root/createRootReducer.ts
@@ -3,54 +3,54 @@ import { reducer as formReducer } from "redux-form";
 import { reducer as oidc } from "redux-oidc";
 import { reducer as toastrReducer } from "react-redux-toastr";
 import { connectRouter } from "connected-react-router";
-import apiReducer from "api/reducer";
-import areaNoteReducer from "areaNote/reducer";
-import areaSearchReducer from "areaSearch/reducer";
-import auditLogReducer from "auditLog/reducer";
-import authReducer from "auth/reducer";
-import batchrunReducer from "batchrun/reducer";
-import billingPeriodReducer from "billingPeriods/reducer";
-import collectionCourtDecisionReducer from "collectionCourtDecision/reducer";
-import collectionLetterReducer from "collectionLetter/reducer";
-import collectionNoteReducer from "collectionNote/reducer";
-import commentsReducer from "comments/reducer";
-import contactsReducer from "contacts/reducer";
-import contractFileReducer from "contractFile/reducer";
-import createCollectionLetterReducer from "createCollectionLetter/reducer";
-import creditDecisionReducer from "creditDecision/reducer";
-import leaseStatisticReportReducer from "leaseStatisticReport/reducer";
-import districtsReducer from "district/reducer";
-import indexReducer from "index/reducer";
-import infillDevelopmentReducer from "infillDevelopment/reducer";
-import infillDevelopmentAttachmentReducer from "infillDevelopmentAttachment/reducer";
-import invoiceReducer from "invoices/reducer";
-import invoiceNoteReducer from "invoiceNote/reducer";
-import invoiceSetReducer from "invoiceSets/reducer";
-import landUseInvoiceReducer from "landUseInvoices/reducer";
-import landUseContractReducer from "landUseContract/reducer";
-import landUseAgreementAttachmentReducer from "landUseAgreementAttachment/reducer";
-import leaseReducer from "leases/reducer";
-import plotSearchReducer from "plotSearch/reducer";
-import plotApplicationsReducer from "plotApplications/reducer";
-import applicationReducer from "application/reducer";
-import leaseCreateChargeReducer from "leaseCreateCharge/reducer";
-import leaseholdTransferReducer from "leaseholdTransfer/reducer";
-import leaseTypeReducer from "leaseType/reducer";
-import lessorReducer from "lessor/reducer";
-import penaltyInterestReducer from "penaltyInterest/reducer";
-import previewInvoicesReducer from "previewInvoices/reducer";
-import rentBasisReducer from "rentbasis/reducer";
-import rentForPeriodReducer from "rentForPeriod/reducer";
-import sapInvoiceReducer from "sapInvoice/reducer";
-import serviceUnitsReducer from "serviceUnits/reducer";
-import topNavigationReducer from "components/topNavigation/reducer";
-import tradeRegisterReducer from "tradeRegister/reducer";
-import uiDataReducer from "uiData/reducer";
-import usersReducer from "users/reducer";
-import usersPermissionsReducer from "usersPermissions/reducer";
-import vatReducer from "vat/reducer";
-import type { Reducer } from "types";
-import type { RootState } from "root/types";
+import apiReducer from "@/api/reducer";
+import areaNoteReducer from "@/areaNote/reducer";
+import areaSearchReducer from "@/areaSearch/reducer";
+import auditLogReducer from "@/auditLog/reducer";
+import authReducer from "@/auth/reducer";
+import batchrunReducer from "@/batchrun/reducer";
+import billingPeriodReducer from "@/billingPeriods/reducer";
+import collectionCourtDecisionReducer from "@/collectionCourtDecision/reducer";
+import collectionLetterReducer from "@/collectionLetter/reducer";
+import collectionNoteReducer from "@/collectionNote/reducer";
+import commentsReducer from "@/comments/reducer";
+import contactsReducer from "@/contacts/reducer";
+import contractFileReducer from "@/contractFile/reducer";
+import createCollectionLetterReducer from "@/createCollectionLetter/reducer";
+import creditDecisionReducer from "@/creditDecision/reducer";
+import leaseStatisticReportReducer from "@/leaseStatisticReport/reducer";
+import districtsReducer from "@/district/reducer";
+import indexReducer from "@/index/reducer";
+import infillDevelopmentReducer from "@/infillDevelopment/reducer";
+import infillDevelopmentAttachmentReducer from "@/infillDevelopmentAttachment/reducer";
+import invoiceReducer from "@/invoices/reducer";
+import invoiceNoteReducer from "@/invoiceNote/reducer";
+import invoiceSetReducer from "@/invoiceSets/reducer";
+import landUseInvoiceReducer from "@/landUseInvoices/reducer";
+import landUseContractReducer from "@/landUseContract/reducer";
+import landUseAgreementAttachmentReducer from "@/landUseAgreementAttachment/reducer";
+import leaseReducer from "@/leases/reducer";
+import plotSearchReducer from "@/plotSearch/reducer";
+import plotApplicationsReducer from "@/plotApplications/reducer";
+import applicationReducer from "@/application/reducer";
+import leaseCreateChargeReducer from "@/leaseCreateCharge/reducer";
+import leaseholdTransferReducer from "@/leaseholdTransfer/reducer";
+import leaseTypeReducer from "@/leaseType/reducer";
+import lessorReducer from "@/lessor/reducer";
+import penaltyInterestReducer from "@/penaltyInterest/reducer";
+import previewInvoicesReducer from "@/previewInvoices/reducer";
+import rentBasisReducer from "@/rentbasis/reducer";
+import rentForPeriodReducer from "@/rentForPeriod/reducer";
+import sapInvoiceReducer from "@/sapInvoice/reducer";
+import serviceUnitsReducer from "@/serviceUnits/reducer";
+import topNavigationReducer from "@/components/topNavigation/reducer";
+import tradeRegisterReducer from "@/tradeRegister/reducer";
+import uiDataReducer from "@/uiData/reducer";
+import usersReducer from "@/users/reducer";
+import usersPermissionsReducer from "@/usersPermissions/reducer";
+import vatReducer from "@/vat/reducer";
+import type { Reducer } from "@/types";
+import type { RootState } from "@/root/types";
 export default ((history: Record<string, any>): Reducer<RootState> => combineReducers<Record<string, any>, any>({
   api: apiReducer,
   areaNote: areaNoteReducer,
diff --git a/src/root/createRootSaga.ts b/src/root/createRootSaga.ts
index 750ee52a4..3b2b4c1bd 100644
--- a/src/root/createRootSaga.ts
+++ b/src/root/createRootSaga.ts
@@ -1,51 +1,51 @@
 import { all, fork } from "redux-saga/effects";
-import areaNoteSaga from "areaNote/saga";
-import auditLogSaga from "auditLog/saga";
-import authSaga from "auth/saga";
-import areaSearchSaga from "areaSearch/saga";
-import batchrunSaga from "batchrun/saga";
-import billingPeriodsSaga from "billingPeriods/saga";
-import collectionCourtDecisionSaga from "collectionCourtDecision/saga";
-import collectionLetterSaga from "collectionLetter/saga";
-import collectionNoteSaga from "collectionNote/saga";
-import commentSaga from "comments/saga";
-import contactSaga from "contacts/saga";
-import contractFileSaga from "contractFile/saga";
-import createCollectionLetterSaga from "createCollectionLetter/saga";
-import creditDecisionSaga from "creditDecision/saga";
-import districtSaga from "district/saga";
-import indexSaga from "index/saga";
-import infillDevelopmentSaga from "infillDevelopment/saga";
-import infillDevelopmentAttachmentSaga from "infillDevelopmentAttachment/saga";
-import invoiceSaga from "invoices/saga";
-import landUseinvoiceSaga from "landUseInvoices/saga";
-import invoiceNoteSaga from "invoiceNote/saga";
-import invoiceSetSaga from "invoiceSets/saga";
-import landUseContractSaga from "landUseContract/saga";
-import landUseAgreementAttachmentSaga from "landUseAgreementAttachment/saga";
-import leaseSaga from "leases/saga";
-import leaseAreaAttachmentSaga from "leaseAreaAttachment/saga";
-import leaseInspectionAttachmentSaga from "leaseInspectionAttachment/saga";
-import leaseCreateChargeSaga from "leaseCreateCharge/saga";
-import leaseholdTransferSaga from "leaseholdTransfer/saga";
-import leaseStatisticReportSaga from "leaseStatisticReport/saga";
-import leaseTypeSaga from "leaseType/saga";
-import lessorSaga from "lessor/saga";
-import penaltyInterestSaga from "penaltyInterest/saga";
-import previewInvoicesSaga from "previewInvoices/saga";
-import relatedLeaseSaga from "relatedLease/saga";
-import rentBasisSaga from "rentbasis/saga";
-import rentForPeriodSaga from "rentForPeriod/saga";
-import sapInvoicesSaga from "sapInvoice/saga";
-import serviceUnitsSaga from "serviceUnits/saga";
-import tradeRegisterSaga from "tradeRegister/saga";
-import uiDataSaga from "uiData/saga";
-import userSaga from "users/saga";
-import usersPermissionsSaga from "usersPermissions/saga";
-import vatSaga from "vat/saga";
-import plotSearchSaga from "plotSearch/saga";
-import plotApplicationsSaga from "plotApplications/saga";
-import applicationSaga from "application/saga";
+import areaNoteSaga from "@/areaNote/saga";
+import auditLogSaga from "@/auditLog/saga";
+import authSaga from "@/auth/saga";
+import areaSearchSaga from "@/areaSearch/saga";
+import batchrunSaga from "@/batchrun/saga";
+import billingPeriodsSaga from "@/billingPeriods/saga";
+import collectionCourtDecisionSaga from "@/collectionCourtDecision/saga";
+import collectionLetterSaga from "@/collectionLetter/saga";
+import collectionNoteSaga from "@/collectionNote/saga";
+import commentSaga from "@/comments/saga";
+import contactSaga from "@/contacts/saga";
+import contractFileSaga from "@/contractFile/saga";
+import createCollectionLetterSaga from "@/createCollectionLetter/saga";
+import creditDecisionSaga from "@/creditDecision/saga";
+import districtSaga from "@/district/saga";
+import indexSaga from "@/index/saga";
+import infillDevelopmentSaga from "@/infillDevelopment/saga";
+import infillDevelopmentAttachmentSaga from "@/infillDevelopmentAttachment/saga";
+import invoiceSaga from "@/invoices/saga";
+import landUseinvoiceSaga from "@/landUseInvoices/saga";
+import invoiceNoteSaga from "@/invoiceNote/saga";
+import invoiceSetSaga from "@/invoiceSets/saga";
+import landUseContractSaga from "@/landUseContract/saga";
+import landUseAgreementAttachmentSaga from "@/landUseAgreementAttachment/saga";
+import leaseSaga from "@/leases/saga";
+import leaseAreaAttachmentSaga from "@/leaseAreaAttachment/saga";
+import leaseInspectionAttachmentSaga from "@/leaseInspectionAttachment/saga";
+import leaseCreateChargeSaga from "@/leaseCreateCharge/saga";
+import leaseholdTransferSaga from "@/leaseholdTransfer/saga";
+import leaseStatisticReportSaga from "@/leaseStatisticReport/saga";
+import leaseTypeSaga from "@/leaseType/saga";
+import lessorSaga from "@/lessor/saga";
+import penaltyInterestSaga from "@/penaltyInterest/saga";
+import previewInvoicesSaga from "@/previewInvoices/saga";
+import relatedLeaseSaga from "@/relatedLease/saga";
+import rentBasisSaga from "@/rentbasis/saga";
+import rentForPeriodSaga from "@/rentForPeriod/saga";
+import sapInvoicesSaga from "@/sapInvoice/saga";
+import serviceUnitsSaga from "@/serviceUnits/saga";
+import tradeRegisterSaga from "@/tradeRegister/saga";
+import uiDataSaga from "@/uiData/saga";
+import userSaga from "@/users/saga";
+import usersPermissionsSaga from "@/usersPermissions/saga";
+import vatSaga from "@/vat/saga";
+import plotSearchSaga from "@/plotSearch/saga";
+import plotApplicationsSaga from "@/plotApplications/saga";
+import applicationSaga from "@/application/saga";
 
 export default (() =>
 function* rootSaga() {
diff --git a/src/root/enableOfflineMode.ts b/src/root/enableOfflineMode.ts
deleted file mode 100644
index e56854b22..000000000
--- a/src/root/enableOfflineMode.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import runtime from "offline-plugin/runtime";
-runtime.install({
-  onUpdateReady() {
-    runtime.applyUpdate();
-  },
-
-  onUpdated() {
-    location.reload();
-  }
-
-});
\ No newline at end of file
diff --git a/src/root/renderApp.tsx b/src/root/renderApp.tsx
deleted file mode 100644
index f192f3dbb..000000000
--- a/src/root/renderApp.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import React, { createElement } from "react";
-import { render } from "react-dom";
-import { AppContainer } from "react-hot-loader";
-import type { RootProps } from "./Root";
-export default ((component: any, props: RootProps) => render(<AppContainer>
-      {createElement(component, props)}
-    </AppContainer>, // $FlowFixMe
-document.getElementById('root')));
\ No newline at end of file
diff --git a/src/root/routes.tsx b/src/root/routes.tsx
index 2aded735d..c93c95cc8 100644
--- a/src/root/routes.tsx
+++ b/src/root/routes.tsx
@@ -1,39 +1,39 @@
 import React from "react";
 import { Redirect, Route, Switch } from "react-router";
-import ErrorPage from "errorPage/ErrorPage";
-import App from "app/App";
-import AreaNoteListPage from "areaNote/components/AreaNoteListPage";
-import BasisOfRentCalculatorPage from "basisOfRentCalculator/components/BasisOfRentCalculatorPage";
-import BatchRunPage from "batchrun/components/BatchRunPage";
-import CallbackPage from "auth/components/CallbackPage";
-import ContactListPage from "contacts/components/ContactsListPage";
-import ContactPage from "contacts/components/ContactPage";
-import CreditDecisionSearchPage from "creditDecision/components/CreditDecisionSearchPage";
-import IndexListPage from "index/components/IndexListPage";
-import InfillDevelopmentPage from "infillDevelopment/components/InfillDevelopmentPage";
-import InfillDevelopmentListPage from "infillDevelopment/components/InfillDevelopmentListPage";
-import InvoiceNoteListPage from "invoiceNote/components/InvoiceNoteListPage";
-import LandUseContractListPage from "landUseContract/components/LandUseContractListPage";
-import LandUseContractPage from "landUseContract/components/LandUseContractPage";
-import LeaseListPage from "leases/components/LeaseListPage";
-import LeasePage from "leases/components/LeasePage";
-import LeaseholdTransferListPage from "leaseholdTransfer/components/LeaseholdTransferListPage";
-import NewContactPage from "contacts/components/NewContactPage";
-import NewInfillDevelopmentPage from "infillDevelopment/components/NewInfillDevelopmentPage";
-import NewRentBasisPage from "rentbasis/components/NewRentBasisPage";
-import PlotSearchListPage from "plotSearch/components/PlotSearchListPage";
-import PlotApplicationsListPage from "plotApplications/components/PlotApplicationsListPage";
-import PlotSearchPage from "plotSearch/components/PlotSearchPage";
-import PlotApplicationsPage from "plotApplications/components/PlotApplicationPage";
-import RentBasisListPage from "rentbasis/components/RentBasisListPage";
-import RentBasisPage from "rentbasis/components/RentBasisPage";
-import SapInvoicesListPage from "sapInvoice/components/SapInvoicesListPage";
-import LeaseStatisticReport from "leaseStatisticReport/components/LeaseStatisticReportPage";
-import TradeRegisterSearchPage from "tradeRegister/components/TradeRegisterSearchPage";
-import PlotApplicationCreatePage from "plotApplications/components/PlotApplicationCreatePage";
-import AreaSearchApplicationListPage from "areaSearch/components/AreaSearchApplicationListPage";
-import AreaSearchApplicationPage from "areaSearch/components/AreaSearchApplicationPage";
-import AreaSearchApplicationCreatePage from "areaSearch/components/AreaSearchApplicationCreatePage";
+import ErrorPage from "@/errorPage/ErrorPage";
+import App from "@/app/App";
+import AreaNoteListPage from "@/areaNote/components/AreaNoteListPage";
+import BasisOfRentCalculatorPage from "@/basisOfRentCalculator/components/BasisOfRentCalculatorPage";
+import BatchRunPage from "@/batchrun/components/BatchRunPage";
+import CallbackPage from "@/auth/components/CallbackPage";
+import ContactListPage from "@/contacts/components/ContactsListPage";
+import ContactPage from "@/contacts/components/ContactPage";
+import CreditDecisionSearchPage from "@/creditDecision/components/CreditDecisionSearchPage";
+import IndexListPage from "@/index/components/IndexListPage";
+import InfillDevelopmentPage from "@/infillDevelopment/components/InfillDevelopmentPage";
+import InfillDevelopmentListPage from "@/infillDevelopment/components/InfillDevelopmentListPage";
+import InvoiceNoteListPage from "@/invoiceNote/components/InvoiceNoteListPage";
+import LandUseContractListPage from "@/landUseContract/components/LandUseContractListPage";
+import LandUseContractPage from "@/landUseContract/components/LandUseContractPage";
+import LeaseListPage from "@/leases/components/LeaseListPage";
+import LeasePage from "@/leases/components/LeasePage";
+import LeaseholdTransferListPage from "@/leaseholdTransfer/components/LeaseholdTransferListPage";
+import NewContactPage from "@/contacts/components/NewContactPage";
+import NewInfillDevelopmentPage from "@/infillDevelopment/components/NewInfillDevelopmentPage";
+import NewRentBasisPage from "@/rentbasis/components/NewRentBasisPage";
+import PlotSearchListPage from "@/plotSearch/components/PlotSearchListPage";
+import PlotApplicationsListPage from "@/plotApplications/components/PlotApplicationsListPage";
+import PlotSearchPage from "@/plotSearch/components/PlotSearchPage";
+import PlotApplicationsPage from "@/plotApplications/components/PlotApplicationPage";
+import RentBasisListPage from "@/rentbasis/components/RentBasisListPage";
+import RentBasisPage from "@/rentbasis/components/RentBasisPage";
+import SapInvoicesListPage from "@/sapInvoice/components/SapInvoicesListPage";
+import LeaseStatisticReport from "@/leaseStatisticReport/components/LeaseStatisticReportPage";
+import TradeRegisterSearchPage from "@/tradeRegister/components/TradeRegisterSearchPage";
+import PlotApplicationCreatePage from "@/plotApplications/components/PlotApplicationCreatePage";
+import AreaSearchApplicationListPage from "@/areaSearch/components/AreaSearchApplicationListPage";
+import AreaSearchApplicationPage from "@/areaSearch/components/AreaSearchApplicationPage";
+import AreaSearchApplicationCreatePage from "@/areaSearch/components/AreaSearchApplicationCreatePage";
 
 /**
  * Routes enumerate
@@ -135,4 +135,4 @@ export default (<App>
     <Route exact path={getRouteById(Routes.CREDIT_DECISION)} component={CreditDecisionSearchPage} />
     <Route component={ErrorPage} />
   </Switch>
-</App> as React.ReactNode);
\ No newline at end of file
+</App> as JSX.Element);
\ No newline at end of file
diff --git a/src/root/startApp.ts b/src/root/startApp.ts
deleted file mode 100644
index bf716c509..000000000
--- a/src/root/startApp.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import configureStore, { history } from "./configureStore";
-import renderApp from "./renderApp";
-import Root from "./Root";
-export const store = configureStore();
-export default (() => {
-  const rootProps = {
-    history,
-    store
-  };
-  renderApp(Root, rootProps);
-
-  if (module.hot) {
-    module.hot.accept('./Root', () => {
-      const nextRootComponent = require('./Root').default;
-
-      renderApp(nextRootComponent, rootProps);
-    });
-  } // if (process.env.NODE_ENV === 'production') {
-  //   require('./enableOfflineMode');
-  // }
-
-});
\ No newline at end of file
diff --git a/src/sapInvoice/actions.ts b/src/sapInvoice/actions.ts
index b29588175..cb9b80fa8 100644
--- a/src/sapInvoice/actions.ts
+++ b/src/sapInvoice/actions.ts
@@ -1,5 +1,5 @@
 import { createAction } from "redux-actions";
-import type { SapInvoiceList, FetchSapInvoicesAction, ReceiveSapInvoicesAction, NotFoundAction } from "sapInvoice/types";
+import type { SapInvoiceList, FetchSapInvoicesAction, ReceiveSapInvoicesAction, NotFoundAction } from "@/sapInvoice/types";
 export const fetchSapInvoices = (query?: Record<string, any>): FetchSapInvoicesAction => createAction('mvj/sapInvoice/FETCH_ALL')(query);
 export const receiveSapInvoices = (invoices: SapInvoiceList): ReceiveSapInvoicesAction => createAction('mvj/sapInvoice/RECEIVE_ALL')(invoices);
 export const notFound = (): NotFoundAction => createAction('mvj/sapInvoice/NOT_FOUND')();
\ No newline at end of file
diff --git a/src/sapInvoice/components/SapInvoicesListPage.tsx b/src/sapInvoice/components/SapInvoicesListPage.tsx
index 4e66e0e29..091f662c0 100644
--- a/src/sapInvoice/components/SapInvoicesListPage.tsx
+++ b/src/sapInvoice/components/SapInvoicesListPage.tsx
@@ -5,34 +5,34 @@ import { withRouter } from "react-router";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import ExternalLinkIcon from "components/icons/ExternalLinkIcon";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import PageContainer from "components/content/PageContainer";
-import Pagination from "components/table/Pagination";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import ExternalLinkIcon from "@/components/icons/ExternalLinkIcon";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import PageContainer from "@/components/content/PageContainer";
+import Pagination from "@/components/table/Pagination";
 import Search from "./Search";
-import SortableTable from "components/table/SortableTable";
-import TableFilters from "components/table/TableFilters";
-import TableWrapper from "components/table/TableWrapper";
-import { fetchSapInvoices } from "sapInvoice/actions";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { LIST_TABLE_PAGE_SIZE } from "util/constants";
-import { DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER } from "sapInvoice/constants";
-import { FormNames, Methods, PermissionMissingTexts } from "enums";
-import { InvoiceFieldPaths, InvoiceRowsFieldPaths } from "invoices/enums";
-import { getContactFullName } from "contacts/helpers";
-import { formatReceivableTypesString } from "invoices/helpers";
-import { getContentLeaseIdentifier } from "leases/helpers";
-import { getSapInvoices, mapSapInvoiceSearchFilters } from "sapInvoice/helpers";
-import { formatDate, formatNumber, getApiResponseCount, getApiResponseMaxPage, getFieldOptions, getSearchQuery, getUrlParams, isEmptyValue, isFieldAllowedToRead, isMethodAllowed, setPageTitle } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getIsFetching, getSapInvoices as getSapInvoiceList } from "sapInvoice/selectors";
-import { withSapInvoicesAttributes } from "components/attributes/SapInvoicesAttributes";
-import { getUserActiveServiceUnit } from "usersPermissions/selectors";
+import SortableTable from "@/components/table/SortableTable";
+import TableFilters from "@/components/table/TableFilters";
+import TableWrapper from "@/components/table/TableWrapper";
+import { fetchSapInvoices } from "@/sapInvoice/actions";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { LIST_TABLE_PAGE_SIZE } from "@/util/constants";
+import { DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER } from "@/sapInvoice/constants";
+import { FormNames, Methods, PermissionMissingTexts } from "@/enums";
+import { InvoiceFieldPaths, InvoiceRowsFieldPaths } from "@/invoices/enums";
+import { getContactFullName } from "@/contacts/helpers";
+import { formatReceivableTypesString } from "@/invoices/helpers";
+import { getContentLeaseIdentifier } from "@/leases/helpers";
+import { getSapInvoices, mapSapInvoiceSearchFilters } from "@/sapInvoice/helpers";
+import { formatDate, formatNumber, getApiResponseCount, getApiResponseMaxPage, getFieldOptions, getSearchQuery, getUrlParams, isEmptyValue, isFieldAllowedToRead, isMethodAllowed, setPageTitle } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getIsFetching, getSapInvoices as getSapInvoiceList } from "@/sapInvoice/selectors";
+import { withSapInvoicesAttributes } from "@/components/attributes/SapInvoicesAttributes";
+import { getUserActiveServiceUnit } from "@/usersPermissions/selectors";
 import type { Attributes, Methods as MethodsType } from "types";
-import type { SapInvoiceList } from "sapInvoice/types";
-import type { UserServiceUnit } from "usersPermissions/types";
+import type { SapInvoiceList } from "@/sapInvoice/types";
+import type { UserServiceUnit } from "@/usersPermissions/types";
 
 const getColumns = (invoiceAttributes: Attributes) => {
   const receivableTypeOptions = getFieldOptions(invoiceAttributes, InvoiceRowsFieldPaths.RECEIVABLE_TYPE);
diff --git a/src/sapInvoice/components/Search.tsx b/src/sapInvoice/components/Search.tsx
index 28a980770..dc2c25798 100644
--- a/src/sapInvoice/components/Search.tsx
+++ b/src/sapInvoice/components/Search.tsx
@@ -5,12 +5,12 @@ import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
 import isEqual from "lodash/isEqual";
 import isEmpty from "lodash/isEmpty";
-import FormField from "components/form/FormField";
-import SearchContainer from "components/search/SearchContainer";
-import { FieldTypes, FormNames } from "enums";
-import { fetchServiceUnits } from "serviceUnits/actions";
-import { getServiceUnits, getIsFetching as getIsFetchingServiceUnits } from "serviceUnits/selectors";
-import type { ServiceUnits } from "serviceUnits/types";
+import FormField from "@/components/form/FormField";
+import SearchContainer from "@/components/search/SearchContainer";
+import { FieldTypes, FormNames } from "@/enums";
+import { fetchServiceUnits } from "@/serviceUnits/actions";
+import { getServiceUnits, getIsFetching as getIsFetchingServiceUnits } from "@/serviceUnits/selectors";
+import type { ServiceUnits } from "@/serviceUnits/types";
 type Props = {
   formValues: Record<string, any>;
   fetchServiceUnits: (...args: Array<any>) => any;
diff --git a/src/sapInvoice/constants.ts b/src/sapInvoice/constants.ts
index 10570e0aa..4134c9b79 100644
--- a/src/sapInvoice/constants.ts
+++ b/src/sapInvoice/constants.ts
@@ -1,4 +1,4 @@
-import { TableSortOrder } from "enums";
+import { TableSortOrder } from "@/enums";
 
 /**
  * Default sort key of sap invoices list page
diff --git a/src/sapInvoice/helpers.ts b/src/sapInvoice/helpers.ts
index 013ed4f4a..a93a7c0e4 100644
--- a/src/sapInvoice/helpers.ts
+++ b/src/sapInvoice/helpers.ts
@@ -1,9 +1,9 @@
 import format from "date-fns/format";
 import subMonths from "date-fns/subMonths";
-import { TableSortOrder } from "enums";
-import { getContentInvoiceReceivableTypes } from "invoices/helpers";
-import { getApiResponseResults } from "util/helpers";
-import type { SapInvoiceList } from "sapInvoice/types";
+import { TableSortOrder } from "@/enums";
+import { getContentInvoiceReceivableTypes } from "@/invoices/helpers";
+import { getApiResponseResults } from "@/util/helpers";
+import type { SapInvoiceList } from "@/sapInvoice/types";
 
 /**
  * Get sap invoices from API response
diff --git a/src/sapInvoice/reducer.ts b/src/sapInvoice/reducer.ts
index e1dd8e444..87710b84d 100644
--- a/src/sapInvoice/reducer.ts
+++ b/src/sapInvoice/reducer.ts
@@ -1,6 +1,6 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
-import type { Reducer } from "../types";
+import type { Reducer } from "@/types";
 import type { SapInvoiceList, ReceiveSapInvoicesAction } from "./types";
 const isFetchingReducer: Reducer<boolean> = handleActions({
   'mvj/sapInvoice/FETCH_ALL': () => true,
diff --git a/src/sapInvoice/saga.ts b/src/sapInvoice/saga.ts
index 8001e92e5..764c5329c 100644
--- a/src/sapInvoice/saga.ts
+++ b/src/sapInvoice/saga.ts
@@ -1,7 +1,7 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { notFound, receiveSapInvoices } from "./actions";
-import { receiveError } from "api/actions";
-import { fetchInvoices } from "invoices/requests";
+import { receiveError } from "@/api/actions";
+import { fetchInvoices } from "@/invoices/requests";
 
 function* fetchSapInvoicesSaga({
   payload: query,
diff --git a/src/sapInvoice/spec.ts b/src/sapInvoice/sapInvoice.spec.ts
similarity index 96%
rename from src/sapInvoice/spec.ts
rename to src/sapInvoice/sapInvoice.spec.ts
index 214e47ab2..c2da2efe7 100644
--- a/src/sapInvoice/spec.ts
+++ b/src/sapInvoice/sapInvoice.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchSapInvoices, receiveSapInvoices, notFound } from "./actions";
 import sapInvoicesReducer from "./reducer";
 import type { SapInvoicesState } from "./types";
diff --git a/src/sapInvoice/selectors.ts b/src/sapInvoice/selectors.ts
index 962d1cc26..ea7689f99 100644
--- a/src/sapInvoice/selectors.ts
+++ b/src/sapInvoice/selectors.ts
@@ -1,5 +1,5 @@
 import type { Selector } from "types";
-import type { SapInvoiceList } from "sapInvoice/types";
-import type { RootState } from "root/types";
+import type { SapInvoiceList } from "@/sapInvoice/types";
+import type { RootState } from "@/root/types";
 export const getIsFetching: Selector<boolean, void> = (state: RootState): boolean => state.sapInvoice.isFetching;
 export const getSapInvoices: Selector<SapInvoiceList, void> = (state: RootState): SapInvoiceList => state.sapInvoice.list;
\ No newline at end of file
diff --git a/src/sapInvoice/types.ts b/src/sapInvoice/types.ts
index 287401c56..284f01653 100644
--- a/src/sapInvoice/types.ts
+++ b/src/sapInvoice/types.ts
@@ -1,4 +1,4 @@
-import type { Action } from "../types";
+import type { Action } from "@/types";
 export type SapInvoicesState = {
   isFetching: boolean;
   list: SapInvoiceList;
diff --git a/src/serviceUnits/reducer.ts b/src/serviceUnits/reducer.ts
index b1b7fda05..3431f9847 100644
--- a/src/serviceUnits/reducer.ts
+++ b/src/serviceUnits/reducer.ts
@@ -1,6 +1,6 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
-import type { Reducer } from "../types";
+import type { Reducer } from "@/types";
 import type { ServiceUnits, ReceiveServiceUnitsAction } from "./types";
 const isFetchingReducer: Reducer<boolean> = handleActions({
   'mvj/serviceUnits/FETCH_ALL': () => true,
diff --git a/src/serviceUnits/requests.ts b/src/serviceUnits/requests.ts
index 2db45d798..1d52333c5 100644
--- a/src/serviceUnits/requests.ts
+++ b/src/serviceUnits/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 export const fetchServiceUnits = (): Generator<any, any, any> => {
   return callApi(new Request(createUrl('service_unit/')));
 };
\ No newline at end of file
diff --git a/src/serviceUnits/saga.ts b/src/serviceUnits/saga.ts
index 864850a0c..f78cecd56 100644
--- a/src/serviceUnits/saga.ts
+++ b/src/serviceUnits/saga.ts
@@ -1,7 +1,7 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { receiveServiceUnits, notFound } from "./actions";
 import { fetchServiceUnits } from "./requests";
-import { receiveError } from "../api/actions";
+import { receiveError } from "@/api/actions";
 
 function* fetchServiceUnitsSaga(): Generator<any, any, any> {
   try {
diff --git a/src/serviceUnits/selectors.ts b/src/serviceUnits/selectors.ts
index 34c8a47b6..d7a100780 100644
--- a/src/serviceUnits/selectors.ts
+++ b/src/serviceUnits/selectors.ts
@@ -1,5 +1,5 @@
 import type { Selector } from "types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 import type { ServiceUnits } from "./types";
 export const getIsFetching: Selector<boolean, void> = (state: RootState): boolean => state.serviceUnits.isFetching;
 export const getServiceUnits: Selector<ServiceUnits, void> = (state: RootState): ServiceUnits => state.serviceUnits.serviceUnits;
\ No newline at end of file
diff --git a/src/serviceUnits/types.ts b/src/serviceUnits/types.ts
index bfdc8ea13..64993f5cd 100644
--- a/src/serviceUnits/types.ts
+++ b/src/serviceUnits/types.ts
@@ -1,4 +1,4 @@
-import type { Action } from "../types";
+import type { Action } from "@/types";
 export type ServiceUnit = { id: number, name: string };
 export type ServiceUnits = Array<Record<string, any>>;
 export type ServiceUnitState = {
diff --git a/src/styles/_fonts.scss b/src/styles/_fonts.scss
index 541e93111..a8fcc8989 100644
--- a/src/styles/_fonts.scss
+++ b/src/styles/_fonts.scss
@@ -4,88 +4,88 @@
 
 @font-face {
   font-family: HelsinkiGrotesk;
-  src: url('../assets/fonts/HelsinkiGrotesk-Regular.eot'); /* IE9 Compat Modes */
-  src: url('../assets/fonts/HelsinkiGrotesk-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-  url('../assets/fonts/HelsinkiGrotesk-Regular.woff') format('woff'), /* Modern Browsers */
-  url('../assets/fonts/HelsinkiGrotesk-Regular.ttf') format('truetype'), /* Safari, Android, iOS */
-  url('../assets/fonts/HelsinkiGrotesk-Regular.svg#HelsinkiGrotesk-Regular') format('svg'); /* Legacy iOS */
+  src: url('/assets/fonts/HelsinkiGrotesk-Regular.eot'); /* IE9 Compat Modes */
+  src: url('/assets/fonts/HelsinkiGrotesk-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('/assets/fonts/HelsinkiGrotesk-Regular.woff') format('woff'), /* Modern Browsers */
+  url('/assets/fonts/HelsinkiGrotesk-Regular.ttf') format('truetype'), /* Safari, Android, iOS */
+  url('/assets/fonts/HelsinkiGrotesk-Regular.svg#HelsinkiGrotesk-Regular') format('svg'); /* Legacy iOS */
   font-weight: normal;
   font-style: normal;
 }
 
 @font-face {
   font-family: HelsinkiGrotesk;
-  src: url('../assets/fonts/HelsinkiGrotesk-RegularItalic.eot'); /* IE9 Compat Modes */
-  src: url('../assets/fonts/HelsinkiGrotesk-RegularItalic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-  url('../assets/fonts/HelsinkiGrotesk-RegularItalic.woff') format('woff'), /* Modern Browsers */
-  url('../assets/fonts/HelsinkiGrotesk-RegularItalic.ttf') format('truetype'), /* Safari, Android, iOS */
-  url('../assets/fonts/HelsinkiGrotesk-RegularItalic.svg#HelsinkiGrotesk-RegularItalic') format('svg'); /* Legacy iOS */
+  src: url('/assets/fonts/HelsinkiGrotesk-RegularItalic.eot'); /* IE9 Compat Modes */
+  src: url('/assets/fonts/HelsinkiGrotesk-RegularItalic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('/assets/fonts/HelsinkiGrotesk-RegularItalic.woff') format('woff'), /* Modern Browsers */
+  url('/assets/fonts/HelsinkiGrotesk-RegularItalic.ttf') format('truetype'), /* Safari, Android, iOS */
+  url('/assets/fonts/HelsinkiGrotesk-RegularItalic.svg#HelsinkiGrotesk-RegularItalic') format('svg'); /* Legacy iOS */
   font-weight: normal;
   font-style: italic;
 }
 
 @font-face {
   font-family: HelsinkiGrotesk;
-  src: url('../assets/fonts/HelsinkiGrotesk-Medium.eot'); /* IE9 Compat Modes */
-  src: url('../assets/fonts/HelsinkiGrotesk-Medium.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-  url('../assets/fonts/HelsinkiGrotesk-Medium.woff') format('woff'), /* Modern Browsers */
-  url('../assets/fonts/HelsinkiGrotesk-Medium.ttf') format('truetype'), /* Safari, Android, iOS */
-  url('../assets/fonts/HelsinkiGrotesk-Medium.svg#HelsinkiGrotesk-Medium') format('svg'); /* Legacy iOS */
+  src: url('/assets/fonts/HelsinkiGrotesk-Medium.eot'); /* IE9 Compat Modes */
+  src: url('/assets/fonts/HelsinkiGrotesk-Medium.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('/assets/fonts/HelsinkiGrotesk-Medium.woff') format('woff'), /* Modern Browsers */
+  url('/assets/fonts/HelsinkiGrotesk-Medium.ttf') format('truetype'), /* Safari, Android, iOS */
+  url('/assets/fonts/HelsinkiGrotesk-Medium.svg#HelsinkiGrotesk-Medium') format('svg'); /* Legacy iOS */
   font-weight: 500;
   font-style: normal;
 }
 
 @font-face {
   font-family: HelsinkiGrotesk;
-  src: url('../assets/fonts/HelsinkiGrotesk-MediumItalic.eot'); /* IE9 Compat Modes */
-  src: url('../assets/fonts/HelsinkiGrotesk-MediumItalic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-  url('../assets/fonts/HelsinkiGrotesk-MediumItalic.woff') format('woff'), /* Modern Browsers */
-  url('../assets/fonts/HelsinkiGrotesk-MediumItalic.ttf') format('truetype'), /* Safari, Android, iOS */
-  url('../assets/fonts/HelsinkiGrotesk-MediumItalic.svg#HelsinkiGrotesk-MediumItalic') format('svg'); /* Legacy iOS */
+  src: url('/assets/fonts/HelsinkiGrotesk-MediumItalic.eot'); /* IE9 Compat Modes */
+  src: url('/assets/fonts/HelsinkiGrotesk-MediumItalic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('/assets/fonts/HelsinkiGrotesk-MediumItalic.woff') format('woff'), /* Modern Browsers */
+  url('/assets/fonts/HelsinkiGrotesk-MediumItalic.ttf') format('truetype'), /* Safari, Android, iOS */
+  url('/assets/fonts/HelsinkiGrotesk-MediumItalic.svg#HelsinkiGrotesk-MediumItalic') format('svg'); /* Legacy iOS */
   font-style: italic;
   font-weight: 500;
 }
 
 @font-face {
   font-family: HelsinkiGrotesk;
-  src: url('../assets/fonts/HelsinkiGrotesk-Bold.eot'); /* IE9 Compat Modes */
-  src: url('../assets/fonts/HelsinkiGrotesk-Bold.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-  url('../assets/fonts/HelsinkiGrotesk-Bold.woff') format('woff'), /* Modern Browsers */
-  url('../assets/fonts/HelsinkiGrotesk-Bold.ttf') format('truetype'), /* Safari, Android, iOS */
-  url('../assets/fonts/HelsinkiGrotesk-Bold.svg#HelsinkiGrotesk-Bold') format('svg'); /* Legacy iOS */
+  src: url('/assets/fonts/HelsinkiGrotesk-Bold.eot'); /* IE9 Compat Modes */
+  src: url('/assets/fonts/HelsinkiGrotesk-Bold.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('/assets/fonts/HelsinkiGrotesk-Bold.woff') format('woff'), /* Modern Browsers */
+  url('/assets/fonts/HelsinkiGrotesk-Bold.ttf') format('truetype'), /* Safari, Android, iOS */
+  url('/assets/fonts/HelsinkiGrotesk-Bold.svg#HelsinkiGrotesk-Bold') format('svg'); /* Legacy iOS */
   font-weight: bold;
   font-style: normal;
 }
 
 @font-face {
   font-family: HelsinkiGrotesk;
-  src: url('../assets/fonts/HelsinkiGrotesk-BoldItalic.eot'); /* IE9 Compat Modes */
-  src: url('../assets/fonts/HelsinkiGrotesk-BoldItalic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-  url('../assets/fonts/HelsinkiGrotesk-BoldItalic.woff') format('woff'), /* Modern Browsers */
-  url('../assets/fonts/HelsinkiGrotesk-BoldItalic.ttf') format('truetype'), /* Safari, Android, iOS */
-  url('../assets/fonts/HelsinkiGrotesk-BoldItalic.svg#HelsinkiGrotesk-BoldItalic') format('svg'); /* Legacy iOS */
+  src: url('/assets/fonts/HelsinkiGrotesk-BoldItalic.eot'); /* IE9 Compat Modes */
+  src: url('/assets/fonts/HelsinkiGrotesk-BoldItalic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('/assets/fonts/HelsinkiGrotesk-BoldItalic.woff') format('woff'), /* Modern Browsers */
+  url('/assets/fonts/HelsinkiGrotesk-BoldItalic.ttf') format('truetype'), /* Safari, Android, iOS */
+  url('/assets/fonts/HelsinkiGrotesk-BoldItalic.svg#HelsinkiGrotesk-BoldItalic') format('svg'); /* Legacy iOS */
   font-weight: bold;
   font-style: italic;
 }
 
 @font-face {
   font-family: HelsinkiGrotesk;
-  src: url('../assets/fonts/HelsinkiGrotesk-Black.eot'); /* IE9 Compat Modes */
-  src: url('../assets/fonts/HelsinkiGrotesk-Black.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-  url('../assets/fonts/HelsinkiGrotesk-Black.woff') format('woff'), /* Modern Browsers */
-  url('../assets/fonts/HelsinkiGrotesk-Black.ttf') format('truetype'), /* Safari, Android, iOS */
-  url('../assets/fonts/HelsinkiGrotesk-Black.svg#HelsinkiGrotesk-Black') format('svg'); /* Legacy iOS */
+  src: url('/assets/fonts/HelsinkiGrotesk-Black.eot'); /* IE9 Compat Modes */
+  src: url('/assets/fonts/HelsinkiGrotesk-Black.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('/assets/fonts/HelsinkiGrotesk-Black.woff') format('woff'), /* Modern Browsers */
+  url('/assets/fonts/HelsinkiGrotesk-Black.ttf') format('truetype'), /* Safari, Android, iOS */
+  url('/assets/fonts/HelsinkiGrotesk-Black.svg#HelsinkiGrotesk-Black') format('svg'); /* Legacy iOS */
   font-weight: 900;
   font-style: normal;
 }
 
 @font-face {
   font-family: HelsinkiGrotesk;
-  src: url('../assets/fonts/HelsinkiGrotesk-BlackItalic.eot'); /* IE9 Compat Modes */
-  src: url('../assets/fonts/HelsinkiGrotesk-BlackItalic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-  url('../assets/fonts/HelsinkiGrotesk-BlackItalic.woff') format('woff'), /* Modern Browsers */
-  url('../assets/fonts/HelsinkiGrotesk-BlackItalic.ttf') format('truetype'), /* Safari, Android, iOS */
-  url('../assets/fonts/HelsinkiGrotesk-BlackItalic.svg#HelsinkiGrotesk-BlackItalic') format('svg'); /* Legacy iOS */
+  src: url('/assets/fonts/HelsinkiGrotesk-BlackItalic.eot'); /* IE9 Compat Modes */
+  src: url('/assets/fonts/HelsinkiGrotesk-BlackItalic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('/assets/fonts/HelsinkiGrotesk-BlackItalic.woff') format('woff'), /* Modern Browsers */
+  url('/assets/fonts/HelsinkiGrotesk-BlackItalic.ttf') format('truetype'), /* Safari, Android, iOS */
+  url('/assets/fonts/HelsinkiGrotesk-BlackItalic.svg#HelsinkiGrotesk-BlackItalic') format('svg'); /* Legacy iOS */
   font-weight: 900;
   font-style: italic;
 }
diff --git a/src/test.ts b/src/test.ts
deleted file mode 100644
index 472d9d834..000000000
--- a/src/test.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import chai from "chai";
-import chaiEnzyme from "chai-enzyme";
-import sinonChai from "sinon-chai";
-chai.use(chaiEnzyme());
-chai.use(sinonChai);
\ No newline at end of file
diff --git a/src/tradeRegister/actions.ts b/src/tradeRegister/actions.ts
index 76716b9ab..7b34c4e20 100644
--- a/src/tradeRegister/actions.ts
+++ b/src/tradeRegister/actions.ts
@@ -1,5 +1,5 @@
 import { createAction } from "redux-actions";
-import type { TradeRegisterDataMap, FetchTradeRegisterCompanyExtendedByIdAction, ReceiveTradeRegisterCompanyExtendedByIdAction, CompanyExtendedNotFoundByIdAction, FetchTradeRegisterCompanyNoticeByIdAction, ReceiveTradeRegisterCompanyNoticeByIdAction, CompanyNoticeNotFoundByIdAction, FetchTradeRegisterCompanyRepresentByIdAction, ReceiveTradeRegisterCompanyRepresentByIdAction, CompanyRepresentNotFoundByIdAction, ReceiveCollapseStatesAction } from "tradeRegister/types";
+import type { TradeRegisterDataMap, FetchTradeRegisterCompanyExtendedByIdAction, ReceiveTradeRegisterCompanyExtendedByIdAction, CompanyExtendedNotFoundByIdAction, FetchTradeRegisterCompanyNoticeByIdAction, ReceiveTradeRegisterCompanyNoticeByIdAction, CompanyNoticeNotFoundByIdAction, FetchTradeRegisterCompanyRepresentByIdAction, ReceiveTradeRegisterCompanyRepresentByIdAction, CompanyRepresentNotFoundByIdAction, ReceiveCollapseStatesAction } from "@/tradeRegister/types";
 export const fetchTradeRegisterCompanyExtendedById = (businessId: string): FetchTradeRegisterCompanyExtendedByIdAction => createAction('mvj/tradeRegister/FETCH_COMPANY_EXTENDED_BY_ID')(businessId);
 export const receiveTradeRegisterCompanyExtendedById = (payload: TradeRegisterDataMap): ReceiveTradeRegisterCompanyExtendedByIdAction => createAction('mvj/tradeRegister/RECEIVE_COMPANY_EXTENDED_BY_ID')(payload);
 export const companyExtendedNotFoundById = (businessId: string): CompanyExtendedNotFoundByIdAction => createAction('mvj/tradeRegister/COMPANY_EXTENDED_NOT_FOUND_BY_ID')(businessId);
diff --git a/src/tradeRegister/components/CompanyExtended.tsx b/src/tradeRegister/components/CompanyExtended.tsx
index 0186ef0b3..320750d20 100644
--- a/src/tradeRegister/components/CompanyExtended.tsx
+++ b/src/tradeRegister/components/CompanyExtended.tsx
@@ -2,21 +2,21 @@ import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import get from "lodash/get";
-import Collapse from "components/collapse/Collapse";
-import ExternalLink from "components/links/ExternalLink";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import ListItem from "components/content/ListItem";
-import ListItems from "components/content/ListItems";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import ShowMore from "components/showMore/ShowMore";
-import SubTitle from "components/content/SubTitle";
-import { receiveCollapseStates } from "tradeRegister/actions";
-import { CollapseStatePaths, CompanyStates, CompanyExtendedFieldPaths, CompanyExtendedFieldTitles } from "tradeRegister/enums";
-import { getUiDataTradeRegisterCompanyExtendedKey } from "uiData/helpers";
-import { formatDate, formatNumber, formatNumberWithThousandSeparator } from "util/helpers";
-import { getCollapseStateByKey, getCompanyExtendedById, getIsFetchingCompanyExtendedById } from "tradeRegister/selectors";
+import Collapse from "@/components/collapse/Collapse";
+import ExternalLink from "@/components/links/ExternalLink";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import ListItem from "@/components/content/ListItem";
+import ListItems from "@/components/content/ListItems";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import ShowMore from "@/components/showMore/ShowMore";
+import SubTitle from "@/components/content/SubTitle";
+import { receiveCollapseStates } from "@/tradeRegister/actions";
+import { CollapseStatePaths, CompanyStates, CompanyExtendedFieldPaths, CompanyExtendedFieldTitles } from "@/tradeRegister/enums";
+import { getUiDataTradeRegisterCompanyExtendedKey } from "@/uiData/helpers";
+import { formatDate, formatNumber, formatNumberWithThousandSeparator } from "@/util/helpers";
+import { getCollapseStateByKey, getCompanyExtendedById, getIsFetchingCompanyExtendedById } from "@/tradeRegister/selectors";
 type Props = {
   businessId: string;
   companyExtended: Record<string, any> | null | undefined;
diff --git a/src/tradeRegister/components/CompanyNotice.tsx b/src/tradeRegister/components/CompanyNotice.tsx
index 5d8437463..2c0c1937f 100644
--- a/src/tradeRegister/components/CompanyNotice.tsx
+++ b/src/tradeRegister/components/CompanyNotice.tsx
@@ -3,21 +3,21 @@ import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
 import get from "lodash/get";
-import BoxItem from "components/content/BoxItem";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import Collapse from "components/collapse/Collapse";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import ListItem from "components/content/ListItem";
-import ListItems from "components/content/ListItems";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import { receiveCollapseStates } from "tradeRegister/actions";
-import { CollapseStatePaths, CompanyNoticeFieldPaths, CompanyNoticeFieldTitles } from "tradeRegister/enums";
-import { formatDate } from "util/helpers";
-import { getUiDataTradeRegisterCompanyNoticeKey } from "uiData/helpers";
-import { getCollapseStateByKey, getCompanyNoticeById, getIsFetchingCompanyNoticeById } from "tradeRegister/selectors";
-import { withWindowResize } from "components/resize/WindowResizeHandler";
+import BoxItem from "@/components/content/BoxItem";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import Collapse from "@/components/collapse/Collapse";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import ListItem from "@/components/content/ListItem";
+import ListItems from "@/components/content/ListItems";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import { receiveCollapseStates } from "@/tradeRegister/actions";
+import { CollapseStatePaths, CompanyNoticeFieldPaths, CompanyNoticeFieldTitles } from "@/tradeRegister/enums";
+import { formatDate } from "@/util/helpers";
+import { getUiDataTradeRegisterCompanyNoticeKey } from "@/uiData/helpers";
+import { getCollapseStateByKey, getCompanyNoticeById, getIsFetchingCompanyNoticeById } from "@/tradeRegister/selectors";
+import { withWindowResize } from "@/components/resize/WindowResizeHandler";
 type Props = {
   businessId: string;
   companyNotice: Record<string, any> | null | undefined;
diff --git a/src/tradeRegister/components/CompanyRepresent.tsx b/src/tradeRegister/components/CompanyRepresent.tsx
index 5a07f2fcd..483e94e66 100644
--- a/src/tradeRegister/components/CompanyRepresent.tsx
+++ b/src/tradeRegister/components/CompanyRepresent.tsx
@@ -3,20 +3,20 @@ import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
 import get from "lodash/get";
-import BoxItem from "components/content/BoxItem";
-import BoxItemContainer from "components/content/BoxItemContainer";
-import Collapse from "components/collapse/Collapse";
-import FormText from "components/form/FormText";
-import FormTextTitle from "components/form/FormTextTitle";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import ShowMore from "components/showMore/ShowMore";
-import SubTitle from "components/content/SubTitle";
-import { receiveCollapseStates } from "tradeRegister/actions";
-import { CollapseStatePaths, CompanyRepresentFieldPaths, CompanyRepresentFieldTitles } from "tradeRegister/enums";
-import { formatDate } from "util/helpers";
-import { getUiDataTradeRegisterCompanyRepresentKey } from "uiData/helpers";
-import { getCollapseStateByKey, getCompanyRepresentById, getIsFetchingCompanyRepresentById } from "tradeRegister/selectors";
+import BoxItem from "@/components/content/BoxItem";
+import BoxItemContainer from "@/components/content/BoxItemContainer";
+import Collapse from "@/components/collapse/Collapse";
+import FormText from "@/components/form/FormText";
+import FormTextTitle from "@/components/form/FormTextTitle";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import ShowMore from "@/components/showMore/ShowMore";
+import SubTitle from "@/components/content/SubTitle";
+import { receiveCollapseStates } from "@/tradeRegister/actions";
+import { CollapseStatePaths, CompanyRepresentFieldPaths, CompanyRepresentFieldTitles } from "@/tradeRegister/enums";
+import { formatDate } from "@/util/helpers";
+import { getUiDataTradeRegisterCompanyRepresentKey } from "@/uiData/helpers";
+import { getCollapseStateByKey, getCompanyRepresentById, getIsFetchingCompanyRepresentById } from "@/tradeRegister/selectors";
 type JusristicPersonProps = {
   person: Record<string, any>;
 };
diff --git a/src/tradeRegister/components/DownloadableFiles.tsx b/src/tradeRegister/components/DownloadableFiles.tsx
index d470d409d..bbfa228d1 100644
--- a/src/tradeRegister/components/DownloadableFiles.tsx
+++ b/src/tradeRegister/components/DownloadableFiles.tsx
@@ -1,15 +1,15 @@
 import React, { Fragment } from "react";
 import { connect } from "react-redux";
 import { Row, Column } from "react-foundation";
-import Collapse from "components/collapse/Collapse";
-import FormText from "components/form/FormText";
-import FileDownloadLink from "components/file/FileDownloadLink";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import { receiveCollapseStates } from "tradeRegister/actions";
-import { CollapseStatePaths } from "tradeRegister/enums";
-import { getCollapseStateByKey, getCompanyExtendedById, getIsFetchingCompanyExtendedById } from "tradeRegister/selectors";
-import createUrlWithoutVersionSuffix from "api/createUrlWithoutVersionSuffix";
+import Collapse from "@/components/collapse/Collapse";
+import FormText from "@/components/form/FormText";
+import FileDownloadLink from "@/components/file/FileDownloadLink";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import { receiveCollapseStates } from "@/tradeRegister/actions";
+import { CollapseStatePaths } from "@/tradeRegister/enums";
+import { getCollapseStateByKey, getCompanyExtendedById, getIsFetchingCompanyExtendedById } from "@/tradeRegister/selectors";
+import createUrlWithoutVersionSuffix from "@/api/createUrlWithoutVersionSuffix";
 type Props = {
   businessId: string;
   companyExtended: Record<string, any> | null | undefined;
diff --git a/src/tradeRegister/components/Search.tsx b/src/tradeRegister/components/Search.tsx
index 3609d8108..fa9bd4acb 100644
--- a/src/tradeRegister/components/Search.tsx
+++ b/src/tradeRegister/components/Search.tsx
@@ -3,14 +3,14 @@ import { connect } from "react-redux";
 import { getFormValues, reduxForm } from "redux-form";
 import { Row, Column } from "react-foundation";
 import flowRight from "lodash/flowRight";
-import Button from "components/button/Button";
-import FormField from "components/form/FormField";
-import SearchInputColumn from "components/search/SearchInputColumn";
-import SearchLabel from "components/search/SearchLabel";
-import SearchLabelColumn from "components/search/SearchLabelColumn";
-import SearchRow from "components/search/SearchRow";
-import { FieldTypes, FormNames } from "enums";
-import { ButtonColors } from "components/enums";
+import Button from "@/components/button/Button";
+import FormField from "@/components/form/FormField";
+import SearchInputColumn from "@/components/search/SearchInputColumn";
+import SearchLabel from "@/components/search/SearchLabel";
+import SearchLabelColumn from "@/components/search/SearchLabelColumn";
+import SearchRow from "@/components/search/SearchRow";
+import { FieldTypes, FormNames } from "@/enums";
+import { ButtonColors } from "@/components/enums";
 type Props = {
   formValues?: Record<string, any>;
   handleSubmit?: (...args: Array<any>) => any;
diff --git a/src/tradeRegister/components/TradeRegisterSearchPage.tsx b/src/tradeRegister/components/TradeRegisterSearchPage.tsx
index 1b7d78604..da7f7f27f 100644
--- a/src/tradeRegister/components/TradeRegisterSearchPage.tsx
+++ b/src/tradeRegister/components/TradeRegisterSearchPage.tsx
@@ -5,20 +5,20 @@ import { Row, Column } from "react-foundation";
 import { withRouter } from "react-router";
 import flowRight from "lodash/flowRight";
 import isEmpty from "lodash/isEmpty";
-import AuthorizationError from "components/authorization/AuthorizationError";
-import ContentContainer from "components/content/ContentContainer";
-import Divider from "components/content/Divider";
-import Loader from "components/loader/Loader";
-import PageContainer from "components/content/PageContainer";
-import Search from "tradeRegister/components/Search";
-import TradeRegisterTemplate from "tradeRegister/components/TradeRegisterTemplate";
-import { receiveTopNavigationSettings } from "components/topNavigation/actions";
-import { FormNames, PermissionMissingTexts } from "enums";
-import { UsersPermissions } from "usersPermissions/enums";
-import { hasPermissions, getSearchQuery, getUrlParams, setPageTitle } from "util/helpers";
-import { getRouteById, Routes } from "root/routes";
-import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors";
-import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types";
+import AuthorizationError from "@/components/authorization/AuthorizationError";
+import ContentContainer from "@/components/content/ContentContainer";
+import Divider from "@/components/content/Divider";
+import Loader from "@/components/loader/Loader";
+import PageContainer from "@/components/content/PageContainer";
+import Search from "@/tradeRegister/components/Search";
+import TradeRegisterTemplate from "@/tradeRegister/components/TradeRegisterTemplate";
+import { receiveTopNavigationSettings } from "@/components/topNavigation/actions";
+import { FormNames, PermissionMissingTexts } from "@/enums";
+import { UsersPermissions } from "@/usersPermissions/enums";
+import { hasPermissions, getSearchQuery, getUrlParams, setPageTitle } from "@/util/helpers";
+import { getRouteById, Routes } from "@/root/routes";
+import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors";
+import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types";
 type Props = {
   history: Record<string, any>;
   initialize: (...args: Array<any>) => any;
diff --git a/src/tradeRegister/components/TradeRegisterTemplate.tsx b/src/tradeRegister/components/TradeRegisterTemplate.tsx
index e87bcef9c..85c17e9f1 100644
--- a/src/tradeRegister/components/TradeRegisterTemplate.tsx
+++ b/src/tradeRegister/components/TradeRegisterTemplate.tsx
@@ -1,14 +1,14 @@
 import React, { Fragment, PureComponent } from "react";
 import { connect } from "react-redux";
 import flowRight from "lodash/flowRight";
-import CompanyExtended from "tradeRegister/components/CompanyExtended";
-import CompanyNotice from "tradeRegister/components/CompanyNotice";
-import CompanyRepresent from "tradeRegister/components/CompanyRepresent";
-import DownloadableFiles from "tradeRegister/components/DownloadableFiles";
-import Loader from "components/loader/Loader";
-import LoaderWrapper from "components/loader/LoaderWrapper";
-import { fetchTradeRegisterCompanyExtendedById, fetchTradeRegisterCompanyNoticeById, fetchTradeRegisterCompanyRepresentById } from "tradeRegister/actions";
-import { getCompanyExtendedById, getCompanyNoticeById, getCompanyRepresentById, getIsFetchingCompanyExtendedById, getIsFetchingCompanyNoticeById, getIsFetchingCompanyRepresentById } from "tradeRegister/selectors";
+import CompanyExtended from "@/tradeRegister/components/CompanyExtended";
+import CompanyNotice from "@/tradeRegister/components/CompanyNotice";
+import CompanyRepresent from "@/tradeRegister/components/CompanyRepresent";
+import DownloadableFiles from "@/tradeRegister/components/DownloadableFiles";
+import Loader from "@/components/loader/Loader";
+import LoaderWrapper from "@/components/loader/LoaderWrapper";
+import { fetchTradeRegisterCompanyExtendedById, fetchTradeRegisterCompanyNoticeById, fetchTradeRegisterCompanyRepresentById } from "@/tradeRegister/actions";
+import { getCompanyExtendedById, getCompanyNoticeById, getCompanyRepresentById, getIsFetchingCompanyExtendedById, getIsFetchingCompanyNoticeById, getIsFetchingCompanyRepresentById } from "@/tradeRegister/selectors";
 type Props = {
   businessId: string;
   companyExtended: Record<string, any> | null | undefined;
diff --git a/src/tradeRegister/reducer.ts b/src/tradeRegister/reducer.ts
index af74d05c0..884dab529 100644
--- a/src/tradeRegister/reducer.ts
+++ b/src/tradeRegister/reducer.ts
@@ -1,7 +1,7 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
 import type { Reducer } from "types";
-import type { TradeRegisterDataMap, TradeRegisterIsFetchingMap, FetchTradeRegisterCompanyExtendedByIdAction, ReceiveTradeRegisterCompanyExtendedByIdAction, CompanyExtendedNotFoundByIdAction, FetchTradeRegisterCompanyNoticeByIdAction, ReceiveTradeRegisterCompanyNoticeByIdAction, CompanyNoticeNotFoundByIdAction, FetchTradeRegisterCompanyRepresentByIdAction, ReceiveTradeRegisterCompanyRepresentByIdAction, CompanyRepresentNotFoundByIdAction, ReceiveCollapseStatesAction } from "tradeRegister/types";
+import type { TradeRegisterDataMap, TradeRegisterIsFetchingMap, FetchTradeRegisterCompanyExtendedByIdAction, ReceiveTradeRegisterCompanyExtendedByIdAction, CompanyExtendedNotFoundByIdAction, FetchTradeRegisterCompanyNoticeByIdAction, ReceiveTradeRegisterCompanyNoticeByIdAction, CompanyNoticeNotFoundByIdAction, FetchTradeRegisterCompanyRepresentByIdAction, ReceiveTradeRegisterCompanyRepresentByIdAction, CompanyRepresentNotFoundByIdAction, ReceiveCollapseStatesAction } from "@/tradeRegister/types";
 const isFetchingCompanyExtendedByIdReducer: Reducer<TradeRegisterIsFetchingMap> = handleActions({
   ['mvj/tradeRegister/FETCH_COMPANY_EXTENDED_BY_ID']: (state: TradeRegisterIsFetchingMap, {
     payload: businessId
diff --git a/src/tradeRegister/requests.ts b/src/tradeRegister/requests.ts
index 415755db9..e940aa649 100644
--- a/src/tradeRegister/requests.ts
+++ b/src/tradeRegister/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "api/callApi";
-import createUrlWithoutVersionSuffix from "api/createUrlWithoutVersionSuffix";
+import callApi from "@/api/callApi";
+import createUrlWithoutVersionSuffix from "@/api/createUrlWithoutVersionSuffix";
 export const fetchCompanyExtended = (businessId: string): Generator<any, any, any> => {
   return callApi(new Request(createUrlWithoutVersionSuffix(`trade_register/company_extended/${businessId}/`)));
 };
diff --git a/src/tradeRegister/saga.ts b/src/tradeRegister/saga.ts
index aeebd00f6..3ce93ea8a 100644
--- a/src/tradeRegister/saga.ts
+++ b/src/tradeRegister/saga.ts
@@ -1,5 +1,5 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
-import { receiveError } from "api/actions";
+import { receiveError } from "@/api/actions";
 import { receiveTradeRegisterCompanyExtendedById, companyExtendedNotFoundById, receiveTradeRegisterCompanyNoticeById, companyNoticeNotFoundById, receiveTradeRegisterCompanyRepresentById, companyRepresentNotFoundById } from "./actions";
 import { fetchCompanyExtended, fetchCompanyNotice, fetchCompanyRepresent } from "./requests";
 
diff --git a/src/tradeRegister/selectors.ts b/src/tradeRegister/selectors.ts
index c19914fa5..70ec339a3 100644
--- a/src/tradeRegister/selectors.ts
+++ b/src/tradeRegister/selectors.ts
@@ -1,4 +1,4 @@
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 import type { Selector } from "types";
 export const getIsFetchingCompanyExtendedById: Selector<boolean, string> = (state: RootState, businessId: string): boolean => state.tradeRegister.isFetchingCompanyExtendedById[businessId];
 export const getCompanyExtendedById: Selector<Record<string, any> | null | undefined, string> = (state: RootState, businessId: string): Record<string, any> | null | undefined => state.tradeRegister.companyExtendedById[businessId];
diff --git a/src/tradeRegister/spec.ts b/src/tradeRegister/tradeRegister.spec.ts
similarity index 99%
rename from src/tradeRegister/spec.ts
rename to src/tradeRegister/tradeRegister.spec.ts
index 6f6afbe9b..611ed6e32 100644
--- a/src/tradeRegister/spec.ts
+++ b/src/tradeRegister/tradeRegister.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchTradeRegisterCompanyExtendedById, companyExtendedNotFoundById, receiveTradeRegisterCompanyExtendedById, fetchTradeRegisterCompanyNoticeById, companyNoticeNotFoundById, receiveTradeRegisterCompanyNoticeById, fetchTradeRegisterCompanyRepresentById, companyRepresentNotFoundById, receiveTradeRegisterCompanyRepresentById, receiveCollapseStates } from "./actions";
 import tradeRegisterReducer from "./reducer";
 import type { TradeRegisterState } from "./types";
diff --git a/src/types.ts b/src/types.ts
index 50d9e89c3..cad89edd8 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -1,4 +1,4 @@
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 export type Action<Type extends string, Payload> = {
   type: Type;
   payload: Payload;
diff --git a/src/uiData/actions.ts b/src/uiData/actions.ts
index f13ecbd65..0a96e973c 100644
--- a/src/uiData/actions.ts
+++ b/src/uiData/actions.ts
@@ -1,6 +1,6 @@
 import { createAction } from "redux-actions";
 import type { Attributes, Methods } from "types";
-import type { UiDataList, CreateUiDataPayload, EditUiDataPayload, FetchAttributesAction, ReceiveAttributesAction, ReceiveMethodsAction, AttributesNotFoundAction, FetchUiDataListAction, ReceiveUiDataListAction, CreateUiDataAction, DeleteUiDataAction, EditUiDataAction, NotFoundAction } from "uiData/types";
+import type { UiDataList, CreateUiDataPayload, EditUiDataPayload, FetchAttributesAction, ReceiveAttributesAction, ReceiveMethodsAction, AttributesNotFoundAction, FetchUiDataListAction, ReceiveUiDataListAction, CreateUiDataAction, DeleteUiDataAction, EditUiDataAction, NotFoundAction } from "@/uiData/types";
 export const fetchAttributes = (): FetchAttributesAction => createAction('mvj/uiData/FETCH_ATTRIBUTES')();
 export const receiveAttributes = (attributes: Attributes): ReceiveAttributesAction => createAction('mvj/uiData/RECEIVE_ATTRIBUTES')(attributes);
 export const receiveMethods = (methods: Methods): ReceiveMethodsAction => createAction('mvj/uiData/RECEIVE_METHODS')(methods);
diff --git a/src/uiData/helpers.ts b/src/uiData/helpers.ts
index f23bead29..ddb957f37 100644
--- a/src/uiData/helpers.ts
+++ b/src/uiData/helpers.ts
@@ -1,4 +1,4 @@
-import { UiDataPrefixes } from "uiData/enums";
+import { UiDataPrefixes } from "@/uiData/enums";
 import type { UiDataList } from "./types";
 
 /**
diff --git a/src/uiData/reducer.ts b/src/uiData/reducer.ts
index 6d8828670..9932eddfa 100644
--- a/src/uiData/reducer.ts
+++ b/src/uiData/reducer.ts
@@ -1,7 +1,7 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
 import type { Attributes, Methods, Reducer } from "types";
-import type { UiDataList, ReceiveAttributesAction, ReceiveMethodsAction, ReceiveUiDataListAction } from "uiData/types";
+import type { UiDataList, ReceiveAttributesAction, ReceiveMethodsAction, ReceiveUiDataListAction } from "@/uiData/types";
 const isFetchingAttributesReducer: Reducer<boolean> = handleActions({
   'mvj/uiData/FETCH_ATTRIBUTES': () => true,
   'mvj/uiData/RECEIVE_METHODS': () => false,
diff --git a/src/uiData/requests.ts b/src/uiData/requests.ts
index 785a0449c..fc67975e5 100644
--- a/src/uiData/requests.ts
+++ b/src/uiData/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "api/callApi";
-import createUrl from "api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 export const fetchAttributes = () => {
   return callApi(new Request(createUrl('ui_data/'), {
     method: 'OPTIONS'
diff --git a/src/uiData/saga.ts b/src/uiData/saga.ts
index c89702757..c818e9926 100644
--- a/src/uiData/saga.ts
+++ b/src/uiData/saga.ts
@@ -1,8 +1,8 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { SubmissionError } from "redux-form";
-import { receiveError } from "api/actions";
+import { receiveError } from "@/api/actions";
 import { attributesNotFound, fetchUiDataList as fetchUiDataListAction, receiveAttributes, receiveMethods, receiveUiDataList, notFound } from "./actions";
-import { displayUIMessage } from "util/helpers";
+import { displayUIMessage } from "@/util/helpers";
 import { createUiData, deleteUiData, editUiData, fetchAttributes, fetchUiDataList } from "./requests";
 
 function* fetchAttributesSaga(): Generator<any, any, any> {
diff --git a/src/uiData/selectors.ts b/src/uiData/selectors.ts
index 87aa269bb..0295dc1e9 100644
--- a/src/uiData/selectors.ts
+++ b/src/uiData/selectors.ts
@@ -1,5 +1,5 @@
-import type { Attributes, Methods, Selector } from "../types";
-import type { RootState } from "../root/types";
+import type { Attributes, Methods, Selector } from "@/types";
+import type { RootState } from "@/root/types";
 import type { UiDataList } from "./types";
 export const getIsFetchingAttributes: Selector<boolean, void> = (state: RootState): boolean => state.uiData.isFetchingAttributes;
 export const getAttributes: Selector<Attributes, void> = (state: RootState): Attributes => state.uiData.attributes;
diff --git a/src/uiData/spec.ts b/src/uiData/uiData.spec.ts
similarity index 98%
rename from src/uiData/spec.ts
rename to src/uiData/uiData.spec.ts
index 5b4df63e3..aa7fb3373 100644
--- a/src/uiData/spec.ts
+++ b/src/uiData/uiData.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchAttributes, attributesNotFound, receiveAttributes, receiveMethods, fetchUiDataList, createUiData, deleteUiData, editUiData, receiveUiDataList, notFound } from "./actions";
 import uiDataReducer from "./reducer";
 import type { UiDataState } from "./types";
diff --git a/src/users/helpers.ts b/src/users/helpers.ts
index 9d017f617..69807163c 100644
--- a/src/users/helpers.ts
+++ b/src/users/helpers.ts
@@ -1,4 +1,4 @@
-import { sortStringByKeyAsc } from "util/helpers";
+import { sortStringByKeyAsc } from "@/util/helpers";
 import type { UserList } from "./types";
 
 /**
diff --git a/src/users/reducer.ts b/src/users/reducer.ts
index 70a474d0c..bfe7f5461 100644
--- a/src/users/reducer.ts
+++ b/src/users/reducer.ts
@@ -1,6 +1,6 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
-import type { Reducer } from "../types";
+import type { Reducer } from "@/types";
 import type { UserList, ReceiveUsersAction } from "./types";
 const isFetchingReducer: Reducer<boolean> = handleActions({
   'mvj/users/FETCH_ALL': () => true,
diff --git a/src/users/requests.ts b/src/users/requests.ts
index 2833962cf..82a1abbd2 100644
--- a/src/users/requests.ts
+++ b/src/users/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 export const fetchUsers = (search: string): Generator<any, any, any> => {
   return callApi(new Request(createUrl(`user/${search || ''}`)));
 };
\ No newline at end of file
diff --git a/src/users/requestsAsync.ts b/src/users/requestsAsync.ts
index 8c57a9cff..4d677460d 100644
--- a/src/users/requestsAsync.ts
+++ b/src/users/requestsAsync.ts
@@ -1,5 +1,5 @@
-import createUrl from "api/createUrl";
-import callApiAsync from "api/callApiAsync";
+import createUrl from "@/api/createUrl";
+import callApiAsync from "@/api/callApiAsync";
 export const fetchUsers = async (query?: Record<string, any>): Promise<Array<Record<string, any>>> => {
   const {
     response: {
diff --git a/src/users/saga.ts b/src/users/saga.ts
index da84255b8..9d8767e36 100644
--- a/src/users/saga.ts
+++ b/src/users/saga.ts
@@ -2,7 +2,7 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import get from "lodash/get";
 import { receiveUsers, notFound } from "./actions";
 import { fetchUsers } from "./requests";
-import { receiveError } from "../api/actions";
+import { receiveError } from "@/api/actions";
 
 function* fetchUsersSaga({
   payload: search,
diff --git a/src/users/selectors.ts b/src/users/selectors.ts
index e858eb595..d257c78b4 100644
--- a/src/users/selectors.ts
+++ b/src/users/selectors.ts
@@ -1,5 +1,5 @@
 import type { Selector } from "types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 import type { UserList } from "./types";
 export const getIsFetching: Selector<boolean, void> = (state: RootState): boolean => state.user.isFetching;
 export const getUsers: Selector<UserList, void> = (state: RootState): UserList => state.user.list;
\ No newline at end of file
diff --git a/src/users/types.ts b/src/users/types.ts
index 3e26b7191..5e704a17a 100644
--- a/src/users/types.ts
+++ b/src/users/types.ts
@@ -1,4 +1,4 @@
-import type { Action } from "../types";
+import type { Action } from "@/types";
 export type UserState = {
   isFetching: boolean;
   list: UserList;
diff --git a/src/users/spec.ts b/src/users/users.spec.ts
similarity index 96%
rename from src/users/spec.ts
rename to src/users/users.spec.ts
index 2354231c7..80ecc50a1 100644
--- a/src/users/spec.ts
+++ b/src/users/users.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchUsers, receiveUsers, notFound } from "./actions";
 import usersReducer from "./reducer";
 import type { UserState } from "./types";
diff --git a/src/usersPermissions/reducer.ts b/src/usersPermissions/reducer.ts
index 6bbf0c6f0..a282f0a5a 100644
--- a/src/usersPermissions/reducer.ts
+++ b/src/usersPermissions/reducer.ts
@@ -1,6 +1,6 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
-import type { Reducer } from "../types";
+import type { Reducer } from "@/types";
 import type { UserGroups, UsersPermissions, UserServiceUnits, UserServiceUnit, ReceiveUserGroupsAction, ReceiveUsersPermissionsAction, ReceiveUserServiceUnitsAction, SetUserActiveServiceUnitAction } from "./types";
 const isFetchingReducer: Reducer<boolean> = handleActions({
   'mvj/usersPermissions/FETCH_ALL': () => true,
diff --git a/src/usersPermissions/requests.ts b/src/usersPermissions/requests.ts
index 0d4a1ea92..41a134130 100644
--- a/src/usersPermissions/requests.ts
+++ b/src/usersPermissions/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 export const fetchUsersPermissions = (): Generator<any, any, any> => {
   return callApi(new Request(createUrl('users_permissions/')));
 };
\ No newline at end of file
diff --git a/src/usersPermissions/saga.ts b/src/usersPermissions/saga.ts
index e28f80ecd..1a47852a0 100644
--- a/src/usersPermissions/saga.ts
+++ b/src/usersPermissions/saga.ts
@@ -1,7 +1,7 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { receiveUserGroups, receiveUsersPermissions, receiveUserServiceUnits, setUserActiveServiceUnit, notFound } from "./actions";
 import { fetchUsersPermissions } from "./requests";
-import { receiveError } from "../api/actions";
+import { receiveError } from "@/api/actions";
 
 function* fetchUsersPermissionsSaga(): Generator<any, any, any> {
   try {
diff --git a/src/usersPermissions/selectors.ts b/src/usersPermissions/selectors.ts
index e2e475f2a..707ad547a 100644
--- a/src/usersPermissions/selectors.ts
+++ b/src/usersPermissions/selectors.ts
@@ -1,5 +1,5 @@
 import type { Selector } from "types";
-import type { RootState } from "root/types";
+import type { RootState } from "@/root/types";
 import type { UserGroups, UsersPermissions, UserServiceUnit, UserServiceUnits } from "./types";
 export const getIsFetching: Selector<boolean, void> = (state: RootState): boolean => state.usersPermissions.isFetching;
 export const getUserGroups: Selector<UserGroups, void> = (state: RootState): UserGroups => state.usersPermissions.groups;
diff --git a/src/usersPermissions/types.ts b/src/usersPermissions/types.ts
index f6c9c1e41..4d940aa8c 100644
--- a/src/usersPermissions/types.ts
+++ b/src/usersPermissions/types.ts
@@ -1,4 +1,4 @@
-import type { Action } from "../types";
+import type { Action } from "@/types";
 export type UserGroups = Array<string>;
 export type UsersPermissions = Array<Record<string, any>>;
 export type UserServiceUnit = Record<string, any>;
diff --git a/src/usersPermissions/spec.ts b/src/usersPermissions/usersPermissions.spec.ts
similarity index 95%
rename from src/usersPermissions/spec.ts
rename to src/usersPermissions/usersPermissions.spec.ts
index 0e136015f..79dde262a 100644
--- a/src/usersPermissions/spec.ts
+++ b/src/usersPermissions/usersPermissions.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { fetchUsersPermissions, receiveUserGroups, receiveUsersPermissions, notFound } from "./actions";
 import usersPermissionsReducer from "./reducer";
 import type { UsersPermissionsState } from "./types";
@@ -11,11 +11,8 @@ const defaultState: UsersPermissionsState = {
 };
 
 describe('Users permissions', () => {
-  // $FlowFixMe
   describe('Reducer', () => {
-    // $FlowFixMe
     describe('usersPermissionsReducer', () => {
-      // $FlowFixMe
       it('should update user groups', () => {
         const dummyUserGroups = ['UserGroup1'];
         const newState = { ...defaultState,
diff --git a/src/util/forms.ts b/src/util/forms.ts
index 7ab5f0013..066276792 100644
--- a/src/util/forms.ts
+++ b/src/util/forms.ts
@@ -1,9 +1,9 @@
-import { isContactFormDirty } from "contacts/helpers";
-import { isInfillDevelopmentFormDirty } from "infillDevelopment/helpers";
-import { isAnyLandUseContractFormDirty } from "landUseContract/helpers";
-import { isAnyLeaseFormDirty } from "leases/helpers";
-import { isRentBasisFormDirty } from "rentbasis/helpers";
-import { store } from "root/startApp";
+import { isContactFormDirty } from "@/contacts/helpers";
+import { isInfillDevelopmentFormDirty } from "@/infillDevelopment/helpers";
+import { isAnyLandUseContractFormDirty } from "@/landUseContract/helpers";
+import { isAnyLeaseFormDirty } from "@/leases/helpers";
+import { isRentBasisFormDirty } from "@/rentbasis/helpers";
+import { store } from "@/index";
 
 /**
  * Test has any page dirty forms
diff --git a/src/util/helpers.tsx b/src/util/helpers.tsx
index 6a71b8298..098c823c7 100644
--- a/src/util/helpers.tsx
+++ b/src/util/helpers.tsx
@@ -8,11 +8,11 @@ import isArray from "lodash/isArray";
 import isEmpty from "lodash/isEmpty";
 import isNumber from "lodash/isNumber";
 import { toastr } from "react-redux-toastr";
-import ToastrIcons from "components/toastr/ToastrIcons";
-import { PAIKKATIETOPALVELU_URL } from "util/constants";
-import { Breakpoints } from "foundation/enums";
-import type { ApiResponse, Attributes, Methods } from "types";
-import type { UsersPermissions } from "usersPermissions/types";
+import ToastrIcons from "@/components/toastr/ToastrIcons";
+import { PAIKKATIETOPALVELU_URL } from "@/util/constants";
+import { Breakpoints } from "@/foundation/enums";
+import type { ApiResponse, Attributes, Methods } from "@/types";
+import type { UsersPermissions } from "@/usersPermissions/types";
 
 /**
  * Compose page title
@@ -42,11 +42,11 @@ export const setPageTitle = (title: string, prepend?: boolean) => {
 
 /* istanbul ignore next */
 export const getDocumentWidth = (): number => {
-  return Math.max( // $FlowFixMe
-  document.documentElement['clientWidth'], // $FlowFixMe
-  document.body['scrollWidth'], // $FlowFixMe
-  document.documentElement['scrollWidth'], // $FlowFixMe
-  document.body['offsetWidth'], // $FlowFixMe
+  return Math.max(
+  document.documentElement['clientWidth'],
+  document.body['scrollWidth'],
+  document.documentElement['scrollWidth'],
+  document.body['offsetWidth'],
   document.documentElement['offsetWidth']);
 };
 
@@ -123,7 +123,6 @@ export const getSearchQuery = (filters: any): string => {
         return;
       }
 
-      // $FlowFixMe
       query.push(`${key}=${isArray(filter) ? filter.join(',') : encodeURIComponent(filter)}`);
     }
   });
@@ -298,7 +297,7 @@ export const formatDateRange = (startDate: any, endDate: any): string => {
 
 /* istanbul ignore next */
 export const getApiUrlWithOutVersionSuffix = (): string => {
-  return process.env.API_URL ? process.env.API_URL.split('/v1')[0] : '';
+  return import.meta.env.VITE_API_URL ? import.meta.env.VITE_API_URL.split('/v1')[0] : '';
 };
 
 /**
@@ -497,7 +496,6 @@ export const copyElementContentsToClipboard = (el: any): boolean => {
   document.body.appendChild(el);
   selectElementContents(el);
   document.execCommand('copy');
-  // $FlowFixMe
   document.body.removeChild(el);
 
   if (selection && selected) {
@@ -683,7 +681,6 @@ export const findReactById = (id: string | null | undefined): Record<string, any
   const dom = document.getElementById(id);
   if (!dom) return null;
   const key = Object.keys(dom).find(key => key.startsWith('__reactInternalInstance$'));
-  // $FlowFixMe
   const internalInstance = dom[key];
   if (internalInstance == null) return null;
 
diff --git a/src/util/map.ts b/src/util/map.ts
index 37b72768b..dc640a0ed 100644
--- a/src/util/map.ts
+++ b/src/util/map.ts
@@ -1,14 +1,12 @@
 import isArray from "lodash/isArray";
+import * as L from "leaflet";
+import "leaflet-draw";
 import type { LatLngBounds } from "leaflet";
 
 /**
  * Translate leaflet draw literals in Finnish
  */
-
-/* istanbul ignore next */
-export const localizeMap = () => {
-  const L = require('leaflet');
-
+export const localizeMap = (): void => {
   L.drawLocal.draw.handlers.circle.tooltip.start = 'Klikkaa ja raahaa piirtääksesi ympyrän';
   L.drawLocal.draw.handlers.circle.radius = 'Säde';
   L.drawLocal.draw.handlers.polygon.tooltip.start = 'Aloita alueen piirtäminen klikkaamalla.';
@@ -78,22 +76,18 @@ export const getCoordinatesOfGeometry = (geometry: any): Array<[number, number]>
  * @param  {Object} geojson
  * @returns {Object}
  */
-
-/* istanbul ignore next */
 export const formatCoordsToLatLng = (geojson: Record<string, any> | null | undefined): (Record<string, any> | null | undefined) | null => {
-  const L = require('leaflet');
-
   let crs;
 
   if (geojson) {
     if (geojson.crs && geojson.crs.type === 'name') {
       crs = new L.Proj.CRS(geojson.crs.properties.name);
     } else if (geojson.crs && geojson.crs.type) {
-      crs = new L.Proj.CRS(geojson.crs.type + ':' + geojson.crs.properties.code);
+      crs = new L.Proj.CRS(geojson.crs.type, geojson.crs.properties.code);
     }
 
     if (crs !== undefined) {
-      return (coords: Array<Record<string, any>>) => {
+      return (coords: Array<number>) => {
         var point = L.point(coords[0], coords[1]);
         return crs ? crs.projection.unproject(point) : null;
       };
@@ -106,10 +100,7 @@ export const formatCoordsToLatLng = (geojson: Record<string, any> | null | undef
  * @param {Object[]} bbox
  * @returns {Object}
  */
-
-/* istanbul ignore next */
-export const getBoundsFromBBox = (bbox: Array<Record<string, any>>): Record<string, any> => {
-  const L = require('leaflet');
+export const getBoundsFromBBox = (bbox: Array<number>): LatLngBounds => {
 
   if (!bbox || !isArray(bbox) || bbox.length < 4) return null;
   const maxBoundsSouthWest = new L.LatLng(bbox[3], bbox[2]),
@@ -122,11 +113,7 @@ export const getBoundsFromBBox = (bbox: Array<Record<string, any>>): Record<stri
  * @param {Object[]} coordinates
  * @returns Object
  */
-
-/* istanbul ignore next */
 export const getBoundsFromCoordinates = (coordinates: Array<any>): LatLngBounds => {
-  const L = require('leaflet');
-
   const lats = [],
         lons = [];
   coordinates.forEach(coordinate => {
@@ -148,8 +135,6 @@ export const getBoundsFromCoordinates = (coordinates: Array<any>): LatLngBounds
  * @returns Object
  */
 export const getBoundsFromFeatures = (leasesGeoJson: Record<string, any>): Record<string, any> => {
-  const L = require('leaflet');
-
   const lats = [],
         lons = [];
   if (leasesGeoJson && leasesGeoJson.features) leasesGeoJson.features.forEach(feature => {
@@ -189,8 +174,6 @@ export const getCenterFromCoordinates = (coordinates: Array<any>): [number, numb
   return [lng, lat];
 };
 export const getAreaFromGeoJSON = (geometry: Record<string, any>): number => {
-  const L = require('leaflet');
-
   let area = 0;
 
   switch (geometry.type) {
diff --git a/src/util/storage.ts b/src/util/storage.ts
index 417967639..9501ce9ef 100644
--- a/src/util/storage.ts
+++ b/src/util/storage.ts
@@ -30,7 +30,8 @@ export const setStorageItem = (key: string, value: any, callback: ((...args: Arr
     if (callback && typeof callback === 'function') {
       callback();
     }
-  } catch (e) {// fall silently
+  } catch (e) {
+    console.error('Failed to set item to local storage', e);
   }
 };
 
@@ -75,7 +76,8 @@ export const setSessionStorageItem = (key: string, value: any, callback: ((...ar
     if (callback && typeof callback === 'function') {
       callback();
     }
-  } catch (e) {// fall silently
+  } catch (e) {
+    console.error('Failed to set item to session storage', e);
   }
 };
 
@@ -98,7 +100,7 @@ export const removeSessionStorageItem = (key: string, callback: ((...args: Array
  * @returns {string}
  */
 const buildStorageKey = (key: string) => {
-  return [process.env.STORAGE_PREFIX, key].join('.');
+  return [import.meta.env.VITE_STORAGE_PREFIX, key].join('.');
 };
 
 /**
@@ -110,6 +112,7 @@ const isJson = (value: any) => {
   try {
     JSON.parse(value);
   } catch (e) {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     return false;
   }
 
diff --git a/src/util/testUtil.ts b/src/util/testUtil.ts
index c2ece6bb4..ec6af2361 100644
--- a/src/util/testUtil.ts
+++ b/src/util/testUtil.ts
@@ -1,8 +1,8 @@
 import { $Shape } from "utility-types";
-import type { RootState } from "../root/types";
+import type { RootState } from "@/root/types";
 import { createStore } from "redux";
 import { createMemoryHistory } from "history";
-import createRootReducer from "../root/createRootReducer";
+import createRootReducer from "@/root/createRootReducer";
 export const getTestRootState = (overrides: $Shape<RootState> = {}): RootState => {
   const history = createMemoryHistory();
   const rootState = createStore(createRootReducer(history));
diff --git a/src/util/spec.ts b/src/util/util.spec.ts
similarity index 99%
rename from src/util/spec.ts
rename to src/util/util.spec.ts
index 8cc9e5bd3..fcefd3ef4 100644
--- a/src/util/spec.ts
+++ b/src/util/util.spec.ts
@@ -1,12 +1,10 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { isValidDate, getDayMonth, getCurrentYear, sortByStartAndEndDateAsc, sortByStartAndEndDateDesc, isDateRangesCollapsing, splitDateRanges, getSplittedDateRanges, getSplittedDateRangesWithItems } from "./date";
 import { composePageTitle, getSearchQuery, getUrlParams, fixedLengthNumber, getEpochTime, isEmptyValue, formatNumberWithThousandSeparator, formatDecimalNumber, formatNumber, isDecimalNumberStr, convertStrToDecimalNumber, formatDate, formatDateRange, getReferenceNumberLink, findItemById, getLabelOfOption, sortNumberByKeyAsc, sortNumberByKeyDesc, sortStringAsc, sortStringDesc, sortStringByKeyAsc, sortStringByKeyDesc, sortByOptionsAsc, sortByOptionsDesc, addEmptyOption, isFieldRequired, isFieldAllowedToEdit, isFieldAllowedToRead, isMethodAllowed, hasPermissions, getFieldAttributeOptions, getFieldOptions, humanReadableByteCount, hasNumber, findFromOcdString, createPTPPlanReportUrl, createPTPPlotDivisionUrl, getApiResponseCount, getApiResponseMaxPage, getApiResponseResults, isActive, isActiveOrFuture, isArchived } from "./helpers";
 import { getCoordinatesOfGeometry, getCenterFromCoordinates } from "./map";
 
 describe('utils', () => {
-  // $FlowFixMe
   describe('date.js', () => {
-    // $FlowFixMe
     it('0999-12-31 should be invalid date', () => {
       expect(isValidDate(new Date('0999-12-31'))).to.deep.equal(false);
     });
@@ -510,7 +508,6 @@ describe('utils', () => {
     });
   });
   describe('helpers.js', () => {
-    // $FlowFixMe
     it('Should return correct title', () => {
       expect(composePageTitle('foo')).to.deep.equal('foo | Maanvuokrausjärjestelmä | Helsingin Kaupunki');
       expect(composePageTitle()).to.deep.equal('Maanvuokrausjärjestelmä | Helsingin Kaupunki');
@@ -1225,7 +1222,6 @@ describe('utils', () => {
     });
   });
   describe('map.js', () => {
-    // $FlowFixMe
     it('Should return coordinates of a geometry', () => {
       const coordinates = [[24.945222, 60.176976], [24.945222, 60.179629], [24.957479, 60.179629], [24.957479, 60.176976], [24.945222, 60.176976]];
       const geometry = {
diff --git a/src/vat/reducer.ts b/src/vat/reducer.ts
index b3d2adcf8..de4916bc8 100644
--- a/src/vat/reducer.ts
+++ b/src/vat/reducer.ts
@@ -1,6 +1,6 @@
 import { combineReducers } from "redux";
 import { handleActions } from "redux-actions";
-import type { Reducer } from "../types";
+import type { Reducer } from "@/types";
 import type { VatList, ReceiveVatsAction } from "./types";
 const isFetchingReducer: Reducer<boolean> = handleActions({
   'mvj/vat/FETCH_ALL': () => true,
diff --git a/src/vat/requests.ts b/src/vat/requests.ts
index e2c292d52..ce7bd7b27 100644
--- a/src/vat/requests.ts
+++ b/src/vat/requests.ts
@@ -1,5 +1,5 @@
-import callApi from "../api/callApi";
-import createUrl from "../api/createUrl";
+import callApi from "@/api/callApi";
+import createUrl from "@/api/createUrl";
 export const fetchVats = (): Generator<any, any, any> => {
   return callApi(new Request(createUrl(`vat/?limit=10000`)));
 };
\ No newline at end of file
diff --git a/src/vat/saga.ts b/src/vat/saga.ts
index 62eeaac39..eb233e072 100644
--- a/src/vat/saga.ts
+++ b/src/vat/saga.ts
@@ -1,7 +1,7 @@
 import { all, call, fork, put, takeLatest } from "redux-saga/effects";
 import { notFound, receiveVats } from "./actions";
 import { fetchVats } from "./requests";
-import { receiveError } from "api/actions";
+import { receiveError } from "@/api/actions";
 
 function* fetchVatsSaga(): Generator<any, any, any> {
   try {
diff --git a/src/vat/selectors.ts b/src/vat/selectors.ts
index cb67bbd75..bf6c3b4a3 100644
--- a/src/vat/selectors.ts
+++ b/src/vat/selectors.ts
@@ -1,5 +1,5 @@
-import type { Selector } from "../types";
-import type { RootState } from "../root/types";
+import type { Selector } from "@/types";
+import type { RootState } from "@/root/types";
 import type { VatList } from "./types";
 export const getIsFetching: Selector<boolean, void> = (state: RootState): boolean => state.vat.isFetching;
 export const getVats: Selector<VatList, void> = (state: RootState): VatList => {
diff --git a/src/vat/types.ts b/src/vat/types.ts
index 81e84a3c0..28d7375dd 100644
--- a/src/vat/types.ts
+++ b/src/vat/types.ts
@@ -1,4 +1,4 @@
-import type { Action } from "../types";
+import type { Action } from "@/types";
 export type VatState = {
   isFetching: boolean;
   list: VatList;
diff --git a/src/vat/spec.ts b/src/vat/vat.spec.ts
similarity index 93%
rename from src/vat/spec.ts
rename to src/vat/vat.spec.ts
index b4cf9bd3a..612bddd20 100644
--- a/src/vat/spec.ts
+++ b/src/vat/vat.spec.ts
@@ -1,4 +1,4 @@
-import { expect } from "chai";
+import { describe, expect, it } from "vitest";
 import { receiveVats, fetchVats, notFound } from "./actions";
 import vatsReducer from "./reducer";
 import type { VatState } from "./types";
@@ -8,11 +8,8 @@ const defaultState: VatState = {
 };
 
 describe('Vats', () => {
-  // $FlowFixMe
   describe('Reducer', () => {
-    // $FlowFixMe
     describe('vatsReducer', () => {
-      // $FlowFixMe
       it('should update vats', () => {
         const dummyVats = [{
           id: 1,
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
new file mode 100644
index 000000000..151aa6856
--- /dev/null
+++ b/src/vite-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index 1c552c0ac..42e1750a5 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -11,8 +11,8 @@
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
     /* Language and Environment */
-    "target": "es2016",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
-    // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
+    "target": "ES2020",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "lib": ["dom", "ES2020"],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     "jsx": "react",                                /* Specify what JSX code is generated. */
     // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */
     // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
@@ -25,15 +25,18 @@
     // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
 
     /* Modules */
-    "module": "commonjs",                                /* Specify what module code is generated. */
+    "module": "ESNext",                                /* Specify what module code is generated. */
     "rootDir": "./",                                  /* Specify the root folder within your source files. */
-    // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
+    "moduleResolution": "node",                     /* Specify how TypeScript looks up a file from a given module specifier. */
     "baseUrl": "./src",                                  /* Specify the base directory to resolve non-relative module names. */
-    // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
+    "paths": {
+      "@/*": ["./*"],
+    },                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
     "typeRoots": [
       "./node_modules/@types",
-      "./src/types"
+      "./src/types",
+      "./types"
     ],                                  /* Specify multiple folders that act like './node_modules/@types'. */
     // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
     // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
@@ -58,7 +61,7 @@
     "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
     // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
     // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
-    // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
+    "outDir": "./dist",                                   /* Specify an output folder for all emitted files. */
     // "removeComments": true,                           /* Disable emitting comments. */
     // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
@@ -77,7 +80,7 @@
     // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
 
     /* Interop Constraints */
-    // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
+    "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
     // "verbatimModuleSyntax": true,                     /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */
     // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
     "esModuleInterop": true,                             /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
@@ -106,14 +109,16 @@
     "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
 
     /* Completeness */
-    "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
+    "skipDefaultLibCheck": false,                      /* Skip type checking .d.ts files that are included with TypeScript. */
     "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
   },
   "include": [
     "src",
+    "src/**/*",
     "types"
   ],
   "exclude": [
+    "**/*.spec.ts",
     "defs",
     "**/node_modules",
     "**/.*/",
diff --git a/types/proj4leaflet.d.ts b/types/proj4leaflet.d.ts
deleted file mode 100644
index 198c5123f..000000000
--- a/types/proj4leaflet.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import * as L from 'leaflet';
-
-declare module 'leaflet' {
-    namespace Proj {
-        class CRS extends L.CRS {
-            constructor(code: string, proj4def: string, options?: any);
-          }
-    }
-}
\ No newline at end of file
diff --git a/vite.config.js b/vite.config.js
new file mode 100644
index 000000000..1096f7852
--- /dev/null
+++ b/vite.config.js
@@ -0,0 +1,60 @@
+import { defineConfig } from 'vite';
+import react from '@vitejs/plugin-react';
+import commonjs from 'vite-plugin-commonjs';
+import path from 'path';
+import postcssUrl from 'postcss-url';
+import babel from '@rollup/plugin-babel';
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [
+    react({
+      jsxRuntime: 'classic',
+    }),
+    commonjs(),
+    babel({
+      babelHelpers: 'bundled',
+      extensions: ['.js', '.jsx'],
+      include: ['node_modules/react-foundation/**'],
+      only: ['node_modules/react-foundation/**'],
+      presets: [
+        '@babel/preset-env',
+        '@babel/preset-react',
+      ],
+    }),
+  ],
+  css: {
+    postcss: {
+      plugins: [
+        postcssUrl({}),
+      ]
+    }
+  },
+  resolve: {
+    alias: {
+      '@': path.resolve(__dirname, '/src'),
+  },},
+  define: {
+    'global': {},
+  },
+  optimizeDeps: {
+    esbuildOptions: {
+      loader: {
+        '.js': 'jsx',
+      },
+    },
+  },
+  server: {
+    port: 3000,
+  },
+  test: {
+    globals: true,
+    environment: 'jsdom',
+    alias: {
+      '@': path.resolve(__dirname, '/src'),
+    },
+    coverage: {
+      provider: 'istanbul'
+    },
+  }
+})
diff --git a/yarn.lock b/yarn.lock
index 34565ae1c..1616b7d68 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15,59 +15,49 @@
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@apideck/better-ajv-errors@^0.3.1":
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.6.tgz#957d4c28e886a64a8141f7522783be65733ff097"
-  integrity sha512-P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA==
+"@ampproject/remapping@^2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
+  integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==
   dependencies:
-    json-schema "^0.4.0"
-    jsonpointer "^5.0.0"
-    leven "^3.1.0"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.24"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.1":
+"@babel/code-frame@^7.0.0":
   version "7.10.1"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.1.tgz#d5481c5095daa1c57e16e54c6f9198443afb49ff"
   integrity sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==
   dependencies:
     "@babel/highlight" "^7.10.1"
 
-"@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.8.3":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
-  integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
+"@babel/code-frame@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465"
+  integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==
   dependencies:
-    "@babel/highlight" "^7.23.4"
-    chalk "^2.4.2"
-
-"@babel/compat-data@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.10.1.tgz#b1085ffe72cd17bf2c0ee790fc09f9626011b2db"
-  integrity sha512-CHvCj7So7iCkGKPRFUfryXIkU2gSBw7VSZFYLsqVhrS47269VK2Hfi9S/YcublPMW8k1u2bQBlbDruoQEm4fgw==
-  dependencies:
-    browserslist "^4.12.0"
-    invariant "^2.2.4"
-    semver "^5.5.0"
+    "@babel/highlight" "^7.24.7"
+    picocolors "^1.0.0"
 
-"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.23.3", "@babel/compat-data@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98"
-  integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==
+"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.25.2.tgz#e41928bd33475305c586f6acbbb7e3ade7a6f7f5"
+  integrity sha512-bYcppcpKBvX4znYaPEeFau03bp89ShqNMLs+rmdptMw+heSZh9+z84d2YG+K7cYLbWwzdjtDoW/uqZmPjulClQ==
 
-"@babel/core@^7.11.1", "@babel/core@^7.12.3", "@babel/core@^7.23.9":
-  version "7.23.9"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.9.tgz#b028820718000f267870822fec434820e9b1e4d1"
-  integrity sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==
+"@babel/core@^7.23.9", "@babel/core@^7.24.5", "@babel/core@^7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.25.2.tgz#ed8eec275118d7613e77a352894cd12ded8eba77"
+  integrity sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.23.5"
-    "@babel/generator" "^7.23.6"
-    "@babel/helper-compilation-targets" "^7.23.6"
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helpers" "^7.23.9"
-    "@babel/parser" "^7.23.9"
-    "@babel/template" "^7.23.9"
-    "@babel/traverse" "^7.23.9"
-    "@babel/types" "^7.23.9"
+    "@babel/code-frame" "^7.24.7"
+    "@babel/generator" "^7.25.0"
+    "@babel/helper-compilation-targets" "^7.25.2"
+    "@babel/helper-module-transforms" "^7.25.2"
+    "@babel/helpers" "^7.25.0"
+    "@babel/parser" "^7.25.0"
+    "@babel/template" "^7.25.0"
+    "@babel/traverse" "^7.25.2"
+    "@babel/types" "^7.25.2"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
@@ -83,135 +73,68 @@
     eslint-visitor-keys "^2.1.0"
     semver "^6.3.1"
 
-"@babel/generator@^7.10.1", "@babel/generator@^7.4.0":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.2.tgz#0fa5b5b2389db8bfdfcc3492b551ee20f5dd69a9"
-  integrity sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==
-  dependencies:
-    "@babel/types" "^7.10.2"
-    jsesc "^2.5.1"
-    lodash "^4.17.13"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.23.6":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e"
-  integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==
+"@babel/generator@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.0.tgz#f858ddfa984350bc3d3b7f125073c9af6988f18e"
+  integrity sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==
   dependencies:
-    "@babel/types" "^7.23.6"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
+    "@babel/types" "^7.25.0"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^2.5.1"
 
-"@babel/helper-annotate-as-pure@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz#f6d08acc6f70bbd59b436262553fb2e259a1a268"
-  integrity sha512-ewp3rvJEwLaHgyWGe4wQssC2vjks3E80WiUe2BpMb0KhreTjMROCbxXcEovTrbeGVdQct5VjQfrv9EgC+xMzCw==
+"@babel/helper-annotate-as-pure@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz#5373c7bc8366b12a033b4be1ac13a206c6656aab"
+  integrity sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-annotate-as-pure@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
-  integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz#37d66feb012024f2422b762b9b2a7cfe27c7fba3"
+  integrity sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.1.tgz#0ec7d9be8174934532661f87783eb18d72290059"
-  integrity sha512-cQpVq48EkYxUU0xozpGCLla3wlkdRRqLWu1ksFMXA9CM5KQmyyRpSEsYXbao7JUkOw/tAaYKCaYyZq6HOFYtyw==
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.10.1"
-    "@babel/types" "^7.10.1"
-
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz#5426b109cf3ad47b91120f8328d8ab1be8b0b956"
-  integrity sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==
-  dependencies:
-    "@babel/types" "^7.22.15"
-
-"@babel/helper-compilation-targets@^7.10.2":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.2.tgz#a17d9723b6e2c750299d2a14d4637c76936d8285"
-  integrity sha512-hYgOhF4To2UTB4LTaZepN/4Pl9LD4gfbJx8A34mqoluT8TLbof1mhUlYuNWTEebONa8+UlCC4X0TEXu7AOUyGA==
+"@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.24.7", "@babel/helper-compilation-targets@^7.24.8", "@babel/helper-compilation-targets@^7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz#e1d9410a90974a3a5a66e84ff55ef62e3c02d06c"
+  integrity sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==
   dependencies:
-    "@babel/compat-data" "^7.10.1"
-    browserslist "^4.12.0"
-    invariant "^2.2.4"
-    levenary "^1.1.1"
-    semver "^5.5.0"
-
-"@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.23.6":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991"
-  integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==
-  dependencies:
-    "@babel/compat-data" "^7.23.5"
-    "@babel/helper-validator-option" "^7.23.5"
-    browserslist "^4.22.2"
+    "@babel/compat-data" "^7.25.2"
+    "@babel/helper-validator-option" "^7.24.8"
+    browserslist "^4.23.1"
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.10.1":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.2.tgz#7474295770f217dbcf288bf7572eb213db46ee67"
-  integrity sha512-5C/QhkGFh1vqcziq1vAL6SI9ymzUp8BCYjFpvYVhWP4DlATIb3u5q3iUd35mvlyGs8fO7hckkW7i0tmH+5+bvQ==
-  dependencies:
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/helper-member-expression-to-functions" "^7.10.1"
-    "@babel/helper-optimise-call-expression" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-replace-supers" "^7.10.1"
-    "@babel/helper-split-export-declaration" "^7.10.1"
-
-"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.22.15":
-  version "7.23.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.10.tgz#25d55fafbaea31fd0e723820bb6cc3df72edf7ea"
-  integrity sha512-2XpP2XhkXzgxecPNEEK8Vz8Asj9aRxt08oKOqtiZoqV2UGZ5T+EkyP9sXQ9nwMxBIG34a7jmasVqoMop7VdPUw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-member-expression-to-functions" "^7.23.0"
-    "@babel/helper-optimise-call-expression" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.20"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
+"@babel/helper-create-class-features-plugin@^7.24.7":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.0.tgz#a109bf9c3d58dfed83aaf42e85633c89f43a6253"
+  integrity sha512-GYM6BxeQsETc9mnct+nIIpf63SAyzvyYN7UB/IlTyd+MBg06afFGp0mIeUqGyWgS2mxad6vqbMrHVlaL3m70sQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    "@babel/helper-member-expression-to-functions" "^7.24.8"
+    "@babel/helper-optimise-call-expression" "^7.24.7"
+    "@babel/helper-replace-supers" "^7.25.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
+    "@babel/traverse" "^7.25.0"
     semver "^6.3.1"
 
-"@babel/helper-create-regexp-features-plugin@^7.10.1", "@babel/helper-create-regexp-features-plugin@^7.8.3":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.1.tgz#1b8feeab1594cbcfbf3ab5a3bbcabac0468efdbd"
-  integrity sha512-Rx4rHS0pVuJn5pJOqaqcZR4XSgeF9G/pO/79t+4r7380tXFJdzImFnxMU19f83wjSrmKHq6myrM10pFHTGzkUA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.1"
-    "@babel/helper-regex" "^7.10.1"
-    regexpu-core "^4.7.0"
-
-"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.15", "@babel/helper-create-regexp-features-plugin@^7.22.5":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz#5ee90093914ea09639b01c711db0d6775e558be1"
-  integrity sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.24.7", "@babel/helper-create-regexp-features-plugin@^7.25.0":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz#24c75974ed74183797ffd5f134169316cd1808d9"
+  integrity sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-annotate-as-pure" "^7.24.7"
     regexpu-core "^5.3.1"
     semver "^6.3.1"
 
-"@babel/helper-define-map@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.1.tgz#5e69ee8308648470dd7900d159c044c10285221d"
-  integrity sha512-+5odWpX+OnvkD0Zmq7panrMuAGQBu6aPUgvMzuMGo4R+jUOvealEj2hiqI6WhxgKrTpFoFj0+VdsuA8KDxHBDg==
-  dependencies:
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/types" "^7.10.1"
-    lodash "^4.17.13"
-
-"@babel/helper-define-polyfill-provider@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz#465805b7361f461e86c680f1de21eaf88c25901b"
-  integrity sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==
+"@babel/helper-define-polyfill-provider@^0.6.2":
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz#18594f789c3594acb24cfdb4a7f7b7d2e8bd912d"
+  integrity sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==
   dependencies:
     "@babel/helper-compilation-targets" "^7.22.6"
     "@babel/helper-plugin-utils" "^7.22.5"
@@ -219,262 +142,138 @@
     lodash.debounce "^4.0.8"
     resolve "^1.14.2"
 
-"@babel/helper-environment-visitor@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
-  integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
-
-"@babel/helper-explode-assignable-expression@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.1.tgz#e9d76305ee1162ca467357ae25df94f179af2b7e"
-  integrity sha512-vcUJ3cDjLjvkKzt6rHrl767FeE7pMEYfPanq5L16GRtrXIoznc0HykNW2aEYkcnP76P0isoqJ34dDMFZwzEpJg==
+"@babel/helper-environment-visitor@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz#4b31ba9551d1f90781ba83491dd59cf9b269f7d9"
+  integrity sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==
   dependencies:
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-function-name@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz#92bd63829bfc9215aca9d9defa85f56b539454f4"
-  integrity sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==
+"@babel/helper-member-expression-to-functions@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz#6155e079c913357d24a4c20480db7c712a5c3fb6"
+  integrity sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.10.1"
-    "@babel/template" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/traverse" "^7.24.8"
+    "@babel/types" "^7.24.8"
 
-"@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
-  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
-  dependencies:
-    "@babel/template" "^7.22.15"
-    "@babel/types" "^7.23.0"
-
-"@babel/helper-get-function-arity@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz#7303390a81ba7cb59613895a192b93850e373f7d"
-  integrity sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==
-  dependencies:
-    "@babel/types" "^7.10.1"
-
-"@babel/helper-hoist-variables@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.1.tgz#7e77c82e5dcae1ebf123174c385aaadbf787d077"
-  integrity sha512-vLm5srkU8rI6X3+aQ1rQJyfjvCBLXP8cAGeuw04zeAM2ItKb1e7pmVmLyHb4sDaAYnLL13RHOZPLEtcGZ5xvjg==
-  dependencies:
-    "@babel/types" "^7.10.1"
-
-"@babel/helper-hoist-variables@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
-  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-member-expression-to-functions@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz#432967fd7e12a4afef66c4687d4ca22bc0456f15"
-  integrity sha512-u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g==
-  dependencies:
-    "@babel/types" "^7.10.1"
-
-"@babel/helper-member-expression-to-functions@^7.22.15", "@babel/helper-member-expression-to-functions@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366"
-  integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==
-  dependencies:
-    "@babel/types" "^7.23.0"
-
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.1":
+"@babel/helper-module-imports@^7.0.0":
   version "7.10.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz#dd331bd45bccc566ce77004e9d05fe17add13876"
   integrity sha512-SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg==
   dependencies:
     "@babel/types" "^7.10.1"
 
-"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0"
-  integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
-  dependencies:
-    "@babel/types" "^7.22.15"
-
-"@babel/helper-module-transforms@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz#24e2f08ee6832c60b157bb0936c86bef7210c622"
-  integrity sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==
-  dependencies:
-    "@babel/helper-module-imports" "^7.10.1"
-    "@babel/helper-replace-supers" "^7.10.1"
-    "@babel/helper-simple-access" "^7.10.1"
-    "@babel/helper-split-export-declaration" "^7.10.1"
-    "@babel/template" "^7.10.1"
-    "@babel/types" "^7.10.1"
-    lodash "^4.17.13"
-
-"@babel/helper-module-transforms@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
-  integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
+"@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b"
+  integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-module-imports" "^7.22.15"
-    "@babel/helper-simple-access" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-optimise-call-expression@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz#b4a1f2561870ce1247ceddb02a3860fa96d72543"
-  integrity sha512-a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg==
+"@babel/helper-module-transforms@^7.24.7", "@babel/helper-module-transforms@^7.24.8", "@babel/helper-module-transforms@^7.25.0", "@babel/helper-module-transforms@^7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz#ee713c29768100f2776edf04d4eb23b8d27a66e6"
+  integrity sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/helper-module-imports" "^7.24.7"
+    "@babel/helper-simple-access" "^7.24.7"
+    "@babel/helper-validator-identifier" "^7.24.7"
+    "@babel/traverse" "^7.25.2"
 
-"@babel/helper-optimise-call-expression@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e"
-  integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==
+"@babel/helper-optimise-call-expression@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz#8b0a0456c92f6b323d27cfd00d1d664e76692a0f"
+  integrity sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.1", "@babel/helper-plugin-utils@^7.8.0":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.8.0":
   version "7.10.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz#ec5a5cf0eec925b66c60580328b122c01230a127"
   integrity sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==
 
-"@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.3":
+"@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.7", "@babel/helper-plugin-utils@^7.24.8", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz#94ee67e8ec0e5d44ea7baeb51e571bd26af07878"
+  integrity sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==
+
+"@babel/helper-plugin-utils@^7.18.6":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
   integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
 
-"@babel/helper-regex@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.1.tgz#021cf1a7ba99822f993222a001cc3fec83255b96"
-  integrity sha512-7isHr19RsIJWWLLFn21ubFt223PjQyg1HY7CZEMRr820HttHPpVvrsIN3bUOo44DEfFV4kBXO7Abbn9KTUZV7g==
-  dependencies:
-    lodash "^4.17.13"
-
-"@babel/helper-remap-async-to-generator@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.1.tgz#bad6aaa4ff39ce8d4b82ccaae0bfe0f7dbb5f432"
-  integrity sha512-RfX1P8HqsfgmJ6CwaXGKMAqbYdlleqglvVtht0HGPMSsy2V6MqLlOJVF/0Qyb/m2ZCi2z3q3+s6Pv7R/dQuZ6A==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.1"
-    "@babel/helper-wrap-function" "^7.10.1"
-    "@babel/template" "^7.10.1"
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.1"
-
-"@babel/helper-remap-async-to-generator@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz#7b68e1cb4fa964d2996fd063723fb48eca8498e0"
-  integrity sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-wrap-function" "^7.22.20"
-
-"@babel/helper-replace-supers@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz#ec6859d20c5d8087f6a2dc4e014db7228975f13d"
-  integrity sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.10.1"
-    "@babel/helper-optimise-call-expression" "^7.10.1"
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.1"
-
-"@babel/helper-replace-supers@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz#e37d367123ca98fe455a9887734ed2e16eb7a793"
-  integrity sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-member-expression-to-functions" "^7.22.15"
-    "@babel/helper-optimise-call-expression" "^7.22.5"
-
-"@babel/helper-simple-access@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz#08fb7e22ace9eb8326f7e3920a1c2052f13d851e"
-  integrity sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==
-  dependencies:
-    "@babel/template" "^7.10.1"
-    "@babel/types" "^7.10.1"
-
-"@babel/helper-simple-access@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
-  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
+"@babel/helper-remap-async-to-generator@^7.24.7", "@babel/helper-remap-async-to-generator@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz#d2f0fbba059a42d68e5e378feaf181ef6055365e"
+  integrity sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    "@babel/helper-wrap-function" "^7.25.0"
+    "@babel/traverse" "^7.25.0"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847"
-  integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==
+"@babel/helper-replace-supers@^7.24.7", "@babel/helper-replace-supers@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz#ff44deac1c9f619523fe2ca1fd650773792000a9"
+  integrity sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/helper-member-expression-to-functions" "^7.24.8"
+    "@babel/helper-optimise-call-expression" "^7.24.7"
+    "@babel/traverse" "^7.25.0"
 
-"@babel/helper-split-export-declaration@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz#c6f4be1cbc15e3a868e4c64a17d5d31d754da35f"
-  integrity sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==
+"@babel/helper-simple-access@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz#bcade8da3aec8ed16b9c4953b74e506b51b5edb3"
+  integrity sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-split-export-declaration@^7.22.6":
-  version "7.22.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
-  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
+"@babel/helper-skip-transparent-expression-wrappers@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz#5f8fa83b69ed5c27adc56044f8be2b3ea96669d9"
+  integrity sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-string-parser@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83"
-  integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
+"@babel/helper-string-parser@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d"
+  integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==
 
 "@babel/helper-validator-identifier@^7.10.1":
   version "7.10.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz#5770b0c1a826c4f53f5ede5e153163e0318e94b5"
   integrity sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==
 
-"@babel/helper-validator-identifier@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
-  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
+"@babel/helper-validator-identifier@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db"
+  integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==
 
-"@babel/helper-validator-option@^7.22.15", "@babel/helper-validator-option@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
-  integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
+"@babel/helper-validator-option@^7.24.7", "@babel/helper-validator-option@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz#3725cdeea8b480e86d34df15304806a06975e33d"
+  integrity sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==
 
-"@babel/helper-wrap-function@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz#956d1310d6696257a7afd47e4c42dfda5dfcedc9"
-  integrity sha512-C0MzRGteVDn+H32/ZgbAv5r56f2o1fZSA/rj/TYo8JEJNHg+9BdSmKBUND0shxWRztWhjlT2cvHYuynpPsVJwQ==
-  dependencies:
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/template" "^7.10.1"
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.1"
-
-"@babel/helper-wrap-function@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz#15352b0b9bfb10fc9c76f79f6342c00e3411a569"
-  integrity sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==
+"@babel/helper-wrap-function@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz#dab12f0f593d6ca48c0062c28bcfb14ebe812f81"
+  integrity sha512-s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ==
   dependencies:
-    "@babel/helper-function-name" "^7.22.5"
-    "@babel/template" "^7.22.15"
-    "@babel/types" "^7.22.19"
+    "@babel/template" "^7.25.0"
+    "@babel/traverse" "^7.25.0"
+    "@babel/types" "^7.25.0"
 
-"@babel/helpers@^7.23.9":
-  version "7.23.9"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.9.tgz#c3e20bbe7f7a7e10cb9b178384b4affdf5995c7d"
-  integrity sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==
+"@babel/helpers@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.25.0.tgz#e69beb7841cb93a6505531ede34f34e6a073650a"
+  integrity sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw==
   dependencies:
-    "@babel/template" "^7.23.9"
-    "@babel/traverse" "^7.23.9"
-    "@babel/types" "^7.23.9"
+    "@babel/template" "^7.25.0"
+    "@babel/types" "^7.25.0"
 
 "@babel/highlight@^7.10.1":
   version "7.10.1"
@@ -485,166 +284,74 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/highlight@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b"
-  integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==
+"@babel/highlight@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d"
+  integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-validator-identifier" "^7.24.7"
     chalk "^2.4.2"
     js-tokens "^4.0.0"
+    picocolors "^1.0.0"
 
-"@babel/parser@^7.10.1", "@babel/parser@^7.4.3":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.2.tgz#871807f10442b92ff97e4783b9b54f6a0ca812d0"
-  integrity sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==
-
-"@babel/parser@^7.14.7", "@babel/parser@^7.23.9":
-  version "7.23.9"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.9.tgz#7b903b6149b0f8fa7ad564af646c4c38a77fc44b"
-  integrity sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==
-
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz#5cd1c87ba9380d0afb78469292c954fee5d2411a"
-  integrity sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz#f6652bb16b94f8f9c20c50941e16e9756898dc5d"
-  integrity sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/plugin-transform-optional-chaining" "^7.23.3"
-
-"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.23.7":
-  version "7.23.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.7.tgz#516462a95d10a9618f197d39ad291a9b47ae1d7b"
-  integrity sha512-LlRT7HgaifEpQA1ZgLVOIJZZFVPWN5iReq/7/JixwBtwcoeVGDBD53ZV28rrsLYOZs1Y/EHhA8N/Z6aazHR8cw==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-proposal-async-generator-functions@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.1.tgz#6911af5ba2e615c4ff3c497fe2f47b35bf6d7e55"
-  integrity sha512-vzZE12ZTdB336POZjmpblWfNNRpMSua45EYnRigE2XsZxcXcIyly2ixnTJasJE4Zq3U7t2d8rRF7XRUuzHxbOw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-remap-async-to-generator" "^7.10.1"
-    "@babel/plugin-syntax-async-generators" "^7.8.0"
-
-"@babel/plugin-proposal-class-properties@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.1.tgz#046bc7f6550bb08d9bd1d4f060f5f5a4f1087e01"
-  integrity sha512-sqdGWgoXlnOdgMXU+9MbhzwFRgxVLeiGBqTrnuS7LC2IBU31wSsESbTUreT2O418obpfPdGUR2GbEufZF1bpqw==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-
-"@babel/plugin-proposal-class-properties@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
-  integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-proposal-dynamic-import@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.1.tgz#e36979dc1dc3b73f6d6816fc4951da2363488ef0"
-  integrity sha512-Cpc2yUVHTEGPlmiQzXj026kqwjEQAD9I4ZC16uzdbgWgitg/UHKHLffKNCQZ5+y8jpIZPJcKcwsr2HwPh+w3XA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
-
-"@babel/plugin-proposal-json-strings@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.1.tgz#b1e691ee24c651b5a5e32213222b2379734aff09"
-  integrity sha512-m8r5BmV+ZLpWPtMY2mOKN7wre6HIO4gfIiV+eOmsnZABNenrt/kzYBwrh+KOfgumSWpnlGs5F70J8afYMSJMBg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz#02dca21673842ff2fe763ac253777f235e9bbf78"
-  integrity sha512-56cI/uHYgL2C8HVuHOuvVowihhX0sxb3nnfVRzUeVHTWmRHTZrKuAh/OBIMggGU/S1g/1D2CRCXqP+3u7vX7iA==
+"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.4", "@babel/parser@^7.25.0", "@babel/parser@^7.25.3":
+  version "7.25.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.3.tgz#91fb126768d944966263f0657ab222a642b82065"
+  integrity sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/types" "^7.25.2"
 
-"@babel/plugin-proposal-numeric-separator@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.1.tgz#a9a38bc34f78bdfd981e791c27c6fdcec478c123"
-  integrity sha512-jjfym4N9HtCiNfyyLAVD8WqPYeHUrw4ihxuAynWj6zzp2gf9Ey2f7ImhFm6ikB3CLf5Z/zmcJDri6B4+9j9RsA==
+"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.3":
+  version "7.25.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz#dca427b45a6c0f5c095a1c639dfe2476a3daba7f"
+  integrity sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/traverse" "^7.25.3"
 
-"@babel/plugin-proposal-object-rest-spread@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.1.tgz#cba44908ac9f142650b4a65b8aa06bf3478d5fb6"
-  integrity sha512-Z+Qri55KiQkHh7Fc4BW6o+QBuTagbOp9txE+4U1i79u9oWlf2npkiDx+Rf3iK3lbcHBuNy9UOkwuR5wOMH3LIQ==
+"@babel/plugin-bugfix-safari-class-field-initializer-scope@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.0.tgz#cd0c583e01369ef51676bdb3d7b603e17d2b3f73"
+  integrity sha512-Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-transform-parameters" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.24.8"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz#c9f86d99305f9fa531b568ff5ab8c964b8b223d2"
-  integrity sha512-VqExgeE62YBqI3ogkGoOJp1R6u12DFZjqwJhqtKc2o5m1YTUuUWnos7bZQFBhwkxIFpWYJ7uB75U7VAPPiKETA==
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0.tgz#749bde80356b295390954643de7635e0dffabe73"
+  integrity sha512-lXwdNZtTmeVOOFtwM/WDe7yg1PL8sYhRk/XH0FzbR2HDQ0xC+EnQ/JHeoMYSavtU115tnUk0q9CDyq8si+LMAA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.24.8"
 
-"@babel/plugin-proposal-optional-chaining@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.1.tgz#15f5d6d22708629451a91be28f8facc55b0e818c"
-  integrity sha512-dqQj475q8+/avvok72CF3AOSV/SGEcH29zT5hhohqqvvZ2+boQoOr7iGldBG5YXTO2qgCgc2B3WvVLUdbeMlGA==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz#e4eabdd5109acc399b38d7999b2ef66fc2022f89"
+  integrity sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
+    "@babel/plugin-transform-optional-chaining" "^7.24.7"
 
-"@babel/plugin-proposal-private-methods@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.1.tgz#ed85e8058ab0fe309c3f448e5e1b73ca89cdb598"
-  integrity sha512-RZecFFJjDiQ2z6maFprLgrdnm0OzoC23Mx89xf1CcEsxmHuzuXOdniEuI+S3v7vjQG4F5sa6YtUp+19sZuSxHg==
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.0.tgz#3a82a70e7cb7294ad2559465ebcb871dfbf078fb"
+  integrity sha512-tggFrk1AIShG/RUQbEwt2Tr/E+ObkfwrPjR6BjbRvsx24+PSjK8zrq0GWPNCjo8qpRx4DuJzlcvWJqlm+0h3kw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/traverse" "^7.25.0"
 
 "@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
   version "7.21.0-placeholder-for-preset-env.2"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703"
   integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==
 
-"@babel/plugin-proposal-unicode-property-regex@^7.10.1", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.1.tgz#dc04feb25e2dd70c12b05d680190e138fa2c0c6f"
-  integrity sha512-JjfngYRvwmPwmnbRZyNiPFI8zxCZb8euzbCG/LxyKdeTb59tVciKo9GK9bi6JYKInk1H11Dq9j/zRqIH4KigfQ==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-
-"@babel/plugin-syntax-async-generators@^7.8.0", "@babel/plugin-syntax-async-generators@^7.8.4":
+"@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
   integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-class-properties@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.1.tgz#d5bc0645913df5b17ad7eda0fa2308330bde34c5"
-  integrity sha512-Gf2Yx/iRs1JREDtVZ56OrjjgFHCaldpTnuy9BHla10qyVT3YkIIGEtoDWhyop0ksu1GvNjHIoYRBqm3zoR1jyQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-
 "@babel/plugin-syntax-class-properties@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
@@ -659,7 +366,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-dynamic-import@^7.8.0", "@babel/plugin-syntax-dynamic-import@^7.8.3":
+"@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
   integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
@@ -673,19 +380,19 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-import-assertions@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz#9c05a7f592982aff1a2768260ad84bcd3f0c77fc"
-  integrity sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==
+"@babel/plugin-syntax-import-assertions@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz#2a0b406b5871a20a841240586b1300ce2088a778"
+  integrity sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-syntax-import-attributes@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz#992aee922cf04512461d7dae3ff6951b90a2dc06"
-  integrity sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==
+"@babel/plugin-syntax-import-attributes@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz#b4f9ea95a79e6912480c4b626739f86a076624ca"
+  integrity sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
 "@babel/plugin-syntax-import-meta@^7.10.4":
   version "7.10.4"
@@ -694,19 +401,19 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-json-strings@^7.8.0", "@babel/plugin-syntax-json-strings@^7.8.3":
+"@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
   integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz#8f2e4f8a9b5f9aa16067e142c1ac9cd9f810f473"
-  integrity sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==
+"@babel/plugin-syntax-jsx@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz#39a1fa4a7e3d3d7f34e2acc6be585b718d30e02d"
+  integrity sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
   version "7.10.4"
@@ -715,20 +422,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
   integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-numeric-separator@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.1.tgz#25761ee7410bc8cf97327ba741ee94e4a61b7d99"
-  integrity sha512-uTd0OsHrpe3tH5gRPTxG8Voh99/WCU78vIm5NMRYPAqC8lR4vajt6KkCAknCHrx24vkPdd/05yfdGSB4EIY2mg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-
 "@babel/plugin-syntax-numeric-separator@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
@@ -736,21 +436,21 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
+"@babel/plugin-syntax-object-rest-spread@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.8.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
   integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3":
+"@babel/plugin-syntax-optional-chaining@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
   integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
@@ -764,13 +464,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-top-level-await@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.1.tgz#8b8733f8c57397b3eaa47ddba8841586dcaef362"
-  integrity sha512-hgA5RYkmZm8FTFT3yu2N9Bx7yVVOKYT6yEdXXo6j2JTm0wNxgqaGeQVaSHRjhfnQbX91DtjFB6McRFSlcJH3xQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-
 "@babel/plugin-syntax-top-level-await@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
@@ -786,706 +479,468 @@
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-arrow-functions@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz#cb5ee3a36f0863c06ead0b409b4cc43a889b295b"
-  integrity sha512-6AZHgFJKP3DJX0eCNJj01RpytUa3SOGawIxweHkNX2L6PYikOZmoh5B0d7hIHaIgveMjX990IAa/xK7jRTN8OA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-
-"@babel/plugin-transform-arrow-functions@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz#94c6dcfd731af90f27a79509f9ab7fb2120fc38b"
-  integrity sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==
+"@babel/plugin-transform-arrow-functions@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz#4f6886c11e423bd69f3ce51dbf42424a5f275514"
+  integrity sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-async-generator-functions@^7.23.9":
-  version "7.23.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.9.tgz#9adaeb66fc9634a586c5df139c6240d41ed801ce"
-  integrity sha512-8Q3veQEDGe14dTYuwagbRtwxQDnytyg1JFu4/HwEMETeofocrB0U0ejBJIXoeG/t2oXZ8kzCyI0ZZfbT80VFNQ==
+"@babel/plugin-transform-async-generator-functions@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.0.tgz#b785cf35d73437f6276b1e30439a57a50747bddf"
+  integrity sha512-uaIi2FdqzjpAMvVqvB51S42oC2JEVgh0LDsGfZVDysWE8LrJtQC2jvKmOqEYThKyB7bDEb7BP1GYWDm7tABA0Q==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-remap-async-to-generator" "^7.22.20"
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-remap-async-to-generator" "^7.25.0"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/traverse" "^7.25.0"
 
-"@babel/plugin-transform-async-to-generator@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.1.tgz#e5153eb1a3e028f79194ed8a7a4bf55f862b2062"
-  integrity sha512-XCgYjJ8TY2slj6SReBUyamJn3k2JLUIiiR5b6t1mNCMSvv7yx+jJpaewakikp0uWFQSF7ChPPoe3dHmXLpISkg==
-  dependencies:
-    "@babel/helper-module-imports" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-remap-async-to-generator" "^7.10.1"
-
-"@babel/plugin-transform-async-to-generator@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz#d1f513c7a8a506d43f47df2bf25f9254b0b051fa"
-  integrity sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==
-  dependencies:
-    "@babel/helper-module-imports" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-remap-async-to-generator" "^7.22.20"
-
-"@babel/plugin-transform-block-scoped-functions@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.1.tgz#146856e756d54b20fff14b819456b3e01820b85d"
-  integrity sha512-B7K15Xp8lv0sOJrdVAoukKlxP9N59HS48V1J3U/JGj+Ad+MHq+am6xJVs85AgXrQn4LV8vaYFOB+pr/yIuzW8Q==
+"@babel/plugin-transform-async-to-generator@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz#72a3af6c451d575842a7e9b5a02863414355bdcc"
+  integrity sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-module-imports" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-remap-async-to-generator" "^7.24.7"
 
-"@babel/plugin-transform-block-scoped-functions@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz#fe1177d715fb569663095e04f3598525d98e8c77"
-  integrity sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==
+"@babel/plugin-transform-block-scoped-functions@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz#a4251d98ea0c0f399dafe1a35801eaba455bbf1f"
+  integrity sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-block-scoping@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.1.tgz#47092d89ca345811451cd0dc5d91605982705d5e"
-  integrity sha512-8bpWG6TtF5akdhIm/uWTyjHqENpy13Fx8chg7pFH875aNLwX8JxIxqm08gmAT+Whe6AOmaTeLPe7dpLbXt+xUw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    lodash "^4.17.13"
-
-"@babel/plugin-transform-block-scoping@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz#b2d38589531c6c80fbe25e6b58e763622d2d3cf5"
-  integrity sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==
+"@babel/plugin-transform-block-scoping@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz#23a6ed92e6b006d26b1869b1c91d1b917c2ea2ac"
+  integrity sha512-yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.8"
 
-"@babel/plugin-transform-class-properties@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz#35c377db11ca92a785a718b6aa4e3ed1eb65dc48"
-  integrity sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==
+"@babel/plugin-transform-class-properties@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.7.tgz#256879467b57b0b68c7ddfc5b76584f398cd6834"
+  integrity sha512-vKbfawVYayKcSeSR5YYzzyXvsDFWU2mD8U5TFeXtbCPLFUqe7GyCgvO6XDHzje862ODrOwy6WCPmKeWHbCFJ4w==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-class-static-block@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz#2a202c8787a8964dd11dfcedf994d36bfc844ab5"
-  integrity sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==
+"@babel/plugin-transform-class-static-block@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz#c82027ebb7010bc33c116d4b5044fbbf8c05484d"
+  integrity sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-transform-classes@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.1.tgz#6e11dd6c4dfae70f540480a4702477ed766d733f"
-  integrity sha512-P9V0YIh+ln/B3RStPoXpEQ/CoAxQIhRSUn7aXqQ+FZJ2u8+oCtjIXR3+X0vsSD8zv+mb56K7wZW1XiDTDGiDRQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.1"
-    "@babel/helper-define-map" "^7.10.1"
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/helper-optimise-call-expression" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-replace-supers" "^7.10.1"
-    "@babel/helper-split-export-declaration" "^7.10.1"
-    globals "^11.1.0"
-
-"@babel/plugin-transform-classes@^7.23.8":
-  version "7.23.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.8.tgz#d08ae096c240347badd68cdf1b6d1624a6435d92"
-  integrity sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-compilation-targets" "^7.23.6"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.20"
-    "@babel/helper-split-export-declaration" "^7.22.6"
+"@babel/plugin-transform-classes@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.0.tgz#63122366527d88e0ef61b612554fe3f8c793991e"
+  integrity sha512-xyi6qjr/fYU304fiRwFbekzkqVJZ6A7hOjWZd+89FVcBqPV3S9Wuozz82xdpLspckeaafntbzglaW4pqpzvtSw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    "@babel/helper-compilation-targets" "^7.24.8"
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-replace-supers" "^7.25.0"
+    "@babel/traverse" "^7.25.0"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.1.tgz#59aa399064429d64dce5cf76ef9b90b7245ebd07"
-  integrity sha512-mqSrGjp3IefMsXIenBfGcPXxJxweQe2hEIwMQvjtiDQ9b1IBvDUjkAtV/HMXX47/vXf14qDNedXsIiNd1FmkaQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-
-"@babel/plugin-transform-computed-properties@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz#652e69561fcc9d2b50ba4f7ac7f60dcf65e86474"
-  integrity sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==
+"@babel/plugin-transform-computed-properties@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz#4cab3214e80bc71fae3853238d13d097b004c707"
+  integrity sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/template" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/template" "^7.24.7"
 
-"@babel/plugin-transform-destructuring@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz#abd58e51337815ca3a22a336b85f62b998e71907"
-  integrity sha512-V/nUc4yGWG71OhaTH705pU8ZSdM6c1KmmLP8ys59oOYbT7RpMYAR3MsVOt6OHL0WzG7BlTU076va9fjJyYzJMA==
+"@babel/plugin-transform-destructuring@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz#c828e814dbe42a2718a838c2a2e16a408e055550"
+  integrity sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.24.8"
 
-"@babel/plugin-transform-destructuring@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz#8c9ee68228b12ae3dff986e56ed1ba4f3c446311"
-  integrity sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==
+"@babel/plugin-transform-dotall-regex@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz#5f8bf8a680f2116a7207e16288a5f974ad47a7a0"
+  integrity sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-create-regexp-features-plugin" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-dotall-regex@^7.10.1", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.1.tgz#920b9fec2d78bb57ebb64a644d5c2ba67cc104ee"
-  integrity sha512-19VIMsD1dp02RvduFUmfzj8uknaO3uiHHF0s3E1OHnVsNj8oge8EQ5RzHRbJjGSetRnkEuBYO7TG1M5kKjGLOA==
+"@babel/plugin-transform-duplicate-keys@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz#dd20102897c9a2324e5adfffb67ff3610359a8ee"
+  integrity sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-dotall-regex@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz#3f7af6054882ede89c378d0cf889b854a993da50"
-  integrity sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-duplicate-keys@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.1.tgz#c900a793beb096bc9d4d0a9d0cde19518ffc83b9"
-  integrity sha512-wIEpkX4QvX8Mo9W6XF3EdGttrIPZWozHfEaDTU0WJD/TDnXMvdDh30mzUl/9qWhnf7naicYartcEfUghTCSNpA==
+"@babel/plugin-transform-duplicate-named-capturing-groups-regex@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.0.tgz#809af7e3339466b49c034c683964ee8afb3e2604"
+  integrity sha512-YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-create-regexp-features-plugin" "^7.25.0"
+    "@babel/helper-plugin-utils" "^7.24.8"
 
-"@babel/plugin-transform-duplicate-keys@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz#664706ca0a5dfe8d066537f99032fc1dc8b720ce"
-  integrity sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==
+"@babel/plugin-transform-dynamic-import@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz#4d8b95e3bae2b037673091aa09cd33fecd6419f4"
+  integrity sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-dynamic-import@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz#c7629e7254011ac3630d47d7f34ddd40ca535143"
-  integrity sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-transform-exponentiation-operator@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz#279c3116756a60dd6e6f5e488ba7957db9c59eb3"
-  integrity sha512-lr/przdAbpEA2BUzRvjXdEDLrArGRRPwbaF9rvayuHRvdQ7lUTTkZnhZrJ4LE2jvgMRFF4f0YuPQ20vhiPYxtA==
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-
-"@babel/plugin-transform-exponentiation-operator@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz#ea0d978f6b9232ba4722f3dbecdd18f450babd18"
-  integrity sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==
+"@babel/plugin-transform-exponentiation-operator@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz#b629ee22645f412024297d5245bce425c31f9b0d"
+  integrity sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-export-namespace-from@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz#084c7b25e9a5c8271e987a08cf85807b80283191"
-  integrity sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==
+"@babel/plugin-transform-export-namespace-from@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz#176d52d8d8ed516aeae7013ee9556d540c53f197"
+  integrity sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-transform-for-of@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz#ff01119784eb0ee32258e8646157ba2501fcfda5"
-  integrity sha512-US8KCuxfQcn0LwSCMWMma8M2R5mAjJGsmoCBVwlMygvmDUMkTCykc84IqN1M7t+agSfOmLYTInLCHJM+RUoz+w==
+"@babel/plugin-transform-for-of@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz#f25b33f72df1d8be76399e1b8f3f9d366eb5bc70"
+  integrity sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
 
-"@babel/plugin-transform-for-of@^7.23.6":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz#81c37e24171b37b370ba6aaffa7ac86bcb46f94e"
-  integrity sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==
+"@babel/plugin-transform-function-name@^7.25.1":
+  version "7.25.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz#b85e773097526c1a4fc4ba27322748643f26fc37"
+  integrity sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.24.8"
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/traverse" "^7.25.1"
 
-"@babel/plugin-transform-function-name@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz#4ed46fd6e1d8fde2a2ec7b03c66d853d2c92427d"
-  integrity sha512-//bsKsKFBJfGd65qSNNh1exBy5Y9gD9ZN+DvrJ8f7HXr4avE5POW6zB7Rj6VnqHV33+0vXWUwJT0wSHubiAQkw==
+"@babel/plugin-transform-json-strings@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz#f3e9c37c0a373fee86e36880d45b3664cedaf73a"
+  integrity sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==
   dependencies:
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-
-"@babel/plugin-transform-function-name@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz#8f424fcd862bf84cb9a1a6b42bc2f47ed630f8dc"
-  integrity sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==
-  dependencies:
-    "@babel/helper-compilation-targets" "^7.22.15"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-json-strings@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz#a871d9b6bd171976efad2e43e694c961ffa3714d"
-  integrity sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-transform-literals@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz#5794f8da82846b22e4e6631ea1658bce708eb46a"
-  integrity sha512-qi0+5qgevz1NHLZroObRm5A+8JJtibb7vdcPQF1KQE12+Y/xxl8coJ+TpPW9iRq+Mhw/NKLjm+5SHtAHCC7lAw==
+"@babel/plugin-transform-literals@^7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz#deb1ad14fc5490b9a65ed830e025bca849d8b5f3"
+  integrity sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.24.8"
 
-"@babel/plugin-transform-literals@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz#8214665f00506ead73de157eba233e7381f3beb4"
-  integrity sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==
+"@babel/plugin-transform-logical-assignment-operators@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz#a58fb6eda16c9dc8f9ff1c7b1ba6deb7f4694cb0"
+  integrity sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-logical-assignment-operators@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz#e599f82c51d55fac725f62ce55d3a0886279ecb5"
-  integrity sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-transform-member-expression-literals@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.1.tgz#90347cba31bca6f394b3f7bd95d2bbfd9fce2f39"
-  integrity sha512-UmaWhDokOFT2GcgU6MkHC11i0NQcL63iqeufXWfRy6pUOGYeCGEKhvfFO6Vz70UfYJYHwveg62GS83Rvpxn+NA==
+"@babel/plugin-transform-member-expression-literals@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz#3b4454fb0e302e18ba4945ba3246acb1248315df"
+  integrity sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-member-expression-literals@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz#e37b3f0502289f477ac0e776b05a833d853cabcc"
-  integrity sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==
+"@babel/plugin-transform-modules-amd@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz#65090ed493c4a834976a3ca1cde776e6ccff32d7"
+  integrity sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-modules-amd@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.1.tgz#65950e8e05797ebd2fe532b96e19fc5482a1d52a"
-  integrity sha512-31+hnWSFRI4/ACFr1qkboBbrTxoBIzj7qA69qlq8HY8p7+YCzkCT6/TvQ1a4B0z27VeWtAeJd6pr5G04dc1iHw==
+"@babel/plugin-transform-modules-commonjs@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz#ab6421e564b717cb475d6fff70ae7f103536ea3c"
+  integrity sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.24.8"
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-simple-access" "^7.24.7"
 
-"@babel/plugin-transform-modules-amd@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz#e19b55436a1416829df0a1afc495deedfae17f7d"
-  integrity sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-modules-commonjs@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz#d5ff4b4413ed97ffded99961056e1fb980fb9301"
-  integrity sha512-AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-simple-access" "^7.10.1"
-    babel-plugin-dynamic-import-node "^2.3.3"
-
-"@babel/plugin-transform-modules-commonjs@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz#661ae831b9577e52be57dd8356b734f9700b53b4"
-  integrity sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-simple-access" "^7.22.5"
-
-"@babel/plugin-transform-modules-systemjs@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.1.tgz#9962e4b0ac6aaf2e20431ada3d8ec72082cbffb6"
-  integrity sha512-ewNKcj1TQZDL3YnO85qh9zo1YF1CHgmSTlRQgHqe63oTrMI85cthKtZjAiZSsSNjPQ5NCaYo5QkbYqEw1ZBgZA==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.10.1"
-    "@babel/helper-module-transforms" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    babel-plugin-dynamic-import-node "^2.3.3"
-
-"@babel/plugin-transform-modules-systemjs@^7.23.9":
-  version "7.23.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.9.tgz#105d3ed46e4a21d257f83a2f9e2ee4203ceda6be"
-  integrity sha512-KDlPRM6sLo4o1FkiSlXoAa8edLXFsKKIda779fbLrvmeuc3itnjCtaO6RrtoaANsIJANj+Vk1zqbZIMhkCAHVw==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.20"
-
-"@babel/plugin-transform-modules-umd@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.1.tgz#ea080911ffc6eb21840a5197a39ede4ee67b1595"
-  integrity sha512-EIuiRNMd6GB6ulcYlETnYYfgv4AxqrswghmBRQbWLHZxN4s7mupxzglnHqk9ZiUpDI4eRWewedJJNj67PWOXKA==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-
-"@babel/plugin-transform-modules-umd@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz#5d4395fccd071dfefe6585a4411aa7d6b7d769e9"
-  integrity sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-named-capturing-groups-regex@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f"
-  integrity sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==
+"@babel/plugin-transform-modules-systemjs@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz#8f46cdc5f9e5af74f3bd019485a6cbe59685ea33"
+  integrity sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.25.0"
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-validator-identifier" "^7.24.7"
+    "@babel/traverse" "^7.25.0"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz#a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"
-  integrity sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==
+"@babel/plugin-transform-modules-umd@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz#edd9f43ec549099620df7df24e7ba13b5c76efc8"
+  integrity sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-new-target@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.1.tgz#6ee41a5e648da7632e22b6fb54012e87f612f324"
-  integrity sha512-MBlzPc1nJvbmO9rPr1fQwXOM2iGut+JC92ku6PbiJMMK7SnQc1rytgpopveE3Evn47gzvGYeCdgfCDbZo0ecUw==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz#9042e9b856bc6b3688c0c2e4060e9e10b1460923"
+  integrity sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-create-regexp-features-plugin" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-new-target@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz#5491bb78ed6ac87e990957cea367eab781c4d980"
-  integrity sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==
+"@babel/plugin-transform-new-target@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz#31ff54c4e0555cc549d5816e4ab39241dfb6ab00"
+  integrity sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-nullish-coalescing-operator@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz#45556aad123fc6e52189ea749e33ce090637346e"
-  integrity sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==
+"@babel/plugin-transform-nullish-coalescing-operator@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz#1de4534c590af9596f53d67f52a92f12db984120"
+  integrity sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-transform-numeric-separator@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz#03d08e3691e405804ecdd19dd278a40cca531f29"
-  integrity sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==
+"@babel/plugin-transform-numeric-separator@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz#bea62b538c80605d8a0fac9b40f48e97efa7de63"
+  integrity sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-transform-object-rest-spread@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.4.tgz#2b9c2d26bf62710460bdc0d1730d4f1048361b83"
-  integrity sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==
+"@babel/plugin-transform-object-rest-spread@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz#d13a2b93435aeb8a197e115221cab266ba6e55d6"
+  integrity sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==
   dependencies:
-    "@babel/compat-data" "^7.23.3"
-    "@babel/helper-compilation-targets" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.23.3"
+    "@babel/plugin-transform-parameters" "^7.24.7"
 
-"@babel/plugin-transform-object-super@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.1.tgz#2e3016b0adbf262983bf0d5121d676a5ed9c4fde"
-  integrity sha512-WnnStUDN5GL+wGQrJylrnnVlFhFmeArINIR9gjhSeYyvroGhBrSAXYg/RHsnfzmsa+onJrTJrEClPzgNmmQ4Gw==
+"@babel/plugin-transform-object-super@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz#66eeaff7830bba945dd8989b632a40c04ed625be"
+  integrity sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-replace-supers" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-replace-supers" "^7.24.7"
 
-"@babel/plugin-transform-object-super@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz#81fdb636dcb306dd2e4e8fd80db5b2362ed2ebcd"
-  integrity sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==
+"@babel/plugin-transform-optional-catch-binding@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz#00eabd883d0dd6a60c1c557548785919b6e717b4"
+  integrity sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.20"
-
-"@babel/plugin-transform-optional-catch-binding@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz#318066de6dacce7d92fa244ae475aa8d91778017"
-  integrity sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-transform-optional-chaining@^7.23.3", "@babel/plugin-transform-optional-chaining@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz#6acf61203bdfc4de9d4e52e64490aeb3e52bd017"
-  integrity sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==
+"@babel/plugin-transform-optional-chaining@^7.24.7", "@babel/plugin-transform-optional-chaining@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz#bb02a67b60ff0406085c13d104c99a835cdf365d"
+  integrity sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-transform-parameters@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz#b25938a3c5fae0354144a720b07b32766f683ddd"
-  integrity sha512-tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-
-"@babel/plugin-transform-parameters@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz#83ef5d1baf4b1072fa6e54b2b0999a7b2527e2af"
-  integrity sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==
+"@babel/plugin-transform-parameters@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz#5881f0ae21018400e320fc7eb817e529d1254b68"
+  integrity sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-private-methods@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz#b2d7a3c97e278bfe59137a978d53b2c2e038c0e4"
-  integrity sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==
+"@babel/plugin-transform-private-methods@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.7.tgz#e6318746b2ae70a59d023d5cc1344a2ba7a75f5e"
+  integrity sha512-COTCOkG2hn4JKGEKBADkA8WNb35TGkkRbI5iT845dB+NyqgO8Hn+ajPbSnIQznneJTa3d30scb6iz/DhH8GsJQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-private-property-in-object@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz#3ec711d05d6608fd173d9b8de39872d8dbf68bf5"
-  integrity sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==
+"@babel/plugin-transform-private-property-in-object@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz#4eec6bc701288c1fab5f72e6a4bbc9d67faca061"
+  integrity sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-create-class-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    "@babel/helper-create-class-features-plugin" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-transform-property-literals@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.1.tgz#cffc7315219230ed81dc53e4625bf86815b6050d"
-  integrity sha512-Kr6+mgag8auNrgEpbfIWzdXYOvqDHZOF0+Bx2xh4H2EDNwcbRb9lY6nkZg8oSjsX+DH9Ebxm9hOqtKW+gRDeNA==
+"@babel/plugin-transform-property-literals@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz#f0d2ed8380dfbed949c42d4d790266525d63bbdc"
+  integrity sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-property-literals@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz#54518f14ac4755d22b92162e4a852d308a560875"
-  integrity sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==
+"@babel/plugin-transform-react-display-name@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.24.7.tgz#9caff79836803bc666bcfe210aeb6626230c293b"
+  integrity sha512-H/Snz9PFxKsS1JLI4dJLtnJgCJRoo0AUm3chP6NYr+9En1JMKloheEiLIhlp5MDVznWo+H3AAC1Mc8lmUEpsgg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-react-display-name@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.23.3.tgz#70529f034dd1e561045ad3c8152a267f0d7b6200"
-  integrity sha512-GnvhtVfA2OAtzdX58FJxU19rhoGeQzyVndw3GgtdECQvQFXPEZIOVULHVZGAYmOgmqjXpVpfocAbSjh99V/Fqw==
+"@babel/plugin-transform-react-jsx-development@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.24.7.tgz#eaee12f15a93f6496d852509a850085e6361470b"
+  integrity sha512-QG9EnzoGn+Qar7rxuW+ZOsbWOt56FvvI93xInqsZDC5fsekx1AlIO4KIJ5M+D0p0SqSH156EpmZyXq630B8OlQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-transform-react-jsx" "^7.24.7"
 
-"@babel/plugin-transform-react-jsx-development@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.22.5.tgz#e716b6edbef972a92165cd69d92f1255f7e73e87"
-  integrity sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A==
+"@babel/plugin-transform-react-jsx-self@^7.24.5":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.24.7.tgz#66bff0248ea0b549972e733516ffad577477bdab"
+  integrity sha512-fOPQYbGSgH0HUp4UJO4sMBFjY6DuWq+2i8rixyUMb3CdGixs/gccURvYOAhajBdKDoGajFr3mUq5rH3phtkGzw==
   dependencies:
-    "@babel/plugin-transform-react-jsx" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-react-jsx@^7.22.15", "@babel/plugin-transform-react-jsx@^7.22.5":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.23.4.tgz#393f99185110cea87184ea47bcb4a7b0c2e39312"
-  integrity sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA==
+"@babel/plugin-transform-react-jsx-source@^7.24.1":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.24.7.tgz#1198aab2548ad19582013815c938d3ebd8291ee3"
+  integrity sha512-J2z+MWzZHVOemyLweMqngXrgGC42jQ//R0KdxqkIz/OrbVIIlhFI3WigZ5fO+nwFvBlncr4MGapd8vTyc7RPNQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-module-imports" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-jsx" "^7.23.3"
-    "@babel/types" "^7.23.4"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-react-pure-annotations@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.23.3.tgz#fabedbdb8ee40edf5da96f3ecfc6958e3783b93c"
-  integrity sha512-qMFdSS+TUhB7Q/3HVPnEdYJDQIk57jkntAwSuz9xfSE4n+3I+vHYCli3HoHawN1Z3RfCz/y1zXA/JXjG6cVImQ==
+"@babel/plugin-transform-react-jsx@^7.24.7":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.2.tgz#e37e8ebfa77e9f0b16ba07fadcb6adb47412227a"
+  integrity sha512-KQsqEAVBpU82NM/B/N9j9WOdphom1SZH3R+2V7INrQUH+V9EBFwZsEJl8eBIVeQE62FxJCc70jzEZwqU7RcVqA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    "@babel/helper-module-imports" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/plugin-syntax-jsx" "^7.24.7"
+    "@babel/types" "^7.25.2"
 
-"@babel/plugin-transform-regenerator@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.1.tgz#10e175cbe7bdb63cc9b39f9b3f823c5c7c5c5490"
-  integrity sha512-B3+Y2prScgJ2Bh/2l9LJxKbb8C8kRfsG4AdPT+n7ixBHIxJaIG8bi8tgjxUMege1+WqSJ+7gu1YeoMVO3gPWzw==
+"@babel/plugin-transform-react-pure-annotations@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.24.7.tgz#bdd9d140d1c318b4f28b29a00fb94f97ecab1595"
+  integrity sha512-PLgBVk3fzbmEjBJ/u8kFzOqS9tUeDjiaWud/rRym/yjCo/M9cASPlnrd2ZmmZpQT40fOOrvR8jh+n8jikrOhNA==
   dependencies:
-    regenerator-transform "^0.14.2"
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-regenerator@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz#141afd4a2057298602069fce7f2dc5173e6c561c"
-  integrity sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==
+"@babel/plugin-transform-regenerator@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz#021562de4534d8b4b1851759fd7af4e05d2c47f8"
+  integrity sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
     regenerator-transform "^0.15.2"
 
-"@babel/plugin-transform-reserved-words@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.1.tgz#0fc1027312b4d1c3276a57890c8ae3bcc0b64a86"
-  integrity sha512-qN1OMoE2nuqSPmpTqEM7OvJ1FkMEV+BjVeZZm9V9mq/x1JLKQ4pcv8riZJMNN3u2AUGl0ouOMjRr2siecvHqUQ==
+"@babel/plugin-transform-reserved-words@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz#80037fe4fbf031fc1125022178ff3938bb3743a4"
+  integrity sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-reserved-words@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz#4130dcee12bd3dd5705c587947eb715da12efac8"
-  integrity sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==
+"@babel/plugin-transform-shorthand-properties@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz#85448c6b996e122fa9e289746140aaa99da64e73"
+  integrity sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-shorthand-properties@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz#e8b54f238a1ccbae482c4dce946180ae7b3143f3"
-  integrity sha512-AR0E/lZMfLstScFwztApGeyTHJ5u3JUKMjneqRItWeEqDdHWZwAOKycvQNCasCK/3r5YXsuNG25funcJDu7Y2g==
+"@babel/plugin-transform-spread@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz#e8a38c0fde7882e0fb8f160378f74bd885cc7bb3"
+  integrity sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
 
-"@babel/plugin-transform-shorthand-properties@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz#97d82a39b0e0c24f8a981568a8ed851745f59210"
-  integrity sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==
+"@babel/plugin-transform-sticky-regex@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz#96ae80d7a7e5251f657b5cf18f1ea6bf926f5feb"
+  integrity sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-spread@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz#0c6d618a0c4461a274418460a28c9ccf5239a7c8"
-  integrity sha512-8wTPym6edIrClW8FI2IoaePB91ETOtg36dOkj3bYcNe7aDMN2FXEoUa+WrmPc4xa1u2PQK46fUX2aCb+zo9rfw==
+"@babel/plugin-transform-template-literals@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz#a05debb4a9072ae8f985bcf77f3f215434c8f8c8"
+  integrity sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-spread@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz#41d17aacb12bde55168403c6f2d6bdca563d362c"
-  integrity sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==
+"@babel/plugin-transform-typeof-symbol@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz#383dab37fb073f5bfe6e60c654caac309f92ba1c"
+  integrity sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.8"
 
-"@babel/plugin-transform-sticky-regex@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz#90fc89b7526228bed9842cff3588270a7a393b00"
-  integrity sha512-j17ojftKjrL7ufX8ajKvwRilwqTok4q+BjkknmQw9VNHnItTyMP5anPFzxFJdCQs7clLcWpCV3ma+6qZWLnGMA==
+"@babel/plugin-transform-unicode-escapes@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz#2023a82ced1fb4971630a2e079764502c4148e0e"
+  integrity sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-regex" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-sticky-regex@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz#dec45588ab4a723cb579c609b294a3d1bd22ff04"
-  integrity sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==
+"@babel/plugin-transform-unicode-property-regex@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz#9073a4cd13b86ea71c3264659590ac086605bbcd"
+  integrity sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-template-literals@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.1.tgz#914c7b7f4752c570ea00553b4284dad8070e8628"
-  integrity sha512-t7B/3MQf5M1T9hPCRG28DNGZUuxAuDqLYS03rJrIk2prj/UV7Z6FOneijhQhnv/Xa039vidXeVbvjK2SK5f7Gg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-
-"@babel/plugin-transform-template-literals@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz#5f0f028eb14e50b5d0f76be57f90045757539d07"
-  integrity sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-typeof-symbol@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.1.tgz#60c0239b69965d166b80a84de7315c1bc7e0bb0e"
-  integrity sha512-qX8KZcmbvA23zDi+lk9s6hC1FM7jgLHYIjuLgULgc8QtYnmB3tAVIYkNoKRQ75qWBeyzcoMoK8ZQmogGtC/w0g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-create-regexp-features-plugin" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-typeof-symbol@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz#9dfab97acc87495c0c449014eb9c547d8966bca4"
-  integrity sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==
+"@babel/plugin-transform-unicode-regex@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz#dfc3d4a51127108099b19817c0963be6a2adf19f"
+  integrity sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-create-regexp-features-plugin" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-unicode-escapes@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.1.tgz#add0f8483dab60570d9e03cecef6c023aa8c9940"
-  integrity sha512-zZ0Poh/yy1d4jeDWpx/mNwbKJVwUYJX73q+gyh4bwtG0/iUlzdEu0sLMda8yuDFS6LBQlT/ST1SJAR6zYwXWgw==
+"@babel/plugin-transform-unicode-sets-regex@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.7.tgz#d40705d67523803a576e29c63cef6e516b858ed9"
+  integrity sha512-2G8aAvF4wy1w/AGZkemprdGMRg5o6zPNhbHVImRz3lss55TYCBd6xStN19rt8XJHq20sqV0JbyWjOWwQRwV/wg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-create-regexp-features-plugin" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-unicode-escapes@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz#1f66d16cab01fab98d784867d24f70c1ca65b925"
-  integrity sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==
+"@babel/preset-env@^7.25.3":
+  version "7.25.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.25.3.tgz#0bf4769d84ac51d1073ab4a86f00f30a3a83c67c"
+  integrity sha512-QsYW7UeAaXvLPX9tdVliMJE7MD7M6MLYVTovRTIwhoYQVFHR1rM4wO8wqAezYi3/BpSD+NzVCZ69R6smWiIi8g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-unicode-property-regex@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz#19e234129e5ffa7205010feec0d94c251083d7ad"
-  integrity sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-unicode-regex@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz#6b58f2aea7b68df37ac5025d9c88752443a6b43f"
-  integrity sha512-Y/2a2W299k0VIUdbqYm9X2qS6fE0CUBhhiPpimK6byy7OJ/kORLlIX+J6UrjgNu5awvs62k+6RSslxhcvVw2Tw==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-
-"@babel/plugin-transform-unicode-regex@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz#26897708d8f42654ca4ce1b73e96140fbad879dc"
-  integrity sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-unicode-sets-regex@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz#4fb6f0a719c2c5859d11f6b55a050cc987f3799e"
-  integrity sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/polyfill@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.12.1.tgz#1f2d6371d1261bbd961f3c5d5909150e12d0bd96"
-  integrity sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==
-  dependencies:
-    core-js "^2.6.5"
-    regenerator-runtime "^0.13.4"
-
-"@babel/preset-env@^7.11.0":
-  version "7.23.9"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.9.tgz#beace3b7994560ed6bf78e4ae2073dff45387669"
-  integrity sha512-3kBGTNBBk9DQiPoXYS0g0BYlwTQYUTifqgKTjxUwEUkduRT2QOa0FPGBJ+NROQhGyYO5BuTJwGvBnqKDykac6A==
-  dependencies:
-    "@babel/compat-data" "^7.23.5"
-    "@babel/helper-compilation-targets" "^7.23.6"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-option" "^7.23.5"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.23.3"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.23.3"
-    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.23.7"
+    "@babel/compat-data" "^7.25.2"
+    "@babel/helper-compilation-targets" "^7.25.2"
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-validator-option" "^7.24.8"
+    "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.25.3"
+    "@babel/plugin-bugfix-safari-class-field-initializer-scope" "^7.25.0"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.25.0"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.24.7"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.25.0"
     "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-class-properties" "^7.12.13"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-import-assertions" "^7.23.3"
-    "@babel/plugin-syntax-import-attributes" "^7.23.3"
+    "@babel/plugin-syntax-import-assertions" "^7.24.7"
+    "@babel/plugin-syntax-import-attributes" "^7.24.7"
     "@babel/plugin-syntax-import-meta" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
@@ -1497,131 +952,62 @@
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
-    "@babel/plugin-transform-arrow-functions" "^7.23.3"
-    "@babel/plugin-transform-async-generator-functions" "^7.23.9"
-    "@babel/plugin-transform-async-to-generator" "^7.23.3"
-    "@babel/plugin-transform-block-scoped-functions" "^7.23.3"
-    "@babel/plugin-transform-block-scoping" "^7.23.4"
-    "@babel/plugin-transform-class-properties" "^7.23.3"
-    "@babel/plugin-transform-class-static-block" "^7.23.4"
-    "@babel/plugin-transform-classes" "^7.23.8"
-    "@babel/plugin-transform-computed-properties" "^7.23.3"
-    "@babel/plugin-transform-destructuring" "^7.23.3"
-    "@babel/plugin-transform-dotall-regex" "^7.23.3"
-    "@babel/plugin-transform-duplicate-keys" "^7.23.3"
-    "@babel/plugin-transform-dynamic-import" "^7.23.4"
-    "@babel/plugin-transform-exponentiation-operator" "^7.23.3"
-    "@babel/plugin-transform-export-namespace-from" "^7.23.4"
-    "@babel/plugin-transform-for-of" "^7.23.6"
-    "@babel/plugin-transform-function-name" "^7.23.3"
-    "@babel/plugin-transform-json-strings" "^7.23.4"
-    "@babel/plugin-transform-literals" "^7.23.3"
-    "@babel/plugin-transform-logical-assignment-operators" "^7.23.4"
-    "@babel/plugin-transform-member-expression-literals" "^7.23.3"
-    "@babel/plugin-transform-modules-amd" "^7.23.3"
-    "@babel/plugin-transform-modules-commonjs" "^7.23.3"
-    "@babel/plugin-transform-modules-systemjs" "^7.23.9"
-    "@babel/plugin-transform-modules-umd" "^7.23.3"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5"
-    "@babel/plugin-transform-new-target" "^7.23.3"
-    "@babel/plugin-transform-nullish-coalescing-operator" "^7.23.4"
-    "@babel/plugin-transform-numeric-separator" "^7.23.4"
-    "@babel/plugin-transform-object-rest-spread" "^7.23.4"
-    "@babel/plugin-transform-object-super" "^7.23.3"
-    "@babel/plugin-transform-optional-catch-binding" "^7.23.4"
-    "@babel/plugin-transform-optional-chaining" "^7.23.4"
-    "@babel/plugin-transform-parameters" "^7.23.3"
-    "@babel/plugin-transform-private-methods" "^7.23.3"
-    "@babel/plugin-transform-private-property-in-object" "^7.23.4"
-    "@babel/plugin-transform-property-literals" "^7.23.3"
-    "@babel/plugin-transform-regenerator" "^7.23.3"
-    "@babel/plugin-transform-reserved-words" "^7.23.3"
-    "@babel/plugin-transform-shorthand-properties" "^7.23.3"
-    "@babel/plugin-transform-spread" "^7.23.3"
-    "@babel/plugin-transform-sticky-regex" "^7.23.3"
-    "@babel/plugin-transform-template-literals" "^7.23.3"
-    "@babel/plugin-transform-typeof-symbol" "^7.23.3"
-    "@babel/plugin-transform-unicode-escapes" "^7.23.3"
-    "@babel/plugin-transform-unicode-property-regex" "^7.23.3"
-    "@babel/plugin-transform-unicode-regex" "^7.23.3"
-    "@babel/plugin-transform-unicode-sets-regex" "^7.23.3"
+    "@babel/plugin-transform-arrow-functions" "^7.24.7"
+    "@babel/plugin-transform-async-generator-functions" "^7.25.0"
+    "@babel/plugin-transform-async-to-generator" "^7.24.7"
+    "@babel/plugin-transform-block-scoped-functions" "^7.24.7"
+    "@babel/plugin-transform-block-scoping" "^7.25.0"
+    "@babel/plugin-transform-class-properties" "^7.24.7"
+    "@babel/plugin-transform-class-static-block" "^7.24.7"
+    "@babel/plugin-transform-classes" "^7.25.0"
+    "@babel/plugin-transform-computed-properties" "^7.24.7"
+    "@babel/plugin-transform-destructuring" "^7.24.8"
+    "@babel/plugin-transform-dotall-regex" "^7.24.7"
+    "@babel/plugin-transform-duplicate-keys" "^7.24.7"
+    "@babel/plugin-transform-duplicate-named-capturing-groups-regex" "^7.25.0"
+    "@babel/plugin-transform-dynamic-import" "^7.24.7"
+    "@babel/plugin-transform-exponentiation-operator" "^7.24.7"
+    "@babel/plugin-transform-export-namespace-from" "^7.24.7"
+    "@babel/plugin-transform-for-of" "^7.24.7"
+    "@babel/plugin-transform-function-name" "^7.25.1"
+    "@babel/plugin-transform-json-strings" "^7.24.7"
+    "@babel/plugin-transform-literals" "^7.25.2"
+    "@babel/plugin-transform-logical-assignment-operators" "^7.24.7"
+    "@babel/plugin-transform-member-expression-literals" "^7.24.7"
+    "@babel/plugin-transform-modules-amd" "^7.24.7"
+    "@babel/plugin-transform-modules-commonjs" "^7.24.8"
+    "@babel/plugin-transform-modules-systemjs" "^7.25.0"
+    "@babel/plugin-transform-modules-umd" "^7.24.7"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.24.7"
+    "@babel/plugin-transform-new-target" "^7.24.7"
+    "@babel/plugin-transform-nullish-coalescing-operator" "^7.24.7"
+    "@babel/plugin-transform-numeric-separator" "^7.24.7"
+    "@babel/plugin-transform-object-rest-spread" "^7.24.7"
+    "@babel/plugin-transform-object-super" "^7.24.7"
+    "@babel/plugin-transform-optional-catch-binding" "^7.24.7"
+    "@babel/plugin-transform-optional-chaining" "^7.24.8"
+    "@babel/plugin-transform-parameters" "^7.24.7"
+    "@babel/plugin-transform-private-methods" "^7.24.7"
+    "@babel/plugin-transform-private-property-in-object" "^7.24.7"
+    "@babel/plugin-transform-property-literals" "^7.24.7"
+    "@babel/plugin-transform-regenerator" "^7.24.7"
+    "@babel/plugin-transform-reserved-words" "^7.24.7"
+    "@babel/plugin-transform-shorthand-properties" "^7.24.7"
+    "@babel/plugin-transform-spread" "^7.24.7"
+    "@babel/plugin-transform-sticky-regex" "^7.24.7"
+    "@babel/plugin-transform-template-literals" "^7.24.7"
+    "@babel/plugin-transform-typeof-symbol" "^7.24.8"
+    "@babel/plugin-transform-unicode-escapes" "^7.24.7"
+    "@babel/plugin-transform-unicode-property-regex" "^7.24.7"
+    "@babel/plugin-transform-unicode-regex" "^7.24.7"
+    "@babel/plugin-transform-unicode-sets-regex" "^7.24.7"
     "@babel/preset-modules" "0.1.6-no-external-plugins"
-    babel-plugin-polyfill-corejs2 "^0.4.8"
-    babel-plugin-polyfill-corejs3 "^0.9.0"
-    babel-plugin-polyfill-regenerator "^0.5.5"
-    core-js-compat "^3.31.0"
+    babel-plugin-polyfill-corejs2 "^0.4.10"
+    babel-plugin-polyfill-corejs3 "^0.10.4"
+    babel-plugin-polyfill-regenerator "^0.6.1"
+    core-js-compat "^3.37.1"
     semver "^6.3.1"
 
-"@babel/preset-env@^7.5.5":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.10.2.tgz#715930f2cf8573b0928005ee562bed52fb65fdfb"
-  integrity sha512-MjqhX0RZaEgK/KueRzh+3yPSk30oqDKJ5HP5tqTSB1e2gzGS3PLy7K0BIpnp78+0anFuSwOeuCf1zZO7RzRvEA==
-  dependencies:
-    "@babel/compat-data" "^7.10.1"
-    "@babel/helper-compilation-targets" "^7.10.2"
-    "@babel/helper-module-imports" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-proposal-async-generator-functions" "^7.10.1"
-    "@babel/plugin-proposal-class-properties" "^7.10.1"
-    "@babel/plugin-proposal-dynamic-import" "^7.10.1"
-    "@babel/plugin-proposal-json-strings" "^7.10.1"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.1"
-    "@babel/plugin-proposal-numeric-separator" "^7.10.1"
-    "@babel/plugin-proposal-object-rest-spread" "^7.10.1"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.10.1"
-    "@babel/plugin-proposal-optional-chaining" "^7.10.1"
-    "@babel/plugin-proposal-private-methods" "^7.10.1"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.10.1"
-    "@babel/plugin-syntax-async-generators" "^7.8.0"
-    "@babel/plugin-syntax-class-properties" "^7.10.1"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.1"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-    "@babel/plugin-syntax-top-level-await" "^7.10.1"
-    "@babel/plugin-transform-arrow-functions" "^7.10.1"
-    "@babel/plugin-transform-async-to-generator" "^7.10.1"
-    "@babel/plugin-transform-block-scoped-functions" "^7.10.1"
-    "@babel/plugin-transform-block-scoping" "^7.10.1"
-    "@babel/plugin-transform-classes" "^7.10.1"
-    "@babel/plugin-transform-computed-properties" "^7.10.1"
-    "@babel/plugin-transform-destructuring" "^7.10.1"
-    "@babel/plugin-transform-dotall-regex" "^7.10.1"
-    "@babel/plugin-transform-duplicate-keys" "^7.10.1"
-    "@babel/plugin-transform-exponentiation-operator" "^7.10.1"
-    "@babel/plugin-transform-for-of" "^7.10.1"
-    "@babel/plugin-transform-function-name" "^7.10.1"
-    "@babel/plugin-transform-literals" "^7.10.1"
-    "@babel/plugin-transform-member-expression-literals" "^7.10.1"
-    "@babel/plugin-transform-modules-amd" "^7.10.1"
-    "@babel/plugin-transform-modules-commonjs" "^7.10.1"
-    "@babel/plugin-transform-modules-systemjs" "^7.10.1"
-    "@babel/plugin-transform-modules-umd" "^7.10.1"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
-    "@babel/plugin-transform-new-target" "^7.10.1"
-    "@babel/plugin-transform-object-super" "^7.10.1"
-    "@babel/plugin-transform-parameters" "^7.10.1"
-    "@babel/plugin-transform-property-literals" "^7.10.1"
-    "@babel/plugin-transform-regenerator" "^7.10.1"
-    "@babel/plugin-transform-reserved-words" "^7.10.1"
-    "@babel/plugin-transform-shorthand-properties" "^7.10.1"
-    "@babel/plugin-transform-spread" "^7.10.1"
-    "@babel/plugin-transform-sticky-regex" "^7.10.1"
-    "@babel/plugin-transform-template-literals" "^7.10.1"
-    "@babel/plugin-transform-typeof-symbol" "^7.10.1"
-    "@babel/plugin-transform-unicode-escapes" "^7.10.1"
-    "@babel/plugin-transform-unicode-regex" "^7.10.1"
-    "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.10.2"
-    browserslist "^4.12.0"
-    core-js-compat "^3.6.2"
-    invariant "^2.2.2"
-    levenary "^1.1.1"
-    semver "^5.5.0"
-
 "@babel/preset-modules@0.1.6-no-external-plugins":
   version "0.1.6-no-external-plugins"
   resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz#ccb88a2c49c817236861fee7826080573b8a923a"
@@ -1631,53 +1017,23 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/preset-modules@^0.1.3":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"
-  integrity sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
-    "@babel/plugin-transform-dotall-regex" "^7.4.4"
-    "@babel/types" "^7.4.4"
-    esutils "^2.0.2"
-
-"@babel/preset-react@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.23.3.tgz#f73ca07e7590f977db07eb54dbe46538cc015709"
-  integrity sha512-tbkHOS9axH6Ysf2OUEqoSZ6T3Fa2SrNH6WTWSPBboxKzdxNc9qOICeLXkNG0ZEwbQ1HY8liwOce4aN/Ceyuq6w==
+"@babel/preset-react@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.24.7.tgz#480aeb389b2a798880bf1f889199e3641cbb22dc"
+  integrity sha512-AAH4lEkpmzFWrGVlHaxJB7RLH21uPQ9+He+eFLWHmF9IuFQVugz8eAsamaW0DXRrTfco5zj1wWtpdcXJUOfsag==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-option" "^7.22.15"
-    "@babel/plugin-transform-react-display-name" "^7.23.3"
-    "@babel/plugin-transform-react-jsx" "^7.22.15"
-    "@babel/plugin-transform-react-jsx-development" "^7.22.5"
-    "@babel/plugin-transform-react-pure-annotations" "^7.23.3"
-
-"@babel/register@^7.23.7":
-  version "7.23.7"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.23.7.tgz#485a5e7951939d21304cae4af1719fdb887bc038"
-  integrity sha512-EjJeB6+kvpk+Y5DAkEAmbOBEFkh9OASx0huoEkqYTFxAZHzOAX2Oh5uwAUuL2rUddqfM0SA+KPXV2TbzoZ2kvQ==
-  dependencies:
-    clone-deep "^4.0.1"
-    find-cache-dir "^2.0.0"
-    make-dir "^2.1.0"
-    pirates "^4.0.6"
-    source-map-support "^0.5.16"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-validator-option" "^7.24.7"
+    "@babel/plugin-transform-react-display-name" "^7.24.7"
+    "@babel/plugin-transform-react-jsx" "^7.24.7"
+    "@babel/plugin-transform-react-jsx-development" "^7.24.7"
+    "@babel/plugin-transform-react-pure-annotations" "^7.24.7"
 
 "@babel/regjsgen@^0.8.0":
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
   integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
 
-"@babel/runtime-corejs3@^7.8.3":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.10.2.tgz#3511797ddf9a3d6f3ce46b99cc835184817eaa4e"
-  integrity sha512-+a2M/u7r15o3dV1NEizr9bRi+KUVnrs/qYxF0Z06DAPx/4VCWaz1WA7EcbE+uqGgt39lp5akWGmHsTseIkHkHg==
-  dependencies:
-    core-js-pure "^3.0.0"
-    regenerator-runtime "^0.13.4"
-
 "@babel/runtime@7.17.9":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72"
@@ -1699,7 +1055,7 @@
   dependencies:
     regenerator-runtime "^0.14.0"
 
-"@babel/runtime@^7.12.1":
+"@babel/runtime@^7.12.1", "@babel/runtime@^7.15.4":
   version "7.25.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.0.tgz#3af9a91c1b739c569d5d80cc917280919c544ecb"
   integrity sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw==
@@ -1713,56 +1069,38 @@
   dependencies:
     regenerator-runtime "^0.14.0"
 
-"@babel/template@^7.10.1", "@babel/template@^7.4.0":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.1.tgz#e167154a94cb5f14b28dc58f5356d2162f539811"
-  integrity sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==
-  dependencies:
-    "@babel/code-frame" "^7.10.1"
-    "@babel/parser" "^7.10.1"
-    "@babel/types" "^7.10.1"
-
-"@babel/template@^7.22.15", "@babel/template@^7.23.9":
-  version "7.23.9"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.23.9.tgz#f881d0487cba2828d3259dcb9ef5005a9731011a"
-  integrity sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==
-  dependencies:
-    "@babel/code-frame" "^7.23.5"
-    "@babel/parser" "^7.23.9"
-    "@babel/types" "^7.23.9"
-
-"@babel/traverse@^7.10.1", "@babel/traverse@^7.4.3":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.1.tgz#bbcef3031e4152a6c0b50147f4958df54ca0dd27"
-  integrity sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==
-  dependencies:
-    "@babel/code-frame" "^7.10.1"
-    "@babel/generator" "^7.10.1"
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/helper-split-export-declaration" "^7.10.1"
-    "@babel/parser" "^7.10.1"
-    "@babel/types" "^7.10.1"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.13"
-
-"@babel/traverse@^7.23.9":
-  version "7.23.9"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.9.tgz#2f9d6aead6b564669394c5ce0f9302bb65b9d950"
-  integrity sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==
-  dependencies:
-    "@babel/code-frame" "^7.23.5"
-    "@babel/generator" "^7.23.6"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.23.9"
-    "@babel/types" "^7.23.9"
+"@babel/template@^7.24.7", "@babel/template@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.0.tgz#e733dc3134b4fede528c15bc95e89cb98c52592a"
+  integrity sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==
+  dependencies:
+    "@babel/code-frame" "^7.24.7"
+    "@babel/parser" "^7.25.0"
+    "@babel/types" "^7.25.0"
+
+"@babel/traverse@^7.24.7", "@babel/traverse@^7.24.8", "@babel/traverse@^7.25.0", "@babel/traverse@^7.25.1", "@babel/traverse@^7.25.2", "@babel/traverse@^7.25.3":
+  version "7.25.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.3.tgz#f1b901951c83eda2f3e29450ce92743783373490"
+  integrity sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ==
+  dependencies:
+    "@babel/code-frame" "^7.24.7"
+    "@babel/generator" "^7.25.0"
+    "@babel/parser" "^7.25.3"
+    "@babel/template" "^7.25.0"
+    "@babel/types" "^7.25.2"
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.10.1", "@babel/types@^7.10.2", "@babel/types@^7.4.0", "@babel/types@^7.4.4":
+"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.24.0", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.0", "@babel/types@^7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.2.tgz#55fb231f7dc958cd69ea141a4c2997e819646125"
+  integrity sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==
+  dependencies:
+    "@babel/helper-string-parser" "^7.24.8"
+    "@babel/helper-validator-identifier" "^7.24.7"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@^7.10.1", "@babel/types@^7.4.4":
   version "7.10.2"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.2.tgz#30283be31cad0dbf6fb00bd40641ca0ea675172d"
   integrity sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==
@@ -1771,15 +1109,6 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.4", "@babel/types@^7.23.6", "@babel/types@^7.23.9":
-  version "7.23.9"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.9.tgz#1dd7b59a9a2b5c87f8b41e52770b5ecbf492e002"
-  integrity sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==
-  dependencies:
-    "@babel/helper-string-parser" "^7.23.4"
-    "@babel/helper-validator-identifier" "^7.22.20"
-    to-fast-properties "^2.0.0"
-
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
@@ -1869,13 +1198,133 @@
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
   integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
 
-"@eslint-community/eslint-utils@^4.2.0":
+"@esbuild/aix-ppc64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz#c7184a326533fcdf1b8ee0733e21c713b975575f"
+  integrity sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==
+
+"@esbuild/android-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz#09d9b4357780da9ea3a7dfb833a1f1ff439b4052"
+  integrity sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==
+
+"@esbuild/android-arm@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.21.5.tgz#9b04384fb771926dfa6d7ad04324ecb2ab9b2e28"
+  integrity sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==
+
+"@esbuild/android-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.21.5.tgz#29918ec2db754cedcb6c1b04de8cd6547af6461e"
+  integrity sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==
+
+"@esbuild/darwin-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz#e495b539660e51690f3928af50a76fb0a6ccff2a"
+  integrity sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==
+
+"@esbuild/darwin-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz#c13838fa57372839abdddc91d71542ceea2e1e22"
+  integrity sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==
+
+"@esbuild/freebsd-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz#646b989aa20bf89fd071dd5dbfad69a3542e550e"
+  integrity sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==
+
+"@esbuild/freebsd-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz#aa615cfc80af954d3458906e38ca22c18cf5c261"
+  integrity sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==
+
+"@esbuild/linux-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz#70ac6fa14f5cb7e1f7f887bcffb680ad09922b5b"
+  integrity sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==
+
+"@esbuild/linux-arm@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz#fc6fd11a8aca56c1f6f3894f2bea0479f8f626b9"
+  integrity sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==
+
+"@esbuild/linux-ia32@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz#3271f53b3f93e3d093d518d1649d6d68d346ede2"
+  integrity sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==
+
+"@esbuild/linux-loong64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz#ed62e04238c57026aea831c5a130b73c0f9f26df"
+  integrity sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==
+
+"@esbuild/linux-mips64el@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz#e79b8eb48bf3b106fadec1ac8240fb97b4e64cbe"
+  integrity sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==
+
+"@esbuild/linux-ppc64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz#5f2203860a143b9919d383ef7573521fb154c3e4"
+  integrity sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==
+
+"@esbuild/linux-riscv64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz#07bcafd99322d5af62f618cb9e6a9b7f4bb825dc"
+  integrity sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==
+
+"@esbuild/linux-s390x@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz#b7ccf686751d6a3e44b8627ababc8be3ef62d8de"
+  integrity sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==
+
+"@esbuild/linux-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz#6d8f0c768e070e64309af8004bb94e68ab2bb3b0"
+  integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==
+
+"@esbuild/netbsd-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz#bbe430f60d378ecb88decb219c602667387a6047"
+  integrity sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==
+
+"@esbuild/openbsd-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz#99d1cf2937279560d2104821f5ccce220cb2af70"
+  integrity sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==
+
+"@esbuild/sunos-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz#08741512c10d529566baba837b4fe052c8f3487b"
+  integrity sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==
+
+"@esbuild/win32-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz#675b7385398411240735016144ab2e99a60fc75d"
+  integrity sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==
+
+"@esbuild/win32-ia32@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz#1bfc3ce98aa6ca9a0969e4d2af72144c59c1193b"
+  integrity sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==
+
+"@esbuild/win32-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz#acad351d582d157bb145535db2a6ff53dd514b5c"
+  integrity sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==
+
+"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
   integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
   dependencies:
     eslint-visitor-keys "^3.3.0"
 
+"@eslint-community/regexpp@^4.10.0":
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.11.0.tgz#b0ffd0312b4a3fd2d6f77237e7248a5ad3a680ae"
+  integrity sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==
+
 "@eslint-community/regexpp@^4.6.1":
   version "4.10.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
@@ -1896,31 +1345,22 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.56.0":
-  version "8.56.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b"
-  integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==
+"@eslint/js@8.57.0":
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
+  integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
 
-"@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
-  integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
+"@eslint/js@^9.9.0":
+  version "9.9.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.9.0.tgz#d8437adda50b3ed4401964517b64b4f59b0e2638"
+  integrity sha512-hhetes6ZHP3BlXLxmd8K2SNgkhNSi+UcecbnwWKwpP7kyi/uC75DJ1lOOBO3xrC4jyojtGE3YxKZPHfk4yrgug==
 
 "@hookform/resolvers@^2.9.11":
   version "2.9.11"
   resolved "https://registry.yarnpkg.com/@hookform/resolvers/-/resolvers-2.9.11.tgz#9ce96e7746625a89239f68ca57c4f654264c17ef"
   integrity sha512-bA3aZ79UgcHj7tFV7RlgThzwSSHZgvfbt2wprldRkYBcMopdMvHyO17Wwp/twcJasNFischFfS7oz8Katz8DdQ==
 
-"@hot-loader/react-dom@17.0.2":
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/@hot-loader/react-dom/-/react-dom-17.0.2.tgz#0b24e484093e8f97eb5c72bebdda44fc20bc8400"
-  integrity sha512-G2RZrFhsQClS+bdDh/Ojpk3SgocLPUGnvnJDTQYnmKSSwXtU+Yh+8QMs+Ia3zaAvBiOSpIIDSUxuN69cvKqrWg==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    scheduler "^0.20.2"
-
-"@humanwhocodes/config-array@^0.11.13":
+"@humanwhocodes/config-array@^0.11.14":
   version "0.11.14"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
   integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==
@@ -1939,30 +1379,24 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917"
   integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==
 
-"@istanbuljs/load-nyc-config@^1.0.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
-  integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==
-  dependencies:
-    camelcase "^5.3.1"
-    find-up "^4.1.0"
-    get-package-type "^0.1.0"
-    js-yaml "^3.13.1"
-    resolve-from "^5.0.0"
-
-"@istanbuljs/nyc-config-typescript@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/nyc-config-typescript/-/nyc-config-typescript-1.0.2.tgz#1f5235b28540a07219ae0dd42014912a0b19cf89"
-  integrity sha512-iKGIyMoyJuFnJRSVTZ78POIRvNnwZaWIf8vG4ZS3rQq58MMDrqEX2nnzx0R28V2X8JvmKYiqY9FP2hlJsm8A0w==
+"@isaacs/cliui@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
+  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
   dependencies:
-    "@istanbuljs/schema" "^0.1.2"
+    string-width "^5.1.2"
+    string-width-cjs "npm:string-width@^4.2.0"
+    strip-ansi "^7.0.1"
+    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
+    wrap-ansi "^8.1.0"
+    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
 
-"@istanbuljs/schema@^0.1.2":
+"@istanbuljs/schema@^0.1.2", "@istanbuljs/schema@^0.1.3":
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
-"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
+"@jridgewell/gen-mapping@^0.3.0":
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
   integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==
@@ -1971,6 +1405,15 @@
     "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.9"
 
+"@jridgewell/gen-mapping@^0.3.5":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
+  integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==
+  dependencies:
+    "@jridgewell/set-array" "^1.2.1"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.24"
+
 "@jridgewell/resolve-uri@^3.0.3":
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
@@ -1986,19 +1429,21 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
-"@jridgewell/source-map@^0.3.3":
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.5.tgz#a3bb4d5c6825aab0d281268f47f6ad5853431e91"
-  integrity sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==
-  dependencies:
-    "@jridgewell/gen-mapping" "^0.3.0"
-    "@jridgewell/trace-mapping" "^0.3.9"
+"@jridgewell/set-array@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280"
+  integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
 
 "@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
   version "1.4.15"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
+"@jridgewell/sourcemap-codec@^1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a"
+  integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==
+
 "@jridgewell/trace-mapping@0.3.9":
   version "0.3.9"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
@@ -2007,7 +1452,15 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.9":
+"@jridgewell/trace-mapping@^0.3.23", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
+  version "0.3.25"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
+  integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
+
+"@jridgewell/trace-mapping@^0.3.9":
   version "0.3.22"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz#72a621e5de59f5f1ef792d0793a82ee20f645e4c"
   integrity sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw==
@@ -2020,11 +1473,6 @@
   resolved "https://registry.yarnpkg.com/@juggle/resize-observer/-/resize-observer-3.2.0.tgz#5e0b448d27fe3091bae6216456512c5904d05661"
   integrity sha512-fsLxt0CHx2HCV9EL8lDoVkwHffsA0snUpddYjdLyXcG5E41xaamn9ZyQqOE9TUJdrRlH8/hjIf+UdOdDeKCUgg==
 
-"@leichtgewicht/ip-codec@^2.0.1":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
-  integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
-
 "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
   version "5.1.1-v1"
   resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129"
@@ -2053,37 +1501,15 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@npmcli/fs@^1.0.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257"
-  integrity sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==
-  dependencies:
-    "@gar/promisify" "^1.0.1"
-    semver "^7.3.5"
-
-"@npmcli/fs@^2.1.0":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865"
-  integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==
-  dependencies:
-    "@gar/promisify" "^1.1.3"
-    semver "^7.3.5"
-
-"@npmcli/move-file@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
-  integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
-"@npmcli/move-file@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4"
-  integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
+"@pkgjs/parseargs@^0.11.0":
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
+  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
+
+"@polka/url@^1.0.0-next.24":
+  version "1.0.0-next.25"
+  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.25.tgz#f077fdc0b5d0078d30893396ff4827a13f99e817"
+  integrity sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==
 
 "@popperjs/core@2.11.5":
   version "2.11.5"
@@ -2235,86 +1661,102 @@
   resolved "https://registry.yarnpkg.com/@redux-saga/types/-/types-1.1.0.tgz#0e81ce56b4883b4b2a3001ebe1ab298b84237204"
   integrity sha512-afmTuJrylUU/0OtqzaRkbyYFFNgCF73Bvel/sw90pvGrWIZ+vyoIJqA6eMSoA6+nb443kTmulmBtC9NerXboNg==
 
-"@rollup/plugin-babel@^5.2.0":
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz#04bc0608f4aa4b2e4b1aebf284344d0f68fda283"
-  integrity sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==
-  dependencies:
-    "@babel/helper-module-imports" "^7.10.4"
-    "@rollup/pluginutils" "^3.1.0"
-
-"@rollup/plugin-node-resolve@^11.2.1":
-  version "11.2.1"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz#82aa59397a29cd4e13248b106e6a4a1880362a60"
-  integrity sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==
-  dependencies:
-    "@rollup/pluginutils" "^3.1.0"
-    "@types/resolve" "1.17.1"
-    builtin-modules "^3.1.0"
-    deepmerge "^4.2.2"
-    is-module "^1.0.0"
-    resolve "^1.19.0"
-
-"@rollup/plugin-replace@^2.4.1":
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz#a2d539314fbc77c244858faa523012825068510a"
-  integrity sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==
-  dependencies:
-    "@rollup/pluginutils" "^3.1.0"
-    magic-string "^0.25.7"
-
-"@rollup/pluginutils@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b"
-  integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==
-  dependencies:
-    "@types/estree" "0.0.39"
-    estree-walker "^1.0.1"
-    picomatch "^2.2.2"
-
-"@scarf/scarf@^1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@scarf/scarf/-/scarf-1.0.5.tgz#accee0bce88a9047672f7c8faf3cada59c996b81"
-  integrity sha512-9WKaGVpQH905Aqkk+BczFEeLQxS07rl04afFRPUG9IcSlOwmo5EVVuuNu0d4M9LMYucObvK0LoAe+5HfMW2QhQ==
-
-"@sinonjs/commons@^1", "@sinonjs/commons@^1.3.0", "@sinonjs/commons@^1.4.0", "@sinonjs/commons@^1.7.0":
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.0.tgz#c8d68821a854c555bba172f3b06959a0039b236d"
-  integrity sha512-wEj54PfsZ5jGSwMX68G8ZXFawcSglQSXqCftWX3ec8MDUzQdHgcKvw97awHbY0efQEL5iKUOAmmVtoYgmrSG4Q==
-  dependencies:
-    type-detect "4.0.8"
-
-"@sinonjs/formatio@^3.2.1":
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-3.2.2.tgz#771c60dfa75ea7f2d68e3b94c7e888a78781372c"
-  integrity sha512-B8SEsgd8gArBLMD6zpRw3juQ2FVSsmdd7qlevyDqzS9WTCtvF55/gAL+h6gue8ZvPYcdiPdvueM/qm//9XzyTQ==
+"@rollup/plugin-babel@^6.0.4":
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-6.0.4.tgz#bd698e351fa9aa9619fcae780aea2a603d98e4c4"
+  integrity sha512-YF7Y52kFdFT/xVSuVdjkV5ZdX/3YtmX0QulG+x0taQOtJdHYzVU61aSSkAgVJ7NOv6qPkIYiJSgSWWN/DM5sGw==
   dependencies:
-    "@sinonjs/commons" "^1"
-    "@sinonjs/samsam" "^3.1.0"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@rollup/pluginutils" "^5.0.1"
 
-"@sinonjs/samsam@^3.1.0", "@sinonjs/samsam@^3.3.3":
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-3.3.3.tgz#46682efd9967b259b81136b9f120fd54585feb4a"
-  integrity sha512-bKCMKZvWIjYD0BLGnNrxVuw4dkWCYsLqFOUWw8VgKF/+5Y+mE7LfHWPIYoDXowH+3a9LsWDMo0uAP8YDosPvHQ==
+"@rollup/pluginutils@^5.0.1":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.1.0.tgz#7e53eddc8c7f483a4ad0b94afb1f7f5fd3c771e0"
+  integrity sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==
   dependencies:
-    "@sinonjs/commons" "^1.3.0"
-    array-from "^2.1.1"
-    lodash "^4.17.15"
-
-"@sinonjs/text-encoding@^0.7.1":
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
-  integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
+    "@types/estree" "^1.0.0"
+    estree-walker "^2.0.2"
+    picomatch "^2.3.1"
 
-"@surma/rollup-plugin-off-main-thread@^2.2.3":
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz#ee34985952ca21558ab0d952f00298ad2190c053"
-  integrity sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ==
-  dependencies:
-    ejs "^3.1.6"
-    json5 "^2.2.0"
-    magic-string "^0.25.0"
-    string.prototype.matchall "^4.0.6"
+"@rollup/rollup-android-arm-eabi@4.19.2":
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.19.2.tgz#6b991cb44bf69e50163528ea85bed545330ba821"
+  integrity sha512-OHflWINKtoCFSpm/WmuQaWW4jeX+3Qt3XQDepkkiFTsoxFc5BpF3Z5aDxFZgBqRjO6ATP5+b1iilp4kGIZVWlA==
+
+"@rollup/rollup-android-arm64@4.19.2":
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.19.2.tgz#5d3c8c2f9742d62ba258cc378bd2d4720f0c431c"
+  integrity sha512-k0OC/b14rNzMLDOE6QMBCjDRm3fQOHAL8Ldc9bxEWvMo4Ty9RY6rWmGetNTWhPo+/+FNd1lsQYRd0/1OSix36A==
+
+"@rollup/rollup-darwin-arm64@4.19.2":
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.19.2.tgz#8eac8682a34a705bb6a57eb3e739fd6bbedfabed"
+  integrity sha512-IIARRgWCNWMTeQH+kr/gFTHJccKzwEaI0YSvtqkEBPj7AshElFq89TyreKNFAGh5frLfDCbodnq+Ye3dqGKPBw==
+
+"@rollup/rollup-darwin-x64@4.19.2":
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.19.2.tgz#70a9953fc624bd7f645901f4250f6b5807ac7e92"
+  integrity sha512-52udDMFDv54BTAdnw+KXNF45QCvcJOcYGl3vQkp4vARyrcdI/cXH8VXTEv/8QWfd6Fru8QQuw1b2uNersXOL0g==
+
+"@rollup/rollup-linux-arm-gnueabihf@4.19.2":
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.19.2.tgz#8f6c4ff4c4972413ff94345080380d4e3caa3c69"
+  integrity sha512-r+SI2t8srMPYZeoa1w0o/AfoVt9akI1ihgazGYPQGRilVAkuzMGiTtexNZkrPkQsyFrvqq/ni8f3zOnHw4hUbA==
+
+"@rollup/rollup-linux-arm-musleabihf@4.19.2":
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.19.2.tgz#5d3c0fe5ea5ddf2feb511b3cb031df17eaa7e33d"
+  integrity sha512-+tYiL4QVjtI3KliKBGtUU7yhw0GMcJJuB9mLTCEauHEsqfk49gtUBXGtGP3h1LW8MbaTY6rSFIQV1XOBps1gBA==
+
+"@rollup/rollup-linux-arm64-gnu@4.19.2":
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.19.2.tgz#b7f104388b2f5624d9f8adfff10ba59af8ab8ed1"
+  integrity sha512-OR5DcvZiYN75mXDNQQxlQPTv4D+uNCUsmSCSY2FolLf9W5I4DSoJyg7z9Ea3TjKfhPSGgMJiey1aWvlWuBzMtg==
+
+"@rollup/rollup-linux-arm64-musl@4.19.2":
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.19.2.tgz#6d5ca6d3904309bec285ea5202d589cebb93dee4"
+  integrity sha512-Hw3jSfWdUSauEYFBSFIte6I8m6jOj+3vifLg8EU3lreWulAUpch4JBjDMtlKosrBzkr0kwKgL9iCfjA8L3geoA==
+
+"@rollup/rollup-linux-powerpc64le-gnu@4.19.2":
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.19.2.tgz#4df9be1396ea9eb0ca99fd0f2e858008d7f063e3"
+  integrity sha512-rhjvoPBhBwVnJRq/+hi2Q3EMiVF538/o9dBuj9TVLclo9DuONqt5xfWSaE6MYiFKpo/lFPJ/iSI72rYWw5Hc7w==
+
+"@rollup/rollup-linux-riscv64-gnu@4.19.2":
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.19.2.tgz#80d63c5562915a2f8616a04251fcaee0218112b0"
+  integrity sha512-EAz6vjPwHHs2qOCnpQkw4xs14XJq84I81sDRGPEjKPFVPBw7fwvtwhVjcZR6SLydCv8zNK8YGFblKWd/vRmP8g==
+
+"@rollup/rollup-linux-s390x-gnu@4.19.2":
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.19.2.tgz#ef62e9bc5cc3b84fcfe96ec0a42d1989691217b3"
+  integrity sha512-IJSUX1xb8k/zN9j2I7B5Re6B0NNJDJ1+soezjNojhT8DEVeDNptq2jgycCOpRhyGj0+xBn7Cq+PK7Q+nd2hxLA==
+
+"@rollup/rollup-linux-x64-gnu@4.19.2":
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.19.2.tgz#6a275282a0080fee98ddd9fda0de23c4c6bafd48"
+  integrity sha512-OgaToJ8jSxTpgGkZSkwKE+JQGihdcaqnyHEFOSAU45utQ+yLruE1dkonB2SDI8t375wOKgNn8pQvaWY9kPzxDQ==
+
+"@rollup/rollup-linux-x64-musl@4.19.2":
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.19.2.tgz#64f0c704107e6b45b26dd8c2e1ff64246e4a1251"
+  integrity sha512-5V3mPpWkB066XZZBgSd1lwozBk7tmOkKtquyCJ6T4LN3mzKENXyBwWNQn8d0Ci81hvlBw5RoFgleVpL6aScLYg==
+
+"@rollup/rollup-win32-arm64-msvc@4.19.2":
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.19.2.tgz#bada17b0c5017ff58d0feba401c43ff5a646c693"
+  integrity sha512-ayVstadfLeeXI9zUPiKRVT8qF55hm7hKa+0N1V6Vj+OTNFfKSoUxyZvzVvgtBxqSb5URQ8sK6fhwxr9/MLmxdA==
+
+"@rollup/rollup-win32-ia32-msvc@4.19.2":
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.19.2.tgz#a716d862f6ac39d88bdb825e27f63aeb0387cd66"
+  integrity sha512-Mda7iG4fOLHNsPqjWSjANvNZYoW034yxgrndof0DwCy0D3FvTjeNo+HGE6oGWgvcLZNLlcp0hLEFcRs+UGsMLg==
+
+"@rollup/rollup-win32-x64-msvc@4.19.2":
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.19.2.tgz#d67206c5f2e4b2832ce360bbbde194e96d16dc51"
+  integrity sha512-DPi0ubYhSow/00YqmG1jWm3qt1F8aXziHc/UNy8bo9cpCacqhuWu+iSq/fp2SyEQK7iYTZ60fBU9cat3MXTjIQ==
 
 "@swc/helpers@^0.4.14":
   version "0.4.36"
@@ -2331,16 +1773,6 @@
   dependencies:
     tslib "^2.4.0"
 
-"@tootallnate/once@1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
-  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
-
-"@tootallnate/once@2":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
-  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
-
 "@tsconfig/node10@^1.0.7":
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.11.tgz#6ee46400685f130e278128c7b38b7e031ff5b2f2"
@@ -2361,110 +1793,59 @@
   resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
   integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
 
-"@types/body-parser@*":
-  version "1.19.5"
-  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.5.tgz#04ce9a3b677dc8bd681a17da1ab9835dc9d3ede4"
-  integrity sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==
+"@types/babel__core@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.5.tgz#3df15f27ba85319caa07ba08d0721889bb39c017"
+  integrity sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==
+  dependencies:
+    "@babel/parser" "^7.20.7"
+    "@babel/types" "^7.20.7"
+    "@types/babel__generator" "*"
+    "@types/babel__template" "*"
+    "@types/babel__traverse" "*"
+
+"@types/babel__generator@*":
+  version "7.6.8"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.8.tgz#f836c61f48b1346e7d2b0d93c6dacc5b9535d3ab"
+  integrity sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==
   dependencies:
-    "@types/connect" "*"
-    "@types/node" "*"
+    "@babel/types" "^7.0.0"
 
-"@types/bonjour@^3.5.9":
-  version "3.5.13"
-  resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.13.tgz#adf90ce1a105e81dd1f9c61fdc5afda1bfb92956"
-  integrity sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==
+"@types/babel__template@*":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.4.tgz#5672513701c1b2199bc6dad636a9d7491586766f"
+  integrity sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==
   dependencies:
-    "@types/node" "*"
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
 
-"@types/chai@^4.3.16":
-  version "4.3.16"
-  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.16.tgz#b1572967f0b8b60bf3f87fe1d854a5604ea70c82"
-  integrity sha512-PatH4iOdyh3MyWtmHVFXLWCCIhUbopaltqddG9BzB+gMIzee2MJrvd+jouii9Z3wzQJruGWAm7WOMjgfG8hQlQ==
+"@types/babel__traverse@*":
+  version "7.20.6"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.6.tgz#8dc9f0ae0f202c08d8d4dab648912c8d6038e3f7"
+  integrity sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==
+  dependencies:
+    "@babel/types" "^7.20.7"
 
 "@types/color-name@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
   integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
 
-"@types/connect-history-api-fallback@^1.3.5":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz#7de71645a103056b48ac3ce07b3520b819c1d5b3"
-  integrity sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==
-  dependencies:
-    "@types/express-serve-static-core" "*"
-    "@types/node" "*"
-
-"@types/connect@*":
-  version "3.4.38"
-  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.38.tgz#5ba7f3bc4fbbdeaff8dded952e5ff2cc53f8d858"
-  integrity sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==
-  dependencies:
-    "@types/node" "*"
-
 "@types/cookie@^0.4.1":
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d"
   integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==
 
-"@types/eslint-scope@^3.7.3":
-  version "3.7.7"
-  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5"
-  integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==
-  dependencies:
-    "@types/eslint" "*"
-    "@types/estree" "*"
-
-"@types/eslint@*":
-  version "8.56.2"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.2.tgz#1c72a9b794aa26a8b94ad26d5b9aa51c8a6384bb"
-  integrity sha512-uQDwm1wFHmbBbCZCqAlq6Do9LYwByNZHWzXppSnay9SuwJ+VRbjkbLABer54kcPnMSlG6Fdiy2yaFXm/z9Z5gw==
-  dependencies:
-    "@types/estree" "*"
-    "@types/json-schema" "*"
-
-"@types/estree@*", "@types/estree@^1.0.5":
+"@types/estree@1.0.5", "@types/estree@^1.0.0":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
   integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
 
-"@types/estree@0.0.39":
-  version "0.0.39"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
-  integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
-
-"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33":
-  version "4.17.42"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.42.tgz#2a276952acc73d1b8dc63fd4210647abbc553a71"
-  integrity sha512-ckM3jm2bf/MfB3+spLPWYPUH573plBFwpOhqQ2WottxYV85j1HQFlxmnTq57X1yHY9awZPig06hL/cLMgNWHIQ==
-  dependencies:
-    "@types/node" "*"
-    "@types/qs" "*"
-    "@types/range-parser" "*"
-    "@types/send" "*"
-
-"@types/express@*", "@types/express@^4.17.13":
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d"
-  integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==
-  dependencies:
-    "@types/body-parser" "*"
-    "@types/express-serve-static-core" "^4.17.33"
-    "@types/qs" "*"
-    "@types/serve-static" "*"
-
 "@types/geojson@*":
   version "7946.0.14"
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.14.tgz#319b63ad6df705ee2a65a73ef042c8271e696613"
   integrity sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==
 
-"@types/glob@^7.1.1":
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.2.tgz#06ca26521353a545d94a0adc74f38a59d232c987"
-  integrity sha512-VgNIkxK+j7Nz5P7jvUZlRvhuPSmsEfS03b0alKcq5V/STUKAa3Plemsn5mrQUO7am6OErJ4rhGEGJbACclrtRA==
-  dependencies:
-    "@types/minimatch" "*"
-    "@types/node" "*"
-
 "@types/history@^5.0.0":
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/@types/history/-/history-5.0.0.tgz#29f919f0c8e302763798118f45b19cab4a886f14"
@@ -2472,37 +1853,25 @@
   dependencies:
     history "*"
 
-"@types/html-minifier-terser@^6.0.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35"
-  integrity sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==
-
-"@types/http-errors@*":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.4.tgz#7eb47726c391b7345a6ec35ad7f4de469cf5ba4f"
-  integrity sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==
-
-"@types/http-proxy@^1.17.8":
-  version "1.17.14"
-  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.14.tgz#57f8ccaa1c1c3780644f8a94f9c6b5000b5e2eec"
-  integrity sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==
+"@types/hoist-non-react-statics@^3.3.0":
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz#dab7867ef789d87e2b4b0003c9d65c49cc44a494"
+  integrity sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==
   dependencies:
-    "@types/node" "*"
-
-"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
-  version "7.0.15"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
-  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
+    "@types/react" "*"
+    hoist-non-react-statics "^3.3.0"
 
-"@types/json-schema@^7.0.4":
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
-  integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
+"@types/leaflet-draw@^1.0.11":
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/@types/leaflet-draw/-/leaflet-draw-1.0.11.tgz#277bf4426025f59d6fc55db0eb9c13cef0f49e13"
+  integrity sha512-dyedtNm3aSmnpi6FM6VSl28cQuvP+MD7pgpXyO3Q1ZOCvrJKmzaDq0P3YZTnnBs61fQCKSnNYmbvCkDgFT9FHQ==
+  dependencies:
+    "@types/leaflet" "*"
 
-"@types/leaflet@1.5.23":
-  version "1.5.23"
-  resolved "https://registry.yarnpkg.com/@types/leaflet/-/leaflet-1.5.23.tgz#159823a8c86a50383f0c9d9b9dac2af01fa7603b"
-  integrity sha512-S/xpuwjZuwYMP+4ZzQ10PX0Jy+0XmwPeojtjqhbca9UXaINdoru91Qm/DUUXyh4qYm3CP6Vher06l/UcA9tUKQ==
+"@types/leaflet@*", "@types/leaflet@^1.5.23":
+  version "1.9.12"
+  resolved "https://registry.yarnpkg.com/@types/leaflet/-/leaflet-1.9.12.tgz#a6626a0b3fba36fd34723d6e95b22e8024781ad6"
+  integrity sha512-BK7XS+NyRI291HIo0HCfE18Lp8oA30H1gpi1tf0mF3TgiCEzanQjOqNZ4x126SXzzi2oNSZhZ5axJp1k0iM6jg==
   dependencies:
     "@types/geojson" "*"
 
@@ -2511,81 +1880,54 @@
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.1.tgz#0fabfcf2f2127ef73b119d98452bd317c4a17eb8"
   integrity sha512-X+2qazGS3jxLAIz5JDXDzglAF3KpijdhFxlf/V1+hEsOUc+HnWi81L/uv/EvGuV90WY+7mPGFCUDGfQC3Gj95Q==
 
-"@types/mime@*":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.4.tgz#2198ac274de6017b44d941e00261d5bc6a0e0a45"
-  integrity sha512-iJt33IQnVRkqeqC7PzBHPTC6fDlRNRW8vjrgqtScAhrmMwe8c4Eo7+fUGTa+XdWrpEgpyKWMYmi2dIwMAYRzPw==
-
-"@types/mime@^1":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.5.tgz#1ef302e01cf7d2b5a0fa526790c9123bf1d06690"
-  integrity sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==
-
-"@types/minimatch@*":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
-  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
-
-"@types/minimist@^1.2.0":
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e"
-  integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==
-
-"@types/mocha@^10.0.6":
-  version "10.0.6"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-10.0.6.tgz#818551d39113081048bdddbef96701b4e8bb9d1b"
-  integrity sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg==
-
-"@types/node-forge@^1.3.0":
-  version "1.3.11"
-  resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-1.3.11.tgz#0972ea538ddb0f4d9c2fa0ec5db5724773a604da"
-  integrity sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==
-  dependencies:
-    "@types/node" "*"
-
-"@types/node@*":
-  version "14.0.12"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.12.tgz#9c1d8ffb8084e8936603a6122a7649e40e68e04b"
-  integrity sha512-/sjzehvjkkpvLpYtN6/2dv5kg41otMGuHQUt9T2aiAuIfleCQRQHXXzF1eAw/qkZTj5Kcf4JSTf7EIizHocy6Q==
-
-"@types/normalize-package-data@^2.4.0":
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901"
-  integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==
-
 "@types/parse-json@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
+"@types/proj4@*":
+  version "2.5.5"
+  resolved "https://registry.yarnpkg.com/@types/proj4/-/proj4-2.5.5.tgz#044d53782dc75f20335577ca3af2643962a56980"
+  integrity sha512-y4tHUVVoMEOm2nxRLQ2/ET8upj/pBmoutGxFw2LZJTQWPgWXI+cbxVEUFFmIzr/bpFR83hGDOTSXX6HBeObvZA==
+
+"@types/proj4leaflet@^1.0.2":
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/@types/proj4leaflet/-/proj4leaflet-1.0.10.tgz#096101436e8725160c8da50880560ecc9e651ec9"
+  integrity sha512-Yie5J8sHUgTQ1FTRP9cCDXpWvHXjUiSjwlnJb1F06Czwo6cVOt8Bxy6txMSIVgznbnRWlbYmxNjWDhYtNxAflw==
+  dependencies:
+    "@types/geojson" "*"
+    "@types/leaflet" "*"
+    "@types/proj4" "*"
+
 "@types/prop-types@*":
   version "15.7.12"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.12.tgz#12bb1e2be27293c1406acb6af1c3f3a1481d98c6"
   integrity sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==
 
-"@types/qs@*":
-  version "6.9.11"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.11.tgz#208d8a30bc507bd82e03ada29e4732ea46a6bbda"
-  integrity sha512-oGk0gmhnEJK4Yyk+oI7EfXsLayXatCWPHary1MtcmbAifkobT9cM9yutG/hZKIseOU0MqbIwQ/u2nn/Gb+ltuQ==
-
-"@types/range-parser@*":
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb"
-  integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==
+"@types/react-dom@^16.9.24":
+  version "16.9.24"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.24.tgz#4d193d7d011267fca842e8a10a2d738f92ec5c30"
+  integrity sha512-Gcmq2JTDheyWn/1eteqyzzWKSqDjYU6KYsIvH7thb7CR5OYInAWOX+7WnKf6PaU/cbdOc4szJItcDEJO7UGmfA==
+  dependencies:
+    "@types/react" "^16"
 
-"@types/react-dom@^18.3.0":
-  version "18.3.0"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.3.0.tgz#0cbc818755d87066ab6ca74fbedb2547d74a82b0"
-  integrity sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==
+"@types/react-redux@^7.1.20", "@types/react-redux@^7.1.33":
+  version "7.1.33"
+  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.33.tgz#53c5564f03f1ded90904e3c90f77e4bd4dc20b15"
+  integrity sha512-NF8m5AjWCkert+fosDsN3hAlHzpjSiXlVy9EgQEmLoBhaNXbmyeGs/aj5dQzKuF+/q+S7JQagorGDW8pJ28Hmg==
   dependencies:
+    "@types/hoist-non-react-statics" "^3.3.0"
     "@types/react" "*"
+    hoist-non-react-statics "^3.3.0"
+    redux "^4.0.0"
 
-"@types/react@*", "@types/react@^18.3.2":
-  version "18.3.2"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.2.tgz#462ae4904973bc212fa910424d901e3d137dbfcd"
-  integrity sha512-Btgg89dAnqD4vV7R3hlwOxgqobUQKgx3MmrQRi0yYbs/P0ym8XozIAlkqVilPqHQwXs4e9Tf63rrCgl58BcO4w==
+"@types/react@*", "@types/react@^16", "@types/react@^16.9.56":
+  version "16.14.60"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.60.tgz#f7ab62a329b82826f12d02bc8031d4ef4b5e0d81"
+  integrity sha512-wIFmnczGsTcgwCBeIYOuy2mdXEiKZ5znU/jNOnMZPQyCcIxauMGWlX0TNG4lZ7NxRKj7YUIZRneJQSSdB2jKgg==
   dependencies:
     "@types/prop-types" "*"
+    "@types/scheduler" "^0.16"
     csstype "^3.0.2"
 
 "@types/redux-actions@^2.6.5":
@@ -2593,65 +1935,44 @@
   resolved "https://registry.yarnpkg.com/@types/redux-actions/-/redux-actions-2.6.5.tgz#3728477ada6c4bc0fe54ffae11def23a65c0714b"
   integrity sha512-RgXOigay5cNweP+xH1ru+Vaaj1xXYLpWIfSVO8cSA8Ii2xvR+HRfWYdLe1UVOA8X0kIklalGOa0DTDyld0obkg==
 
-"@types/resolve@1.17.1":
-  version "1.17.1"
-  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"
-  integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==
-  dependencies:
-    "@types/node" "*"
-
-"@types/retry@0.12.0":
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
-  integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
-
-"@types/send@*":
-  version "0.17.4"
-  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a"
-  integrity sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==
-  dependencies:
-    "@types/mime" "^1"
-    "@types/node" "*"
-
-"@types/serve-index@^1.9.1":
-  version "1.9.4"
-  resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.4.tgz#e6ae13d5053cb06ed36392110b4f9a49ac4ec898"
-  integrity sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==
-  dependencies:
-    "@types/express" "*"
-
-"@types/serve-static@*", "@types/serve-static@^1.13.10":
-  version "1.15.5"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.5.tgz#15e67500ec40789a1e8c9defc2d32a896f05b033"
-  integrity sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ==
-  dependencies:
-    "@types/http-errors" "*"
-    "@types/mime" "*"
-    "@types/node" "*"
-
-"@types/sockjs@^0.3.33":
-  version "0.3.36"
-  resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.36.tgz#ce322cf07bcc119d4cbf7f88954f3a3bd0f67535"
-  integrity sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==
+"@types/redux-form@^8.2.5":
+  version "8.3.11"
+  resolved "https://registry.yarnpkg.com/@types/redux-form/-/redux-form-8.3.11.tgz#05d9b9f92bd1c5291ce33de91b55b345f5115a72"
+  integrity sha512-aHZgvDt9rg6C/8IHVgooCABxrWzQxJlVP47b6draiMLXKfWbyhYOVf8AV8+UPujRTnVxp1mWb57kL+r/Rl3wNQ==
   dependencies:
-    "@types/node" "*"
+    "@types/react" "*"
+    redux "^3.6.0 || ^4.0.0"
 
-"@types/trusted-types@^2.0.2":
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.7.tgz#baccb07a970b91707df3a3e8ba6896c57ead2d11"
-  integrity sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==
+"@types/scheduler@^0.16":
+  version "0.16.8"
+  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.8.tgz#ce5ace04cfeabe7ef87c0091e50752e36707deff"
+  integrity sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==
 
-"@types/webpack-env@^1.18.5":
-  version "1.18.5"
-  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.18.5.tgz#eccda0b04fe024bed505881e2e532f9c119169bf"
-  integrity sha512-wz7kjjRRj8/Lty4B+Kr0LN6Ypc/3SymeCCGSbaXp2leH0ZVg/PriNiOwNj4bD4uphI7A8NXS4b6Gl373sfO5mA==
+"@typescript-eslint/eslint-plugin@8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.1.0.tgz#3c020deeaaba82a6f741d00dacf172c53be4911f"
+  integrity sha512-LlNBaHFCEBPHyD4pZXb35mzjGkuGKXU5eeCA1SxvHfiRES0E82dOounfVpL4DCqYvJEKab0bZIA0gCRpdLKkCw==
+  dependencies:
+    "@eslint-community/regexpp" "^4.10.0"
+    "@typescript-eslint/scope-manager" "8.1.0"
+    "@typescript-eslint/type-utils" "8.1.0"
+    "@typescript-eslint/utils" "8.1.0"
+    "@typescript-eslint/visitor-keys" "8.1.0"
+    graphemer "^1.4.0"
+    ignore "^5.3.1"
+    natural-compare "^1.4.0"
+    ts-api-utils "^1.3.0"
 
-"@types/ws@^8.5.5":
-  version "8.5.10"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.10.tgz#4acfb517970853fa6574a3a6886791d04a396787"
-  integrity sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==
+"@typescript-eslint/parser@8.1.0", "@typescript-eslint/parser@^8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.1.0.tgz#b7e77f5fa212df59eba51ecd4986f194bccc2303"
+  integrity sha512-U7iTAtGgJk6DPX9wIWPPOlt1gO57097G06gIcl0N0EEnNw8RGD62c+2/DiP/zL7KrkqnnqF7gtFGR7YgzPllTA==
   dependencies:
-    "@types/node" "*"
+    "@typescript-eslint/scope-manager" "8.1.0"
+    "@typescript-eslint/types" "8.1.0"
+    "@typescript-eslint/typescript-estree" "8.1.0"
+    "@typescript-eslint/visitor-keys" "8.1.0"
+    debug "^4.3.4"
 
 "@typescript-eslint/parser@^6.19.0":
   version "6.21.0"
@@ -2672,11 +1993,34 @@
     "@typescript-eslint/types" "6.21.0"
     "@typescript-eslint/visitor-keys" "6.21.0"
 
+"@typescript-eslint/scope-manager@8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.1.0.tgz#dd8987d2efebb71d230a1c71d82e84a7aead5c3d"
+  integrity sha512-DsuOZQji687sQUjm4N6c9xABJa7fjvfIdjqpSIIVOgaENf2jFXiM9hIBZOL3hb6DHK9Nvd2d7zZnoMLf9e0OtQ==
+  dependencies:
+    "@typescript-eslint/types" "8.1.0"
+    "@typescript-eslint/visitor-keys" "8.1.0"
+
+"@typescript-eslint/type-utils@8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.1.0.tgz#dbf5a4308166dfc37a36305390dea04a3a3b5048"
+  integrity sha512-oLYvTxljVvsMnldfl6jIKxTaU7ok7km0KDrwOt1RHYu6nxlhN3TIx8k5Q52L6wR33nOwDgM7VwW1fT1qMNfFIA==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "8.1.0"
+    "@typescript-eslint/utils" "8.1.0"
+    debug "^4.3.4"
+    ts-api-utils "^1.3.0"
+
 "@typescript-eslint/types@6.21.0":
   version "6.21.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d"
   integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==
 
+"@typescript-eslint/types@8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.1.0.tgz#fbf1eaa668a7e444ac507732ca9d3c3468e5db9c"
+  integrity sha512-q2/Bxa0gMOu/2/AKALI0tCKbG2zppccnRIRCW6BaaTlRVaPKft4oVYPp7WOPpcnsgbr0qROAVCVKCvIQ0tbWog==
+
 "@typescript-eslint/typescript-estree@6.21.0":
   version "6.21.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz#c47ae7901db3b8bddc3ecd73daff2d0895688c46"
@@ -2691,6 +2035,30 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
+"@typescript-eslint/typescript-estree@8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.1.0.tgz#c44e5667683c0bb5caa43192e27de6a994f4e4c4"
+  integrity sha512-NTHhmufocEkMiAord/g++gWKb0Fr34e9AExBRdqgWdVBaKoei2dIyYKD9Q0jBnvfbEA5zaf8plUFMUH6kQ0vGg==
+  dependencies:
+    "@typescript-eslint/types" "8.1.0"
+    "@typescript-eslint/visitor-keys" "8.1.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    minimatch "^9.0.4"
+    semver "^7.6.0"
+    ts-api-utils "^1.3.0"
+
+"@typescript-eslint/utils@8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.1.0.tgz#a922985a43d2560ce0d293be79148fa80c1325e0"
+  integrity sha512-ypRueFNKTIFwqPeJBfeIpxZ895PQhNyH4YID6js0UoBImWYoSjBsahUn9KMiJXh94uOjVBgHD9AmkyPsPnFwJA==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@typescript-eslint/scope-manager" "8.1.0"
+    "@typescript-eslint/types" "8.1.0"
+    "@typescript-eslint/typescript-estree" "8.1.0"
+
 "@typescript-eslint/visitor-keys@6.21.0":
   version "6.21.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz#87a99d077aa507e20e238b11d56cc26ade45fe47"
@@ -2699,167 +2067,109 @@
     "@typescript-eslint/types" "6.21.0"
     eslint-visitor-keys "^3.4.1"
 
+"@typescript-eslint/visitor-keys@8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.1.0.tgz#ab2b3a9699a8ddebf0c205e133f114c1fed9daad"
+  integrity sha512-ba0lNI19awqZ5ZNKh6wCModMwoZs457StTebQ0q1NP58zSi2F6MOZRXwfKZy+jB78JNJ/WH8GSh2IQNzXX8Nag==
+  dependencies:
+    "@typescript-eslint/types" "8.1.0"
+    eslint-visitor-keys "^3.4.3"
+
 "@ungap/structured-clone@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
   integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
 
-"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24"
-  integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==
-  dependencies:
-    "@webassemblyjs/helper-numbers" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-
-"@webassemblyjs/floating-point-hex-parser@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431"
-  integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==
-
-"@webassemblyjs/helper-api-error@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768"
-  integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==
-
-"@webassemblyjs/helper-buffer@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093"
-  integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==
-
-"@webassemblyjs/helper-numbers@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5"
-  integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==
-  dependencies:
-    "@webassemblyjs/floating-point-hex-parser" "1.11.6"
-    "@webassemblyjs/helper-api-error" "1.11.6"
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/helper-wasm-bytecode@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9"
-  integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==
-
-"@webassemblyjs/helper-wasm-section@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577"
-  integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-buffer" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/wasm-gen" "1.11.6"
-
-"@webassemblyjs/ieee754@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a"
-  integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==
-  dependencies:
-    "@xtuc/ieee754" "^1.2.0"
-
-"@webassemblyjs/leb128@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7"
-  integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==
-  dependencies:
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/utf8@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
-  integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
-
-"@webassemblyjs/wasm-edit@^1.11.5":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab"
-  integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-buffer" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/helper-wasm-section" "1.11.6"
-    "@webassemblyjs/wasm-gen" "1.11.6"
-    "@webassemblyjs/wasm-opt" "1.11.6"
-    "@webassemblyjs/wasm-parser" "1.11.6"
-    "@webassemblyjs/wast-printer" "1.11.6"
-
-"@webassemblyjs/wasm-gen@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268"
-  integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/ieee754" "1.11.6"
-    "@webassemblyjs/leb128" "1.11.6"
-    "@webassemblyjs/utf8" "1.11.6"
-
-"@webassemblyjs/wasm-opt@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2"
-  integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-buffer" "1.11.6"
-    "@webassemblyjs/wasm-gen" "1.11.6"
-    "@webassemblyjs/wasm-parser" "1.11.6"
-
-"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1"
-  integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-api-error" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/ieee754" "1.11.6"
-    "@webassemblyjs/leb128" "1.11.6"
-    "@webassemblyjs/utf8" "1.11.6"
-
-"@webassemblyjs/wast-printer@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20"
-  integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@xtuc/long" "4.2.2"
-
-"@xtuc/ieee754@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
-  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
+"@vitejs/plugin-react@^4.3.1":
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-react/-/plugin-react-4.3.1.tgz#d0be6594051ded8957df555ff07a991fb618b48e"
+  integrity sha512-m/V2syj5CuVnaxcUJOQRel/Wr31FFXRFlnOoq1TVtkCxsY5veGMTEmpWHndrhB2U8ScHtCQB1e+4hWYExQc6Lg==
+  dependencies:
+    "@babel/core" "^7.24.5"
+    "@babel/plugin-transform-react-jsx-self" "^7.24.5"
+    "@babel/plugin-transform-react-jsx-source" "^7.24.1"
+    "@types/babel__core" "^7.20.5"
+    react-refresh "^0.14.2"
 
-"@xtuc/long@4.2.2":
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
-  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
+"@vitest/coverage-istanbul@^2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@vitest/coverage-istanbul/-/coverage-istanbul-2.0.5.tgz#18a335813e1ad96b163c908cfa7af62dcf87c5b5"
+  integrity sha512-BvjWKtp7fiMAeYUD0mO5cuADzn1gmjTm54jm5qUEnh/O08riczun8rI4EtQlg3bWoRo2lT3FO8DmjPDX9ZthPw==
+  dependencies:
+    "@istanbuljs/schema" "^0.1.3"
+    debug "^4.3.5"
+    istanbul-lib-coverage "^3.2.2"
+    istanbul-lib-instrument "^6.0.3"
+    istanbul-lib-report "^3.0.1"
+    istanbul-lib-source-maps "^5.0.6"
+    istanbul-reports "^3.1.7"
+    magicast "^0.3.4"
+    test-exclude "^7.0.1"
+    tinyrainbow "^1.2.0"
+
+"@vitest/expect@2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-2.0.5.tgz#f3745a6a2c18acbea4d39f5935e913f40d26fa86"
+  integrity sha512-yHZtwuP7JZivj65Gxoi8upUN2OzHTi3zVfjwdpu2WrvCZPLwsJ2Ey5ILIPccoW23dd/zQBlJ4/dhi7DWNyXCpA==
+  dependencies:
+    "@vitest/spy" "2.0.5"
+    "@vitest/utils" "2.0.5"
+    chai "^5.1.1"
+    tinyrainbow "^1.2.0"
 
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+"@vitest/pretty-format@2.0.5", "@vitest/pretty-format@^2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@vitest/pretty-format/-/pretty-format-2.0.5.tgz#91d2e6d3a7235c742e1a6cc50e7786e2f2979b1e"
+  integrity sha512-h8k+1oWHfwTkyTkb9egzwNMfJAEx4veaPSnMeKbVSjp4euqGSbQlm5+6VHwTr7u4FJslVVsUG5nopCaAYdOmSQ==
+  dependencies:
+    tinyrainbow "^1.2.0"
 
-accepts@~1.3.4, accepts@~1.3.5:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
-  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+"@vitest/runner@2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-2.0.5.tgz#89197e712bb93513537d6876995a4843392b2a84"
+  integrity sha512-TfRfZa6Bkk9ky4tW0z20WKXFEwwvWhRY+84CnSEtq4+3ZvDlJyY32oNTJtM7AW9ihW90tX/1Q78cb6FjoAs+ig==
   dependencies:
-    mime-types "~2.1.24"
-    negotiator "0.6.2"
+    "@vitest/utils" "2.0.5"
+    pathe "^1.1.2"
 
-accepts@~1.3.8:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
-  integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
+"@vitest/snapshot@2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-2.0.5.tgz#a2346bc5013b73c44670c277c430e0334690a162"
+  integrity sha512-SgCPUeDFLaM0mIUHfaArq8fD2WbaXG/zVXjRupthYfYGzc8ztbFbu6dUNOblBG7XLMR1kEhS/DNnfCZ2IhdDew==
   dependencies:
-    mime-types "~2.1.34"
-    negotiator "0.6.3"
+    "@vitest/pretty-format" "2.0.5"
+    magic-string "^0.30.10"
+    pathe "^1.1.2"
 
-acorn-import-assertions@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
-  integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
+"@vitest/spy@2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-2.0.5.tgz#590fc07df84a78b8e9dd976ec2090920084a2b9f"
+  integrity sha512-c/jdthAhvJdpfVuaexSrnawxZz6pywlTPe84LUB2m/4t3rl2fTo9NFGBG4oWgaD+FTgDDV8hJ/nibT7IfH3JfA==
+  dependencies:
+    tinyspy "^3.0.0"
+
+"@vitest/ui@^2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@vitest/ui/-/ui-2.0.5.tgz#cfae5f6c7a1cc8cd1be87c88153215cb60a2cc0d"
+  integrity sha512-m+ZpVt/PVi/nbeRKEjdiYeoh0aOfI9zr3Ria9LO7V2PlMETtAXJS3uETEZkc8Be2oOl8mhd7Ew+5SRBXRYncNw==
+  dependencies:
+    "@vitest/utils" "2.0.5"
+    fast-glob "^3.3.2"
+    fflate "^0.8.2"
+    flatted "^3.3.1"
+    pathe "^1.1.2"
+    sirv "^2.0.4"
+    tinyrainbow "^1.2.0"
+
+"@vitest/utils@2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-2.0.5.tgz#6f8307a4b6bc6ceb9270007f73c67c915944e926"
+  integrity sha512-d8HKbqIcya+GR67mkZbrzhS5kKhtp8dQLcmRZLGTscGVg7yImT82cIrhtn2L8+VujWcy6KZweApgNmPsTAO/UQ==
+  dependencies:
+    "@vitest/pretty-format" "2.0.5"
+    estree-walker "^3.0.3"
+    loupe "^3.1.1"
+    tinyrainbow "^1.2.0"
 
 acorn-jsx@^5.3.2:
   version "5.3.2"
@@ -2871,106 +2181,19 @@ acorn-walk@^8.1.1:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.2.tgz#7703af9415f1b6db9315d6895503862e231d34aa"
   integrity sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==
 
-acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0:
+acorn@^8.4.1, acorn@^8.8.2, acorn@^8.9.0:
   version "8.11.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
   integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
 
-address@^1.0.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6"
-  integrity sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==
-
-address@^1.1.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/address/-/address-1.2.2.tgz#2b5248dac5485a6390532c6a517fda2e3faac89e"
-  integrity sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==
-
-agent-base@5:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c"
-  integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==
-
-agent-base@6:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.0.tgz#5d0101f19bbfaed39980b22ae866de153b93f09a"
-  integrity sha512-j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw==
-  dependencies:
-    debug "4"
-
-agent-base@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
-  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
-  dependencies:
-    debug "4"
-
-agentkeepalive@^4.1.3, agentkeepalive@^4.2.1:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923"
-  integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==
-  dependencies:
-    humanize-ms "^1.2.1"
-
-aggregate-error@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
-  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
-  dependencies:
-    clean-stack "^2.0.0"
-    indent-string "^4.0.0"
-
-airbnb-prop-types@^2.15.0:
-  version "2.15.0"
-  resolved "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.15.0.tgz#5287820043af1eb469f5b0af0d6f70da6c52aaef"
-  integrity sha512-jUh2/hfKsRjNFC4XONQrxo/n/3GG4Tn6Hl0WlFQN5PY9OMC9loSCoAYKnZsWaP8wEfd5xcrPloK0Zg6iS1xwVA==
-  dependencies:
-    array.prototype.find "^2.1.0"
-    function.prototype.name "^1.1.1"
-    has "^1.0.3"
-    is-regex "^1.0.4"
-    object-is "^1.0.1"
-    object.assign "^4.1.0"
-    object.entries "^1.1.0"
-    prop-types "^15.7.2"
-    prop-types-exact "^1.2.0"
-    react-is "^16.9.0"
-
-ajv-formats@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
-  integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==
-  dependencies:
-    ajv "^8.0.0"
-
-ajv-keywords@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
-  integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
-
-ajv-keywords@^3.5.2:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
-  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
-
-ajv-keywords@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
-  integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
-  dependencies:
-    fast-deep-equal "^3.1.3"
-
-ajv@^6.12.2:
-  version "6.12.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
-  integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
+agent-base@^7.0.2, agent-base@^7.1.0:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317"
+  integrity sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==
   dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
+    debug "^4.3.4"
 
-ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.12.4:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -2980,47 +2203,17 @@ ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.0, ajv@^8.6.0, ajv@^8.9.0:
-  version "8.12.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
-  integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    json-schema-traverse "^1.0.0"
-    require-from-string "^2.0.2"
-    uri-js "^4.2.2"
-
-ansi-colors@3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
-  integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==
-
-ansi-html-community@0.0.8, ansi-html-community@^0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41"
-  integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
-ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
-
-ansi-regex@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
-  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
-
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+ansi-regex@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
+  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
+
+ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
@@ -3042,6 +2235,11 @@ ansi-styles@^4.1.0:
     "@types/color-name" "^1.1.1"
     color-convert "^2.0.1"
 
+ansi-styles@^6.1.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
+  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
+
 anymatch@~3.1.2:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
@@ -3050,53 +2248,16 @@ anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-append-transform@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab"
-  integrity sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==
-  dependencies:
-    default-require-extensions "^2.0.0"
-
-"aproba@^1.0.3 || ^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
-  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
-
-archy@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
-  integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=
-
-are-we-there-yet@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
-  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^3.6.0"
-
 arg@^4.1.0:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
   integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
 
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
 argparse@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-argv@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/argv/-/argv-0.0.2.tgz#ecbd16f8949b157183711b1bda334f37840185ab"
-  integrity sha1-7L0W+JSbFXGDcRsb2jNPN4QBhas=
-
 array-buffer-byte-length@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead"
@@ -3105,62 +2266,73 @@ array-buffer-byte-length@^1.0.0:
     call-bind "^1.0.2"
     is-array-buffer "^3.0.1"
 
-array-filter@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83"
-  integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=
-
-array-flatten@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
-  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
-
-array-from@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/array-from/-/array-from-2.1.1.tgz#cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195"
-  integrity sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=
-
-array-includes@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
-  integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==
+array-buffer-byte-length@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f"
+  integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0"
-    is-string "^1.0.5"
+    call-bind "^1.0.5"
+    is-array-buffer "^3.0.4"
 
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
+array-includes@^3.1.6, array-includes@^3.1.8:
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.8.tgz#5e370cbe172fdd5dd6530c1d4aadda25281ba97d"
+  integrity sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==
   dependencies:
-    array-uniq "^1.0.1"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
+    es-object-atoms "^1.0.0"
+    get-intrinsic "^1.2.4"
+    is-string "^1.0.7"
 
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
+array.prototype.findlast@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz#3e4fbcb30a15a7f5bf64cf2faae22d139c2e4904"
+  integrity sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
+    es-shim-unscopables "^1.0.2"
 
-array.prototype.find@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.1.tgz#3baca26108ca7affb08db06bf0be6cb3115a969c"
-  integrity sha512-mi+MYNJYLTx2eNYy+Yh6raoQacCsNeeMUaspFPh9Y141lFSsWxxB8V9mM2ye+eqiRs917J6/pJ4M9ZPzenWckA==
+array.prototype.flat@^1.3.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18"
+  integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.4"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    es-shim-unscopables "^1.0.0"
 
-array.prototype.flat@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b"
-  integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==
+array.prototype.flatmap@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527"
+  integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    es-shim-unscopables "^1.0.0"
+
+array.prototype.tosorted@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz#fe954678ff53034e717ea3352a03f0b0b86f7ffc"
+  integrity sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.3"
+    es-errors "^1.3.0"
+    es-shim-unscopables "^1.0.2"
 
 arraybuffer.prototype.slice@^1.0.2:
   version "1.0.2"
@@ -3175,66 +2347,52 @@ arraybuffer.prototype.slice@^1.0.2:
     is-array-buffer "^3.0.2"
     is-shared-array-buffer "^1.0.2"
 
-arrify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
+arraybuffer.prototype.slice@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6"
+  integrity sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==
+  dependencies:
+    array-buffer-byte-length "^1.0.1"
+    call-bind "^1.0.5"
+    define-properties "^1.2.1"
+    es-abstract "^1.22.3"
+    es-errors "^1.2.1"
+    get-intrinsic "^1.2.3"
+    is-array-buffer "^3.0.4"
+    is-shared-array-buffer "^1.0.2"
 
 asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
-assertion-error@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
-  integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==
-
-async-foreach@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
-  integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
-
-async@^3.2.3:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
-  integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==
-
-at-least-node@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
-  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
+assertion-error@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-2.0.1.tgz#f641a196b335690b1070bf00b6e7593fec190bf7"
+  integrity sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==
 
-author-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/author-regex/-/author-regex-1.0.0.tgz#d08885be6b9bbf9439fe087c76287245f0a81450"
-  integrity sha512-KbWgR8wOYRAPekEmMXrYYdc7BRyhn2Ftk7KWfMUnQ43hFdojWEFRxhhRUm3/OFEdPa1r0KAvTTg9YQK57xTe0g==
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
 available-typed-arrays@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.6.tgz#ac812d8ce5a6b976d738e1c45f08d0b00bc7d725"
   integrity sha512-j1QzY8iPNPG4o4xmO3ptzpRxTciqD3MgEHtifP/YnJpIo58Xu+ne4BejlbkuaLfXn/nz6HFiw29bLpj2PNMdGg==
 
+available-typed-arrays@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846"
+  integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==
+  dependencies:
+    possible-typed-array-names "^1.0.0"
+
 await-to-js@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/await-to-js/-/await-to-js-3.0.0.tgz#70929994185616f4675a91af6167eb61cc92868f"
   integrity sha512-zJAaP9zxTcvTHRlejau3ZOY4V7SRpiByf3/dxx2uyKxxor19tpmpV2QRsTKikckwhaPmr2dVpxxMr7jOCYVp5g==
 
-babel-loader@^9.1.3:
-  version "9.1.3"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-9.1.3.tgz#3d0e01b4e69760cc694ee306fe16d358aa1c6f9a"
-  integrity sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==
-  dependencies:
-    find-cache-dir "^4.0.0"
-    schema-utils "^4.0.0"
-
-babel-plugin-dynamic-import-node@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
-  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
-  dependencies:
-    object.assign "^4.1.0"
-
 babel-plugin-emotion@^10.0.27:
   version "10.0.33"
   resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.0.33.tgz#ce1155dcd1783bbb9286051efee53f4e2be63e03"
@@ -3251,17 +2409,6 @@ babel-plugin-emotion@^10.0.27:
     find-root "^1.1.0"
     source-map "^0.5.7"
 
-babel-plugin-istanbul@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
-  integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@istanbuljs/load-nyc-config" "^1.0.0"
-    "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-instrument "^5.0.4"
-    test-exclude "^6.0.0"
-
 babel-plugin-macros@^2.0.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138"
@@ -3282,29 +2429,29 @@ babel-plugin-module-resolver@^5.0.0:
     reselect "^4.1.7"
     resolve "^1.22.1"
 
-babel-plugin-polyfill-corejs2@^0.4.8:
-  version "0.4.8"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.8.tgz#dbcc3c8ca758a290d47c3c6a490d59429b0d2269"
-  integrity sha512-OtIuQfafSzpo/LhnJaykc0R/MMnuLSSVjVYy9mHArIZ9qTCSZ6TpWCuEKZYVoN//t8HqBNScHrOtCrIK5IaGLg==
+babel-plugin-polyfill-corejs2@^0.4.10:
+  version "0.4.11"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz#30320dfe3ffe1a336c15afdcdafd6fd615b25e33"
+  integrity sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==
   dependencies:
     "@babel/compat-data" "^7.22.6"
-    "@babel/helper-define-polyfill-provider" "^0.5.0"
+    "@babel/helper-define-polyfill-provider" "^0.6.2"
     semver "^6.3.1"
 
-babel-plugin-polyfill-corejs3@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.9.0.tgz#9eea32349d94556c2ad3ab9b82ebb27d4bf04a81"
-  integrity sha512-7nZPG1uzK2Ymhy/NbaOWTg3uibM2BmGASS4vHS4szRZAIR8R6GwA/xAujpdrXU5iyklrimWnLWU+BLF9suPTqg==
+babel-plugin-polyfill-corejs3@^0.10.4:
+  version "0.10.6"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz#2deda57caef50f59c525aeb4964d3b2f867710c7"
+  integrity sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.5.0"
-    core-js-compat "^3.34.0"
+    "@babel/helper-define-polyfill-provider" "^0.6.2"
+    core-js-compat "^3.38.0"
 
-babel-plugin-polyfill-regenerator@^0.5.5:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.5.tgz#8b0c8fc6434239e5d7b8a9d1f832bb2b0310f06a"
-  integrity sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg==
+babel-plugin-polyfill-regenerator@^0.6.1:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz#addc47e240edd1da1058ebda03021f382bba785e"
+  integrity sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.5.0"
+    "@babel/helper-define-polyfill-provider" "^0.6.2"
 
 babel-plugin-syntax-jsx@^6.18.0:
   version "6.18.0"
@@ -3321,57 +2468,11 @@ base64-js@^1.3.0:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
   integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
 
-batch@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
-  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
-
-big.js@^3.1.3:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
-  integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
-
-big.js@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
-  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
-
 binary-extensions@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
-body-parser@1.20.1:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
-  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
-  dependencies:
-    bytes "3.1.2"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    on-finished "2.4.1"
-    qs "6.11.0"
-    raw-body "2.5.1"
-    type-is "~1.6.18"
-    unpipe "1.0.0"
-
-bonjour-service@^1.0.11:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.2.1.tgz#eb41b3085183df3321da1264719fbada12478d02"
-  integrity sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==
-  dependencies:
-    fast-deep-equal "^3.1.3"
-    multicast-dns "^7.2.5"
-
-boolbase@^1.0.0, boolbase@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -3394,108 +2495,20 @@ braces@^3.0.2, braces@~3.0.2:
   dependencies:
     fill-range "^7.1.1"
 
-browser-stdout@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
-  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
-
-browserslist@^4.12.0, browserslist@^4.8.5:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz#06c6d5715a1ede6c51fc39ff67fd647f740b656d"
-  integrity sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==
-  dependencies:
-    caniuse-lite "^1.0.30001043"
-    electron-to-chromium "^1.3.413"
-    node-releases "^1.1.53"
-    pkg-up "^2.0.0"
-
-browserslist@^4.18.1, browserslist@^4.21.10, browserslist@^4.22.2:
-  version "4.22.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.3.tgz#299d11b7e947a6b843981392721169e27d60c5a6"
-  integrity sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A==
-  dependencies:
-    caniuse-lite "^1.0.30001580"
-    electron-to-chromium "^1.4.648"
-    node-releases "^2.0.14"
-    update-browserslist-db "^1.0.13"
-
-buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
-
-builtin-modules@^3.1.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"
-  integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==
-
-bytes@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
-
-bytes@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
-  integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
-
-cacache@^15.2.0:
-  version "15.3.0"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
-  integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
-  dependencies:
-    "@npmcli/fs" "^1.0.0"
-    "@npmcli/move-file" "^1.0.1"
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    glob "^7.1.4"
-    infer-owner "^1.0.4"
-    lru-cache "^6.0.0"
-    minipass "^3.1.1"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.2"
-    mkdirp "^1.0.3"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^8.0.1"
-    tar "^6.0.2"
-    unique-filename "^1.1.1"
-
-cacache@^16.1.0:
-  version "16.1.3"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e"
-  integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==
-  dependencies:
-    "@npmcli/fs" "^2.1.0"
-    "@npmcli/move-file" "^2.0.0"
-    chownr "^2.0.0"
-    fs-minipass "^2.1.0"
-    glob "^8.0.1"
-    infer-owner "^1.0.4"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    mkdirp "^1.0.4"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^9.0.0"
-    tar "^6.1.11"
-    unique-filename "^2.0.0"
-
-caching-transform@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/caching-transform/-/caching-transform-3.0.2.tgz#601d46b91eca87687a281e71cef99791b0efca70"
-  integrity sha512-Mtgcv3lh3U0zRii/6qVgQODdPA4G3zhG+jtbCWj39RXuUFTMzH0vcdMtaJS1jPowd+It2Pqr6y3NJMQqOqCE2w==
+browserslist@^4.23.1, browserslist@^4.23.3:
+  version "4.23.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.3.tgz#debb029d3c93ebc97ffbc8d9cbb03403e227c800"
+  integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==
   dependencies:
-    hasha "^3.0.0"
-    make-dir "^2.0.0"
-    package-hash "^3.0.0"
-    write-file-atomic "^2.4.2"
+    caniuse-lite "^1.0.30001646"
+    electron-to-chromium "^1.5.4"
+    node-releases "^2.0.18"
+    update-browserslist-db "^1.1.0"
+
+cac@^6.7.14:
+  version "6.7.14"
+  resolved "https://registry.yarnpkg.com/cac/-/cac-6.7.14.tgz#804e1e6f506ee363cb0e3ccbb09cad5dd9870959"
+  integrity sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==
 
 call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.4, call-bind@^1.0.5:
   version "1.0.5"
@@ -3506,7 +2519,7 @@ call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.4, call-bind@^1.0.5:
     get-intrinsic "^1.2.1"
     set-function-length "^1.1.1"
 
-call-bind@^1.0.7:
+call-bind@^1.0.6, call-bind@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
   integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
@@ -3522,58 +2535,23 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camel-case@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a"
-  integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==
-  dependencies:
-    pascal-case "^3.1.2"
-    tslib "^2.0.3"
-
-camelcase-keys@^6.2.2:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
-  integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==
-  dependencies:
-    camelcase "^5.3.1"
-    map-obj "^4.0.0"
-    quick-lru "^4.0.1"
-
-camelcase@^5.0.0, camelcase@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-
-caniuse-lite@^1.0.30001043, caniuse-lite@^1.0.30001580:
-  version "1.0.30001585"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001585.tgz"
-  integrity sha512-yr2BWR1yLXQ8fMpdS/4ZZXpseBgE7o4g41x3a6AJOqZuOi+iE/WdJYAuZ6Y95i4Ohd2Y+9MzIWRR+uGABH4s3Q==
-
-case-sensitive-paths-webpack-plugin@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz#db64066c6422eed2e08cc14b986ca43796dbc6d4"
-  integrity sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==
-
-chai-enzyme@^1.0.0-beta.1:
-  version "1.0.0-beta.1"
-  resolved "https://registry.yarnpkg.com/chai-enzyme/-/chai-enzyme-1.0.0-beta.1.tgz#a2ba3f23b99b0c3f67e3485e32b35e797255acda"
-  integrity sha512-vWT101M7qjq6kM/29G4vHrgLM4Mj1gCnKuvOSF03s8pFVsqol4B6USoGM/aYRKqaaIHs8/AxmHjWGFplQWhIQw==
-  dependencies:
-    html "^1.0.0"
+caniuse-lite@^1.0.30001646:
+  version "1.0.30001646"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001646.tgz#d472f2882259ba032dd73ee069ff01bfd059b25d"
+  integrity sha512-dRg00gudiBDDTmUhClSdv3hqRfpbOnU28IpI1T6PBTLWa+kOj0681C8uML3PifYfREuBrVjDGhL3adYpBT6spw==
 
-chai@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/chai/-/chai-4.2.0.tgz#760aa72cf20e3795e84b12877ce0e83737aa29e5"
-  integrity sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==
+chai@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-5.1.1.tgz#f035d9792a22b481ead1c65908d14bb62ec1c82c"
+  integrity sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==
   dependencies:
-    assertion-error "^1.1.0"
-    check-error "^1.0.2"
-    deep-eql "^3.0.1"
-    get-func-name "^2.0.0"
-    pathval "^1.1.0"
-    type-detect "^4.0.5"
+    assertion-error "^2.0.1"
+    check-error "^2.1.1"
+    deep-eql "^5.0.1"
+    loupe "^3.1.0"
+    pathval "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.4.1, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -3582,7 +2560,7 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.4.1, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2:
+chalk@^4.0.0:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -3590,27 +2568,15 @@ chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-check-error@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
-  integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=
-
-cheerio@^1.0.0-rc.3:
-  version "1.0.0-rc.3"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.3.tgz#094636d425b2e9c0f4eb91a46c05630c9a1a8bf6"
-  integrity sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==
-  dependencies:
-    css-select "~1.2.0"
-    dom-serializer "~0.1.1"
-    entities "~1.1.1"
-    htmlparser2 "^3.9.1"
-    lodash "^4.15.0"
-    parse5 "^3.0.1"
-
-chokidar@^3.4.2, chokidar@^3.5.2, chokidar@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
-  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+check-error@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/check-error/-/check-error-2.1.1.tgz#87eb876ae71ee388fa0471fe423f494be1d96ccc"
+  integrity sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==
+
+"chokidar@>=3.0.0 <4.0.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
+  integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
   dependencies:
     anymatch "~3.1.2"
     braces "~3.0.2"
@@ -3622,68 +2588,15 @@ chokidar@^3.4.2, chokidar@^3.5.2, chokidar@^3.5.3:
   optionalDependencies:
     fsevents "~2.3.2"
 
-chownr@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
-  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
-
-chrome-trace-event@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
-  integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==
-  dependencies:
-    tslib "^1.9.0"
-
-classnames@^2.2.3, classnames@^2.2.5, classnames@^2.2.6:
+classnames@^2.2.5, classnames@^2.2.6:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
   integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
 
-clean-css@^5.2.2:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.3.tgz#b330653cd3bd6b75009cc25c714cae7b93351ccd"
-  integrity sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==
-  dependencies:
-    source-map "~0.6.0"
-
-clean-stack@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
-  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-
-clean-webpack-plugin@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/clean-webpack-plugin/-/clean-webpack-plugin-4.0.0.tgz#72947d4403d452f38ed61a9ff0ada8122aacd729"
-  integrity sha512-WuWE1nyTNAyW5T7oNyys2EN0cfP2fdRxhxnIQWiAp0bMabPdHhoGxM8A6YL2GhqwgrPnnaemVE7nv5XJ2Fhh2w==
-  dependencies:
-    del "^4.1.1"
-
-cliui@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
-  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
-  dependencies:
-    string-width "^3.1.0"
-    strip-ansi "^5.2.0"
-    wrap-ansi "^5.1.0"
-
-cliui@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
-  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.1"
-    wrap-ansi "^7.0.0"
-
-clone-deep@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
-  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
-  dependencies:
-    is-plain-object "^2.0.4"
-    kind-of "^6.0.2"
-    shallow-clone "^3.0.0"
+classnames@^2.3.2:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.5.1.tgz#ba774c614be0f016da105c858e7159eae8e7687b"
+  integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==
 
 clsx@^1.1.1:
   version "1.2.1"
@@ -3695,17 +2608,6 @@ clsx@^2.0.0:
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999"
   integrity sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==
 
-codecov@^3.5.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/codecov/-/codecov-3.7.0.tgz#4a09939cde24447a43f36d068e8b4e0188dc3f27"
-  integrity sha512-uIixKofG099NbUDyzRk1HdGtaG8O+PBUAg3wfmjwXw2+ek+PZp+puRvbTohqrVfuudaezivJHFgTtSC3M8MXww==
-  dependencies:
-    argv "0.0.2"
-    ignore-walk "3.0.3"
-    js-yaml "3.13.1"
-    teeny-request "6.0.1"
-    urlgrey "0.4.4"
-
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -3730,40 +2632,12 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-support@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
-  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
-
-colorette@^2.0.10:
-  version "2.0.20"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
-  integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
-
-commander@^2.19.0, commander@^2.20.0:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
-commander@^8.3.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
-  integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
-
-common-path-prefix@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0"
-  integrity sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==
-
-common-tags@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
-  integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==
-
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
+combined-stream@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  dependencies:
+    delayed-stream "~1.0.0"
 
 component-clone@0.2.2:
   version "0.2.2"
@@ -3802,26 +2676,6 @@ component-type@1.1.0:
   resolved "https://registry.yarnpkg.com/component-type/-/component-type-1.1.0.tgz#95b666aad53e5c8d1f2be135c45b5d499197c0c5"
   integrity sha1-lbZmqtU+XI0fK+E1xFtdSZGXwMU=
 
-compressible@~2.0.16:
-  version "2.0.18"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
-  integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
-  dependencies:
-    mime-db ">= 1.43.0 < 2"
-
-compression@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
-  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
-  dependencies:
-    accepts "~1.3.5"
-    bytes "3.0.0"
-    compressible "~2.0.16"
-    debug "2.6.9"
-    on-headers "~1.0.2"
-    safe-buffer "5.1.2"
-    vary "~1.1.2"
-
 compute-scroll-into-view@^1.0.14:
   version "1.0.20"
   resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz#1768b5522d1172754f5d0c9b02de3af6be506a43"
@@ -3832,46 +2686,18 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.4.7:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
-connect-history-api-fallback@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8"
-  integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==
-
-connected-react-router@^6.5.2:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/connected-react-router/-/connected-react-router-6.8.0.tgz#ddc687b31d498322445d235d660798489fa56cae"
-  integrity sha512-E64/6krdJM3Ag3MMmh2nKPtMbH15s3JQDuaYJvOVXzu6MbHbDyIvuwLOyhQIuP4Om9zqEfZYiVyflROibSsONg==
+connected-react-router@^6.9.3:
+  version "6.9.3"
+  resolved "https://registry.yarnpkg.com/connected-react-router/-/connected-react-router-6.9.3.tgz#72300aca9f9d6f38e1f4a2901572faa02adec972"
+  integrity sha512-4ThxysOiv/R2Dc4Cke1eJwjKwH1Y51VDwlOrOfs1LjpdYOVvCNjNkZDayo7+sx42EeGJPQUNchWkjAIJdXGIOQ==
   dependencies:
+    lodash.isequalwith "^4.4.0"
     prop-types "^15.7.2"
+  optionalDependencies:
+    immutable "^3.8.1 || ^4.0.0"
+    seamless-immutable "^7.1.3"
 
-console-control-strings@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
-
-content-disposition@0.5.4:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
-  integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
-  dependencies:
-    safe-buffer "5.2.1"
-
-content-type@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
-  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
-
-convert-source-map@^1.5.0, convert-source-map@^1.6.0:
+convert-source-map@^1.5.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
   integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
@@ -3883,16 +2709,6 @@ convert-source-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
   integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
-cookie-signature@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
-
-cookie@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
-  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
-
 cookie@^0.4.1:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
@@ -3905,41 +2721,23 @@ copy-to-clipboard@^3.2.0:
   dependencies:
     toggle-selection "^1.0.6"
 
-core-js-compat@^3.31.0, core-js-compat@^3.34.0:
-  version "3.35.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.35.1.tgz#215247d7edb9e830efa4218ff719beb2803555e2"
-  integrity sha512-sftHa5qUJY3rs9Zht1WEnmkvXputCyDBczPnr7QDgL8n3qrF3CMXY4VPSYtOLLiOUJcah2WNXREd48iOl6mQIw==
+core-js-compat@^3.37.1, core-js-compat@^3.38.0:
+  version "3.38.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.38.0.tgz#d93393b1aa346b6ee683377b0c31172ccfe607aa"
+  integrity sha512-75LAicdLa4OJVwFxFbQR3NdnZjNgX6ILpVcVzcC4T2smerB5lELMrJQQQoWV6TiuC/vlaFqgU2tKQx9w5s0e0A==
   dependencies:
-    browserslist "^4.22.2"
-
-core-js-compat@^3.6.2:
-  version "3.6.5"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz#2a51d9a4e25dfd6e690251aa81f99e3c05481f1c"
-  integrity sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==
-  dependencies:
-    browserslist "^4.8.5"
-    semver "7.0.0"
-
-core-js-pure@^3.0.0:
-  version "3.6.5"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz#c79e75f5e38dbc85a662d91eea52b8256d53b813"
-  integrity sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA==
+    browserslist "^4.23.3"
 
 core-js@^1.0.0:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
   integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
 
-core-js@^2.6.4, core-js@^2.6.5:
+core-js@^2.6.4:
   version "2.6.11"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
   integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
 
-core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
 cosmiconfig@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"
@@ -3951,17 +2749,6 @@ cosmiconfig@^6.0.0:
     path-type "^4.0.0"
     yaml "^1.7.2"
 
-cp-file@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-6.2.0.tgz#40d5ea4a1def2a9acdd07ba5c0b0246ef73dc10d"
-  integrity sha512-fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA==
-  dependencies:
-    graceful-fs "^4.1.2"
-    make-dir "^2.0.0"
-    nested-error-stacks "^2.0.0"
-    pify "^4.0.1"
-    safe-buffer "^5.0.1"
-
 crc-32@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208"
@@ -3990,14 +2777,6 @@ cross-env@^5.2.0:
   dependencies:
     cross-spawn "^6.0.5"
 
-cross-spawn@^4:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
-  integrity sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=
-  dependencies:
-    lru-cache "^4.0.1"
-    which "^1.2.9"
-
 cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -4009,7 +2788,7 @@ cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -4028,60 +2807,12 @@ crypto-js@^4.2.0:
   resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631"
   integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==
 
-crypto-random-string@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
-  integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
-
-css-loader@^6.10.0:
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.10.0.tgz#7c172b270ec7b833951b52c348861206b184a4b7"
-  integrity sha512-LTSA/jWbwdMlk+rhmElbDR2vbtQoTBPr7fkJE+mxrHj+7ru0hUmHafDRzWIjIHTwpitWVaqY2/UWGRca3yUgRw==
-  dependencies:
-    icss-utils "^5.1.0"
-    postcss "^8.4.33"
-    postcss-modules-extract-imports "^3.0.0"
-    postcss-modules-local-by-default "^4.0.4"
-    postcss-modules-scope "^3.1.1"
-    postcss-modules-values "^4.0.0"
-    postcss-value-parser "^4.2.0"
-    semver "^7.5.4"
-
-css-select@^4.1.3:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b"
-  integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==
-  dependencies:
-    boolbase "^1.0.0"
-    css-what "^6.0.1"
-    domhandler "^4.3.1"
-    domutils "^2.8.0"
-    nth-check "^2.0.1"
-
-css-select@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
-  integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
+cssstyle@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-4.0.1.tgz#ef29c598a1e90125c870525490ea4f354db0660a"
+  integrity sha512-8ZYiJ3A/3OkDd093CBT/0UKDWry7ak4BdPTFP2+QEP7cmhouyq/Up709ASSj2cK02BbZiMgk7kYjZNS4QP5qrQ==
   dependencies:
-    boolbase "~1.0.0"
-    css-what "2.1"
-    domutils "1.5.1"
-    nth-check "~1.0.1"
-
-css-what@2.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
-  integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
-
-css-what@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
-  integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
-
-cssesc@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
-  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
+    rrweb-cssom "^0.6.0"
 
 csstype@^2.5.7, csstype@^2.6.7:
   version "2.6.10"
@@ -4093,6 +2824,46 @@ csstype@^3.0.2:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
   integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
 
+cuint@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
+  integrity sha512-d4ZVpCW31eWwCMe1YT3ur7mUDnTXbgwyzaL320DrcRT45rfjYxkt5QWLrmOJ+/UEAI2+fQgKe/fCjR8l4TpRgw==
+
+data-urls@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-5.0.0.tgz#2f76906bce1824429ffecb6920f45a0b30f00dde"
+  integrity sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==
+  dependencies:
+    whatwg-mimetype "^4.0.0"
+    whatwg-url "^14.0.0"
+
+data-view-buffer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.1.tgz#8ea6326efec17a2e42620696e671d7d5a8bc66b2"
+  integrity sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==
+  dependencies:
+    call-bind "^1.0.6"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.1"
+
+data-view-byte-length@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz#90721ca95ff280677eb793749fce1011347669e2"
+  integrity sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==
+  dependencies:
+    call-bind "^1.0.7"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.1"
+
+data-view-byte-offset@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz#5e0bbfb4828ed2d1b9b400cd8a7d119bca0ff18a"
+  integrity sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==
+  dependencies:
+    call-bind "^1.0.6"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.1"
+
 date-fns@2.16.1:
   version "2.16.1"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.16.1.tgz#05775792c3f3331da812af253e1a935851d3834b"
@@ -4108,20 +2879,6 @@ debounce@^1.2.0:
   resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
   integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
 
-debug@2.6.9, debug@^2.6.0:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@3.2.6, debug@^3.0.0:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
-  dependencies:
-    ms "^2.1.1"
-
 debug@4, debug@^4.1.0, debug@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
@@ -4129,32 +2886,29 @@ debug@4, debug@^4.1.0, debug@^4.1.1:
   dependencies:
     ms "^2.1.1"
 
-debug@^4, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
+debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
     ms "2.1.2"
 
-decamelize-keys@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8"
-  integrity sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==
+debug@^4.3.5:
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b"
+  integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==
   dependencies:
-    decamelize "^1.1.0"
-    map-obj "^1.0.0"
+    ms "2.1.2"
 
-decamelize@^1.1.0, decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
+decimal.js@^10.4.3:
+  version "10.4.3"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23"
+  integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
 
-deep-eql@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df"
-  integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==
-  dependencies:
-    type-detect "^4.0.0"
+deep-eql@^5.0.1:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-5.0.2.tgz#4b756d8d770a9257300825d52a2c2cff99c3a341"
+  integrity sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==
 
 deep-equal@^1.1.1:
   version "1.1.1"
@@ -4168,35 +2922,11 @@ deep-equal@^1.1.1:
     object-keys "^1.1.1"
     regexp.prototype.flags "^1.2.0"
 
-deep-extend@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.1.tgz#b894a9dd90d3023fbf1c55a394fb858eb2066f1f"
-  integrity sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==
-
 deep-is@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-deepmerge@^4.2.2:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
-  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
-
-default-gateway@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71"
-  integrity sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==
-  dependencies:
-    execa "^5.0.0"
-
-default-require-extensions@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
-  integrity sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=
-  dependencies:
-    strip-bom "^3.0.0"
-
 define-data-property@^1.0.1, define-data-property@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3"
@@ -4215,11 +2945,6 @@ define-data-property@^1.1.4:
     es-errors "^1.3.0"
     gopd "^1.0.1"
 
-define-lazy-prop@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
-  integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
-
 define-properties@^1.1.2, define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -4236,201 +2961,44 @@ define-properties@^1.2.0, define-properties@^1.2.1:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
-del@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4"
-  integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==
-  dependencies:
-    "@types/glob" "^7.1.1"
-    globby "^6.1.0"
-    is-path-cwd "^2.0.0"
-    is-path-in-cwd "^2.0.0"
-    p-map "^2.0.0"
-    pify "^4.0.1"
-    rimraf "^2.6.3"
-
-delegates@^1.0.0:
+delayed-stream@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
-depd@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
-  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
-
-depd@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
-
-destroy@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
-  integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
-
-detect-node@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
-  integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
-
-detect-port-alt@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/detect-port-alt/-/detect-port-alt-1.1.6.tgz#24707deabe932d4a3cf621302027c2b266568275"
-  integrity sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==
-  dependencies:
-    address "^1.0.1"
-    debug "^2.6.0"
-
-diff@3.5.0, diff@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
 diff@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
   integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
 
-dir-glob@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
-  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
-  dependencies:
-    path-type "^4.0.0"
-
-discontinuous-range@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
-  integrity sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=
-
-dns-packet@^5.2.2:
-  version "5.6.1"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.6.1.tgz#ae888ad425a9d1478a0674256ab866de1012cf2f"
-  integrity sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==
-  dependencies:
-    "@leichtgewicht/ip-codec" "^2.0.1"
-
-doctrine@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
-  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
-  dependencies:
-    esutils "^2.0.2"
-
-doctrine@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
-  dependencies:
-    esutils "^2.0.2"
-
-dom-converter@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
-  integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==
-  dependencies:
-    utila "~0.4"
-
-dom-helpers@^5.0.1:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.4.tgz#4609680ab5c79a45f2531441f1949b79d6587f4b"
-  integrity sha512-TjMyeVUvNEnOnhzs6uAn9Ya47GmMo3qq7m+Lr/3ON0Rs5kHvb8I+SQYjLUSYn7qhEm0QjW0yrBkvz9yOrwwz1A==
-  dependencies:
-    "@babel/runtime" "^7.8.7"
-    csstype "^2.6.7"
-
-dom-serializer@0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
-  integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==
-  dependencies:
-    domelementtype "^2.0.1"
-    entities "^2.0.0"
-
-dom-serializer@^1.0.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
-  integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==
-  dependencies:
-    domelementtype "^2.0.1"
-    domhandler "^4.2.0"
-    entities "^2.0.0"
-
-dom-serializer@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
-  integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
-  dependencies:
-    domelementtype "^1.3.0"
-    entities "^1.1.1"
-
-dom-walk@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
-  integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==
-
-domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
-  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
-
-domelementtype@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz#1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"
-  integrity sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==
-
-domelementtype@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
-  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
-
-domhandler@^2.3.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
-  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
-  dependencies:
-    domelementtype "1"
-
-domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c"
-  integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==
-  dependencies:
-    domelementtype "^2.2.0"
-
-domutils@1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
-  integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
   dependencies:
-    dom-serializer "0"
-    domelementtype "1"
+    path-type "^4.0.0"
 
-domutils@^1.5.1:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
-  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
+doctrine@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
   dependencies:
-    dom-serializer "0"
-    domelementtype "1"
+    esutils "^2.0.2"
 
-domutils@^2.5.2, domutils@^2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
-  integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
+doctrine@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
   dependencies:
-    dom-serializer "^1.0.1"
-    domelementtype "^2.2.0"
-    domhandler "^4.2.0"
+    esutils "^2.0.2"
 
-dot-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751"
-  integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==
+dom-helpers@^5.0.1:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.4.tgz#4609680ab5c79a45f2531441f1949b79d6587f4b"
+  integrity sha512-TjMyeVUvNEnOnhzs6uAn9Ya47GmMo3qq7m+Lr/3ON0Rs5kHvb8I+SQYjLUSYn7qhEm0QjW0yrBkvz9yOrwwz1A==
   dependencies:
-    no-case "^3.0.4"
-    tslib "^2.0.3"
+    "@babel/runtime" "^7.8.7"
+    csstype "^2.6.7"
 
 dotenv@^8.0.0:
   version "8.2.0"
@@ -4447,67 +3015,30 @@ downshift@6.0.6:
     prop-types "^15.7.2"
     react-is "^16.13.1"
 
-duplexer@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
-  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
-
 ease-component@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ease-component/-/ease-component-1.0.0.tgz#b375726db0b5b04595b77440396fec7daa5d77c9"
   integrity sha1-s3VybbC1sEWVt3RAOW/sfapdd8k=
 
-ee-first@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-
-ejs@^2.3.4:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
-  integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
-
-ejs@^3.1.6:
-  version "3.1.9"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361"
-  integrity sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==
-  dependencies:
-    jake "^10.8.5"
-
-electron-to-chromium@^1.3.413:
-  version "1.3.465"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.465.tgz#d692e5c383317570c2bd82092a24a0308c6ccf29"
-  integrity sha512-K/lUeT3NLAsJ5SHRDhK3/zd0tw7OUllYD8w+fTOXm6ljCPsp2qq+vMzxpLo8u1M27ZjZAjRbsA6rirvne2nAMQ==
-
-electron-to-chromium@^1.4.648:
-  version "1.4.653"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.653.tgz#832ab25e80ad698ac09c1ca547bd9ee6cce7df10"
-  integrity sha512-wA2A2LQCqnEwQAvwADQq3KpMpNwgAUBnRmrFgRzHnPhbQUFArTR32Ab46f4p0MovDLcg4uqd4nCsN2hTltslpA==
+eastasianwidth@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
+  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+electron-to-chromium@^1.5.4:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz#cd477c830dd6fca41fbd5465c1ff6ce08ac22343"
+  integrity sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-emojis-list@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
-
-emojis-list@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
-  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
-
-encodeurl@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+emoji-regex@^9.2.2:
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
+  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
 
 encoding@^0.1.11:
   version "0.1.12"
@@ -4516,117 +3047,11 @@ encoding@^0.1.11:
   dependencies:
     iconv-lite "~0.4.13"
 
-encoding@^0.1.12, encoding@^0.1.13:
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
-  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
-  dependencies:
-    iconv-lite "^0.6.2"
-
-enhanced-resolve@^5.0.0:
-  version "5.16.1"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.1.tgz#e8bc63d51b826d6f1cbc0a150ecb5a8b0c62e567"
-  integrity sha512-4U5pNsuDl0EhuZpq46M5xPslstkviJuhrdobaRDBk2Jy2KO37FDAJl4lb2KlNabxT0m4MTK2UHNrsAcphE8nyw==
-  dependencies:
-    graceful-fs "^4.2.4"
-    tapable "^2.2.0"
-
-enhanced-resolve@^5.15.0:
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35"
-  integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==
-  dependencies:
-    graceful-fs "^4.2.4"
-    tapable "^2.2.0"
-
-entities@^1.1.1, entities@~1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
-  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
-
-entities@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f"
-  integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==
-
 entities@^4.4.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
   integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
 
-env-paths@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
-  integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
-
-enzyme-adapter-react-16@^1.14.0:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.2.tgz#b16db2f0ea424d58a808f9df86ab6212895a4501"
-  integrity sha512-SkvDrb8xU3lSxID8Qic9rB8pvevDbLybxPK6D/vW7PrT0s2Cl/zJYuXvsd1EBTz0q4o3iqG3FJhpYz3nUNpM2Q==
-  dependencies:
-    enzyme-adapter-utils "^1.13.0"
-    enzyme-shallow-equal "^1.0.1"
-    has "^1.0.3"
-    object.assign "^4.1.0"
-    object.values "^1.1.1"
-    prop-types "^15.7.2"
-    react-is "^16.12.0"
-    react-test-renderer "^16.0.0-0"
-    semver "^5.7.0"
-
-enzyme-adapter-utils@^1.13.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.0.tgz#01c885dde2114b4690bf741f8dc94cee3060eb78"
-  integrity sha512-YuEtfQp76Lj5TG1NvtP2eGJnFKogk/zT70fyYHXK2j3v6CtuHqc8YmgH/vaiBfL8K1SgVVbQXtTcgQZFwzTVyQ==
-  dependencies:
-    airbnb-prop-types "^2.15.0"
-    function.prototype.name "^1.1.2"
-    object.assign "^4.1.0"
-    object.fromentries "^2.0.2"
-    prop-types "^15.7.2"
-    semver "^5.7.1"
-
-enzyme-shallow-equal@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.1.tgz#7afe03db3801c9b76de8440694096412a8d9d49e"
-  integrity sha512-hGA3i1so8OrYOZSM9whlkNmVHOicJpsjgTzC+wn2JMJXhq1oO4kA4bJ5MsfzSIcC71aLDKzJ6gZpIxrqt3QTAQ==
-  dependencies:
-    has "^1.0.3"
-    object-is "^1.0.2"
-
-enzyme@^3.10.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.11.0.tgz#71d680c580fe9349f6f5ac6c775bc3e6b7a79c28"
-  integrity sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw==
-  dependencies:
-    array.prototype.flat "^1.2.3"
-    cheerio "^1.0.0-rc.3"
-    enzyme-shallow-equal "^1.0.1"
-    function.prototype.name "^1.1.2"
-    has "^1.0.3"
-    html-element-map "^1.2.0"
-    is-boolean-object "^1.0.1"
-    is-callable "^1.1.5"
-    is-number-object "^1.0.4"
-    is-regex "^1.0.5"
-    is-string "^1.0.5"
-    is-subset "^0.1.1"
-    lodash.escape "^4.0.1"
-    lodash.isequal "^4.5.0"
-    object-inspect "^1.7.0"
-    object-is "^1.0.2"
-    object.assign "^4.1.0"
-    object.entries "^1.1.1"
-    object.values "^1.1.1"
-    raf "^3.4.1"
-    rst-selector-parser "^2.2.3"
-    string.prototype.trim "^1.2.1"
-
-err-code@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
-  integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
-
 error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
@@ -4634,7 +3059,7 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.4, es-abstract@^1.17.5:
+es-abstract@^1.17.0-next.1, es-abstract@^1.17.5:
   version "1.17.5"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9"
   integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==
@@ -4696,6 +3121,58 @@ es-abstract@^1.22.1:
     unbox-primitive "^1.0.2"
     which-typed-array "^1.1.13"
 
+es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.1, es-abstract@^1.23.2, es-abstract@^1.23.3:
+  version "1.23.3"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0"
+  integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==
+  dependencies:
+    array-buffer-byte-length "^1.0.1"
+    arraybuffer.prototype.slice "^1.0.3"
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.7"
+    data-view-buffer "^1.0.1"
+    data-view-byte-length "^1.0.1"
+    data-view-byte-offset "^1.0.0"
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
+    es-set-tostringtag "^2.0.3"
+    es-to-primitive "^1.2.1"
+    function.prototype.name "^1.1.6"
+    get-intrinsic "^1.2.4"
+    get-symbol-description "^1.0.2"
+    globalthis "^1.0.3"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.2"
+    has-proto "^1.0.3"
+    has-symbols "^1.0.3"
+    hasown "^2.0.2"
+    internal-slot "^1.0.7"
+    is-array-buffer "^3.0.4"
+    is-callable "^1.2.7"
+    is-data-view "^1.0.1"
+    is-negative-zero "^2.0.3"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.3"
+    is-string "^1.0.7"
+    is-typed-array "^1.1.13"
+    is-weakref "^1.0.2"
+    object-inspect "^1.13.1"
+    object-keys "^1.1.1"
+    object.assign "^4.1.5"
+    regexp.prototype.flags "^1.5.2"
+    safe-array-concat "^1.1.2"
+    safe-regex-test "^1.0.3"
+    string.prototype.trim "^1.2.9"
+    string.prototype.trimend "^1.0.8"
+    string.prototype.trimstart "^1.0.8"
+    typed-array-buffer "^1.0.2"
+    typed-array-byte-length "^1.0.1"
+    typed-array-byte-offset "^1.0.2"
+    typed-array-length "^1.0.6"
+    unbox-primitive "^1.0.2"
+    which-typed-array "^1.1.15"
+
 es-define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
@@ -4703,16 +3180,43 @@ es-define-property@^1.0.0:
   dependencies:
     get-intrinsic "^1.2.4"
 
-es-errors@^1.3.0:
+es-errors@^1.2.1, es-errors@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
   integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
 
+es-iterator-helpers@^1.0.19:
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz#117003d0e5fec237b4b5c08aded722e0c6d50ca8"
+  integrity sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.3"
+    es-errors "^1.3.0"
+    es-set-tostringtag "^2.0.3"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
+    globalthis "^1.0.3"
+    has-property-descriptors "^1.0.2"
+    has-proto "^1.0.3"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.7"
+    iterator.prototype "^1.1.2"
+    safe-array-concat "^1.1.2"
+
 es-module-lexer@^1.2.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.4.1.tgz#41ea21b43908fe6a287ffcbe4300f790555331f5"
   integrity sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==
 
+es-object-atoms@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.0.0.tgz#ddb55cd47ac2e240701260bc2a8e31ecb643d941"
+  integrity sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==
+  dependencies:
+    es-errors "^1.3.0"
+
 es-set-tostringtag@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz#11f7cc9f63376930a5f20be4915834f4bc74f9c9"
@@ -4722,6 +3226,22 @@ es-set-tostringtag@^2.0.1:
     has-tostringtag "^1.0.0"
     hasown "^2.0.0"
 
+es-set-tostringtag@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz#8bb60f0a440c2e4281962428438d58545af39777"
+  integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==
+  dependencies:
+    get-intrinsic "^1.2.4"
+    has-tostringtag "^1.0.2"
+    hasown "^2.0.1"
+
+es-shim-unscopables@^1.0.0, es-shim-unscopables@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763"
+  integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==
+  dependencies:
+    hasown "^2.0.0"
+
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
@@ -4731,22 +3251,46 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es6-error@^4.0.1, es6-error@^4.1.1:
+es6-error@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
   integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
 
-escalade@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
-  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
-
-escape-html@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+esbuild@^0.21.3:
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.21.5.tgz#9ca301b120922959b766360d8ac830da0d02997d"
+  integrity sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==
+  optionalDependencies:
+    "@esbuild/aix-ppc64" "0.21.5"
+    "@esbuild/android-arm" "0.21.5"
+    "@esbuild/android-arm64" "0.21.5"
+    "@esbuild/android-x64" "0.21.5"
+    "@esbuild/darwin-arm64" "0.21.5"
+    "@esbuild/darwin-x64" "0.21.5"
+    "@esbuild/freebsd-arm64" "0.21.5"
+    "@esbuild/freebsd-x64" "0.21.5"
+    "@esbuild/linux-arm" "0.21.5"
+    "@esbuild/linux-arm64" "0.21.5"
+    "@esbuild/linux-ia32" "0.21.5"
+    "@esbuild/linux-loong64" "0.21.5"
+    "@esbuild/linux-mips64el" "0.21.5"
+    "@esbuild/linux-ppc64" "0.21.5"
+    "@esbuild/linux-riscv64" "0.21.5"
+    "@esbuild/linux-s390x" "0.21.5"
+    "@esbuild/linux-x64" "0.21.5"
+    "@esbuild/netbsd-x64" "0.21.5"
+    "@esbuild/openbsd-x64" "0.21.5"
+    "@esbuild/sunos-x64" "0.21.5"
+    "@esbuild/win32-arm64" "0.21.5"
+    "@esbuild/win32-ia32" "0.21.5"
+    "@esbuild/win32-x64" "0.21.5"
+
+escalade@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
+  integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
 
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
@@ -4756,22 +3300,39 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-plugin-react@^7.14.3:
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.0.tgz#f98712f0a5e57dfd3e5542ef0604b8739cd47be3"
-  integrity sha512-rqe1abd0vxMjmbPngo4NaYxTcR3Y4Hrmc/jg4T+sYz63yqlmJRknpEQfmWY+eDWPuMmix6iUIK+mv0zExjeLgA==
-  dependencies:
-    array-includes "^3.1.1"
+eslint-plugin-react-hooks@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz#c829eb06c0e6f484b3fbb85a97e57784f328c596"
+  integrity sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==
+
+eslint-plugin-react-refresh@^0.4.7:
+  version "0.4.9"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.9.tgz#bf870372b353b12e1e6fb7fc41b282d9cbc8d93d"
+  integrity sha512-QK49YrBAo5CLNLseZ7sZgvgTy21E6NEw22eZqc4teZfH8pxV3yXc9XXOYfUI6JNpw7mfHNkAeWtBxrTyykB6HA==
+
+eslint-plugin-react@^7.35.0:
+  version "7.35.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.35.0.tgz#00b1e4559896710e58af6358898f2ff917ea4c41"
+  integrity sha512-v501SSMOWv8gerHkk+IIQBkcGRGrO2nfybfj5pLxuJNFTPxxA3PSryhXTK+9pNbtkggheDdsC0E9Q8CuPk6JKA==
+  dependencies:
+    array-includes "^3.1.8"
+    array.prototype.findlast "^1.2.5"
+    array.prototype.flatmap "^1.3.2"
+    array.prototype.tosorted "^1.1.4"
     doctrine "^2.1.0"
-    has "^1.0.3"
-    jsx-ast-utils "^2.2.3"
-    object.entries "^1.1.1"
-    object.fromentries "^2.0.2"
-    object.values "^1.1.1"
-    prop-types "^15.7.2"
-    resolve "^1.15.1"
-    string.prototype.matchall "^4.0.2"
-    xregexp "^4.3.0"
+    es-iterator-helpers "^1.0.19"
+    estraverse "^5.3.0"
+    hasown "^2.0.2"
+    jsx-ast-utils "^2.4.1 || ^3.0.0"
+    minimatch "^3.1.2"
+    object.entries "^1.1.8"
+    object.fromentries "^2.0.8"
+    object.values "^1.2.0"
+    prop-types "^15.8.1"
+    resolve "^2.0.0-next.5"
+    semver "^6.3.1"
+    string.prototype.matchall "^4.0.11"
+    string.prototype.repeat "^1.0.0"
 
 eslint-scope@5.1.1:
   version "5.1.1"
@@ -4799,16 +3360,16 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
-eslint@^8.56.0:
-  version "8.56.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.56.0.tgz#4957ce8da409dc0809f99ab07a1b94832ab74b15"
-  integrity sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==
+eslint@^8.57.0:
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
+  integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.6.1"
     "@eslint/eslintrc" "^2.1.4"
-    "@eslint/js" "8.56.0"
-    "@humanwhocodes/config-array" "^0.11.13"
+    "@eslint/js" "8.57.0"
+    "@humanwhocodes/config-array" "^0.11.14"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
     "@ungap/structured-clone" "^1.2.0"
@@ -4852,11 +3413,6 @@ espree@^9.6.0, espree@^9.6.1:
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.4.1"
 
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
 esquery@^1.4.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
@@ -4881,104 +3437,59 @@ estraverse@^5.1.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642"
   integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==
 
-estraverse@^5.2.0:
+estraverse@^5.2.0, estraverse@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
-estree-walker@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
-  integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
+estree-walker@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
+  integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
+
+estree-walker@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-3.0.3.tgz#67c3e549ec402a487b4fc193d1953a524752340d"
+  integrity sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==
+  dependencies:
+    "@types/estree" "^1.0.0"
 
 esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-etag@~1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
-
-eventemitter3@^3.1.0:
+eventemitter3@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7"
   integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==
 
-eventemitter3@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384"
-  integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==
-
-events@^3.2.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
-  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
-
-execa@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
-  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
+execa@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-8.0.1.tgz#51f6a5943b580f963c3ca9c6321796db8cc39b8c"
+  integrity sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==
   dependencies:
     cross-spawn "^7.0.3"
-    get-stream "^6.0.0"
-    human-signals "^2.1.0"
-    is-stream "^2.0.0"
+    get-stream "^8.0.1"
+    human-signals "^5.0.0"
+    is-stream "^3.0.0"
     merge-stream "^2.0.0"
-    npm-run-path "^4.0.1"
-    onetime "^5.1.2"
-    signal-exit "^3.0.3"
-    strip-final-newline "^2.0.0"
+    npm-run-path "^5.1.0"
+    onetime "^6.0.0"
+    signal-exit "^4.1.0"
+    strip-final-newline "^3.0.0"
 
 exit-on-epipe@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692"
   integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==
 
-express@^4.17.3:
-  version "4.18.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
-  integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
-  dependencies:
-    accepts "~1.3.8"
-    array-flatten "1.1.1"
-    body-parser "1.20.1"
-    content-disposition "0.5.4"
-    content-type "~1.0.4"
-    cookie "0.5.0"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "2.0.0"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "1.2.0"
-    fresh "0.5.2"
-    http-errors "2.0.0"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "2.4.1"
-    parseurl "~1.3.3"
-    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.7"
-    qs "6.11.0"
-    range-parser "~1.2.1"
-    safe-buffer "5.2.1"
-    send "0.18.0"
-    serve-static "1.15.0"
-    setprototypeof "1.2.0"
-    statuses "2.0.1"
-    type-is "~1.6.18"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
-
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^3.2.9:
+fast-glob@^3.2.12, fast-glob@^3.2.9, fast-glob@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
   integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
@@ -4989,7 +3500,7 @@ fast-glob@^3.2.9:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
+fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
@@ -5006,24 +3517,6 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
-favicons-webpack-plugin@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/favicons-webpack-plugin/-/favicons-webpack-plugin-6.0.1.tgz#56748abc612b605c684e7dcceca416531a13774a"
-  integrity sha512-Gl0Co4zIZq74EKXdpfe8FaoJqbuf0undV4UgpsL34vqICRAYUDwQdp3D+z+uxEOV0i9o+vHDn7Q6jaSxRiDJUA==
-  dependencies:
-    find-root "^1.1.0"
-    parse-author "^2.0.0"
-    parse5 "^7.1.1"
-  optionalDependencies:
-    html-webpack-plugin "^5.5.0"
-
-faye-websocket@^0.11.3:
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da"
-  integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==
-  dependencies:
-    websocket-driver ">=0.5.1"
-
 fbjs@^0.8.16:
   version "0.8.17"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
@@ -5037,6 +3530,11 @@ fbjs@^0.8.16:
     setimmediate "^1.0.5"
     ua-parser-js "^0.7.18"
 
+fflate@^0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.8.2.tgz#fc8631f5347812ad6028bbe4a2308b2792aa1dea"
+  integrity sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==
+
 file-entry-cache@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -5044,31 +3542,11 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-file-loader@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
-  integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==
-  dependencies:
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
-
 file-saver@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38"
   integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==
 
-filelist@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5"
-  integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==
-  dependencies:
-    minimatch "^5.0.1"
-
-filesize@^8.0.6:
-  version "8.0.7"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-8.0.7.tgz#695e70d80f4e47012c132d57a059e80c6b580bd8"
-  integrity sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ==
-
 fill-range@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
@@ -5076,19 +3554,6 @@ fill-range@^7.1.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-finalhandler@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
-  integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    on-finished "2.4.1"
-    parseurl "~1.3.3"
-    statuses "2.0.1"
-    unpipe "~1.0.0"
-
 find-babel-config@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-2.0.0.tgz#a8216f825415a839d0f23f4d18338a1cc966f701"
@@ -5097,50 +3562,18 @@ find-babel-config@^2.0.0:
     json5 "^2.1.1"
     path-exists "^4.0.0"
 
-find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
-  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^2.0.0"
-    pkg-dir "^3.0.0"
-
-find-cache-dir@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-4.0.0.tgz#a30ee0448f81a3990708f6453633c733e2f6eec2"
-  integrity sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==
-  dependencies:
-    common-path-prefix "^3.0.0"
-    pkg-dir "^7.0.0"
-
 find-root@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
   integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
 
-find-up@3.0.0, find-up@^3.0.0:
+find-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
   integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
   dependencies:
     locate-path "^3.0.0"
 
-find-up@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
-  dependencies:
-    locate-path "^2.0.0"
-
-find-up@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
-  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
-  dependencies:
-    locate-path "^5.0.0"
-    path-exists "^4.0.0"
-
 find-up@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
@@ -5149,14 +3582,6 @@ find-up@^5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
-find-up@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-6.3.0.tgz#2abab3d3280b2dc7ac10199ef324c4e002c8c790"
-  integrity sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==
-  dependencies:
-    locate-path "^7.1.0"
-    path-exists "^5.0.0"
-
 flat-cache@^3.0.4:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
@@ -5166,24 +3591,15 @@ flat-cache@^3.0.4:
     keyv "^4.5.3"
     rimraf "^3.0.2"
 
-flat@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.0.tgz#090bec8b05e39cba309747f1d588f04dbaf98db2"
-  integrity sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==
-  dependencies:
-    is-buffer "~2.0.3"
-
 flatted@^3.2.9:
   version "3.2.9"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf"
   integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==
 
-follow-redirects@^1.0.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.11.0.tgz#afa14f08ba12a52963140fe43212658897bc0ecb"
-  integrity sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA==
-  dependencies:
-    debug "^3.0.0"
+flatted@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
+  integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
 
 font-awesome@^4.7.0:
   version "4.7.0"
@@ -5197,85 +3613,34 @@ for-each@^0.3.3:
   dependencies:
     is-callable "^1.1.3"
 
-foreground-child@^1.5.6:
-  version "1.5.6"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-1.5.6.tgz#4fd71ad2dfde96789b980a5c0a295937cb2f5ce9"
-  integrity sha1-T9ca0t/elnibmApcCilZN8svXOk=
+foreground-child@^3.1.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.0.tgz#0ac8644c06e431439f8561db8ecf29a7b5519c77"
+  integrity sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==
   dependencies:
-    cross-spawn "^4"
-    signal-exit "^3.0.0"
+    cross-spawn "^7.0.0"
+    signal-exit "^4.0.1"
 
-fork-ts-checker-webpack-plugin@^6.5.0:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.3.tgz#eda2eff6e22476a2688d10661688c47f611b37f3"
-  integrity sha512-SbH/l9ikmMWycd5puHJKTkZJKddF4iRLyW3DeZ08HTI7NGyLS38MXd/KGgeWumQO7YNQbW2u/NtPT2YowbPaGQ==
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
   dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@types/json-schema" "^7.0.5"
-    chalk "^4.1.0"
-    chokidar "^3.4.2"
-    cosmiconfig "^6.0.0"
-    deepmerge "^4.2.2"
-    fs-extra "^9.0.0"
-    glob "^7.1.6"
-    memfs "^3.1.2"
-    minimatch "^3.0.4"
-    schema-utils "2.7.0"
-    semver "^7.3.2"
-    tapable "^1.0.0"
-
-forwarded@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
-  integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
 
 foundation-sites@6.5.3:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/foundation-sites/-/foundation-sites-6.5.3.tgz#85373aaed72233ca0d16fdfcb034e976cc6943c9"
   integrity sha512-ZwI0idjHHjezh6jRjpPxkczvmtUuJ1uGatZHpyloX0MvsFHfM0BFoxrqdXryXugGPdmb+yJi3JYMnz6+5t3K1A==
 
-fresh@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
-
-fs-extra@^11.2.0:
-  version "11.2.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
-  integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
-fs-extra@^9.0.0, fs-extra@^9.0.1:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
-  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
-  dependencies:
-    at-least-node "^1.0.0"
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
-fs-minipass@^2.0.0, fs-minipass@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
-  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
-  dependencies:
-    minipass "^3.0.0"
-
-fs-monkey@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.5.tgz#fe450175f0db0d7ea758102e1d84096acb925788"
-  integrity sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew==
-
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@~2.3.2:
+fsevents@~2.3.2, fsevents@~2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
   integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
@@ -5297,15 +3662,6 @@ function-double@^1.0.4:
   dependencies:
     util-arity "^1.1.0"
 
-function.prototype.name@^1.1.1, function.prototype.name@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.2.tgz#5cdf79d7c05db401591dfde83e3b70c5123e9a45"
-  integrity sha512-C8A+LlHBJjB2AdcRPorc5JvJ5VUoWlXdEHLOJdCI7kjHEtGTpHQUiqMvCIKUwIsGwZX2jZJy761AXsn356bJQg==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    functions-have-names "^1.2.0"
-
 function.prototype.name@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd"
@@ -5316,51 +3672,20 @@ function.prototype.name@^1.1.6:
     es-abstract "^1.22.1"
     functions-have-names "^1.2.3"
 
-functions-have-names@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.1.tgz#a981ac397fa0c9964551402cdc5533d7a4d52f91"
-  integrity sha512-j48B/ZI7VKs3sgeI2cZp7WXWmZXu7Iq5pl5/vptV5N2mq+DGFuS/ulaDjtaoLpYzuD6u8UgrUKHfgo7fDTSiBA==
-
 functions-have-names@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
-gauge@^4.0.3:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
-  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
-  dependencies:
-    aproba "^1.0.3 || ^2.0.0"
-    color-support "^1.1.3"
-    console-control-strings "^1.1.0"
-    has-unicode "^2.0.1"
-    signal-exit "^3.0.7"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-    wide-align "^1.1.5"
-
-gaze@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
-  integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
-  dependencies:
-    globule "^1.0.0"
-
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-caller-file@^2.0.1, get-caller-file@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-
-get-func-name@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
-  integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
+get-func-name@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.2.tgz#0d7cf20cd13fda808669ffa88f4ffc7a3943fc41"
+  integrity sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==
 
 get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2:
   version "1.2.2"
@@ -5372,7 +3697,7 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@
     has-symbols "^1.0.3"
     hasown "^2.0.0"
 
-get-intrinsic@^1.2.4:
+get-intrinsic@^1.2.3, get-intrinsic@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
   integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
@@ -5383,25 +3708,10 @@ get-intrinsic@^1.2.4:
     has-symbols "^1.0.3"
     hasown "^2.0.0"
 
-get-own-enumerable-property-symbols@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664"
-  integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==
-
-get-package-type@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
-  integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
-
-get-stdin@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
-  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
-
-get-stream@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
-  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
+get-stream@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-8.0.1.tgz#def9dfd71742cd7754a7761ed43749a27d02eca2"
+  integrity sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==
 
 get-symbol-description@^1.0.0:
   version "1.0.0"
@@ -5411,6 +3721,15 @@ get-symbol-description@^1.0.0:
     call-bind "^1.0.2"
     get-intrinsic "^1.1.1"
 
+get-symbol-description@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5"
+  integrity sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==
+  dependencies:
+    call-bind "^1.0.5"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.4"
+
 glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
@@ -5425,24 +3744,19 @@ glob-parent@^6.0.2:
   dependencies:
     is-glob "^4.0.3"
 
-glob-to-regexp@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
-  integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
-
-glob@7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
+glob@^10.4.1:
+  version "10.4.5"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"
+  integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==
   dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
+    foreground-child "^3.1.0"
+    jackspeak "^3.1.2"
+    minimatch "^9.0.4"
+    minipass "^7.1.2"
+    package-json-from-dist "^1.0.0"
+    path-scurry "^1.11.1"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.1.3, glob@^7.1.4, glob@~7.1.1:
+glob@^7.1.3:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -5454,52 +3768,16 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.3, glob@^7.1.4, glob@~7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.1.6:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^8.0.1, glob@^8.0.3:
+glob@^8.0.3:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
   integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
   dependencies:
     fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^5.0.1"
-    once "^1.3.0"
-
-global-modules@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
-  integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
-  dependencies:
-    global-prefix "^3.0.0"
-
-global-prefix@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97"
-  integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==
-  dependencies:
-    ini "^1.3.5"
-    kind-of "^6.0.2"
-    which "^1.3.1"
-
-global@^4.3.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
-  integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==
-  dependencies:
-    min-document "^2.19.0"
-    process "^0.11.10"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^5.0.1"
+    once "^1.3.0"
 
 globals@^11.1.0:
   version "11.12.0"
@@ -5513,6 +3791,11 @@ globals@^13.19.0:
   dependencies:
     type-fest "^0.20.2"
 
+globals@^15.9.0:
+  version "15.9.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-15.9.0.tgz#e9de01771091ffbc37db5714dab484f9f69ff399"
+  integrity sha512-SmSKyLLKFbSr6rptvP8izbyxJL4ILwqO9Jg23UA0sDlGlu58V59D1//I3vlc0KJphVdUR7vMjHIplYnzBxorQA==
+
 globalthis@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
@@ -5520,7 +3803,7 @@ globalthis@^1.0.3:
   dependencies:
     define-properties "^1.1.3"
 
-globby@^11.0.4, globby@^11.1.0:
+globby@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
   integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
@@ -5532,26 +3815,6 @@ globby@^11.0.4, globby@^11.1.0:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
-globby@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
-  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
-  dependencies:
-    array-union "^1.0.1"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-globule@^1.0.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.2.tgz#d8bdd9e9e4eef8f96e245999a5dee7eb5d8529c4"
-  integrity sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==
-  dependencies:
-    glob "~7.1.1"
-    lodash "~4.17.10"
-    minimatch "~3.0.2"
-
 gopd@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
@@ -5559,48 +3822,21 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+graceful-fs@^4.1.2:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
-graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
-  version "4.2.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
-  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
-
 graphemer@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
   integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
 
-growl@1.10.5:
-  version "1.10.5"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
-  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
-
 gud@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/gud/-/gud-1.0.0.tgz#a489581b17e6a70beca9abe3ae57de7a499852c0"
   integrity sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw==
 
-gzip-size@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
-  integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==
-  dependencies:
-    duplexer "^0.1.2"
-
-handle-thing@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
-  integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
-
-hard-rejection@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
-  integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
-
 has-bigints@^1.0.1, has-bigints@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
@@ -5635,6 +3871,11 @@ has-proto@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
   integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
 
+has-proto@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd"
+  integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==
+
 has-symbols@^1.0.0, has-symbols@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
@@ -5652,10 +3893,12 @@ has-tostringtag@^1.0.0:
   dependencies:
     has-symbols "^1.0.2"
 
-has-unicode@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
+has-tostringtag@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
+  integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
+  dependencies:
+    has-symbols "^1.0.3"
 
 has@^1.0.3:
   version "1.0.3"
@@ -5664,13 +3907,6 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-hasha@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/hasha/-/hasha-3.0.0.tgz#52a32fab8569d41ca69a61ff1a214f8eb7c8bd39"
-  integrity sha1-UqMvq4Vp1BymmmH/GiFPjrfIvTk=
-  dependencies:
-    is-stream "^1.0.1"
-
 hasown@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c"
@@ -5678,6 +3914,13 @@ hasown@^2.0.0:
   dependencies:
     function-bind "^1.1.2"
 
+hasown@^2.0.1, hasown@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
+  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
+  dependencies:
+    function-bind "^1.1.2"
+
 hds-core@3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/hds-core/-/hds-core-3.8.0.tgz#39003a0c129de767239fc1f904d89b6424edc9a1"
@@ -5718,11 +3961,6 @@ hds-react@^3.8.0:
     uuid "^9.0.0"
     yup "^1.0.2"
 
-he@1.2.0, he@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
-  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
-
 history@*:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b"
@@ -5754,251 +3992,78 @@ hosted-git-info@^2.1.4:
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
   integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
 
-hosted-git-info@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
-  integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
-  dependencies:
-    lru-cache "^6.0.0"
-
-hpack.js@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
-  integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=
-  dependencies:
-    inherits "^2.0.1"
-    obuf "^1.0.0"
-    readable-stream "^2.0.1"
-    wbuf "^1.1.0"
-
-html-element-map@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/html-element-map/-/html-element-map-1.2.0.tgz#dfbb09efe882806af63d990cf6db37993f099f22"
-  integrity sha512-0uXq8HsuG1v2TmQ8QkIhzbrqeskE4kn52Q18QJ9iAA/SnHoEKXWiUxHQtclRsCFWEUD2So34X+0+pZZu862nnw==
+html-encoding-sniffer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz#696df529a7cfd82446369dc5193e590a3735b448"
+  integrity sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==
   dependencies:
-    array-filter "^1.0.0"
-
-html-entities@^2.1.0, html-entities@^2.3.2:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.4.0.tgz#edd0cee70402584c8c76cc2c0556db09d1f45061"
-  integrity sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==
+    whatwg-encoding "^3.1.1"
 
 html-escaper@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
-html-minifier-terser@^6.0.2:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#bfc818934cc07918f6b3669f5774ecdfd48f32ab"
-  integrity sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==
-  dependencies:
-    camel-case "^4.1.2"
-    clean-css "^5.2.2"
-    commander "^8.3.0"
-    he "^1.2.0"
-    param-case "^3.0.4"
-    relateurl "^0.2.7"
-    terser "^5.10.0"
-
-html-webpack-plugin@^5.5.0, html-webpack-plugin@^5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.6.0.tgz#50a8fa6709245608cb00e811eacecb8e0d7b7ea0"
-  integrity sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==
-  dependencies:
-    "@types/html-minifier-terser" "^6.0.0"
-    html-minifier-terser "^6.0.2"
-    lodash "^4.17.21"
-    pretty-error "^4.0.0"
-    tapable "^2.0.0"
-
-html@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/html/-/html-1.0.0.tgz#a544fa9ea5492bfb3a2cca8210a10be7b5af1f61"
-  integrity sha1-pUT6nqVJK/s6LMqCEKEL57WvH2E=
-  dependencies:
-    concat-stream "^1.4.7"
-
-htmlparser2@^3.9.1:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
-  integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
-  dependencies:
-    domelementtype "^1.3.1"
-    domhandler "^2.3.0"
-    domutils "^1.5.1"
-    entities "^1.1.1"
-    inherits "^2.0.1"
-    readable-stream "^3.1.1"
-
-htmlparser2@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
-  integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==
-  dependencies:
-    domelementtype "^2.0.1"
-    domhandler "^4.0.0"
-    domutils "^2.5.2"
-    entities "^2.0.0"
-
-http-cache-semantics@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
-  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
-
-http-deceiver@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
-  integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
-
-http-errors@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
-  integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
-  dependencies:
-    depd "2.0.0"
-    inherits "2.0.4"
-    setprototypeof "1.2.0"
-    statuses "2.0.1"
-    toidentifier "1.0.1"
-
-http-errors@~1.6.2:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.0"
-    statuses ">= 1.4.0 < 2"
-
-http-parser-js@>=0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.2.tgz#da2e31d237b393aae72ace43882dd7e270a8ff77"
-  integrity sha512-opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ==
-
-http-proxy-agent@^4.0.0, http-proxy-agent@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
-  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
-  dependencies:
-    "@tootallnate/once" "1"
-    agent-base "6"
-    debug "4"
-
-http-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
-  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
-  dependencies:
-    "@tootallnate/once" "2"
-    agent-base "6"
-    debug "4"
-
-http-proxy-middleware@^2.0.3:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f"
-  integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==
-  dependencies:
-    "@types/http-proxy" "^1.17.8"
-    http-proxy "^1.18.1"
-    is-glob "^4.0.1"
-    is-plain-obj "^3.0.0"
-    micromatch "^4.0.2"
-
-http-proxy@^1.18.1:
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
-  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
+http-proxy-agent@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
+  integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
   dependencies:
-    eventemitter3 "^4.0.0"
-    follow-redirects "^1.0.0"
-    requires-port "^1.0.0"
+    agent-base "^7.1.0"
+    debug "^4.3.4"
 
 http-status-typed@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/http-status-typed/-/http-status-typed-1.0.1.tgz#25a8b08efb4dfc6711c0214b575adb4974616d1a"
   integrity sha512-U8jF221dmNNZbdBiOoK2HduguCwparnsP0z11PQZaDtaHBHuxG3gCimxQi8Cfb8VECave4yoVbONSByQU6z0Ew==
 
-https-proxy-agent@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b"
-  integrity sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==
-  dependencies:
-    agent-base "5"
-    debug "4"
-
-https-proxy-agent@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
-  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
+https-proxy-agent@^7.0.5:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz#9e8b5013873299e11fab6fd548405da2d6c602b2"
+  integrity sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==
   dependencies:
-    agent-base "6"
+    agent-base "^7.0.2"
     debug "4"
 
-human-signals@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
-  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
-
-humanize-ms@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
-  integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==
-  dependencies:
-    ms "^2.0.0"
-
-iconv-lite@0.4.24, iconv-lite@~0.4.13:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
+human-signals@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-5.0.0.tgz#42665a284f9ae0dade3ba41ebc37eb4b852f3a28"
+  integrity sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==
 
-iconv-lite@^0.6.2:
+iconv-lite@0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
   integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
   dependencies:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
-icss-utils@^5.0.0, icss-utils@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
-  integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
-
-idb@^7.0.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/idb/-/idb-7.1.1.tgz#d910ded866d32c7ced9befc5bfdf36f572ced72b"
-  integrity sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==
-
-ignore-by-default@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
-  integrity sha1-SMptcvbGo68Aqa1K5odr44ieKwk=
-
-ignore-walk@3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
-  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
+iconv-lite@~0.4.13:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
-    minimatch "^3.0.4"
+    safer-buffer ">= 2.1.2 < 3"
 
 ignore@^5.2.0:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
   integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
 
-immer@^9.0.7:
-  version "9.0.21"
-  resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.21.tgz#1e025ea31a40f24fb064f1fef23e931496330176"
-  integrity sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==
+ignore@^5.3.1:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
+  integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
 
 immutable@>=3.6.0:
   version "3.8.2"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
   integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=
 
+"immutable@^3.8.1 || ^4.0.0", immutable@^4.0.0:
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.7.tgz#c70145fc90d89fb02021e65c84eb0226e4e5a381"
+  integrity sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==
+
 import-fresh@^3.1.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
@@ -6020,21 +4085,6 @@ imurmurhash@^0.1.4:
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
-indent-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
-  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
-
-indexes-of@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
-  integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
-
-infer-owner@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
-  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
-
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -6043,30 +4093,11 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
+inherits@2:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-inherits@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
-ini@^1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
-
-internal-slot@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz#9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"
-  integrity sha512-2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g==
-  dependencies:
-    es-abstract "^1.17.0-next.1"
-    has "^1.0.3"
-    side-channel "^1.0.2"
-
 internal-slot@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.6.tgz#37e756098c4911c5e912b8edbf71ed3aa116f930"
@@ -6076,28 +4107,22 @@ internal-slot@^1.0.5:
     hasown "^2.0.0"
     side-channel "^1.0.4"
 
-invariant@^2.2.2, invariant@^2.2.4:
+internal-slot@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802"
+  integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==
+  dependencies:
+    es-errors "^1.3.0"
+    hasown "^2.0.0"
+    side-channel "^1.0.4"
+
+invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
   dependencies:
     loose-envify "^1.0.0"
 
-ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
-
-ipaddr.js@1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
-  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
-
-ipaddr.js@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz#2119bc447ff8c257753b196fc5f1ce08a4cdf39f"
-  integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==
-
 is-arguments@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
@@ -6112,11 +4137,26 @@ is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
     get-intrinsic "^1.2.0"
     is-typed-array "^1.1.10"
 
+is-array-buffer@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98"
+  integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.1"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
+is-async-function@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.0.0.tgz#8e4418efd3e5d3a6ebb0164c05ef5afb69aa9646"
+  integrity sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
 is-bigint@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
@@ -6131,11 +4171,6 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
-is-boolean-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.1.tgz#10edc0900dd127697a92f6f9807c7617d68ac48e"
-  integrity sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ==
-
 is-boolean-object@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
@@ -6144,11 +4179,6 @@ is-boolean-object@^1.1.0:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-buffer@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
-  integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
-
 is-callable@^1.1.3, is-callable@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
@@ -6159,38 +4189,56 @@ is-callable@^1.1.4, is-callable@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb"
   integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==
 
-is-core-module@^2.13.0, is-core-module@^2.5.0:
+is-core-module@^2.13.0:
   version "2.13.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
   integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
   dependencies:
     hasown "^2.0.0"
 
+is-data-view@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.1.tgz#4b4d3a511b70f3dc26d42c03ca9ca515d847759f"
+  integrity sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==
+  dependencies:
+    is-typed-array "^1.1.13"
+
 is-date-object@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
   integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
 
-is-docker@^2.0.0, is-docker@^2.1.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
-  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
+is-date-object@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
+  integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
+  dependencies:
+    has-tostringtag "^1.0.0"
 
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+is-finalizationregistry@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz#c8749b65f17c133313e661b1289b95ad3dbd62e6"
+  integrity sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==
+  dependencies:
+    call-bind "^1.0.2"
 
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
+is-generator-function@^1.0.10:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72"
+  integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
 is-glob@^4.0.0, is-glob@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
@@ -6205,21 +4253,21 @@ is-glob@^4.0.3, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-lambda@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
-  integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==
-
-is-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
-  integrity sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==
+is-map@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e"
+  integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==
 
 is-negative-zero@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
   integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
 
+is-negative-zero@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747"
+  integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==
+
 is-number-object@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
@@ -6230,51 +4278,15 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-obj@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
-
-is-path-cwd@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
-  integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
-
-is-path-in-cwd@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb"
-  integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==
-  dependencies:
-    is-path-inside "^2.1.0"
-
-is-path-inside@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2"
-  integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==
-  dependencies:
-    path-is-inside "^1.0.2"
-
 is-path-inside@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
 
-is-plain-obj@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
-
-is-plain-obj@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7"
-  integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==
-
-is-plain-object@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
-  dependencies:
-    isobject "^3.0.1"
+is-potential-custom-element-name@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
+  integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
 is-promise@^2.1.0:
   version "2.2.2"
@@ -6296,15 +4308,10 @@ is-regex@^1.1.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-regexp@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
-  integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
-
-is-root@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c"
-  integrity sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==
+is-set@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.3.tgz#8ab209ea424608141372ded6e0cb200ef1d9d01d"
+  integrity sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==
 
 is-shared-array-buffer@^1.0.2:
   version "1.0.2"
@@ -6313,15 +4320,22 @@ is-shared-array-buffer@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
+is-shared-array-buffer@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz#1237f1cba059cdb62431d378dcc37d9680181688"
+  integrity sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==
+  dependencies:
+    call-bind "^1.0.7"
+
 is-stream@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
-is-stream@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
-  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
+is-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac"
+  integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==
 
 is-string@^1.0.5:
   version "1.0.5"
@@ -6335,11 +4349,6 @@ is-string@^1.0.7:
   dependencies:
     has-tostringtag "^1.0.0"
 
-is-subset@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
-  integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=
-
 is-symbol@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
@@ -6361,6 +4370,18 @@ is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.9:
   dependencies:
     which-typed-array "^1.1.11"
 
+is-typed-array@^1.1.13:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229"
+  integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==
+  dependencies:
+    which-typed-array "^1.1.14"
+
+is-weakmap@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd"
+  integrity sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==
+
 is-weakref@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
@@ -6368,12 +4389,13 @@ is-weakref@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
-is-wsl@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
-  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
+is-weakset@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.3.tgz#e801519df8c0c43e12ff2834eead84ec9e624007"
+  integrity sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==
   dependencies:
-    is-docker "^2.0.0"
+    call-bind "^1.0.7"
+    get-intrinsic "^1.2.4"
 
 isarray@0.0.1:
   version "0.0.1"
@@ -6385,21 +4407,11 @@ isarray@^2.0.5:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
   integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
 
-isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
-isobject@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
-
 isomorphic-fetch@^2.1.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
@@ -6408,128 +4420,73 @@ isomorphic-fetch@^2.1.1:
     node-fetch "^1.0.1"
     whatwg-fetch ">=0.10.0"
 
-istanbul-lib-coverage@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
-  integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==
-
-istanbul-lib-coverage@^3.2.0:
+istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0, istanbul-lib-coverage@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756"
   integrity sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==
 
-istanbul-lib-hook@^2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz#c95695f383d4f8f60df1f04252a9550e15b5b133"
-  integrity sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA==
-  dependencies:
-    append-transform "^1.0.0"
-
-istanbul-lib-instrument@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"
-  integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==
-  dependencies:
-    "@babel/generator" "^7.4.0"
-    "@babel/parser" "^7.4.3"
-    "@babel/template" "^7.4.0"
-    "@babel/traverse" "^7.4.3"
-    "@babel/types" "^7.4.0"
-    istanbul-lib-coverage "^2.0.5"
-    semver "^6.0.0"
-
-istanbul-lib-instrument@^5.0.4:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d"
-  integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==
+istanbul-lib-instrument@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz#fa15401df6c15874bcb2105f773325d78c666765"
+  integrity sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==
   dependencies:
-    "@babel/core" "^7.12.3"
-    "@babel/parser" "^7.14.7"
-    "@istanbuljs/schema" "^0.1.2"
+    "@babel/core" "^7.23.9"
+    "@babel/parser" "^7.23.9"
+    "@istanbuljs/schema" "^0.1.3"
     istanbul-lib-coverage "^3.2.0"
-    semver "^6.3.0"
+    semver "^7.5.4"
 
-istanbul-lib-report@^2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33"
-  integrity sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==
+istanbul-lib-report@^3.0.0, istanbul-lib-report@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz#908305bac9a5bd175ac6a74489eafd0fc2445a7d"
+  integrity sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==
   dependencies:
-    istanbul-lib-coverage "^2.0.5"
-    make-dir "^2.1.0"
-    supports-color "^6.1.0"
+    istanbul-lib-coverage "^3.0.0"
+    make-dir "^4.0.0"
+    supports-color "^7.1.0"
 
-istanbul-lib-source-maps@^3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8"
-  integrity sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==
+istanbul-lib-source-maps@^5.0.6:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz#acaef948df7747c8eb5fbf1265cb980f6353a441"
+  integrity sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==
   dependencies:
+    "@jridgewell/trace-mapping" "^0.3.23"
     debug "^4.1.1"
-    istanbul-lib-coverage "^2.0.5"
-    make-dir "^2.1.0"
-    rimraf "^2.6.3"
-    source-map "^0.6.1"
+    istanbul-lib-coverage "^3.0.0"
 
-istanbul-reports@^2.2.4:
-  version "2.2.7"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.7.tgz#5d939f6237d7b48393cc0959eab40cd4fd056931"
-  integrity sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==
+istanbul-reports@^3.1.7:
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.7.tgz#daed12b9e1dca518e15c056e1e537e741280fa0b"
+  integrity sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==
   dependencies:
     html-escaper "^2.0.0"
+    istanbul-lib-report "^3.0.0"
 
-jake@^10.8.5:
-  version "10.8.7"
-  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f"
-  integrity sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==
-  dependencies:
-    async "^3.2.3"
-    chalk "^4.0.2"
-    filelist "^1.0.4"
-    minimatch "^3.1.2"
-
-jest-worker@^26.2.1:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
-  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
+iterator.prototype@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.2.tgz#5e29c8924f01916cb9335f1ff80619dcff22b0c0"
+  integrity sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==
   dependencies:
-    "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^7.0.0"
+    define-properties "^1.2.1"
+    get-intrinsic "^1.2.1"
+    has-symbols "^1.0.3"
+    reflect.getprototypeof "^1.0.4"
+    set-function-name "^2.0.1"
 
-jest-worker@^27.4.5:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
-  integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
+jackspeak@^3.1.2:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz#8833a9d89ab4acde6188942bd1c53b6390ed5a8a"
+  integrity sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==
   dependencies:
-    "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^8.0.0"
-
-js-base64@^2.4.9:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
-  integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==
+    "@isaacs/cliui" "^8.0.2"
+  optionalDependencies:
+    "@pkgjs/parseargs" "^0.11.0"
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@3.13.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-js-yaml@^3.13.1:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
-  integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
 js-yaml@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
@@ -6537,6 +4494,33 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
+jsdom@^24.1.1:
+  version "24.1.1"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-24.1.1.tgz#f41df8f4f3b2fbfa7e1bdc5df62c9804fd14a9d0"
+  integrity sha512-5O1wWV99Jhq4DV7rCLIoZ/UIhyQeDR7wHVyZAHAshbrvZsLs+Xzz7gtwnlJTJDjleiTKh54F4dXrX70vJQTyJQ==
+  dependencies:
+    cssstyle "^4.0.1"
+    data-urls "^5.0.0"
+    decimal.js "^10.4.3"
+    form-data "^4.0.0"
+    html-encoding-sniffer "^4.0.0"
+    http-proxy-agent "^7.0.2"
+    https-proxy-agent "^7.0.5"
+    is-potential-custom-element-name "^1.0.1"
+    nwsapi "^2.2.12"
+    parse5 "^7.1.2"
+    rrweb-cssom "^0.7.1"
+    saxes "^6.0.0"
+    symbol-tree "^3.2.4"
+    tough-cookie "^4.1.4"
+    w3c-xmlserializer "^5.0.0"
+    webidl-conversions "^7.0.0"
+    whatwg-encoding "^3.1.1"
+    whatwg-mimetype "^4.0.0"
+    whatwg-url "^14.0.0"
+    ws "^8.18.0"
+    xml-name-validator "^5.0.0"
+
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
@@ -6552,90 +4536,41 @@ json-buffer@3.0.1:
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
   integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
 
-json-loader@^0.5.7:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
-  integrity sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==
-
 json-parse-better-errors@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-parse-even-better-errors@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
-  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
-
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
-json-schema-traverse@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
-  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
-
-json-schema@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
-  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
-
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
-json5@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
-
-json5@^2.1.1, json5@^2.2.0, json5@^2.2.2, json5@^2.2.3:
+json5@^2.1.1, json5@^2.2.2, json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
-json5@^2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
-  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
-  dependencies:
-    minimist "^1.2.5"
-
-jsonfile@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
-  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
-  dependencies:
-    universalify "^2.0.0"
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-jsonpointer@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.1.tgz#2110e0af0900fd37467b5907ecd13a7884a1b559"
-  integrity sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==
-
-jsx-ast-utils@^2.2.3:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.3.0.tgz#edd727794ea284d7fda575015ed1b0cde0289ab6"
-  integrity sha512-3HNoc7nZ1hpZIKB3hJ7BlFRkzCx2BynRtfSwbkqZdpRdvAPsGMnzclPwrvDBS7/lalHTj21NwIeaEpysHBOudg==
+"jsx-ast-utils@^2.4.1 || ^3.0.0":
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a"
+  integrity sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==
   dependencies:
-    array-includes "^3.1.1"
-    object.assign "^4.1.0"
+    array-includes "^3.1.6"
+    array.prototype.flat "^1.3.1"
+    object.assign "^4.1.4"
+    object.values "^1.1.6"
 
 just-curry-it@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/just-curry-it/-/just-curry-it-3.1.0.tgz#ab59daed308a58b847ada166edd0a2d40766fbc5"
   integrity sha512-mjzgSOFzlrurlURaHVjnQodyPNvrHrf1TbQP2XU9NSqBtHQPuHZ+Eb6TAJP7ASeJN9h9K0KXoRTs8u6ouHBKvg==
 
-just-extend@^4.0.2:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.1.0.tgz#7278a4027d889601640ee0ce0e5a00b992467da4"
-  integrity sha512-ApcjaOdVTJ7y4r08xI5wIqpvwS48Q0PBG4DJROcEkH1f8MdAiNFyFxz3xoL0LWAVwjrwPYZdVHHxhRHcx/uGLA==
-
 jwt-decode@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-3.1.2.tgz#3fb319f3675a2df0c2895c8f5e9fa4b67b04ed59"
@@ -6656,24 +4591,6 @@ keyv@^4.5.3:
   dependencies:
     json-buffer "3.0.1"
 
-kind-of@^6.0.2, kind-of@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
-  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
-
-kleur@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
-  integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
-
-launch-editor@^2.6.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.1.tgz#f259c9ef95cbc9425620bbbd14b468fcdb4ffe3c"
-  integrity sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==
-  dependencies:
-    picocolors "^1.0.0"
-    shell-quote "^1.8.1"
-
 leaflet-draw@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/leaflet-draw/-/leaflet-draw-1.0.4.tgz#45be92f378ed253e7202fdeda1fcc71885198d46"
@@ -6697,10 +4614,10 @@ leaflet-zoombox@^0.5.1:
   resolved "https://registry.yarnpkg.com/leaflet-zoombox/-/leaflet-zoombox-0.5.1.tgz#84a50abf10a354aed5e0661eadbdda8927f1512f"
   integrity sha512-qbLm6vkJzN1thr1cQFf9xsP+M7K5dz0Xa4EAt9kppkGDxV9Xewr1kpg6e8JBFfCGcqJi6pulNhkxLnfooxYZRQ==
 
-leaflet.fullscreen@1.4.5:
-  version "1.4.5"
-  resolved "https://registry.yarnpkg.com/leaflet.fullscreen/-/leaflet.fullscreen-1.4.5.tgz#3b558dece24d9b51ce762b2e00fe902727f47272"
-  integrity sha512-rQnZswt/bI2HXmYDWjvgu8GIgg5TAyJEVOXJ1SVpo+36G9/YJ4j8gt8bz7VQU5P/gs2tQNCFbuuWtKYpSw8gbA==
+leaflet.fullscreen@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/leaflet.fullscreen/-/leaflet.fullscreen-1.6.0.tgz#daad9a6e07c8bdbca8e5af7e3d50272d31b0226a"
+  integrity sha512-Mr6STMeyKSfJ1CsKFcPZOm425LOe0c/6EHh0AK93GiTvteTAMFmO/oFDNe+0p1mk4+8yeGLcYgaXTSzPveEGhA==
 
 leaflet@^1.5.1:
   version "1.6.0"
@@ -6714,18 +4631,6 @@ leaflet@^1.5.1:
   dependencies:
     tslib "^2.4.0"
 
-leven@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
-  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
-
-levenary@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77"
-  integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==
-  dependencies:
-    leven "^3.1.0"
-
 levn@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
@@ -6749,43 +4654,6 @@ load-json-file@^4.0.0:
     pify "^3.0.0"
     strip-bom "^3.0.0"
 
-loader-runner@^4.2.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
-  integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
-
-loader-utils@0.2.x:
-  version "0.2.17"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
-  integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-    object-assign "^4.0.1"
-
-loader-utils@^2.0.0, loader-utils@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
-  integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^3.0.0"
-    json5 "^2.1.2"
-
-loader-utils@^3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.2.1.tgz#4fb104b599daafd82ef3e1a41fb9265f87e1f576"
-  integrity sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==
-
-locate-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
-  dependencies:
-    p-locate "^2.0.0"
-    path-exists "^3.0.0"
-
 locate-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
@@ -6794,13 +4662,6 @@ locate-path@^3.0.0:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
-locate-path@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
-  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
-  dependencies:
-    p-locate "^4.1.0"
-
 locate-path@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
@@ -6808,13 +4669,6 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
-locate-path@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-7.2.0.tgz#69cb1779bd90b35ab1e771e1f2f89a202c2a8a8a"
-  integrity sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==
-  dependencies:
-    p-locate "^6.0.0"
-
 lodash-es@^4.17.10:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
@@ -6830,55 +4684,21 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
-lodash.escape@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98"
-  integrity sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=
-
-lodash.flattendeep@^4.4.0:
+lodash.isequalwith@^4.4.0:
   version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
-  integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=
-
-lodash.isequal@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
+  resolved "https://registry.yarnpkg.com/lodash.isequalwith/-/lodash.isequalwith-4.4.0.tgz#266726ddd528f854f21f4ea98a065606e0fbc6b0"
+  integrity sha512-dcZON0IalGBpRmJBmMkaoV7d3I80R2O+FrzsZyHdNSFrANq/cgDqKQNmAHE8UEj4+QYWwwhkQOVdLHiAopzlsQ==
 
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash.sortby@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
-  integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==
-
-lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.5, lodash@~4.17.10:
+lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.21, lodash@^4.17.5:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-log-symbols@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
-  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
-  dependencies:
-    chalk "^2.0.1"
-
-lolex@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lolex/-/lolex-4.2.0.tgz#ddbd7f6213ca1ea5826901ab1222b65d714b3cd7"
-  integrity sha512-gKO5uExCXvSm6zbF562EvM+rd1kQDnB9AZBbiQVzf1ZmdDpxUSvpnAaVOP83N/31mRK8Ml8/VE8DMvsAZQ+7wg==
-
-lolex@^5.0.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/lolex/-/lolex-5.1.2.tgz#953694d098ce7c07bc5ed6d0e42bc6c0c6d5a367"
-  integrity sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==
-  dependencies:
-    "@sinonjs/commons" "^1.7.0"
-
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -6886,20 +4706,17 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
-lower-case@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
-  integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==
+loupe@^3.1.0, loupe@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/loupe/-/loupe-3.1.1.tgz#71d038d59007d890e3247c5db97c1ec5a92edc54"
+  integrity sha512-edNu/8D5MKVfGVFRhFf8aAxiTM6Wumfz5XsaatSxlD3w4R1d/WEKUTydCdPGbl9K7QG/Ca3GnDV2sIKIpXRQcw==
   dependencies:
-    tslib "^2.0.3"
+    get-func-name "^2.0.1"
 
-lru-cache@^4.0.1:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
-  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
+lru-cache@^10.2.0:
+  version "10.4.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
+  integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
 
 lru-cache@^5.1.1:
   version "5.1.1"
@@ -6915,97 +4732,41 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^7.7.1:
-  version "7.18.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
-  integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
+magic-string@^0.30.1, magic-string@^0.30.10:
+  version "0.30.11"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.11.tgz#301a6f93b3e8c2cb13ac1a7a673492c0dfd12954"
+  integrity sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.5.0"
 
-magic-string@^0.25.0, magic-string@^0.25.7:
-  version "0.25.9"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c"
-  integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==
+magicast@^0.3.4:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.3.4.tgz#bbda1791d03190a24b00ff3dd18151e7fd381d19"
+  integrity sha512-TyDF/Pn36bBji9rWKHlZe+PZb6Mx5V8IHCSxk7X4aljM4e/vyDvZZYwHewdVaqiA0nb3ghfHU/6AUpDxWoER2Q==
   dependencies:
-    sourcemap-codec "^1.4.8"
+    "@babel/parser" "^7.24.4"
+    "@babel/types" "^7.24.0"
+    source-map-js "^1.2.0"
 
-make-dir@^2.0.0, make-dir@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
-  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
+make-dir@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
+  integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==
+  dependencies:
+    semver "^7.5.3"
+
+make-dir@~3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
   dependencies:
-    pify "^4.0.1"
-    semver "^5.6.0"
+    semver "^6.0.0"
 
 make-error@^1.1.1:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
-make-fetch-happen@^10.0.4:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164"
-  integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==
-  dependencies:
-    agentkeepalive "^4.2.1"
-    cacache "^16.1.0"
-    http-cache-semantics "^4.1.0"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
-    is-lambda "^1.0.1"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-fetch "^2.0.3"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    negotiator "^0.6.3"
-    promise-retry "^2.0.1"
-    socks-proxy-agent "^7.0.0"
-    ssri "^9.0.0"
-
-make-fetch-happen@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
-  integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
-  dependencies:
-    agentkeepalive "^4.1.3"
-    cacache "^15.2.0"
-    http-cache-semantics "^4.1.0"
-    http-proxy-agent "^4.0.1"
-    https-proxy-agent "^5.0.0"
-    is-lambda "^1.0.1"
-    lru-cache "^6.0.0"
-    minipass "^3.1.3"
-    minipass-collect "^1.0.2"
-    minipass-fetch "^1.3.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    negotiator "^0.6.2"
-    promise-retry "^2.0.1"
-    socks-proxy-agent "^6.0.0"
-    ssri "^8.0.0"
-
-map-obj@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
-  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
-
-map-obj@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
-  integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
-
-media-typer@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
-
-memfs@^3.1.2, memfs@^3.4.3:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6"
-  integrity sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ==
-  dependencies:
-    fs-monkey "^1.0.4"
-
 memoize-one@5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e"
@@ -7021,36 +4782,6 @@ memorystream@^0.3.1:
   resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
   integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
 
-meow@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364"
-  integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==
-  dependencies:
-    "@types/minimist" "^1.2.0"
-    camelcase-keys "^6.2.2"
-    decamelize "^1.2.0"
-    decamelize-keys "^1.1.0"
-    hard-rejection "^2.1.0"
-    minimist-options "4.1.0"
-    normalize-package-data "^3.0.0"
-    read-pkg-up "^7.0.1"
-    redent "^3.0.0"
-    trim-newlines "^3.0.0"
-    type-fest "^0.18.0"
-    yargs-parser "^20.2.3"
-
-merge-descriptors@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
-
-merge-source-map@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"
-  integrity sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==
-  dependencies:
-    source-map "^0.6.1"
-
 merge-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
@@ -7061,17 +4792,12 @@ merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-methods@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
-
 mgrs@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/mgrs/-/mgrs-1.0.0.tgz#fb91588e78c90025672395cb40b25f7cd6ad1829"
   integrity sha1-+5FYjnjJACVnI5XLQLJffNatGCk=
 
-micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4:
+micromatch@^4.0.4:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -7079,51 +4805,27 @@ micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
-mime-db@1.44.0, "mime-db@>= 1.43.0 < 2":
-  version "1.44.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
-  integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
-
 mime-db@1.52.0:
   version "1.52.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.34:
+mime-types@^2.1.12:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
   dependencies:
     mime-db "1.52.0"
 
-mime-types@~2.1.17, mime-types@~2.1.24:
-  version "2.1.27"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
-  integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
-  dependencies:
-    mime-db "1.44.0"
-
-mime@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
-
-mimic-fn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-
-min-document@^2.19.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
-  integrity sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=
-  dependencies:
-    dom-walk "^0.1.0"
+mime@~2.5.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"
+  integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==
 
-min-indent@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
-  integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
+mimic-fn@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc"
+  integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==
 
 mini-create-react-context@^0.4.0:
   version "0.4.0"
@@ -7133,33 +4835,21 @@ mini-create-react-context@^0.4.0:
     "@babel/runtime" "^7.5.5"
     tiny-warning "^1.0.3"
 
-mini-css-extract-plugin@^2.7.7:
-  version "2.7.7"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.7.tgz#4acf02f362c641c38fb913bfcb7ca2fc4a7cf339"
-  integrity sha512-+0n11YGyRavUR3IlaOzJ0/4Il1avMvJ1VJfhWfCn24ITQXhRr1gghbhhrda6tgtNcpZaWKdSuwKq20Jb7fnlyw==
+minimatch@9.0.3:
+  version "9.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
+  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
   dependencies:
-    schema-utils "^4.0.0"
-
-minimalistic-assert@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
-  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
+    brace-expansion "^2.0.1"
 
-minimatch@3.0.4, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@9.0.3:
-  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
-  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
-  dependencies:
-    brace-expansion "^2.0.1"
-
-minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
+minimatch@^3.0.5, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -7173,181 +4863,40 @@ minimatch@^5.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimist-options@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
-  integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==
+minimatch@^9.0.4:
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
+  integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
   dependencies:
-    arrify "^1.0.1"
-    is-plain-obj "^1.1.0"
-    kind-of "^6.0.3"
+    brace-expansion "^2.0.1"
 
-minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+minimatch@~3.0.4:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz#5e6a59bd11e2ab0de1cfb843eb2d82e546c321c1"
+  integrity sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==
+  dependencies:
+    brace-expansion "^1.1.7"
 
 minimist@^1.2.6:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
-minipass-collect@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
-  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-fetch@^1.3.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6"
-  integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==
-  dependencies:
-    minipass "^3.1.0"
-    minipass-sized "^1.0.3"
-    minizlib "^2.0.0"
-  optionalDependencies:
-    encoding "^0.1.12"
-
-minipass-fetch@^2.0.3:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add"
-  integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==
-  dependencies:
-    minipass "^3.1.6"
-    minipass-sized "^1.0.3"
-    minizlib "^2.1.2"
-  optionalDependencies:
-    encoding "^0.1.13"
-
-minipass-flush@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
-  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
-  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-sized@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
-  integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.1.6:
-  version "3.3.6"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
-  integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
-  dependencies:
-    yallist "^4.0.0"
-
-minipass@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
-  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
-
-minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
-  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
-  dependencies:
-    minipass "^3.0.0"
-    yallist "^4.0.0"
-
-mkdirp@0.5.4:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.4.tgz#fd01504a6797ec5c9be81ff43d204961ed64a512"
-  integrity sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==
-  dependencies:
-    minimist "^1.2.5"
-
-mkdirp@^0.5.0:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
-  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
-  dependencies:
-    minimist "^1.2.5"
-
-mkdirp@^1.0.3, mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
-mocha@^6.2.0:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-6.2.3.tgz#e648432181d8b99393410212664450a4c1e31912"
-  integrity sha512-0R/3FvjIGH3eEuG17ccFPk117XL2rWxatr81a57D+r/x2uTYZRbdZ4oVidEUMh2W2TJDa7MdAb12Lm2/qrKajg==
-  dependencies:
-    ansi-colors "3.2.3"
-    browser-stdout "1.3.1"
-    debug "3.2.6"
-    diff "3.5.0"
-    escape-string-regexp "1.0.5"
-    find-up "3.0.0"
-    glob "7.1.3"
-    growl "1.10.5"
-    he "1.2.0"
-    js-yaml "3.13.1"
-    log-symbols "2.2.0"
-    minimatch "3.0.4"
-    mkdirp "0.5.4"
-    ms "2.1.1"
-    node-environment-flags "1.0.5"
-    object.assign "4.1.0"
-    strip-json-comments "2.0.1"
-    supports-color "6.0.0"
-    which "1.3.1"
-    wide-align "1.1.3"
-    yargs "13.3.2"
-    yargs-parser "13.1.2"
-    yargs-unparser "1.6.0"
-
-moo@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.1.tgz#7aae7f384b9b09f620b6abf6f74ebbcd1b65dbc4"
-  integrity sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
+  integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
 
-ms@2.0.0:
+mrmime@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-ms@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+  resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-2.0.0.tgz#151082a6e06e59a9a39b46b3e14d5cfe92b3abb4"
+  integrity sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==
 
 ms@2.1.2, ms@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@2.1.3, ms@^2.0.0:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
-multicast-dns@^7.2.5:
-  version "7.2.5"
-  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.5.tgz#77eb46057f4d7adbd16d9290fa7299f6fa64cced"
-  integrity sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==
-  dependencies:
-    dns-packet "^5.2.2"
-    thunky "^1.0.2"
-
-nan@^2.17.0:
-  version "2.18.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554"
-  integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==
-
 nanoid@^2.0.0:
   version "2.1.11"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280"
@@ -7363,69 +4912,11 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-nearley@^2.7.10:
-  version "2.19.3"
-  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.19.3.tgz#ae3b040e27616b5348102c436d1719209476a5a1"
-  integrity sha512-FpAy1PmTsUpOtgxr23g4jRNvJHYzZEW2PixXeSzksLR/ykPfwKhAodc2+9wQhY+JneWLcvkDw6q7FJIsIdF/aQ==
-  dependencies:
-    commander "^2.19.0"
-    moo "^0.5.0"
-    railroad-diagrams "^1.0.0"
-    randexp "0.4.6"
-    semver "^5.4.1"
-
-negotiator@0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
-  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
-
-negotiator@0.6.3, negotiator@^0.6.2, negotiator@^0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
-  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
-
-neo-async@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
-  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
-
-nested-error-stacks@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz#0fbdcf3e13fe4994781280524f8b96b0cdff9c61"
-  integrity sha512-AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug==
-
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
-nise@^1.5.2:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/nise/-/nise-1.5.3.tgz#9d2cfe37d44f57317766c6e9408a359c5d3ac1f7"
-  integrity sha512-Ymbac/94xeIrMf59REBPOv0thr+CJVFMhrlAkW/gjCIE58BGQdCj0x7KRCb3yz+Ga2Rz3E9XXSvUyyxqqhjQAQ==
-  dependencies:
-    "@sinonjs/formatio" "^3.2.1"
-    "@sinonjs/text-encoding" "^0.7.1"
-    just-extend "^4.0.2"
-    lolex "^5.0.1"
-    path-to-regexp "^1.7.0"
-
-no-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
-  integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==
-  dependencies:
-    lower-case "^2.0.2"
-    tslib "^2.0.3"
-
-node-environment-flags@1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.5.tgz#fa930275f5bf5dae188d6192b24b4c8bbac3d76a"
-  integrity sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==
-  dependencies:
-    object.getownpropertydescriptors "^2.0.3"
-    semver "^5.7.0"
-
 node-fetch@^1.0.1:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
@@ -7434,98 +4925,17 @@ node-fetch@^1.0.1:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
-node-fetch@^2.2.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
-  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
-
-node-forge@^1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
-  integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
-
-node-gyp@^8.4.1:
-  version "8.4.1"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937"
-  integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==
-  dependencies:
-    env-paths "^2.2.0"
-    glob "^7.1.4"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^9.1.0"
-    nopt "^5.0.0"
-    npmlog "^6.0.0"
-    rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
-    which "^2.0.2"
-
-node-releases@^1.1.53:
-  version "1.1.58"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.58.tgz#8ee20eef30fa60e52755fcc0942def5a734fe935"
-  integrity sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==
-
-node-releases@^2.0.14:
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
-  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
-
-node-sass@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-8.0.0.tgz#c80d52148db0ce88610bcf1e1d112027393c13e1"
-  integrity sha512-jPzqCF2/e6JXw6r3VxfIqYc8tKQdkj5Z/BDATYyG6FL6b/LuYBNFGFVhus0mthcWifHm/JzBpKAd+3eXsWeK/A==
-  dependencies:
-    async-foreach "^0.1.3"
-    chalk "^4.1.2"
-    cross-spawn "^7.0.3"
-    gaze "^1.0.0"
-    get-stdin "^4.0.1"
-    glob "^7.0.3"
-    lodash "^4.17.15"
-    make-fetch-happen "^10.0.4"
-    meow "^9.0.0"
-    nan "^2.17.0"
-    node-gyp "^8.4.1"
-    sass-graph "^4.0.1"
-    stdout-stream "^1.4.0"
-    "true-case-path" "^2.2.1"
-
-nodemon@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-3.0.3.tgz#244a62d1c690eece3f6165c6cdb0db03ebd80b76"
-  integrity sha512-7jH/NXbFPxVaMwmBCC2B9F/V6X1VkEdNgx3iu9jji8WxWcvhMWkmhNWhI5077zknOnZnBzba9hZP6bCPJLSReQ==
-  dependencies:
-    chokidar "^3.5.2"
-    debug "^4"
-    ignore-by-default "^1.0.1"
-    minimatch "^3.1.2"
-    pstree.remy "^1.1.8"
-    semver "^7.5.3"
-    simple-update-notifier "^2.0.0"
-    supports-color "^5.5.0"
-    touch "^3.1.0"
-    undefsafe "^2.0.5"
+node-releases@^2.0.18:
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
+  integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
 
 nodent-runtime@^3.0.4:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/nodent-runtime/-/nodent-runtime-3.2.1.tgz#9e2755d85e39f764288f0d4752ebcfe3e541e00e"
   integrity sha512-7Ws63oC+215smeKJQCxzrK21VFVlCFBkwl0MOObt0HOpVQXs3u483sAmtkF33nNqZ5rSOQjB76fgyPBmAUrtCA==
 
-nopt@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
-  integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
-  dependencies:
-    abbrev "1"
-
-nopt@~1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
-  integrity sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=
-  dependencies:
-    abbrev "1"
-
-normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
+normalize-package-data@^2.3.2:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -7535,16 +4945,6 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-package-data@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
-  integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
-  dependencies:
-    hosted-git-info "^4.0.1"
-    is-core-module "^2.5.0"
-    semver "^7.3.4"
-    validate-npm-package-license "^3.0.1"
-
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
@@ -7570,69 +4970,19 @@ npm-run-all@^4.1.5:
     shell-quote "^1.6.1"
     string.prototype.padend "^3.0.0"
 
-npm-run-path@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
-  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
-  dependencies:
-    path-key "^3.0.0"
-
-npmlog@^6.0.0:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
-  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
-  dependencies:
-    are-we-there-yet "^3.0.0"
-    console-control-strings "^1.1.0"
-    gauge "^4.0.3"
-    set-blocking "^2.0.0"
-
-nth-check@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
-  integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==
-  dependencies:
-    boolbase "^1.0.0"
-
-nth-check@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
-  integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
+npm-run-path@^5.1.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.3.0.tgz#e23353d0ebb9317f174e93417e4a4d82d0249e9f"
+  integrity sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==
   dependencies:
-    boolbase "~1.0.0"
+    path-key "^4.0.0"
 
-nyc@^14.1.1:
-  version "14.1.1"
-  resolved "https://registry.yarnpkg.com/nyc/-/nyc-14.1.1.tgz#151d64a6a9f9f5908a1b73233931e4a0a3075eeb"
-  integrity sha512-OI0vm6ZGUnoGZv/tLdZ2esSVzDwUC88SNs+6JoSOMVxA+gKMB8Tk7jBwgemLx4O40lhhvZCVw1C+OYLOBOPXWw==
-  dependencies:
-    archy "^1.0.0"
-    caching-transform "^3.0.2"
-    convert-source-map "^1.6.0"
-    cp-file "^6.2.0"
-    find-cache-dir "^2.1.0"
-    find-up "^3.0.0"
-    foreground-child "^1.5.6"
-    glob "^7.1.3"
-    istanbul-lib-coverage "^2.0.5"
-    istanbul-lib-hook "^2.0.7"
-    istanbul-lib-instrument "^3.3.0"
-    istanbul-lib-report "^2.0.8"
-    istanbul-lib-source-maps "^3.0.6"
-    istanbul-reports "^2.2.4"
-    js-yaml "^3.13.1"
-    make-dir "^2.1.0"
-    merge-source-map "^1.1.0"
-    resolve-from "^4.0.0"
-    rimraf "^2.6.3"
-    signal-exit "^3.0.2"
-    spawn-wrap "^1.4.2"
-    test-exclude "^5.2.3"
-    uuid "^3.3.2"
-    yargs "^13.2.2"
-    yargs-parser "^13.0.0"
+nwsapi@^2.2.12:
+  version "2.2.12"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.12.tgz#fb6af5c0ec35b27b4581eb3bbad34ec9e5c696f8"
+  integrity sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==
 
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -7647,7 +4997,7 @@ object-inspect@^1.7.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
   integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
 
-object-is@^1.0.1, object-is@^1.0.2:
+object-is@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz#c5d2e87ff9e119f78b7a088441519e2eec1573b6"
   integrity sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==
@@ -7660,7 +5010,7 @@ object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object.assign@4.1.0, object.assign@^4.1.0:
+object.assign@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
   integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
@@ -7670,7 +5020,7 @@ object.assign@4.1.0, object.assign@^4.1.0:
     has-symbols "^1.0.0"
     object-keys "^1.0.11"
 
-object.assign@^4.1.4:
+object.assign@^4.1.4, object.assign@^4.1.5:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0"
   integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==
@@ -7680,58 +5030,33 @@ object.assign@^4.1.4:
     has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
-object.entries@^1.1.0, object.entries@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz#bc73f00acb6b6bb16c203434b10f9a7e797d3add"
-  integrity sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-    has "^1.0.3"
-
-object.fromentries@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"
-  integrity sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-
-object.getownpropertydescriptors@^2.0.3:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
-  integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
+object.entries@^1.1.8:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.8.tgz#bffe6f282e01f4d17807204a24f8edd823599c41"
+  integrity sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
 
-object.values@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
-  integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==
+object.fromentries@^2.0.8:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65"
+  integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-
-obuf@^1.0.0, obuf@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
-  integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
+    es-object-atoms "^1.0.0"
 
-offline-plugin@^5.0.7:
-  version "5.0.7"
-  resolved "https://registry.yarnpkg.com/offline-plugin/-/offline-plugin-5.0.7.tgz#26936ad1a7699f4d67e0a095a258972a4ccf1788"
-  integrity sha512-ArMFt4QFjK0wg8B5+R/6tt65u6Dk+Pkx4PAcW5O7mgIF3ywMepaQqFOQgfZD4ybanuGwuJihxUwMRgkzd+YGYw==
+object.values@^1.1.6, object.values@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b"
+  integrity sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==
   dependencies:
-    deep-extend "^0.5.1"
-    ejs "^2.3.4"
-    loader-utils "0.2.x"
-    minimatch "^3.0.3"
-    slash "^1.0.0"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
 
 oidc-client-ts@^2.2.2:
   version "2.4.0"
@@ -7751,18 +5076,6 @@ oidc-client@^1.8.2:
     crypto-js "^3.1.9-1"
     uuid "^3.3.2"
 
-on-finished@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
-  integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
-  dependencies:
-    ee-first "1.1.1"
-
-on-headers@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
-  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
-
 once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -7770,21 +5083,12 @@ once@^1.3.0:
   dependencies:
     wrappy "1"
 
-onetime@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
-  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
-  dependencies:
-    mimic-fn "^2.1.0"
-
-open@^8.0.9, open@^8.4.0:
-  version "8.4.2"
-  resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
-  integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==
+onetime@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4"
+  integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==
   dependencies:
-    define-lazy-prop "^2.0.0"
-    is-docker "^2.1.1"
-    is-wsl "^2.2.0"
+    mimic-fn "^4.0.0"
 
 optionator@^0.9.3:
   version "0.9.3"
@@ -7794,23 +5098,11 @@ optionator@^0.9.3:
     "@aashutoshrathi/word-wrap" "^1.2.3"
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
-    levn "^0.4.1"
-    prelude-ls "^1.2.1"
-    type-check "^0.4.0"
-
-os-homedir@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-
-p-limit@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
-  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
-  dependencies:
-    p-try "^1.0.0"
+    levn "^0.4.1"
+    prelude-ls "^1.2.1"
+    type-check "^0.4.0"
 
-p-limit@^2.0.0, p-limit@^2.2.0:
+p-limit@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
@@ -7824,20 +5116,6 @@ p-limit@^3.0.2:
   dependencies:
     yocto-queue "^0.1.0"
 
-p-limit@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-4.0.0.tgz#914af6544ed32bfa54670b061cafcbd04984b644"
-  integrity sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==
-  dependencies:
-    yocto-queue "^1.0.0"
-
-p-locate@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
-  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
-  dependencies:
-    p-limit "^1.1.0"
-
 p-locate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
@@ -7845,13 +5123,6 @@ p-locate@^3.0.0:
   dependencies:
     p-limit "^2.0.0"
 
-p-locate@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
-  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
-  dependencies:
-    p-limit "^2.2.0"
-
 p-locate@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
@@ -7859,60 +5130,15 @@ p-locate@^5.0.0:
   dependencies:
     p-limit "^3.0.2"
 
-p-locate@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-6.0.0.tgz#3da9a49d4934b901089dca3302fa65dc5a05c04f"
-  integrity sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==
-  dependencies:
-    p-limit "^4.0.0"
-
-p-map@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
-  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
-
-p-map@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
-  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
-p-retry@^4.5.0:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16"
-  integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==
-  dependencies:
-    "@types/retry" "0.12.0"
-    retry "^0.13.1"
-
-p-try@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
-
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-package-hash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/package-hash/-/package-hash-3.0.0.tgz#50183f2d36c9e3e528ea0a8605dff57ce976f88e"
-  integrity sha512-lOtmukMDVvtkL84rJHI7dpTYq+0rli8N2wlnqUcBuDWCfVhRUfOmnR9SsoHFMLpACvEV60dX7rd0rFaYDZI+FA==
-  dependencies:
-    graceful-fs "^4.1.15"
-    hasha "^3.0.0"
-    lodash.flattendeep "^4.4.0"
-    release-zalgo "^1.0.0"
-
-param-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5"
-  integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==
-  dependencies:
-    dot-case "^3.0.4"
-    tslib "^2.0.3"
+package-json-from-dist@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz#e501cd3094b278495eb4258d4c9f6d5ac3019f00"
+  integrity sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==
 
 parent-module@^1.0.0:
   version "1.0.1"
@@ -7921,13 +5147,6 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-author@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/parse-author/-/parse-author-2.0.0.tgz#d3460bf1ddd0dfaeed42da754242e65fb684a81f"
-  integrity sha512-yx5DfvkN8JsHL2xk2Os9oTia467qnvRgey4ahSm2X8epehBLx/gWLcy5KI+Y36ful5DzGbCS6RazqZGgy1gHNw==
-  dependencies:
-    author-regex "^1.0.0"
-
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -7946,33 +5165,13 @@ parse-json@^5.0.0:
     json-parse-better-errors "^1.0.1"
     lines-and-columns "^1.1.6"
 
-parse5@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
-  integrity sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==
-  dependencies:
-    "@types/node" "*"
-
-parse5@^7.1.1:
+parse5@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32"
   integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==
   dependencies:
     entities "^4.4.0"
 
-parseurl@~1.3.2, parseurl@~1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
-  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
-
-pascal-case@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb"
-  integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==
-  dependencies:
-    no-case "^3.0.4"
-    tslib "^2.0.3"
-
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -7983,31 +5182,26 @@ path-exists@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
-path-exists@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-5.0.0.tgz#a6aad9489200b21fab31e49cf09277e5116fb9e7"
-  integrity sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==
-
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
-
 path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
-path-key@^3.0.0, path-key@^3.1.0:
+path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
+path-key@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18"
+  integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==
+
 path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
@@ -8018,10 +5212,13 @@ path-parse@^1.0.7:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
-path-to-regexp@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
+path-scurry@^1.11.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
+  integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
+  dependencies:
+    lru-cache "^10.2.0"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
 
 path-to-regexp@^1.7.0:
   version "1.8.0"
@@ -8042,22 +5239,27 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-pathval@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
-  integrity sha1-uULm1L3mUwBe9rcTYd74cn0GReA=
+pathe@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.2.tgz#6c4cb47a945692e48a1ddd6e4094d170516437ec"
+  integrity sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==
 
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+pathval@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pathval/-/pathval-2.0.0.tgz#7e2550b422601d4f6b8e26f1301bc8f15a741a25"
+  integrity sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==
 
 picocolors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.3.1:
+picocolors@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1"
+  integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==
+
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -8067,59 +5269,11 @@ pidtree@^0.3.0:
   resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.1.tgz#ef09ac2cc0533df1f3250ccf2c4d366b0d12114a"
   integrity sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==
 
-pify@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
-
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
   integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
-pify@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
-  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
-
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-
-pirates@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9"
-  integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==
-
-pkg-dir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
-  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
-  dependencies:
-    find-up "^3.0.0"
-
-pkg-dir@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-7.0.0.tgz#8f0c08d6df4476756c5ff29b3282d0bab7517d11"
-  integrity sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==
-  dependencies:
-    find-up "^6.3.0"
-
-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
-  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
-  dependencies:
-    find-up "^2.1.0"
-
 pkg-up@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
@@ -8132,55 +5286,20 @@ popper.js@^1.14.4:
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
   integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==
 
-postcss-modules-extract-imports@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
-  integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
-
-postcss-modules-local-by-default@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.4.tgz#7cbed92abd312b94aaea85b68226d3dec39a14e6"
-  integrity sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==
-  dependencies:
-    icss-utils "^5.0.0"
-    postcss-selector-parser "^6.0.2"
-    postcss-value-parser "^4.1.0"
-
-postcss-modules-scope@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.1.1.tgz#32cfab55e84887c079a19bbb215e721d683ef134"
-  integrity sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==
-  dependencies:
-    postcss-selector-parser "^6.0.4"
-
-postcss-modules-values@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"
-  integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==
-  dependencies:
-    icss-utils "^5.0.0"
-
-postcss-selector-parser@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"
-  integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==
-  dependencies:
-    cssesc "^3.0.0"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
+possible-typed-array-names@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f"
+  integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==
 
-postcss-selector-parser@^6.0.4:
-  version "6.0.15"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz#11cc2b21eebc0b99ea374ffb9887174855a01535"
-  integrity sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw==
+postcss-url@^10.1.3:
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-10.1.3.tgz#54120cc910309e2475ec05c2cfa8f8a2deafdf1e"
+  integrity sha512-FUzyxfI5l2tKmXdYc6VTu3TWZsInayEKPbiyW+P6vmmIrrb4I6CGX0BFoewgYHLK+oIL5FECEK02REYRpBvUCw==
   dependencies:
-    cssesc "^3.0.0"
-    util-deprecate "^1.0.2"
-
-postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
-  integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
+    make-dir "~3.1.0"
+    mime "~2.5.2"
+    minimatch "~3.0.4"
+    xxhashjs "~0.2.2"
 
 postcss@^8.4.21:
   version "8.4.38"
@@ -8191,53 +5310,34 @@ postcss@^8.4.21:
     picocolors "^1.0.0"
     source-map-js "^1.2.0"
 
-postcss@^8.4.33:
-  version "8.4.33"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.33.tgz#1378e859c9f69bf6f638b990a0212f43e2aaa742"
-  integrity sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==
+postcss@^8.4.39:
+  version "8.4.40"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.40.tgz#eb81f2a4dd7668ed869a6db25999e02e9ad909d8"
+  integrity sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==
   dependencies:
     nanoid "^3.3.7"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
+    picocolors "^1.0.1"
+    source-map-js "^1.2.0"
+
+postcss@^8.4.40, postcss@^8.4.41:
+  version "8.4.41"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.41.tgz#d6104d3ba272d882fe18fc07d15dc2da62fa2681"
+  integrity sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==
+  dependencies:
+    nanoid "^3.3.7"
+    picocolors "^1.0.1"
+    source-map-js "^1.2.0"
 
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-pretty-bytes@^5.3.0, pretty-bytes@^5.4.1:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
-  integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
-
-pretty-error@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6"
-  integrity sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==
-  dependencies:
-    lodash "^4.17.20"
-    renderkid "^3.0.0"
-
 printj@~1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222"
   integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==
 
-private@^0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
-  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
-
-process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
-process@^0.11.10:
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
-
 proj4@^2.3.14, proj4@^2.5.0:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/proj4/-/proj4-2.6.2.tgz#4665d7cbc30fd356375007c2fed53b07dbda1d67"
@@ -8253,19 +5353,6 @@ proj4leaflet@^1.0.2:
   dependencies:
     proj4 "^2.3.14"
 
-promise-inflight@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
-
-promise-retry@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
-  integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==
-  dependencies:
-    err-code "^2.0.2"
-    retry "^0.12.0"
-
 promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
@@ -8273,24 +5360,7 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-prompts@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
-  integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
-  dependencies:
-    kleur "^3.0.3"
-    sisteransi "^1.0.5"
-
-prop-types-exact@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/prop-types-exact/-/prop-types-exact-1.2.0.tgz#825d6be46094663848237e3925a98c6e944e9869"
-  integrity sha512-K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA==
-  dependencies:
-    has "^1.0.3"
-    object.assign "^4.1.0"
-    reflect.ownkeys "^0.2.0"
-
-prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.6.x, prop-types@^15.7.2:
+prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.6.x, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -8299,110 +5369,50 @@ prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1,
     object-assign "^4.1.1"
     react-is "^16.8.1"
 
+prop-types@^15.8.1:
+  version "15.8.1"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
+  integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
+  dependencies:
+    loose-envify "^1.4.0"
+    object-assign "^4.1.1"
+    react-is "^16.13.1"
+
 property-expr@^2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.6.tgz#f77bc00d5928a6c748414ad12882e83f24aec1e8"
   integrity sha512-SVtmxhRE/CGkn3eZY1T6pC8Nln6Fr/lu1mKSgRud0eC73whjGfoAogbn78LkD8aFL0zz3bAFerKSnOl7NlErBA==
 
-proxy-addr@~2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
-  integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
-  dependencies:
-    forwarded "0.2.0"
-    ipaddr.js "1.9.1"
-
-pseudomap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
-
-pstree.remy@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a"
-  integrity sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==
-
-punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
+psl@^1.1.33:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
+  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
 
 punycode@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-qs@6.11.0:
-  version "6.11.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
-  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
-  dependencies:
-    side-channel "^1.0.4"
+punycode@^2.1.1, punycode@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
+  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
-qs@^6.11.2:
-  version "6.12.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.1.tgz#39422111ca7cbdb70425541cba20c7d7b216599a"
-  integrity sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==
-  dependencies:
-    side-channel "^1.0.6"
+querystringify@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
 
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
-quick-lru@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
-  integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
-
 raf-schd@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/raf-schd/-/raf-schd-4.0.2.tgz#bd44c708188f2e84c810bf55fcea9231bcaed8a0"
   integrity sha512-VhlMZmGy6A6hrkJWHLNTGl5gtgMUm+xfGza6wbwnE914yeQ5Ybm18vgM734RZhMgfw4tacUrWseGZlpUrrakEQ==
 
-raf@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
-  integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==
-  dependencies:
-    performance-now "^2.1.0"
-
-railroad-diagrams@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e"
-  integrity sha1-635iZ1SN3t+4mcG5Dlc3RVnN234=
-
-randexp@0.4.6:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3"
-  integrity sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==
-  dependencies:
-    discontinuous-range "1.0.0"
-    ret "~0.1.10"
-
-randombytes@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
-  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
-  dependencies:
-    safe-buffer "^5.1.0"
-
-range-parser@^1.2.1, range-parser@~1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
-  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
-
-raw-body@2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
-  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
-  dependencies:
-    bytes "3.1.2"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    unpipe "1.0.0"
-
 react-datepicker@2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/react-datepicker/-/react-datepicker-2.8.0.tgz#d93423a2abe9eeef8d3eaa7ff437f31be8a3a2f5"
@@ -8414,45 +5424,15 @@ react-datepicker@2.8.0:
     react-onclickoutside "^6.7.1"
     react-popper "^1.0.2"
 
-react-dev-utils@^12.0.1:
-  version "12.0.1"
-  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-12.0.1.tgz#ba92edb4a1f379bd46ccd6bcd4e7bc398df33e73"
-  integrity sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==
-  dependencies:
-    "@babel/code-frame" "^7.16.0"
-    address "^1.1.2"
-    browserslist "^4.18.1"
-    chalk "^4.1.2"
-    cross-spawn "^7.0.3"
-    detect-port-alt "^1.1.6"
-    escape-string-regexp "^4.0.0"
-    filesize "^8.0.6"
-    find-up "^5.0.0"
-    fork-ts-checker-webpack-plugin "^6.5.0"
-    global-modules "^2.0.0"
-    globby "^11.0.4"
-    gzip-size "^6.0.0"
-    immer "^9.0.7"
-    is-root "^2.1.0"
-    loader-utils "^3.2.0"
-    open "^8.4.0"
-    pkg-up "^3.1.0"
-    prompts "^2.4.2"
-    react-error-overlay "^6.0.11"
-    recursive-readdir "^2.2.2"
-    shell-quote "^1.7.3"
-    strip-ansi "^6.0.1"
-    text-table "^0.2.0"
-
-react-dom@16.8.6:
-  version "16.8.6"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f"
-  integrity sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA==
+react-dom@^16.9:
+  version "16.14.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89"
+  integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.13.6"
+    scheduler "^0.19.1"
 
 react-dual-listbox@^2.0.0:
   version "2.0.0"
@@ -8464,44 +5444,25 @@ react-dual-listbox@^2.0.0:
     nanoid "^2.0.0"
     prop-types "^15.5.8"
 
-react-error-overlay@^6.0.11:
-  version "6.0.11"
-  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz#92835de5841c5cf08ba00ddd2d677b6d17ff9adb"
-  integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==
-
 react-fast-compare@^3.0.1:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.2.tgz#929a97a532304ce9fee4bcae44234f1ce2c21d49"
   integrity sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==
 
-react-foundation@^0.9.6:
-  version "0.9.6"
-  resolved "https://registry.yarnpkg.com/react-foundation/-/react-foundation-0.9.6.tgz#1bd641d310173dd966e2eb33d7bb63168aef7aff"
-  integrity sha512-mM2BdaQkc4eFWAWBse3KvxcRS9rUv/YVFrbQ3GiO3WkouWrYt/Gaph+QShZywn4JwCZ/mLXGvOx/sHUxqThALQ==
+react-foundation@^0.9.7:
+  version "0.9.7"
+  resolved "https://registry.yarnpkg.com/react-foundation/-/react-foundation-0.9.7.tgz#57aefdf3e31b1681c6849849050d1ff7a58b22d3"
+  integrity sha512-mqBMii1XyIQ4Tyq8Nd1jymd5QQcscyRk8vnwSaDXYf4oFC+2fYa2nhbdT69dtTsOpbXeCufYlWLRPk8Ocz4C8Q==
   dependencies:
-    classnames "^2.2.3"
+    classnames "^2.2.6"
     fbjs "^0.8.16"
-    prop-types "^15.5.10"
+    prop-types "^15.7.2"
 
 react-hook-form@^7.43.3:
   version "7.51.5"
   resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.51.5.tgz#4afbfb819312db9fea23e8237a3a0d097e128b43"
   integrity sha512-J2ILT5gWx1XUIJRETiA7M19iXHlG74+6O3KApzvqB/w8S5NQR7AbU8HVZrMALdmDgWpRPYiZJl0zx8Z4L2mP6Q==
 
-react-hot-loader@^4.13.1:
-  version "4.13.1"
-  resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.13.1.tgz#979fd7598e27338b3faffae6ed01c65374dace5e"
-  integrity sha512-ZlqCfVRqDJmMXTulUGic4lN7Ic1SXgHAFw7y/Jb7t25GBgTR0fYAJ8uY4mrpxjRyWGWmqw77qJQGnYbzCvBU7g==
-  dependencies:
-    fast-levenshtein "^2.0.6"
-    global "^4.3.0"
-    hoist-non-react-statics "^3.3.0"
-    loader-utils "^2.0.3"
-    prop-types "^15.6.1"
-    react-lifecycles-compat "^3.0.4"
-    shallowequal "^1.1.0"
-    source-map "^0.7.3"
-
 react-input-autosize@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.2.2.tgz#fcaa7020568ec206bc04be36f4eb68e647c4d8c2"
@@ -8509,11 +5470,16 @@ react-input-autosize@^2.2.2:
   dependencies:
     prop-types "^15.5.8"
 
-react-is@^16.12.0, react-is@^16.13.1, react-is@^16.4.2, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6, react-is@^16.9.0:
+react-is@^16.13.1, react-is@^16.4.2, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
+react-is@^17.0.2:
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
+  integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
+
 react-leaflet-draw@^0.19.0:
   version "0.19.0"
   resolved "https://registry.yarnpkg.com/react-leaflet-draw/-/react-leaflet-draw-0.19.0.tgz#95de33054016db27e171f8f8f646f6bad17106f3"
@@ -8521,12 +5487,12 @@ react-leaflet-draw@^0.19.0:
   dependencies:
     lodash-es "^4.17.10"
 
-react-leaflet-fullscreen@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/react-leaflet-fullscreen/-/react-leaflet-fullscreen-1.0.1.tgz#59496664cb45ecb431d50506e61e0a14a1fa9f98"
-  integrity sha512-o6zZlytomWQiWyUh6hbdlJVSgbuCHF1M7JUgS8Z6IOBUo3aFPiHKju7Osb9eKu3nTUoN1jWsm5ZNhRteY+NChQ==
+react-leaflet-fullscreen@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/react-leaflet-fullscreen/-/react-leaflet-fullscreen-1.0.2.tgz#9dba4dc651f613299411b754df78a2b7f77b132a"
+  integrity sha512-SU7Bs5pokR3UEj8K6MEKcHCbCNEKqN39Z3ad78i1nUqLb0MRymf+8Oy69l8AkKnRN4KOcOcatDsAA1L3ifev9Q==
   dependencies:
-    leaflet.fullscreen "1.4.5"
+    leaflet.fullscreen "1.6.0"
     prop-types "^15.6.x"
 
 react-leaflet@^2.8.0:
@@ -8539,11 +5505,6 @@ react-leaflet@^2.8.0:
     hoist-non-react-statics "^3.3.2"
     warning "^4.0.3"
 
-react-lifecycles-compat@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
-  integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
-
 react-merge-refs@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/react-merge-refs/-/react-merge-refs-1.1.0.tgz#73d88b892c6c68cbb7a66e0800faa374f4c38b06"
@@ -8575,24 +5536,30 @@ react-popper@^1.0.2:
     typed-styles "^0.0.7"
     warning "^4.0.2"
 
-react-redux-toastr@^7.5.1:
-  version "7.6.5"
-  resolved "https://registry.yarnpkg.com/react-redux-toastr/-/react-redux-toastr-7.6.5.tgz#f2343b3d5f7c49193a9bc30cf76b6e39b3e06a9b"
-  integrity sha512-tbf8z18O85BGKXhDfYsgNmurbKlP9p7UXjtdBNS1wWqCAY0QNAyW1W5ulChPEFWoBWVzQywgMGIZ5j3an//srg==
+react-redux-toastr@^7.6.12:
+  version "7.6.13"
+  resolved "https://registry.yarnpkg.com/react-redux-toastr/-/react-redux-toastr-7.6.13.tgz#9d1df102d6d9565f1fbce98a45c14166239b7669"
+  integrity sha512-dK0Qh5+xkvIYuh8EME8mFQVZMzeRc+DxV3U4SMWjEVpYt2D19+bH/u2hobmQclsebRVszNi0X/vlPIBihsy/GA==
   dependencies:
-    classnames "^2.2.3"
-    eventemitter3 "^3.1.0"
+    classnames "^2.3.2"
+    eventemitter3 "^3.1.2"
 
 react-redux@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.0.tgz#f970f62192b3981642fec46fd0db18a074fe879d"
-  integrity sha512-EvCAZYGfOLqwV7gh849xy9/pt55rJXPwmYvI4lilPM5rUT/1NxuuN59ipdBksRVSvz0KInbPnp4IfoXJXCqiDA==
+  version "7.2.9"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.9.tgz#09488fbb9416a4efe3735b7235055442b042481d"
+  integrity sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==
   dependencies:
-    "@babel/runtime" "^7.5.5"
-    hoist-non-react-statics "^3.3.0"
+    "@babel/runtime" "^7.15.4"
+    "@types/react-redux" "^7.1.20"
+    hoist-non-react-statics "^3.3.2"
     loose-envify "^1.4.0"
     prop-types "^15.7.2"
-    react-is "^16.9.0"
+    react-is "^17.0.2"
+
+react-refresh@^0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.2.tgz#3833da01ce32da470f1f936b9d477da5c7028bf9"
+  integrity sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==
 
 react-resize-detector@^4.2.0:
   version "4.2.3"
@@ -8660,16 +5627,6 @@ react-select@^3.0.4:
     react-input-autosize "^2.2.2"
     react-transition-group "^4.3.0"
 
-react-test-renderer@^16.0.0-0:
-  version "16.13.1"
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.13.1.tgz#de25ea358d9012606de51e012d9742e7f0deabc1"
-  integrity sha512-Sn2VRyOK2YJJldOqoh8Tn/lWQ+ZiKhyZTPtaO0Q6yNj+QDbmRkVFap6pZPy3YQk8DScRDfyqm/KxKYP9gCMRiQ==
-  dependencies:
-    object-assign "^4.1.1"
-    prop-types "^15.6.2"
-    react-is "^16.8.6"
-    scheduler "^0.19.1"
-
 react-transition-group@^4.3.0:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz#63868f9325a38ea5ee9535d828327f85773345c9"
@@ -8694,32 +5651,14 @@ react-virtual@2.10.4:
   dependencies:
     "@reach/observe-rect" "^1.1.0"
 
-react@16.8.6:
-  version "16.8.6"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"
-  integrity sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==
+react@^16.9:
+  version "16.14.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
+  integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.13.6"
-
-read-pkg-up@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
-  integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==
-  dependencies:
-    find-up "^3.0.0"
-    read-pkg "^3.0.0"
-
-read-pkg-up@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
-  integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
-  dependencies:
-    find-up "^4.1.0"
-    read-pkg "^5.2.0"
-    type-fest "^0.8.1"
 
 read-pkg@^3.0.0:
   version "3.0.0"
@@ -8730,38 +5669,6 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-read-pkg@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
-  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
-  dependencies:
-    "@types/normalize-package-data" "^2.4.0"
-    normalize-package-data "^2.5.0"
-    parse-json "^5.0.0"
-    type-fest "^0.6.0"
-
-readable-stream@^2.0.1, readable-stream@^2.2.2:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
@@ -8769,21 +5676,6 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
-recursive-readdir@^2.2.2:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.3.tgz#e726f328c0d69153bcabd5c322d3195252379372"
-  integrity sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==
-  dependencies:
-    minimatch "^3.0.5"
-
-redent@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
-  integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==
-  dependencies:
-    indent-string "^4.0.0"
-    strip-indent "^3.0.0"
-
 reduce-reducers@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/reduce-reducers/-/reduce-reducers-0.4.3.tgz#8e052618801cd8fc2714b4915adaa8937eb6d66c"
@@ -8801,12 +5693,11 @@ redux-actions@^2.6.5:
     to-camel-case "^1.0.0"
 
 redux-form@^8.2.5:
-  version "8.3.6"
-  resolved "https://registry.yarnpkg.com/redux-form/-/redux-form-8.3.6.tgz#c098dcd0b9d8c38e2e443dab91033ea0e74d4609"
-  integrity sha512-PfDdi+9JtNdr29Pv+9123TiojJlFB6+qczCRfP++cVT4nO2tEv4tDJHSV1l/Ol3Qh9z2cRg1QeLMhShNtRZ3+g==
+  version "8.3.10"
+  resolved "https://registry.yarnpkg.com/redux-form/-/redux-form-8.3.10.tgz#335657fafd4b26b91b4ce65371cd9dabe3648158"
+  integrity sha512-Eeog8dJYUxCSZI/oBoy7VkprvMjj1lpUnHa3LwjVNZvYDNeiRZMoZoaAT+6nlK2YQ4aiBopKUMiLe4ihUOHCGg==
   dependencies:
     "@babel/runtime" "^7.9.2"
-    "@scarf/scarf" "^1.0.5"
     es6-error "^4.1.1"
     hoist-non-react-statics "^3.3.2"
     invariant "^2.2.4"
@@ -8829,6 +5720,13 @@ redux-saga@^1.0.5:
   dependencies:
     "@redux-saga/core" "^1.1.3"
 
+"redux@^3.6.0 || ^4.0.0", redux@^4.0.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197"
+  integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==
+  dependencies:
+    "@babel/runtime" "^7.9.2"
+
 redux@^4.0.4:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.5.tgz#4db5de5816e17891de8a80c424232d06f051d93f"
@@ -8837,10 +5735,18 @@ redux@^4.0.4:
     loose-envify "^1.4.0"
     symbol-observable "^1.2.0"
 
-reflect.ownkeys@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460"
-  integrity sha1-dJrO7H8/34tj+SegSAnpDFwLNGA=
+reflect.getprototypeof@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz#3ab04c32a8390b770712b7a8633972702d278859"
+  integrity sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.1"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.4"
+    globalthis "^1.0.3"
+    which-builtin-type "^1.1.3"
 
 regenerate-unicode-properties@^10.1.0:
   version "10.1.1"
@@ -8849,18 +5755,6 @@ regenerate-unicode-properties@^10.1.0:
   dependencies:
     regenerate "^1.4.2"
 
-regenerate-unicode-properties@^8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
-  integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
-  dependencies:
-    regenerate "^1.4.0"
-
-regenerate@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.1.tgz#cad92ad8e6b591773485fbe05a485caf4f457e6f"
-  integrity sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==
-
 regenerate@^1.4.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
@@ -8876,14 +5770,6 @@ regenerator-runtime@^0.14.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
   integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
 
-regenerator-transform@^0.14.2:
-  version "0.14.4"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7"
-  integrity sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==
-  dependencies:
-    "@babel/runtime" "^7.8.4"
-    private "^0.1.8"
-
 regenerator-transform@^0.15.2:
   version "0.15.2"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz#5bbae58b522098ebdf09bca2f83838929001c7a4"
@@ -8891,7 +5777,7 @@ regenerator-transform@^0.15.2:
   dependencies:
     "@babel/runtime" "^7.8.4"
 
-regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.0:
+regexp.prototype.flags@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"
   integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==
@@ -8899,7 +5785,7 @@ regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.0:
     define-properties "^1.1.3"
     es-abstract "^1.17.0-next.1"
 
-regexp.prototype.flags@^1.5.0, regexp.prototype.flags@^1.5.1:
+regexp.prototype.flags@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e"
   integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==
@@ -8908,17 +5794,15 @@ regexp.prototype.flags@^1.5.0, regexp.prototype.flags@^1.5.1:
     define-properties "^1.2.0"
     set-function-name "^2.0.0"
 
-regexpu-core@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938"
-  integrity sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==
+regexp.prototype.flags@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334"
+  integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==
   dependencies:
-    regenerate "^1.4.0"
-    regenerate-unicode-properties "^8.2.0"
-    regjsgen "^0.5.1"
-    regjsparser "^0.6.4"
-    unicode-match-property-ecmascript "^1.0.4"
-    unicode-match-property-value-ecmascript "^1.2.0"
+    call-bind "^1.0.6"
+    define-properties "^1.2.1"
+    es-errors "^1.3.0"
+    set-function-name "^2.0.1"
 
 regexpu-core@^5.3.1:
   version "5.3.2"
@@ -8932,18 +5816,6 @@ regexpu-core@^5.3.1:
     unicode-match-property-ecmascript "^2.0.0"
     unicode-match-property-value-ecmascript "^2.1.0"
 
-regjsgen@^0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
-  integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
-
-regjsparser@^0.6.4:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272"
-  integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==
-  dependencies:
-    jsesc "~0.5.0"
-
 regjsparser@^0.9.1:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
@@ -8951,48 +5823,10 @@ regjsparser@^0.9.1:
   dependencies:
     jsesc "~0.5.0"
 
-relateurl@^0.2.7:
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
-  integrity sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==
-
-release-zalgo@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/release-zalgo/-/release-zalgo-1.0.0.tgz#09700b7e5074329739330e535c5a90fb67851730"
-  integrity sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=
-  dependencies:
-    es6-error "^4.0.1"
-
-renderkid@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-3.0.0.tgz#5fd823e4d6951d37358ecc9a58b1f06836b6268a"
-  integrity sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==
-  dependencies:
-    css-select "^4.1.3"
-    dom-converter "^0.2.0"
-    htmlparser2 "^6.1.0"
-    lodash "^4.17.21"
-    strip-ansi "^6.0.1"
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
-
-require-from-string@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
-  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
-
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
-
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
+  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
 reselect@^4.0.0, reselect@^4.1.7:
   version "4.1.8"
@@ -9009,24 +5843,19 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
-resolve-from@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
-  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
-
 resolve-pathname@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd"
   integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==
 
-resolve@^1.10.0, resolve@^1.12.0, resolve@^1.15.1:
+resolve@^1.10.0, resolve@^1.12.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
   integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
   dependencies:
     path-parse "^1.0.6"
 
-resolve@^1.14.2, resolve@^1.19.0, resolve@^1.22.1:
+resolve@^1.14.2, resolve@^1.22.1:
   version "1.22.8"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
   integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
@@ -9035,33 +5864,20 @@ resolve@^1.14.2, resolve@^1.19.0, resolve@^1.22.1:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-ret@~0.1.10:
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
-
-retry@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
-  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
-
-retry@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
-  integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
-
+resolve@^2.0.0-next.5:
+  version "2.0.0-next.5"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.5.tgz#6b0ec3107e671e52b68cd068ef327173b90dc03c"
+  integrity sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==
+  dependencies:
+    is-core-module "^2.13.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@^2.6.2, rimraf@^2.6.3:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
@@ -9069,30 +5885,40 @@ rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
-rollup-plugin-terser@^7.0.0:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d"
-  integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==
-  dependencies:
-    "@babel/code-frame" "^7.10.4"
-    jest-worker "^26.2.1"
-    serialize-javascript "^4.0.0"
-    terser "^5.0.0"
-
-rollup@^2.43.1:
-  version "2.79.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
-  integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
+rollup@^4.13.0:
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.19.2.tgz#4985cd2028965157e8d674a70e49f33aca9038eb"
+  integrity sha512-6/jgnN1svF9PjNYJ4ya3l+cqutg49vOZ4rVgsDKxdl+5gpGPnByFXWGyfH9YGx9i3nfBwSu1Iyu6vGwFFA0BdQ==
+  dependencies:
+    "@types/estree" "1.0.5"
   optionalDependencies:
+    "@rollup/rollup-android-arm-eabi" "4.19.2"
+    "@rollup/rollup-android-arm64" "4.19.2"
+    "@rollup/rollup-darwin-arm64" "4.19.2"
+    "@rollup/rollup-darwin-x64" "4.19.2"
+    "@rollup/rollup-linux-arm-gnueabihf" "4.19.2"
+    "@rollup/rollup-linux-arm-musleabihf" "4.19.2"
+    "@rollup/rollup-linux-arm64-gnu" "4.19.2"
+    "@rollup/rollup-linux-arm64-musl" "4.19.2"
+    "@rollup/rollup-linux-powerpc64le-gnu" "4.19.2"
+    "@rollup/rollup-linux-riscv64-gnu" "4.19.2"
+    "@rollup/rollup-linux-s390x-gnu" "4.19.2"
+    "@rollup/rollup-linux-x64-gnu" "4.19.2"
+    "@rollup/rollup-linux-x64-musl" "4.19.2"
+    "@rollup/rollup-win32-arm64-msvc" "4.19.2"
+    "@rollup/rollup-win32-ia32-msvc" "4.19.2"
+    "@rollup/rollup-win32-x64-msvc" "4.19.2"
     fsevents "~2.3.2"
 
-rst-selector-parser@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91"
-  integrity sha1-gbIw6i/MYGbInjRy3nlChdmwPZE=
-  dependencies:
-    lodash.flattendeep "^4.4.0"
-    nearley "^2.7.10"
+rrweb-cssom@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz#ed298055b97cbddcdeb278f904857629dec5e0e1"
+  integrity sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==
+
+rrweb-cssom@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.7.1.tgz#c73451a484b86dd7cfb1e0b2898df4b703183e4b"
+  integrity sha512-TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg==
 
 run-parallel@^1.1.9:
   version "1.2.0"
@@ -9111,16 +5937,21 @@ safe-array-concat@^1.0.1:
     has-symbols "^1.0.3"
     isarray "^2.0.5"
 
-safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-array-concat@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb"
+  integrity sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==
+  dependencies:
+    call-bind "^1.0.7"
+    get-intrinsic "^1.2.4"
+    has-symbols "^1.0.3"
+    isarray "^2.0.5"
+
+safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
 safe-regex-test@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.2.tgz#3ba32bdb3ea35f940ee87e5087c60ee786c3f6c5"
@@ -9130,35 +5961,35 @@ safe-regex-test@^1.0.0:
     get-intrinsic "^1.2.2"
     is-regex "^1.1.4"
 
+safe-regex-test@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377"
+  integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==
+  dependencies:
+    call-bind "^1.0.6"
+    es-errors "^1.3.0"
+    is-regex "^1.1.4"
+
 "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass-graph@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-4.0.1.tgz#2ff8ca477224d694055bf4093f414cf6cfad1d2e"
-  integrity sha512-5YCfmGBmxoIRYHnKK2AKzrAkCoQ8ozO+iumT8K4tXJXRVCPf+7s1/9KxTSW3Rbvf+7Y7b4FR3mWyLnQr3PHocA==
-  dependencies:
-    glob "^7.0.0"
-    lodash "^4.17.11"
-    scss-tokenizer "^0.4.3"
-    yargs "^17.2.1"
-
-sass-loader@^14.1.0:
-  version "14.1.0"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-14.1.0.tgz#43ba90e0cd8a15a1e932e818c525b0115a0ce8a3"
-  integrity sha512-LS2mLeFWA+orYxHNu+O18Xe4jR0kyamNOOUsE3NyBP4DvIL+8stHpNX0arYTItdPe80kluIiJ7Wfe/9iHSRO0Q==
+sass@^1.77.8:
+  version "1.77.8"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.8.tgz#9f18b449ea401759ef7ec1752a16373e296b52bd"
+  integrity sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==
   dependencies:
-    neo-async "^2.6.2"
+    chokidar ">=3.0.0 <4.0.0"
+    immutable "^4.0.0"
+    source-map-js ">=0.6.2 <2.0.0"
 
-scheduler@^0.13.6:
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889"
-  integrity sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==
+saxes@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5"
+  integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==
   dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
+    xmlchars "^2.2.0"
 
 scheduler@^0.19.1:
   version "0.19.1"
@@ -9168,42 +5999,6 @@ scheduler@^0.19.1:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-scheduler@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
-  integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-
-schema-utils@2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
-  integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==
-  dependencies:
-    "@types/json-schema" "^7.0.4"
-    ajv "^6.12.2"
-    ajv-keywords "^3.4.1"
-
-schema-utils@^3.0.0, schema-utils@^3.1.1, schema-utils@^3.2.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe"
-  integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
-  dependencies:
-    "@types/json-schema" "^7.0.8"
-    ajv "^6.12.5"
-    ajv-keywords "^3.5.2"
-
-schema-utils@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b"
-  integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==
-  dependencies:
-    "@types/json-schema" "^7.0.9"
-    ajv "^8.9.0"
-    ajv-formats "^2.1.1"
-    ajv-keywords "^5.1.0"
-
 scroll-to@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/scroll-to/-/scroll-to-0.0.2.tgz#936d398a9133660a2492145c2c0081dfcb0728f3"
@@ -9212,38 +6007,17 @@ scroll-to@0.0.2:
     component-raf "1.2.0"
     component-tween "1.2.0"
 
-scss-tokenizer@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.4.3.tgz#1058400ee7d814d71049c29923d2b25e61dc026c"
-  integrity sha512-raKLgf1LI5QMQnG+RxHz6oK0sL3x3I4FN2UDLqgLOGO8hodECNnNh5BXn7fAyBxrA8zVzdQizQ6XjNJQ+uBwMw==
-  dependencies:
-    js-base64 "^2.4.9"
-    source-map "^0.7.3"
-
-select-hose@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
-  integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
+seamless-immutable@^7.1.3:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/seamless-immutable/-/seamless-immutable-7.1.4.tgz#6e9536def083ddc4dea0207d722e0e80d0f372f8"
+  integrity sha512-XiUO1QP4ki4E2PHegiGAlu6r82o5A+6tRh7IkGGTVg/h+UoeX4nFBeCGPOhb4CYjvkqsfm/TUtvOMYC1xmV30A==
 
-selfsigned@^2.1.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.4.1.tgz#560d90565442a3ed35b674034cec4e95dceb4ae0"
-  integrity sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==
-  dependencies:
-    "@types/node-forge" "^1.3.0"
-    node-forge "^1"
-
-"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
+"semver@2 || 3 || 4 || 5", semver@^5.5.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
-  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
-
-semver@^6.0.0, semver@^6.3.0:
+semver@^6.0.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -9253,74 +6027,18 @@ semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.5.3, semver@^7.5.4:
+semver@^7.5.3, semver@^7.6.0:
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
+  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
+
+semver@^7.5.4:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"
 
-send@0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
-  integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
-  dependencies:
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "2.0.0"
-    mime "1.6.0"
-    ms "2.1.3"
-    on-finished "2.4.1"
-    range-parser "~1.2.1"
-    statuses "2.0.1"
-
-serialize-javascript@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
-  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
-  dependencies:
-    randombytes "^2.1.0"
-
-serialize-javascript@^6.0.1:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2"
-  integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==
-  dependencies:
-    randombytes "^2.1.0"
-
-serve-index@^1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
-  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
-  dependencies:
-    accepts "~1.3.4"
-    batch "0.6.1"
-    debug "2.6.9"
-    escape-html "~1.0.3"
-    http-errors "~1.6.2"
-    mime-types "~2.1.17"
-    parseurl "~1.3.2"
-
-serve-static@1.15.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
-  integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
-  dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.3"
-    send "0.18.0"
-
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-
 set-function-length@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.0.tgz#2f81dc6c16c7059bda5ab7c82c11f03a515ed8e1"
@@ -9353,33 +6071,21 @@ set-function-name@^2.0.0:
     functions-have-names "^1.2.3"
     has-property-descriptors "^1.0.0"
 
+set-function-name@^2.0.1, set-function-name@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985"
+  integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==
+  dependencies:
+    define-data-property "^1.1.4"
+    es-errors "^1.3.0"
+    functions-have-names "^1.2.3"
+    has-property-descriptors "^1.0.2"
+
 setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
   integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
 
-setprototypeof@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
-  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
-
-setprototypeof@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
-  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
-
-shallow-clone@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
-  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
-  dependencies:
-    kind-of "^6.0.2"
-
-shallowequal@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
-  integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==
-
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -9409,19 +6115,6 @@ shell-quote@^1.6.1:
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
   integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
 
-shell-quote@^1.7.3, shell-quote@^1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
-  integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
-
-side-channel@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947"
-  integrity sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA==
-  dependencies:
-    es-abstract "^1.17.0-next.1"
-    object-inspect "^1.7.0"
-
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -9441,171 +6134,40 @@ side-channel@^1.0.6:
     get-intrinsic "^1.2.4"
     object-inspect "^1.13.1"
 
-signal-exit@^3.0.0, signal-exit@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
-  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
-
-signal-exit@^3.0.3, signal-exit@^3.0.7:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
-  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
-
-simple-update-notifier@^2.0.0:
+siginfo@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz#d70b92bdab7d6d90dfd73931195a30b6e3d7cebb"
-  integrity sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==
-  dependencies:
-    semver "^7.5.3"
+  resolved "https://registry.yarnpkg.com/siginfo/-/siginfo-2.0.0.tgz#32e76c70b79724e3bb567cb9d543eb858ccfaf30"
+  integrity sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==
 
-sinon-chai@^3.3.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/sinon-chai/-/sinon-chai-3.5.0.tgz#c9a78304b0e15befe57ef68e8a85a00553f5c60e"
-  integrity sha512-IifbusYiQBpUxxFJkR3wTU68xzBN0+bxCScEaKMjBvAQERg6FnTTc1F17rseLb1tjmkJ23730AXpFI0c47FgAg==
-
-sinon@^7.3.2:
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/sinon/-/sinon-7.5.0.tgz#e9488ea466070ea908fd44a3d6478fd4923c67ec"
-  integrity sha512-AoD0oJWerp0/rY9czP/D6hDTTUYGpObhZjMpd7Cl/A6+j0xBE+ayL/ldfggkBXUs0IkvIiM1ljM8+WkOc5k78Q==
-  dependencies:
-    "@sinonjs/commons" "^1.4.0"
-    "@sinonjs/formatio" "^3.2.1"
-    "@sinonjs/samsam" "^3.3.3"
-    diff "^3.5.0"
-    lolex "^4.2.0"
-    nise "^1.5.2"
-    supports-color "^5.5.0"
-
-sisteransi@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
-  integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
+signal-exit@^4.0.1, signal-exit@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
 
-slash@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
-  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
+sirv@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/sirv/-/sirv-2.0.4.tgz#5dd9a725c578e34e449f332703eb2a74e46a29b0"
+  integrity sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==
+  dependencies:
+    "@polka/url" "^1.0.0-next.24"
+    mrmime "^2.0.0"
+    totalist "^3.0.0"
 
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-smart-buffer@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
-  integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
-
-sockjs@^0.3.24:
-  version "0.3.24"
-  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce"
-  integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==
-  dependencies:
-    faye-websocket "^0.11.3"
-    uuid "^8.3.2"
-    websocket-driver "^0.7.4"
-
-socks-proxy-agent@^6.0.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce"
-  integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==
-  dependencies:
-    agent-base "^6.0.2"
-    debug "^4.3.3"
-    socks "^2.6.2"
-
-socks-proxy-agent@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
-  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
-  dependencies:
-    agent-base "^6.0.2"
-    debug "^4.3.3"
-    socks "^2.6.2"
-
-socks@^2.6.2:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55"
-  integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==
-  dependencies:
-    ip "^2.0.0"
-    smart-buffer "^4.2.0"
-
-source-list-map@^2.0.0, source-list-map@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
-  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
-
-source-map-js@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
-  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
-
-source-map-js@^1.2.0:
+"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
   integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
 
-source-map-support@^0.5.16:
-  version "0.5.19"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
-  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-support@~0.5.20:
-  version "0.5.21"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
-  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map@^0.5.0, source-map@^0.5.7:
+source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-source-map@^0.7.3:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
-
-source-map@^0.7.4:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
-  integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
-
-source-map@^0.8.0-beta.0:
-  version "0.8.0-beta.0"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.8.0-beta.0.tgz#d4c1bb42c3f7ee925f005927ba10709e0d1d1f11"
-  integrity sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==
-  dependencies:
-    whatwg-url "^7.0.0"
-
-sourcemap-codec@^1.4.8:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
-  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
-
-spawn-wrap@^1.4.2:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.4.3.tgz#81b7670e170cca247d80bf5faf0cfb713bdcf848"
-  integrity sha512-IgB8md0QW/+tWqcavuFgKYR/qIRvJkRLPJDFaoXtLLUaVcCDK0+HeFTkmQHj3eprcYhc+gOl0aEA1w7qZlYezw==
-  dependencies:
-    foreground-child "^1.5.6"
-    mkdirp "^0.5.0"
-    os-homedir "^1.0.1"
-    rimraf "^2.6.2"
-    signal-exit "^3.0.2"
-    which "^1.3.0"
-
 spdx-correct@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
@@ -9632,81 +6194,17 @@ spdx-license-ids@^3.0.0:
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
   integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
 
-spdy-transport@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
-  integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==
-  dependencies:
-    debug "^4.1.0"
-    detect-node "^2.0.4"
-    hpack.js "^2.1.6"
-    obuf "^1.1.2"
-    readable-stream "^3.0.6"
-    wbuf "^1.7.3"
-
-spdy@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b"
-  integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==
-  dependencies:
-    debug "^4.1.0"
-    handle-thing "^2.0.0"
-    http-deceiver "^1.2.7"
-    select-hose "^2.0.0"
-    spdy-transport "^3.0.0"
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
-ssri@^8.0.0, ssri@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
-  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
-  dependencies:
-    minipass "^3.1.1"
-
-ssri@^9.0.0:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
-  integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
-  dependencies:
-    minipass "^3.1.1"
-
-statuses@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
-  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
-
-"statuses@>= 1.4.0 < 2":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
-
-stdout-stream@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
-  integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==
-  dependencies:
-    readable-stream "^2.0.1"
-
-stream-events@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/stream-events/-/stream-events-1.0.5.tgz#bbc898ec4df33a4902d892333d47da9bf1c406d5"
-  integrity sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==
-  dependencies:
-    stubs "^3.0.0"
+stackback@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/stackback/-/stackback-0.0.2.tgz#1ac8a0d9483848d1695e418b6d031a3c3ce68e3b"
+  integrity sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==
 
-"string-width@^1.0.2 || 2":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
+std-env@^3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.7.0.tgz#c9f7386ced6ecf13360b6c6c55b8aaa4ef7481d2"
+  integrity sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==
 
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -9715,50 +6213,41 @@ stream-events@^1.0.5:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string-width@^3.0.0, string-width@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
 string-width@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
-  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
     emoji-regex "^8.0.0"
     is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.0"
+    strip-ansi "^6.0.1"
 
-string.prototype.matchall@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"
-  integrity sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg==
+string-width@^5.0.1, string-width@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
+  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0"
-    has-symbols "^1.0.1"
-    internal-slot "^1.0.2"
-    regexp.prototype.flags "^1.3.0"
-    side-channel "^1.0.2"
+    eastasianwidth "^0.2.0"
+    emoji-regex "^9.2.2"
+    strip-ansi "^7.0.1"
 
-string.prototype.matchall@^4.0.6:
-  version "4.0.10"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz#a1553eb532221d4180c51581d6072cd65d1ee100"
-  integrity sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==
+string.prototype.matchall@^4.0.11:
+  version "4.0.11"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz#1092a72c59268d2abaad76582dccc687c0297e0a"
+  integrity sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    get-intrinsic "^1.2.1"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
+    get-intrinsic "^1.2.4"
+    gopd "^1.0.1"
     has-symbols "^1.0.3"
-    internal-slot "^1.0.5"
-    regexp.prototype.flags "^1.5.0"
-    set-function-name "^2.0.0"
-    side-channel "^1.0.4"
+    internal-slot "^1.0.7"
+    regexp.prototype.flags "^1.5.2"
+    set-function-name "^2.0.2"
+    side-channel "^1.0.6"
 
 string.prototype.padend@^3.0.0:
   version "3.1.0"
@@ -9768,14 +6257,13 @@ string.prototype.padend@^3.0.0:
     define-properties "^1.1.3"
     es-abstract "^1.17.0-next.1"
 
-string.prototype.trim@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz#141233dff32c82bfad80684d7e5f0869ee0fb782"
-  integrity sha512-MjGFEeqixw47dAMFMtgUro/I0+wNqZB5GKXGt1fFr24u3TzDXCPu7J9Buppzoe3r/LqkSDLDDJzE15RGWDGAVw==
+string.prototype.repeat@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz#e90872ee0308b29435aa26275f6e1b762daee01a"
+  integrity sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==
   dependencies:
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
+    es-abstract "^1.17.5"
 
 string.prototype.trim@^1.2.8:
   version "1.2.8"
@@ -9786,6 +6274,16 @@ string.prototype.trim@^1.2.8:
     define-properties "^1.2.0"
     es-abstract "^1.22.1"
 
+string.prototype.trim@^1.2.9:
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz#b6fa326d72d2c78b6df02f7759c73f8f6274faa4"
+  integrity sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.0"
+    es-object-atoms "^1.0.0"
+
 string.prototype.trimend@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
@@ -9803,6 +6301,15 @@ string.prototype.trimend@^1.0.7:
     define-properties "^1.2.0"
     es-abstract "^1.22.1"
 
+string.prototype.trimend@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz#3651b8513719e8a9f48de7f2f77640b26652b229"
+  integrity sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
+
 string.prototype.trimleft@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"
@@ -9838,127 +6345,58 @@ string.prototype.trimstart@^1.0.7:
     define-properties "^1.2.0"
     es-abstract "^1.22.1"
 
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-stringify-object@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629"
-  integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==
-  dependencies:
-    get-own-enumerable-property-symbols "^3.0.0"
-    is-obj "^1.0.1"
-    is-regexp "^1.0.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
-strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+string.prototype.trimstart@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz#7ee834dda8c7c17eff3118472bb35bfedaa34dde"
+  integrity sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==
   dependencies:
-    ansi-regex "^4.1.0"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
 
-strip-ansi@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
   dependencies:
-    ansi-regex "^5.0.0"
+    ansi-regex "^5.0.1"
 
-strip-ansi@^6.0.1:
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
   dependencies:
     ansi-regex "^5.0.1"
 
+strip-ansi@^7.0.1:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
+  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
+  dependencies:
+    ansi-regex "^6.0.1"
+
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
   integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
-strip-comments@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz#4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b"
-  integrity sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==
-
-strip-final-newline@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
-  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
-
-strip-indent@^3.0.0:
+strip-final-newline@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
-  integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
-  dependencies:
-    min-indent "^1.0.0"
-
-strip-json-comments@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd"
+  integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==
 
 strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-stubs@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/stubs/-/stubs-3.0.0.tgz#e8d2ba1fa9c90570303c030b6900f7d5f89abe5b"
-  integrity sha1-6NK6H6nJBXAwPAMLaQD31fiavls=
-
-style-loader@^3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.4.tgz#f30f786c36db03a45cbd55b6a70d930c479090e7"
-  integrity sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==
-
-supports-color@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.0.0.tgz#76cfe742cf1f41bb9b1c29ad03068c05b4c0e40a"
-  integrity sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^5.3.0, supports-color@^5.5.0:
+supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
-  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^7.0.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
-  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
-  dependencies:
-    has-flag "^4.0.0"
-
 supports-color@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
@@ -9966,13 +6404,6 @@ supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-color@^8.0.0:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
-  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
-  dependencies:
-    has-flag "^4.0.0"
-
 supports-preserve-symlinks-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
@@ -9983,104 +6414,25 @@ symbol-observable@^1.2.0:
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
   integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
-tapable@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
-  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
-
-tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
-  integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
-
-tar@^6.0.2, tar@^6.1.11, tar@^6.1.2:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73"
-  integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==
-  dependencies:
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    minipass "^5.0.0"
-    minizlib "^2.1.1"
-    mkdirp "^1.0.3"
-    yallist "^4.0.0"
-
-teeny-request@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-6.0.1.tgz#9b1f512cef152945827ba7e34f62523a4ce2c5b0"
-  integrity sha512-TAK0c9a00ELOqLrZ49cFxvPVogMUFaWY8dUsQc/0CuQPGF+BOxOQzXfE413BAk2kLomwNplvdtMpeaeGWmoc2g==
-  dependencies:
-    http-proxy-agent "^4.0.0"
-    https-proxy-agent "^4.0.0"
-    node-fetch "^2.2.0"
-    stream-events "^1.0.5"
-    uuid "^3.3.2"
-
-temp-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e"
-  integrity sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==
-
-tempy@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tempy/-/tempy-0.6.0.tgz#65e2c35abc06f1124a97f387b08303442bde59f3"
-  integrity sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==
-  dependencies:
-    is-stream "^2.0.0"
-    temp-dir "^2.0.0"
-    type-fest "^0.16.0"
-    unique-string "^2.0.0"
-
-terser-webpack-plugin@^5.3.10:
-  version "5.3.10"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199"
-  integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==
-  dependencies:
-    "@jridgewell/trace-mapping" "^0.3.20"
-    jest-worker "^27.4.5"
-    schema-utils "^3.1.1"
-    serialize-javascript "^6.0.1"
-    terser "^5.26.0"
-
-terser@^5.0.0, terser@^5.10.0, terser@^5.26.0:
-  version "5.27.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.27.0.tgz#70108689d9ab25fef61c4e93e808e9fd092bf20c"
-  integrity sha512-bi1HRwVRskAjheeYl291n3JC4GgO/Ty4z1nVs5AAsmonJulGxpSektecnNedrwK9C7vpvVtcX3cw00VSLt7U2A==
-  dependencies:
-    "@jridgewell/source-map" "^0.3.3"
-    acorn "^8.8.2"
-    commander "^2.20.0"
-    source-map-support "~0.5.20"
-
-test-exclude@^5.2.3:
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
-  integrity sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==
-  dependencies:
-    glob "^7.1.3"
-    minimatch "^3.0.4"
-    read-pkg-up "^4.0.0"
-    require-main-filename "^2.0.0"
-
-test-exclude@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
-  integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
+symbol-tree@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
+  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
+
+test-exclude@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-7.0.1.tgz#20b3ba4906ac20994e275bbcafd68d510264c2a2"
+  integrity sha512-pFYqmTw68LXVjeWJMST4+borgQP2AyMNbg1BpZh9LbyhUeNkeaPF9gzfPGUAnSMV3qPYdWUwDIjjCLiSDOl7vg==
   dependencies:
     "@istanbuljs/schema" "^0.1.2"
-    glob "^7.1.4"
-    minimatch "^3.0.4"
+    glob "^10.4.1"
+    minimatch "^9.0.4"
 
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
-thunky@^1.0.2:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
-  integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
-
 tiny-case@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/tiny-case/-/tiny-case-1.0.3.tgz#d980d66bc72b5d5a9ca86fb7c9ffdb9c898ddd03"
@@ -10096,6 +6448,26 @@ tiny-warning@^1.0.0, tiny-warning@^1.0.3:
   resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
   integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
 
+tinybench@^2.8.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.9.0.tgz#103c9f8ba6d7237a47ab6dd1dcff77251863426b"
+  integrity sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==
+
+tinypool@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-1.0.0.tgz#a68965218e04f4ad9de037d2a1cd63cda9afb238"
+  integrity sha512-KIKExllK7jp3uvrNtvRBYBWBOAXSX8ZvoaD8T+7KB/QHIuoJW3Pmr60zucywjAlMb5TeXUkcs/MWeWLu0qvuAQ==
+
+tinyrainbow@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/tinyrainbow/-/tinyrainbow-1.2.0.tgz#5c57d2fc0fb3d1afd78465c33ca885d04f02abb5"
+  integrity sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==
+
+tinyspy@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/tinyspy/-/tinyspy-3.0.0.tgz#cb61644f2713cd84dee184863f4642e06ddf0585"
+  integrity sha512-q5nmENpTHgiPVd1cJDDc9cVoYN5x4vCvwT3FMilvKPKneCBZAxn2YWQjDF0UMcE9k0Cay1gBiDfTMU0g+mPMQA==
+
 to-camel-case@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/to-camel-case/-/to-camel-case-1.0.0.tgz#1a56054b2f9d696298ce66a60897322b6f423e46"
@@ -10132,56 +6504,38 @@ toggle-selection@^1.0.6:
   resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32"
   integrity sha1-bkWxJj8gF/oKzH2J14sVuL932jI=
 
-toidentifier@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
-  integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
-
 toposort@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
   integrity sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==
 
-touch@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b"
-  integrity sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==
-  dependencies:
-    nopt "~1.0.10"
+totalist@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.1.tgz#ba3a3d600c915b1a97872348f79c127475f6acf8"
+  integrity sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==
 
-tr46@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
-  integrity sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==
+tough-cookie@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36"
+  integrity sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==
   dependencies:
-    punycode "^2.1.0"
+    psl "^1.1.33"
+    punycode "^2.1.1"
+    universalify "^0.2.0"
+    url-parse "^1.5.3"
 
-trim-newlines@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
-  integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
-
-"true-case-path@^2.2.1":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-2.2.1.tgz#c5bf04a5bbec3fd118be4084461b3a27c4d796bf"
-  integrity sha512-0z3j8R7MCjy10kc/g+qg7Ln3alJTodw9aDuVWZa3uiWqfuBMKeAeP2ocWcxoyM3D73yz3Jt/Pu4qPr4wHSdB/Q==
+tr46@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-5.0.0.tgz#3b46d583613ec7283020d79019f1335723801cec"
+  integrity sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==
+  dependencies:
+    punycode "^2.3.1"
 
-ts-api-utils@^1.0.1:
+ts-api-utils@^1.0.1, ts-api-utils@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
   integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
 
-ts-loader@^9.5.1:
-  version "9.5.1"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.5.1.tgz#63d5912a86312f1fbe32cef0859fb8b2193d9b89"
-  integrity sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==
-  dependencies:
-    chalk "^4.1.0"
-    enhanced-resolve "^5.0.0"
-    micromatch "^4.0.0"
-    semver "^7.3.4"
-    source-map "^0.7.4"
-
 ts-node@^10.9.2:
   version "10.9.2"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f"
@@ -10210,12 +6564,7 @@ tsconfig-paths@^4.2.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@^1.9.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
-  integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
-
-tslib@^2.0.3, tslib@^2.4.0:
+tslib@^2.4.0:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
@@ -10227,49 +6576,16 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
-type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
-  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
-
-type-fest@^0.16.0:
-  version "0.16.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.16.0.tgz#3240b891a78b0deae910dbeb86553e552a148860"
-  integrity sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==
-
-type-fest@^0.18.0:
-  version "0.18.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
-  integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
-
 type-fest@^0.20.2:
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
-type-fest@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
-  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
-
-type-fest@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
-  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
-
 type-fest@^2.19.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b"
   integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==
 
-type-is@~1.6.18:
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
-  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
-  dependencies:
-    media-typer "0.3.0"
-    mime-types "~2.1.24"
-
 typed-array-buffer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60"
@@ -10279,6 +6595,15 @@ typed-array-buffer@^1.0.0:
     get-intrinsic "^1.2.1"
     is-typed-array "^1.1.10"
 
+typed-array-buffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3"
+  integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==
+  dependencies:
+    call-bind "^1.0.7"
+    es-errors "^1.3.0"
+    is-typed-array "^1.1.13"
+
 typed-array-byte-length@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0"
@@ -10289,6 +6614,17 @@ typed-array-byte-length@^1.0.0:
     has-proto "^1.0.1"
     is-typed-array "^1.1.10"
 
+typed-array-byte-length@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz#d92972d3cff99a3fa2e765a28fcdc0f1d89dec67"
+  integrity sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==
+  dependencies:
+    call-bind "^1.0.7"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-proto "^1.0.3"
+    is-typed-array "^1.1.13"
+
 typed-array-byte-offset@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b"
@@ -10300,6 +6636,18 @@ typed-array-byte-offset@^1.0.0:
     has-proto "^1.0.1"
     is-typed-array "^1.1.10"
 
+typed-array-byte-offset@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz#f9ec1acb9259f395093e4567eb3c28a580d02063"
+  integrity sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==
+  dependencies:
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.7"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-proto "^1.0.3"
+    is-typed-array "^1.1.13"
+
 typed-array-length@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
@@ -10309,16 +6657,23 @@ typed-array-length@^1.0.4:
     for-each "^0.3.3"
     is-typed-array "^1.1.9"
 
+typed-array-length@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.6.tgz#57155207c76e64a3457482dfdc1c9d1d3c4c73a3"
+  integrity sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==
+  dependencies:
+    call-bind "^1.0.7"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-proto "^1.0.3"
+    is-typed-array "^1.1.13"
+    possible-typed-array-names "^1.0.0"
+
 typed-styles@^0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/typed-styles/-/typed-styles-0.0.7.tgz#93392a008794c4595119ff62dde6809dbc40a3d9"
   integrity sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q==
 
-typedarray@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
-
 typescript-compare@^0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/typescript-compare/-/typescript-compare-0.0.2.tgz#7ee40a400a406c2ea0a7e551efd3309021d5f425"
@@ -10326,6 +6681,15 @@ typescript-compare@^0.0.2:
   dependencies:
     typescript-logic "^0.0.0"
 
+typescript-eslint@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.1.0.tgz#c43a3543ab34c37b7f88deb4ff18b9764aed0b60"
+  integrity sha512-prB2U3jXPJLpo1iVLN338Lvolh6OrcCZO+9Yv6AR+tvegPPptYCDBIHiEEUdqRi8gAv2bXNKfMUrgAd2ejn/ow==
+  dependencies:
+    "@typescript-eslint/eslint-plugin" "8.1.0"
+    "@typescript-eslint/parser" "8.1.0"
+    "@typescript-eslint/utils" "8.1.0"
+
 typescript-logic@^0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/typescript-logic/-/typescript-logic-0.0.0.tgz#66ebd82a2548f2b444a43667bec120b496890196"
@@ -10358,29 +6722,11 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
-undefsafe@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.5.tgz#38733b9327bdcd226db889fb723a6efd162e6e2c"
-  integrity sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==
-
-unicode-canonical-property-names-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
-  integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
-
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
   integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
 
-unicode-match-property-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
-  integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
-  dependencies:
-    unicode-canonical-property-names-ecmascript "^1.0.4"
-    unicode-property-aliases-ecmascript "^1.0.4"
-
 unicode-match-property-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
@@ -10389,88 +6735,28 @@ unicode-match-property-ecmascript@^2.0.0:
     unicode-canonical-property-names-ecmascript "^2.0.0"
     unicode-property-aliases-ecmascript "^2.0.0"
 
-unicode-match-property-value-ecmascript@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
-  integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
-
 unicode-match-property-value-ecmascript@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0"
   integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==
 
-unicode-property-aliases-ecmascript@^1.0.4:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
-  integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
-
 unicode-property-aliases-ecmascript@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
   integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
 
-uniq@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
-  integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
-
-unique-filename@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
-  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
-  dependencies:
-    unique-slug "^2.0.0"
-
-unique-filename@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2"
-  integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==
-  dependencies:
-    unique-slug "^3.0.0"
-
-unique-slug@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
-  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
-  dependencies:
-    imurmurhash "^0.1.4"
-
-unique-slug@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9"
-  integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==
-  dependencies:
-    imurmurhash "^0.1.4"
-
-unique-string@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
-  integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==
-  dependencies:
-    crypto-random-string "^2.0.0"
-
-universalify@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
-  integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
-
-unpipe@1.0.0, unpipe@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
-
-upath@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
-  integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
+universalify@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
+  integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
 
-update-browserslist-db@^1.0.13:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
-  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
+update-browserslist-db@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz#7ca61c0d8650766090728046e416a8cde682859e"
+  integrity sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==
   dependencies:
-    escalade "^3.1.1"
-    picocolors "^1.0.0"
+    escalade "^3.1.2"
+    picocolors "^1.0.1"
 
 uri-js@^4.2.2:
   version "4.2.2"
@@ -10479,63 +6765,29 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-url-loader@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-4.1.1.tgz#28505e905cae158cf07c92ca622d7f237e70a4e2"
-  integrity sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==
-  dependencies:
-    loader-utils "^2.0.0"
-    mime-types "^2.1.27"
-    schema-utils "^3.0.0"
-
-url@^0.11.3:
-  version "0.11.3"
-  resolved "https://registry.yarnpkg.com/url/-/url-0.11.3.tgz#6f495f4b935de40ce4a0a52faee8954244f3d3ad"
-  integrity sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==
+url-parse@^1.5.3:
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
+  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
   dependencies:
-    punycode "^1.4.1"
-    qs "^6.11.2"
-
-urlgrey@0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/urlgrey/-/urlgrey-0.4.4.tgz#892fe95960805e85519f1cd4389f2cb4cbb7652f"
-  integrity sha1-iS/pWWCAXoVRnxzUOJ8stMu3ZS8=
+    querystringify "^2.1.1"
+    requires-port "^1.0.0"
 
 util-arity@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/util-arity/-/util-arity-1.1.0.tgz#59d01af1fdb3fede0ac4e632b0ab5f6ce97c9330"
   integrity sha512-kkyIsXKwemfSy8ZEoaIz06ApApnWsk5hQO0vLjZS6UkBiGiW++Jsyb8vSBoc0WKlffGoGs5yYy/j5pp8zckrFA==
 
-util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
-utila@~0.4:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
-  integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=
-
 utility-types@^3.11.0:
   version "3.11.0"
   resolved "https://registry.yarnpkg.com/utility-types/-/utility-types-3.11.0.tgz#607c40edb4f258915e901ea7995607fdf319424c"
   integrity sha512-6Z7Ma2aVEWisaL6TvBCy7P8rm2LQoPv6dJ7ecIaIixHcwfbJ0x7mWdbcwlIM5IGQxPZSFYeqRCqlOOeKoJYMkw==
 
-utils-merge@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
-
 uuid@^3.3.2:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-uuid@^8.3.2:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
-  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
-
 uuid@^9.0.0:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
@@ -10559,180 +6811,127 @@ value-equal@^1.0.1:
   resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c"
   integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==
 
-vary@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+vite-node@2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-2.0.5.tgz#36d909188fc6e3aba3da5fc095b3637d0d18e27b"
+  integrity sha512-LdsW4pxj0Ot69FAoXZ1yTnA9bjGohr2yNBU7QKRxpz8ITSkhuDl6h3zS/tvgz4qrNjeRnvrWeXQ8ZF7Um4W00Q==
+  dependencies:
+    cac "^6.7.14"
+    debug "^4.3.5"
+    pathe "^1.1.2"
+    tinyrainbow "^1.2.0"
+    vite "^5.0.0"
 
-warning@^4.0.2, warning@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"
-  integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==
+vite-plugin-commonjs@^0.10.1:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/vite-plugin-commonjs/-/vite-plugin-commonjs-0.10.1.tgz#18585abc6020adaee733150847972f55a1f88c55"
+  integrity sha512-taP8R9kYGlCW5OzkVR0UIWRCnG6rSxeWWuA7tnU5b9t5MniibOnDY219NhisTeDhJAeGT8cEnrhVWZ9A5yD+vg==
   dependencies:
-    loose-envify "^1.0.0"
+    acorn "^8.8.2"
+    fast-glob "^3.2.12"
+    magic-string "^0.30.1"
+    vite-plugin-dynamic-import "^1.5.0"
 
-watchpack@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
-  integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
+vite-plugin-dynamic-import@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/vite-plugin-dynamic-import/-/vite-plugin-dynamic-import-1.5.0.tgz#a28f4768da977f0e448009489617aec259180b63"
+  integrity sha512-Qp85c+AVJmLa8MLni74U4BDiWpUeFNx7NJqbGZyR2XJOU7mgW0cb7nwlAMucFyM4arEd92Nfxp4j44xPi6Fu7g==
   dependencies:
-    glob-to-regexp "^0.4.1"
-    graceful-fs "^4.1.2"
+    acorn "^8.8.2"
+    es-module-lexer "^1.2.1"
+    fast-glob "^3.2.12"
+    magic-string "^0.30.1"
 
-wbuf@^1.1.0, wbuf@^1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
-  integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
+vite@^5.0.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.0.tgz#11dca8a961369ba8b5cae42d068c7ad684d5370f"
+  integrity sha512-5xokfMX0PIiwCMCMb9ZJcMyh5wbBun0zUzKib+L65vAZ8GY9ePZMXxFrHbr/Kyll2+LSCY7xtERPpxkBDKngwg==
   dependencies:
-    minimalistic-assert "^1.0.0"
+    esbuild "^0.21.3"
+    postcss "^8.4.40"
+    rollup "^4.13.0"
+  optionalDependencies:
+    fsevents "~2.3.3"
 
-webidl-conversions@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
-  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
-
-webpack-dev-middleware@^5.3.1:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f"
-  integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==
-  dependencies:
-    colorette "^2.0.10"
-    memfs "^3.4.3"
-    mime-types "^2.1.31"
-    range-parser "^1.2.1"
-    schema-utils "^4.0.0"
-
-webpack-dev-server@^4.15.1:
-  version "4.15.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz#8944b29c12760b3a45bdaa70799b17cb91b03df7"
-  integrity sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==
-  dependencies:
-    "@types/bonjour" "^3.5.9"
-    "@types/connect-history-api-fallback" "^1.3.5"
-    "@types/express" "^4.17.13"
-    "@types/serve-index" "^1.9.1"
-    "@types/serve-static" "^1.13.10"
-    "@types/sockjs" "^0.3.33"
-    "@types/ws" "^8.5.5"
-    ansi-html-community "^0.0.8"
-    bonjour-service "^1.0.11"
-    chokidar "^3.5.3"
-    colorette "^2.0.10"
-    compression "^1.7.4"
-    connect-history-api-fallback "^2.0.0"
-    default-gateway "^6.0.3"
-    express "^4.17.3"
-    graceful-fs "^4.2.6"
-    html-entities "^2.3.2"
-    http-proxy-middleware "^2.0.3"
-    ipaddr.js "^2.0.1"
-    launch-editor "^2.6.0"
-    open "^8.0.9"
-    p-retry "^4.5.0"
-    rimraf "^3.0.2"
-    schema-utils "^4.0.0"
-    selfsigned "^2.1.1"
-    serve-index "^1.9.1"
-    sockjs "^0.3.24"
-    spdy "^4.0.2"
-    webpack-dev-middleware "^5.3.1"
-    ws "^8.13.0"
-
-webpack-hot-middleware@^2.26.0:
-  version "2.26.0"
-  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.26.0.tgz#0a103c9b2836c1f27d7f74bbe0e96c99c82d0265"
-  integrity sha512-okzjec5sAEy4t+7rzdT8eRyxsk0FDSmBPN2KwX4Qd+6+oQCfe5Ve07+u7cJvofgB+B4w5/4dO4Pz0jhhHyyPLQ==
-  dependencies:
-    ansi-html-community "0.0.8"
-    html-entities "^2.1.0"
-    strip-ansi "^6.0.0"
+vite@^5.3.5:
+  version "5.3.5"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.3.5.tgz#b847f846fb2b6cb6f6f4ed50a830186138cb83d8"
+  integrity sha512-MdjglKR6AQXQb9JGiS7Rc2wC6uMjcm7Go/NHNO63EwiJXfuk9PgqiP/n5IDJCziMkfw9n4Ubp7lttNwz+8ZVKA==
+  dependencies:
+    esbuild "^0.21.3"
+    postcss "^8.4.39"
+    rollup "^4.13.0"
+  optionalDependencies:
+    fsevents "~2.3.3"
 
-webpack-manifest-plugin@^5.0.0:
+vitest@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/vitest/-/vitest-2.0.5.tgz#2f15a532704a7181528e399cc5b754c7f335fd62"
+  integrity sha512-8GUxONfauuIdeSl5f9GTgVEpg5BTOlplET4WEDaeY2QBiN8wSm68vxN/tb5z405OwppfoCavnwXafiaYBC/xOA==
+  dependencies:
+    "@ampproject/remapping" "^2.3.0"
+    "@vitest/expect" "2.0.5"
+    "@vitest/pretty-format" "^2.0.5"
+    "@vitest/runner" "2.0.5"
+    "@vitest/snapshot" "2.0.5"
+    "@vitest/spy" "2.0.5"
+    "@vitest/utils" "2.0.5"
+    chai "^5.1.1"
+    debug "^4.3.5"
+    execa "^8.0.1"
+    magic-string "^0.30.10"
+    pathe "^1.1.2"
+    std-env "^3.7.0"
+    tinybench "^2.8.0"
+    tinypool "^1.0.0"
+    tinyrainbow "^1.2.0"
+    vite "^5.0.0"
+    vite-node "2.0.5"
+    why-is-node-running "^2.3.0"
+
+w3c-xmlserializer@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-5.0.0.tgz#084246c1f295d1b3222d36e955546433ca8df803"
-  integrity sha512-8RQfMAdc5Uw3QbCQ/CBV/AXqOR8mt03B6GJmRbhWopE8GzRfEpn+k0ZuWywxW+5QZsffhmFDY1J6ohqJo+eMuw==
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz#f925ba26855158594d907313cedd1476c5967f6c"
+  integrity sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==
   dependencies:
-    tapable "^2.0.0"
-    webpack-sources "^2.2.0"
+    xml-name-validator "^5.0.0"
 
-webpack-sources@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
-  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
+warning@^4.0.2, warning@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"
+  integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==
   dependencies:
-    source-list-map "^2.0.0"
-    source-map "~0.6.1"
+    loose-envify "^1.0.0"
 
-webpack-sources@^2.2.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.1.tgz#570de0af163949fe272233c2cefe1b56f74511fd"
-  integrity sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==
-  dependencies:
-    source-list-map "^2.0.1"
-    source-map "^0.6.1"
-
-webpack-sources@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
-  integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
-
-webpack@^5.9.0:
-  version "5.90.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.90.0.tgz#313bfe16080d8b2fee6e29b6c986c0714ad4290e"
-  integrity sha512-bdmyXRCXeeNIePv6R6tGPyy20aUobw4Zy8r0LUS2EWO+U+Ke/gYDgsCh7bl5rB6jPpr4r0SZa6dPxBxLooDT3w==
-  dependencies:
-    "@types/eslint-scope" "^3.7.3"
-    "@types/estree" "^1.0.5"
-    "@webassemblyjs/ast" "^1.11.5"
-    "@webassemblyjs/wasm-edit" "^1.11.5"
-    "@webassemblyjs/wasm-parser" "^1.11.5"
-    acorn "^8.7.1"
-    acorn-import-assertions "^1.9.0"
-    browserslist "^4.21.10"
-    chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.15.0"
-    es-module-lexer "^1.2.1"
-    eslint-scope "5.1.1"
-    events "^3.2.0"
-    glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.9"
-    json-parse-even-better-errors "^2.3.1"
-    loader-runner "^4.2.0"
-    mime-types "^2.1.27"
-    neo-async "^2.6.2"
-    schema-utils "^3.2.0"
-    tapable "^2.1.1"
-    terser-webpack-plugin "^5.3.10"
-    watchpack "^2.4.0"
-    webpack-sources "^3.2.3"
-
-websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
-  integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
-  dependencies:
-    http-parser-js ">=0.5.1"
-    safe-buffer ">=5.1.0"
-    websocket-extensions ">=0.1.1"
+webidl-conversions@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
+  integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
 
-websocket-extensions@>=0.1.1:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
-  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
+whatwg-encoding@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz#d0f4ef769905d426e1688f3e34381a99b60b76e5"
+  integrity sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==
+  dependencies:
+    iconv-lite "0.6.3"
 
 whatwg-fetch@>=0.10.0, whatwg-fetch@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
   integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==
 
-whatwg-url@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06"
-  integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==
+whatwg-mimetype@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz#bc1bf94a985dc50388d54a9258ac405c3ca2fc0a"
+  integrity sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==
+
+whatwg-url@^14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-14.0.0.tgz#00baaa7fd198744910c4b1ef68378f2200e4ceb6"
+  integrity sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==
   dependencies:
-    lodash.sortby "^4.7.0"
-    tr46 "^1.0.1"
-    webidl-conversions "^4.0.2"
+    tr46 "^5.0.0"
+    webidl-conversions "^7.0.0"
 
 which-boxed-primitive@^1.0.2:
   version "1.0.2"
@@ -10745,10 +6944,33 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+which-builtin-type@^1.1.3:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.1.4.tgz#592796260602fc3514a1b5ee7fa29319b72380c3"
+  integrity sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w==
+  dependencies:
+    function.prototype.name "^1.1.6"
+    has-tostringtag "^1.0.2"
+    is-async-function "^2.0.0"
+    is-date-object "^1.0.5"
+    is-finalizationregistry "^1.0.2"
+    is-generator-function "^1.0.10"
+    is-regex "^1.1.4"
+    is-weakref "^1.0.2"
+    isarray "^2.0.5"
+    which-boxed-primitive "^1.0.2"
+    which-collection "^1.0.2"
+    which-typed-array "^1.1.15"
+
+which-collection@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.2.tgz#627ef76243920a107e7ce8e96191debe4b16c2a0"
+  integrity sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==
+  dependencies:
+    is-map "^2.0.3"
+    is-set "^2.0.3"
+    is-weakmap "^2.0.2"
+    is-weakset "^2.0.3"
 
 which-typed-array@^1.1.11, which-typed-array@^1.1.13:
   version "1.1.13"
@@ -10761,218 +6983,45 @@ which-typed-array@^1.1.11, which-typed-array@^1.1.13:
     gopd "^1.0.1"
     has-tostringtag "^1.0.0"
 
-which@1.3.1, which@^1.2.9, which@^1.3.0, which@^1.3.1:
+which-typed-array@^1.1.14, which-typed-array@^1.1.15:
+  version "1.1.15"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d"
+  integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==
+  dependencies:
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.7"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-tostringtag "^1.0.2"
+
+which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
-which@^2.0.1, which@^2.0.2:
+which@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
   dependencies:
     isexe "^2.0.0"
 
-wide-align@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
-wide-align@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
-  integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
+why-is-node-running@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/why-is-node-running/-/why-is-node-running-2.3.0.tgz#a3f69a97107f494b3cdc3bdddd883a7d65cebf04"
+  integrity sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==
   dependencies:
-    string-width "^1.0.2 || 2 || 3 || 4"
+    siginfo "^2.0.0"
+    stackback "0.0.2"
 
 wkt-parser@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/wkt-parser/-/wkt-parser-1.2.4.tgz#e42ba7b96f13aef82a2da9056e2d87da0fec5393"
   integrity sha512-ZzKnc7ml/91fOPh5bANBL4vUlWPIYYv11waCtWTkl2TRN+LEmBg60Q1MA8gqV4hEp4MGfSj9JiHz91zw/gTDXg==
 
-workbox-background-sync@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-7.0.0.tgz#2b84b96ca35fec976e3bd2794b70e4acec46b3a5"
-  integrity sha512-S+m1+84gjdueM+jIKZ+I0Lx0BDHkk5Nu6a3kTVxP4fdj3gKouRNmhO8H290ybnJTOPfBDtTMXSQA/QLTvr7PeA==
-  dependencies:
-    idb "^7.0.1"
-    workbox-core "7.0.0"
-
-workbox-broadcast-update@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-7.0.0.tgz#7f611ca1a94ba8ac0aa40fa171c9713e0f937d22"
-  integrity sha512-oUuh4jzZrLySOo0tC0WoKiSg90bVAcnE98uW7F8GFiSOXnhogfNDGZelPJa+6KpGBO5+Qelv04Hqx2UD+BJqNQ==
-  dependencies:
-    workbox-core "7.0.0"
-
-workbox-build@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-7.0.0.tgz#02ab5ef2991b3369b8b9395703f08912212769b4"
-  integrity sha512-CttE7WCYW9sZC+nUYhQg3WzzGPr4IHmrPnjKiu3AMXsiNQKx+l4hHl63WTrnicLmKEKHScWDH8xsGBdrYgtBzg==
-  dependencies:
-    "@apideck/better-ajv-errors" "^0.3.1"
-    "@babel/core" "^7.11.1"
-    "@babel/preset-env" "^7.11.0"
-    "@babel/runtime" "^7.11.2"
-    "@rollup/plugin-babel" "^5.2.0"
-    "@rollup/plugin-node-resolve" "^11.2.1"
-    "@rollup/plugin-replace" "^2.4.1"
-    "@surma/rollup-plugin-off-main-thread" "^2.2.3"
-    ajv "^8.6.0"
-    common-tags "^1.8.0"
-    fast-json-stable-stringify "^2.1.0"
-    fs-extra "^9.0.1"
-    glob "^7.1.6"
-    lodash "^4.17.20"
-    pretty-bytes "^5.3.0"
-    rollup "^2.43.1"
-    rollup-plugin-terser "^7.0.0"
-    source-map "^0.8.0-beta.0"
-    stringify-object "^3.3.0"
-    strip-comments "^2.0.1"
-    tempy "^0.6.0"
-    upath "^1.2.0"
-    workbox-background-sync "7.0.0"
-    workbox-broadcast-update "7.0.0"
-    workbox-cacheable-response "7.0.0"
-    workbox-core "7.0.0"
-    workbox-expiration "7.0.0"
-    workbox-google-analytics "7.0.0"
-    workbox-navigation-preload "7.0.0"
-    workbox-precaching "7.0.0"
-    workbox-range-requests "7.0.0"
-    workbox-recipes "7.0.0"
-    workbox-routing "7.0.0"
-    workbox-strategies "7.0.0"
-    workbox-streams "7.0.0"
-    workbox-sw "7.0.0"
-    workbox-window "7.0.0"
-
-workbox-cacheable-response@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-7.0.0.tgz#ee27c036728189eed69d25a135013053277482d2"
-  integrity sha512-0lrtyGHn/LH8kKAJVOQfSu3/80WDc9Ma8ng0p2i/5HuUndGttH+mGMSvOskjOdFImLs2XZIimErp7tSOPmu/6g==
-  dependencies:
-    workbox-core "7.0.0"
-
-workbox-core@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-7.0.0.tgz#dec114ec923cc2adc967dd9be1b8a0bed50a3545"
-  integrity sha512-81JkAAZtfVP8darBpfRTovHg8DGAVrKFgHpOArZbdFd78VqHr5Iw65f2guwjE2NlCFbPFDoez3D3/6ZvhI/rwQ==
-
-workbox-expiration@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-7.0.0.tgz#3d90bcf2a7577241de950f89784f6546b66c2baa"
-  integrity sha512-MLK+fogW+pC3IWU9SFE+FRStvDVutwJMR5if1g7oBJx3qwmO69BNoJQVaMXq41R0gg3MzxVfwOGKx3i9P6sOLQ==
-  dependencies:
-    idb "^7.0.1"
-    workbox-core "7.0.0"
-
-workbox-google-analytics@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-7.0.0.tgz#603b2c4244af1e85de0fb26287d4e17d3293452a"
-  integrity sha512-MEYM1JTn/qiC3DbpvP2BVhyIH+dV/5BjHk756u9VbwuAhu0QHyKscTnisQuz21lfRpOwiS9z4XdqeVAKol0bzg==
-  dependencies:
-    workbox-background-sync "7.0.0"
-    workbox-core "7.0.0"
-    workbox-routing "7.0.0"
-    workbox-strategies "7.0.0"
-
-workbox-navigation-preload@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-7.0.0.tgz#4913878dbbd97057181d57baa18d2bbdde085c6c"
-  integrity sha512-juWCSrxo/fiMz3RsvDspeSLGmbgC0U9tKqcUPZBCf35s64wlaLXyn2KdHHXVQrb2cqF7I0Hc9siQalainmnXJA==
-  dependencies:
-    workbox-core "7.0.0"
-
-workbox-precaching@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-7.0.0.tgz#3979ba8033aadf3144b70e9fe631d870d5fbaa03"
-  integrity sha512-EC0vol623LJqTJo1mkhD9DZmMP604vHqni3EohhQVwhJlTgyKyOkMrZNy5/QHfOby+39xqC01gv4LjOm4HSfnA==
-  dependencies:
-    workbox-core "7.0.0"
-    workbox-routing "7.0.0"
-    workbox-strategies "7.0.0"
-
-workbox-range-requests@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-7.0.0.tgz#97511901e043df27c1aa422adcc999a7751f52ed"
-  integrity sha512-SxAzoVl9j/zRU9OT5+IQs7pbJBOUOlriB8Gn9YMvi38BNZRbM+RvkujHMo8FOe9IWrqqwYgDFBfv6sk76I1yaQ==
-  dependencies:
-    workbox-core "7.0.0"
-
-workbox-recipes@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-7.0.0.tgz#1a6a01c8c2dfe5a41eef0fed3fe517e8a45c6514"
-  integrity sha512-DntcK9wuG3rYQOONWC0PejxYYIDHyWWZB/ueTbOUDQgefaeIj1kJ7pdP3LZV2lfrj8XXXBWt+JDRSw1lLLOnww==
-  dependencies:
-    workbox-cacheable-response "7.0.0"
-    workbox-core "7.0.0"
-    workbox-expiration "7.0.0"
-    workbox-precaching "7.0.0"
-    workbox-routing "7.0.0"
-    workbox-strategies "7.0.0"
-
-workbox-routing@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-7.0.0.tgz#6668438a06554f60645aedc77244a4fe3a91e302"
-  integrity sha512-8YxLr3xvqidnbVeGyRGkaV4YdlKkn5qZ1LfEePW3dq+ydE73hUUJJuLmGEykW3fMX8x8mNdL0XrWgotcuZjIvA==
-  dependencies:
-    workbox-core "7.0.0"
-
-workbox-strategies@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-7.0.0.tgz#dcba32b3f3074476019049cc490fe1a60ea73382"
-  integrity sha512-dg3qJU7tR/Gcd/XXOOo7x9QoCI9nk74JopaJaYAQ+ugLi57gPsXycVdBnYbayVj34m6Y8ppPwIuecrzkpBVwbA==
-  dependencies:
-    workbox-core "7.0.0"
-
-workbox-streams@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-7.0.0.tgz#36722aecd04785f88b6f709e541c094fc658c0f9"
-  integrity sha512-moVsh+5to//l6IERWceYKGiftc+prNnqOp2sgALJJFbnNVpTXzKISlTIsrWY+ogMqt+x1oMazIdHj25kBSq/HQ==
-  dependencies:
-    workbox-core "7.0.0"
-    workbox-routing "7.0.0"
-
-workbox-sw@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-7.0.0.tgz#7350126411e3de1409f7ec243df8d06bb5b08b86"
-  integrity sha512-SWfEouQfjRiZ7GNABzHUKUyj8pCoe+RwjfOIajcx6J5mtgKkN+t8UToHnpaJL5UVVOf5YhJh+OHhbVNIHe+LVA==
-
-workbox-webpack-plugin@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-7.0.0.tgz#6c61661a2cacde1239192a5877a041a2943d1a55"
-  integrity sha512-R1ZzCHPfzeJjLK2/TpKUhxSQ3fFDCxlWxgRhhSjMQLz3G2MlBnyw/XeYb34e7SGgSv0qG22zEhMIzjMNqNeKbw==
-  dependencies:
-    fast-json-stable-stringify "^2.1.0"
-    pretty-bytes "^5.4.1"
-    upath "^1.2.0"
-    webpack-sources "^1.4.3"
-    workbox-build "7.0.0"
-
-workbox-window@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-7.0.0.tgz#a683ab33c896e4f16786794eac7978fc98a25d08"
-  integrity sha512-j7P/bsAWE/a7sxqTzXo3P2ALb1reTfZdvVp6OJ/uLr/C2kZAMvjeWGm8V4htQhor7DOvYg0sSbFN2+flT5U0qA==
-  dependencies:
-    "@types/trusted-types" "^2.0.2"
-    workbox-core "7.0.0"
-
-wrap-ansi@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
-  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
-  dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^3.0.0"
-    strip-ansi "^5.0.0"
-
-wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -10981,46 +7030,41 @@ wrap-ansi@^7.0.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
+  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
+  dependencies:
+    ansi-styles "^6.1.0"
+    string-width "^5.0.1"
+    strip-ansi "^7.0.1"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-write-file-atomic@^2.4.2:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
-  integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==
-  dependencies:
-    graceful-fs "^4.1.11"
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.2"
-
-ws@^8.13.0:
+ws@^8.18.0:
   version "8.18.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"
   integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==
 
-xregexp@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz#7e92e73d9174a99a59743f67a4ce879a04b5ae50"
-  integrity sha512-7jXDIFXh5yJ/orPn4SXjuVrWWoi4Cr8jfV1eHv9CixKSbU+jY4mxfrBwAuDvupPNKpMUY+FeIqsVw/JLT9+B8g==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.8.3"
-
-y18n@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
-  integrity "sha1-tfJZyCzW4zaSHv17/Yv1YN6e7t8= sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
+xml-name-validator@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-5.0.0.tgz#82be9b957f7afdacf961e5980f1bf227c0bf7673"
+  integrity sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==
 
-y18n@^5.0.5:
-  version "5.0.8"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
-  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
+xmlchars@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
+  integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
-yallist@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
+xxhashjs@~0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/xxhashjs/-/xxhashjs-0.2.2.tgz#8a6251567621a1c46a5ae204da0249c7f8caa9d8"
+  integrity sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==
+  dependencies:
+    cuint "^0.2.2"
 
 yallist@^3.0.2:
   version "3.1.1"
@@ -11037,62 +7081,6 @@ yaml@^1.7.2:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
   integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
 
-yargs-parser@13.1.2, yargs-parser@^13.0.0, yargs-parser@^13.1.2:
-  version "13.1.2"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
-  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs-parser@^20.2.3:
-  version "20.2.9"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
-  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
-
-yargs-parser@^21.1.1:
-  version "21.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
-  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
-
-yargs-unparser@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.6.0.tgz#ef25c2c769ff6bd09e4b0f9d7c605fb27846ea9f"
-  integrity sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==
-  dependencies:
-    flat "^4.1.0"
-    lodash "^4.17.15"
-    yargs "^13.3.0"
-
-yargs@13.3.2, yargs@^13.2.2, yargs@^13.3.0:
-  version "13.3.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
-  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
-  dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.2"
-
-yargs@^17.2.1:
-  version "17.7.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
-  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
-  dependencies:
-    cliui "^8.0.1"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.3"
-    y18n "^5.0.5"
-    yargs-parser "^21.1.1"
-
 yn@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
@@ -11103,11 +7091,6 @@ yocto-queue@^0.1.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
-yocto-queue@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
-  integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
-
 yup@^1.0.2:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/yup/-/yup-1.4.0.tgz#898dcd660f9fb97c41f181839d3d65c3ee15a43e"