diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
index c8eb3d452c..7a9b75d3d3 100644
--- a/.github/workflows/audit.yml
+++ b/.github/workflows/audit.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: "18"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
diff --git a/.github/workflows/bf-applicant-frontend-tests.yml b/.github/workflows/bf-applicant-frontend-tests.yml
index 251c268d96..6c3326332f 100644
--- a/.github/workflows/bf-applicant-frontend-tests.yml
+++ b/.github/workflows/bf-applicant-frontend-tests.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16"
+          node-version: "18"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
@@ -52,7 +52,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16"
+          node-version: "18"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
@@ -68,4 +68,4 @@ jobs:
       - name: Check that building dev application works
         env:
           NEXTJS_DISABLE_SENTRY: true
-        run: yarn build
+        run: NODE_OPTIONS=--openssl-legacy-provider yarn build
diff --git a/.github/workflows/bf-handler-frontend-tests.yml b/.github/workflows/bf-handler-frontend-tests.yml
index 0c50506891..9596a69797 100644
--- a/.github/workflows/bf-handler-frontend-tests.yml
+++ b/.github/workflows/bf-handler-frontend-tests.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16"
+          node-version: "18"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
@@ -52,7 +52,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16"
+          node-version: "18"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
@@ -68,4 +68,4 @@ jobs:
       - name: Check that building dev application works
         env:
           NEXTJS_DISABLE_SENTRY: true
-        run: yarn build
+        run: NODE_OPTIONS=--openssl-legacy-provider yarn build
diff --git a/.github/workflows/bf-review.yml b/.github/workflows/bf-review.yml
index 8ef45cf3a7..bcb6647e5e 100644
--- a/.github/workflows/bf-review.yml
+++ b/.github/workflows/bf-review.yml
@@ -238,7 +238,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16"
+          node-version: "18"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
diff --git a/.github/workflows/bf-shared-frontend-tests.yml b/.github/workflows/bf-shared-frontend-tests.yml
index 03f5dfa07d..6cfa4d0f96 100644
--- a/.github/workflows/bf-shared-frontend-tests.yml
+++ b/.github/workflows/bf-shared-frontend-tests.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16"
+          node-version: "18"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
diff --git a/.github/workflows/ks-empl-frontend-tests.yml b/.github/workflows/ks-empl-frontend-tests.yml
index dfb9bc36fb..b6e75f0e5a 100644
--- a/.github/workflows/ks-empl-frontend-tests.yml
+++ b/.github/workflows/ks-empl-frontend-tests.yml
@@ -2,14 +2,14 @@ name: (KS Employer) Frontend Lint, Unit and Component tests
 
 on:
   push:
-    branches: [ develop, main ]
+    branches: [develop, main]
   pull_request:
     paths:
-      - 'frontend/shared/**'
-      - 'frontend/kesaseteli/shared/**'
-      - 'frontend/kesaseteli/employer/**'
-      - 'frontend/*'
-      - '.github/workflows/ks-empl-frontend-tests.yml'
+      - "frontend/shared/**"
+      - "frontend/kesaseteli/shared/**"
+      - "frontend/kesaseteli/employer/**"
+      - "frontend/*"
+      - ".github/workflows/ks-empl-frontend-tests.yml"
       - "!**/browser-tests/**"
       - "!**/README.md"
   workflow_dispatch:
@@ -25,7 +25,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: "18"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
@@ -63,7 +63,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: "18"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
@@ -79,7 +79,7 @@ jobs:
       - name: Check that building dev application works
         env:
           NEXTJS_DISABLE_SENTRY: true
-        run: yarn build
+        run: NODE_OPTIONS=--openssl-legacy-provider yarn build
       - name: Frontend build failure slack notification
         uses: rtCamp/action-slack-notify@v2
         env:
diff --git a/.github/workflows/ks-handler-frontend-tests.yml b/.github/workflows/ks-handler-frontend-tests.yml
index d15e7da6a3..aae9af617d 100644
--- a/.github/workflows/ks-handler-frontend-tests.yml
+++ b/.github/workflows/ks-handler-frontend-tests.yml
@@ -2,14 +2,14 @@ name: (KS Handler) Frontend Lint, Unit and Component tests
 
 on:
   push:
-    branches: [ develop, main ]
+    branches: [develop, main]
   pull_request:
     paths:
-      - 'frontend/shared/**'
-      - 'frontend/kesaseteli/shared/**'
-      - 'frontend/kesaseteli/handler/**'
-      - 'frontend/*'
-      - '.github/workflows/ks-handler-frontend-tests.yml'
+      - "frontend/shared/**"
+      - "frontend/kesaseteli/shared/**"
+      - "frontend/kesaseteli/handler/**"
+      - "frontend/*"
+      - ".github/workflows/ks-handler-frontend-tests.yml"
       - "!**/browser-tests/**"
       - "!**/README.md"
   workflow_dispatch:
@@ -25,7 +25,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: "18"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
@@ -63,7 +63,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: "18"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
@@ -79,7 +79,7 @@ jobs:
       - name: Check that building dev application works
         env:
           NEXTJS_DISABLE_SENTRY: true
-        run: yarn build
+        run: NODE_OPTIONS=--openssl-legacy-provider yarn build
       - name: Frontend build failure slack notification
         uses: rtCamp/action-slack-notify@v2
         env:
diff --git a/.github/workflows/ks-review.yml b/.github/workflows/ks-review.yml
index 49151e01d6..a4588457b2 100644
--- a/.github/workflows/ks-review.yml
+++ b/.github/workflows/ks-review.yml
@@ -256,7 +256,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: "18"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
diff --git a/.github/workflows/ks-shared-frontend-tests.yml b/.github/workflows/ks-shared-frontend-tests.yml
index 272e4af157..39341ccd38 100644
--- a/.github/workflows/ks-shared-frontend-tests.yml
+++ b/.github/workflows/ks-shared-frontend-tests.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: "18"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
diff --git a/.github/workflows/ks-youth-frontend-tests.yml b/.github/workflows/ks-youth-frontend-tests.yml
index 1bc22fb856..8ba667154d 100644
--- a/.github/workflows/ks-youth-frontend-tests.yml
+++ b/.github/workflows/ks-youth-frontend-tests.yml
@@ -2,14 +2,14 @@ name: (KS Youth) Frontend Lint, Unit and Component tests
 
 on:
   push:
-    branches: [ develop, main ]
+    branches: [develop, main]
   pull_request:
     paths:
-      - 'frontend/shared/**'
-      - 'frontend/kesaseteli/shared/**'
-      - 'frontend/kesaseteli/youth/**'
-      - 'frontend/*'
-      - '.github/workflows/ks-youth-frontend-tests.yml'
+      - "frontend/shared/**"
+      - "frontend/kesaseteli/shared/**"
+      - "frontend/kesaseteli/youth/**"
+      - "frontend/*"
+      - ".github/workflows/ks-youth-frontend-tests.yml"
       - "!**/browser-tests/**"
       - "!**/README.md"
   workflow_dispatch:
@@ -25,7 +25,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: "18"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
@@ -63,7 +63,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: "18"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
@@ -79,7 +79,7 @@ jobs:
       - name: Check that building dev application works
         env:
           NEXTJS_DISABLE_SENTRY: true
-        run: yarn build
+        run: NODE_OPTIONS=--openssl-legacy-provider yarn build
       - name: Frontend build failure slack notification
         uses: rtCamp/action-slack-notify@v2
         env:
diff --git a/.github/workflows/shared-frontend-tests.yml b/.github/workflows/shared-frontend-tests.yml
index 1b6faeeaf0..45317f81bc 100644
--- a/.github/workflows/shared-frontend-tests.yml
+++ b/.github/workflows/shared-frontend-tests.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: "18"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
diff --git a/.github/workflows/te-admn-frontend-tests.yml b/.github/workflows/te-admn-frontend-tests.yml
index 227d992fcf..9b8b1a4143 100644
--- a/.github/workflows/te-admn-frontend-tests.yml
+++ b/.github/workflows/te-admn-frontend-tests.yml
@@ -2,13 +2,13 @@ name: (TET) Admin Frontend Lint, Unit and Component tests
 
 on:
   push:
-    branches: [ develop, main ]
+    branches: [develop, main]
   pull_request:
     paths:
-      - 'frontend/shared/**'
-      - 'frontend/tet/admin/**'
-      - 'frontend/*'
-      - '.github/workflows/te-admn-frontend-tests.yml'
+      - "frontend/shared/**"
+      - "frontend/tet/admin/**"
+      - "frontend/*"
+      - ".github/workflows/te-admn-frontend-tests.yml"
       - "!**/browser-tests/**"
       - "!**/README.md"
   workflow_dispatch:
@@ -24,7 +24,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: "18"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
@@ -62,7 +62,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: "18"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
@@ -78,7 +78,7 @@ jobs:
       - name: Check that building dev application works
         env:
           NEXTJS_DISABLE_SENTRY: true
-        run: yarn build
+        run: NODE_OPTIONS=--openssl-legacy-provider yarn build
       - name: Frontend build failure slack notification
         uses: rtCamp/action-slack-notify@v2
         env:
diff --git a/.github/workflows/te-review.yml b/.github/workflows/te-review.yml
index a1fee5245a..da23cec1e2 100644
--- a/.github/workflows/te-review.yml
+++ b/.github/workflows/te-review.yml
@@ -247,7 +247,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: "18"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
diff --git a/.github/workflows/te-shared-frontend-tests.yml b/.github/workflows/te-shared-frontend-tests.yml
index 1a38d7038e..6700d9c690 100644
--- a/.github/workflows/te-shared-frontend-tests.yml
+++ b/.github/workflows/te-shared-frontend-tests.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: "18"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
diff --git a/.github/workflows/te-yout-frontend-tests.yml b/.github/workflows/te-yout-frontend-tests.yml
index 65592e4390..989b9b13ff 100644
--- a/.github/workflows/te-yout-frontend-tests.yml
+++ b/.github/workflows/te-yout-frontend-tests.yml
@@ -2,13 +2,13 @@ name: (TET) Youth Frontend Lint, Unit and Component tests
 
 on:
   push:
-    branches: [ develop, main ]
+    branches: [develop, main]
   pull_request:
     paths:
-      - 'frontend/shared/**'
-      - 'frontend/*'
-      - 'frontend/tet/**'
-      - '.github/workflows/te-yout-frontend-tests.yml'
+      - "frontend/shared/**"
+      - "frontend/*"
+      - "frontend/tet/**"
+      - ".github/workflows/te-yout-frontend-tests.yml"
       - "!**/browser-tests/**"
       - "!**/README.md"
   workflow_dispatch:
@@ -24,7 +24,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: "18"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
@@ -62,7 +62,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: "18"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
@@ -78,7 +78,7 @@ jobs:
       - name: Check that building dev application works
         env:
           NEXTJS_DISABLE_SENTRY: true
-        run: yarn build
+        run: NODE_OPTIONS=--openssl-legacy-provider yarn build
       - name: Frontend build failure slack notification
         uses: rtCamp/action-slack-notify@v2
         env:
diff --git a/.github/workflows/yarn-audit-scheduled.yml b/.github/workflows/yarn-audit-scheduled.yml
index 0c567a606c..ad180fb4b5 100644
--- a/.github/workflows/yarn-audit-scheduled.yml
+++ b/.github/workflows/yarn-audit-scheduled.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: "18"
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
diff --git a/README.md b/README.md
index 069b3659cf..d0c542523d 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ This monorepo contains code for four different employment services:
 ## Requirements
 
 * Docker@^19.03.0 (or higher)
-* NodeJS@^16.19.0
+* NodeJS@^18.16.0
 * Yarn@^1.22
 
 ---
diff --git a/backend/benefit/applications/api/v1/review_state_views.py b/backend/benefit/applications/api/v1/review_state_views.py
new file mode 100644
index 0000000000..348f5cb0d5
--- /dev/null
+++ b/backend/benefit/applications/api/v1/review_state_views.py
@@ -0,0 +1,34 @@
+from rest_framework import status
+from rest_framework.response import Response
+from rest_framework.views import APIView
+
+from applications.api.v1.serializers.review_state import ReviewStateSerializer
+from applications.models import Application, ReviewState
+from common.permissions import BFIsHandler
+
+
+class ReviewStateView(APIView):
+    permission_classes = [BFIsHandler]
+
+    def get(self, _, application_id):
+        try:
+            review_state = ReviewState.objects.get(application=application_id)
+        except ReviewState.DoesNotExist:
+            application = Application.objects.get(id=application_id)
+            if application:
+                review_state = ReviewState.objects.create(application=application)
+            else:
+                return Response(status=status.HTTP_404_NOT_FOUND)
+        serializer = ReviewStateSerializer(review_state)
+        return Response(serializer.data)
+
+    def put(self, request, application_id):
+        try:
+            review_state = ReviewState.objects.get(application=application_id)
+        except ReviewState.DoesNotExist:
+            return Response(status=status.HTTP_404_NOT_FOUND)
+        serializer = ReviewStateSerializer(review_state, data=request.data)
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
diff --git a/backend/benefit/applications/api/v1/serializers/review_state.py b/backend/benefit/applications/api/v1/serializers/review_state.py
new file mode 100644
index 0000000000..2518e1b1b1
--- /dev/null
+++ b/backend/benefit/applications/api/v1/serializers/review_state.py
@@ -0,0 +1,9 @@
+from rest_framework import serializers
+
+from applications.models import ReviewState
+
+
+class ReviewStateSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = ReviewState
+        fields = "__all__"
diff --git a/backend/benefit/applications/migrations/0036_alter_employee_working_hours.py b/backend/benefit/applications/migrations/0036_alter_employee_working_hours.py
new file mode 100644
index 0000000000..4d16ce4848
--- /dev/null
+++ b/backend/benefit/applications/migrations/0036_alter_employee_working_hours.py
@@ -0,0 +1,21 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("applications", "0035_alter_applicationbatch_handler"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="employee",
+            name="working_hours",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=2,
+                max_digits=5,
+                null=True,
+                verbose_name="working hour",
+            ),
+        ),
+    ]
diff --git a/backend/benefit/applications/migrations/0037_reviewstate.py b/backend/benefit/applications/migrations/0037_reviewstate.py
new file mode 100644
index 0000000000..fa9b8e46d1
--- /dev/null
+++ b/backend/benefit/applications/migrations/0037_reviewstate.py
@@ -0,0 +1,28 @@
+# Generated by Django 3.2.18 on 2023-07-19 20:52
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('applications', '0036_alter_employee_working_hours'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ReviewState',
+            fields=[
+                ('application', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='applications.application', verbose_name='application')),
+                ('company', models.BooleanField(default=False, verbose_name='company')),
+                ('company_contact_person', models.BooleanField(default=False, verbose_name='company contact person')),
+                ('de_minimis_aids', models.BooleanField(default=False, verbose_name='de minimis aids')),
+                ('co_operation_negotiations', models.BooleanField(default=False, verbose_name='co-operation negotiations')),
+                ('employee', models.BooleanField(default=False, verbose_name='employee')),
+                ('pay_subsidy', models.BooleanField(default=False, verbose_name='pay subsidy')),
+                ('benefit', models.BooleanField(default=False, verbose_name='benefit')),
+                ('employment', models.BooleanField(default=False, verbose_name='employment')),
+            ],
+        ),
+    ]
diff --git a/backend/benefit/applications/migrations/0038_reviewstate_approval.py b/backend/benefit/applications/migrations/0038_reviewstate_approval.py
new file mode 100644
index 0000000000..75181c6d73
--- /dev/null
+++ b/backend/benefit/applications/migrations/0038_reviewstate_approval.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.18 on 2023-08-16 16:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('applications', '0037_reviewstate'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='reviewstate',
+            name='approval',
+            field=models.BooleanField(default=False, verbose_name='approval'),
+        ),
+    ]
diff --git a/backend/benefit/applications/migrations/0039_alter_paysubsidy_percentages.py b/backend/benefit/applications/migrations/0039_alter_paysubsidy_percentages.py
new file mode 100644
index 0000000000..9339abf11f
--- /dev/null
+++ b/backend/benefit/applications/migrations/0039_alter_paysubsidy_percentages.py
@@ -0,0 +1,33 @@
+# Generated by Django 3.2.18 on 2023-08-24 11:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('applications', '0038_reviewstate_approval'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='application',
+            name='additional_pay_subsidy_percent',
+            field=models.IntegerField(blank=True, choices=[(50, '50%'), (70, '70%'), (100, '100%')], null=True, verbose_name='Pay subsidy percent for second pay subsidy grant'),
+        ),
+        migrations.AlterField(
+            model_name='application',
+            name='pay_subsidy_percent',
+            field=models.IntegerField(blank=True, choices=[(50, '50%'), (70, '70%'), (100, '100%')], null=True, verbose_name='Pay subsidy percent'),
+        ),
+        migrations.AlterField(
+            model_name='historicalapplication',
+            name='additional_pay_subsidy_percent',
+            field=models.IntegerField(blank=True, choices=[(50, '50%'), (70, '70%'), (100, '100%')], null=True, verbose_name='Pay subsidy percent for second pay subsidy grant'),
+        ),
+        migrations.AlterField(
+            model_name='historicalapplication',
+            name='pay_subsidy_percent',
+            field=models.IntegerField(blank=True, choices=[(50, '50%'), (70, '70%'), (100, '100%')], null=True, verbose_name='Pay subsidy percent'),
+        ),
+    ]
diff --git a/backend/benefit/applications/models.py b/backend/benefit/applications/models.py
index 6aa2f676c2..2375d33364 100755
--- a/backend/benefit/applications/models.py
+++ b/backend/benefit/applications/models.py
@@ -38,9 +38,8 @@
 )
 
 PAY_SUBSIDY_PERCENT_CHOICES = (
-    (30, "30%"),
-    (40, "40%"),
     (50, "50%"),
+    (70, "70%"),
     (100, "100%"),
 )
 
@@ -580,18 +579,24 @@ def raise_error():
                 self.decision_maker_name,
                 self.section_of_the_law,
                 validate_decision_date(self.decision_date),
+            ]
+
+            required_fields_accepted_ahjo = required_fields_rejected + [
                 self.expert_inspector_name,
                 self.expert_inspector_title,
+                self.p2p_checker_name,
             ]
 
-            required_fields_accepted = required_fields_rejected + [
+            required_fields_accepted_p2p = required_fields_rejected + [
                 self.p2p_inspector_name,
                 self.p2p_inspector_email,
                 self.p2p_checker_name,
             ]
 
-            if self.status == ApplicationBatchStatus.DECIDED_ACCEPTED and not all(
-                required_fields_accepted
+            if (
+                self.status == ApplicationBatchStatus.DECIDED_ACCEPTED
+                and not all(required_fields_accepted_ahjo)
+                and not all(required_fields_accepted_p2p)
             ):
                 raise_error()
             if self.status == ApplicationBatchStatus.DECIDED_REJECTED and not all(
@@ -753,8 +758,8 @@ class Employee(UUIDModel, TimeStampedModel):
     )
     working_hours = models.DecimalField(
         verbose_name=_("working hour"),
-        decimal_places=1,
-        max_digits=4,
+        decimal_places=2,
+        max_digits=5,
         blank=True,
         null=True,
     )
@@ -827,3 +832,27 @@ class Meta:
 
     def __str__(self):
         return "{} {}".format(self.attachment_type, self.attachment_file.name)
+
+
+class ReviewState(models.Model):
+    application = models.OneToOneField(
+        Application,
+        on_delete=models.CASCADE,
+        primary_key=True,
+        verbose_name=_("application"),
+    )
+    company = models.BooleanField(default=False, verbose_name=_("company"))
+    company_contact_person = models.BooleanField(
+        default=False, verbose_name=_("company contact person")
+    )
+    de_minimis_aids = models.BooleanField(
+        default=False, verbose_name=_("de minimis aids")
+    )
+    co_operation_negotiations = models.BooleanField(
+        default=False, verbose_name=_("co-operation negotiations")
+    )
+    employee = models.BooleanField(default=False, verbose_name=_("employee"))
+    pay_subsidy = models.BooleanField(default=False, verbose_name=_("pay subsidy"))
+    benefit = models.BooleanField(default=False, verbose_name=_("benefit"))
+    employment = models.BooleanField(default=False, verbose_name=_("employment"))
+    approval = models.BooleanField(default=False, verbose_name=_("approval"))
diff --git a/backend/benefit/applications/tests/test_ahjo_integration.py b/backend/benefit/applications/tests/test_ahjo_integration.py
index ebceac356b..5de4fdae45 100644
--- a/backend/benefit/applications/tests/test_ahjo_integration.py
+++ b/backend/benefit/applications/tests/test_ahjo_integration.py
@@ -248,7 +248,7 @@ def test_multiple_benefit_per_application(mock_pdf_convert):
         override_monthly_benefit_amount=None,
     )
     pay_subsidy = PaySubsidyFactory(
-        pay_subsidy_percent=40, start_date=date(2021, 7, 10), end_date=date(2021, 9, 10)
+        pay_subsidy_percent=50, start_date=date(2021, 7, 10), end_date=date(2021, 9, 10)
     )
     application.pay_subsidies.add(pay_subsidy)
     application.save()
@@ -262,15 +262,17 @@ def test_multiple_benefit_per_application(mock_pdf_convert):
     assert (
         html.count(application.ahjo_application_number) == 2
     )  # Make sure there are two rows in the report
+    print(html)
     _assert_html_content(
         html,
         (
             application.ahjo_application_number,
             application.employee.first_name,
             application.employee.last_name,
-            "691",
-            "340",
+            "440",
+            "893",
             "1600",
             "800",
+            "2493",
         ),
     )
diff --git a/backend/benefit/applications/tests/test_application_batch_api.py b/backend/benefit/applications/tests/test_application_batch_api.py
index f53db2ec46..dc16718543 100755
--- a/backend/benefit/applications/tests/test_application_batch_api.py
+++ b/backend/benefit/applications/tests/test_application_batch_api.py
@@ -39,6 +39,30 @@ def get_valid_batch_completion_data():
     }
 
 
+def get_valid_p2p_batch_completion_data():
+    return {
+        "decision_maker_title": get_faker().job(),
+        "decision_maker_name": get_faker().name(),
+        "section_of_the_law": "$1234",
+        "decision_date": date.today(),
+        "p2p_inspector_name": get_faker().name(),
+        "p2p_inspector_email": get_faker().email(),
+        "p2p_checker_name": get_faker().name(),
+    }
+
+
+def get_valid_ahjo_batch_completion_data():
+    return {
+        "decision_maker_title": get_faker().job(),
+        "decision_maker_name": get_faker().name(),
+        "section_of_the_law": "$1234",
+        "decision_date": date.today(),
+        "expert_inspector_name": get_faker().name(),
+        "expert_inspector_title": get_faker().job(),
+        "p2p_checker_name": get_faker().name(),
+    }
+
+
 def fill_as_valid_batch_completion_and_save(
     batch: ApplicationBatch, status: ApplicationBatchStatus = None
 ):
@@ -314,6 +338,14 @@ def test_batch_too_many_drafts(application_batch):
 def test_batch_status_decided(
     handler_api_client, application_batch, batch_status, delta_months, delta_days
 ):
+    def remove_inspection_data_from_batch(batch):
+        batch.p2p_inspector_name = ""
+        batch.p2p_inspector_email = ""
+        batch.p2p_checker_name = ""
+        batch.expert_inspector_name = ""
+        batch.expert_inspector_title = ""
+        batch.save()
+
     url = get_batch_detail_url(application_batch, "status/")
     payload = get_valid_batch_completion_data()
     payload["status"] = batch_status
@@ -330,6 +362,22 @@ def test_batch_status_decided(
     response = handler_api_client.patch(url, payload)
     assert response.status_code == 200
 
+    # Use Ahjo inspector
+    remove_inspection_data_from_batch(application_batch)
+    payload = get_valid_ahjo_batch_completion_data()
+    payload["decision_date"] = date.today() + relativedelta(months=(delta_months))
+    payload["status"] = batch_status
+    response = handler_api_client.patch(url, payload)
+    assert response.status_code == 200
+
+    # Use Talpa/P2P inspector
+    remove_inspection_data_from_batch(application_batch)
+    payload = get_valid_p2p_batch_completion_data()
+    payload["status"] = batch_status
+    payload["decision_date"] = date.today() + relativedelta(months=(delta_months))
+    response = handler_api_client.patch(url, payload)
+    assert response.status_code == 200
+
 
 @pytest.mark.parametrize(
     "status,batch_status,expected_decision",
diff --git a/backend/benefit/applications/tests/test_applications_api.py b/backend/benefit/applications/tests/test_applications_api.py
index 27782c5474..0dedc0f3b3 100755
--- a/backend/benefit/applications/tests/test_applications_api.py
+++ b/backend/benefit/applications/tests/test_applications_api.py
@@ -1455,7 +1455,7 @@ def test_application_modified_at_non_draft(api_client, application, status):
     [
         (None, None, None, 200),  # empty application
         (True, 50, None, 200),  # one pay subsidy
-        (True, 100, 30, 200),  # two pay subsidies
+        (True, 100, 30, 400),  # two pay subsidies
         (None, 100, None, 400),  # invalid
         (True, None, 50, 400),  # invalid percent
         (True, 99, None, 400),  # invalid choice
diff --git a/backend/benefit/calculator/migrations/0013_alter_paysubsidy_percentages.py b/backend/benefit/calculator/migrations/0013_alter_paysubsidy_percentages.py
new file mode 100644
index 0000000000..60a3da5799
--- /dev/null
+++ b/backend/benefit/calculator/migrations/0013_alter_paysubsidy_percentages.py
@@ -0,0 +1,33 @@
+# Generated by Django 3.2.18 on 2023-08-24 11:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('calculator', '0012_history_date_format_changes'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='calculation',
+            name='state_aid_max_percentage',
+            field=models.IntegerField(blank=True, choices=[(50, '50%'), (70, '70%'), (100, '100%')], default=None, null=True, verbose_name='State aid maximum %'),
+        ),
+        migrations.AlterField(
+            model_name='historicalcalculation',
+            name='state_aid_max_percentage',
+            field=models.IntegerField(blank=True, choices=[(50, '50%'), (70, '70%'), (100, '100%')], default=None, null=True, verbose_name='State aid maximum %'),
+        ),
+        migrations.AlterField(
+            model_name='historicalpaysubsidy',
+            name='pay_subsidy_percent',
+            field=models.IntegerField(choices=[(50, '50%'), (70, '70%'), (100, '100%')], verbose_name='Pay subsidy percent'),
+        ),
+        migrations.AlterField(
+            model_name='paysubsidy',
+            name='pay_subsidy_percent',
+            field=models.IntegerField(choices=[(50, '50%'), (70, '70%'), (100, '100%')], verbose_name='Pay subsidy percent'),
+        ),
+    ]
diff --git a/backend/benefit/calculator/models.py b/backend/benefit/calculator/models.py
index e05a070422..a42afa84eb 100644
--- a/backend/benefit/calculator/models.py
+++ b/backend/benefit/calculator/models.py
@@ -24,6 +24,7 @@
 
 STATE_AID_MAX_PERCENTAGE_CHOICES = (
     (50, "50%"),
+    (70, "70%"),
     (100, "100%"),
 )
 
@@ -527,10 +528,13 @@ class SalaryCostsRow(CalculationRow):
     proxy_row_type = RowType.SALARY_COSTS_EUR
     description_fi_template = "Palkkakustannukset / kk"
 
+    """Calculate the amount of salary costs for the application.
+    Notice that the vacation money is reported per month by the applicant."""
+
     def calculate_amount(self):
         return (
             self.calculation.monthly_pay
-            + self.calculation.vacation_money / self.calculation.duration_in_months
+            + self.calculation.vacation_money
             + self.calculation.other_expenses
         )
 
@@ -555,7 +559,7 @@ class Meta:
 
 class PaySubsidyMonthlyRow(CalculationRow):
     proxy_row_type = RowType.PAY_SUBSIDY_MONTHLY_EUR
-    description_fi_template = "Palkkatuki (enintään {row.max_subsidy} €)"
+    description_fi_template = "Palkkatuki"
 
     """
     Special rule regarding a 100% pay subsidy. The 100% subsidy is limited so, that it's only possible
@@ -566,9 +570,10 @@ class PaySubsidyMonthlyRow(CalculationRow):
     * vacation money = 498,85
     * 100% pay subsidy has been granted for 6 months
     * Pay subsidy is calcuated using formula:
-      min(1800, (monthly_pay+additional_expenses)/0.8*0.65) + vacation_money/6/0.8*0.65
+      min(2020, (monthly_pay / work_time_fraction * 0.65) * 1.23
     """
     MAX_WORK_TIME_FRACTION_FOR_FULL_PAY_SUBSIDY = decimal.Decimal("0.65")
+    GROSS_WAGE_COEFFICIENT_FOR_FULL_PAY_SUBSIDY = decimal.Decimal("1.23")
 
     def __init__(self, *args, **kwargs):
         self.pay_subsidy = kwargs.pop("pay_subsidy", None)
@@ -577,10 +582,7 @@ def __init__(self, *args, **kwargs):
 
     def calculate_amount(self):
         """
-        Rule regarding the vacation money:
-        "Palkkatuen enimmäismäärä yritykselle vuonna 2021 on 1400 €/kk, jonka lisäksi maksetaan enintään
-        palkkatukipäätöksen mukainen prosenttiosuus lomarahasta."
-        Therefore, the pay subsidy limit does not apply to the vacation_money
+        1.7.2023 voimaantulevan lain mukaan lomarahaa ja sivukuluja ei oteta enää huomioon palkkatuen määrää laskiessa
         """
         assert self.max_subsidy is not None
         assert self.pay_subsidy is not None
@@ -592,39 +594,23 @@ def calculate_amount(self):
         pay_subsidy_fraction = self.pay_subsidy.pay_subsidy_percent * decimal.Decimal(
             "0.01"
         )
-
-        if (
-            pay_subsidy_fraction == 1
-            and work_time_fraction > self.MAX_WORK_TIME_FRACTION_FOR_FULL_PAY_SUBSIDY
-        ):
-            full_time_salary_cost_excluding_vacation_money = (
-                self.calculation.monthly_pay + self.calculation.other_expenses
-            ) / work_time_fraction
-            full_time_vacation_money = (
-                self.calculation.vacation_money / work_time_fraction
-            ) / self.calculation.duration_in_months
-            subsidy_amount = (
-                min(
-                    self.max_subsidy,
-                    full_time_salary_cost_excluding_vacation_money
-                    * self.MAX_WORK_TIME_FRACTION_FOR_FULL_PAY_SUBSIDY,
+        # Pay subsidy max is 100%:
+        if pay_subsidy_fraction == 1:
+            full_time_salary_cost = (self.calculation.monthly_pay) / work_time_fraction
+
+            subsidy_amount = min(
+                self.max_subsidy,
+                (
+                    full_time_salary_cost
+                    * self.MAX_WORK_TIME_FRACTION_FOR_FULL_PAY_SUBSIDY
                 )
-                + full_time_vacation_money
-                * self.MAX_WORK_TIME_FRACTION_FOR_FULL_PAY_SUBSIDY
+                * self.GROSS_WAGE_COEFFICIENT_FOR_FULL_PAY_SUBSIDY,
             )
+        # Pay subsidy max is less than 100% (50% or 70%):
         else:
-            salary_cost_excluding_vacation_money = (
-                self.calculation.monthly_pay + self.calculation.other_expenses
-            )
-            monthly_vacation_money = (
-                self.calculation.vacation_money / self.calculation.duration_in_months
-            )
-            subsidy_amount = (
-                min(
-                    self.max_subsidy,
-                    pay_subsidy_fraction * salary_cost_excluding_vacation_money,
-                )
-                + monthly_vacation_money * pay_subsidy_fraction
+            subsidy_amount = min(
+                self.max_subsidy,
+                pay_subsidy_fraction * self.calculation.monthly_pay,
             )
         return subsidy_amount
 
@@ -674,7 +660,7 @@ class Meta:
 
 class SalaryBenefitMonthlyRow(CalculationRow):
     proxy_row_type = RowType.HELSINKI_BENEFIT_MONTHLY_EUR
-    description_fi_template = "Helsinki-lisä / kk (enintään {row.max_benefit} €)"
+    description_fi_template = "Helsinki-lisä / kk"
 
     def __init__(self, *args, **kwargs):
         self.max_benefit = kwargs.pop("max_benefit", None)
@@ -733,7 +719,7 @@ class SalaryBenefitTotalRow(CalculationRow, TotalRowMixin):
 
     def calculate_amount(self):
         return to_decimal(
-            self.calculation.duration_in_months
+            self.calculation.duration_in_months_rounded
             * self.calculation.calculator.get_amount(
                 RowType.HELSINKI_BENEFIT_MONTHLY_EUR
             ),
@@ -753,7 +739,7 @@ def __init__(self, *args, **kwargs):
 
     def calculate_amount(self):
         return to_decimal(
-            duration_in_months(self.start_date, self.end_date)
+            duration_in_months(self.start_date, self.end_date, 2)
             * self.calculation.calculator.get_amount(
                 RowType.HELSINKI_BENEFIT_MONTHLY_EUR
             ),
diff --git a/backend/benefit/calculator/rules.py b/backend/benefit/calculator/rules.py
index cecf369e45..386d86eb00 100644
--- a/backend/benefit/calculator/rules.py
+++ b/backend/benefit/calculator/rules.py
@@ -2,12 +2,15 @@
 import datetime
 import decimal
 import logging
+from typing import Union
 
 from django.db import transaction
 
 from applications.enums import ApplicationStatus, BenefitType
 from calculator.enums import RowType
 from calculator.models import (
+    Calculation,
+    CalculationRow,
     DateRangeDescriptionRow,
     DescriptionRow,
     EmployeeBenefitMonthlyRow,
@@ -34,17 +37,17 @@
 
 
 class HelsinkiBenefitCalculator:
-    def __init__(self, calculation):
+    def __init__(self, calculation: Calculation):
         self.calculation = calculation
         self._row_counter = 0
 
     @staticmethod
-    def get_calculator(calculation):
+    def get_calculator(calculation: Calculation):
         # in future, one might use e.g. application date to determine the correct calculator
         if calculation.override_monthly_benefit_amount is not None:
             return ManualOverrideCalculator(calculation)
         elif calculation.application.benefit_type == BenefitType.SALARY_BENEFIT:
-            return SalaryBenefitCalculator2021(calculation)
+            return SalaryBenefitCalculator2023(calculation)
         elif calculation.application.benefit_type == BenefitType.EMPLOYMENT_BENEFIT:
             return EmployeeBenefitCalculator2021(calculation)
         else:
@@ -77,7 +80,12 @@ def get_sub_total_ranges(self):
                 # change day is the day after end_date
                 change_days.add(item.end_date + datetime.timedelta(days=1))
 
-        def get_item_in_effect(items, day):
+        def get_item_in_effect(
+            items: list[PaySubsidy], day: datetime.date
+        ) -> Union[PaySubsidy, None]:
+            # Return the first item in the list whose start date is less than or equal to the given day,
+            # and whose end date is greater than or equal to the given day.
+            # If no such item is found, it returns None.
             for item in items:
                 if item.start_date <= day <= item.end_date:
                     return item
@@ -102,7 +110,7 @@ def get_item_in_effect(items, day):
         assert ranges[-1].end_date == self.calculation.end_date
         return ranges
 
-    def get_amount(self, row_type, default=None):
+    def get_amount(self, row_type: RowType, default=None):
         # This function is used by the various CalculationRow to retrieve a previously calculated value
         row = (
             self.calculation.rows.order_by("-ordering")
@@ -146,7 +154,7 @@ def calculate(self):
                 self.calculation.calculated_benefit_amount = None
             self.calculation.save()
 
-    def _create_row(self, row_class, **kwargs):
+    def _create_row(self, row_class: CalculationRow, **kwargs):
         row = row_class(
             calculation=self.calculation, ordering=self._row_counter, **kwargs
         )
@@ -169,7 +177,7 @@ def create_rows(self):
             SalaryBenefitTotalRow,
         )
 
-    def get_amount(self, row_type, default=None):
+    def get_amount(self, row_type: RowType, default=None):
         return decimal.Decimal(0)
 
 
@@ -182,14 +190,15 @@ def create_rows(self):
         )
 
 
-class SalaryBenefitCalculator2021(HelsinkiBenefitCalculator):
+class SalaryBenefitCalculator2023(HelsinkiBenefitCalculator):
     """
-    Calculation of salary benefit, according to rules in effect 2021 (and possibly onwards)
+    Calculation of salary benefit, according to rules in effect starting from 1.7.2023
     """
 
     # The maximum amount of pay subsidy depends on the pay subsidy percent in the pay subsidy decision.
-    PAY_SUBSIDY_MAX_FOR_100_PERCENT = 1800
-    DEFAULT_PAY_SUBSIDY_MAX = 1400
+    PAY_SUBSIDY_MAX_FOR_100_PERCENT = 2020
+    PAY_SUBSIDY_MAX_FOR_70_PERCENT = 1770
+    PAY_SUBSIDY_MAX_FOR_50_PERCENT = 1260
     SALARY_BENEFIT_MAX = 800
 
     def can_calculate(self):
@@ -209,10 +218,14 @@ def can_calculate(self):
     def get_maximum_monthly_pay_subsidy(self, pay_subsidy):
         if pay_subsidy.pay_subsidy_percent == 100:
             return self.PAY_SUBSIDY_MAX_FOR_100_PERCENT
+        elif pay_subsidy.pay_subsidy_percent == 70:
+            return self.PAY_SUBSIDY_MAX_FOR_70_PERCENT
         else:
-            return self.DEFAULT_PAY_SUBSIDY_MAX
+            return self.PAY_SUBSIDY_MAX_FOR_50_PERCENT
 
     def create_deduction_rows(self, benefit_sub_range):
+        # Create the rows for the calculation
+        # that display the deduction amounts for pay subsidy and training compensation
         if benefit_sub_range.pay_subsidy or benefit_sub_range.training_compensation:
             self._create_row(
                 DescriptionRow,
diff --git a/backend/benefit/calculator/tests/Helsinki-lisa laskurin testitapaukset.xlsx b/backend/benefit/calculator/tests/Helsinki-lisa laskurin testitapaukset.xlsx
index b33f7eb204..cbb0ee9de7 100644
Binary files a/backend/benefit/calculator/tests/Helsinki-lisa laskurin testitapaukset.xlsx and b/backend/benefit/calculator/tests/Helsinki-lisa laskurin testitapaukset.xlsx differ
diff --git a/backend/benefit/calculator/tests/test_calculator_api.py b/backend/benefit/calculator/tests/test_calculator_api.py
index 5a770d1354..0b0fe6b065 100644
--- a/backend/benefit/calculator/tests/test_calculator_api.py
+++ b/backend/benefit/calculator/tests/test_calculator_api.py
@@ -35,7 +35,7 @@ def _set_two_pay_subsidies_with_empty_dates(data: dict) -> dict:
         {
             "start_date": None,
             "end_date": None,
-            "pay_subsidy_percent": 40,
+            "pay_subsidy_percent": 70,
             "work_time_percent": 40,
         },
     ]
@@ -249,7 +249,7 @@ def test_modify_calculation_invalid_status(
         {
             "start_date": str(handling_application.start_date),
             "end_date": str(handling_application.end_date),
-            "pay_subsidy_percent": 40,
+            "pay_subsidy_percent": 50,
             "work_time_percent": "50.00",
         }
     ]
@@ -315,7 +315,7 @@ def test_application_edit_pay_subsidy(handler_api_client, handling_application):
 
     # edit fields
     data["pay_subsidies"][0]["start_date"] = "2021-06-01"
-    data["pay_subsidies"][0]["pay_subsidy_percent"] = 40
+    data["pay_subsidies"][0]["pay_subsidy_percent"] = 70
     # swap order
     data["pay_subsidies"][0], data["pay_subsidies"][1] = (
         data["pay_subsidies"][1],
@@ -328,7 +328,7 @@ def test_application_edit_pay_subsidy(handler_api_client, handling_application):
     assert response.status_code == 200
     assert len(response.data["pay_subsidies"]) == 2
     assert response.data["pay_subsidies"][1]["start_date"] == "2021-06-01"
-    assert response.data["pay_subsidies"][1]["pay_subsidy_percent"] == 40
+    assert response.data["pay_subsidies"][1]["pay_subsidy_percent"] == 70
 
 
 def test_application_delete_pay_subsidy(handler_api_client, handling_application):
@@ -472,7 +472,7 @@ def test_pay_subsidies_validation_in_handling(
             company=mock_get_organisation_roles_and_create_company,
             pay_subsidy_granted=True,
             pay_subsidy_percent=100,
-            additional_pay_subsidy_percent=40,
+            additional_pay_subsidy_percent=70,
         )
     data = HandlerApplicationSerializer(handling_application).data
     _set_two_pay_subsidies_with_empty_dates(data)
diff --git a/backend/benefit/calculator/tests/test_models.py b/backend/benefit/calculator/tests/test_models.py
index ca9d78ca03..6d85eaf90a 100644
--- a/backend/benefit/calculator/tests/test_models.py
+++ b/backend/benefit/calculator/tests/test_models.py
@@ -74,7 +74,7 @@ def test_create_for_application_fail(received_application):
 
 
 @pytest.mark.parametrize(
-    "pay_subsidy_percent, max_subsidy", [(40, 1400), (50, 1400), (100, 1800)]
+    "pay_subsidy_percent, max_subsidy", [(70, 1770), (50, 1260), (100, 2020)]
 )
 def test_pay_subsidy_maximum(handling_application, pay_subsidy_percent, max_subsidy):
     assert handling_application.pay_subsidies.count() == 1
diff --git a/backend/benefit/common/utils.py b/backend/benefit/common/utils.py
index 20e272be1d..23397d3065 100644
--- a/backend/benefit/common/utils.py
+++ b/backend/benefit/common/utils.py
@@ -2,6 +2,7 @@
 import functools
 import itertools
 from datetime import date, timedelta
+from typing import Iterator, Tuple, Union
 
 from dateutil.relativedelta import relativedelta
 from phonenumber_field.serializerfields import (
@@ -9,7 +10,27 @@
 )
 
 
-def update_object(obj, data, limit_to_fields=None):
+def update_object(obj: object, data: dict, limit_to_fields=None):
+    """
+    Updates the fields of an object with the provided data.
+
+    Args:
+        obj: The object to be updated.
+        data: A dictionary containing field-value pairs to update the object.
+        limit_to_fields (optional): A list of fields to limit the update to. Default is None.
+
+    Raises:
+        ValueError: If a field in the data is set to None but is not nullable according to the object's model.
+
+    Example:
+        user = User.objects.get(id=1)
+        data = {'name': 'John', 'age': 25}
+        update_object(user, data)
+
+    In the example above, the update_object function is used to update the 'name' and 'age' fields of a User object.
+    The function takes the User object, a data dictionary with field-value pairs, and updates the object accordingly.
+    The updated object is then saved.
+    """
     if not data:
         return
     for k, v in data.items():
@@ -21,7 +42,33 @@ def update_object(obj, data, limit_to_fields=None):
     obj.save()
 
 
-def xgroup(iter, n=2, check_length=False):
+def xgroup(iter, n=2, check_length=False) -> Iterator[Tuple]:
+    """
+    Groups elements from an iterable into tuples of size n.
+
+    Args:
+        iterable: The iterable to be grouped.
+        n (optional): The size of each group. Default is 2.
+        check_length (optional): Whether to check if the length of the iterable is divisible by n. Default is False.
+
+    Yields:
+        Tuples of size n containing elements from the iterable.
+
+    Raises:
+        AssertionError: If check_length is True and the length of the iterable is not divisible by n.
+
+    Example:
+        items = [1, 2, 3, 4, 5, 6]
+        for group in xgroup(items, 3):
+            print(group)
+
+        # Output:
+        # (1, 2, 3)
+        # (4, 5, 6)
+
+    In the example above, the xgroup function is used to group elements from a list into tuples of size 3.
+    Each tuple is then printed, demonstrating how the function can be used to iterate over groups of elements.
+    """
     """
     adapted from: comp.lang.python Thu Jun 5 22:58:05 CEST 2003
 
@@ -40,6 +87,30 @@ def xgroup(iter, n=2, check_length=False):
 
 
 def pairwise(iterable):
+    """
+    Iterates over an iterable, returning pairs of consecutive elements.
+
+    Args:
+        iterable: An iterable object.
+
+    Returns:
+        An iterator that generates tuples containing consecutive pairs of elements from the iterable.
+
+    Example:
+        numbers = [1, 2, 3, 4, 5]
+        pairs = pairwise(numbers)
+        for pair in pairs:
+            print(pair)
+
+        Output:
+        (1, 2)
+        (2, 3)
+        (3, 4)
+        (4, 5)
+
+    In the example above, the pairwise function takes a list of numbers and returns an iterator that generates pairs
+    of consecutive numbers. The resulting pairs are then printed one by one.
+    """
     "s -> (s0,s1), (s1,s2), (s2, s3), ..."
     a, b = itertools.tee(iterable)
     for unused in b:
@@ -47,22 +118,81 @@ def pairwise(iterable):
     return zip(a, b)
 
 
-def nested_setattr(obj, attr, val):
+def nested_setattr(obj: object, attr, val):
     """
-    Support dotted access to nested objects
+    Sets the value of a nested attribute in an object using dotted notation.
+
+    Args:
+        obj: The object to set the attribute on.
+        attr: The attribute name or dotted path to the nested attribute.
+        val: The value to set for the attribute.
+
+    Returns:
+        None
+
+    Example:
+        user = User()
+        nested_setattr(user, 'profile.name', 'John')
+        nested_setattr(user, 'profile.age', 25)
+
+    In the example above, the nested_setattr function is used to set the 'name' and 'age' attributes of the 'profile'
+    nested object within a User object. The function takes the User object, the attribute name or dotted path, and the
+    corresponding value, and sets the attributes accordingly.
     """
     pre, _, post = attr.rpartition(".")
     return setattr(nested_getattr(obj, pre) if pre else obj, post, val)
 
 
 def nested_getattr(obj, attr, *args):
+    """
+    Retrieves the value of a nested attribute from an object using dot notation.
+
+    Args:
+        obj: The object from which to retrieve the attribute.
+        attr: A string representing the nested attribute using dot notation.
+        *args: Additional arguments to be passed to the getattr function.
+
+    Returns:
+        The value of the nested attribute if it exists, or None if any intermediate attribute is missing.
+
+    Example:
+        class Person:
+            def __init__(self, name):
+                self.name = name
+
+        person = Person("John")
+        print(nested_getattr(person, "name"))  # Output: "John"
+    """
+
     def _getattr(obj, attr):
         return getattr(obj, attr, *args)
 
     return functools.reduce(_getattr, [obj] + attr.split("."))
 
 
-def to_decimal(numeric_value, decimal_places=None, allow_null=True):
+def to_decimal(numeric_value, decimal_places: Union[int, None] = None, allow_null=True):
+    """
+    Converts a numeric value to a decimal.
+
+    Args:
+        numeric_value: The numeric value to be converted.
+        decimal_places: The number of decimal places to round the converted value to.
+                        If None, no rounding will be performed.
+        allow_null: Whether to allow a None value as input.
+        If True and numeric_value is None, the function returns None.
+
+    Returns:
+        The numeric value converted to a decimal, with optional rounding if decimal_places is provided.
+        If numeric_value is None and allow_null is True, the function returns None.
+
+    Example:
+        num = 3.14159
+        dec = to_decimal(num, 2)
+        print(dec)  # Output: 3.14
+
+    In the example above, the to_decimal function converts the numeric value 3.14159 to a decimal with 2 decimal places
+    and assigns it to the variable dec. The resulting decimal value is then printed.
+    """
     if numeric_value is None and allow_null:
         return None
     value = decimal.Decimal(numeric_value)
@@ -80,7 +210,34 @@ def to_representation(self, value):
         return "0{}".format(value.national_number)
 
 
-def date_range_overlap(start_1, end_1, start_2, end_2):
+def date_range_overlap(start_1: date, end_1: date, start_2: date, end_2: date):
+    """
+    Calculates the overlap between two date ranges.
+
+    Args:
+        start_1: The start date of the first date range.
+        end_1: The end date of the first date range.
+        start_2: The start date of the second date range.
+        end_2: The end date of the second date range.
+
+    Returns:
+        The number of overlapping days between the two date ranges. If there is no overlap, the function returns 0.
+
+    Raises:
+        ValueError: If any of the start or end dates are None.
+
+    Example:
+        start_1 = date(2022, 1, 1)
+        end_1 = date(2022, 1, 15)
+        start_2 = date(2022, 1, 10)
+        end_2 = date(2022, 1, 20)
+        overlap = date_range_overlap(start_1, end_1, start_2, end_2)
+        print(overlap)  # Output: 6
+
+    In the example above, the date_range_overlap function calculates the overlap between two date ranges.
+    The first date range spans from January 1st to January 15th, and the second date range spans from
+    January 10th to January 20th. The function returns the number of overlapping days, which is 6.
+    """
     """
     Based on: https://stackoverflow.com/questions/9044084/efficient-date-range-overlap-calculation-in-python
     """
@@ -92,11 +249,30 @@ def date_range_overlap(start_1, end_1, start_2, end_2):
     return max(0, delta)
 
 
-METHOD_EU = True
+def days360(start_date: date, end_date: date):
+    """
+    Calculates the number of days between two dates using the 360-day method.
 
+    Args:
+        start_date: The starting date.
+        end_date: The ending date.
+
+    Returns:
+        The number of days between the two dates using the 360-day method.
+
+    Raises:
+        ValueError: If start_date or end_date is not a date object.
+
+    Example:
+        start = date(2022, 1, 1)
+        end = date(2022, 2, 15)
+        days = days360(start, end)
+        print(days)  # Output: 46
+
+    In the example above, the days360 function calculates the number of days between January 1, 2022,
+    and February 15, 2022,
+    using the 360-day method. The result, 46, is then printed.
 
-def days360(start_date, end_date):
-    """
     Calculation of the number of months in Helsinki Benefit calculator excel file used
     the days360 function. This is a Python implementation.
     source: https://stackoverflow.com/questions/51832672/pandas-excel-days360-equivalent
@@ -104,6 +280,8 @@ def days360(start_date, end_date):
     * Added unit tests
     * forced method_eu to always be True.
     """
+    METHOD_EU = True
+
     if not isinstance(start_date, date) or not isinstance(end_date, date):
         raise ValueError("date object needed")
 
@@ -143,7 +321,9 @@ def days360(start_date, end_date):
     )
 
 
-def duration_in_months(start_date, end_date, decimal_places=None):
+def duration_in_months(
+    start_date: date, end_date: date, decimal_places: Union[int, None] = None
+):
     # This is the formula used in the application calculator Excel file 2021-09
     return to_decimal(
         decimal.Decimal(days360(start_date, end_date + timedelta(days=1))) / 30,
@@ -169,7 +349,7 @@ def duration_in_months_rounded(self):
         # in many calculations
         return self._get_duration_in_months(decimal_places=2)
 
-    def _get_duration_in_months(self, decimal_places=None):
+    def _get_duration_in_months(self, decimal_places: Union[int, None] = None):
         if self.start_date and self.end_date:
             return duration_in_months(
                 self.start_date, self.end_date, decimal_places=decimal_places
@@ -182,7 +362,7 @@ def _get_duration_in_months(self, decimal_places=None):
 DATE_RANGE_MAX_ITERATIONS = 7
 
 
-def get_date_range_end_with_days360(start_date, n_months):
+def get_date_range_end_with_days360(start_date: date, n_months: int):
     """
     Given a start date and a duration in months, return the end_date for a date range that most closely
     matches the given duration.
diff --git a/backend/benefit/helsinkibenefit/settings.py b/backend/benefit/helsinkibenefit/settings.py
index bb927ad891..b9c5a95b5c 100644
--- a/backend/benefit/helsinkibenefit/settings.py
+++ b/backend/benefit/helsinkibenefit/settings.py
@@ -292,6 +292,7 @@
 CSRF_TRUSTED_ORIGINS = env.list("CSRF_TRUSTED_ORIGINS")
 CSRF_COOKIE_NAME = env.str("CSRF_COOKIE_NAME")
 CSRF_COOKIE_SECURE = True
+CSRF_USE_SESSIONS = True
 
 # Audit logging
 AUDIT_LOG_ORIGIN = env.str("AUDIT_LOG_ORIGIN")
diff --git a/backend/benefit/helsinkibenefit/urls.py b/backend/benefit/helsinkibenefit/urls.py
index 0e970d750a..c6751f9790 100644
--- a/backend/benefit/helsinkibenefit/urls.py
+++ b/backend/benefit/helsinkibenefit/urls.py
@@ -12,6 +12,7 @@
 from rest_framework_nested import routers
 
 from applications.api.v1 import application_batch_views, views as application_views
+from applications.api.v1.review_state_views import ReviewStateView
 from calculator.api.v1 import views as calculator_views
 from common.debug_util import debug_env
 from companies.api.v1.views import (
@@ -25,7 +26,7 @@
     HandlerNoteViewSet,
 )
 from terms.api.v1.views import ApproveTermsOfServiceView
-from users.api.v1.views import CurrentUserView, UserUuidGDPRAPIView
+from users.api.v1.views import CurrentUserView, UserOptionsView, UserUuidGDPRAPIView
 
 router = routers.DefaultRouter()
 router.register(
@@ -68,7 +69,11 @@
     path("v1/company/", GetUsersOrganizationView.as_view()),
     path("v1/company/search/<str:name>/", SearchOrganisationsView.as_view()),
     path("v1/company/get/<str:business_id>/", GetOrganisationByIdView.as_view()),
-    path("v1/users/me/", CurrentUserView.as_view()),
+    path("v1/users/me/", CurrentUserView.as_view(), name="users-me"),
+    path("v1/users/options/", UserOptionsView.as_view()),
+    path(
+        "v1/handlerapplications/<str:application_id>/review/", ReviewStateView.as_view()
+    ),
     path("oidc/", include("shared.oidc.urls")),
     path("oauth2/", include("shared.azure_adfs.urls")),
     path("api-auth/", include("rest_framework.urls", namespace="rest_framework")),
diff --git a/backend/benefit/users/api/v1/serializers.py b/backend/benefit/users/api/v1/serializers.py
index 28efb82dee..762a115fb7 100644
--- a/backend/benefit/users/api/v1/serializers.py
+++ b/backend/benefit/users/api/v1/serializers.py
@@ -26,6 +26,7 @@ class Meta:
             "terms_of_service_approvals",
             "terms_of_service_approval_needed",
             "terms_of_service_in_effect",
+            "is_staff",
         ]
         read_only_fields = [
             "id",
@@ -34,6 +35,7 @@ class Meta:
             "terms_of_service_approvals",
             "terms_of_service_approval_needed",
             "terms_of_service_in_effect",
+            "is_staff",
         ]
 
     terms_of_service_in_effect = serializers.SerializerMethodField(
diff --git a/backend/benefit/users/api/v1/views.py b/backend/benefit/users/api/v1/views.py
index 230c6e37d9..d205a477d3 100644
--- a/backend/benefit/users/api/v1/views.py
+++ b/backend/benefit/users/api/v1/views.py
@@ -1,7 +1,9 @@
+from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.contrib.auth.base_user import AbstractBaseUser
 from django.core.exceptions import PermissionDenied
 from django.db import DatabaseError, transaction
+from django.middleware.csrf import get_token
 from django.shortcuts import get_object_or_404
 from drf_spectacular.utils import extend_schema
 from helsinki_gdpr.views import DeletionNotAllowed, DryRunException, GDPRAPIView
@@ -29,7 +31,9 @@ def get(self, request):
         serializer = UserSerializer(
             self._get_current_user(request), context={"request": request}
         )
-        return Response(serializer.data)
+        response = serializer.data
+        response["csrf_token"] = get_token(request)
+        return Response(response)
 
     def _get_current_user(self, request):
         if not request.user.is_authenticated:
@@ -37,6 +41,25 @@ def _get_current_user(self, request):
         return request.user
 
 
+@extend_schema(description="API for setting currently logged in user's language.")
+class UserOptionsView(APIView):
+    permission_classes = [BFIsAuthenticated]
+
+    def get(self, request):
+        lang = request.GET.get("lang")
+
+        if lang in ["fi", "en", "sv"]:
+            token = request.COOKIES.get("yjdhcsrftoken")
+
+            response = Response(
+                {"lang": lang, "token": token}, status=status.HTTP_200_OK
+            )
+            response.set_cookie(settings.LANGUAGE_COOKIE_NAME, lang, httponly=True)
+            return response
+
+        return Response(status=status.HTTP_400_BAD_REQUEST)
+
+
 class UserUuidGDPRAPIView(GDPRAPIView):
     """GDPR API view that is used from Helsinki profile to query and delete user data."""
 
diff --git a/backend/benefit/users/tests/conftest.py b/backend/benefit/users/tests/conftest.py
index cf687ed857..7b11e94c3a 100644
--- a/backend/benefit/users/tests/conftest.py
+++ b/backend/benefit/users/tests/conftest.py
@@ -1,10 +1,23 @@
+import factory
 import pytest
 from rest_framework.test import APIClient
 
+from applications.tests.factories import ApplicationFactory
 from common.tests.conftest import *  # noqa
+from companies.tests.conftest import *  # noqa
 from helsinkibenefit.tests.conftest import *  # noqa
 
 
 @pytest.fixture
 def gdpr_api_client():
     return APIClient()
+
+
+@pytest.fixture
+def application(mock_get_organisation_roles_and_create_company):
+    # Application which belongs to logged in user company
+    with factory.Faker.override_default_locale("fi_FI"):
+        app = ApplicationFactory()
+        app.company = mock_get_organisation_roles_and_create_company
+        app.save()
+        return app
diff --git a/backend/benefit/users/tests/test_user_api.py b/backend/benefit/users/tests/test_user_api.py
new file mode 100644
index 0000000000..87e381f526
--- /dev/null
+++ b/backend/benefit/users/tests/test_user_api.py
@@ -0,0 +1,11 @@
+from rest_framework.reverse import reverse
+
+from common.tests.conftest import get_client_user
+
+
+def test_applications_unauthorized(api_client, application):
+    response = api_client.get(reverse("users-me"))
+    user = get_client_user(api_client)
+    assert response.status_code == 200
+    assert response.data["id"] == str(user.id)
+    assert len(response.data["csrf_token"]) > 0
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index e3efeefc75..1bb73acc6e 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -1,5 +1,5 @@
 # =======================================
-FROM helsinkitest/node:16-slim as appbase
+FROM helsinkitest/node:18-slim as appbase
 # =======================================
 
 # Install ca-certificates so that Sentry can upload source maps
@@ -38,7 +38,7 @@ FROM appbase as development
 
 # Set V8 max heap size to 2GB (default is 512MB)
 # This prevents Docker Compose from crashing due to out of memory errors
-ENV NODE_OPTIONS="--max_old_space_size=2048"
+ENV NODE_OPTIONS="--max_old_space_size=2048 --openssl-legacy-provider"
 
 ARG PROJECT
 ARG FOLDER
@@ -92,16 +92,18 @@ COPY --chown=appuser:appuser . .
 # Build application
 WORKDIR /app/$PROJECT/$FOLDER/
 
-RUN yarn build
+RUN NODE_OPTIONS=--openssl-legacy-provider yarn build
 
 # Clean all dependencies (this should avoid caching + missing /pages directory problem)
 RUN rm -rf node_modules
 RUN yarn cache clean
 
 # ==========================================
-FROM helsinkitest/node:16-slim AS production
+FROM helsinkitest/node:18-slim AS production
 # ==========================================
 
+ENV NODE_OPTIONS="--openssl-legacy-provider"
+
 ARG PORT
 ARG PROJECT
 ARG FOLDER
diff --git a/frontend/README.md b/frontend/README.md
index 4449b17cdd..bdb33d3ef5 100644
--- a/frontend/README.md
+++ b/frontend/README.md
@@ -9,14 +9,14 @@ Project is automatically deployed to testing environment when pushing to develop
 
 ## Requirements
 
-- Node 16.x (match with dockerfile: helsinkitest/node:16-slim)
+- Node 18.x (match with dockerfile: helsinkitest/node:18-slim)
 - Yarn
 - Git
 - Docker
 
 ### install node with nvm
 
-    nvm install 16 --lts
+    nvm install 18 --lts
 
 
 ## Available Scripts
diff --git a/frontend/babel.config.js b/frontend/babel.config.js
deleted file mode 100644
index 9f3abffca2..0000000000
--- a/frontend/babel.config.js
+++ /dev/null
@@ -1,11 +0,0 @@
-module.exports = {
-  presets: ['next/babel', ['@babel/preset-typescript', { isTSX: true, allExtensions: true }]],
-  plugins: [
-    ['styled-components', { ssr: true }],
-    ['import', {
-      'libraryName': 'react-use',
-      'libraryDirectory': 'lib',
-      'camel2DashComponentName': false
-    }
-  ]],
-};
diff --git a/frontend/benefit/README.md b/frontend/benefit/README.md
index 1195083cea..8c5e20efe5 100644
--- a/frontend/benefit/README.md
+++ b/frontend/benefit/README.md
@@ -9,7 +9,7 @@ Project is automatically deployed to testing environment when pushing to develop
 
 ## Requirements
 
-- Node 16.x
+- Node 18.x
 - Lerna  
 - Yarn
 - Git
@@ -18,8 +18,8 @@ Project is automatically deployed to testing environment when pushing to develop
 ### Install NodeJS
 
     # Use node manager (n or nvm, for example)
-    n 16
-    nvm install 16 --lts
+    n 18
+    nvm install 18 --lts
     # Alternative methods
     https://nodejs.org/dist/
     https://nodejs.org/en/download/package-manager
diff --git a/frontend/benefit/applicant/jest.config.js b/frontend/benefit/applicant/jest.config.js
index e5f8d6f3f6..6984bf0727 100644
--- a/frontend/benefit/applicant/jest.config.js
+++ b/frontend/benefit/applicant/jest.config.js
@@ -1,11 +1,12 @@
 const sharedConfig = require('../../jest.config.js');
-module.exports = {
+const nextJest = require('next/jest');
+
+const createJestConfig = nextJest({
+  dir: './',
+});
+
+const config = {
   ...sharedConfig,
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.jest.json',
-    },
-  },
   moduleNameMapper: {
     [`^shared\/(.*)$`]: '<rootDir>/../../shared/src/$1',
     [`^benefit-shared\/(.*)$`]: '<rootDir>../shared/src/$1',
@@ -20,4 +21,8 @@ module.exports = {
     '<rootDir>/../../shared/src/server/next-server.js',
     '<rootDir>/../../shared/src/test/',
   ],
+  moduleDirectories: ['node_modules', '<rootDir>/'],
+  testEnvironment: 'jest-environment-jsdom',
 };
+
+module.exports = createJestConfig(config);
diff --git a/frontend/benefit/applicant/next-env.d.ts b/frontend/benefit/applicant/next-env.d.ts
index 9bc3dd46b9..4f11a03dc6 100644
--- a/frontend/benefit/applicant/next-env.d.ts
+++ b/frontend/benefit/applicant/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
diff --git a/frontend/benefit/applicant/next.config.js b/frontend/benefit/applicant/next.config.js
index 03069a2105..fd7fd19ec1 100644
--- a/frontend/benefit/applicant/next.config.js
+++ b/frontend/benefit/applicant/next.config.js
@@ -6,5 +6,4 @@ const { parsed: env } = require('dotenv').config({
 module.exports = nextConfig({
   i18n,
   env,
-  poweredByHeader: false,
 });
diff --git a/frontend/benefit/applicant/package.json b/frontend/benefit/applicant/package.json
index 417fbf2f2e..d87de1caef 100644
--- a/frontend/benefit/applicant/package.json
+++ b/frontend/benefit/applicant/package.json
@@ -11,8 +11,8 @@
     "test": "jest --passWithNoTests",
     "test:staged": "yarn test --watchAll=false --findRelatedTests",
     "test:coverage": "yarn test --verbose --coverage",
-    "browser-test": "testcafe 'chrome --allow-insecure-localhost --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/newApplication/company.testcafe.ts",
-    "browser-test:ci": "testcafe 'chrome:headless --disable-gpu --window-size=\"1249,720\"  --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/newApplication/company.testcafe.ts"
+    "browser-test": "testcafe 'chrome --allow-insecure-localhost --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/newApplication/company.testcafe.ts --experimental-proxyless",
+    "browser-test:ci": "testcafe 'chrome:headless --disable-gpu --window-size=\"1249,720\"  --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/newApplication/company.testcafe.ts --experimental-proxyless"
   },
   "dependencies": {
     "@frontend/shared": "*",
@@ -21,7 +21,7 @@
     "@sentry/browser": "^7.16.0",
     "@sentry/nextjs": "^7.16.0",
     "axios": "^0.27.2",
-    "babel-plugin-import": "^1.13.3",
+    "babel-plugin-import": "^1.13.6",
     "camelcase-keys": "^7.0.2",
     "date-fns": "^2.24.0",
     "dotenv": "^16.0.0",
@@ -29,11 +29,11 @@
     "formik": "^2.2.9",
     "hds-react": "^2.10.0",
     "lodash": "^4.17.21",
-    "next": "^11.1.4",
+    "next": "^12.3.4",
     "next-compose-plugins": "^2.2.1",
-    "next-i18next": "^10.5.0",
+    "next-i18next": "^13.0.3",
     "next-plugin-custom-babel-config": "^1.0.5",
-    "next-transpile-modules": "^9.0.0",
+    "next-transpile-modules": "^9.1.0",
     "pdfjs-dist": "3.6.172",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
diff --git a/frontend/benefit/applicant/public/favicons/manifest.webmanifest b/frontend/benefit/applicant/public/favicons/manifest.webmanifest
index 5e0299b4af..267bb8ff36 100644
--- a/frontend/benefit/applicant/public/favicons/manifest.webmanifest
+++ b/frontend/benefit/applicant/public/favicons/manifest.webmanifest
@@ -1,6 +1,14 @@
 {
-    "icons": [
-        { "src": "/favicon-192x192.png", "type": "image/png", "sizes": "192x192" },
-        { "src": "/favicon-512x512.png", "type": "image/png", "sizes": "512x512" }
-    ]
-}
\ No newline at end of file
+  "icons": [
+    {
+      "src": "/favicons/favicon-192x192.png",
+      "type": "image/png",
+      "sizes": "192x192"
+    },
+    {
+      "src": "/favicons/favicon-512x512.png",
+      "type": "image/png",
+      "sizes": "512x512"
+    }
+  ]
+}
diff --git a/frontend/benefit/applicant/public/locales/en/common.json b/frontend/benefit/applicant/public/locales/en/common.json
index 6b3ce28ee3..4610a048fa 100644
--- a/frontend/benefit/applicant/public/locales/en/common.json
+++ b/frontend/benefit/applicant/public/locales/en/common.json
@@ -86,6 +86,10 @@
           "deMinimisAidMaxAmount": {
             "label": "Maximum amount exceeded",
             "content": "The maximum amount of de minimis aid has been exceeded. Under the EU Regulation, a company may receive a maximum EUR 200,000 of de minimis aid during the current year and the previous two tax years. All forms of de minimis aid granted by various authorities during this period will be taken into account in the maximum amount."
+          },
+          "deMinimisUnfinished": {
+            "label": "Missing de minimis aid information",
+            "content": "Please fill any missing de minimis aid information and press 'Add' button."
           }
         },
         "tooltips": {
@@ -186,7 +190,7 @@
         "salaryExpensesExplanation": "The gross salary and indirect labour costs are indicated in EUR per month, holiday bonus as a lump sum",
         "tooltips": {
           "heading5Employment": "Collective agreement applied: e.g. Collective Agreement for the Commercial Sector. If there is no binding collective agreement in the sector, put in a dash.",
-          "heading5EmploymentSub1": "The gross salary is the salary paid to the subsidised employee before the deduction of the employee’s statutory contributions (the employee’s unemployment insurance and pension insurance contributions) and taxes. If the subsidised employee is paid remuneration bonuses (e.g. evening, night or shift work bonus), take the estimated amount into account in the gross salary. The employers’ statutory indirect labour costs include social security expenses, pension insurance, accident insurance and unemployment insurance premiums as well as the mandatory group life insurance premium. Indirect labour costs refer to the amount of the employer’s statutory indirect labour costs paid for the salary per month. The holiday bonus is a salary cost to be covered by the subsidy when it is paid for holiday pay during the subsidy period. Estimate the amount of holiday bonus to be paid during the subsidy period. Holiday compensation is not covered by the Helsinki benefit.",
+          "heading5EmploymentSub1": "The gross salary is the salary paid to the subsidised employee before the deduction of the employee’s statutory contributions (the employee’s unemployment insurance and pension insurance contributions) and taxes. If the subsidised employee is paid remuneration bonuses (e.g. evening, night or shift work bonus), take the estimated amount into account in the gross salary. The employers’ statutory indirect labour costs include social security expenses, pension insurance, accident insurance and unemployment insurance premiums as well as the mandatory group life insurance premium.\r\n\r\nIndirect labour costs refer to the amount of the employer’s statutory indirect labour costs paid for the salary per month.\r\n\r\nThe holiday bonus is a salary cost to be covered by the subsidy when it is paid for holiday pay during the subsidy period. Estimate the amount of holiday bonus to be paid during the subsidy period. Holiday compensation is not covered by the Helsinki benefit.",
           "heading5Assignment": "The gross salary is the salary paid to the subsidised employee before the deduction of the employee's statutory contributions (the employee's unemployment insurance and pension insurance contributions) and taxes. If the subsidised employee is paid remuneration bonuses (e.g. evening, night or shift work bonus), take the estimated amount into account in the gross salary. The employers' statutory indirect labour costs include social security expenses, pension insurance, accident insurance and unemployment insurance premiums as well as the mandatory group life insurance premium. Indirect labour costs refer to the amount of the employer's statutory indirect labour costs paid for the salary per month. The holiday bonus is a salary cost to be covered by the subsidy when it is paid for holiday pay during the subsidy period. Estimate the amount of holiday bonus to be paid during the subsidy period. Holiday compensation is not covered by the Helsinki benefit.",
           "heading2": "Pay subsidy is a financial subsidy intended to promote the employment of an unemployed jobseeker, which TE Services can grant to the employer for salary costs.",
           "heading3": "The Helsinki benefit for employment is intended for guidance, orientation, tools, work clothing and workspace costs when no other support is paid for these. The Helsinki benefit for salary is intended for the cost of employing a subsidised employee (= gross salary, statutory indirect labour costs and holiday bonus). The Helsinki benefit for a commission is intended for the performance of an individual job or project."
@@ -374,7 +378,8 @@
     "drawer": {
       "title": "Application’s messages"
     },
-    "languageMenuButtonAriaLabel": "Select language"
+    "languageMenuButtonAriaLabel": "Select language",
+    "menuToggleAriaLabel": "Menu"
   },
   "footer": {
     "copyrightText": "Copyright",
@@ -421,7 +426,6 @@
   "credentialsIngress": {
     "text": "A person to be employed with the Helsinki benefit must be informed of the processing of their personal data. Print the notification and request a signature from the person to be employed."
   },
-  "menuToggleAriaLabel": "Menu",
   "form": {
     "validation": {
       "required": "This field is required",
@@ -657,5 +661,8 @@
         "heading1": "Palaute ja yhteystiedot"
       }
     }
+  },
+  "toast": {
+    "closeToast": "Close notification"
   }
 }
diff --git a/frontend/benefit/applicant/public/locales/fi/common.json b/frontend/benefit/applicant/public/locales/fi/common.json
index 7020b7519b..109e59c4bb 100644
--- a/frontend/benefit/applicant/public/locales/fi/common.json
+++ b/frontend/benefit/applicant/public/locales/fi/common.json
@@ -86,6 +86,10 @@
           "deMinimisAidMaxAmount": {
             "label": "Enimmäismäärä ylitetty",
             "content": "De minimis-tuen enimmäismäärä on ylitetty. Tuki voi olla enintään 200 000 euroa, joka myönnetään yritykselle kuluvan vuoden ja kahden edellisen verovuoden kuluessa. Enimmäismäärässä huomioidaan kaikkien eri viranomaisten kyseisenä ajanjaksona de minimis -tukena myöntämä rahoitus."
+          },
+          "deMinimisUnfinished": {
+            "label": "Puuttuvia de minimis-tuen tietoja",
+            "content": "Täytä puuttuvat de minimis -kentät ja paina 'Lisää' painiketta."
           }
         },
         "tooltips": {
@@ -186,7 +190,7 @@
         "salaryExpensesExplanation": "Bruttopalkka ja sivukulut ilmoitetaan euroina kuukaudessa, lomaraha kertasummana",
         "tooltips": {
           "heading5Employment": "Sovellettava työehtosopimus: esim. Kaupan työehtosopimus. Jos alalla ei ole velvoittavaa työehtosopimusta, merkitse viiva.",
-          "heading5EmploymentSub1": "Bruttopalkalla tarkoitetaan tuella palkattavalle maksettavaa palkkaa ennen työntekijän lakisääteisten maksujen (työntekijän työttömyysvakuutus- ja eläkevakuutusmaksu) ja verojen pidätystä. Jos tuella palkattavalle maksetaan palkan lisiä (esim. ilta-, yö- tai vuorotyölisä), ota niiden arvioitu määrä huomioon bruttopalkassa. Työnantajan lakisääteisiin sivukuluihin luetaan sosiaaliturva-, työeläkevakuutus-, tapaturmavakuutus- ja työttömyysvakuutusmaksu sekä pakollinen ryhmähenkivakuutusmaksu. Sivukulut tarkoittavat palkasta maksettavien työnantajan lakisääteisten sivukulujen määrä kuukaudessa. Lomaraha on tuella katettava palkkauskustannus silloin, kun se maksetaan tukijakson aikana pidetystä vuosilomapalkasta. Arvioi tukijakson aikana maksettavan lomarahan määrä. Lomakorvaus ei ole Helsinki-lisällä katettava korvaus.",
+          "heading5EmploymentSub1": "Bruttopalkalla tarkoitetaan tuella palkattavalle maksettavaa palkkaa ennen työntekijän lakisääteisten maksujen (työntekijän työttömyysvakuutus- ja eläkevakuutusmaksu) ja verojen pidätystä. Jos tuella palkattavalle maksetaan palkan lisiä (esim. ilta-, yö- tai vuorotyölisä), ota niiden arvioitu määrä huomioon bruttopalkassa. Työnantajan lakisääteisiin sivukuluihin luetaan sosiaaliturva-, työeläkevakuutus-, tapaturmavakuutus- ja työttömyysvakuutusmaksu sekä pakollinen ryhmähenkivakuutusmaksu.\r\n\r\nSivukulut tarkoittavat palkasta maksettavien työnantajan lakisääteisten sivukulujen määrä kuukaudessa.\r\n\r\nLomaraha on tuella katettava palkkauskustannus silloin, kun se maksetaan tukijakson aikana pidetystä vuosilomapalkasta. Arvioi tukijakson aikana maksettavan lomarahan määrä. Lomakorvaus ei ole Helsinki-lisällä katettava korvaus.",
           "heading5Assignment": "Palkkauskustannukset tooltip text",
           "heading2": "Palkkatuki on työttömän työnhakijan työllistymisen edistämiseksi tarkoitettu rahallinen tuki, jonka TE-palvelut voi myöntää työnantajalle palkkauskustannuksiin.",
           "heading3": "Työllistämisen Helsinki-lisä on tarkoitettu ohjaus-, perehdytys-, työväline-, työvaate- ja työtilakustannuksiin silloin, kun niihin ei makseta muuta tukea. Palkan Helsinki-lisä on tarkoitettu työllistetyn henkilön palkkauskustannuksiin (=bruttopalkka, lakisääteiset sivukulut ja lomaraha). Toimeksiannon Helsinki-lisä on tarkoitettu yksittäisen työn tai projektin suorittamiseen."
@@ -374,7 +378,8 @@
     "drawer": {
       "title": "Hakemuksen viestit"
     },
-    "languageMenuButtonAriaLabel": "Valitse kieli"
+    "languageMenuButtonAriaLabel": "Valitse kieli",
+    "menuToggleAriaLabel": "Valikko"
   },
   "footer": {
     "copyrightText": "Copyright",
@@ -421,7 +426,6 @@
   "credentialsIngress": {
     "text": "Helsinki-lisällä työllistettävää henkilöä on tiedotettava hänen henkilötietojensa käsittelystä. Tulosta tiedoksianto ja pyydä siihen allekirjoitus työllistettävältä."
   },
-  "menuToggleAriaLabel": "Valikko",
   "form": {
     "validation": {
       "required": "Tämä kenttä on pakollinen",
@@ -657,5 +661,8 @@
         "heading1": "Palaute ja yhteystiedot"
       }
     }
+  },
+  "toast": {
+    "closeToast": "Sulje ilmoitus"
   }
 }
diff --git a/frontend/benefit/applicant/public/locales/sv/common.json b/frontend/benefit/applicant/public/locales/sv/common.json
index ac3f6fcb2c..c69435c9f5 100644
--- a/frontend/benefit/applicant/public/locales/sv/common.json
+++ b/frontend/benefit/applicant/public/locales/sv/common.json
@@ -86,6 +86,10 @@
           "deMinimisAidMaxAmount": {
             "label": "Maximibeloppet har överskridits",
             "content": "Maximibeloppet för de minimis-stöd har överskridits. Enligt EU:s förordning kan ett företag få de minimis-stöd till ett belopp om högst 200 000 euro under det innevarandet året och under de två föregående skatteåren. I maximibeloppet beaktas samtliga de minimis-stöd som olika myndigheter har beviljat under denna tidsperiod."
+          },
+          "deMinimisUnfinished": {
+            "label": "Information saknar om de minimis stöd",
+            "content": "Vänligen fyll i eventuell saknad de minimis-stöd information och tryck på knappen 'Lägg till'."
           }
         },
         "tooltips": {
@@ -186,7 +190,7 @@
         "salaryExpensesExplanation": "Bruttolön och bikostnader anges i euro per månad, semesterpenning som ett engångsbelopp",
         "tooltips": {
           "heading5Employment": "Kollektivavtal som tillämpas: t.ex. kollektivavtal för handeln. Sätt streck om branschen inte har ett bindande kollektivavtal.",
-          "heading5EmploymentSub1": "Med bruttolön avses lönen till den person som anställs med subventionen före innehållande av arbetsgivarens lagstadgade kostnader (arbetslöshets- och pensionsförsäkringspremier för arbetstagaren) och skatter. Om den person som anställs med subventionen får lönetillägg (t.ex. kvälls-, natt- eller skiftarbetstillägg), ska det uppskattade beloppet från dessa beaktas i bruttolönen. Till arbetsgivarens lagstadgade bikostnader räknas socialskyddsavgifterna och premierna för arbetspensionsförsäkringen, olycksfallsförsäkringen och arbetslöshetsförsäkringen samt den obligatoriska grupplivförsäkringen. Med bikostnader avses arbetsgivarens lagstadgade bikostnader per månad. Semesterpenning är en lönekostnad som kan täckas med subventionen till den del som semesterpenning betalas för semesterlön som används under subventionsperioden. Uppskatta semesterpenningen som betalas under subventionsperioden. Semesterpenning kan inte täckas med Helsingforstillägg.",
+          "heading5EmploymentSub1": "Med bruttolön avses lönen till den person som anställs med subventionen före innehållande av arbetsgivarens lagstadgade kostnader (arbetslöshets- och pensionsförsäkringspremier för arbetstagaren) och skatter. Om den person som anställs med subventionen får lönetillägg (t.ex. kvälls-, natt- eller skiftarbetstillägg), ska det uppskattade beloppet från dessa beaktas i bruttolönen. Till arbetsgivarens lagstadgade bikostnader räknas socialskyddsavgifterna och premierna för arbetspensionsförsäkringen, olycksfallsförsäkringen och arbetslöshetsförsäkringen samt den obligatoriska grupplivförsäkringen.\r\n\r\nMed bikostnader avses arbetsgivarens lagstadgade bikostnader per månad.\r\n\r\nSemesterpenning är en lönekostnad som kan täckas med subventionen till den del som semesterpenning betalas för semesterlön som används under subventionsperioden. Uppskatta semesterpenningen som betalas under subventionsperioden. Semesterpenning kan inte täckas med Helsingforstillägg.",
           "heading5Assignment": "Med bruttolön avses lönen till den person som anställs med subventionen före innehållande av arbetsgivarens lagstadgade kostnader (arbetslöshets- och pensionsförsäkringspremier för arbetstagaren) och skatter. Om den person som anställs med subventionen får lönetillägg (t.ex. kvälls-, natt- eller skiftarbetstillägg), ska det uppskattade beloppet från dessa beaktas i bruttolönen. Till arbetsgivarens lagstadgade bikostnader räknas socialskyddsavgifterna och premierna för arbetspensionsförsäkringen, olycksfallsförsäkringen och arbetslöshetsförsäkringen samt den obligatoriska grupplivförsäkringen. Med bikostnader avses arbetsgivarens lagstadgade bikostnader per månad. Semesterpenning är en lönekostnad som kan täckas med subventionen till den del som semesterpenning betalas för semesterlön som används under subventionsperioden. Uppskatta semesterpenningen som betalas under subventionsperioden. Semesterpenning kan inte täckas med Helsingforstillägg.",
           "heading2": "Lönesubvention är ett ekonomiskt stöd för främjande av sysselsättningen av en arbetslös arbetssökande som arbets- och näringslivstjänsterna kan bevilja till arbetsgivaren för lönekostnader.",
           "heading3": "Helsingforstillägg för sysselsättning är avsett för kostnaderna för handledning, inskolning, arbetsredskap, arbetskläder och arbetslokaler då inga andra understöd utbetalas för dessa. Helsingforstillägg för lön är avsett för lönekostnaderna för den anställda (=bruttolön, lagstadgade bikostnader och semesterpenning). Helsingforstillägg för uppdrag är avsett för utförande av ett enskilt jobb eller projekt."
@@ -374,7 +378,8 @@
     "drawer": {
       "title": "Meddelanden om ansökan"
     },
-    "languageMenuButtonAriaLabel": "Ändra språk"
+    "languageMenuButtonAriaLabel": "Ändra språk",
+    "menuToggleAriaLabel": "Menu"
   },
   "footer": {
     "copyrightText": "Copyright",
@@ -421,7 +426,6 @@
   "credentialsIngress": {
     "text": "Den person som anställs med Helsingforstillägg ska informeras om behandlingen av hens personuppgifter. Skriv ut informationen och be den anställda om underskrift."
   },
-  "menuToggleAriaLabel": "Menu",
   "form": {
     "validation": {
       "required": "Detta är ett obligatoriskt fält",
@@ -657,5 +661,8 @@
         "heading1": "Palaute ja yhteystiedot"
       }
     }
+  },
+  "toast": {
+    "closeToast": "Stäng avisering"
   }
 }
diff --git a/frontend/benefit/applicant/src/components/applications/Applications.sc.ts b/frontend/benefit/applicant/src/components/applications/Applications.sc.ts
index acdfffbe64..896b402afc 100644
--- a/frontend/benefit/applicant/src/components/applications/Applications.sc.ts
+++ b/frontend/benefit/applicant/src/components/applications/Applications.sc.ts
@@ -1,14 +1,21 @@
+import { respondAbove } from 'shared/styles/mediaQueries';
 import styled from 'styled-components';
 
 export const $PageHeader = styled.div`
-  display: flex;
-  justify-content: space-between;
-  align-items: start;
+  display: block;
   margin-bottom: ${(props) => props.theme.spacing.s};
   margin-top: ${(props) => props.theme.spacing.m};
-  & > div {
-    flex: 1 0 50%;
+
+  & > * {
+    margin-bottom: ${(props) => props.theme.spacing.m};
   }
+
+  ${respondAbove('md')`
+    flex: 1 0 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: start;
+  `};
 `;
 
 export const $HeaderItem = styled.div``;
diff --git a/frontend/benefit/applicant/src/components/applications/forms/application/deMinimisAid/DeMinimisAidForm.tsx b/frontend/benefit/applicant/src/components/applications/forms/application/deMinimisAid/DeMinimisAidForm.tsx
index 95dd9dae9a..95f1558b8a 100644
--- a/frontend/benefit/applicant/src/components/applications/forms/application/deMinimisAid/DeMinimisAidForm.tsx
+++ b/frontend/benefit/applicant/src/components/applications/forms/application/deMinimisAid/DeMinimisAidForm.tsx
@@ -23,9 +23,13 @@ import { useDeminimisAid } from './useDeminimisAid';
 
 interface DeMinimisAidFormProps {
   data: DeMinimisAid[];
+  setUnfinishedDeMinimisAid: React.Dispatch<React.SetStateAction<boolean>>;
 }
 
-const DeMinimisAidForm: React.FC<DeMinimisAidFormProps> = ({ data }) => {
+const DeMinimisAidForm: React.FC<DeMinimisAidFormProps> = ({
+  data,
+  setUnfinishedDeMinimisAid,
+}) => {
   const {
     t,
     language,
@@ -38,6 +42,26 @@ const DeMinimisAidForm: React.FC<DeMinimisAidFormProps> = ({ data }) => {
   } = useDeminimisAid(data);
   const theme = useTheme();
 
+  const onSubmit = (
+    event: React.MouseEvent<HTMLButtonElement, MouseEvent>
+  ): void => {
+    setUnfinishedDeMinimisAid(false);
+    return handleSubmit(event);
+  };
+
+  const handleBlur = (
+    event: React.FocusEvent<HTMLInputElement, Element>
+  ): void => {
+    setUnfinishedDeMinimisAid(false);
+    const grantValuesAsString = Object.values(formik.values).reduce(
+      (acc, val) => acc + val
+    );
+    if (grantValuesAsString !== '') {
+      setUnfinishedDeMinimisAid(true);
+    }
+    formik.handleBlur(event);
+  };
+
   return (
     <$GridCell
       $colStart={3}
@@ -65,7 +89,7 @@ const DeMinimisAidForm: React.FC<DeMinimisAidFormProps> = ({ data }) => {
             name={fields.granter.name}
             label={fields.granter.label}
             placeholder={fields.granter.placeholder}
-            onBlur={formik.handleBlur}
+            onBlur={(event) => handleBlur(event)}
             onChange={formik.handleChange}
             value={formik.values.granter}
             invalid={!!getErrorMessage(DE_MINIMIS_AID_KEYS.GRANTER)}
@@ -80,7 +104,7 @@ const DeMinimisAidForm: React.FC<DeMinimisAidFormProps> = ({ data }) => {
             name={fields.amount.name}
             label={fields.amount.label || ''}
             placeholder={fields.amount.placeholder}
-            onBlur={formik.handleBlur}
+            onBlur={(event) => handleBlur(event)}
             onChange={(e) =>
               formik.setFieldValue(
                 fields.amount.name,
@@ -101,7 +125,7 @@ const DeMinimisAidForm: React.FC<DeMinimisAidFormProps> = ({ data }) => {
             label={fields.grantedAt.label}
             placeholder={fields.grantedAt.placeholder}
             language={language}
-            onBlur={formik.handleBlur}
+            onBlur={(event) => handleBlur(event)}
             onChange={(value) =>
               formik.setFieldValue(fields.grantedAt.name, value)
             }
@@ -133,7 +157,7 @@ const DeMinimisAidForm: React.FC<DeMinimisAidFormProps> = ({ data }) => {
             !formik.isValid ||
             sumBy(grants, 'amount') > MAX_DEMINIMIS_AID_TOTAL_AMOUNT
           }
-          onClick={(e) => handleSubmit(e)}
+          onClick={(e) => onSubmit(e)}
           iconLeft={<IconPlusCircle />}
           fullWidth
         >
diff --git a/frontend/benefit/applicant/src/components/applications/forms/application/step1/ApplicationFormStep1.tsx b/frontend/benefit/applicant/src/components/applications/forms/application/step1/ApplicationFormStep1.tsx
index 8344d8b03a..2a77e86bf3 100644
--- a/frontend/benefit/applicant/src/components/applications/forms/application/step1/ApplicationFormStep1.tsx
+++ b/frontend/benefit/applicant/src/components/applications/forms/application/step1/ApplicationFormStep1.tsx
@@ -20,6 +20,9 @@ import { useApplicationFormStep1 } from './useApplicationFormStep1';
 const ApplicationFormStep1: React.FC<DynamicFormStepComponentProps> = ({
   data,
 }) => {
+  const [isUnfinishedDeMinimisAid, setUnfinishedDeMinimisAid] =
+    React.useState(false);
+
   const {
     t,
     handleSubmit,
@@ -34,7 +37,7 @@ const ApplicationFormStep1: React.FC<DynamicFormStepComponentProps> = ({
     translationsBase,
     formik,
     deMinimisAidSet,
-  } = useApplicationFormStep1(data);
+  } = useApplicationFormStep1(data, Boolean(isUnfinishedDeMinimisAid));
 
   useAlertBeforeLeaving(formik.dirty);
 
@@ -161,56 +164,59 @@ const ApplicationFormStep1: React.FC<DynamicFormStepComponentProps> = ({
           />
         </$GridCell>
       </FormSection>
-    {showDeminimisSection && (
-      <FormSection
-        header={t(`${translationsBase}.heading3`)}
-        tooltip={t(`${translationsBase}.tooltips.heading3`)}
-      >
-        <$GridCell $colSpan={8}>
-          <SelectionGroup
-            id={fields.deMinimisAid.name}
-            label={fields.deMinimisAid.label}
-            direction="vertical"
-            required
-            errorText={getErrorMessage(fields.deMinimisAid.name)}
-          >
-            <$RadioButton
-              id={`${fields.deMinimisAid.name}False`}
-              name={fields.deMinimisAid.name}
-              value="false"
-              label={t(
-                `${translationsBase}.fields.${APPLICATION_FIELDS_STEP1_KEYS.DE_MINIMIS_AID}.no`
-              )}
-              onChange={() => {
-                formik.setFieldValue(fields.deMinimisAid.name, false);
-                setDeMinimisAids([]);
-              }}
-              // 3 states: null (none is selected), true, false
-              checked={formik.values.deMinimisAid === false}
-            />
-            <$RadioButton
-              id={`${fields.deMinimisAid.name}True`}
-              name={fields.deMinimisAid.name}
-              value="true"
-              label={t(
-                `${translationsBase}.fields.${APPLICATION_FIELDS_STEP1_KEYS.DE_MINIMIS_AID}.yes`
-              )}
-              onChange={() =>
-                formik.setFieldValue(fields.deMinimisAid.name, true)
-              }
-              checked={formik.values.deMinimisAid === true}
-            />
-          </SelectionGroup>
-        </$GridCell>
+      {showDeminimisSection && (
+        <FormSection
+          header={t(`${translationsBase}.heading3`)}
+          tooltip={t(`${translationsBase}.tooltips.heading3`)}
+        >
+          <$GridCell $colSpan={8}>
+            <SelectionGroup
+              id={fields.deMinimisAid.name}
+              label={fields.deMinimisAid.label}
+              direction="vertical"
+              required
+              errorText={getErrorMessage(fields.deMinimisAid.name)}
+            >
+              <$RadioButton
+                id={`${fields.deMinimisAid.name}False`}
+                name={fields.deMinimisAid.name}
+                value="false"
+                label={t(
+                  `${translationsBase}.fields.${APPLICATION_FIELDS_STEP1_KEYS.DE_MINIMIS_AID}.no`
+                )}
+                onChange={() => {
+                  formik.setFieldValue(fields.deMinimisAid.name, false);
+                  setDeMinimisAids([]);
+                }}
+                // 3 states: null (none is selected), true, false
+                checked={formik.values.deMinimisAid === false}
+              />
+              <$RadioButton
+                id={`${fields.deMinimisAid.name}True`}
+                name={fields.deMinimisAid.name}
+                value="true"
+                label={t(
+                  `${translationsBase}.fields.${APPLICATION_FIELDS_STEP1_KEYS.DE_MINIMIS_AID}.yes`
+                )}
+                onChange={() =>
+                  formik.setFieldValue(fields.deMinimisAid.name, true)
+                }
+                checked={formik.values.deMinimisAid === true}
+              />
+            </SelectionGroup>
+          </$GridCell>
 
-        {formik.values.deMinimisAid && (
-          <>
-            <DeMinimisAidForm data={deMinimisAidSet} />
-            <DeMinimisAidsList />
-          </>
-        )}
-      </FormSection>
-    )}
+          {formik.values.deMinimisAid && (
+            <>
+              <DeMinimisAidForm
+                data={deMinimisAidSet}
+                setUnfinishedDeMinimisAid={setUnfinishedDeMinimisAid}
+              />
+              <DeMinimisAidsList />
+            </>
+          )}
+        </FormSection>
+      )}
       <FormSection paddingBottom header={t(`${translationsBase}.heading4`)}>
         <$GridCell $colSpan={8}>
           <SelectionGroup
diff --git a/frontend/benefit/applicant/src/components/applications/forms/application/step1/useApplicationFormStep1.ts b/frontend/benefit/applicant/src/components/applications/forms/application/step1/useApplicationFormStep1.ts
index d0ab808852..b75c49a9c5 100644
--- a/frontend/benefit/applicant/src/components/applications/forms/application/step1/useApplicationFormStep1.ts
+++ b/frontend/benefit/applicant/src/components/applications/forms/application/step1/useApplicationFormStep1.ts
@@ -14,6 +14,7 @@ import fromPairs from 'lodash/fromPairs';
 import { TFunction } from 'next-i18next';
 import React, { useState } from 'react';
 import { Field } from 'shared/components/forms/fields/types';
+import showErrorToast from 'shared/components/toast/show-error-toast';
 import { OptionType } from 'shared/types/common';
 import { focusAndScroll } from 'shared/utils/dom.utils';
 
@@ -39,10 +40,12 @@ type ExtendedComponentProps = {
 };
 
 const useApplicationFormStep1 = (
-  application: Partial<Application>
+  application: Partial<Application>,
+  isUnfinishedDeminimisAid: boolean
 ): ExtendedComponentProps => {
   const { t } = useTranslation();
-  const { setDeMinimisAids } = React.useContext(DeMinimisContext);
+  const { deMinimisAids, setDeMinimisAids } =
+    React.useContext(DeMinimisContext);
   const { onNext, onSave, onDelete } = useFormActions(application);
 
   const translationsBase = 'common:applications.sections.company';
@@ -103,6 +106,20 @@ const useApplicationFormStep1 = (
         return focusAndScroll(errorFieldKey);
       }
 
+      if (isUnfinishedDeminimisAid) {
+        showErrorToast(
+          t(`${translationsBase}.deMinimisUnfinished.label`),
+          t(`${translationsBase}.deMinimisUnfinished.content`)
+        );
+        return false;
+      }
+
+      // de minimis fields are empty, set radio to false
+      if (deMinimisAids.length === 0) {
+        void formik.setFieldValue(fields.deMinimisAidSet.name, []);
+        void formik.setFieldValue(fields.deMinimisAid.name, false);
+      }
+
       return formik.submitForm();
     });
   };
@@ -114,8 +131,8 @@ const useApplicationFormStep1 = (
   const applicationId = values?.id;
   const handleDelete = applicationId
     ? () => {
-      void onDelete(applicationId);
-    }
+        void onDelete(applicationId);
+      }
     : undefined;
 
   const clearDeminimisAids = React.useCallback((): void => {
diff --git a/frontend/benefit/applicant/src/components/applications/forms/application/step4/ApplicationFormStep4.tsx b/frontend/benefit/applicant/src/components/applications/forms/application/step4/ApplicationFormStep4.tsx
index d254c886a0..12580d7bfb 100644
--- a/frontend/benefit/applicant/src/components/applications/forms/application/step4/ApplicationFormStep4.tsx
+++ b/frontend/benefit/applicant/src/components/applications/forms/application/step4/ApplicationFormStep4.tsx
@@ -75,7 +75,7 @@ const ApplicationFormStep4: React.FC<DynamicFormStepComponentProps> = ({
             />
           </$GridCell>
         )}
-        <$GridCell $colSpan={6}>
+        <$GridCell $colSpan={12}>
           <CredentialsSection
             title={t(`${translationsBase}.uploadPowerOfAttorney.title`)}
             description={t(
@@ -123,7 +123,7 @@ const ApplicationFormStep4: React.FC<DynamicFormStepComponentProps> = ({
                         {t(`${translationsBase}.uploadPowerOfAttorney.action1`)}
                       </Button>
                     </$GridCell>
-                    <$GridCell $colSpan={6}>
+                    <$GridCell $colSpan={8}>
                       <UploadAttachment
                         theme="black"
                         variant="secondary"
diff --git a/frontend/benefit/applicant/src/components/applications/pageContent/PageContent.tsx b/frontend/benefit/applicant/src/components/applications/pageContent/PageContent.tsx
index f3faded8e6..a2c895f522 100644
--- a/frontend/benefit/applicant/src/components/applications/pageContent/PageContent.tsx
+++ b/frontend/benefit/applicant/src/components/applications/pageContent/PageContent.tsx
@@ -133,7 +133,14 @@ const PageContent: React.FC = () => {
   }
 
   return (
-    <Container data-testid={`step-${currentStep}`}>
+    <Container
+      data-testid={`step-${currentStep}`}
+      css={{
+        'max-width': theme.contentWidth.max,
+        margin: '0 auto',
+        'grid-template-columns': 'repeat(auto-fit, minmax(180px, 1fr))',
+      }}
+    >
       <$PageHeader>
         <$HeaderItem>
           <$PageHeading>
diff --git a/frontend/benefit/applicant/src/components/header/useHeader.ts b/frontend/benefit/applicant/src/components/header/useHeader.ts
index 986f2bfebb..9877f076b9 100644
--- a/frontend/benefit/applicant/src/components/header/useHeader.ts
+++ b/frontend/benefit/applicant/src/components/header/useHeader.ts
@@ -1,10 +1,12 @@
 import useApplicationQuery from 'benefit/applicant/hooks/useApplicationQuery';
 import { useTranslation } from 'benefit/applicant/i18n';
 import { getLanguageOptions } from 'benefit/applicant/utils/common';
+import { BackendEndpoint } from 'benefit-shared/backend-api/backend-api';
 import { APPLICATION_STATUSES } from 'benefit-shared/constants';
 import { useRouter } from 'next/router';
 import { TFunction } from 'next-i18next';
 import React, { useEffect, useState } from 'react';
+import useBackendAPI from 'shared/hooks/useBackendAPI';
 import useToggle from 'shared/hooks/useToggle';
 import { NavigationItem, OptionType } from 'shared/types/common';
 
@@ -27,6 +29,8 @@ const useHeader = (): ExtendedComponentProps => {
   const { t } = useTranslation();
   const router = useRouter();
   const id = router?.query?.id?.toString() ?? '';
+  const { axios } = useBackendAPI();
+
   const [hasMessenger, setHasMessenger] = useState<boolean>(false);
   const [unreadMessagesCount, setUnredMessagesCount] = useState<
     number | undefined | null
@@ -75,6 +79,10 @@ const useHeader = (): ExtendedComponentProps => {
   ): void => {
     e.preventDefault();
 
+    void axios.get(BackendEndpoint.USER_OPTIONS, {
+      params: { lang: newLanguage.value },
+    });
+
     void router.push({ pathname, query }, asPath, {
       locale: newLanguage.value,
     });
diff --git a/frontend/benefit/applicant/src/components/messenger/Messages.tsx b/frontend/benefit/applicant/src/components/messenger/Messages.tsx
index 488a367495..97a255236e 100644
--- a/frontend/benefit/applicant/src/components/messenger/Messages.tsx
+++ b/frontend/benefit/applicant/src/components/messenger/Messages.tsx
@@ -38,6 +38,8 @@ const Messages: React.FC<ComponentProps> = ({ data, variant, withScroll }) => {
           date={message.modifiedAt || ''}
           text={message.content}
           isPrimary={message.messageType === MESSAGE_TYPES.APPLICANT_MESSAGE}
+          wrapAsColumn
+          alignRight={message.messageType === MESSAGE_TYPES.APPLICANT_MESSAGE}
           variant={variant}
         />
       ))}
diff --git a/frontend/benefit/applicant/src/constants.ts b/frontend/benefit/applicant/src/constants.ts
index ad14473e56..99fbb5e75e 100644
--- a/frontend/benefit/applicant/src/constants.ts
+++ b/frontend/benefit/applicant/src/constants.ts
@@ -113,4 +113,5 @@ export const SUBMITTED_STATUSES = [
 
 export enum LOCAL_STORAGE_KEYS {
   IS_TERMS_OF_SERVICE_APPROVED = 'isTermsOfServiceApproved',
+  CSRF_TOKEN = 'csrfToken',
 }
diff --git a/frontend/benefit/applicant/src/hooks/useUserQuery.ts b/frontend/benefit/applicant/src/hooks/useUserQuery.ts
index ace1549ef8..c3958671ca 100644
--- a/frontend/benefit/applicant/src/hooks/useUserQuery.ts
+++ b/frontend/benefit/applicant/src/hooks/useUserQuery.ts
@@ -7,6 +7,7 @@ import { useQuery, UseQueryResult } from 'react-query';
 import showErrorToast from 'shared/components/toast/show-error-toast';
 import useBackendAPI from 'shared/hooks/useBackendAPI';
 import useLocale from 'shared/hooks/useLocale';
+import { setLocalStorageItem } from 'shared/utils/localstorage.utils';
 
 import { LOCAL_STORAGE_KEYS } from '../constants';
 
@@ -51,9 +52,9 @@ const useUserQuery = (
       select: (data) => camelcaseKeys(data, { deep: true }),
       onError: (error) => handleError(error),
       onSuccess: (data) => {
+        setLocalStorageItem(LOCAL_STORAGE_KEYS.CSRF_TOKEN, data.csrfToken);
         if (data.id && data.termsOfServiceApprovalNeeded)
-          // eslint-disable-next-line scanjs-rules/identifier_localStorage
-          localStorage.setItem(
+          setLocalStorageItem(
             LOCAL_STORAGE_KEYS.IS_TERMS_OF_SERVICE_APPROVED,
             'false'
           );
diff --git a/frontend/benefit/applicant/src/pages/_app.tsx b/frontend/benefit/applicant/src/pages/_app.tsx
index 97c401d21d..e0be75f92d 100644
--- a/frontend/benefit/applicant/src/pages/_app.tsx
+++ b/frontend/benefit/applicant/src/pages/_app.tsx
@@ -13,8 +13,8 @@ import {
 import { setAppLoaded } from 'benefit-shared/utils/common';
 import { AppProps } from 'next/app';
 import { useRouter } from 'next/router';
+import { useTranslation } from 'next-i18next';
 import React, { useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 import { QueryClient, QueryClientProvider } from 'react-query';
 import BackendAPIProvider from 'shared/backend-api/BackendAPIProvider';
 import BaseApp from 'shared/components/app/BaseApp';
@@ -56,6 +56,7 @@ const App: React.FC<AppProps> = (appProps) => {
     <BackendAPIProvider
       baseURL={getBackendDomain()}
       headers={getHeaders(locale)}
+      isLocalStorageCsrf
     >
       <QueryClientProvider client={queryClient}>
         <AuthProvider>
diff --git a/frontend/benefit/applicant/src/pages/login.tsx b/frontend/benefit/applicant/src/pages/login.tsx
index d86b1e0012..9be28bea44 100644
--- a/frontend/benefit/applicant/src/pages/login.tsx
+++ b/frontend/benefit/applicant/src/pages/login.tsx
@@ -23,8 +23,9 @@ import {
   $GridCell,
 } from 'shared/components/forms/section/FormSection.sc';
 import getServerSideTranslations from 'shared/i18n/get-server-side-translations';
+import { removeLocalStorageItem } from 'shared/utils/localstorage.utils';
 
-import { IS_CLIENT, LOCAL_STORAGE_KEYS } from '../constants';
+import { LOCAL_STORAGE_KEYS } from '../constants';
 
 type NotificationProps =
   | (Pick<HDSNotificationProps, 'type' | 'label'> & {
@@ -60,9 +61,8 @@ const Login: NextPage = () => {
   }, [logout, queryClient]);
 
   useEffect(() => {
-    if (IS_CLIENT)
-      // eslint-disable-next-line scanjs-rules/identifier_localStorage
-      localStorage.removeItem(LOCAL_STORAGE_KEYS.IS_TERMS_OF_SERVICE_APPROVED);
+    removeLocalStorageItem(LOCAL_STORAGE_KEYS.IS_TERMS_OF_SERVICE_APPROVED);
+    removeLocalStorageItem(LOCAL_STORAGE_KEYS.CSRF_TOKEN);
   }, []);
 
   return (
diff --git a/frontend/benefit/applicant/src/styles/globals.css b/frontend/benefit/applicant/src/styles/globals.css
index cf05c00a9d..555a33b824 100644
--- a/frontend/benefit/applicant/src/styles/globals.css
+++ b/frontend/benefit/applicant/src/styles/globals.css
@@ -17,3 +17,8 @@ li {
 .app-load-wrapper > div {
   display: none;
 }
+
+/* Allow HDS tooltip's content to break new line on every \r\n */
+[class*='Tooltip-module'] section[class*='Tooltip-module_tooltip'] {
+  white-space: pre-line;
+}
diff --git a/frontend/benefit/handler/jest.config.js b/frontend/benefit/handler/jest.config.js
index 0c71ada50a..da39fc59f5 100644
--- a/frontend/benefit/handler/jest.config.js
+++ b/frontend/benefit/handler/jest.config.js
@@ -1,11 +1,12 @@
 const sharedConfig = require('../../jest.config.js');
-module.exports = {
+const nextJest = require('next/jest');
+
+const createJestConfig = nextJest({
+  dir: './',
+});
+
+const config = {
   ...sharedConfig,
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.jest.json',
-    },
-  },
   moduleNameMapper: {
     [`^shared\/(.*)$`]: '<rootDir>/../../shared/src/$1',
     [`^benefit-shared\/(.*)$`]: '<rootDir>../shared/src/$1',
@@ -21,3 +22,5 @@ module.exports = {
     '<rootDir>/../../shared/src/test/',
   ],
 };
+
+module.exports = createJestConfig(config);
diff --git a/frontend/benefit/handler/next-env.d.ts b/frontend/benefit/handler/next-env.d.ts
index 9bc3dd46b9..4f11a03dc6 100644
--- a/frontend/benefit/handler/next-env.d.ts
+++ b/frontend/benefit/handler/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
diff --git a/frontend/benefit/handler/package.json b/frontend/benefit/handler/package.json
index 9c463613e7..fbdfaa174f 100644
--- a/frontend/benefit/handler/package.json
+++ b/frontend/benefit/handler/package.json
@@ -11,15 +11,15 @@
     "test": "jest --passWithNoTests",
     "test:staged": "yarn test --watchAll=false --findRelatedTests",
     "test:coverage": "yarn test --verbose --coverage",
-    "browser-test": "testcafe 'chrome --allow-insecure-localhost --disable-web-security --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/pages/",
-    "browser-test:ci": "testcafe 'chrome:headless --allow-insecure-localhost --disable-web-security --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/pages/"
+    "browser-test": "testcafe 'chrome --allow-insecure-localhost --disable-web-security --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/pages/ --experimental-proxyless",
+    "browser-test:ci": "testcafe 'chrome:headless --allow-insecure-localhost --disable-web-security --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/pages/ --experimental-proxyless"
   },
   "dependencies": {
     "@frontend/benefit-shared": "*",
     "@frontend/shared": "*",
     "@sentry/browser": "^7.16.0",
     "axios": "^0.27.2",
-    "babel-plugin-import": "^1.13.3",
+    "babel-plugin-import": "^1.13.6",
     "camelcase-keys": "^7.0.2",
     "date-fns": "^2.24.0",
     "dotenv": "^16.0.0",
@@ -29,11 +29,11 @@
     "fuse.js": "^6.6.2",
     "hds-react": "^2.10.0",
     "lodash": "^4.17.21",
-    "next": "^11.1.4",
+    "next": "^12.3.4",
     "next-compose-plugins": "^2.2.1",
-    "next-i18next": "^10.5.0",
+    "next-i18next": "^13.0.3",
     "next-plugin-custom-babel-config": "^1.0.5",
-    "next-transpile-modules": "^9.0.0",
+    "next-transpile-modules": "^9.1.0",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-input-mask": "^2.0.4",
diff --git a/frontend/benefit/handler/public/favicons/manifest.webmanifest b/frontend/benefit/handler/public/favicons/manifest.webmanifest
index 5e0299b4af..267bb8ff36 100644
--- a/frontend/benefit/handler/public/favicons/manifest.webmanifest
+++ b/frontend/benefit/handler/public/favicons/manifest.webmanifest
@@ -1,6 +1,14 @@
 {
-    "icons": [
-        { "src": "/favicon-192x192.png", "type": "image/png", "sizes": "192x192" },
-        { "src": "/favicon-512x512.png", "type": "image/png", "sizes": "512x512" }
-    ]
-}
\ No newline at end of file
+  "icons": [
+    {
+      "src": "/favicons/favicon-192x192.png",
+      "type": "image/png",
+      "sizes": "192x192"
+    },
+    {
+      "src": "/favicons/favicon-512x512.png",
+      "type": "image/png",
+      "sizes": "512x512"
+    }
+  ]
+}
diff --git a/frontend/benefit/handler/public/locales/en/common.json b/frontend/benefit/handler/public/locales/en/common.json
index 487d9beb95..07c5643ccc 100644
--- a/frontend/benefit/handler/public/locales/en/common.json
+++ b/frontend/benefit/handler/public/locales/en/common.json
@@ -32,6 +32,11 @@
         }
       }
     },
+    "titles": {
+      "applicantMessage": "Hakija",
+      "handlerMessage": "Käsittelijä",
+      "note": ""
+    },
     "showEveryone": "Nämä viestit näkyvät hakijalle",
     "showToHanlderOnly": "Näkyy vain käsittelijöille",
     "compose": "Kirjoita viesti",
@@ -640,7 +645,7 @@
       "workingHours": "Työaika: {{workingHours}} tuntia viikossa",
       "monthlyPay": "Bruttopalkka: {{monthlyPay}} € / kk",
       "otherExpenses": "Sivukulut: {{otherExpenses}} € / kk",
-      "vacationMoney": "Lomaraha: {{vacationMoney}} €",
+      "vacationMoney": "Lomaraha: {{vacationMoney}} € / kk",
       "noSupport": "Ei puolleta",
       "support": "Puolletaan",
       "reason": "Perustelu",
@@ -680,7 +685,10 @@
         "label": "Alkaen",
         "placeholder": "Alkaen"
       },
-      "endDate": { "label": "Päättyen", "placeholder": "Päättyen" },
+      "endDate": {
+        "label": "Päättyen",
+        "placeholder": "Päättyen"
+      },
       "monthlyPay": {
         "label": "Bruttopalkka € / kk",
         "placeholder": "Bruttopalkka"
@@ -690,7 +698,7 @@
         "placeholder": "Sivukulut"
       },
       "vacationMoney": {
-        "label": "Lomaraha €",
+        "label": "Lomaraha € / kk",
         "placeholder": "Lomaraha"
       },
       "stateAidMaxPercentage": {
@@ -741,7 +749,7 @@
       "header": "Palkan Helsinki-lisää haettu ajalle",
       "monthlyPay": "Bruttopalkka € / kk",
       "otherExpenses": "Sivukulut € / kk",
-      "vacationMoney": "Lomaraha €",
+      "vacationMoney": "Lomaraha € / kk",
       "startEndDates": "{{startDate}} - {{endDate}} ({{period}} kk)",
       "maximumAid": "Valtiotukimaksimi",
       "salarySubsidyPercentage": "Palkkatukiprosentti",
@@ -822,7 +830,8 @@
       "number": {
         "invalid": "Virheellinen arvo, ilmoita vain numeroita",
         "max": "Arvon tulee olla enintään {{max}}",
-        "min": "Arvon tulee olla vähintään {{min}}"
+        "min": "Arvon tulee olla vähintään {{min}}",
+        "twoDecimals": "Arvon tulee sisältää enintään kaksi desimaalia"
       },
       "string": {
         "max": "Tämä kenttä voi olla korkeintaan {{max}} merkkiä pitkä",
@@ -1012,6 +1021,10 @@
         "p2pInspectorEmail": "Tarkastajan sähköposti, P2P",
         "p2pCheckerName": "Hyväksyjän nimi, P2P"
       },
+      "headings": {
+        "decisionDetails": "Päätöksen tiedot",
+        "inspectionDetails": "Tarkastuksen tiedot"
+      },
       "errors": {
         "decision_maker_name": "Pakollinen tieto",
         "decision_maker_title": "Pakollinen tieto",
@@ -1034,4 +1047,4 @@
     },
     "keyword": "Hakusana"
   }
-}
+}
\ No newline at end of file
diff --git a/frontend/benefit/handler/public/locales/fi/common.json b/frontend/benefit/handler/public/locales/fi/common.json
index af510b57d3..04cf8c7bf2 100644
--- a/frontend/benefit/handler/public/locales/fi/common.json
+++ b/frontend/benefit/handler/public/locales/fi/common.json
@@ -32,6 +32,11 @@
         }
       }
     },
+    "titles": {
+      "applicantMessage": "Hakija",
+      "handlerMessage": "Käsittelijä",
+      "note": ""
+    },
     "showEveryone": "Nämä viestit näkyvät hakijalle",
     "showToHanlderOnly": "Näkyy vain käsittelijöille",
     "compose": "Kirjoita viesti",
@@ -640,7 +645,7 @@
       "workingHours": "Työaika: {{workingHours}} tuntia viikossa",
       "monthlyPay": "Bruttopalkka: {{monthlyPay}} € / kk",
       "otherExpenses": "Sivukulut: {{otherExpenses}} € / kk",
-      "vacationMoney": "Lomaraha: {{vacationMoney}} €",
+      "vacationMoney": "Lomaraha: {{vacationMoney}} € / kk",
       "noSupport": "Ei puolleta",
       "support": "Puolletaan",
       "reason": "Perustelu",
@@ -680,7 +685,10 @@
         "label": "Alkaen",
         "placeholder": "Alkaen"
       },
-      "endDate": { "label": "Päättyen", "placeholder": "Päättyen" },
+      "endDate": {
+        "label": "Päättyen",
+        "placeholder": "Päättyen"
+      },
       "monthlyPay": {
         "label": "Bruttopalkka € / kk",
         "placeholder": "Bruttopalkka"
@@ -690,7 +698,7 @@
         "placeholder": "Sivukulut"
       },
       "vacationMoney": {
-        "label": "Lomaraha €",
+        "label": "Lomaraha € / kk",
         "placeholder": "Lomaraha"
       },
       "stateAidMaxPercentage": {
@@ -741,7 +749,7 @@
       "header": "Palkan Helsinki-lisää haettu ajalle",
       "monthlyPay": "Bruttopalkka € / kk",
       "otherExpenses": "Sivukulut € / kk",
-      "vacationMoney": "Lomaraha €",
+      "vacationMoney": "Lomaraha € / kk",
       "startEndDates": "{{startDate}} - {{endDate}} ({{period}} kk)",
       "maximumAid": "Valtiotukimaksimi",
       "salarySubsidyPercentage": "Palkkatukiprosentti",
@@ -822,7 +830,8 @@
       "number": {
         "invalid": "Virheellinen arvo, ilmoita vain numeroita",
         "max": "Arvon tulee olla enintään {{max}}",
-        "min": "Arvon tulee olla vähintään {{min}}"
+        "min": "Arvon tulee olla vähintään {{min}}",
+        "twoDecimals": "Arvon tulee sisältää enintään kaksi desimaalia"
       },
       "string": {
         "max": "Tämä kenttä voi olla korkeintaan {{max}} merkkiä pitkä",
@@ -1012,6 +1021,10 @@
         "p2pInspectorEmail": "Tarkastajan sähköposti, P2P",
         "p2pCheckerName": "Hyväksyjän nimi, P2P"
       },
+      "headings": {
+        "decisionDetails": "Päätöksen tiedot",
+        "inspectionDetails": "Tarkastuksen tiedot"
+      },
       "errors": {
         "decision_maker_name": "Pakollinen tieto",
         "decision_maker_title": "Pakollinen tieto",
@@ -1034,4 +1047,4 @@
     },
     "keyword": "Hakusana"
   }
-}
+}
\ No newline at end of file
diff --git a/frontend/benefit/handler/public/locales/sv/common.json b/frontend/benefit/handler/public/locales/sv/common.json
index 07d47919da..85ff27375d 100644
--- a/frontend/benefit/handler/public/locales/sv/common.json
+++ b/frontend/benefit/handler/public/locales/sv/common.json
@@ -32,6 +32,11 @@
         }
       }
     },
+    "titles": {
+      "applicantMessage": "Hakija",
+      "handlerMessage": "Käsittelijä",
+      "note": ""
+    },
     "showEveryone": "Nämä viestit näkyvät hakijalle",
     "showToHanlderOnly": "Näkyy vain käsittelijöille",
     "compose": "Kirjoita viesti",
@@ -646,7 +651,7 @@
       "workingHours": "Työaika: {{workingHours}} tuntia viikossa",
       "monthlyPay": "Bruttopalkka: {{monthlyPay}} € / kk",
       "otherExpenses": "Sivukulut: {{otherExpenses}} € / kk",
-      "vacationMoney": "Lomaraha: {{vacationMoney}} €",
+      "vacationMoney": "Lomaraha: {{vacationMoney}} € / kk",
       "noSupport": "Ei puolleta",
       "support": "Puolletaan",
       "reason": "Perustelu",
@@ -686,7 +691,10 @@
         "label": "Alkaen",
         "placeholder": "Alkaen"
       },
-      "endDate": { "label": "Päättyen", "placeholder": "Päättyen" },
+      "endDate": {
+        "label": "Päättyen",
+        "placeholder": "Päättyen"
+      },
       "monthlyPay": {
         "label": "Bruttopalkka € / kk",
         "placeholder": "Bruttopalkka"
@@ -696,7 +704,7 @@
         "placeholder": "Sivukulut"
       },
       "vacationMoney": {
-        "label": "Lomaraha €",
+        "label": "Lomaraha € / kk",
         "placeholder": "Lomaraha"
       },
       "stateAidMaxPercentage": {
@@ -747,7 +755,7 @@
       "header": "Palkan Helsinki-lisää haettu ajalle",
       "monthlyPay": "Bruttopalkka € / kk",
       "otherExpenses": "Sivukulut € / kk",
-      "vacationMoney": "Lomaraha €",
+      "vacationMoney": "Lomaraha € / kk",
       "startEndDates": "{{startDate}} - {{endDate}} ({{period}} kk)",
       "maximumAid": "Valtiotukimaksimi",
       "salarySubsidyPercentage": "Palkkatukiprosentti",
@@ -828,7 +836,8 @@
       "number": {
         "invalid": "Virheellinen arvo, ilmoita vain numeroita",
         "max": "Arvon tulee olla enintään {{max}}",
-        "min": "Arvon tulee olla vähintään {{min}}"
+        "min": "Arvon tulee olla vähintään {{min}}",
+        "twoDecimals": "Arvon tulee sisältää enintään kaksi desimaalia"
       },
       "string": {
         "max": "Tämä kenttä voi olla korkeintaan {{max}} merkkiä pitkä",
@@ -1018,6 +1027,10 @@
         "p2pInspectorEmail": "Tarkastajan sähköposti, P2P",
         "p2pCheckerName": "Hyväksyjän nimi, P2P"
       },
+      "headings": {
+        "decisionDetails": "Päätöksen tiedot",
+        "inspectionDetails": "Tarkastuksen tiedot"
+      },
       "errors": {
         "decision_maker_name": "Pakollinen tieto",
         "decision_maker_title": "Pakollinen tieto",
@@ -1040,4 +1053,4 @@
     },
     "keyword": "Hakusana"
   }
-}
+}
\ No newline at end of file
diff --git a/frontend/benefit/handler/src/auth/AuthProvider.tsx b/frontend/benefit/handler/src/auth/AuthProvider.tsx
index 14583505e9..103a2b400b 100644
--- a/frontend/benefit/handler/src/auth/AuthProvider.tsx
+++ b/frontend/benefit/handler/src/auth/AuthProvider.tsx
@@ -5,11 +5,11 @@ import AuthContext from 'shared/auth/AuthContext';
 const AuthProvider = <P,>({
   children,
 }: React.PropsWithChildren<P>): JSX.Element => {
-  const userQuery = useUserQuery((user) => Boolean(user));
+  const userQuery = useUserQuery((user) => user);
   return (
     <AuthContext.Provider
       value={{
-        isAuthenticated: userQuery.isSuccess && userQuery.data,
+        isAuthenticated: userQuery.isSuccess && Boolean(userQuery.data),
         isLoading: userQuery.isLoading,
         isError: userQuery.isError,
       }}
diff --git a/frontend/benefit/handler/src/components/applicationReview/ApplicationReview.tsx b/frontend/benefit/handler/src/components/applicationReview/ApplicationReview.tsx
index a1ac21a07e..9783b68630 100644
--- a/frontend/benefit/handler/src/components/applicationReview/ApplicationReview.tsx
+++ b/frontend/benefit/handler/src/components/applicationReview/ApplicationReview.tsx
@@ -1,5 +1,6 @@
 import ApplicationHeader from 'benefit/handler/components/applicationHeader/ApplicationHeader';
 import { HANDLED_STATUSES } from 'benefit/handler/constants';
+import ReviewStateContext from 'benefit/handler/context/ReviewStateContext';
 import {
   APPLICATION_ORIGINS,
   APPLICATION_STATUSES,
@@ -33,6 +34,7 @@ import PaySubsidyView from './paySubsidyView/PaySubsidyView';
 import SalaryBenefitCalculatorView from './salaryBenefitCalculatorView/SalaryBenefitCalculatorView';
 import { useApplicationReview } from './useApplicationReview';
 
+
 const ApplicationReview: React.FC = () => {
   const {
     application,
@@ -41,6 +43,8 @@ const ApplicationReview: React.FC = () => {
     t,
     isUploading,
     handleUpload,
+    reviewState,
+    handleUpdateReviewState,
   } = useApplicationReview();
   const theme = useTheme();
 
@@ -92,45 +96,52 @@ const ApplicationReview: React.FC = () => {
             })}
           </StatusLabel>
         )}
-        <CompanyInfoView data={application} />
-        <ContactPersonView data={application} />
-        <DeminimisView data={application} />
-        <CoOperationNegotiationsView data={application} />
-        <EmployeeView
-          data={application}
-          handleUpload={handleUpload}
-          isUploading={isUploading}
-        />
-        <PaySubsidyView
-          data={application}
-          handleUpload={handleUpload}
-          isUploading={isUploading}
-        />
-        <BenefitView data={application} />
-        <EmploymentView
-          data={application}
-          handleUpload={handleUpload}
-          isUploading={isUploading}
-        />
-        {application.applicationOrigin === APPLICATION_ORIGINS.HANDLER ? (
-          <AttachmentsView data={application} />
-        ) : (
-          <ConsentView
+        <ReviewStateContext.Provider
+          value={{
+            reviewState,
+            handleUpdateReviewState,
+          }}
+        >
+          <CompanyInfoView data={application} />
+          <ContactPersonView data={application} />
+          <DeminimisView data={application} />
+          <CoOperationNegotiationsView data={application} />
+          <EmployeeView
             data={application}
             handleUpload={handleUpload}
             isUploading={isUploading}
           />
-        )}
-        {application.status === APPLICATION_STATUSES.HANDLING && (
-          <>
-            <CalculatorView />
-            <ApplicationProcessingView />
-          </>
-        )}
-        {application.status &&
-          HANDLED_STATUSES.includes(application.status) && (
-            <HandledView data={application} />
+          <PaySubsidyView
+            data={application}
+            handleUpload={handleUpload}
+            isUploading={isUploading}
+          />
+          <BenefitView data={application} />
+          <EmploymentView
+            data={application}
+            handleUpload={handleUpload}
+            isUploading={isUploading}
+          />
+          {application.applicationOrigin === APPLICATION_ORIGINS.HANDLER ? (
+            <AttachmentsView data={application} />
+          ) : (
+            <ConsentView
+              data={application}
+              handleUpload={handleUpload}
+              isUploading={isUploading}
+            />
+          )}
+          {application.status === APPLICATION_STATUSES.HANDLING && (
+            <>
+              <CalculatorView />
+              <ApplicationProcessingView />
+            </>
           )}
+          {application.status &&
+            HANDLED_STATUSES.includes(application.status) && (
+              <HandledView data={application} />
+            )}
+        </ReviewStateContext.Provider>
       </Container>
       <StickyActionBar>
         {application.status === APPLICATION_STATUSES.RECEIVED && (
diff --git a/frontend/benefit/handler/src/components/applicationReview/actions/handlingApplicationActions/HandlingApplicationActions.tsx b/frontend/benefit/handler/src/components/applicationReview/actions/handlingApplicationActions/HandlingApplicationActions.tsx
index 964edece1d..adfc291336 100644
--- a/frontend/benefit/handler/src/components/applicationReview/actions/handlingApplicationActions/HandlingApplicationActions.tsx
+++ b/frontend/benefit/handler/src/components/applicationReview/actions/handlingApplicationActions/HandlingApplicationActions.tsx
@@ -63,18 +63,21 @@ const HandlingApplicationActions: React.FC<Props> = ({
             }`
           )}
         </Button>
-        {(application.status === APPLICATION_STATUSES.ACCEPTED ||
-          application.status === APPLICATION_STATUSES.REJECTED) && (
-          <Button
-            onClick={onBackToHandling}
-            theme="black"
-            variant="secondary"
-            disabled={!!application.batch}
-            iconLeft={<IconArrowUndo />}
-          >
-            {t(`${translationsBase}.backToHandling`)}
-          </Button>
-        )}
+        {[
+          APPLICATION_STATUSES.ACCEPTED,
+          APPLICATION_STATUSES.REJECTED,
+        ].includes(application.status) &&
+          !application.batch &&
+          !application.archived && (
+            <Button
+              onClick={onBackToHandling}
+              theme="black"
+              variant="secondary"
+              iconLeft={<IconArrowUndo />}
+            >
+              {t(`${translationsBase}.backToHandling`)}
+            </Button>
+          )}
         <Button
           onClick={toggleMessagesDrawerVisiblity}
           theme="black"
@@ -84,18 +87,20 @@ const HandlingApplicationActions: React.FC<Props> = ({
           {t(`${translationsBase}.handlingPanel`)}
         </Button>
       </$Column>
-      {application.status !== APPLICATION_STATUSES.CANCELLED && (
-        <$Column>
-          <Button
-            onClick={openDialog}
-            theme="black"
-            variant="supplementary"
-            iconLeft={<IconTrash />}
-          >
-            {t(`${translationsBase}.cancel`)}
-          </Button>
-        </$Column>
-      )}
+      {application.status !== APPLICATION_STATUSES.CANCELLED &&
+        !application.batch &&
+        !application.archived && (
+          <$Column>
+            <Button
+              onClick={openDialog}
+              theme="black"
+              variant="supplementary"
+              iconLeft={<IconTrash />}
+            >
+              {t(`${translationsBase}.cancel`)}
+            </Button>
+          </$Column>
+        )}
 
       {isConfirmationModalOpen && (
         <Modal
diff --git a/frontend/benefit/handler/src/components/applicationReview/benefitView/BenefitView.tsx b/frontend/benefit/handler/src/components/applicationReview/benefitView/BenefitView.tsx
index 9ec52cd8c1..9284f8fa9f 100644
--- a/frontend/benefit/handler/src/components/applicationReview/benefitView/BenefitView.tsx
+++ b/frontend/benefit/handler/src/components/applicationReview/benefitView/BenefitView.tsx
@@ -18,6 +18,7 @@ const BenefitView: React.FC<ApplicationReviewViewProps> = ({ data }) => {
       withoutDivider
       header={t(`${translationsBase}.headings.heading7`)}
       action={data.status !== APPLICATION_STATUSES.RECEIVED ? <span /> : null}
+      section='benefit'
     >
       <$GridCell $colSpan={6}>
         <$ViewField>
diff --git a/frontend/benefit/handler/src/components/applicationReview/coOperationNegotiationsView/CoOperationNegotiationsView.tsx b/frontend/benefit/handler/src/components/applicationReview/coOperationNegotiationsView/CoOperationNegotiationsView.tsx
index a27c2464e2..1271fdce1a 100644
--- a/frontend/benefit/handler/src/components/applicationReview/coOperationNegotiationsView/CoOperationNegotiationsView.tsx
+++ b/frontend/benefit/handler/src/components/applicationReview/coOperationNegotiationsView/CoOperationNegotiationsView.tsx
@@ -18,6 +18,7 @@ const CoOperationNegotiationsView: React.FC<ApplicationReviewViewProps> = ({
     <ReviewSection
       header={t(`${translationsBase}.headings.heading4`)}
       action={data.status !== APPLICATION_STATUSES.RECEIVED ? <span /> : null}
+      section='coOperationNegotiations'
     >
       <$GridCell $colSpan={12}>
         <$ViewField>
diff --git a/frontend/benefit/handler/src/components/applicationReview/companyInfoView/CompanyInfoView.tsx b/frontend/benefit/handler/src/components/applicationReview/companyInfoView/CompanyInfoView.tsx
index b879800627..3329b7d19b 100644
--- a/frontend/benefit/handler/src/components/applicationReview/companyInfoView/CompanyInfoView.tsx
+++ b/frontend/benefit/handler/src/components/applicationReview/companyInfoView/CompanyInfoView.tsx
@@ -21,6 +21,7 @@ const CompanyInfoView: React.FC<ApplicationReviewViewProps> = ({ data }) => {
     <ReviewSection
       header={t(`${translationsBase}.headings.heading1`)}
       action={data.status !== APPLICATION_STATUSES.RECEIVED ? <span /> : null}
+      section='company'
     >
       <$GridCell $colSpan={3}>
         <$ViewField>{data.company?.name}</$ViewField>
diff --git a/frontend/benefit/handler/src/components/applicationReview/consentView/ConsentView.tsx b/frontend/benefit/handler/src/components/applicationReview/consentView/ConsentView.tsx
index 4a99b27af6..d9f601a4ef 100644
--- a/frontend/benefit/handler/src/components/applicationReview/consentView/ConsentView.tsx
+++ b/frontend/benefit/handler/src/components/applicationReview/consentView/ConsentView.tsx
@@ -21,6 +21,7 @@ const ConsentView: React.FC<ApplicationReviewViewProps> = ({
   return (
     <ReviewSection
       header={t(`${translationsBase}.headings.heading9`)}
+      section='approval'
       action={
         data.status !== APPLICATION_STATUSES.RECEIVED ? (
           <ConsentActions
diff --git a/frontend/benefit/handler/src/components/applicationReview/contactPersonView/ContactPersonView.tsx b/frontend/benefit/handler/src/components/applicationReview/contactPersonView/ContactPersonView.tsx
index 1c57f5cf09..16297cfbb8 100644
--- a/frontend/benefit/handler/src/components/applicationReview/contactPersonView/ContactPersonView.tsx
+++ b/frontend/benefit/handler/src/components/applicationReview/contactPersonView/ContactPersonView.tsx
@@ -17,6 +17,7 @@ const ContactPersonView: React.FC<ApplicationReviewViewProps> = ({ data }) => {
     <ReviewSection
       header={t(`${translationsBase}.headings.heading2`)}
       action={data.status !== APPLICATION_STATUSES.RECEIVED ? <span /> : null}
+      section='companyContactPerson'
     >
       <$GridCell $colSpan={6}>
         <$ViewField>
diff --git a/frontend/benefit/handler/src/components/applicationReview/deminimisView/DeminimisView.tsx b/frontend/benefit/handler/src/components/applicationReview/deminimisView/DeminimisView.tsx
index 7a3a2d1581..475bc71862 100644
--- a/frontend/benefit/handler/src/components/applicationReview/deminimisView/DeminimisView.tsx
+++ b/frontend/benefit/handler/src/components/applicationReview/deminimisView/DeminimisView.tsx
@@ -21,6 +21,7 @@ const DeminimisView: React.FC<ApplicationReviewViewProps> = ({ data }) => {
     <ReviewSection
       header={t(`${translationsBase}.headings.heading3`)}
       action={data.status !== APPLICATION_STATUSES.RECEIVED ? <span /> : null}
+      section='deMinimisAids'
     >
       {data.deMinimisAidSet && data.deMinimisAidSet?.length > 0 ? (
         <>
diff --git a/frontend/benefit/handler/src/components/applicationReview/employeeView/EmployeeView.tsx b/frontend/benefit/handler/src/components/applicationReview/employeeView/EmployeeView.tsx
index f57f42944c..1ca44308e0 100644
--- a/frontend/benefit/handler/src/components/applicationReview/employeeView/EmployeeView.tsx
+++ b/frontend/benefit/handler/src/components/applicationReview/employeeView/EmployeeView.tsx
@@ -26,6 +26,7 @@ const EmployeeView: React.FC<ApplicationReviewViewProps> = ({
   return (
     <ReviewSection
       header={t(`${translationsBase}.headings.heading5`)}
+      section='employee'
       action={
         data.status !== APPLICATION_STATUSES.RECEIVED ? (
           <EmployeeActions
diff --git a/frontend/benefit/handler/src/components/applicationReview/employmentAppliedMoreView/utils/validation.ts b/frontend/benefit/handler/src/components/applicationReview/employmentAppliedMoreView/utils/validation.ts
index bcbe74bb24..7c50be7441 100644
--- a/frontend/benefit/handler/src/components/applicationReview/employmentAppliedMoreView/utils/validation.ts
+++ b/frontend/benefit/handler/src/components/applicationReview/employmentAppliedMoreView/utils/validation.ts
@@ -9,8 +9,8 @@ export const getValidationSchema = (): Yup.SchemaOf<CalculationCommon> =>
   Yup.object().shape({
     [CALCULATION_EMPLOYMENT_KEYS.START_DATE]: Yup.string().typeError(
       VALIDATION_MESSAGE_KEYS.DATE_FORMAT
-    ),
+    ).required(VALIDATION_MESSAGE_KEYS.REQUIRED),
     [CALCULATION_EMPLOYMENT_KEYS.END_DATE]: Yup.string().typeError(
       VALIDATION_MESSAGE_KEYS.DATE_FORMAT
-    ),
+    ).required(VALIDATION_MESSAGE_KEYS.REQUIRED),
   });
diff --git a/frontend/benefit/handler/src/components/applicationReview/employmentView/EmpoymentView.tsx b/frontend/benefit/handler/src/components/applicationReview/employmentView/EmpoymentView.tsx
index 149fc2ca52..db0b56fb52 100644
--- a/frontend/benefit/handler/src/components/applicationReview/employmentView/EmpoymentView.tsx
+++ b/frontend/benefit/handler/src/components/applicationReview/employmentView/EmpoymentView.tsx
@@ -23,6 +23,7 @@ const EmploymentView: React.FC<ApplicationReviewViewProps> = ({
   return (
     <ReviewSection
       header={t(`${translationsBase}.headings.heading8`)}
+      section='employment'
       action={
         data.status !== APPLICATION_STATUSES.RECEIVED ? (
           <EmploymentActions
diff --git a/frontend/benefit/handler/src/components/applicationReview/paySubsidyView/PaySubsidyView.tsx b/frontend/benefit/handler/src/components/applicationReview/paySubsidyView/PaySubsidyView.tsx
index dd9b50ea05..9cc048dfc4 100644
--- a/frontend/benefit/handler/src/components/applicationReview/paySubsidyView/PaySubsidyView.tsx
+++ b/frontend/benefit/handler/src/components/applicationReview/paySubsidyView/PaySubsidyView.tsx
@@ -27,6 +27,7 @@ const PaySubsidyView: React.FC<ApplicationReviewViewProps> = ({
   return (
     <ReviewSection
       header={t(`${translationsBase}.headings.heading6`)}
+      section='paySubsidy'
       action={
         data.status !== APPLICATION_STATUSES.RECEIVED ? (
           <PaySubsidyActions
diff --git a/frontend/benefit/handler/src/components/applicationReview/salaryBenefitCalculatorView/SalaryBenefitCalculatorView.tsx b/frontend/benefit/handler/src/components/applicationReview/salaryBenefitCalculatorView/SalaryBenefitCalculatorView.tsx
index b7cab05ac9..a6d0834662 100644
--- a/frontend/benefit/handler/src/components/applicationReview/salaryBenefitCalculatorView/SalaryBenefitCalculatorView.tsx
+++ b/frontend/benefit/handler/src/components/applicationReview/salaryBenefitCalculatorView/SalaryBenefitCalculatorView.tsx
@@ -13,7 +13,6 @@ import {
 } from 'hds-react';
 import * as React from 'react';
 import { $ViewField } from 'shared/components/benefit/summaryView/SummaryView.sc';
-import DateInputWithSeparator from 'shared/components/forms/fields/dateInputWithSeparator/DateInputWithSeparator';
 import { $Checkbox } from 'shared/components/forms/fields/Fields.sc';
 import { Option } from 'shared/components/forms/fields/types';
 import { $GridCell } from 'shared/components/forms/section/FormSection.sc';
@@ -283,7 +282,7 @@ const SalaryBenefitCalculatorView: React.FC<
                   $colStart={item.paySubsidyPercent === 100 ? 6 : 3}
                   $colSpan={3}
                 >
-                  <DateInputWithSeparator
+                  <DateInput
                     id={fields.startDate.name}
                     name={fields.startDate.name}
                     placeholder={fields.startDate.placeholder}
@@ -353,7 +352,7 @@ const SalaryBenefitCalculatorView: React.FC<
       </$GridCell>
 
       <$GridCell $colStart={1} $colSpan={2}>
-        <DateInputWithSeparator
+        <DateInput
           id={fields.startDate.name}
           name={fields.startDate.name}
           placeholder={fields.startDate.placeholder}
@@ -505,9 +504,9 @@ const SalaryBenefitCalculatorView: React.FC<
           </$GridCell>
 
           <$GridCell $colStart={3} $colSpan={3}>
-            <DateInputWithSeparator
-              id={fields.startDate.name}
-              name={fields.startDate.name}
+            <DateInput
+              id={fields.trainingCompensationStartDate.name}
+              name={fields.trainingCompensationStartDate.name}
               placeholder={fields.startDate.placeholder}
               language={language}
               onChange={(value) =>
@@ -517,16 +516,16 @@ const SalaryBenefitCalculatorView: React.FC<
                 }))
               }
               value={convertToUIDateFormat(newTrainingCompensation.startDate)}
-              invalid={!!getErrorMessage(fields.startDate.name)}
-              aria-invalid={!!getErrorMessage(fields.startDate.name)}
-              errorText={getErrorMessage(fields.startDate.name)}
+              invalid={!!getErrorMessage(fields.trainingCompensationStartDate.name)}
+              aria-invalid={!!getErrorMessage(fields.trainingCompensationStartDate.name)}
+              errorText={getErrorMessage(fields.trainingCompensationStartDate.name)}
             />
           </$GridCell>
 
           <$GridCell $colStart={6} $colSpan={3}>
             <DateInput
-              id={fields.endDate.name}
-              name={fields.endDate.name}
+              id={fields.trainingCompensationEndDate.name}
+              name={fields.trainingCompensationEndDate.name}
               placeholder={fields.endDate.placeholder}
               language={language}
               onChange={(value) =>
@@ -538,9 +537,9 @@ const SalaryBenefitCalculatorView: React.FC<
                 }))
               }
               value={convertToUIDateFormat(newTrainingCompensation.endDate)}
-              invalid={!!getErrorMessage(fields.endDate.name)}
-              aria-invalid={!!getErrorMessage(fields.endDate.name)}
-              errorText={getErrorMessage(fields.endDate.name)}
+              invalid={!!getErrorMessage(fields.trainingCompensationEndDate.name)}
+              aria-invalid={!!getErrorMessage(fields.trainingCompensationEndDate.name)}
+              errorText={getErrorMessage(fields.trainingCompensationEndDate.name)}
               style={{ paddingRight: `${theme.spacing.s}` }}
             />
           </$GridCell>
diff --git a/frontend/benefit/handler/src/components/applicationReview/useApplicationReview.ts b/frontend/benefit/handler/src/components/applicationReview/useApplicationReview.ts
index 8611c9d158..1e225a9f36 100644
--- a/frontend/benefit/handler/src/components/applicationReview/useApplicationReview.ts
+++ b/frontend/benefit/handler/src/components/applicationReview/useApplicationReview.ts
@@ -1,9 +1,13 @@
 import AppContext from 'benefit/handler/context/AppContext';
 import useApplicationQuery from 'benefit/handler/hooks/useApplicationQuery';
+import useReviewStateQuery from 'benefit/handler/hooks/useReviewStateQuery';
+import useUpdateReviewStateQuery from 'benefit/handler/hooks/useUpdateReviewStateQuery';
 import useUploadAttachmentQuery from 'benefit/handler/hooks/useUploadAttachmentQuery';
 import {
   Application,
   HandledAplication,
+  ReviewState,
+  ReviewStateData,
 } from 'benefit/handler/types/application';
 import camelcaseKeys from 'camelcase-keys';
 import { useRouter } from 'next/router';
@@ -11,6 +15,7 @@ import { TFunction, useTranslation } from 'next-i18next';
 import React, { useEffect, useState } from 'react';
 import showErrorToast from 'shared/components/toast/show-error-toast';
 import hdsToast from 'shared/components/toast/Toast';
+import snakecaseKeys from 'snakecase-keys';
 
 type ExtendedComponentProps = {
   t: TFunction;
@@ -21,6 +26,8 @@ type ExtendedComponentProps = {
   isLoading: boolean;
   isUploading: boolean;
   handleUpload: (attachment: FormData) => void;
+  reviewState: ReviewState;
+  handleUpdateReviewState: (reviewState: ReviewState) => void;
 };
 
 const useApplicationReview = (): ExtendedComponentProps => {
@@ -42,6 +49,17 @@ const useApplicationReview = (): ExtendedComponentProps => {
     isError: isUploadingError,
   } = useUploadAttachmentQuery();
 
+  const {
+    status: reviewStateDataStatus,
+    data: reviewStateData,
+    error: reviewStateDataError,
+  } = useReviewStateQuery(id);
+
+  const {
+    mutate: updateReviewState,
+    isError: isUpdatingReviewStateError,
+  } = useUpdateReviewStateQuery();
+
   const handleUpload = (attachment: FormData): void => {
     uploadAttachment({
       applicationId: id,
@@ -49,6 +67,11 @@ const useApplicationReview = (): ExtendedComponentProps => {
     });
   };
 
+  const handleUpdateReviewState = (reviewState: ReviewState): void => {
+    const data: ReviewStateData = snakecaseKeys(reviewState);
+    updateReviewState(data);
+  };
+
   useEffect(() => {
     if (isUploadingError) {
       showErrorToast(
@@ -59,7 +82,11 @@ const useApplicationReview = (): ExtendedComponentProps => {
   }, [isUploadingError, t]);
 
   useEffect(() => {
-    if (applicationDataError) {
+    if (
+      applicationDataError ||
+      reviewStateDataError ||
+      isUpdatingReviewStateError
+    ) {
       hdsToast({
         autoDismissTime: 5000,
         type: 'error',
@@ -67,17 +94,24 @@ const useApplicationReview = (): ExtendedComponentProps => {
         text: t('common:error.generic.text'),
       });
     }
-  }, [t, applicationDataError]);
+  }, [t, applicationDataError, reviewStateDataError, isUpdatingReviewStateError]);
 
   useEffect(() => {
+    const loadingDataStatuses = new Set(['idle', 'loading']);
     if (
       id &&
-      applicationDataStatus !== 'idle' &&
-      applicationDataStatus !== 'loading'
+      !loadingDataStatuses.has(applicationDataStatus) &&
+      !loadingDataStatuses.has(reviewStateDataStatus)
     ) {
       setIsLoading(false);
     }
-  }, [applicationDataStatus, id, applicationData]);
+  }, [
+    id,
+    applicationDataStatus,
+    applicationData,
+    reviewStateDataStatus,
+    reviewStateData,
+  ]);
 
   useEffect(() => {
     if (router.isReady && !router.query.id) {
@@ -89,6 +123,10 @@ const useApplicationReview = (): ExtendedComponentProps => {
     deep: true,
   });
 
+  const reviewState: ReviewState = camelcaseKeys(reviewStateData || {}, {
+    deep: true,
+  });
+
   return {
     t,
     id,
@@ -98,6 +136,8 @@ const useApplicationReview = (): ExtendedComponentProps => {
     isError: Boolean(id && applicationDataError),
     isUploading,
     handleUpload,
+    reviewState,
+    handleUpdateReviewState,
   };
 };
 
diff --git a/frontend/benefit/handler/src/components/batchProcessing/BatchActionsInspectionForm.tsx b/frontend/benefit/handler/src/components/batchProcessing/BatchActionsInspectionForm.tsx
index 5c9f06d3cc..cc4573e24c 100644
--- a/frontend/benefit/handler/src/components/batchProcessing/BatchActionsInspectionForm.tsx
+++ b/frontend/benefit/handler/src/components/batchProcessing/BatchActionsInspectionForm.tsx
@@ -5,14 +5,23 @@ import {
   PROPOSALS_FOR_DECISION,
 } from 'benefit-shared/constants';
 import { BatchProposal } from 'benefit-shared/types/application';
-import { Button, DateInput, IconArrowUndo, TextInput } from 'hds-react';
+import {
+  Button,
+  DateInput,
+  IconArrowUndo,
+  RadioButton,
+  TextInput,
+} from 'hds-react';
 import noop from 'lodash/noop';
 import { useTranslation } from 'next-i18next';
-import React from 'react';
+import React, { ChangeEvent } from 'react';
 import { $GridCell } from 'shared/components/forms/section/FormSection.sc';
 import Modal from 'shared/components/modal/Modal';
+import theme from 'shared/styles/theme';
+import { CSSProperties } from 'styled-components';
 
 import ConfirmModalContent from '../applicationReview/actions/ConfirmModalContent/confirm';
+import { $InspectionTypeContainer } from '../table/BatchCompletion.sc';
 import { $FormSection } from '../table/TableExtras.sc';
 import { useBatchActionsInspected } from './useBatchActionsInspected';
 
@@ -33,7 +42,8 @@ const BatchActionsInspectionForm: React.FC<BatchProps> = ({
   isInspectionFormSent,
   setInspectionFormSent,
   setBatchCloseAnimation,
-}: BatchProps) => {
+}: // eslint-disable-next-line sonarjs/cognitive-complexity
+BatchProps) => {
   const { id, proposal_for_decision: proposalForDecision } = batch;
   const { t } = useTranslation();
   const { formik, yearFromNow, isSuccess, isError } = useBatchActionsInspected(
@@ -46,6 +56,8 @@ const BatchActionsInspectionForm: React.FC<BatchProps> = ({
   const [isModalBatchToCompletion, setModalBatchToCompletion] =
     React.useState(false);
 
+  const [inspectorMode, setInspectorMode] = React.useState('ahjo');
+
   React.useEffect(() => {
     if (isError) {
       setInspectionFormSent(false);
@@ -82,6 +94,11 @@ const BatchActionsInspectionForm: React.FC<BatchProps> = ({
         return false;
       });
 
+  const handleRadioButton = (event: ChangeEvent<HTMLInputElement>): void => {
+    setInspectorMode(event.target.value);
+    formik.handleChange(event);
+  };
+
   const handleSubmit = (e: React.FormEvent): void => {
     e.preventDefault();
     formik
@@ -152,6 +169,7 @@ const BatchActionsInspectionForm: React.FC<BatchProps> = ({
         }
       />
       <form onSubmit={handleSubmit} noValidate>
+        <h3>{t('common:batches.form.headings.decisionDetails')}</h3>
         <$FormSection>
           <$GridCell $colSpan={3}>
             <TextInput
@@ -209,76 +227,141 @@ const BatchActionsInspectionForm: React.FC<BatchProps> = ({
           </$GridCell>
         </$FormSection>
 
-        <$FormSection>
-          <$GridCell $colSpan={3}>
-            <TextInput
-              onChange={formik.handleChange}
-              label={t('common:batches.form.fields.expertInspectorName')}
-              id={`expert_inspector_name${id}`}
-              name="expert_inspector_name"
-              errorText={getErrorMessage('expert_inspector_name')}
-              invalid={!!formik.errors.expert_inspector_name}
-              value={formik.values.expert_inspector_name ?? ''}
-              required
-            />
-          </$GridCell>
+        {proposalForDecision === PROPOSALS_FOR_DECISION.ACCEPTED ? (
+          <>
+            <h3>{t('common:batches.form.headings.inspectionDetails')}</h3>
+            <$InspectionTypeContainer>
+              <$FormSection>
+                <$GridCell $colSpan={12}>
+                  <RadioButton
+                    key={`inspector-mode-${id}-ahjo`}
+                    id={`inspector-mode-${id}-ahjo`}
+                    value="ahjo"
+                    label="Ahjo-tarkastus"
+                    name="inspection_mode"
+                    checked={inspectorMode === 'ahjo'}
+                    onChange={handleRadioButton}
+                    style={theme.components.radio as CSSProperties}
+                  />
+                </$GridCell>
+                {inspectorMode === 'ahjo' ? (
+                  <$GridCell $colSpan={12}>
+                    <hr />
+                  </$GridCell>
+                ) : null}
+              </$FormSection>
 
-          <$GridCell $colSpan={3}>
-            <TextInput
-              onChange={formik.handleChange}
-              label={t('common:batches.form.fields.expertInspectorTitle')}
-              id={`expert_inspector_title_${id}`}
-              name="expert_inspector_title"
-              errorText={getErrorMessage('expert_inspector_title')}
-              invalid={!!formik.errors.expert_inspector_title}
-              value={formik.values.expert_inspector_title ?? ''}
-              required
-            />
-          </$GridCell>
-        </$FormSection>
+              {inspectorMode === 'ahjo' ? (
+                <$FormSection>
+                  <$GridCell $colSpan={3}>
+                    <TextInput
+                      onChange={formik.handleChange}
+                      label={t(
+                        'common:batches.form.fields.expertInspectorName'
+                      )}
+                      id={`expert_inspector_name${id}`}
+                      name="expert_inspector_name"
+                      errorText={getErrorMessage('expert_inspector_name')}
+                      invalid={!!formik.errors.expert_inspector_name}
+                      value={formik.values.expert_inspector_name ?? ''}
+                      required={inspectorMode === 'ahjo'}
+                    />
+                  </$GridCell>
 
-        {proposalForDecision === PROPOSALS_FOR_DECISION.ACCEPTED ? (
-          <$FormSection css="border-top: 1pox solid #000;">
-            <$GridCell $colSpan={3}>
-              <TextInput
-                onChange={formik.handleChange}
-                label={t('common:batches.form.fields.p2pInspectorName')}
-                id={`p2p_inspector_name${id}`}
-                name="p2p_inspector_name"
-                errorText={getErrorMessage('p2p_inspector_name')}
-                invalid={!!formik.errors.p2p_inspector_name}
-                value={formik.values.p2p_inspector_name ?? ''}
-                required
-              />
-            </$GridCell>
+                  <$GridCell $colSpan={3}>
+                    <TextInput
+                      onChange={formik.handleChange}
+                      label={t(
+                        'common:batches.form.fields.expertInspectorTitle'
+                      )}
+                      id={`expert_inspector_title_${id}`}
+                      name="expert_inspector_title"
+                      errorText={getErrorMessage('expert_inspector_title')}
+                      invalid={!!formik.errors.expert_inspector_title}
+                      value={formik.values.expert_inspector_title ?? ''}
+                      required={inspectorMode === 'ahjo'}
+                    />
+                  </$GridCell>
+                  <$GridCell $colSpan={3}>
+                    <TextInput
+                      onChange={formik.handleChange}
+                      label={t('common:batches.form.fields.p2pCheckerName')}
+                      id={`p2p_checker_name_${id}`}
+                      name="p2p_checker_name"
+                      errorText={getErrorMessage('p2p_checker_name')}
+                      invalid={!!formik.errors.p2p_checker_name}
+                      value={formik.values.p2p_checker_name ?? ''}
+                      required={inspectorMode === 'ahjo'}
+                    />
+                  </$GridCell>
+                </$FormSection>
+              ) : null}
+            </$InspectionTypeContainer>
 
-            <$GridCell $colSpan={3}>
-              <TextInput
-                onChange={formik.handleChange}
-                label={t('common:batches.form.fields.p2pInspectorEmail')}
-                id={`p2p_inspector_email_${id}`}
-                name="p2p_inspector_email"
-                errorText={getErrorMessage('p2p_inspector_email')}
-                invalid={!!formik.errors.p2p_inspector_email}
-                value={formik.values.p2p_inspector_email ?? ''}
-                required
-              />
-            </$GridCell>
-            <$GridCell $colSpan={3}>
-              <TextInput
-                onChange={formik.handleChange}
-                label={t('common:batches.form.fields.p2pCheckerName')}
-                id={`p2p_checker_name_${id}`}
-                name="p2p_checker_name"
-                errorText={getErrorMessage('p2p_checker_name')}
-                invalid={!!formik.errors.p2p_checker_name}
-                value={formik.values.p2p_checker_name ?? ''}
-                required
-              />
-            </$GridCell>
-          </$FormSection>
-        ) : null}
+            <$InspectionTypeContainer>
+              <$FormSection>
+                <$GridCell $colSpan={12}>
+                  <RadioButton
+                    key={`inspector-mode-${id}-p2p`}
+                    id={`inspector-mode-${id}-p2p`}
+                    value="p2p"
+                    label="P2P-tarkastus"
+                    name="inspection_mode"
+                    checked={inspectorMode === 'p2p'}
+                    onChange={handleRadioButton}
+                    style={theme.components.radio as CSSProperties}
+                  />
+                </$GridCell>
+                {inspectorMode === 'p2p' ? (
+                  <$GridCell $colSpan={12}>
+                    <hr />
+                  </$GridCell>
+                ) : null}
+              </$FormSection>
+              {inspectorMode === 'p2p' ? (
+                <$FormSection css="border-top: 1pox solid #000;">
+                  <$GridCell $colSpan={3}>
+                    <TextInput
+                      onChange={formik.handleChange}
+                      label={t('common:batches.form.fields.p2pInspectorName')}
+                      id={`p2p_inspector_name${id}`}
+                      name="p2p_inspector_name"
+                      errorText={getErrorMessage('p2p_inspector_name')}
+                      invalid={!!formik.errors.p2p_inspector_name}
+                      value={formik.values.p2p_inspector_name ?? ''}
+                      required={inspectorMode === 'p2p'}
+                    />
+                  </$GridCell>
 
+                  <$GridCell $colSpan={3}>
+                    <TextInput
+                      onChange={formik.handleChange}
+                      label={t('common:batches.form.fields.p2pInspectorEmail')}
+                      id={`p2p_inspector_email_${id}`}
+                      name="p2p_inspector_email"
+                      errorText={getErrorMessage('p2p_inspector_email')}
+                      invalid={!!formik.errors.p2p_inspector_email}
+                      value={formik.values.p2p_inspector_email ?? ''}
+                      required={inspectorMode === 'p2p'}
+                    />
+                  </$GridCell>
+                  <$GridCell $colSpan={3}>
+                    <TextInput
+                      onChange={formik.handleChange}
+                      label={t('common:batches.form.fields.p2pCheckerName')}
+                      id={`p2p_checker_name_${id}`}
+                      name="p2p_checker_name"
+                      errorText={getErrorMessage('p2p_checker_name')}
+                      invalid={!!formik.errors.p2p_checker_name}
+                      value={formik.values.p2p_checker_name ?? ''}
+                      required={inspectorMode === 'p2p'}
+                    />
+                  </$GridCell>
+                </$FormSection>
+              ) : null}
+            </$InspectionTypeContainer>
+          </>
+        ) : null}
         <$FormSection>
           <$GridCell $colSpan={3}>
             <Button
diff --git a/frontend/benefit/handler/src/components/batchProcessing/BatchApplicationList.tsx b/frontend/benefit/handler/src/components/batchProcessing/BatchApplicationList.tsx
index 12bc6d508d..a2d9cbe67f 100644
--- a/frontend/benefit/handler/src/components/batchProcessing/BatchApplicationList.tsx
+++ b/frontend/benefit/handler/src/components/batchProcessing/BatchApplicationList.tsx
@@ -160,7 +160,17 @@ const BatchApplicationList: React.FC<BatchProps> = ({ batch }: BatchProps) => {
 
   return (
     <$TableGrid animateClose={batchCloseAnimation}>
-      <$TableWrapper>
+      <$TableWrapper
+        borderColor={
+          !isCollapsed &&
+          [
+            BATCH_STATUSES.AWAITING_FOR_DECISION,
+            BATCH_STATUSES.DECIDED_ACCEPTED,
+          ].includes(status)
+            ? theme.colors.fogDark
+            : null
+        }
+      >
         <Modal
           id={`batch-confirmation-modal-app-removal-${id}`}
           isOpen={isConfirmAppRemoval}
@@ -208,7 +218,7 @@ const BatchApplicationList: React.FC<BatchProps> = ({ batch }: BatchProps) => {
           </div>
         </$HorizontalList>
         {applications?.length ? (
-          <$TableBody isCollapsed={isCollapsed} aria-hidden={isCollapsed}>
+          <$TableBody $isCollapsed={isCollapsed} aria-hidden={isCollapsed}>
             <Table
               indexKey="id"
               theme={theme.components.table}
@@ -217,7 +227,16 @@ const BatchApplicationList: React.FC<BatchProps> = ({ batch }: BatchProps) => {
               initialSortingOrder="asc"
               cols={cols}
             />
-            <$TableFooter>
+            <$TableFooter
+              backgroundColor={
+                [
+                  BATCH_STATUSES.AWAITING_FOR_DECISION,
+                  BATCH_STATUSES.DECIDED_ACCEPTED,
+                ].includes(status)
+                  ? theme.colors.coatOfArmsLight
+                  : null
+              }
+            >
               {[
                 BATCH_STATUSES.DRAFT,
                 BATCH_STATUSES.AHJO_REPORT_CREATED,
diff --git a/frontend/benefit/handler/src/components/batchProcessing/useBatchActionsInspected.ts b/frontend/benefit/handler/src/components/batchProcessing/useBatchActionsInspected.ts
index 2863bcaacb..4d2216d8f5 100644
--- a/frontend/benefit/handler/src/components/batchProcessing/useBatchActionsInspected.ts
+++ b/frontend/benefit/handler/src/components/batchProcessing/useBatchActionsInspected.ts
@@ -80,9 +80,24 @@ const useBatchActionsInspected = (
     max: addMonths(now, 3),
   };
   const requiredSchema = {
-    fullName: string()
-      .matches(/^(.*)\s(\w+)/, translations.invalidName)
-      .required(translations.required),
+    inspectionMode: string().required(),
+    decisionMakerFullName: string().when('inspection_mode', {
+      is: 'ahjo',
+      then: string()
+        .matches(/^(.*)\s(\w+)/, translations.invalidName)
+        .required(translations.required),
+    }),
+    decisionMakerAnyString: string().required(translations.required),
+    ahjoFullName: string().when('inspection_mode', {
+      is: 'ahjo',
+      then: string()
+        .matches(/^(.*)\s(\w+)/, translations.invalidName)
+        .required(translations.required),
+    }),
+    ahjoAnyString: string().when('inspection_mode', {
+      is: 'ahjo',
+      then: string().required(translations.required),
+    }),
     sectionOfTheLaw: string()
       .matches(/^§\d+$/, translations.sectionOfTheLaw)
       .required(translations.required),
@@ -101,31 +116,42 @@ const useBatchActionsInspected = (
       )
       .transform(parseLocalizedDateString)
       .required(t('common:form.validation.date.format')),
-    anyString: string().required(translations.required),
-    email: string()
-      .required(translations.required)
-      .email(t('common:form.validation.email.invalid')),
+    p2pAnyString: string().when('inspection_mode', {
+      is: 'p2p',
+      then: string().required(translations.required),
+    }),
+    p2pFullName: string().when('inspection_mode', {
+      is: 'p2p',
+      then: string()
+        .matches(/^(.*)\s(\w+)/, translations.invalidName)
+        .required(translations.required),
+    }),
+    email: string().when('inspection_mode', {
+      is: 'p2p',
+      then: string()
+        .email(t('common:form.validation.email.invalid'))
+        .required(translations.required),
+    }),
   };
 
   const schemaRejected = object({
-    decision_maker_name: requiredSchema.fullName,
-    decision_maker_title: requiredSchema.anyString,
+    decision_maker_name: requiredSchema.decisionMakerFullName,
+    decision_maker_title: requiredSchema.decisionMakerAnyString,
     section_of_the_law: requiredSchema.sectionOfTheLaw,
     decision_date: requiredSchema.finnishDate,
-    expert_inspector_name: requiredSchema.fullName,
-    expert_inspector_title: requiredSchema.anyString,
   });
 
   const schemaAccepted = object({
-    decision_maker_name: requiredSchema.fullName,
-    decision_maker_title: requiredSchema.anyString,
+    inspection_mode: requiredSchema.inspectionMode,
+    decision_maker_name: requiredSchema.decisionMakerFullName,
+    decision_maker_title: requiredSchema.decisionMakerAnyString,
     section_of_the_law: requiredSchema.sectionOfTheLaw,
     decision_date: requiredSchema.finnishDate,
-    expert_inspector_name: requiredSchema.fullName,
-    expert_inspector_title: requiredSchema.anyString,
-    p2p_inspector_name: requiredSchema.anyString,
+    expert_inspector_name: requiredSchema.ahjoFullName,
+    expert_inspector_title: requiredSchema.ahjoAnyString,
+    p2p_inspector_name: requiredSchema.p2pFullName,
     p2p_inspector_email: requiredSchema.email,
-    p2p_checker_name: requiredSchema.anyString,
+    p2p_checker_name: requiredSchema.p2pAnyString,
   });
 
   const markBatchAs = (
@@ -140,6 +166,7 @@ const useBatchActionsInspected = (
 
   const formOptions = {
     initialValues: {
+      inspection_mode: 'ahjo',
       decision_maker_name,
       decision_maker_title,
       expert_inspector_name,
diff --git a/frontend/benefit/handler/src/components/messenger/Messages.tsx b/frontend/benefit/handler/src/components/messenger/Messages.tsx
index 5bd8ee13c8..b4a91c8bd6 100644
--- a/frontend/benefit/handler/src/components/messenger/Messages.tsx
+++ b/frontend/benefit/handler/src/components/messenger/Messages.tsx
@@ -39,6 +39,8 @@ const Messages: React.FC<ComponentProps> = ({ data, variant, withScroll }) => {
           text={message.content}
           isPrimary={message.messageType === MESSAGE_TYPES.HANDLER_MESSAGE}
           variant={variant}
+          alignRight={message.messageType === MESSAGE_TYPES.HANDLER_MESSAGE}
+          wrapAsColumn
         />
       ))}
       {data.length === 0 && (
diff --git a/frontend/benefit/handler/src/components/newApplication/useApplicationForm.ts b/frontend/benefit/handler/src/components/newApplication/useApplicationForm.ts
index b0d1809c96..6b183bf9c2 100644
--- a/frontend/benefit/handler/src/components/newApplication/useApplicationForm.ts
+++ b/frontend/benefit/handler/src/components/newApplication/useApplicationForm.ts
@@ -2,7 +2,7 @@ import {
   APPLICATION_FIELD_KEYS,
   APPLICATION_FIELDS,
 } from 'benefit/handler/constants';
-import useApplicationQuery from 'benefit/handler/hooks/useApplicationQuery';
+import useApplicationQueryWithState from 'benefit/handler/hooks/useApplicationQueryWithState';
 import useFormActions from 'benefit/handler/hooks/useFormActions';
 import {
   StepActionType,
@@ -93,11 +93,14 @@ export const useApplicationForm = (): ExtendedComponentProps => {
     }
   }, [id, dispatchStep]);
 
+  const [application, setApplication] = React.useState<Application>(
+    getApplication({} as ApplicationData)
+  );
   const {
     status: applicationDataStatus,
     data: applicationData,
     error: applicationDataError,
-  } = useApplicationQuery(id);
+  } = useApplicationQueryWithState(id, setApplication);
 
   React.useEffect(() => {
     if (applicationDataError) {
@@ -116,7 +119,6 @@ export const useApplicationForm = (): ExtendedComponentProps => {
     }
   }, [t, applicationDataError, applicationDataStatus, id, applicationData]);
 
-  const application = getApplication(applicationData);
   organizationType = application.company?.organizationType ?? 'company';
 
   const { onSave, onQuietSave, onSubmit, onNext, onDelete } =
diff --git a/frontend/benefit/handler/src/components/newApplication/utils/validation.ts b/frontend/benefit/handler/src/components/newApplication/utils/validation.ts
index 829cfc6ab3..afff0b3cca 100644
--- a/frontend/benefit/handler/src/components/newApplication/utils/validation.ts
+++ b/frontend/benefit/handler/src/components/newApplication/utils/validation.ts
@@ -297,6 +297,12 @@ export const getValidationSchema = (
             .nullable()
             .required(t(VALIDATION_MESSAGE_KEYS.REQUIRED)),
           [EMPLOYEE_KEYS.WORKING_HOURS]: Yup.number()
+            .test(
+              'is-decimal',
+              t(VALIDATION_MESSAGE_KEYS.NUMBER_TWO_DECIMALS),
+              (value: number): boolean =>
+                value ? /^\d+.?\d{1,2}$/.test(String(value)) : false
+            )
             .transform((_value, originalValue) =>
               Number(getNumberValue(originalValue))
             )
diff --git a/frontend/benefit/handler/src/components/reviewSection/ReviewSection.sc.ts b/frontend/benefit/handler/src/components/reviewSection/ReviewSection.sc.ts
index 2fe6e5a9bc..0313d54e6a 100644
--- a/frontend/benefit/handler/src/components/reviewSection/ReviewSection.sc.ts
+++ b/frontend/benefit/handler/src/components/reviewSection/ReviewSection.sc.ts
@@ -1,4 +1,4 @@
-import { IconCheckCircle } from 'hds-react';
+import { IconCheckCircle, IconCheckCircleFill } from 'hds-react';
 import styled, { DefaultTheme } from 'styled-components';
 
 type ColorKeys = keyof DefaultTheme['colors'];
@@ -16,4 +16,12 @@ export const $ActionLeft = styled.div`
 export const $CheckIcon = styled(IconCheckCircle)`
   padding-top: 20px;
   padding-left: ${(props) => props.theme.spacing.s};
+  cursor: pointer;
+`;
+
+export const $CheckIconFill = styled(IconCheckCircleFill)`
+  padding-top: 20px;
+  padding-left: ${(props) => props.theme.spacing.s};
+  color: ${(props) => props.theme.colors.coatOfArms};
+  cursor: pointer;
 `;
diff --git a/frontend/benefit/handler/src/components/reviewSection/ReviewSection.tsx b/frontend/benefit/handler/src/components/reviewSection/ReviewSection.tsx
index 4025075ac8..2542c00356 100644
--- a/frontend/benefit/handler/src/components/reviewSection/ReviewSection.tsx
+++ b/frontend/benefit/handler/src/components/reviewSection/ReviewSection.tsx
@@ -1,3 +1,5 @@
+import ReviewStateContext from 'benefit/handler/context/ReviewStateContext';
+import { ReviewState } from 'benefit/handler/types/application';
 import * as React from 'react';
 import Heading from 'shared/components/forms/heading/Heading';
 import { HeadingProps } from 'shared/components/forms/heading/Heading.sc';
@@ -9,7 +11,7 @@ import {
   GridProps,
 } from 'shared/components/forms/section/FormSection.sc';
 
-import { $ActionLeft, $CheckIcon } from './ReviewSection.sc';
+import { $ActionLeft, $CheckIcon, $CheckIconFill } from './ReviewSection.sc';
 import { useReviewSection } from './useReviewSection';
 
 export type ReviewSectionProps = {
@@ -18,6 +20,7 @@ export type ReviewSectionProps = {
   withMargin?: boolean;
   withoutDivider?: boolean;
   header?: string;
+  section?: keyof ReviewState;
 } & HeadingProps &
   GridProps;
 
@@ -29,9 +32,36 @@ const ReviewSection: React.FC<ReviewSectionProps> = ({
   withoutDivider,
   role,
   loading,
+  section,
   ...rest
 }) => {
   const { theme, bgColor, withAction } = useReviewSection(action, withMargin);
+  const { reviewState, handleUpdateReviewState } =
+    React.useContext(ReviewStateContext);
+  const sectionState = reviewState[section];
+
+  const handleReviewClick = (): void => {
+    handleUpdateReviewState({ ...reviewState, [section]: !sectionState });
+  };
+
+  const CheckIcon: React.FC = () => {
+    if (sectionState) {
+      return (
+        <$CheckIconFill
+          aria-label="application-action"
+          size="m"
+          onClick={handleReviewClick}
+        />
+      );
+    }
+    return (
+      <$CheckIcon
+        aria-label="application-action"
+        size="m"
+        onClick={handleReviewClick}
+      />
+    );
+  };
 
   return (
     <$Grid
@@ -43,9 +73,7 @@ const ReviewSection: React.FC<ReviewSectionProps> = ({
     >
       {withAction && (
         <$GridCell $colSpan={1}>
-          <$ActionLeft>
-            {action && <$CheckIcon aria-label="application-action" size="m" />}
-          </$ActionLeft>
+          <$ActionLeft>{action && <CheckIcon />}</$ActionLeft>
         </$GridCell>
       )}
       <$GridCell $colStart={2} $colSpan={12}>
diff --git a/frontend/benefit/handler/src/components/table/BatchCompletion.sc.ts b/frontend/benefit/handler/src/components/table/BatchCompletion.sc.ts
new file mode 100644
index 0000000000..7eba303aad
--- /dev/null
+++ b/frontend/benefit/handler/src/components/table/BatchCompletion.sc.ts
@@ -0,0 +1,24 @@
+import theme from 'shared/styles/theme';
+import styled from 'styled-components';
+
+import { $FormSection } from './TableExtras.sc';
+
+type Props = {
+  bgColor?: string;
+};
+
+export const $InspectionTypeContainer = styled.div<Props>`
+  border: 2px solid ${theme.colors.black50};
+  padding: ${theme.spacing.s} ${theme.spacing.l} ${theme.spacing.s}
+    ${theme.spacing.l};
+  background-color: ${theme.colors.white};
+  margin-bottom: ${theme.spacing.xs};
+
+  ${$FormSection}:first-child {
+    margin: ${theme.spacing.xs} 0 ${theme.spacing.xs} 0;
+  }
+
+  hr {
+    border-top: 1px solid ${theme.colors.fog};
+  }
+`;
diff --git a/frontend/benefit/handler/src/components/table/TableExtras.sc.ts b/frontend/benefit/handler/src/components/table/TableExtras.sc.ts
index b750128675..eeef6fcc89 100644
--- a/frontend/benefit/handler/src/components/table/TableExtras.sc.ts
+++ b/frontend/benefit/handler/src/components/table/TableExtras.sc.ts
@@ -2,7 +2,7 @@ import FormSection from 'shared/components/forms/section/FormSection';
 import styled from 'styled-components';
 
 type CollapsedProps = {
-  isCollapsed: boolean;
+  $isCollapsed: boolean;
 };
 
 export const $HorizontalList = styled.dl`
@@ -60,13 +60,20 @@ export const $TableGrid = styled.div<TableGridProps>`
   margin-bottom: ${(props) => (props.animateClose ? '0' : 'var(--spacing-l)')};
 `;
 
-export const $TableWrapper = styled.div`
+type TableWrapperProps = {
+  borderColor: string;
+};
+
+export const $TableWrapper = styled.div<TableWrapperProps>`
   overflow-y: hidden;
   background: #fff;
+  transition: 0.15s outline ease-in-out;
+  outline: 1px solid
+    ${(props) => (props.borderColor ? props.borderColor : 'transparent')};
 `;
 
 export const $TableBody = styled.div<CollapsedProps>`
-  display: ${(props) => (props.isCollapsed ? 'none' : 'block')};
+  display: ${(props) => (props.$isCollapsed ? 'none' : 'block')};
 `;
 
 export const $HintText = styled.p`
@@ -87,12 +94,17 @@ export const $FormSection = styled(FormSection)`
   }
 `;
 
-export const $TableFooter = styled.footer`
+type $TableFooterProps = {
+  backgroundColor?: string;
+  borderColor?: string;
+};
+export const $TableFooter = styled.footer<$TableFooterProps>`
   display: flex;
   flex-flow: row wrap;
-  background: #efefef;
+  background-color: ${(props) =>
+    props.backgroundColor ? props.backgroundColor : '#efefef'};
   width: 100%;
-  padding: var(--spacing-s);
+  padding: var(--spacing-m);
   align-items: center;
   box-sizing: border-box;
 
diff --git a/frontend/benefit/handler/src/constants.ts b/frontend/benefit/handler/src/constants.ts
index 2829a1cdf5..6e426fd991 100644
--- a/frontend/benefit/handler/src/constants.ts
+++ b/frontend/benefit/handler/src/constants.ts
@@ -58,6 +58,8 @@ export enum CALCULATION_SALARY_KEYS {
   PAY_SUBSIDIES = 'paySubsidies',
   TRAINING_COMPENSATIONS = 'trainingCompensations',
   MONTHLY_AMOUNT = 'monthlyAmount',
+  TRAINING_COMPENSATION_START_DATE = 'trainingCompensationStartDate',
+  TRAINING_COMPENSATION_END_DATE = 'trainingCompensationEndDate',
 }
 
 export const STATE_AID_MAX_PERCENTAGE_OPTIONS = [50, 100];
@@ -191,3 +193,7 @@ export const ALL_APPLICATION_STATUSES: APPLICATION_STATUSES[] = [
   APPLICATION_STATUSES.DRAFT,
   APPLICATION_STATUSES.REJECTED,
 ];
+
+export enum LOCAL_STORAGE_KEYS {
+  CSRF_TOKEN = 'csrfToken',
+}
diff --git a/frontend/benefit/handler/src/context/ReviewStateContext.tsx b/frontend/benefit/handler/src/context/ReviewStateContext.tsx
new file mode 100644
index 0000000000..96db08c368
--- /dev/null
+++ b/frontend/benefit/handler/src/context/ReviewStateContext.tsx
@@ -0,0 +1,25 @@
+import { ReviewState } from 'benefit/handler/types/application';
+import React from 'react';
+
+type ReviewStateContextType = {
+  reviewState: ReviewState;
+  handleUpdateReviewState: (reviewState: ReviewState) => void;
+};
+
+const defaultValues = {
+  reviewState: {
+    id: '',
+    company: false,
+    companyContactPerson: false,
+    deMinimisAids: false,
+    coOperationNegotiations: false,
+    employee: false,
+    paySubsidy: false,
+    benefit: false,
+    employment: false,
+    approval: false,
+  },
+  handleUpdateReviewState: () => null,
+};
+
+export default React.createContext<ReviewStateContextType>(defaultValues);
diff --git a/frontend/benefit/handler/src/hooks/useApplicationQueryWithState.ts b/frontend/benefit/handler/src/hooks/useApplicationQueryWithState.ts
new file mode 100644
index 0000000000..110406c379
--- /dev/null
+++ b/frontend/benefit/handler/src/hooks/useApplicationQueryWithState.ts
@@ -0,0 +1,34 @@
+import { Application } from 'benefit/handler/types/application';
+import { BackendEndpoint } from 'benefit-shared/backend-api/backend-api';
+import { ApplicationData } from 'benefit-shared/types/application';
+import React from 'react';
+import { useQuery, UseQueryResult } from 'react-query';
+import useBackendAPI from 'shared/hooks/useBackendAPI';
+
+import { getApplication } from '../components/newApplication/utils/applicationForm';
+
+const useApplicationQueryWithState = (
+  id: string,
+  setApplication: React.Dispatch<React.SetStateAction<Application>>
+): UseQueryResult<ApplicationData, Error> => {
+  const { axios, handleResponse } = useBackendAPI();
+
+  return useQuery<ApplicationData, Error>(
+    ['applications', id],
+    () =>
+      !id
+        ? Promise.reject(new Error('Missing application id'))
+        : handleResponse<ApplicationData>(
+            axios.get(`${BackendEndpoint.HANDLER_APPLICATIONS}${id}/`)
+          ),
+    {
+      onSuccess: (data) => {
+        setApplication(getApplication(data));
+      },
+      enabled: Boolean(id),
+      staleTime: Infinity,
+    }
+  );
+};
+
+export default useApplicationQueryWithState;
diff --git a/frontend/benefit/handler/src/hooks/useReviewStateQuery.ts b/frontend/benefit/handler/src/hooks/useReviewStateQuery.ts
new file mode 100644
index 0000000000..6c5588b075
--- /dev/null
+++ b/frontend/benefit/handler/src/hooks/useReviewStateQuery.ts
@@ -0,0 +1,26 @@
+import { ReviewStateData } from 'benefit/handler/types/application';
+import { BackendEndpoint } from 'benefit-shared/backend-api/backend-api';
+import { useQuery, UseQueryResult } from 'react-query';
+import useBackendAPI from 'shared/hooks/useBackendAPI';
+
+const useReviewStateQuery = (
+  id: string
+): UseQueryResult<ReviewStateData, Error> => {
+  const { axios, handleResponse } = useBackendAPI();
+
+  return useQuery<ReviewStateData, Error>(
+    ['reviewState', id],
+    () =>
+      !id
+        ? Promise.reject(new Error('Missing application id'))
+        : handleResponse<ReviewStateData>(
+            axios.get(`${BackendEndpoint.HANDLER_APPLICATIONS}${id}/review/`)
+          ),
+    {
+      enabled: Boolean(id),
+      staleTime: Infinity,
+    }
+  );
+};
+
+export default useReviewStateQuery;
diff --git a/frontend/benefit/handler/src/hooks/useUpdateReviewStateQuery.ts b/frontend/benefit/handler/src/hooks/useUpdateReviewStateQuery.ts
new file mode 100644
index 0000000000..d62f0ae038
--- /dev/null
+++ b/frontend/benefit/handler/src/hooks/useUpdateReviewStateQuery.ts
@@ -0,0 +1,33 @@
+import { AxiosError } from 'axios';
+import { ReviewStateData } from 'benefit/handler/types/application';
+import { BackendEndpoint } from 'benefit-shared/backend-api/backend-api';
+import { useMutation, UseMutationResult, useQueryClient } from 'react-query';
+import useBackendAPI from 'shared/hooks/useBackendAPI';
+
+import { ErrorData } from '../types/common';
+
+const useUpdateReviewStateQuery = (): UseMutationResult<
+  ReviewStateData,
+  AxiosError<ErrorData>,
+  ReviewStateData
+> => {
+  const { axios, handleResponse } = useBackendAPI();
+  const queryClient = useQueryClient();
+  return useMutation<ReviewStateData, AxiosError<ErrorData>, ReviewStateData>(
+    'updateReviewState',
+    (reviewState: ReviewStateData) =>
+      handleResponse<ReviewStateData>(
+        axios.put(
+          `${BackendEndpoint.HANDLER_APPLICATIONS}${reviewState.application}/review/`,
+          reviewState
+        )
+      ),
+    {
+      onSuccess: () => {
+        void queryClient.invalidateQueries('reviewState');
+      },
+    }
+  );
+};
+
+export default useUpdateReviewStateQuery;
diff --git a/frontend/benefit/handler/src/hooks/useUserQuery.ts b/frontend/benefit/handler/src/hooks/useUserQuery.ts
index f2740dae48..644b942720 100644
--- a/frontend/benefit/handler/src/hooks/useUserQuery.ts
+++ b/frontend/benefit/handler/src/hooks/useUserQuery.ts
@@ -1,38 +1,57 @@
+import { AxiosError } from 'axios';
 import { BackendEndpoint } from 'benefit-shared/backend-api/backend-api';
 import { useRouter } from 'next/router';
 import { useQuery, UseQueryResult } from 'react-query';
 import useBackendAPI from 'shared/hooks/useBackendAPI';
 import useLocale from 'shared/hooks/useLocale';
 import User from 'shared/types/user';
+import { setLocalStorageItem } from 'shared/utils/localstorage.utils';
+
+import { LOCAL_STORAGE_KEYS, ROUTES } from '../constants';
+import useLogout from './useLogout';
 
 // check that authentication is still alive in every 5 minutes
 const FIVE_MINUTES = 5 * 60 * 1000;
 
-const useUserQuery = <T = User>(
+const useUserQuery = <T extends User>(
   select?: (user: User) => T
-): UseQueryResult<T, Error> => {
+): UseQueryResult<T | User, AxiosError> => {
   const router = useRouter();
   const locale = useLocale();
+  const noPermissionLogout = useLogout();
+
   // Don't fetch user state if status is logged out
   const logout =
-    (router.route === '/login' || router.route === `${locale}/login`) &&
+    (router.route === ROUTES.LOGIN ||
+      router.route === `${locale}${ROUTES.LOGIN}`) &&
     (router.asPath.includes('logout=true') ||
       router.asPath.includes('userStateError=true'));
   const { axios, handleResponse } = useBackendAPI();
 
-  const handleError = (error: Error): void => {
+  const handleError = (error: AxiosError): void => {
     if (logout) {
-      void router.push(`${locale}/login?logout=true`);
+      void router.push(`${locale}${ROUTES.LOGIN}?logout=true`);
     } else if (/40[13]/.test(error.message)) {
-      void router.push(`${locale}/login`);
+      void router.push(`${locale}${ROUTES.LOGIN}`);
     } else if (
       !process.env.NEXT_PUBLIC_MOCK_FLAG ||
       process.env.NEXT_PUBLIC_MOCK_FLAG === '0'
     ) {
-      void router.push(`${locale}/login?userStateError=true`);
+      void router.push(`${locale}${ROUTES.LOGIN}?userStateError=true`);
     }
   };
 
+  const checkForStaffStatus = (user: User): void => {
+    if (user && !user.is_staff) {
+      void noPermissionLogout();
+    }
+  };
+
+  const onSuccessHandler = (user: User): void => {
+    checkForStaffStatus(user);
+    setLocalStorageItem(LOCAL_STORAGE_KEYS.CSRF_TOKEN, user.csrf_token);
+  };
+
   return useQuery(
     `${BackendEndpoint.USER_ME}`,
     () => handleResponse<User>(axios.get(BackendEndpoint.USER_ME)),
@@ -41,6 +60,7 @@ const useUserQuery = <T = User>(
       enabled: !logout,
       retry: false,
       select,
+      onSuccess: onSuccessHandler,
       onError: (error) => handleError(error),
     }
   );
diff --git a/frontend/benefit/handler/src/pages/_app.tsx b/frontend/benefit/handler/src/pages/_app.tsx
index e38c8213db..d3f9716669 100644
--- a/frontend/benefit/handler/src/pages/_app.tsx
+++ b/frontend/benefit/handler/src/pages/_app.tsx
@@ -33,6 +33,7 @@ const App: React.FC<AppProps> = (appProps) => {
     <BackendAPIProvider
       baseURL={getBackendDomain()}
       headers={getHeaders(locale)}
+      isLocalStorageCsrf
     >
       <AppContextProvider>
         <QueryClientProvider client={queryClient}>
diff --git a/frontend/benefit/handler/src/pages/login.tsx b/frontend/benefit/handler/src/pages/login.tsx
index 2ad5971a0d..684ac33a34 100644
--- a/frontend/benefit/handler/src/pages/login.tsx
+++ b/frontend/benefit/handler/src/pages/login.tsx
@@ -12,8 +12,11 @@ import React, { useEffect } from 'react';
 import { useQueryClient } from 'react-query';
 import Container from 'shared/components/container/Container';
 import getServerSideTranslations from 'shared/i18n/get-server-side-translations';
+import { removeLocalStorageItem } from 'shared/utils/localstorage.utils';
 import { useTheme } from 'styled-components';
 
+import { LOCAL_STORAGE_KEYS } from '../constants';
+
 type NotificationProps = Pick<HDSNotificationProps, 'type' | 'label'> & {
   content?: string;
 };
@@ -61,6 +64,10 @@ const Login: NextPage = () => {
     }
   }, [router.query.logout, router.query.userStateError, queryClient]);
 
+  useEffect(() => {
+    removeLocalStorageItem(LOCAL_STORAGE_KEYS.CSRF_TOKEN);
+  }, []);
+
   return (
     <Container>
       <Notification
diff --git a/frontend/benefit/handler/src/types/application.d.ts b/frontend/benefit/handler/src/types/application.d.ts
index a8121b0444..dc376b05b8 100644
--- a/frontend/benefit/handler/src/types/application.d.ts
+++ b/frontend/benefit/handler/src/types/application.d.ts
@@ -177,3 +177,29 @@ export type ApplicationFields = Record<
     APPLICATION_FIELD_KEYS.EMPLOYEE,
     Record<EMPLOYEE_KEYS, Field<APPLICATION_FIELD_KEYS>>
   >;
+
+export type ReviewState = {
+  application?: string;
+  company?: boolean;
+  companyContactPerson?: boolean;
+  deMinimisAids?: boolean;
+  coOperationNegotiations?: boolean;
+  employee?: boolean;
+  paySubsidy?: boolean;
+  benefit?: boolean;
+  employment?: boolean;
+  approval?: boolean;
+};
+
+export type ReviewStateData = {
+  application?: string;
+  company?: boolean;
+  company_contact_person?: boolean;
+  de_minimis_aids?: boolean;
+  co_operation_negotiations?: boolean;
+  employee?: boolean;
+  pay_subsidy?: boolean;
+  benefit?: boolean;
+  employment?: boolean;
+  approval?: boolean;
+};
diff --git a/frontend/benefit/shared/package.json b/frontend/benefit/shared/package.json
index 1ccc103d52..51203129ef 100644
--- a/frontend/benefit/shared/package.json
+++ b/frontend/benefit/shared/package.json
@@ -16,7 +16,7 @@
     "@frontend/shared": "*",
     "camelcase-keys": "^7.0.1",
     "hds-react": "^2.10.0",
-    "next": "^11.1.4",
+    "next": "^12.3.4",
     "react": "^18.0.0",
     "styled-components": "^5.3.3"
   },
diff --git a/frontend/benefit/shared/src/backend-api/backend-api.ts b/frontend/benefit/shared/src/backend-api/backend-api.ts
index 898ff1ebf3..f48d65f268 100644
--- a/frontend/benefit/shared/src/backend-api/backend-api.ts
+++ b/frontend/benefit/shared/src/backend-api/backend-api.ts
@@ -7,6 +7,7 @@ export const BackendEndpoint = {
   LOGOUT: '/oidc/logout/',
   USER: '/oidc/userinfo/',
   USER_ME: 'v1/users/me/',
+  USER_OPTIONS: 'v1/users/options/',
   COMPANY: '/v1/company/',
   APPLICATIONS: '/v1/applications/',
   APPLICATIONS_SIMPLIFIED: '/v1/applications/simplified_list/',
diff --git a/frontend/benefit/shared/src/constants.ts b/frontend/benefit/shared/src/constants.ts
index 9bd6c70c2b..48efc6930c 100644
--- a/frontend/benefit/shared/src/constants.ts
+++ b/frontend/benefit/shared/src/constants.ts
@@ -17,6 +17,7 @@ export enum VALIDATION_MESSAGE_KEYS {
   NUMBER_INVALID = 'common:form.validation.number.invalid',
   NUMBER_MIN = 'common:form.validation.number.min',
   NUMBER_MAX = 'common:form.validation.number.max',
+  NUMBER_TWO_DECIMALS = 'common:form.validation.number.twoDecimals',
   PHONE_INVALID = 'common:form.validation.phone.invalid',
   STRING_POSITIVENUMBER = 'common:form.validation.string.positiveNumber',
   STRING_MIN = 'common:form.validation.string.min',
@@ -35,7 +36,7 @@ export enum VALIDATION_MESSAGE_KEYS {
   PHONE_NUMBER_LENGTH_MAX = 'common:form.validation.phoneNumber.max',
 }
 
-export const PAY_SUBSIDY_OPTIONS = [30, 40, 50, 100] as const;
+export const PAY_SUBSIDY_OPTIONS = [50, 70, 100] as const;
 
 export enum EMPLOYEE_KEYS {
   FIRST_NAME = 'firstName',
@@ -106,6 +107,8 @@ export enum DE_MINIMIS_AID_KEYS {
 export enum CALCULATION_EMPLOYMENT_KEYS {
   START_DATE = 'startDate',
   END_DATE = 'endDate',
+  TRAINING_COMPENSATION_START_DATE = 'trainingCompensationStartDate',
+  TRAINING_COMPENSATION_END_DATE = 'trainingCompensationEndDate',
 }
 
 export enum ORGANIZATION_TYPES {
diff --git a/frontend/benefit/shared/src/types/application.d.ts b/frontend/benefit/shared/src/types/application.d.ts
index 404c9e760a..f9b50cd20e 100644
--- a/frontend/benefit/shared/src/types/application.d.ts
+++ b/frontend/benefit/shared/src/types/application.d.ts
@@ -505,6 +505,7 @@ export type UserData = {
   last_name: string;
   terms_of_service_approval_needed: boolean;
   terms_of_service_in_effect: TermsOfServiceInEffectData;
+  csrf_token: string;
 };
 
 export type ApplicantConsents = {
@@ -528,6 +529,7 @@ export type User = {
   lastName: string;
   termsOfServiceApprovalNeeded: boolean;
   termsOfServiceInEffect: TermsOfServiceInEffect;
+  csrfToken: string;
 };
 
 export type ApproveTermsOfServiceResponseData = {
diff --git a/frontend/kesaseteli/README.md b/frontend/kesaseteli/README.md
index 9b0c8aaa8c..4819339fa1 100644
--- a/frontend/kesaseteli/README.md
+++ b/frontend/kesaseteli/README.md
@@ -19,7 +19,7 @@ Project is automatically deployed to testing environment when pushing to develop
 
 ## Requirements
 
-- Node 16.x
+- Node 18.x
 - Lerna
 - Yarn
 - Git
@@ -27,7 +27,7 @@ Project is automatically deployed to testing environment when pushing to develop
 
 ### install node with nvm
 
-    nvm install 16 --lts
+    nvm install 18 --lts
 
 
 ## Available Scripts
diff --git a/frontend/kesaseteli/employer/next-env.d.ts b/frontend/kesaseteli/employer/next-env.d.ts
index 9bc3dd46b9..4f11a03dc6 100644
--- a/frontend/kesaseteli/employer/next-env.d.ts
+++ b/frontend/kesaseteli/employer/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
diff --git a/frontend/kesaseteli/employer/package.json b/frontend/kesaseteli/employer/package.json
index 92ea4a1692..b7a42104c9 100644
--- a/frontend/kesaseteli/employer/package.json
+++ b/frontend/kesaseteli/employer/package.json
@@ -13,9 +13,8 @@
     "test:debug-dom": "cross-env DEBUG_PRINT_LIMIT=1000000 yarn test",
     "test:staged": "yarn test --watchAll=false --findRelatedTests",
     "test:coverage": "yarn test --verbose --coverage",
-    "browser-test": "testcafe 'chrome --allow-insecure-localhost --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/",
-    "browser-test:ci": "testcafe 'chrome:headless --disable-gpu --window-size=\"1249,720\"  --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/",
-    "browser-test:wsl2win": "testcafe 'path:`/mnt/c/Program Files/Google/Chrome/Application/chrome.exe` --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --live --dev  browser-tests/"
+    "browser-test": "testcafe 'chrome --allow-insecure-localhost --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/ --experimental-proxyless",
+    "browser-test:ci": "testcafe 'chrome:headless --disable-gpu --window-size=\"1249,720\"  --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/ --experimental-proxyless"
   },
   "dependencies": {
     "@frontend/kesaseteli-shared": "*",
@@ -28,9 +27,9 @@
     "hds-react": "^2.10.0",
     "ibantools": "^4.1.5",
     "lodash": "^4.17.21",
-    "next": "^11.1.4",
+    "next": "^12.3.4",
     "next-compose-plugins": "^2.2.1",
-    "next-i18next": "^10.5.0",
+    "next-i18next": "^13.0.3",
     "next-plugin-custom-babel-config": "^1.0.5",
     "next-transpile-modules": "^9.0.0",
     "react": "^18.0.0",
diff --git a/frontend/kesaseteli/handler/next-env.d.ts b/frontend/kesaseteli/handler/next-env.d.ts
index 9bc3dd46b9..4f11a03dc6 100644
--- a/frontend/kesaseteli/handler/next-env.d.ts
+++ b/frontend/kesaseteli/handler/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
diff --git a/frontend/kesaseteli/handler/package.json b/frontend/kesaseteli/handler/package.json
index feaf5ff7b4..ceadb71f45 100644
--- a/frontend/kesaseteli/handler/package.json
+++ b/frontend/kesaseteli/handler/package.json
@@ -13,8 +13,8 @@
     "test:debug-dom": "cross-env DEBUG_PRINT_LIMIT=1000000 yarn test",
     "test:staged": "yarn test --watchAll=false --findRelatedTests",
     "test:coverage": "yarn test:debug-dom --verbose --coverage",
-    "browser-test": "testcafe 'chrome --allow-insecure-localhost --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/",
-    "browser-test:ci": "testcafe 'chrome:headless --disable-gpu --window-size=\"1249,720\"  --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/"
+    "browser-test": "testcafe 'chrome --allow-insecure-localhost --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/ --experimental-proxyless",
+    "browser-test:ci": "testcafe 'chrome:headless --disable-gpu --window-size=\"1249,720\"  --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/ --experimental-proxyless"
   },
   "dependencies": {
     "@frontend/kesaseteli-shared": "*",
@@ -27,11 +27,11 @@
     "finnish-ssn": "^2.0.4",
     "hds-react": "^2.10.0",
     "lodash": "^4.17.21",
-    "next": "^11.1.4",
+    "next": "^12.3.4",
     "next-compose-plugins": "^2.2.1",
-    "next-i18next": "^10.5.0",
+    "next-i18next": "^13.0.3",
     "next-plugin-custom-babel-config": "^1.0.5",
-    "next-transpile-modules": "^9.0.0",
+    "next-transpile-modules": "^9.1.0",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-hook-form": "^7.30.0",
diff --git a/frontend/kesaseteli/youth/next-env.d.ts b/frontend/kesaseteli/youth/next-env.d.ts
index 9bc3dd46b9..4f11a03dc6 100644
--- a/frontend/kesaseteli/youth/next-env.d.ts
+++ b/frontend/kesaseteli/youth/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
diff --git a/frontend/kesaseteli/youth/package.json b/frontend/kesaseteli/youth/package.json
index 002b440e38..2c8217df2e 100644
--- a/frontend/kesaseteli/youth/package.json
+++ b/frontend/kesaseteli/youth/package.json
@@ -13,8 +13,8 @@
     "test:debug-dom": "cross-env DEBUG_PRINT_LIMIT=1000000 yarn test",
     "test:staged": "yarn test --watchAll=false --findRelatedTests",
     "test:coverage": "yarn test:debug-dom --verbose --coverage",
-    "browser-test": "testcafe 'chrome --allow-insecure-localhost --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/",
-    "browser-test:ci": "testcafe 'chrome:headless --disable-gpu --window-size=\"1249,720\"  --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/",
+    "browser-test": "testcafe 'chrome --allow-insecure-localhost --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/ --experimental-proxyless",
+    "browser-test:ci": "testcafe 'chrome:headless --disable-gpu --window-size=\"1249,720\"  --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/ --experimental-proxyless",
     "browser-test:wsl2win": "testcafe 'path:`/mnt/c/Program Files/Google/Chrome/Application/chrome.exe`  --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --live --dev --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/"
   },
   "dependencies": {
@@ -28,9 +28,9 @@
     "finnish-ssn": "^2.0.4",
     "hds-react": "^2.10.0",
     "lodash": "^4.17.21",
-    "next": "^11.1.4",
+    "next": "^12.3.4",
     "next-compose-plugins": "^2.2.1",
-    "next-i18next": "^10.5.0",
+    "next-i18next": "^13.0.3",
     "next-plugin-custom-babel-config": "^1.0.5",
     "next-transpile-modules": "^9.0.0",
     "react": "^18.0.0",
diff --git a/frontend/next.config.js b/frontend/next.config.js
index 1cbcd4e5f5..d97149253a 100644
--- a/frontend/next.config.js
+++ b/frontend/next.config.js
@@ -1,11 +1,10 @@
 const webpack = require('webpack');
 const path = require('path');
 const withPlugins = require('next-compose-plugins');
-const withCustomBabelConfig = require('next-plugin-custom-babel-config');
+const { withSentryConfig } = require('@sentry/nextjs');
 const withTranspileModules = require('next-transpile-modules');
 // https://nextjs.org/docs/api-reference/next.config.js/introduction
 // https://docs.sentry.io/platforms/javascript/guides/nextjs/
-const { withSentryConfig } = require('@sentry/nextjs');
 const pc = require('picocolors');
 const packageJson = require('./package.json');
 const { parsed: env } = require('dotenv').config({
@@ -14,24 +13,12 @@ const { parsed: env } = require('dotenv').config({
 
 const trueEnv = ['true', '1', 'yes'];
 
-const NEXTJS_IGNORE_ESLINT = trueEnv.includes(
-  process.env?.NEXTJS_IGNORE_ESLINT ?? 'false'
-);
-const NEXTJS_IGNORE_TYPECHECK = trueEnv.includes(
-  process.env?.NEXTJS_IGNORE_TYPECHECK ?? 'false'
-);
-const NEXTJS_DISABLE_SENTRY = trueEnv.includes(
-  process.env?.NEXTJS_DISABLE_SENTRY ?? 'false'
-);
-const NEXTJS_SENTRY_UPLOAD_DRY_RUN = trueEnv.includes(
-  process.env?.NEXTJS_SENTRY_UPLOAD_DRY_RUN ?? 'false'
-);
-const NEXTJS_SENTRY_DEBUG = trueEnv.includes(
-  process.env?.NEXTJS_SENTRY_DEBUG ?? 'false'
-);
-const NEXTJS_SENTRY_TRACING = trueEnv.includes(
-  process.env?.NEXTJS_SENTRY_TRACING ?? 'false'
-);
+const NEXTJS_IGNORE_ESLINT = trueEnv.includes(process.env?.NEXTJS_IGNORE_ESLINT ?? 'false');
+const NEXTJS_IGNORE_TYPECHECK = trueEnv.includes(process.env?.NEXTJS_IGNORE_TYPECHECK ?? 'false');
+const NEXTJS_DISABLE_SENTRY = trueEnv.includes(process.env?.NEXTJS_DISABLE_SENTRY ?? 'false');
+const NEXTJS_SENTRY_UPLOAD_DRY_RUN = trueEnv.includes(process.env?.NEXTJS_SENTRY_UPLOAD_DRY_RUN ?? 'false');
+const NEXTJS_SENTRY_DEBUG = trueEnv.includes(process.env?.NEXTJS_SENTRY_DEBUG ?? 'false');
+const NEXTJS_SENTRY_TRACING = trueEnv.includes(process.env?.NEXTJS_SENTRY_TRACING ?? 'false');
 
 // Get the app context ...
 let appName;
@@ -48,47 +35,31 @@ if (process.cwd().indexOf('/app/') === 0) {
  * to deliver an image or deploy the files.
  * @link https://nextjs.org/docs/advanced-features/source-maps
  */
-const disableSourceMaps = trueEnv.includes(
-  process.env?.NEXT_DISABLE_SOURCEMAPS ?? 'false'
-);
+const disableSourceMaps = trueEnv.includes(process.env?.NEXT_DISABLE_SOURCEMAPS ?? 'false');
 
 if (disableSourceMaps) {
-  console.warn(
-    `${pc.yellow(
-      'notice'
-    )}- Sourcemaps generation have been disabled through NEXT_DISABLE_SOURCEMAPS`
-  );
+  console.warn(`${pc.yellow('notice')}- Sourcemaps generation have been disabled through NEXT_DISABLE_SOURCEMAPS`);
 }
 
 if (NEXTJS_SENTRY_DEBUG) {
-  console.warn(
-    `${pc.yellow(
-      'notice'
-    )}- Build won't use sentry treeshaking (NEXTJS_SENTRY_DEBUG)`
-  );
+  console.warn(`${pc.yellow('notice')}- Build won't use sentry treeshaking (NEXTJS_SENTRY_DEBUG)`);
 }
 
 const nextConfig = (override) => ({
   productionBrowserSourceMaps: !disableSourceMaps,
   poweredByHeader: false,
-  // swcMinify: true,
+  swcMinify: true,
   compiler: {
-  //  styledComponents: true,
+    styledComponents: true,
   },
   experimental: {
-    reactRoot: true
-   // externalDir: true,
-   // outputStandalone: true
-  },
-  sentry: {
-    hideSourceMaps: disableSourceMaps,
-    autoInstrumentServerFunctions: !NEXTJS_DISABLE_SENTRY
+    externalDir: true,
   },
+  output: 'standalone',
   typescript: {
     /** Do not run TypeScript during production builds (`next build`). */
     ignoreBuildErrors: NEXTJS_IGNORE_TYPECHECK,
   },
-
   eslint: {
     ignoreDuringBuilds: NEXTJS_IGNORE_ESLINT,
   },
@@ -96,30 +67,18 @@ const nextConfig = (override) => ({
   webpack: (config) => {
     config.resolve.fallback = {
       fs: false,
-      path: require.resolve('path-browserify'),
     };
 
-    const babelRule = config.module.rules.find((rule) =>
-      Array.isArray(rule.use)
-        ? rule.use.find((u) => u.loader?.match(/next.*babel.*loader/i))
-        : rule.use?.loader?.match(/next.*babel.*loader/i)
-    );
-    if (babelRule) {
-      babelRule.include.push(path.resolve('../../'));
-    }
-    config.plugins.push(
-      new webpack.IgnorePlugin({ resourceRegExp: /\/(__tests__|test)\// })
-    );
+    config.plugins.push(new webpack.IgnorePlugin({ resourceRegExp: /\/(__tests__|test)\// }));
 
     // https://docs.sentry.io/platforms/javascript/guides/nextjs/configuration/tree-shaking/
     config.plugins.push(
       new webpack.DefinePlugin({
         __SENTRY_DEBUG__: NEXTJS_SENTRY_DEBUG,
         __SENTRY_TRACING__: NEXTJS_SENTRY_TRACING,
-      })
+      }),
     );
 
-
     config.module.rules.push({
       test: /\.test.tsx$/,
       loader: 'ignore-loader',
@@ -153,11 +112,7 @@ const nextConfig = (override) => ({
 let config = nextConfig;
 
 if (!NEXTJS_DISABLE_SENTRY) {
-  console.warn(
-    `${pc.yellow(
-      'notice'
-    )}- Sentry is enabled (NEXTJS_DISABLE_SENTRY)`
-  );
+  console.warn(`${pc.yellow('notice')}- Sentry is enabled (NEXTJS_DISABLE_SENTRY)`);
   // @ts-ignore because sentry does not match nextjs current definitions
   config = withSentryConfig(config, {
     // Additional config options for the Sentry Webpack plugin. Keep in mind that
@@ -170,21 +125,10 @@ if (!NEXTJS_DISABLE_SENTRY) {
     // silent: isProd, // Suppresses all logs
     dryRun: NEXTJS_SENTRY_UPLOAD_DRY_RUN,
   });
-}
-else {
-  console.warn(
-    `${pc.yellow(
-      'notice'
-    )}- Sentry is disabled (NEXTJS_DISABLE_SENTRY)`
-  );
+} else {
+  console.warn(`${pc.yellow('notice')}- Sentry is disabled (NEXTJS_DISABLE_SENTRY)`);
 }
 
-const plugins = [
-  [withTranspileModules, { transpileModules: ['@frontend'] }],
-  [
-    withCustomBabelConfig,
-    { babelConfigFile: path.resolve('../../babel.config.js') },
-  ],
-];
+const plugins = [[withTranspileModules, { transpileModules: ['@frontend'] }]];
 
-module.exports = (override) => withPlugins(plugins, config(override));
+module.exports = async (phase) => withPlugins(plugins, config(phase))(phase, { undefined });
diff --git a/frontend/package.json b/frontend/package.json
index b347873500..d63e09d421 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -10,17 +10,17 @@
     "tet/*",
     "shared"
   ],
-  "engines" : { 
-    "node" : ">=16.19.0 <17.0.0"
+  "engines": {
+    "node": ">=18.16.0 <19.0.0"
   },
   "scripts": {
     "audit": "npx lerna-audit --level=high --groups=dependencies",
     "build": "npx lerna run build",
-    "ks-empl:build": "npx lerna run --scope @frontend/employer --stream build",
-    "ks-hdlr:build": "npx lerna run --scope @frontend/ks-handler --stream build",
-    "ks-youth:build": "npx lerna run --scope @frontend/youth --stream build",
-    "bf-appl:build": "npx lerna run --scope @frontend/applicant --stream build",
-    "bf-hdlr:build": "npx lerna run --scope @frontend/bf-handler --stream build",
+    "ks-empl:build": "cross-env NODE_OPTIONS=--openssl-legacy-provider npx lerna run --scope @frontend/employer --stream build",
+    "ks-hdlr:build": "cross-env NODE_OPTIONS=--openssl-legacy-provider npx lerna run --scope @frontend/ks-handler --stream build",
+    "ks-youth:build": "cross-env NODE_OPTIONS=--openssl-legacy-provider npx lerna run --scope @frontend/youth --stream build",
+    "bf-appl:build": "cross-env NODE_OPTIONS=--openssl-legacy-provider npx lerna run --scope @frontend/applicant --stream build",
+    "bf-hdlr:build": "cross-env NODE_OPTIONS=--openssl-legacy-provider npx lerna run --scope @frontend/bf-handler --stream build",
     "ks-empl:dev": "npx lerna run --scope @frontend/employer --stream dev",
     "ks-hdlr:dev": "npx lerna run --scope @frontend/ks-handler --stream dev",
     "ks-youth:dev": "npx lerna run --scope @frontend/youth --stream dev",
@@ -39,7 +39,7 @@
     "test:staged": "npx lerna run test:staged",
     "test:coverage": "npx lerna run test:coverage --stream --concurrency 1",
     "bf-appl:test": "yarn --cwd benefit/applicant test",
-    "bf-hdlr:test": "yarn --cwd benefit/bf-handler test",
+    "bf-hdlr:test": "yarn --cwd benefit/handler test",
     "bf-appl:browser-test": "yarn --cwd benefit/applicant browser-test",
     "bf-appl:browser-test:ci": "yarn --cwd benefit/applicant browser-test:ci",
     "ks-empl:test": " yarn --cwd kesaseteli/employer test",
@@ -50,13 +50,13 @@
     "ks-youth:browser-test:ci": "yarn --cwd kesaseteli/youth browser-test:ci",
     "shared:test": " yarn --cwd shared test",
     "ks-shared:test": " yarn --cwd kesaseteli/shared test",
-    "te-admin:build": "npx lerna run --scope @frontend/te-admin --stream build",
+    "te-admin:build": "cross-env NODE_OPTIONS=--openssl-legacy-provider npx lerna run --scope @frontend/te-admin --stream build",
     "te-admin:dev": "npx lerna run --scope @frontend/te-admin --stream dev",
     "te-admin:start": "npx lerna run --scope  @frontend/te-admin --stream start",
     "te-admin:test": " yarn --cwd tet/admin test",
     "te-admin:browser-test": "yarn --cwd tet/admin browser-test",
     "te-admin:browser-test:ci": "yarn --cwd tet/admin browser-test:ci",
-    "te-youth:build": "npx lerna run --scope @frontend/te-youth --stream build",
+    "te-youth:build": "cross-env NODE_OPTIONS=--openssl-legacy-provider npx lerna run --scope @frontend/te-youth --stream build",
     "te-youth:dev": "npx lerna run --scope @frontend/te-youth --stream dev",
     "te-youth:start": "npx lerna run --scope  @frontend/te-youth --stream start",
     "te-youth:test": " yarn --cwd tet/youth test",
@@ -72,7 +72,7 @@
     "@commitlint/config-conventional": "^16.0.0",
     "@faker-js/faker": "^6.0.0-alpha.6",
     "@ffmpeg-installer/ffmpeg": "^1.1.0",
-    "@next/eslint-plugin-next": "^11.1.4",
+    "@next/eslint-plugin-next": "^12.2.6",
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^13.3.0",
     "@testing-library/react-hooks": "^8.0.0",
@@ -82,7 +82,7 @@
     "@types/jest": "^27.4.0",
     "@types/jest-axe": "^3.5.3",
     "@types/leaflet": "^1.7.9",
-    "@types/node": "^17.0.43",
+    "@types/node": "^18.16.0",
     "@types/pretty": "^2.0.1",
     "@types/react-input-mask": "2.0.5",
     "@types/react-leaflet": "^2.8.2",
@@ -101,7 +101,7 @@
     "eslint-config-airbnb": "^19.0.2",
     "eslint-config-airbnb-typescript": "^16.1.0",
     "eslint-config-auto": "^0.7.1",
-    "eslint-config-next": "^11.1.4",
+    "eslint-config-next": "^12.2.6",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-array-func": "^3.1.7",
     "eslint-plugin-chai-expect": "^3.0.0",
@@ -135,7 +135,7 @@
     "eslint-plugin-you-dont-need-lodash-underscore": "^6.12.0",
     "faker": "^5.5.3",
     "husky": "^8.0.1",
-    "i18next": "^21.6.0",
+    "i18next": "^22.4.13",
     "jest": "^27.4.7",
     "jest-axe": "^6.0.0",
     "lerna": "^4.0.0",
@@ -146,9 +146,9 @@
     "picocolors": "1.0.0",
     "prettier": "^2.5.1",
     "pretty": "^2.0.0",
-    "react-i18next": "^11.11.0",
+    "react-i18next": "^12.2.0",
     "slack-node": "^0.2.0",
-    "testcafe": "^1.19.0",
+    "testcafe": "^2.4.0",
     "testcafe-reporter-custom": "^1.2.1",
     "testcafe-reporter-html": "^1.4.6",
     "ts-jest": "^27.1.3",
diff --git a/frontend/shared/browser-tests/page-models/PageComponent.ts b/frontend/shared/browser-tests/page-models/PageComponent.ts
index 46cc3267c4..6bb012c9c9 100644
--- a/frontend/shared/browser-tests/page-models/PageComponent.ts
+++ b/frontend/shared/browser-tests/page-models/PageComponent.ts
@@ -106,7 +106,8 @@ abstract class PageComponent {
   ): TestControllerPromise {
     return t
       .click(selector)
-      .pressKey('ctrl+a delete')
+      .selectText(selector)
+      .pressKey('delete')
       .typeText(selector, value ?? '');
   }
 
diff --git a/frontend/shared/package.json b/frontend/shared/package.json
index 6412db768c..1aeba1243f 100644
--- a/frontend/shared/package.json
+++ b/frontend/shared/package.json
@@ -25,8 +25,8 @@
     "hds-react": "^2.10.0",
     "js-file-download": "^0.4.12",
     "lodash": "^4.17.21",
-    "next": "^11.1.4",
-    "next-i18next": "^10.5.0",
+    "next": "^12.3.4",
+    "next-i18next": "^13.0.3",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-hook-form": "^7.30.0",
diff --git a/frontend/shared/sentry-config.js b/frontend/shared/sentry-config.js
index 1b0331b84d..b204f3290a 100644
--- a/frontend/shared/sentry-config.js
+++ b/frontend/shared/sentry-config.js
@@ -1,24 +1,25 @@
-import * as Sentry from "@sentry/nextjs";
+import * as Sentry from '@sentry/nextjs';
 import maskGDPRData from 'shared/utils/mask-gdpr-data';
 
 export default function sentryConfig() {
   Sentry.init({
-      dsn: process.env.NEXT_PUBLIC_SENTRY_DSN || '',
-      environment: process.env.NEXT_PUBLIC_SENTRY_ENVIRONMENT || 'development',
-      attachStacktrace: true,
-      maxBreadcrumbs: Number(process.env.NEXT_PUBLIC_SENTRY_MAX_BREADCRUMBS) || 100,
-      // Adjust this value in production, or use tracesSampler for greater control
-      // @see https://develop.sentry.dev/sdk/performance/
-      tracesSampleRate: 1,
-      beforeBreadcrumb(breadcrumb: Sentry.Breadcrumb) {
-        return {
-          ...breadcrumb,
-          message: maskGDPRData(breadcrumb.message),
-          data: maskGDPRData(breadcrumb.data),
-        };
-      },
-      beforeSend(event: Sentry.Event) {
-        return maskGDPRData(event);
-      },
-  })
-};
\ No newline at end of file
+    dsn: process.env.NEXT_PUBLIC_SENTRY_DSN || '',
+    environment: process.env.NEXT_PUBLIC_SENTRY_ENVIRONMENT || 'development',
+    attachStacktrace: true,
+    maxBreadcrumbs:
+      Number(process.env.NEXT_PUBLIC_SENTRY_MAX_BREADCRUMBS) || 100,
+    // Adjust this value in production, or use tracesSampler for greater control
+    // @see https://develop.sentry.dev/sdk/performance/
+    tracesSampleRate: 1,
+    beforeBreadcrumb(breadcrumb) {
+      return {
+        ...breadcrumb,
+        message: maskGDPRData(breadcrumb.message),
+        data: maskGDPRData(breadcrumb.data),
+      };
+    },
+    beforeSend(event) {
+      return maskGDPRData(event);
+    },
+  });
+}
diff --git a/frontend/shared/src/backend-api/BackendAPIProvider.tsx b/frontend/shared/src/backend-api/BackendAPIProvider.tsx
index 3e1c117eb6..03fdb035e6 100644
--- a/frontend/shared/src/backend-api/BackendAPIProvider.tsx
+++ b/frontend/shared/src/backend-api/BackendAPIProvider.tsx
@@ -2,17 +2,20 @@ import Axios from 'axios';
 import React from 'react';
 import { getLastCookieValue } from 'shared/cookies/get-last-cookie-value';
 import { Headers } from 'shared/types/common';
+import { getLocalStorageItem } from 'shared/utils/localstorage.utils';
 
 import BackendAPIContext from './BackendAPIContext';
 
 export interface BackendAPIProviderProps {
   baseURL: string;
   headers?: Headers;
+  isLocalStorageCsrf?: boolean;
 }
 
 const BackendAPIProvider: React.FC<BackendAPIProviderProps> = ({
   baseURL,
   headers,
+  isLocalStorageCsrf = false,
   children,
 }): JSX.Element => (
   <BackendAPIContext.Provider
@@ -20,7 +23,9 @@ const BackendAPIProvider: React.FC<BackendAPIProviderProps> = ({
       baseURL,
       headers: {
         'Content-Type': 'application/json',
-        'X-CSRFToken': getLastCookieValue('yjdhcsrftoken'),
+        'X-CSRFToken': isLocalStorageCsrf
+          ? getLocalStorageItem('csrfToken')
+          : getLastCookieValue('yjdhcsrftoken'),
         ...headers,
       },
       withCredentials: true,
diff --git a/frontend/shared/src/components/accordion/accordion.d.ts b/frontend/shared/src/components/accordion/accordion.d.ts
index 2e3ca48074..b1525c9071 100644
--- a/frontend/shared/src/components/accordion/accordion.d.ts
+++ b/frontend/shared/src/components/accordion/accordion.d.ts
@@ -1,7 +1,7 @@
 type CommonAccordionProps = React.PropsWithChildren<{
   border?: false;
   card?: false;
-  heading?: React.ReactElement;
+  heading?: React.ReactElement | string;
   headingLevel?: number;
   headerBackgroundColor?: string;
   id: string;
diff --git a/frontend/shared/src/components/container/Container.sc.ts b/frontend/shared/src/components/container/Container.sc.ts
index 58500b0d6b..90ceaac309 100644
--- a/frontend/shared/src/components/container/Container.sc.ts
+++ b/frontend/shared/src/components/container/Container.sc.ts
@@ -1,17 +1,19 @@
 import { respondAbove } from 'shared/styles/mediaQueries';
+import theme from 'shared/styles/theme';
 import styled from 'styled-components';
 
 export type ContainerProps = { backgroundColor?: string };
 
+const gridTemplateColumns = `grid-template-columns: 1fr minmax(auto, 
+  ${theme.contentWidth.max}) 1fr;`;
+
 export const $Container = styled.div<ContainerProps>`
   display: grid;
   background-color: ${(props) => props.backgroundColor || ''};
   grid-template-columns: ${(props) => props.theme.spacing.xs2} 1fr ${(props) =>
       props.theme.spacing.xs2};
 
-  ${respondAbove('md')`
-    grid-template-columns: 1fr minmax(auto, 1240px) 1fr;
-  `};
+  ${respondAbove('md')(gridTemplateColumns)}
 
   & > * {
     grid-column: 2;
diff --git a/frontend/shared/src/components/messaging/Message.tsx b/frontend/shared/src/components/messaging/Message.tsx
index cb8d052118..c2c11c0062 100644
--- a/frontend/shared/src/components/messaging/Message.tsx
+++ b/frontend/shared/src/components/messaging/Message.tsx
@@ -15,6 +15,8 @@ export interface MessageProps {
   date: string;
   text: string;
   isPrimary?: boolean;
+  alignRight?: boolean;
+  wrapAsColumn?: boolean;
   variant: MessageVariant;
 }
 
@@ -24,13 +26,15 @@ const Message: React.FC<MessageProps> = ({
   text,
   isPrimary,
   variant,
+  alignRight,
+  wrapAsColumn,
 }) => (
   <$MessageContainer>
-    <$Meta>
+    <$Meta alignRight={alignRight} wrapAsColumn={wrapAsColumn}>
       <$Sender>{sender}</$Sender>
       <$Date>{date}</$Date>
     </$Meta>
-    <$Message isPrimary={isPrimary} variant={variant}>
+    <$Message isPrimary={isPrimary} variant={variant} alignRight={alignRight}>
       {text}
     </$Message>
     {variant === 'note' && <$Hr />}
diff --git a/frontend/shared/src/components/messaging/Messaging.sc.tsx b/frontend/shared/src/components/messaging/Messaging.sc.tsx
index 3798d0b227..74e66ef902 100644
--- a/frontend/shared/src/components/messaging/Messaging.sc.tsx
+++ b/frontend/shared/src/components/messaging/Messaging.sc.tsx
@@ -3,9 +3,15 @@ import styled from 'styled-components';
 
 interface MessageProps {
   isPrimary?: boolean;
+  alignRight?: boolean;
   variant: MessageVariant;
 }
 
+interface MetaProps {
+  wrapAsColumn?: boolean;
+  alignRight?: boolean;
+}
+
 interface MessageListProps {
   variant: MessageVariant;
 }
@@ -23,11 +29,13 @@ export const $MessagesList = styled.div<MessageListProps>`
   padding: ${({ theme }) => theme.spacing.xs};
 `;
 
-export const $Meta = styled.div`
+export const $Meta = styled.div<MetaProps>`
   width: 100%;
   display: flex;
   justify-content: space-between;
   margin-top: ${({ theme }) => theme.spacing.s};
+  flex-flow: ${(props) => (props.wrapAsColumn ? 'column' : 'row')};
+  text-align: ${(props) => (props.alignRight ? 'right' : 'left')};
 `;
 
 export const $Sender = styled.span`
@@ -56,6 +64,7 @@ export const $Message = styled.div<MessageProps>`
   margin-top: ${(props) => props.variant !== 'note' && props.theme.spacing.s};
   color: ${(props) => props.theme.colors.black90};
   white-space: pre-line;
+  margin-left: ${(props) => (props.alignRight ? 'auto' : '0')};
 `;
 
 export const $Actions = styled.div`
diff --git a/frontend/shared/src/styles/theme.ts b/frontend/shared/src/styles/theme.ts
index f2480fb91a..eae41074cd 100644
--- a/frontend/shared/src/styles/theme.ts
+++ b/frontend/shared/src/styles/theme.ts
@@ -1,13 +1,20 @@
 import { DefaultTheme } from 'styled-components';
 
-const colors = {
+const tokens = {
   coatOfArms: 'var(--color-coat-of-arms)',
-  components: {
-    stepper: {
-      black: 'var(--color-black-90)',
-      white: 'var(--color-white)',
-      grey: 'var(--color-black-30)',
-    },
+  fog: 'var(--color-fog)',
+};
+
+const componentColors = {
+  stepper: {
+    black: 'var(--color-black-90)',
+    white: 'var(--color-white)',
+    grey: 'var(--color-black-30)',
+  },
+  radio: {
+    base: tokens.coatOfArms,
+    selectedHover: 'var(--color-black-80)',
+    selectedFocus: tokens.fog,
   },
 };
 
@@ -21,7 +28,7 @@ const theme: DefaultTheme = {
     busLight: 'var(--color-bus-light)',
     busMediumLight: 'var(--color-bus-medium-light)',
     busDark: 'var(--color-bus-dark)',
-    coatOfArms: colors.coatOfArms as 'var(--color-coat-of-arms)',
+    coatOfArms: 'var(--color-coat-of-arms)',
     coatOfArmsLight: 'var(--color-coat-of-arms-light)',
     coatOfArmsMediumLight: 'var(--color-coat-of-arms-medium-light)',
     coatOfArmsDark: 'var(--color-coat-of-arms-dark)',
@@ -148,22 +155,33 @@ const theme: DefaultTheme = {
     l: '992px',
     xl: '1248px',
   },
+  contentWidth: {
+    max: '1240px',
+  },
   components: {
     tabs: {
-      '--tab-color': colors.coatOfArms,
+      '--tab-color': tokens.coatOfArms,
       '--tab-active-border-color': 'var(--color-black)',
     },
     table: {
-      '--header-background-color': colors.coatOfArms,
+      '--header-background-color': tokens.coatOfArms,
     },
     stepper: {
-      '--hds-not-selected-step-label-color': colors.components.stepper.black,
-      '--hds-step-background-color': colors.components.stepper.white,
-      '--hds-step-content-color': colors.components.stepper.black,
-      '--hds-stepper-background-color': colors.components.stepper.white,
-      '--hds-stepper-color': colors.components.stepper.black,
-      '--hds-stepper-disabled-color': colors.components.stepper.grey,
-      '--hds-stepper-focus-border-color': colors.components.stepper.black,
+      '--hds-not-selected-step-label-color': componentColors.stepper.black,
+      '--hds-step-background-color': componentColors.stepper.white,
+      '--hds-step-content-color': componentColors.stepper.black,
+      '--hds-stepper-background-color': componentColors.stepper.white,
+      '--hds-stepper-color': componentColors.stepper.black,
+      '--hds-stepper-disabled-color': componentColors.stepper.grey,
+      '--hds-stepper-focus-border-color': componentColors.stepper.black,
+    },
+    radio: {
+      '--border-color-selected': componentColors.radio.base,
+      '--border-color-selected-hover': componentColors.radio.selectedHover,
+      '--border-color-selected-focus': componentColors.radio.selectedFocus,
+      '--icon-color-selected': componentColors.radio.base,
+      '--icon-color-hover': componentColors.radio.base,
+      '--focus-outline-color': componentColors.radio.base,
     },
   },
 };
diff --git a/frontend/shared/src/types/styled-components.d.ts b/frontend/shared/src/types/styled-components.d.ts
index 67208524ec..1d2f1fdc41 100644
--- a/frontend/shared/src/types/styled-components.d.ts
+++ b/frontend/shared/src/types/styled-components.d.ts
@@ -138,6 +138,9 @@ declare module 'styled-components' {
       l: '992px';
       xl: '1248px';
     };
+    contentWidth: {
+      max: '1240px';
+    };
     components: {
       stepper: {
         '--hds-not-selected-step-label-color': string;
@@ -155,6 +158,14 @@ declare module 'styled-components' {
       table: {
         '--header-background-color': string;
       };
+      radio: {
+        '--border-color-selected': string;
+        '--border-color-selected-hover': string;
+        '--border-color-selected-focus': string;
+        '--icon-color-selected': string;
+        '--icon-color-hover': string;
+        '--focus-outline-color': string;
+      };
     };
   }
 }
diff --git a/frontend/shared/src/types/user.d.ts b/frontend/shared/src/types/user.d.ts
index d72931a874..51b05ee2d9 100644
--- a/frontend/shared/src/types/user.d.ts
+++ b/frontend/shared/src/types/user.d.ts
@@ -5,5 +5,7 @@ type User = {
   family_name: string;
   name: string;
   organization_name?: string;
+  is_staff?: boolean;
+  csrf_token?: string;
 };
 export default User;
diff --git a/frontend/shared/src/utils/localstorage.utils.ts b/frontend/shared/src/utils/localstorage.utils.ts
new file mode 100644
index 0000000000..4860b42562
--- /dev/null
+++ b/frontend/shared/src/utils/localstorage.utils.ts
@@ -0,0 +1,14 @@
+/* eslint-disable scanjs-rules/identifier_localStorage */
+
+const IS_CLIENT = typeof window !== 'undefined';
+
+export const getLocalStorageItem = (key: string): string =>
+  IS_CLIENT ? localStorage.getItem(key) || '' : '';
+
+export const setLocalStorageItem = (key: string, value: string): void =>
+  IS_CLIENT && localStorage.setItem(key, value);
+
+export const removeLocalStorageItem = (key: string): void =>
+  IS_CLIENT && localStorage.removeItem(key);
+
+/* eslint-enable scanjs-rules/identifier_localStorage */
diff --git a/frontend/tet/admin/browser-tests/login/login.testcafe.ts b/frontend/tet/admin/browser-tests/login/login.testcafe.ts
index e421804487..b576d86dc9 100644
--- a/frontend/tet/admin/browser-tests/login/login.testcafe.ts
+++ b/frontend/tet/admin/browser-tests/login/login.testcafe.ts
@@ -7,7 +7,7 @@ import { getBackendDomain } from '@frontend/te-admin/src/backend-api/backend-api
 
 import getTetAdminTranslationsApi from '../../src/__tests__/utils/i18n/get-tet-admin-translations-api';
 import { getFrontendUrl } from '../utils/url.utils';
-import { Selector, t } from 'testcafe';
+import { Selector } from 'testcafe';
 import { doLogin, SuomiFiData } from '@frontend/shared/browser-tests/actions/login-action';
 
 const url = getFrontendUrl('/');
diff --git a/frontend/tet/admin/jest.config.js b/frontend/tet/admin/jest.config.js
index 8e98550490..d0030dfbe7 100644
--- a/frontend/tet/admin/jest.config.js
+++ b/frontend/tet/admin/jest.config.js
@@ -1,6 +1,11 @@
 const sharedConfig = require('../../jest.config.js');
+const nextJest = require('next/jest');
 
-module.exports = {
+const createJestConfig = nextJest({
+  dir: './',
+});
+
+const config = {
   ...sharedConfig,
   globals: {
     'ts-jest': {
@@ -19,3 +24,5 @@ module.exports = {
   coveragePathIgnorePatterns: ['<rootDir>/tet/admin/src/pages/'],
   verbose: true,
 };
+
+module.exports = createJestConfig(config);
diff --git a/frontend/tet/admin/next-env.d.ts b/frontend/tet/admin/next-env.d.ts
index 9bc3dd46b9..4f11a03dc6 100644
--- a/frontend/tet/admin/next-env.d.ts
+++ b/frontend/tet/admin/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
diff --git a/frontend/tet/admin/package.json b/frontend/tet/admin/package.json
index 90552c35b1..6b233118b1 100644
--- a/frontend/tet/admin/package.json
+++ b/frontend/tet/admin/package.json
@@ -12,7 +12,7 @@
     "test:staged": "yarn test --watchAll=false --findRelatedTests",
     "test:coverage": "yarn test:debug-dom --verbose --coverage",
 		"test:debug-nock": "cross-env DEBUG=nock.* yarn test",
-    "browser-test": "testcafe 'chrome --allow-insecure-localhost --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/",
+    "browser-test": "cross-env LOCAL_TEST_RUN=1 testcafe 'chrome --allow-insecure-localhost --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/ --experimental-proxyless",
     "browser-test:ci": "testcafe 'chrome:headless --disable-gpu --window-size=\"1249,720\"  --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/",
     "lint": "eslint --ext js,ts,tsx src"
   },
@@ -27,9 +27,9 @@
     "dotenv": "^16.0.0",
     "hds-react": "^2.10.0",
     "leaflet": "^1.7.1",
-    "next": "^11.1.4",
+    "next": "^12.3.4",
     "next-compose-plugins": "^2.2.1",
-    "next-i18next": "^10.5.0",
+    "next-i18next": "^13.0.3",
     "next-plugin-custom-babel-config": "^1.0.5",
     "next-transpile-modules": "^9.0.0",
     "react": "^18.0.0",
diff --git a/frontend/tet/admin/src/components/editor/DateInput.tsx b/frontend/tet/admin/src/components/editor/DateInput.tsx
index bb7703b7d4..ca89c6d12d 100644
--- a/frontend/tet/admin/src/components/editor/DateInput.tsx
+++ b/frontend/tet/admin/src/components/editor/DateInput.tsx
@@ -6,7 +6,12 @@ import { Language } from 'shared/i18n/i18n';
 import Id from 'shared/types/id';
 import TetPosting from 'tet-shared/types/tetposting';
 
+// Known issue with react-hook-form library, errors out with:
+// Type of property 'prototype' circularly references itself in mapped type '{ [K in keyof Blob]-?: PathImpl<K & string, Blob[K]>; }'.
+// More at: https://github.com/orgs/react-hook-form/discussions/7764
 type Props = {
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
   id: Id<TetPosting>;
   label: string;
   registerOptions?: RegisterOptions;
diff --git a/frontend/tet/admin/src/components/editor/Editor.tsx b/frontend/tet/admin/src/components/editor/Editor.tsx
index 8ca77bdd05..cb8dfa3cd1 100644
--- a/frontend/tet/admin/src/components/editor/Editor.tsx
+++ b/frontend/tet/admin/src/components/editor/Editor.tsx
@@ -23,6 +23,14 @@ export type EditorSectionProps = {
   initialValue: TetPosting;
 };
 
+// Known issue with react-hook-form library, errors out with:
+// Type of property 'prototype' circularly references itself in mapped type '{ [K in keyof Blob]-?: PathImpl<K & string, Blob[K]>; }'.
+// More at: https://github.com/orgs/react-hook-form/discussions/7764
+
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+const RenderHiddenIdInput = (id: string, value: string): JSXElement => <HiddenIdInput id={id} initialValue={value} />;
+
 // add new posting / edit existing
 const Editor: React.FC<EditorProps> = ({ initialValue, isNewPosting = false }) => {
   const { t } = useTranslation();
@@ -38,9 +46,9 @@ const Editor: React.FC<EditorProps> = ({ initialValue, isNewPosting = false }) =
   return (
     <FormProvider {...methods}>
       <form aria-label={t('common:editor.formLabel')}>
-        <HiddenIdInput id="id" initialValue={initialValue?.id} />
-        <HiddenIdInput id="image_url" initialValue={initialValue?.image_url} />
-        <HiddenIdInput id="image_id" initialValue={initialValue?.image_id} />
+        {RenderHiddenIdInput('id', initialValue?.id)}
+        {RenderHiddenIdInput('image_url', initialValue?.image_url)}
+        {RenderHiddenIdInput('image_id', initialValue?.image_id)}
         <EditorErrorNotification />
         <p>* {t('common:editor.requiredInfo')}</p>
         <EmployerInfo />
diff --git a/frontend/tet/admin/src/components/editor/HiddenIdInput.tsx b/frontend/tet/admin/src/components/editor/HiddenIdInput.tsx
index 71f53a8e12..bfae1707fa 100644
--- a/frontend/tet/admin/src/components/editor/HiddenIdInput.tsx
+++ b/frontend/tet/admin/src/components/editor/HiddenIdInput.tsx
@@ -3,6 +3,12 @@ import { useFormContext } from 'react-hook-form';
 import InputProps from 'shared/types/input-props';
 import TetPosting from 'tet-shared/types/tetposting';
 
+// Known issue with react-hook-form library, errors out with:
+// Type of property 'prototype' circularly references itself in mapped type '{ [K in keyof Blob]-?: PathImpl<K & string, Blob[K]>; }'.
+// More at: https://github.com/orgs/react-hook-form/discussions/7764
+
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
 const HiddenIdInput: React.FC<InputProps<TetPosting>> = ({ id, initialValue }) => {
   const { register } = useFormContext<TetPosting>();
   return <input type="hidden" {...register(id)} defaultValue={initialValue} />;
diff --git a/frontend/tet/admin/src/components/editor/SelectionGroup.tsx b/frontend/tet/admin/src/components/editor/SelectionGroup.tsx
index 7a70e86fd7..60663bd276 100644
--- a/frontend/tet/admin/src/components/editor/SelectionGroup.tsx
+++ b/frontend/tet/admin/src/components/editor/SelectionGroup.tsx
@@ -34,6 +34,12 @@ const SelectionGroup: React.FC<Props> = ({ fieldId, label, options, required, ru
   };
 
   return (
+    // Known issue with react-hook-form library, errors out with:
+    // Type of property 'prototype' circularly references itself in mapped type '{ [K in keyof Blob]-?: PathImpl<K & string, Blob[K]>; }'.
+    // More at: https://github.com/orgs/react-hook-form/discussions/7764
+
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
     <Controller
       name={fieldId}
       control={control}
diff --git a/frontend/tet/admin/src/components/editor/TextArea.tsx b/frontend/tet/admin/src/components/editor/TextArea.tsx
index a102deb051..a3ee9891a8 100644
--- a/frontend/tet/admin/src/components/editor/TextArea.tsx
+++ b/frontend/tet/admin/src/components/editor/TextArea.tsx
@@ -4,7 +4,12 @@ import { Controller, RegisterOptions, useFormContext } from 'react-hook-form';
 import Id from 'shared/types/id';
 import TetPosting from 'tet-shared/types/tetposting';
 
+// Known issue with react-hook-form library, errors out with:
+// Type of property 'prototype' circularly references itself in mapped type '{ [K in keyof Blob]-?: PathImpl<K & string, Blob[K]>; }'.
+// More at: https://github.com/orgs/react-hook-form/discussions/7764
 type Props = {
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
   id: Id<TetPosting>;
   testId?: string;
   label: string;
diff --git a/frontend/tet/admin/src/components/editor/TextInput.tsx b/frontend/tet/admin/src/components/editor/TextInput.tsx
index 50172eaac0..8c974ccfc6 100644
--- a/frontend/tet/admin/src/components/editor/TextInput.tsx
+++ b/frontend/tet/admin/src/components/editor/TextInput.tsx
@@ -4,7 +4,12 @@ import { Controller, RegisterOptions, useFormContext } from 'react-hook-form';
 import Id from 'shared/types/id';
 import TetPosting from 'tet-shared/types/tetposting';
 
+// Known issue with react-hook-form library, errors out with:
+// Type of property 'prototype' circularly references itself in mapped type '{ [K in keyof Blob]-?: PathImpl<K & string, Blob[K]>; }'.
+// More at: https://github.com/orgs/react-hook-form/discussions/7764
 type Props = {
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
   id: Id<TetPosting>;
   label: string;
   placeholder: string;
diff --git a/frontend/tet/admin/src/components/header/Header.tsx b/frontend/tet/admin/src/components/header/Header.tsx
index eb9d5dfe77..8ceac21bec 100644
--- a/frontend/tet/admin/src/components/header/Header.tsx
+++ b/frontend/tet/admin/src/components/header/Header.tsx
@@ -63,7 +63,6 @@ const Header: React.FC = () => {
             }
           : undefined
       }
-      hideLogin={isLoginPage}
     />
   );
 };
diff --git a/frontend/tet/admin/src/hooks/translation/useValidationRules.ts b/frontend/tet/admin/src/hooks/translation/useValidationRules.ts
index 23e96f59bb..ed696879cf 100644
--- a/frontend/tet/admin/src/hooks/translation/useValidationRules.ts
+++ b/frontend/tet/admin/src/hooks/translation/useValidationRules.ts
@@ -20,6 +20,7 @@ const useValidationRules = (): RegisterOptions & Record<string, RegisterOptions>
         message: phoneMessage,
       },
     },
+    // @ts-expect-error Should be "max"?
     maxlength: t('common:editor.posting.validation.max'),
     name: {
       required: {
diff --git a/frontend/tet/shared/package.json b/frontend/tet/shared/package.json
index c0563a9a8a..9d5f87ee8b 100644
--- a/frontend/tet/shared/package.json
+++ b/frontend/tet/shared/package.json
@@ -17,8 +17,8 @@
     "@frontend/shared": "*",
     "axios": "^0.27.2",
     "hds-react": "^2.10.0",
-    "next": "^11.1.4",
-    "next-i18next": "^10.5.0",
+    "next": "^12.3.4",
+    "next-i18next": "^13.0.3",
     "react-query": "^3.34.0",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
diff --git a/frontend/tet/youth/browser-tests/pages/searchpage.ts b/frontend/tet/youth/browser-tests/pages/searchpage.ts
index 2d611c2904..fdb2f3b92e 100644
--- a/frontend/tet/youth/browser-tests/pages/searchpage.ts
+++ b/frontend/tet/youth/browser-tests/pages/searchpage.ts
@@ -13,11 +13,13 @@ class Searchpage {
 
   searchTags = Selector('#searchTags');
 
-  searchTagButton = Selector('#hds-tag > button');
+  searchTagButton = Selector('#hds-tag-label > button');
+
+  searchTagDeleteButton = Selector('#hds-tag-delete-button');
 
   removeAllSearchesButton = Selector('#removeAllSearches');
 
-  submitButton = Selector('button').withText('Etsi');
+  submitButton = Selector('button').withText('Hae');
 
   readMoreButton = Selector('button').withText('Lue lisää');
 
@@ -50,7 +52,7 @@ class Searchpage {
   fillDates = (startDate: string, endDate: string) =>
     t.typeText(this.startDate, startDate).typeText(this.endDate, endDate);
 
-  removeTag = () => t.click(this.searchTagButton);
+  removeTag = () => t.click(this.searchTagDeleteButton());
 
   goToPosting = () => t.click(this.readMoreButton);
 }
diff --git a/frontend/tet/youth/browser-tests/search.testcafe.ts b/frontend/tet/youth/browser-tests/search.testcafe.ts
index daa3f82b2d..627f6cd5d6 100644
--- a/frontend/tet/youth/browser-tests/search.testcafe.ts
+++ b/frontend/tet/youth/browser-tests/search.testcafe.ts
@@ -25,8 +25,13 @@ fixture('Frontpage')
 
 const formatDate = (date: Date): string => `${date.getDate()}.${date.getMonth() + 1}.${date.getFullYear()}`;
 
-// This works locally but not on the review environment
-test.skip('simple test', async () => {
+const IS_LOCAL_TEST_RUN = process.env?.LOCAL_TEST_RUN === '1';
+
+test('simple test', async () => {
+  // This works locally but not on the review environment
+  if (!IS_LOCAL_TEST_RUN) {
+    return;
+  }
   const searchTerm = faker.lorem.word();
 
   await frontpage.fillSearch(searchTerm);
@@ -36,7 +41,11 @@ test.skip('simple test', async () => {
 // The test is skipped due to instability in the review environment
 // causing the test to fail. This worked well locally. If you get it to work in review
 // you can delete the simple test above.
-test.skip('user can search and navigate', async (t) => {
+test('user can search and navigate', async (t) => {
+  if (!IS_LOCAL_TEST_RUN) {
+    return;
+  }
+
   // Generate some data to test with
   // The goal here is not to do a comprehensive test but more of a PoC
   // that the solution works end to end with some sample values.
@@ -45,8 +54,8 @@ test.skip('user can search and navigate', async (t) => {
   const startDate = formatDate(start);
   const endDate = formatDate(end);
   // Should find working method https://linkedevents-api.dev.hel.ninja/linkedevents-dev/v1/keyword/tet:2/
-  const workMethodText = 'varjosta';
-  const languageText = 'suomeksi'; // Should find Finnish language
+  const workMethodText = 'Varjostus';
+  const languageText = 'Suomi';
   const searchTerm = faker.lorem.word();
 
   await frontpage.fillSearch(searchTerm);
diff --git a/frontend/tet/youth/jest.config.js b/frontend/tet/youth/jest.config.js
index 78a083fc15..fe31fa72d9 100644
--- a/frontend/tet/youth/jest.config.js
+++ b/frontend/tet/youth/jest.config.js
@@ -1,12 +1,12 @@
 const sharedConfig = require('../../jest.config.js');
+const nextJest = require('next/jest');
 
-module.exports = {
+const createJestConfig = nextJest({
+  dir: './',
+});
+
+const config = {
   ...sharedConfig,
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.jest.json',
-    },
-  },
   moduleNameMapper: {
     [`^shared\/(.*)$`]: '<rootDir>/../../shared/src/$1',
     [`^tet-shared\/(.*)$`]: '<rootDir>../shared/src/$1',
@@ -17,4 +17,8 @@ module.exports = {
     '<rootDir>src/__tests__/utils/init-i18n.ts',
   ],
   coveragePathIgnorePatterns: ['<rootDir>/tet/youth/src/pages/'],
+  moduleDirectories: ['node_modules', '<rootDir>/'],
+  testEnvironment: 'jest-environment-jsdom',
 };
+
+module.exports = createJestConfig(config);
diff --git a/frontend/tet/youth/next-env.d.ts b/frontend/tet/youth/next-env.d.ts
index 9bc3dd46b9..4f11a03dc6 100644
--- a/frontend/tet/youth/next-env.d.ts
+++ b/frontend/tet/youth/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
diff --git a/frontend/tet/youth/next.config.js b/frontend/tet/youth/next.config.js
index 259d2add57..f544b6d052 100644
--- a/frontend/tet/youth/next.config.js
+++ b/frontend/tet/youth/next.config.js
@@ -3,4 +3,4 @@ const { i18n } = require('./next-i18next.config');
 const { parsed: env } = require('dotenv').config({
   path: '../../../.env.tet',
 });
-module.exports = nextConfig({ i18n, env, experimental: { reactRoot: false } });
+module.exports = nextConfig({ i18n, env });
diff --git a/frontend/tet/youth/package.json b/frontend/tet/youth/package.json
index 73f29df783..ba82fa71ed 100644
--- a/frontend/tet/youth/package.json
+++ b/frontend/tet/youth/package.json
@@ -12,8 +12,8 @@
     "test:debug-dom": "cross-env DEBUG_PRINT_LIMIT=1000000 yarn test",
     "test:staged": "yarn test --watchAll=false --findRelatedTests",
     "test:coverage": "yarn test:debug-dom --verbose --coverage",
-    "browser-test": "testcafe 'chrome --allow-insecure-localhost --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/",
-    "browser-test:ci": "testcafe 'chrome:headless --disable-gpu --window-size=\"1249,720\"  --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/",
+    "browser-test": "cross-env LOCAL_TEST_RUN=1 testcafe 'chrome --allow-insecure-localhost --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/ --experimental-proxyless",
+    "browser-test:ci": "testcafe 'chrome:headless --disable-gpu --window-size=\"1249,720\"  --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/ --experimental-proxyless",
     "lint": "eslint --ext js,ts,tsx src browser-tests"
   },
   "dependencies": {
@@ -27,9 +27,9 @@
     "leaflet.markercluster": "^1.5.3",
     "dotenv": "^16.0.0",
     "hds-react": "^2.10.0",
-    "next": "^11.1.4",
+    "next": "^12.3.4",
     "next-compose-plugins": "^2.2.1",
-    "next-i18next": "^10.5.0",
+    "next-i18next": "^13.0.3",
     "next-plugin-custom-babel-config": "^1.0.5",
     "next-transpile-modules": "^9.0.0",
     "react-leaflet": "^3.2.5",
diff --git a/frontend/tet/youth/src/__tests__/index.test.tsx b/frontend/tet/youth/src/__tests__/index.test.tsx
index 7a0eceb807..d9b07239a6 100644
--- a/frontend/tet/youth/src/__tests__/index.test.tsx
+++ b/frontend/tet/youth/src/__tests__/index.test.tsx
@@ -10,8 +10,6 @@ import IndexPage from 'tet/youth/pages';
 
 import getYouthTranslationsApi from './utils/i18n/get-youth-translations';
 
-jest.mock('next/router');
-
 describe('frontend/tet/youth/src/pages/index.tsx', () => {
   const {
     translations: { [DEFAULT_LANGUAGE]: translations },
diff --git a/frontend/tet/youth/src/__tests__/postings.test.tsx b/frontend/tet/youth/src/__tests__/postings.test.tsx
index 9ed6d2b706..44ba609ed4 100644
--- a/frontend/tet/youth/src/__tests__/postings.test.tsx
+++ b/frontend/tet/youth/src/__tests__/postings.test.tsx
@@ -14,8 +14,6 @@ import renderPage from 'tet/youth/__tests__/utils/components/render-page';
 import Postings from 'tet/youth/pages';
 import { fakeEventListYouth } from 'tet-shared/__tests__/utils/fake-objects';
 
-jest.mock('next/router');
-
 const postings = fakeEventListYouth(['Avustaja', 'Kirjasto']);
 
 describe('frontend/tet/youth/src/pages/postings.tsx', () => {
diff --git a/frontend/tet/youth/src/__tests__/show.test.tsx b/frontend/tet/youth/src/__tests__/show.test.tsx
index 4796b4592b..1fe2db15e4 100644
--- a/frontend/tet/youth/src/__tests__/show.test.tsx
+++ b/frontend/tet/youth/src/__tests__/show.test.tsx
@@ -3,8 +3,6 @@ import React from 'react';
 import renderComponent from 'tet/youth/__tests__/utils/components/render-component';
 import ShowPostingPage from 'tet/youth/pages';
 
-jest.mock('next/router');
-
 describe('frontend/tet/youth/src/pages/postings/show.tsx', () => {
   beforeAll(() => {
     Object.defineProperty(window, 'matchMedia', {
diff --git a/frontend/tet/youth/src/pages/postings.tsx b/frontend/tet/youth/src/pages/postings.tsx
index cb4e0ec449..3263c14620 100644
--- a/frontend/tet/youth/src/pages/postings.tsx
+++ b/frontend/tet/youth/src/pages/postings.tsx
@@ -1,21 +1,14 @@
 import type { NextPage } from 'next';
 import { GetStaticProps } from 'next';
-import Script from 'next/script';
 import React from 'react';
 import getServerSideTranslations from 'shared/i18n/get-server-side-translations';
 import JobPostings from 'tet/youth/components/jobPostings/JobPostings';
 import HeaderLinks from 'tet-shared/components/HeaderLinks';
-import MapScripts from 'tet-shared/components/MapScripts';
 
 const Postings: NextPage = () => (
   <>
     <HeaderLinks />
     <JobPostings />
-    <MapScripts />
-    <Script
-      src="https://unpkg.com/react-leaflet-markercluster/src/react-leaflet-markercluster.js"
-      strategy="beforeInteractive"
-    />
   </>
 );
 
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 4fde9cd69e..a98252b515 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -17,13 +17,6 @@
     axe-core "^4.4.1"
     requestidlecallback "^0.3.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.12.13", "@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"
@@ -244,7 +237,7 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-validator-identifier@^7.14.9", "@babel/helper-validator-identifier@^7.15.7", "@babel/helper-validator-identifier@^7.16.7":
+"@babel/helper-validator-identifier@^7.15.7", "@babel/helper-validator-identifier@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
   integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
@@ -273,7 +266,7 @@
     "@babel/traverse" "^7.17.3"
     "@babel/types" "^7.17.0"
 
-"@babel/highlight@^7.10.4", "@babel/highlight@^7.16.7":
+"@babel/highlight@^7.16.7":
   version "7.16.10"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88"
   integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==
@@ -512,13 +505,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz#000e2e25d8673cce49300517a3eda44c263e4201"
-  integrity sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
 "@babel/plugin-syntax-jsx@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz#50b6571d13f764266a113d77c82b4a6508bbe665"
@@ -1037,24 +1023,17 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@7.15.3":
-  version "7.15.3"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz#2e1c2880ca118e5b2f9988322bd8a7656a32502b"
-  integrity sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.17", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
   version "7.17.8"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz#3e56e4aff81befa55ac3ac6a0967349fd1c5bca2"
   integrity sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.20.13":
-  version "7.22.3"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.3.tgz#0a7fce51d43adbf0f7b517a71f4c3aaca92ebcbb"
-  integrity sha512-XsDuspWKLUsxwCp6r7EhsExHtYfbe5oAGQ19kqngTdCPUoPQzOPdUbD/pB9PJiwb2ptYKQDjSJT3R6dC+EPqfQ==
+"@babel/runtime@^7.20.13", "@babel/runtime@^7.20.6":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673"
+  integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==
   dependencies:
     regenerator-runtime "^0.13.11"
 
@@ -1083,14 +1062,6 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@7.15.0":
-  version "7.15.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.0.tgz#61af11f2286c4e9c69ca8deb5f4375a73c72dcbd"
-  integrity sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.14.9"
-    to-fast-properties "^2.0.0"
-
 "@babel/types@^7.0.0", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
   version "7.17.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
@@ -1268,6 +1239,11 @@
   dependencies:
     "@cspotcode/source-map-consumer" "0.8.0"
 
+"@devexpress/bin-v8-flags-filter@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@devexpress/bin-v8-flags-filter/-/bin-v8-flags-filter-1.3.0.tgz#3069f2525c0c5fb940810e9ec10fc592c47552db"
+  integrity sha512-LWLNfYGwVJKYpmHUDoODltnlqxdEAl5Qmw7ha1+TSpsABeF94NKSWkQTTV1TB4CM02j2pZyqn36nHgaFl8z7qw==
+
 "@devexpress/error-stack-parser@^2.0.6":
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/@devexpress/error-stack-parser/-/error-stack-parser-2.0.6.tgz#a7c32e54583566bc6abf153c32a8b86d87d1e490"
@@ -1275,6 +1251,18 @@
   dependencies:
     stackframe "^1.1.1"
 
+"@electron/asar@^3.2.3":
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.3.tgz#f598db50061ae5f90ad651f0255366b4e818000e"
+  integrity sha512-wmOfE6szYyqZhRIiLH+eyZEp+bGcJI0OD/SCvSUrfBE0jvauyGYO2ZhpWxmNCcDojKu5DYrsVqT5BOCZZ01XIg==
+  dependencies:
+    chromium-pickle-js "^0.2.0"
+    commander "^5.0.0"
+    glob "^7.1.6"
+    minimatch "^3.0.4"
+  optionalDependencies:
+    "@types/glob" "^7.1.1"
+
 "@emotion/is-prop-valid@^1.1.0":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz#34ad6e98e871aa6f7a20469b602911b8b11b3a95"
@@ -1381,26 +1369,6 @@
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@hapi/accept@5.0.2":
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/@hapi/accept/-/accept-5.0.2.tgz#ab7043b037e68b722f93f376afb05e85c0699523"
-  integrity sha512-CmzBx/bXUR8451fnZRuZAJRlzgm0Jgu5dltTX/bszmR2lheb9BpyN47Q1RbaGTsvFzn0PXAEs+lXDKfshccYZw==
-  dependencies:
-    "@hapi/boom" "9.x.x"
-    "@hapi/hoek" "9.x.x"
-
-"@hapi/boom@9.x.x":
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.4.tgz#1f9dad367c6a7da9f8def24b4a986fc5a7bd9db6"
-  integrity sha512-Ls1oH8jaN1vNsqcaHVYJrKmgMcKsC1wcp8bujvXrHaAqD2iDYq3HoOwsxwo09Cuda5R5nC0o0IxlrlTuvPuzSw==
-  dependencies:
-    "@hapi/hoek" "9.x.x"
-
-"@hapi/hoek@9.x.x":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17"
-  integrity sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw==
-
 "@humanwhocodes/config-array@^0.9.2":
   version "0.9.5"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7"
@@ -2330,76 +2298,82 @@
   resolved "https://registry.yarnpkg.com/@miherlosev/esm/-/esm-3.2.26.tgz#a516b35d8b8b4eac29598f1c2c23e30a4d260200"
   integrity sha512-TaW4jTGVE1/ln2VGFChnheMh589QCAZy1MVnLvjjSzZ4pEAa4WYAWPwFkDVZbSdPQdLfZy7LuTyZjWRkhX9/Gg==
 
-"@napi-rs/triples@^1.0.3":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@napi-rs/triples/-/triples-1.1.0.tgz#88c35b72e79a20b79bb4c9b3e2817241a1c9f4f9"
-  integrity sha512-XQr74QaLeMiqhStEhLn1im9EOMnkypp7MZOwQhGzqp2Weu5eQJbpPxWxixxlYRKWPOmJjsk6qYfYH9kq43yc2w==
-
-"@next/env@11.1.4":
-  version "11.1.4"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-11.1.4.tgz#ff6090c2c38ca08e7d73eed616ff0899dd3fcc41"
-  integrity sha512-vEW+fSulzZams4nYmcX9LByb1moMBlkwOAVf0eF+44u+1N/h7HDeznPBWIjEfihzTku8rdLB0k7u8VT8AGtNkQ==
+"@next/env@12.3.4":
+  version "12.3.4"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-12.3.4.tgz#c787837d36fcad75d72ff8df6b57482027d64a47"
+  integrity sha512-H/69Lc5Q02dq3o+dxxy5O/oNxFsZpdL6WREtOOtOM1B/weonIwDXkekr1KV5DPVPr12IHFPrMrcJQ6bgPMfn7A==
 
-"@next/eslint-plugin-next@11.1.4", "@next/eslint-plugin-next@^11.1.4":
-  version "11.1.4"
-  resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-11.1.4.tgz#032f89b11d5a0b91748209a137e4e46294d269c2"
-  integrity sha512-E0iM++lWF2uOEBSRWSIg9sl3xXWvYSGP6tvUVKdeNNIiEAWwcZzs0OqxeO7Xq3BZ5XkQREEGiAUkzfCqDze5TQ==
+"@next/eslint-plugin-next@12.3.4", "@next/eslint-plugin-next@^12.2.6":
+  version "12.3.4"
+  resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-12.3.4.tgz#e7dc00e2e89ed361f111d687b8534483ec15518b"
+  integrity sha512-BFwj8ykJY+zc1/jWANsDprDIu2MgwPOIKxNVnrKvPs+f5TPegrVnem8uScND+1veT4B7F6VeqgaNLFW1Hzl9Og==
   dependencies:
     glob "7.1.7"
 
-"@next/polyfill-module@11.1.4":
-  version "11.1.4"
-  resolved "https://registry.yarnpkg.com/@next/polyfill-module/-/polyfill-module-11.1.4.tgz#9b4a4ccf3a783244c132bfb2d04d3980dcd3d4c1"
-  integrity sha512-CY3bOSQf9Dy3+34dFjFbOdg3DRXIGfujb54D/AVO83ajyQczRZ3xdU0i5VV0eSR6B56ktVy3/aelOffpTUq6LA==
-
-"@next/react-dev-overlay@11.1.4":
-  version "11.1.4"
-  resolved "https://registry.yarnpkg.com/@next/react-dev-overlay/-/react-dev-overlay-11.1.4.tgz#a0b911e799389b4ca6a30fb129c49071150c7a22"
-  integrity sha512-8/9JflJwRXEvVb6cKCWgRTOmALzDJHpWD5diRbtXWsllqxcMBjtscgnO4PaK+9QyZnSYSUbn0zZUZvxOXOTE1Q==
-  dependencies:
-    "@babel/code-frame" "7.12.11"
-    anser "1.4.9"
-    chalk "4.0.0"
-    classnames "2.2.6"
-    css.escape "1.5.1"
-    data-uri-to-buffer "3.0.1"
-    platform "1.3.6"
-    shell-quote "1.7.2"
-    source-map "0.8.0-beta.0"
-    stacktrace-parser "0.1.10"
-    strip-ansi "6.0.0"
-
-"@next/react-refresh-utils@11.1.4":
-  version "11.1.4"
-  resolved "https://registry.yarnpkg.com/@next/react-refresh-utils/-/react-refresh-utils-11.1.4.tgz#08d3427b7a97f225d3cf31ee8605722c267176c0"
-  integrity sha512-jTme207yEV4On9Gk0QJYK2N3kfKVBx17lLOL3qSjqNbqk1TnE51xvzogOCQXNABbzQlBY+J/NN+eylPS4QOKwA==
-
-"@next/swc-darwin-arm64@11.1.4":
-  version "11.1.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-11.1.4.tgz#6a3d80e7cac3e83746adbe98ed1e78ea9baa504f"
-  integrity sha512-jt8dMtIRWnJjRYLid6NWCxXzXdpr9VFT/vhDp8ioh+TtOR0UKPHMxei6R4GA3RqoyPEfFcSNmkG7OtyqCSxNIw==
-
-"@next/swc-darwin-x64@11.1.4":
-  version "11.1.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-11.1.4.tgz#bd548cf3fb3dc5e79a54b330f14e4b7b8a4e1320"
-  integrity sha512-5i9tOQNO8kawwggHvQUVR3a5KzIGaE2dw1g1kL//z/N840djvGseHrJSFEGdP1c35gM+dSGPpAKHmeBKrwHM8g==
-
-"@next/swc-linux-x64-gnu@11.1.4":
-  version "11.1.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-11.1.4.tgz#967c92aa0d9d6bc9414bbff9395c85c7755ba9d1"
-  integrity sha512-QfVuXugxBkCUHN9yD/VZ1xqszcMlBDj6vrbRiQvmWuyNo39ON6HqGn3jDwVrTHc9oKo2a0XInm+0zEnQeDmjSw==
-
-"@next/swc-win32-x64-msvc@11.1.4":
-  version "11.1.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-11.1.4.tgz#370c310ba197e799235492bf71084d3acbbb2c6a"
-  integrity sha512-7MPXYWsCo5qGZXyyJwBLvQkYi0hKARtpjGxjt/mdxn7A7O+jKJgAuxgOo/lnZIiXfbJzxRnSD8k6WkUwN0IVmg==
-
-"@node-rs/helper@1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@node-rs/helper/-/helper-1.2.1.tgz#e079b05f21ff4329d82c4e1f71c0290e4ecdc70c"
-  integrity sha512-R5wEmm8nbuQU0YGGmYVjEc0OHtYsuXdpRG+Ut/3wZ9XAvQWyThN08bTh2cBJgoZxHQUPtvRfeQuxcAgLuiBISg==
-  dependencies:
-    "@napi-rs/triples" "^1.0.3"
+"@next/swc-android-arm-eabi@12.3.4":
+  version "12.3.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.3.4.tgz#fd1c2dafe92066c6120761c6a39d19e666dc5dd0"
+  integrity sha512-cM42Cw6V4Bz/2+j/xIzO8nK/Q3Ly+VSlZJTa1vHzsocJRYz8KT6MrreXaci2++SIZCF1rVRCDgAg5PpqRibdIA==
+
+"@next/swc-android-arm64@12.3.4":
+  version "12.3.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-android-arm64/-/swc-android-arm64-12.3.4.tgz#11a146dae7b8bca007239b21c616e83f77b19ed4"
+  integrity sha512-5jf0dTBjL+rabWjGj3eghpLUxCukRhBcEJgwLedewEA/LJk2HyqCvGIwj5rH+iwmq1llCWbOky2dO3pVljrapg==
+
+"@next/swc-darwin-arm64@12.3.4":
+  version "12.3.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.3.4.tgz#14ac8357010c95e67327f47082af9c9d75d5be79"
+  integrity sha512-DqsSTd3FRjQUR6ao0E1e2OlOcrF5br+uegcEGPVonKYJpcr0MJrtYmPxd4v5T6UCJZ+XzydF7eQo5wdGvSZAyA==
+
+"@next/swc-darwin-x64@12.3.4":
+  version "12.3.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-12.3.4.tgz#e7dc63cd2ac26d15fb84d4d2997207fb9ba7da0f"
+  integrity sha512-PPF7tbWD4k0dJ2EcUSnOsaOJ5rhT3rlEt/3LhZUGiYNL8KvoqczFrETlUx0cUYaXe11dRA3F80Hpt727QIwByQ==
+
+"@next/swc-freebsd-x64@12.3.4":
+  version "12.3.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-freebsd-x64/-/swc-freebsd-x64-12.3.4.tgz#fe7ceec58746fdf03f1fcb37ec1331c28e76af93"
+  integrity sha512-KM9JXRXi/U2PUM928z7l4tnfQ9u8bTco/jb939pdFUHqc28V43Ohd31MmZD1QzEK4aFlMRaIBQOWQZh4D/E5lQ==
+
+"@next/swc-linux-arm-gnueabihf@12.3.4":
+  version "12.3.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.3.4.tgz#d7016934d02bfc8bd69818ffb0ae364b77b17af7"
+  integrity sha512-3zqD3pO+z5CZyxtKDTnOJ2XgFFRUBciOox6EWkoZvJfc9zcidNAQxuwonUeNts6Xbm8Wtm5YGIRC0x+12YH7kw==
+
+"@next/swc-linux-arm64-gnu@12.3.4":
+  version "12.3.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.3.4.tgz#43a7bc409b03487bff5beb99479cacdc7bd29af5"
+  integrity sha512-kiX0vgJGMZVv+oo1QuObaYulXNvdH/IINmvdZnVzMO/jic/B8EEIGlZ8Bgvw8LCjH3zNVPO3mGrdMvnEEPEhKA==
+
+"@next/swc-linux-arm64-musl@12.3.4":
+  version "12.3.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.3.4.tgz#4d1db6de6dc982b974cd1c52937111e3e4a34bd3"
+  integrity sha512-EETZPa1juczrKLWk5okoW2hv7D7WvonU+Cf2CgsSoxgsYbUCZ1voOpL4JZTOb6IbKMDo6ja+SbY0vzXZBUMvkQ==
+
+"@next/swc-linux-x64-gnu@12.3.4":
+  version "12.3.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.3.4.tgz#c3b414d77bab08b35f7dd8943d5586f0adb15e38"
+  integrity sha512-4csPbRbfZbuWOk3ATyWcvVFdD9/Rsdq5YHKvRuEni68OCLkfy4f+4I9OBpyK1SKJ00Cih16NJbHE+k+ljPPpag==
+
+"@next/swc-linux-x64-musl@12.3.4":
+  version "12.3.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.3.4.tgz#187a883ec09eb2442a5ebf126826e19037313c61"
+  integrity sha512-YeBmI+63Ro75SUiL/QXEVXQ19T++58aI/IINOyhpsRL1LKdyfK/35iilraZEFz9bLQrwy1LYAR5lK200A9Gjbg==
+
+"@next/swc-win32-arm64-msvc@12.3.4":
+  version "12.3.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.3.4.tgz#89befa84e453ed2ef9a888f375eba565a0fde80b"
+  integrity sha512-Sd0qFUJv8Tj0PukAYbCCDbmXcMkbIuhnTeHm9m4ZGjCf6kt7E/RMs55Pd3R5ePjOkN7dJEuxYBehawTR/aPDSQ==
+
+"@next/swc-win32-ia32-msvc@12.3.4":
+  version "12.3.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.3.4.tgz#cb50c08f0e40ead63642a7f269f0c8254261f17c"
+  integrity sha512-rt/vv/vg/ZGGkrkKcuJ0LyliRdbskQU+91bje+PgoYmxTZf/tYs6IfbmgudBJk6gH3QnjHWbkphDdRQrseRefQ==
+
+"@next/swc-win32-x64-msvc@12.3.4":
+  version "12.3.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.3.4.tgz#d28ea15a72cdcf96201c60a43e9630cd7fda168f"
+  integrity sha512-DQ20JEfTBZAgF8QCjYfJhv2/279M6onxFjdG/+5B0Cyj00/EdBxiWb2eGGFgQhrBbNv/lsvzFbbi0Ptf8Vw/bg==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -2896,10 +2870,10 @@
     estree-walker "^2.0.1"
     picomatch "^2.2.2"
 
-"@rushstack/eslint-patch@^1.0.6":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.1.1.tgz#782fa5da44c4f38ae9fd38e9184b54e451936118"
-  integrity sha512-BUyKJGdDWqvWC5GEhyOiUrGNi9iJUr4CU0O2WxJL6QJhHeeA/NVBalH+FeK0r/x/W0rPymXt5s78TDS7d6lCwg==
+"@rushstack/eslint-patch@^1.1.3":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz#8be36a1f66f3265389e90b5f9c9962146758f728"
+  integrity sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==
 
 "@sentry/browser@7.16.0", "@sentry/browser@^7.16.0":
   version "7.16.0"
@@ -3029,6 +3003,13 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
+"@swc/helpers@0.4.11":
+  version "0.4.11"
+  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.4.11.tgz#db23a376761b3d31c26502122f349a21b592c8de"
+  integrity sha512-rEUrBSGIoSFuYxwBYtlUFMlE2CwGhmW+w9355/5oduSw8e5h2+Tj4UrAGNNgP9915++wj5vkQo0UuOBqOAq4nw==
+  dependencies:
+    tslib "^2.4.0"
+
 "@swc/helpers@^0.4.2":
   version "0.4.14"
   resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.4.14.tgz#1352ac6d95e3617ccb7c1498ff019654f1e12a74"
@@ -3336,10 +3317,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.47.tgz#ca9237d51f2a2557419688511dab1c8daf475188"
   integrity sha512-BzcaRsnFuznzOItW1WpQrDHM7plAa7GIDMZ6b5pnMbkqEtM/6WCOhvZar39oeMQP79gwvFUWjjptE7/KGcNqFg==
 
-"@types/node@^17.0.43":
-  version "17.0.43"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.43.tgz#7f16898cdd791c9d64069000ad448b47b3ca8353"
-  integrity sha512-jnUpgw8fL9kP2iszfIDyBQtw5Mf4/XSqy0Loc1J9pI14ejL83XcCEvSf50Gs/4ET0I9VCCDoOfufQysj0S66xA==
+"@types/node@^18.16.0":
+  version "18.16.3"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.3.tgz#6bda7819aae6ea0b386ebc5b24bdf602f1b42b01"
+  integrity sha512-OPs5WnnT1xkCBiuQrZA4+YAV4HEJejmHneyraIaxsbev5yCEr6KMwINNFP9wQeFIw8FWcoTqF3vQsa5CDaI+8Q==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.1"
@@ -3505,15 +3486,15 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@^4.20.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.33.0.tgz#dfe797570d9694e560528d18eecad86c8c744899"
-  integrity sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==
+"@typescript-eslint/parser@^5.21.0":
+  version "5.57.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.57.0.tgz#f675bf2cd1a838949fd0de5683834417b757e4fa"
+  integrity sha512-orrduvpWYkgLCyAdNtR1QIWovcNZlEm6yL8nwH/eTxWLd8gsP+25pdLHYzL2QdkqrieaDwLpytHqycncv0woUQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "4.33.0"
-    "@typescript-eslint/types" "4.33.0"
-    "@typescript-eslint/typescript-estree" "4.33.0"
-    debug "^4.3.1"
+    "@typescript-eslint/scope-manager" "5.57.0"
+    "@typescript-eslint/types" "5.57.0"
+    "@typescript-eslint/typescript-estree" "5.57.0"
+    debug "^4.3.4"
 
 "@typescript-eslint/parser@^5.9.1":
   version "5.17.0"
@@ -3525,14 +3506,6 @@
     "@typescript-eslint/typescript-estree" "5.17.0"
     debug "^4.3.2"
 
-"@typescript-eslint/scope-manager@4.33.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz#d38e49280d983e8772e29121cf8c6e9221f280a3"
-  integrity sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==
-  dependencies:
-    "@typescript-eslint/types" "4.33.0"
-    "@typescript-eslint/visitor-keys" "4.33.0"
-
 "@typescript-eslint/scope-manager@5.17.0":
   version "5.17.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.17.0.tgz#4cea7d0e0bc0e79eb60cad431c89120987c3f952"
@@ -3549,6 +3522,14 @@
     "@typescript-eslint/types" "5.28.0"
     "@typescript-eslint/visitor-keys" "5.28.0"
 
+"@typescript-eslint/scope-manager@5.57.0":
+  version "5.57.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.57.0.tgz#79ccd3fa7bde0758059172d44239e871e087ea36"
+  integrity sha512-NANBNOQvllPlizl9LatX8+MHi7bx7WGIWYjPHDmQe5Si/0YEYfxSljJpoTyTWFTgRy3X8gLYSE4xQ2U+aCozSw==
+  dependencies:
+    "@typescript-eslint/types" "5.57.0"
+    "@typescript-eslint/visitor-keys" "5.57.0"
+
 "@typescript-eslint/type-utils@5.28.0":
   version "5.28.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.28.0.tgz#53ccc78fdcf0205ef544d843b84104c0e9c7ca8e"
@@ -3558,11 +3539,6 @@
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@4.33.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72"
-  integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==
-
 "@typescript-eslint/types@5.17.0":
   version "5.17.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.17.0.tgz#861ec9e669ffa2aa9b873dd4d28d9b1ce26d216f"
@@ -3573,18 +3549,10 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.28.0.tgz#cffd9bcdce28db6daaa146e48a0be4387a6f4e9d"
   integrity sha512-2OOm8ZTOQxqkPbf+DAo8oc16sDlVR5owgJfKheBkxBKg1vAfw2JsSofH9+16VPlN9PWtv8Wzhklkqw3k/zCVxA==
 
-"@typescript-eslint/typescript-estree@4.33.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz#0dfb51c2908f68c5c08d82aefeaf166a17c24609"
-  integrity sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==
-  dependencies:
-    "@typescript-eslint/types" "4.33.0"
-    "@typescript-eslint/visitor-keys" "4.33.0"
-    debug "^4.3.1"
-    globby "^11.0.3"
-    is-glob "^4.0.1"
-    semver "^7.3.5"
-    tsutils "^3.21.0"
+"@typescript-eslint/types@5.57.0":
+  version "5.57.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.57.0.tgz#727bfa2b64c73a4376264379cf1f447998eaa132"
+  integrity sha512-mxsod+aZRSyLT+jiqHw1KK6xrANm19/+VFALVFP5qa/aiJnlP38qpyaTd0fEKhWvQk6YeNZ5LGwI1pDpBRBhtQ==
 
 "@typescript-eslint/typescript-estree@5.17.0", "@typescript-eslint/typescript-estree@^5.13.0":
   version "5.17.0"
@@ -3612,6 +3580,19 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
+"@typescript-eslint/typescript-estree@5.57.0":
+  version "5.57.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.57.0.tgz#ebcd0ee3e1d6230e888d88cddf654252d41e2e40"
+  integrity sha512-LTzQ23TV82KpO8HPnWuxM2V7ieXW8O142I7hQTxWIHDcCEIjtkat6H96PFkYBQqGFLW/G/eVVOB9Z8rcvdY/Vw==
+  dependencies:
+    "@typescript-eslint/types" "5.57.0"
+    "@typescript-eslint/visitor-keys" "5.57.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
 "@typescript-eslint/utils@5.28.0":
   version "5.28.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.28.0.tgz#b27a136eac300a48160b36d2aad0da44a1341b99"
@@ -3636,14 +3617,6 @@
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/visitor-keys@4.33.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz#2a22f77a41604289b7a186586e9ec48ca92ef1dd"
-  integrity sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==
-  dependencies:
-    "@typescript-eslint/types" "4.33.0"
-    eslint-visitor-keys "^2.0.0"
-
 "@typescript-eslint/visitor-keys@5.17.0":
   version "5.17.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.17.0.tgz#52daae45c61b0211b4c81b53a71841911e479128"
@@ -3660,6 +3633,14 @@
     "@typescript-eslint/types" "5.28.0"
     eslint-visitor-keys "^3.3.0"
 
+"@typescript-eslint/visitor-keys@5.57.0":
+  version "5.57.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.57.0.tgz#e2b2f4174aff1d15eef887ce3d019ecc2d7a8ac1"
+  integrity sha512-ery2g3k0hv5BLiKpPuwYt9KBkAp2ugT6VvyShXdLOkax895EC55sP0Tx5L0fZaQueiK3fBLvHVvEl3jFS5ia+g==
+  dependencies:
+    "@typescript-eslint/types" "5.57.0"
+    eslint-visitor-keys "^3.3.0"
+
 "@xobotyi/scrollbar-width@^1.9.5":
   version "1.9.5"
   resolved "https://registry.yarnpkg.com/@xobotyi/scrollbar-width/-/scrollbar-width-1.9.5.tgz#80224a6919272f405b87913ca13b92929bdf3c4d"
@@ -3787,11 +3768,6 @@ amdefine@>=0.0.4:
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
   integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
-anser@1.4.9:
-  version "1.4.9"
-  resolved "https://registry.yarnpkg.com/anser/-/anser-1.4.9.tgz#1f85423a5dcf8da4631a341665ff675b96845760"
-  integrity sha512-AI+BjTeGt2+WFk4eWcqbQ7snZpDBt8SaLlj0RT2h5xfdWaiy51OjYvqwMrNzJLGy8iOAL6nKDITWO+rd4MkYEA==
-
 ansi-escapes@^4.2.1, ansi-escapes@^4.3.0, ansi-escapes@^4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
@@ -3843,7 +3819,7 @@ any-promise@^1.0.0:
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
   integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==
 
-anymatch@^3.0.3, anymatch@~3.1.1:
+anymatch@^3.0.3:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
   integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
@@ -3907,6 +3883,14 @@ 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==
 
+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-differ@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-3.0.0.tgz#3cbb3d0f316810eafcc47624734237d6aee4ae6b"
@@ -3938,6 +3922,17 @@ array-includes@^3.1.4:
     get-intrinsic "^1.1.1"
     is-string "^1.0.7"
 
+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"
@@ -3964,6 +3959,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.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz#908dc82d8a406930fdf38598d51e7411d18d4446"
@@ -3973,6 +3978,27 @@ array.prototype.flatmap@^1.2.5:
     define-properties "^1.1.3"
     es-abstract "^1.19.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"
+
 arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -4003,16 +4029,6 @@ asar@^2.0.1:
   optionalDependencies:
     "@types/glob" "^7.1.1"
 
-asn1.js@^5.2.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
-  integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==
-  dependencies:
-    bn.js "^4.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-    safer-buffer "^2.1.0"
-
 asn1@~0.2.3:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
@@ -4025,24 +4041,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=
 
-assert@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-2.0.0.tgz#95fc1c616d48713510680f2eaf2d10dd22e02d32"
-  integrity sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==
-  dependencies:
-    es6-object-assign "^1.1.0"
-    is-nan "^1.2.1"
-    object-is "^1.0.1"
-    util "^0.12.0"
-
-assert@^1.1.1:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
-  integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==
-  dependencies:
-    object-assign "^4.1.1"
-    util "0.10.3"
-
 assertion-error@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
@@ -4053,11 +4051,6 @@ ast-types-flow@^0.0.7:
   resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
   integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
 
-ast-types@0.13.2:
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.2.tgz#df39b677a911a83f3a049644fb74fdded23cea48"
-  integrity sha512-uWMHxJxtfj/1oZClOxDEV1sQ1HCDkA4MG8Gr69KKeBjEVH0R84WlejZ0y2DcwyBlpAEMltmVYkVgqfLFb2oyiA==
-
 astral-regex@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
@@ -4073,6 +4066,11 @@ async@3.2.3:
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9"
   integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==
 
+async@^3.2.0:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
+  integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -4181,6 +4179,13 @@ babel-plugin-import@^1.13.3:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/runtime" "^7.0.0"
 
+babel-plugin-import@^1.13.6:
+  version "1.13.6"
+  resolved "https://registry.yarnpkg.com/babel-plugin-import/-/babel-plugin-import-1.13.6.tgz#4ff2aa3b9759e6a4458ce59890da3684fe3dda9d"
+  integrity sha512-N7FYnGh0DFsvDRkAPsvFq/metVfVD7P2h1rokOPpEH4cZbdRHCW+2jbXt0nnuqowkm/xhh2ww1anIdEpfYa7ZA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.0.0"
+
 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"
@@ -4202,16 +4207,16 @@ babel-plugin-jest-hoist@^27.5.1:
     "@types/babel__core" "^7.0.0"
     "@types/babel__traverse" "^7.0.6"
 
-babel-plugin-module-resolver@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-4.1.0.tgz#22a4f32f7441727ec1fbf4967b863e1e3e9f33e2"
-  integrity sha512-MlX10UDheRr3lb3P0WcaIdtCSRlxdQsB1sBqL7W0raF070bGl1HQQq5K3T2vf2XAYie+ww+5AKC/WrkjRO2knA==
+babel-plugin-module-resolver@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-5.0.0.tgz#2b7fc176bd55da25f516abf96015617b4f70fc73"
+  integrity sha512-g0u+/ChLSJ5+PzYwLwP8Rp8Rcfowz58TJNCe+L/ui4rpzE/mg//JVX0EWBUYoxaextqnwuGHzfGp2hh0PPV25Q==
   dependencies:
-    find-babel-config "^1.2.0"
-    glob "^7.1.6"
+    find-babel-config "^2.0.0"
+    glob "^8.0.3"
     pkg-up "^3.1.0"
-    reselect "^4.0.0"
-    resolve "^1.13.1"
+    reselect "^4.1.7"
+    resolve "^1.22.1"
 
 babel-plugin-polyfill-corejs2@^0.3.0:
   version "0.3.1"
@@ -4289,7 +4294,7 @@ 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.0.2, base64-js@^1.1.2, base64-js@^1.3.0, base64-js@^1.3.1:
+base64-js@^1.1.2, 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==
@@ -4311,21 +4316,6 @@ big-integer@^1.6.16:
   resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686"
   integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==
 
-big.js@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
-  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
-
-bin-v8-flags-filter@^1.1.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/bin-v8-flags-filter/-/bin-v8-flags-filter-1.2.0.tgz#023fc4ee22999b2b1f6dd1b7253621366841537e"
-  integrity sha512-g8aeYkY7GhyyKRvQMBsJQZjhm2iCX3dKYvfrMpwVR8IxmUGrkpCBFoKbB9Rh0o3sTLCjU/1tFpZ4C7j3f+D+3g==
-
-binary-extensions@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
-  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
-
 bl@^4.0.3:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
@@ -4340,16 +4330,6 @@ bluebird@^3.5.0:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
-  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
-
-bn.js@^5.0.0, bn.js@^5.1.1:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002"
-  integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==
-
 body-parser@1.19.2:
   version "1.19.2"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e"
@@ -4384,7 +4364,14 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^3.0.2, braces@~3.0.2:
+brace-expansion@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  dependencies:
+    balanced-match "^1.0.0"
+
+braces@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -4405,11 +4392,6 @@ broadcast-channel@^3.4.1:
     rimraf "3.0.2"
     unload "2.2.0"
 
-brorand@^1.0.1, brorand@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
-  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
-
 brotli@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/brotli/-/brotli-1.3.2.tgz#525a9cad4fcba96475d7d388f6aecb13eed52f46"
@@ -4429,78 +4411,13 @@ browser-process-hrtime@^1.0.0:
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
-browserify-aes@^1.0.0, browserify-aes@^1.0.4:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
-  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
-  dependencies:
-    buffer-xor "^1.0.3"
-    cipher-base "^1.0.0"
-    create-hash "^1.1.0"
-    evp_bytestokey "^1.0.3"
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-browserify-cipher@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
-  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
-  dependencies:
-    browserify-aes "^1.0.4"
-    browserify-des "^1.0.0"
-    evp_bytestokey "^1.0.0"
-
-browserify-des@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
-  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
-  dependencies:
-    cipher-base "^1.0.1"
-    des.js "^1.0.0"
-    inherits "^2.0.1"
-    safe-buffer "^5.1.2"
-
-browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
-  integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
-  dependencies:
-    bn.js "^5.0.0"
-    randombytes "^2.0.1"
-
-browserify-sign@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"
-  integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==
-  dependencies:
-    bn.js "^5.1.1"
-    browserify-rsa "^4.0.1"
-    create-hash "^1.2.0"
-    create-hmac "^1.1.7"
-    elliptic "^6.5.3"
-    inherits "^2.0.4"
-    parse-asn1 "^5.1.5"
-    readable-stream "^3.6.0"
-    safe-buffer "^5.2.0"
-
-browserify-zlib@0.2.0, browserify-zlib@^0.2.0:
+browserify-zlib@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
   integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
   dependencies:
     pako "~1.0.5"
 
-browserslist@4.16.6:
-  version "4.16.6"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
-  integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
-  dependencies:
-    caniuse-lite "^1.0.30001219"
-    colorette "^1.2.2"
-    electron-to-chromium "^1.3.723"
-    escalade "^3.1.1"
-    node-releases "^1.1.71"
-
 browserslist@^4.17.5, browserslist@^4.19.1:
   version "4.20.2"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88"
@@ -4536,28 +4453,6 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-buffer-xor@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
-  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
-
-buffer@5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz#a31749dc7d81d84db08abf937b6b8c4033f62786"
-  integrity sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==
-  dependencies:
-    base64-js "^1.0.2"
-    ieee754 "^1.1.4"
-
-buffer@^4.3.0:
-  version "4.9.2"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
-  integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
-  dependencies:
-    base64-js "^1.0.2"
-    ieee754 "^1.1.4"
-    isarray "^1.0.0"
-
 buffer@^5.5.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
@@ -4571,11 +4466,6 @@ builtin-modules@^3.0.0:
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887"
   integrity sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==
 
-builtin-status-codes@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
-  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
-
 builtins@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
@@ -4591,11 +4481,6 @@ byte-size@^7.0.0:
   resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-7.0.1.tgz#b1daf3386de7ab9d706b941a748dbfc71130dee3"
   integrity sha512-crQdqyCwhokxwV1UyDzLZanhkugAgft7vt0qbbdt60C6Zf3CAiGmtUCylbtYwrU6loOUw3euGrNtW1J651ot1A==
 
-bytes@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
-  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
-
 bytes@3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
@@ -4691,11 +4576,16 @@ camelize@^1.0.0:
   resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b"
   integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=
 
-caniuse-lite@^1.0.30001202, caniuse-lite@^1.0.30001219, caniuse-lite@^1.0.30001228, caniuse-lite@^1.0.30001317:
+caniuse-lite@^1.0.30001317:
   version "1.0.30001325"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001325.tgz#2b4ad19b77aa36f61f2eaf72e636d7481d55e606"
   integrity sha512-sB1bZHjseSjDtijV1Hb7PB2Zd58Kyx+n/9EotvZ4Qcz2K3d0lWB8dB4nb8wN/TsOGFq3UuAm0zQZNQ4SoR7TrQ==
 
+caniuse-lite@^1.0.30001406:
+  version "1.0.30001472"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001472.tgz#3f484885f2a2986c019dc416e65d9d62798cdd64"
+  integrity sha512-xWC/0+hHHQgj3/vrKYY0AAzeIUgr7L9wlELIcAvZdDUHlhL/kNxMdnQLOSOQfP8R51ZzPhmHdyMkI0MMpmxCfg==
+
 canvas@^2.11.2:
   version "2.11.2"
   resolved "https://registry.yarnpkg.com/canvas/-/canvas-2.11.2.tgz#553d87b1e0228c7ac0fc72887c3adbac4abbd860"
@@ -4722,15 +4612,6 @@ chai@4.3.4:
     pathval "^1.1.1"
     type-detect "^4.0.5"
 
-chalk@2.4.2, chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.0, chalk@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
 chalk@3.0.0, chalk@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
@@ -4739,14 +4620,6 @@ chalk@3.0.0, chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.0.0.tgz#6e98081ed2d17faab615eb52ac66ec1fe6209e72"
-  integrity sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
 chalk@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
@@ -4755,6 +4628,15 @@ chalk@4.1.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.0, chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    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"
@@ -4798,21 +4680,6 @@ check-error@^1.0.2:
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
   integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=
 
-chokidar@3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
-  integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
-  dependencies:
-    anymatch "~3.1.1"
-    braces "~3.0.2"
-    glob-parent "~5.1.0"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.5.0"
-  optionalDependencies:
-    fsevents "~2.3.1"
-
 chownr@^1.1.1, chownr@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
@@ -4823,10 +4690,10 @@ chownr@^2.0.0:
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
   integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
 
-chrome-remote-interface@^0.30.0:
-  version "0.30.1"
-  resolved "https://registry.yarnpkg.com/chrome-remote-interface/-/chrome-remote-interface-0.30.1.tgz#8b30a0a36274137b31536f6436ca52f32ae5cbba"
-  integrity sha512-emKaqCjYAgrT35nm6PvTUKJ++2NX9qAmrcNRPRGyryG9Kc7wlkvO0bmvEdNMrr8Bih2e149WctJZFzUiM1UNwg==
+chrome-remote-interface@^0.32.1:
+  version "0.32.1"
+  resolved "https://registry.yarnpkg.com/chrome-remote-interface/-/chrome-remote-interface-0.32.1.tgz#e3478ca712223e51c4df7294cbc536f868ca0aa6"
+  integrity sha512-CU3/K/8YlU2H0DjsLRbxPsG4piiSGUcIy6GkGXF11SqOYoIeuUBivOsGXScaZnTyC1p4wFSR+GNmAM434/ALWw==
   dependencies:
     commander "2.11.x"
     ws "^7.2.0"
@@ -4851,24 +4718,11 @@ ci-info@^3.2.0, ci-info@^3.3.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2"
   integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==
 
-cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
-  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.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.2.6:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
-  integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
-
 clean-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/clean-regexp/-/clean-regexp-1.0.0.tgz#8df7c7aae51fd36874e8f8d05b9180bc11a3fed7"
@@ -5036,11 +4890,6 @@ color@^4.2.3:
     color-convert "^2.0.1"
     color-string "^1.9.0"
 
-colorette@^1.2.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40"
-  integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==
-
 colorette@^2.0.16:
   version "2.0.16"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
@@ -5076,16 +4925,16 @@ commander@^4.0.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
+commander@^5.0.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@^8.3.0:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
-
 compare-func@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-2.0.0.tgz#fb65e75edbddfd2e568554e8b5b05fff7a51fcb3"
@@ -5136,21 +4985,11 @@ confusing-browser-globals@^1.0.10:
   resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81"
   integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==
 
-console-browserify@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
-  integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
-
 console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
-constants-browserify@1.0.0, constants-browserify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
-  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
-
 content-disposition@0.5.4:
   version "0.5.4"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
@@ -5254,13 +5093,6 @@ conventional-recommended-bump@^6.1.0:
     meow "^8.0.0"
     q "^1.5.1"
 
-convert-source-map@1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
-  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
-  dependencies:
-    safe-buffer "~5.1.1"
-
 convert-source-map@^1.4.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"
@@ -5348,14 +5180,6 @@ crc-32@1.2.0:
     exit-on-epipe "~1.0.1"
     printj "~1.1.0"
 
-create-ecdh@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
-  integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==
-  dependencies:
-    bn.js "^4.1.0"
-    elliptic "^6.5.3"
-
 create-eslint-index@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/create-eslint-index/-/create-eslint-index-1.0.0.tgz#d954372d86d5792fcd67e9f2b791b1ab162411bb"
@@ -5363,29 +5187,6 @@ create-eslint-index@^1.0.0:
   dependencies:
     lodash.get "^4.3.0"
 
-create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
-  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
-  dependencies:
-    cipher-base "^1.0.1"
-    inherits "^2.0.1"
-    md5.js "^1.3.4"
-    ripemd160 "^2.0.1"
-    sha.js "^2.4.0"
-
-create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
-  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
-  dependencies:
-    cipher-base "^1.0.3"
-    create-hash "^1.1.0"
-    inherits "^2.0.1"
-    ripemd160 "^2.0.0"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
 create-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
@@ -5414,23 +5215,6 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-crypto-browserify@3.12.0, crypto-browserify@^3.11.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
-  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
-  dependencies:
-    browserify-cipher "^1.0.0"
-    browserify-sign "^4.0.0"
-    create-ecdh "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.0"
-    diffie-hellman "^5.0.0"
-    inherits "^2.0.1"
-    pbkdf2 "^3.0.3"
-    public-encrypt "^4.0.0"
-    randombytes "^2.0.0"
-    randomfill "^1.0.3"
-
 crypto-js@^4.0.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.1.1.tgz#9e485bcf03521041bd85844786b83fb7619736cf"
@@ -5471,7 +5255,7 @@ css-tree@^1.1.2:
     mdn-data "2.0.14"
     source-map "^0.6.1"
 
-css.escape@1.5.1, css.escape@^1.5.1:
+css.escape@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"
   integrity sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=
@@ -5495,20 +5279,6 @@ css@^3.0.0:
     source-map "^0.6.1"
     source-map-resolve "^0.6.0"
 
-cssnano-preset-simple@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/cssnano-preset-simple/-/cssnano-preset-simple-3.0.2.tgz#5d9d0caf4de7a76319b8716a789bb989a028054c"
-  integrity sha512-7c6EOw3oZshKOZc20Jh+cs2dIKxp0viV043jdal/t1iGVQkoyAQio3rrFWhPgAlkXMu+PRXsslqLhosFTmLhmQ==
-  dependencies:
-    caniuse-lite "^1.0.30001202"
-
-cssnano-simple@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cssnano-simple/-/cssnano-simple-3.0.0.tgz#a4b8ccdef4c7084af97e19bc5b93b4ecf211e90f"
-  integrity sha512-oU3ueli5Dtwgh0DyeohcIEE00QVfbPR3HzyXdAl89SfnQG3y0/qcpfLVW+jPIh3/rgMZGwuW96rejZGaYE9eUg==
-  dependencies:
-    cssnano-preset-simple "^3.0.0"
-
 cssom@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
@@ -5553,11 +5323,6 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-data-uri-to-buffer@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz#594b8973938c5bc2c33046535785341abc4f3636"
-  integrity sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==
-
 data-urls@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
@@ -5587,7 +5352,7 @@ debounce@^1.2.0:
   resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
   integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
 
-debug@2, debug@2.6.9, 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==
@@ -5713,6 +5478,14 @@ define-properties@^1.1.3:
   dependencies:
     object-keys "^1.0.12"
 
+define-properties@^1.1.4:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5"
+  integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==
+  dependencies:
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
+
 del@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
@@ -5759,14 +5532,6 @@ deprecation@^2.0.0, deprecation@^2.3.1:
   resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
   integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
 
-des.js@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
-  integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==
-  dependencies:
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-
 destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
@@ -5825,15 +5590,6 @@ diff@^4.0.1, diff@^4.0.2:
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
   integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
 
-diffie-hellman@^5.0.0:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
-  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
-  dependencies:
-    bn.js "^4.1.0"
-    miller-rabin "^4.0.0"
-    randombytes "^2.0.0"
-
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -5869,16 +5625,6 @@ dom-serializer@^1.0.1:
     domhandler "^4.2.0"
     entities "^2.0.0"
 
-domain-browser@4.19.0:
-  version "4.19.0"
-  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-4.19.0.tgz#1093e17c0a17dbd521182fe90d49ac1370054af1"
-  integrity sha512-fRA+BaAWOR/yr/t7T9E9GJztHPeFjj8U35ajyAjCDtAAnTn1Rc1f6W6VGPJrO1tkQv9zWu+JRof7z6oQtiYVFQ==
-
-domain-browser@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
-  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
-
 domelementtype@^2.0.1, domelementtype@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
@@ -5984,7 +5730,7 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.723, electron-to-chromium@^1.4.84:
+electron-to-chromium@^1.4.84:
   version "1.4.103"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.103.tgz#abfe376a4d70fa1e1b4b353b95df5d6dfd05da3a"
   integrity sha512-c/uKWR1Z/W30Wy/sx3dkZoj4BijbXX85QKWu9jJfjho3LBAXNEGAEW3oWiGb+dotA6C6BzCTxL2/aLes7jlUeg==
@@ -5994,19 +5740,6 @@ elegant-spinner@^1.0.1:
   resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
   integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
 
-elliptic@^6.5.3:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
-  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
-  dependencies:
-    bn.js "^4.11.9"
-    brorand "^1.1.0"
-    hash.js "^1.0.0"
-    hmac-drbg "^1.0.1"
-    inherits "^2.0.4"
-    minimalistic-assert "^1.0.1"
-    minimalistic-crypto-utils "^1.0.1"
-
 email-validator@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/email-validator/-/email-validator-2.0.4.tgz#b8dfaa5d0dae28f1b03c95881d904d4e40bfe7ed"
@@ -6037,17 +5770,12 @@ emoji-regex@^9.2.2:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
   integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
 
-emojis-list@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
-
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
-encoding@0.1.13, encoding@^0.1.12:
+encoding@^0.1.12:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
   integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
@@ -6076,6 +5804,14 @@ enhance-visitors@^1.0.0:
   dependencies:
     lodash "^4.13.1"
 
+enhanced-resolve@^5.10.0:
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
+  integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
+  dependencies:
+    graceful-fs "^4.2.4"
+    tapable "^2.2.0"
+
 enhanced-resolve@^5.7.0:
   version "5.9.2"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz#0224dcd6a43389ebfb2d55efee517e5466772dd9"
@@ -6130,7 +5866,7 @@ error-stack-parser@^1.3.6:
   dependencies:
     stackframe "^0.3.1"
 
-es-abstract@^1.18.5, es-abstract@^1.19.0, es-abstract@^1.19.1:
+es-abstract@^1.19.0, es-abstract@^1.19.1:
   version "1.19.2"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.2.tgz#8f7b696d8f15b167ae3640b4060670f3d054143f"
   integrity sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w==
@@ -6156,27 +5892,78 @@ es-abstract@^1.18.5, es-abstract@^1.19.0, es-abstract@^1.19.1:
     string.prototype.trimstart "^1.0.4"
     unbox-primitive "^1.0.1"
 
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
+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:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
-es6-object-assign@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c"
-  integrity sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=
-
-es6-promise@^4.2.8:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
-  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
-
-escalade@^3.1.1:
-  version "3.1.1"
+    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-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"
+  integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==
+  dependencies:
+    has "^1.0.3"
+
+es-to-primitive@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
+  dependencies:
+    is-callable "^1.1.4"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.2"
+
+es6-promise@^4.2.8:
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
+  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
+
+escalade@^3.1.1:
+  version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
@@ -6275,27 +6062,27 @@ eslint-config-auto@^0.7.1:
     read-pkg-up "7.0.1"
     rimraf "^3.0.2"
 
-eslint-config-next@^11.1.4:
-  version "11.1.4"
-  resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-11.1.4.tgz#70bbc26abf26ef31e85a8eb56ec75844ff1544be"
-  integrity sha512-PD2/sxnLcI1Zy/QwKSwugzgafwymNh70Y/nPB/v+i0GOTFIl2JpLRUg9m/bQFHzi6PDeDM81w89ayFvpa2/Nxg==
-  dependencies:
-    "@next/eslint-plugin-next" "11.1.4"
-    "@rushstack/eslint-patch" "^1.0.6"
-    "@typescript-eslint/parser" "^4.20.0"
-    eslint-import-resolver-node "^0.3.4"
-    eslint-import-resolver-typescript "^2.4.0"
-    eslint-plugin-import "^2.22.1"
-    eslint-plugin-jsx-a11y "^6.4.1"
-    eslint-plugin-react "^7.23.1"
-    eslint-plugin-react-hooks "^4.2.0"
+eslint-config-next@^12.2.6:
+  version "12.3.4"
+  resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-12.3.4.tgz#3d4d9e74b919b879c4cc79c61bdc388fb2b964ee"
+  integrity sha512-WuT3gvgi7Bwz00AOmKGhOeqnyA5P29Cdyr0iVjLyfDbk+FANQKcOjFUTZIdyYfe5Tq1x4TGcmoe4CwctGvFjHQ==
+  dependencies:
+    "@next/eslint-plugin-next" "12.3.4"
+    "@rushstack/eslint-patch" "^1.1.3"
+    "@typescript-eslint/parser" "^5.21.0"
+    eslint-import-resolver-node "^0.3.6"
+    eslint-import-resolver-typescript "^2.7.1"
+    eslint-plugin-import "^2.26.0"
+    eslint-plugin-jsx-a11y "^6.5.1"
+    eslint-plugin-react "^7.31.7"
+    eslint-plugin-react-hooks "^4.5.0"
 
 eslint-config-prettier@^8.3.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-import-resolver-node@^0.3.4, eslint-import-resolver-node@^0.3.6:
+eslint-import-resolver-node@^0.3.6:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd"
   integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==
@@ -6303,7 +6090,16 @@ eslint-import-resolver-node@^0.3.4, eslint-import-resolver-node@^0.3.6:
     debug "^3.2.7"
     resolve "^1.20.0"
 
-eslint-import-resolver-typescript@^2.4.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-typescript@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.7.1.tgz#a90a4a1c80da8d632df25994c4c5fdcdd02b8751"
   integrity sha512-00UbgGwV8bSgUv34igBDbTOtKhqoRMy9bFjNehT40bXg6585PNIct8HhXZ0SybqB9rWtXj9crcku8ndDn/gIqQ==
@@ -6322,6 +6118,13 @@ eslint-module-utils@^2.7.2:
     debug "^3.2.7"
     find-up "^2.1.0"
 
+eslint-module-utils@^2.7.4:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz#4f3e41116aaf13a20792261e61d3a2e7e0583974"
+  integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==
+  dependencies:
+    debug "^3.2.7"
+
 eslint-plugin-array-func@^3.1.7:
   version "3.1.7"
   resolved "https://registry.yarnpkg.com/eslint-plugin-array-func/-/eslint-plugin-array-func-3.1.7.tgz#c47ce735eed2d9cb4129984d514898df4e0393ba"
@@ -6352,7 +6155,7 @@ eslint-plugin-html@^6.2.0:
   dependencies:
     htmlparser2 "^7.1.2"
 
-eslint-plugin-import@^2.22.1, eslint-plugin-import@^2.25.4:
+eslint-plugin-import@^2.25.4:
   version "2.25.4"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz#322f3f916a4e9e991ac7af32032c25ce313209f1"
   integrity sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==
@@ -6371,6 +6174,27 @@ eslint-plugin-import@^2.22.1, eslint-plugin-import@^2.25.4:
     resolve "^1.20.0"
     tsconfig-paths "^3.12.0"
 
+eslint-plugin-import@^2.26.0:
+  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-async@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/eslint-plugin-jest-async/-/eslint-plugin-jest-async-1.0.3.tgz#69196702d8af85655b21a789a6fd75ca0a37800f"
@@ -6402,7 +6226,7 @@ eslint-plugin-json@^3.1.0:
     lodash "^4.17.21"
     vscode-json-languageservice "^4.1.6"
 
-eslint-plugin-jsx-a11y@^6.4.1, eslint-plugin-jsx-a11y@^6.5.1:
+eslint-plugin-jsx-a11y@^6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz#cdbf2df901040ca140b6ec14715c988889c2a6d8"
   integrity sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==
@@ -6484,12 +6308,17 @@ eslint-plugin-promise@^6.0.0:
   resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-6.0.0.tgz#017652c07c9816413a41e11c30adc42c3d55ff18"
   integrity sha512-7GPezalm5Bfi/E22PnQxDWH2iW9GTvAlUNTztemeHb6c1BniSyoeTrM87JkC0wYdi6aQrZX9p2qEiAno8aTcbw==
 
-eslint-plugin-react-hooks@^4.2.0, eslint-plugin-react-hooks@^4.3.0:
+eslint-plugin-react-hooks@^4.3.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.4.0.tgz#71c39e528764c848d8253e1aa2c7024ed505f6c4"
   integrity sha512-U3RVIfdzJaeKDQKEJbz5p3NW8/L80PCATJAfuojwbaEL+gBjfGdhUcGde+WGUW46Q5sr/NgxevsIiDtNXrvZaQ==
 
-eslint-plugin-react@^7.23.1, eslint-plugin-react@^7.27.1:
+eslint-plugin-react-hooks@^4.5.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3"
+  integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==
+
+eslint-plugin-react@^7.27.1:
   version "7.29.4"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.29.4.tgz#4717de5227f55f3801a5fd51a16a4fa22b5914d2"
   integrity sha512-CVCXajliVh509PcZYRFyu/BoUEz452+jtQJq2b3Bae4v3xBUWPLCmtmBM+ZinG4MzwmxJgJ2M5rMqhqLVn7MtQ==
@@ -6509,6 +6338,27 @@ eslint-plugin-react@^7.23.1, eslint-plugin-react@^7.27.1:
     semver "^6.3.0"
     string.prototype.matchall "^4.0.6"
 
+eslint-plugin-react@^7.31.7:
+  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-plugin-scanjs-rules@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-scanjs-rules/-/eslint-plugin-scanjs-rules-0.2.1.tgz#a37403fde845df41277e03e5c2073f055d47942d"
@@ -6662,6 +6512,13 @@ esotope-hammerhead@0.6.1:
   dependencies:
     "@types/estree" "0.0.46"
 
+esotope-hammerhead@0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/esotope-hammerhead/-/esotope-hammerhead-0.6.3.tgz#0cd6f7503c7fe285daf366ff7d42a338316d59ac"
+  integrity sha512-Aq6gUznvm0xPtjpbZo9OSsRO1+m+NM0hjZOYufH3HDlJWeOZpBskR/vuP9/tiMaQFD3+ES5BQq5fAY1qOLKWUA==
+  dependencies:
+    "@types/estree" "0.0.46"
+
 espree@^9.3.1:
   version "9.3.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.1.tgz#8793b4bc27ea4c778c19908e0719e7b8f4115bcd"
@@ -6710,7 +6567,7 @@ esutils@^2.0.2:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-etag@1.8.1, etag@~1.8.1:
+etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
@@ -6733,19 +6590,11 @@ eventemitter3@^4.0.4:
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
   integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
-events@^3.0.0, events@^3.3.0:
+events@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
-evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
-  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
-  dependencies:
-    md5.js "^1.3.4"
-    safe-buffer "^5.1.1"
-
 execa@^3.3.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-3.4.0.tgz#c08ed4550ef65d858fac269ffc8572446f37eb89"
@@ -6978,22 +6827,13 @@ finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
-find-babel-config@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.2.0.tgz#a9b7b317eb5b9860cda9d54740a8c8337a2283a2"
-  integrity sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==
-  dependencies:
-    json5 "^0.5.1"
-    path-exists "^3.0.0"
-
-find-cache-dir@3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
-  integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
+find-babel-config@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-2.0.0.tgz#a8216f825415a839d0f23f4d18338a1cc966f701"
+  integrity sha512-dOKT7jvF3hGzlW60Gc3ONox/0rRZ/tz7WCil0bqA1In/3I8f1BctpXahRnEKDySZqci7u+dqq93sZST9fOJpFw==
   dependencies:
-    commondir "^1.0.1"
-    make-dir "^3.0.2"
-    pkg-dir "^4.1.0"
+    json5 "^2.1.1"
+    path-exists "^4.0.0"
 
 find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
@@ -7068,10 +6908,12 @@ fontkit@^2.0.2:
     unicode-properties "^1.4.0"
     unicode-trie "^2.0.0"
 
-foreach@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
-  integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
+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:
+    is-callable "^1.1.3"
 
 forever-agent@~0.6.1:
   version "0.6.1"
@@ -7132,6 +6974,11 @@ forwarded@0.2.0:
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
   integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
 
+fp-ts@^2.9.5:
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.13.1.tgz#1bf2b24136cca154846af16752dc29e8fa506f2a"
+  integrity sha512-0eu5ULPS2c/jsa1lGFneEFFEdTbembJv8e4QKXeVJ3lm/5hyve06dlKZrpxmMwJt6rYen7sxmHHK2CLaXvWuWQ==
+
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
@@ -7185,7 +7032,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.3.2, fsevents@~2.3.1, fsevents@~2.3.2:
+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==
@@ -7202,11 +7049,26 @@ function-double@^1.0.4:
   dependencies:
     util-arity "^1.1.0"
 
+function.prototype.name@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
+  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    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.3"
+  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
+  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
+
 fuse.js@^6.6.2:
   version "6.6.2"
   resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-6.6.2.tgz#fe463fed4b98c0226ac3da2856a415576dc9a111"
@@ -7265,12 +7127,24 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
     has "^1.0.3"
     has-symbols "^1.0.1"
 
-get-orientation@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/get-orientation/-/get-orientation-1.1.2.tgz#20507928951814f8a91ded0a0e67b29dfab98947"
-  integrity sha512-/pViTfifW+gBbh/RnlFYHINvELT9Znt+SYyDKAUL6uV6By019AK/s+i9XP4jSwq7lwP38Fd8HVeTxym3+hkwmQ==
+get-intrinsic@^1.1.3, get-intrinsic@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f"
+  integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.3"
+
+get-os-info@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/get-os-info/-/get-os-info-1.0.2.tgz#5f65df82d3fa16192d2363fc621f050f8a570864"
+  integrity sha512-Nlgt85ph6OHZ4XvTcC8LMLDDFUzf7LAinYJZUwzrnc3WiO+vDEHDmNItTtzixBDLv94bZsvJGrrDRAE6uPs4MQ==
   dependencies:
-    stream-parser "^0.3.1"
+    getos "^3.2.1"
+    macos-release "^3.0.1"
+    os-family "^1.1.0"
+    windows-release "^5.0.1"
 
 get-package-type@^0.1.0:
   version "0.1.0"
@@ -7322,6 +7196,13 @@ get-symbol-description@^1.0.0:
     call-bind "^1.0.2"
     get-intrinsic "^1.1.1"
 
+getos@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/getos/-/getos-3.2.1.tgz#0134d1f4e00eb46144c5a9c0ac4dc087cbb27dc5"
+  integrity sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==
+  dependencies:
+    async "^3.2.0"
+
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
@@ -7383,7 +7264,7 @@ github-from-package@0.0.0:
   resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
   integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=
 
-glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.0:
+glob-parent@^5.1.1, 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==
@@ -7397,11 +7278,6 @@ glob-parent@^6.0.1:
   dependencies:
     is-glob "^4.0.3"
 
-glob-to-regexp@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
-  integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
-
 glob@7.1.6:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
@@ -7438,6 +7314,17 @@ glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, gl
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^8.0.3:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
+  integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^5.0.1"
+    once "^1.3.0"
+
 global-dirs@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
@@ -7457,6 +7344,13 @@ globals@^13.6.0, globals@^13.9.0:
   dependencies:
     type-fest "^0.20.2"
 
+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:
+    define-properties "^1.1.3"
+
 globby@^10.0.1:
   version "10.0.2"
   resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543"
@@ -7471,7 +7365,7 @@ globby@^10.0.1:
     merge2 "^1.2.3"
     slash "^3.0.0"
 
-globby@^11.0.2, globby@^11.0.3, globby@^11.0.4, globby@^11.1.0:
+globby@^11.0.2, globby@^11.0.4, globby@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
   integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
@@ -7494,6 +7388,13 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+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.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
   version "4.2.9"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
@@ -7541,6 +7442,11 @@ has-bigints@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
   integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
 
+has-bigints@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
+  integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
+
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -7551,6 +7457,18 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
+has-property-descriptors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
+  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
+  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, has-symbols@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
@@ -7575,23 +7493,6 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-hash-base@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
-  integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==
-  dependencies:
-    inherits "^2.0.4"
-    readable-stream "^3.6.0"
-    safe-buffer "^5.2.0"
-
-hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
-  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
-  dependencies:
-    inherits "^2.0.3"
-    minimalistic-assert "^1.0.1"
-
 hds-core@2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/hds-core/-/hds-core-2.10.0.tgz#bbead215341313cc15591387c0a8d3f013caff4a"
@@ -7631,11 +7532,6 @@ hds-react@^2.10.0:
     react-use-measure "2.0.1"
     react-virtual "2.2.7"
 
-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-es@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/highlight-es/-/highlight-es-1.0.3.tgz#12abc300a27e686f6f18010134e3a5c6d2fe6930"
@@ -7645,16 +7541,7 @@ highlight-es@^1.0.0:
     is-es2016-keyword "^1.0.0"
     js-tokens "^3.0.0"
 
-hmac-drbg@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
-  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
-  dependencies:
-    hash.js "^1.0.3"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.1"
-
-hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.2.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
+hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.3.0, 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==
@@ -7692,7 +7579,7 @@ html-encoding-sniffer@^2.0.1:
   dependencies:
     whatwg-encoding "^1.0.5"
 
-html-escaper@^2.0.0, html-escaper@^2.0.2:
+html-escaper@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
@@ -7719,17 +7606,6 @@ http-cache-semantics@^4.1.0:
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
   integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
 
-http-errors@1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
-  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.4"
-    setprototypeof "1.1.1"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.0"
-
 http-errors@1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
@@ -7759,10 +7635,10 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-https-browserify@1.0.0, https-browserify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
-  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
+http-status-codes@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/http-status-codes/-/http-status-codes-2.2.0.tgz#bb2efe63d941dfc2be18e15f703da525169622be"
+  integrity sha512-feERVo9iWxvnejp3SEfm/+oNG517npqL2/PIA8ORjyOZjGC7TwCRQsZylciLS64i6pJ0wRYz3rkXLRwbtFa8Ng==
 
 https-proxy-agent@^5.0.0:
   version "5.0.0"
@@ -7809,17 +7685,17 @@ hyphenate-style-name@^1.0.2:
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d"
   integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==
 
-i18next-fs-backend@^1.0.7:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/i18next-fs-backend/-/i18next-fs-backend-1.1.4.tgz#d0e9b9ed2fa7a0f11002d82b9fa69c3c3d6482da"
-  integrity sha512-/MfAGMP0jHonV966uFf9PkWWuDjPYLIcsipnSO3NxpNtAgRUKLTwvm85fEmsF6hGeu0zbZiCQ3W74jwO6K9uXA==
+i18next-fs-backend@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/i18next-fs-backend/-/i18next-fs-backend-2.1.1.tgz#07c6393be856c5a398e3dfc1257bf8439841cd89"
+  integrity sha512-FTnj+UmNgT3YRml5ruRv0jMZDG7odOL/OP5PF5mOqvXud2vHrPOOs68Zdk6iqzL47cnnM0ZVkK2BAvpFeDJToA==
 
-i18next@^21.6.0, i18next@^21.6.12:
-  version "21.6.14"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-21.6.14.tgz#2bc199fba7f4da44b5952d7df0a3814a6e5c3943"
-  integrity sha512-XL6WyD+xlwQwbieXRlXhKWoLb/rkch50/rA+vl6untHnJ+aYnkQ0YDZciTWE78PPhOpbi2gR0LTJCJpiAhA+uQ==
+i18next@^22.4.13:
+  version "22.4.13"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-22.4.13.tgz#02e291ab0056eab13b7d356fb454ff991923eaa0"
+  integrity sha512-GX7flMHRRqQA0I1yGLmaZ4Hwt1JfLqagk8QPDPZsqekbKtXsuIngSVWM/s3SLgNkrEXjA+0sMGNuOEkkmyqmWg==
   dependencies:
-    "@babel/runtime" "^7.17.2"
+    "@babel/runtime" "^7.20.6"
 
 ibantools@^4.1.5:
   version "4.1.5"
@@ -7847,7 +7723,7 @@ iconv-lite@^0.6.2:
   dependencies:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
-ieee754@^1.1.13, ieee754@^1.1.4:
+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==
@@ -7864,13 +7740,6 @@ ignore@^5.0.5, ignore@^5.1.1, ignore@^5.2.0:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
   integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
 
-image-size@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.0.0.tgz#58b31fe4743b1cec0a0ac26f5c914d3c5b2f0750"
-  integrity sha512-JLJ6OwBfO1KcA+TvJT+v8gbE6iWbj24LyDNFgFEN0lzegn6cC6a/p3NIDaepMsJjQjlUWqIC7wJv8lBFxPNjcw==
-  dependencies:
-    queue "6.0.2"
-
 immediate@~3.0.5:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
@@ -7929,21 +7798,11 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3, inherits@~2.0.4:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-inherits@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
-  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
-
-inherits@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
 ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
@@ -7997,6 +7856,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"
+
 invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
@@ -8037,13 +7905,14 @@ is-alphanumerical@^1.0.0:
     is-alphabetical "^1.0.0"
     is-decimal "^1.0.0"
 
-is-arguments@^1.0.4:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
-  integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==
+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"
-    has-tostringtag "^1.0.0"
+    get-intrinsic "^1.2.0"
+    is-typed-array "^1.1.10"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
@@ -8062,13 +7931,6 @@ is-bigint@^1.0.1:
   dependencies:
     has-bigints "^1.0.1"
 
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
-  dependencies:
-    binary-extensions "^2.0.0"
-
 is-boolean-object@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
@@ -8089,6 +7951,11 @@ is-builtin-module@^3.1.0:
   dependencies:
     builtin-modules "^3.0.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"
@@ -8108,6 +7975,13 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
+is-core-module@^2.11.0, is-core-module@^2.9.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
+  integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
+  dependencies:
+    has "^1.0.3"
+
 is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.8.0, is-core-module@^2.8.1:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
@@ -8179,13 +8053,6 @@ is-generator-fn@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
-is-generator-function@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72"
-  integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
 is-get-set-prop@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-get-set-prop/-/is-get-set-prop-1.0.0.tgz#2731877e4d78a6a69edcce6bb9d68b0779e76312"
@@ -8201,7 +8068,7 @@ is-glob@^2.0.1:
   dependencies:
     is-extglob "^1.0.0"
 
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
@@ -8230,14 +8097,6 @@ is-lambda@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
   integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU=
 
-is-nan@^1.2.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d"
-  integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-
 is-negative-zero@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
@@ -8319,6 +8178,11 @@ 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-podman@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-podman/-/is-podman-1.0.1.tgz#284a7ba1e6987fff8af5d71d97a29d2a85b7996a"
+  integrity sha512-+5vbtF5FIg262iUa7gOIseIWTx0740RHiax7oSmJMhbfSoBIMQ/IacKKgfnGj65JGeH9lGEVQcdkDwhn1Em1mQ==
+
 is-potential-custom-element-name@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
@@ -8340,7 +8204,7 @@ is-regex@^1.1.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-shared-array-buffer@^1.0.1:
+is-shared-array-buffer@^1.0.1, is-shared-array-buffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
   integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
@@ -8380,15 +8244,15 @@ is-text-path@^1.0.1:
   dependencies:
     text-extensions "^1.0.0"
 
-is-typed-array@^1.1.3, is-typed-array@^1.1.7:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.8.tgz#cbaa6585dc7db43318bc5b89523ea384a6f65e79"
-  integrity sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA==
+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"
-    es-abstract "^1.18.5"
-    foreach "^2.0.5"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
     has-tostringtag "^1.0.0"
 
 is-typedarray@^1.0.0, is-typedarray@~1.0.0:
@@ -8418,7 +8282,7 @@ is-whitespace@^0.3.0:
   resolved "https://registry.yarnpkg.com/is-whitespace/-/is-whitespace-0.3.0.tgz#1639ecb1be036aec69a54cbb401cfbed7114ab7f"
   integrity sha1-Fjnssb4DauxppUy7QBz77XEUq38=
 
-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=
@@ -8895,15 +8759,6 @@ jest-watcher@^27.5.1:
     jest-util "^27.5.1"
     string-length "^4.0.1"
 
-jest-worker@27.0.0-next.5:
-  version "27.0.0-next.5"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.0-next.5.tgz#5985ee29b12a4e191f4aae4bb73b97971d86ec28"
-  integrity sha512-mk0umAQ5lT+CaOJ+Qp01N6kz48sJG2kr2n1rX0koqKf6FIygQV0qLOdN9SCYID4IVeSigDOcPeGLozdMLYfb5g==
-  dependencies:
-    "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^8.0.0"
-
 jest-worker@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
@@ -9060,16 +8915,11 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json5@2.x, json5@^2.1.0, json5@^2.1.2:
+json5@2.x, json5@^2.1.2:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
   integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
 
-json5@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
-
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
@@ -9077,6 +8927,11 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
+json5@^2.1.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==
+
 jsonc-parser@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22"
@@ -9096,21 +8951,15 @@ jsonparse@^1.2.0, jsonparse@^1.3.1:
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
 
-jsonwebtoken@^8.5.1:
-  version "8.5.1"
-  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d"
-  integrity sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==
+jsonwebtoken@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz#d0faf9ba1cc3a56255fe49c0961a67e520c1926d"
+  integrity sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==
   dependencies:
     jws "^3.2.2"
-    lodash.includes "^4.3.0"
-    lodash.isboolean "^3.0.3"
-    lodash.isinteger "^4.0.4"
-    lodash.isnumber "^3.0.3"
-    lodash.isplainobject "^4.0.6"
-    lodash.isstring "^4.0.1"
-    lodash.once "^4.0.0"
+    lodash "^4.17.21"
     ms "^2.1.1"
-    semver "^5.6.0"
+    semver "^7.3.8"
 
 jsprim@^1.2.2:
   version "1.4.2"
@@ -9350,15 +9199,6 @@ load-json-file@^6.2.0:
     strip-bom "^4.0.0"
     type-fest "^0.6.0"
 
-loader-utils@1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
-  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^2.0.0"
-    json5 "^1.0.1"
-
 localforage@^1.8.1:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.10.0.tgz#5c465dc5f62b2807c3a84c0c6a1b1b3212781dd4"
@@ -9416,16 +9256,6 @@ lodash.get@^4.3.0, lodash.get@^4.4.2:
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
   integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
 
-lodash.includes@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
-  integrity sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=
-
-lodash.isboolean@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
-  integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=
-
 lodash.isequal@4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
@@ -9436,36 +9266,16 @@ lodash.isfunction@3.0.9:
   resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051"
   integrity sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==
 
-lodash.isinteger@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
-  integrity sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=
-
 lodash.ismatch@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
   integrity sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=
 
-lodash.isnumber@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc"
-  integrity sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=
-
 lodash.isobject@3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz#3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d"
   integrity sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA==
 
-lodash.isplainobject@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
-  integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
-
-lodash.isstring@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
-  integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=
-
 lodash.isundefined@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz#23ef3d9535565203a66cefd5b830f848911afb48"
@@ -9486,11 +9296,6 @@ lodash.merge@4.6.2, lodash.merge@^4.6.2:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash.once@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
-  integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
-
 lodash.pick@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
@@ -9506,11 +9311,6 @@ lodash.set@^4.3.2:
   resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23"
   integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=
 
-lodash.sortby@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
-  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
-
 lodash.template@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
@@ -9620,6 +9420,11 @@ lz-string@^1.4.4:
   resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26"
   integrity sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY=
 
+macos-release@^3.0.1:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-3.1.0.tgz#6165bb0736ae567ed6649e36ce6a24d87cbb7aca"
+  integrity sha512-/M/R0gCDgM+Cv1IuBG1XGdfTFnMEG6PZeT+KGWHO/OG+imqmaD9CH5vHBTycEM3+Kc4uG2Il+tFAuUWLqQOeUA==
+
 make-cancellable-promise@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/make-cancellable-promise/-/make-cancellable-promise-1.1.0.tgz#b4e9fcb31db3a27417e44f80cffa598ec9ac9f4e"
@@ -9633,7 +9438,7 @@ 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.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
   integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
@@ -9730,15 +9535,6 @@ match-url-wildcard@0.0.4:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-md5.js@^1.3.4:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
-  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-    safe-buffer "^5.1.2"
-
 mdast-util-from-markdown@^0.8.5:
   version "0.8.5"
   resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz#d1ef2ca42bc377ecb0463a987910dae89bd9a28c"
@@ -9847,14 +9643,6 @@ microseconds@0.2.0:
   resolved "https://registry.yarnpkg.com/microseconds/-/microseconds-0.2.0.tgz#233b25f50c62a65d861f978a4a4f8ec18797dc39"
   integrity sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA==
 
-miller-rabin@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
-  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
-  dependencies:
-    bn.js "^4.0.0"
-    brorand "^1.0.1"
-
 mime-db@1.52.0, mime-db@^1.41.0:
   version "1.52.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
@@ -9902,16 +9690,6 @@ min-indent@^1.0.0:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
-minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
-  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
-
-minimalistic-crypto-utils@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
-  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
-
 minimatch@^3.0.4, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
@@ -9919,6 +9697,13 @@ minimatch@^3.0.4, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^5.0.1:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
+  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist-options@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
@@ -10061,10 +9846,10 @@ moment@^2.14.1:
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz#00910c60b20843bcba52d37d58c628b47b1f20e4"
   integrity sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==
 
-moment@^2.29.3:
-  version "2.29.3"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.3.tgz#edd47411c322413999f7a5940d526de183c031f3"
-  integrity sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==
+moment@^2.29.4:
+  version "2.29.4"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
+  integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
 
 monocle-ts@^2.3.5:
   version "2.3.12"
@@ -10147,23 +9932,21 @@ nanoclone@^0.2.1:
   resolved "https://registry.yarnpkg.com/nanoclone/-/nanoclone-0.2.1.tgz#dd4090f8f1a110d26bb32c49ed2f5b9235209ed4"
   integrity sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==
 
-nanoid@^3.1.12, nanoid@^3.1.23, nanoid@^3.1.31:
+nanoid@^3.1.12, nanoid@^3.1.31:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.2.tgz#c89622fafb4381cd221421c69ec58547a1eec557"
   integrity sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==
 
+nanoid@^3.3.4:
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
+  integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
+
 napi-build-utils@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
   integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
 
-native-url@0.3.4:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/native-url/-/native-url-0.3.4.tgz#29c943172aed86c63cee62c8c04db7f5756661f8"
-  integrity sha512-6iM8R99ze45ivyH8vybJ7X0yekIcPf5GgLV5K0ENCbmRcaRIDoj37BC8iLEmaaBfqqb8enuZ5p0uhY+lVAbAcA==
-  dependencies:
-    querystring "^0.2.0"
-
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -10189,18 +9972,16 @@ next-compose-plugins@^2.2.1:
   resolved "https://registry.yarnpkg.com/next-compose-plugins/-/next-compose-plugins-2.2.1.tgz#020fc53f275a7e719d62521bef4300fbb6fde5ab"
   integrity sha512-OjJ+fV15FXO2uQXQagLD4C0abYErBjyjE0I0FHpOEIB8upw0hg1ldFP6cqHTJBH1cZqy96OeR3u1dJ+Ez2D4Bg==
 
-next-i18next@^10.5.0:
-  version "10.5.0"
-  resolved "https://registry.yarnpkg.com/next-i18next/-/next-i18next-10.5.0.tgz#cf9f5f1cb01cc5e900807630bcf01ac3b3d58f28"
-  integrity sha512-+Xj/v5gqpEUBKKAaFCZ76+Ps6OGAaIgGowJTF67wTcmIQbHrcHMPjHwPTbnpXy7uHrH8os7i4eAfRENAv/6xwg==
+next-i18next@^13.0.3:
+  version "13.2.2"
+  resolved "https://registry.yarnpkg.com/next-i18next/-/next-i18next-13.2.2.tgz#9609546fab1d1d5f9b227e86c5ca23d0cbbbddb4"
+  integrity sha512-t0WU6K+HJoq2nVQ0n6OiiEZja9GyMqtDSU74FmOafgk4ljns+iZ18bsNJiI8rOUXfFfkW96ea1N7D5kbMyT+PA==
   dependencies:
-    "@babel/runtime" "^7.13.17"
+    "@babel/runtime" "^7.20.13"
     "@types/hoist-non-react-statics" "^3.3.1"
     core-js "^3"
-    hoist-non-react-statics "^3.2.0"
-    i18next "^21.6.12"
-    i18next-fs-backend "^1.0.7"
-    react-i18next "^11.15.5"
+    hoist-non-react-statics "^3.3.2"
+    i18next-fs-backend "^2.1.1"
 
 next-plugin-custom-babel-config@^1.0.5:
   version "1.0.5"
@@ -10215,66 +9996,39 @@ next-transpile-modules@^9.0.0:
     enhanced-resolve "^5.7.0"
     escalade "^3.1.1"
 
-next@^11.1.4:
-  version "11.1.4"
-  resolved "https://registry.yarnpkg.com/next/-/next-11.1.4.tgz#2381eeeffae80f58e6d80d8335ab56d2e157064e"
-  integrity sha512-GWQJrWYkfAKP8vmrzJcCfRSKv955Khyjqd5jipTcVKDGg+SH+NfjDMWFtCwArcQlHPvzisGu1ERLY0+Eoj7G+g==
-  dependencies:
-    "@babel/runtime" "7.15.3"
-    "@hapi/accept" "5.0.2"
-    "@next/env" "11.1.4"
-    "@next/polyfill-module" "11.1.4"
-    "@next/react-dev-overlay" "11.1.4"
-    "@next/react-refresh-utils" "11.1.4"
-    "@node-rs/helper" "1.2.1"
-    assert "2.0.0"
-    ast-types "0.13.2"
-    browserify-zlib "0.2.0"
-    browserslist "4.16.6"
-    buffer "5.6.0"
-    caniuse-lite "^1.0.30001228"
-    chalk "2.4.2"
-    chokidar "3.5.1"
-    constants-browserify "1.0.0"
-    crypto-browserify "3.12.0"
-    cssnano-simple "3.0.0"
-    domain-browser "4.19.0"
-    encoding "0.1.13"
-    etag "1.8.1"
-    find-cache-dir "3.3.1"
-    get-orientation "1.1.2"
-    https-browserify "1.0.0"
-    image-size "1.0.0"
-    jest-worker "27.0.0-next.5"
-    native-url "0.3.4"
-    node-fetch "2.6.7"
-    node-html-parser "1.4.9"
-    node-libs-browser "^2.2.1"
-    os-browserify "0.3.0"
-    p-limit "3.1.0"
-    path-browserify "1.0.1"
-    pnp-webpack-plugin "1.6.4"
-    postcss "8.2.15"
-    process "0.11.10"
-    querystring-es3 "0.2.1"
-    raw-body "2.4.1"
-    react-is "17.0.2"
-    react-refresh "0.8.3"
-    stream-browserify "3.0.0"
-    stream-http "3.1.1"
-    string_decoder "1.3.0"
-    styled-jsx "4.0.1"
-    timers-browserify "2.0.12"
-    tty-browserify "0.0.1"
-    use-subscription "1.5.1"
-    util "0.12.4"
-    vm-browserify "1.1.2"
-    watchpack "2.1.1"
+next-transpile-modules@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/next-transpile-modules/-/next-transpile-modules-9.1.0.tgz#dffd2563bf76f8afdb28f0611948f46252ca65ef"
+  integrity sha512-yzJji65xDqcIqjvx5vPJcs1M+MYQTzLM1pXH/qf8Q88ohx+bwVGDc1AeV+HKr1NwvMCNTpwVPSFI7cA5WdyeWA==
+  dependencies:
+    enhanced-resolve "^5.10.0"
+    escalade "^3.1.1"
+
+next@^12.3.4:
+  version "12.3.4"
+  resolved "https://registry.yarnpkg.com/next/-/next-12.3.4.tgz#f2780a6ebbf367e071ce67e24bd8a6e05de2fcb1"
+  integrity sha512-VcyMJUtLZBGzLKo3oMxrEF0stxh8HwuW976pAzlHhI3t8qJ4SROjCrSh1T24bhrbjw55wfZXAbXPGwPt5FLRfQ==
+  dependencies:
+    "@next/env" "12.3.4"
+    "@swc/helpers" "0.4.11"
+    caniuse-lite "^1.0.30001406"
+    postcss "8.4.14"
+    styled-jsx "5.0.7"
+    use-sync-external-store "1.2.0"
   optionalDependencies:
-    "@next/swc-darwin-arm64" "11.1.4"
-    "@next/swc-darwin-x64" "11.1.4"
-    "@next/swc-linux-x64-gnu" "11.1.4"
-    "@next/swc-win32-x64-msvc" "11.1.4"
+    "@next/swc-android-arm-eabi" "12.3.4"
+    "@next/swc-android-arm64" "12.3.4"
+    "@next/swc-darwin-arm64" "12.3.4"
+    "@next/swc-darwin-x64" "12.3.4"
+    "@next/swc-freebsd-x64" "12.3.4"
+    "@next/swc-linux-arm-gnueabihf" "12.3.4"
+    "@next/swc-linux-arm64-gnu" "12.3.4"
+    "@next/swc-linux-arm64-musl" "12.3.4"
+    "@next/swc-linux-x64-gnu" "12.3.4"
+    "@next/swc-linux-x64-musl" "12.3.4"
+    "@next/swc-win32-arm64-msvc" "12.3.4"
+    "@next/swc-win32-ia32-msvc" "12.3.4"
+    "@next/swc-win32-x64-msvc" "12.3.4"
 
 no-case@^3.0.4:
   version "3.0.4"
@@ -10346,52 +10100,11 @@ node-gyp@^7.1.0:
     tar "^6.0.2"
     which "^2.0.2"
 
-node-html-parser@1.4.9:
-  version "1.4.9"
-  resolved "https://registry.yarnpkg.com/node-html-parser/-/node-html-parser-1.4.9.tgz#3c8f6cac46479fae5800725edb532e9ae8fd816c"
-  integrity sha512-UVcirFD1Bn0O+TSmloHeHqZZCxHjvtIeGdVdGMhyZ8/PWlEiZaZ5iJzR189yKZr8p0FXN58BUeC7RHRkf/KYGw==
-  dependencies:
-    he "1.2.0"
-
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
 
-node-libs-browser@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
-  integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==
-  dependencies:
-    assert "^1.1.1"
-    browserify-zlib "^0.2.0"
-    buffer "^4.3.0"
-    console-browserify "^1.1.0"
-    constants-browserify "^1.0.0"
-    crypto-browserify "^3.11.0"
-    domain-browser "^1.1.1"
-    events "^3.0.0"
-    https-browserify "^1.0.0"
-    os-browserify "^0.3.0"
-    path-browserify "0.0.1"
-    process "^0.11.10"
-    punycode "^1.2.4"
-    querystring-es3 "^0.2.0"
-    readable-stream "^2.3.3"
-    stream-browserify "^2.0.1"
-    stream-http "^2.7.2"
-    string_decoder "^1.0.0"
-    timers-browserify "^2.0.4"
-    tty-browserify "0.0.0"
-    url "^0.11.0"
-    util "^0.11.0"
-    vm-browserify "^1.0.1"
-
-node-releases@^1.1.71:
-  version "1.1.77"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.77.tgz#50b0cfede855dd374e7585bf228ff34e57c1c32e"
-  integrity sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ==
-
 node-releases@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01"
@@ -10432,7 +10145,7 @@ normalize-package-data@^3.0.0, normalize-package-data@^3.0.2:
     semver "^7.3.4"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^3.0.0, 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"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
@@ -10594,13 +10307,10 @@ object-inspect@^1.12.0, object-inspect@^1.9.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
   integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
 
-object-is@^1.0.1:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
-  integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
+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-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
@@ -10617,6 +10327,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"
@@ -10626,6 +10346,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"
@@ -10635,6 +10364,15 @@ object.fromentries@^2.0.5:
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
 
+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.4"
+    es-abstract "^1.20.4"
+
 object.getownpropertydescriptors@^2.0.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e"
@@ -10652,6 +10390,14 @@ object.hasown@^1.1.0:
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
 
+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:
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
 object.values@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
@@ -10661,6 +10407,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"
+
 oblivious-set@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/oblivious-set/-/oblivious-set-1.0.0.tgz#c8316f2c2fb6ff7b11b6158db3234c49f733c566"
@@ -10718,12 +10473,7 @@ optionator@^0.9.1:
     type-check "^0.4.0"
     word-wrap "^1.2.3"
 
-os-browserify@0.3.0, os-browserify@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
-  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
-
-os-family@^1.0.0:
+os-family@^1.0.0, os-family@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/os-family/-/os-family-1.1.0.tgz#8a89cb617dd1631b8ef9506be830144f626c214e"
   integrity sha512-E3Orl5pvDJXnVmpaAA2TeNNpNhTMl4o5HghuWhOivBjEiTnJSrMYSa5uZMek1lBEvu8kKEsa2YgVcGFVDqX/9w==
@@ -10756,13 +10506,6 @@ p-finally@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561"
   integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==
 
-p-limit@3.1.0, p-limit@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
-  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
-  dependencies:
-    yocto-queue "^0.1.0"
-
 p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
@@ -10777,6 +10520,13 @@ p-limit@^2.0.0, p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
+p-limit@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -10913,17 +10663,6 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-asn1@^5.0.0, parse-asn1@^5.1.5:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4"
-  integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==
-  dependencies:
-    asn1.js "^5.2.0"
-    browserify-aes "^1.0.0"
-    evp_bytestokey "^1.0.0"
-    pbkdf2 "^3.0.3"
-    safe-buffer "^5.1.1"
-
 parse-entities@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8"
@@ -10999,16 +10738,6 @@ parseurl@~1.3.3:
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
-path-browserify@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
-  integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
-
-path-browserify@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
-  integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==
-
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -11073,17 +10802,6 @@ pause-stream@^0.0.11:
   dependencies:
     through "~2.3"
 
-pbkdf2@^3.0.3:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075"
-  integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==
-  dependencies:
-    create-hash "^1.1.2"
-    create-hmac "^1.1.4"
-    ripemd160 "^2.0.1"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
 pdfjs-dist@3.6.172:
   version "3.6.172"
   resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-3.6.172.tgz#f9efdfc5e850e1fecfc70b7f6f45c5dc990d8096"
@@ -11104,7 +10822,7 @@ picocolors@1.0.0, picocolors@^1.0.0:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.0, picomatch@^2.3.1:
+picomatch@^2.0.4, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.0, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -11163,7 +10881,7 @@ pirates@^4.0.1, pirates@^4.0.4:
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b"
   integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==
 
-pkg-dir@^4.1.0, pkg-dir@^4.2.0:
+pkg-dir@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
   integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
@@ -11177,11 +10895,6 @@ pkg-up@^3.1.0:
   dependencies:
     find-up "^3.0.0"
 
-platform@1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.6.tgz#48b4ce983164b209c2d45a107adb31f473a6e7a7"
-  integrity sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==
-
 pluralize@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1"
@@ -11192,13 +10905,6 @@ pngjs@^3.3.1:
   resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
   integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
 
-pnp-webpack-plugin@1.6.4:
-  version "1.6.4"
-  resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz#c9711ac4dc48a685dabafc86f8b6dd9f8df84149"
-  integrity sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==
-  dependencies:
-    ts-pnp "^1.1.6"
-
 postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
@@ -11213,14 +10919,14 @@ postcss@7.0.36:
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
-postcss@8.2.15:
-  version "8.2.15"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.15.tgz#9e66ccf07292817d226fc315cbbf9bc148fbca65"
-  integrity sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q==
+postcss@8.4.14:
+  version "8.4.14"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf"
+  integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==
   dependencies:
-    colorette "^1.2.2"
-    nanoid "^3.1.23"
-    source-map "^0.6.1"
+    nanoid "^3.3.4"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
 
 prebuild-install@^7.0.1:
   version "7.1.0"
@@ -11299,11 +11005,6 @@ process-nextick-args@~2.0.0:
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
-process@0.11.10, 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.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
@@ -11401,18 +11102,6 @@ psl@^1.1.28, psl@^1.1.33:
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
   integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
 
-public-encrypt@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
-  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
-  dependencies:
-    bn.js "^4.1.0"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    parse-asn1 "^5.0.0"
-    randombytes "^2.0.1"
-    safe-buffer "^5.1.2"
-
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
@@ -11421,16 +11110,6 @@ 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@^1.2.4:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
-
 punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
@@ -11473,27 +11152,12 @@ query-string@^6.13.8:
     split-on-first "^1.0.0"
     strict-uri-encode "^2.0.0"
 
-querystring-es3@0.2.1, querystring-es3@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
-  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
-
-querystring@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
-
-querystring@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd"
-  integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==
-
 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==
 
-queue@6.0.2, queue@^6.0.1:
+queue@^6.0.1:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/queue/-/queue-6.0.2.tgz#b91525283e2315c7553d2efa18d83e76432fed65"
   integrity sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==
@@ -11515,36 +11179,11 @@ ramda@^0.27.1:
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.27.2.tgz#84463226f7f36dc33592f6f4ed6374c48306c3f1"
   integrity sha512-SbiLPU40JuJniHexQSAgad32hfwd+DRUdwF2PlVuI5RZD0/vahUco7R8vD86J/tcEKKF9vZrUVwgtmGCqlCKyA==
 
-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
-  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
-  dependencies:
-    safe-buffer "^5.1.0"
-
-randomfill@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
-  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
-  dependencies:
-    randombytes "^2.0.5"
-    safe-buffer "^5.1.0"
-
 range-parser@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.1.tgz#30ac82f98bb5ae8c152e67149dac8d55153b168c"
-  integrity sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA==
-  dependencies:
-    bytes "3.1.0"
-    http-errors "1.7.3"
-    iconv-lite "0.4.24"
-    unpipe "1.0.0"
-
 raw-body@2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c"
@@ -11595,13 +11234,12 @@ react-hook-form@^7.30.0:
   resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.30.0.tgz#c9e2fd54d3627e43bd94bf38ef549df2e80c1371"
   integrity sha512-DzjiM6o2vtDGNMB9I4yCqW8J21P314SboNG1O0obROkbg7KVS0I7bMtwSdKyapnCPjHgnxc3L7E5PEdISeEUcQ==
 
-react-i18next@^11.11.0, react-i18next@^11.15.5:
-  version "11.16.2"
-  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.16.2.tgz#650b18c12a624057ee2651ba4b4a989b526be554"
-  integrity sha512-1iuZduvARUelL5ux663FvIoDZExwFO+9QtRAAt4uvs1/aun4cUZt8XBrVg7iiDgNls9cOSORAhE7Ri5KA9RMvg==
+react-i18next@^12.2.0:
+  version "12.2.0"
+  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-12.2.0.tgz#010e3f6070b8d700442947233352ebe4b252d7a1"
+  integrity sha512-5XeVgSygaGfyFmDd2WcXvINRw2WEC1XviW1LXY/xLOEMzsCFRwKqfnHN+hUjla8ZipbVJR27GCMSuTr0BhBBBQ==
   dependencies:
-    "@babel/runtime" "^7.14.5"
-    html-escaper "^2.0.2"
+    "@babel/runtime" "^7.20.6"
     html-parse-stringify "^3.0.1"
 
 react-input-mask@^2.0.4:
@@ -11612,16 +11250,16 @@ react-input-mask@^2.0.4:
     invariant "^2.2.4"
     warning "^4.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==
-
 react-is@^16.13.1, react-is@^16.7.0:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
+react-is@^17.0.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==
+
 react-leaflet-markercluster@^3.0.0-rc1:
   version "3.0.0-rc1"
   resolved "https://registry.yarnpkg.com/react-leaflet-markercluster/-/react-leaflet-markercluster-3.0.0-rc1.tgz#4e45392d599fb410eac413aeee6cb52f51d0fc5c"
@@ -11680,11 +11318,6 @@ react-query@^3.34.0:
     broadcast-channel "^3.4.1"
     match-sorter "^6.0.2"
 
-react-refresh@0.8.3:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.8.3.tgz#721d4657672d400c5e3c75d063c4a85fb2d5d68f"
-  integrity sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg==
-
 react-spring@9.3.0:
   version "9.3.0"
   resolved "https://registry.yarnpkg.com/react-spring/-/react-spring-9.3.0.tgz#4d71eecbfd4f0823bf67e5943d2b0fb77f3e26ad"
@@ -11858,7 +11491,7 @@ read@1, read@~1.0.1:
   dependencies:
     mute-stream "~0.0.4"
 
-readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0:
+readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -11867,7 +11500,7 @@ readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stre
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+readable-stream@^2.0.1, readable-stream@^2.0.6, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -11880,6 +11513,15 @@ readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
+readable-stream@^3.6.0:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
 readdir-scoped-modules@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
@@ -11890,13 +11532,6 @@ readdir-scoped-modules@^1.0.0:
     graceful-fs "^4.1.2"
     once "^1.3.0"
 
-readdirp@~3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
-  integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
-  dependencies:
-    picomatch "^2.2.1"
-
 readline-transform@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/readline-transform/-/readline-transform-1.0.0.tgz#3157f97428acaec0f05a5c1ff2c3120f4e6d904b"
@@ -11952,6 +11587,15 @@ regexp.prototype.flags@^1.4.1:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
+regexp.prototype.flags@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
+  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    functions-have-names "^1.2.2"
+
 regexpp@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
@@ -12069,6 +11713,11 @@ reselect@^4.0.0:
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.5.tgz#852c361247198da6756d07d9296c2b51eddb79f6"
   integrity sha512-uVdlz8J7OO+ASpBYoz1Zypgx0KasCY20H+N8JD13oUMtPvSHQuscrHop4KbXrbsBcdB9Ds7lVK7eRkBIfO43vQ==
 
+reselect@^4.1.7:
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.7.tgz#56480d9ff3d3188970ee2b76527bd94a95567a42"
+  integrity sha512-Zu1xbUt3/OPwsXL46hvOOoQrap2azE7ZQbokq61BQfiXvhewsKDwhMeZjTX9sX0nvw1t/U5Audyn1I9P/m9z0A==
+
 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"
@@ -12120,7 +11769,7 @@ resolve.exports@^1.1.0:
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
   integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
 
-resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, 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.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
   integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
@@ -12129,6 +11778,15 @@ resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.2
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+resolve@^1.22.1:
+  version "1.22.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
+  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
+  dependencies:
+    is-core-module "^2.9.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"
@@ -12137,6 +11795,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"
@@ -12179,14 +11846,6 @@ rimraf@^2.2.8, rimraf@^2.6.3:
   dependencies:
     glob "^7.1.3"
 
-ripemd160@^2.0.0, ripemd160@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
-  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-
 rollup@2.78.0:
   version "2.78.0"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.78.0.tgz#00995deae70c0f712ea79ad904d5f6b033209d9e"
@@ -12227,7 +11886,7 @@ rxjs@^7.5.5:
   dependencies:
     tslib "^2.1.0"
 
-safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -12237,6 +11896,15 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
+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:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.3"
+    is-regex "^1.1.4"
+
 safe-regex@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-2.1.1.tgz#f7128f00d056e2fe5c11e81a1324dd974aadced2"
@@ -12317,6 +11985,13 @@ semver@^7.3.7:
   dependencies:
     lru-cache "^6.0.0"
 
+semver@^7.3.8:
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
+  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
+  dependencies:
+    lru-cache "^6.0.0"
+
 send@0.17.2:
   version "0.17.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820"
@@ -12351,34 +12026,21 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
+set-cookie-parser@^2.5.1:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz#131921e50f62ff1a66a461d7d62d7b21d5d15a51"
+  integrity sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==
+
 set-harmonic-interval@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-harmonic-interval/-/set-harmonic-interval-1.0.1.tgz#e1773705539cdfb80ce1c3d99e7f298bb3995249"
   integrity sha512-AhICkFV84tBP1aWqPwLZqFvAwqEoVA9kxNMniGEUvzOlm4vLmOFLiTT3UZ6bziJTy4bOVpzWGTfSCbmaayGx8g==
 
-setimmediate@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
-
-setprototypeof@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
-  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
-
 setprototypeof@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
-sha.js@^2.4.0, sha.js@^2.4.8:
-  version "2.4.11"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
-  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
 shallow-clone@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
@@ -12417,11 +12079,6 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shell-quote@1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
-  integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
-
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -12581,6 +12238,11 @@ sort-keys@^4.0.0:
   dependencies:
     is-plain-obj "^2.0.0"
 
+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.1:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
@@ -12618,18 +12280,6 @@ source-map@0.5.6:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
   integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
 
-source-map@0.7.3, source-map@^0.7.3:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
-
-source-map@0.8.0-beta.0:
-  version "0.8.0-beta.0"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.8.0-beta.0.tgz#d4c1bb42c3f7ee925f005927ba10709e0d1d1f11"
-  integrity sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==
-  dependencies:
-    whatwg-url "^7.0.0"
-
 source-map@^0.1.38:
   version "0.1.43"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
@@ -12647,6 +12297,11 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
+source-map@^0.7.3:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+
 sourcemap-codec@^1.4.8:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
@@ -12765,34 +12420,11 @@ stacktrace-js@^2.0.2:
     stack-generator "^2.0.5"
     stacktrace-gps "^3.0.4"
 
-stacktrace-parser@0.1.10:
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/stacktrace-parser/-/stacktrace-parser-0.1.10.tgz#29fb0cae4e0d0b85155879402857a1639eb6051a"
-  integrity sha512-KJP1OCML99+8fhOHxwwzyWrlUuVX5GQ0ZpJTd1DFXhdkrvg1szxfHhawXUZ3g9TkXORQd4/WG68jMlQZ2p8wlg==
-  dependencies:
-    type-fest "^0.7.1"
-
 "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
-stream-browserify@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-3.0.0.tgz#22b0a2850cdf6503e73085da1fc7b7d0c2122f2f"
-  integrity sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==
-  dependencies:
-    inherits "~2.0.4"
-    readable-stream "^3.5.0"
-
-stream-browserify@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
-  integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
-  dependencies:
-    inherits "~2.0.1"
-    readable-stream "^2.0.2"
-
 stream-combiner@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858"
@@ -12801,34 +12433,6 @@ stream-combiner@^0.2.2:
     duplexer "~0.1.1"
     through "~2.3.4"
 
-stream-http@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-3.1.1.tgz#0370a8017cf8d050b9a8554afe608f043eaff564"
-  integrity sha512-S7OqaYu0EkFpgeGFb/NPOoPLxFko7TPqtEeFg5DXPB4v/KETHG0Ln6fRFrNezoelpaDKmycEmmZ81cC9DAwgYg==
-  dependencies:
-    builtin-status-codes "^3.0.0"
-    inherits "^2.0.4"
-    readable-stream "^3.6.0"
-    xtend "^4.0.2"
-
-stream-http@^2.7.2:
-  version "2.8.3"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
-  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
-  dependencies:
-    builtin-status-codes "^3.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.3.6"
-    to-arraybuffer "^1.0.0"
-    xtend "^4.0.0"
-
-stream-parser@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/stream-parser/-/stream-parser-0.3.1.tgz#1618548694420021a1182ff0af1911c129761773"
-  integrity sha1-FhhUhpRCACGhGC/wrxkRwSl2F3M=
-  dependencies:
-    debug "2"
-
 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"
@@ -12839,11 +12443,6 @@ string-argv@^0.3.1:
   resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da"
   integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==
 
-string-hash@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b"
-  integrity sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs=
-
 string-length@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
@@ -12893,6 +12492,29 @@ string.prototype.matchall@^4.0.6:
     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"
@@ -12901,6 +12523,15 @@ string.prototype.trimend@^1.0.4:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
+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"
@@ -12909,7 +12540,16 @@ string.prototype.trimstart@^1.0.4:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-string_decoder@1.3.0, string_decoder@^1.0.0, string_decoder@^1.1.1:
+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"
   integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
@@ -12923,13 +12563,6 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-strip-ansi@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
-  dependencies:
-    ansi-regex "^5.0.0"
-
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -13015,29 +12648,10 @@ styled-components@^5.3.1, styled-components@^5.3.3:
     shallowequal "^1.1.0"
     supports-color "^5.5.0"
 
-styled-jsx@4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-4.0.1.tgz#ae3f716eacc0792f7050389de88add6d5245b9e9"
-  integrity sha512-Gcb49/dRB1k8B4hdK8vhW27Rlb2zujCk1fISrizCcToIs+55B4vmUM0N9Gi4nnVfFZWe55jRdWpAqH1ldAKWvQ==
-  dependencies:
-    "@babel/plugin-syntax-jsx" "7.14.5"
-    "@babel/types" "7.15.0"
-    convert-source-map "1.7.0"
-    loader-utils "1.2.3"
-    source-map "0.7.3"
-    string-hash "1.1.3"
-    stylis "3.5.4"
-    stylis-rule-sheet "0.0.10"
-
-stylis-rule-sheet@0.0.10:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz#44e64a2b076643f4b52e5ff71efc04d8c3c4a430"
-  integrity sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw==
-
-stylis@3.5.4:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz#f665f25f5e299cf3d64654ab949a57c768b73fbe"
-  integrity sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q==
+styled-jsx@5.0.7:
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.0.7.tgz#be44afc53771b983769ac654d355ca8d019dff48"
+  integrity sha512-b3sUzamS086YLRuvnaDigdAewz1/EFYlHpYBP5mZovKEdQQOIIYq8lApylub3HHZ6xFjV051kkGU7cudJmrXEA==
 
 stylis@^4.0.6:
   version "4.1.0"
@@ -13231,18 +12845,18 @@ testcafe-browser-tools@2.0.23:
     read-file-relative "^1.2.0"
     which-promise "^1.0.0"
 
-testcafe-hammerhead@24.5.19:
-  version "24.5.19"
-  resolved "https://registry.yarnpkg.com/testcafe-hammerhead/-/testcafe-hammerhead-24.5.19.tgz#26bf2bf2e0d3b1b4a1a0dbbdb86fbb063aef3f26"
-  integrity sha512-P6Io/wh0kpNhwqLGwKxBnpiUjDfSM8a0IwTvFQskjvmazlt9OCBb6a0gMZQGNmC7G6pG+XTktjMd9ZsO7FDgag==
+testcafe-hammerhead@29.0.0:
+  version "29.0.0"
+  resolved "https://registry.yarnpkg.com/testcafe-hammerhead/-/testcafe-hammerhead-29.0.0.tgz#f06d0644116f888da606d275755c84dbd3922615"
+  integrity sha512-xLYAsv87f1tHrciu7zz1hpqVsg3rnyFc8gnHvXxejHGMFON5iQhbLIAx2Xm7A1Anx5AlxIFyxRc8TFfa7SixBw==
   dependencies:
+    "@electron/asar" "^3.2.3"
     acorn-hammerhead "0.6.1"
-    asar "^2.0.1"
     bowser "1.6.0"
     crypto-md5 "^1.0.0"
     css "2.2.3"
     debug "4.3.1"
-    esotope-hammerhead "0.6.1"
+    esotope-hammerhead "0.6.3"
     http-cache-semantics "^4.1.0"
     iconv-lite "0.5.1"
     lodash "^4.17.20"
@@ -13292,10 +12906,10 @@ testcafe-hammerhead@>=19.4.0:
     tunnel-agent "0.6.0"
     webauth "^1.1.0"
 
-testcafe-legacy-api@5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/testcafe-legacy-api/-/testcafe-legacy-api-5.1.4.tgz#de913a79869abf9c5ff117eeb9adbef78519f4ff"
-  integrity sha512-CWjwGlRZdSuoWDIRBHKetpmDffR+/LKS6+69n8VM4mkLKgUwsP8p3MERHdx0obBn8wZ0LSyrYj8SCtv5f7oWZg==
+testcafe-legacy-api@5.1.6:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/testcafe-legacy-api/-/testcafe-legacy-api-5.1.6.tgz#157b29902153cc086649f91960a4e45694481f50"
+  integrity sha512-Q451IdSUX1NmRfE8kzIcEeoqbUlLaMv2fwVNgQOBEFmA5E57c3jsIpLDTDqv6FPcNwdNMYIZMiB6tzlXB5wf1g==
   dependencies:
     async "3.2.3"
     dedent "^0.6.0"
@@ -13317,20 +12931,21 @@ testcafe-reporter-custom@^1.2.1:
   resolved "https://registry.yarnpkg.com/testcafe-reporter-custom/-/testcafe-reporter-custom-1.2.1.tgz#790e7676650026ac5df49baada8e6fd35ad2e163"
   integrity sha512-P85P5+xKRjm96kiZddCl2EjVk7LVgyTfAr2KSIIK0pAdj4W5Wcx69RmiM07KTihpEFQqz0jmcc7/gTk9VWLpgQ==
 
-testcafe-reporter-dashboard@1.0.0-rc.1:
-  version "1.0.0-rc.1"
-  resolved "https://registry.yarnpkg.com/testcafe-reporter-dashboard/-/testcafe-reporter-dashboard-1.0.0-rc.1.tgz#c1fa6caf86cbaac5fb973866a3f791d6183f5854"
-  integrity sha512-VWFVo8kmG3OICD1RFdjvDCsEltGcHqTYN9X0aDyXg+0PqioYuAGUKQxqRA31dnG+2/RnaET4VJhhEvcbKzwhTw==
+testcafe-reporter-dashboard@^0.2.10:
+  version "0.2.10"
+  resolved "https://registry.yarnpkg.com/testcafe-reporter-dashboard/-/testcafe-reporter-dashboard-0.2.10.tgz#21919a5582de514d282712a155165597f03e7a9f"
+  integrity sha512-7Avj92KyMcrZjpzs/qvvwS4yHRpvL6k5P+gW85xxCAuKQ2syd3y7lXs4Ogh5s2WuNt8Q3bfunuzfJGmQ0hcFZQ==
   dependencies:
     es6-promise "^4.2.8"
+    fp-ts "^2.9.5"
     io-ts "^2.2.14"
     io-ts-types "^0.5.15"
     isomorphic-fetch "^3.0.0"
-    jsonwebtoken "^8.5.1"
+    jsonwebtoken "^9.0.0"
     monocle-ts "^2.3.5"
     newtype-ts "^0.3.4"
     semver "^5.6.0"
-    uuid "3.3.3"
+    uuid "^9.0.0"
 
 testcafe-reporter-html@^1.4.6:
   version "1.4.6"
@@ -13367,10 +12982,15 @@ testcafe-safe-storage@^1.1.1:
   resolved "https://registry.yarnpkg.com/testcafe-safe-storage/-/testcafe-safe-storage-1.1.2.tgz#dacfda9a51c77f61f11b13506d4004dd7f27eb73"
   integrity sha512-6km7D26+KCQGeFlSQ9fVEU7tD8qdioSpqzxU8CCZkd2KzBS0jTFkqaJ54rPaLdd5+wdhgO3+as3LMm4F0EDeYA==
 
-testcafe@^1.19.0:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/testcafe/-/testcafe-1.19.0.tgz#e26bf04a59bae4ad8c17aa43deba12a8ffcb98b3"
-  integrity sha512-HH6Z60N51SPw7WcNFhvbrcV1a6Dri1T0npFmE8BvxQEjsYog2whtdxj01yfaYrE87AZK/ep6lOwrqy0P6WmsfQ==
+testcafe-selector-generator@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/testcafe-selector-generator/-/testcafe-selector-generator-0.1.0.tgz#852c86f71565e5d9320da625c2260d040cbed786"
+  integrity sha512-MTw+RigHsEYmFgzUFNErDxui1nTYUk6nm2bmfacQiKPdhJ9AHW/wue4J/l44mhN8x3E8NgOUkHHOI+1TDFXiLQ==
+
+testcafe@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/testcafe/-/testcafe-2.4.0.tgz#41930f6d5cee44726696d80dd1472b2c93fa881c"
+  integrity sha512-RELOes/dlJ1uUcAoDDBwREls6SfO1aMdjHr6juK6T4Ixgz263VYWrBBfSShTuebCyFUzNuA+ol7+rsOZ2dvEqQ==
   dependencies:
     "@babel/core" "^7.12.1"
     "@babel/plugin-proposal-async-generator-functions" "^7.12.1"
@@ -13388,18 +13008,18 @@ testcafe@^1.19.0:
     "@babel/preset-flow" "^7.12.1"
     "@babel/preset-react" "^7.12.1"
     "@babel/runtime" "^7.12.5"
+    "@devexpress/bin-v8-flags-filter" "^1.3.0"
     "@miherlosev/esm" "3.2.26"
     "@types/node" "^12.20.10"
     async-exit-hook "^1.1.2"
-    babel-plugin-module-resolver "^4.0.0"
+    babel-plugin-module-resolver "^5.0.0"
     babel-plugin-syntax-trailing-function-commas "^6.22.0"
-    bin-v8-flags-filter "^1.1.2"
     bowser "^2.8.1"
     callsite "^1.0.0"
     callsite-record "^4.0.0"
     chai "4.3.4"
     chalk "^2.3.0"
-    chrome-remote-interface "^0.30.0"
+    chrome-remote-interface "^0.32.1"
     coffeescript "^2.3.1"
     commander "^8.3.0"
     debug "^4.3.1"
@@ -13413,22 +13033,25 @@ testcafe@^1.19.0:
     endpoint-utils "^1.0.2"
     error-stack-parser "^1.3.6"
     execa "^4.0.3"
+    get-os-info "^1.0.2"
     globby "^11.0.4"
     graceful-fs "^4.1.11"
     graphlib "^2.1.5"
+    http-status-codes "^2.2.0"
     humanize-duration "^3.25.0"
     import-lazy "^3.1.0"
     indent-string "^1.2.2"
     is-ci "^1.0.10"
     is-docker "^2.0.0"
     is-glob "^2.0.1"
+    is-podman "^1.0.1"
     is-stream "^2.0.0"
-    json5 "^2.1.0"
+    json5 "^2.2.2"
     lodash "^4.17.13"
     log-update-async-hook "^2.0.7"
     make-dir "^3.0.0"
     mime-db "^1.41.0"
-    moment "^2.29.3"
+    moment "^2.29.4"
     moment-duration-format-commonjs "^1.0.0"
     mustache "^2.1.2"
     nanoid "^3.1.31"
@@ -13447,23 +13070,26 @@ testcafe@^1.19.0:
     resolve-from "^4.0.0"
     sanitize-filename "^1.6.0"
     semver "^5.6.0"
+    set-cookie-parser "^2.5.1"
     source-map-support "^0.5.16"
     strip-bom "^2.0.0"
     testcafe-browser-tools "2.0.23"
-    testcafe-hammerhead "24.5.19"
-    testcafe-legacy-api "5.1.4"
-    testcafe-reporter-dashboard "1.0.0-rc.1"
+    testcafe-hammerhead "29.0.0"
+    testcafe-legacy-api "5.1.6"
+    testcafe-reporter-dashboard "^0.2.10"
     testcafe-reporter-json "^2.1.0"
     testcafe-reporter-list "^2.1.0"
     testcafe-reporter-minimal "^2.1.0"
     testcafe-reporter-spec "^2.1.1"
     testcafe-reporter-xunit "^2.2.1"
     testcafe-safe-storage "^1.1.1"
+    testcafe-selector-generator "^0.1.0"
     time-limit-promise "^1.0.2"
     tmp "0.0.28"
     tree-kill "^1.2.2"
-    typescript "^3.3.3"
+    typescript "4.7.4"
     unquote "^1.1.1"
+    url-to-options "^2.0.0"
 
 text-extensions@^1.0.0:
   version "1.9.0"
@@ -13524,13 +13150,6 @@ time-limit-promise@^1.0.2:
   resolved "https://registry.yarnpkg.com/time-limit-promise/-/time-limit-promise-1.0.4.tgz#33e928212273c70d52153c28ad2a7e3319b975f9"
   integrity sha512-FLHDDsIDducw7MBcRWlFtW2Tm50DoKOSFf0Nzx17qwXj8REXCte0eUkHrJl9QU3Bl9arG3XNYX0PcHpZ9xyuLw==
 
-timers-browserify@2.0.12, timers-browserify@^2.0.4:
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee"
-  integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==
-  dependencies:
-    setimmediate "^1.0.4"
-
 tiny-inflate@^1.0.0, tiny-inflate@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.3.tgz#122715494913a1805166aaf7c93467933eea26c4"
@@ -13580,11 +13199,6 @@ tmpl@1.0.5:
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
   integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
 
-to-arraybuffer@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
-  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
-
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
@@ -13602,11 +13216,6 @@ toggle-selection@^1.0.6:
   resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32"
   integrity sha1-bkWxJj8gF/oKzH2J14sVuL932jI=
 
-toidentifier@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
-  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
-
 toidentifier@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
@@ -13634,13 +13243,6 @@ tough-cookie@~2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-tr46@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
-  integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
-  dependencies:
-    punycode "^2.1.0"
-
 tr46@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
@@ -13713,11 +13315,6 @@ ts-node@^10.0.0, ts-node@^10.6.0:
     v8-compile-cache-lib "^3.0.0"
     yn "3.1.1"
 
-ts-pnp@^1.1.6:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
-  integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==
-
 ts-toolbelt@^6.4.2:
   version "6.15.5"
   resolved "https://registry.yarnpkg.com/ts-toolbelt/-/ts-toolbelt-6.15.5.tgz#cb3b43ed725cb63644782c64fbcad7d8f28c0a83"
@@ -13744,9 +13341,9 @@ tslib@^2.0.3, tslib@^2.1.0:
   integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
 
 tslib@^2.4.0:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.2.tgz#1b6f07185c881557b0ffa84b111a0106989e8338"
-  integrity sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA==
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
+  integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
 
 tsutils@^3.21.0:
   version "3.21.0"
@@ -13755,16 +13352,6 @@ tsutils@^3.21.0:
   dependencies:
     tslib "^1.8.1"
 
-tty-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
-  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
-
-tty-browserify@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811"
-  integrity sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==
-
 tunnel-agent@0.6.0, tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -13821,11 +13408,6 @@ type-fest@^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.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.7.1.tgz#8dda65feaf03ed78f0a3f9678f1869147f7c5c48"
-  integrity sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==
-
 type-fest@^0.8.1:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
@@ -13849,6 +13431,15 @@ 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"
+
 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"
@@ -13861,10 +13452,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@^3.3.3:
-  version "3.9.10"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8"
-  integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==
+typescript@4.7.4:
+  version "4.7.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"
+  integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==
 
 typescript@^4.4.3, typescript@^4.5.5:
   version "4.6.3"
@@ -13896,6 +13487,16 @@ unbox-primitive@^1.0.1:
     has-symbols "^1.0.2"
     which-boxed-primitive "^1.0.2"
 
+unbox-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
+  integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
+  dependencies:
+    call-bind "^1.0.2"
+    has-bigints "^1.0.2"
+    has-symbols "^1.0.3"
+    which-boxed-primitive "^1.0.2"
+
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
@@ -14006,20 +13607,15 @@ urix@^0.1.0:
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
-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"
+url-to-options@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-2.0.0.tgz#416bfe77868b168b8aa7b72d74e7c29a97dca69d"
+  integrity sha512-mfONnc9dqO0J41wUh/El+plDskrIJRcyLcx6WjEGYW2K11RnjPDAgeoNFCallADaYJfcWIvAlYyZPBw02AbfIQ==
 
-use-subscription@1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/use-subscription/-/use-subscription-1.5.1.tgz#73501107f02fad84c6dd57965beb0b75c68c42d1"
-  integrity sha512-Xv2a1P/yReAjAbhylMfFplFKj9GssgTwN7RlcTxBujFQcloStWNDQdc4g4NRWH9xS4i/FDk04vQBptAXoF3VcA==
-  dependencies:
-    object-assign "^4.1.1"
+use-sync-external-store@1.2.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==
 
 utf8-byte-length@^1.0.1:
   version "1.0.4"
@@ -14043,42 +13639,11 @@ util-promisify@^2.1.0:
   dependencies:
     object.getownpropertydescriptors "^2.0.3"
 
-util@0.10.3:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
-  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
-  dependencies:
-    inherits "2.0.1"
-
-util@0.12.4, util@^0.12.0:
-  version "0.12.4"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253"
-  integrity sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==
-  dependencies:
-    inherits "^2.0.3"
-    is-arguments "^1.0.4"
-    is-generator-function "^1.0.7"
-    is-typed-array "^1.1.3"
-    safe-buffer "^5.1.2"
-    which-typed-array "^1.1.2"
-
-util@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
-  integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==
-  dependencies:
-    inherits "2.0.3"
-
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@3.3.3:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
-  integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==
-
 uuid@^3.3.2:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
@@ -14089,6 +13654,11 @@ uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+uuid@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
+  integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
+
 v8-compile-cache-lib@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.0.tgz#0582bcb1c74f3a2ee46487ceecf372e46bce53e8"
@@ -14146,11 +13716,6 @@ vite-compatible-readable-stream@^3.6.1:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-vm-browserify@1.1.2, vm-browserify@^1.0.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
-  integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
-
 void-elements@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"
@@ -14215,14 +13780,6 @@ warning@^4.0.2:
   dependencies:
     loose-envify "^1.0.0"
 
-watchpack@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.1.1.tgz#e99630550fca07df9f90a06056987baa40a689c7"
-  integrity sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==
-  dependencies:
-    glob-to-regexp "^0.4.1"
-    graceful-fs "^4.1.2"
-
 wcwidth@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
@@ -14245,11 +13802,6 @@ webidl-conversions@^3.0.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
   integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
 
-webidl-conversions@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
-  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
-
 webidl-conversions@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
@@ -14285,15 +13837,6 @@ whatwg-url@^5.0.0:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
 
-whatwg-url@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06"
-  integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==
-  dependencies:
-    lodash.sortby "^4.7.0"
-    tr46 "^1.0.1"
-    webidl-conversions "^4.0.2"
-
 whatwg-url@^8.0.0, whatwg-url@^8.4.0, whatwg-url@^8.5.0:
   version "8.7.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"
@@ -14333,17 +13876,17 @@ which-promise@^1.0.0:
     pinkie-promise "^1.0.0"
     which "^1.1.2"
 
-which-typed-array@^1.1.2:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.7.tgz#2761799b9a22d4b8660b3c1b40abaa7739691793"
-  integrity sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw==
+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:
     available-typed-arrays "^1.0.5"
     call-bind "^1.0.2"
-    es-abstract "^1.18.5"
-    foreach "^2.0.5"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
     has-tostringtag "^1.0.0"
-    is-typed-array "^1.1.7"
+    is-typed-array "^1.1.10"
 
 which@^1.1.2, which@^1.3.1:
   version "1.3.1"
@@ -14366,6 +13909,13 @@ wide-align@^1.1.0, wide-align@^1.1.2:
   dependencies:
     string-width "^1.0.2 || 2 || 3 || 4"
 
+windows-release@^5.0.1:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-5.1.0.tgz#fc56e8c53d970bd63ded965c85b2fbeacf7d80da"
+  integrity sha512-CddHecz5dt0ngTjGPP1uYr9Tjl4qq5rEKNk8UGb8XCdngNXI+GRYvqelD055FdiUgqODZz3R/5oZWYldPtXQpA==
+  dependencies:
+    execa "^5.1.1"
+
 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"
@@ -14466,7 +14016,7 @@ xmlchars@^2.2.0:
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
-xtend@^4.0.0, xtend@^4.0.2, xtend@~4.0.1:
+xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
diff --git a/package.json b/package.json
index 484b0a4420..3f53dc9d16 100644
--- a/package.json
+++ b/package.json
@@ -3,12 +3,12 @@
     "cross-env": "^7.0.3",
     "husky": "^8.0.3"
   },
-  "engines" : { 
-    "node" : ">=16.19.0 <17.0.0"
+  "engines": {
+    "node": ">=18.16.0 <19.0.0"
   },
   "scripts": {
     "prepare": "husky install",
-    "// clean: stop and remove docker containers and database volume" : "",
+    "// clean: stop and remove docker containers and database volume": "",
     "clean": "docker compose -f compose.handler.yml down --remove-orphans; docker compose -f compose.employer.yml down --remove-orphans; docker compose -f compose.benefit.yml down --remove-orphans; docker rm -f $(docker ps -a -q); docker volume rm $(docker volume ls -q);",
     "// partial docker compose commands per service, dont use these straight. Use <service>:up, <service>:build or <service>:rebuild instead ": "",
     "benefit": "cross-env COMPOSE_HTTP_TIMEOUT=200 docker compose -f compose.benefit.yml",