diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 000000000..19f7f6833
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,22 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/typescript-node
+{
+	"name": "Node.js & TypeScript",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/typescript-node:1-20-bullseye"
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "yarn install",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}
diff --git a/firebase.json b/firebase.json
index 50521685f..0a07be0d6 100644
--- a/firebase.json
+++ b/firebase.json
@@ -20,7 +20,7 @@
             { "key" : "X-XSS-Protection", "value" : "1; mode=block" },
             {
               "key": "Content-Security-Policy",
-              "value": "default-src 'self'; frame-src 'self' *.gov.bc.ca *.hotjar.com *.googleapis.com https://*.nr-data.net https://*.newrelic.com https://*.cac1.pure.cloud; script-src 'self' 'unsafe-eval' 'unsafe-inline' *.gov.bc.ca *.hotjar.com *.googleapis.com https://*.nr-data.net https://*.newrelic.com https://*.cac1.pure.cloud; style-src 'self' 'unsafe-inline' *.cloudflare.com *.googleapis.com; font-src 'self' *.gov.bc.ca *.hotjar.com *.cloudflare.com *.googleapis.com *.gstatic.com *.jsdelivr.net; img-src 'self' data: *.hotjar.com https://*.cac1.pure.cloud; connect-src 'self' https://*.run.app *.gov.bc.ca *.launchdarkly.com *.hotjar.com *.postescanada-canadapost.ca *.sentry.io *.apigee.net wss://*.hotjar.com *.hotjar.io https://*.nr-data.net https://shyrka-prod-cac1.s3.ca-central-1.amazonaws.com https://*.newrelic.com https://*.cac1.pure.cloud wss://*.cac1.pure.cloud; manifest-src 'self'; media-src 'self' https://*.cac1.pure.cloud; object-src 'self' https://*.cac1.pure.cloud; child-src 'self' https://*.cac1.pure.cloud;"
+              "value": "default-src 'self'; frame-src 'self' *.gov.bc.ca *.hotjar.com *.googleapis.com https://*.nr-data.net https://*.newrelic.com https://*.cac1.pure.cloud; script-src 'self' 'unsafe-eval' 'unsafe-inline' *.gov.bc.ca *.hotjar.com *.googleapis.com https://*.nr-data.net https://*.newrelic.com https://*.cac1.pure.cloud; style-src 'self' 'unsafe-inline' *.cloudflare.com *.googleapis.com; font-src 'self' *.gov.bc.ca *.hotjar.com *.cloudflare.com *.googleapis.com *.gstatic.com *.jsdelivr.net; img-src 'self' data: *.hotjar.com https://*.cac1.pure.cloud; connect-src 'self' https://*.run.app *.gov.bc.ca wss://*.gov.bc.ca *.launchdarkly.com *.hotjar.com *.postescanada-canadapost.ca *.sentry.io *.apigee.net wss://*.hotjar.com *.hotjar.io https://*.nr-data.net https://shyrka-prod-cac1.s3.ca-central-1.amazonaws.com https://*.newrelic.com https://*.cac1.pure.cloud wss://*.cac1.pure.cloud; manifest-src 'self'; media-src 'self' https://*.cac1.pure.cloud; object-src 'self' https://*.cac1.pure.cloud; child-src 'self' https://*.cac1.pure.cloud;"
             },
             { "key": "Cache-Control", "value": "no-cache, no-store, must-revalidate"},
             { "key": "Pragma", "value": "no-cache"},
diff --git a/package-lock.json b/package-lock.json
index 91a2e3307..9d1277f28 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,28 +1,30 @@
 {
   "name": "business-filings-ui",
-  "version": "6.10.0",
+  "version": "8.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "business-filings-ui",
-      "version": "6.10.0",
+      "version": "8.0.0",
       "dependencies": {
         "@babel/compat-data": "^7.21.5",
-        "@bcrs-shared-components/base-address": "2.0.7",
+        "@bcrs-shared-components/base-address": "2.0.9",
         "@bcrs-shared-components/breadcrumb": "2.1.11",
         "@bcrs-shared-components/confirm-dialog": "1.2.1",
-        "@bcrs-shared-components/corp-type-module": "1.0.11",
+        "@bcrs-shared-components/corp-type-module": "1.0.14",
         "@bcrs-shared-components/court-order-poa": "2.1.4",
+        "@bcrs-shared-components/date-picker": "1.2.39",
         "@bcrs-shared-components/document-delivery": "1.2.1",
-        "@bcrs-shared-components/enums": "1.0.50",
-        "@bcrs-shared-components/expandable-help": "^1.0.0",
+        "@bcrs-shared-components/enums": "1.1.4",
+        "@bcrs-shared-components/expandable-help": "1.0.1",
         "@bcrs-shared-components/folio-number-input": "1.1.18",
-        "@bcrs-shared-components/interfaces": "1.0.75",
-        "@bcrs-shared-components/mixins": "1.1.25",
+        "@bcrs-shared-components/interfaces": "1.1.2",
+        "@bcrs-shared-components/mixins": "1.1.30",
         "@bcrs-shared-components/staff-comments": "1.3.11",
         "@bcrs-shared-components/staff-payment": "2.1.11",
         "@mdi/font": "^5.9.55",
+        "@reactivex/rxjs": "^6.6.7",
         "@sentry/integrations": "^7.50.0",
         "@sentry/vue": "^7.50.0",
         "axios": "^0.27.2",
@@ -39,6 +41,7 @@
         "qrcode.vue": "1.7.0",
         "regenerator-runtime": "^0.13.11",
         "register-service-worker": "^1.7.2",
+        "rxjs": "^7.8.1",
         "sbc-common-components": "3.0.8",
         "vue": "2.7.14",
         "vue-affix": "^0.5.2",
@@ -71,7 +74,7 @@
         "sass": "^1.55.0",
         "sinon": "^14.0.2",
         "typescript": "4.5.5",
-        "vite": "4.3.9",
+        "vite": "4.5.2",
         "vite-plugin-environment": "^1.1.3",
         "vitest": "0.33.0",
         "vue-class-component": "^7.2.6",
@@ -85,18 +88,16 @@
     },
     "node_modules/@aashutoshrathi/word-wrap": {
       "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
-      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.0",
         "@jridgewell/trace-mapping": "^0.3.9"
@@ -107,35 +108,31 @@
     },
     "node_modules/@babel/code-frame": {
       "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/highlight": "^7.10.4"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz",
-      "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==",
+      "version": "7.23.2",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
       "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
       "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
-      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.22.20",
         "chalk": "^2.4.2",
@@ -147,9 +144,8 @@
     },
     "node_modules/@babel/highlight/node_modules/ansi-styles": {
       "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^1.9.0"
       },
@@ -159,9 +155,8 @@
     },
     "node_modules/@babel/highlight/node_modules/chalk": {
       "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -173,42 +168,37 @@
     },
     "node_modules/@babel/highlight/node_modules/color-convert": {
       "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "1.1.3"
       }
     },
     "node_modules/@babel/highlight/node_modules/color-name": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
     },
     "node_modules/@babel/highlight/node_modules/has-flag": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/@babel/highlight/node_modules/supports-color": {
       "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^3.0.0"
       },
@@ -218,8 +208,7 @@
     },
     "node_modules/@babel/parser": {
       "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
-      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
+      "license": "MIT",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -229,16 +218,15 @@
     },
     "node_modules/@bcoe/v8-coverage": {
       "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@bcrs-shared-components/base-address": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/base-address/-/base-address-2.0.7.tgz",
-      "integrity": "sha512-8BEklPFUkbXkdWS1p4NItQS+ZRJSh4WppmuJp98iZmR/4EFe+olSjACdEEA0q4X+5uRnoYoYHdrusN1jDM5kIQ==",
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/base-address/-/base-address-2.0.9.tgz",
+      "integrity": "sha512-0vAFlzWxBLU1Pxv+eDJ1mrHjOfk45jG9wtY1HJ82SyViVK0kvZWI1AOzWaVQ+p/1WU6+60OR8uhyixzUwggAjQ==",
       "dependencies": {
-        "@bcrs-shared-components/mixins": "^1.1.25",
+        "@bcrs-shared-components/mixins": "^1.1.27",
         "lodash.uniqueid": "^4.0.1",
         "vue": "^2.7.14",
         "vuelidate": "0.6.2"
@@ -246,8 +234,6 @@
     },
     "node_modules/@bcrs-shared-components/breadcrumb": {
       "version": "2.1.11",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/breadcrumb/-/breadcrumb-2.1.11.tgz",
-      "integrity": "sha512-p3rxQqchkbbXFIISoXRVQ0fOIzLT4kzxdp+WVrgwVlQAb0SrNEDJC/XNc850mLJUlt/N5uI9debf5+ItQtytlA==",
       "dependencies": {
         "@bcrs-shared-components/interfaces": "^1.0.54",
         "vue-property-decorator": "^9.1.2"
@@ -255,80 +241,106 @@
     },
     "node_modules/@bcrs-shared-components/confirm-dialog": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/confirm-dialog/-/confirm-dialog-1.2.1.tgz",
-      "integrity": "sha512-cwCj01zXavyvS/7VQiBFfU5GlZXrSP+A3BJus35xDjYscduTPsszA86+AWKeR6KBmq+GNjSC9RlxsY613ocD7w==",
       "dependencies": {
         "vue-property-decorator": "^9.1.2"
       }
     },
     "node_modules/@bcrs-shared-components/corp-type-module": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/corp-type-module/-/corp-type-module-1.0.11.tgz",
-      "integrity": "sha512-+iE3qiySSafiA311m14DuoG9Rq/ranBJNT7Kf7KQ9dJFDNNuTA326pCGwKBeuT1L6pFpGeibXGE+vQ0AYnSPUA=="
+      "version": "1.0.14",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/corp-type-module/-/corp-type-module-1.0.14.tgz",
+      "integrity": "sha512-SZhJw4hpqQT2BL3RuVB0Z1hmShhrv5byhH4gnaF1fVl9jsUGkjC/Ytic08UnEX4DIyR1/VWNyjTclNgxi9+0Bw=="
     },
     "node_modules/@bcrs-shared-components/court-order-poa": {
       "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/court-order-poa/-/court-order-poa-2.1.4.tgz",
-      "integrity": "sha512-dw2eMvs5DBa7E6WTymgUbLRoeTsr4Zlmx4CzViA4cIU5fePrppoNcP4IGz38ep9FRUoq7zKz8j5lBSJi+U/xAw==",
       "dependencies": {
         "@bcrs-shared-components/interfaces": "^1.0.47",
         "vue-property-decorator": "^9.1.2"
       }
     },
+    "node_modules/@bcrs-shared-components/date-picker": {
+      "version": "1.2.39",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/date-picker/-/date-picker-1.2.39.tgz",
+      "integrity": "sha512-cVNsEHAXAD7A0bqwAS4PQU47AqvBsnIU2xirnyUmPSEykXlkHzKQaPQFx1Y6q0oJ6a1Lc31/y3/CBs19rE2gow==",
+      "dependencies": {
+        "@bcrs-shared-components/interfaces": "^1.1.2",
+        "@bcrs-shared-components/mixins": "^1.1.30",
+        "vue": "^2.7.14"
+      }
+    },
+    "node_modules/@bcrs-shared-components/date-picker/node_modules/@bcrs-shared-components/corp-type-module": {
+      "version": "1.0.14",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/corp-type-module/-/corp-type-module-1.0.14.tgz",
+      "integrity": "sha512-SZhJw4hpqQT2BL3RuVB0Z1hmShhrv5byhH4gnaF1fVl9jsUGkjC/Ytic08UnEX4DIyR1/VWNyjTclNgxi9+0Bw=="
+    },
+    "node_modules/@bcrs-shared-components/date-picker/node_modules/@bcrs-shared-components/interfaces": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.1.2.tgz",
+      "integrity": "sha512-MMZISHIbTkQ86PGWmGqo0aLlRjpRVJ1WOP0R99gay4fjpzylPgrNO/aYHWj7nyT0zeIEQ1g/aCW5UaUCIHHm8w==",
+      "dependencies": {
+        "@bcrs-shared-components/corp-type-module": "^1.0.14",
+        "@bcrs-shared-components/enums": "^1.1.2",
+        "vue": "^2.7.14"
+      }
+    },
+    "node_modules/@bcrs-shared-components/date-picker/node_modules/@bcrs-shared-components/mixins": {
+      "version": "1.1.30",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/mixins/-/mixins-1.1.30.tgz",
+      "integrity": "sha512-piKdDz93Xv2np32k9Gm2S3HScicOtCctR+yPy5rgo2j9kLM5DoUrXFv8ptHiFoSx55EF+jd5c0lzIXYTIjZaYQ==",
+      "dependencies": {
+        "@bcrs-shared-components/enums": "^1.1.2",
+        "@bcrs-shared-components/interfaces": "^1.1.2",
+        "country-list": "^2.3.0",
+        "lodash": "4.17.21",
+        "provinces": "^1.11.0",
+        "vue": "^2.7.14"
+      }
+    },
     "node_modules/@bcrs-shared-components/document-delivery": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/document-delivery/-/document-delivery-1.2.1.tgz",
-      "integrity": "sha512-jzbBvhKzgJb1v/+WdFOzqDNU+9yZGxr+YtSd4KC3lsa1qTIBsyIGjY5o323K1hnJdVDoHljWoN0gdBTc6TlBdg==",
       "dependencies": {
         "vue-property-decorator": "^9.1.2"
       }
     },
     "node_modules/@bcrs-shared-components/enums": {
-      "version": "1.0.50",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.0.50.tgz",
-      "integrity": "sha512-a2FnvCt1Vb0PHdYzPW8oa7+956sUz4lUIzFMvgryJF1T+jop+RK3RM/aEfn2fath8PRWCRs9AqL6PMGTAyNcxw==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.1.4.tgz",
+      "integrity": "sha512-EwHjFTfIiOJLzU3yWSPJnxfplF+cgQSPGFE+6T1jo/7aVpLPMw/cSSGi3cJIr3h7SjyQd8wTxsFP4QDVgCrH7A==",
       "dependencies": {
-        "@bcrs-shared-components/corp-type-module": "^1.0.13"
+        "@bcrs-shared-components/corp-type-module": "^1.0.14"
       }
     },
-    "node_modules/@bcrs-shared-components/enums/node_modules/@bcrs-shared-components/corp-type-module": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/corp-type-module/-/corp-type-module-1.0.13.tgz",
-      "integrity": "sha512-Wa8H/bxo8GAlcG7YdiP4zl1wzqxewiCO0TC+pBaYUc4+eufuInlS3yYFa9MFg8+vIL/pDfamRtXqdg1I6C6QYA=="
-    },
     "node_modules/@bcrs-shared-components/expandable-help": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/expandable-help/-/expandable-help-1.0.0.tgz",
-      "integrity": "sha512-UsjE87YDfZqldplKSR6kzdcQUitz+rP4IyWmwy0qxR97xICzdOT3V4e5258QLEuDwcPt8ZudIZvbR5i80vTWJg==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/expandable-help/-/expandable-help-1.0.1.tgz",
+      "integrity": "sha512-XhSYX1sSpoBUfCg5AoTe/1fKuOOtxuhhykhefRw8r+j34GK4hTJzeHYaUJBbXD87r2RkdITu3IFS4kA1yZm3OA==",
       "dependencies": {
         "vue": "^2.7.14"
       }
     },
     "node_modules/@bcrs-shared-components/folio-number-input": {
       "version": "1.1.18",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/folio-number-input/-/folio-number-input-1.1.18.tgz",
-      "integrity": "sha512-e1nqsuZTwPIKWHQROnQVw2gOThBPYnRw14F3CRROf5+4yugBBEjvyvAo+s//JnXRTTCSQky5JesQDu6U3LEU6w==",
       "dependencies": {
         "@bcrs-shared-components/interfaces": "^1.0.61",
         "vue-property-decorator": "^9.1.2"
       }
     },
     "node_modules/@bcrs-shared-components/interfaces": {
-      "version": "1.0.75",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.0.75.tgz",
-      "integrity": "sha512-duTiywSNipho1mfdJGj8K+r5MgsNMU06rP5T9wIVPhtUsq/u+8QTRIqr6JD565kFbSvWGFo/HZhqtpVaAmp6/w==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.1.2.tgz",
+      "integrity": "sha512-MMZISHIbTkQ86PGWmGqo0aLlRjpRVJ1WOP0R99gay4fjpzylPgrNO/aYHWj7nyT0zeIEQ1g/aCW5UaUCIHHm8w==",
       "dependencies": {
-        "@bcrs-shared-components/enums": "^1.0.50",
+        "@bcrs-shared-components/corp-type-module": "^1.0.14",
+        "@bcrs-shared-components/enums": "^1.1.2",
         "vue": "^2.7.14"
       }
     },
     "node_modules/@bcrs-shared-components/mixins": {
-      "version": "1.1.25",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/mixins/-/mixins-1.1.25.tgz",
-      "integrity": "sha512-GGA75o+O+IlUJPDlGQPtYIIIYpYps7KBULEED0SISLZw/kuM4tT6/TeIvDSdvNNxWo7KyDQQnq2R7Sq5nRZuoQ==",
+      "version": "1.1.30",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/mixins/-/mixins-1.1.30.tgz",
+      "integrity": "sha512-piKdDz93Xv2np32k9Gm2S3HScicOtCctR+yPy5rgo2j9kLM5DoUrXFv8ptHiFoSx55EF+jd5c0lzIXYTIjZaYQ==",
       "dependencies": {
-        "@bcrs-shared-components/enums": "^1.0.50",
-        "@bcrs-shared-components/interfaces": "^1.0.75",
+        "@bcrs-shared-components/enums": "^1.1.2",
+        "@bcrs-shared-components/interfaces": "^1.1.2",
         "country-list": "^2.3.0",
         "lodash": "4.17.21",
         "provinces": "^1.11.0",
@@ -337,8 +349,6 @@
     },
     "node_modules/@bcrs-shared-components/staff-comments": {
       "version": "1.3.11",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/staff-comments/-/staff-comments-1.3.11.tgz",
-      "integrity": "sha512-ZncZwiWV4j+siL4Z73mXVkdqCvBMVpqAA5RQBwTry9OlygCFGNPpHNbCkyEkquuTG0kEgz29t4W9wyJqNI1qfQ==",
       "dependencies": {
         "@bcrs-shared-components/interfaces": "^1.0.54",
         "vue-property-decorator": "^9.1.2"
@@ -346,8 +356,6 @@
     },
     "node_modules/@bcrs-shared-components/staff-payment": {
       "version": "2.1.11",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/staff-payment/-/staff-payment-2.1.11.tgz",
-      "integrity": "sha512-n/KpfyvsfU0C7FeRIg/BIKNZR8nq9qFP/cujNfpgcPIpDEnUPeeHEVvgcPHiTOqa/c+/9L+bIppbMvlPPvg5yg==",
       "dependencies": {
         "@bcrs-shared-components/enums": "^1.0.33",
         "@bcrs-shared-components/folio-number-input": "^1.1.11",
@@ -356,9 +364,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.19.tgz",
-      "integrity": "sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz",
+      "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==",
       "cpu": [
         "arm"
       ],
@@ -372,9 +380,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz",
-      "integrity": "sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz",
+      "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==",
       "cpu": [
         "arm64"
       ],
@@ -388,9 +396,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.19.tgz",
-      "integrity": "sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz",
+      "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==",
       "cpu": [
         "x64"
       ],
@@ -404,9 +412,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz",
-      "integrity": "sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz",
+      "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==",
       "cpu": [
         "arm64"
       ],
@@ -420,9 +428,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz",
-      "integrity": "sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz",
+      "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==",
       "cpu": [
         "x64"
       ],
@@ -436,9 +444,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz",
-      "integrity": "sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz",
+      "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==",
       "cpu": [
         "arm64"
       ],
@@ -452,9 +460,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz",
-      "integrity": "sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz",
+      "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==",
       "cpu": [
         "x64"
       ],
@@ -468,9 +476,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz",
-      "integrity": "sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz",
+      "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==",
       "cpu": [
         "arm"
       ],
@@ -484,9 +492,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz",
-      "integrity": "sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz",
+      "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==",
       "cpu": [
         "arm64"
       ],
@@ -500,9 +508,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz",
-      "integrity": "sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz",
+      "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==",
       "cpu": [
         "ia32"
       ],
@@ -516,9 +524,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz",
-      "integrity": "sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz",
+      "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==",
       "cpu": [
         "loong64"
       ],
@@ -532,9 +540,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz",
-      "integrity": "sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz",
+      "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==",
       "cpu": [
         "mips64el"
       ],
@@ -548,9 +556,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz",
-      "integrity": "sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz",
+      "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==",
       "cpu": [
         "ppc64"
       ],
@@ -564,9 +572,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz",
-      "integrity": "sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz",
+      "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==",
       "cpu": [
         "riscv64"
       ],
@@ -580,9 +588,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz",
-      "integrity": "sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz",
+      "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==",
       "cpu": [
         "s390x"
       ],
@@ -596,9 +604,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz",
-      "integrity": "sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz",
+      "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==",
       "cpu": [
         "x64"
       ],
@@ -612,9 +620,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz",
-      "integrity": "sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz",
+      "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==",
       "cpu": [
         "x64"
       ],
@@ -628,9 +636,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz",
-      "integrity": "sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz",
+      "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==",
       "cpu": [
         "x64"
       ],
@@ -644,9 +652,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz",
-      "integrity": "sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz",
+      "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==",
       "cpu": [
         "x64"
       ],
@@ -660,9 +668,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz",
-      "integrity": "sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz",
+      "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==",
       "cpu": [
         "arm64"
       ],
@@ -676,9 +684,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz",
-      "integrity": "sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz",
+      "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==",
       "cpu": [
         "ia32"
       ],
@@ -692,9 +700,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz",
-      "integrity": "sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz",
+      "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==",
       "cpu": [
         "x64"
       ],
@@ -709,9 +717,8 @@
     },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eslint-visitor-keys": "^3.3.0"
       },
@@ -723,19 +730,17 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.9.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.0.tgz",
-      "integrity": "sha512-zJmuCWj2VLBt4c25CfBIbMZLGLyhkvs7LznyVX5HfpzeocThgIj5XQK4L+g3U36mMcx8bPMhGyPpwCATamC4jQ==",
+      "version": "4.10.0",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
     "node_modules/@eslint/eslintrc": {
       "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
-      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.1.1",
@@ -753,27 +758,24 @@
     },
     "node_modules/@eslint/eslintrc/node_modules/ignore": {
       "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.50.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz",
-      "integrity": "sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==",
+      "version": "8.52.0",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
     "node_modules/@humanwhocodes/config-array": {
       "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
-      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.0",
         "debug": "^4.1.1",
@@ -785,9 +787,8 @@
     },
     "node_modules/@humanwhocodes/module-importer": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=12.22"
       },
@@ -798,24 +799,21 @@
     },
     "node_modules/@humanwhocodes/object-schema": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/@istanbuljs/schema": {
       "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@jest/schemas": {
       "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
-      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@sinclair/typebox": "^0.27.8"
       },
@@ -825,9 +823,8 @@
     },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/set-array": "^1.0.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -839,92 +836,42 @@
     },
     "node_modules/@jridgewell/resolve-uri": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
-      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/set-array": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.19",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
-      "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
+      "version": "0.3.20",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
-    "node_modules/@mapbox/node-pre-gyp": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
-      "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==",
-      "optional": true,
-      "dependencies": {
-        "detect-libc": "^2.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "make-dir": "^3.1.0",
-        "node-fetch": "^2.6.7",
-        "nopt": "^5.0.0",
-        "npmlog": "^5.0.1",
-        "rimraf": "^3.0.2",
-        "semver": "^7.3.5",
-        "tar": "^6.1.11"
-      },
-      "bin": {
-        "node-pre-gyp": "bin/node-pre-gyp"
-      }
-    },
-    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "optional": true,
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "optional": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/@mdi/font": {
       "version": "5.9.55",
-      "resolved": "https://registry.npmjs.org/@mdi/font/-/font-5.9.55.tgz",
-      "integrity": "sha512-jswRF6q3eq8NWpWiqct6q+6Fg/I7nUhrxYJfiEM8JJpap0wVJLQdbKtyS65GdlK7S7Ytnx3TTi/bmw+tBhkGmg=="
+      "license": "Apache-2.0"
     },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
@@ -935,18 +882,16 @@
     },
     "node_modules/@nodelib/fs.stat": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/@nodelib/fs.walk": {
       "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -957,15 +902,13 @@
     },
     "node_modules/@one-ini/wasm": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz",
-      "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@pinia/testing": {
       "version": "0.0.16",
-      "resolved": "https://registry.npmjs.org/@pinia/testing/-/testing-0.0.16.tgz",
-      "integrity": "sha512-oa5kO82hzWekqMq1HTnS/b+ZM+ZKEcEApuuCTelvKK79jTxg7P026Qw8/2RbVn5eUGAvRWQu4ubObrshVqCRjQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "vue-demi": "*"
       },
@@ -978,10 +921,9 @@
     },
     "node_modules/@pinia/testing/node_modules/vue-demi": {
       "version": "0.14.6",
-      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.6.tgz",
-      "integrity": "sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "bin": {
         "vue-demi-fix": "bin/vue-demi-fix.js",
         "vue-demi-switch": "bin/vue-demi-switch.js"
@@ -1002,106 +944,104 @@
         }
       }
     },
+    "node_modules/@reactivex/rxjs": {
+      "version": "6.6.7",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
     "node_modules/@sentry-internal/tracing": {
-      "version": "7.72.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.72.0.tgz",
-      "integrity": "sha512-DToryaRSHk9R5RLgN4ktYEXZjQdqncOAWPqyyIurji8lIobXFRfmLtGL1wjoCK6sQNgWsjhSM9kXxwGnva1DNw==",
+      "version": "7.77.0",
+      "license": "MIT",
       "dependencies": {
-        "@sentry/core": "7.72.0",
-        "@sentry/types": "7.72.0",
-        "@sentry/utils": "7.72.0",
-        "tslib": "^2.4.1 || ^1.9.3"
+        "@sentry/core": "7.77.0",
+        "@sentry/types": "7.77.0",
+        "@sentry/utils": "7.77.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@sentry/browser": {
-      "version": "7.72.0",
-      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.72.0.tgz",
-      "integrity": "sha512-fcFDTzqhPd3VZAmmYW3KvBTBaEfrKjPmRhlAsfhkGWYLCHqVkNtzsFER4cmUNRGNxjyt9tcG3WlTTqgLRucycQ==",
+      "version": "7.77.0",
+      "license": "MIT",
       "dependencies": {
-        "@sentry-internal/tracing": "7.72.0",
-        "@sentry/core": "7.72.0",
-        "@sentry/replay": "7.72.0",
-        "@sentry/types": "7.72.0",
-        "@sentry/utils": "7.72.0",
-        "tslib": "^2.4.1 || ^1.9.3"
+        "@sentry-internal/tracing": "7.77.0",
+        "@sentry/core": "7.77.0",
+        "@sentry/replay": "7.77.0",
+        "@sentry/types": "7.77.0",
+        "@sentry/utils": "7.77.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@sentry/core": {
-      "version": "7.72.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.72.0.tgz",
-      "integrity": "sha512-G03JdQ5ZsFNRjcNNi+QvCjqOuBvYqU92Gs1T2iK3GE8dSBTu2khThydMpG4xrKZQLIpHOyiIhlFZiuPtZ66W8w==",
+      "version": "7.77.0",
+      "license": "MIT",
       "dependencies": {
-        "@sentry/types": "7.72.0",
-        "@sentry/utils": "7.72.0",
-        "tslib": "^2.4.1 || ^1.9.3"
+        "@sentry/types": "7.77.0",
+        "@sentry/utils": "7.77.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@sentry/integrations": {
-      "version": "7.72.0",
-      "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.72.0.tgz",
-      "integrity": "sha512-ay2WgLtjsr0WS8+N7i7VmKzondoZRh3ISx8rb91LjmVrDNu8baleZAB59jkKe/JSy0gYh99umJuptc2te/65+A==",
+      "version": "7.77.0",
+      "license": "MIT",
       "dependencies": {
-        "@sentry/types": "7.72.0",
-        "@sentry/utils": "7.72.0",
-        "localforage": "^1.8.1",
-        "tslib": "^2.4.1 || ^1.9.3"
+        "@sentry/core": "7.77.0",
+        "@sentry/types": "7.77.0",
+        "@sentry/utils": "7.77.0",
+        "localforage": "^1.8.1"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@sentry/replay": {
-      "version": "7.72.0",
-      "resolved": "https://registry.npmjs.org/@sentry/replay/-/replay-7.72.0.tgz",
-      "integrity": "sha512-dHH/mYCFBwJ/kYmL9L5KihjwQKcefiuvcH0otHSwKSpbbeEoM/BV+SHQoYGd6OMSYnL9fq1dHfF7Zo26p5Yu0Q==",
+      "version": "7.77.0",
+      "license": "MIT",
       "dependencies": {
-        "@sentry/core": "7.72.0",
-        "@sentry/types": "7.72.0",
-        "@sentry/utils": "7.72.0"
+        "@sentry-internal/tracing": "7.77.0",
+        "@sentry/core": "7.77.0",
+        "@sentry/types": "7.77.0",
+        "@sentry/utils": "7.77.0"
       },
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@sentry/types": {
-      "version": "7.72.0",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.72.0.tgz",
-      "integrity": "sha512-g6u0mk62yGshx02rfFADIfyR/S9VXcf3RG2qQPuvykrWtOfN/BOTrZypF7I+MiqKwRW76r3Pcu2C/AB+6z9XQA==",
+      "version": "7.77.0",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@sentry/utils": {
-      "version": "7.72.0",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.72.0.tgz",
-      "integrity": "sha512-o/MtqI7WJXuswidH0bSgBP40KN2lrnyQEIx5uoyJUJi/QEaboIsqbxU62vaFJpde8SYrbA+rTnP3J3ujF2gUag==",
+      "version": "7.77.0",
+      "license": "MIT",
       "dependencies": {
-        "@sentry/types": "7.72.0",
-        "tslib": "^2.4.1 || ^1.9.3"
+        "@sentry/types": "7.77.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@sentry/vue": {
-      "version": "7.72.0",
-      "resolved": "https://registry.npmjs.org/@sentry/vue/-/vue-7.72.0.tgz",
-      "integrity": "sha512-XTJK7C8WH370jBhXzKwPS3TgG5w5tT+qW25IQ+ypyBv4vclcaKeeGMlIehuH2n3hVI9ut/f4Wjj1EwCrQE4ORw==",
+      "version": "7.77.0",
+      "license": "MIT",
       "dependencies": {
-        "@sentry/browser": "7.72.0",
-        "@sentry/core": "7.72.0",
-        "@sentry/types": "7.72.0",
-        "@sentry/utils": "7.72.0",
-        "tslib": "^2.4.1 || ^1.9.3"
+        "@sentry/browser": "7.77.0",
+        "@sentry/core": "7.77.0",
+        "@sentry/types": "7.77.0",
+        "@sentry/utils": "7.77.0"
       },
       "engines": {
         "node": ">=8"
@@ -1112,42 +1052,37 @@
     },
     "node_modules/@sinclair/typebox": {
       "version": "0.27.8",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@sinonjs/commons": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz",
-      "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "type-detect": "4.0.8"
       }
     },
     "node_modules/@sinonjs/fake-timers": {
       "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz",
-      "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@sinonjs/commons": "^1.7.0"
       }
     },
     "node_modules/@sinonjs/fake-timers/node_modules/@sinonjs/commons": {
       "version": "1.8.6",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
-      "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "type-detect": "4.0.8"
       }
     },
     "node_modules/@sinonjs/samsam": {
       "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-7.0.1.tgz",
-      "integrity": "sha512-zsAk2Jkiq89mhZovB2LLOdTCxJF4hqqTToGP0ASWlhp4I1hqOjcfmZGafXntCN7MDC6yySH0mFHrYtHceOeLmw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@sinonjs/commons": "^2.0.0",
         "lodash.get": "^4.4.2",
@@ -1156,108 +1091,96 @@
     },
     "node_modules/@sinonjs/text-encoding": {
       "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz",
-      "integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==",
-      "dev": true
+      "dev": true,
+      "license": "(Unlicense OR Apache-2.0)"
     },
     "node_modules/@tootallnate/once": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
     },
     "node_modules/@types/chai": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.6.tgz",
-      "integrity": "sha512-VOVRLM1mBxIRxydiViqPcKn6MIxZytrbMpd6RJLIWKxUNr3zux8no0Oc7kJx0WAPIitgZ0gkrDS+btlqQpubpw==",
-      "dev": true
+      "version": "4.3.9",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/chai-subset": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@types/chai-subset/-/chai-subset-1.3.3.tgz",
-      "integrity": "sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==",
+      "version": "1.3.4",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/chai": "*"
       }
     },
     "node_modules/@types/istanbul-lib-coverage": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
-      "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==",
-      "dev": true
+      "version": "2.0.5",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/json-schema": {
-      "version": "7.0.13",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz",
-      "integrity": "sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==",
-      "dev": true
+      "version": "7.0.14",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/json5": {
       "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/lodash": {
-      "version": "4.14.199",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.199.tgz",
-      "integrity": "sha512-Vrjz5N5Ia4SEzWWgIVwnHNEnb1UE1XMkvY5DGXrAeOGE9imk0hgTHh5GyDjLDJi9OTCn9oo9dXH1uToK1VRfrg==",
-      "dev": true
+      "version": "4.14.200",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "20.7.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.7.1.tgz",
-      "integrity": "sha512-LT+OIXpp2kj4E2S/p91BMe+VgGX2+lfO+XTpfXhh+bCk2LkQtHZSub8ewFBMGP5ClysPjTDFa4sMI8Q3n4T0wg==",
-      "dev": true
+      "version": "20.8.10",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
     },
     "node_modules/@types/semver": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.3.tgz",
-      "integrity": "sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==",
-      "dev": true
+      "version": "7.5.4",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/sinon": {
-      "version": "10.0.17",
-      "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.17.tgz",
-      "integrity": "sha512-+6ILpcixQ0Ma3dHMTLv4rSycbDXkDljgKL+E0nI2RUxxhYTFyPSjt6RVMxh7jUshvyVcBvicb0Ktj+lAJcjgeA==",
+      "version": "10.0.20",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/sinonjs__fake-timers": "*"
       }
     },
     "node_modules/@types/sinonjs__fake-timers": {
-      "version": "8.1.3",
-      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.3.tgz",
-      "integrity": "sha512-4g+2YyWe0Ve+LBh+WUm1697PD0Kdi6coG1eU0YjQbwx61AZ8XbEpL1zIT6WjuUKrCMCROpEaYQPDjBnDouBVAQ==",
-      "dev": true
+      "version": "8.1.4",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/vue-the-mask": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/@types/vue-the-mask/-/vue-the-mask-0.11.2.tgz",
-      "integrity": "sha512-8XXSMyic/jLMJspzSkxILpF6P2p+lkp2T9DH/MyW/AlKuTDv6uWkObfwLM0lMiOzmYeQgM6clWHF4SRoDKrV8Q==",
+      "version": "0.11.4",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "vue": "^2.6.10"
       }
     },
     "node_modules/@types/vuelidate": {
-      "version": "0.7.19",
-      "resolved": "https://registry.npmjs.org/@types/vuelidate/-/vuelidate-0.7.19.tgz",
-      "integrity": "sha512-fXVthNVCuWurszolIxi5CML9jbwXDq1ZwYgt0aQR8zBZ0UjcFcn8oyQie4zykjBAiyzExlEoGktzYy0/xc5BlA==",
+      "version": "0.7.20",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "vue": "^2.6.11"
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
-      "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.4.0",
         "@typescript-eslint/scope-manager": "5.62.0",
@@ -1289,9 +1212,8 @@
     },
     "node_modules/@typescript-eslint/parser": {
       "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
-      "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "@typescript-eslint/scope-manager": "5.62.0",
         "@typescript-eslint/types": "5.62.0",
@@ -1316,9 +1238,8 @@
     },
     "node_modules/@typescript-eslint/scope-manager": {
       "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
-      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/types": "5.62.0",
         "@typescript-eslint/visitor-keys": "5.62.0"
@@ -1333,9 +1254,8 @@
     },
     "node_modules/@typescript-eslint/type-utils": {
       "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz",
-      "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/typescript-estree": "5.62.0",
         "@typescript-eslint/utils": "5.62.0",
@@ -1360,9 +1280,8 @@
     },
     "node_modules/@typescript-eslint/types": {
       "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
-      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -1373,9 +1292,8 @@
     },
     "node_modules/@typescript-eslint/typescript-estree": {
       "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
-      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "@typescript-eslint/types": "5.62.0",
         "@typescript-eslint/visitor-keys": "5.62.0",
@@ -1400,9 +1318,8 @@
     },
     "node_modules/@typescript-eslint/utils": {
       "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
-      "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@types/json-schema": "^7.0.9",
@@ -1426,9 +1343,8 @@
     },
     "node_modules/@typescript-eslint/visitor-keys": {
       "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
-      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/types": "5.62.0",
         "eslint-visitor-keys": "^3.3.0"
@@ -1441,11 +1357,15 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.2.0",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/@vitejs/plugin-vue2": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue2/-/plugin-vue2-2.2.0.tgz",
-      "integrity": "sha512-1km7zEuZ/9QRPvzXSjikbTYGQPG86Mq1baktpC4sXqsXlb02HQKfi+fl8qVS703JM7cgm24Ga9j+RwKmvFn90A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^14.18.0 || >= 16.0.0"
       },
@@ -1455,10 +1375,9 @@
       }
     },
     "node_modules/@vitest/coverage-v8": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-0.34.5.tgz",
-      "integrity": "sha512-97xjhRTSdmeeHCm2nNHhT3hLsMYkAhHXm/rwj6SZ3voka8xiCJrwgtfIjoZIFEL4OO0KezGmVuHWQXcMunULIA==",
+      "version": "0.34.6",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.1",
         "@bcoe/v8-coverage": "^0.2.3",
@@ -1481,9 +1400,8 @@
     },
     "node_modules/@vitest/expect": {
       "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.33.0.tgz",
-      "integrity": "sha512-sVNf+Gla3mhTCxNJx+wJLDPp/WcstOe0Ksqz4Vec51MmgMth/ia0MGFEkIZmVGeTL5HtjYR4Wl/ZxBxBXZJTzQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@vitest/spy": "0.33.0",
         "@vitest/utils": "0.33.0",
@@ -1495,9 +1413,8 @@
     },
     "node_modules/@vitest/runner": {
       "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.33.0.tgz",
-      "integrity": "sha512-UPfACnmCB6HKRHTlcgCoBh6ppl6fDn+J/xR8dTufWiKt/74Y9bHci5CKB8tESSV82zKYtkBJo9whU3mNvfaisg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@vitest/utils": "0.33.0",
         "p-limit": "^4.0.0",
@@ -1509,9 +1426,8 @@
     },
     "node_modules/@vitest/snapshot": {
       "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-0.33.0.tgz",
-      "integrity": "sha512-tJjrl//qAHbyHajpFvr8Wsk8DIOODEebTu7pgBrP07iOepR5jYkLFiqLq2Ltxv+r0uptUb4izv1J8XBOwKkVYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "magic-string": "^0.30.1",
         "pathe": "^1.1.1",
@@ -1523,9 +1439,8 @@
     },
     "node_modules/@vitest/spy": {
       "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.33.0.tgz",
-      "integrity": "sha512-Kv+yZ4hnH1WdiAkPUQTpRxW8kGtH8VRTnus7ZTGovFYM1ZezJpvGtb9nPIjPnptHbsyIAxYZsEpVPYgtpjGnrg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "tinyspy": "^2.1.1"
       },
@@ -1535,9 +1450,8 @@
     },
     "node_modules/@vitest/utils": {
       "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.33.0.tgz",
-      "integrity": "sha512-pF1w22ic965sv+EN6uoePkAOTkAPWM03Ri/jXNyMIKBb/XHLDPfhLvf/Fa9g0YECevAIz56oVYXhodLvLQ/awA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "diff-sequences": "^29.4.3",
         "loupe": "^2.3.6",
@@ -1568,14 +1482,11 @@
     },
     "node_modules/@vscode/l10n": {
       "version": "0.0.16",
-      "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.16.tgz",
-      "integrity": "sha512-JT5CvrIYYCrmB+dCana8sUqJEcGB1ZDXNLMQ2+42bW995WmNoenijWMUdZfwmuQUTQcEVVIa2OecZzTYWUW9Cg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@vue/compiler-sfc": {
       "version": "2.7.14",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz",
-      "integrity": "sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==",
       "dependencies": {
         "@babel/parser": "^7.18.4",
         "postcss": "^8.4.14",
@@ -1583,15 +1494,13 @@
       }
     },
     "node_modules/@vue/devtools-api": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.5.0.tgz",
-      "integrity": "sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q=="
+      "version": "6.5.1",
+      "license": "MIT"
     },
     "node_modules/@vue/eslint-config-standard": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@vue/eslint-config-standard/-/eslint-config-standard-4.0.0.tgz",
-      "integrity": "sha512-bQghq1cw1BuMRHNhr3tRpAJx1tpGy0QtajQX873kLtA9YVuOIoXR7nAWnTN09bBHnSUh2N288vMsqPi2fI4Hzg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eslint-config-standard": "^12.0.0",
         "eslint-plugin-import": "^2.14.0",
@@ -1602,9 +1511,8 @@
     },
     "node_modules/@vue/eslint-config-typescript": {
       "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-9.1.0.tgz",
-      "integrity": "sha512-j/852/ZYQ5wDvCD3HE2q4uqJwJAceer2FwoEch1nFo+zTOsPrbzbE3cuWIs3kvu5hdFsGTMYwRwjI6fqZKDMxQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "vue-eslint-parser": "^8.0.0"
       },
@@ -1620,9 +1528,8 @@
     },
     "node_modules/@vue/test-utils": {
       "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.3.6.tgz",
-      "integrity": "sha512-udMmmF1ts3zwxUJEIAj5ziioR900reDrt6C9H3XpWPsLBx2lpHKoA4BTdd9HNIYbkGltWw+JjWJ+5O6QBwiyEw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "dom-event-types": "^1.0.0",
         "lodash": "^4.17.15",
@@ -1635,21 +1542,18 @@
     },
     "node_modules/abab": {
       "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/abbrev": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "devOptional": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/acorn": {
       "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -1659,27 +1563,24 @@
     },
     "node_modules/acorn-jsx": {
       "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
     "node_modules/acorn-walk": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+      "version": "8.3.0",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
     },
     "node_modules/agent-base": {
       "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "devOptional": true,
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "4"
       },
@@ -1689,9 +1590,8 @@
     },
     "node_modules/ajv": {
       "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -1705,27 +1605,24 @@
     },
     "node_modules/ansi-colors": {
       "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
-      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/ansi-regex": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "devOptional": true,
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -1738,9 +1635,8 @@
     },
     "node_modules/anymatch": {
       "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -1749,39 +1645,18 @@
         "node": ">= 8"
       }
     },
-    "node_modules/aproba": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
-      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
-      "optional": true
-    },
-    "node_modules/are-we-there-yet": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
-      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
-      "optional": true,
-      "dependencies": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^3.6.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/argparse": {
       "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
     },
     "node_modules/array-buffer-byte-length": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
-      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "is-array-buffer": "^3.0.1"
@@ -1792,9 +1667,8 @@
     },
     "node_modules/array-includes": {
       "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz",
-      "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
@@ -1811,18 +1685,16 @@
     },
     "node_modules/array-union": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/array.prototype.findlastindex": {
       "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz",
-      "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
@@ -1839,9 +1711,8 @@
     },
     "node_modules/array.prototype.flat": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
-      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
@@ -1857,9 +1728,8 @@
     },
     "node_modules/array.prototype.flatmap": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
-      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
@@ -1875,9 +1745,8 @@
     },
     "node_modules/arraybuffer.prototype.slice": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz",
-      "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-buffer-byte-length": "^1.0.0",
         "call-bind": "^1.0.2",
@@ -1896,32 +1765,28 @@
     },
     "node_modules/assertion-error": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/astral-regex": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/asynckit": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+      "license": "MIT"
     },
     "node_modules/available-typed-arrays": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -1931,8 +1796,7 @@
     },
     "node_modules/axios": {
       "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
-      "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
+      "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.14.9",
         "form-data": "^4.0.0"
@@ -1940,14 +1804,11 @@
     },
     "node_modules/balanced-match": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "devOptional": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/base64-js": {
       "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
       "funding": [
         {
           "type": "github",
@@ -1961,28 +1822,26 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/binary-extensions": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/boolbase": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "devOptional": true,
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -1990,9 +1849,8 @@
     },
     "node_modules/braces": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fill-range": "^7.0.1"
       },
@@ -2002,30 +1860,28 @@
     },
     "node_modules/builtin-modules": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/cac": {
       "version": "6.7.14",
-      "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
-      "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "version": "1.0.5",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.1",
+        "set-function-length": "^1.1.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -2033,33 +1889,16 @@
     },
     "node_modules/callsites": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/canvas": {
-      "version": "2.11.2",
-      "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz",
-      "integrity": "sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==",
-      "hasInstallScript": true,
-      "optional": true,
-      "dependencies": {
-        "@mapbox/node-pre-gyp": "^1.0.0",
-        "nan": "^2.17.0",
-        "simple-get": "^3.0.3"
-      },
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/chai": {
       "version": "4.3.10",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz",
-      "integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "assertion-error": "^1.1.0",
         "check-error": "^1.0.3",
@@ -2075,9 +1914,8 @@
     },
     "node_modules/chalk": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -2091,18 +1929,16 @@
     },
     "node_modules/character-parser": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz",
-      "integrity": "sha512-+UqJQjFEFaTAs3bNsF2j2kEN1baG/zghZbdqoYEDxGZtJo9LBzl1A+m0D4n3qKx8N2FNv8/Xp6yV9mQmBuptaw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-regex": "^1.0.3"
       }
     },
     "node_modules/check-error": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
-      "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "get-func-name": "^2.0.2"
       },
@@ -2112,8 +1948,6 @@
     },
     "node_modules/chokidar": {
       "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
       "dev": true,
       "funding": [
         {
@@ -2121,6 +1955,7 @@
           "url": "https://paulmillr.com/funding/"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -2137,25 +1972,14 @@
         "fsevents": "~2.3.2"
       }
     },
-    "node_modules/chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "optional": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/clickout-event": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/clickout-event/-/clickout-event-1.1.2.tgz",
-      "integrity": "sha512-oGb80mX872OcwV5Rfz6khuolsi3cJHLGHmJ+Tvw9w6J3MejH5StPfFma+Z3rPhNZ+vCXnAo+GLBl09bfxCLaSQ=="
+      "license": "MIT"
     },
     "node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -2165,23 +1989,12 @@
     },
     "node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "optional": true,
-      "bin": {
-        "color-support": "bin.js"
-      }
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/combined-stream": {
       "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "license": "MIT",
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -2191,24 +2004,21 @@
     },
     "node_modules/commander": {
       "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
-      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=14"
       }
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "devOptional": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/condense-newlines": {
       "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/condense-newlines/-/condense-newlines-0.2.1.tgz",
-      "integrity": "sha512-P7X+QL9Hb9B/c8HI5BFFKmjgBu2XpQuF98WZ9XkO+dBGgk5XgwiQz7o1SmpglNWId3581UcS0SFAWfoIhMHPfg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "extend-shallow": "^2.0.1",
         "is-whitespace": "^0.3.0",
@@ -2220,31 +2030,22 @@
     },
     "node_modules/config-chain": {
       "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
-      "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ini": "^1.3.4",
         "proto-list": "~1.2.1"
       }
     },
-    "node_modules/console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
-      "optional": true
-    },
     "node_modules/convert-source-map": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
-      "dev": true
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/core-js": {
-      "version": "3.32.2",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.2.tgz",
-      "integrity": "sha512-pxXSw1mYZPDGvTQqEc5vgIb83jGQKFGYWY76z4a7weZXUolw3G+OvpZqSRcfYOoOVUQJYEPsWeQK8pKEnUtWxQ==",
+      "version": "3.33.2",
       "hasInstallScript": true,
+      "license": "MIT",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/core-js"
@@ -2252,14 +2053,12 @@
     },
     "node_modules/country-list": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/country-list/-/country-list-2.3.0.tgz",
-      "integrity": "sha512-qZk66RlmQm7fQjMYWku1AyjlKPogjPEorAZJG88owPExoPV8EsyCcuFLvO2afTXHEhi9liVOoyd+5A6ZS5QwaA=="
+      "license": "MIT"
     },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -2271,9 +2070,8 @@
     },
     "node_modules/cssesc": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "cssesc": "bin/cssesc"
       },
@@ -2283,9 +2081,8 @@
     },
     "node_modules/cssstyle": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-3.0.0.tgz",
-      "integrity": "sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "rrweb-cssom": "^0.6.0"
       },
@@ -2295,14 +2092,12 @@
     },
     "node_modules/csstype": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
-      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
+      "license": "MIT"
     },
     "node_modules/data-urls": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-4.0.0.tgz",
-      "integrity": "sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "abab": "^2.0.6",
         "whatwg-mimetype": "^3.0.0",
@@ -2314,16 +2109,14 @@
     },
     "node_modules/de-indent": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
-      "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
       "dev": true,
+      "license": "MIT",
       "peer": true
     },
     "node_modules/debug": {
       "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "devOptional": true,
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -2338,27 +2131,13 @@
     },
     "node_modules/decimal.js": {
       "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
-      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
-      "dev": true
-    },
-    "node_modules/decompress-response": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
-      "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
-      "optional": true,
-      "dependencies": {
-        "mimic-response": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/deep-eql": {
       "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
-      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "type-detect": "^4.0.0"
       },
@@ -2368,15 +2147,13 @@
     },
     "node_modules/deep-is": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/define-data-property": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz",
-      "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==",
+      "version": "1.1.1",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "get-intrinsic": "^1.2.1",
         "gopd": "^1.0.1",
@@ -2388,9 +2165,8 @@
     },
     "node_modules/define-properties": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
-      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.0.1",
         "has-property-descriptors": "^1.0.0",
@@ -2405,50 +2181,31 @@
     },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
     },
-    "node_modules/delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
-      "optional": true
-    },
-    "node_modules/detect-libc": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz",
-      "integrity": "sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==",
-      "optional": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/diff": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
-      "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.3.1"
       }
     },
     "node_modules/diff-sequences": {
       "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
-      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/dir-glob": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-type": "^4.0.0"
       },
@@ -2458,9 +2215,8 @@
     },
     "node_modules/doctrine": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -2470,15 +2226,13 @@
     },
     "node_modules/dom-event-types": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/dom-event-types/-/dom-event-types-1.1.0.tgz",
-      "integrity": "sha512-jNCX+uNJ3v38BKvPbpki6j5ItVlnSqVV6vDWGS6rExzCMjsc39frLjm1n91o6YaKK6AZl0wLloItW6C6mr61BQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/domexception": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
-      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "webidl-conversions": "^7.0.0"
       },
@@ -2488,9 +2242,8 @@
     },
     "node_modules/editorconfig": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz",
-      "integrity": "sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@one-ini/wasm": "0.1.1",
         "commander": "^10.0.0",
@@ -2506,18 +2259,16 @@
     },
     "node_modules/editorconfig/node_modules/brace-expansion": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
     },
     "node_modules/editorconfig/node_modules/minimatch": {
       "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz",
-      "integrity": "sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -2530,15 +2281,13 @@
     },
     "node_modules/emoji-regex": {
       "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "devOptional": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/enquirer": {
       "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
-      "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-colors": "^4.1.1",
         "strip-ansi": "^6.0.1"
@@ -2549,9 +2298,8 @@
     },
     "node_modules/entities": {
       "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.12"
       },
@@ -2560,26 +2308,25 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.22.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.2.tgz",
-      "integrity": "sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA==",
+      "version": "1.22.3",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-buffer-byte-length": "^1.0.0",
         "arraybuffer.prototype.slice": "^1.0.2",
         "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.5",
         "es-set-tostringtag": "^2.0.1",
         "es-to-primitive": "^1.2.1",
         "function.prototype.name": "^1.1.6",
-        "get-intrinsic": "^1.2.1",
+        "get-intrinsic": "^1.2.2",
         "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",
+        "hasown": "^2.0.0",
         "internal-slot": "^1.0.5",
         "is-array-buffer": "^3.0.2",
         "is-callable": "^1.2.7",
@@ -2589,7 +2336,7 @@
         "is-string": "^1.0.7",
         "is-typed-array": "^1.1.12",
         "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.3",
+        "object-inspect": "^1.13.1",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.4",
         "regexp.prototype.flags": "^1.5.1",
@@ -2603,7 +2350,7 @@
         "typed-array-byte-offset": "^1.0.0",
         "typed-array-length": "^1.0.4",
         "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.11"
+        "which-typed-array": "^1.1.13"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2613,33 +2360,30 @@
       }
     },
     "node_modules/es-set-tostringtag": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
-      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
+      "version": "2.0.2",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "has-tostringtag": "^1.0.0"
+        "get-intrinsic": "^1.2.2",
+        "has-tostringtag": "^1.0.0",
+        "hasown": "^2.0.0"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "version": "1.0.2",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has": "^1.0.3"
+        "hasown": "^2.0.0"
       }
     },
     "node_modules/es-to-primitive": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-callable": "^1.1.4",
         "is-date-object": "^1.0.1",
@@ -2653,9 +2397,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.17.19",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz",
-      "integrity": "sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz",
+      "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
@@ -2665,34 +2409,33 @@
         "node": ">=12"
       },
       "optionalDependencies": {
-        "@esbuild/android-arm": "0.17.19",
-        "@esbuild/android-arm64": "0.17.19",
-        "@esbuild/android-x64": "0.17.19",
-        "@esbuild/darwin-arm64": "0.17.19",
-        "@esbuild/darwin-x64": "0.17.19",
-        "@esbuild/freebsd-arm64": "0.17.19",
-        "@esbuild/freebsd-x64": "0.17.19",
-        "@esbuild/linux-arm": "0.17.19",
-        "@esbuild/linux-arm64": "0.17.19",
-        "@esbuild/linux-ia32": "0.17.19",
-        "@esbuild/linux-loong64": "0.17.19",
-        "@esbuild/linux-mips64el": "0.17.19",
-        "@esbuild/linux-ppc64": "0.17.19",
-        "@esbuild/linux-riscv64": "0.17.19",
-        "@esbuild/linux-s390x": "0.17.19",
-        "@esbuild/linux-x64": "0.17.19",
-        "@esbuild/netbsd-x64": "0.17.19",
-        "@esbuild/openbsd-x64": "0.17.19",
-        "@esbuild/sunos-x64": "0.17.19",
-        "@esbuild/win32-arm64": "0.17.19",
-        "@esbuild/win32-ia32": "0.17.19",
-        "@esbuild/win32-x64": "0.17.19"
+        "@esbuild/android-arm": "0.18.20",
+        "@esbuild/android-arm64": "0.18.20",
+        "@esbuild/android-x64": "0.18.20",
+        "@esbuild/darwin-arm64": "0.18.20",
+        "@esbuild/darwin-x64": "0.18.20",
+        "@esbuild/freebsd-arm64": "0.18.20",
+        "@esbuild/freebsd-x64": "0.18.20",
+        "@esbuild/linux-arm": "0.18.20",
+        "@esbuild/linux-arm64": "0.18.20",
+        "@esbuild/linux-ia32": "0.18.20",
+        "@esbuild/linux-loong64": "0.18.20",
+        "@esbuild/linux-mips64el": "0.18.20",
+        "@esbuild/linux-ppc64": "0.18.20",
+        "@esbuild/linux-riscv64": "0.18.20",
+        "@esbuild/linux-s390x": "0.18.20",
+        "@esbuild/linux-x64": "0.18.20",
+        "@esbuild/netbsd-x64": "0.18.20",
+        "@esbuild/openbsd-x64": "0.18.20",
+        "@esbuild/sunos-x64": "0.18.20",
+        "@esbuild/win32-arm64": "0.18.20",
+        "@esbuild/win32-ia32": "0.18.20",
+        "@esbuild/win32-x64": "0.18.20"
       }
     },
     "node_modules/escape-string-regexp": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -2702,9 +2445,8 @@
     },
     "node_modules/eslint": {
       "version": "7.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
-      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "7.12.11",
         "@eslint/eslintrc": "^0.4.3",
@@ -2759,9 +2501,8 @@
     },
     "node_modules/eslint-config-standard": {
       "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-12.0.0.tgz",
-      "integrity": "sha512-COUz8FnXhqFitYj4DTqHzidjIL/t4mumGZto5c7DrBpvWoie+Sn3P4sLEzUGeYhRElWuFEf8K1S1EfvD1vixCQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "eslint": ">=5.0.0",
         "eslint-plugin-import": ">=2.13.0",
@@ -2772,9 +2513,8 @@
     },
     "node_modules/eslint-import-resolver-node": {
       "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
-      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^3.2.7",
         "is-core-module": "^2.13.0",
@@ -2783,18 +2523,16 @@
     },
     "node_modules/eslint-import-resolver-node/node_modules/debug": {
       "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
     "node_modules/eslint-module-utils": {
       "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
-      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^3.2.7"
       },
@@ -2809,18 +2547,16 @@
     },
     "node_modules/eslint-module-utils/node_modules/debug": {
       "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
     "node_modules/eslint-plugin-es": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-1.4.1.tgz",
-      "integrity": "sha512-5fa/gR2yR3NxQf+UXkeLeP8FBBl6tSgdrAz1+cF84v1FMM4twGwQoqTnn+QxFLcPOrF4pdKEJKDB/q9GoyJrCA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eslint-utils": "^1.4.2",
         "regexpp": "^2.0.1"
@@ -2834,9 +2570,8 @@
     },
     "node_modules/eslint-plugin-es/node_modules/eslint-utils": {
       "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
-      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eslint-visitor-keys": "^1.1.0"
       },
@@ -2846,43 +2581,40 @@
     },
     "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/eslint-plugin-es/node_modules/regexpp": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
-      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.5.0"
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.28.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz",
-      "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==",
+      "version": "2.29.0",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "array-includes": "^3.1.6",
-        "array.prototype.findlastindex": "^1.2.2",
-        "array.prototype.flat": "^1.3.1",
-        "array.prototype.flatmap": "^1.3.1",
+        "array-includes": "^3.1.7",
+        "array.prototype.findlastindex": "^1.2.3",
+        "array.prototype.flat": "^1.3.2",
+        "array.prototype.flatmap": "^1.3.2",
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.7",
+        "eslint-import-resolver-node": "^0.3.9",
         "eslint-module-utils": "^2.8.0",
-        "has": "^1.0.3",
-        "is-core-module": "^2.13.0",
+        "hasown": "^2.0.0",
+        "is-core-module": "^2.13.1",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
-        "object.fromentries": "^2.0.6",
-        "object.groupby": "^1.0.0",
-        "object.values": "^1.1.6",
+        "object.fromentries": "^2.0.7",
+        "object.groupby": "^1.0.1",
+        "object.values": "^1.1.7",
         "semver": "^6.3.1",
         "tsconfig-paths": "^3.14.2"
       },
@@ -2895,18 +2627,16 @@
     },
     "node_modules/eslint-plugin-import/node_modules/debug": {
       "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
     "node_modules/eslint-plugin-import/node_modules/doctrine": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -2916,18 +2646,16 @@
     },
     "node_modules/eslint-plugin-import/node_modules/semver": {
       "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/eslint-plugin-node": {
       "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-8.0.1.tgz",
-      "integrity": "sha512-ZjOjbjEi6jd82rIpFSgagv4CHWzG9xsQAVp1ZPlhRnnYxcTgENUVBvhYmkQ7GvT1QFijUSo69RaiOJKhMu6i8w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eslint-plugin-es": "^1.3.1",
         "eslint-utils": "^1.3.1",
@@ -2945,9 +2673,8 @@
     },
     "node_modules/eslint-plugin-node/node_modules/eslint-utils": {
       "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
-      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eslint-visitor-keys": "^1.1.0"
       },
@@ -2957,35 +2684,30 @@
     },
     "node_modules/eslint-plugin-node/node_modules/eslint-visitor-keys": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/eslint-plugin-node/node_modules/semver": {
       "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver"
       }
     },
     "node_modules/eslint-plugin-promise": {
       "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-4.3.1.tgz",
-      "integrity": "sha512-bY2sGqyptzFBDLh/GMbAxfdJC+b0f23ME63FOE4+Jao0oZ3E1LEwFtWJX/1pGMJLiTtrSSern2CRM/g+dfc0eQ==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/eslint-plugin-standard": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-4.1.0.tgz",
-      "integrity": "sha512-ZL7+QRixjTR6/528YNGyDotyffm5OQst/sGxKDwGb9Uqs4In5Egi4+jbobhqJoyoCM6/7v/1A5fhQ7ScMtDjaQ==",
       "dev": true,
       "funding": [
         {
@@ -3001,15 +2723,15 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "peerDependencies": {
         "eslint": ">=5.0.0"
       }
     },
     "node_modules/eslint-plugin-vue": {
       "version": "8.7.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.7.1.tgz",
-      "integrity": "sha512-28sbtm4l4cOzoO1LtzQPxfxhQABararUb1JtqusQqObJpWX2e/gmVyeYVfepizPFne0Q5cILkYGiBoV36L12Wg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eslint-utils": "^3.0.0",
         "natural-compare": "^1.4.0",
@@ -3027,9 +2749,8 @@
     },
     "node_modules/eslint-plugin-vue/node_modules/eslint-utils": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eslint-visitor-keys": "^2.0.0"
       },
@@ -3045,18 +2766,16 @@
     },
     "node_modules/eslint-plugin-vue/node_modules/eslint-visitor-keys": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/eslint-plugin-vuetify": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-vuetify/-/eslint-plugin-vuetify-1.1.0.tgz",
-      "integrity": "sha512-I1YRUCGkDqe8F7O0tdf63UZVKtk4734+8fzbZ24YIZKTTyQp/FIR0nSZYG8mPFhTWerzPta7oXNzliBOwP2XeQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eslint-plugin-vue": "^7.0.0",
         "requireindex": "^1.2.0"
@@ -3068,9 +2787,8 @@
     },
     "node_modules/eslint-plugin-vuetify/node_modules/eslint-plugin-vue": {
       "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.20.0.tgz",
-      "integrity": "sha512-oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eslint-utils": "^2.1.0",
         "natural-compare": "^1.4.0",
@@ -3086,18 +2804,16 @@
     },
     "node_modules/eslint-plugin-vuetify/node_modules/eslint-visitor-keys": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/eslint-plugin-vuetify/node_modules/espree": {
       "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
-      "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "acorn": "^7.1.1",
         "acorn-jsx": "^5.2.0",
@@ -3109,18 +2825,16 @@
     },
     "node_modules/eslint-plugin-vuetify/node_modules/semver": {
       "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/eslint-plugin-vuetify/node_modules/vue-eslint-parser": {
       "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz",
-      "integrity": "sha512-qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^4.1.1",
         "eslint-scope": "^5.1.1",
@@ -3142,9 +2856,8 @@
     },
     "node_modules/eslint-scope": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -3155,9 +2868,8 @@
     },
     "node_modules/eslint-utils": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eslint-visitor-keys": "^1.1.0"
       },
@@ -3170,18 +2882,16 @@
     },
     "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/eslint-visitor-keys": {
       "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -3191,27 +2901,24 @@
     },
     "node_modules/eslint/node_modules/eslint-visitor-keys": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/eslint/node_modules/ignore": {
       "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/espree": {
       "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
-      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "acorn": "^7.4.0",
         "acorn-jsx": "^5.3.1",
@@ -3223,18 +2930,16 @@
     },
     "node_modules/espree/node_modules/eslint-visitor-keys": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/esprima": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "bin": {
         "esparse": "bin/esparse.js",
         "esvalidate": "bin/esvalidate.js"
@@ -3245,9 +2950,8 @@
     },
     "node_modules/esquery": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -3257,18 +2961,16 @@
     },
     "node_modules/esquery/node_modules/estraverse": {
       "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
     },
     "node_modules/esrecurse": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "estraverse": "^5.2.0"
       },
@@ -3278,36 +2980,32 @@
     },
     "node_modules/esrecurse/node_modules/estraverse": {
       "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
     },
     "node_modules/estraverse": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
     },
     "node_modules/esutils": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/extend-shallow": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-extendable": "^0.1.0"
       },
@@ -3317,15 +3015,13 @@
     },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fast-glob": {
       "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
-      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
@@ -3339,30 +3035,26 @@
     },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fastq": {
       "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
       }
     },
     "node_modules/file-entry-cache": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "flat-cache": "^3.0.4"
       },
@@ -3372,9 +3064,8 @@
     },
     "node_modules/fill-range": {
       "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -3384,9 +3075,8 @@
     },
     "node_modules/find-up": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^6.0.0",
         "path-exists": "^4.0.0"
@@ -3399,12 +3089,11 @@
       }
     },
     "node_modules/flat-cache": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.0.tgz",
-      "integrity": "sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==",
+      "version": "3.1.1",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "flatted": "^3.2.7",
+        "flatted": "^3.2.9",
         "keyv": "^4.5.3",
         "rimraf": "^3.0.2"
       },
@@ -3414,26 +3103,23 @@
     },
     "node_modules/flatted": {
       "version": "3.2.9",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
-      "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/flush-promises": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/flush-promises/-/flush-promises-1.0.2.tgz",
-      "integrity": "sha512-G0sYfLQERwKz4+4iOZYQEZVpOt9zQrlItIxQAAYAWpfby3gbHrx0osCHz5RLl/XoXevXk0xoN4hDFky/VV9TrA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/follow-redirects": {
       "version": "1.15.3",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
-      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
       "funding": [
         {
           "type": "individual",
           "url": "https://github.com/sponsors/RubenVerborgh"
         }
       ],
+      "license": "MIT",
       "engines": {
         "node": ">=4.0"
       },
@@ -3445,17 +3131,15 @@
     },
     "node_modules/for-each": {
       "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-callable": "^1.1.3"
       }
     },
     "node_modules/form-data": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -3465,35 +3149,10 @@
         "node": ">= 6"
       }
     },
-    "node_modules/fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "optional": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/fs-minipass/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "optional": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "devOptional": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
@@ -3510,16 +3169,17 @@
       }
     },
     "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
+      "version": "1.1.2",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/function.prototype.name": {
       "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
-      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
@@ -3535,58 +3195,34 @@
     },
     "node_modules/functional-red-black-tree": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/functions-have-names": {
       "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/gauge": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
-      "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
-      "optional": true,
-      "dependencies": {
-        "aproba": "^1.0.3 || ^2.0.0",
-        "color-support": "^1.1.2",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.1",
-        "object-assign": "^4.1.1",
-        "signal-exit": "^3.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "wide-align": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/get-func-name": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
-      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+      "version": "1.2.2",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
+        "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3"
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -3594,9 +3230,8 @@
     },
     "node_modules/get-symbol-description": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "get-intrinsic": "^1.1.1"
@@ -3610,9 +3245,8 @@
     },
     "node_modules/glob": {
       "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
-      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -3629,9 +3263,8 @@
     },
     "node_modules/glob-parent": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -3641,18 +3274,16 @@
     },
     "node_modules/glob/node_modules/brace-expansion": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
     },
     "node_modules/glob/node_modules/minimatch": {
       "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -3661,10 +3292,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.22.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.22.0.tgz",
-      "integrity": "sha512-H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw==",
+      "version": "13.23.0",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -3677,9 +3307,8 @@
     },
     "node_modules/globalthis": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "define-properties": "^1.1.3"
       },
@@ -3692,9 +3321,8 @@
     },
     "node_modules/globby": {
       "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
@@ -3712,9 +3340,8 @@
     },
     "node_modules/gopd": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "get-intrinsic": "^1.1.3"
       },
@@ -3724,47 +3351,31 @@
     },
     "node_modules/graphemer": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
+      "license": "MIT"
     },
     "node_modules/has-bigints": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "version": "1.0.1",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.1.1"
+        "get-intrinsic": "^1.2.2"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -3772,9 +3383,8 @@
     },
     "node_modules/has-proto": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -3784,9 +3394,8 @@
     },
     "node_modules/has-symbols": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -3796,9 +3405,8 @@
     },
     "node_modules/has-tostringtag": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-symbols": "^1.0.2"
       },
@@ -3809,17 +3417,21 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
-      "optional": true
+    "node_modules/hasown": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
     "node_modules/he": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "bin": {
         "he": "bin/he"
@@ -3827,9 +3439,8 @@
     },
     "node_modules/html-encoding-sniffer": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
-      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "whatwg-encoding": "^2.0.0"
       },
@@ -3839,15 +3450,13 @@
     },
     "node_modules/html-escaper": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/http-proxy-agent": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "2",
         "agent-base": "6",
@@ -3859,14 +3468,12 @@
     },
     "node_modules/http-status-codes": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/http-status-codes/-/http-status-codes-2.3.0.tgz",
-      "integrity": "sha512-RJ8XvFvpPM/Dmc5SV+dC4y5PCeOhT3x1Hq0NU3rjGeg5a/CqlhZ7uudknPwZFz4aeAXDcbAyaeP7GAo9lvngtA=="
+      "license": "MIT"
     },
     "node_modules/https-proxy-agent": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-      "devOptional": true,
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "agent-base": "6",
         "debug": "4"
@@ -3877,9 +3484,8 @@
     },
     "node_modules/iconv-lite": {
       "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -3889,29 +3495,25 @@
     },
     "node_modules/ignore": {
       "version": "5.2.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/immediate": {
       "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
-      "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ=="
+      "license": "MIT"
     },
     "node_modules/immutable": {
       "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz",
-      "integrity": "sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/import-fresh": {
       "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -3925,18 +3527,16 @@
     },
     "node_modules/imurmurhash": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.19"
       }
     },
     "node_modules/inflight": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "devOptional": true,
+      "dev": true,
+      "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -3944,24 +3544,21 @@
     },
     "node_modules/inherits": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "devOptional": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/ini": {
       "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/internal-slot": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
-      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
+      "version": "1.0.6",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.2.0",
-        "has": "^1.0.3",
+        "get-intrinsic": "^1.2.2",
+        "hasown": "^2.0.0",
         "side-channel": "^1.0.4"
       },
       "engines": {
@@ -3970,9 +3567,8 @@
     },
     "node_modules/is-array-buffer": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
-      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "get-intrinsic": "^1.2.0",
@@ -3984,9 +3580,8 @@
     },
     "node_modules/is-bigint": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-bigints": "^1.0.1"
       },
@@ -3996,9 +3591,8 @@
     },
     "node_modules/is-binary-path": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -4008,9 +3602,8 @@
     },
     "node_modules/is-boolean-object": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "has-tostringtag": "^1.0.0"
@@ -4024,15 +3617,13 @@
     },
     "node_modules/is-buffer": {
       "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/is-callable": {
       "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -4041,12 +3632,11 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.13.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
-      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
+      "version": "2.13.1",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has": "^1.0.3"
+        "hasown": "^2.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -4054,9 +3644,8 @@
     },
     "node_modules/is-date-object": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-tostringtag": "^1.0.0"
       },
@@ -4069,9 +3658,8 @@
     },
     "node_modules/is-expression": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-expression/-/is-expression-4.0.0.tgz",
-      "integrity": "sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "acorn": "^7.1.1",
         "object-assign": "^4.1.1"
@@ -4079,36 +3667,32 @@
     },
     "node_modules/is-extendable": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-extglob": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "devOptional": true,
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/is-glob": {
       "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -4118,9 +3702,8 @@
     },
     "node_modules/is-negative-zero": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -4130,18 +3713,16 @@
     },
     "node_modules/is-number": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
     },
     "node_modules/is-number-object": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-tostringtag": "^1.0.0"
       },
@@ -4154,24 +3735,21 @@
     },
     "node_modules/is-path-inside": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/is-potential-custom-element-name": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/is-regex": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "has-tostringtag": "^1.0.0"
@@ -4185,9 +3763,8 @@
     },
     "node_modules/is-shared-array-buffer": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2"
       },
@@ -4197,9 +3774,8 @@
     },
     "node_modules/is-string": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-tostringtag": "^1.0.0"
       },
@@ -4212,9 +3788,8 @@
     },
     "node_modules/is-symbol": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-symbols": "^1.0.2"
       },
@@ -4227,9 +3802,8 @@
     },
     "node_modules/is-typed-array": {
       "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
-      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "which-typed-array": "^1.1.11"
       },
@@ -4242,9 +3816,8 @@
     },
     "node_modules/is-weakref": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2"
       },
@@ -4254,39 +3827,34 @@
     },
     "node_modules/is-whitespace": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/is-whitespace/-/is-whitespace-0.3.0.tgz",
-      "integrity": "sha512-RydPhl4S6JwAyj0JJjshWJEFG6hNye3pZFBRZaTUfZFwGHxzppNaNOVgQuS/E/SlhrApuMXrpnK1EEIXfdo3Dg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/isarray": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/isexe": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/istanbul-lib-coverage": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
-      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/istanbul-lib-report": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
-      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "istanbul-lib-coverage": "^3.0.0",
         "make-dir": "^4.0.0",
@@ -4298,9 +3866,8 @@
     },
     "node_modules/istanbul-lib-source-maps": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "debug": "^4.1.1",
         "istanbul-lib-coverage": "^3.0.0",
@@ -4312,9 +3879,8 @@
     },
     "node_modules/istanbul-reports": {
       "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz",
-      "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "html-escaper": "^2.0.0",
         "istanbul-lib-report": "^3.0.0"
@@ -4325,9 +3891,8 @@
     },
     "node_modules/js-beautify": {
       "version": "1.14.9",
-      "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.9.tgz",
-      "integrity": "sha512-coM7xq1syLcMyuVGyToxcj2AlzhkDjmfklL8r0JgJ7A76wyGMpJ1oA35mr4APdYNO/o/4YY8H54NQIJzhMbhBg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "config-chain": "^1.1.13",
         "editorconfig": "^1.0.3",
@@ -4345,9 +3910,8 @@
     },
     "node_modules/js-beautify/node_modules/nopt": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz",
-      "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "abbrev": "^1.0.0"
       },
@@ -4360,20 +3924,17 @@
     },
     "node_modules/js-sha256": {
       "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.9.0.tgz",
-      "integrity": "sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA=="
+      "license": "MIT"
     },
     "node_modules/js-tokens": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/js-yaml": {
       "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -4384,9 +3945,8 @@
     },
     "node_modules/jsdom": {
       "version": "22.1.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz",
-      "integrity": "sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "abab": "^2.0.6",
         "cssstyle": "^3.0.0",
@@ -4426,27 +3986,23 @@
     },
     "node_modules/json-buffer": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json5": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "minimist": "^1.2.0"
       },
@@ -4456,20 +4012,17 @@
     },
     "node_modules/jsonc-parser": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/just-extend": {
       "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz",
-      "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/keycloak-js": {
       "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/keycloak-js/-/keycloak-js-9.0.3.tgz",
-      "integrity": "sha512-c8FFPa8YiJmPbJEMZ/mIrHflBR6FIFUm5xTWtIDzlrnoeF4u0wDmTBfo1u71rWIL1HanLvg3T+9AgR1NqfmGbA==",
+      "license": "Apache-2.0",
       "dependencies": {
         "base64-js": "1.3.1",
         "js-sha256": "0.9.0"
@@ -4477,23 +4030,20 @@
     },
     "node_modules/keycloak-js/node_modules/base64-js": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
+      "license": "MIT"
     },
     "node_modules/keyv": {
-      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz",
-      "integrity": "sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==",
+      "version": "4.5.4",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "json-buffer": "3.0.1"
       }
     },
     "node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-buffer": "^1.1.5"
       },
@@ -4503,8 +4053,7 @@
     },
     "node_modules/launchdarkly-js-client-sdk": {
       "version": "2.24.2",
-      "resolved": "https://registry.npmjs.org/launchdarkly-js-client-sdk/-/launchdarkly-js-client-sdk-2.24.2.tgz",
-      "integrity": "sha512-8jrLOia0vfZ4stqQRv9TjAYfRGK2JyWpLIL6PbTl99LqTtJMuYtryFUQp0b8WH1153YN+gVdoqPVI7uwbbzLLQ==",
+      "license": "Apache-2.0",
       "dependencies": {
         "escape-string-regexp": "^4.0.0",
         "launchdarkly-js-sdk-common": "3.8.2"
@@ -4512,8 +4061,7 @@
     },
     "node_modules/launchdarkly-js-sdk-common": {
       "version": "3.8.2",
-      "resolved": "https://registry.npmjs.org/launchdarkly-js-sdk-common/-/launchdarkly-js-sdk-common-3.8.2.tgz",
-      "integrity": "sha512-pEqZ3FTKtYrTaPdbPntFJs87svzcezrkoRWY2GEFmyPC33txOqU788x0yby2+haC/saFPNfXpH6bbiJE/GjMSA==",
+      "license": "Apache-2.0",
       "dependencies": {
         "base64-js": "^1.3.0",
         "fast-deep-equal": "^2.0.1",
@@ -4522,14 +4070,12 @@
     },
     "node_modules/launchdarkly-js-sdk-common/node_modules/fast-deep-equal": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha512-bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w=="
+      "license": "MIT"
     },
     "node_modules/levn": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1",
         "type-check": "~0.4.0"
@@ -4540,17 +4086,15 @@
     },
     "node_modules/lie": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
-      "integrity": "sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==",
+      "license": "MIT",
       "dependencies": {
         "immediate": "~3.0.5"
       }
     },
     "node_modules/local-pkg": {
       "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.3.tgz",
-      "integrity": "sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=14"
       },
@@ -4560,17 +4104,15 @@
     },
     "node_modules/localforage": {
       "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz",
-      "integrity": "sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==",
+      "license": "Apache-2.0",
       "dependencies": {
         "lie": "3.1.1"
       }
     },
     "node_modules/locate-path": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^5.0.0"
       },
@@ -4583,57 +4125,48 @@
     },
     "node_modules/lodash": {
       "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+      "license": "MIT"
     },
     "node_modules/lodash.clonedeep": {
       "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.get": {
       "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.omit": {
       "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz",
-      "integrity": "sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg=="
+      "license": "MIT"
     },
     "node_modules/lodash.truncate": {
       "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.uniqueid": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.uniqueid/-/lodash.uniqueid-4.0.1.tgz",
-      "integrity": "sha512-GQQWaIeGlL6DIIr06kj1j6sSmBxyNMwI8kaX9aKpHR/XsMTiaXDVPNPAkiboOTK9OJpTJF/dXT3xYoFQnj386Q=="
+      "license": "MIT"
     },
     "node_modules/loupe": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
-      "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==",
+      "version": "2.3.7",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "get-func-name": "^2.0.0"
+        "get-func-name": "^2.0.1"
       }
     },
     "node_modules/lru-cache": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "devOptional": true,
+      "dev": true,
+      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -4642,10 +4175,9 @@
       }
     },
     "node_modules/magic-string": {
-      "version": "0.30.3",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.3.tgz",
-      "integrity": "sha512-B7xGbll2fG/VjP+SWg4sX3JynwIU0mjoTc6MPpKNuIvftk6u6vqhDnk1R80b8C2GBR6ywqy+1DcKBrevBg+bmw==",
+      "version": "0.30.5",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.4.15"
       },
@@ -4655,9 +4187,8 @@
     },
     "node_modules/make-dir": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
-      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "semver": "^7.5.3"
       },
@@ -4670,18 +4201,16 @@
     },
     "node_modules/merge2": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/micromatch": {
       "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "braces": "^3.0.2",
         "picomatch": "^2.3.1"
@@ -4692,16 +4221,14 @@
     },
     "node_modules/mime-db": {
       "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/mime-types": {
       "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -4709,23 +4236,10 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/mimic-response": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
-      "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
-      "optional": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/minimatch": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "devOptional": true,
+      "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -4735,64 +4249,16 @@
     },
     "node_modules/minimist": {
       "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/minipass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-      "optional": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "optional": true,
-      "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minizlib/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "optional": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "optional": true,
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/mlly": {
       "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.2.tgz",
-      "integrity": "sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "acorn": "^8.10.0",
         "pathe": "^1.1.1",
@@ -4801,10 +4267,9 @@
       }
     },
     "node_modules/mlly/node_modules/acorn": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+      "version": "8.11.2",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -4814,26 +4279,18 @@
     },
     "node_modules/ms": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "devOptional": true
-    },
-    "node_modules/nan": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz",
-      "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==",
-      "optional": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/nanoid": {
       "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
-      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
       "funding": [
         {
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -4843,21 +4300,18 @@
     },
     "node_modules/natural-compare": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/natural-compare-lite": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
-      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/nise": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.4.tgz",
-      "integrity": "sha512-8+Ib8rRJ4L0o3kfmyVCL7gzrohyDe0cMFTBa2d364yIrEGMEoetznKJx899YxjybU6bL9SQkYPSBBs1gyYs8Xg==",
+      "version": "5.1.5",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@sinonjs/commons": "^2.0.0",
         "@sinonjs/fake-timers": "^10.0.2",
@@ -4868,105 +4322,32 @@
     },
     "node_modules/nise/node_modules/@sinonjs/fake-timers": {
       "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
-      "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@sinonjs/commons": "^3.0.0"
       }
     },
     "node_modules/nise/node_modules/@sinonjs/fake-timers/node_modules/@sinonjs/commons": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz",
-      "integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "type-detect": "4.0.8"
       }
     },
-    "node_modules/node-fetch": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
-      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
-      "optional": true,
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/node-fetch/node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-      "optional": true
-    },
-    "node_modules/node-fetch/node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-      "optional": true
-    },
-    "node_modules/node-fetch/node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "optional": true,
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
-    "node_modules/nopt": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-      "optional": true,
-      "dependencies": {
-        "abbrev": "1"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/normalize-path": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/npmlog": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
-      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
-      "optional": true,
-      "dependencies": {
-        "are-we-there-yet": "^2.0.0",
-        "console-control-strings": "^1.1.0",
-        "gauge": "^3.0.0",
-        "set-blocking": "^2.0.0"
-      }
-    },
     "node_modules/nth-check": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "^1.0.0"
       },
@@ -4976,42 +4357,37 @@
     },
     "node_modules/nwsapi": {
       "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
-      "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/object-assign": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "devOptional": true,
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "version": "1.13.1",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/object-keys": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/object.assign": {
       "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -5027,9 +4403,8 @@
     },
     "node_modules/object.fromentries": {
       "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz",
-      "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
@@ -5044,9 +4419,8 @@
     },
     "node_modules/object.groupby": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz",
-      "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
@@ -5056,9 +4430,8 @@
     },
     "node_modules/object.values": {
       "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz",
-      "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
@@ -5073,18 +4446,16 @@
     },
     "node_modules/once": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "devOptional": true,
+      "dev": true,
+      "license": "ISC",
       "dependencies": {
         "wrappy": "1"
       }
     },
     "node_modules/optionator": {
       "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@aashutoshrathi/word-wrap": "^1.2.3",
         "deep-is": "^0.1.3",
@@ -5099,9 +4470,8 @@
     },
     "node_modules/p-limit": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
-      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "yocto-queue": "^1.0.0"
       },
@@ -5114,9 +4484,8 @@
     },
     "node_modules/p-locate": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^3.0.2"
       },
@@ -5129,9 +4498,8 @@
     },
     "node_modules/p-locate/node_modules/p-limit": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -5144,9 +4512,8 @@
     },
     "node_modules/p-locate/node_modules/yocto-queue": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -5156,9 +4523,8 @@
     },
     "node_modules/parent-module": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -5168,9 +4534,8 @@
     },
     "node_modules/parse5": {
       "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
-      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "entities": "^4.4.0"
       },
@@ -5180,65 +4545,57 @@
     },
     "node_modules/path-exists": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "devOptional": true,
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/path-key": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/path-parse": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/path-to-regexp": {
       "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
-      "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "isarray": "0.0.1"
       }
     },
     "node_modules/path-to-regexp/node_modules/isarray": {
       "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/path-type": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/path2d-polyfill": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path2d-polyfill/-/path2d-polyfill-2.0.1.tgz",
-      "integrity": "sha512-ad/3bsalbbWhmBo0D6FZ4RNMwsLsPpL6gnvhuSaU5Vm7b06Kr5ubSltQQ0T7YKsiJQO+g22zJ4dJKNTXIyOXtA==",
+      "license": "MIT",
       "optional": true,
       "engines": {
         "node": ">=8"
@@ -5246,23 +4603,20 @@
     },
     "node_modules/pathe": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz",
-      "integrity": "sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/pathval": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
-      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/pdfjs-dist": {
       "version": "3.9.179",
-      "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-3.9.179.tgz",
-      "integrity": "sha512-AZBEIAORYDaOAlM0/A4Zg465+XF3ugYDdgrVmioVvNW5tH3xs3RpGFBYOG5PM9/vLM3M/wNncsMLTgyIKdqMKg==",
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=18"
       },
@@ -5273,14 +4627,12 @@
     },
     "node_modules/picocolors": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+      "license": "ISC"
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -5289,9 +4641,8 @@
       }
     },
     "node_modules/pinia": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.1.6.tgz",
-      "integrity": "sha512-bIU6QuE5qZviMmct5XwCesXelb5VavdOWKWaB17ggk++NUwQWWbP5YnsONTk3b752QkW9sACiR81rorpeOMSvQ==",
+      "version": "2.1.7",
+      "license": "MIT",
       "dependencies": {
         "@vue/devtools-api": "^6.5.0",
         "vue-demi": ">=0.14.5"
@@ -5315,8 +4666,7 @@
     },
     "node_modules/pinia-class": {
       "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/pinia-class/-/pinia-class-0.0.3.tgz",
-      "integrity": "sha512-7l1ZB6c50v5aDaSZRauK1CVaUL0ZrOC2Z1xwX03AZCGKnV+EzZmmQ3fm19LgaXhD9oGExb6eezJ8hZDu86s8vw==",
+      "license": "MIT",
       "peerDependencies": {
         "pinia": "^2.0.0",
         "vue-class-component": "^7.0.0"
@@ -5324,9 +4674,8 @@
     },
     "node_modules/pinia/node_modules/vue-demi": {
       "version": "0.14.6",
-      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.6.tgz",
-      "integrity": "sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==",
       "hasInstallScript": true,
+      "license": "MIT",
       "bin": {
         "vue-demi-fix": "bin/vue-demi-fix.js",
         "vue-demi-switch": "bin/vue-demi-switch.js"
@@ -5349,9 +4698,8 @@
     },
     "node_modules/pkg-types": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz",
-      "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "jsonc-parser": "^3.2.0",
         "mlly": "^1.2.0",
@@ -5360,8 +4708,6 @@
     },
     "node_modules/postcss": {
       "version": "8.4.31",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
-      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -5376,6 +4722,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "nanoid": "^3.3.6",
         "picocolors": "^1.0.0",
@@ -5387,9 +4734,8 @@
     },
     "node_modules/postcss-selector-parser": {
       "version": "6.0.13",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
-      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -5400,18 +4746,16 @@
     },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8.0"
       }
     },
     "node_modules/prettier": {
       "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "prettier": "bin-prettier.js"
       },
@@ -5424,9 +4768,8 @@
     },
     "node_modules/pretty": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pretty/-/pretty-2.0.0.tgz",
-      "integrity": "sha512-G9xUchgTEiNpormdYBl+Pha50gOUovT18IvAe7EYMZ1/f9W/WWMPRn+xI68yXNMUk3QXHDwo/1wV/4NejVNe1w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "condense-newlines": "^0.2.1",
         "extend-shallow": "^2.0.1",
@@ -5438,9 +4781,8 @@
     },
     "node_modules/pretty-format": {
       "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -5452,9 +4794,8 @@
     },
     "node_modules/pretty-format/node_modules/ansi-styles": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -5464,41 +4805,35 @@
     },
     "node_modules/progress": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
     },
     "node_modules/proto-list": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
-      "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/provinces": {
       "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/provinces/-/provinces-1.11.0.tgz",
-      "integrity": "sha512-5hoDYWtKr89stoSVajofU1rFGKzB2wpUqJJfnldokWfLUnLamQK9PnA8svh2j3XOYdb8BI2vbU4q3DtEcdNQ9w=="
+      "license": "MIT"
     },
     "node_modules/psl": {
       "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/pug-error": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pug-error/-/pug-error-2.0.0.tgz",
-      "integrity": "sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/pug-lexer": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-5.0.1.tgz",
-      "integrity": "sha512-0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "character-parser": "^2.2.0",
         "is-expression": "^4.0.0",
@@ -5506,32 +4841,27 @@
       }
     },
     "node_modules/punycode": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+      "version": "2.3.1",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/qrcode.vue": {
       "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/qrcode.vue/-/qrcode.vue-1.7.0.tgz",
-      "integrity": "sha512-R7t6Y3fDDtcU7L4rtqwGUDP9xD64gJhIwpfjhRCTKmBoYF6SS49PIJHRJ048cse6OI7iwTwgyy2C46N9Ygoc6g==",
+      "license": "MIT",
       "peerDependencies": {
         "vue": "^2.0.0"
       }
     },
     "node_modules/querystringify": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "dev": true,
       "funding": [
         {
@@ -5546,33 +4876,18 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/react-is": {
       "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
-    },
-    "node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "optional": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/readdirp": {
       "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -5582,14 +4897,12 @@
     },
     "node_modules/regenerator-runtime": {
       "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+      "license": "MIT"
     },
     "node_modules/regexp.prototype.flags": {
       "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
-      "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
@@ -5604,9 +4917,8 @@
     },
     "node_modules/regexpp": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -5616,38 +4928,33 @@
     },
     "node_modules/register-service-worker": {
       "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/register-service-worker/-/register-service-worker-1.7.2.tgz",
-      "integrity": "sha512-CiD3ZSanZqcMPRhtfct5K9f7i3OLCcBBWsJjLh1gW9RO/nS94sVzY59iS+fgYBOBqaBpf4EzfqUF3j9IG+xo8A=="
+      "license": "MIT"
     },
     "node_modules/require-from-string": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/requireindex": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
-      "integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.5"
       }
     },
     "node_modules/requires-port": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/resolve": {
-      "version": "1.22.6",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz",
-      "integrity": "sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw==",
+      "version": "1.22.8",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
@@ -5662,18 +4969,16 @@
     },
     "node_modules/resolve-from": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/reusify": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
@@ -5681,9 +4986,8 @@
     },
     "node_modules/rimraf": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "devOptional": true,
+      "dev": true,
+      "license": "ISC",
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -5696,9 +5000,8 @@
     },
     "node_modules/rimraf/node_modules/glob": {
       "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "devOptional": true,
+      "dev": true,
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -5716,9 +5019,8 @@
     },
     "node_modules/rollup": {
       "version": "3.29.4",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz",
-      "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "rollup": "dist/bin/rollup"
       },
@@ -5732,14 +5034,11 @@
     },
     "node_modules/rrweb-cssom": {
       "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz",
-      "integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/run-parallel": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
       "dev": true,
       "funding": [
         {
@@ -5755,15 +5054,26 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "queue-microtask": "^1.2.2"
       }
     },
+    "node_modules/rxjs": {
+      "version": "7.8.1",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/rxjs/node_modules/tslib": {
+      "version": "2.6.2",
+      "license": "0BSD"
+    },
     "node_modules/safe-array-concat": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz",
-      "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "get-intrinsic": "^1.2.1",
@@ -5777,31 +5087,10 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "optional": true
-    },
     "node_modules/safe-regex-test": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "get-intrinsic": "^1.1.3",
@@ -5813,15 +5102,13 @@
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/sass": {
-      "version": "1.68.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.68.0.tgz",
-      "integrity": "sha512-Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA==",
+      "version": "1.69.5",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
         "immutable": "^4.0.0",
@@ -5836,9 +5123,8 @@
     },
     "node_modules/saxes": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
-      "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "xmlchars": "^2.2.0"
       },
@@ -5848,8 +5134,7 @@
     },
     "node_modules/sbc-common-components": {
       "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/sbc-common-components/-/sbc-common-components-3.0.8.tgz",
-      "integrity": "sha512-TjZA8xRxtwrynI/EXLbGKr68+NFBlFPXDs1n7Uc+EaGD+zwmi8flSi6FEQNbrfb01YfVmlZ8GNghU7f1YP41rw==",
+      "license": "Apache-2.0",
       "dependencies": {
         "@mdi/font": "^4.5.95",
         "axios": "^0.21.1",
@@ -5871,27 +5156,22 @@
       }
     },
     "node_modules/sbc-common-components/node_modules/@mdi/font": {
-      "version": "4.9.95",
-      "resolved": "https://registry.npmjs.org/@mdi/font/-/font-4.9.95.tgz",
-      "integrity": "sha512-m2sbAs+SMwRnWpkMriBxEulwuhmqRyh6X+hdOZlqSxYZUM2C2TaDnQ4gcilzdoAgru2XYnWViZ/xPuSDGgRXVw=="
+      "version": "4.9.95"
     },
     "node_modules/sbc-common-components/node_modules/axios": {
       "version": "0.21.4",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
-      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+      "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.14.0"
       }
     },
     "node_modules/sbc-common-components/node_modules/vue2-filters": {
       "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/vue2-filters/-/vue2-filters-0.7.2.tgz",
-      "integrity": "sha512-7I74isiBUQFGaNbVv57NzHGqh54cLe0JNJmJmu66wxP5eOK/CqHN4iqHMgwPPPvPbgbFbpI/GjbHiIx8tNruwg=="
+      "license": "MIT"
     },
     "node_modules/sbc-common-components/node_modules/vuelidate": {
       "version": "0.7.7",
-      "resolved": "https://registry.npmjs.org/vuelidate/-/vuelidate-0.7.7.tgz",
-      "integrity": "sha512-pT/U2lDI67wkIqI4tum7cMSIfGcAMfB+Phtqh2ttdXURwvHRBJEAQ0tVbUsW9Upg83Q5QH59bnCoXI7A9JDGnA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 4.0.0",
         "npm": ">= 3.0.0"
@@ -5899,9 +5179,8 @@
     },
     "node_modules/semver": {
       "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "devOptional": true,
+      "dev": true,
+      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -5912,17 +5191,24 @@
         "node": ">=10"
       }
     },
-    "node_modules/set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
-      "optional": true
+    "node_modules/set-function-length": {
+      "version": "1.1.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-data-property": "^1.1.1",
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
     "node_modules/set-function-name": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
-      "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.0.1",
         "functions-have-names": "^1.2.3",
@@ -5934,9 +5220,8 @@
     },
     "node_modules/shebang-command": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -5946,18 +5231,16 @@
     },
     "node_modules/shebang-regex": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/side-channel": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.0",
         "get-intrinsic": "^1.0.2",
@@ -5969,52 +5252,13 @@
     },
     "node_modules/siginfo": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
-      "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
-      "dev": true
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "optional": true
-    },
-    "node_modules/simple-concat": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
-      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "optional": true
-    },
-    "node_modules/simple-get": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz",
-      "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==",
-      "optional": true,
-      "dependencies": {
-        "decompress-response": "^4.2.0",
-        "once": "^1.3.1",
-        "simple-concat": "^1.0.0"
-      }
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/sinon": {
       "version": "14.0.2",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-14.0.2.tgz",
-      "integrity": "sha512-PDpV0ZI3ZCS3pEqx0vpNp6kzPhHrLx72wA0G+ZLaaJjLIYeE0n8INlgaohKuGy7hP0as5tbUd23QWu5U233t+w==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@sinonjs/commons": "^2.0.0",
         "@sinonjs/fake-timers": "^9.1.2",
@@ -6030,18 +5274,16 @@
     },
     "node_modules/slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/slice-ansi": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "astral-regex": "^2.0.0",
@@ -6056,52 +5298,37 @@
     },
     "node_modules/source-map": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/source-map-js": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/sprintf-js": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/stackback": {
       "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
-      "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/std-env": {
       "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.4.3.tgz",
-      "integrity": "sha512-f9aPhy8fYBuMN+sNfakZV18U39PbalgjXG3lLB9WkaYTxijru61wb57V9wxxNthXM5Sd88ETBWi29qLAsHO52Q==",
-      "dev": true
-    },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "optional": true,
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/string-width": {
       "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "devOptional": true,
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -6113,9 +5340,8 @@
     },
     "node_modules/string.prototype.trim": {
       "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz",
-      "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
@@ -6130,9 +5356,8 @@
     },
     "node_modules/string.prototype.trimend": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz",
-      "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
@@ -6144,9 +5369,8 @@
     },
     "node_modules/string.prototype.trimstart": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz",
-      "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
@@ -6158,9 +5382,8 @@
     },
     "node_modules/strip-ansi": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "devOptional": true,
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -6170,18 +5393,16 @@
     },
     "node_modules/strip-bom": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -6191,9 +5412,8 @@
     },
     "node_modules/strip-literal": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-1.3.0.tgz",
-      "integrity": "sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "acorn": "^8.10.0"
       },
@@ -6202,10 +5422,9 @@
       }
     },
     "node_modules/strip-literal/node_modules/acorn": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+      "version": "8.11.2",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -6215,9 +5434,8 @@
     },
     "node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -6227,9 +5445,8 @@
     },
     "node_modules/supports-preserve-symlinks-flag": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -6239,15 +5456,13 @@
     },
     "node_modules/symbol-tree": {
       "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/table": {
       "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz",
-      "integrity": "sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "ajv": "^8.0.1",
         "lodash.truncate": "^4.4.2",
@@ -6261,9 +5476,8 @@
     },
     "node_modules/table/node_modules/ajv": {
       "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -6277,32 +5491,13 @@
     },
     "node_modules/table/node_modules/json-schema-traverse": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "node_modules/tar": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz",
-      "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==",
-      "optional": true,
-      "dependencies": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^5.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/test-exclude": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "@istanbuljs/schema": "^0.1.2",
         "glob": "^7.1.4",
@@ -6314,9 +5509,8 @@
     },
     "node_modules/test-exclude/node_modules/glob": {
       "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -6334,39 +5528,34 @@
     },
     "node_modules/text-table": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/tinybench": {
       "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.5.1.tgz",
-      "integrity": "sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/tinypool": {
       "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.6.0.tgz",
-      "integrity": "sha512-FdswUUo5SxRizcBc6b1GSuLpLjisa8N8qMyYoP3rl+bym+QauhtJP5bvZY1ytt8krKGmMLYIRl36HBZfeAoqhQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/tinyspy": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.1.1.tgz",
-      "integrity": "sha512-XPJL2uSzcOyBMky6OFrusqWlzfFrXtE0hPuMgW8A2HmaqrPo4ZQHRN/V0QXN3FSjKxpsbRrFc5LI7KOwBsT1/w==",
+      "version": "2.2.0",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -6376,9 +5565,8 @@
     },
     "node_modules/tough-cookie": {
       "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
-      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "psl": "^1.1.33",
         "punycode": "^2.1.1",
@@ -6391,9 +5579,8 @@
     },
     "node_modules/tr46": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
-      "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "punycode": "^2.3.0"
       },
@@ -6403,9 +5590,8 @@
     },
     "node_modules/tsconfig-paths": {
       "version": "3.14.2",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
-      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/json5": "^0.0.29",
         "json5": "^1.0.2",
@@ -6414,16 +5600,13 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+      "version": "1.14.1",
+      "license": "0BSD"
     },
     "node_modules/tslint": {
       "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.3.tgz",
-      "integrity": "sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==",
-      "deprecated": "TSLint has been deprecated in favor of ESLint. Please see https://github.com/palantir/tslint/issues/4534 for more information.",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "builtin-modules": "^1.1.1",
@@ -6451,9 +5634,8 @@
     },
     "node_modules/tslint/node_modules/ansi-styles": {
       "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^1.9.0"
       },
@@ -6463,9 +5645,8 @@
     },
     "node_modules/tslint/node_modules/chalk": {
       "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -6477,48 +5658,42 @@
     },
     "node_modules/tslint/node_modules/color-convert": {
       "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "1.1.3"
       }
     },
     "node_modules/tslint/node_modules/color-name": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/tslint/node_modules/commander": {
       "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/tslint/node_modules/diff": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.3.1"
       }
     },
     "node_modules/tslint/node_modules/escape-string-regexp": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
     },
     "node_modules/tslint/node_modules/glob": {
       "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -6536,18 +5711,16 @@
     },
     "node_modules/tslint/node_modules/has-flag": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/tslint/node_modules/mkdirp": {
       "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "minimist": "^1.2.6"
       },
@@ -6557,18 +5730,16 @@
     },
     "node_modules/tslint/node_modules/semver": {
       "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver"
       }
     },
     "node_modules/tslint/node_modules/supports-color": {
       "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^3.0.0"
       },
@@ -6576,17 +5747,10 @@
         "node": ">=4"
       }
     },
-    "node_modules/tslint/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
     "node_modules/tslint/node_modules/tsutils": {
       "version": "2.29.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
-      "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "tslib": "^1.8.1"
       },
@@ -6596,9 +5760,8 @@
     },
     "node_modules/tsutils": {
       "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "tslib": "^1.8.1"
       },
@@ -6609,17 +5772,10 @@
         "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
       }
     },
-    "node_modules/tsutils/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
     "node_modules/type-check": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1"
       },
@@ -6629,18 +5785,16 @@
     },
     "node_modules/type-detect": {
       "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/type-fest": {
       "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true,
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
       },
@@ -6650,9 +5804,8 @@
     },
     "node_modules/typed-array-buffer": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
-      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "get-intrinsic": "^1.2.1",
@@ -6664,9 +5817,8 @@
     },
     "node_modules/typed-array-byte-length": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
-      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "for-each": "^0.3.3",
@@ -6682,9 +5834,8 @@
     },
     "node_modules/typed-array-byte-offset": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
@@ -6701,9 +5852,8 @@
     },
     "node_modules/typed-array-length": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
-      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "for-each": "^0.3.3",
@@ -6715,9 +5865,8 @@
     },
     "node_modules/typescript": {
       "version": "4.5.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz",
-      "integrity": "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==",
       "devOptional": true,
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -6728,15 +5877,13 @@
     },
     "node_modules/ufo": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.1.tgz",
-      "integrity": "sha512-uY/99gMLIOlJPwATcMVYfqDSxUR9//AUcgZMzwfSTJPDKzA1S8mX4VLqa+fiAtveraQUBCz4FFcwVZBGbwBXIw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/unbox-primitive": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "has-bigints": "^1.0.2",
@@ -6747,29 +5894,31 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/universalify": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4.0.0"
       }
     },
     "node_modules/uri-js": {
       "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "punycode": "^2.1.0"
       }
     },
     "node_modules/url-parse": {
       "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
@@ -6777,48 +5926,43 @@
     },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "devOptional": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/uuid": {
       "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "license": "MIT",
       "bin": {
         "uuid": "bin/uuid"
       }
     },
     "node_modules/v8-compile-cache": {
       "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz",
-      "integrity": "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/v8-to-istanbul": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz",
-      "integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==",
+      "version": "9.1.3",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.12",
         "@types/istanbul-lib-coverage": "^2.0.1",
-        "convert-source-map": "^1.6.0"
+        "convert-source-map": "^2.0.0"
       },
       "engines": {
         "node": ">=10.12.0"
       }
     },
     "node_modules/vite": {
-      "version": "4.3.9",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-4.3.9.tgz",
-      "integrity": "sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==",
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz",
+      "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==",
       "dev": true,
       "dependencies": {
-        "esbuild": "^0.17.5",
-        "postcss": "^8.4.23",
-        "rollup": "^3.21.0"
+        "esbuild": "^0.18.10",
+        "postcss": "^8.4.27",
+        "rollup": "^3.27.1"
       },
       "bin": {
         "vite": "bin/vite.js"
@@ -6826,12 +5970,16 @@
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
       },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
       "optionalDependencies": {
         "fsevents": "~2.3.2"
       },
       "peerDependencies": {
         "@types/node": ">= 14",
         "less": "*",
+        "lightningcss": "^1.21.0",
         "sass": "*",
         "stylus": "*",
         "sugarss": "*",
@@ -6844,6 +5992,9 @@
         "less": {
           "optional": true
         },
+        "lightningcss": {
+          "optional": true
+        },
         "sass": {
           "optional": true
         },
@@ -6860,9 +6011,8 @@
     },
     "node_modules/vite-node": {
       "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.33.0.tgz",
-      "integrity": "sha512-19FpHYbwWWxDr73ruNahC+vtEdza52kA90Qb3La98yZ0xULqV8A5JLNPUff0f5zID4984tW7l3DH2przTJUZSw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cac": "^6.7.14",
         "debug": "^4.3.4",
@@ -6883,18 +6033,16 @@
     },
     "node_modules/vite-plugin-environment": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/vite-plugin-environment/-/vite-plugin-environment-1.1.3.tgz",
-      "integrity": "sha512-9LBhB0lx+2lXVBEWxFZC+WO7PKEyE/ykJ7EPWCq95NEcCpblxamTbs5Dm3DLBGzwODpJMEnzQywJU8fw6XGGGA==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "vite": ">= 2.7"
       }
     },
     "node_modules/vitest": {
       "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.33.0.tgz",
-      "integrity": "sha512-1CxaugJ50xskkQ0e969R/hW47za4YXDUfWJDxip1hwbnhUjYolpfUn2AMOulqG/Dtd9WYAtkHmM/m3yKVrEejQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/chai": "^4.3.5",
         "@types/chai-subset": "^1.3.3",
@@ -6968,10 +6116,9 @@
       }
     },
     "node_modules/vitest/node_modules/acorn": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+      "version": "8.11.2",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -6981,9 +6128,8 @@
     },
     "node_modules/vls": {
       "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/vls/-/vls-0.8.5.tgz",
-      "integrity": "sha512-61kbdO2COZWBMC4wq59QfDdev9ruXd0226f57DFJTFpFXv85S+qnHakQlAmbSYFFLGKcx95HB2UjnuQh4YRwFA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eslint": "^8.34.0",
         "eslint-plugin-vue": "^9.9.0",
@@ -7001,9 +6147,8 @@
     },
     "node_modules/vls/node_modules/@eslint/eslintrc": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
-      "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
@@ -7023,12 +6168,11 @@
       }
     },
     "node_modules/vls/node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.11",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz",
-      "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==",
+      "version": "0.11.13",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.1",
+        "@humanwhocodes/object-schema": "^2.0.1",
         "debug": "^4.1.1",
         "minimatch": "^3.0.5"
       },
@@ -7036,11 +6180,15 @@
         "node": ">=10.10.0"
       }
     },
+    "node_modules/vls/node_modules/@humanwhocodes/object-schema": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
     "node_modules/vls/node_modules/acorn": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+      "version": "8.11.2",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -7050,23 +6198,22 @@
     },
     "node_modules/vls/node_modules/argparse": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
+      "dev": true,
+      "license": "Python-2.0"
     },
     "node_modules/vls/node_modules/eslint": {
-      "version": "8.50.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz",
-      "integrity": "sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==",
+      "version": "8.52.0",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.50.0",
-        "@humanwhocodes/config-array": "^0.11.11",
+        "@eslint/js": "8.52.0",
+        "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
         "ajv": "^6.12.4",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -7109,10 +6256,9 @@
       }
     },
     "node_modules/vls/node_modules/eslint-plugin-vue": {
-      "version": "9.17.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.17.0.tgz",
-      "integrity": "sha512-r7Bp79pxQk9I5XDP0k2dpUC7Ots3OSWgvGZNu3BxmKK6Zg7NgVtcOB6OCna5Kb9oQwJPl5hq183WD0SY5tZtIQ==",
+      "version": "9.18.1",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "natural-compare": "^1.4.0",
@@ -7131,9 +6277,8 @@
     },
     "node_modules/vls/node_modules/eslint-scope": {
       "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
@@ -7147,9 +6292,8 @@
     },
     "node_modules/vls/node_modules/espree": {
       "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
@@ -7164,18 +6308,16 @@
     },
     "node_modules/vls/node_modules/estraverse": {
       "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
     },
     "node_modules/vls/node_modules/glob-parent": {
       "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.3"
       },
@@ -7185,9 +6327,8 @@
     },
     "node_modules/vls/node_modules/js-yaml": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
       },
@@ -7197,9 +6338,8 @@
     },
     "node_modules/vls/node_modules/typescript": {
       "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
       "dev": true,
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -7209,10 +6349,9 @@
       }
     },
     "node_modules/vls/node_modules/vue-eslint-parser": {
-      "version": "9.3.1",
-      "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.3.1.tgz",
-      "integrity": "sha512-Clr85iD2XFZ3lJ52/ppmUDG/spxQu6+MAeHXjjyI4I1NUYZ9xmenQp4N0oaHJhrA8OOxltCVxMRfANGa70vU0g==",
+      "version": "9.3.2",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^4.3.4",
         "eslint-scope": "^7.1.1",
@@ -7233,39 +6372,34 @@
       }
     },
     "node_modules/vscode-html-languageservice": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.1.0.tgz",
-      "integrity": "sha512-cGOu5+lrz+2dDXSGS15y24lDtPaML1T8K/SfqgFbLmCZ1btYOxceFieR+ybTS2es/A67kRc62m2cKFLUQPWG5g==",
+      "version": "5.1.1",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@vscode/l10n": "^0.0.16",
-        "vscode-languageserver-textdocument": "^1.0.8",
-        "vscode-languageserver-types": "^3.17.3",
-        "vscode-uri": "^3.0.7"
+        "vscode-languageserver-textdocument": "^1.0.11",
+        "vscode-languageserver-types": "^3.17.5",
+        "vscode-uri": "^3.0.8"
       }
     },
     "node_modules/vscode-languageserver-textdocument": {
       "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz",
-      "integrity": "sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/vscode-languageserver-types": {
       "version": "3.17.5",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz",
-      "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/vscode-uri": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.7.tgz",
-      "integrity": "sha512-eOpPHogvorZRobNqJGhapa0JdwaxpjVvyBp0QIUMRMSf8ZAlqOdEquKuRmw9Qwu0qXtJIWqFtMkmvJjUZmMjVA==",
-      "dev": true
+      "version": "3.0.8",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/vue": {
       "version": "2.7.14",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.14.tgz",
-      "integrity": "sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==",
+      "license": "MIT",
       "dependencies": {
         "@vue/compiler-sfc": "2.7.14",
         "csstype": "^3.1.0"
@@ -7273,37 +6407,32 @@
     },
     "node_modules/vue-affix": {
       "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/vue-affix/-/vue-affix-0.5.2.tgz",
-      "integrity": "sha512-60TedWOHHuqTpaZsTni9yyc+FwH4qP/Kjt6QegK7Hv1G+tP/CJ7+K1mTRsrEJkjUq55Q0a7hjHTblv+Y+u4o0Q=="
+      "license": "MIT"
     },
     "node_modules/vue-class-component": {
       "version": "7.2.6",
-      "resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-7.2.6.tgz",
-      "integrity": "sha512-+eaQXVrAm/LldalI272PpDe3+i4mPis0ORiMYxF6Ae4hyuCh15W8Idet7wPUEs4N4YptgFHGys4UrgNQOMyO6w==",
+      "license": "MIT",
       "peerDependencies": {
         "vue": "^2.0.0"
       }
     },
     "node_modules/vue-debounce-decorator": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/vue-debounce-decorator/-/vue-debounce-decorator-1.0.1.tgz",
-      "integrity": "sha512-2XUI5deMvWDK810Py3b002rpgGdBBUI1Qvggl1rfFo1kDBEo49FDYFYo1yBuwK+Bs7p3XqF++z0K37RuGjgmIQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "vue-class-component": "^6.3.2"
       }
     },
     "node_modules/vue-debounce-decorator/node_modules/vue-class-component": {
       "version": "6.3.2",
-      "resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-6.3.2.tgz",
-      "integrity": "sha512-cH208IoM+jgZyEf/g7mnFyofwPDJTM/QvBNhYMjqGB8fCsRyTf68rH2ISw/G20tJv+5mIThQ3upKwoL4jLTr1A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/vue-eslint-parser": {
       "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-8.3.0.tgz",
-      "integrity": "sha512-dzHGG3+sYwSf6zFBa0Gi9ZDshD7+ad14DGOdTLjruRVgZXe2J+DcZ9iUhyR48z5g1PqRa20yt3Njna/veLJL/g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^4.3.2",
         "eslint-scope": "^7.0.0",
@@ -7324,10 +6453,9 @@
       }
     },
     "node_modules/vue-eslint-parser/node_modules/acorn": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+      "version": "8.11.2",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -7337,9 +6465,8 @@
     },
     "node_modules/vue-eslint-parser/node_modules/eslint-scope": {
       "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
@@ -7353,9 +6480,8 @@
     },
     "node_modules/vue-eslint-parser/node_modules/espree": {
       "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
@@ -7370,27 +6496,23 @@
     },
     "node_modules/vue-eslint-parser/node_modules/estraverse": {
       "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
     },
     "node_modules/vue-hotjar": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/vue-hotjar/-/vue-hotjar-1.4.0.tgz",
-      "integrity": "sha512-C/4lfjB1R3+eXiC+jSpNn3z0GWicpnADeRWpEHLdP2FSIi/AjupoIBikugHvGV334QYGUueXUyVZz6GHr+3eYQ=="
+      "license": "MIT"
     },
     "node_modules/vue-i18n": {
       "version": "8.28.2",
-      "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.28.2.tgz",
-      "integrity": "sha512-C5GZjs1tYlAqjwymaaCPDjCyGo10ajUphiwA922jKt9n7KPpqR7oM1PCwYzhB/E7+nT3wfdG3oRre5raIT1rKA=="
+      "license": "MIT"
     },
     "node_modules/vue-property-decorator": {
       "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-9.1.2.tgz",
-      "integrity": "sha512-xYA8MkZynPBGd/w5QFJ2d/NM0z/YeegMqYTphy7NJQXbZcuU6FC6AOdUAcy4SXP+YnkerC6AfH+ldg7PDk9ESQ==",
+      "license": "MIT",
       "peerDependencies": {
         "vue": "*",
         "vue-class-component": "*"
@@ -7398,14 +6520,12 @@
     },
     "node_modules/vue-router": {
       "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.6.5.tgz",
-      "integrity": "sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ=="
+      "license": "MIT"
     },
     "node_modules/vue-template-compiler": {
       "version": "2.7.14",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz",
-      "integrity": "sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "dependencies": {
         "de-indent": "^1.0.2",
@@ -7423,13 +6543,11 @@
     },
     "node_modules/vue2-filters": {
       "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/vue2-filters/-/vue2-filters-0.14.0.tgz",
-      "integrity": "sha512-2tFWC6gx1SVIr+6VXoufkL+bZa8Gn0/P09T/bnGjOEAGH1+eVT05bPm/VF2V/nL/HMyWkLdlvxKh9JNqpfFlyw=="
+      "license": "MIT"
     },
     "node_modules/vuelidate": {
       "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/vuelidate/-/vuelidate-0.6.2.tgz",
-      "integrity": "sha512-rowo/OSwC8XEGdWg+ZgTpcgxYtmbQKbGOw4Z+lfT/BkNPoNyPEVgIeObUhhFO7Q7Lz0u0p429qfus/BHs9tMpg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 4.0.0",
         "npm": ">= 3.0.0"
@@ -7437,9 +6555,8 @@
     },
     "node_modules/vuelidate-property-decorators": {
       "version": "1.0.28",
-      "resolved": "https://registry.npmjs.org/vuelidate-property-decorators/-/vuelidate-property-decorators-1.0.28.tgz",
-      "integrity": "sha512-ktb+9bYkTSmUFLi9g7gMGY035F5WvNnBQ/yl1U8MlclcFT65bYU/vBQ5HcZ4T1Ko6IL5wIPD4XJ+KkllKvgycg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "vue-class-component": "^7.0.1",
         "vuelidate": "^0.7.4"
@@ -7447,9 +6564,8 @@
     },
     "node_modules/vuelidate-property-decorators/node_modules/vuelidate": {
       "version": "0.7.7",
-      "resolved": "https://registry.npmjs.org/vuelidate/-/vuelidate-0.7.7.tgz",
-      "integrity": "sha512-pT/U2lDI67wkIqI4tum7cMSIfGcAMfB+Phtqh2ttdXURwvHRBJEAQ0tVbUsW9Upg83Q5QH59bnCoXI7A9JDGnA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4.0.0",
         "npm": ">= 3.0.0"
@@ -7457,8 +6573,7 @@
     },
     "node_modules/vuetify": {
       "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.7.1.tgz",
-      "integrity": "sha512-DVFmRsDtYrITw9yuGLwpFWngFYzEgk0KwloDCIV3+vhZw+NBFJOSzdbttbYmOwtqvQlhDxUyIRQolrRbSFAKlg==",
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/johnleider"
@@ -7469,17 +6584,15 @@
     },
     "node_modules/vuex": {
       "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz",
-      "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==",
+      "license": "MIT",
       "peerDependencies": {
         "vue": "^2.0.0"
       }
     },
     "node_modules/vuex-class": {
       "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/vuex-class/-/vuex-class-0.3.2.tgz",
-      "integrity": "sha512-m0w7/FMsNcwJgunJeM+wcNaHzK2KX1K1rw2WUQf7Q16ndXHo7pflRyOV/E8795JO/7fstyjH3EgqBI4h4n4qXQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "vue": "^2.5.0",
         "vue-class-component": "^6.0.0 || ^7.0.0",
@@ -7488,10 +6601,9 @@
     },
     "node_modules/vuex-module-decorators": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/vuex-module-decorators/-/vuex-module-decorators-1.2.0.tgz",
-      "integrity": "sha512-3lHp75qVgrNXUpFKs4J4eRnrxjY3BYUkHwR+ZKvvIycw/7tDwlL0RPuiYLwrHEUBTvJePSZaehZJ0BMTw1/ugQ==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8",
         "npm": ">= 5",
@@ -7504,9 +6616,8 @@
     },
     "node_modules/w3c-xmlserializer": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
-      "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "xml-name-validator": "^4.0.0"
       },
@@ -7516,18 +6627,16 @@
     },
     "node_modules/webidl-conversions": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/whatwg-encoding": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
-      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "iconv-lite": "0.6.3"
       },
@@ -7537,18 +6646,16 @@
     },
     "node_modules/whatwg-mimetype": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
-      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/whatwg-url": {
       "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz",
-      "integrity": "sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "tr46": "^4.1.1",
         "webidl-conversions": "^7.0.0"
@@ -7559,9 +6666,8 @@
     },
     "node_modules/which": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -7574,9 +6680,8 @@
     },
     "node_modules/which-boxed-primitive": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-bigint": "^1.0.1",
         "is-boolean-object": "^1.1.0",
@@ -7589,13 +6694,12 @@
       }
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
-      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
+      "version": "1.1.13",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.4",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
         "has-tostringtag": "^1.0.0"
@@ -7609,9 +6713,8 @@
     },
     "node_modules/why-is-node-running": {
       "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz",
-      "integrity": "sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "siginfo": "^2.0.0",
         "stackback": "0.0.2"
@@ -7623,26 +6726,15 @@
         "node": ">=8"
       }
     },
-    "node_modules/wide-align": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
-      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
-      "optional": true,
-      "dependencies": {
-        "string-width": "^1.0.2 || 2 || 3 || 4"
-      }
-    },
     "node_modules/wrappy": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "devOptional": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/ws": {
       "version": "8.14.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
-      "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -7661,30 +6753,26 @@
     },
     "node_modules/xml-name-validator": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
-      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/xmlchars": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/yallist": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "devOptional": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/yocto-queue": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
-      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12.20"
       },
diff --git a/package.json b/package.json
index 326bc7874..14a1b11c5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "business-filings-ui",
-  "version": "6.10.0",
+  "version": "8.0.0",
   "private": true,
   "appName": "Filings UI",
   "sbcName": "SBC Common Components",
@@ -14,20 +14,22 @@
   },
   "dependencies": {
     "@babel/compat-data": "^7.21.5",
-    "@bcrs-shared-components/base-address": "2.0.7",
+    "@bcrs-shared-components/base-address": "2.0.9",
     "@bcrs-shared-components/breadcrumb": "2.1.11",
     "@bcrs-shared-components/confirm-dialog": "1.2.1",
-    "@bcrs-shared-components/corp-type-module": "1.0.11",
+    "@bcrs-shared-components/corp-type-module": "1.0.14",
     "@bcrs-shared-components/court-order-poa": "2.1.4",
+    "@bcrs-shared-components/date-picker": "1.2.39",
     "@bcrs-shared-components/document-delivery": "1.2.1",
-    "@bcrs-shared-components/enums": "1.0.50",
-    "@bcrs-shared-components/expandable-help": "^1.0.0",
+    "@bcrs-shared-components/enums": "1.1.4",
+    "@bcrs-shared-components/expandable-help": "1.0.1",
     "@bcrs-shared-components/folio-number-input": "1.1.18",
-    "@bcrs-shared-components/interfaces": "1.0.75",
-    "@bcrs-shared-components/mixins": "1.1.25",
+    "@bcrs-shared-components/interfaces": "1.1.2",
+    "@bcrs-shared-components/mixins": "1.1.30",
     "@bcrs-shared-components/staff-comments": "1.3.11",
     "@bcrs-shared-components/staff-payment": "2.1.11",
     "@mdi/font": "^5.9.55",
+    "@reactivex/rxjs": "^6.6.7",
     "@sentry/integrations": "^7.50.0",
     "@sentry/vue": "^7.50.0",
     "axios": "^0.27.2",
@@ -44,6 +46,7 @@
     "qrcode.vue": "1.7.0",
     "regenerator-runtime": "^0.13.11",
     "register-service-worker": "^1.7.2",
+    "rxjs": "^7.8.1",
     "sbc-common-components": "3.0.8",
     "vue": "2.7.14",
     "vue-affix": "^0.5.2",
@@ -76,7 +79,7 @@
     "sass": "^1.55.0",
     "sinon": "^14.0.2",
     "typescript": "4.5.5",
-    "vite": "4.3.9",
+    "vite": "4.5.2",
     "vite-plugin-environment": "^1.1.3",
     "vitest": "0.33.0",
     "vue-class-component": "^7.2.6",
diff --git a/src/App.vue b/src/App.vue
index bdd65bbab..b96c571c7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -75,10 +75,10 @@
       </div>
     </v-fade-transition>
 
-    <!-- Fetching Data spinner -->
+    <!-- Fetching Data/Starting Amalgamation spinner -->
     <v-fade-transition>
       <div
-        v-show="showFetchingDataSpinner"
+        v-show="spinnerText"
         class="loading-container grayed-out"
       >
         <div class="loading__content">
@@ -88,7 +88,7 @@
             indeterminate
           />
           <div class="loading-msg white--text">
-            Fetching Data
+            {{ spinnerText }}
           </div>
         </div>
       </div>
@@ -104,7 +104,7 @@
       type="warning"
     >
       <div
-        class="mb-0 text-center colour-dk-text"
+        class="mb-0 text-center color-dk-text"
         v-html="bannerText"
       />
     </v-alert>
@@ -114,6 +114,7 @@
       <main v-if="isSigninRoute || dataLoaded">
         <Breadcrumb :breadcrumbs="breadcrumbs" />
         <EntityInfo
+          v-if="!isAmalgamationSelectionRoute"
           @confirmDissolution="confirmDissolutionDialog = true"
           @notInGoodStanding="nigsMessage = $event; notInGoodStandingDialog = true"
           @downloadBusinessSummary="downloadBusinessSummary()"
@@ -162,7 +163,6 @@ import {
   TaskTodoIF
 } from '@/interfaces'
 import {
-  CorpTypeCd,
   EntityStatus,
   FilingStatus,
   FilingTypes,
@@ -170,6 +170,7 @@ import {
   NigsMessage,
   Routes
 } from '@/enums'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { SessionStorageKeys } from 'sbc-common-components/src/util/constants'
 import { useBusinessStore, useConfigurationStore, useFilingHistoryListStore, useRootStore } from './stores'
 
@@ -239,14 +240,18 @@ export default {
       [
         'getEntityName',
         'getLegalType',
-        'getIdentifier'
+        'getIdentifier',
+        'isSoleProp'
       ]),
 
     ...mapState(useRootStore,
       [
         'getKeycloakRoles',
+        'isAppFiling',
+        'isAppTask',
         'isRoleStaff',
-        'showFetchingDataSpinner'
+        'showFetchingDataSpinner',
+        'showStartingAmalgamationSpinner'
       ]),
 
     /** The Business ID string. */
@@ -287,6 +292,11 @@ export default {
       return !!keycloakToken
     },
 
+    /** Is true if this is the amalgamation selection panel page. */
+    isAmalgamationSelectionRoute (): boolean {
+      return this.$route?.name === Routes.AMALGAMATION_SELECTION
+    },
+
     /** The About text. */
     aboutText (): string {
       return import.meta.env.ABOUT_TEXT
@@ -299,6 +309,13 @@ export default {
       return bannerText?.trim() || null
     },
 
+    /** Spinner text. */
+    spinnerText (): string {
+      if (this.showFetchingDataSpinner) return 'Fetching Data'
+      if (this.showStartingAmalgamationSpinner) return 'Starting Amalgamation'
+      return null
+    },
+
     /** The route breadcrumbs list. */
     breadcrumbs (): Array<BreadcrumbIF> {
       const breadcrumbs = this.$route?.meta?.breadcrumb
@@ -393,6 +410,7 @@ export default {
         'setRecordsAddress',
         'setRegisteredAddress',
         'setTasks',
+        'setUserInfo',
         'setUserKeycloakGuid'
       ]),
 
@@ -436,12 +454,14 @@ export default {
       // fetch user info and update Launch Darkly
       // and save user's Keycloak GUID
       try {
-        const userInfo = await AuthServices.fetchUserInfo(this.getAuthApiUrl).then(response => response?.data)
+        const userInfo = await AuthServices.fetchUserInfo(this.getAuthApiUrl)
+        this.setUserInfo(userInfo)
         await this.updateLaunchDarkly(userInfo)
         this.setUserKeycloakGuid(userInfo.keycloakGuid)
       } catch (error) {
         // just log the error -- no need to halt app
-        console.log('Error updating Launch Darkly =', error) // eslint-disable-line no-console
+        // eslint-disable-next-line no-console
+        console.log('Error fetching user info or updating Launch Darkly =', error)
       }
 
       // is this a business entity?
@@ -460,7 +480,7 @@ export default {
         }
       }
 
-      // is this a draft app entity?
+      // is this a draft app entity (incorporation/registration/amalgamation)?
       if (this.tempRegNumber) {
         try {
           await this.fetchDraftAppData() // throws on error
@@ -520,15 +540,15 @@ export default {
     async fetchDraftAppData (): Promise<void> {
       this.nameRequestInvalidType = null // reset for new fetches
 
-      const draft = await LegalServices.fetchDraftApp(this.tempRegNumber)
+      const application = await LegalServices.fetchDraftApp(this.tempRegNumber)
 
-      // Handle Draft filings
-      this.storeDraftApp(draft)
+      // handle draft application
+      this.storeDraftApp(application)
 
-      // if the draft has a NR, load it
-      if (this.localNrNumber) {
+      // if this app is a task (not a filing), and it has a NR, load it
+      if (this.isAppTask && this.localNrNumber) {
         const nr = await LegalServices.fetchNameRequest(this.localNrNumber)
-        this.storeNrData(nr, draft)
+        this.storeNrData(nr, application)
       }
     },
 
@@ -607,23 +627,53 @@ export default {
       }
     },
 
-    /** Verifies and stores a draft applications data. */
+    /** Verifies and stores a draft application's data. */
     storeDraftApp (application: any): void {
       const filing = application?.filing
       const filingName = filing.header?.name as FilingTypes
+
       if (!filing || !filing.header || !filingName) {
         throw new Error(`Invalid ${filingName} filing`)
       }
 
-      if (![FilingTypes.INCORPORATION_APPLICATION, FilingTypes.REGISTRATION].includes(filingName)) {
-        throw new Error(`Invalid ${filingName} filing - filing name`)
-      }
-
       const status = filing.header.status as FilingStatus
       if (!status) {
         throw new Error(`Invalid ${filingName} filing - filing status`)
       }
 
+      const isAmalgamation = (filingName === FilingTypes.AMALGAMATION_APPLICATION)
+      const isIncorporationApplication = (filingName === FilingTypes.INCORPORATION_APPLICATION)
+      const isRegistration = (filingName === FilingTypes.REGISTRATION)
+
+      let entityStatus: EntityStatus
+      switch (status) {
+        case FilingStatus.DRAFT:
+        case FilingStatus.PENDING:
+          // this is a draft application
+          if (isAmalgamation) entityStatus = EntityStatus.DRAFT_AMALGAMATION
+          else if (isIncorporationApplication) entityStatus = EntityStatus.DRAFT_INCORP_APP
+          else if (isRegistration) entityStatus = EntityStatus.DRAFT_REGISTRATION
+          else throw new Error(`Invalid ${filingName} filing - filing name`)
+          break
+
+        case FilingStatus.COMPLETED:
+        case FilingStatus.PAID:
+          // this is a filed application
+          if (isAmalgamation) entityStatus = EntityStatus.FILED_AMALGAMATION
+          else if (isIncorporationApplication) entityStatus = EntityStatus.FILED_INCORP_APP
+          else if (isRegistration) entityStatus = EntityStatus.FILED_REGISTRATION
+          else throw new Error(`Invalid ${filingName} filing - filing name`)
+          break
+
+        default:
+          throw new Error(`Invalid ${filingName} filing - filing status`)
+      }
+
+      // special check for amalgamation application
+      if (isAmalgamation && !filing.amalgamationApplication.type) {
+        throw new Error('Missing amalgamation type')
+      }
+
       // NB: different object from actual NR
       const nameRequest = filing[filingName].nameRequest as {
         legalName?: string
@@ -641,11 +691,10 @@ export default {
       }
 
       // store business info
+      this.setEntityStatus(entityStatus)
       this.setIdentifier(this.tempRegNumber)
       this.setLegalType(legalType)
-
-      // Draft Applications are always in good standing
-      this.setGoodStanding(true)
+      this.setGoodStanding(true) // draft apps are always in good standing
 
       // save local NR Number if present
       this.localNrNumber = nameRequest.nrNumber || null
@@ -653,29 +702,27 @@ export default {
       // store Legal Name if present
       if (nameRequest.legalName) this.setLegalName(nameRequest.legalName)
 
-      switch (status) {
-        case FilingStatus.DRAFT:
-        case FilingStatus.PENDING:
-          // this is a draft application
-          this.setEntityStatus(EntityStatus.DRAFT_APP)
-          this.storeDraftAppTask(application)
-          break
-
-        case FilingStatus.COMPLETED:
-        case FilingStatus.PAID:
-          // this is a filed application
-          this.setEntityStatus(EntityStatus.FILED_APP)
-          this.storeFiledApp(application)
-          break
-
-        default:
-          throw new Error(`Invalid ${filingName} filing - filing status`)
-      }
+      // store the application in the right list
+      if (this.isAppTask) this.storeDraftAppTask(application)
+      else if (this.isAppFiling) this.storeDraftAppFiling(application)
+      else throw new Error(`Invalid ${filingName} filing - filing status`)
     },
 
     /** Stores draft application as a task in the Todo List. */
     storeDraftAppTask (application: any): void {
       const filing = application.filing as TaskTodoIF
+      // NB: these were already validated in storeDraftApp()
+      const header = filing.header
+      const data = filing[header.name]
+
+      const description = GetCorpFullDescription(data.nameRequest.legalType)
+      const dba = this.isSoleProp ? ' / Doing Business As (DBA) ' : ' '
+      const filingName = EnumUtilities.filingTypeToName(header.name, null, data.type)
+
+      // save display name for later
+      filing.displayName = `${description}${dba}${filingName}`
+
+      // add this as a task item
       const taskItem: ApiTaskIF = {
         enabled: true,
         order: 1,
@@ -685,29 +732,34 @@ export default {
     },
 
     /** Stores filed application as a filing in the Filing History List. */
-    storeFiledApp (filedApplication: any): void {
-      const filing = filedApplication.filing as TaskTodoIF
+    storeDraftAppFiling (application: any): void {
+      const filing = application.filing as TaskTodoIF
       // NB: these were already validated in storeDraftApp()
       const header = filing.header
-      const application = filing[header.name]
+      const data = filing[header.name]
 
       // set addresses
-      this.storeAddresses({ data: application.offices || [] })
+      this.storeAddresses({ data: data.offices || [] })
+
+      // set parties
+      this.storeParties({ data: { parties: data.parties || [] } })
 
-      // Set parties
-      this.storeParties({ data: { parties: application.parties || [] } })
+      const description = GetCorpFullDescription(data.nameRequest.legalType)
+      const filingName = EnumUtilities.filingTypeToName(header.name, null, data.type)
 
-      // add this as a filing (for Filing History List)
+      // add this as a filing item
       const filingItem = {
         availableOnPaperOnly: header.availableOnPaperOnly,
         businessIdentifier: this.getIdentifier,
-        commentsCount: filedApplication.commentsCount,
-        commentsLink: filedApplication.commentsLink,
-        displayName: EnumUtilities.filingTypeToName(header.name),
-        documentsLink: filedApplication.documentsLink,
+        commentsCount: application.commentsCount,
+        commentsLink: application.commentsLink,
+        displayLedger: application.displayLedger,
+        displayName: `${description} ${filingName}`,
+        documentsLink: application.documentsLink,
         effectiveDate: this.apiToUtcString(header.effectiveDate),
         filingId: header.filingId,
-        filingLink: filedApplication.filingLink,
+        filingLink: application.filingLink,
+        filingSubType: data.type,
         isFutureEffective: header.isFutureEffective,
         name: header.name,
         status: header.status,
@@ -721,7 +773,7 @@ export default {
       this.setFilings([filingItem])
     },
 
-    storeNrData (nr: NameRequestIF, ia: any): void {
+    storeNrData (nr: NameRequestIF, app: any): void {
       // verify that NR is valid
       const error = this.isNrInvalid(nr)
       if (error) {
@@ -737,7 +789,7 @@ export default {
 
       // if IA is not yet completed, check if NR is consumable
       // (once IA is completed, NR state will be CONSUMED)
-      if (ia.filing.header.status !== FilingStatus.COMPLETED) {
+      if (app.filing.header.status !== FilingStatus.COMPLETED) {
         const nrState = this.getNrState(nr) as NameRequestStates
         if (nrState !== NameRequestStates.APPROVED && nrState !== NameRequestStates.CONDITIONAL) {
           this.nameRequestInvalidDialog = true
diff --git a/src/assets/images/bc_wallet_app.png b/src/assets/images/bc_wallet_app.png
new file mode 100644
index 000000000..b0b51dc01
Binary files /dev/null and b/src/assets/images/bc_wallet_app.png differ
diff --git a/src/assets/images/bc_wallet_app_store.png b/src/assets/images/bc_wallet_app_store.png
new file mode 100644
index 000000000..7d2ced331
Binary files /dev/null and b/src/assets/images/bc_wallet_app_store.png differ
diff --git a/src/assets/images/business_card_feature.png b/src/assets/images/business_card_feature.png
new file mode 100644
index 000000000..b5abde33a
Binary files /dev/null and b/src/assets/images/business_card_feature.png differ
diff --git a/src/assets/images/business_card_issuance_steps.png b/src/assets/images/business_card_issuance_steps.png
new file mode 100644
index 000000000..fa2b41056
Binary files /dev/null and b/src/assets/images/business_card_issuance_steps.png differ
diff --git a/src/assets/styles/base.scss b/src/assets/styles/base.scss
index 27e1fa2b7..a5495009f 100644
--- a/src/assets/styles/base.scss
+++ b/src/assets/styles/base.scss
@@ -315,6 +315,32 @@ ul.list {
   border-left: 1px solid $gray6;
 }
 
-.colour-dk-text {
+.message-box {
+  background-color: $BCgovGold0 !important;
+  border-color: $BCgovGold5 !important;
+  border-radius: 0;
+
+  p {
+    margin: 1.25rem;
+    padding: 0;
+    font-size: $px-14;
+    letter-spacing: 0.01rem;
+    color: $gray7;
+  }
+}
+
+.color-dk-text {
   color: $gray9 !important;
 }
+
+.bg-color-blue {
+  background-color: $BCgovBlue5O !important;
+}
+
+.word-break-normal {
+  word-break: normal;
+}
+
+.overflow-auto {
+  overflow: auto;
+}
diff --git a/src/assets/styles/theme.scss b/src/assets/styles/theme.scss
index 95d93ad2d..4bdc381c7 100644
--- a/src/assets/styles/theme.scss
+++ b/src/assets/styles/theme.scss
@@ -81,3 +81,7 @@ $px-15: 0.9375rem;
 $px-16: 1.0000rem;
 $px-20: 1.2500rem;
 $px-24: 1.5000rem;
+$px-28: 1.7500rem;
+$px-32: 2.0000rem;
+$px-34: 2.1250rem;
+$px-36: 2.2500rem;
\ No newline at end of file
diff --git a/src/components/AgmExtension/AboutTheBusiness.vue b/src/components/AgmExtension/AboutTheBusiness.vue
new file mode 100644
index 000000000..f65ca08b7
--- /dev/null
+++ b/src/components/AgmExtension/AboutTheBusiness.vue
@@ -0,0 +1,80 @@
+<template>
+  <VcardTemplate id="about-the-business">
+    <template #icon>
+      mdi-domain
+    </template>
+
+    <template #title>
+      About the Business
+    </template>
+
+    <template #content>
+      <v-row
+        no-gutters
+        class="px-6 py-7"
+      >
+        <v-col
+          cols="12"
+          sm="3"
+          class="pr-4"
+        >
+          <strong>Business in Good Standing</strong>
+        </v-col>
+        <v-col
+          id="entity-in-good-standing"
+          cols="12"
+          sm="9"
+        >
+          {{ data.isGoodStanding ? 'Yes' : 'No' }}
+        </v-col>
+      </v-row>
+
+      <v-divider class="mx-4" />
+
+      <v-row
+        no-gutters
+        class="px-6 py-7"
+      >
+        <v-col
+          cols="12"
+          sm="3"
+        >
+          <strong>Date of Incorporation</strong>
+        </v-col>
+        <v-col
+          id="entity-date-of-incorporation"
+          cols="12"
+          sm="9"
+        >
+          {{ DateUtilities.dateToPacificDate(data.incorporationDate, true) }}
+        </v-col>
+      </v-row>
+    </template>
+  </VcardTemplate>
+</template>
+
+<script lang="ts">
+import { AgmExtEvalIF } from '@/interfaces'
+import { Component, Prop, Vue } from 'vue-property-decorator'
+import { DateUtilities } from '@/services'
+import { VcardTemplate } from '@/components/common'
+
+@Component({
+  components: {
+    VcardTemplate
+  }
+})
+export default class AboutTheBusiness extends Vue {
+  readonly DateUtilities = DateUtilities
+
+  @Prop({ required: true }) readonly data!: AgmExtEvalIF
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/styles/theme.scss';
+
+.col-12 {
+  font-size: $px-16;
+}
+</style>
diff --git a/src/components/AgmExtension/AgmExtensionEvaluation.vue b/src/components/AgmExtension/AgmExtensionEvaluation.vue
new file mode 100644
index 000000000..b7bc4d3ed
--- /dev/null
+++ b/src/components/AgmExtension/AgmExtensionEvaluation.vue
@@ -0,0 +1,135 @@
+<template>
+  <VcardTemplate id="agm-extension-evaluation">
+    <template #icon>
+      mdi-calendar-range
+    </template>
+
+    <template #title>
+      AGM Extension Evaluation
+    </template>
+
+    <template #content>
+      <v-card
+        v-if="evaluateResult && !data.isEligible"
+        outlined
+        class="message-box rounded-0 mt-6 mx-6"
+      >
+        <p>
+          <strong>Evaluation Result:</strong> Based on the information provided above,
+          an extension cannot be granted.
+        </p>
+      </v-card>
+      <div
+        v-else-if="!evaluateResult"
+        class="overflow-auto"
+      >
+        <v-card
+          outlined
+          class="message-box rounded-0 my-6 mx-6"
+        >
+          <p>
+            Fill out the extension request details above to display.
+          </p>
+        </v-card>
+      </div>
+
+      <template v-if="evaluateResult">
+        <v-row
+          no-gutters
+          class="px-6 pt-7"
+        >
+          <v-col
+            cols="12"
+            sm="3"
+          >
+            <strong>AGM Year</strong>
+          </v-col>
+          <v-col
+            cols="12"
+            sm="9"
+          >
+            {{ data.agmYear }}
+          </v-col>
+        </v-row>
+
+        <v-row
+          no-gutters
+          class="px-6 py-4"
+        >
+          <v-col
+            cols="12"
+            sm="3"
+          >
+            <strong>Duration of Extension</strong>
+          </v-col>
+          <v-col
+            cols="12"
+            sm="9"
+          >
+            <template v-if="!data.isEligible">
+              <template v-if="data.alreadyExtended && !data.requestExpired">
+                The business has reached maximum possible extension for this AGM.
+              </template>
+              <template v-else-if="!data.alreadyExtended && data.requestExpired">
+                The business is outside of the time window to request an extension.
+              </template>
+              <template v-else-if="data.alreadyExtended && data.requestExpired">
+                The AGM due date from the previous extension has passed.
+              </template>
+            </template>
+            <template v-else-if="!!data.extensionDuration">
+              {{ data.extensionDuration }} months
+            </template>
+          </v-col>
+        </v-row>
+
+        <v-row
+          no-gutters
+          class="px-6 pb-7"
+        >
+          <v-col
+            cols="12"
+            sm="3"
+          >
+            <strong>Due date for this AGM</strong>
+          </v-col>
+          <v-col
+            cols="12"
+            sm="9"
+          >
+            <template v-if="data.isEligible">
+              {{ formattedDate(data.agmDueDate) }}
+            </template>
+            <template v-else>
+              {{ formattedDate(data.prevExpiryDate) }}
+            </template>
+          </v-col>
+        </v-row>
+      </template>
+    </template>
+  </VcardTemplate>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from 'vue-property-decorator'
+import { VcardTemplate } from '@/components/common'
+import { AgmExtEvalIF } from '@/interfaces'
+import { DateUtilities } from '@/services'
+
+@Component({
+  components: {
+    VcardTemplate
+  }
+})
+export default class AgmExtensionEvaluation extends Vue {
+  @Prop({ required: true }) readonly data!: AgmExtEvalIF
+  @Prop({ default: false }) readonly evaluateResult!: boolean
+
+  formattedDate (val: string): string {
+    const date = (DateUtilities.yyyyMmDdToDate(val))
+    const pacificDate = DateUtilities.dateToPacificDate(date, true)
+    if (pacificDate) return pacificDate
+    return ''
+  }
+}
+</script>
diff --git a/src/components/AgmExtension/AgmExtensionHelp.vue b/src/components/AgmExtension/AgmExtensionHelp.vue
new file mode 100644
index 000000000..8ff89a828
--- /dev/null
+++ b/src/components/AgmExtension/AgmExtensionHelp.vue
@@ -0,0 +1,31 @@
+<template>
+  <section class="agm-extension-help mt-0">
+    <h3 class="text-center">
+      AGM Extension Help
+    </h3>
+    <div class="mt-6">
+      <p class="ml-1">
+        A company must have an annual general meeting (AGM) every calendar year, not more than 15
+        months after the previous year's meeting. A company's first AGM must happen within 18 months
+        of recognition. The date of an AGM becomes the company's annual reference date.
+      </p>
+      <p class="ml-1">
+        Shareholders entitled to vote may decide by unanimous resolution to postpone the AGM to a
+        later date than the annual reference date. They can also decide by unanimous resolution to
+        waive the AGM for that year. A unanimous resolution to postpone or waive the AGM must pass on
+        or before the annual reference date. Shareholders must select a new annual reference date.
+      </p>
+      <p class="ml-1">
+        If a company does not pass a unanimous resolution before the required date, they must apply
+        for an AGM extension.
+      </p>
+    </div>
+  </section>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator'
+
+@Component({})
+export default class AgmExtensionHelp extends Vue {}
+</script>
diff --git a/src/components/AgmExtension/ExtensionRequest.vue b/src/components/AgmExtension/ExtensionRequest.vue
new file mode 100644
index 000000000..b46c693b5
--- /dev/null
+++ b/src/components/AgmExtension/ExtensionRequest.vue
@@ -0,0 +1,529 @@
+<template>
+  <VcardTemplate id="extension-request">
+    <template #icon>
+      mdi-calendar-range
+    </template>
+
+    <template #title>
+      Extension Request
+    </template>
+
+    <template #content>
+      <div
+        class="px-6 py-7"
+        :class="{ 'invalid-section': !firstSectionValid && showErrors }"
+      >
+        <v-row
+          v-if="!is30MonthsAfterIncorp"
+          no-gutters
+        >
+          <v-col
+            cols="12"
+            sm="3"
+          >
+            <strong>Is this the first AGM?</strong>
+          </v-col>
+          <v-col
+            cols="12"
+            sm="9"
+          >
+            <v-radio-group
+              id="first-agm-radio-group"
+              v-model="data.isFirstAgm"
+              class="mt-0 pt-0"
+            >
+              <v-radio
+                label="Yes"
+                :value="true"
+              />
+              <v-radio
+                label="No - Specify AGM Year below"
+                class="pt-2"
+                :value="false"
+              />
+            </v-radio-group>
+          </v-col>
+        </v-row>
+
+        <v-row no-gutters>
+          <v-col
+            cols="12"
+            sm="3"
+          >
+            <strong>AGM Year</strong>
+          </v-col>
+          <v-col
+            cols="12"
+            sm="9"
+          >
+            <AgmYear
+              v-model="data.agmYear"
+              label="AGM year"
+              :rules="agmYearRules"
+              :disableEdit="isFirstAgm"
+              @valid="agmYearValid=$event"
+            />
+          </v-col>
+        </v-row>
+      </div>
+
+      <v-divider class="mx-4" />
+
+      <div
+        class="px-6 py-7"
+        :class="{ 'invalid-section': !secondSectionValid && showErrors }"
+      >
+        <v-expand-transition>
+          <v-row
+            v-if="!isFirstAgm"
+            no-gutters
+          >
+            <v-col
+              cols="12"
+              sm="3"
+              class="pr-4"
+            >
+              <strong>Most recent annual reference date or AGM date</strong>
+            </v-col>
+            <v-col
+              cols="12"
+              sm="9"
+            >
+              <DatePicker
+                class="pt-2"
+                title="Previous AGM date or a reference date"
+                nudge-right="40"
+                :minDate="incorporationDateText"
+                :maxDate="data.currentDate"
+                :inputRules="dateRules"
+                @emitDate="data.prevAgmDate = $event"
+                @emitCancel="data.prevAgmDate = ''"
+              />
+            </v-col>
+          </v-row>
+        </v-expand-transition>
+        <v-row no-gutters>
+          <v-col
+            cols="12"
+            sm="3"
+            class="pr-4"
+          >
+            <strong>Has an extension been requested for this AGM year already?</strong>
+          </v-col>
+          <v-col
+            cols="12"
+            sm="9"
+          >
+            <v-radio-group
+              id="prev-extension-radio-group"
+              v-model="data.isPrevExtension"
+              class="mt-0 pt-0"
+            >
+              <v-radio
+                label="Yes - Specify the date the extension expires"
+                :value="true"
+              />
+              <v-expand-transition>
+                <DatePicker
+                  v-if="data.isPrevExtension"
+                  class="pt-2 pl-8"
+                  title="Date of extension expiry"
+                  nudge-right="40"
+                  :disablePicker="!data.isPrevExtension"
+                  :showCurrent="prevExpiryDateMin"
+                  :minDate="prevExpiryDateMin"
+                  :maxDate="prevExpiryDateMax"
+                  :inputRules="dateRules"
+                  @emitDate="data.prevExpiryDate = $event"
+                  @emitCancel="data.prevExpiryDate = ''"
+                />
+              </v-expand-transition>
+              <v-radio
+                label="No - this is the first extension request for this AGM"
+                class="pt-2"
+                :value="false"
+              />
+            </v-radio-group>
+          </v-col>
+        </v-row>
+      </div>
+
+      <v-divider class="mx-4" />
+
+      <div
+        class="px-6 py-7"
+        :class="{ 'invalid-section': !thirdSectionValid && showErrors }"
+      >
+        <v-row no-gutters>
+          <v-col
+            cols="12"
+            sm="3"
+            class="pr-4"
+          >
+            <strong>Intended date this AGM will be held</strong>
+          </v-col>
+          <v-col
+            cols="12"
+            sm="9"
+          >
+            <DatePicker
+              class="pt-2"
+              title="Intended date this AGM will be held"
+              nudge-right="40"
+              :minDate="data.currentDate"
+              :inputRules="dateRules"
+              @emitDate="data.intendedAgmDate = $event"
+              @emitCancel="data.intendedAgmDate = ''"
+            />
+          </v-col>
+        </v-row>
+      </div>
+    </template>
+  </VcardTemplate>
+</template>
+
+<script lang="ts">
+import { Component, Emit, Prop, Vue, Watch } from 'vue-property-decorator'
+import { VcardTemplate } from '@/components/common'
+import { AgmExtEvalIF } from '@/interfaces'
+import { DatePicker } from '@bcrs-shared-components/date-picker'
+import AgmYear from '@/components/AgmLocationChange/AgmYear.vue'
+import { DateUtilities } from '@/services'
+
+@Component({
+  components: {
+    AgmYear,
+    DatePicker,
+    VcardTemplate
+  }
+})
+export default class ExtensionRequest extends Vue {
+  @Prop({ required: true }) readonly data!: AgmExtEvalIF
+  @Prop({ default: false }) readonly showErrors!: boolean
+
+  /** Variables for validation rules. */
+  isValid = false
+  agmYearValid = false
+
+  get firstSectionValid (): boolean {
+    return this.data.isFirstAgm != null && this.agmYearValid
+  }
+
+  get secondSectionValid (): boolean {
+    const isPrevExtensionValid = (
+      (this.data.isPrevExtension && !!this.data.prevExpiryDate) ||
+      (this.data.isPrevExtension === false)
+    )
+
+    if (this.isFirstAgm) {
+      return isPrevExtensionValid
+    } else {
+      return this.data.prevAgmDate && isPrevExtensionValid
+    }
+  }
+
+  get thirdSectionValid (): boolean {
+    return !!this.data.intendedAgmDate
+  }
+
+  /** The array of validations rule(s) for the AGM Year text field. */
+  get agmYearRules (): Array<(v) => boolean | string> {
+    return [
+      v => !!v || 'A year is required.',
+      v => (!!v && v.length === 4) || 'Please enter a valid year.',
+      v => parseInt(v) >= this.data.incorporationDate?.getFullYear() ||
+        'Year cannot be before incorporation date.',
+      v => !DateUtilities.isDateFuture(v) || 'Year cannot be in the future.'
+    ]
+  }
+
+  /** The array of validations rule(s) for the  date fields. */
+  get dateRules (): Array<(v) => boolean | string> {
+    return [
+      v => !!v || 'A date is required.'
+    ]
+  }
+
+  /** Whether to disable the editing of AGM Year field. */
+  get isFirstAgm (): boolean {
+    // Field disabled on first load when value is null
+    if (this.data.isFirstAgm == null) {
+      return true
+    }
+
+    // Field disabled when it is first agm
+    return this.data.isFirstAgm
+  }
+
+  /** Hide isFirstAgm question if IncorporationDate >= 30 months ago */
+  get is30MonthsAfterIncorp (): boolean {
+    if (
+      DateUtilities.subtractDates(
+        DateUtilities.dateToYyyyMmDd(this.data.incorporationDate),
+        this.data.currentDate
+      ) >= 30
+    ) {
+      this.data.isFirstAgm = false
+      return true
+    } else {
+      return false
+    }
+  }
+
+  /** Extension expiry maximum date allowed */
+  get prevExpiryDateMax (): string {
+    if (this.isFirstAgm) {
+      // For first AGM, max shouldn't be later than Incorporation date + 18 months + 12 months
+      return DateUtilities.addMonthsToDate(30, DateUtilities.dateToYyyyMmDd(this.data.incorporationDate))
+    } else {
+      // For subsequent AGMs, max shouldn't be later than reference date + 15 months + 12 months
+      return DateUtilities.addMonthsToDate(27, this.data.prevAgmDate)
+    }
+  }
+
+  /** Extension expiry minimum date allowed */
+  get prevExpiryDateMin (): string {
+    if (this.isFirstAgm) {
+      // For first AGM, min shouldn't be later than Incorporation date + 18 months
+      return DateUtilities.addMonthsToDate(18, DateUtilities.dateToYyyyMmDd(this.data.incorporationDate))
+    } else {
+      // For subsequent AGMs, min shouldn't be later than reference date + 15 months
+      return DateUtilities.addMonthsToDate(15, this.data.prevAgmDate)
+    }
+  }
+
+  /** Incorporation date as text. */
+  get incorporationDateText (): string {
+    return DateUtilities.dateToYyyyMmDd(
+      this.data?.incorporationDate
+    )
+  }
+
+  /** Called when isFirstAgm radio group changes. */
+  @Watch('data.isFirstAgm')
+  onIsFirstAgmChanged (val: boolean): void {
+    if (val) {
+      this.data.agmYear = this.data.incorporationDate.getFullYear().toString()
+      this.data.prevAgmDate = null
+    } else {
+      this.data.agmYear = ''
+    }
+  }
+
+  /** Called when isPrevExtension radio group changes. */
+  @Watch('data.isPrevExtension')
+  onIsPrevExtensionChanged (val: boolean): void {
+    if (!val) {
+      this.data.prevExpiryDate = null
+    }
+  }
+
+  /** Watches all data properties to keep track of changes. */
+  @Watch('data.isFirstAgm')
+  @Watch('data.prevAgmDate')
+  @Watch('data.isPrevExtension')
+  @Watch('data.prevExpiryDate')
+  @Watch('data.intendedAgmDate')
+  @Watch('data.currentDate')
+  @Watch('agmYearValid')
+  private onHaveChanges (): void {
+    this.checkEligibility()
+    this.checkValidity()
+  }
+
+  /** Eligibility for first agm with no extension requested this year */
+  /* eslint-disable brace-style */
+  handleFirstAgmNotPrevExtension (): void {
+    const currentDate = DateUtilities.yyyyMmDdToDate(this.data.currentDate)
+    const cutOffYyyyMmDd = DateUtilities.addMonthsToDate(
+      18, DateUtilities.dateToYyyyMmDd(this.data.incorporationDate))
+    const cutOffDate = DateUtilities.yyyyMmDdToDate(cutOffYyyyMmDd)
+
+    // IF CurrentDate > (IncorporationDate + 18 Months + 5 days)
+    if ((DateUtilities.daysBetweenTwoDates(cutOffDate, currentDate) - 5) > 0) {
+      this.data.isEligible = false
+      this.data.requestExpired = true
+    }
+    // ELSE ExtensionDuration = 6 months
+    else {
+      this.data.isEligible = true
+      this.data.extensionDuration = 6
+      this.data.agmDueDate = DateUtilities.addMonthsToDate(
+        this.data.extensionDuration,
+        cutOffYyyyMmDd
+      )
+    }
+  }
+
+  /** Eligibility for first agm with extension requested this year */
+  handleFirstAgmAndPrevExtension (): void {
+    const currentDate = DateUtilities.yyyyMmDdToDate(this.data.currentDate)
+    const cutOffYyyyMmDd = DateUtilities.addMonthsToDate(
+      30, DateUtilities.dateToYyyyMmDd(this.data.incorporationDate))
+    const cutOffDate = DateUtilities.yyyyMmDdToDate(cutOffYyyyMmDd)
+    const expiryDate = DateUtilities.yyyyMmDdToDate(this.data.prevExpiryDate)
+
+    // IF ExpirationDate >= (IncorporationDate + 18 months + 12 months)
+    if ((DateUtilities.daysBetweenTwoDates(cutOffDate, expiryDate)) >= 0) {
+      // Shouldn't get here
+      this.data.isEligible = false
+      this.data.alreadyExtended = true
+    }
+    // ELSE IF CurrentDate > (ExpirationDate + 5 days)
+    else if ((DateUtilities.daysBetweenTwoDates(expiryDate, currentDate)) > 5) {
+      this.data.isEligible = false
+      this.data.requestExpired = true
+    }
+    // ELSE ELIGIBLE, ExtensionDuration = MIN(6, 12 - totalExtensionApproved)
+    else {
+      this.data.isEligible = true
+      // totalExtensionApproved: (ExpirationDate - 18 months - IncorporationDate) in months
+      const totalExtensionApproved = DateUtilities.subtractDates(
+        DateUtilities.dateToYyyyMmDd(this.data.incorporationDate), this.data.prevExpiryDate) - 18
+      this.data.extensionDuration = Math.min(6, (12 - totalExtensionApproved))
+      this.data.agmDueDate = DateUtilities.addMonthsToDate(
+        this.data.extensionDuration,
+        this.data.prevExpiryDate
+      )
+    }
+  }
+
+  /** Eligibility for subsequent agm with no extension requested this year */
+  handleNotFirstAgmNotPrevExtension (): void {
+    const currentDate = DateUtilities.yyyyMmDdToDate(this.data.currentDate)
+    const cutOffYyyyMmDd = DateUtilities.addMonthsToDate(
+      15, this.data.prevAgmDate)
+    const cutOffDate = DateUtilities.yyyyMmDdToDate(cutOffYyyyMmDd)
+
+    // IF CurrentDate > (PrevAgmDate + 15 Months + 5 days)
+    if ((DateUtilities.daysBetweenTwoDates(cutOffDate, currentDate) - 5) > 0) {
+      this.data.isEligible = false
+      this.data.requestExpired = true
+    }
+    // ELSE ExtensionDuration = 6 months
+    else {
+      this.data.isEligible = true
+      this.data.extensionDuration = 6
+      this.data.agmDueDate = DateUtilities.addMonthsToDate(
+        this.data.extensionDuration,
+        cutOffYyyyMmDd
+      )
+    }
+  }
+
+  /** Eligibility for subsequent agm with extension requested this year */
+  handleNotFirstAgmAndPrevExtension (): void {
+    const currentDate = DateUtilities.yyyyMmDdToDate(this.data.currentDate)
+    const cutOffDate = DateUtilities.yyyyMmDdToDate(this.data.prevAgmDate)
+    const expiryDate = DateUtilities.yyyyMmDdToDate(this.data.prevExpiryDate)
+
+    // IF CurrentDate > (ExpirationDate + 5 days)
+    if ((DateUtilities.daysBetweenTwoDates(expiryDate, currentDate)) > 5) {
+      this.data.isEligible = false
+      this.data.requestExpired = true
+    }
+    // ELSE IF (ExpirationDate - PrevAgmDate) > 12 months
+    else if ((DateUtilities.daysBetweenTwoDates(cutOffDate, expiryDate)) > 365) {
+      this.data.isEligible = false
+      this.data.alreadyExtended = true
+    }
+    // ELSE ExtensionDuration = 12 months - ExpiryDate - PrevAgmDate
+    else {
+      this.data.isEligible = true
+      this.data.extensionDuration = 12 - DateUtilities.subtractDates(
+        this.data.prevAgmDate,
+        this.data.prevExpiryDate
+      )
+      this.data.agmDueDate = DateUtilities.addMonthsToDate(
+        this.data.extensionDuration,
+        this.data.prevExpiryDate
+      )
+    }
+  }
+
+  /** Checks eligibility for agm request */
+  checkEligibility (): void {
+    this.data.isEligible = false
+    this.data.extensionDuration = null
+    this.data.agmDueDate = null
+    this.data.alreadyExtended = false
+    this.data.requestExpired = false
+
+    // IF first AGM extension
+    // AND NOT extension requested this year
+    if (
+      this.isFirstAgm &&
+      this.data.isPrevExtension === false &&
+      this.data.incorporationDate
+    ) {
+      this.handleFirstAgmNotPrevExtension()
+    }
+
+    // ELSE IF first AGM extension
+    // AND extension requested this year
+    else if (
+      this.isFirstAgm &&
+      this.data.isPrevExtension &&
+      this.data.prevExpiryDate &&
+      this.data.incorporationDate
+    ) {
+      this.handleFirstAgmAndPrevExtension()
+    }
+
+    // ELSE IF NOT first agm extension
+    // AND NOT extension requested this year
+    else if (
+      this.isFirstAgm === false &&
+      this.data.isPrevExtension === false &&
+      this.data.prevAgmDate
+    ) {
+      this.handleNotFirstAgmNotPrevExtension()
+    }
+
+    // ELSE IF NOT first agm extension
+    // AND extension requested this year
+    else if (
+      this.isFirstAgm === false &&
+      this.data.isPrevExtension &&
+      this.data.prevAgmDate &&
+      this.data.prevExpiryDate
+    ) {
+      this.handleNotFirstAgmAndPrevExtension()
+    }
+
+    this.emitData()
+  }
+  /* eslint-enable brace-style */
+
+  /** Whether the extension request is valid or not */
+  checkValidity (): void {
+    this.isValid = (
+      this.firstSectionValid &&
+      this.secondSectionValid &&
+      this.thirdSectionValid
+    )
+
+    this.emitValid()
+  }
+
+  /** Emits an event of the updated data object. */
+  @Emit('update:data')
+  private emitData (): AgmExtEvalIF {
+    return this.data
+  }
+
+  /** Emits an event indicating whether or not this component is valid. */
+  @Emit('valid')
+  private emitValid (): boolean {
+    return this.isValid
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/styles/theme.scss';
+
+.agm-year-textfield {
+  max-width: 50%;
+}
+</style>
diff --git a/src/components/AgmLocationChange/AgmLocation.vue b/src/components/AgmLocationChange/AgmLocation.vue
new file mode 100644
index 000000000..84b91ca96
--- /dev/null
+++ b/src/components/AgmLocationChange/AgmLocation.vue
@@ -0,0 +1,67 @@
+<template>
+  <v-text-field
+    id="agm-location"
+    ref="textAreaRef"
+    filled
+    :label="textFieldlabel"
+    :rules="rules"
+    :value="locationValue"
+    @input="emitInput($event)"
+  />
+</template>
+
+<script lang="ts">
+import { Component, Emit, Prop, Vue, Watch } from 'vue-property-decorator'
+
+@Component({})
+export default class AgmLocation extends Vue {
+  // Refs
+  $refs!: {
+    textAreaRef: any
+  }
+
+  /** The AGM location text field value. */
+  @Prop({ default: '' }) readonly locationValue!: string
+
+  /** The AGM location text field label. */
+  @Prop({ default: 'AGM Location' }) readonly textFieldlabel!: string
+
+  /** The AGM location text field rules. */
+  @Prop({ default: () => [] }) readonly rules!: any[]
+
+  /** Prompt the validations. Used for global validations. */
+  @Prop({ default: false }) readonly validateForm!: boolean
+
+  agmLocation = ''
+
+  /** Called when component is created. */
+  created (): void {
+    // inform parent of initial validity
+    this.emitValid(this.locationValue)
+  }
+
+  /** Validate the AGM location text field */
+  @Watch('validateForm')
+  validateAgmLocation (): void {
+    if (this.validateForm && !this.agmLocation) {
+      this.$refs.textAreaRef.validate()
+      this.$refs.textAreaRef.error = true
+    }
+  }
+
+  /** Emits an event with the changed input (ie, updated v-model). */
+  @Emit('update:agmLocation')
+  emitInput (val: string): void {
+    this.agmLocation = val
+    this.emitValid(val)
+    this.$refs.textAreaRef.error = false
+  }
+
+  /** Emits an event indicating whether or not this component is valid. */
+  @Emit('valid')
+  emitValid (val: string): boolean {
+    // component is valid if every rule is valid
+    return this.rules.every(rule => rule(val) === true)
+  }
+}
+</script>
diff --git a/src/components/AgmLocationChange/AgmYear.vue b/src/components/AgmLocationChange/AgmYear.vue
new file mode 100644
index 000000000..c8fa7cc78
--- /dev/null
+++ b/src/components/AgmLocationChange/AgmYear.vue
@@ -0,0 +1,76 @@
+<template>
+  <v-text-field
+    id="year-txt"
+    ref="textAreaRef"
+    hide-spin-buttons
+    type="number"
+    filled
+    :disabled="disableEdit"
+    :label="label"
+    :rules="rules"
+    :value="value"
+    validate-on-blur
+    @input="emitInput($event)"
+  />
+</template>
+
+<script lang="ts">
+import { Component, Emit, Prop, Vue, Watch } from 'vue-property-decorator'
+import { Debounce } from 'vue-debounce-decorator'
+
+@Component({})
+export default class AgmYear extends Vue {
+  // Refs
+  $refs!: {
+    textAreaRef: any
+  }
+
+  @Prop({ default: '' }) readonly value!: string
+
+  @Prop({ default: 'Year' }) readonly label!: string
+
+  @Prop({ default: () => [] }) readonly rules!: any[]
+
+  @Prop({ default: false }) readonly validateForm!: boolean
+
+  /** Whether to disable the AGM year input field. */
+  @Prop({ default: false }) readonly disableEdit!: boolean
+
+  agmYear = ''
+
+  /** Called when component is created. */
+  created (): void {
+    // inform parent of initial validity
+    this.emitValid(this.value)
+  }
+
+  @Watch('value')
+  @Debounce(300)
+  onValueChanged (val: string): void {
+    this.emitValid(val)
+  }
+
+  /** Validate AGM year field */
+  @Watch('validateForm')
+  validateAgmYear (): void {
+    if (this.validateForm && !this.agmYear) {
+      this.$refs.textAreaRef.validate()
+      this.$refs.textAreaRef.error = true
+    }
+  }
+
+  /** Emits an event with the changed input (ie, updated v-model). */
+  @Emit('input')
+  emitInput (val: string): void {
+    this.agmYear = val
+  }
+
+  /** Emits an event indicating whether or not this component is valid. */
+  @Emit('valid')
+  emitValid (val: string): boolean {
+    // component is valid if every rule is valid
+    return this.rules.every(rule => rule(val) === true)
+  }
+}
+
+</script>
diff --git a/src/components/Dashboard/Alerts/Amalgamation.vue b/src/components/Dashboard/Alerts/Amalgamation.vue
new file mode 100644
index 000000000..120bbeb92
--- /dev/null
+++ b/src/components/Dashboard/Alerts/Amalgamation.vue
@@ -0,0 +1,127 @@
+<template>
+  <v-expansion-panels
+    id="amalgamation-container"
+    v-model="panel"
+  >
+    <v-expansion-panel class="mb-6">
+      <v-expansion-panel-header
+        hide-actions
+        class="d-flex justify-space-between px-6 py-5"
+      >
+        <h3>
+          <v-icon
+            left
+            color="orange darken-2"
+          >
+            mdi-alert
+          </v-icon>
+          <span>This corporation is part of an amalgamation and is scheduled to become
+            historical on {{ amalgamationDate || '[unknown]' }}.</span>
+        </h3>
+        <v-btn
+          text
+          color="primary"
+          class="details-btn my-n1"
+          @click.stop="togglePanel()"
+        >
+          <span color="primary">{{ panel === 0 ? "Hide Details" : "View Details" }}</span>
+          <v-icon
+            right
+            color="primary"
+          >
+            {{ panel === 0 ? "mdi-chevron-up" : "mdi-chevron-down" }}
+          </v-icon>
+        </v-btn>
+      </v-expansion-panel-header>
+
+      <v-expansion-panel-content>
+        <p class="mb-0">
+          If you have any questions, please contact BC Registries staff:
+        </p>
+        <ContactInfo class="pt-5" />
+      </v-expansion-panel-content>
+    </v-expansion-panel>
+  </v-expansion-panels>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator'
+import { Getter } from 'pinia-class'
+import { ContactInfo } from '@/components/common'
+import { useBusinessStore } from '@/stores'
+import { ApiDateTimeUtc, BusinessWarningIF } from '@/interfaces'
+import { DateUtilities } from '@/services'
+
+@Component({
+  components: { ContactInfo }
+})
+export default class Amalgamation extends Vue {
+  @Getter(useBusinessStore) getBusinessWarnings!: BusinessWarningIF[]
+
+  panel = 1
+
+  togglePanel (): void {
+    this.panel = (this.panel === 1 ? 0 : 1)
+  }
+
+  get amalgamationDate (): string {
+    const warning = this.getBusinessWarnings.find(item =>
+      item.warningType?.includes('FUTURE_EFFECTIVE_AMALGAMATION')
+    )
+    const date = warning?.data?.amalgamationDate as ApiDateTimeUtc
+    return DateUtilities.apiToPacificDate(date, true)
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/styles/theme.scss";
+
+.v-expansion-panel-header {
+  pointer-events: none; // disable whole-row expansion
+}
+
+h3 {
+  .v-icon {
+    margin-top: -2px;
+    font-size: $px-20;
+  }
+
+  span {
+    font-size: $px-14;
+  }
+}
+
+.details-btn {
+  pointer-events: auto; // enable detail button only
+  max-width: fit-content;
+  color: $app-blue;
+
+  span {
+    font-size: $px-13;
+  }
+
+  .v-icon {
+    font-size: $px-24 !important;
+  }
+}
+
+// override default expansion panel padding
+:deep(.v-expansion-panel-content__wrap) {
+  padding: 0 1.5rem 1.25rem 1.5rem;
+}
+
+p {
+  font-size: $px-14;
+}
+
+// override contact info sizes
+:deep(.contact-info .contact-container) {
+  .v-icon {
+    font-size: $px-16 !important;
+  }
+  span {
+    font-size: $px-14 !important;
+  }
+}
+</style>
diff --git a/src/components/Dashboard/FilingHistoryList.vue b/src/components/Dashboard/FilingHistoryList.vue
index e146c4610..060204124 100644
--- a/src/components/Dashboard/FilingHistoryList.vue
+++ b/src/components/Dashboard/FilingHistoryList.vue
@@ -143,7 +143,9 @@ export default class FilingHistoryList extends Mixins(FilingMixin) {
   is (filing: ApiFilingIF): string {
     switch (true) {
       case filing.availableOnPaperOnly: return 'paper-filing' // must come first
+      case EnumUtilities.isTypeAgmExtension(filing): return 'agm-extension'
       case EnumUtilities.isTypeAlteration(filing): return 'alteration-filing'
+      case EnumUtilities.isTypeAmalgamation(filing): return 'amalgamation-filing'
       case EnumUtilities.isTypeChangeOfAddress(filing): return 'change-of-address'
       case EnumUtilities.isTypeConsentContinuationOut(filing): return 'consent-continuation-out'
       case EnumUtilities.isTypeContinuationOut(filing): return 'continuation-out'
@@ -231,7 +233,9 @@ export default class FilingHistoryList extends Mixins(FilingMixin) {
 }
 
 :deep(.v-expansion-panel-header) {
+  min-height: auto !important;
   padding: 0;
+  margin-top: 0.25rem;
 
   .v-expansion-panel-header__icon {
     display: none;
diff --git a/src/components/Dashboard/FilingHistoryList/FilingTemplate.vue b/src/components/Dashboard/FilingHistoryList/FilingTemplate.vue
index d7ce4941f..0c13d6296 100644
--- a/src/components/Dashboard/FilingHistoryList/FilingTemplate.vue
+++ b/src/components/Dashboard/FilingHistoryList/FilingTemplate.vue
@@ -53,7 +53,7 @@
       </div>
     </v-expansion-panel-header>
 
-    <v-expansion-panel-content>
+    <v-expansion-panel-content class="pt-5">
       <slot name="body">
         <!-- is this a generic paid (not yet completed) filing? -->
         <div
diff --git a/src/components/Dashboard/FilingHistoryList/HeaderActions.vue b/src/components/Dashboard/FilingHistoryList/HeaderActions.vue
index 2ce6a54c1..b9e01d424 100644
--- a/src/components/Dashboard/FilingHistoryList/HeaderActions.vue
+++ b/src/components/Dashboard/FilingHistoryList/HeaderActions.vue
@@ -154,9 +154,8 @@ export default class HeaderActions extends Mixins(AllowableActionsMixin) {
 
       case FilingTypes.CHANGE_OF_ADDRESS:
       case FilingTypes.CHANGE_OF_DIRECTORS:
-        if (this.isBenBcCccUlc) {
-          // correction via Edit UI if current type is BC, CC, ULC, or BEN
-          // To-Do for the future: Revisit this when we do Coop corrections in Edit UI
+        if (this.isBenBcCccUlc || this.isCoop) {
+          // correction via Edit UI if current type is BC, CC, ULC, BEN or COOP
           this.setCurrentFiling(filing)
           this.setFileCorrectionDialog(true)
           break
diff --git a/src/components/Dashboard/FilingHistoryList/LimitedRestorationExtensionFiling.vue b/src/components/Dashboard/FilingHistoryList/LimitedRestorationExtensionFiling.vue
index 72ce11f51..b8ff3918c 100644
--- a/src/components/Dashboard/FilingHistoryList/LimitedRestorationExtensionFiling.vue
+++ b/src/components/Dashboard/FilingHistoryList/LimitedRestorationExtensionFiling.vue
@@ -7,10 +7,10 @@
 
     <p>
       The period of restoration was successfuly extended and is active
-      <strong>until {{ expiryDateFriendly }}</strong>. At the end of the extended limited
-      restoration period, the company will be automatically dissolved. If you require assistance
-      to extend a limited restoration/reinstatement or wish to convert your restoration from a
-      limited period to a full restoration, please contact BC Registries staff:
+      <strong>until {{ expiryDateFriendly || '[unknown]' }}</strong>. At the end of the extended
+      limited restoration period, the company will be automatically dissolved. If you require
+      assistance to extend a limited restoration/reinstatement or wish to convert your restoration
+      from a limited period to a full restoration, please contact BC Registries staff:
     </p>
 
     <ContactInfo class="mt-4" />
@@ -33,7 +33,7 @@ export default class LimitedRestorationExtensionFiling extends Vue {
   /** The expiry date of the limited restoration extension filing. */
   get expiryDateFriendly (): string {
     const date = DateUtilities.yyyyMmDdToDate(this.filing.expiry)
-    return (DateUtilities.dateToPacificDate(date, true) || 'Unknown')
+    return DateUtilities.dateToPacificDate(date, true)
   }
 }
 
diff --git a/src/components/Dashboard/FilingHistoryList/filings/AgmExtension.vue b/src/components/Dashboard/FilingHistoryList/filings/AgmExtension.vue
new file mode 100644
index 000000000..935ab7de1
--- /dev/null
+++ b/src/components/Dashboard/FilingHistoryList/filings/AgmExtension.vue
@@ -0,0 +1,57 @@
+<template>
+  <FilingTemplate
+    class="agm-extension"
+    :filing="filing"
+    :index="index"
+  >
+    <template #body>
+      <div v-if="isFilingComplete">
+        <p class="mt-4">
+          The {{ agmYear }} AGM must be held by <strong>{{ agmDueDate }}</strong>.
+        </p>
+      </div>
+    </template>
+  </FilingTemplate>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from 'vue-property-decorator'
+import { ApiFilingIF } from '@/interfaces'
+import FilingTemplate from '../FilingTemplate.vue'
+import { DateUtilities, EnumUtilities } from '@/services'
+
+@Component({
+  components: { FilingTemplate }
+})
+export default class AgmExtension extends Vue {
+  @Prop({ required: true }) readonly filing!: ApiFilingIF
+  @Prop({ required: true }) readonly index!: number
+
+  /** Whether the filing is complete. */
+  get isFilingComplete (): boolean {
+    return EnumUtilities.isStatusCompleted(this.filing)
+  }
+
+  get agmYear (): string {
+    return this.filing.data?.agmExtension?.year || '[unknown]'
+  }
+
+  get agmDueDate (): string {
+    const yyyyMmDd = this.filing.data?.agmExtension?.expireDateApprovedExt
+    const date = DateUtilities.yyyyMmDdToDate(yyyyMmDd)
+    const pacificDate = DateUtilities.dateToPacificDate(date, true)
+    if (pacificDate) return `${pacificDate} at 11:59 pm Pacific time`
+    return '[unknown]'
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/styles/theme.scss";
+
+p {
+  color: $gray7;
+  font-size: $px-15;
+  margin-top: 1rem !important;
+}
+</style>
diff --git a/src/components/Dashboard/FilingHistoryList/filings/AmalgamationFiling.vue b/src/components/Dashboard/FilingHistoryList/filings/AmalgamationFiling.vue
new file mode 100644
index 000000000..130586ad3
--- /dev/null
+++ b/src/components/Dashboard/FilingHistoryList/filings/AmalgamationFiling.vue
@@ -0,0 +1,145 @@
+<template>
+  <FilingTemplate
+    class="amalgamation-filing"
+    :filing="filing"
+    :index="index"
+  >
+    <template #subtitle>
+      <FiledAndPendingPaid
+        v-if="isFutureEffectivePending"
+        class="item-header-subtitle"
+        :filing="filing"
+        :index="index"
+      />
+
+      <FutureEffectivePaid
+        v-else-if="isFutureEffective"
+        class="item-header-subtitle"
+        :filing="filing"
+        :index="index"
+      />
+    </template>
+
+    <template #body>
+      <FutureEffectivePending
+        v-if="isFutureEffectivePending"
+        :filing="filing"
+      />
+
+      <FutureEffective
+        v-else-if="isFutureEffective"
+        :filing="filing"
+      />
+
+      <div
+        v-if="!!tempRegNumber && isStatusCompleted"
+        class="completed-ia-details"
+      >
+        <h4>Amalgamation Complete</h4>
+
+        <p>
+          {{ companyName }} has been successfully amalgamated.
+        </p>
+
+        <p>
+          Return to My Business Registry to access your business and file changes.
+        </p>
+
+        <div class="to-dashboard-container text-center mt-6">
+          <v-btn
+            color="primary"
+            @click.stop="returnToMyBusinessRegistry()"
+          >
+            <span>Return to My Business Registry</span>
+          </v-btn>
+        </div>
+      </div>
+    </template>
+  </FilingTemplate>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from 'vue-property-decorator'
+import { Getter } from 'pinia-class'
+import { ApiFilingIF } from '@/interfaces'
+import { DateUtilities, EnumUtilities } from '@/services'
+import { navigate } from '@/utils'
+import FiledAndPendingPaid from '../subtitles/FiledAndPendingPaid.vue'
+import FilingTemplate from '../FilingTemplate.vue'
+import FutureEffective from '../bodies/FutureEffective.vue'
+import FutureEffectivePaid from '../subtitles/FutureEffectivePaid.vue'
+import FutureEffectivePending from '../bodies/FutureEffectivePending.vue'
+import { useBusinessStore, useConfigurationStore } from '@/stores'
+
+@Component({
+  components: {
+    FiledAndPendingPaid,
+    FilingTemplate,
+    FutureEffective,
+    FutureEffectivePaid,
+    FutureEffectivePending
+  }
+})
+export default class AmalgamationFiling extends Vue {
+  @Prop({ required: true }) readonly filing!: ApiFilingIF
+  @Prop({ required: true }) readonly index!: number
+
+  @Getter(useBusinessStore) getEntityName!: string
+  @Getter(useBusinessStore) getLegalName!: string
+  @Getter(useConfigurationStore) getMyBusinessRegistryUrl!: string
+
+  /** The Temporary Registration Number string (may be null). */
+  get tempRegNumber (): string {
+    return sessionStorage.getItem('TEMP_REG_NUMBER')
+  }
+
+  /** Whether this filing is in Complete status. */
+  get isStatusCompleted (): boolean {
+    return EnumUtilities.isStatusCompleted(this.filing)
+  }
+
+  /** Whether this filing is Future Effective Pending (overdue). */
+  get isFutureEffectivePending (): boolean {
+    return (
+      EnumUtilities.isStatusPaid(this.filing) &&
+      this.filing.isFutureEffective &&
+      DateUtilities.isDatePast(this.filing.effectiveDate)
+    )
+  }
+
+  /** Whether this filing is Future Effective (not yet completed). */
+  get isFutureEffective (): boolean {
+    return (
+      EnumUtilities.isStatusPaid(this.filing) &&
+      this.filing.isFutureEffective &&
+      DateUtilities.isDateFuture(this.filing.effectiveDate)
+    )
+  }
+
+  /** The legal name or numbered description of the new company. */
+  get companyName (): string {
+    if (this.getLegalName) return this.getLegalName
+    if (this.getEntityName) return `A ${this.getEntityName}`
+    return 'Unknown Name'
+  }
+
+  returnToMyBusinessRegistry (): void {
+    navigate(this.getMyBusinessRegistryUrl)
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/styles/theme.scss";
+
+.item-header-subtitle {
+  color: $gray7;
+  margin-top: 0.5rem;
+}
+
+p {
+  color: $gray7;
+  font-size: $px-15;
+  margin-top: 1rem !important;
+}
+</style>
diff --git a/src/components/Dashboard/FilingHistoryList/filings/ConsentContinuationOut.vue b/src/components/Dashboard/FilingHistoryList/filings/ConsentContinuationOut.vue
index b894830d0..95be34f96 100644
--- a/src/components/Dashboard/FilingHistoryList/filings/ConsentContinuationOut.vue
+++ b/src/components/Dashboard/FilingHistoryList/filings/ConsentContinuationOut.vue
@@ -73,7 +73,7 @@ export default class ConsentContinuationOut extends Mixins(CountriesProvincesMix
   /** Check if Consent is Expired. */
   get isConsentExpired (): boolean {
     const date = DateUtilities.apiToDate(this.filing.data?.consentContinuationOut?.expiry)
-    const daysToExpire = DateUtilities.daysFromToday(new Date(), date)
+    const daysToExpire = DateUtilities.daysBetweenTwoDates(new Date(), date)
     if (isNaN(daysToExpire) || daysToExpire < 0) {
       return true
     }
@@ -112,12 +112,16 @@ export default class ConsentContinuationOut extends Mixins(CountriesProvincesMix
   }
 
   private getRegionNameFromCode (short: string): string {
+    if (short === 'FEDERAL') {
+      return 'Federal'
+    }
+
     const region = this.canadaUsaRegions?.find(region => region.short === short)
     return region?.name
   }
 
   /** Get the respective regions of the country selected as an array of objects. */
-  get canadaUsaRegions (): Array<object> {
+  get canadaUsaRegions (): Array<any> {
     const foreignJusrisdictionCountry = this.filing.data?.consentContinuationOut?.country
     if (foreignJusrisdictionCountry === 'CA') {
       return this.getCountryRegions('CA')
@@ -141,5 +145,4 @@ p {
 .warn-icon {
     margin-bottom: 6px;
 }
-
 </style>
diff --git a/src/components/Dashboard/FilingHistoryList/filings/ContinuationOut.vue b/src/components/Dashboard/FilingHistoryList/filings/ContinuationOut.vue
index debb201c1..356f69a93 100644
--- a/src/components/Dashboard/FilingHistoryList/filings/ContinuationOut.vue
+++ b/src/components/Dashboard/FilingHistoryList/filings/ContinuationOut.vue
@@ -73,7 +73,7 @@ export default class ContinuationOut extends Mixins(CountriesProvincesMixin) {
   }
 
   /** Get the respective regions of the country selected as an array of objects. */
-  get canadaUsaRegions (): Array<object> {
+  get canadaUsaRegions (): Array<any> {
     const foreignJusrisdictionCountry = this.filing.data?.continuationOut?.country
     if (foreignJusrisdictionCountry === 'CA') {
       return this.getCountryRegions('CA')
diff --git a/src/components/Dashboard/FilingHistoryList/filings/IncorporationApplication.vue b/src/components/Dashboard/FilingHistoryList/filings/IncorporationApplication.vue
index 5149d17ab..18d9f5beb 100644
--- a/src/components/Dashboard/FilingHistoryList/filings/IncorporationApplication.vue
+++ b/src/components/Dashboard/FilingHistoryList/filings/IncorporationApplication.vue
@@ -32,13 +32,13 @@
       />
 
       <div
-        v-else-if="isStatusCompleted"
+        v-if="!!tempRegNumber && isStatusCompleted"
         class="completed-ia-details"
       >
         <h4>Incorporation Complete</h4>
 
         <p>
-          {{ getLegalName || 'A Numbered Benefit Company' }} has been successfully incorporated.
+          {{ companyName }} has been successfully incorporated.
         </p>
 
         <p>
@@ -84,9 +84,15 @@ export default class IncorporationApplication extends Vue {
   @Prop({ required: true }) readonly filing!: ApiFilingIF
   @Prop({ required: true }) readonly index!: number
 
+  @Getter(useBusinessStore) getEntityName!: string
   @Getter(useBusinessStore) getLegalName!: string
   @Getter(useConfigurationStore) getMyBusinessRegistryUrl!: string
 
+  /** The Temporary Registration Number string (may be null). */
+  get tempRegNumber (): string {
+    return sessionStorage.getItem('TEMP_REG_NUMBER')
+  }
+
   /** Whether this filing is in Complete status. */
   get isStatusCompleted (): boolean {
     return EnumUtilities.isStatusCompleted(this.filing)
@@ -110,6 +116,13 @@ export default class IncorporationApplication extends Vue {
     )
   }
 
+  /** The legal name or numbered description of the new company. */
+  get companyName (): string {
+    if (this.getLegalName) return this.getLegalName
+    if (this.getEntityName) return `A ${this.getEntityName}`
+    return 'Unknown Name'
+  }
+
   returnToMyBusinessRegistry (): void {
     navigate(this.getMyBusinessRegistryUrl)
   }
diff --git a/src/components/Dashboard/FilingHistoryList/filings/RegistrationFiling.vue b/src/components/Dashboard/FilingHistoryList/filings/RegistrationFiling.vue
index 99b13b723..1b9643f03 100644
--- a/src/components/Dashboard/FilingHistoryList/filings/RegistrationFiling.vue
+++ b/src/components/Dashboard/FilingHistoryList/filings/RegistrationFiling.vue
@@ -6,14 +6,18 @@
   >
     <template #body>
       <div
-        v-if="isStatusCompleted"
+        v-if="!!tempRegNumber && isStatusCompleted"
         class="completed-dissolution-details"
       >
         <h4>Registration Complete</h4>
 
-        <p>{{ getLegalName || 'This company' }} has been successfully registered.</p>
+        <p>
+          {{ getLegalName || 'This company' }} has been successfully registered.
+        </p>
 
-        <p>Return to My Business Registry to access your business and file changes.</p>
+        <p>
+          Return to My Business Registry to access your business and file changes.
+        </p>
 
         <div class="to-dashboard-container text-center mt-6">
           <v-btn
@@ -49,6 +53,11 @@ export default class RegistrationFiling extends Vue {
   @Getter(useBusinessStore) getLegalName!: string
   @Getter(useConfigurationStore) getMyBusinessRegistryUrl!: string
 
+  /** The Temporary Registration Number string (may be null). */
+  get tempRegNumber (): string {
+    return sessionStorage.getItem('TEMP_REG_NUMBER')
+  }
+
   get isStatusCompleted (): boolean {
     return EnumUtilities.isStatusCompleted(this.filing)
   }
diff --git a/src/components/Dashboard/FilingHistoryList/filings/index.ts b/src/components/Dashboard/FilingHistoryList/filings/index.ts
index c15f106d1..6e24864f3 100644
--- a/src/components/Dashboard/FilingHistoryList/filings/index.ts
+++ b/src/components/Dashboard/FilingHistoryList/filings/index.ts
@@ -1,4 +1,6 @@
+export { default as AgmExtension } from './AgmExtension.vue'
 export { default as AlterationFiling } from './AlterationFiling.vue'
+export { default as AmalgamationFiling } from './AmalgamationFiling.vue'
 export { default as ChangeOfAddress } from './ChangeOfAddress.vue'
 export { default as ConsentContinuationOut } from './ConsentContinuationOut.vue'
 export { default as ContinuationOut } from './ContinuationOut.vue'
diff --git a/src/components/Dashboard/StaffNotation.vue b/src/components/Dashboard/StaffNotation.vue
index bc89c54b3..9f3b2286f 100644
--- a/src/components/Dashboard/StaffNotation.vue
+++ b/src/components/Dashboard/StaffNotation.vue
@@ -134,8 +134,9 @@
             </v-list-item>
 
             <v-list-item
-              v-if="isAllowed(AllowableActions.RESTORATION)"
+              v-if="isHistorical"
               data-type="restoration"
+              :disabled="!isAllowed(AllowableActions.RESTORATION)"
               @click="goToRestorationFiling(ApplicationTypes.CREATE_UI, FilingSubTypes.FULL_RESTORATION)"
             >
               <v-list-item-title>
@@ -186,7 +187,8 @@
             </v-list-item>
 
             <v-list-item
-              v-if="isAllowed(AllowableActions.LIMITED_RESTORATION_EXTENSION)"
+              v-if="isHistorical"
+              :disabled="!isAllowed(AllowableActions.LIMITED_RESTORATION_EXTENSION)"
               data-type="extend-limited-restoration"
               @click="goToRestorationFiling(ApplicationTypes.EDIT_UI, FilingSubTypes.LIMITED_RESTORATION_EXTENSION)"
             >
@@ -196,7 +198,8 @@
             </v-list-item>
 
             <v-list-item
-              v-if="isAllowed(AllowableActions.LIMITED_RESTORATION_TO_FULL)"
+              v-if="isHistorical"
+              :disabled="!isAllowed(AllowableActions.LIMITED_RESTORATION_TO_FULL)"
               data-type="convert-full-restoration"
               @click="goToRestorationFiling(ApplicationTypes.EDIT_UI, FilingSubTypes.LIMITED_RESTORATION_TO_FULL)"
             >
diff --git a/src/components/Dashboard/TodoList.vue b/src/components/Dashboard/TodoList.vue
index b244538a6..049647187 100644
--- a/src/components/Dashboard/TodoList.vue
+++ b/src/components/Dashboard/TodoList.vue
@@ -165,6 +165,14 @@
                   <ContactInfo class="mt-4 contact-info-warning" />
                 </div>
 
+                <!-- draft amalgamation -->
+                <div
+                  v-else-if="isStatusDraft(item) && isTypeAmalgamation(item)"
+                  class="todo-subtitle"
+                >
+                  <span>{{ item.subtitle }}</span>
+                </div>
+
                 <!-- draft incorporation -->
                 <div
                   v-else-if="isStatusDraft(item) && isTypeIncorporationApplication(item)"
@@ -254,6 +262,7 @@
                 <span>Do not authorize</span>
               </v-btn>
             </div>
+
             <div
               v-else
               class="list-item__actions"
@@ -317,7 +326,10 @@
                     :disabled="!item.enabled"
                     @click.native.stop="doResumeFiling(item)"
                   >
-                    <template v-if="isTypeIncorporationApplication(item) && item.isEmptyFiling">
+                    <template v-if="isTypeAmalgamation(item) && item.isEmptyFiling">
+                      <span>Fill out Amalgamation Application</span>
+                    </template>
+                    <template v-else-if="isTypeIncorporationApplication(item) && item.isEmptyFiling">
                       <span v-if="getNameRequest">Incorporate using this NR</span>
                       <span v-else>Incorporate a Numbered Company</span>
                     </template>
@@ -395,6 +407,7 @@
                   <v-btn
                     v-if="EnumUtilities.isPayMethodOnlineBanking(item)"
                     class="btn-change-payment-type"
+                    :class="{ 'cancellable' : isCancellableTodoItem(item) }"
                     color="primary"
                     :disabled="!item.enabled"
                     @click.native.stop="doResumePayment(item)"
@@ -404,6 +417,7 @@
                   <v-btn
                     v-else
                     class="btn-resume-payment"
+                    :class="{ 'cancellable' : isCancellableTodoItem(item) }"
                     color="primary"
                     :disabled="!item.enabled"
                     @click.native.stop="doResumePayment(item)"
@@ -413,6 +427,7 @@
 
                   <!-- dropdown menu -->
                   <v-menu
+                    v-if="isCancellableTodoItem(item)"
                     offset-y
                     left
                   >
@@ -513,10 +528,10 @@
             </div>
           </template>
 
-          <!-- is this a draft IA or Registration? -->
+          <!-- is this a draft Amalgamation or IA or Registration? -->
           <template
-            v-else-if="isStatusDraft(item) &&
-              (isTypeIncorporationApplication(item) || isTypeRegistration(item))"
+            v-else-if="isStatusDraft(item) && (isTypeAmalgamation(item) || isTypeIncorporationApplication(item) ||
+              isTypeRegistration(item))"
           >
             <NameRequestInfo :nameRequest="item.nameRequest" />
           </template>
@@ -526,6 +541,8 @@
             <PaymentPendingOnlineBanking
               v-if="EnumUtilities.isPayMethodOnlineBanking(item)"
               :filing="item"
+              :payApiUrl="getPayApiUrl"
+              :accountId="accountId"
               class="mb-6"
             />
             <PaymentPending v-else />
@@ -640,10 +657,11 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
   enableCheckbox: Array<any> = []
   confirmEnabled = false
   panel: number = null // currently expanded panel
-  checkTimer: number = null
+  checkTimer = null // may be type number or NodeJS.Timeout
   inProcessFiling: number = null
   fetchAffiliationInvitationsErrorDialog = false
   authorizeAffiliationInvitationErrorDialog = false
+  accountId: number = null
 
   @Prop({ default: null }) readonly highlightId!: number
 
@@ -660,13 +678,11 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
   @Getter(useRootStore) getTasks!: Array<ApiTaskIF>
   @Getter(useRootStore) getTodoListResource!: TodoListResourceIF
   @Getter(useBusinessStore) isBenBcCccUlc!: boolean
-  @Getter(useBusinessStore) isSoleProp!: boolean
 
   @Action(useRootStore) setARFilingYear!: (x: number) => void
   @Action(useRootStore) setArMinDate!: (x: string) => void
   @Action(useRootStore) setArMaxDate!: (x: string) => void
   @Action(useRootStore) setNextARDate!: (x: string) => void
-  @Action(useRootStore) setCurrentFilingStatus!: (x: FilingStatus) => void
 
   // for template
   readonly EnumUtilities = EnumUtilities
@@ -737,6 +753,8 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
   showDetailsBtnBlue (item: TodoItemIF): boolean {
     if (this.isStatusNew(item) && this.isTypeConversion(item)) return true
     if (this.isStatusDraft(item) && this.isTypeConversion(item)) return true
+    if (this.isStatusDraft(item) && this.isTypeAmalgamation(item) &&
+      item.nameRequest) return true
     if (this.isStatusDraft(item) && this.isTypeIncorporationApplication(item) &&
       item.nameRequest) return true
     if (this.isStatusDraft(item) && this.isTypeRegistration(item) &&
@@ -823,6 +841,14 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
     })
   }
 
+  /** Check if task item is cancellable (has a draft). */
+  isCancellableTodoItem (item: TodoItemIF): boolean {
+    return (
+      (item.name !== FilingTypes.AGM_EXTENSION) &&
+      (item.name !== FilingTypes.AGM_LOCATION_CHANGE)
+    )
+  }
+
   /** Loads a todo item into the Todo Items array. */
   loadTodoItem (task: ApiTaskIF): void {
     const todo = task.task.todo // already checked for not falsey in loadData()
@@ -900,6 +926,7 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
       // eslint-disable-line no-console
       console.log('failed the call for authorization of affiliation invitation', err)
       this.authorizeAffiliationInvitationErrorDialog = true
+      return null
     })
 
     const index = this.todoItems.indexOf(affiliationInvitationTodo)
@@ -936,9 +963,9 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
     }
 
     // load all the invitations here and push them into todo items
-    const accountId = JSON.parse(sessionStorage.getItem('CURRENT_ACCOUNT'))?.id
+    this.accountId = JSON.parse(sessionStorage.getItem('CURRENT_ACCOUNT'))?.id
     const response =
-      await AuthServices.fetchAffiliationInvitations(this.getAuthApiUrl, this.getIdentifier, accountId)
+      await AuthServices.fetchAffiliationInvitations(this.getAuthApiUrl, this.getIdentifier, this.accountId)
         .catch((err) => {
           console.log('Error fetching affiliation invitations for todo', err) // eslint-disable-line no-console
           this.fetchAffiliationInvitationsErrorDialog = true
@@ -991,14 +1018,32 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
 
     if (header) {
       switch (header.name) {
+        case FilingTypes.ADMIN_FREEZE:
+          // do nothing for admin_freeze
+          break
+        case FilingTypes.AGM_EXTENSION:
+          await this.loadAgmExtension(task)
+          break
+        case FilingTypes.AGM_LOCATION_CHANGE:
+          await this.loadAgmLocationChange(task)
+          break
+        case FilingTypes.ALTERATION:
+          await this.loadAlteration(task)
+          break
+        case FilingTypes.AMALGAMATION_APPLICATION:
+          await this.loadAmalgamation(task)
+          break
         case FilingTypes.ANNUAL_REPORT:
           await this.loadAnnualReport(task)
           break
+        case FilingTypes.CHANGE_OF_ADDRESS:
+          await this.loadChangeOfAddress(task)
+          break
         case FilingTypes.CHANGE_OF_DIRECTORS:
           await this.loadChangeOfDirectors(task)
           break
-        case FilingTypes.CHANGE_OF_ADDRESS:
-          await this.loadChangeOfAddress(task)
+        case FilingTypes.CHANGE_OF_REGISTRATION:
+          await this.loadChangeOfRegistration(task)
           break
         case FilingTypes.CONSENT_CONTINUATION_OUT:
           await this.loadConsentContinuationOut(task)
@@ -1006,35 +1051,26 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
         case FilingTypes.CONTINUATION_OUT:
           await this.loadContinuationOut(task)
           break
+        case FilingTypes.CONVERSION:
+          await this.loadConversion(task)
+          break
         case FilingTypes.CORRECTION:
           await this.loadCorrection(task)
           break
-        case FilingTypes.INCORPORATION_APPLICATION:
-          await this.loadIncorporationApplication(task)
-          break
-        case FilingTypes.ALTERATION:
-          await this.loadAlteration(task)
-          break
         case FilingTypes.DISSOLUTION:
           await this.loadDissolution(task)
           break
+        case FilingTypes.INCORPORATION_APPLICATION:
+          await this.loadIncorporationApplication(task)
+          break
         case FilingTypes.REGISTRATION:
           await this.loadRegistration(task)
           break
-        case FilingTypes.CHANGE_OF_REGISTRATION:
-          await this.loadChangeOfRegistration(task)
-          break
-        case FilingTypes.CONVERSION:
-          await this.loadConversion(task)
-          break
-        case FilingTypes.SPECIAL_RESOLUTION:
-          await this.loadSpecialResolution(task)
-          break
         case FilingTypes.RESTORATION:
           await this.loadRestoration(task)
           break
-        case FilingTypes.ADMIN_FREEZE:
-          // Do nothing for admin_freeze.
+        case FilingTypes.SPECIAL_RESOLUTION:
+          await this.loadSpecialResolution(task)
           break
         default:
           // eslint-disable-next-line no-console
@@ -1189,8 +1225,8 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
       const item: TodoItemIF = {
         name: FilingTypes.CHANGE_OF_DIRECTORS,
         filingId: header.filingId,
-        title: `File Director Change`,
-        draftTitle: `Director Change`,
+        title: 'File Director Change',
+        draftTitle: 'Director Change',
         status: header.status || FilingStatus.NEW,
         enabled: task.enabled,
         order: task.order,
@@ -1218,8 +1254,8 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
       const item: TodoItemIF = {
         name: FilingTypes.CHANGE_OF_ADDRESS,
         filingId: header.filingId,
-        title: `File Address Change`,
-        draftTitle: `Address Change`,
+        title: 'File Address Change',
+        draftTitle: 'Address Change',
         status: header.status || FilingStatus.NEW,
         enabled: task.enabled,
         order: task.order,
@@ -1270,6 +1306,56 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
     }
   }
 
+  async loadAmalgamation (task: ApiTaskIF): Promise<void> {
+    const filing = task.task.filing
+    const header = filing.header
+    const amalgamation = filing.amalgamationApplication
+
+    if (header && amalgamation) {
+      // set subtitle only if DRAFT IA
+      let subtitle: string = null
+      if (this.isStatusDraft(header)) {
+        if (this.getNameRequest) {
+          subtitle = `NR APPROVED - ${this.expiresText(this.getNameRequest)}`
+        } else {
+          subtitle = 'DRAFT'
+        }
+      }
+
+      const paymentStatusCode = header.paymentStatusCode
+      const payErrorObj = paymentStatusCode && await PayServices.getPayErrorObj(this.getPayApiUrl, paymentStatusCode)
+
+      // NB: amalgamation application may be undefined
+      const haveData = Boolean(
+        amalgamation?.amalgamatingBusinesses ||
+        amalgamation?.offices ||
+        amalgamation?.contactPoint ||
+        amalgamation?.parties ||
+        amalgamation?.shareStructure?.shareClasses
+      )
+
+      const item: TodoItemIF = {
+        name: FilingTypes.AMALGAMATION_APPLICATION,
+        filingId: header.filingId,
+        title: filing.displayName,
+        subtitle,
+        draftTitle: FilingNames.AMALGAMATION_APPLICATION,
+        status: header.status,
+        enabled: task.enabled,
+        order: task.order,
+        paymentMethod: header.paymentMethod || null,
+        paymentToken: header.paymentToken || null,
+        payErrorObj,
+        isEmptyFiling: !haveData,
+        nameRequest: this.getNameRequest
+      }
+      this.todoItems.push(item)
+    } else {
+      // eslint-disable-next-line no-console
+      console.log('ERROR - invalid header or amalgamation in filing =', filing)
+    }
+  }
+
   async loadIncorporationApplication (task: ApiTaskIF): Promise<void> {
     const filing = task.task.filing
     const header = filing.header
@@ -1277,8 +1363,6 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
 
     // NB: don't check "incorporationApplication" as it may be empty
     if (header) {
-      const title = `${GetCorpFullDescription(this.getLegalType)} Incorporation Application`
-
       // set subtitle only if DRAFT IA
       let subtitle: string = null
       if (this.isStatusDraft(header)) {
@@ -1292,7 +1376,7 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
       const paymentStatusCode = header.paymentStatusCode
       const payErrorObj = paymentStatusCode && await PayServices.getPayErrorObj(this.getPayApiUrl, paymentStatusCode)
 
-      // NB: incorporationApplicationmay be undefined
+      // NB: incorporationApplication may be undefined
       const haveData = Boolean(
         incorporationApplication?.offices ||
         incorporationApplication?.contactPoint ||
@@ -1303,7 +1387,7 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
       const item: TodoItemIF = {
         name: FilingTypes.INCORPORATION_APPLICATION,
         filingId: header.filingId,
-        title,
+        title: filing.displayName,
         subtitle,
         draftTitle: FilingNames.INCORPORATION_APPLICATION,
         status: header.status,
@@ -1329,11 +1413,6 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
 
     // NB: don't check "registration" as it may be empty
     if (header) {
-      const corpFullDescription = GetCorpFullDescription(this.getLegalType)
-      const title = this.isSoleProp
-        ? `${corpFullDescription} / Doing Business As (DBA) ${FilingNames.REGISTRATION}`
-        : `${corpFullDescription} ${FilingNames.REGISTRATION}`
-
       // set subtitle only if DRAFT
       let subtitle: string = null
       if (this.isStatusDraft(header)) {
@@ -1358,7 +1437,7 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
       const item: TodoItemIF = {
         name: FilingTypes.REGISTRATION,
         filingId: header.filingId,
-        title,
+        title: filing.displayName,
         subtitle,
         draftTitle: FilingNames.REGISTRATION,
         status: header.status,
@@ -1479,6 +1558,66 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
     }
   }
 
+  async loadAgmExtension (task: ApiTaskIF): Promise<void> {
+    const filing = task.task.filing
+    const header = filing.header
+    const agmExtension = filing.agmExtension
+
+    if (header && agmExtension) {
+      const paymentStatusCode = header.paymentStatusCode
+      const payErrorObj = paymentStatusCode && await PayServices.getPayErrorObj(this.getPayApiUrl, paymentStatusCode)
+
+      const item = {
+        name: FilingTypes.AGM_EXTENSION,
+        filingId: header.filingId,
+        title: FilingNames.AGM_EXTENSION,
+        draftTitle: FilingNames.AGM_EXTENSION,
+        status: header.status,
+        enabled: task.enabled,
+        order: task.order,
+        paymentMethod: header.paymentMethod || null,
+        paymentToken: header.paymentToken || null,
+        payErrorObj,
+        // FUTURE: ideally, this would come from the filing:
+        warnings: this.getBusinessWarnings.map(warning => warning.message)
+      } as TodoItemIF
+      this.todoItems.push(item)
+    } else {
+      // eslint-disable-next-line no-console
+      console.log('ERROR - invalid header or agmExtension in filing =', filing)
+    }
+  }
+
+  async loadAgmLocationChange (task: ApiTaskIF): Promise<void> {
+    const filing = task.task.filing
+    const header = filing.header
+    const agmLocationChange = filing.agmLocationChange
+
+    if (header && agmLocationChange) {
+      const paymentStatusCode = header.paymentStatusCode
+      const payErrorObj = paymentStatusCode && await PayServices.getPayErrorObj(this.getPayApiUrl, paymentStatusCode)
+
+      const item = {
+        name: FilingTypes.AGM_LOCATION_CHANGE,
+        filingId: header.filingId,
+        title: FilingNames.AGM_LOCATION_CHANGE,
+        draftTitle: FilingNames.AGM_LOCATION_CHANGE,
+        status: header.status,
+        enabled: task.enabled,
+        order: task.order,
+        paymentMethod: header.paymentMethod || null,
+        paymentToken: header.paymentToken || null,
+        payErrorObj,
+        // FUTURE: ideally, this would come from the filing:
+        warnings: this.getBusinessWarnings.map(warning => warning.message)
+      } as TodoItemIF
+      this.todoItems.push(item)
+    } else {
+      // eslint-disable-next-line no-console
+      console.log('ERROR - invalid header or agmLocationChange in filing =', filing)
+    }
+  }
+
   async loadContinuationOut (task: ApiTaskIF): Promise<void> {
     const filing = task.task.filing
     const header = filing.header
@@ -1610,7 +1749,6 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
         this.setArMinDate(item.arMinDate) // COOP only
         this.setArMaxDate(item.arMaxDate) // COOP only
         this.setNextARDate(item.nextArDate) // BEN/BC/CCC/ULC only
-        this.setCurrentFilingStatus(FilingStatus.NEW)
         this.$router.push({ name: Routes.ANNUAL_REPORT, params: { filingId: '0' } }) // 0 means "new AR"
         break
       case FilingTypes.CONVERSION: {
@@ -1629,37 +1767,39 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
   /** Resumes a draft filing. */
   doResumeFiling (item: TodoItemIF): void {
     switch (item.name) {
+      case FilingTypes.AMALGAMATION_APPLICATION: {
+        // navigate to Create UI to resume this Amalgamation
+        const amalgamationUrl = `${this.getCreateUrl}?id=${this.tempRegNumber}`
+        navigate(amalgamationUrl)
+        break
+      }
+
       case FilingTypes.ANNUAL_REPORT:
         // resume this Annual Report locally
         this.setARFilingYear(item.ARFilingYear)
         this.setArMinDate(item.arMinDate) // COOP only
         this.setArMaxDate(item.arMaxDate) // COOP only
         this.setNextARDate(item.nextArDate) // BEN/BC/CCC/ULC only
-        this.setCurrentFilingStatus(FilingStatus.DRAFT)
         this.$router.push({ name: Routes.ANNUAL_REPORT, params: { filingId: item.filingId.toString() } })
         break
 
       case FilingTypes.CHANGE_OF_DIRECTORS:
         // resume this Change Of Directors locally
-        this.setCurrentFilingStatus(FilingStatus.DRAFT)
         this.$router.push({ name: Routes.STANDALONE_DIRECTORS, params: { filingId: item.filingId.toString() } })
         break
 
       case FilingTypes.CHANGE_OF_ADDRESS:
         // resume this Change Of Address locally
-        this.setCurrentFilingStatus(FilingStatus.DRAFT)
         this.$router.push({ name: Routes.STANDALONE_ADDRESSES, params: { filingId: item.filingId.toString() } })
         break
 
       case FilingTypes.CONSENT_CONTINUATION_OUT:
         // resume this Consent to Continuation Out locally
-        this.setCurrentFilingStatus(FilingStatus.DRAFT)
         this.$router.push({ name: Routes.CONSENT_CONTINUATION_OUT, params: { filingId: item.filingId.toString() } })
         break
 
       case FilingTypes.CONTINUATION_OUT:
         // resume this Continuation Out locally
-        this.setCurrentFilingStatus(FilingStatus.DRAFT)
         this.$router.push({ name: Routes.CONTINUATION_OUT, params: { filingId: item.filingId.toString() } })
         break
 
@@ -1677,12 +1817,10 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
 
           case FilingNames.CHANGE_OF_ADDRESS:
           case FilingNames.CHANGE_OF_DIRECTORS:
-            if (this.isBenBcCccUlc) {
-              // To-Do for the future: Revisit this when we do Coop corrections in Edit UI
+            if (this.isBenBcCccUlc || this.isCoop) {
               navigateToCorrectionEditUi(this.getEditUrl, this.getIdentifier)
               break
             } else {
-              this.setCurrentFilingStatus(FilingStatus.DRAFT)
               routeToLocalCorrection(this.$router)
               break
             }
@@ -1690,7 +1828,6 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
           case FilingTypes.ANNUAL_REPORT:
           case FilingTypes.CONVERSION:
           default:
-            this.setCurrentFilingStatus(FilingStatus.DRAFT)
             routeToLocalCorrection(this.$router)
             break
         }
@@ -1746,33 +1883,9 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
         break
       }
 
-      case FilingTypes.RESTORATION: {
-        let restorationType: FilingSubTypes
-
-        /**
-         * Type assertion is done to fix TypeScript error.
-         * "This condition will always return 'false' since the types
-         * 'FilingSubTypes' and 'RestorationTypes' have no overlap."
-         */
-        if (item.filingSubType === FilingSubTypes.FULL_RESTORATION) {
-          restorationType = FilingSubTypes.FULL_RESTORATION
-        }
-
-        if (item.filingSubType === FilingSubTypes.LIMITED_RESTORATION) {
-          restorationType = FilingSubTypes.LIMITED_RESTORATION
-        }
-
-        if (item.filingSubType === FilingSubTypes.LIMITED_RESTORATION_EXTENSION) {
-          restorationType = FilingSubTypes.LIMITED_RESTORATION_EXTENSION
-        }
-
-        if (item.filingSubType === FilingSubTypes.LIMITED_RESTORATION_TO_FULL) {
-          restorationType = FilingSubTypes.LIMITED_RESTORATION_TO_FULL
-        }
-
-        navigate(this.buildRestorationUrl(item, restorationType))
+      case FilingTypes.RESTORATION:
+        this.navigateForResumeRestoration(item)
         break
-      }
 
       default:
         // eslint-disable-next-line no-console
@@ -1795,6 +1908,33 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
     }
   }
 
+  /* Handles the restoration flow inside of doResumeFiling */
+  navigateForResumeRestoration (item: TodoItemIF): void {
+    let restorationType: FilingSubTypes
+    /**
+     * Type assertion is done to fix TypeScript error.
+     * "This condition will always return 'false' since the types
+     * 'FilingSubTypes' and 'RestorationTypes' have no overlap."
+     */
+    if (item.filingSubType === FilingSubTypes.FULL_RESTORATION) {
+      restorationType = FilingSubTypes.FULL_RESTORATION
+    }
+
+    if (item.filingSubType === FilingSubTypes.LIMITED_RESTORATION) {
+      restorationType = FilingSubTypes.LIMITED_RESTORATION
+    }
+
+    if (item.filingSubType === FilingSubTypes.LIMITED_RESTORATION_EXTENSION) {
+      restorationType = FilingSubTypes.LIMITED_RESTORATION_EXTENSION
+    }
+
+    if (item.filingSubType === FilingSubTypes.LIMITED_RESTORATION_TO_FULL) {
+      restorationType = FilingSubTypes.LIMITED_RESTORATION_TO_FULL
+    }
+
+    navigate(this.buildRestorationUrl(item, restorationType))
+  }
+
   // navigate to Create UI if Full/Limited restoration or to Edit UI if Limited extension/Full to Limited conversion
   buildRestorationUrl (item: TodoItemIF, restorationType: FilingSubTypes): string {
     let url: string
@@ -2064,8 +2204,8 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
     border-bottom-right-radius: 0;
   }
 
-  .btn-change-payment-type,
-  .btn-resume-payment {
+  .btn-change-payment-type.cancellable,
+  .btn-resume-payment.cancellable {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
   }
diff --git a/src/components/Dashboard/TodoList/PaymentPendingOnlineBanking.vue b/src/components/Dashboard/TodoList/PaymentPendingOnlineBanking.vue
index 6856ad8e9..1099cfa7d 100644
--- a/src/components/Dashboard/TodoList/PaymentPendingOnlineBanking.vue
+++ b/src/components/Dashboard/TodoList/PaymentPendingOnlineBanking.vue
@@ -11,6 +11,12 @@
         If you have not done so, <strong>log in to your online bank account</strong> to pay the
         outstanding balance on your BC Registries and Online Services account.
       </li>
+      <li>
+        Enter <strong>"BC Registries and Online Services"</strong> as payee.
+      </li>
+      <li>
+        Enter the following account number: <strong>{{ cfsAccountId }}</strong>
+      </li>
       <li>
         Once submitted through your bank, Online Banking payments can take <strong>2 to 5 days to
           be processed</strong>.
@@ -30,16 +36,25 @@
 
 <script lang="ts">
 import { Component, Prop, Vue } from 'vue-property-decorator'
+import { PayServices } from '@/services/'
 
 @Component({})
 export default class PaymentPendingOnlineBanking extends Vue {
   /** The subject filing. */
   @Prop({ required: true }) readonly filing!: any
+  @Prop({ required: true }) readonly payApiUrl!: string
+  @Prop({ required: true }) readonly accountId!: any
+
+  cfsAccountId: string = null;
 
   /** The draft title of the subject filing. */
   get draftTitle (): string {
     return this.filing?.draftTitle || 'filing'
   }
+
+  async mounted () {
+    this.cfsAccountId = await PayServices.fetchCfsAccountId(this.payApiUrl, this.accountId)
+  }
 }
 </script>
 
diff --git a/src/components/DigitalCredentials/CredentialsDashboard.vue b/src/components/DigitalCredentials/CredentialsDashboard.vue
new file mode 100644
index 000000000..dd1b1f6aa
--- /dev/null
+++ b/src/components/DigitalCredentials/CredentialsDashboard.vue
@@ -0,0 +1,195 @@
+<template>
+  <div id="credentials-dashboard">
+    <!-- Dialogs -->
+    <ConfirmRevokeCredentialDialog
+      :dialog="confirmRevokeCredentialDialog"
+      attach="#app"
+      @close="hideConfirmRevokeCredentialDialog()"
+      @proceed="revokeCredential()"
+    />
+
+    <ConfirmReplaceCredentialDialog
+      :dialog="confirmReplaceCredentialDialog"
+      attach="#app"
+      @close="hideConfirmReplaceCredentialDialog()"
+      @proceed="replaceCredential()"
+    />
+
+    <CredentialRevokedDialog
+      :dialog="credentialRevokedDialog"
+      attach="#app"
+      @close="credentialRevokedDialog = false"
+    />
+
+    <RevokeCredentialErrorDialog
+      :dialog="revokeCredentialErrorDialog"
+      attach="#app"
+      @close="revokeCredentialErrorDialog = false"
+    />
+
+    <ReplaceCredentialErrorDialog
+      :dialog="replaceCredentialErrorDialog"
+      attach="#app"
+      @close="replaceCredentialErrorDialog = false"
+    />
+
+    <!-- Initial Page Load Transition -->
+    <v-fade-transition>
+      <div
+        v-show="showLoadingContainer"
+        class="loading-container"
+      >
+        <div class="loading__content">
+          <v-progress-circular
+            color="primary"
+            :size="50"
+            indeterminate
+          />
+          <div class="loading-msg">
+            {{ loadingMessage }}
+          </div>
+        </div>
+      </div>
+    </v-fade-transition>
+
+    <v-container>
+      <CredentialsTable
+        v-if="issuedCredentials?.length"
+        :issuedCredentials="issuedCredentials"
+        @onPromptConfirmRevokeCredential="displayConfirmRevokeCredentialDialog($event)"
+        @onPromptConfirmReplaceCredential="displayConfirmReplaceCredentialDialog($event)"
+      />
+      <v-row v-else>
+        <v-col
+          cols="12"
+          md="8"
+        >
+          <CredentialsLanding />
+        </v-col>
+        <v-col
+          cols="12"
+          md="4"
+        >
+          <CredentialsInfo />
+        </v-col>
+      </v-row>
+    </v-container>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator'
+import { useBusinessStore } from '@/stores'
+import { Getter } from 'pinia-class'
+import { DigitalCredentialIF } from '@/interfaces'
+import { LegalServices } from '@/services'
+import CredentialsInfo from '@/components/DigitalCredentials/CredentialsInfo.vue'
+import CredentialsLanding from '@/components/DigitalCredentials/CredentialsLanding.vue'
+import CredentialsTable from '@/components/DigitalCredentials/CredentialsTable.vue'
+import ConfirmReplaceCredentialDialog from '@/components/DigitalCredentials/dialogs/ConfirmReplaceCredentialDialog.vue'
+import ConfirmRevokeCredentialDialog from '@/components/DigitalCredentials/dialogs/ConfirmRevokeCredentialDialog.vue'
+import CredentialRevokedDialog from '@/components/DigitalCredentials/dialogs/CredentialRevokedDialog.vue'
+import ReplaceCredentialErrorDialog from '@/components/DigitalCredentials/dialogs/ReplaceCredentialErrorDialog.vue'
+import RevokeCredentialErrorDialog from '@/components/DigitalCredentials/dialogs/RevokeCredentialErrorDialog.vue'
+import { Routes } from '@/enums'
+
+@Component({
+  components: {
+    CredentialsInfo,
+    CredentialsLanding,
+    CredentialsTable,
+    ConfirmRevokeCredentialDialog,
+    ConfirmReplaceCredentialDialog,
+    CredentialRevokedDialog,
+    ReplaceCredentialErrorDialog,
+    RevokeCredentialErrorDialog
+  }
+})
+export default class CredentialsDashboard extends Vue {
+  @Getter(useBusinessStore) getIdentifier!: string
+
+  loadingMessage = 'Loading'
+  showLoadingContainer = true
+  confirmRevokeCredentialDialog = false
+  confirmReplaceCredentialDialog = false
+  credentialRevokedDialog = false
+  replaceCredentialErrorDialog = false
+  revokeCredentialErrorDialog = false
+  issuedCredential: DigitalCredentialIF = null
+  issuedCredentials: Array<DigitalCredentialIF> = []
+
+  async mounted (): Promise<void> {
+    await this.getCredentials()
+    this.showLoadingContainer = false
+  }
+
+  async getCredentials (): Promise<void> {
+    const { data } = await LegalServices.fetchCredentials(this.getIdentifier)
+    this.issuedCredentials = data?.issuedCredentials || []
+  }
+
+  displayConfirmRevokeCredentialDialog (issuedCredential: DigitalCredentialIF): void {
+    this.issuedCredential = issuedCredential
+    this.confirmRevokeCredentialDialog = true
+  }
+
+  hideConfirmRevokeCredentialDialog (): void {
+    this.issuedCredential = null
+    this.confirmRevokeCredentialDialog = false
+  }
+
+  displayConfirmReplaceCredentialDialog (issuedCredential: DigitalCredentialIF): void {
+    this.issuedCredential = issuedCredential
+    this.confirmReplaceCredentialDialog = true
+  }
+
+  hideConfirmReplaceCredentialDialog (): void {
+    this.issuedCredential = null
+    this.confirmReplaceCredentialDialog = false
+  }
+
+  async revokeCredential (): Promise<void> {
+    this.showLoadingContainer = true
+    let revokeCredential = this.issuedCredential.isRevoked ? {} : null
+    if (this.issuedCredential.isIssued && !this.issuedCredential.isRevoked) {
+      revokeCredential = await LegalServices.revokeCredential(this.getIdentifier, this.issuedCredential.credentialId)
+    }
+
+    this.hideConfirmRevokeCredentialDialog()
+    if (!revokeCredential) {
+      this.revokeCredentialErrorDialog = true
+    } else {
+      this.credentialRevokedDialog = true
+      await this.getCredentials()
+    }
+    this.showLoadingContainer = false
+  }
+
+  async replaceCredential (): Promise<void> {
+    this.showLoadingContainer = true
+    let revokedCredential = !this.issuedCredential.isIssued || this.issuedCredential.isRevoked ? {} : null
+    if (this.issuedCredential.isIssued && !this.issuedCredential.isRevoked) {
+      revokedCredential =
+        await LegalServices.revokeCredential(this.getIdentifier, this.issuedCredential.credentialId, true)
+    }
+    const removedCredential =
+      await LegalServices.removeCredential(this.getIdentifier, this.issuedCredential.credentialId)
+    const removedConnection =
+      await LegalServices.removeActiveCredentialConnection(this.getIdentifier)
+
+    this.hideConfirmReplaceCredentialDialog()
+    if (!(revokedCredential && removedCredential && removedConnection)) {
+      this.replaceCredentialErrorDialog = true
+    } else {
+      this.$router.push({ name: Routes.ISSUE_CREDENTIAL })
+    }
+    this.showLoadingContainer = false
+  }
+}
+</script>
+
+<style lang="scss">
+.loading-container {
+  z-index: 1;
+}
+</style>
diff --git a/src/components/DigitalCredentials/CredentialsDetailSteps.vue b/src/components/DigitalCredentials/CredentialsDetailSteps.vue
new file mode 100644
index 000000000..2e0704564
--- /dev/null
+++ b/src/components/DigitalCredentials/CredentialsDetailSteps.vue
@@ -0,0 +1,145 @@
+<template>
+  <div id="credentials-detail-steps">
+    <h1>Steps to get your credential</h1>
+    <v-card class="mt-6">
+      <v-card-text class="d-flex">
+        <span
+          class="credentials-stepper-number ml-n4 my-n4 px-4
+          font-weight-bold align-self-stretch d-flex rounded-l"
+        >
+          <div class="align-self-center">1</div>
+        </span>
+        <span class="ml-4">
+          <v-row>
+            <v-col
+              cols="12"
+              sm="12"
+              lg="8"
+            >
+              <h3>Install the BC Wallet app on your phone</h3>
+              <p class="mt-1">
+                <a
+                  href="https://www2.gov.bc.ca/gov/content/governments/government-id/bc-wallet#get"
+                  target="_blank"
+                >BC Wallet<v-icon
+                  small
+                  color="primary"
+                >mdi-open-in-new</v-icon></a> is a digital identity wallet. It lets you receive, store and present
+                digital credentials such as memberships, permits, and ID cards.
+              </p>
+              <div class="d-flex">
+                <img
+                  src="@/assets/images/bc_wallet_app.png"
+                  width="36px"
+                  alt="BC Wallet app icon"
+                  class="mr-2"
+                >
+                <v-btn
+                  color="primary"
+                  href="https://www2.gov.bc.ca/gov/content/governments/government-id/bc-wallet#get"
+                  target="_blank"
+                >Get the BC Wallet app
+                  <v-icon>mdi-chevron-right</v-icon>
+                </v-btn>
+              </div>
+              <p class="mt-4">
+                <a
+                  href="https://www2.gov.bc.ca/gov/content/governments/government-id/bc-wallet/help"
+                  target="_blank"
+                >Help topics about using the BC Wallet app<v-icon
+                  small
+                  color="primary"
+                >mdi-open-in-new</v-icon></a>
+              </p>
+            </v-col>
+            <v-col>
+              <img
+                width="100%"
+                src="@/assets/images/bc_wallet_app_store.png"
+                :alt="imageAltText1"
+              >
+            </v-col>
+          </v-row>
+        </span>
+      </v-card-text>
+    </v-card>
+    <v-card class="mt-4">
+      <v-card-text class="d-flex">
+        <span
+          class="credentials-stepper-number ml-n4 my-n4 px-4
+                    font-weight-bold align-self-stretch d-flex rounded-l"
+        >
+          <div class="align-self-center">2</div>
+        </span>
+        <span class="ml-4">
+          <h3>Get your Digital Business Card</h3>
+          <v-row class="justify-center">
+            <v-col
+              cols="12"
+              lg="8"
+            >
+              <img
+                width="100%"
+                src="@/assets/images/business_card_issuance_steps.png"
+                :alt="imageAltText2"
+              >
+            </v-col>
+            <v-col cols="12">
+              <ol class="credentials-ordered-list">
+                <li><p>Open the BC Wallet app on your mobile phone, tap the "Scan" button.</p></li>
+                <li><p>Allow (if prompted) the app to access the camera as it is needed to scan the QR code.</p></li>
+                <li><p>Point your camera towards the QR code on the website. Once the scan is successful,
+                  you’ll receive a credential offer in BC Wallet over a secure connection from BC Registries.
+                </p></li>
+                <li><p>Open the credential offer and accept the credential.</p></li>
+              </ol>
+            </v-col>
+          </v-row>
+        </span>
+      </v-card-text>
+    </v-card>
+    <v-btn
+      id="hide-detail-steps-button"
+      class="mt-6"
+      color="primary"
+      @click.prevent="handleHideDetailSteps()"
+    >
+      Return to Simple Steps
+      <v-icon>mdi-chevron-right</v-icon>
+    </v-btn>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Emit, Vue } from 'vue-property-decorator'
+
+@Component({})
+export default class CredentialsDetailSteps extends Vue {
+  imageAltText1 = 'Two mobile phones side by side showing the BC Wallet App in the app store.'
+  imageAltText2 = 'On the far left is a BC Wallet with a QR code sample and arrows between 3 mobile phones ' +
+  'showing the steps below.'
+
+  @Emit('onHideDetailSteps')
+  handleHideDetailSteps (): void {
+    return undefined
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/styles/theme.scss";
+
+.credentials-stepper-number {
+  color: white;
+  background-color: $app-blue;
+}
+
+.credentials-ordered-list {
+    li::marker {
+      font-weight: bold;
+    }
+    li {
+      padding-left: $px-10;
+    }
+}
+</style>
diff --git a/src/components/DigitalCredentials/CredentialsFooter.vue b/src/components/DigitalCredentials/CredentialsFooter.vue
deleted file mode 100644
index 5ce5f35bc..000000000
--- a/src/components/DigitalCredentials/CredentialsFooter.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-  <v-container
-    id="credentials-footer"
-    class="list-item px-0 pb-1"
-  >
-    <div class="buttons-right">
-      <v-btn
-        v-if="currentStepIndex > 0"
-        id="back-btn"
-        color="primary"
-        large
-        outlined
-        @click="back()"
-      >
-        <v-icon>mdi-chevron-left</v-icon>
-        <span>Back</span>
-      </v-btn>
-
-      <v-btn
-        id="next-btn"
-        class="font-weight-bold"
-        color="primary"
-        large
-        @click="next()"
-      >
-        <span>{{ nextStepName }}</span>
-        <v-icon v-if="currentStepIndex !== lastStepIndex">
-          mdi-chevron-right
-        </v-icon>
-      </v-btn>
-
-      <v-btn
-        id="cancel-btn"
-        large
-        outlined
-        color="primary"
-        @click="cancel()"
-      >
-        <span>Cancel</span>
-      </v-btn>
-    </div>
-  </v-container>
-</template>
-
-<script lang="ts">
-import { Component, Emit, Prop, Vue } from 'vue-property-decorator'
-
-@Component({})
-export default class CredentialsFooter extends Vue {
-  @Prop({ default: 0 }) readonly currentStepIndex!: number
-
-  @Prop({ default: null }) readonly lastStepIndex!: number
-
-  @Prop({ default: 'Next' }) readonly nextStepName!: string
-
-  @Emit() back (): void {}
-  @Emit() next (): void {}
-  @Emit() cancel (): void {}
-}
-</script>
-
-<style lang="scss" scoped>
-@import '@/assets/styles/theme.scss';
-
-#credentials-footer {
-  border-top: 1px solid $gray3;
-
-  .buttons-right {
-    margin-left: auto;
-  }
-
-  .v-btn {
-    min-width: 100px;
-  }
-
-  .v-btn + .v-btn {
-    margin-left: 0.5rem;
-  }
-
-  #cancel-btn {
-    margin-left: 0.5rem;
-  }
-}
-</style>
diff --git a/src/components/DigitalCredentials/CredentialsInfo.vue b/src/components/DigitalCredentials/CredentialsInfo.vue
new file mode 100644
index 000000000..566bc5f48
--- /dev/null
+++ b/src/components/DigitalCredentials/CredentialsInfo.vue
@@ -0,0 +1,40 @@
+<template>
+  <div id="credentials-info">
+    <v-card>
+      <v-card-title class="font-weight-bold word-break-normal">
+        Where to use your Business Card
+      </v-card-title>
+      <v-card-text>
+        <p>
+          At present there are no places to use your Digital Business Card. In the near future you will be able to use
+          your business card credential to obtain a business licence, a business bank account, business permits,
+          and access services.
+        </p>
+      </v-card-text>
+    </v-card>
+    <v-card class="mt-3">
+      <v-card-title class="font-weight-bold word-break-normal">
+        How to use digital credentials
+      </v-card-title>
+      <v-card-text>
+        <p>
+          Websites will request proof of your Digital Business Card.
+          Try the <a
+            href="https://digital.gov.bc.ca/digital-trust/showcase"
+            target="_blank"
+          >BC Wallet Showcase<v-icon
+            color="primary"
+            small
+          >mdi-open-in-new</v-icon></a> to learn more.
+        </p>
+      </v-card-text>
+    </v-card>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator'
+
+@Component
+export default class CredentialsInfo extends Vue { }
+</script>
diff --git a/src/components/DigitalCredentials/CredentialsLanding.vue b/src/components/DigitalCredentials/CredentialsLanding.vue
index 499b7485c..f67b85e4f 100644
--- a/src/components/DigitalCredentials/CredentialsLanding.vue
+++ b/src/components/DigitalCredentials/CredentialsLanding.vue
@@ -1,70 +1,63 @@
 <template>
-  <section id="credentials-landing">
-    <!-- Credentials Header -->
-    <article id="digital-credentials-header">
-      <v-row no-gutters>
-        <v-col
-          cols="12"
-          lg="11"
-        >
-          <h1>Business Digital Credentials</h1>
-          <p class="mt-4">
-            A digital credential is the digital equivalent of paper-based credential like a driver's
-            license. It works as proof of qualification used to get services such as opening a bank account. Use your
-            business information to generate the digital credentials. You save digital credentials on your phone using
-            a digital wallet app. When a service provider asks for a digital credential, you use the digital wallet
-            app to show it.
-          </p>
-        </v-col>
-      </v-row>
-    </article>
-
-    <!-- Add Credentials -->
-    <article id="add-digital-credentials">
-      <v-row no-gutters>
-        <v-col
-          cols="12"
-          lg="11"
-        >
-          <!-- Important Message: To verify BCSC -->
-          <ImportantMessage
-            :message="'You must be logged in with BC Services Card to generate a Business Digital Credentials.'"
-          />
-
-          <v-btn
-            id="add-credential-btn"
-            color="primary"
-            class="mt-4 font-weight-bold pa-6"
-            large
-            @click="addCredentials()"
-          >
-            <span>Generate a Business Digital Credential</span>
-          </v-btn>
-        </v-col>
-      </v-row>
-    </article>
-
-    <!-- Credentials Table -->
-    <article id="digital-credentials-table">
-      <v-row no-gutters>
-        <v-col
-          cols="12"
-          lg="11"
-        >
-          <CredentialsTable
-            :issuedCredentials="issuedCredentials"
-          />
-        </v-col>
-      </v-row>
-    </article>
-  </section>
+  <div id="credentials-landing">
+    <v-card>
+      <v-card-text>
+        <v-container>
+          <v-row>
+            <v-col
+              class="d-flex align-center align-content-center"
+              cols="12"
+              sm="4"
+              md="5"
+            >
+              <img
+                width="100%"
+                src="@/assets/images/business_card_feature.png"
+                :alt="imageAltText"
+              >
+            </v-col>
+            <v-col
+              cols="12"
+              sm="8"
+              md="7"
+            >
+              <h1>Business Card Credentials</h1>
+              <p class="mt-4">
+                Use your business information to generate the Digital Business Card. You save digital credentials on
+                your phone using the BC Wallet app. When a service provider asks for a digital credential, you use the
+                BC Wallet app to show it.
+              </p>
+              <p>
+                A digital credential is the digital equivalent of a paper-based credential like a driver's licence. It
+                works as proof of qualification used to get services such as opening a bank account, or getting your
+                business licence.
+              </p>
+              <div class="d-flex justify-center justify-sm-start">
+                <v-btn
+                  id="add-credential-btn"
+                  color="primary"
+                  class="mt-4 font-weight-bold pa-6"
+                  large
+                  @click="issueCredentials()"
+                >
+                  <span>Get your Digital Business Card
+                    <v-icon>mdi-chevron-right</v-icon>
+                  </span>
+                </v-btn>
+              </div>
+            </v-col>
+          </v-row>
+        </v-container>
+      </v-card-text>
+    </v-card>
+  </div>
 </template>
 
 <script lang="ts">
-import { Component, Emit, Prop, Vue } from 'vue-property-decorator'
-import CredentialsTable from '@/components/DigitalCredentials/CredentialsTable.vue'
+import { Component, Vue } from 'vue-property-decorator'
 import { ImportantMessage } from '@/components/common'
-import { DigitalCredentialsIF } from '@/interfaces'
+import { Routes } from '@/enums'
+import CredentialsTable from '@/components/DigitalCredentials/CredentialsTable.vue'
 
 @Component({
   components: {
@@ -73,10 +66,11 @@ import { DigitalCredentialsIF } from '@/interfaces'
   }
 })
 export default class CredentialsLanding extends Vue {
-  @Prop({ default: () => [] }) readonly issuedCredentials!: Array<DigitalCredentialsIF>
+  imageAltText = 'Two mobile phones one behind the other. The top left one is showing your business card ' +
+  'credential details, the bottom right one is showing your business card. Both are in the BC Wallet app.'
 
-  // Pass add event to parent.
-  @Emit('addCredentials')
-  addCredentials () {}
+  issueCredentials (): void {
+    this.$router.push({ name: Routes.ISSUE_CREDENTIAL })
+  }
 }
 </script>
diff --git a/src/components/DigitalCredentials/CredentialsMenu.vue b/src/components/DigitalCredentials/CredentialsMenu.vue
new file mode 100644
index 000000000..ef722ca39
--- /dev/null
+++ b/src/components/DigitalCredentials/CredentialsMenu.vue
@@ -0,0 +1,85 @@
+<template>
+  <v-menu
+    id="credentials-menu"
+    v-model="expand"
+    offset-y
+    transition="slide-y-transition"
+  >
+    <template #activator="{ on }">
+      <v-btn
+        small
+        text
+        color="primary"
+        class="menu-btn"
+        v-on="on"
+      >
+        <span class="font-13 ml-1">Credential Options</span>
+        <v-icon
+          v-if="expand"
+          medium
+        >
+          mdi-menu-up
+        </v-icon>
+        <v-icon
+          v-else
+          medium
+        >
+          mdi-menu-down
+        </v-icon>
+      </v-btn>
+    </template>
+
+    <v-list dense>
+      <v-list-item-group color="primary">
+        <v-list-item
+          :disabled="issuedCredential.isDeleted"
+          @click="handleConfirmReplaceCredential()"
+        >
+          <v-list-item-title>
+            <span class="app-blue">Replace Credential</span>
+          </v-list-item-title>
+        </v-list-item>
+        <v-list-item
+          :disabled="!issuedCredential.isIssued || issuedCredential.isRevoked"
+          @click="handleConfirmRevokeCredential()"
+        >
+          <v-list-item-title>
+            <span class="app-blue">Revoke Credential</span>
+          </v-list-item-title>
+        </v-list-item>
+      </v-list-item-group>
+    </v-list>
+  </v-menu>
+</template>
+
+<script lang="ts">
+import { DigitalCredentialIF } from '@/interfaces'
+import { Component, Vue, Emit, Prop } from 'vue-property-decorator'
+
+@Component
+export default class CredentialsMenu extends Vue {
+  @Prop({ default: () => null }) issuedCredential!: DigitalCredentialIF
+
+  expand = false
+
+  /** Emits an event to confirm revoke credential. */
+  @Emit('onConfirmRevokeCredential')
+  handleConfirmRevokeCredential (): DigitalCredentialIF {
+    return this.issuedCredential
+  }
+
+  /** Emits an event to confirm replace credential. */
+  @Emit('onConfirmReplaceCredential')
+  handleConfirmReplaceCredential (): DigitalCredentialIF {
+    return this.issuedCredential
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/styles/theme.scss';
+
+:deep(.theme--light.v-list-item--disabled) {
+  opacity: 0.38 !important;
+}
+</style>
diff --git a/src/components/DigitalCredentials/CredentialsSimpleSteps.vue b/src/components/DigitalCredentials/CredentialsSimpleSteps.vue
new file mode 100644
index 000000000..3f86e41f5
--- /dev/null
+++ b/src/components/DigitalCredentials/CredentialsSimpleSteps.vue
@@ -0,0 +1,101 @@
+<template>
+  <div id="credentials-simple-steps">
+    <v-card class="pa-3">
+      <v-card-text>
+        <h1>Steps to get your credential:</h1>
+        <v-card class="mt-6">
+          <v-card-text class="d-flex">
+            <span
+              class="credentials-stepper-number ml-n4 my-n4 px-8
+                    font-weight-bold align-self-stretch d-flex rounded-l"
+            >
+              <div class="align-self-center">1</div>
+            </span>
+            <span class="ml-8">
+              Have the
+              <a
+                href="https://www2.gov.bc.ca/gov/content/governments/government-id/bc-wallet"
+                target="_blank"
+              >
+                BC Wallet app<v-icon
+                  small
+                  color="primary"
+                >mdi-open-in-new</v-icon></a>
+              installed on your mobile phone.
+            </span>
+          </v-card-text>
+        </v-card>
+        <v-card class="mt-2">
+          <v-card-text class="d-flex">
+            <span
+              class="credentials-stepper-number ml-n4 my-n4 px-8
+                    font-weight-bold align-self-stretch d-flex rounded-l"
+            >
+              <div class="align-self-center">2</div>
+            </span>
+            <span class="ml-8">
+              Scan the QR code with your BC Wallet app to get your Digital Business Card and accept it in your BC
+              Wallet app.
+            </span>
+          </v-card-text>
+        </v-card>
+        <v-card class="mt-2">
+          <v-card-text class="d-flex">
+            <span
+              class="credentials-stepper-number ml-n4 my-n4 px-8
+                    font-weight-bold align-self-stretch d-flex rounded-l"
+            >
+              <div class="align-self-center">3</div>
+            </span>
+            <span class="ml-8">
+              Check your Digital Business Cards on the
+              <router-link to="/digital-credentials">credential dashboard</router-link>.
+            </span>
+          </v-card-text>
+        </v-card>
+      </v-card-text>
+      <v-card-text class="mt-n2">
+        <a
+          href="#"
+          @click.prevent="handleShowDetailSteps()"
+        >Read detailed instructions</a>
+      </v-card-text>
+    </v-card>
+
+    <v-btn
+      id="return-to-company-dashboard-button"
+      color="primary"
+      class="mt-6"
+      @click="handleGoToCredentialsDashboard()"
+    >
+      Return to Company Dashboard
+      <v-icon>mdi-chevron-right</v-icon>
+    </v-btn>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Emit, Vue } from 'vue-property-decorator'
+
+@Component({})
+export default class CredentialSimpleSteps extends Vue {
+  @Emit('onGoToCredentialsDashboard')
+  handleGoToCredentialsDashboard (): void {
+    return undefined
+  }
+
+  @Emit('onShowDetailSteps')
+  handleShowDetailSteps (): void {
+    return undefined
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/styles/theme.scss";
+
+.credentials-stepper-number {
+  color: white;
+  background-color: $app-blue;
+}
+</style>
diff --git a/src/components/DigitalCredentials/CredentialsStepper.vue b/src/components/DigitalCredentials/CredentialsStepper.vue
new file mode 100644
index 000000000..706038247
--- /dev/null
+++ b/src/components/DigitalCredentials/CredentialsStepper.vue
@@ -0,0 +1,291 @@
+<template>
+  <div id="credentials-stepper">
+    <!-- Dialogs -->
+    <ConfirmCredentialsTermsOfUseDialog
+      :dialog="confirmCredentialsTermsOfUseDialog"
+      attach="#app"
+      @close="goToCredentialsDashboard()"
+      @proceed="hideConfirmCredentialsTermsOfUseDialog()"
+    />
+
+    <CredentialNotReceivedDialog
+      :dialog="credentialNotReceivedDialog"
+      attach="#app"
+      @close="credentialNotReceivedDialog = false"
+      @onResendOffer="resendOffer()"
+      @onResetOffer="resetOffer()"
+    />
+
+    <!-- Initial Page Load Transition -->
+    <v-fade-transition>
+      <div
+        v-show="showLoadingContainer"
+        class="loading-container"
+      >
+        <div class="loading__content">
+          <v-progress-circular
+            color="primary"
+            :size="50"
+            indeterminate
+          />
+          <div class="loading-msg">
+            {{ loadingMessage }}
+          </div>
+        </div>
+      </div>
+    </v-fade-transition>
+
+    <v-container>
+      <v-row>
+        <v-col
+          cols="12"
+          md="8"
+        >
+          <CredentialsDetailSteps
+            v-if="showDetailSteps"
+            @onHideDetailSteps="showDetailSteps = false"
+          />
+          <CredentialsSimpleSteps
+            v-else
+            @onShowDetailSteps="showDetailSteps = true"
+            @onGoToCredentialsDashboard="goToCredentialsDashboard()"
+          />
+        </v-col>
+        <v-col
+          cols="12"
+          md="4"
+        >
+          <v-card
+            v-if="!credentialConnection?.isActive"
+            class="pt-3 px-3"
+          >
+            <v-card-text class="d-flex flex-column">
+              <p class="justify-center text-center font-weight-bold word-break-normal">
+                Scan this QR code with your BC Wallet app
+              </p>
+              <QrcodeVue
+                class="d-flex justify-center mt-4"
+                render-as="svg"
+                size="200"
+                :value="credentialConnection?.invitationUrl"
+              />
+              <p class="mt-8 justify-center text-center word-break-normal">
+                QR code isn't scanning?
+                <!-- eslint-disable vue/max-attributes-per-line -->
+                <a href="#" @click.prevent="handleGenegerateNewQRCode()">Generate a new QR code</a>.
+              </p>
+            </v-card-text>
+          </v-card>
+          <v-card
+            v-else
+            class="pt-3 px-3"
+          >
+            <v-card-text
+              v-if="!issuedCredential?.isIssued"
+              class="d-flex flex-column"
+            >
+              <p class="justify-center text-center font-weight-bold word-break-normal">
+                Accept the request in your wallet
+              </p>
+              <div
+                class="d-flex justify-self-center align-self-center justify-center align-center pt-4"
+                style="width: 200px; height: 200px"
+              >
+                <v-progress-circular
+                  color="primary"
+                  indeterminate
+                />
+              </div>
+              <p class="justify-center text-center word-break-normal pt-8">
+                <a
+                  href="#"
+                  @click.prevent="handleNoCredentialOfferReceived()"
+                >
+                  I didn't receive anything
+                </a>
+              </p>
+            </v-card-text>
+            <v-card-text
+              v-else
+              class="d-flex flex-column"
+            >
+              <p class="justify-center text-center font-weight-bold word-break-normal">
+                Your Business Card is now ready to use
+              </p>
+              <div
+                class="d-flex justify-self-center align-self-center justify-center align-center"
+                style="width: 200px; height: 200px"
+              >
+                <v-icon
+                  color="black"
+                  size="xxx-large"
+                >
+                  mdi-check-circle-outline
+                </v-icon>
+              </div>
+              <p class="justify-center text-center word-break-normal pt-8">
+                Go to your
+                <!-- eslint-disable vue/singleline-html-element-content-newline -->
+                <router-link to="/digital-credentials">credential dashboard</router-link>
+                to see details and make changes.
+              </p>
+            </v-card-text>
+          </v-card>
+        </v-col>
+      </v-row>
+    </v-container>
+    <CredentialsWebSocket
+      :connection="credentialConnection"
+      :issuedCredential="issuedCredential"
+      @onConnection="handleConnection($event)"
+      @onIssuedCredential="handleIssuedCredential($event)"
+    />
+  </div>
+</template>
+
+<script lang="ts">
+import { DigitalCredentialTypes, Routes } from '@/enums'
+import { LegalServices } from '@/services'
+import { useBusinessStore } from '@/stores'
+import { Getter } from 'pinia-class'
+import { Component, Vue } from 'vue-property-decorator'
+import QrcodeVue from 'qrcode.vue'
+import { DigitalCredentialIF, WalletConnectionIF } from '@/interfaces'
+import CredentialsWebSocket from '@/components/DigitalCredentials/CredentialsWebSocket.vue'
+import ConfirmCredentialsTermsOfUseDialog
+  from '@/components/DigitalCredentials/dialogs/ConfirmCredentialsTermsofUseDialog.vue'
+import CredentialNotReceivedDialog from './dialogs/CredentialNotReceivedDialog.vue'
+import CredentialsSimpleSteps from '@/components/DigitalCredentials/CredentialsSimpleSteps.vue'
+import CredentialsDetailSteps from '@/components/DigitalCredentials/CredentialsDetailSteps.vue'
+
+Component.registerHooks(['beforeRouteEnter'])
+
+// Create a component that extends the Vue class called CredentialsStepper
+@Component({
+  components: {
+    QrcodeVue,
+    CredentialsWebSocket,
+    ConfirmCredentialsTermsOfUseDialog,
+    CredentialNotReceivedDialog,
+    CredentialsSimpleSteps,
+    CredentialsDetailSteps
+  }
+})
+export default class CredentialsStepper extends Vue {
+  @Getter(useBusinessStore) getIdentifier!: string
+
+  loadingMessage = 'Loading'
+  showLoadingContainer = true
+  showDetailSteps = false
+  confirmCredentialsTermsOfUseDialog = false
+  credentialNotReceivedDialog = false
+  credentialTypes = DigitalCredentialTypes
+  credentialConnection: WalletConnectionIF = null
+  issuedCredential: DigitalCredentialIF = null
+
+  async beforeRouteEnter (to, from, next): Promise<void> {
+    next(async (_this) => {
+      const { data } = await LegalServices.fetchCredentials(_this.getIdentifier)
+      const issuedCredentials = data?.issuedCredentials
+
+      if (issuedCredentials?.length) {
+        next({ name: Routes.DIGITAL_CREDENTIALS })
+      } else {
+        _this.confirmCredentialsTermsOfUseDialog = true
+        next()
+      }
+    })
+  }
+
+  async setupConnection (): Promise<void> {
+    await this.getCredentialsConnection()
+    if (!this.credentialConnection) {
+      await this.addCredentialInvitation()
+    }
+    this.showLoadingContainer = false
+  }
+
+  async hideConfirmCredentialsTermsOfUseDialog (): Promise<void> {
+    this.confirmCredentialsTermsOfUseDialog = false
+    await this.setupConnection()
+  }
+
+  async handleGenegerateNewQRCode (): Promise<void> {
+    this.showLoadingContainer = true
+    await LegalServices.removeCredentialConnection(this.getIdentifier, this.credentialConnection.connectionId)
+    await this.setupConnection()
+  }
+
+  async handleNoCredentialOfferReceived (): Promise<void> {
+    this.credentialNotReceivedDialog = true
+  }
+
+  async addCredentialInvitation (): Promise<void> {
+    const { data: connection } = await LegalServices.createCredentialInvitation(this.getIdentifier)
+    this.credentialConnection = connection || null
+  }
+
+  async getCredentialsConnection (): Promise<void> {
+    const { data } = await LegalServices.fetchCredentialConnections(this.getIdentifier)
+    this.credentialConnection = data?.connections?.[0] || null
+  }
+
+  async issueCredential (credentialType: DigitalCredentialTypes): Promise<void> {
+    const { data: issuedCredential } = await LegalServices.sendCredentialOffer(this.getIdentifier, credentialType)
+    this.issuedCredential = issuedCredential || null
+  }
+
+  async handleConnection (connection: WalletConnectionIF) {
+    this.credentialConnection = connection
+    if (this.credentialConnection?.isActive) {
+      await this.issueCredential(this.credentialTypes.BUSINESS)
+    }
+  }
+
+  async handleIssuedCredential (issuedCredential: DigitalCredentialIF) {
+    this.issuedCredential = issuedCredential
+  }
+
+  async resendOffer (): Promise<void> {
+    this.credentialNotReceivedDialog = false
+    this.showLoadingContainer = true
+    if (this.issuedCredential) {
+      await this.removeCredential(this.getIdentifier, this.issuedCredential.credentialId)
+    }
+    await this.issueCredential(this.credentialTypes.BUSINESS)
+    this.showLoadingContainer = false
+  }
+
+  async resetOffer (): Promise<void> {
+    this.credentialNotReceivedDialog = false
+    this.showLoadingContainer = true
+    if (this.issuedCredential) {
+      await this.removeCredential(this.getIdentifier, this.issuedCredential.credentialId)
+    }
+    if (this.credentialConnection) {
+      await this.removeConnection(this.getIdentifier, this.credentialConnection.connectionId)
+    }
+    await this.setupConnection()
+  }
+
+  async removeCredential (identifier: string, credentialId: string): Promise<void> {
+    await LegalServices.removeCredential(identifier, credentialId)
+    this.issuedCredential = null
+  }
+
+  async removeConnection (identifier: string, connectionId: string): Promise<void> {
+    await LegalServices.removeCredentialConnection(identifier, connectionId)
+    this.credentialConnection = null
+  }
+
+  goToCredentialsDashboard (): void {
+    this.$router.push({ name: Routes.DIGITAL_CREDENTIALS })
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.loading-container {
+  z-index: 1;
+}
+</style>
diff --git a/src/components/DigitalCredentials/CredentialsTable.vue b/src/components/DigitalCredentials/CredentialsTable.vue
index ed386f126..ecf366812 100644
--- a/src/components/DigitalCredentials/CredentialsTable.vue
+++ b/src/components/DigitalCredentials/CredentialsTable.vue
@@ -1,9 +1,8 @@
 <template>
-  <div
-    id="credentials-table"
-    class="mt-8"
-  >
-    <header class="credentials-table-header">
+  <div id="credentials-table">
+    <h1>My Credential Dashboard</h1>
+
+    <header class="credentials-table-header mt-4">
       <label class="font-weight-bold pl-2">Your Digital Credentials</label>
     </header>
 
@@ -21,10 +20,17 @@
           {{ formatCredentialType(item.credentialType) }}
         </template>
         <template #[`item.isIssued`]="{ item }">
-          {{ item.isIssued ? 'Issued' : 'Pending' }}
+          {{ item.isRevoked ? "Revoked" : item.isIssued ? "Issued" : "Pending" }}
         </template>
         <template #[`item.dateOfIssue`]="{ item }">
-          {{ apiToPacificDate(item.dateOfIssue) || '-' }}
+          {{ apiToPacificDateTime(item.dateOfIssue) || "-" }}
+        </template>
+        <template #[`item.action`]="{ item }">
+          <CredentialsMenu
+            :issuedCredential="item"
+            @onConfirmRevokeCredential="promptConfirmRevokeCredential($event)"
+            @onConfirmReplaceCredential="promptConfirmReplaceCredential($event)"
+          />
         </template>
       </v-data-table>
     </v-card>
@@ -32,17 +38,22 @@
 </template>
 
 <script lang="ts">
-import { Component, Mixins, Prop } from 'vue-property-decorator'
-import { DigitalCredentialsIF, TableHeaderIF } from '@/interfaces'
+import { Component, Mixins, Prop, Emit } from 'vue-property-decorator'
+import { DigitalCredentialIF, TableHeaderIF } from '@/interfaces'
 import { DigitalCredentialTypes } from '@/enums'
 import { DateMixin } from '@/mixins'
+import CredentialsMenu from '@/components/DigitalCredentials/CredentialsMenu.vue'
 
-@Component({})
+@Component({
+  components: {
+    CredentialsMenu
+  }
+})
 export default class CredentialsTable extends Mixins(DateMixin) {
-  @Prop({ default: () => [] }) readonly issuedCredentials!: Array<DigitalCredentialsIF>
+  @Prop({ default: () => [] }) readonly issuedCredentials!: Array<DigitalCredentialIF>
 
   get credentialsTableHeaders (): Array<TableHeaderIF> {
-    // Do not display headers if there is table data
+    // Do not display headers if there is no table data
     if (this.issuedCredentials.length === 0) return []
     return [
       {
@@ -62,22 +73,41 @@ export default class CredentialsTable extends Mixins(DateMixin) {
       },
       {
         class: 'column-lg',
-        text: 'Date of Issue',
+        text: 'Issue Date',
         value: 'dateOfIssue'
+      },
+      {
+        class: 'column-lg',
+        text: '',
+        value: 'action'
       }
     ]
   }
 
   formatCredentialType (credentialType: DigitalCredentialTypes): string {
     // Safety check
-    if (!credentialType) return 'Unknown'
+    if (!credentialType) {
+      return 'Unknown'
+    }
     return credentialType.charAt(0).toUpperCase() + credentialType.slice(1) + ' Credential'
   }
+
+  /** Emits an event to prompt confirmation to revoke credential. */
+  @Emit('onPromptConfirmRevokeCredential')
+  promptConfirmRevokeCredential (issuedCredential: DigitalCredentialIF): DigitalCredentialIF {
+    return issuedCredential
+  }
+
+  /** Emits an event to prompt confirmation to replace credential. */
+  @Emit('onPromptConfirmReplaceCredential')
+  promptConfirmReplaceCredential (issuedCredential: DigitalCredentialIF): DigitalCredentialIF {
+    return issuedCredential
+  }
 }
 </script>
 
 <style lang="scss" scoped>
-@import '@/assets/styles/theme.scss';
+@import "@/assets/styles/theme.scss";
 
 .credentials-table-header {
   background-color: $BCgovBlue5O;
@@ -87,10 +117,13 @@ export default class CredentialsTable extends Mixins(DateMixin) {
 
 // Vuetify overrides for Table Headers and Cells
 :deep() {
-  .v-data-table > .v-data-table__wrapper > table > thead > tr > th, td {
+
+  .v-data-table>.v-data-table__wrapper>table>thead>tr>th,
+  td {
     color: $gray7;
-    font-size: .875rem;
+    font-size: $px-14;
   }
+
   .column-lg {
     width: 15rem !important;
   }
diff --git a/src/components/DigitalCredentials/CredentialsTermsOfUse.vue b/src/components/DigitalCredentials/CredentialsTermsOfUse.vue
new file mode 100644
index 000000000..74e841229
--- /dev/null
+++ b/src/components/DigitalCredentials/CredentialsTermsOfUse.vue
@@ -0,0 +1,398 @@
+<template>
+  <div
+    id="credentials-terms-of-use"
+    class="warning-text"
+  >
+    <section>
+      <p class="font-weight-bold terms-of-use-title text-center warning-title pt-4">
+        TERMS OF USE
+      </p>
+    </section>
+    <section>
+      <p class="font-weight-bold terms-of-use-title">
+        1.&emsp;Terms of Use
+      </p>
+      <p class="text-justify">
+        These Terms of Use are an agreement between you and the Province, and govern your use of the Digital
+        Business Card. By indicating that you agree to these Terms of Use, and in consideration of the Province
+        issuing the Digital Business Card to you, you agree to the following.
+      </p>
+    </section>
+    <section>
+      <p class="font-weight-bold terms-of-use-title">
+        2.&emsp;Ability to Accept Terms of Use
+      </p>
+      <div class="text-justify">
+        <div>
+          To accept these Terms of Use and have the Digital Business Card issued to your Wallet, you must:
+        </div>
+        <div>
+          <ol class="alpha">
+            <li>
+              be at least 19 years of age, or
+            </li>
+            <li>
+              if you are under 19, have obtained the consent of your parent or guardian to accept these Terms
+              of Use on your behalf, in which case your parent or guardian is responsible for your
+              compliance with these Terms of Use.
+            </li>
+          </ol>
+        </div>
+      </div>
+    </section>
+    <section>
+      <p class="font-weight-bold terms-of-use-title pt-4">
+        3.&emsp;Creation and Issuance of Digital Business Card
+      </p>
+      <div class="text-justify">
+        <div>
+          You agree that the Province may:
+        </div>
+        <ol class="alpha">
+          <li>
+            use information you provided
+            <ol class="ml-n6 roman">
+              <li>
+                for your BC Services Card, and
+              </li>
+              <li>
+                to the Registrar of Companies in a registration statement filed under section 88(1)(a) to
+                (c) of the <span class="font-italic">Partnership Act</span>, to create the Digital Business
+                Card, and
+              </li>
+            </ol>
+          </li>
+          <li>issue the Digital Business Card to your Wallet.</li>
+        </ol>
+      </div>
+    </section>
+    <section>
+      <p class="font-weight-bold terms-of-use-title pt-4">
+        4.&emsp;Presentation of Digital Business Card
+      </p>
+      <p class="text-justify">
+        You are solely responsible for deciding to which Verifiers you present the Digital Business Card
+        and what information to share with Verifiers. Verifiers will be able to confirm independently whether
+        the Digital Business Card is valid or has been revoked, although Verifiers will not be able to see the
+        reason the Digital Business Card was revoked.
+      </p>
+    </section>
+    <section>
+      <p class="font-weight-bold terms-of-use-title">
+        5.&emsp;Acceptable Use
+      </p>
+      <div class="text-justify">
+        <div>
+          You are solely responsible for all use of the Digital Business Card. You must not:
+        </div>
+        <ol class="alpha">
+          <li>
+            allow any other individual or entity to use your Digital Business Card;
+          </li>
+          <li>
+            attempt to add the Digital Business Card to anyone's Wallet except your own;
+          </li>
+          <li>
+            attempt to add the Digital Business Card to a Wallet that has not been approved by the Province for
+            such use;
+          </li>
+          <li>
+            use the Digital Business Card for any unlawful or inappropriate purpose, including without
+            limitation to misrepresent your identity;
+          </li>
+          <li>
+            tamper with the Digital Business Card;
+          </li>
+          <li>
+            attempt to circumvent or subvert any security measure associated with the Digital Business Card; or
+          </li>
+          <li>
+            use the Digital Business Card to misrepresent your identity or your relationship with or authority
+            to represent the business named in the Digital Business Card.
+          </li>
+        </ol>
+      </div>
+    </section>
+    <section>
+      <p class="font-weight-bold terms-of-use-title pt-4">
+        6.&emsp;Wallet and Device Protection
+      </p>
+      <div class="text-justify">
+        <div>
+          You are responsible for the security of:
+        </div>
+        <ol class="alpha">
+          <li>
+            any Wallet that you use in connection with the Digital Business Card, and
+          </li>
+          <li>
+            the device or service that holds the Wallet, including without limitation security afforded by
+            device protection, keeping your device protection confidential, and using any other security
+            protections in connection with your device.
+          </li>
+        </ol>
+      </div>
+    </section>
+    <section>
+      <p class="font-weight-bold terms-of-use-title pt-4">
+        7.&emsp;Ownership and License
+      </p>
+      <p class="text-justify">
+        The Digital Business Card is owned by the Province or its licensors. Subject to your compliance with these
+        Terms of Use, the Province grants you a non-exclusive, revocable, limited license to access and use the
+        Digital Business Card for the purpose of allowing Verifiers with whom you choose to share the
+        Digital Business Card to verify its contents.
+      </p>
+    </section>
+    <section>
+      <p class="font-weight-bold terms-of-use-title">
+        8.&emsp;Revocation of Digital Business Card
+      </p>
+      <p class="text-justify">
+        The Province may at any time, in its sole discretion, revoke the Digital Business Card issued to you, in
+        order to ensure, without limitation, that the Digital Business Card reflects your current BC Services Card
+        information and is based on current technology. After revoking a Digital Business Card the Province may, in
+        its sole discretion, offer to issue you a new Digital Business Card. If the Province revokes your Digital
+        Business Card and does not issue you a new one, then the revoked Digital Business Card will remain in your
+        Wallet until and unless you delete it. It is your sole responsibility to determine whether a Verifier will
+        accept a revoked Digital Business Card.
+      </p>
+    </section>
+    <section>
+      <p class="font-weight-bold terms-of-use-title">
+        9.&emsp;Termination
+      </p>
+      <div class="text-justify">
+        <div>
+          These Terms of Use and your license to access and use the Digital Business Card will terminate
+          automatically if:
+        </div>
+        <ol class="alpha">
+          <li>
+            you fail to comply with any provision of these Terms of Use, in which case you must immediately
+            delete the Digital Business Card from your Wallet, or
+          </li>
+          <li>
+            you choose to delete the Digital Business Card from your Wallet for any reason.
+          </li>
+        </ol>
+      </div>
+    </section>
+    <section>
+      <p class="font-weight-bold terms-of-use-title pt-4">
+        10.&emsp;No Warranty
+      </p>
+      <div class="text-justify">
+        <div>
+          The Digital Business Card is provided to you “as is”, and the Province disclaims all representations,
+          warranties, conditions, obligations and liabilities of any kind, whether express or implied, in relation
+          to the Digital Business Card, including without limitation implied warranties with respect to
+          merchantability, satisfactory quality, fitness for a particular purpose and non-infringement. Without
+          limiting the general nature of the previous sentence, the Province does not represent or warrant that:
+        </div>
+        <ol class="alpha">
+          <li>
+            the Digital Business Card will be available;
+          </li>
+          <li>
+            your use of the Digital Business Card will be timely, uninterrupted or error free;
+          </li>
+          <li>
+            any errors in the Digital Business Card will be corrected; or
+          </li>
+          <li>
+            the Digital Business Card will meet your expectations and requirements.
+          </li>
+        </ol>
+      </div>
+    </section>
+    <section>
+      <p class="font-weight-bold terms-of-use-title pt-4">
+        11.&emsp;Limitation of Liability
+      </p>
+      <p class="text-justify">
+        To the maximum extent permitted by applicable law, under no circumstances will the Province be liable to
+        you, to any other individual or to any entity for any direct, indirect, special, incidental, consequential
+        or other loss, claim, injury or damage, whether foreseeable or unforeseeable (including without limitation
+        claims for damages for loss of profits or business opportunities, use or misuse of, or inability to use, the
+        Digital Business Card, interruptions, deletion or corruption of files, loss of programs or information,
+        errors, defects or delays) arising out of or in any way connected with your use of the Digital Business Card
+        and whether based on contract, tort, strict liability or any other legal theory. The previous sentence will
+        apply even if the Province has been specifically advised of the possibility of any such loss, claim, injury
+        or damage.
+      </p>
+    </section>
+    <section>
+      <p class="font-weight-bold terms-of-use-title">
+        12.&emsp;Indemnity
+      </p>
+      <div class="text-justify">
+        <div>
+          You agree to indemnify, defend and hold harmless the Province and the Province's employees and agents
+          from and against all claims, demands, obligations, losses, liabilities, costs or debts, and expenses
+          (including but not limited to reasonable legal fees) arising from:
+        </div>
+        <ol class="alpha">
+          <li>
+            your use of the Digital Business Card, or
+          </li>
+          <li>
+            your violation of any provision of these Terms of Use.
+          </li>
+        </ol>
+      </div>
+    </section>
+    <section>
+      <p class="font-weight-bold terms-of-use-title pt-4">
+        13.&emsp;Changes to Terms of Use
+      </p>
+      <p class="text-justify">
+        The Province may at any time, in its sole discretion, make changes to these Terms of Use. When changes are
+        made, the Province will send a notification to your Wallet and to your email address, if you have provided
+        one, informing you that changes have been made to the Terms of Use. You are solely responsible for ensuring
+        that you have not disabled the “messages” function in your Wallet and for providing the Province with an up
+        to date email address, and if you do not do so you are solely responsible for monitoring the posted Terms of
+        Use found at <a
+          :href="touLink"
+          target="_blank"
+        >{{ touLink }}</a> for changes. The Province is not
+        responsible for your failure to receive any notification sent to your Wallet or email address, and
+        regardless of whether you receive such notification, your continued use of the Digital Business Card will
+        constitute your unconditional acceptance of any changes to these Terms of Use.
+      </p>
+    </section>
+    <section>
+      <p class="font-weight-bold terms-of-use-title">
+        14.&emsp;Province Contact Information
+      </p>
+      <p class="text-justify">
+        If you have questions about your Digital Business Card, contact the BC Registries Help Desk at: <a
+          :href="'mailto:' + emailAddress"
+        >{{ emailAddress }}</a>
+      </p>
+    </section>
+    <section>
+      <p class="font-weight-bold terms-of-use-title">
+        15.&emsp;General
+      </p>
+      <p class="text-justify">
+        These Terms of Use are the entire agreement between you and the Province with respect
+        to the Digital Business Card. The headings in these Terms of Use are inserted for convenience only and will
+        not be used in interpreting or construing any provision of these Terms of Use. Sections 7, 10, 11, 12 and
+        15, and any other sections of these Terms of Use which, by their terms or nature, are intended to survive
+        termination, will survive any termination of these Terms of Use. If any provision of these Terms of Use is
+        invalid, illegal or unenforceable, that provision will be severed from these Terms of Use and all other
+        provisions will remain in full force and effect. These Terms of Use will be governed by and construed in
+        accordance with the laws of the province of British Columbia and the applicable laws of Canada. By accepting
+        these Terms of Use, you consent to the exclusive jurisdiction and venue of the courts of the province of
+        British Columbia, sitting in Victoria, for the hearing of any dispute arising from or related to these Terms
+        of Use and their subject matter.
+      </p>
+    </section>
+    <section>
+      <p class="font-weight-bold terms-of-use-title">
+        16.&emsp;Definitions
+      </p>
+      <div class="text-justify">
+        <p>
+          In these Terms of Use, the following terms have the following meanings:
+        </p>
+        <p>
+          <span class="font-weight-bold terms-of-use-title">“BC Services Card”</span> means the Province-issued
+          identification card to facilitate access to various government services and programs and which may include
+          information such as an individual's name, photograph, date of birth, and a unique identifier.
+        </p>
+        <p>
+          <span class="font-weight-bold terms-of-use-title">“Digital Business Card”</span> means the verifiable
+          credential issued to you to identify you as the person who, in relation to the matters set out in section
+          88(1)(a) to (c) of the <span class="font-italic">Partnership Act</span>, filed a registration statement
+          respecting a sole proprietorship with the Registrar of Companies for the purpose of providing that information
+          to Verifiers.
+        </p>
+        <p>
+          <span class="font-weight-bold terms-of-use-title">“Province”</span> means His Majesty the King in right of the
+          Province of British Columbia as represented by the Minister of Citizens' Services.
+        </p>
+        <p>
+          <span class="font-weight-bold terms-of-use-title">“Terms of Use”</span> means the agreement referred to in
+          section 1.
+        </p>
+        <p>
+          <span class="font-weight-bold terms-of-use-title">“Verifiers”</span> means third parties to whom you present
+          your Digital Business Card for the purpose of allowing those third parties to verify its contents.
+        </p>
+        <p>
+          <span class="font-weight-bold terms-of-use-title">“Wallet”</span> means software, such as the BC Wallet mobile
+          device app, that you can use to receive, store and present digital credentials such as your Digital Business
+          Card.
+        </p>
+      </div>
+    </section>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator'
+
+@Component({})
+export default class CredentialsTermsOfUse extends Vue {
+  readonly touLink = 'https://www2.gov.bc.ca/gov/content' +
+    '/employment-business/business/managing-a-business/permits-licences/digital-business-card-terms-of-use'
+  readonly emailAddress = 'BCRegistries@gov.bc.ca'
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/styles/theme.scss';
+
+.terms-of-use-title {
+  color: $gray9;
+}
+
+ol.alpha {
+  counter-reset: list;
+
+  li {
+    list-style: none;
+    position: relative;
+    padding-left: $px-36;
+  }
+
+  li:before {
+    position: absolute;
+    left: 0;
+    content: "(" counter(list, lower-alpha) ")";
+    counter-increment: list;
+  }
+}
+
+ol.roman {
+  counter-reset: list;
+
+  li {
+    list-style: none;
+    position: relative;
+    padding-left: $px-36;
+  }
+
+  li:before {
+    position: absolute;
+    left: 0;
+    content: "(" counter(list, lower-roman) ")";
+    counter-increment: list;
+  }
+}
+
+.warning-title {
+  font-size: $px-24;
+  font-weight: bold;
+  color: $gray9;
+  line-height: $px-34;
+}
+
+.warning-text {
+  font-weight: normal;
+  font-size: $px-16;
+  color: $gray7;
+  line-height: $px-24;
+}</style>
diff --git a/src/components/DigitalCredentials/CredentialsWebSocket.vue b/src/components/DigitalCredentials/CredentialsWebSocket.vue
new file mode 100644
index 000000000..52f6ce5b8
--- /dev/null
+++ b/src/components/DigitalCredentials/CredentialsWebSocket.vue
@@ -0,0 +1,107 @@
+<template>
+  <div id="credentials-web-socket" />
+</template>
+
+<script lang="ts">
+import { Component, Emit, Prop, Vue, Watch } from 'vue-property-decorator'
+import { useBusinessStore, useConfigurationStore } from '@/stores'
+import { Getter } from 'pinia-class'
+import { WalletConnectionIF, DigitalCredentialIF } from '@/interfaces'
+import { Observable, Subscription, interval, of } from 'rxjs'
+import { catchError, map, switchMap } from 'rxjs/operators'
+import { LegalServices } from '@/services'
+
+@Component
+export default class CredentialsWebSocket extends Vue {
+  @Getter(useConfigurationStore) getLegalApiUrl!: string
+  @Getter(useBusinessStore) getIdentifier!: string
+
+  @Prop({ default: null }) readonly connection!: WalletConnectionIF
+  @Prop({ default: null }) readonly issuedCredential!: DigitalCredentialIF
+
+  connectionsSubscription: Subscription
+  issueCredentialV20Subscription: Subscription
+
+  connections$: Observable<WalletConnectionIF | null>
+  issueCredentialV20$: Observable<DigitalCredentialIF | null>
+
+  mounted (): void {
+    this.connections$ =
+      interval(1000)
+        .pipe(
+          switchMap(() => LegalServices.fetchCredentialConnections(this.getIdentifier)),
+          map(({ data }) => data?.connections[0] || null),
+          catchError(() => of(null))
+        )
+
+    this.issueCredentialV20$ =
+      interval(1000)
+        .pipe(
+          switchMap(() => LegalServices.fetchCredentials(this.getIdentifier)),
+          map(({ data }) => data?.issuedCredentials[0] || null),
+          catchError(() => of(null))
+        )
+  }
+
+  destroyed (): void {
+    this.unsubscribeConnections()
+    this.unsubscribeIssueCredentialV20()
+  }
+
+  subscribeConnections (): void {
+    this.connectionsSubscription = this.connections$
+      .subscribe((connection) => {
+        if (connection) {
+          this.handleConnectionsMessage(connection)
+        }
+      })
+  }
+
+  subscribeIssueCredentialV20 (): void {
+    this.issueCredentialV20Subscription = this.issueCredentialV20$
+      .subscribe((issuedCredential) => {
+        if (issuedCredential) {
+          this.handleIssuedCredentialMessage(issuedCredential)
+        }
+      })
+  }
+
+  unsubscribeConnections (): void {
+    if (this.connectionsSubscription && !this.connectionsSubscription.closed) {
+      this.connectionsSubscription.unsubscribe()
+    }
+  }
+
+  unsubscribeIssueCredentialV20 (): void {
+    if (this.issueCredentialV20Subscription && !this.issueCredentialV20Subscription.closed) {
+      this.issueCredentialV20Subscription.unsubscribe()
+    }
+  }
+
+  @Watch('connection', { immediate: true })
+  onConnectionChanged (connection: WalletConnectionIF): void {
+    this.unsubscribeConnections()
+    if (connection && !connection.isActive) {
+      this.subscribeConnections()
+    }
+  }
+
+  @Watch('issuedCredential', { immediate: true })
+  onIssuedCredentialChanged (issuedCredential: DigitalCredentialIF): void {
+    this.unsubscribeIssueCredentialV20()
+    if (issuedCredential && !issuedCredential.isIssued) {
+      this.subscribeIssueCredentialV20()
+    }
+  }
+
+  @Emit('onConnection')
+  handleConnectionsMessage (connection: WalletConnectionIF): WalletConnectionIF {
+    return connection
+  }
+
+  @Emit('onIssuedCredential')
+  handleIssuedCredentialMessage (issuedCredential: DigitalCredentialIF): DigitalCredentialIF {
+    return issuedCredential
+  }
+}
+</script>
diff --git a/src/components/DigitalCredentials/DigitalWalletDownload.vue b/src/components/DigitalCredentials/DigitalWalletDownload.vue
deleted file mode 100644
index 886fbcc5b..000000000
--- a/src/components/DigitalCredentials/DigitalWalletDownload.vue
+++ /dev/null
@@ -1,192 +0,0 @@
-<template>
-  <section id="digital-wallet-download">
-    <article id="digital-wallet-header">
-      <v-row no-gutters>
-        <v-col
-          cols="12"
-          lg="11"
-        >
-          <h3>Download Digital Wallet</h3>
-          <p class="mt-4 font-14">
-            Digital Wallets are apps you download on your phone to securely store your digital
-            credentials. Below are download links to currently supported digital wallets. You can have multiple digital
-            wallets on your phone. If you already have one of these wallet apps on your phone, continue to next step:
-            Choose Digital Credentials.
-          </p>
-        </v-col>
-      </v-row>
-
-      <!-- Important Message: Unsupported wallets -->
-      <ImportantMessage
-        :message="'Wallet app by Google and Apple Wallet are not currently supported.'"
-      />
-    </article>
-
-    <article id="wallet-download">
-      <v-row no-gutters>
-        <v-col cols="12">
-          <h3 class="py-8">
-            Download Trinsic Wallet on your phone
-          </h3>
-
-          <v-card
-            flat
-            class="pa-3"
-          >
-            <v-card-text>
-              <!-- Download Steps -->
-              <v-row no-gutters>
-                <v-col>
-                  <p class="font-16">
-                    Trinsic is a digital wallet app that is compatible with BC Gov production and proof
-                    of concept applications.
-                  </p>
-                </v-col>
-              </v-row>
-              <v-row
-                no-gutters
-                class="pt-3"
-              >
-                <v-col
-                  cols="12"
-                  lg="9"
-                >
-                  <p>
-                    1. Scan the appropriate QR code on your phone or select the app store icon below for your phone.
-                    Depending on your phone model, you may need to
-                    <v-tooltip
-                      top
-                      content-class="top-tooltip"
-                      transition="fade-transition"
-                    >
-                      <template #activator="{ on }">
-                        <span
-                          class="dotted-underline"
-                          v-on="on"
-                        >download a QR scanner app to scan</span>
-                      </template>
-                      Newer smartphones can use the camera app to scan QR codes. Older smartphones need a separate app
-                      to scan QR codes.
-                    </v-tooltip>
-                    the QR code.
-                  </p>
-
-                  <v-row
-                    no-gutters
-                    class="text-center mt-4"
-                  >
-                    <v-col
-                      cols="12"
-                      lg="5"
-                    >
-                      <h4>Apple iOS</h4>
-                      <QrcodeVue
-                        class="mt-6"
-                        size="160"
-                        :value="appleUrl"
-                      />
-                    </v-col>
-                    <v-col
-                      cols="12"
-                      lg="5"
-                    >
-                      <h4>Android</h4>
-                      <QrcodeVue
-                        class="mt-6"
-                        size="160"
-                        :value="googleUrl"
-                      />
-                    </v-col>
-                  </v-row>
-
-                  <!-- App Store Downloads -->
-                  <v-row
-                    no-gutters
-                    class="my-6"
-                  >
-                    <v-col
-                      cols="6"
-                      lg="5"
-                    >
-                      <a
-                        :href="appleUrl"
-                        target="_blank"
-                        rel="noopener"
-                      >
-                        <v-img
-                          contain
-                          height="44"
-                          class="app-download-image"
-                          src="@/assets/images/appleDownload.png"
-                          alt="App Store"
-                        />
-                      </a>
-                    </v-col>
-                    <v-col
-                      cols="6"
-                      lg="5"
-                    >
-                      <a
-                        :href="googleUrl"
-                        target="_blank"
-                        rel="noopener"
-                      >
-                        <v-img
-                          contain
-                          height="42"
-                          class="app-download-image"
-                          src="@/assets/images/googleDownload.png"
-                          alt="Google Play"
-                        />
-                      </a>
-                    </v-col>
-                  </v-row>
-
-                  <p>
-                    2. Open the Trinsic Wallet and tap on the menu icon (<v-icon color="black">
-                      mdi-menu
-                    </v-icon>) on
-                    the top left corner.
-                  </p>
-                  <p>3. Tap on Network and select "BCovrin Test"</p>
-                </v-col>
-              </v-row>
-            </v-card-text>
-          </v-card>
-        </v-col>
-      </v-row>
-    </article>
-  </section>
-</template>
-
-<script lang="ts">
-import { Component, Vue } from 'vue-property-decorator'
-import { ImportantMessage } from '@/components/common'
-import QrcodeVue from 'qrcode.vue'
-
-@Component({
-  components: {
-    ImportantMessage,
-    QrcodeVue
-  }
-})
-export default class DigitalWalletDownload extends Vue {
-  readonly appleUrl = 'https://apps.apple.com/us/app/trinsic-wallet/id1475160728'
-  readonly googleUrl = 'https://play.google.com/store/apps/details?id=id.streetcred.apps.mobile&hl=en_US'
-}
-</script>
-
-<style lang="scss" scoped>
-@import '@/assets/styles/theme.scss';
-
-#digital-wallet-download {
-  p {
-    color: $gray9;
-  }
-  .app-download-image {
-    &:hover {
-      cursor: pointer;
-    }
-  }
-}
-</style>
diff --git a/src/components/DigitalCredentials/IssueCredentials.vue b/src/components/DigitalCredentials/IssueCredentials.vue
deleted file mode 100644
index 720922de6..000000000
--- a/src/components/DigitalCredentials/IssueCredentials.vue
+++ /dev/null
@@ -1,165 +0,0 @@
-<template>
-  <section id="issue-credentials">
-    <article id="issue-credentials-header">
-      <v-row no-gutters>
-        <v-col
-          cols="12"
-          lg="11"
-        >
-          <h3>Issue Credential to Digital Wallet</h3>
-          <p class="mt-4 font-14">
-            <span v-if="hasRegisteredWallet">
-              Issue the business credentials to the registered digital wallet. You can choose to issue two kinds of
-              Digital Credentials. Having both credentials will help with accessing services quicker. Credentials are
-              issued by sending Credential Offers to the digital wallet app. Once the Credential Offers are sent, the
-              digital wallet app on your phone will ask you to claim the Credential Offers. When the Credential Offers
-              are claimed, the credential is stored on the app.
-            </span>
-            <span v-else>
-              There are no digital wallets registered with this business. Please go back to the previous step and
-              register a digital wallet.
-            </span>
-          </p>
-        </v-col>
-      </v-row>
-    </article>
-
-    <article v-if="hasRegisteredWallet">
-      <v-row no-gutters>
-        <v-col
-          cols="12"
-          lg="12"
-        >
-          <v-card
-            flat
-            rounded
-            class="px-2 mt-3"
-          >
-            <v-card-text class="px-6 py-8">
-              <!-- Credential Offer -->
-              <v-row no-gutters>
-                <v-col
-                  cols="12"
-                  lg="8"
-                  class="ma-auto"
-                >
-                  <h4>Business Digital Credential</h4>
-                </v-col>
-                <v-col
-                  cols="12"
-                  lg="4"
-                  class="pr-2"
-                >
-                  <v-btn
-                    v-if="issuedCredentials.length === 0"
-                    id="next-btn"
-                    large
-                    color="primary"
-                    class="font-weight-bold px-6 float-right"
-                    :loading="isSendingOffer"
-                    @click="sendCredentialOffer(DigitalCredentialTypes.BUSINESS)"
-                  >
-                    Send Credential Offer
-                  </v-btn>
-
-                  <div v-else-if="isPendingAcceptedOffer">
-                    <v-icon class="pr-2 alert-text">
-                      mdi-wallet
-                    </v-icon>
-                    <span class="font-weight-bold alert-text">Check Digital Wallet for Offer</span>
-                  </div>
-
-                  <div v-else>
-                    <v-icon
-                      color="success"
-                      class="pr-2"
-                    >
-                      mdi-check
-                    </v-icon>
-                    <span class="success-text font-weight-bold">Credential Successfully Stored</span>
-                  </div>
-                </v-col>
-              </v-row>
-            </v-card-text>
-          </v-card>
-        </v-col>
-      </v-row>
-    </article>
-
-    <!-- Navigate back section when no selections made -->
-    <article
-      v-else
-      id="no-credentials-msg"
-      @click="back()"
-    >
-      <v-card
-        flat
-        rounded
-        class="pa-3"
-      >
-        <v-card-text>
-          <v-row no-gutters>
-            <v-col cols="12">
-              <span class="font-16">
-                <v-icon
-                  class="pr-1"
-                  color="primary"
-                >mdi-arrow-left</v-icon>
-                Go back to the previous step to register a digital wallet with this business.
-              </span>
-            </v-col>
-          </v-row>
-        </v-card-text>
-      </v-card>
-    </article>
-  </section>
-</template>
-
-<script lang="ts">
-import { Component, Emit, Prop, Vue } from 'vue-property-decorator'
-import { DigitalCredentialTypes } from '@/enums'
-import { DigitalCredentialsIF } from '@/interfaces'
-
-@Component({})
-export default class IssueCredentials extends Vue {
-  @Prop({ default: false }) readonly hasRegisteredWallet!: boolean
-
-  @Prop({ default: false }) readonly issuedCredentials!: Array<DigitalCredentialsIF>
-
-  readonly DigitalCredentialTypes = DigitalCredentialTypes
-  isSendingOffer = false
-
-  get isPendingAcceptedOffer (): boolean {
-    return !this.issuedCredentials[0]?.isIssued
-  }
-
-  @Emit() back (): void {}
-
-  @Emit('sendCredentialOffer')
-  sendCredentialOffer (credentialType: DigitalCredentialTypes) {
-    this.isSendingOffer = true
-    return credentialType
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import '@/assets/styles/theme.scss';
-
-#issue-credentials {
-  p, span, i {
-    color: $gray9;
-  }
-  #no-credentials-msg {
-    &:hover {
-      cursor: pointer;
-    }
-  }
-  .alert-text {
-    color: $app-alert;
-  }
-  .success-text {
-    color: $app-green;
-  }
-}
-</style>
diff --git a/src/components/DigitalCredentials/RegisterWallet.vue b/src/components/DigitalCredentials/RegisterWallet.vue
deleted file mode 100644
index 472de3dfb..000000000
--- a/src/components/DigitalCredentials/RegisterWallet.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <section id="register-wallet">
-    <article id="register-wallet-header">
-      <v-row no-gutters>
-        <v-col
-          cols="12"
-          lg="11"
-        >
-          <h3>Register Digital Wallet</h3>
-          <p class="mt-4 font-14">
-            Register the digital wallet on your phone with this business by scanning the QR code
-            below with the digital wallet app.
-          </p>
-        </v-col>
-      </v-row>
-    </article>
-
-    <article v-if="!hasRegisteredWallet">
-      <v-card
-        flat
-        rounded
-        class="pa-3 mt-3"
-      >
-        <v-card-text>
-          <v-row no-gutters>
-            <!-- Successfully Generated QR Code -->
-            <v-col
-              cols="12"
-              lg="3"
-              class="px-2"
-            >
-              <!-- Placeholder Url -->
-              <QrcodeVue
-                render-as="svg"
-                size="160"
-                :value="credentialInvitationUrl"
-              />
-            </v-col>
-
-            <v-col
-              cols="12"
-              lg="9"
-            >
-              <p>
-                Open the digital wallet app on your phone and scan this QR code to register the wallet with this
-                business. When you're done, proceed to the next step.
-              </p>
-            </v-col>
-          </v-row>
-        </v-card-text>
-      </v-card>
-    </article>
-
-    <article
-      v-else
-      class="text-center"
-    >
-      <v-card
-        flat
-        rounded
-        class="pa-3 mt-3"
-      >
-        <v-card-text>
-          <v-row no-gutters>
-            <v-col cols="12">
-              <v-icon
-                color="success"
-                x-large
-              >
-                mdi-check-circle
-              </v-icon>
-            </v-col>
-            <v-col
-              cols="12"
-              class="mt-2"
-            >
-              <span>Successfully Registered Wallet</span>
-            </v-col>
-          </v-row>
-        </v-card-text>
-      </v-card>
-    </article>
-  </section>
-</template>
-
-<script lang="ts">
-import { Component, Prop, Vue } from 'vue-property-decorator'
-import QrcodeVue from 'qrcode.vue'
-
-@Component({
-  components: { QrcodeVue }
-})
-export default class RegisterWallet extends Vue {
-  @Prop({ default: false }) readonly credentialInvitationUrl!: boolean
-  @Prop({ default: false }) readonly hasRegisteredWallet: boolean
-}
-</script>
-
-<style lang="scss" scoped>
-@import '@/assets/styles/theme.scss';
-
-#register-wallet {
-  p, span {
-    color: $gray9;
-  }
-}
-</style>
diff --git a/src/components/DigitalCredentials/dialogs/ConfirmCredentialsTermsofUseDialog.vue b/src/components/DigitalCredentials/dialogs/ConfirmCredentialsTermsofUseDialog.vue
new file mode 100644
index 000000000..dfbc79cb3
--- /dev/null
+++ b/src/components/DigitalCredentials/dialogs/ConfirmCredentialsTermsofUseDialog.vue
@@ -0,0 +1,85 @@
+<template>
+  <v-dialog
+    id="confirm-credentials-terms-of-use-dialog"
+    v-model="dialog"
+    width="60rem"
+    persistent
+    :attach="attach"
+    content-class="confirm-credentials-terms-of-use-dialog"
+  >
+    <v-card class="pa-5">
+      <v-card-text>
+        <CredentialsTermsOfUse />
+      </v-card-text>
+
+      <v-card-actions>
+        <v-row
+          no-gutters
+          justify="center"
+        >
+          <v-btn
+            id="dialog-close-button"
+            class="mr-4 action-btn"
+            color="primary"
+            outlined
+            @click="close()"
+          >
+            <span>Cancel</span>
+          </v-btn>
+          <v-btn
+            id="dialog-proceed-button"
+            class="action-btn"
+            color="primary"
+            @click="proceed()"
+          >
+            Agree to Terms
+          </v-btn>
+        </v-row>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop, Emit } from 'vue-property-decorator'
+import CredentialsTermsOfUse from '@/components/DigitalCredentials/CredentialsTermsOfUse.vue'
+
+@Component({
+  components: {
+    CredentialsTermsOfUse
+  }
+})
+export default class ConfirmCredentialsTermsOfUseDialog extends Vue {
+  /** Prop to display the dialog. */
+  @Prop({ default: false }) readonly dialog!: boolean
+
+  /** Prop to provide attachment selector. */
+  @Prop({ default: '' }) readonly attach!: string
+
+  // Pass click events to parent.
+  @Emit() close (): void {
+    return undefined
+  }
+  @Emit() proceed (): void {
+    return undefined
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/styles/theme.scss';
+
+.close-btn {
+  position: absolute;
+  right: $px-32;
+}
+
+.action-btn {
+  min-height: 44px;
+}
+
+// Vuetify overrides
+:deep(.v-dialog .v-card .v-card__text) {
+  padding-top: 0 !important;
+}
+</style>
diff --git a/src/components/DigitalCredentials/dialogs/ConfirmReplaceCredentialDialog.vue b/src/components/DigitalCredentials/dialogs/ConfirmReplaceCredentialDialog.vue
new file mode 100644
index 000000000..1cee667cc
--- /dev/null
+++ b/src/components/DigitalCredentials/dialogs/ConfirmReplaceCredentialDialog.vue
@@ -0,0 +1,128 @@
+<template>
+  <v-dialog
+    id="confirm-revoke-credential-dialog"
+    v-model="dialog"
+    width="45rem"
+    persistent
+    :attach="attach"
+    content-class="confirm-replace-credential-dialog"
+  >
+    <v-card class="pa-5">
+      <v-card-subtitle
+        class="pt-5"
+        align="center"
+      >
+        <v-icon
+          color="error"
+          large
+        >
+          mdi-information-outline
+        </v-icon>
+        <v-btn
+          small
+          text
+          color="primary"
+          class="close-btn"
+          @click="close()"
+        >
+          <v-icon>mdi-close</v-icon>
+        </v-btn>
+      </v-card-subtitle>
+
+      <v-card-text>
+        <p
+          id="dialog-title"
+          class="warning-title"
+        >
+          Are you sure?
+        </p>
+        <p
+          id="dialog-text"
+          class="warning-text"
+        >
+          This will revoke the existing digital credential in a BC Wallet and send you another one.
+          It cannot be reversed. Do you still wish to continue?
+        </p>
+      </v-card-text>
+
+      <v-card-actions>
+        <v-row
+          no-gutters
+          justify="center"
+        >
+          <v-btn
+            id="dialog-close-button"
+            class="mr-4 action-btn"
+            color="primary"
+            outlined
+            @click="close()"
+          >
+            <span>Cancel</span>
+          </v-btn>
+          <v-btn
+            id="dialog-proceed-button"
+            class="action-btn"
+            color="primary"
+            @click="proceed()"
+          >
+            Replace Credential
+          </v-btn>
+        </v-row>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop, Emit } from 'vue-property-decorator'
+
+@Component({})
+export default class ConfirmReplaceCredentialDialog extends Vue {
+  /** Prop to display the dialog. */
+  @Prop({ default: false }) readonly dialog!: boolean
+
+  /** Prop to provide attachment selector. */
+  @Prop({ default: '' }) readonly attach!: string
+
+  // Pass click events to parent.
+  @Emit() close (): void {
+    return undefined
+  }
+  @Emit() proceed (): void {
+    return undefined
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/styles/theme.scss';
+
+.close-btn {
+  position: absolute;
+  right: $px-32;
+}
+
+.action-btn {
+  min-height: 44px;
+}
+
+.warning-title {
+  font-size: $px-24;
+  font-weight: bold;
+  color: $gray9;
+  text-align: center;
+  line-height: $px-34;
+}
+
+.warning-text {
+  font-weight: normal;
+  font-size: $px-16;
+  color: $gray7;
+  line-height: $px-24;
+}
+
+// Vuetify overrides
+:deep(.v-dialog .v-card .v-card__text) {
+  padding-top: 0 !important;
+}
+</style>
diff --git a/src/components/DigitalCredentials/dialogs/ConfirmRevokeCredentialDialog.vue b/src/components/DigitalCredentials/dialogs/ConfirmRevokeCredentialDialog.vue
new file mode 100644
index 000000000..a57e63f9d
--- /dev/null
+++ b/src/components/DigitalCredentials/dialogs/ConfirmRevokeCredentialDialog.vue
@@ -0,0 +1,128 @@
+<template>
+  <v-dialog
+    id="confirm-revoke-credential-dialog"
+    v-model="dialog"
+    width="45rem"
+    persistent
+    :attach="attach"
+    content-class="confirm-revoke-credential-dialog"
+  >
+    <v-card class="pa-5">
+      <v-card-subtitle
+        class="pt-5"
+        align="center"
+      >
+        <v-icon
+          color="error"
+          large
+        >
+          mdi-information-outline
+        </v-icon>
+        <v-btn
+          small
+          text
+          color="primary"
+          class="close-btn"
+          @click="close()"
+        >
+          <v-icon>mdi-close</v-icon>
+        </v-btn>
+      </v-card-subtitle>
+
+      <v-card-text>
+        <p
+          id="dialog-title"
+          class="warning-title"
+        >
+          Are you sure?
+        </p>
+        <p
+          id="dialog-text"
+          class="warning-text"
+        >
+          This will revoke the existing digital credential in a BC Wallet.
+          It cannot be reversed. Do you still wish to continue?
+        </p>
+      </v-card-text>
+
+      <v-card-actions>
+        <v-row
+          no-gutters
+          justify="center"
+        >
+          <v-btn
+            id="dialog-close-button"
+            class="mr-4 action-btn"
+            color="primary"
+            outlined
+            @click="close()"
+          >
+            <span>Cancel</span>
+          </v-btn>
+          <v-btn
+            id="dialog-proceed-button"
+            class="action-btn"
+            color="primary"
+            @click="proceed()"
+          >
+            Revoke Credential
+          </v-btn>
+        </v-row>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop, Emit } from 'vue-property-decorator'
+
+@Component({})
+export default class ConfirmRevokeCredentialDialog extends Vue {
+  /** Prop to display the dialog. */
+  @Prop({ default: false }) readonly dialog!: boolean
+
+  /** Prop to provide attachment selector. */
+  @Prop({ default: '' }) readonly attach!: string
+
+  // Pass click events to parent.
+  @Emit() close (): void {
+    return undefined
+  }
+  @Emit() proceed (): void {
+    return undefined
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/styles/theme.scss';
+
+.close-btn {
+  position: absolute;
+  right: $px-32;
+}
+
+.action-btn {
+  min-height: 44px;
+}
+
+.warning-title {
+  font-size: $px-24;
+  font-weight: bold;
+  color: $gray9;
+  text-align: center;
+  line-height: $px-34;
+}
+
+.warning-text {
+  font-weight: normal;
+  font-size: $px-16;
+  color: $gray7;
+  line-height: $px-24;
+}
+
+// Vuetify overrides
+:deep(.v-dialog .v-card .v-card__text) {
+  padding-top: 0 !important;
+}
+</style>
diff --git a/src/components/DigitalCredentials/dialogs/CredentialNotReceivedDialog.vue b/src/components/DigitalCredentials/dialogs/CredentialNotReceivedDialog.vue
new file mode 100644
index 000000000..5ef6cd123
--- /dev/null
+++ b/src/components/DigitalCredentials/dialogs/CredentialNotReceivedDialog.vue
@@ -0,0 +1,131 @@
+<template>
+  <v-dialog
+    id="credential-not-received-dialog"
+    v-model="dialog"
+    width="45rem"
+    persistent
+    :attach="attach"
+    content-class="credential-not-received-dialog"
+  >
+    <v-card class="pa-5">
+      <v-card-text>
+        <p
+          id="dialog-title"
+          class="warning-title"
+        >
+          Didn't receive a credential offer?
+        </p>
+        <p
+          id="dialog-text"
+          class="warning-text"
+        >
+          Credential offers can take up to a minute, depending on your internet connection. Try the following:
+          <ul>
+            <li>
+              <p>Check your internet connection</p>
+            </li>
+            <li>
+              <p>Try using your mobile data if available</p>
+            </li>
+            <li>
+              <p>Close the wallet on your phone and open it again</p>
+            </li>
+            <li>
+              <p>
+                <a
+                  href="#"
+                  @click.prevent="handleResendOffer()"
+                >Send another credential offer</a>
+              </p>
+            </li>
+            <li>
+              <p>
+                <a
+                  href="#"
+                  @click.prevent="handleResetOffer()"
+                >Refresh the page</a> and scan the QR code again
+              </p>
+            </li>
+          </ul>
+        </p>
+      </v-card-text>
+
+      <v-card-actions>
+        <v-row
+          no-gutters
+          justify="center"
+        >
+          <v-btn
+            id="dialog-close-button"
+            class="action-btn"
+            color="primary"
+            @click="close()"
+          >
+            Got it
+          </v-btn>
+        </v-row>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop, Emit } from 'vue-property-decorator'
+
+@Component({})
+export default class CredentialNotReceivedDialog extends Vue {
+  /** Prop to display the dialog. */
+  @Prop({ default: false }) readonly dialog!: boolean
+
+  /** Prop to provide attachment selector. */
+  @Prop({ default: '' }) readonly attach!: string
+
+  // Pass click events to parent.
+  @Emit() close (): void {
+    return undefined
+  }
+
+  @Emit('onResendOffer')
+  handleResendOffer (): void {
+    return undefined
+  }
+
+  @Emit('onResetOffer')
+  handleResetOffer (): void {
+    return undefined
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/styles/theme.scss';
+
+.close-btn {
+  position: absolute;
+  right: $px-32;
+}
+
+.action-btn {
+  min-height: 44px;
+}
+
+.warning-title {
+  font-size: $px-24;
+  font-weight: bold;
+  color: $gray9;
+  text-align: center;
+  line-height: $px-34;
+}
+
+.warning-text {
+  font-weight: normal;
+  font-size: $px-16;
+  color: $gray7;
+  line-height: $px-24;
+}
+
+// Vuetify overrides
+:deep(.v-dialog .v-card .v-card__text) {
+  padding-top: 0 !important;
+}
+</style>
diff --git a/src/components/DigitalCredentials/dialogs/CredentialRevokedDialog.vue b/src/components/DigitalCredentials/dialogs/CredentialRevokedDialog.vue
new file mode 100644
index 000000000..254d26e4d
--- /dev/null
+++ b/src/components/DigitalCredentials/dialogs/CredentialRevokedDialog.vue
@@ -0,0 +1,88 @@
+<template>
+  <v-dialog
+    id="credential-revoked-dialog"
+    v-model="dialog"
+    width="45rem"
+    persistent
+    :attach="attach"
+    content-class="credential-revoked-dialog"
+  >
+    <v-card class="pa-5">
+      <v-card-text>
+        <p
+          id="dialog-title"
+          class="warning-title"
+        >
+          The credential has now been revoked.
+        </p>
+      </v-card-text>
+
+      <v-card-actions>
+        <v-row
+          no-gutters
+          justify="center"
+        >
+          <v-btn
+            id="dialog-close-button"
+            class="action-btn"
+            color="primary"
+            @click="close()"
+          >
+            Go back to My Credentials
+          </v-btn>
+        </v-row>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop, Emit } from 'vue-property-decorator'
+
+@Component({})
+export default class CredentialRevokedDialog extends Vue {
+  /** Prop to display the dialog. */
+  @Prop({ default: false }) readonly dialog!: boolean
+
+  /** Prop to provide attachment selector. */
+  @Prop({ default: '' }) readonly attach!: string
+
+  // Pass click events to parent.
+  @Emit() close (): void {
+    return undefined
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/styles/theme.scss';
+
+.close-btn {
+  position: absolute;
+  right: $px-32;
+}
+
+.action-btn {
+  min-height: 44px;
+}
+
+.warning-title {
+  font-size: $px-24;
+  font-weight: bold;
+  color: $gray9;
+  text-align: center;
+  line-height: $px-34;
+}
+
+.warning-text {
+  font-weight: normal;
+  font-size: $px-16;
+  color: $gray7;
+  line-height: $px-24;
+}
+
+// Vuetify overrides
+:deep(.v-dialog .v-card .v-card__text) {
+  padding-top: 0 !important;
+}
+</style>
diff --git a/src/components/DigitalCredentials/dialogs/ReplaceCredentialErrorDialog.vue b/src/components/DigitalCredentials/dialogs/ReplaceCredentialErrorDialog.vue
new file mode 100644
index 000000000..99ca55521
--- /dev/null
+++ b/src/components/DigitalCredentials/dialogs/ReplaceCredentialErrorDialog.vue
@@ -0,0 +1,67 @@
+<template>
+  <v-dialog
+    id="replace-credential-error-dialog"
+    v-model="dialog"
+    width="45rem"
+    persistent
+    :attach="attach"
+    content-class="replace-credential-error-dialog"
+  >
+    <v-card>
+      <v-card-title>Unable to Replace Credential</v-card-title>
+
+      <v-card-text>
+        <p class="font-15">
+          We were unable to replace your credential.
+        </p>
+
+        <template v-if="!isRoleStaff">
+          <p class="font-15">
+            If this error persists, please contact us.
+          </p>
+          <ContactInfo class="mt-5" />
+        </template>
+      </v-card-text>
+
+      <v-divider class="my-0" />
+
+      <v-card-actions>
+        <v-spacer />
+        <v-btn
+          id="dialog-close-button"
+          color="primary"
+          text
+          @click="close()"
+        >
+          Close
+        </v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Emit, Vue } from 'vue-property-decorator'
+import { Getter } from 'pinia-class'
+import { ContactInfo } from '@/components/common'
+import { useRootStore } from '@/stores'
+
+@Component({
+  components: { ContactInfo }
+})
+export default class ReplaceCredentialErrorDialog extends Vue {
+  // Getter to check if logged in user is Staff.
+  @Getter(useRootStore) isRoleStaff!: boolean
+
+  /** Prop to display the dialog. */
+  @Prop({ default: false }) readonly dialog!: boolean
+
+  /** Prop to provide attachment selector. */
+  @Prop({ default: '' }) readonly attach!: string
+
+  // Pass click event to parent.
+  @Emit() close (): void {
+    return undefined
+  }
+}
+</script>
diff --git a/src/components/DigitalCredentials/dialogs/RevokeCredentialErrorDialog.vue b/src/components/DigitalCredentials/dialogs/RevokeCredentialErrorDialog.vue
new file mode 100644
index 000000000..98e1aa328
--- /dev/null
+++ b/src/components/DigitalCredentials/dialogs/RevokeCredentialErrorDialog.vue
@@ -0,0 +1,67 @@
+<template>
+  <v-dialog
+    id="revoke-credential-error-dialog"
+    v-model="dialog"
+    width="45rem"
+    persistent
+    :attach="attach"
+    content-class="revoke-credential-error-dialog"
+  >
+    <v-card>
+      <v-card-title>Unable to Revoke Credential</v-card-title>
+
+      <v-card-text>
+        <p class="font-15">
+          We were unable to revoke your credential.
+        </p>
+
+        <template v-if="!isRoleStaff">
+          <p class="font-15">
+            If this error persists, please contact us.
+          </p>
+          <ContactInfo class="mt-5" />
+        </template>
+      </v-card-text>
+
+      <v-divider class="my-0" />
+
+      <v-card-actions>
+        <v-spacer />
+        <v-btn
+          id="dialog-close-button"
+          color="primary"
+          text
+          @click="close()"
+        >
+          Close
+        </v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Emit, Vue } from 'vue-property-decorator'
+import { Getter } from 'pinia-class'
+import { ContactInfo } from '@/components/common'
+import { useRootStore } from '@/stores'
+
+@Component({
+  components: { ContactInfo }
+})
+export default class RevokeCredentialErrorDialog extends Vue {
+  // Getter to check if logged in user is Staff.
+  @Getter(useRootStore) isRoleStaff!: boolean
+
+  /** Prop to display the dialog. */
+  @Prop({ default: false }) readonly dialog!: boolean
+
+  /** Prop to provide attachment selector. */
+  @Prop({ default: '' }) readonly attach!: string
+
+  // Pass click event to parent.
+  @Emit() close (): void {
+    return undefined
+  }
+}
+</script>
diff --git a/src/components/DigitalCredentials/enums/routes.ts b/src/components/DigitalCredentials/enums/routes.ts
new file mode 100644
index 000000000..6229a60d9
--- /dev/null
+++ b/src/components/DigitalCredentials/enums/routes.ts
@@ -0,0 +1,4 @@
+export enum Routes {
+  DIGITAL_CREDENTIALS = 'digital-credentials', // Root route for Digital Credentials
+  ISSUE_CREDENTIAL = 'issue'
+}
diff --git a/src/components/DigitalCredentials/index.ts b/src/components/DigitalCredentials/index.ts
index 820f90882..9b8bcad17 100644
--- a/src/components/DigitalCredentials/index.ts
+++ b/src/components/DigitalCredentials/index.ts
@@ -1,5 +1,8 @@
+export { default as CredentialsDashboard } from './CredentialsDashboard.vue'
+export { default as CredentialsDetailSteps } from './CredentialsDetailSteps.vue'
+export { default as CredentialsInfo } from './CredentialsInfo.vue'
 export { default as CredentialsLanding } from './CredentialsLanding.vue'
-export { default as DigitalWalletDownload } from './DigitalWalletDownload.vue'
-export { default as RegisterWallet } from './RegisterWallet.vue'
-export { default as IssueCredentials } from './IssueCredentials.vue'
-export { default as CredentialsFooter } from './CredentialsFooter.vue'
+export { default as CredentialsSimpleSteps } from './CredentialsSimpleSteps.vue'
+export { default as CredentialsStepper } from './CredentialsStepper.vue'
+export { default as CredentialsTable } from './CredentialsTable.vue'
+export { default as CredentialsWebSocket } from './CredentialsWebSocket.vue'
diff --git a/src/components/EntityInfo.vue b/src/components/EntityInfo.vue
index c06b792fd..33c2438e7 100644
--- a/src/components/EntityInfo.vue
+++ b/src/components/EntityInfo.vue
@@ -18,7 +18,7 @@
             :tempRegNumber="tempRegNumber"
           />
           <EntityMenu
-            v-if="!isInLocalFilingPage"
+            v-if="!(isInLocalFilingPage || isDCRoute)"
             class="mt-2 ml-n3"
             :businessId="businessId"
             @confirmDissolution="emitConfirmDissolution()"
@@ -49,7 +49,7 @@ import EntityDefinitions from './EntityInfo/EntityDefinitions.vue'
 import EntityHeader from './EntityInfo/EntityHeader.vue'
 import EntityMenu from './EntityInfo/EntityMenu.vue'
 import { useRootStore } from '@/stores'
-import { Routes } from '@/enums/routes'
+import { Routes, DCRoutes } from '@/enums/routes'
 
 @Component({
   components: {
@@ -73,7 +73,7 @@ export default class EntityInfo extends Vue {
   get isInLocalFilingPage (): boolean {
     return (
       this.$route?.name === Routes.AGM_EXTENSION ||
-      this.$route?.name === Routes.AGM_LOCATION_CHG ||
+      this.$route?.name === Routes.AGM_LOCATION_CHANGE ||
       this.$route?.name === Routes.ANNUAL_REPORT ||
       this.$route?.name === Routes.CONSENT_CONTINUATION_OUT ||
       this.$route?.name === Routes.CONTINUATION_OUT ||
@@ -83,6 +83,10 @@ export default class EntityInfo extends Vue {
     )
   }
 
+  get isDCRoute (): boolean {
+    return this.$route.matched.some(route => route.path.includes(DCRoutes.DIGITAL_CREDENTIALS))
+  }
+
   /** The Temporary Registration Number string (may be null). */
   get tempRegNumber (): string {
     return sessionStorage.getItem('TEMP_REG_NUMBER')
diff --git a/src/components/EntityInfo/EntityHeader.vue b/src/components/EntityInfo/EntityHeader.vue
index b1709e5f9..7e271eeaa 100644
--- a/src/components/EntityInfo/EntityHeader.vue
+++ b/src/components/EntityInfo/EntityHeader.vue
@@ -72,18 +72,18 @@
     <template v-if="!!tempRegNumber">
       <!-- Title -->
       <div
-        id="ia-reg-name"
-        aria-label="Incorporation Application or Registration Entity Name"
+        id="app-name"
+        aria-label="Application Name or Future Entity Name"
       >
         {{ getEntityName || 'Unknown Name' }}
       </div>
 
       <!-- Subtitle -->
       <div
-        id="ia-reg-description"
-        aria-label="Incorporation Application or Registration Description"
+        id="app-description"
+        aria-label="Amalgamation, Incorporation or Registration Description"
       >
-        {{ iaRegDescription }}
+        {{ appDescription }}
       </div>
     </template>
   </header>
@@ -95,6 +95,7 @@ import { Getter } from 'pinia-class'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { FilingNames } from '@/enums'
 import { useBusinessStore, useFilingHistoryListStore, useRootStore } from '@/stores'
+import { ApiFilingIF, ApiTaskIF } from '@/interfaces'
 
 @Component({})
 export default class EntityHeader extends Vue {
@@ -102,10 +103,14 @@ export default class EntityHeader extends Vue {
   @Prop({ required: true }) readonly tempRegNumber!: string // may be null
 
   @Getter(useBusinessStore) getEntityName!: string
+  @Getter(useFilingHistoryListStore) getFilings!: ApiFilingIF[]
   @Getter(useBusinessStore) getLegalType!: CorpTypeCd
   @Getter(useRootStore) getLimitedRestorationActiveUntil!: string
   @Getter(useRootStore) getReasonText!: string
+  @Getter(useRootStore) getTasks!: ApiTaskIF[]
   @Getter(useFilingHistoryListStore) isAuthorizedToContinueOut!: boolean
+  @Getter(useRootStore) isDraftAmalgamation!: boolean
+  @Getter(useRootStore) isFiledAmalgamation!: boolean
   @Getter(useBusinessStore) isHistorical!: boolean
   @Getter(useRootStore) isInLimitedRestoration!: boolean
   @Getter(useBusinessStore) isSoleProp!: boolean
@@ -120,8 +125,15 @@ export default class EntityHeader extends Vue {
     }
   }
 
-  /** The incorporation application or registration description. */
-  get iaRegDescription (): string {
+  /** The incorporation/registration/amalgamation application description. */
+  get appDescription (): string {
+    if (this.isDraftAmalgamation) {
+      return this.getTasks[0]?.task.filing.displayName
+    }
+    if (this.isFiledAmalgamation) {
+      return this.getFilings[0]?.displayName
+    }
+
     const filingName = [CorpTypeCd.SOLE_PROP, CorpTypeCd.PARTNERSHIP].includes(this.getLegalType)
       ? FilingNames.REGISTRATION
       : FilingNames.INCORPORATION_APPLICATION
@@ -136,7 +148,7 @@ export default class EntityHeader extends Vue {
 @import '@/assets/styles/theme.scss';
 
 #entity-legal-name,
-#ia-reg-name {
+#app-name {
   display: inline-block;
   color: $gray9;
   letter-spacing: -0.01rem;
@@ -148,7 +160,7 @@ export default class EntityHeader extends Vue {
 #business-description,
 #limited-restoration,
 #active-util,
-#ia-reg-description {
+#app-description {
   font-size: $px-14;
   color: $gray7;
 }
diff --git a/src/components/EntityInfo/EntityMenu.vue b/src/components/EntityInfo/EntityMenu.vue
index 9e70d9e1f..0ab4cc0c2 100644
--- a/src/components/EntityInfo/EntityMenu.vue
+++ b/src/components/EntityInfo/EntityMenu.vue
@@ -69,32 +69,8 @@
       </v-tooltip>
     </span>
 
-    <!-- View/Add Digital Credentials -->
-    <span v-if="isAllowed(AllowableActions.DIGITAL_CREDENTIALS)">
-      <v-tooltip
-        top
-        content-class="top-tooltip"
-        transition="fade-transition"
-      >
-        <template #activator="{ on }">
-          <v-btn
-            id="view-add-digital-credentials-button"
-            small
-            text
-            color="primary"
-            @click="emitViewAddDigitalCredentials()"
-            v-on="on"
-          >
-            <v-icon medium>mdi-file-certificate-outline</v-icon>
-            <span class="font-13 ml-1">Business Digital Credentials</span>
-          </v-btn>
-        </template>
-        Manage the digital credentials generated for the business.
-      </v-tooltip>
-    </span>
-
     <!-- More Actions -->
-    <span v-if="isBusiness && !isHistorical">
+    <span v-if="isBusiness && areMoreActionsAvailable">
       <v-menu
         v-model="expand"
         offset-y
@@ -122,89 +98,148 @@
 
         <v-list dense>
           <v-list-item-group color="primary">
-            <!-- Dissolve Business -->
-            <v-tooltip
-              right
-              content-class="right-tooltip"
-            >
-              <template #activator="{ on }">
-                <v-list-item
-                  id="dissolution-list-item"
-                  :disabled="!isAllowed(AllowableActions.VOLUNTARY_DISSOLUTION)"
-                  v-on="on"
-                  @click="promptDissolve()"
-                >
-                  <v-list-item-title>
-                    <span class="app-blue">Dissolve this Business</span>
-                  </v-list-item-title>
-                </v-list-item>
-              </template>
-              Dissolving the business will make this business historical
-              and it will be struck from the corporate registry.
-            </v-tooltip>
-
-            <!-- Consent to Continue Out -->
-            <v-tooltip
-              right
-              content-class="right-tooltip"
-            >
-              <template #activator="{ on }">
-                <v-list-item
-                  v-if="isBenBcCccUlc || isCoop"
-                  id="cco-list-item"
-                  :disabled="!isAllowed(AllowableActions.CONSENT_CONTINUATION_OUT)"
-                  v-on="on"
-                  @click="goToConsentContinuationOutFiling()"
-                >
-                  <v-list-item-title>
-                    <span class="app-blue">Consent to Continue Out</span>
-                  </v-list-item-title>
-                </v-list-item>
-              </template>
-              Submit a Consent to Continue Out of the province of B.C.
-            </v-tooltip>
-
-            <!-- Request AGM Extension -->
-            <v-tooltip
-              right
-              content-class="right-tooltip"
-            >
-              <template #activator="{ on }">
-                <v-list-item
-                  v-if="enableAgmExtension"
-                  id="agm-ext-list-item"
-                  :disabled="!isAllowed(AllowableActions.AGM_EXTENSION)"
-                  v-on="on"
-                  @click="goToAgmExtensionFiling()"
-                >
-                  <v-list-item-title>
-                    <span class="app-blue">Request AGM Extension</span>
-                  </v-list-item-title>
-                </v-list-item>
-              </template>
-              Request an AGM extension. The longest extension granted at one time is six months.
-            </v-tooltip>
-
-            <!-- Request AGM Location Change -->
-            <v-tooltip
-              right
-              content-class="right-tooltip"
-            >
-              <template #activator="{ on }">
-                <v-list-item
-                  v-if="enableAgmLocationChg"
-                  id="agm-loc-chg-list-item"
-                  :disabled="!isAllowed(AllowableActions.AGM_LOCATION_CHG)"
-                  v-on="on"
-                  @click="goToAgmLocationChgFiling()"
-                >
-                  <v-list-item-title>
-                    <span class="app-blue">Request AGM Location Change</span>
-                  </v-list-item-title>
-                </v-list-item>
-              </template>
-              Request an AGM location change.
-            </v-tooltip>
+            <!-- View/Add Digital Credentials -->
+            <span v-if="isAllowed(AllowableActions.DIGITAL_CREDENTIALS)">
+              <v-tooltip
+                right
+                content-class="right-tooltip"
+              >
+                <template #activator="{ on }">
+                  <v-list-item
+                    id="view-add-digital-credentials-button"
+                    @click="emitViewAddDigitalCredentials()"
+                    v-on="on"
+                  >
+                    <v-list-item-title>
+                      <span class="app-blue">Digital Business Cards</span>
+                    </v-list-item-title>
+                  </v-list-item>
+                </template>
+                Manage the digital cards generated for the business.
+              </v-tooltip>
+            </span>
+
+            <span v-if="!isHistorical">
+              <!-- Dissolve Business -->
+              <v-tooltip
+                right
+                content-class="right-tooltip"
+              >
+                <template #activator="{ on }">
+                  <v-list-item
+                    id="dissolution-list-item"
+                    :disabled="!isAllowed(AllowableActions.VOLUNTARY_DISSOLUTION)"
+                    v-on="on"
+                    @click="promptDissolve()"
+                  >
+                    <v-list-item-title>
+                      <span class="app-blue">Dissolve this Business</span>
+                    </v-list-item-title>
+                  </v-list-item>
+                </template>
+                Dissolving the business will make this business historical
+                and it will be struck from the corporate registry.
+              </v-tooltip>
+
+              <!-- Consent to Continue Out -->
+              <v-tooltip
+                right
+                content-class="right-tooltip"
+              >
+                <template #activator="{ on }">
+                  <v-list-item
+                    v-if="isBenBcCccUlc || isCoop"
+                    id="cco-list-item"
+                    :disabled="!isAllowed(AllowableActions.CONSENT_CONTINUATION_OUT)"
+                    v-on="on"
+                    @click="goToConsentContinuationOutFiling()"
+                  >
+                    <v-list-item-title>
+                      <span class="app-blue">Consent to Continue Out</span>
+                    </v-list-item-title>
+                  </v-list-item>
+                </template>
+                Submit a Consent to Continue Out of the province of B.C.
+              </v-tooltip>
+
+              <!-- Request AGM Extension -->
+              <v-tooltip
+                right
+                content-class="right-tooltip"
+              >
+                <template #activator="{ on }">
+                  <div
+                    v-if="enableAgmExtension"
+                    v-on="on"
+                  >
+                    <v-list-item
+                      id="agm-ext-list-item"
+                      :disabled="!isAllowed(AllowableActions.AGM_EXTENSION)"
+                      v-on="on"
+                      @click="goToAgmExtensionFiling()"
+                    >
+                      <v-list-item-title>
+                        <span class="app-blue">Request AGM Extension</span>
+                      </v-list-item-title>
+                    </v-list-item>
+                  </div>
+                </template>
+                <span>{{ agmExtensionToolTipText }}</span>
+              </v-tooltip>
+
+              <!-- Request AGM Location Change -->
+              <v-tooltip
+                right
+                content-class="right-tooltip"
+              >
+                <template #activator="{ on }">
+                  <div
+                    v-if="enableAgmLocationChg"
+                    v-on="on"
+                  >
+                    <v-list-item
+                      id="agm-loc-chg-list-item"
+                      :disabled="!isAllowed(AllowableActions.AGM_LOCATION_CHANGE)"
+                      v-on="on"
+                      @click="goToAgmLocationChgFiling()"
+                    >
+                      <v-list-item-title>
+                        <span class="app-blue">Request AGM Location Change</span>
+                      </v-list-item-title>
+                    </v-list-item>
+                  </div>
+                </template>
+                <span>{{ agmLocationChgToolTipText }}</span>
+              </v-tooltip>
+
+              <!-- Amalgamate -->
+              <v-tooltip
+                right
+                content-class="right-tooltip"
+              >
+                <template #activator="{ on }">
+                  <div
+                    v-if="enableAmalgamation"
+                    v-on="on"
+                  >
+                    <v-list-item
+                      id="amalgamate-list-item"
+                      small
+                      text
+                      color="primary"
+                      :disabled="!isAllowed(AllowableActions.AMALGAMATION)"
+                      @click="goToAmalgamationSelection()"
+                      v-on="on"
+                    >
+                      <v-list-item-title>
+                        <span class="app-blue">Amalgamate</span>
+                      </v-list-item-title>
+                    </v-list-item>
+                  </div>
+                </template>
+                <span>{{ amalgamateTooltipText }}</span>
+              </v-tooltip>
+            </span>
           </v-list-item-group>
         </v-list>
       </v-menu>
@@ -230,6 +265,7 @@ export default class EntityMenu extends Mixins(AllowableActionsMixin) {
 
   @Getter(useConfigurationStore) getEditUrl!: string
   @Getter(useBusinessStore) getIdentifier!: string
+  @Getter(useBusinessStore) isAdminFrozen!: boolean
   @Getter(useBusinessStore) isBenBcCccUlc!: boolean
   @Getter(useBusinessStore) isHistorical!: boolean
   @Getter(useRootStore) isPendingDissolution!: boolean
@@ -245,12 +281,51 @@ export default class EntityMenu extends Mixins(AllowableActionsMixin) {
     return !!this.businessId
   }
 
+  /**
+   * More actions should only display if an entity is not historical or if the Digital Credentials
+   * feature is available, otherwise an empty menu will display for historical entities. */
+  get areMoreActionsAvailable (): boolean {
+    return !this.isHistorical || this.isAllowed(AllowableActions.DIGITAL_CREDENTIALS)
+  }
+
   get enableAgmExtension (): boolean {
-    return !!GetFeatureFlag('enable-agm-extension')
+    return !!GetFeatureFlag('supported-agm-extension-entities').includes(this.getLegalType)
   }
 
   get enableAgmLocationChg (): boolean {
-    return !!GetFeatureFlag('enable-agm-location-chg')
+    return !!GetFeatureFlag('supported-agm-location-chg-entities').includes(this.getLegalType)
+  }
+
+  get enableAmalgamation (): boolean {
+    return !!GetFeatureFlag('supported-amalgamation-entities').includes(this.getLegalType)
+  }
+
+  /** The tooltip text for AGM Extension list item. Text is different if action item is disabled. */
+  get agmExtensionToolTipText (): string {
+    if (!this.isAllowed(AllowableActions.AGM_EXTENSION)) {
+      return 'The business must be in good standing to request an AGM extension.'
+    } else {
+      return 'Request an AGM extension. The longest extension granted at one time is six months.'
+    }
+  }
+
+  /** The tooltip text for AGM Location Change list item. Text is different if action item is disabled. */
+  get agmLocationChgToolTipText (): string {
+    if (!this.isAllowed(AllowableActions.AGM_LOCATION_CHANGE)) {
+      return 'The business must be in good standing to request an AGM location change.'
+    } else {
+      return 'Request an AGM location change.'
+    }
+  }
+
+  /** The tooltip text for the amalgamate button. Text changes depending on the business status. */
+  get amalgamateTooltipText (): string {
+    if (this.isAdminFrozen) {
+      return 'This business is frozen and cannot be involved in an amalgamation.'
+    } else if (this.isPendingDissolution) {
+      return 'This business has a future effective dissolution and cannot be involved in an amalgamation.'
+    }
+    return 'Amalgamate with other businesses.'
   }
 
   /**
@@ -282,6 +357,10 @@ export default class EntityMenu extends Mixins(AllowableActionsMixin) {
     this.emitConfirmDissolution()
   }
 
+  goToAmalgamationSelection (): void {
+    this.$router.push({ name: Routes.AMALGAMATION_SELECTION, params: { filingId: '0' } })
+  }
+
   goToConsentContinuationOutFiling (): void {
     // 0 means "new filing"
     this.$router.push({ name: Routes.CONSENT_CONTINUATION_OUT, params: { filingId: '0' } })
@@ -294,7 +373,7 @@ export default class EntityMenu extends Mixins(AllowableActionsMixin) {
 
   goToAgmLocationChgFiling (): void {
     // 0 means "new filing"
-    this.$router.push({ name: Routes.AGM_LOCATION_CHG, params: { filingId: '0' } })
+    this.$router.push({ name: Routes.AGM_LOCATION_CHANGE, params: { filingId: '0' } })
   }
 
   /** Emits an event to confirm dissolution. */
diff --git a/src/components/common/Certify.vue b/src/components/common/Certify.vue
index 7e6f04426..fb0c105bc 100644
--- a/src/components/common/Certify.vue
+++ b/src/components/common/Certify.vue
@@ -20,6 +20,7 @@
           filled
           persistent-hint
           label="Person's legal name"
+          :disabled="disableEdit"
           :value="certifiedBy"
           :rules="[ v => !!v || 'A person\'s legal name is required.']"
           @input="emitCertifiedBy($event)"
@@ -37,7 +38,7 @@
           </template>
         </v-checkbox>
         <p class="certify-clause signature-date">
-          <strong>Date:</strong> {{ getCurrentDate }}
+          <strong>Date:</strong> {{ formattedCurrentDate || '[unknown]' }}
         </p>
         <p class="certify-clause">
           {{ message }}
@@ -50,6 +51,7 @@
 <script lang="ts">
 import { Component, Emit, Prop, Vue, Watch } from 'vue-property-decorator'
 import { Getter } from 'pinia-class'
+import { DateUtilities } from '@/services'
 import { useRootStore } from '@/stores'
 
 @Component({})
@@ -77,8 +79,11 @@ export default class Certify extends Vue {
   /** Prompt the validations. Used for global validations. */
   @Prop({ default: false }) readonly validateForm!: boolean
 
-  certifyName = ''
+  /** Whether to disable the Certified By input field. */
+  @Prop({ default: false }) readonly disableEdit!: boolean
 
+  // local properties
+  certifyName = ''
   checkboxState = false
 
   /** Called when component is created. */
@@ -87,6 +92,11 @@ export default class Certify extends Vue {
     this.emitValid(!!this.trimmedCertifiedBy && this.isCertified)
   }
 
+  get formattedCurrentDate (): string {
+    const date = DateUtilities.yyyyMmDdToDate(this.getCurrentDate)
+    return DateUtilities.dateToPacificDate(date, true)
+  }
+
   /** The trimmed "Certified By" string (may be ''). */
   get trimmedCertifiedBy (): string {
     // remove repeated inline whitespace, and leading/trailing whitespace
@@ -168,4 +178,11 @@ export default class Certify extends Vue {
     margin-top: -1.25rem;
   }
 }
+
+// vertically align the ripple circle with the check box
+:deep() {
+  .v-input--selection-controls__ripple {
+    margin-top: -3px;
+  }
+}
 </style>
diff --git a/src/components/common/DateTooltip.vue b/src/components/common/DateTooltip.vue
index c91a124db..622c3cec1 100644
--- a/src/components/common/DateTooltip.vue
+++ b/src/components/common/DateTooltip.vue
@@ -9,10 +9,10 @@
         class="date-tooltip d-inline cursor-default"
         v-on="on"
       >
-        <span class="dotted-underline">{{ dateString }}</span>
+        <span class="dotted-underline">{{ dateString || '[unknown]' }}</span>
       </div>
     </template>
-    {{ dateTimeString }}
+    {{ dateTimeString || '[unknown]' }}
   </v-tooltip>
 </template>
 
@@ -25,11 +25,11 @@ export default class DateTooltip extends Vue {
   @Prop({ default: null }) readonly date!: Date
 
   get dateString (): string {
-    return (DateUtilities.dateToPacificDate(this.date) || '[unknown]')
+    return DateUtilities.dateToPacificDate(this.date)
   }
 
   get dateTimeString (): string {
-    return (DateUtilities.dateToPacificDateTime(this.date) || '[unknown]')
+    return DateUtilities.dateToPacificDateTime(this.date)
   }
 }
 </script>
diff --git a/src/components/common/DetailComment.vue b/src/components/common/DetailComment.vue
index 79e83d437..270d76904 100644
--- a/src/components/common/DetailComment.vue
+++ b/src/components/common/DetailComment.vue
@@ -32,20 +32,6 @@ export default class DetailComment extends Vue {
     textarea: any
   }
 
-  /** Array of validations rules for the textarea. */
-  get rules (): Array<(val) => boolean | string> {
-    // include whitespace in maximum length check
-    return [
-      val => (val && val.trim().length > 0) || 'Detail is required.',
-      val => (val && val.length <= this.maxLength) || 'Maximum characters exceeded.'
-    ]
-  }
-
-  /** Public method to reset Vuetify validation on textarea. */
-  resetValidation (): void {
-    (this.$refs.textarea as any).resetValidation()
-  }
-
   /** Comment (v-model) passed into this component (required). */
   @Prop({ default: '' }) readonly value!: string
 
@@ -61,8 +47,25 @@ export default class DetailComment extends Vue {
   /** Prompt the validations. Used for global validations. */
   @Prop({ default: false }) readonly validateForm!: boolean
 
+  /** Text is required error message. */
+  @Prop({ default: 'Detail is required.' }) readonly textRequiredErrorMsg!: string
+
   detailedComment = ''
 
+  /** Array of validations rules for the textarea. */
+  get rules (): Array<(val) => boolean | string> {
+    // include whitespace in maximum length check
+    return [
+      val => (val && val.trim().length > 0) || this.textRequiredErrorMsg,
+      val => (val && val.length <= this.maxLength) || 'Maximum characters exceeded.'
+    ]
+  }
+
+  /** Public method to reset Vuetify validation on textarea. */
+  resetValidation (): void {
+    (this.$refs.textarea as any).resetValidation()
+  }
+
   /** Called when component is created. */
   created (): void {
     // inform parent of initial validity
@@ -90,8 +93,9 @@ export default class DetailComment extends Vue {
 
   /** Emits an event with the changed comment (ie, updated v-model). */
   @Emit('input')
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  emitInput (val: string): void {}
+  emitInput (val: string): void {
+    this.detailedComment = val
+  }
 
   /** Emits an event indicating whether or not this component is valid. */
   @Emit('valid')
@@ -113,7 +117,6 @@ export default class DetailComment extends Vue {
   // Move the placeholder and input text from the edges.
   :deep() {
     .theme--light.v-input input, .theme--light.v-input textarea {
-      background-color: $gray1;
       padding-top: 0.5rem;
       padding-left: 0.5rem;
     }
diff --git a/src/components/common/ForeignJurisdiction.vue b/src/components/common/ForeignJurisdiction.vue
index 4e4928952..6f4a7adf2 100644
--- a/src/components/common/ForeignJurisdiction.vue
+++ b/src/components/common/ForeignJurisdiction.vue
@@ -80,7 +80,7 @@ export default class ForeignJurisdiction extends Mixins(CountriesProvincesMixin)
   }
 
   /** Get the respective regions of the country selected as an array of objects. */
-  get canadaUsaRegions (): Array<object> {
+  get canadaUsaRegions (): Array<any> {
     if (this.selectedCountryName === 'Canada') {
       let regions = this.getCountryRegions('CA')
       regions = regions.filter(province => province.short !== 'BC')
diff --git a/src/components/common/NameRequestInfo.vue b/src/components/common/NameRequestInfo.vue
index 7c3483d06..2e8be7daf 100644
--- a/src/components/common/NameRequestInfo.vue
+++ b/src/components/common/NameRequestInfo.vue
@@ -91,7 +91,7 @@ import { Component, Mixins, Prop } from 'vue-property-decorator'
 import { Getter } from 'pinia-class'
 import { getName } from 'country-list'
 import { capitalize, formatPhoneNumber } from '@/utils'
-import { NameRequestStates } from '@/enums'
+import { NameRequestStates, NameRequestTypes } from '@/enums'
 import { NameRequestIF, NameRequestApplicantIF } from '@/interfaces'
 import { DateMixin, EnumMixin, NameRequestMixin } from '@/mixins'
 import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
@@ -124,6 +124,9 @@ export default class NameRequestInfo extends Mixins(DateMixin, EnumMixin, NameRe
 
   /** The request type. */
   get requestType (): string {
+    if (this.nameRequest.request_action_cd === NameRequestTypes.AMALGAMATION) {
+      return 'Amalgamation'
+    }
     return 'New Business'
   }
 
@@ -167,11 +170,9 @@ export default class NameRequestInfo extends Mixins(DateMixin, EnumMixin, NameRe
   /** The applicant's name. */
   get applicantName (): string {
     let name: string
-    if (this.applicant?.middleName) {
-      name = `${this.applicant?.firstName} ${this.applicant?.middleName} ${this.applicant?.lastName}`
-    } else {
-      name = `${this.applicant?.firstName} ${this.applicant?.lastName}`
-    }
+    const firstName = this.applicant?.firstName ? this.applicant.firstName + ' ' : ''
+    const middleName = this.applicant?.middleName ? this.applicant.middleName + ' ' : ''
+    name = `${firstName}${middleName}${this.applicant?.lastName}`
     return name
   }
 
diff --git a/src/components/common/VcardTemplate.vue b/src/components/common/VcardTemplate.vue
new file mode 100644
index 000000000..ec165f180
--- /dev/null
+++ b/src/components/common/VcardTemplate.vue
@@ -0,0 +1,35 @@
+<template>
+  <v-card flat>
+    <section class="mt-0">
+      <header class="d-flex bg-color-blue rounded-t py-5 px-6">
+        <v-icon color="appDkBlue">
+          <slot name="icon" />
+        </v-icon>
+
+        <h2 class="font-16 font-weight-bold color-dk-text pl-2">
+          <slot name="title" />
+        </h2>
+      </header>
+
+      <div class="content">
+        <slot name="content" />
+      </div>
+    </section>
+  </v-card>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator'
+
+@Component({})
+export default class VcardTemplate extends Vue {}
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/styles/theme.scss";
+
+.v-icon {
+  // move icon up to line up vertically with the title
+  margin-top: -3px;
+}
+</style>
diff --git a/src/components/common/index.ts b/src/components/common/index.ts
index d6cbe2e14..b702225ef 100644
--- a/src/components/common/index.ts
+++ b/src/components/common/index.ts
@@ -13,6 +13,7 @@ import OfficeAddresses from './OfficeAddresses.vue'
 import Stepper from '@/components/common/Stepper.vue'
 import SummaryDirectors from './SummaryDirectors.vue'
 import SummaryOfficeAddresses from './SummaryOfficeAddresses.vue'
+import VcardTemplate from './VcardTemplate.vue'
 import WarningPopover from './WarningPopover.vue'
 
 // NB: importing/exporting Directors gives us weird errors,
@@ -34,5 +35,6 @@ export {
   Stepper,
   SummaryDirectors,
   SummaryOfficeAddresses,
+  VcardTemplate,
   WarningPopover
 }
diff --git a/src/components/dialogs/AddStaffNotationDialog.vue b/src/components/dialogs/AddStaffNotationDialog.vue
index 180ff47c3..0d94ae1d2 100644
--- a/src/components/dialogs/AddStaffNotationDialog.vue
+++ b/src/components/dialogs/AddStaffNotationDialog.vue
@@ -155,6 +155,7 @@ import { FormIF } from '@/interfaces'
 import { EffectOfOrderTypes, FilingSubTypes, FilingTypes, PageSizes } from '@/enums'
 import { EnumUtilities, LegalServices } from '@/services'
 import { useAuthenticationStore, useBusinessStore, useRootStore } from '@/stores'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 
 @Component({
   components: {
@@ -198,7 +199,7 @@ export default class AddStaffNotationDialog extends Mixins(DateMixin) {
   @Getter(useRootStore) getCurrentDate!: string
   @Getter(useBusinessStore) getFoundingDate!: Date
   @Getter(useBusinessStore) getLegalName!: string
-  @Getter(useBusinessStore) getLegalType!: string
+  @Getter(useBusinessStore) getLegalType!: CorpTypeCd
   @Getter(useBusinessStore) getIdentifier!: string
   @Getter(useAuthenticationStore) getKeycloakGuid!: string
   @Getter(useBusinessStore) isAdminFrozen!: boolean
diff --git a/src/components/dialogs/ConfirmDissolutionDialog.vue b/src/components/dialogs/ConfirmDissolutionDialog.vue
index ab88a18b4..7720e5bbe 100644
--- a/src/components/dialogs/ConfirmDissolutionDialog.vue
+++ b/src/components/dialogs/ConfirmDissolutionDialog.vue
@@ -83,11 +83,11 @@
 </template>
 
 <script lang="ts">
-
 import { Component, Prop, Emit, Vue } from 'vue-property-decorator'
 import { Getter } from 'pinia-class'
 import { DissolutionConfirmationResourceIF } from '@/interfaces'
 import { useBusinessStore, useRootStore } from '@/stores'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 
 @Component({})
 export default class ConfirmDissolutionDialog extends Vue {
@@ -100,7 +100,7 @@ export default class ConfirmDissolutionDialog extends Vue {
   // Global getters
   @Getter(useRootStore) getDissolutionConfirmationResource!: DissolutionConfirmationResourceIF
   @Getter(useBusinessStore) getLegalName!: string
-  @Getter(useBusinessStore) getLegalType!: string
+  @Getter(useBusinessStore) getLegalType!: CorpTypeCd
 
   /** The entity title to display. */
   get entityTitle (): string {
diff --git a/src/components/dialogs/NotEligibleExtensionDialog.vue b/src/components/dialogs/NotEligibleExtensionDialog.vue
new file mode 100644
index 000000000..3ce95b263
--- /dev/null
+++ b/src/components/dialogs/NotEligibleExtensionDialog.vue
@@ -0,0 +1,95 @@
+<template>
+  <v-dialog
+    v-model="dialog"
+    width="45rem"
+    persistent
+    :attach="attach"
+    content-class="not-eligible-extension-dialog"
+  >
+    <v-card class="pa-10">
+      <v-card-subtitle class="d-flex justify-space-between pa-0">
+        <p id="dialog-title">
+          Not Eligible for Extension
+        </p>
+        <v-btn
+          id="dialog-close-btn"
+          text
+          color="primary"
+          @click="okay()"
+        >
+          <v-icon>mdi-close</v-icon>
+        </v-btn>
+      </v-card-subtitle>
+
+      <v-card-text class="mx-n5">
+        <p>
+          Based on the information provided, this business is not eligible for an AGM extension.
+        </p>
+
+        <template v-if="!isRoleStaff">
+          <p>
+            If you have any questions about the review, please contact us at:
+          </p>
+          <ContactInfo class="mt-5" />
+        </template>
+      </v-card-text>
+
+      <v-card-actions class="d-flex justify-center pa-0">
+        <v-btn
+          id="dialog-ok-btn"
+          color="primary"
+          @click="okay()"
+        >
+          OK
+        </v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Emit, Vue } from 'vue-property-decorator'
+import { Getter } from 'pinia-class'
+import { ContactInfo } from '@/components/common'
+import { useRootStore } from '@/stores'
+
+@Component({
+  components: { ContactInfo }
+})
+export default class NotEligibleExtensionDialog extends Vue {
+  // Getter to check if logged in user is Staff.
+  @Getter(useRootStore) isRoleStaff!: boolean
+
+  /** Prop to display the dialog. */
+  @Prop({ default: false }) readonly dialog!: boolean
+
+  /** Prop to provide attachment selector. */
+  @Prop({ default: '' }) readonly attach!: string
+
+  // Pass click event to parent.
+  @Emit() okay () {}
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/styles/theme.scss';
+
+#dialog-title {
+  margin: 6px 0 0; // align vertically with close button
+  font-size: $px-24;
+  font-weight: bold;
+  color: $gray9;
+}
+
+.v-card__text {
+  font-weight: normal;
+  font-size: $px-16;
+  color: $gray7;
+  line-height: $px-24;
+}
+
+#dialog-ok-btn {
+  min-height: 40px;
+  min-width: 100px;
+}
+</style>
diff --git a/src/components/dialogs/TechnicalErrorDialog.vue b/src/components/dialogs/TechnicalErrorDialog.vue
new file mode 100644
index 000000000..75c91c60a
--- /dev/null
+++ b/src/components/dialogs/TechnicalErrorDialog.vue
@@ -0,0 +1,64 @@
+<template>
+  <v-dialog
+    v-model="dialog"
+    width="45rem"
+    persistent
+    :attach="attach"
+    content-class="technical-error-dialog"
+  >
+    <v-card>
+      <v-card-title>Error</v-card-title>
+
+      <v-card-text>
+        <p class="font-15">
+          We could not process your action due to a technical issue. Try again in a few minutes.
+        </p>
+
+        <template v-if="!isRoleStaff">
+          <p class="font-15">
+            If this error persists, please contact BC Registries staff:
+          </p>
+          <ContactInfo class="mt-5" />
+        </template>
+      </v-card-text>
+
+      <v-divider class="my-0" />
+
+      <v-card-actions>
+        <v-spacer />
+        <v-btn
+          id="dialog-close-button"
+          color="primary"
+          text
+          @click="close()"
+        >
+          Close
+        </v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Emit, Vue } from 'vue-property-decorator'
+import { Getter } from 'pinia-class'
+import { ContactInfo } from '@/components/common'
+import { useRootStore } from '@/stores'
+
+@Component({
+  components: { ContactInfo }
+})
+export default class TechnicalErrorDialog extends Vue {
+  // Getter to check if logged in user is Staff.
+  @Getter(useRootStore) isRoleStaff!: boolean
+
+  /** Prop to display the dialog. */
+  @Prop({ default: false }) readonly dialog!: boolean
+
+  /** Prop to provide attachment selector. */
+  @Prop({ default: '' }) readonly attach!: string
+
+  // Pass click event to parent.
+  @Emit() close () {}
+}
+</script>
diff --git a/src/components/dialogs/index.ts b/src/components/dialogs/index.ts
index b7c38efab..7155bade8 100644
--- a/src/components/dialogs/index.ts
+++ b/src/components/dialogs/index.ts
@@ -13,11 +13,13 @@ import FileCorrectionDialog from './FileCorrectionDialog.vue'
 import LoadCorrectionDialog from './LoadCorrectionDialog.vue'
 import NameRequestAuthErrorDialog from './NameRequestAuthErrorDialog.vue'
 import NameRequestInvalidDialog from './NameRequestInvalidDialog.vue'
+import NotEligibleExtensionDialog from './NotEligibleExtensionDialog.vue'
 import NotInGoodStandingDialog from '@/components/dialogs/NotInGoodStandingDialog.vue'
 import PaymentErrorDialog from './PaymentErrorDialog.vue'
 import ResumeErrorDialog from './ResumeErrorDialog.vue'
 import SaveErrorDialog from './SaveErrorDialog.vue'
 import StaffPaymentDialog from './StaffPaymentDialog.vue'
+import TechnicalErrorDialog from './TechnicalErrorDialog.vue'
 
 export {
   AddCommentDialog,
@@ -35,9 +37,11 @@ export {
   LoadCorrectionDialog,
   NameRequestAuthErrorDialog,
   NameRequestInvalidDialog,
+  NotEligibleExtensionDialog,
   NotInGoodStandingDialog,
   PaymentErrorDialog,
   ResumeErrorDialog,
   SaveErrorDialog,
-  StaffPaymentDialog
+  StaffPaymentDialog,
+  TechnicalErrorDialog
 }
diff --git a/src/enums/allowableActions.ts b/src/enums/allowableActions.ts
index 2e6524255..1422cb805 100644
--- a/src/enums/allowableActions.ts
+++ b/src/enums/allowableActions.ts
@@ -3,7 +3,8 @@ export enum AllowableActions {
   ADDRESS_CHANGE = 1, // skip 0 which is falsy
   ADMINISTRATIVE_DISSOLUTION,
   AGM_EXTENSION,
-  AGM_LOCATION_CHG,
+  AGM_LOCATION_CHANGE,
+  AMALGAMATION,
   ANNUAL_REPORT,
   BUSINESS_INFORMATION,
   BUSINESS_SUMMARY,
diff --git a/src/enums/amalgamationEnums.ts b/src/enums/amalgamationEnums.ts
new file mode 100644
index 000000000..28573900a
--- /dev/null
+++ b/src/enums/amalgamationEnums.ts
@@ -0,0 +1,9 @@
+export enum AmlRoles {
+  AMALGAMATING = 'amalgamating',
+  HOLDING = 'holding'
+}
+
+export enum AmlTypes {
+  LEAR = 'lear',
+  FOREIGN = 'foreign'
+}
diff --git a/src/enums/entityStatus.ts b/src/enums/entityStatus.ts
index d4ac99eb7..d06f0fa2c 100644
--- a/src/enums/entityStatus.ts
+++ b/src/enums/entityStatus.ts
@@ -1,5 +1,9 @@
 /** Statuses used before business exists. */
 export enum EntityStatus {
-  DRAFT_APP = 'DRAFT_APP',
-  FILED_APP = 'FILED_APP',
+  DRAFT_AMALGAMATION = 'DRAFT_AMALGAMATION',
+  DRAFT_INCORP_APP = 'DRAFT_INCORP_APP',
+  DRAFT_REGISTRATION = 'DRAFT_REGISTRATION',
+  FILED_AMALGAMATION = 'FILED_AMALGAMATION',
+  FILED_INCORP_APP = 'FILED_INCORP_APP',
+  FILED_REGISTRATION = 'FILED_REGISTRATION',
 }
diff --git a/src/enums/filingSubTypes.ts b/src/enums/filingSubTypes.ts
index 4904bef5f..afb380d72 100644
--- a/src/enums/filingSubTypes.ts
+++ b/src/enums/filingSubTypes.ts
@@ -1,16 +1,21 @@
+import { AmalgamationTypes, RestorationTypes } from '@bcrs-shared-components/enums'
+
 /** Filing sub-types used by Legal API. */
 // FUTURE: move these to shared enum and import that instead
 export enum FilingSubTypes {
   ADMIN_FREEZE = 'adminFreeze',
   ADMIN_UNFREEZE = 'adminUnfreeze',
+  AMALGAMATION_REGULAR = AmalgamationTypes.REGULAR,
+  AMALGAMATION_HORIZONTAL = AmalgamationTypes.HORIZONTAL,
+  AMALGAMATION_VERTICAL = AmalgamationTypes.VERTICAL,
   COURT_ORDERED_LIQUIDATION = 'courtOrderedLiquidation',
   DISSOLUTION_ADMINISTRATIVE = 'administrative',
   DISSOLUTION_INVOLUNTARY = 'involuntary',
   DISSOLUTION_VOLUNTARY = 'voluntary',
-  FULL_RESTORATION = 'fullRestoration',
-  LIMITED_RESTORATION = 'limitedRestoration',
-  LIMITED_RESTORATION_EXTENSION = 'limitedRestorationExtension',
-  LIMITED_RESTORATION_TO_FULL = 'limitedRestorationToFull',
+  FULL_RESTORATION = RestorationTypes.FULL,
+  LIMITED_RESTORATION = RestorationTypes.LIMITED,
+  LIMITED_RESTORATION_EXTENSION = RestorationTypes.LTD_EXTEND,
+  LIMITED_RESTORATION_TO_FULL = RestorationTypes.LTD_TO_FULL,
   VOLUNTARY_LIQUIDATION = 'voluntaryLiquidation',
 
   // FUTURE: add these dissolution names as needed
diff --git a/src/enums/index.ts b/src/enums/index.ts
index 30d8d60ae..f08167277 100644
--- a/src/enums/index.ts
+++ b/src/enums/index.ts
@@ -1,5 +1,6 @@
 export * from './actions'
 export * from './allowableActions'
+export * from './amalgamationEnums'
 export * from './applicationTypes'
 export * from './correctionTypes'
 export * from './effectOfOrderTypes'
@@ -21,4 +22,5 @@ export * from './affiliationInvitation'
 
 // external enums
 export { CorpTypeCd, CorpClass } from '@bcrs-shared-components/corp-type-module'
-export { AccountTypes, FilingCodes, FilingNames, FilingTypes, StaffPaymentOptions } from '@bcrs-shared-components/enums'
+export { AccountTypes, AmalgamationTypes, FilingCodes, FilingNames, FilingTypes, StaffPaymentOptions }
+  from '@bcrs-shared-components/enums'
diff --git a/src/enums/nameRequestTypes.ts b/src/enums/nameRequestTypes.ts
index 8fda1cfc4..914a94105 100644
--- a/src/enums/nameRequestTypes.ts
+++ b/src/enums/nameRequestTypes.ts
@@ -1,5 +1,6 @@
 /** Enum to help map name request type codes */
 export enum NameRequestTypes {
+  AMALGAMATION = 'AML',
   NEW = 'NEW',
   CHANGE_OF_NAME = 'CHG',
   CONVERSION = 'CNV'
diff --git a/src/enums/routes.ts b/src/enums/routes.ts
index a8fb2e440..c6342c038 100644
--- a/src/enums/routes.ts
+++ b/src/enums/routes.ts
@@ -1,6 +1,9 @@
-export enum Routes {
+import { Routes as DCRoutes } from '@/components/DigitalCredentials/enums/routes'
+
+export enum CoreRoutes {
   AGM_EXTENSION = 'agm-extension',
-  AGM_LOCATION_CHG = 'agm-location-chg',
+  AGM_LOCATION_CHANGE = 'agm-location-chg',
+  AMALGAMATION_SELECTION = 'amalgamation-selection',
   ANNUAL_REPORT = 'annual-report',
   CONSENT_CONTINUATION_OUT = 'consent-continuation-out',
   CONTINUATION_OUT = 'continuation-out',
@@ -10,10 +13,13 @@ export enum Routes {
   STANDALONE_DIRECTORS = 'standalone-directors',
   SIGNIN = 'signin',
   SIGNOUT = 'signout',
+}
+
+export { DCRoutes }
 
-  // Digital Credential Routes for Pilot
-  DIGITAL_CREDENTIALS = 'digital-credentials',
-  DOWNLOAD_WALLET = 'download-wallet',
-  REGISTER_WALLET = 'register-wallet',
-  ISSUE_CREDENTIALS = 'issue-credentials'
+// Combined routes
+export type Routes = CoreRoutes | DCRoutes
+export const Routes = {
+  ...CoreRoutes,
+  ...DCRoutes
 }
diff --git a/src/interfaces/agm-ext-eval-interface.ts b/src/interfaces/agm-ext-eval-interface.ts
new file mode 100644
index 000000000..be4d700c0
--- /dev/null
+++ b/src/interfaces/agm-ext-eval-interface.ts
@@ -0,0 +1,35 @@
+/** Object that stores AGM Extension evaluation fields. */
+export interface AgmExtEvalIF {
+  currentDate: string // YYYY-MM-DD
+  alreadyExtended: boolean
+  requestExpired: boolean
+  isGoodStanding: boolean
+  incorporationDate: Date
+  isFirstAgm: boolean
+  agmYear: string // YYYY
+  prevAgmDate: string // YYYY-MM-DD
+  isPrevExtension: boolean
+  prevExpiryDate: string // YYYY-MM-DD
+  intendedAgmDate: string // YYYY-MM-DD
+  extensionDuration: number // in months
+  agmDueDate: string // YYYY-MM-DD
+  isEligible: boolean
+}
+
+/** An empty AGM Extension Evaluation object. Note: don't assign this - make a copy instead. */
+export const EmptyAgmExtEval: AgmExtEvalIF = {
+  currentDate: null,
+  alreadyExtended: null,
+  requestExpired: null,
+  isGoodStanding: null,
+  incorporationDate: null,
+  isFirstAgm: null,
+  agmYear: null,
+  prevAgmDate: null,
+  isPrevExtension: null,
+  prevExpiryDate: null,
+  intendedAgmDate: null,
+  extensionDuration: NaN,
+  agmDueDate: null,
+  isEligible: null
+}
diff --git a/src/interfaces/amalgamation-interfaces.ts b/src/interfaces/amalgamation-interfaces.ts
new file mode 100644
index 000000000..5e1e75543
--- /dev/null
+++ b/src/interfaces/amalgamation-interfaces.ts
@@ -0,0 +1,67 @@
+import { AmalgamationTypes, CorpTypeCd, FilingTypes } from '@/enums'
+import { CorrectNameOptions } from '@bcrs-shared-components/enums'
+import { CompletingPartyIF, ContactPointIF, CourtOrderIF,
+  NameTranslationIF, ShareClassIF } from '@bcrs-shared-components/interfaces'
+import { OfficeAddressIF } from './address-interfaces'
+
+/**
+ * A filing's amalgamation application object from the API. See:
+ * https://github.com/bcgov/business-schemas/blob/main/src/registry_schemas/schemas/amalgamation_application.json
+ */
+export interface RegisteredRecordsAddressesIF {
+  registeredOffice: OfficeAddressIF
+  recordsOffice?: OfficeAddressIF
+}
+
+export interface NameRequestFilingIF {
+  legalType: CorpTypeCd
+  legalName?: string
+  nrNumber?: string
+  correctNameOption?: CorrectNameOptions
+}
+
+export interface AmalgamationApplicationIF {
+  amalgamatingBusinesses: any[]
+  courtApproval: boolean
+  type: AmalgamationTypes
+  nameRequest: NameRequestFilingIF
+  nameTranslations: NameTranslationIF[]
+  offices: RegisteredRecordsAddressesIF | object
+  contactPoint: ContactPointIF
+  parties: CompletingPartyIF[]
+
+  // BEN / CC / BC / ULC only:
+  shareStructure?: {
+    shareClasses: ShareClassIF[]
+  }
+  incorporationAgreement?: {
+    agreementType: string
+  }
+  // ULC only:
+  courtOrder?: CourtOrderIF
+}
+
+/** Amalgamation Application filing interface. */
+export interface AmalgamationApplicationFilingIF {
+  header: {
+    name: FilingTypes
+    certifiedBy: string
+    date: string
+    effectiveDate?: string
+    filingId?: number
+    folioNumber?: string
+    isFutureEffective: boolean
+
+    // staff payment properties:
+    routingSlipNumber?: string
+    bcolAccountNumber?: string
+    datNumber?: string
+    waiveFees?: boolean
+    priority?: boolean
+  }
+  business: {
+    legalType: CorpTypeCd
+    identifier: string
+  }
+  amalgamationApplication: AmalgamationApplicationIF
+}
diff --git a/src/interfaces/api-filing-interface.ts b/src/interfaces/api-filing-interface.ts
index 287af11fd..22833c1f5 100644
--- a/src/interfaces/api-filing-interface.ts
+++ b/src/interfaces/api-filing-interface.ts
@@ -1,10 +1,12 @@
-import { CorpTypeCd, EffectOfOrderTypes, FilingStatus, FilingSubTypes, FilingTypes } from '@/enums'
+import { AmalgamationTypes, CorpTypeCd, EffectOfOrderTypes, FilingStatus, FilingSubTypes, FilingTypes }
+  from '@/enums'
 import { ApiDateTimeUtc, CommentIF, DocumentIF, FormattedDateTimeGmt, IsoDatePacific, SpecialResolutionIF }
   from '@/interfaces'
 
 /**
- * A filing object from the Legal API ("filings" call).
- * See also History Item interface.
+ * A filing object from the Legal API ("filings" call). This is the newer response with extra metadata
+ * instead of separate business / documents / header / filing objects.
+ * This object is also what the Filings History List uses directly.
  */
 export interface ApiFilingIF {
   availableOnPaperOnly: boolean
@@ -12,6 +14,7 @@ export interface ApiFilingIF {
   commentsCount: number
   commentsLink: string // URL to fetch this filing's comments
   displayName: string
+  displayLedger: boolean // whether to display this ledger item
   documentsLink: string // URL to fetch this filing's documents
   effectiveDate: FormattedDateTimeGmt
   filingId: number
@@ -41,12 +44,34 @@ export interface ApiFilingIF {
       freeze: boolean
     }
 
+    agmExtension?: {
+      year: string // YYYY-MM-DD
+      isFirstAgm: boolean
+      prevAgmRefDate: string // YYYY-MM-DD
+      extReqForAgmYear: boolean
+      expireDateCurrExt: string // YYYY-MM-DD
+      intendedAgmDate: string // YYYY-MM-DD
+      totalApprovedExt: number // in months
+      extensionDuration: number // in months
+      expireDateApprovedExt: string // YYYY-MM-DD
+    }
+
+    agmLocationChange?: {
+      year: string
+      reason: string
+      agmLocation: string
+    }
+
     // alteration filings only
     alteration?: {
       fromLegalType?: CorpTypeCd
       toLegalType?: CorpTypeCd
     }
 
+    amalgamationApplication?: {
+      type: AmalgamationTypes
+    }
+
     // AR filings only
     annualReport?: {
       annualGeneralMeetingDate: IsoDatePacific
diff --git a/src/interfaces/api-task-interface.ts b/src/interfaces/api-task-interface.ts
index c40cd7559..48393c108 100644
--- a/src/interfaces/api-task-interface.ts
+++ b/src/interfaces/api-task-interface.ts
@@ -1,7 +1,12 @@
-import { AlterationIF, ApiBusinessIF, RestorationIF, SpecialResolutionIF } from '@/interfaces'
+import { AlterationIF, AmalgamationApplicationIF,
+  ApiBusinessIF, RestorationIF, SpecialResolutionIF } from '@/interfaces'
 import { FilingStatus, FilingTypes } from '@/enums'
 
-/** A filing's header object from the Legal API. */
+/**
+ * The header object from the Legal API when the filing contains separate business /
+ * documents / header / filing objects. This is the older response from the "filings"
+ * call but is still used for fetching draft apps or tasks.
+ */
 export interface ApiHeaderIF {
   accountId?: number // NOT USED
   ARFilingYear?: number // ARs only
@@ -32,11 +37,14 @@ export interface ApiHeaderIF {
 }
 
 /**
- * A task todo (or filing) object.
+ * The object for a draft application (or registration or amalgamation) filing or todo task.
  * Note that only `business` and `header` are required.
  */
 export interface TaskTodoIF {
+  agmExtension?: any
+  agmLocationChange?: any
   alteration?: AlterationIF
+  amalgamationApplication?: AmalgamationApplicationIF
   annualReport?: any
   business: ApiBusinessIF
   changeOfAddress?: any
@@ -47,6 +55,7 @@ export interface TaskTodoIF {
   conversion?: any
   correction?: any
   courtOrder?: any
+  displayName?: string // for app tasks only
   dissolution?: any
   documents?: Array<any>
   header: ApiHeaderIF
@@ -59,8 +68,8 @@ export interface TaskTodoIF {
 }
 
 /**
- * A task object from the Legal API ("tasks" call).
- * See also Todo Item interface.
+ * A task object from the Legal API ("tasks" call), which contains a draft filing or a todo item.
+ * See also TodoItemIF.
  */
 export interface ApiTaskIF {
   enabled: boolean
diff --git a/src/interfaces/authentication-state-interface.ts b/src/interfaces/authentication-state-interface.ts
new file mode 100644
index 000000000..3ebaedaa5
--- /dev/null
+++ b/src/interfaces/authentication-state-interface.ts
@@ -0,0 +1,14 @@
+import { CurrentUserIF, CurrentAccountIF } from '@/interfaces'
+
+/** The state model interface for the Authentication Store. */
+export interface AuthenticationStateIF {
+  account: {
+    currentUser: CurrentUserIF
+    currentAccount: CurrentAccountIF
+  },
+  auth: {
+    token: string
+    idToken: string
+    refreshToken: string
+  }
+}
diff --git a/src/interfaces/business-interfaces.ts b/src/interfaces/business-state-interfaces.ts
similarity index 83%
rename from src/interfaces/business-interfaces.ts
rename to src/interfaces/business-state-interfaces.ts
index 93c16c1df..9632379b9 100644
--- a/src/interfaces/business-interfaces.ts
+++ b/src/interfaces/business-state-interfaces.ts
@@ -1,4 +1,5 @@
 import { EntityState, CorpTypeCd, FilingSubTypes, FilingTypes } from '@/enums'
+import { AmalgamationTypes } from '@bcrs-shared-components/enums'
 import { IsoDatePacific, ApiDateTimeUtc } from '@bcrs-shared-components/interfaces'
 
 export interface FilingTypeIF {
@@ -9,6 +10,7 @@ export interface FilingTypeIF {
 }
 
 export interface AllowedActionsIF {
+  digitalBusinessCard: boolean
   filing: {
     filingSubmissionLink: string
     filingTypes: Array<FilingTypeIF>
@@ -24,11 +26,19 @@ export interface AlternateNameIF {
   operatingName: string
 }
 
+export interface AmalgamatedIntoIF {
+  amalgamationDate: ApiDateTimeUtc
+  amalgamationType: AmalgamationTypes
+  identifier: string // eg, BC7654321
+  legalName: string
+}
+
 export interface BusinessWarningIF {
   code: string // FUTURE: use an enum
   filing?: string // not used
   message: string
   warningType: string // FUTURE: use an enum
+  data?: any // optional extra properties (eg, amalgamationDate)
 }
 
 /** The Business object from the Legal API. */
@@ -37,6 +47,7 @@ export interface ApiBusinessIF {
   adminFreeze: boolean
   allowedActions: AllowedActionsIF
   alternateNames?: Array<AlternateNameIF>
+  amalgamatedInto?: AmalgamatedIntoIF
   arMaxDate?: IsoDatePacific // not used
   arMinDate?: IsoDatePacific // not used
   associationType: string // COOP only
@@ -69,7 +80,7 @@ export interface ApiBusinessIF {
   warnings: Array<BusinessWarningIF>
 }
 
-/** The Business module state interface. */
+/** The state model interface for the Business Store. */
 export interface BusinessStateIF {
   businessInfo: ApiBusinessIF
 }
diff --git a/src/interfaces/configuration-state-interface.ts b/src/interfaces/configuration-state-interface.ts
index b88be3a8f..b4fa4dbda 100644
--- a/src/interfaces/configuration-state-interface.ts
+++ b/src/interfaces/configuration-state-interface.ts
@@ -1,4 +1,4 @@
-/** The Configuration module state interface. */
+/** The state model interface for the Configuration Store. */
 export interface ConfigurationStateIF {
   configuration: {
     VUE_APP_ADDRESS_COMPLETE_KEY: string,
diff --git a/src/interfaces/digitalCredentials-interface.ts b/src/interfaces/digitalCredentials-interface.ts
index 9283853b8..f85879b4a 100644
--- a/src/interfaces/digitalCredentials-interface.ts
+++ b/src/interfaces/digitalCredentials-interface.ts
@@ -1,9 +1,19 @@
 import { DigitalCredentialTypes } from '@/enums'
 
-export interface DigitalCredentialsIF {
+export interface DigitalCredentialIF {
   legalName: string
   credentialType: DigitalCredentialTypes
+  credentialId: string
   isIssued: boolean
   dateOfIssue: string
   isRevoked: boolean
+  isDeleted: boolean
+}
+
+export interface WalletConnectionIF {
+  businessId: string
+  connectionId: string
+  invitationUrl: string
+  isActive: boolean
+  connectionState: string
 }
diff --git a/src/interfaces/filing-history-list-state-interface.ts b/src/interfaces/filing-history-list-state-interface.ts
index dd689609e..89257d60b 100644
--- a/src/interfaces/filing-history-list-state-interface.ts
+++ b/src/interfaces/filing-history-list-state-interface.ts
@@ -1,6 +1,6 @@
 import { ApiFilingIF } from '@/interfaces'
 
-/** The Filing History List module state interface. */
+/** The state model interface for the Filing History List Store. */
 export interface FilingHistoryListStateIF {
   addCommentDialog: boolean
   currentFiling: ApiFilingIF
diff --git a/src/interfaces/index.ts b/src/interfaces/index.ts
index 97056e614..9aa99c595 100644
--- a/src/interfaces/index.ts
+++ b/src/interfaces/index.ts
@@ -11,15 +11,17 @@ export type { AlterationIF, ContactPointIF, NameTranslationIF, ShareStructureIF,
   IncorporationApplicationIF, IncorporationAddressIf, ShareClassIF, CommentIF, ConfirmDialogType, StaffPaymentIF,
   ApiDateTimeUtc, FormattedDateTimeGmt, IsoDatePacific, SpecialResolutionIF }
 
-// must come before other interfaces that use it
-export * from './officer-interface'
+export * from './officer-interface' // must come before other interfaces that use it
 export * from './address-interfaces'
 export * from './affiliation-invitation-interface'
+export * from './agm-ext-eval-interface'
 export * from './alert-message-interface'
+export * from './amalgamation-interfaces'
 export * from './api-filing-interface'
 export * from './api-task-interface'
+export * from './authentication-state-interface'
 export * from './breadcrumb-interface'
-export * from './business-interfaces'
+export * from './business-state-interfaces'
 export * from './component-interface'
 export * from './configuration-state-interface'
 export * from './correction-filing-interface'
@@ -44,7 +46,6 @@ export * from './presigned-url-interface'
 export * from './restoration-interfaces'
 export * from './role-interface'
 export * from './root-state-interface'
-export * from './state-interface'
 export * from './steps-interface'
 export * from './table-header-interface'
 export * from './todo-item-interface'
diff --git a/src/interfaces/root-state-interface.ts b/src/interfaces/root-state-interface.ts
index 3f9ca863f..d2096bba8 100644
--- a/src/interfaces/root-state-interface.ts
+++ b/src/interfaces/root-state-interface.ts
@@ -1,14 +1,49 @@
-import { CurrentUserIF, CurrentAccountIF } from '@/interfaces'
+import { CorpTypeCd, EntityStatus } from '@/enums'
+import { ApiHeaderIF, ApiTaskIF, FilingDataIF, OfficeAddressIF, PartyIF } from '@/interfaces'
 
-/** The ROOT state model interface. */
+/** Interface for the state filing object. */
+export interface StateFilingIF {
+  business: any
+  consentContinuationOut?: any
+  header: ApiHeaderIF
+  dissolution?: any
+  restoration?: any
+  putBackOn?: any
+}
+
+/** The state model interface for the Root Store. */
 export interface RootStateIF {
-  account: {
-    currentUser: CurrentUserIF,
-    currentAccount: CurrentAccountIF
-  },
-  auth: {
-    token: string,
-    idToken: string,
-    refreshToken: string
-  }
+  // tombstone data
+  authRoles: Array<string>
+  currentDate: string // 'today' as YYYY-MM-DD in Pacific timezone
+  currentJsDate: Date // 'now' as of dashboard loading in UTC
+  entityStatus: EntityStatus // for amalgamations/applications/registrations only
+  keycloakRoles: Array<string>
+  stateFiling: StateFilingIF
+  userKeycloakGuid: string
+
+  // entity info from auth db
+  businessEmail: string
+  businessPhone: string
+  businessPhoneExtension: string
+  corpTypeCd: CorpTypeCd
+
+  // set by Todo List
+  ARFilingYear: number // YYYY
+  arMaxDate: string // YYYY-MM-DD // COOPs only
+  arMinDate: string // YYYY-MM-DD // COOPs only
+  nextARDate: string // YYYY-MM-DD // BCOMPs only
+
+  // other global data
+  businessAddress: OfficeAddressIF
+  configObject: any
+  fetchingDataSpinner: boolean
+  startingAmalgamationSpinner: boolean
+  filingData: Array<FilingDataIF>
+  nameRequest: any
+  parties: Array<PartyIF>
+  recordsAddress: OfficeAddressIF
+  registeredAddress: OfficeAddressIF
+  tasks: Array<ApiTaskIF> // "tasks" data from API
+  userInfo: any // from auth db
 }
diff --git a/src/interfaces/state-interface.ts b/src/interfaces/state-interface.ts
deleted file mode 100644
index 1a6efce89..000000000
--- a/src/interfaces/state-interface.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { CorpTypeCd, EntityStatus, FilingStatus } from '@/enums'
-import { ApiHeaderIF, ApiTaskIF, FilingDataIF, OfficeAddressIF, PartyIF } from '@/interfaces'
-
-export interface StateFilingIF {
-  business: any
-  consentContinuationOut?: any
-  header: ApiHeaderIF
-  dissolution?: any
-  restoration?: any
-  putBackOn?: any
-}
-
-/** The state model interface. */
-export interface StateIF {
-  // tombstone data
-  authRoles: Array<string>
-  currentDate: string // 'today' as YYYY-MM-DD in Pacific timezone
-  currentJsDate: Date // 'now' as of dashboard loading in UTC
-  entityStatus: EntityStatus // for draft app only
-  keycloakRoles: Array<string>
-  stateFiling: StateFilingIF // the state filing object
-  userKeycloakGuid: string
-
-  // entity info from auth db
-  businessEmail: string
-  businessPhone: string
-  businessPhoneExtension: string
-  corpTypeCd: CorpTypeCd
-
-  // set by Todo List
-  ARFilingYear: number // YYYY
-  arMaxDate: string // YYYY-MM-DD // COOPs only
-  arMinDate: string // YYYY-MM-DD // COOPs only
-  nextARDate: string // YYYY-MM-DD // BCOMPs only
-
-  // other global data
-  businessAddress: OfficeAddressIF
-  configObject: any
-  currentFilingStatus: FilingStatus
-  fetchingDataSpinner: boolean
-  filingData: Array<FilingDataIF>
-  nameRequest: any
-  parties: Array<PartyIF>
-  recordsAddress: OfficeAddressIF
-  registeredAddress: OfficeAddressIF
-  tasks: Array<ApiTaskIF> // "tasks" data from API
-}
diff --git a/src/interfaces/steps-interface.ts b/src/interfaces/steps-interface.ts
index 78f64ec69..a9e781db6 100644
--- a/src/interfaces/steps-interface.ts
+++ b/src/interfaces/steps-interface.ts
@@ -4,5 +4,6 @@ export interface StepsIF {
   icon: string
   text: string
   to: string,
+  disabled?: boolean,
   component: any // Work around: Do components have types?
 }
diff --git a/src/interfaces/todo-item-interface.ts b/src/interfaces/todo-item-interface.ts
index 42a9acd58..edf7897c2 100644
--- a/src/interfaces/todo-item-interface.ts
+++ b/src/interfaces/todo-item-interface.ts
@@ -3,7 +3,7 @@ import { PaymentErrorIF } from '@/interfaces'
 
 /**
  * A Todo List item (ie, local object).
- * See also Api Task interface.
+ * See also ApiTaskIF.
  */
 export interface TodoItemIF {
   draftTitle: string
diff --git a/src/main.ts b/src/main.ts
index 9becacb00..51333ac44 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -123,16 +123,11 @@ async function start () {
 
 // execution and error handling
 start().catch(error => {
-  // log any error after configuring sentry.
-  // it helps to identify configuration issues specific to the environment.
-  // note that it won't log anything related to `fetchConfig()` since sentry is depending on a config value.
+  // Log any error after configuring sentry.
+  // It helps to identify configuration issues specific to the environment.
+  // Note that it won't log anything related to `fetchConfig()` since sentry is depending on a config value.
   Sentry.captureException(error)
-  console.log(error) // eslint-disable-line no-console
-  // bypass alert if this specific error
-  if (!error?.message?.startsWith('Missing or invalid')) {
-    alert('There was an error starting this page. (See console for details.)\n' +
-      'Please try again later.')
-  }
+  alert(error)
   // try to navigate to Business Registry home page
   navigate(sessionStorage.getItem('BUSINESSES_URL'))
 })
diff --git a/src/mixins/allowable-actions-mixin.ts b/src/mixins/allowable-actions-mixin.ts
index ed14ac147..2262e9f75 100644
--- a/src/mixins/allowable-actions-mixin.ts
+++ b/src/mixins/allowable-actions-mixin.ts
@@ -1,7 +1,7 @@
 import { Component, Vue } from 'vue-property-decorator'
 import { Getter } from 'pinia-class'
 import { GetFeatureFlag } from '@/utils'
-import { AllowableActions, CorpTypeCd, FilingSubTypes, FilingTypes, Routes } from '@/enums'
+import { AllowableActions, CorpTypeCd, FilingSubTypes, FilingTypes } from '@/enums'
 import { AllowedActionsIF } from '@/interfaces'
 import { useBusinessStore, useRootStore } from '@/stores'
 
@@ -9,9 +9,9 @@ import { useBusinessStore, useRootStore } from '@/stores'
 export default class AllowableActionsMixin extends Vue {
   @Getter(useBusinessStore) getAllowedActions!: AllowedActionsIF
   @Getter(useBusinessStore) getLegalType!: CorpTypeCd
-  @Getter(useBusinessStore) isBComp!: boolean
   @Getter(useBusinessStore) isCoop!: boolean
   @Getter(useBusinessStore) isFirm!: boolean
+  @Getter(useBusinessStore) isSoleProp!: boolean
   @Getter(useBusinessStore) isGoodStanding!: boolean
   @Getter(useRootStore) isRoleStaff!: boolean
 
@@ -40,13 +40,15 @@ export default class AllowableActionsMixin extends Vue {
       }
 
       case AllowableActions.AGM_EXTENSION: {
-        return true // *** FOR DEBUGGING ONLY
-        // return this.isAllowedFiling(FilingTypes.AGM_EXTENSION)
+        return this.isAllowedFiling(FilingTypes.AGM_EXTENSION)
       }
 
-      case AllowableActions.AGM_LOCATION_CHG: {
-        return true // *** FOR DEBUGGING ONLY
-        // return this.isAllowedFiling(FilingTypes.AGM_LOCATION_CHG)
+      case AllowableActions.AGM_LOCATION_CHANGE: {
+        return this.isAllowedFiling(FilingTypes.AGM_LOCATION_CHANGE)
+      }
+
+      case AllowableActions.AMALGAMATION: {
+        return this.isAllowedFiling(FilingTypes.AMALGAMATION_APPLICATION)
       }
 
       case AllowableActions.BUSINESS_INFORMATION: {
@@ -91,11 +93,15 @@ export default class AllowableActionsMixin extends Vue {
         return (isBusiness && this.isRoleStaff)
       }
 
+      /**
+       * DBC feature is only available to self-registered owners of an SP
+       * who are logged in via BCSC.
+       */
       case AllowableActions.DIGITAL_CREDENTIALS: {
         // NB: this feature is targeted via LaunchDarkly
         const ff = !!GetFeatureFlag('enable-digital-credentials')
-        const isNotaDcRoute = !(this.$route.matched.some(route => route.name === Routes.DIGITAL_CREDENTIALS))
-        return (ff && isNotaDcRoute && this.isGoodStanding && this.isBComp && !this.isRoleStaff)
+        const isDigitalBusinessCardAllowed = this.getAllowedActions?.digitalBusinessCard
+        return (ff && isDigitalBusinessCardAllowed)
       }
 
       case AllowableActions.DIRECTOR_CHANGE: {
@@ -111,11 +117,13 @@ export default class AllowableActionsMixin extends Vue {
       }
 
       case AllowableActions.LIMITED_RESTORATION_EXTENSION: {
-        return this.isAllowedFiling(FilingTypes.RESTORATION, FilingSubTypes.LIMITED_RESTORATION_EXTENSION)
+        return !!GetFeatureFlag('supported-restoration-entities')?.includes(this.getLegalType) &&
+        this.isAllowedFiling(FilingTypes.RESTORATION, FilingSubTypes.LIMITED_RESTORATION_EXTENSION)
       }
 
       case AllowableActions.LIMITED_RESTORATION_TO_FULL: {
-        return this.isAllowedFiling(FilingTypes.RESTORATION, FilingSubTypes.LIMITED_RESTORATION_TO_FULL)
+        return !!GetFeatureFlag('supported-restoration-entities')?.includes(this.getLegalType) &&
+        this.isAllowedFiling(FilingTypes.RESTORATION, FilingSubTypes.LIMITED_RESTORATION_TO_FULL)
       }
 
       case AllowableActions.PUT_BACK_ON: {
@@ -137,9 +145,11 @@ export default class AllowableActionsMixin extends Vue {
       case AllowableActions.RESTORATION: {
         // full restoration or limited restoration
         // but not limited restoration extension or limited restoration to full
+        const ff = !!GetFeatureFlag('supported-restoration-entities')?.includes(this.getLegalType)
         return (
-          this.isAllowedFiling(FilingTypes.RESTORATION, FilingSubTypes.FULL_RESTORATION) ||
-          this.isAllowedFiling(FilingTypes.RESTORATION, FilingSubTypes.LIMITED_RESTORATION)
+          ff &&
+          (this.isAllowedFiling(FilingTypes.RESTORATION, FilingSubTypes.FULL_RESTORATION) ||
+          this.isAllowedFiling(FilingTypes.RESTORATION, FilingSubTypes.LIMITED_RESTORATION))
         )
       }
 
diff --git a/src/mixins/date-mixin.ts b/src/mixins/date-mixin.ts
index d13875480..33f077e7c 100644
--- a/src/mixins/date-mixin.ts
+++ b/src/mixins/date-mixin.ts
@@ -93,6 +93,16 @@ export default class DateMixin extends Vue {
     return DateUtilities.dateToPacificDateTime(date)
   }
 
+  /**
+   * Converts a date string (YYYY-MM-DD) to a date string (Month Day, Year) in Pacific timezone.
+   * @param longMonth whether to show long month name (eg, December vs Dec)
+   * @param showWeekday whether to show the weekday name (eg, Thursday)
+   * @example "2021-01-01" -> "Thursday, December 31, 2020"
+   */
+  yyyyMmDdToPacificDate (dateStr: IsoDatePacific, longMonth = false, showWeekday = false): string {
+    return DateUtilities.dateToPacificDate(this.yyyyMmDdToDate(dateStr), longMonth, showWeekday)
+  }
+
   /**
    * DEPRECATED - call resources/date-utilities instead
    * Converts a Date object to an API datetime string.
@@ -201,6 +211,6 @@ export default class DateMixin extends Vue {
    * @returns NaN in case of error
    */
   daysFromToday (date: Date): number {
-    return DateUtilities.daysFromToday(this.getCurrentJsDate, date)
+    return DateUtilities.daysBetweenTwoDates(this.getCurrentJsDate, date)
   }
 }
diff --git a/src/mixins/enum-mixin.ts b/src/mixins/enum-mixin.ts
index cc6674317..5f098ebed 100644
--- a/src/mixins/enum-mixin.ts
+++ b/src/mixins/enum-mixin.ts
@@ -45,6 +45,11 @@ export default class EnumMixin extends Vue {
     return (item.name === FilingTypes.ALTERATION)
   }
 
+  /** DEPRECATED Returns True if filing is an Amalgamation. */
+  isTypeAmalgamation (item: any): boolean {
+    return (item.name === FilingTypes.AMALGAMATION_APPLICATION)
+  }
+
   /** DEPRECATED Returns True if filing is an Annual Report. */
   isTypeAnnualReport (item: any): boolean {
     return (item.name === FilingTypes.ANNUAL_REPORT)
@@ -65,6 +70,11 @@ export default class EnumMixin extends Vue {
     return (item.name === FilingTypes.CORRECTION)
   }
 
+  /** DEPRECATED Returns True if filing is a Dissolution. */
+  isTypeDissolution (item: any): boolean {
+    return (item.name === FilingTypes.DISSOLUTION)
+  }
+
   /** DEPRECATED Returns True if filing is an Incorporation Application. */
   isTypeIncorporationApplication (item: any): boolean {
     return (item.name === FilingTypes.INCORPORATION_APPLICATION)
diff --git a/src/mixins/name-request-mixin.ts b/src/mixins/name-request-mixin.ts
index fe673c511..0ca99d0e9 100644
--- a/src/mixins/name-request-mixin.ts
+++ b/src/mixins/name-request-mixin.ts
@@ -18,7 +18,10 @@ export default class NameRequestMixin extends Vue {
     if (!nr.legalType) return 'Invalid NR legal type'
     if (!this.getNrApprovedName(nr)) return 'Invalid NR approved name'
     if (!nr.nrNum) return 'Invalid NR number'
-    if (nr.request_action_cd !== NameRequestTypes.NEW) return 'Invalid NR action code'
+    if (
+      nr.request_action_cd !== NameRequestTypes.NEW &&
+      nr.request_action_cd !== NameRequestTypes.AMALGAMATION
+    ) return 'Invalid NR action code'
     if (!nr.state) return 'Invalid NR state'
     return null
   }
diff --git a/src/resources/DigitalCredentialRoutes.ts b/src/resources/DigitalCredentialRoutes.ts
index 4de61e26e..757debd83 100644
--- a/src/resources/DigitalCredentialRoutes.ts
+++ b/src/resources/DigitalCredentialRoutes.ts
@@ -1,55 +1,36 @@
 import { Routes } from '@/enums'
 import DigitalCredentials from '@/views/DigitalCredentials.vue'
 import { getDigitalCredentialBreadcrumb } from '@/resources/BreadcrumbResources'
-import { DigitalWalletDownload, IssueCredentials, RegisterWallet } from '@/components/DigitalCredentials'
+import { CredentialsDashboard, CredentialsStepper } from '@/components/DigitalCredentials'
 
 export const DigitalCredentialRoutes = {
   path: `/${Routes.DIGITAL_CREDENTIALS}`,
-  name: Routes.DIGITAL_CREDENTIALS,
   component: DigitalCredentials,
   meta: {
     requiresAuth: true,
-    breadcrumb: [ getDigitalCredentialBreadcrumb() ]
+    breadcrumb: [getDigitalCredentialBreadcrumb()]
   },
   children: [
     {
-      name: Routes.DOWNLOAD_WALLET,
-      path: Routes.DOWNLOAD_WALLET,
-      component: DigitalWalletDownload,
+      path: '',
+      name: Routes.DIGITAL_CREDENTIALS,
+      component: CredentialsDashboard,
       meta: {
         breadcrumb: [
-          getDigitalCredentialBreadcrumb(),
-          {
-            text: 'Download Wallet',
-            to: { name: Routes.DOWNLOAD_WALLET }
-          }
-        ]
-      }
-    },
-    {
-      name: Routes.REGISTER_WALLET,
-      path: Routes.REGISTER_WALLET,
-      component: RegisterWallet,
-      meta: {
-        breadcrumb: [
-          getDigitalCredentialBreadcrumb(),
-          {
-            text: 'Register Wallet',
-            to: { name: Routes.REGISTER_WALLET }
-          }
+          getDigitalCredentialBreadcrumb()
         ]
       }
     },
     {
-      name: Routes.ISSUE_CREDENTIALS,
-      path: Routes.ISSUE_CREDENTIALS,
-      component: IssueCredentials,
+      path: Routes.ISSUE_CREDENTIAL,
+      name: Routes.ISSUE_CREDENTIAL,
+      component: CredentialsStepper,
       meta: {
         breadcrumb: [
           getDigitalCredentialBreadcrumb(),
           {
             text: 'Issue Credentials',
-            to: { name: Routes.ISSUE_CREDENTIALS }
+            to: { name: Routes.ISSUE_CREDENTIAL }
           }
         ]
       }
diff --git a/src/resources/business-config.ts b/src/resources/business-config.ts
index a7e84d6fc..583443257 100644
--- a/src/resources/business-config.ts
+++ b/src/resources/business-config.ts
@@ -64,7 +64,7 @@ export const ConfigJson = [
           ' A person who commits this offence is subject to a maximum fine of $5,000.'
       },
       {
-        feeCode: FilingCodes.AGM_LOCATION_CHG,
+        feeCode: FilingCodes.AGM_LOCATION_CHANGE,
         displayName: 'AGM Location Change',
         certifyText: 'Note: It is an offence to make or assist in making a false or' +
           ' misleading statement in a record filed under the Business Corporations Act.' +
@@ -356,7 +356,7 @@ export const ConfigJson = [
           ' A person who commits this offence is subject to a maximum fine of $5,000.'
       },
       {
-        feeCode: FilingCodes.AGM_LOCATION_CHG,
+        feeCode: FilingCodes.AGM_LOCATION_CHANGE,
         displayName: 'AGM Location Change',
         certifyText: 'Note: It is an offence to make or assist in making a false or' +
           ' misleading statement in a record filed under the Business Corporations Act.' +
@@ -449,7 +449,7 @@ export const ConfigJson = [
           ' A person who commits this offence is subject to a maximum fine of $5,000.'
       },
       {
-        feeCode: FilingCodes.AGM_LOCATION_CHG,
+        feeCode: FilingCodes.AGM_LOCATION_CHANGE,
         displayName: 'AGM Location Change',
         certifyText: 'Note: It is an offence to make or assist in making a false or' +
           ' misleading statement in a record filed under the Business Corporations Act.' +
@@ -542,7 +542,7 @@ export const ConfigJson = [
           ' A person who commits this offence is subject to a maximum fine of $5,000.'
       },
       {
-        feeCode: FilingCodes.AGM_LOCATION_CHG,
+        feeCode: FilingCodes.AGM_LOCATION_CHANGE,
         displayName: 'AGM Location Change',
         certifyText: 'Note: It is an offence to make or assist in making a false or' +
           ' misleading statement in a record filed under the Business Corporations Act.' +
diff --git a/src/router.ts b/src/router.ts
index 2b292071d..a358c7f16 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import VueRouter, { Route } from 'vue-router'
 import routes from '@/routes'
-import { Routes } from '@/enums'
+import { Routes, DCRoutes } from '@/enums'
 import { SessionStorageKeys } from 'sbc-common-components/src/util/constants'
 import { GetFeatureFlag } from '@/utils'
 
@@ -56,7 +56,7 @@ export function getVueRouter () {
     // See DIGITAL_CREDENTIALS in Allowable Actions Mixin.
     return (
       !GetFeatureFlag('enable-digital-credentials') &&
-      [Routes.DIGITAL_CREDENTIALS].includes(route.name as Routes)
+      [Routes.DIGITAL_CREDENTIALS].includes(route.name as DCRoutes)
     )
   }
 
diff --git a/src/routes.ts b/src/routes.ts
index 66c6d3a32..b79dfa886 100644
--- a/src/routes.ts
+++ b/src/routes.ts
@@ -1,6 +1,7 @@
 import Dashboard from '@/views/Dashboard.vue'
 import AgmExtension from '@/views/AgmExtension.vue'
 import AgmLocationChg from '@/views/AgmLocationChg.vue'
+import AmalgamationSelection from '@/views/AmalgamationSelection.vue'
 import AnnualReport from '@/views/AnnualReport.vue'
 import StandaloneDirectorsFiling from '@/views/StandaloneDirectorsFiling.vue'
 import StandaloneOfficeAddressFiling from '@/views/StandaloneOfficeAddressFiling.vue'
@@ -39,16 +40,32 @@ export default [
   },
   {
     path: '/agm-location-chg',
-    name: Routes.AGM_LOCATION_CHG,
+    name: Routes.AGM_LOCATION_CHANGE,
     component: AgmLocationChg,
     meta: {
       requiresAuth: true,
       breadcrumb: [
         {
-          text: `File ${FilingNames.AGM_LOCATION_CHG}`,
+          text: `File ${FilingNames.AGM_LOCATION_CHANGE}`,
           disabled: false,
           exact: true,
-          to: { name: Routes.AGM_LOCATION_CHG }
+          to: { name: Routes.AGM_LOCATION_CHANGE }
+        }
+      ]
+    }
+  },
+  {
+    path: '/amalgamation-selection',
+    name: Routes.AMALGAMATION_SELECTION,
+    component: AmalgamationSelection,
+    meta: {
+      requiresAuth: true,
+      breadcrumb: [
+        {
+          text: 'Amalgamation Selection',
+          disabled: false,
+          exact: true,
+          to: { name: Routes.AMALGAMATION_SELECTION }
         }
       ]
     }
diff --git a/src/services/auth-services.ts b/src/services/auth-services.ts
index bc76a6e8b..3dc1647d0 100644
--- a/src/services/auth-services.ts
+++ b/src/services/auth-services.ts
@@ -19,11 +19,18 @@ export default class AuthServices {
 
   /**
    * Fetches user info for the current user.
-   * @returns the axios response
+   * @returns the user info object
    */
-  static async fetchUserInfo (authApiUrl: string): Promise<AxiosResponse> {
+  static async fetchUserInfo (authApiUrl: string): Promise<any> {
     const url = `${authApiUrl}users/@me`
     return axios.get(url)
+      .then(response => {
+        const data = response?.data
+        if (!data) {
+          console.log('fetchUserInfo() error - invalid response =', response)
+        }
+        return data
+      })
   }
 
   /**
diff --git a/src/services/date-utilities.ts b/src/services/date-utilities.ts
index d2952afed..4d7714dee 100644
--- a/src/services/date-utilities.ts
+++ b/src/services/date-utilities.ts
@@ -329,25 +329,26 @@ export default class DateUtilities {
   }
 
   /**
-   * Returns the number of days that 'date' is from today in Pacific timezone.
+   * Returns the number of days that 'date' is from 'initialDate' in Pacific timezone.
    * @returns -1 for yesterday
    * @returns 0 for today
    * @returns +1 for tomorrow
    * @returns NaN in case of error
    */
-  static daysFromToday (today: Date, date: Date): number {
+  static daysBetweenTwoDates (initialDate: Date, date: Date): number {
     // safety check
+    if (!isDate(initialDate) || isNaN(initialDate.getTime())) return NaN
     if (!isDate(date) || isNaN(date.getTime())) return NaN
 
     // set "date" to 12:00 am Pacific
     date.setHours(0, 0, 0, 0)
 
-    // compute "today" at 12:00 am Pacific
-    today.setHours(0, 0, 0, 0)
+    // compute "initialDate" at 12:00 am Pacific
+    initialDate.setHours(0, 0, 0, 0)
 
-    // calculate difference between "date" and "today"
+    // calculate difference between "date" and "initialDate"
     // (result should be a whole number)
-    const diff = (date.valueOf() - today.valueOf()) / MS_IN_A_DAY
+    const diff = (date.valueOf() - initialDate.valueOf()) / MS_IN_A_DAY
     return Math.round(diff)
   }
 
@@ -360,4 +361,45 @@ export default class DateUtilities {
   static isDateFuture (date: FormattedDateTimeGmt): boolean {
     return (new Date(date) > new Date())
   }
+
+  /**
+   * Add a number of months to a date and return "YYYY-MM-DD".
+   * Date must be in the format of "YYYY-MM-DD" and months is a number
+   * @example (3, 2023-02-03) -> "2023-05-03"
+   * @example (18, 2023-02-03) -> "2024-08-03"
+   */
+  static addMonthsToDate (month: number, date: string): string {
+    // safety checks
+    if (month == null || !date) return null
+    if (date?.length !== 10) return null
+
+    const temp = this.yyyyMmDdToDate(date)
+    temp.setMonth(temp.getMonth() + month)
+    const dateAfterAddition = this.dateToYyyyMmDd(temp)
+    return dateAfterAddition
+  }
+
+  /**
+   * Decrease one date from another and return number of months as the difference.
+   * Dates must be in the "YYYY-MM-DD" format
+   * @example (2023-02-03, 2024-08-03) -> 18
+   * @example (2023-02-03, 2023-04-03) -> 2
+   */
+  static subtractDates (dateFrom: string, dateTo: string): number {
+    // safety checks
+    if (!dateFrom || !dateTo) return null
+    if (dateFrom?.length !== 10) return null
+    if (dateTo?.length !== 10) return null
+
+    const expiryDate = this.yyyyMmDdToDate(dateTo)
+    const currDate = this.yyyyMmDdToDate(dateFrom)
+    const monthDiff = expiryDate.getMonth() - currDate.getMonth()
+    const yearDiff = (12 * (expiryDate.getFullYear() - currDate.getFullYear()))
+    let difference = monthDiff + yearDiff
+    // For example if Jan 31st and March 1, difference is 1 not 2
+    if ((expiryDate.getDate() + 25) < currDate.getDate()) {
+      difference--
+    }
+    return difference
+  }
 }
diff --git a/src/services/enum-utilities.ts b/src/services/enum-utilities.ts
index 85b00c242..8972c61c4 100644
--- a/src/services/enum-utilities.ts
+++ b/src/services/enum-utilities.ts
@@ -67,6 +67,16 @@ export default class EnumUtilities {
   // Filing Type helpers
   //
 
+  /** Returns True if filing is an AGM Extension. */
+  static isTypeAgmExtension (item: any): boolean {
+    return (item.name === FilingTypes.AGM_EXTENSION)
+  }
+
+  /** Returns True if filing is an AGM Location Change. */
+  static isTypeAgmLocationChange (item: any): boolean {
+    return (item.name === FilingTypes.AGM_LOCATION_CHANGE)
+  }
+
   /** Returns True if filing is an Alteration. */
   static isTypeAlteration (item: any): boolean {
     return (item.name === FilingTypes.ALTERATION)
@@ -117,6 +127,46 @@ export default class EnumUtilities {
     return (item.name === FilingTypes.CORRECTION)
   }
 
+  /** Returns True if filing is a Dissolution. */
+  static isTypeDissolution (item: any): boolean {
+    return (item.name === FilingTypes.DISSOLUTION)
+  }
+
+  /** Returns True if filing is an Amalgamation. */
+  static isTypeAmalgamation (item: any): boolean {
+    return (item.name === FilingTypes.AMALGAMATION_APPLICATION)
+  }
+
+  /** Returns True if filing is a Regular Amalgamation. */
+  static isTypeAmalgamationRegular (item: any): boolean {
+    return (
+      // the property in a todo item or filing item:
+      item.filingSubType === FilingSubTypes.AMALGAMATION_REGULAR ||
+      // the property in a state filing:
+      item.amalgamationApplication?.type === FilingSubTypes.AMALGAMATION_REGULAR
+    )
+  }
+
+  /** Returns True if filing is a Horizontal Amalgamation. */
+  static isTypeAmalgamationHorizontal (item: any): boolean {
+    return (
+      // the property in a todo item or filing item:
+      item.filingSubType === FilingSubTypes.AMALGAMATION_HORIZONTAL ||
+      // the property in a state filing:
+      item.amalgamationApplication?.type === FilingSubTypes.AMALGAMATION_HORIZONTAL
+    )
+  }
+
+  /** Returns True if filing is a Vertical Amalgamation. */
+  static isTypeAmalgamationVertical (item: any): boolean {
+    return (
+      // the property in a todo item or filing item:
+      item.filingSubType === FilingSubTypes.AMALGAMATION_VERTICAL ||
+      // the property in a state filing:
+      item.amalgamationApplication?.type === FilingSubTypes.AMALGAMATION_VERTICAL
+    )
+  }
+
   /** Returns True if filing is an Incorporation Application. */
   static isTypeIncorporationApplication (item: any): boolean {
     return (item.name === FilingTypes.INCORPORATION_APPLICATION)
@@ -299,7 +349,20 @@ export default class EnumUtilities {
       case FilingTypes.ADMIN_FREEZE:
         // FUTURE: add freeze/unfreeze checks here
         return FilingNames.ADMIN_FREEZE
+      case FilingTypes.AGM_EXTENSION: return FilingNames.AGM_EXTENSION
+      case FilingTypes.AGM_LOCATION_CHANGE: return FilingNames.AGM_LOCATION_CHANGE
       case FilingTypes.ALTERATION: return FilingNames.ALTERATION
+      case FilingTypes.AMALGAMATION_APPLICATION:
+        if (subType === FilingSubTypes.AMALGAMATION_HORIZONTAL) {
+          return `${FilingNames.AMALGAMATION_APPLICATION} - Horizontal`
+        }
+        if (subType === FilingSubTypes.AMALGAMATION_REGULAR) {
+          return `${FilingNames.AMALGAMATION_APPLICATION} - Regular`
+        }
+        if (subType === FilingSubTypes.AMALGAMATION_VERTICAL) {
+          return `${FilingNames.AMALGAMATION_APPLICATION} - Vertical`
+        }
+        return FilingNames.AMALGAMATION_APPLICATION
       case FilingTypes.ANNUAL_REPORT: return FilingNames.ANNUAL_REPORT + (agmYear ? ` (${agmYear})` : '')
       case FilingTypes.CHANGE_OF_ADDRESS: return FilingNames.CHANGE_OF_ADDRESS
       case FilingTypes.CHANGE_OF_COMPANY_INFO: return FilingNames.CHANGE_OF_COMPANY_INFO
@@ -322,7 +385,7 @@ export default class EnumUtilities {
         if (subType === FilingSubTypes.LIMITED_RESTORATION_EXTENSION) return FilingNames.RESTORATION_EXTENSION
         if (subType === FilingSubTypes.FULL_RESTORATION) return FilingNames.RESTORATION_FULL
         if (subType === FilingSubTypes.LIMITED_RESTORATION) return FilingNames.RESTORATION_LIMITED
-        return FilingNames.UNKNOWN
+        return FilingNames.RESTORATION_APPLICATION
       case FilingTypes.SPECIAL_RESOLUTION: return FilingNames.SPECIAL_RESOLUTION
       case FilingTypes.TRANSITION: return FilingNames.TRANSITION_APPLICATION
       case FilingTypes.PUT_BACK_ON: return FilingNames.PUT_BACK_ON
@@ -332,13 +395,15 @@ export default class EnumUtilities {
   }
 
   /**
-   * Converts a string in "camelCase" (or "PascalCase") to separate, title-case words,
+   * Converts a string in "camelCase" (or "PascalCase") to a string of separate, title-case words,
    * suitable for a title or proper name.
    * @param s the string to convert
    * @returns the converted string
    */
   static camelCaseToWords (s: string): string {
-    return s?.split(/(?=[A-Z])/).join(' ').replace(/^\w/, c => c.toUpperCase()) || ''
+    const words = s?.split(/(?=[A-Z])/).join(' ').replace(/^\w/, c => c.toUpperCase()) || ''
+    // SPECIAL CASE: convert 'Agm' to uppercase
+    return words.replace('Agm', 'AGM')
   }
 
   /**
diff --git a/src/services/legal-services.ts b/src/services/legal-services.ts
index f18396e61..1bb29ef4b 100644
--- a/src/services/legal-services.ts
+++ b/src/services/legal-services.ts
@@ -1,9 +1,10 @@
 // Libraries
 import axios from '@/axios-auth'
 import { AxiosResponse } from 'axios'
-import { ApiBusinessIF, ApiFilingIF, CommentIF, DocumentIF, FetchDocumentsIF, NameRequestIF,
-  PresignedUrlIF } from '@/interfaces'
+import { ApiBusinessIF, ApiFilingIF, CommentIF, DocumentIF, FetchDocumentsIF, PresignedUrlIF }
+  from '@/interfaces'
 import { DigitalCredentialTypes, FilingStatus, Roles } from '@/enums'
+import { StatusCodes } from 'http-status-codes'
 
 /**
  * Class that provides integration with the Legal API.
@@ -81,11 +82,11 @@ export default class LegalServices {
   }
 
   /**
-   * Fetches the draft Application filing.
+   * Fetches the draft IA / Registration / Amalgamation filing.
    * This is a unique request using the temp reg number.
    * This assumes a single filing is returned.
    * @param tempRegNumber the temporary registration number
-   * @returns the draft app response
+   * @returns the draft app response (a single filing)
    */
   static async fetchDraftApp (tempRegNumber: string): Promise<any> {
     const url = `businesses/${tempRegNumber}/filings`
@@ -95,15 +96,33 @@ export default class LegalServices {
   }
 
   /**
-   * Fetches a Name Request.
-   * @param filingId the NR number
-   * @returns the name request object
+   * Fetches name request data.
+   * @param nrNumber the name request number (eg, NR 1234567) to fetch
+   * @param phone the name request phone (eg, 12321232)
+   * @param email the name request email (eg, nr@example.com)
+   * @returns a promise to return the NR data, or null if not found
    */
-  static async fetchNameRequest (nrNumber: string): Promise<NameRequestIF> {
-    const url = `nameRequests/${nrNumber}`
+  static async fetchNameRequest (nrNumber: string, phone = '', email = ''): Promise<any> {
+    const url = `nameRequests/${nrNumber}/validate?phone=${phone}&email=${email}`
+
     return axios.get(url)
-      // workaround because data is at "response.data.data"
-      .then(response => response?.data)
+      .then(response => {
+        if (response?.data) {
+          return response.data
+        }
+        // eslint-disable-next-line no-console
+        console.log('fetchNameRequest() error - invalid response =', response)
+        throw new Error('Invalid API response')
+      }).catch(error => {
+        if (error?.response?.status === StatusCodes.NOT_FOUND) {
+          return null // NR not found (not an error)
+        } else if (error?.response?.status === StatusCodes.BAD_REQUEST) {
+          throw new Error('Sent invalid email or phone number.') // Sent invalid email or phone
+        } else if (error?.response?.status === StatusCodes.FORBIDDEN) {
+          throw new Error('Not sent email or phone number.') // Not sent the email or phone
+        }
+        throw error
+      })
   }
 
   /**
@@ -136,6 +155,7 @@ export default class LegalServices {
     if (isDraft) {
       url += '?draft=true'
     }
+
     return axios.post(url, { filing })
       .then(response => {
         const filing = response?.data?.filing
@@ -148,6 +168,26 @@ export default class LegalServices {
       })
   }
 
+  /**
+   * Creates (posts) a draft business record, which is used to bootstrap a new business.
+   * @param businessRequest the object body of the request
+   * @returns the filing object associated with the temporary business
+   */
+  static async createDraftBusiness (businessRequest: any): Promise<any> {
+    const url = `businesses?draft=true`
+
+    return axios.post(url, businessRequest)
+      .then(response => {
+        const filing = response?.data?.filing
+        if (!filing) {
+          // eslint-disable-next-line no-console
+          console.log('createDraftBusiness() error - invalid response =', response)
+          throw new Error('Invalid filing')
+        }
+        return filing
+      })
+  }
+
   /**
    * Updates (puts) a filing.
    * @param businessId the business identifier (aka entity inc no)
@@ -161,6 +201,7 @@ export default class LegalServices {
     if (isDraft) {
       url += '?draft=true'
     }
+
     return axios.put(url, { filing })
       .then(response => {
         const filing = response?.data?.filing
@@ -308,7 +349,7 @@ export default class LegalServices {
   //
 
   /**
-   * Fetches digital credential information.
+   * Fetches digital credentials for a business.
    * @param businessId the business identifier (aka entity inc no)
    * @returns the axios response
    */
@@ -323,7 +364,7 @@ export default class LegalServices {
   }
 
   /**
-   * Creates a digital credentials invitation.
+   * Creates a wallet connection invitation.
    * @param businessId the business identifier (aka entity inc no)
    * @returns the axios response
    */
@@ -338,12 +379,12 @@ export default class LegalServices {
   }
 
   /**
-   * Fetches a digital credentials connection information.
+   * Fetches a list of wallet connections for a business.
    * @param businessId the business identifier (aka entity inc no)
    * @returns the axios response
    */
-  static async fetchCredentialConnection (businessId: string): Promise<AxiosResponse> {
-    const url = `businesses/${businessId}/digitalCredentials/connection`
+  static async fetchCredentialConnections (businessId: string): Promise<AxiosResponse> {
+    const url = `businesses/${businessId}/digitalCredentials/connections`
     return axios.get(url)
       .catch(error => {
         // eslint-disable-next-line no-console
@@ -353,13 +394,46 @@ export default class LegalServices {
   }
 
   /**
-   * Issues a digital credentials offer.
+   * Removes an active credential wallet connection.
+   * @param businessId the business identifier (aka entity inc no)
+   * @returns the axios response
+   */
+  static async removeActiveCredentialConnection (businessId: string): Promise<AxiosResponse> {
+    const url = `businesses/${businessId}/digitalCredentials/activeConnection`
+    return axios.delete(url)
+      .catch(error => {
+        // eslint-disable-next-line no-console
+        console.log(error.message)
+        return null
+      })
+  }
+
+  /**
+   * Removes a credential wallet connection.
+   * @param businessId the business identifier (aka entity inc no)
+   * @param connectionId the connection identifier
+   * @returns the axios response
+   */
+  static async removeCredentialConnection (businessId: string, connectionId: string): Promise<AxiosResponse> {
+    const url = `businesses/${businessId}/digitalCredentials/connections/${connectionId}`
+    return axios.delete(url)
+      .catch(error => {
+        // eslint-disable-next-line no-console
+        console.log(error.message)
+        return null
+      })
+  }
+
+  /**
+   * Sends a digital credential offer.
    * @param businessId The business identifier (aka entity inc no)
    * @param credentialType The credential offer type
    * @returns the axios response
    */
-  static async issueCredentialOffer (businessId: string, credentialType: DigitalCredentialTypes)
-  : Promise<AxiosResponse> {
+  static async sendCredentialOffer (
+    businessId: string,
+    credentialType: DigitalCredentialTypes)
+    : Promise<AxiosResponse> {
     const url = `businesses/${businessId}/digitalCredentials/${credentialType}`
     return axios.post(url)
       .catch(error => {
@@ -368,4 +442,40 @@ export default class LegalServices {
         return null
       })
   }
+
+  /**
+   * Revokes a digital credential.
+   * @param businessId The business identifier (aka entity inc no)
+   * @param credentialId The credential identifier
+   * @returns the axios response
+   */
+  static async revokeCredential (
+    businessId: string,
+    credentialId: string,
+    reissue = false)
+    : Promise<AxiosResponse> {
+    const url = `businesses/${businessId}/digitalCredentials/${credentialId}/revoke`
+    return axios.post(url, { reissue })
+      .catch(error => {
+        // eslint-disable-next-line no-console
+        console.log(error.message)
+        return null
+      })
+  }
+
+  /**
+   * Removes a digital credential.
+   * @param businessId The business identifier (aka entity inc no)
+   * @param credentialId The credential identifier
+   * @returns the axios response
+   */
+  static async removeCredential (businessId: string, credentialId: string): Promise<AxiosResponse> {
+    const url = `businesses/${businessId}/digitalCredentials/${credentialId}`
+    return axios.delete(url)
+      .catch(error => {
+        // eslint-disable-next-line no-console
+        console.log(error.message)
+        return null
+      })
+  }
 }
diff --git a/src/services/pay-services.ts b/src/services/pay-services.ts
index e176455ac..a9183d136 100644
--- a/src/services/pay-services.ts
+++ b/src/services/pay-services.ts
@@ -18,4 +18,21 @@ export default class PayServices {
       .then(response => response?.data)
       .catch(() => {}) // ignore errors
   }
+
+  /**
+   * Fetches the CFS account ID from the pay-api.
+   * @param payApiUrl the URL of the pay-api
+   * @param accountId the ID for which to fetch the CFS account ID
+   * @returns the CFS account ID
+   */
+  static async fetchCfsAccountId (payApiUrl: string, accountId: number): Promise<string> {
+    const url = `${payApiUrl}accounts/${accountId}`
+    try {
+      const response = await axios.get(url)
+      return response?.data?.cfsAccount?.cfsAccountNumber
+    } catch (error) {
+      console.error('Error fetching data from Pay API:', error)
+      throw error
+    }
+  }
 }
diff --git a/src/stores/authenticationStore.ts b/src/stores/authenticationStore.ts
index 457f361a7..4a28d134e 100644
--- a/src/stores/authenticationStore.ts
+++ b/src/stores/authenticationStore.ts
@@ -1,18 +1,18 @@
 import { AccountTypes } from '@bcrs-shared-components/enums'
-import { RootStateIF } from '@/interfaces'
+import { AuthenticationStateIF } from '@/interfaces'
 import { defineStore } from 'pinia'
 import { useRootStore } from './rootStore'
 
 export const useAuthenticationStore = defineStore('authentication', {
   getters: {
     /** Whether the current account is a premium account. */
-    isPremiumAccount (rootState: RootStateIF): boolean {
-      return (rootState.account.currentAccount.accountType === AccountTypes.PREMIUM)
+    isPremiumAccount (state: AuthenticationStateIF): boolean {
+      return (state.account.currentAccount.accountType === AccountTypes.PREMIUM)
     },
 
     /** Whether the user is ServiceBC Staff (which is not the same as Staff). */
-    isSbcStaff (rootState: RootStateIF): boolean {
-      return (rootState.account.currentAccount.accountType === AccountTypes.SBC_STAFF)
+    isSbcStaff (state: AuthenticationStateIF): boolean {
+      return (state.account.currentAccount.accountType === AccountTypes.SBC_STAFF)
     },
 
     /** The user's Keycloak GUID. */
@@ -21,8 +21,8 @@ export const useAuthenticationStore = defineStore('authentication', {
     },
 
     /** The user's Keycloak Bearer Token. */
-    getKeycloakToken (rootState: RootStateIF): string {
-      return rootState.auth.token
+    getKeycloakToken (state: AuthenticationStateIF): string {
+      return state.auth.token
     },
 
     /** Returns true is the user is Keycloak authenticated. */
@@ -31,26 +31,26 @@ export const useAuthenticationStore = defineStore('authentication', {
     },
 
     /** Returns the Keycloak user object. */
-    getKeycloakUser (rootState: RootStateIF): any {
-      return rootState.account.currentUser
+    getKeycloakUser (state: AuthenticationStateIF): any {
+      return state.account.currentUser
     },
 
     /** Each Keycloak user can have many accounts.
      * This getter returns the account the user
      * has selected
      */
-    getCurrentAccount (rootState: RootStateIF): any {
-      return rootState.account.currentAccount
+    getCurrentAccount (state: AuthenticationStateIF): any {
+      return state.account.currentAccount
     },
 
     /** Returns the Keycloak roles. */
-    getKeycloakRoles (rootState: RootStateIF): Array<string> {
-      return rootState.account.currentUser.roles
+    getKeycloakRoles (state: AuthenticationStateIF): Array<string> {
+      return state.account.currentUser.roles
     },
 
     /** Is True if Keycloak Staff role is set. */
-    isKeycloakRoleStaff (rootState: RootStateIF): boolean {
-      return rootState.account.currentUser.roles.includes('staff')
+    isKeycloakRoleStaff (state: AuthenticationStateIF): boolean {
+      return state.account.currentUser.roles.includes('staff')
     }
   }
 })
diff --git a/src/stores/businessStore.ts b/src/stores/businessStore.ts
index 9d7fb50d7..8e981083e 100644
--- a/src/stores/businessStore.ts
+++ b/src/stores/businessStore.ts
@@ -1,8 +1,10 @@
-import { AllowedActionsIF, ApiBusinessIF, ApiDateTimeUtc, BusinessStateIF, BusinessWarningIF } from '@/interfaces'
+import { AllowedActionsIF, AmalgamatedIntoIF, ApiBusinessIF, ApiDateTimeUtc, BusinessStateIF, BusinessWarningIF }
+  from '@/interfaces'
 import { defineStore } from 'pinia'
 import { CorpTypeCd, EntityState } from '@/enums'
 import { DateUtilities, LegalServices } from '@/services/'
 import { GetCorpNumberedDescription } from '@bcrs-shared-components/corp-type-module'
+import { useRootStore } from './rootStore'
 
 export const useBusinessStore = defineStore('business', {
   state: (): BusinessStateIF => ({
@@ -33,11 +35,16 @@ export const useBusinessStore = defineStore('business', {
   }),
 
   getters: {
-    /** The allowed actions object. */
+    /** The Allowed Actions object. */
     getAllowedActions (state: BusinessStateIF): AllowedActionsIF {
       return state.businessInfo.allowedActions
     },
 
+    /** The Amalgamated Info object. */
+    getAmalgamatedInto (state: BusinessStateIF): AmalgamatedIntoIF {
+      return state.businessInfo.amalgamatedInto
+    },
+
     /** The business number (aka Tax ID). */
     getBusinessNumber (state: BusinessStateIF): string {
       return state.businessInfo.taxId
@@ -48,7 +55,7 @@ export const useBusinessStore = defineStore('business', {
       return state.businessInfo.warnings
     },
 
-    /** The business state.businessInfo. */
+    /** The business state. */
     getBusinessState (state: BusinessStateIF): EntityState {
       return state.businessInfo.state
     },
@@ -101,9 +108,13 @@ export const useBusinessStore = defineStore('business', {
 
     /** The entity name, or numbered description, or empty string. */
     getEntityName (): string {
-      return (
-        this.getLegalName || GetCorpNumberedDescription(this.getLegalType)
-      )
+      const rootStore = useRootStore()
+
+      if (rootStore.isDraftAmalgamation || rootStore.isFiledAmalgamation) {
+        return this.getLegalName || 'Numbered Amalgamated Company'
+      } else {
+        return (this.getLegalName || GetCorpNumberedDescription(this.getLegalType))
+      }
     },
 
     /** The state filing URL (may be null). */
@@ -132,6 +143,11 @@ export const useBusinessStore = defineStore('business', {
       )
     },
 
+    /** Is True if the business is part of a future effective amalgamation filing. */
+    isFutureEffectiveAmalgamation (): boolean {
+      return this.getBusinessWarnings.some(item => item.warningType === 'FUTURE_EFFECTIVE_AMALGAMATION')
+    },
+
     /** Is True if business is active. */
     isActive (): boolean {
       return (this.getBusinessState === EntityState.ACTIVE)
@@ -143,13 +159,23 @@ export const useBusinessStore = defineStore('business', {
     },
 
     /** Is True if entity is a Benefit Company. */
-    isBComp (state: BusinessStateIF): boolean {
-      return (state.businessInfo.legalType === CorpTypeCd.BENEFIT_COMPANY)
+    isBComp (): boolean {
+      return (this.getLegalType === CorpTypeCd.BENEFIT_COMPANY)
     },
 
     /** Is True if entity is a BC Company. */
-    isBcCompany (state: BusinessStateIF): boolean {
-      return (state.businessInfo.legalType === CorpTypeCd.BC_COMPANY)
+    isBcCompany (): boolean {
+      return (this.getLegalType === CorpTypeCd.BC_COMPANY)
+    },
+
+    /** Is True if entity is a BC Community Contribution Company. */
+    isCcc (): boolean {
+      return (this.getLegalType === CorpTypeCd.BC_CCC)
+    },
+
+    /** Is True if entity is a BC ULC Company. */
+    isUlc (): boolean {
+      return (this.getLegalType === CorpTypeCd.BC_ULC_COMPANY)
     },
 
     /** Is True if entity is a BEN/BC/CCC/ULC. */
@@ -162,19 +188,24 @@ export const useBusinessStore = defineStore('business', {
       )
     },
 
-    /** Is True if entity is a BC Community Contribution Company. */
-    isCcc (state: BusinessStateIF): boolean {
-      return (state.businessInfo.legalType === CorpTypeCd.BC_CCC)
+    /** Is True if entity is a Cooperative. */
+    isCoop (): boolean {
+      return (this.getLegalType === CorpTypeCd.COOP)
     },
 
-    /** Is True if entity is a Cooperative. */
-    isCoop (state: BusinessStateIF): boolean {
-      return (state.businessInfo.legalType === CorpTypeCd.COOP)
+    /** Is True if entity is a Corporation. */
+    isCorp (): boolean {
+      return (this.getLegalType === CorpTypeCd.CORPORATION)
     },
 
-    /** Is True if entity is a BC Corporation. */
-    isCorp (state: BusinessStateIF): boolean {
-      return (state.businessInfo.legalType === CorpTypeCd.BC_CORPORATION)
+    /** Is True if entity is a General Partnership. */
+    isPartnership (): boolean {
+      return (this.getLegalType === CorpTypeCd.PARTNERSHIP)
+    },
+
+    /** Is True if entity is a Sole Proprietorship. */
+    isSoleProp (): boolean {
+      return (this.getLegalType === CorpTypeCd.SOLE_PROP)
     },
 
     /** Is True if entity is a Sole Proprietorship or General Partnership. */
@@ -195,21 +226,6 @@ export const useBusinessStore = defineStore('business', {
     /** Is True if business is in liquidation. */
     isLiquidation (): boolean {
       return (this.getBusinessState === EntityState.LIQUIDATION)
-    },
-
-    /** Is True if entity is a General Partnership. */
-    isPartnership (): boolean {
-      return (this.getLegalType === CorpTypeCd.PARTNERSHIP)
-    },
-
-    /** Is True if entity is a Sole Proprietorship. */
-    isSoleProp (): boolean {
-      return (this.getLegalType === CorpTypeCd.SOLE_PROP)
-    },
-
-    /** Is True if entity is a BC ULC Company. */
-    isUlc (): boolean {
-      return (this.getLegalType === CorpTypeCd.BC_ULC_COMPANY)
     }
   },
 
diff --git a/src/stores/configurationStore.ts b/src/stores/configurationStore.ts
index b109e464c..8e5feac59 100644
--- a/src/stores/configurationStore.ts
+++ b/src/stores/configurationStore.ts
@@ -91,7 +91,7 @@ export const useConfigurationStore = defineStore('configuration', {
     },
 
     setSessionVariables (data: any) {
-    // The following four session variables are used by SBC Header (a common component):
+      // The following four session variables are used by SBC Header (a common component):
       sessionStorage.setItem('AUTH_WEB_URL', data.VUE_APP_AUTH_WEB_URL)
       sessionStorage.setItem('BUSINESSES_URL', data.VUE_APP_BUSINESSES_URL)
       sessionStorage.setItem('REGISTRY_HOME_URL', data.VUE_APP_REGISTRY_HOME_URL)
diff --git a/src/stores/filingHistoryListStore.ts b/src/stores/filingHistoryListStore.ts
index d14e6461a..bb3079a5b 100644
--- a/src/stores/filingHistoryListStore.ts
+++ b/src/stores/filingHistoryListStore.ts
@@ -33,11 +33,40 @@ export const useFilingHistoryListStore = defineStore('filingHistoryList', {
           // eslint-disable-next-line no-console
           console.log('Invalid filing =', filing)
           return false
+        } else if (filing.displayLedger === false) {
+          // eslint-disable-next-line no-console
+          console.log('Not shown filing on the ledger =', filing)
+          return false
         }
         return true
       })
     },
 
+    /** The function to compute total AGM extension duration. Requires argument for AGM Year. */
+    getTotalAgmExtensionDuration (state: FilingHistoryListStateIF): (year: number) => number {
+      return (year: number) => {
+        return state.filings.reduce((totalMonths, filing) => {
+          // Skip if not AGM_EXTENSION
+          if (filing.name !== FilingTypes.AGM_EXTENSION) {
+            return totalMonths
+          }
+          const filingExtension = filing.data?.agmExtension
+          // Skip if extension data is missing
+          if (!filingExtension) {
+            return totalMonths
+          }
+          // Cast year as number
+          // Skip if years don't match
+          if (Number(filingExtension.year) !== year) {
+            return totalMonths
+          }
+          // Add total months for the specific AGM year
+          totalMonths += filingExtension.extensionDuration || 0
+          return totalMonths
+        }, 0)
+      }
+    },
+
     /** The count of filings in the Filing History List. */
     getHistoryCount (): number {
       const filings = this.getFilings as ApiFilingIF[]
@@ -192,7 +221,7 @@ export const useFilingHistoryListStore = defineStore('filingHistoryList', {
 
         // check if we're opening a new panel
         if (!isCurrentPanel) {
-        // get a reference to the filing so we can update it right in the main list
+          // get a reference to the filing so we can update it right in the main list
           const filing = this.getFilings[index]
 
           // check if we're missing comments or documents
diff --git a/src/stores/rootStore.ts b/src/stores/rootStore.ts
index 2520a31ef..f0cf45d95 100644
--- a/src/stores/rootStore.ts
+++ b/src/stores/rootStore.ts
@@ -1,13 +1,13 @@
 import { defineStore } from 'pinia'
-import { CorpTypeCd, EntityStatus, FilingStatus, FilingSubTypes, FilingTypes } from '@/enums'
-import { ApiTaskIF, DissolutionConfirmationResourceIF, FilingDataIF, OfficeAddressIF, PartyIF, StateIF,
-  TodoListResourceIF, IsoDatePacific, StateFilingIF } from '@/interfaces'
+import { CorpTypeCd, EntityStatus, FilingSubTypes, FilingTypes } from '@/enums'
+import { ApiTaskIF, DissolutionConfirmationResourceIF, FilingDataIF, OfficeAddressIF, PartyIF,
+  RootStateIF, TodoListResourceIF, IsoDatePacific, StateFilingIF } from '@/interfaces'
 import { DateUtilities, EnumUtilities, LegalServices } from '@/services'
 import { useBusinessStore } from './businessStore'
 import { useFilingHistoryListStore } from './filingHistoryListStore'
 
 export const useRootStore = defineStore('root', {
-  state: (): StateIF => ({
+  state: (): RootStateIF => ({
     authRoles: [],
     currentDate: null,
     currentJsDate: null,
@@ -25,19 +25,20 @@ export const useRootStore = defineStore('root', {
     nextARDate: null,
     businessAddress: null,
     configObject: null,
-    currentFilingStatus: null,
     fetchingDataSpinner: false,
+    startingAmalgamationSpinner: false,
     filingData: [],
     nameRequest: null,
     parties: [],
     recordsAddress: null,
     registeredAddress: null,
-    tasks: []
+    tasks: [],
+    userInfo: null
   }),
 
   getters: {
     /** The list of tasks from the API. */
-    getTasks (state: StateIF): ApiTaskIF[] {
+    getTasks (state: RootStateIF): ApiTaskIF[] {
       return state.tasks
     },
 
@@ -46,7 +47,7 @@ export const useRootStore = defineStore('root', {
      * NB: internally this is stored as UTC
      * NB: use date mixins to display this
      */
-    getCurrentJsDate (state: StateIF): Date {
+    getCurrentJsDate (state: RootStateIF): Date {
       return state.currentJsDate
     },
 
@@ -54,22 +55,22 @@ export const useRootStore = defineStore('root', {
      * The current date (YYYY-MM-DD), which was refreshed when the dashload loaded,
      * in Pacific timezone.
      */
-    getCurrentDate (state: StateIF): IsoDatePacific {
+    getCurrentDate (state: RootStateIF): IsoDatePacific {
       return state.currentDate
     },
 
     /** The current year. */
-    getCurrentYear (state: StateIF): number {
+    getCurrentYear (state: RootStateIF): number {
       return (state.currentDate ? +state.currentDate.substring(0, 4) : 0)
     },
 
     /** The business email. */
-    getBusinessEmail (state: StateIF): string {
+    getBusinessEmail (state: RootStateIF): string {
       return state.businessEmail
     },
 
     /** The business phone number and optional extension. */
-    getFullPhoneNumber (state: StateIF): string {
+    getFullPhoneNumber (state: RootStateIF): string {
       const phone = state.businessPhone
       const ext = state.businessPhoneExtension
 
@@ -80,24 +81,25 @@ export const useRootStore = defineStore('root', {
     },
 
     /** The roles from the Keycloak token (JWT). */
-    getKeycloakRoles (state: StateIF): Array<string> {
+    getKeycloakRoles (state: RootStateIF): Array<string> {
       return state.keycloakRoles
     },
 
-    /** Is True if Staff role is set.
+    /**
+     * Is True if Staff role is set.
      * DEPRECATED - use authentication/isKeycloakRoleStaff() instead
      */
-    isRoleStaff (state: StateIF): boolean {
+    isRoleStaff (state: RootStateIF): boolean {
       return state.keycloakRoles.includes('staff')
     },
 
     /** Is True if app permissions includes Edit role. */
-    isRoleEdit (state: StateIF): boolean {
+    isRoleEdit (state: RootStateIF): boolean {
       return state.authRoles.includes('edit')
     },
 
     /** Is True if app permission includes View role. */
-    isRoleView (state: StateIF): boolean {
+    isRoleView (state: RootStateIF): boolean {
       return state.authRoles.includes('view')
     },
 
@@ -106,43 +108,68 @@ export const useRootStore = defineStore('root', {
       return false // FUTURE: implement this
     },
 
-    /** Is True if this is a Draft Application. */
-    isAppTask (state: StateIF): boolean {
-      return (state.entityStatus === EntityStatus.DRAFT_APP)
+    getEntityStatus (state: RootStateIF): EntityStatus {
+      return state.entityStatus
     },
 
-    /** Is True if this is a Paid or Completed Application. */
-    isAppFiling (state: StateIF): boolean {
-      return (state.entityStatus === EntityStatus.FILED_APP)
+    isDraftAmalgamation (state: RootStateIF): boolean {
+      return (state.entityStatus === EntityStatus.DRAFT_AMALGAMATION)
     },
 
-    /** The Name Request (may be null). */
-    getNameRequest (state: StateIF): any {
-      return (state.nameRequest)
+    isDraftIncorpApp (state: RootStateIF): boolean {
+      return (state.entityStatus === EntityStatus.DRAFT_INCORP_APP)
     },
 
-    isCurrentFilingEditable (state: StateIF): boolean {
-      return (state.currentFilingStatus === FilingStatus.NEW || state.currentFilingStatus === FilingStatus.DRAFT)
+    isDraftRegistration (state: RootStateIF): boolean {
+      return (state.entityStatus === EntityStatus.DRAFT_REGISTRATION)
     },
 
-    getReportState (state: StateIF): string {
-      switch (state.currentFilingStatus) {
-        case FilingStatus.NEW: return ''
-        case FilingStatus.DRAFT: return 'Draft'
-      }
-      return state.currentFilingStatus
+    isFiledAmalgamation (state: RootStateIF): boolean {
+      return (state.entityStatus === EntityStatus.FILED_AMALGAMATION)
+    },
+
+    isFiledIncorpApp (state: RootStateIF): boolean {
+      return (state.entityStatus === EntityStatus.FILED_INCORP_APP)
+    },
+
+    isFiledRegistration (state: RootStateIF): boolean {
+      return (state.entityStatus === EntityStatus.FILED_REGISTRATION)
+    },
+
+    /** Is True if this is a Draft or Pending application. */
+    isAppTask (): boolean {
+      return (
+        this.isDraftAmalgamation || this.isDraftIncorpApp || this.isDraftRegistration
+      )
+    },
+
+    /** Is True if this is a Completed or Paid application. */
+    isAppFiling (): boolean {
+      return (
+        this.isFiledAmalgamation || this.isFiledIncorpApp || this.isFiledRegistration
+      )
+    },
+
+    /** The Name Request (may be null). */
+    getNameRequest (state: RootStateIF): any {
+      return (state.nameRequest)
     },
 
     /** Whether to show the Fetching Data spinner. */
-    showFetchingDataSpinner (state: StateIF): boolean {
+    showFetchingDataSpinner (state: RootStateIF): boolean {
       return state.fetchingDataSpinner
     },
 
+    /** Whether to show the Starting Amalgamation spinner. */
+    showStartingAmalgamationSpinner (state: RootStateIF): boolean {
+      return state.startingAmalgamationSpinner
+    },
+
     /**
      * This is used to show Legal Obligations only for a new business
      * that has no tasks and hasn't filed anything yet (except their IA).
      **/
-    isBusinessWithNoMaintenanceFilings (state: StateIF): boolean {
+    isBusinessWithNoMaintenanceFilings (state: RootStateIF): boolean {
       const filingHistoryListStore = useFilingHistoryListStore()
       return (
         // no todo items
@@ -156,77 +183,116 @@ export const useRootStore = defineStore('root', {
     },
 
     /** The entity registered office address. */
-    getRegisteredOfficeAddress (state: StateIF): OfficeAddressIF {
+    getRegisteredOfficeAddress (state: RootStateIF): OfficeAddressIF {
       return state.registeredAddress
     },
 
     /** The parties list from the API. */
-    getParties (state: StateIF): Array<PartyIF> {
+    getParties (state: RootStateIF): Array<PartyIF> {
       return state.parties
     },
 
     /** The entity business address. */
-    getBusinessAddress (state: StateIF): OfficeAddressIF {
+    getBusinessAddress (state: RootStateIF): OfficeAddressIF {
       return state.businessAddress
     },
 
     /** The entity resource text for confirmation modal. */
-    getDissolutionConfirmationResource (state: StateIF): DissolutionConfirmationResourceIF {
+    getDissolutionConfirmationResource (state: RootStateIF): DissolutionConfirmationResourceIF {
       return state.configObject?.dissolutionConfirmation
     },
     /** The entity TodoList resources. */
-    getTodoListResource (state: StateIF): TodoListResourceIF {
+    getTodoListResource (state: RootStateIF): TodoListResourceIF {
       return state.configObject?.todoList
     },
 
     /** The corp type code from Auth db (may be null). */
-    getCorpTypeCd (state: StateIF): CorpTypeCd {
+    getCorpTypeCd (state: RootStateIF): CorpTypeCd {
       return state.corpTypeCd
     },
 
+    /** The user info from Auth db (may be null). */
+    getUserInfo (state: RootStateIF): any {
+      return state.userInfo
+    },
+
     //
     // State Filing getters
     //
 
     /** The filing that changed the business state, if there is one. */
-    getStateFiling (state: StateIF): StateFilingIF {
+    getStateFiling (state: RootStateIF): StateFilingIF {
       return state.stateFiling
     },
 
-    /**
-     * A formatted concatenation of the name and the effective date of the filing.
-     * Only used when entity is historical.
-     */
+    /** The historical reason text to display in the info header. */
     getReasonText (): string {
+      const enDash = '–' // ALT + 0150
       const businessStore = useBusinessStore()
-      const stateFiling = this.getStateFiling as StateFilingIF // may be null
 
+      if (!businessStore.isHistorical) return null // safety check
+
+      // check if historical reason is amalgamation
+      const amalgamatedInto = businessStore.getAmalgamatedInto
+      if (amalgamatedInto) return reasonTextAmalgamation()
+
+      // get state filing (may be null)
+      const stateFiling = this.getStateFiling as StateFilingIF
       const filingType = stateFiling?.header?.name
       if (!filingType) return null // safety check
 
-      // create reason text to display in the info header
-      let name: string
-      let date: string
+      // check if historical reason is dissolution
+      if (filingType === FilingTypes.DISSOLUTION) return reasonTextDissolution()
+
+      // check if historical reason is continuation out
+      if (filingType === FilingTypes.CONTINUATION_OUT) return reasonTextContinuationOut()
+
+      // fallback reason text
+      return reasonTextOther()
+
+      //
+      // helper functions
+      //
+
+      /** The reason text for a business made historical by an amalgamation. */
+      function reasonTextAmalgamation (): string {
+        const name = 'Amalgamation'
+        const amalgamationDate = DateUtilities.apiToDate(amalgamatedInto.amalgamationDate)
+        if (!amalgamationDate) throw new Error('Invalid amalgamation date')
+        const date = DateUtilities.dateToPacificDate(amalgamationDate, true)
+        const identifier = amalgamatedInto.identifier || 'Unknown Company'
+        return `${name} ${enDash} ${date} ${enDash} ${identifier}`
+      }
 
-      if (filingType === FilingTypes.DISSOLUTION) {
-        name = EnumUtilities.dissolutionTypeToName(
+      /** The reason text for a business made historical by a dissolution. */
+      function reasonTextDissolution (): string {
+        const name = EnumUtilities.dissolutionTypeToName(
           businessStore.isFirm,
-          (stateFiling?.dissolution?.dissolutionType as FilingSubTypes)
+          (stateFiling.dissolution?.dissolutionType as FilingSubTypes)
         )
         const dissolutionDate = DateUtilities.yyyyMmDdToDate(stateFiling.dissolution?.dissolutionDate)
         if (!dissolutionDate) throw new Error('Invalid dissolution date')
-        date = DateUtilities.dateToPacificDate(dissolutionDate, true)
-      } else {
-        name = (filingType === FilingTypes.CONTINUATION_OUT)
-          ? 'Continued Out'
-          : EnumUtilities.filingTypeToName(filingType)
-        const effectiveDate = DateUtilities.apiToDate(stateFiling.header.effectiveDate)
+        const date = DateUtilities.dateToPacificDate(dissolutionDate, true)
+        return `${name} ${enDash} ${date}`
+      }
+
+      /** The reason text for a business made historical by a continuation out. */
+      function reasonTextContinuationOut (): string {
+        const name = 'Continued Out'
+        const effectiveDate = DateUtilities.apiToDate(stateFiling.header?.effectiveDate)
         if (!effectiveDate) throw new Error('Invalid effective date')
-        date = DateUtilities.dateToPacificDateTime(effectiveDate)
+        const dateTime = DateUtilities.dateToPacificDateTime(effectiveDate)
+        return `${name} ${enDash} ${dateTime}`
       }
 
-      const enDash = '–' // ALT + 0150
-      return `${name} ${enDash} ${date}`
+      /** The reason text for a business made historical by some other state filing. */
+      function reasonTextOther (): string {
+        const name = EnumUtilities.filingTypeToName(filingType)
+        const effectiveDate = DateUtilities.apiToDate(stateFiling.header?.effectiveDate)
+        if (!effectiveDate) throw new Error('Invalid effective date')
+        const dateTime = DateUtilities.dateToPacificDateTime(effectiveDate)
+        return `${name} ${enDash} ${dateTime}`
+      }
     },
 
     /** The limited restoration active-until date, if it exists, otherwise null. */
@@ -258,6 +324,10 @@ export const useRootStore = defineStore('root', {
       this.fetchingDataSpinner = val
     },
 
+    setStartingAmalgamationSpinner (val: boolean) {
+      this.startingAmalgamationSpinner = val
+    },
+
     setStateFiling (stateFilingResponse: any) {
       this.stateFiling = stateFilingResponse
     },
@@ -271,6 +341,10 @@ export const useRootStore = defineStore('root', {
       this.userKeycloakGuid = userKeycloakGuid
     },
 
+    setUserInfo (val: any) {
+      this.userInfo = val
+    },
+
     /** Set the app permissions. */
     setAuthRoles (authRoles: Array<string>) {
       this.authRoles = authRoles
@@ -320,10 +394,6 @@ export const useRootStore = defineStore('root', {
       this.businessPhoneExtension = businessPhoneExtension
     },
 
-    setCurrentFilingStatus (currentFilingStatus: FilingStatus) {
-      this.currentFilingStatus = currentFilingStatus
-    },
-
     setTasks (tasks: Array<ApiTaskIF>) {
       this.tasks = tasks
     },
diff --git a/src/stores/state.ts b/src/stores/state.ts
index 06fb2f7ae..3a00cf5ed 100644
--- a/src/stores/state.ts
+++ b/src/stores/state.ts
@@ -1,6 +1,6 @@
-import { StateIF } from '@/interfaces'
+import { RootStateIF } from '@/interfaces'
 
-export const state: StateIF = {
+export const state: RootStateIF = {
   authRoles: [],
   currentDate: null,
   currentJsDate: null,
@@ -21,12 +21,12 @@ export const state: StateIF = {
 
   businessAddress: null,
   configObject: null,
-  currentFilingStatus: null,
   fetchingDataSpinner: false,
   filingData: [],
   nameRequest: null,
   parties: [],
   recordsAddress: null,
   registeredAddress: null,
-  tasks: []
+  tasks: [],
+  userInfo: null
 }
diff --git a/src/utils/feature-flags.ts b/src/utils/feature-flags.ts
index 92d2ad943..653d0b92c 100644
--- a/src/utils/feature-flags.ts
+++ b/src/utils/feature-flags.ts
@@ -9,15 +9,17 @@ declare const window: any
  */
 const defaultFlagSet: LDFlagSet = {
   'banner-text': '', // by default, there is no banner text
-  'enable-agm-extension': false,
-  'enable-agm-location-chg': false,
   'enable-digital-credentials': false,
   'sentry-enable': false, // by default, no sentry logs
   'show-alert-phone-numbers-firm': false,
+  'supported-amalgamation-entities': [],
   'supported-business-summary-entities': [],
   'supported-correction-entities': [],
   'supported-dissolution-entities': [],
-  'supported-consent-continuation-out-entities': []
+  'supported-consent-continuation-out-entities': [],
+  'supported-agm-extension-entities': [],
+  'supported-agm-location-chg-entities': [],
+  'supported-restoration-entities': []
 }
 
 /**
diff --git a/src/utils/set-base-route-and-business-id.ts b/src/utils/set-base-route-and-business-id.ts
index 8fca95578..e6b167a74 100644
--- a/src/utils/set-base-route-and-business-id.ts
+++ b/src/utils/set-base-route-and-business-id.ts
@@ -23,7 +23,7 @@ export function setBaseRouteAndBusinessId (pathname: string, processEnvBaseUrl:
     // ensure we don't already have a Business ID in scope
     sessionStorage.removeItem('BUSINESS_ID')
   } else {
-    throw new Error('Missing or invalid Business ID or Temp Reg Number.')
+    throw new Error('Missing or invalid Business ID or Temporary Registration Number.')
   }
 
   // set Base for Vue Router
diff --git a/src/views/AgmExtension.vue b/src/views/AgmExtension.vue
index c6d2aa894..cee2f406a 100644
--- a/src/views/AgmExtension.vue
+++ b/src/views/AgmExtension.vue
@@ -14,57 +14,14 @@
       @exit="onPaymentErrorDialogExit()"
     />
 
-    <ResumeErrorDialog
+    <NotEligibleExtensionDialog
       attach="#agm-extension"
-      :dialog="resumeErrorDialog"
-      @exit="goToDashboard(true)"
+      :dialog="notEligibleExtensionDialog"
+      @okay="notEligibleExtensionDialog = false"
     />
 
-    <SaveErrorDialog
-      attach="#agm-extension"
-      filingName="AGM Extension"
-      :dialog="!!saveErrorReason"
-      :disableRetry="busySaving"
-      :errors="saveErrors"
-      :warnings="saveWarnings"
-      @exit="saveErrorReason=null"
-      @retry="onSaveErrorDialogRetry()"
-      @okay="onSaveErrorDialogOkay()"
-    />
-
-    <StaffPaymentDialog
-      :staffPaymentData.sync="staffPaymentData"
-      attach="#agm-extension"
-      :dialog="staffPaymentDialog"
-      :loading="filingPaying"
-      @exit="staffPaymentDialog=false"
-      @submit="onClickFilePay(true)"
-    />
-
-    <!-- Initial Page Load Transition -->
-    <v-fade-transition>
-      <div
-        v-show="showLoadingContainer"
-        class="loading-container"
-      >
-        <div class="loading__content">
-          <v-progress-circular
-            color="primary"
-            :size="50"
-            indeterminate
-          />
-          <div class="loading-msg">
-            {{ loadingMessage }}
-          </div>
-        </div>
-      </div>
-    </v-fade-transition>
-
     <!-- Main Body -->
-    <v-container
-      v-if="dataLoaded"
-      class="view-container"
-    >
+    <v-container class="view-container">
       <v-row>
         <v-col
           cols="12"
@@ -72,176 +29,44 @@
         >
           <article id="main-article">
             <!-- Page Title -->
-            <header>
-              <h1>
-                AGM Extension
-              </h1>
-            </header>
+            <h1>AGM Extension</h1>
 
             <ExpandableHelp helpLabel="Help with Annual General Meeting Extension">
               <template #content>
-                Help text, or sub-component, goes here.
+                <AgmExtensionHelp />
               </template>
             </ExpandableHelp>
 
-            <!-- Extension Eligibility -->
-            <section class="mt-8">
-              <header>
-                <h2>Extension Eligibility</h2>
-                <p>
-                  Fill out the following section to evaluate the eligibility for extension.
-                </p>
-              </header>
+            <header>
+              <h2>Extension Detail</h2>
+              <p class="grey-text">
+                Enter the details about the extension request to evaluate the eligibility.
+              </p>
+            </header>
 
-              <div
-                id="extension-eligibility-section"
-                :class="{ 'invalid-extension-eligibility': !extensionEligibilityValid && showErrors }"
-              >
-                <v-card
-                  flat
-                  class="py-4 px-5"
-                >
-                  <v-row
-                    no-gutters
-                    class="my-4"
-                  >
-                    <v-col
-                      cols="12"
-                      sm="3"
-                      class="pr-4"
-                    >
-                      <strong :class="{ 'app-red': !extensionEligibilityValid && showErrors }">
-                        Business in Good Standing
-                      </strong>
-                    </v-col>
-                    <v-col
-                      cols="12"
-                      sm="9"
-                    >
-                      Yes
-                    </v-col>
-                  </v-row>
-
-                  <v-divider />
-
-                  <v-row
-                    no-gutters
-                    class="my-4"
-                  >
-                    <v-col
-                      cols="12"
-                      sm="3"
-                      class="pr-4"
-                    >
-                      <strong :class="{ 'app-red': !extensionEligibilityValid && showErrors }">
-                        Date of Incorporation
-                      </strong>
-                    </v-col>
-                    <v-col
-                      cols="12"
-                      sm="9"
-                    >
-                      (date goes here)
-                    </v-col>
-                  </v-row>
-
-                  <v-divider />
-
-                  <v-row
-                    no-gutters
-                    class="my-4"
-                  >
-                    <v-col
-                      cols="12"
-                      sm="3"
-                      class="pr-4"
-                    >
-                      <strong :class="{ 'app-red': !extensionEligibilityValid && showErrors }">
-                        Date of the Last Extension Grant on Record
-                      </strong>
-                    </v-col>
-                    <v-col
-                      cols="12"
-                      sm="9"
-                    >
-                      (date goes here)
-                    </v-col>
-                  </v-row>
-
-                  <v-divider />
-
-                  <v-row
-                    no-gutters
-                    class="my-4"
-                  >
-                    <v-col
-                      cols="12"
-                      sm="3"
-                      class="pr-4"
-                    >
-                      <strong :class="{ 'app-red': !extensionEligibilityValid && showErrors }">
-                        Date the Annual General Meeting is intended to be held
-                      </strong>
-                    </v-col>
-                    <v-col
-                      cols="12"
-                      sm="9"
-                    >
-                      (date picker goes here)
-                    </v-col>
-                  </v-row>
-
-                  <v-divider />
-
-                  <v-row
-                    no-gutters
-                    class="my-4"
-                  >
-                    <v-col
-                      cols="12"
-                      sm="3"
-                      class="pr-4"
-                    >
-                      <strong :class="{ 'app-red': !extensionEligibilityValid && showErrors }">
-                        Date of Previous Annual General Meeting
-                      </strong>
-                    </v-col>
-                    <v-col
-                      cols="12"
-                      sm="9"
-                    >
-                      (radio buttons go here)
-                    </v-col>
-                  </v-row>
-
-                  <v-divider />
-
-                  <v-row
-                    no-gutters
-                    class="my-4"
-                  >
-                    <v-col
-                      cols="12"
-                      sm="3"
-                      class="pr-4"
-                    >
-                      <strong :class="{ 'app-red': !extensionEligibilityValid && showErrors }">
-                        Was the above extension grant for the current AGM?
-                      </strong>
-                    </v-col>
-                    <v-col
-                      cols="12"
-                      sm="9"
-                    >
-                      (radio buttons go here)
-                    </v-col>
-                  </v-row>
-                </v-card>
-              </div>
-            </section>
+            <!-- About the Business -->
+            <AboutTheBusiness
+              class="mt-6"
+              :data.sync="data"
+            />
+
+            <!-- Extension Request -->
+            <ExtensionRequest
+              class="mt-8"
+              :data.sync="data"
+              :showErrors="showErrors"
+              @valid="extensionRequestValid=$event"
+            />
+
+            <!-- AGM Extension Evaluation -->
+            <AgmExtensionEvaluation
+              class="mt-8"
+              :data.sync="data"
+              :evaluateResult="extensionRequestValid"
+            />
 
             <!-- Certify -->
-            <section>
+            <section class="mt-8">
               <header>
                 <h2>Certify</h2>
                 <p class="grey-text">
@@ -257,6 +82,7 @@
                   :isCertified.sync="isCertified"
                   :certifiedBy.sync="certifiedBy"
                   :class="{ 'invalid-certify': !certifyFormValid && showErrors }"
+                  :disableEdit="!isRoleStaff"
                   :entityDisplay="displayName()"
                   :message="certifyText(FilingCodes.AGM_EXTENSION)"
                   @valid="certifyFormValid=$event"
@@ -292,27 +118,6 @@
       id="buttons-container"
       class="list-item"
     >
-      <div class="buttons-left">
-        <v-btn
-          id="consent-save-btn"
-          large
-          :disabled="busySaving"
-          :loading="saving"
-          @click="onClickSave()"
-        >
-          <span>Save</span>
-        </v-btn>
-        <v-btn
-          id="consent-save-resume-btn"
-          large
-          :disabled="busySaving"
-          :loading="savingResuming"
-          @click="onClickSaveResume()"
-        >
-          <span>Save and Resume Later</span>
-        </v-btn>
-      </div>
-
       <div class="buttons-right">
         <v-tooltip
           top
@@ -325,7 +130,7 @@
               v-on="on"
             >
               <v-btn
-                id="consent-file-pay-btn"
+                id="file-pay-btn"
                 color="primary"
                 large
                 :disabled="busySaving"
@@ -341,7 +146,8 @@
         </v-tooltip>
 
         <v-btn
-          id="consent-cancel-btn"
+          id="cancel-btn"
+          class="ml-2"
           large
           :disabled="busySaving"
           @click="goToDashboard()"
@@ -361,25 +167,29 @@ import { navigate } from '@/utils'
 import SbcFeeSummary from 'sbc-common-components/src/components/SbcFeeSummary.vue'
 import { ExpandableHelp } from '@bcrs-shared-components/expandable-help'
 import { Certify } from '@/components/common'
-import { ConfirmDialog, PaymentErrorDialog, ResumeErrorDialog, SaveErrorDialog, StaffPaymentDialog }
-  from '@/components/dialogs'
+import { ConfirmDialog, NotEligibleExtensionDialog, PaymentErrorDialog } from '@/components/dialogs'
+import AboutTheBusiness from '@/components/AgmExtension/AboutTheBusiness.vue'
+import AgmExtensionEvaluation from '@/components/AgmExtension/AgmExtensionEvaluation.vue'
+import AgmExtensionHelp from '@/components/AgmExtension/AgmExtensionHelp.vue'
+import ExtensionRequest from '@/components/AgmExtension/ExtensionRequest.vue'
 import { CommonMixin, DateMixin, EnumMixin, FilingMixin, ResourceLookupMixin } from '@/mixins'
 import { LegalServices } from '@/services/'
-import { FilingCodes, FilingStatus, FilingTypes, Routes, SaveErrorReasons, StaffPaymentOptions }
-  from '@/enums'
-import { ConfirmDialogType, StaffPaymentIF } from '@/interfaces'
-import { useBusinessStore, useConfigurationStore, useRootStore } from '@/stores'
+import { FilingCodes, FilingTypes, Routes, SaveErrorReasons } from '@/enums'
+import { AgmExtEvalIF, ConfirmDialogType, EmptyAgmExtEval } from '@/interfaces'
+import { useBusinessStore, useConfigurationStore, useFilingHistoryListStore, useRootStore } from '@/stores'
 
 @Component({
   components: {
+    AboutTheBusiness,
+    AgmExtensionEvaluation,
+    AgmExtensionHelp,
     Certify,
     ConfirmDialog,
     ExpandableHelp,
+    ExtensionRequest,
+    NotEligibleExtensionDialog,
     PaymentErrorDialog,
-    ResumeErrorDialog,
-    SaveErrorDialog,
-    SbcFeeSummary,
-    StaffPaymentDialog
+    SbcFeeSummary
   }
 })
 export default class AgmExtension extends Mixins(CommonMixin, DateMixin,
@@ -393,48 +203,38 @@ export default class AgmExtension extends Mixins(CommonMixin, DateMixin,
   @Getter(useConfigurationStore) getAuthWebUrl!: string
   @Getter(useBusinessStore) getLegalName!: string
   @Getter(useConfigurationStore) getPayApiUrl!: string
+  @Getter(useRootStore) getUserInfo!: any
+  @Getter(useBusinessStore) isGoodStanding!: boolean
   @Getter(useRootStore) isRoleStaff!: boolean
-
+  @Getter(useFilingHistoryListStore) getTotalAgmExtensionDuration!: (year: number) => number;
   // enum for template
   readonly FilingCodes = FilingCodes
 
+  // evaluation object
+  data = { ...EmptyAgmExtEval } as AgmExtEvalIF
+
   // variables for Certify component
   certifiedBy = ''
   isCertified = false
   certifyFormValid = false
 
-  // variables for Extension Eligiblity section
-  extensionEligibilityValid = false
-
-  // variables for staff payment
-  staffPaymentData = { option: StaffPaymentOptions.NONE } as StaffPaymentIF
-  staffPaymentDialog = false
+  // variables for Extension Request section
+  extensionRequestValid = false
 
   // variables for displaying dialogs
-  resumeErrorDialog = false
   saveErrorReason: SaveErrorReasons = null
   paymentErrorDialog = false
 
   // other variables
   totalFee = 0
-  dataLoaded = false
-  loadingMessage = ''
-  filingId = 0 // id of this consent to continuation out filing
+  filingId = 0 // id of this agm extension filing
   savedFiling: any = null // filing during save
-  saving = false // true only when saving
-  savingResuming = false // true only when saving and resuming
   showErrors = false // true when we press on File and Pay (trigger validation)
   filingPaying = false // true only when filing and paying
   haveChanges = false
   saveErrors = []
   saveWarnings = []
-
-  /** True if loading container should be shown, else False. */
-  get showLoadingContainer (): boolean {
-    // show loading container when data isn't yet loaded and when
-    // no dialogs are displayed (otherwise dialogs may be hidden)
-    return (!this.dataLoaded && !this.saveErrorReason && !this.paymentErrorDialog)
-  }
+  notEligibleExtensionDialog = false
 
   /** The Base URL string. */
   get baseUrl (): string {
@@ -443,12 +243,12 @@ export default class AgmExtension extends Mixins(CommonMixin, DateMixin,
 
   /** True if page is valid, else False. */
   get isPageValid (): boolean {
-    return (this.certifyFormValid && this.extensionEligibilityValid)
+    return (this.extensionRequestValid && this.certifyFormValid)
   }
 
-  /** True when saving, saving and resuming, or filing and paying. */
+  /** True when filing and paying. */
   get busySaving (): boolean {
-    return (this.saving || this.savingResuming || this.filingPaying)
+    return (this.filingPaying)
   }
 
   /** True if payment is required, else False. */
@@ -472,184 +272,44 @@ export default class AgmExtension extends Mixins(CommonMixin, DateMixin,
     }
 
     // this is the id of THIS filing
-    // if 0, this is a new filing
-    // otherwise it's a draft filing
+    // it must be 0 (meaning new filing) -- we do not support resuming a draft filing
     this.filingId = +this.$route.params.filingId // number or NaN
 
     // if required data isn't set, go back to dashboard
-    if (!this.getIdentifier || isNaN(this.filingId)) {
+    if (!this.getIdentifier || this.filingId !== 0) {
       this.$router.push({ name: Routes.DASHBOARD })
     }
   }
 
   /** Called when component is mounted. */
-  async mounted (): Promise<void> {
-    // wait until entire view is rendered (including all child components)
-    // see https://v3.vuejs.org/api/options-lifecycle-hooks.html#mounted
-    await this.$nextTick()
-
-    if (this.filingId > 0) {
-      this.loadingMessage = `Resuming Your Request for AGM Extension`
-    } else {
-      this.loadingMessage = `Preparing Your Request for AGM Extension`
+  mounted (): void {
+    this.data.currentDate = this.getCurrentDate
+    this.data.isGoodStanding = this.isGoodStanding
+    this.data.incorporationDate = this.getFoundingDate
+
+    // Pre-populate the certified block with the logged in user's name (if not staff)
+    if (!this.isRoleStaff && this.getUserInfo) {
+      this.certifiedBy = this.getUserInfo.firstname + ' ' + this.getUserInfo.lastname
     }
 
-    // fetch draft (which may overwrite some properties)
-    if (this.filingId > 0) {
-      await this.fetchDraftFiling()
-    }
-
-    this.dataLoaded = true
-
-    // always include consent continue out code
-    // use existing Priority and Waive Fees flags
-    this.updateFilingData('add', FilingCodes.AGM_EXTENSION, this.staffPaymentData.isPriority,
-      (this.staffPaymentData.option === StaffPaymentOptions.NO_FEE))
-  }
-
-  /** Fetches the draft consent filing. */
-  async fetchDraftFiling (): Promise<void> {
-    const url = `businesses/${this.getIdentifier}/filings/${this.filingId}`
-    await LegalServices.fetchFiling(url).then(filing => {
-      // verify data
-      if (!filing) throw new Error('Missing filing')
-      if (!filing.header) throw new Error('Missing header')
-      if (!filing.business) throw new Error('Missing business')
-      if (!filing.agmExtension) throw new Error('Missing agm extension object')
-      if (filing.header.name !== FilingTypes.AGM_EXTENSION) throw new Error('Invalid filing type')
-      if (filing.header.status !== FilingStatus.DRAFT) throw new Error('Invalid filing status')
-      if (filing.business.identifier !== this.getIdentifier) throw new Error('Invalid business identifier')
-      if (filing.business.legalName !== this.getLegalName) throw new Error('Invalid business legal name')
-
-      // load Certified By (but not Date)
-      this.certifiedBy = filing.header.certifiedBy
-
-      // load Staff Payment properties
-      if (filing.header.routingSlipNumber) {
-        this.staffPaymentData = {
-          option: StaffPaymentOptions.FAS,
-          routingSlipNumber: filing.header.routingSlipNumber,
-          isPriority: filing.header.priority
-        } as StaffPaymentIF
-      } else if (filing.header.bcolAccountNumber) {
-        this.staffPaymentData = {
-          option: StaffPaymentOptions.BCOL,
-          bcolAccountNumber: filing.header.bcolAccountNumber,
-          datNumber: filing.header.datNumber,
-          folioNumber: filing.header.folioNumber,
-          isPriority: filing.header.priority
-        } as StaffPaymentIF
-      } else if (filing.header.waiveFees) {
-        this.staffPaymentData = {
-          option: StaffPaymentOptions.NO_FEE
-        } as StaffPaymentIF
-      } else {
-        this.staffPaymentData = {
-          option: StaffPaymentOptions.NONE
-        } as StaffPaymentIF
-      }
-    }).catch(error => {
-      // eslint-disable-next-line no-console
-      console.log('fetchDraftFiling() error =', error)
-      this.resumeErrorDialog = true
-    })
-  }
-
-  /**
-   * Called when user clicks Save button
-   * or when user retries from Save Error dialog.
-   */
-  async onClickSave (): Promise<void> {
-    // prevent double saving
-    if (this.busySaving) return
-
-    this.saving = true
-
-    // save draft filing
-    this.savedFiling = await this.saveFiling(true).catch(error => {
-      this.saveErrorReason = SaveErrorReasons.SAVE
-      // try to return filing (which may exist depending on save error)
-      return error?.response?.data?.filing || null
-    })
-
-    const filingId = +this.savedFiling?.header?.filingId || 0
-    if (filingId > 0) {
-      // save filing ID for possible future updates
-      this.filingId = filingId
-    }
-
-    // if there was no error, finish save process now
-    // otherwise, dialog may finish this later
-    if (!this.saveErrorReason) this.onClickSaveFinish()
-
-    this.saving = false
-  }
-
-  onClickSaveFinish (): void {
-    // safety check
-    if (this.filingId > 0) {
-      // changes were saved, so clear flag
-      this.haveChanges = false
-    } else {
-      // eslint-disable-next-line no-console
-      console.log('onClickSaveFinish(): invalid filing ID, filing =', null)
-    }
-  }
-
-  /**
-   * Called when user clicks Save and Resume later button
-   * or when user retries from Save Error dialog.
-   */
-  async onClickSaveResume (): Promise<void> {
-    // prevent double saving
-    if (this.busySaving) return
-
-    this.savingResuming = true
-
-    // save draft filing
-    this.savedFiling = await this.saveFiling(true).catch(error => {
-      this.saveErrorReason = SaveErrorReasons.SAVE_RESUME
-      // try to return filing (which may exist depending on save error)
-      return error?.response?.data?.filing || null
-    })
-
-    const filingId = +this.savedFiling?.header?.filingId || 0
-    if (filingId > 0) {
-      // save filing ID for possible future updates
-      this.filingId = filingId
-    }
-
-    // if there was no error, finish save-resume process now
-    // otherwise, dialog may finish this later
-    if (!this.saveErrorReason) this.onClickSaveResumeFinish()
-
-    this.savingResuming = false
-  }
-
-  onClickSaveResumeFinish (): void {
-    // safety check
-    if (this.filingId > 0) {
-      // changes were saved, so go to dashboard
-      this.goToDashboard(true)
-    } else {
-      // eslint-disable-next-line no-console
-      console.log('onClickSaveResumeFinish(): invalid filing ID, filing =', null)
-    }
+    // always include agm extension code
+    // (no Priority flag and no Waive Fees flag)
+    this.updateFilingData('add', FilingCodes.AGM_EXTENSION, undefined, undefined)
   }
 
   /**
    * Called when user clicks File and Pay button
-   * or when user retries from Save Error dialog
-   * or when user submits from Staff Payment dialog.
+   * or when user retries from Save Error dialog.
    */
-  async onClickFilePay (fromStaffPayment = false): Promise<void> {
+  async onClickFilePay (): Promise<void> {
     // if there is an invalid component, scroll to it
     if (!this.isPageValid) {
       this.showErrors = true
-      // *** TODO: check for section errors here
-      if (!this.extensionEligibilityValid) {
-        // Show error message of detail comment text area if invalid
-        // this.$refs.detailCommentRef.$refs.textarea.error = true
+      //
+      // FUTURE: check for section errors here
+      //
+      if (!this.extensionRequestValid) {
+        // nothing to do here -- "showErrors" will do it all
       }
       if (!this.certifyFormValid) {
         // Show error message of legal name text field if invalid
@@ -659,16 +319,15 @@ export default class AgmExtension extends Mixins(CommonMixin, DateMixin,
       return
     }
 
-    // prevent double saving
-    if (this.busySaving) return
-
-    // if this is a staff user clicking File and Pay (not Submit)
-    // then detour via Staff Payment dialog
-    if (this.isRoleStaff && !fromStaffPayment) {
-      this.staffPaymentDialog = true
+    // if not eligible, display dialog
+    if (!this.data.isEligible) {
+      this.notEligibleExtensionDialog = true
       return
     }
 
+    // prevent double saving
+    if (this.busySaving) return
+
     this.filingPaying = true
 
     // save final filing (not draft)
@@ -749,33 +408,12 @@ export default class AgmExtension extends Mixins(CommonMixin, DateMixin,
 
     const header: any = {
       header: {
-        name: FilingTypes.CONSENT_CONTINUATION_OUT,
+        name: FilingTypes.AGM_EXTENSION,
         certifiedBy: this.certifiedBy || '',
         date: this.getCurrentDate // NB: API will reassign this date according to its clock
       }
     }
 
-    switch (this.staffPaymentData.option) {
-      case StaffPaymentOptions.FAS:
-        header.header['routingSlipNumber'] = this.staffPaymentData.routingSlipNumber
-        header.header['priority'] = this.staffPaymentData.isPriority
-        break
-
-      case StaffPaymentOptions.BCOL:
-        header.header['bcolAccountNumber'] = this.staffPaymentData.bcolAccountNumber
-        header.header['datNumber'] = this.staffPaymentData.datNumber
-        header.header['folioNumber'] = this.staffPaymentData.folioNumber
-        header.header['priority'] = this.staffPaymentData.isPriority
-        break
-
-      case StaffPaymentOptions.NO_FEE:
-        header.header['waiveFees'] = true
-        break
-
-      case StaffPaymentOptions.NONE: // should never happen
-        break
-    }
-
     const business: any = {
       business: {
         foundingDate: this.dateToApi(this.getFoundingDate),
@@ -787,7 +425,20 @@ export default class AgmExtension extends Mixins(CommonMixin, DateMixin,
 
     const data: any = {
       [FilingTypes.AGM_EXTENSION]: {
-        // properties go here
+        // convert local properties into API/schema properties
+        year: this.data.agmYear,
+        isFirstAgm: this.data.isFirstAgm,
+        extReqForAgmYear: this.data.isPrevExtension,
+        intendedAgmDate: this.data.intendedAgmDate,
+        totalApprovedExt: this.getTotalAgmExtensionDuration(Number(this.data.agmYear)) + this.data.extensionDuration,
+        expireDateApprovedExt: this.data.agmDueDate,
+        // conditionally add properties if not null
+        ...(this.data.prevAgmDate && { prevAgmRefDate: this.data.prevAgmDate }),
+        ...(this.data.prevExpiryDate && {
+          expireDateCurrExt: this.data.prevExpiryDate
+        }),
+        // add in remaining local properties for future auditing
+        ...this.data
       }
     }
 
@@ -803,7 +454,7 @@ export default class AgmExtension extends Mixins(CommonMixin, DateMixin,
         ret = await LegalServices.createFiling(this.getIdentifier, filing, isDraft)
       }
       return ret
-    } catch (error) {
+    } catch (error: any) {
       // save errors or warnings, if any
       this.saveErrors = error?.response?.data?.errors || []
       this.saveWarnings = error?.response?.data?.warnings || []
@@ -862,76 +513,28 @@ export default class AgmExtension extends Mixins(CommonMixin, DateMixin,
     }
   }
 
-  /** Handles Retry events from Save Error dialog. */
-  async onSaveErrorDialogRetry (): Promise<void> {
-    switch (this.saveErrorReason) {
-      case SaveErrorReasons.SAVE:
-        // close the dialog and retry save
-        this.saveErrorReason = null
-        await this.onClickSave()
-        break
-      case SaveErrorReasons.SAVE_RESUME:
-        // close the dialog and retry save-resume
-        this.saveErrorReason = null
-        await this.onClickSaveResume()
-        break
-      case SaveErrorReasons.FILE_PAY:
-        // close the dialog and retry file-pay
-        this.saveErrorReason = null
-        if (this.isRoleStaff) await this.onClickFilePay(true)
-        else await this.onClickFilePay()
-        break
-    }
-  }
-
-  /** Handles Okay events from Save Error dialog. */
-  onSaveErrorDialogOkay (): void {
-    switch (this.saveErrorReason) {
-      case SaveErrorReasons.SAVE:
-        // close the dialog and finish save process
-        this.saveErrorReason = null
-        this.onClickSaveFinish()
-        break
-      case SaveErrorReasons.SAVE_RESUME:
-        // close the dialog and finish save-resume process
-        this.saveErrorReason = null
-        this.onClickSaveResumeFinish()
-        break
-      case SaveErrorReasons.FILE_PAY:
-        // close the dialog and finish file-pay process
-        this.saveErrorReason = null
-        this.onClickFilePayFinish()
-        break
-    }
-  }
-
   /** Array of valid components. Must match validFlags. */
   readonly validComponents = [
-    'extension-eligibility-section',
+    'extension-request',
     'certify-form-section'
   ]
 
   /** Object of valid flags. Must match validComponents. */
   get validFlags (): object {
     return {
-      extensionEligibility: this.extensionEligibilityValid,
+      extensionEligibility: this.extensionRequestValid,
       certifyForm: this.certifyFormValid
     }
   }
 
-  @Watch('extensionEligibilityValid')
-  @Watch('certifyFormValid')
-  onHaveChanges (): void {
-    this.haveChanges = true
-  }
-
-  @Watch('staffPaymentData')
-  onStaffPaymentDataChanged (val: StaffPaymentIF): void {
-    const waiveFees = (val.option === StaffPaymentOptions.NO_FEE)
-
-    // add Waive Fees flag to all filing codes
-    this.updateFilingData('add', FilingCodes.CONSENT_CONTINUATION_OUT, val.isPriority, waiveFees)
-
+  /** Watches all data properties to keep track of changes. */
+  @Watch('data.isFirstAgm')
+  @Watch('data.agmYear')
+  @Watch('data.prevAgmDate')
+  @Watch('data.isPrevExtension')
+  @Watch('data.prevExpiryDate')
+  @Watch('data.intendedAgmDate')
+  private onHaveChanges (): void {
     this.haveChanges = true
   }
 }
@@ -951,17 +554,6 @@ h2::before {
   content: counter(header-counter) '. ';
 }
 
-article {
-  .v-card {
-    line-height: 1.2rem;
-    font-size: $px-14;
-  }
-}
-
-section + section {
-  margin-top: 3rem;
-}
-
 h1 {
   margin-bottom: 1.25rem;
   line-height: 2rem;
@@ -974,40 +566,18 @@ h2 {
   font-size: 1.125rem;
 }
 
-strong {
-  color: $gray9;
-}
-
 // Save & Filing Buttons
 #buttons-container {
   padding-top: 2rem;
   border-top: 1px solid $gray5;
 
-  .buttons-left {
-    width: 50%;
-  }
-
   .buttons-right {
     margin-left: auto;
   }
-
-  .v-btn + .v-btn {
-    margin-left: 0.5rem;
-  }
-
-  #consent-cancel-btn {
-    margin-left: 0.5rem;
-  }
 }
 
 // Fix font size and color to stay consistent.
 :deep() {
-  .invalid-extension-eligibility {
-    .title-label {
-      color: $app-red;
-    }
-  }
-
   .certify-clause, .certify-stmt, .grey-text {
     color: $gray7;
   }
diff --git a/src/views/AgmLocationChg.vue b/src/views/AgmLocationChg.vue
index 547486b84..39f336eda 100644
--- a/src/views/AgmLocationChg.vue
+++ b/src/views/AgmLocationChg.vue
@@ -14,57 +14,8 @@
       @exit="onPaymentErrorDialogExit()"
     />
 
-    <ResumeErrorDialog
-      attach="#agm-location-chg"
-      :dialog="resumeErrorDialog"
-      @exit="goToDashboard(true)"
-    />
-
-    <SaveErrorDialog
-      attach="#agm-location-chg"
-      filingName="AGM Location Change"
-      :dialog="!!saveErrorReason"
-      :disableRetry="busySaving"
-      :errors="saveErrors"
-      :warnings="saveWarnings"
-      @exit="saveErrorReason=null"
-      @retry="onSaveErrorDialogRetry()"
-      @okay="onSaveErrorDialogOkay()"
-    />
-
-    <StaffPaymentDialog
-      :staffPaymentData.sync="staffPaymentData"
-      attach="#agm-location-chg"
-      :dialog="staffPaymentDialog"
-      :loading="filingPaying"
-      @exit="staffPaymentDialog=false"
-      @submit="onClickFilePay(true)"
-    />
-
-    <!-- Initial Page Load Transition -->
-    <v-fade-transition>
-      <div
-        v-show="showLoadingContainer"
-        class="loading-container"
-      >
-        <div class="loading__content">
-          <v-progress-circular
-            color="primary"
-            :size="50"
-            indeterminate
-          />
-          <div class="loading-msg">
-            {{ loadingMessage }}
-          </div>
-        </div>
-      </div>
-    </v-fade-transition>
-
     <!-- Main Body -->
-    <v-container
-      v-if="dataLoaded"
-      class="view-container"
-    >
+    <v-container class="view-container">
       <v-row>
         <v-col
           cols="12"
@@ -78,47 +29,148 @@
               </h1>
             </header>
 
-            <ExpandableHelp helpLabel="Help with Annual General Meeting Extension">
+            <!-- Help -->
+            <ExpandableHelp helpLabel="Help with Annual General Meeting Location Change">
               <template #content>
-                Help text, or sub-component, goes here.
+                <h3 class="text-center">
+                  AGM Location Change Help
+                </h3>
+                <div class="mt-6">
+                  <p class="ml-1">
+                    Generally, company meetings must be in British Columbia (BC). However, there are exceptions to
+                    this rule. A company must request a location change if the meeting will be fully or partially
+                    in-person and none of the exceptions listed below apply. Partially in-person meetings combine
+                    both in-person and online participation. The location change request only applies to
+                    the in-person participants.
+                    <br><br>
+                    Exceptions to the requirement for a location change request include the following:
+                    <br><br>
+                    <ul>
+                      <li>The meeting will be fully online;</li>
+                      <li>The company's articles permit a location outside BC;</li>
+                      <li>
+                        Nothing in the articles restrict a location change approved by
+                        resolution or by ordinary resolution, as the case may be.
+                      </li>
+                    </ul>
+                  </p>
+                </div>
               </template>
             </ExpandableHelp>
 
             <!-- Main Section -->
             <section class="mt-8">
               <header>
-                <h2>Section Title</h2>
+                <h2>Location Change Detail</h2>
                 <p class="grey-text">
-                  Section subtext.
+                  Enter the calendar year the AGM is for and AGM location outside B.C.
                 </p>
               </header>
 
-              <div
-                id="main-section"
-                :class="{ 'invalid-section': !sectionValid && showErrors }"
-              >
-                <v-card
-                  flat
-                  class="py-4 px-5"
-                >
-                  <v-row
-                    no-gutters
-                    class="my-4"
+              <div>
+                <v-card flat>
+                  <!-- AGM Year -->
+                  <div
+                    id="agm-year-section"
+                    :class="{ 'invalid-section': !agmYearValid && showErrors }"
                   >
-                    <v-col
-                      cols="12"
-                      sm="3"
-                      class="pr-4"
+                    <v-row
+                      no-gutters
+                      class="pt-8 pb-2"
                     >
-                      <strong :class="{ 'app-red': !sectionValid && showErrors }">Subtitle</strong>
-                    </v-col>
-                    <v-col
-                      cols="12"
-                      sm="9"
+                      <v-col
+                        cols="12"
+                        sm="3"
+                        class="pl-4"
+                      >
+                        <strong :class="{ 'app-red': !agmYearValid && showErrors }">AGM Year</strong>
+                      </v-col>
+                      <v-col
+                        cols="12"
+                        sm="4"
+                      >
+                        <AgmYear
+                          v-model="agmYear"
+                          :validateForm="showErrors"
+                          label="AGM year"
+                          :rules="agmYearRules"
+                          @valid="agmYearValid=$event"
+                        />
+                      </v-col>
+                    </v-row>
+                  </div>
+
+                  <v-divider />
+
+                  <!-- Reason -->
+                  <div
+                    id="reason-section"
+                    :class="{ 'invalid-section': !reasonValid && showErrors }"
+                  >
+                    <v-row
+                      no-gutters
+                      class="py-6"
+                    >
+                      <v-col
+                        cols="12"
+                        sm="3"
+                        class="pl-4 pt-4"
+                      >
+                        <strong :class="{ 'app-red': !reasonValid && showErrors }">Reason</strong>
+                      </v-col>
+                      <v-col
+                        cols="12"
+                        sm="8"
+                      >
+                        <DetailComment
+                          v-model="reason"
+                          :class="{ 'invalid-component': !reasonValid && showErrors }"
+                          placeholder="Reason"
+                          maxLength="2000"
+                          textRequiredErrorMsg="Reason is required."
+                          :validateForm="showErrors"
+                          @valid="reasonValid=$event"
+                        />
+                      </v-col>
+                    </v-row>
+                  </div>
+
+                  <v-divider />
+
+                  <!-- Location address -->
+                  <div
+                    id="location-section"
+                    :class="{ 'invalid-section': !agmLocationValid && showErrors }"
+                  >
+                    <v-row
+                      no-gutters
+                      class="pt-6"
                     >
-                      Section content goes here.
-                    </v-col>
-                  </v-row>
+                      <v-col
+                        cols="12"
+                        sm="3"
+                        class="pl-4 pt-4"
+                      >
+                        <strong :class="{ 'app-red': !agmLocationValid && showErrors }">AGM Location</strong>
+                      </v-col>
+                      <v-col
+                        cols="12"
+                        sm="8"
+                      >
+                        <p>
+                          Enter the AGM location not in B.C. Include the city, province or state equivalent,
+                          and country. E.g. "Red Deer, Alberta, Canada"
+                        </p>
+                        <AgmLocation
+                          v-model="agmLocation"
+                          :rules="agmLocationRules"
+                          :validateForm="showErrors"
+                          @update:agmLocation="agmLocation=$event"
+                          @valid="agmLocationValid=$event"
+                        />
+                      </v-col>
+                    </v-row>
+                  </div>
                 </v-card>
               </div>
             </section>
@@ -140,8 +192,9 @@
                   :isCertified.sync="isCertified"
                   :certifiedBy.sync="certifiedBy"
                   :class="{ 'invalid-certify': !certifyFormValid && showErrors }"
+                  :disableEdit="!isRoleStaff"
                   :entityDisplay="displayName()"
-                  :message="certifyText(FilingCodes.ANNUAL_REPORT_OT)"
+                  :message="certifyText(FilingCodes.AGM_LOCATION_CHANGE)"
                   @valid="certifyFormValid=$event"
                 />
               </div>
@@ -175,27 +228,6 @@
       id="buttons-container"
       class="list-item"
     >
-      <div class="buttons-left">
-        <v-btn
-          id="consent-save-btn"
-          large
-          :disabled="busySaving"
-          :loading="saving"
-          @click="onClickSave()"
-        >
-          <span>Save</span>
-        </v-btn>
-        <v-btn
-          id="consent-save-resume-btn"
-          large
-          :disabled="busySaving"
-          :loading="savingResuming"
-          @click="onClickSaveResume()"
-        >
-          <span>Save and Resume Later</span>
-        </v-btn>
-      </div>
-
       <div class="buttons-right">
         <v-tooltip
           top
@@ -208,7 +240,7 @@
               v-on="on"
             >
               <v-btn
-                id="consent-file-pay-btn"
+                id="agm-loctn-chg-file-pay-btn"
                 color="primary"
                 large
                 :disabled="busySaving"
@@ -224,7 +256,7 @@
         </v-tooltip>
 
         <v-btn
-          id="consent-cancel-btn"
+          id="agm-loctn-chg-cancel-btn"
           large
           :disabled="busySaving"
           @click="goToDashboard()"
@@ -242,27 +274,27 @@ import { Getter } from 'pinia-class'
 import { StatusCodes } from 'http-status-codes'
 import { navigate } from '@/utils'
 import SbcFeeSummary from 'sbc-common-components/src/components/SbcFeeSummary.vue'
-import { ExpandableHelp } from '@bcrs-shared-components/expandable-help'
-import { Certify } from '@/components/common'
-import { ConfirmDialog, PaymentErrorDialog, ResumeErrorDialog, SaveErrorDialog, StaffPaymentDialog }
-  from '@/components/dialogs'
+import { Certify, DetailComment } from '@/components/common'
+import { ConfirmDialog, PaymentErrorDialog } from '@/components/dialogs'
 import { CommonMixin, DateMixin, EnumMixin, FilingMixin, ResourceLookupMixin } from '@/mixins'
+import { ExpandableHelp } from '@bcrs-shared-components/expandable-help'
 import { LegalServices } from '@/services/'
-import { FilingCodes, FilingStatus, FilingTypes, Routes, SaveErrorReasons, StaffPaymentOptions }
-  from '@/enums'
-import { ConfirmDialogType, StaffPaymentIF } from '@/interfaces'
+import { FilingCodes, FilingTypes, Routes, SaveErrorReasons } from '@/enums'
+import { ConfirmDialogType } from '@/interfaces'
 import { useBusinessStore, useConfigurationStore, useRootStore } from '@/stores'
+import AgmLocation from '@/components/AgmLocationChange/AgmLocation.vue'
+import AgmYear from '@/components/AgmLocationChange/AgmYear.vue'
 
 @Component({
   components: {
+    AgmLocation,
+    AgmYear,
     Certify,
     ConfirmDialog,
+    DetailComment,
     ExpandableHelp,
     PaymentErrorDialog,
-    ResumeErrorDialog,
-    SaveErrorDialog,
-    SbcFeeSummary,
-    StaffPaymentDialog
+    SbcFeeSummary
   }
 })
 export default class AgmLocationChg extends Mixins(CommonMixin, DateMixin,
@@ -276,49 +308,41 @@ export default class AgmLocationChg extends Mixins(CommonMixin, DateMixin,
   @Getter(useConfigurationStore) getAuthWebUrl!: string
   @Getter(useBusinessStore) getLegalName!: string
   @Getter(useConfigurationStore) getPayApiUrl!: string
+  @Getter(useRootStore) getUserInfo!: any
   @Getter(useRootStore) isRoleStaff!: boolean
 
   // enum for template
   readonly FilingCodes = FilingCodes
 
   // variables for main section
-  sectionValid = false
+  agmLocation = ''
+  agmLocationValid = false
+  agmYear = ''
+  agmYearValid = false
 
   // variables for Certify component
   certifiedBy = ''
   isCertified = false
   certifyFormValid = false
 
-  // variables for staff payment
-  staffPaymentData = { option: StaffPaymentOptions.NONE } as StaffPaymentIF
-  staffPaymentDialog = false
+  // variables for DetailComment component
+  reason = ''
+  reasonValid = false
 
   // variables for displaying dialogs
-  resumeErrorDialog = false
   saveErrorReason: SaveErrorReasons = null
   paymentErrorDialog = false
 
   // other variables
   totalFee = 0
-  dataLoaded = false
-  loadingMessage = ''
-  filingId = 0 // id of this consent to continuation out filing
+  filingId = 0 // id of this agm location change filing
   savedFiling: any = null // filing during save
-  saving = false // true only when saving
-  savingResuming = false // true only when saving and resuming
   showErrors = false // true when we press on File and Pay (trigger validation)
   filingPaying = false // true only when filing and paying
   haveChanges = false
   saveErrors = []
   saveWarnings = []
 
-  /** True if loading container should be shown, else False. */
-  get showLoadingContainer (): boolean {
-    // show loading container when data isn't yet loaded and when
-    // no dialogs are displayed (otherwise dialogs may be hidden)
-    return (!this.dataLoaded && !this.saveErrorReason && !this.paymentErrorDialog)
-  }
-
   /** The Base URL string. */
   get baseUrl (): string {
     return sessionStorage.getItem('BASE_URL')
@@ -326,12 +350,12 @@ export default class AgmLocationChg extends Mixins(CommonMixin, DateMixin,
 
   /** True if page is valid, else False. */
   get isPageValid (): boolean {
-    return (this.sectionValid && this.certifyFormValid)
+    return (this.agmLocationValid && this.agmYearValid && this.certifyFormValid && this.reasonValid)
   }
 
   /** True when saving, saving and resuming, or filing and paying. */
   get busySaving (): boolean {
-    return (this.saving || this.savingResuming || this.filingPaying)
+    return (this.filingPaying)
   }
 
   /** True if payment is required, else False. */
@@ -340,6 +364,33 @@ export default class AgmLocationChg extends Mixins(CommonMixin, DateMixin,
     return (this.totalFee > 0)
   }
 
+  /** Array of validations rules for AGM location. */
+  get agmLocationRules (): Array<(val) => boolean | string> {
+    const rules = [] as Array<(val) => boolean | string>
+    rules.push(val => !!val || 'AGM location is required.')
+    rules.push(val => (val.length <= 400) || 'Must be 400 characters or less.')
+    return rules
+  }
+
+  /** Array of validations rules for AGM year. */
+  get agmYearRules (): Array<(val) => boolean | string> {
+    const rules = [] as Array<(val) => boolean | string>
+    rules.push(val => !!val || 'AGM year is required.')
+    rules.push(val => (val && +val <= this.maxAgmYear) || 'Must be on or before ' + this.maxAgmYear)
+    rules.push(val => (val && +val >= this.minAgmYear) || 'Must be on or after ' + this.minAgmYear)
+    return rules
+  }
+
+  get minAgmYear () : number {
+    const today = new Date()
+    return (today.getFullYear() - 2)
+  }
+
+  get maxAgmYear () : number {
+    const today = new Date()
+    return (today.getFullYear() + 1)
+  }
+
   /** Called when component is created. */
   created (): void {
     // init
@@ -355,185 +406,35 @@ export default class AgmLocationChg extends Mixins(CommonMixin, DateMixin,
     }
 
     // this is the id of THIS filing
-    // if 0, this is a new filing
-    // otherwise it's a draft filing
+    // it must be 0 (meaning new filing) -- we do not support resuming a draft filing
     this.filingId = +this.$route.params.filingId // number or NaN
 
     // if required data isn't set, go back to dashboard
-    if (!this.getIdentifier || isNaN(this.filingId)) {
+    if (!this.getIdentifier || this.filingId !== 0) {
       this.$router.push({ name: Routes.DASHBOARD })
     }
   }
 
   /** Called when component is mounted. */
-  async mounted (): Promise<void> {
-    // wait until entire view is rendered (including all child components)
-    // see https://v3.vuejs.org/api/options-lifecycle-hooks.html#mounted
-    await this.$nextTick()
-
-    if (this.filingId > 0) {
-      this.loadingMessage = `Resuming Your Request for AGM Location Change`
-    } else {
-      this.loadingMessage = `Preparing Your Request for AGM Location Change`
+  mounted (): void {
+    // Pre-populate the certified block with the logged in user's name (if not staff)
+    if (!this.isRoleStaff && this.getUserInfo) {
+      this.certifiedBy = this.getUserInfo.firstname + ' ' + this.getUserInfo.lastname
     }
 
-    // fetch draft (which may overwrite some properties)
-    if (this.filingId > 0) {
-      await this.fetchDraftFiling()
-    }
-
-    this.dataLoaded = true
-
-    // always include consent continue out code
-    // use existing Priority and Waive Fees flags
-    this.updateFilingData('add', FilingCodes.AGM_LOCATION_CHG, this.staffPaymentData.isPriority,
-      (this.staffPaymentData.option === StaffPaymentOptions.NO_FEE))
-  }
-
-  /** Fetches the draft consent filing. */
-  async fetchDraftFiling (): Promise<void> {
-    const url = `businesses/${this.getIdentifier}/filings/${this.filingId}`
-    await LegalServices.fetchFiling(url).then(filing => {
-      // verify data
-      if (!filing) throw new Error('Missing filing')
-      if (!filing.header) throw new Error('Missing header')
-      if (!filing.business) throw new Error('Missing business')
-      if (!filing.agmLocationChg) throw new Error('Missing agm location chg object')
-      if (filing.header.name !== FilingTypes.AGM_LOCATION_CHG) throw new Error('Invalid filing type')
-      if (filing.header.status !== FilingStatus.DRAFT) throw new Error('Invalid filing status')
-      if (filing.business.identifier !== this.getIdentifier) throw new Error('Invalid business identifier')
-      if (filing.business.legalName !== this.getLegalName) throw new Error('Invalid business legal name')
-
-      // load Certified By (but not Date)
-      this.certifiedBy = filing.header.certifiedBy
-
-      // load Staff Payment properties
-      if (filing.header.routingSlipNumber) {
-        this.staffPaymentData = {
-          option: StaffPaymentOptions.FAS,
-          routingSlipNumber: filing.header.routingSlipNumber,
-          isPriority: filing.header.priority
-        } as StaffPaymentIF
-      } else if (filing.header.bcolAccountNumber) {
-        this.staffPaymentData = {
-          option: StaffPaymentOptions.BCOL,
-          bcolAccountNumber: filing.header.bcolAccountNumber,
-          datNumber: filing.header.datNumber,
-          folioNumber: filing.header.folioNumber,
-          isPriority: filing.header.priority
-        } as StaffPaymentIF
-      } else if (filing.header.waiveFees) {
-        this.staffPaymentData = {
-          option: StaffPaymentOptions.NO_FEE
-        } as StaffPaymentIF
-      } else {
-        this.staffPaymentData = {
-          option: StaffPaymentOptions.NONE
-        } as StaffPaymentIF
-      }
-    }).catch(error => {
-      // eslint-disable-next-line no-console
-      console.log('fetchDraftFiling() error =', error)
-      this.resumeErrorDialog = true
-    })
-  }
-
-  /**
-   * Called when user clicks Save button
-   * or when user retries from Save Error dialog.
-   */
-  async onClickSave (): Promise<void> {
-    // prevent double saving
-    if (this.busySaving) return
-
-    this.saving = true
-
-    // save draft filing
-    this.savedFiling = await this.saveFiling(true).catch(error => {
-      this.saveErrorReason = SaveErrorReasons.SAVE
-      // try to return filing (which may exist depending on save error)
-      return error?.response?.data?.filing || null
-    })
-
-    const filingId = +this.savedFiling?.header?.filingId || 0
-    if (filingId > 0) {
-      // save filing ID for possible future updates
-      this.filingId = filingId
-    }
-
-    // if there was no error, finish save process now
-    // otherwise, dialog may finish this later
-    if (!this.saveErrorReason) this.onClickSaveFinish()
-
-    this.saving = false
-  }
-
-  onClickSaveFinish (): void {
-    // safety check
-    if (this.filingId > 0) {
-      // changes were saved, so clear flag
-      this.haveChanges = false
-    } else {
-      // eslint-disable-next-line no-console
-      console.log('onClickSaveFinish(): invalid filing ID, filing =', null)
-    }
-  }
-
-  /**
-   * Called when user clicks Save and Resume later button
-   * or when user retries from Save Error dialog.
-   */
-  async onClickSaveResume (): Promise<void> {
-    // prevent double saving
-    if (this.busySaving) return
-
-    this.savingResuming = true
-
-    // save draft filing
-    this.savedFiling = await this.saveFiling(true).catch(error => {
-      this.saveErrorReason = SaveErrorReasons.SAVE_RESUME
-      // try to return filing (which may exist depending on save error)
-      return error?.response?.data?.filing || null
-    })
-
-    const filingId = +this.savedFiling?.header?.filingId || 0
-    if (filingId > 0) {
-      // save filing ID for possible future updates
-      this.filingId = filingId
-    }
-
-    // if there was no error, finish save-resume process now
-    // otherwise, dialog may finish this later
-    if (!this.saveErrorReason) this.onClickSaveResumeFinish()
-
-    this.savingResuming = false
-  }
-
-  onClickSaveResumeFinish (): void {
-    // safety check
-    if (this.filingId > 0) {
-      // changes were saved, so go to dashboard
-      this.goToDashboard(true)
-    } else {
-      // eslint-disable-next-line no-console
-      console.log('onClickSaveResumeFinish(): invalid filing ID, filing =', null)
-    }
+    // always include agm location change code
+    // (no Priority flag and no Waive Fees flag)
+    this.updateFilingData('add', FilingCodes.AGM_LOCATION_CHANGE, undefined, undefined)
   }
 
   /**
    * Called when user clicks File and Pay button
-   * or when user retries from Save Error dialog
-   * or when user submits from Staff Payment dialog.
+   * or when user retries from Save Error dialog.
    */
-  async onClickFilePay (fromStaffPayment = false): Promise<void> {
+  async onClickFilePay (): Promise<void> {
     // if there is an invalid component, scroll to it
     if (!this.isPageValid) {
       this.showErrors = true
-      // *** TODO: check for section errors here
-      if (!this.sectionValid) {
-        // Show error message of detail comment text area if invalid
-        // this.$refs.detailCommentRef.$refs.textarea.error = true
-      }
       if (!this.certifyFormValid) {
         // Show error message of legal name text field if invalid
         this.$refs.certifyRef.$refs.certifyTextfieldRef.error = true
@@ -545,13 +446,6 @@ export default class AgmLocationChg extends Mixins(CommonMixin, DateMixin,
     // prevent double saving
     if (this.busySaving) return
 
-    // if this is a staff user clicking File and Pay (not Submit)
-    // then detour via Staff Payment dialog
-    if (this.isRoleStaff && !fromStaffPayment) {
-      this.staffPaymentDialog = true
-      return
-    }
-
     this.filingPaying = true
 
     // save final filing (not draft)
@@ -632,33 +526,12 @@ export default class AgmLocationChg extends Mixins(CommonMixin, DateMixin,
 
     const header: any = {
       header: {
-        name: FilingTypes.CONSENT_CONTINUATION_OUT,
+        name: FilingTypes.AGM_LOCATION_CHANGE,
         certifiedBy: this.certifiedBy || '',
         date: this.getCurrentDate // NB: API will reassign this date according to its clock
       }
     }
 
-    switch (this.staffPaymentData.option) {
-      case StaffPaymentOptions.FAS:
-        header.header['routingSlipNumber'] = this.staffPaymentData.routingSlipNumber
-        header.header['priority'] = this.staffPaymentData.isPriority
-        break
-
-      case StaffPaymentOptions.BCOL:
-        header.header['bcolAccountNumber'] = this.staffPaymentData.bcolAccountNumber
-        header.header['datNumber'] = this.staffPaymentData.datNumber
-        header.header['folioNumber'] = this.staffPaymentData.folioNumber
-        header.header['priority'] = this.staffPaymentData.isPriority
-        break
-
-      case StaffPaymentOptions.NO_FEE:
-        header.header['waiveFees'] = true
-        break
-
-      case StaffPaymentOptions.NONE: // should never happen
-        break
-    }
-
     const business: any = {
       business: {
         foundingDate: this.dateToApi(this.getFoundingDate),
@@ -669,8 +542,10 @@ export default class AgmLocationChg extends Mixins(CommonMixin, DateMixin,
     }
 
     const data: any = {
-      [FilingTypes.AGM_LOCATION_CHG]: {
-        // properties go here
+      [FilingTypes.AGM_LOCATION_CHANGE]: {
+        year: this.agmYear,
+        reason: this.reason,
+        agmLocation: this.agmLocation
       }
     }
 
@@ -686,7 +561,7 @@ export default class AgmLocationChg extends Mixins(CommonMixin, DateMixin,
         ret = await LegalServices.createFiling(this.getIdentifier, filing, isDraft)
       }
       return ret
-    } catch (error) {
+    } catch (error: any) {
       // save errors or warnings, if any
       this.saveErrors = error?.response?.data?.errors || []
       this.saveWarnings = error?.response?.data?.warnings || []
@@ -745,76 +620,32 @@ export default class AgmLocationChg extends Mixins(CommonMixin, DateMixin,
     }
   }
 
-  /** Handles Retry events from Save Error dialog. */
-  async onSaveErrorDialogRetry (): Promise<void> {
-    switch (this.saveErrorReason) {
-      case SaveErrorReasons.SAVE:
-        // close the dialog and retry save
-        this.saveErrorReason = null
-        await this.onClickSave()
-        break
-      case SaveErrorReasons.SAVE_RESUME:
-        // close the dialog and retry save-resume
-        this.saveErrorReason = null
-        await this.onClickSaveResume()
-        break
-      case SaveErrorReasons.FILE_PAY:
-        // close the dialog and retry file-pay
-        this.saveErrorReason = null
-        if (this.isRoleStaff) await this.onClickFilePay(true)
-        else await this.onClickFilePay()
-        break
-    }
-  }
-
-  /** Handles Okay events from Save Error dialog. */
-  onSaveErrorDialogOkay (): void {
-    switch (this.saveErrorReason) {
-      case SaveErrorReasons.SAVE:
-        // close the dialog and finish save process
-        this.saveErrorReason = null
-        this.onClickSaveFinish()
-        break
-      case SaveErrorReasons.SAVE_RESUME:
-        // close the dialog and finish save-resume process
-        this.saveErrorReason = null
-        this.onClickSaveResumeFinish()
-        break
-      case SaveErrorReasons.FILE_PAY:
-        // close the dialog and finish file-pay process
-        this.saveErrorReason = null
-        this.onClickFilePayFinish()
-        break
-    }
-  }
-
   /** Array of valid components. Must match validFlags. */
   readonly validComponents = [
-    'main-section',
+    'agm-year-section',
+    'reason-section',
+    'location-section',
     'certify-form-section'
   ]
 
   /** Object of valid flags. Must match validComponents. */
   get validFlags (): object {
     return {
-      mainSection: this.sectionValid,
+      // mainSection: this.sectionValid,
+      agmYear: this.agmYearValid,
+      reason: this.reasonValid,
+      location: this.agmLocationValid,
       certifyForm: this.certifyFormValid
     }
   }
 
-  @Watch('sectionValid')
-  @Watch('certifyFormValid')
-  onHaveChanges (): void {
-    this.haveChanges = true
-  }
-
-  @Watch('staffPaymentData')
-  onStaffPaymentDataChanged (val: StaffPaymentIF): void {
-    const waiveFees = (val.option === StaffPaymentOptions.NO_FEE)
-
-    // add Waive Fees flag to all filing codes
-    this.updateFilingData('add', FilingCodes.CONSENT_CONTINUATION_OUT, val.isPriority, waiveFees)
-
+  /** Watches all data properties to keep track of changes. */
+  @Watch('agmYear')
+  @Watch('agmLocation')
+  @Watch('certifiedBy')
+  @Watch('isCertified')
+  @Watch('reason')
+  private onHaveChanges (): void {
     this.haveChanges = true
   }
 }
@@ -879,19 +710,13 @@ h2 {
     margin-left: 0.5rem;
   }
 
-  #consent-cancel-btn {
+  #agm-loctn-chg-cancel-btn {
     margin-left: 0.5rem;
   }
 }
 
 // Fix font size and color to stay consistent.
 :deep() {
-  .invalid-foreign-jurisdiction {
-    .title-label {
-      color: $app-red;
-    }
-  }
-
   .certify-clause, .certify-stmt, .grey-text {
     color: $gray7;
   }
@@ -901,5 +726,23 @@ h2 {
       color: $app-red;
     }
   }
+
+  .invalid-component {
+    .title-label {
+      color: $app-red;
+    }
+  }
+
+  // Setting the top and bottom red borders (error) radii to 0.
+  .v-card > *:first-child:not(.v-btn):not(.v-chip):not(.v-avatar),
+  .v-card > .v-card__progress + *:not(.v-btn):not(.v-chip):not(.v-avatar) {
+    border-top-left-radius: 0px;
+    border-top-right-radius: 0px;
+  }
+
+  .v-card > *:last-child:not(.v-btn):not(.v-chip):not(.v-avatar) {
+    border-bottom-left-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
 }
 </style>
diff --git a/src/views/AmalgamationSelection.vue b/src/views/AmalgamationSelection.vue
new file mode 100644
index 000000000..06c277f5b
--- /dev/null
+++ b/src/views/AmalgamationSelection.vue
@@ -0,0 +1,300 @@
+<template>
+  <div id="amalgamation-selection">
+    <TechnicalErrorDialog
+      :dialog="showErrorDialog"
+      attach="#amalgamation-selection"
+      @close="showErrorDialog = false"
+    />
+
+    <!-- Main Body -->
+    <v-container class="view-container">
+      <v-row>
+        <v-col
+          cols="12"
+          lg="9"
+        >
+          <article id="main-article">
+            <!-- Page Title -->
+            <header>
+              <h1>
+                Choose the type of amalgamation to be filed.
+              </h1>
+              <p>
+                Choose the appropriate one for your filing.
+              </p>
+            </header>
+          </article>
+        </v-col>
+      </v-row>
+
+      <v-row>
+        <!-- First Choice -->
+        <v-col>
+          <v-card
+            id="start-horizontal-short-form-card"
+            flat
+            class="pa-8"
+          >
+            <h2>
+              Horizontal short-form amalgamation
+            </h2>
+            <br>
+            <p>
+              A <strong>horizontal short-form amalgamation</strong> can be used if the amalgamating
+              corporations are all wholly owned subsidiaries of the same holding body corporate.
+            </p>
+            <p>To complete a short-form amalgamation, the directors of each amalgamating corporation need to:</p>
+            <ul>
+              <li>Approve the amalgamation</li>
+              <li>File articles of amalgamation</li>
+            </ul>
+            <br>
+            <p>Shareholders of the amalgamating corporations do not need to approve the amalgamation.</p>
+            <div class="btn-div">
+              <!-- TODO: Remove disabled when doing short form amalgamations -->
+              <v-btn
+                id="horizontal-short-form-btn"
+                disabled
+                color="primary"
+                large
+              >
+                <strong>Start Horizontal Short-form</strong>
+              </v-btn>
+            </div>
+          </v-card>
+        </v-col>
+
+        <!-- Second Choice -->
+        <v-col>
+          <v-card
+            id="start-vertical-short-form-card"
+            flat
+            class="pa-8"
+          >
+            <h2>
+              Vertical short-form amalgamation
+            </h2>
+            <br>
+            <p>
+              A <strong>vertical short-form amalgamation</strong> can be used if the subsidiary
+              corporations are wholly owned by the corporation they are amalgamating with.
+            </p>
+            <p>To complete a short-form amalgamation, the directors of each amalgamating corporation need to:</p>
+            <ul>
+              <li>Approve the amalgamation</li>
+              <li>File articles of amalgamation</li>
+            </ul>
+            <br>
+            <p>Shareholders of the amalgamating corporations do not need to approve the amalgamation.</p>
+            <div class="btn-div">
+              <!-- TODO: Remove disabled when doing short form amalgamations -->
+              <v-btn
+                id="vertical-short-form-btn"
+                disabled
+                color="primary"
+                large
+              >
+                <strong>Start Vertical Short-form</strong>
+              </v-btn>
+            </div>
+          </v-card>
+        </v-col>
+
+        <!-- Third Choice -->
+        <v-col>
+          <v-card
+            id="start-regular-long-form-card"
+            flat
+            class="pa-8"
+          >
+            <h2>
+              Regular long-form amalgamation
+            </h2>
+            <br>
+            <p>
+              If amalgamating corporations don't meet criteria for a short-form amalgamation, they
+              need to complete the following steps to amalgamate:
+            </p>
+            <ul>
+              <li>The shareholders of each amalgamating corporation must approve the amalgamation</li>
+              <li>The amalgamating corporations must enter into an amalgamation agreement</li>
+              <li>
+                The amalgamating corporations then file articles of amalgamation along with the
+                amalgamation agreement to obtain a certificate of amalgamation
+              </li>
+            </ul>
+            <br>
+            <p>
+              When the amalgamation is complete, your company will be a
+              <strong>{{ getRegularAmalgamationText() }}.</strong>
+            </p>
+            <div class="btn-div">
+              <v-btn
+                id="regular-long-form-btn"
+                color="primary"
+                large
+                @click="startRegularAmalgamation()"
+              >
+                <strong>Start Regular Long-form</strong>
+              </v-btn>
+            </div>
+          </v-card>
+        </v-col>
+      </v-row>
+    </v-container>
+  </div>
+</template>
+
+<script lang="ts">
+import { useBusinessStore, useConfigurationStore, useRootStore } from '@/stores'
+import { Action, Getter } from 'pinia-class'
+import { Component, Vue } from 'vue-property-decorator'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
+import { AmalgamationTypes, FilingTypes } from '@bcrs-shared-components/enums'
+import { AmlRoles, AmlTypes, Routes } from '@/enums'
+import { LegalServices } from '@/services'
+import { navigate } from '@/utils'
+import { TechnicalErrorDialog } from '@/components/dialogs'
+
+@Component({
+  components: {
+    TechnicalErrorDialog
+  }
+})
+export default class AmalgamationSelection extends Vue {
+  @Getter(useConfigurationStore) getCreateUrl!: string
+  @Getter(useBusinessStore) getIdentifier!: string
+  @Getter(useBusinessStore) getLegalType!: CorpTypeCd
+  @Getter(useBusinessStore) isBComp!: boolean
+  @Getter(useBusinessStore) isBcCompany!: boolean
+  @Getter(useBusinessStore) isCcc!: boolean
+  @Getter(useBusinessStore) isUlc!: boolean
+
+  @Action(useRootStore) setStartingAmalgamationSpinner!: (x: boolean) => void
+
+  showErrorDialog = false
+
+  /** Called when component is created. */
+  created (): void {
+    const filingId = +this.$route.params.filingId // id param of this selection panel route, must be 0
+
+    // if required data isn't set, go back to dashboard
+    if (!this.getIdentifier || filingId !== 0) {
+      this.$router.push({ name: Routes.DASHBOARD })
+    }
+  }
+
+  /** The amalmagated company result name depending on the type. */
+  getRegularAmalgamationText (): string {
+    if (this.isBComp || this.isBcCompany) return 'BC limited company'
+    if (this.isCcc) return 'BC community contribution company'
+    if (this.isUlc) return 'BC unlimited liability company'
+    return 'Unknown'
+  }
+
+  /** Called when Start Regular Long-form button is clicked. */
+  async startRegularAmalgamation (): Promise<any> {
+    // Create a draft amalgamation application then redirect to Create UI.
+    try {
+      // show spinner since this is a network call
+      this.setStartingAmalgamationSpinner(true)
+      const businessId = await this.createBusinessAA(AmalgamationTypes.REGULAR)
+      const amalgamationUrl = `${this.getCreateUrl}?id=${businessId}`
+      navigate(amalgamationUrl)
+      return
+    } catch (error) {
+      console.log('Error: unable to amalgamate now =', error)
+      this.setStartingAmalgamationSpinner(false)
+      this.showErrorDialog = true
+    }
+  }
+
+  /**
+   * Creates a draft amalgamation application.
+   * @param type the type of amalgamation to create
+   * @returns the business identifier of the newly created amalgamation application
+   */
+  private async createBusinessAA (type: AmalgamationTypes): Promise<string> {
+    const accountId = +JSON.parse(sessionStorage.getItem('CURRENT_ACCOUNT'))?.id || 0
+    const legalType = this.getLegalType
+
+    const draftAmalgamationApplication = {
+      filing: {
+        header: {
+          name: FilingTypes.AMALGAMATION_APPLICATION,
+          accountId
+        },
+        business: {
+          legalType
+        },
+        amalgamationApplication: {
+          nameRequest: {
+            legalType
+          },
+          type
+        }
+      }
+    } as any
+
+    // if this is a regular amalgamation, pre-populate the current business as a TING
+    if (type === AmalgamationTypes.REGULAR) {
+      draftAmalgamationApplication.filing.amalgamationApplication.amalgamatingBusinesses = [
+        {
+          type: AmlTypes.LEAR,
+          role: AmlRoles.AMALGAMATING,
+          identifier: this.getIdentifier
+        }
+      ]
+    }
+
+    // create the draft business record
+    // (throws an exception on error, which startRegularAmalgamation() will handle)
+    const filing = await LegalServices.createDraftBusiness(draftAmalgamationApplication)
+
+    // validate and return the identifier
+    const identifier = filing?.business?.identifier as string
+    if (!identifier) throw new Error('Invalid business identifier')
+    return identifier
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/styles/theme.scss';
+
+p, ul {
+  color: $gray9;
+}
+
+h1 {
+  margin-bottom: 1.25rem;
+  line-height: 2rem;
+  letter-spacing: -0.01rem;
+}
+
+// Have all the 3 options (cards) with same height.
+.v-card {
+  height: 100%;
+  margin-bottom: 4rem;
+  position: relative;
+}
+
+// Center and push the buttons to the botton of the cards.
+// Keep them centered in the cards regardless of screen size.
+.btn-div {
+  position: absolute;
+  bottom: 2rem;
+  margin-left: auto;
+  margin-right: auto;
+  left: 0;
+  right: 0;
+  text-align: center;
+}
+
+// TODO: Remove disabled styling when short form amalgamations are implemented.
+.theme--light.v-btn.v-btn--disabled:not(.v-btn--flat):not(.v-btn--text):not(.v-btn--outlined) {
+  color: white !important;
+  background-color: $app-blue !important;
+  opacity: 0.4;
+}
+</style>
diff --git a/src/views/AnnualReport.vue b/src/views/AnnualReport.vue
index 7b2d8742f..e4ebd7295 100644
--- a/src/views/AnnualReport.vue
+++ b/src/views/AnnualReport.vue
@@ -106,9 +106,9 @@
                 <h1 id="annual-report-header">
                   File {{ ARFilingYear }} Annual Report
                   <span
-                    v-if="getReportState"
+                    v-if="filingId > 0"
                     class="font-italic"
-                  > &mdash; {{ getReportState }}</span>
+                  > &mdash; Draft</span>
                 </h1>
                 <p>
                   Select your Annual General Meeting date, then verify or change your Office Addresses
@@ -201,9 +201,9 @@
                 <h1 id="annual-report-header-BC">
                   File {{ ARFilingYear }} Annual Report
                   <span
-                    v-if="getReportState"
-                    style="font-style: italic"
-                  > &mdash; {{ getReportState }}</span>
+                    v-if="filingId > 0"
+                    class="font-italic"
+                  > &mdash; Draft</span>
                 </h1>
                 <p>Please review all the information before you file and pay</p>
               </header>
@@ -306,7 +306,6 @@
     >
       <div class="buttons-left">
         <v-btn
-          v-if="isCurrentFilingEditable"
           id="ar-save-btn"
           large
           :disabled="busySaving"
@@ -316,7 +315,6 @@
           <span>Save</span>
         </v-btn>
         <v-btn
-          v-if="isCurrentFilingEditable"
           id="ar-save-resume-btn"
           large
           :disabled="busySaving"
@@ -339,7 +337,6 @@
               v-on="on"
             >
               <v-btn
-                v-if="isCurrentFilingEditable"
                 id="ar-file-pay-btn"
                 color="primary"
                 large
@@ -472,9 +469,7 @@ export default class AnnualReport extends Mixins(CommonMixin, DateMixin, FilingM
   @Getter(useBusinessStore) getLastAnnualReportDate!: string
   @Getter(useBusinessStore) getLastDirectorChangeDate!: string
   @Getter(useConfigurationStore) getPayApiUrl!: string
-  @Getter(useRootStore) getReportState!: string
   @Getter(useBusinessStore) isCoop!: boolean
-  @Getter(useRootStore) isCurrentFilingEditable!: boolean
   @Getter(useRootStore) isRoleStaff!: boolean
 
   // variables for AgmDate component
@@ -1139,7 +1134,7 @@ export default class AnnualReport extends Mixins(CommonMixin, DateMixin, FilingM
         ret = await LegalServices.createFiling(this.getIdentifier, filing, isDraft)
       }
       return ret
-    } catch (error) {
+    } catch (error: any) {
       // save errors or warnings, if any
       this.saveErrors = error?.response?.data?.errors || []
       this.saveWarnings = error?.response?.data?.warnings || []
diff --git a/src/views/ConsentContinuationOut.vue b/src/views/ConsentContinuationOut.vue
index da3fb354c..cdc827f3d 100644
--- a/src/views/ConsentContinuationOut.vue
+++ b/src/views/ConsentContinuationOut.vue
@@ -193,6 +193,7 @@
                   :isCertified.sync="isCertified"
                   :certifiedBy.sync="certifiedBy"
                   :class="{ 'invalid-certify': !certifyFormValid && showErrors }"
+                  :disableEdit="!isRoleStaff"
                   :entityDisplay="displayName()"
                   :message="certifyText(FilingCodes.ANNUAL_REPORT_OT)"
                   @valid="certifyFormValid=$event"
@@ -366,6 +367,7 @@ export default class ConsentContinuationOut extends Mixins(CommonMixin, DateMixi
   @Getter(useRootStore) getBusinessEmail!: string
   @Getter(useBusinessStore) getLegalName!: string
   @Getter(useConfigurationStore) getPayApiUrl!: string
+  @Getter(useRootStore) getUserInfo!: any
   @Getter(useRootStore) isRoleStaff!: boolean
 
   // enum for template
@@ -503,6 +505,11 @@ export default class ConsentContinuationOut extends Mixins(CommonMixin, DateMixi
 
     this.dataLoaded = true
 
+    // Pre-populate the certified block with the logged in user's name (if not staff)
+    if (!this.isRoleStaff && this.getUserInfo) {
+      this.certifiedBy = this.getUserInfo.firstname + ' ' + this.getUserInfo.lastname
+    }
+
     // always include consent continue out code
     // use existing Priority and Waive Fees flags
     this.updateFilingData('add', FilingCodes.CONSENT_CONTINUATION_OUT, this.staffPaymentData.isPriority,
@@ -840,7 +847,7 @@ export default class ConsentContinuationOut extends Mixins(CommonMixin, DateMixi
         ret = await LegalServices.createFiling(this.getIdentifier, filing, isDraft)
       }
       return ret
-    } catch (error) {
+    } catch (error: any) {
       // save errors or warnings, if any
       this.saveErrors = error?.response?.data?.errors || []
       this.saveWarnings = error?.response?.data?.warnings || []
diff --git a/src/views/ContinuationOut.vue b/src/views/ContinuationOut.vue
index 985bbe5e1..176acc3bb 100644
--- a/src/views/ContinuationOut.vue
+++ b/src/views/ContinuationOut.vue
@@ -838,7 +838,7 @@ export default class ContinuationOut extends Mixins(CommonMixin, DateMixin,
         ret = await LegalServices.createFiling(this.getIdentifier, filing, isDraft)
       }
       return ret
-    } catch (error) {
+    } catch (error: any) {
       // save errors or warnings, if any
       this.saveErrors = error?.response?.data?.errors || []
       this.saveWarnings = error?.response?.data?.warnings || []
diff --git a/src/views/Correction.vue b/src/views/Correction.vue
index 0c248986a..b3343ca14 100644
--- a/src/views/Correction.vue
+++ b/src/views/Correction.vue
@@ -755,7 +755,7 @@ export default class Correction extends Mixins(CommonMixin, DateMixin, EnumMixin
         ret = await LegalServices.createFiling(this.getIdentifier, filing, isDraft)
       }
       return ret
-    } catch (error) {
+    } catch (error: any) {
       // save errors or warnings, if any
       this.saveErrors = error?.response?.data?.errors || []
       this.saveWarnings = error?.response?.data?.warnings || []
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index 0aebfa965..9415ed2a4 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -29,6 +29,7 @@
                 </h2>
               </header>
               <!-- FUTURE: move these to a new Alerts component and inside one expansion panel -->
+              <Amalgamation v-if="isAmalgamationAlert" />
               <FrozenInformation v-if="isFrozenInformationAlert" />
               <MissingInformation v-if="isMissingInformationAlert" />
               <NotInCompliance v-if="isNotInComplianceAlert" />
@@ -231,22 +232,23 @@
 </template>
 
 <script lang="ts">
-import { mapActions, mapState } from 'pinia'
+import { mapState } from 'pinia'
 import { navigate } from '@/utils'
 import AddressListSm from '@/components/Dashboard/AddressListSm.vue'
 import CustodianListSm from '@/components/Dashboard/CustodianListSm.vue'
 import DirectorListSm from '@/components/Dashboard/DirectorListSm.vue'
 import FilingHistoryList from '@/components/Dashboard/FilingHistoryList.vue'
+import Amalgamation from '@/components/Dashboard/Alerts/Amalgamation.vue'
 import FrozenInformation from '@/components/Dashboard/Alerts/FrozenInformation.vue'
+import MissingInformation from '@/components/Dashboard/Alerts/MissingInformation.vue'
+import NotInCompliance from '@/components/Dashboard/Alerts/NotInCompliance.vue'
+import NotInGoodStanding from '@/components/Dashboard/Alerts/NotInGoodStanding.vue'
 import LegalObligation from '@/components/Dashboard/LegalObligation.vue'
 import ProprietorPartnersListSm from '@/components/Dashboard/ProprietorPartnersListSm.vue'
 import StaffNotation from '@/components/Dashboard/StaffNotation.vue'
 import TodoList from '@/components/Dashboard/TodoList.vue'
 import { CoaWarningDialog } from '@/components/dialogs'
-import MissingInformation from '@/components/Dashboard/Alerts/MissingInformation.vue'
-import NotInCompliance from '@/components/Dashboard/Alerts/NotInCompliance.vue'
-import NotInGoodStanding from '@/components/Dashboard/Alerts/NotInGoodStanding.vue'
-import { FilingStatus, Routes, AllowableActions, Roles } from '@/enums'
+import { Routes, AllowableActions, Roles } from '@/enums'
 import { PartyIF } from '@/interfaces'
 import { AllowableActionsMixin, CommonMixin, DateMixin, EnumMixin } from '@/mixins'
 import { useBusinessStore, useConfigurationStore, useFilingHistoryListStore, useRootStore } from '@/stores'
@@ -256,6 +258,7 @@ export default {
 
   components: {
     AddressListSm,
+    Amalgamation,
     CoaWarningDialog,
     CustodianListSm,
     DirectorListSm,
@@ -293,6 +296,7 @@ export default {
         'getIdentifier',
         'hasComplianceWarning',
         'hasMissingInfoWarning',
+        'isFutureEffectiveAmalgamation',
         'isAdminFrozen',
         'isBenBcCccUlc',
         'isFirm',
@@ -348,9 +352,9 @@ export default {
       return +this.$route.query.filing_id
     },
 
-    /** Whether to show Missing Information alert. */
-    isMissingInformationAlert (): boolean {
-      return this.hasMissingInfoWarning
+    /** Whether to show Amalgamation alert. */
+    isAmalgamationAlert (): boolean {
+      return this.isFutureEffectiveAmalgamation
     },
 
     /** Whether to show Missing Information alert. */
@@ -358,6 +362,11 @@ export default {
       return this.isAdminFrozen
     },
 
+    /** Whether to show Missing Information alert. */
+    isMissingInformationAlert (): boolean {
+      return this.hasMissingInfoWarning
+    },
+
     /** Whether to show Not In Compliance alert. */
     isNotInComplianceAlert (): boolean {
       return this.hasComplianceWarning
@@ -371,6 +380,7 @@ export default {
     /** The number of alerts. */
     alertCount (): number {
       let count = 0
+      if (this.isAmalgamationAlert) count++
       if (this.isFrozenInformationAlert) count++
       if (this.isMissingInformationAlert) count++
       if (this.isNotInComplianceAlert) count++
@@ -384,11 +394,8 @@ export default {
   },
 
   methods: {
-    ...mapActions(useRootStore, ['setCurrentFilingStatus']),
-
     goToStandaloneDirectors () {
-      this.setCurrentFilingStatus(FilingStatus.NEW)
-      this.$router.push({ name: Routes.STANDALONE_DIRECTORS, params: { filingId: 0 } }) // 0 means "new COD filing"
+      this.$router.push({ name: Routes.STANDALONE_DIRECTORS, params: { filingId: '0' } }) // 0 means "new COD filing"
     },
 
     goToChangeFiling () {
@@ -397,8 +404,7 @@ export default {
     },
 
     goToStandaloneAddresses () {
-      this.setCurrentFilingStatus(FilingStatus.NEW)
-      this.$router.push({ name: Routes.STANDALONE_ADDRESSES, params: { filingId: 0 } }) // 0 means "new COA filing"
+      this.$router.push({ name: Routes.STANDALONE_ADDRESSES, params: { filingId: '0' } }) // 0 means "new COA filing"
     },
 
     reloadDataIfNeeded (needed: boolean) {
diff --git a/src/views/DigitalCredentials.vue b/src/views/DigitalCredentials.vue
index c5076beb9..5b1f28637 100644
--- a/src/views/DigitalCredentials.vue
+++ b/src/views/DigitalCredentials.vue
@@ -1,213 +1,19 @@
 <template>
   <v-container id="digital-credentials">
-    <!-- Digital Credentials Landing -->
-    <CredentialsLanding
-      v-if="isDigitalCredentialHome"
-      class="py-8"
-      :issuedCredentials="issuedCredentials"
-      @addCredentials="addCredentials()"
-    />
-
-    <!-- Add Credentials -->
-    <section
-      v-else
-      id="add-digital-credentials"
-    >
-      <!-- Add Credentials Header -->
-      <article
-        id="add-digital-credentials-header"
-        class="pt-8"
-      >
-        <v-row no-gutters>
-          <v-col
-            cols="12"
-            lg="11"
-          >
-            <h1>Generate Business Digital Credentials</h1>
-          </v-col>
-        </v-row>
-      </article>
-
-      <!-- Credentials Stepper -->
-      <article
-        id="digital-credentials-stepper"
-        class="mt-8"
-      >
-        <v-row no-gutters>
-          <v-col
-            cols="12"
-            lg="9"
-          >
-            <Stepper :getSteps="digitalCredentialSteps" />
-          </v-col>
-        </v-row>
-      </article>
-
-      <!-- Credentials component flow -->
-      <article id="digital-credentials-component-view">
-        <v-row no-gutters>
-          <v-col
-            cols="12"
-            lg="9"
-          >
-            <router-view
-              class="py-8"
-              :credentialInvitationUrl="credentialInvitationUrl"
-              :hasRegisteredWallet="hasRegisteredWallet"
-              :issuedCredentials="issuedCredentials"
-              @back="back()"
-              @sendCredentialOffer="issueCredential($event)"
-            />
-          </v-col>
-        </v-row>
-      </article>
-
-      <!-- Credentials Footer -->
-      <CredentialsFooter
-        :nextStepName="nextStepName"
-        :currentStepIndex="currentStepIndex"
-        :lastStepIndex="digitalCredentialSteps.length - 1"
-        @back="back()"
-        @next="next()"
-        @cancel="cancel()"
-      />
-    </section>
+    <router-view />
   </v-container>
 </template>
 
 <script lang="ts">
-import { Component, Watch, Vue } from 'vue-property-decorator'
-import { Getter } from 'pinia-class'
-import {
-  RegisterWallet,
-  CredentialsLanding,
-  CredentialsFooter,
-  DigitalWalletDownload,
-  IssueCredentials
-} from '@/components/DigitalCredentials'
-import { Stepper } from '@/components/common'
-import { DigitalCredentialTypes, Routes } from '@/enums'
-import { DigitalCredentialsIF, StepsIF } from '@/interfaces'
-import { LegalServices } from '@/services/'
-import { useBusinessStore } from '@/stores'
-
-@Component({
-  components: {
-    CredentialsLanding,
-    CredentialsFooter,
-    Stepper
-  }
-})
-export default class DigitalCredentials extends Vue {
-  @Getter(useBusinessStore) getIdentifier!: string
-
-  issuedCredentials: Array<DigitalCredentialsIF> = []
-  credentialInvitationUrl = ''
-  hasRegisteredWallet = false
-
-  /** The steps for Business Digital Credentials. **/
-  get digitalCredentialSteps (): Array<StepsIF> {
-    return [
-      {
-        id: 'step-1-btn',
-        step: 1,
-        icon: 'mdi-cloud-download',
-        text: 'Download\n Digital Wallet',
-        to: `/digital-credentials/download-wallet`,
-        component: DigitalWalletDownload
-      },
-      {
-        id: 'step-2-btn',
-        step: 2,
-        icon: 'mdi-cellphone',
-        text: 'Register\n Digital Wallet',
-        to: `/digital-credentials/register-wallet`,
-        component: RegisterWallet
-      },
-      {
-        id: 'step-3-btn',
-        step: 3,
-        icon: 'mdi-file-certificate-outline',
-        text: 'Issue Credential to\n Digital Wallet',
-        to: `/digital-credentials/issue-credentials`,
-        component: IssueCredentials
-      }
-    ]
-  }
-
-  get currentStepIndex (): number {
-    return this.digitalCredentialSteps.map(step => { return step.to })
-      .indexOf(`/${Routes.DIGITAL_CREDENTIALS}/${this.$route.name}`)
-  }
-
-  get isDigitalCredentialHome (): boolean {
-    return (this.$route.name === Routes.DIGITAL_CREDENTIALS)
-  }
-
-  get nextStepName (): string {
-    return this.digitalCredentialSteps[this.currentStepIndex + 1]?.text || 'Done'
-  }
-
-  addCredentials (): void {
-    this.$router.push({ path: `${Routes.DIGITAL_CREDENTIALS}/${Routes.DOWNLOAD_WALLET}` })
-  }
-
-  back (): void {
-    this.$router.push({ path: this.digitalCredentialSteps[this.currentStepIndex - 1].to })
-  }
-
-  next (): void {
-    this.$router.push({
-      path: this.digitalCredentialSteps[this.currentStepIndex + 1]?.to ||
-      `/${Routes.DIGITAL_CREDENTIALS}`
-    })
-  }
-
-  cancel (): void {
-    this.$router.push({ path: `/${Routes.DIGITAL_CREDENTIALS}` })
-  }
-
-  async getCredentials (): Promise<void> {
-    const { data } = await LegalServices.fetchCredentials(this.getIdentifier)
-    if (data?.issuedCredentials) {
-      this.issuedCredentials = data.issuedCredentials
-    }
-  }
-
-  async addCredentialInvitation (): Promise<void> {
-    const { data } = await LegalServices.createCredentialInvitation(this.getIdentifier)
-    if (data?.invitationUrl) {
-      this.credentialInvitationUrl = data.invitationUrl
-    }
-  }
-
-  async getCredentialsConnection (): Promise<void> {
-    const connection = await LegalServices.fetchCredentialConnection(this.getIdentifier)
-    if (connection) {
-      this.hasRegisteredWallet = true
-    }
-  }
-
-  async issueCredential (credentialType: DigitalCredentialTypes): Promise<void> {
-    const credentialIssued = await LegalServices.issueCredentialOffer(this.getIdentifier, credentialType)
-    if (credentialIssued) {
-      await this.getCredentials()
-    }
-  }
-
-  // Keep credential data in sync when navigating between routes.
-  // This is required due to the nature of external interactions between mobile device and api
-  @Watch('$route', { immediate: true })
-  async syncCredentials (): Promise<void> {
-    await this.getCredentials()
-
-    // Check for connections on step 2 when there is no registered wallet
-    if (this.issuedCredentials.length > 0) { this.hasRegisteredWallet = true }
-    if (!this.hasRegisteredWallet && this.currentStepIndex === 1) { await this.getCredentialsConnection() }
-
-    // Generate an Invitation URL once only if the user has not registered
-    if (!this.hasRegisteredWallet && !this.credentialInvitationUrl) {
-      await this.addCredentialInvitation()
+import { Component, Mixins } from 'vue-property-decorator'
+import { AllowableActions, Routes } from '@/enums'
+import { AllowableActionsMixin } from '@/mixins'
+
+@Component
+export default class DigitalCredentials extends Mixins(AllowableActionsMixin) {
+  mounted (): void {
+    if (!this.isAllowed(AllowableActions.DIGITAL_CREDENTIALS)) {
+      this.$router.push({ name: Routes.DASHBOARD })
     }
   }
 }
diff --git a/src/views/StandaloneDirectorsFiling.vue b/src/views/StandaloneDirectorsFiling.vue
index d378434e6..a36cfdb6b 100644
--- a/src/views/StandaloneDirectorsFiling.vue
+++ b/src/views/StandaloneDirectorsFiling.vue
@@ -879,7 +879,7 @@ export default class StandaloneDirectorsFiling extends Mixins(CommonMixin, DateM
         ret = await LegalServices.createFiling(this.getIdentifier, filing, isDraft)
       }
       return ret
-    } catch (error) {
+    } catch (error: any) {
       // save errors or warnings, if any
       this.saveErrors = error?.response?.data?.errors || []
       this.saveWarnings = error?.response?.data?.warnings || []
diff --git a/src/views/StandaloneOfficeAddressFiling.vue b/src/views/StandaloneOfficeAddressFiling.vue
index b7f840d53..ef33b24b2 100644
--- a/src/views/StandaloneOfficeAddressFiling.vue
+++ b/src/views/StandaloneOfficeAddressFiling.vue
@@ -755,7 +755,7 @@ export default class StandaloneOfficeAddressFiling extends Mixins(CommonMixin, D
         ret = await LegalServices.createFiling(this.getIdentifier, filing, isDraft)
       }
       return ret
-    } catch (error) {
+    } catch (error: any) {
       // save errors or warnings, if any
       this.saveErrors = error?.response?.data?.errors || []
       this.saveWarnings = error?.response?.data?.warnings || []
diff --git a/tests/unit/AboutTheBusiness.spec.ts b/tests/unit/AboutTheBusiness.spec.ts
new file mode 100644
index 000000000..d3edff427
--- /dev/null
+++ b/tests/unit/AboutTheBusiness.spec.ts
@@ -0,0 +1,50 @@
+import Vue from 'vue'
+import Vuetify from 'vuetify'
+import { mount } from '@vue/test-utils'
+import AboutTheBusiness from '@/components/AgmExtension/AboutTheBusiness.vue'
+import { AgmExtEvalIF, EmptyAgmExtEval } from '@/interfaces'
+
+Vue.use(Vuetify)
+const vuetify = new Vuetify({})
+
+describe('About The Business component', () => {
+  it('handles empty data', () => {
+    const wrapper = mount(AboutTheBusiness, {
+      propsData: { data: EmptyAgmExtEval },
+      vuetify
+    })
+
+    expect(wrapper.find('#entity-in-good-standing').text()).toBe('No')
+    expect(wrapper.find('#entity-date-of-incorporation').text()).toBe('')
+
+    wrapper.destroy()
+  })
+
+  it('displays business info properly', () => {
+    const wrapper = mount(AboutTheBusiness, {
+      propsData: {
+        data: {
+          ...EmptyAgmExtEval,
+          isGoodStanding: true,
+          incorporationDate: new Date('2023-12-31T08:00:00.000Z')
+        } as AgmExtEvalIF
+      },
+      vuetify
+    })
+
+    // verify component displays properly
+    expect(wrapper.find('.v-card').attributes('id')).toBe('about-the-business')
+    expect(wrapper.find('header i').attributes('class')).toContain('mdi-domain')
+    expect(wrapper.find('header h2').text()).toBe('About the Business')
+
+    const rows = wrapper.findAll('.content > .row')
+    expect(rows.at(0).find('.col-sm-3').text()).toBe('Business in Good Standing')
+    expect(rows.at(1).find('.col-sm-3').text()).toBe('Date of Incorporation')
+
+    // verify displayed text
+    expect(wrapper.find('#entity-in-good-standing').text()).toBe('Yes')
+    expect(wrapper.find('#entity-date-of-incorporation').text()).toBe('December 31, 2023')
+
+    wrapper.destroy()
+  })
+})
diff --git a/tests/unit/AgmExtension.spec.ts b/tests/unit/AgmExtension.spec.ts
index 0fd0837af..17ef4df29 100644
--- a/tests/unit/AgmExtension.spec.ts
+++ b/tests/unit/AgmExtension.spec.ts
@@ -1,325 +1,244 @@
+// framework and libraries
 import Vue from 'vue'
 import Vuetify from 'vuetify'
-import { createLocalVue, shallowMount } from '@vue/test-utils'
+import { createLocalVue, mount } from '@vue/test-utils'
 import { createPinia, setActivePinia } from 'pinia'
-import { useBusinessStore, useRootStore } from '@/stores'
-import AgmExtension from '@/views/AgmExtension.vue'
-import { ConfirmDialog, ResumeErrorDialog, SaveErrorDialog }
-  from '@/components/dialogs'
-import { BusinessNameForeign, EffectiveDate, Certify, DetailComment, ForeignJurisdiction } from '@/components/common'
-import { CourtOrderPoa } from '@bcrs-shared-components/court-order-poa'
-import { DocumentDelivery } from '@bcrs-shared-components/document-delivery'
+import { useBusinessStore, useFilingHistoryListStore, useRootStore } from '@/stores'
+import VueRouter from 'vue-router'
+import mockRouter from './mockRouter'
+import { CorpTypeCd, FilingTypes } from '@/enums'
 import { LegalServices } from '@/services'
+
+// components
+import AgmExtension from '@/views/AgmExtension.vue'
+import AboutTheBusiness from '@/components/AgmExtension/AboutTheBusiness.vue'
+import AgmExtensionEvaluation from '@/components/AgmExtension/AgmExtensionEvaluation.vue'
+import AgmExtensionHelp from '@/components/AgmExtension/AgmExtensionHelp.vue'
+import { ConfirmDialog, NotEligibleExtensionDialog, PaymentErrorDialog } from '@/components/dialogs'
+import { Certify } from '@/components/common'
+import { ExpandableHelp } from '@bcrs-shared-components/expandable-help'
+import ExtensionRequest from '@/components/AgmExtension/ExtensionRequest.vue'
+import SbcFeeSummary from 'sbc-common-components/src/components/SbcFeeSummary.vue'
 import flushPromises from 'flush-promises'
-import mockRouter from './mockRouter'
-import VueRouter from 'vue-router'
-import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 
-// suppress various warnings:
-// - "Unknown custom element <affix>" warnings
-// - "$listeners is readonly"
-// - "Avoid mutating a prop directly"
-// ref: https://github.com/vuejs/vue-test-utils/issues/532
+// suppress warning "Unknown custom element <affix>" warnings
 Vue.config.silent = true
 
 Vue.use(Vuetify)
+const vuetify = new Vuetify({})
 
-const localVue = createLocalVue()
-localVue.use(VueRouter)
 setActivePinia(createPinia())
 const businessStore = useBusinessStore()
 const rootStore = useRootStore()
+const filingHistoryListStore = useFilingHistoryListStore()
+
+describe('AGM Extension view', () => {
+  let wrapper: any
 
-describe.skip('AGM Extension view', () => {
   beforeEach(() => {
     // init store
-    rootStore.currentDate = '2020-03-04'
-    businessStore.setLegalType(CorpTypeCd.COOP)
-    businessStore.setLegalName('My Test Entity')
-    businessStore.setIdentifier('CP1234567')
-    businessStore.setFoundingDate('1971-05-12T00:00:00-00:00')
+    rootStore.currentDate = '2023-11-06'
+    businessStore.setLegalType(CorpTypeCd.BENEFIT_COMPANY)
+    businessStore.setLegalName('My Benefit Company')
+    businessStore.setIdentifier('BC1234567')
+    businessStore.setFoundingDate('2000-01-01T08:00:00.000+00:00')
+    businessStore.setGoodStanding(true)
     rootStore.filingData = []
-    rootStore.keycloakRoles = ['staff'] // continuation outs currently apply to staff only
-  })
-
-  it('mounts the sub-components properly', async () => {
-    const $route = { params: { filingId: '0' } }
 
     // create local Vue and mock router
     const localVue = createLocalVue()
     localVue.use(VueRouter)
-    const $router = mockRouter.mock()
-
-    const wrapper = shallowMount(AgmExtension, { mocks: { $route, $router } })
-    wrapper.vm.$data.dataLoaded = true
-    await Vue.nextTick()
+    const router = mockRouter.mock()
+    router.push({ name: 'agm-extension', params: { filingId: '0' } })
 
-    // verify sub-components
-    expect(wrapper.findComponent(BusinessNameForeign).exists()).toBe(true)
-    expect(wrapper.findComponent(Certify).exists()).toBe(true)
-    expect(wrapper.findComponent(ConfirmDialog).exists()).toBe(true)
-    expect(wrapper.findComponent(CourtOrderPoa).exists()).toBe(true)
-    expect(wrapper.findComponent(DetailComment).exists()).toBe(true)
-    expect(wrapper.findComponent(DocumentDelivery).exists()).toBe(true)
-    expect(wrapper.findComponent(EffectiveDate).exists()).toBe(true)
-    expect(wrapper.findComponent(ForeignJurisdiction).exists()).toBe(true)
-    expect(wrapper.findComponent(ResumeErrorDialog).exists()).toBe(true)
-    expect(wrapper.findComponent(SaveErrorDialog).exists()).toBe(true)
+    wrapper = mount(AgmExtension, {
+      localVue,
+      router,
+      stubs: {
+        // NOTE - we want to stub out some components and not others:
+        AboutTheBusiness: true,
+        AgmExtensionEvaluation: true,
+        // AgmExtensionHelp: true,
+        // Certify: true,
+        ConfirmDialog: true,
+        // ExpandableHelp: true,
+        ExtensionRequest: true,
+        NotEligibleExtensionDialog: true,
+        PaymentErrorDialog: true,
+        SbcFeeSummary: true
+      },
+      vuetify
+    })
+  })
 
+  afterEach(() => {
     wrapper.destroy()
   })
 
-  it('sets filing data properly', async () => {
-    const $route = { params: { filingId: '0' } }
-
-    // create local Vue and mock router
-    const localVue = createLocalVue()
-    localVue.use(VueRouter)
-    const $router = mockRouter.mock()
+  it('displays the initial view properly', () => {
+    // verify dialogs and sub-components
+    expect(wrapper.findComponent(ConfirmDialog).exists()).toBe(true)
+    expect(wrapper.findComponent(PaymentErrorDialog).exists()).toBe(true)
+    expect(wrapper.findComponent(NotEligibleExtensionDialog).exists()).toBe(true)
+    expect(wrapper.findComponent(ExpandableHelp).exists()).toBe(true)
+    expect(wrapper.findComponent(AgmExtensionHelp).exists()).toBe(true)
+    expect(wrapper.findComponent(AboutTheBusiness).exists()).toBe(true)
+    expect(wrapper.findComponent(ExtensionRequest).exists()).toBe(true)
+    expect(wrapper.findComponent(AgmExtensionEvaluation).exists()).toBe(true)
+    expect(wrapper.findComponent(Certify).exists()).toBe(true)
+    expect(wrapper.findComponent(SbcFeeSummary).exists()).toBe(true)
+
+    // verify titles
+    expect(wrapper.find('article > h1').text()).toBe('AGM Extension')
+    expect(wrapper.find('article > header > h2').text()).toBe('Extension Detail')
+    expect(wrapper.find('article > header > p').text()).toContain('Enter the details about')
+    expect(wrapper.find('article > section > header > h2').text()).toBe('Certify')
+    expect(wrapper.find('article > section > header > p').text()).toContain('Enter the legal name')
+  })
 
-    const wrapper = shallowMount(AgmExtension, { mocks: { $route, $router } })
-    wrapper.vm.$data.dataLoaded = true
-    await Vue.nextTick()
+  it('displays expandable help properly', async () => {
+    expect(wrapper.find('.help-label').text()).toContain('Help with')
 
-    const vm: any = wrapper.vm
+    // verify help section is not visible
+    expect(wrapper.find('.help-section').isVisible()).toBe(false)
+    await wrapper.find('.help-btn').trigger('click')
 
-    // verify initial Filing Data
-    expect(vm.filingData).not.toBeUndefined()
-    expect(vm.filingData).not.toBeNull()
-    expect(vm.filingData.length).toBe(1)
-    expect(vm.filingData[0].filingTypeCode).toBe('COUTI')
-    expect(vm.filingData[0].entityType).toBe('CP')
+    // verify help section is now visible
+    expect(wrapper.find('.help-section').isVisible()).toBe(true)
 
-    wrapper.destroy()
+    // verify title and text
+    expect(wrapper.find('.agm-extension-help > h3').text()).toBe('AGM Extension Help')
+    expect(wrapper.find('.agm-extension-help > div').text()).toContain('A company must have')
+    expect(wrapper.find('.agm-extension-help > div').text()).toContain('Shareholders entitled')
+    expect(wrapper.find('.agm-extension-help > div').text()).toContain('If a company does not')
   })
 
-  it('sets computed states properly', () => {
-    // mock $route
-    const $route = { params: { filingId: '0' } }
-
-    // create local Vue and mock router
-    const localVue = createLocalVue()
-    localVue.use(VueRouter)
-    const $router = mockRouter.mock()
-
-    const wrapper = shallowMount(AgmExtension, { mocks: { $route, $router } })
-    const vm: any = wrapper.vm
-
-    // verify "isPayRequired" with no fee
-    vm.totalFee = 0
-    expect(!!vm.isPayRequired).toBe(false)
-
-    // verify "isPayRequired" with a fee
-    vm.totalFee = 350
-    expect(!!vm.isPayRequired).toBe(true)
-
-    // verify "validated" - all true
-    vm.businessNameValid = true
-    vm.certifyFormValid = true
-    vm.courtOrderValid = true
-    vm.detailCommentValid = true
-    vm.documentDeliveryValid = true
-    vm.effectiveDateValid = true
-    vm.foreignJurisdictionValid = true
-    expect(!!vm.isPageValid).toBe(true)
-
-    // verify "validated" - invalid Detail Comment form
-    vm.businessNameValid = true
-    vm.certifyFormValid = true
-    vm.courtOrderValid = true
-    vm.detailCommentValid = false
-    vm.documentDeliveryValid = true
-    vm.effectiveDateValid = true
-    vm.foreignJurisdictionValid = true
-    expect(!!vm.isPageValid).toBe(false)
-
-    // verify "validated" - invalid Certify form
-    vm.businessNameValid = true
-    vm.certifyFormValid = false
-    vm.courtOrderValid = true
-    vm.detailCommentValid = true
-    vm.documentDeliveryValid = true
-    vm.effectiveDateValid = true
-    vm.foreignJurisdictionValid = true
-    expect(!!vm.isPageValid).toBe(false)
-
-    // verify "validated" - invalid Court Order form
-    vm.businessNameValid = true
-    vm.certifyFormValid = true
-    vm.courtOrderValid = false
-    vm.detailCommentValid = true
-    vm.documentDeliveryValid = true
-    vm.effectiveDateValid = true
-    vm.foreignJurisdictionValid = true
-    expect(!!vm.isPageValid).toBe(false)
-
-    // verify "validated" - invalid Document Delivery form
-    vm.businessNameValid = true
-    vm.certifyFormValid = true
-    vm.courtOrderValid = true
-    vm.detailCommentValid = true
-    vm.documentDeliveryValid = false
-    vm.effectiveDateValid = true
-    vm.foreignJurisdictionValid = true
-    expect(!!vm.isPageValid).toBe(false)
-
-    // verify "validated" - invalid Foreign Jurisdiction form
-    vm.businessNameValid = true
-    vm.certifyFormValid = true
-    vm.courtOrderValid = true
-    vm.detailCommentValid = true
-    vm.documentDeliveryValid = true
-    vm.effectiveDateValid = true
-    vm.foreignJurisdictionValid = false
-    expect(vm.isPageValid).toBe(false)
-    wrapper.destroy()
-
-    // verify "validated" - invalid Effective Date form
-    vm.businessNameValid = true
-    vm.certifyFormValid = true
-    vm.courtOrderValid = true
-    vm.detailCommentValid = true
-    vm.documentDeliveryValid = true
-    vm.effectiveDateValid = false
-    vm.foreignJurisdictionValid = true
-    expect(vm.isPageValid).toBe(false)
-    wrapper.destroy()
-
-    // verify "validated" - invalid Business Name Foreign form
-    vm.businessNameValid = false
-    vm.certifyFormValid = true
-    vm.courtOrderValid = true
-    vm.detailCommentValid = true
-    vm.documentDeliveryValid = true
-    vm.effectiveDateValid = true
-    vm.foreignJurisdictionValid = true
-    expect(vm.isPageValid).toBe(false)
-    wrapper.destroy()
+  it('sets fee summary data properly', () => {
+    expect(wrapper.vm.filingData).toEqual([{ filingTypeCode: 'AGMDT', entityType: 'BEN' }])
   })
 
-  it('saves draft continuation out properly', async () => {
-    // mock "has pending tasks" legal service
-    vi.spyOn(LegalServices, 'hasPendingTasks').mockImplementation((): any => {
-      return Promise.resolve(false)
+  it('reports invalid page when Extension Request is invalid', async () => {
+    wrapper.setData({
+      extensionRequestValid: false,
+      certifyFormValid: true
     })
+    await wrapper.find('#file-pay-btn').trigger('click')
+    expect(wrapper.vm.isPageValid).toBe(false)
+  })
 
-    // mock "create filing" legal service
-    // (garbage response data - we aren't testing that)
-    vi.spyOn(LegalServices, 'createFiling').mockImplementation((): any => {
-      return Promise.resolve({
-        business: {},
-        header: { filingId: 456 },
-        agmExtension: {
-          continuationOutDate: '2023-06-10',
-          details: 'test',
-          foreignJurisdiction: {
-            country: 'LB'
-          },
-          legalName: 'North Shore Toys LTD.'
-        },
-        annualReport: {}
-      })
+  it('reports invalid page when Certify is invalid', async () => {
+    wrapper.setData({
+      extensionRequestValid: true,
+      certifyFormValid: false
     })
+    await wrapper.find('#file-pay-btn').trigger('click')
+    expect(wrapper.vm.isPageValid).toBe(false)
+  })
 
-    // mock $route
-    const $route = { params: { filingId: '0' } }
-
-    // create local Vue and mock router
-    createLocalVue().use(VueRouter)
-    const router = mockRouter.mock()
-    router.push({ name: 'continuation-out' })
+  it('doesn\'t file and displays dialog when not eligible', async () => {
+    // verify that dialog is initially disabled
+    // (NB: stub doesn't show dialog="false")
+    expect(wrapper.findComponent(NotEligibleExtensionDialog).attributes('dialog')).toBeUndefined()
 
-    const wrapper = shallowMount(AgmExtension, {
-      router,
-      stubs: {
-        BusinessNameForeign: true,
-        CourtOrderPoa: true,
-        DetailComment: true,
-        DocumentDelivery: true,
-        Certify: true,
-        EffectiveDate: true,
-        ForeignJurisdiction: true,
-        SbcFeeSummary: true
-      },
-      mocks: { $route }
+    // simulate ineligibility but valid component
+    wrapper.setData({
+      data: { isEligible: false },
+      extensionRequestValid: true
     })
-    const vm: any = wrapper.vm
 
-    // wait for fetch to complete
-    await flushPromises()
+    // simulate valid certify data and component
+    wrapper.setData({ certifiedBy: 'Full Name', isCertified: true, certifyFormValid: true })
 
-    // call the save action (since clicking button doesn't work)
-    await vm.onClickSave()
+    // click the file-pay button
+    await wrapper.find('#file-pay-btn').trigger('click')
 
-    // verify new Filing ID
-    expect(vm.filingId).toBe(456)
+    // verify that dialog is now enabled
+    expect(wrapper.findComponent(NotEligibleExtensionDialog).attributes('dialog')).toBe('true')
+  })
 
-    wrapper.destroy()
+  it('returns total months in agm within the same year extension', async () => {
+    const filingHistoryList = [
+      { name: FilingTypes.AGM_EXTENSION, data: { agmExtension: { extensionDuration: 2, year: 2023 } } },
+      { name: FilingTypes.AGM_EXTENSION, data: { agmExtension: { extensionDuration: 4, year: 2023 } } },
+      { name: FilingTypes.AGM_EXTENSION, data: { agmExtension: { extensionDuration: 4, year: 2024 } } }
+    ]
+    filingHistoryListStore.setFilings(filingHistoryList as any)
+    const totalAgmExtension = filingHistoryListStore.getTotalAgmExtensionDuration(2023)
+    expect(totalAgmExtension).toBe(6)
   })
 
-  it('resumes draft continuation out properly', async () => {
-    // mock "fetch filing" legal service
-    vi.spyOn(LegalServices, 'fetchFiling').mockImplementation((): any => {
-      return Promise.resolve({
-        business: {
-          identifier: 'CP1234567',
-          legalName: 'My Test Entity'
-        },
-        header: {
-          name: 'agmExtension',
-          status: 'DRAFT',
-          certifiedBy: 'Johnny Certifier',
-          routingSlipNumber: '123456789',
-          priority: true
-        },
-        agmExtension: {
-          continuationOutDate: '2023-06-10',
-          details: 'Line 1\nLine 2\nLine 3',
-          foreignJurisdiction: {
-            country: 'CA',
-            region: 'AB'
-          },
-          legalName: 'North Shore Toys LTD.'
-        },
-        annualReport: {}
-      })
+  it('files JSON data properly when eligible', async () => {
+    // verify initial route name
+    expect(wrapper.vm.$route.name).toBe('agm-extension')
+
+    // mock hasPendingTasks()
+    LegalServices.hasPendingTasks = vi.fn().mockResolvedValue(false)
+
+    // mock createFiling()
+    LegalServices.createFiling = vi.fn().mockResolvedValue({
+      agmExtension: {},
+      business: {},
+      header: {
+        filingId: 123,
+        isPaymentActionRequired: false
+      }
     })
 
-    // mock $route
-    const $route = { params: { filingId: '456' } }
+    // simulate eligible data and valid component
+    wrapper.setData({
+      data: { isEligible: true },
+      extensionRequestValid: true
+    })
 
-    // create local Vue and mock router
-    createLocalVue().use(VueRouter)
-    const router = mockRouter.mock()
-    router.push({ name: 'continuation-out' })
+    // simulate valid certify data and component
+    wrapper.setData({ certifiedBy: 'Full Name', isCertified: true, certifyFormValid: true })
 
-    const wrapper = shallowMount(AgmExtension, {
-      router,
-      stubs: {
-        BusinessNameForeign: true,
-        CourtOrderPoa: true,
-        DetailComment: true,
-        DocumentDelivery: true,
-        Certify: true,
-        EffectiveDate: true,
-        ForeignJurisdiction: true,
-        SbcFeeSummary: true
-      },
-      mocks: { $route }
-    })
-    const vm: any = wrapper.vm
+    // click the file-pay button
+    await wrapper.find('#file-pay-btn').trigger('click')
 
-    // wait for fetches to complete
+    // wait for save to complete and everything to update
     await flushPromises()
 
-    expect(vm.certifiedBy).toBe('Johnny Certifier')
-    // NB: line 1 (default comment) should be removed
-    expect(vm.detailComment).toBe('Line 2\nLine 3')
-    expect(vm.initialEffectiveDate).toBe('2023-06-10')
-    expect(vm.initialBusinessName).toBe('North Shore Toys LTD.')
-    expect(vm.initialCountry).toBe('CA')
-    expect(vm.initialRegion).toBe('AB')
-
-    wrapper.destroy()
+    // verify legal services method was called
+    expect(LegalServices.createFiling).toHaveBeenCalled()
+
+    // verify payload (filing JSON)
+    const data = {
+      agmExtension: {
+        agmDueDate: null,
+        agmYear: null,
+        alreadyExtended: null,
+        currentDate: '2023-11-06',
+        expireDateApprovedExt: null,
+        extReqForAgmYear: null,
+        extensionDuration: NaN,
+        incorporationDate: new Date('2000-01-01T08:00:00.000Z'),
+        intendedAgmDate: null,
+        isEligible: true,
+        isFirstAgm: null,
+        isGoodStanding: true,
+        isPrevExtension: null,
+        prevAgmDate: null,
+        prevExpiryDate: null,
+        requestExpired: null,
+        totalApprovedExt: NaN,
+        year: null
+      },
+      business: {
+        foundingDate: '2000-01-01T08:00:00.000+00:00',
+        identifier: 'BC1234567',
+        legalName: 'My Benefit Company',
+        legalType: 'BEN'
+      },
+      header: {
+        certifiedBy: 'Full Name',
+        date: '2023-11-06',
+        name: 'agmExtension'
+      }
+    }
+    expect(LegalServices.createFiling).toHaveBeenCalledWith('BC1234567', data, false)
+
+    // verify redirection to dashboard
+    expect(wrapper.vm.$route.name).toBe('dashboard')
   })
 })
diff --git a/tests/unit/AgmExtensionEvaluation.spec.ts b/tests/unit/AgmExtensionEvaluation.spec.ts
new file mode 100644
index 000000000..5e3508f86
--- /dev/null
+++ b/tests/unit/AgmExtensionEvaluation.spec.ts
@@ -0,0 +1,206 @@
+import Vue from 'vue'
+import Vuetify from 'vuetify'
+import { mount } from '@vue/test-utils'
+import AgmExtensionEvaluation from '@/components/AgmExtension/AgmExtensionEvaluation.vue'
+import { AgmExtEvalIF, EmptyAgmExtEval } from '@/interfaces'
+
+Vue.use(Vuetify)
+
+const vuetify = new Vuetify({})
+
+describe('ExtensionEvaluation', () => {
+  let wrapper: any
+
+  beforeEach(() => {
+    wrapper = mount(AgmExtensionEvaluation, {
+      propsData: {
+        data: {
+          ...EmptyAgmExtEval,
+          agmYear: '2023',
+          currentDate: '2023-10-22',
+          incorporationDate: new Date('2023-01-01T08:00:00.000Z')
+        } as AgmExtEvalIF,
+        evaluateResult: true
+      },
+      vuetify
+    })
+  })
+
+  afterEach(() => {
+    wrapper.destroy()
+  })
+
+  it('displays normally', () => {
+    const rows = wrapper.findAll('.content .row')
+
+    expect(rows.at(0).find('.col-sm-3').text()).toBe('AGM Year')
+    expect(rows.at(0).find('.col-sm-9').text()).toBe('2023')
+
+    expect(rows.at(1).find('.col-sm-3').text()).toBe('Duration of Extension')
+    expect(rows.at(1).find('.col-sm-9').text()).toBe('')
+
+    expect(rows.at(2).find('.col-sm-3').text()).toBe('Due date for this AGM')
+    expect(rows.at(2).find('.col-sm-9').text()).toBe('')
+  })
+
+  it('displays warning card normally', async () => {
+    wrapper.setData({
+      data: {
+        ...wrapper.vm.data,
+        isEligible: false
+      } as AgmExtEvalIF
+    })
+    await Vue.nextTick() // wait for DOM to update
+
+    expect(wrapper.find('.v-card').attributes('id')).toBe('agm-extension-evaluation')
+    expect(wrapper.find('header i').attributes('class')).toContain('mdi-calendar-range')
+    expect(wrapper.find('header h2').text()).toBe('AGM Extension Evaluation')
+    expect(wrapper.find('.content .message-box').text()).toContain('Based on the information')
+  })
+
+  it('is eligible', async () => {
+    wrapper.setData({
+      data: {
+        ...wrapper.vm.data,
+        isEligible: true,
+        extensionDuration: 6
+      } as AgmExtEvalIF
+    })
+    await Vue.nextTick() // wait for DOM to update
+
+    const rows = wrapper.findAll('.content .row')
+
+    expect(rows.at(0).find('.col-sm-9').text()).toBe('2023')
+    expect(rows.at(1).find('.col-sm-9').text()).toBe('6 months')
+    expect(rows.at(2).find('.col-sm-9').text()).toBe('')
+  })
+
+  it('is eligible, setting the already extended and request expired to true', async () => {
+    wrapper.setData({
+      data: {
+        ...wrapper.vm.data,
+        isEligible: true,
+        extensionDuration: 6,
+        alreadyExtended: true,
+        requestExpired: true
+      } as AgmExtEvalIF
+    })
+    await Vue.nextTick() // wait for DOM to update
+
+    const rows = wrapper.findAll('.content .row')
+
+    expect(rows.at(0).find('.col-sm-9').text()).toBe('2023')
+    expect(rows.at(1).find('.col-sm-9').text()).toBe('6 months')
+    expect(rows.at(2).find('.col-sm-9').text()).toBe('')
+  })
+
+  it('is eligible, setting the already extended to false request expired to true', async () => {
+    wrapper.setData({
+      data: {
+        ...wrapper.vm.data,
+        isEligible: true,
+        extensionDuration: 6,
+        alreadyExtended: false,
+        requestExpired: true
+      } as AgmExtEvalIF
+    })
+    await Vue.nextTick() // wait for DOM to update
+
+    const rows = wrapper.findAll('.content .row')
+
+    expect(rows.at(0).find('.col-sm-9').text()).toBe('2023')
+    expect(rows.at(1).find('.col-sm-9').text()).toBe('6 months')
+    expect(rows.at(2).find('.col-sm-9').text()).toBe('')
+  })
+
+  it('is eligible, setting the already extended to true and request expired to false', async () => {
+    wrapper.setData({
+      data: {
+        ...wrapper.vm.data,
+        isEligible: true,
+        extensionDuration: 6,
+        alreadyExtended: true,
+        requestExpired: false
+      } as AgmExtEvalIF
+    })
+    await Vue.nextTick() // wait for DOM to update
+
+    const rows = wrapper.findAll('.content .row')
+
+    expect(rows.at(0).find('.col-sm-9').text()).toBe('2023')
+    expect(rows.at(1).find('.col-sm-9').text()).toBe('6 months')
+    expect(rows.at(2).find('.col-sm-9').text()).toBe('')
+  })
+
+  it('is not eligible - already extended', async () => {
+    wrapper.setData({
+      data: {
+        ...wrapper.vm.data,
+        isEligible: false,
+        alreadyExtended: true,
+        requestExpired: false
+      } as AgmExtEvalIF
+    })
+    await Vue.nextTick() // wait for DOM to update
+
+    const rows = wrapper.findAll('.content .row')
+
+    expect(rows.at(0).find('.col-sm-9').text()).toBe('2023')
+    expect(rows.at(1).find('.col-sm-9').text()).toBe(
+      'The business has reached maximum possible extension for this AGM.')
+    expect(rows.at(2).find('.col-sm-9').text()).toBe('')
+  })
+
+  it('is not eligible - request expired', async () => {
+    wrapper.setData({
+      data: {
+        ...wrapper.vm.data,
+        isEligible: false,
+        alreadyExtended: false,
+        requestExpired: true
+      } as AgmExtEvalIF
+    })
+    await Vue.nextTick() // wait for DOM to update
+
+    const rows = wrapper.findAll('.content .row')
+
+    expect(rows.at(0).find('.col-sm-9').text()).toBe('2023')
+    expect(rows.at(1).find('.col-sm-9').text()).toBe(
+      'The business is outside of the time window to request an extension.')
+    expect(rows.at(2).find('.col-sm-9').text()).toBe('')
+  })
+
+  it('is not eligible - already extended + request expired', async () => {
+    wrapper.setData({
+      data: {
+        ...wrapper.vm.data,
+        isEligible: false,
+        alreadyExtended: true,
+        requestExpired: true
+      } as AgmExtEvalIF
+    })
+    await Vue.nextTick() // wait for DOM to update
+
+    const rows = wrapper.findAll('.content .row')
+
+    expect(rows.at(0).find('.col-sm-9').text()).toBe('2023')
+    expect(rows.at(1).find('.col-sm-9').text()).toBe(
+      'The AGM due date from the previous extension has passed.')
+    expect(rows.at(2).find('.col-sm-9').text()).toBe('')
+  })
+
+  it('is not eligible - do not evaluate', async () => {
+    wrapper.setData({
+      data: {
+        ...wrapper.vm.data,
+        isEligible: false,
+        alreadyExtended: true,
+        requestExpired: true
+      } as AgmExtEvalIF,
+      evaluateResult: false
+    })
+    await Vue.nextTick() // wait for DOM to update
+
+    expect(wrapper.find('.message-box').exists()).toBe(true)
+  })
+})
diff --git a/tests/unit/AgmExtensionHelp.spec.ts b/tests/unit/AgmExtensionHelp.spec.ts
new file mode 100644
index 000000000..44fac4274
--- /dev/null
+++ b/tests/unit/AgmExtensionHelp.spec.ts
@@ -0,0 +1,23 @@
+import Vue from 'vue'
+import Vuetify from 'vuetify'
+import { shallowMount } from '@vue/test-utils'
+import AgmExtensionHelp from '@/components/AgmExtension/AgmExtensionHelp.vue'
+
+Vue.use(Vuetify)
+const vuetify = new Vuetify({})
+
+describe('AgmExtensionHelp', () => {
+  it('displays normally', () => {
+    const wrapper = shallowMount(AgmExtensionHelp, { vuetify })
+
+    expect(wrapper.find('.agm-extension-help').exists()).toBe(true)
+    expect(wrapper.find('h3').text()).toBe('AGM Extension Help')
+
+    const paragraphs = wrapper.findAll('p')
+    expect(paragraphs.at(0).text()).toContain('A company must have an')
+    expect(paragraphs.at(1).text()).toContain('Shareholders entitled to')
+    expect(paragraphs.at(2).text()).toContain('If a company does not')
+
+    wrapper.destroy()
+  })
+})
diff --git a/tests/unit/AgmLocation.spec.ts b/tests/unit/AgmLocation.spec.ts
new file mode 100644
index 000000000..f2fcb62e3
--- /dev/null
+++ b/tests/unit/AgmLocation.spec.ts
@@ -0,0 +1,99 @@
+import Vue from 'vue'
+import Vuetify from 'vuetify'
+import { mount } from '@vue/test-utils'
+import AgmLocation from '@/components/AgmLocationChange/AgmLocation.vue'
+
+Vue.use(Vuetify)
+const vuetify = new Vuetify({})
+
+// Prevent the warning "[Vuetify] Unable to locate target [data-app]"
+document.body.setAttribute('data-app', 'true')
+
+describe('AgmLocation', () => {
+  /** Array of validations rules for AGM location to be passed as a prop. */
+  const rules = [] as Array<(val) => boolean | string>
+  rules.push(val => !!val || 'AGM location is required.')
+  rules.push(val => (val.length <= 400) || 'Must be 400 characters or less.')
+
+  it('initializes correctly', () => {
+    const wrapper = mount(AgmLocation,
+      {
+        vuetify,
+        propsData: {
+          rules: rules
+        }
+      })
+    const vm: any = wrapper.vm
+
+    expect(vm.agmLocation).toBe('')
+    expect(wrapper.emitted('update:agmLocation')).toBeUndefined()
+    expect(wrapper.emitted('valid').pop()[0]).toBe(false)
+    wrapper.destroy()
+  })
+
+  it('emit correct validation when initial location value is passed', async () => {
+    const wrapper = mount(AgmLocation,
+      {
+        vuetify,
+        propsData: {
+          rules: rules,
+          locationValue: 'Toronto, Ontario, Canada'
+        }
+      })
+
+    expect(wrapper.emitted('valid').pop()[0]).toBe(true)
+    wrapper.destroy()
+  })
+
+  it('emit correct events when a valid agm location is the input', async () => {
+    const wrapper = mount(AgmLocation,
+      {
+        vuetify,
+        propsData: {
+          rules: rules
+        }
+      })
+
+    const input = wrapper.find('#agm-location')
+    await input.setValue('Toronto, Ontario, Canada')
+
+    expect(wrapper.emitted('update:agmLocation').pop()[0]).toBe('Toronto, Ontario, Canada')
+    expect(wrapper.emitted('valid').pop()[0]).toBe(true)
+    wrapper.destroy()
+  })
+
+  it('emit correct events when an invalid agm location (empty string) is the input', async () => {
+    const wrapper = mount(AgmLocation,
+      {
+        vuetify,
+        propsData: {
+          rules: rules
+        }
+      })
+
+    const input = wrapper.find('#agm-location')
+    await input.setValue('')
+
+    expect(wrapper.emitted('update:agmLocation').pop()[0]).toBe('')
+    expect(wrapper.emitted('valid').pop()[0]).toBe(false)
+    wrapper.destroy()
+  })
+
+  it('emit correct events when an invalid agm location (over 100 chars) is the input', async () => {
+    const wrapper = mount(AgmLocation,
+      {
+        vuetify,
+        propsData: {
+          rules: rules
+        }
+      })
+
+    const input = wrapper.find('#agm-location')
+    const a401 = 'a'.repeat(401)
+    await input.setValue(a401)
+
+    expect(wrapper.emitted('update:agmLocation').pop()[0]).toBe(a401)
+    expect(wrapper.emitted('valid').pop()[0]).toBe(false)
+    wrapper.destroy()
+  })
+})
diff --git a/tests/unit/AgmLocationChg.spec.ts b/tests/unit/AgmLocationChg.spec.ts
index dc1a3c014..f09ff31a1 100644
--- a/tests/unit/AgmLocationChg.spec.ts
+++ b/tests/unit/AgmLocationChg.spec.ts
@@ -2,18 +2,16 @@ import Vue from 'vue'
 import Vuetify from 'vuetify'
 import { createLocalVue, shallowMount } from '@vue/test-utils'
 import { createPinia, setActivePinia } from 'pinia'
-import { useBusinessStore, useRootStore } from '@/stores'
+import { useBusinessStore, useConfigurationStore, useRootStore } from '@/stores'
 import AgmLocationChg from '@/views/AgmLocationChg.vue'
-import { ConfirmDialog, ResumeErrorDialog, SaveErrorDialog }
-  from '@/components/dialogs'
-import { BusinessNameForeign, EffectiveDate, Certify, DetailComment, ForeignJurisdiction } from '@/components/common'
-import { CourtOrderPoa } from '@bcrs-shared-components/court-order-poa'
-import { DocumentDelivery } from '@bcrs-shared-components/document-delivery'
-import { LegalServices } from '@/services'
+import { Certify } from '@/components/common'
+import AgmYear from '@/components/AgmLocationChange/AgmYear.vue'
 import flushPromises from 'flush-promises'
 import mockRouter from './mockRouter'
 import VueRouter from 'vue-router'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
+import sinon from 'sinon'
+import axios from '@/axios-auth'
 
 // suppress various warnings:
 // - "Unknown custom element <affix>" warnings
@@ -23,84 +21,136 @@ import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 Vue.config.silent = true
 
 Vue.use(Vuetify)
-
+const vuetify = new Vuetify({})
 const localVue = createLocalVue()
 localVue.use(VueRouter)
 setActivePinia(createPinia())
 const businessStore = useBusinessStore()
+const configurationStore = useConfigurationStore()
 const rootStore = useRootStore()
 
-describe.skip('AGM Location Chg view', () => {
+// Prevent the warning "[Vuetify] Unable to locate target [data-app]"
+document.body.setAttribute('data-app', 'true')
+
+describe('AGM Location Chg view', () => {
+  const { assign } = window.location
+
+  beforeAll(() => {
+    // mock the window.location.assign function
+    delete window.location
+    window.location = { assign: vi.fn() } as any
+
+    // set configurations
+    const configuration = {
+      'VUE_APP_AUTH_WEB_URL': 'https://auth.web.url/'
+    }
+    configurationStore.setConfiguration(configuration)
+
+    // set necessary session variables
+    sessionStorage.setItem('BASE_URL', 'https://base.url/')
+    sessionStorage.setItem('CURRENT_ACCOUNT', '{ "id": "2288" }')
+  })
+
   beforeEach(() => {
     // init store
     rootStore.currentDate = '2020-03-04'
-    businessStore.setLegalType(CorpTypeCd.COOP)
+    businessStore.setLegalType(CorpTypeCd.BENEFIT_COMPANY)
     businessStore.setLegalName('My Test Entity')
-    businessStore.setIdentifier('CP1234567')
+    businessStore.setIdentifier('BC0007291')
     businessStore.setFoundingDate('1971-05-12T00:00:00-00:00')
     rootStore.filingData = []
-    rootStore.keycloakRoles = ['staff'] // continuation outs currently apply to staff only
+    rootStore.keycloakRoles = ['user']
+
+    // mock "get tasks" endpoint - needed for hasPendingTasks()
+    sinon
+      .stub(axios, 'get')
+      .withArgs('businesses/BC0007291/tasks')
+      .returns(Promise.resolve({ data: { tasks: [] } }))
+
+    // mock "save and file" endpoint
+    sinon
+      .stub(axios, 'post')
+      .withArgs('businesses/BC0007291/filings')
+      .returns(Promise.resolve({
+        data: {
+          filing: {
+            agmLocationChange: {
+              year: '2023',
+              agmLocation: 'Toronto, Ontario, Canada',
+              reason: 'Test Reason'
+            },
+            business: {
+              foundingDate: '2007-04-08T00:00:00+00:00',
+              identifier: 'BC0007291',
+              legalName: 'Legal Name - BC0007291'
+            },
+            header: {
+              name: 'agmLocationChange',
+              date: '2017-06-06',
+              submitter: 'bc0007291',
+              status: 'PENDING',
+              filingId: 123,
+              certifiedBy: 'Full Name',
+              email: 'no_one@never.get',
+              paymentToken: '321',
+              isPaymentActionRequired: true
+            }
+          }
+        }
+      }))
   })
 
-  it('mounts the sub-components properly', async () => {
-    const $route = { params: { filingId: '0' } }
+  afterEach(() => {
+    sinon.restore()
+    vi.restoreAllMocks()
+  })
+
+  afterAll(() => {
+    window.location.assign = assign
+  })
 
+  it('mounts the sub-components properly', () => {
     // create local Vue and mock router
     const localVue = createLocalVue()
     localVue.use(VueRouter)
     const $router = mockRouter.mock()
+    const $route = { params: { filingId: '0' } }
 
     const wrapper = shallowMount(AgmLocationChg, { mocks: { $route, $router } })
-    wrapper.vm.$data.dataLoaded = true
-    await Vue.nextTick()
 
     // verify sub-components
-    expect(wrapper.findComponent(BusinessNameForeign).exists()).toBe(true)
+    expect(wrapper.findComponent(AgmYear).exists()).toBe(true)
     expect(wrapper.findComponent(Certify).exists()).toBe(true)
-    expect(wrapper.findComponent(ConfirmDialog).exists()).toBe(true)
-    expect(wrapper.findComponent(CourtOrderPoa).exists()).toBe(true)
-    expect(wrapper.findComponent(DetailComment).exists()).toBe(true)
-    expect(wrapper.findComponent(DocumentDelivery).exists()).toBe(true)
-    expect(wrapper.findComponent(EffectiveDate).exists()).toBe(true)
-    expect(wrapper.findComponent(ForeignJurisdiction).exists()).toBe(true)
-    expect(wrapper.findComponent(ResumeErrorDialog).exists()).toBe(true)
-    expect(wrapper.findComponent(SaveErrorDialog).exists()).toBe(true)
 
     wrapper.destroy()
   })
 
-  it('sets filing data properly', async () => {
-    const $route = { params: { filingId: '0' } }
-
+  it('sets filing data properly', () => {
     // create local Vue and mock router
     const localVue = createLocalVue()
     localVue.use(VueRouter)
     const $router = mockRouter.mock()
+    const $route = { params: { filingId: '0' } }
 
     const wrapper = shallowMount(AgmLocationChg, { mocks: { $route, $router } })
-    wrapper.vm.$data.dataLoaded = true
-    await Vue.nextTick()
-
     const vm: any = wrapper.vm
 
     // verify initial Filing Data
     expect(vm.filingData).not.toBeUndefined()
     expect(vm.filingData).not.toBeNull()
     expect(vm.filingData.length).toBe(1)
-    expect(vm.filingData[0].filingTypeCode).toBe('COUTI')
-    expect(vm.filingData[0].entityType).toBe('CP')
+    expect(vm.filingData[0].filingTypeCode).toBe('AGMLC')
+    expect(vm.filingData[0].entityType).toBe('BEN')
 
     wrapper.destroy()
   })
 
   it('sets computed states properly', () => {
-    // mock $route
-    const $route = { params: { filingId: '0' } }
-
     // create local Vue and mock router
     const localVue = createLocalVue()
     localVue.use(VueRouter)
     const $router = mockRouter.mock()
+    const $route = { params: { filingId: '0' } }
 
     const wrapper = shallowMount(AgmLocationChg, { mocks: { $route, $router } })
     const vm: any = wrapper.vm
@@ -114,211 +164,71 @@ describe.skip('AGM Location Chg view', () => {
     expect(!!vm.isPayRequired).toBe(true)
 
     // verify "validated" - all true
-    vm.businessNameValid = true
+    vm.agmLocationValid = true
+    vm.agmYearValid = true
     vm.certifyFormValid = true
-    vm.courtOrderValid = true
-    vm.detailCommentValid = true
-    vm.documentDeliveryValid = true
-    vm.effectiveDateValid = true
-    vm.foreignJurisdictionValid = true
+    vm.reasonValid = true
     expect(!!vm.isPageValid).toBe(true)
 
-    // verify "validated" - invalid Detail Comment form
-    vm.businessNameValid = true
+    // verify "validated" - invalid agm year
+    vm.agmLocationValid = true
+    vm.agmYearValid = false
     vm.certifyFormValid = true
-    vm.courtOrderValid = true
-    vm.detailCommentValid = false
-    vm.documentDeliveryValid = true
-    vm.effectiveDateValid = true
-    vm.foreignJurisdictionValid = true
+    vm.reasonValid = true
     expect(!!vm.isPageValid).toBe(false)
 
-    // verify "validated" - invalid Certify form
-    vm.businessNameValid = true
-    vm.certifyFormValid = false
-    vm.courtOrderValid = true
-    vm.detailCommentValid = true
-    vm.documentDeliveryValid = true
-    vm.effectiveDateValid = true
-    vm.foreignJurisdictionValid = true
-    expect(!!vm.isPageValid).toBe(false)
-
-    // verify "validated" - invalid Court Order form
-    vm.businessNameValid = true
+    // verify "validated" - invalid reason
+    vm.agmLocationValid = true
+    vm.agmYearValid = true
     vm.certifyFormValid = true
-    vm.courtOrderValid = false
-    vm.detailCommentValid = true
-    vm.documentDeliveryValid = true
-    vm.effectiveDateValid = true
-    vm.foreignJurisdictionValid = true
+    vm.reasonValid = false
     expect(!!vm.isPageValid).toBe(false)
 
-    // verify "validated" - invalid Document Delivery form
-    vm.businessNameValid = true
+    // verify "validated" - invalid Location change form
+    vm.agmLocationValid = false
+    vm.agmYearValid = true
     vm.certifyFormValid = true
-    vm.courtOrderValid = true
-    vm.detailCommentValid = true
-    vm.documentDeliveryValid = false
-    vm.effectiveDateValid = true
-    vm.foreignJurisdictionValid = true
+    vm.reasonValid = true
     expect(!!vm.isPageValid).toBe(false)
 
-    // verify "validated" - invalid Foreign Jurisdiction form
-    vm.businessNameValid = true
-    vm.certifyFormValid = true
-    vm.courtOrderValid = true
-    vm.detailCommentValid = true
-    vm.documentDeliveryValid = true
-    vm.effectiveDateValid = true
-    vm.foreignJurisdictionValid = false
-    expect(vm.isPageValid).toBe(false)
-    wrapper.destroy()
-
-    // verify "validated" - invalid Effective Date form
-    vm.businessNameValid = true
-    vm.certifyFormValid = true
-    vm.courtOrderValid = true
-    vm.detailCommentValid = true
-    vm.documentDeliveryValid = true
-    vm.effectiveDateValid = false
-    vm.foreignJurisdictionValid = true
-    expect(vm.isPageValid).toBe(false)
-    wrapper.destroy()
-
-    // verify "validated" - invalid Business Name Foreign form
-    vm.businessNameValid = false
-    vm.certifyFormValid = true
-    vm.courtOrderValid = true
-    vm.detailCommentValid = true
-    vm.documentDeliveryValid = true
-    vm.effectiveDateValid = true
-    vm.foreignJurisdictionValid = true
-    expect(vm.isPageValid).toBe(false)
-    wrapper.destroy()
+    // verify "validated" - invalid Certify form
+    vm.agmLocationValid = true
+    vm.agmYearValid = true
+    vm.certifyFormValid = false
+    vm.reasonValid = true
+    expect(!!vm.isPageValid).toBe(false)
   })
 
-  it('saves draft continuation out properly', async () => {
-    // mock "has pending tasks" legal service
-    vi.spyOn(LegalServices, 'hasPendingTasks').mockImplementation((): any => {
-      return Promise.resolve(false)
-    })
-
-    // mock "create filing" legal service
-    // (garbage response data - we aren't testing that)
-    vi.spyOn(LegalServices, 'createFiling').mockImplementation((): any => {
-      return Promise.resolve({
-        business: {},
-        header: { filingId: 456 },
-        agmLocationChg: {
-          continuationOutDate: '2023-06-10',
-          details: 'test',
-          foreignJurisdiction: {
-            country: 'LB'
-          },
-          legalName: 'North Shore Toys LTD.'
-        },
-        annualReport: {}
-      })
-    })
-
-    // mock $route
-    const $route = { params: { filingId: '0' } }
+  it('saves a new filing and redirects to Pay URL when the File & Pay button is clicked', async () => {
+    const $route = { params: { filingId: '0' } } // new filing id
 
-    // create local Vue and mock router
-    createLocalVue().use(VueRouter)
-    const router = mockRouter.mock()
-    router.push({ name: 'continuation-out' })
-
-    const wrapper = shallowMount(AgmLocationChg, {
-      router,
-      stubs: {
-        BusinessNameForeign: true,
-        CourtOrderPoa: true,
-        DetailComment: true,
-        DocumentDelivery: true,
-        Certify: true,
-        EffectiveDate: true,
-        ForeignJurisdiction: true,
-        SbcFeeSummary: true
-      },
-      mocks: { $route }
-    })
+    const wrapper = shallowMount(AgmLocationChg, { mocks: { $route }, vuetify })
     const vm: any = wrapper.vm
 
-    // wait for fetch to complete
-    await flushPromises()
-
-    // call the save action (since clicking button doesn't work)
-    await vm.onClickSave()
-
-    // verify new Filing ID
-    expect(vm.filingId).toBe(456)
-
-    wrapper.destroy()
-  })
-
-  it('resumes draft continuation out properly', async () => {
-    // mock "fetch filing" legal service
-    vi.spyOn(LegalServices, 'fetchFiling').mockImplementation((): any => {
-      return Promise.resolve({
-        business: {
-          identifier: 'CP1234567',
-          legalName: 'My Test Entity'
-        },
-        header: {
-          name: 'agmLocationChg',
-          status: 'DRAFT',
-          certifiedBy: 'Johnny Certifier',
-          routingSlipNumber: '123456789',
-          priority: true
-        },
-        agmLocationChg: {
-          continuationOutDate: '2023-06-10',
-          details: 'Line 1\nLine 2\nLine 3',
-          foreignJurisdiction: {
-            country: 'CA',
-            region: 'AB'
-          },
-          legalName: 'North Shore Toys LTD.'
-        },
-        annualReport: {}
-      })
+    // make sure form is validated
+    await wrapper.setData({
+      agmLocationValid: true,
+      agmYearValid: true,
+      certifyFormValid: true,
+      reasonValid: true
     })
 
-    // mock $route
-    const $route = { params: { filingId: '456' } }
+    expect(vm.isPageValid).toEqual(true)
 
-    // create local Vue and mock router
-    createLocalVue().use(VueRouter)
-    const router = mockRouter.mock()
-    router.push({ name: 'continuation-out' })
-
-    const wrapper = shallowMount(AgmLocationChg, {
-      router,
-      stubs: {
-        BusinessNameForeign: true,
-        CourtOrderPoa: true,
-        DetailComment: true,
-        DocumentDelivery: true,
-        Certify: true,
-        EffectiveDate: true,
-        ForeignJurisdiction: true,
-        SbcFeeSummary: true
-      },
-      mocks: { $route }
-    })
-    const vm: any = wrapper.vm
+    // fee is set to 0
+    vm.totalFee = 0
+
+    // sanity check
+    expect(vi.isMockFunction(window.location.assign)).toBe(true)
 
-    // wait for fetches to complete
-    await flushPromises()
+    // click the File & Pay button
+    await vm.onClickFilePay()
+    await flushPromises() // wait for save to complete and everything to update
 
-    expect(vm.certifiedBy).toBe('Johnny Certifier')
-    // NB: line 1 (default comment) should be removed
-    expect(vm.detailComment).toBe('Line 2\nLine 3')
-    expect(vm.initialEffectiveDate).toBe('2023-06-10')
-    expect(vm.initialBusinessName).toBe('North Shore Toys LTD.')
-    expect(vm.initialCountry).toBe('CA')
-    expect(vm.initialRegion).toBe('AB')
+    // verify redirection
+    const accountId = JSON.parse(sessionStorage.getItem('CURRENT_ACCOUNT'))?.id
+    const payURL = 'https://auth.web.url/makepayment/321/' + encodeURIComponent('https://base.url/?filing_id=123')
+    expect(window.location.assign).toHaveBeenCalledWith(payURL + '?accountid=' + accountId)
 
     wrapper.destroy()
   })
diff --git a/tests/unit/AgmYear.spec.ts b/tests/unit/AgmYear.spec.ts
new file mode 100644
index 000000000..eae889e07
--- /dev/null
+++ b/tests/unit/AgmYear.spec.ts
@@ -0,0 +1,132 @@
+import Vue from 'vue'
+import Vuetify from 'vuetify'
+import { mount } from '@vue/test-utils'
+import AgmYear from '@/components/AgmLocationChange/AgmYear.vue'
+import { sleep } from '@/utils/sleep'
+
+Vue.use(Vuetify)
+const vuetify = new Vuetify({})
+
+// Prevent the warning "[Vuetify] Unable to locate target [data-app]"
+document.body.setAttribute('data-app', 'true')
+
+describe('AgmYear', () => {
+  /** Array of validations rules for AGM Year with min and max AGM year. */
+  const today = new Date()
+  const minAgmYear = today.getFullYear() - 2
+  const maxAgmYear = today.getFullYear() + 1
+  const rules = [] as Array<(val) => boolean | string>
+  rules.push(val => !!val || 'AGM year is required.')
+  rules.push(val => (val && +val <= maxAgmYear) || 'Must be on or before ' + maxAgmYear)
+  rules.push(val => (val && +val >= minAgmYear) || 'Must be on or after ' + minAgmYear)
+
+  it('initializes correctly', () => {
+    const wrapper = mount(AgmYear,
+      {
+        vuetify,
+        propsData: {
+          rules: rules
+        }
+      })
+    const vm: any = wrapper.vm
+
+    expect(vm.agmYear).toBe('')
+    expect(wrapper.emitted('input')).toBeUndefined()
+    expect(wrapper.emitted('valid').pop()[0]).toBe(false)
+    wrapper.destroy()
+  })
+
+  it('emit correct validation when valid agm year is passed', async () => {
+    const wrapper = mount(AgmYear,
+      {
+        vuetify,
+        propsData: {
+          rules: rules,
+          value: today.getFullYear()
+        }
+      })
+
+    expect(wrapper.emitted('valid').pop()[0]).toBe(true)
+    wrapper.destroy()
+  })
+
+  it('emit correct events when a valid agm year is the input', async () => {
+    const wrapper = mount(AgmYear,
+      {
+        vuetify,
+        propsData: {
+          rules: rules
+        }
+      })
+
+    const vm: any = wrapper.vm
+    vm.onValueChanged(today.getFullYear())
+    const input = wrapper.find('#year-txt')
+    await input.setValue(today.getFullYear())
+    await sleep(300) // need to wait for debounce
+
+    expect(wrapper.emitted('input').pop()[0]).toBe(today.getFullYear().toString())
+    expect(wrapper.emitted('valid').pop()[0]).toBe(true)
+    wrapper.destroy()
+  })
+
+  it('emit correct events when an invalid agm year (empty string) is the input', async () => {
+    const wrapper = mount(AgmYear,
+      {
+        vuetify,
+        propsData: {
+          rules: rules
+        }
+      })
+
+    const vm: any = wrapper.vm
+    vm.onValueChanged('')
+    const input = wrapper.find('#year-txt')
+    await input.setValue('')
+    await sleep(300) // need to wait for debounce
+
+    expect(wrapper.emitted('input').pop()[0]).toBe('')
+    expect(wrapper.emitted('valid').pop()[0]).toBe(false)
+    wrapper.destroy()
+  })
+
+  it('emit correct events when an invalid agm year (less than min) is the input', async () => {
+    const wrapper = mount(AgmYear,
+      {
+        vuetify,
+        propsData: {
+          rules: rules
+        }
+      })
+
+    const vm: any = wrapper.vm
+    vm.onValueChanged(today.getFullYear() - 3)
+    const input = wrapper.find('#year-txt')
+    await input.setValue(today.getFullYear() - 3)
+    await sleep(300) // need to wait for debounce
+
+    expect(wrapper.emitted('input').pop()[0]).toBe((today.getFullYear() - 3).toString())
+    expect(wrapper.emitted('valid').pop()[0]).toBe(false)
+    wrapper.destroy()
+  })
+
+  it('emit correct events when an invalid agm year (more than max) is the input', async () => {
+    const wrapper = mount(AgmYear,
+      {
+        vuetify,
+        propsData: {
+          rules: rules
+        }
+      })
+
+    const vm: any = wrapper.vm
+    vm.onValueChanged(today.getFullYear() + 2)
+    const input = wrapper.find('#year-txt')
+    await input.setValue(today.getFullYear() + 2)
+    await sleep(300) // need to wait for debounce
+
+    expect(wrapper.emitted('input').pop()[0]).toBe((today.getFullYear() + 2).toString())
+    expect(wrapper.emitted('valid').pop()[0]).toBe(false)
+    wrapper.destroy()
+  })
+})
diff --git a/tests/unit/Amalgamation.spec.ts b/tests/unit/Amalgamation.spec.ts
new file mode 100644
index 000000000..dcfa41080
--- /dev/null
+++ b/tests/unit/Amalgamation.spec.ts
@@ -0,0 +1,60 @@
+import Vue from 'vue'
+import Vuetify from 'vuetify'
+import { mount } from '@vue/test-utils'
+import { createPinia, setActivePinia } from 'pinia'
+import { useBusinessStore } from '@/stores'
+import Amalgamation from '@/components/Dashboard/Alerts/Amalgamation.vue'
+import { ContactInfo } from '@/components/common'
+import flushPromises from 'flush-promises'
+
+Vue.use(Vuetify)
+const vuetify = new Vuetify({})
+
+setActivePinia(createPinia())
+const businessStore = useBusinessStore()
+
+describe('Amalgamation component', () => {
+  beforeAll(() => {
+    businessStore.$state.businessInfo.warnings = [
+      {
+        code: 'AMALGAMATING_BUSINESS',
+        message: 'This business is part of a future effective amalgamation.',
+        warningType: 'FUTURE_EFFECTIVE_AMALGAMATION',
+        data: {
+          amalgamationDate: '2024-01-31T08:00:00+00:00'
+        }
+      }
+    ]
+  })
+
+  it('Displays expansion panel closed', () => {
+    const wrapper = mount(Amalgamation, { vuetify })
+
+    // verify content
+    expect(wrapper.find('h3').text()).toContain('This corporation is part of an amalgamation')
+    expect(wrapper.find('h3').text()).toContain('January 31, 2024')
+    expect(wrapper.find('.details-btn').text()).toBe('View Details')
+    expect(wrapper.find('.v-expansion-panel-content').exists()).toBe(false)
+
+    wrapper.destroy()
+  })
+
+  it('Displays expansion panel open', async () => {
+    const wrapper = mount(Amalgamation, { vuetify })
+
+    // click the button
+    await wrapper.find('.details-btn').trigger('click')
+    await flushPromises() // wait for expansion transition
+
+    // verify content
+    expect(wrapper.find('h3').text()).toContain('This corporation is part of an amalgamation')
+    expect(wrapper.find('h3').text()).toContain('January 31, 2024')
+    expect(wrapper.find('.v-expansion-panel-content').exists()).toBe(true)
+    expect(wrapper.find('.v-expansion-panel-content__wrap').text()).toContain('If you have any questions')
+    expect(wrapper.findComponent(ContactInfo).exists()).toBe(true)
+
+    wrapper.destroy()
+  })
+
+  // FUTURE: add a text to verify hidePhoneNumbers()
+})
diff --git a/tests/unit/AmalgamationFiling.spec.ts b/tests/unit/AmalgamationFiling.spec.ts
new file mode 100644
index 000000000..631211ec5
--- /dev/null
+++ b/tests/unit/AmalgamationFiling.spec.ts
@@ -0,0 +1,61 @@
+import Vue from 'vue'
+import Vuetify from 'vuetify'
+import { Wrapper, mount } from '@vue/test-utils'
+import { createPinia, setActivePinia } from 'pinia'
+import { useBusinessStore } from '@/stores'
+import { FilingStatus, FilingTypes } from '@/enums'
+import AmalgamationFiling from '@/components/Dashboard/FilingHistoryList/filings/AmalgamationFiling.vue'
+
+// mock the console.warn function to hide "[Vuetify] The v-expansion-panel component must be used inside a
+// v-expansion-panels"
+console.warn = vi.fn()
+
+Vue.use(Vuetify)
+
+const vuetify = new Vuetify({})
+setActivePinia(createPinia())
+const businessStore = useBusinessStore()
+
+describe('Amalgamation Filing', () => {
+  let wrapper: Wrapper<AmalgamationFiling>
+
+  beforeAll(() => {
+    // init store
+    businessStore.setLegalName('MY COMPANY')
+
+    wrapper = mount(AmalgamationFiling, {
+      vuetify,
+      propsData: {
+        filing: {
+          comments: [],
+          commentsCount: 0,
+          commentsLink: null,
+          displayName: 'Amalgamation Application - Regular',
+          documents: [],
+          documentsLink: 'dummy_link',
+          data: {},
+          effectiveDate: new Date('2021-01-01 08:00:00 GMT'),
+          name: FilingTypes.AMALGAMATION_APPLICATION,
+          status: FilingStatus.COMPLETED,
+          submittedDate: new Date('2021-01-01 08:00:00 GMT'),
+          submitter: 'John Doe'
+        },
+        index: 0
+      }
+    })
+  })
+
+  afterAll(() => {
+    wrapper.destroy()
+  })
+
+  it('Displays expected content with a valid filing', () => {
+    // verify content
+    expect(wrapper.find('.item-header-title').text()).toBe('Amalgamation Application - Regular')
+    expect(wrapper.find('.item-header-subtitle').text()).toContain('FILED AND PAID')
+    expect(wrapper.find('.item-header-subtitle').text()).toContain('(filed by John Doe on Jan 1, 2021)')
+    expect(wrapper.find('.item-header-subtitle').text()).toContain('EFFECTIVE as of Jan 1, 2021')
+
+    // FUTURE: expand the panel and verify content
+  })
+})
diff --git a/tests/unit/AmalgamationSelection.spec.ts b/tests/unit/AmalgamationSelection.spec.ts
new file mode 100644
index 000000000..2d4ddf417
--- /dev/null
+++ b/tests/unit/AmalgamationSelection.spec.ts
@@ -0,0 +1,88 @@
+import Vue from 'vue'
+import Vuetify from 'vuetify'
+import { createLocalVue, mount } from '@vue/test-utils'
+import AmalgamationSelection from '@/views/AmalgamationSelection.vue'
+import { useBusinessStore } from '@/stores'
+import { createPinia, setActivePinia } from 'pinia'
+import VueRouter from 'vue-router'
+import mockRouter from './mockRouter'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
+import { LegalServices } from '@/services'
+
+Vue.use(Vuetify)
+const vuetify = new Vuetify({})
+const localVue = createLocalVue()
+localVue.use(VueRouter)
+setActivePinia(createPinia())
+
+describe('AmalgamationSelection', () => {
+  let wrapper: any
+
+  beforeEach(() => {
+    const router = mockRouter.mock()
+    router.push({ name: 'amalgamation-selection', params: { filingId: '0' } })
+    wrapper = mount(AmalgamationSelection,
+      {
+        localVue,
+        router,
+        vuetify
+      })
+  })
+
+  afterEach(() => {
+    wrapper.destroy()
+  })
+
+  it('initializes correctly', () => {
+    expect(wrapper.find('#amalgamation-selection').exists()).toBe(true)
+    expect(wrapper.find('#start-horizontal-short-form-card').exists()).toBe(true)
+    expect(wrapper.find('#start-vertical-short-form-card').exists()).toBe(true)
+    expect(wrapper.find('#start-regular-long-form-card').exists()).toBe(true)
+    expect(wrapper.find('.btn-div').exists()).toBe(true)
+  })
+
+  it('content of horizontal short form card is correct', () => {
+    expect(wrapper.find('#start-horizontal-short-form-card > h2').text()).toBe('Horizontal short-form amalgamation')
+    expect(wrapper.find('#start-horizontal-short-form-card > p').text()).toContain(
+      'A horizontal short-form amalgamation can be used if the amalgamating corporations')
+    expect(wrapper.find('#start-horizontal-short-form-card > p').text()).toContain(
+      'are all wholly owned subsidiaries of the same holding body corporate.')
+    expect(wrapper.find('#horizontal-short-form-btn').text()).toBe('Start Horizontal Short-form')
+    // TODO: Need to update this line when short form amalgamations are implemented
+    expect(wrapper.find('#horizontal-short-form-btn').classes()).toContain('v-btn--disabled') // disabled
+  })
+
+  it('content of vertical short form card is correct', () => {
+    expect(wrapper.find('#start-vertical-short-form-card > h2').text()).toBe('Vertical short-form amalgamation')
+    expect(wrapper.find('#start-vertical-short-form-card > p').text()).toContain(
+      'A vertical short-form amalgamation can be used if the subsidiary')
+    expect(wrapper.find('#start-vertical-short-form-card > p').text()).toContain(
+      'corporations are wholly owned by the corporation they are amalgamating with.')
+    expect(wrapper.find('#vertical-short-form-btn').text()).toBe('Start Vertical Short-form')
+    // TODO: Need to update this line when short form amalgamations are implemented
+    expect(wrapper.find('#vertical-short-form-btn').classes()).toContain('v-btn--disabled') // disabled
+  })
+
+  it('content of regular long form card is correct', () => {
+    const vm = wrapper.vm as any
+    useBusinessStore().setLegalType(CorpTypeCd.BC_COMPANY)
+
+    expect(wrapper.find('#start-regular-long-form-card > h2').text()).toBe('Regular long-form amalgamation')
+    expect(wrapper.find('#start-regular-long-form-card > p').text()).toContain(
+      'If amalgamating corporations don\'t meet criteria for a short-form amalgamation, they')
+    expect(wrapper.find('#start-regular-long-form-card > p').text()).toContain(
+      'need to complete the following steps to amalgamate:')
+    expect(wrapper.find('#regular-long-form-btn').text()).toBe('Start Regular Long-form')
+    expect(wrapper.find('#regular-long-form-btn').classes()).not.toContain('v-btn--disabled') // enabled
+
+    expect(vm.getRegularAmalgamationText()).toBe('BC limited company')
+  })
+
+  it('start regular long-form button clicked', async () => {
+    const createFiling = vi.spyOn((LegalServices as any), 'createDraftBusiness')
+    const button = wrapper.find('#regular-long-form-btn')
+    await button.trigger('click')
+
+    expect(createFiling).toHaveBeenCalled()
+  })
+})
diff --git a/tests/unit/AnnualReport.spec.ts b/tests/unit/AnnualReport.spec.ts
index 10b2ccef3..1f7aab1bb 100644
--- a/tests/unit/AnnualReport.spec.ts
+++ b/tests/unit/AnnualReport.spec.ts
@@ -17,7 +17,7 @@ import Directors from '@/components/common/Directors.vue'
 import ArDate from '@/components/AnnualReport/ARDate.vue'
 import { Certify, OfficeAddresses, SummaryDirectors, SummaryOfficeAddresses } from '@/components/common'
 import { ConfigJson } from '@/resources/business-config'
-import { CorpTypeCd, FilingStatus } from '@/enums'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 
 // suppress various warnings:
 // - "Unknown custom element <affix>" warnings
@@ -54,7 +54,6 @@ describe('Annual Report - Part 1 - UI', () => {
     rootStore.ARFilingYear = 2017
     rootStore.arMinDate = '2017-01-01'
     rootStore.arMaxDate = '2018-04-30'
-    rootStore.currentFilingStatus = FilingStatus.NEW
     businessStore.setLegalType(CorpTypeCd.COOP)
   })
 
@@ -97,7 +96,6 @@ describe('Annual Report - Part 1 - UI', () => {
     expect(businessStore.getIdentifier).toEqual('CP0001191')
     expect(businessStore.getLegalType).toEqual('CP')
     expect(rootStore.ARFilingYear).toEqual(2017)
-    expect(rootStore.currentFilingStatus).toEqual('NEW')
 
     // check titles and sub-titles
     expect(vm.$el.querySelector('#annual-report-header').textContent).toContain('2017')
@@ -372,7 +370,6 @@ describe('Annual Report - Part 1B - UI (BCOMP)', () => {
     businessStore.setIdentifier('BC0007291')
     rootStore.ARFilingYear = 2018
     rootStore.nextARDate = '2018-09-26'
-    rootStore.currentFilingStatus = FilingStatus.NEW
     businessStore.setLegalType(CorpTypeCd.BENEFIT_COMPANY)
   })
 
@@ -397,7 +394,6 @@ describe('Annual Report - Part 1B - UI (BCOMP)', () => {
     expect(businessStore.getLegalType).toEqual('BEN')
     expect(rootStore.ARFilingYear).toEqual(2018)
     expect(rootStore.nextARDate).toEqual('2018-09-26')
-    expect(rootStore.currentFilingStatus).toEqual('NEW')
 
     // check titles and sub-titles
     expect(vm.$el.querySelector('#annual-report-header-BC').textContent).toContain('2018')
@@ -509,7 +505,6 @@ describe('Annual Report - Part 2A - Resuming with FAS staff payment', () => {
     businessStore.setIdentifier('CP0001191')
     businessStore.setLegalName('Legal Name - CP0001191')
     rootStore.ARFilingYear = 2017
-    rootStore.setCurrentFilingStatus(FilingStatus.DRAFT)
     rootStore.arMinDate = '2017-01-01'
     rootStore.arMaxDate = '2018-04-30'
 
@@ -589,7 +584,6 @@ describe('Annual Report - Part 2B - Resuming with BCOL staff payment', () => {
     businessStore.setIdentifier('CP0001191')
     businessStore.setLegalName('Legal Name - CP0001191')
     rootStore.ARFilingYear = 2017
-    rootStore.setCurrentFilingStatus(FilingStatus.DRAFT)
     rootStore.arMinDate = '2017-01-01'
     rootStore.arMaxDate = '2018-04-30'
 
@@ -673,7 +667,6 @@ describe('Annual Report - Part 2C - Resuming with No Fee staff payment', () => {
     businessStore.setIdentifier('CP0001191')
     businessStore.setLegalName('Legal Name - CP0001191')
     rootStore.ARFilingYear = 2017
-    rootStore.setCurrentFilingStatus(FilingStatus.DRAFT)
     rootStore.arMinDate = '2017-01-01'
     rootStore.arMaxDate = '2018-04-30'
 
@@ -764,7 +757,6 @@ describe('Annual Report - Part 3 - Submitting', () => {
     businessStore.setLegalType(CorpTypeCd.COOP)
     businessStore.setLegalName('Legal Name - CP0001191')
     rootStore.ARFilingYear = 2017
-    rootStore.setCurrentFilingStatus(FilingStatus.NEW)
     rootStore.arMinDate = '2017-01-01'
     rootStore.arMaxDate = '2018-04-30'
 
@@ -1049,7 +1041,6 @@ describe('Annual Report - Part 3B - Submitting (BCOMP)', () => {
     businessStore.setLegalType(CorpTypeCd.BENEFIT_COMPANY)
     rootStore.ARFilingYear = 2018
     rootStore.nextARDate = '2018-09-26'
-    rootStore.setCurrentFilingStatus(FilingStatus.NEW)
     rootStore.setRegisteredAddress({} as any)
     rootStore.setRecordsAddress({} as any)
 
@@ -1176,7 +1167,6 @@ describe('Annual Report - Part 4 - Saving', () => {
     businessStore.setLegalType(CorpTypeCd.COOP)
     businessStore.setLegalName('Legal Name - CP0001191')
     rootStore.ARFilingYear = 2017
-    rootStore.setCurrentFilingStatus(FilingStatus.NEW)
     rootStore.arMinDate = '2017-01-01'
     rootStore.arMaxDate = '2018-04-30'
 
@@ -1330,7 +1320,6 @@ describe('Annual Report - Part 5 - Data', () => {
     businessStore.setLegalType(CorpTypeCd.COOP)
     businessStore.setLegalName('Legal Name - CP0001191')
     rootStore.ARFilingYear = currentFilingYear
-    rootStore.setCurrentFilingStatus(FilingStatus.NEW)
     rootStore.arMinDate = '2017-01-01'
     rootStore.arMaxDate = '2018-04-30'
 
@@ -1606,7 +1595,6 @@ describe('Annual Report - Part 5B - Data (BCOMP)', () => {
     rootStore.ARFilingYear = 2018
     rootStore.currentDate = '2018-09-26'
     rootStore.nextARDate = '2018-09-26'
-    rootStore.setCurrentFilingStatus(FilingStatus.NEW)
     rootStore.setRegisteredAddress({} as any)
     rootStore.setRecordsAddress({} as any)
 
@@ -1765,7 +1753,6 @@ describe('Annual Report - Part 6 - Error/Warning Dialogs', () => {
     businessStore.setLegalType(CorpTypeCd.COOP)
     businessStore.setLegalName('Legal Name - CP0001191')
     rootStore.ARFilingYear = 2017
-    rootStore.setCurrentFilingStatus(FilingStatus.NEW)
     rootStore.arMinDate = '2017-01-01'
     rootStore.arMaxDate = '2018-04-30'
 
@@ -1968,7 +1955,6 @@ describe('Annual Report - Part 7 - Concurrent Saves', () => {
     businessStore.setLegalName('Legal Name - CP0001191')
     businessStore.setLegalType(CorpTypeCd.COOP)
     rootStore.ARFilingYear = 2017
-    rootStore.setCurrentFilingStatus(FilingStatus.NEW)
     businessStore.setIdentifier('CP0001191')
     rootStore.arMinDate = '2017-01-01'
     rootStore.arMaxDate = '2018-04-30'
@@ -2089,7 +2075,6 @@ describe('Annual Report - payment required error', () => {
     businessStore.setLegalType(CorpTypeCd.COOP)
     businessStore.setLegalName('Legal Name - CP0001191')
     rootStore.ARFilingYear = 2017
-    rootStore.setCurrentFilingStatus(FilingStatus.NEW)
 
     // mock "file post" endpoint, with a pay error response
     const p1 = Promise.reject({
diff --git a/tests/unit/App.spec.ts b/tests/unit/App.spec.ts
index 3a1e3ba3d..7b48c6e77 100644
--- a/tests/unit/App.spec.ts
+++ b/tests/unit/App.spec.ts
@@ -7,9 +7,13 @@ import { createLocalVue, shallowMount, Wrapper } from '@vue/test-utils'
 import flushPromises from 'flush-promises'
 import mockRouter from './mockRouter'
 import axios from '@/axios-auth'
+import { AuthServices, LegalServices } from '@/services'
 import { createPinia, setActivePinia } from 'pinia'
 import { useBusinessStore, useFilingHistoryListStore, useRootStore } from '@/stores'
 import App from '@/App.vue'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
+import { AmalgamationTypes, EntityStatus, FilingStatus, FilingSubTypes, FilingTypes } from '@/enums'
+import * as utils from '@/utils'
 
 // mock fetch() as it is not defined in Vitest
 // NB: it should be `global.fetch` but that doesn't work and this does
@@ -910,7 +914,7 @@ describe('App as a Draft IA with approved NR', () => {
       })))
 
     // GET NR data
-    get.withArgs('nameRequests/NR 1234567')
+    get.withArgs('nameRequests/NR 1234567/validate?phone=&email=')
       .returns(new Promise(resolve => resolve({
         data: {
           applicants: {},
@@ -1032,7 +1036,7 @@ describe('App as a Draft IA with conditional-not required NR', () => {
       })))
 
     // GET NR data
-    get.withArgs('nameRequests/NR 1234567')
+    get.withArgs('nameRequests/NR 1234567/validate?phone=&email=')
       .returns(new Promise(resolve => resolve({
         data: {
           applicants: {},
@@ -1135,7 +1139,7 @@ describe('App as a Draft IA with conditional-received NR', () => {
       })))
 
     // GET NR data
-    get.withArgs('nameRequests/NR 1234567')
+    get.withArgs('nameRequests/NR 1234567/validate?phone=&email=')
       .returns(new Promise(resolve => resolve({
         data: {
           applicants: {},
@@ -1238,7 +1242,7 @@ describe('App as a Draft IA with conditional-waived NR', () => {
       })))
 
     // GET NR data
-    get.withArgs('nameRequests/NR 1234567')
+    get.withArgs('nameRequests/NR 1234567/validate?phone=&email=')
       .returns(new Promise(resolve => resolve({
         data: {
           applicants: {},
@@ -1314,6 +1318,7 @@ describe('App as a PAID (pending) Incorporation Application', () => {
 
   beforeAll(() => {
     // clear store
+    rootStore.setNameRequest(null)
     rootStore.setTasks([])
     filingHistoryListStore.setFilings([])
 
@@ -1341,7 +1346,7 @@ describe('App as a PAID (pending) Incorporation Application', () => {
       })))
 
     // GET NR data
-    get.withArgs('nameRequests/NR 1234567')
+    get.withArgs('nameRequests/NR 1234567/validate?phone=&email=')
       .returns(new Promise(resolve => resolve({
         data: {
           applicants: {},
@@ -1416,11 +1421,6 @@ describe('App as a PAID (pending) Incorporation Application', () => {
     wrapper.destroy()
   })
 
-  it('fetches NR data properly', () => {
-    expect(rootStore.getNameRequest.nrNum).toBe('NR 1234567')
-    expect(businessStore.getLegalName).toBe('My Name Request')
-  })
-
   it.skip('fetches IA filing properly', () => {
     expect(businessStore.getIdentifier).toBe('T123456789')
     expect(businessStore.getLegalType).toBe('BEN')
@@ -1456,11 +1456,12 @@ describe('App as a PAID (pending) Incorporation Application', () => {
 })
 
 describe('App as a COMPLETED Incorporation Application', () => {
-  // Intermediate scenario - While returning from payment completion page
+  // Intermediate scenario - still using Temp Reg Number
   let wrapper: Wrapper<Vue>
 
   beforeAll(() => {
     // clear store
+    rootStore.setNameRequest(null)
     rootStore.setTasks([])
     filingHistoryListStore.setFilings([])
 
@@ -1488,7 +1489,7 @@ describe('App as a COMPLETED Incorporation Application', () => {
       })))
 
     // GET NR data
-    get.withArgs('nameRequests/NR 1234567')
+    get.withArgs('nameRequests/NR 1234567/validate?phone=&email=')
       .returns(new Promise(resolve => resolve({
         data: {
           applicants: {},
@@ -1563,11 +1564,6 @@ describe('App as a COMPLETED Incorporation Application', () => {
     wrapper.destroy()
   })
 
-  it('fetches NR data properly', () => {
-    expect(rootStore.getNameRequest.nrNum).toBe('NR 1234567')
-    expect(businessStore.getLegalName).toBe('My Name Request')
-  })
-
   it.skip('fetches IA filing properly', () => {
     expect(businessStore.getIdentifier).toBe('T123456789')
     expect(businessStore.getLegalType).toBe('BEN')
@@ -1602,7 +1598,7 @@ describe('App as a COMPLETED Incorporation Application', () => {
   })
 })
 
-describe('App as an historical business', () => {
+describe('App as an historical business - Amalgamation', () => {
   let wrapper: Wrapper<Vue>
 
   beforeAll(() => {
@@ -1654,9 +1650,127 @@ describe('App as an historical business', () => {
       .returns(new Promise(resolve => resolve({
         data: {
           business: {
-            arMaxDate: '2021-12-10',
-            arMinDate: '2022-12-02',
-            dissolutionDate: '2021-12-06',
+            amalgamatedInto: {
+              amalgamationDate: '2023-12-01T08:00:00+00:00',
+              amalgamationType: AmalgamationTypes.REGULAR,
+              identifier: 'BC7654321',
+              legalName: 'Amalgamated Business Name Ltd.'
+            },
+            foundingDate: '2021-12-02T20:15:00+00:00',
+            goodStanding: true,
+            hasRestrictions: false,
+            identifier: 'BC1234567',
+            lastAddressChangeDate: '2021-12-02',
+            lastAnnualReportDate: '',
+            lastDirectorChangeDate: '2021-12-02',
+            legalName: 'HISTORICAL CORP.',
+            legalType: 'BEN',
+            nextAnnualReport: '2022-12-02T08:00:00+00:00',
+            state: 'HISTORICAL',
+            stateFiling: null,
+            submitter: 'bcsc/pmd3qdz4hzr3hpwbm7jwufel6flpqtyj'
+          }
+        }
+      })))
+
+    // GET tasks
+    get.withArgs('businesses/BC1234567/tasks')
+      .returns(new Promise(resolve => resolve({ data: { tasks: [] } })))
+
+    // GET filings
+    get.withArgs('businesses/BC1234567/filings')
+      .returns(new Promise(resolve => resolve({ data: { filings: [] } })))
+
+    // GET addresses
+    get.withArgs('businesses/BC1234567/addresses')
+      .returns(new Promise(resolve => resolve({ data: {} })))
+
+    // GET directors
+    get.withArgs('businesses/BC1234567/parties')
+      .returns(new Promise(resolve => resolve({ data: { parties: [] } })))
+
+    // create a Local Vue and install router on it
+    const localVue = createLocalVue()
+    localVue.use(VueRouter)
+    const router = mockRouter.mock()
+    router.push({ name: 'dashboard' })
+
+    wrapper = shallowMount(App, {
+      localVue,
+      router,
+      vuetify
+    })
+
+    // wait for everything to settle
+    await flushPromises()
+  })
+
+  afterEach(() => {
+    sinon.restore()
+    wrapper.destroy()
+  })
+
+  it('fetches and parses state filing properly', () => {
+    expect(businessStore.isActive).toBe(false)
+    expect(businessStore.isHistorical).toBe(true)
+    expect(businessStore.isLiquidation).toBe(false)
+    expect(rootStore.getReasonText).toBe('Amalgamation – December 1, 2023 – BC7654321')
+  })
+})
+
+describe('App as an historical business - Voluntary Dissolution', () => {
+  let wrapper: Wrapper<Vue>
+
+  beforeAll(() => {
+    // clear store
+    rootStore.setTasks([])
+    filingHistoryListStore.setFilings([])
+
+    sessionStorage.clear()
+    sessionStorage.setItem('KEYCLOAK_TOKEN', KEYCLOAK_TOKEN_USER)
+    sessionStorage.setItem('BUSINESS_ID', 'BC1234567')
+  })
+
+  beforeEach(async () => {
+    const get = sinon.stub(axios, 'get')
+
+    // GET authorizations (role) from Auth API
+    get.withArgs('entities/BC1234567/authorizations')
+      .returns(new Promise(resolve => resolve({
+        data:
+        {
+          roles: ['edit', 'view']
+        }
+      })))
+
+    // GET user info from Auth API
+    get.withArgs('users/@me')
+      .returns(new Promise(resolve => resolve({
+        data: USER_INFO
+      })))
+
+    // GET entity info from Auth API
+    get.withArgs('entities/BC1234567')
+      .returns(new Promise(resolve => resolve({
+        data:
+        {
+          // Auth API Entity data
+          contacts: [
+            {
+              email: 'first.last@email.com',
+              phone: '(111)-222-3333',
+              phoneExtension: '444'
+            }
+          ]
+        }
+      })))
+
+    // GET business info from Legal API
+    get.withArgs('businesses/BC1234567')
+      .returns(new Promise(resolve => resolve({
+        data: {
+          business: {
+            dissolutionDate: '2023-12-01',
             foundingDate: '2021-12-02T20:15:00+00:00',
             goodStanding: true,
             hasRestrictions: false,
@@ -1690,10 +1804,10 @@ describe('App as an historical business', () => {
             business: {},
             dissolution: {
               dissolutionType: 'voluntary',
-              dissolutionDate: '2021-12-01'
+              dissolutionDate: '2023-12-01'
             },
             header: {
-              effectiveDate: '2021-12-06T20:05:35.168290+00:00',
+              effectiveDate: '2023-12-01T08:00:00+00:00',
               name: 'dissolution'
             }
           }
@@ -1733,7 +1847,136 @@ describe('App as an historical business', () => {
     expect(businessStore.isActive).toBe(false)
     expect(businessStore.isHistorical).toBe(true)
     expect(businessStore.isLiquidation).toBe(false)
-    expect(rootStore.getReasonText).toBe('Voluntary Dissolution – December 1, 2021')
+    expect(rootStore.getReasonText).toBe('Voluntary Dissolution – December 1, 2023')
+  })
+})
+
+describe('App as an historical business - Continuation Out', () => {
+  let wrapper: Wrapper<Vue>
+
+  beforeAll(() => {
+    // clear store
+    rootStore.setTasks([])
+    filingHistoryListStore.setFilings([])
+
+    sessionStorage.clear()
+    sessionStorage.setItem('KEYCLOAK_TOKEN', KEYCLOAK_TOKEN_USER)
+    sessionStorage.setItem('BUSINESS_ID', 'BC1234567')
+  })
+
+  beforeEach(async () => {
+    const get = sinon.stub(axios, 'get')
+
+    // GET authorizations (role) from Auth API
+    get.withArgs('entities/BC1234567/authorizations')
+      .returns(new Promise(resolve => resolve({
+        data:
+        {
+          roles: ['edit', 'view']
+        }
+      })))
+
+    // GET user info from Auth API
+    get.withArgs('users/@me')
+      .returns(new Promise(resolve => resolve({
+        data: USER_INFO
+      })))
+
+    // GET entity info from Auth API
+    get.withArgs('entities/BC1234567')
+      .returns(new Promise(resolve => resolve({
+        data:
+        {
+          // Auth API Entity data
+          contacts: [
+            {
+              email: 'first.last@email.com',
+              phone: '(111)-222-3333',
+              phoneExtension: '444'
+            }
+          ]
+        }
+      })))
+
+    // GET business info from Legal API
+    get.withArgs('businesses/BC1234567')
+      .returns(new Promise(resolve => resolve({
+        data: {
+          business: {
+            foundingDate: '2021-12-02T20:15:00+00:00',
+            goodStanding: true,
+            hasRestrictions: false,
+            identifier: 'BC1234567',
+            lastAddressChangeDate: '2021-12-02',
+            lastAnnualReportDate: '',
+            lastDirectorChangeDate: '2021-12-02',
+            legalName: 'HISTORICAL CORP.',
+            legalType: 'BEN',
+            nextAnnualReport: '2022-12-02T08:00:00+00:00',
+            state: 'HISTORICAL',
+            stateFiling: 'businesses/BC1234567/filings/113526',
+            submitter: 'bcsc/pmd3qdz4hzr3hpwbm7jwufel6flpqtyj'
+          }
+        }
+      })))
+
+    // GET tasks
+    get.withArgs('businesses/BC1234567/tasks')
+      .returns(new Promise(resolve => resolve({ data: { tasks: [] } })))
+
+    // GET filings
+    get.withArgs('businesses/BC1234567/filings')
+      .returns(new Promise(resolve => resolve({ data: { filings: [] } })))
+
+    // GET state filing
+    get.withArgs('businesses/BC1234567/filings/113526')
+      .returns(new Promise(resolve => resolve({
+        data: {
+          filing: {
+            business: {},
+            continuationOut: {},
+            header: {
+              effectiveDate: '2023-12-01T08:01:00+00:00',
+              name: 'continuationOut'
+            }
+          }
+        }
+      })))
+
+    // GET addresses
+    get.withArgs('businesses/BC1234567/addresses')
+      .returns(new Promise(resolve => resolve({ data: {} })))
+
+    // GET directors
+    get.withArgs('businesses/BC1234567/parties')
+      .returns(new Promise(resolve => resolve({ data: { parties: [] } })))
+
+    // create a Local Vue and install router on it
+    const localVue = createLocalVue()
+    localVue.use(VueRouter)
+    const router = mockRouter.mock()
+    router.push({ name: 'dashboard' })
+
+    wrapper = shallowMount(App, {
+      localVue,
+      router,
+      vuetify
+    })
+
+    // wait for everything to settle
+    await flushPromises()
+  })
+
+  afterEach(() => {
+    sinon.restore()
+    wrapper.destroy()
+  })
+
+  it('fetches and parses state filing properly', () => {
+    expect(businessStore.isActive).toBe(false)
+    expect(businessStore.isHistorical).toBe(true)
+    expect(businessStore.isLiquidation).toBe(false)
+    expect(rootStore.getReasonText).toBe('Continued Out – December 1, 2023 at 12:01 am Pacific time')
   })
 })
 
@@ -1769,7 +2012,7 @@ describe('App as a Draft Registration with approved NR', () => {
       })))
 
     // GET NR data
-    get.withArgs('nameRequests/NR 1234567')
+    get.withArgs('nameRequests/NR 1234567/validate?phone=&email=')
       .returns(new Promise(resolve => resolve({
         data: {
           applicants: {},
@@ -1860,11 +2103,12 @@ describe('App as a Draft Registration with approved NR', () => {
 })
 
 describe('App as a COMPLETED Registration Application', () => {
-  // Intermediate scenario - While returning from payment completion page
+  // Intermediate scenario - still using Temp Reg Number
   let wrapper: Wrapper<Vue>
 
   beforeAll(() => {
     // clear store
+    rootStore.setNameRequest(null)
     rootStore.setTasks([])
     filingHistoryListStore.setFilings([])
 
@@ -1892,7 +2136,7 @@ describe('App as a COMPLETED Registration Application', () => {
       })))
 
     // GET NR data
-    get.withArgs('nameRequests/NR 1234567')
+    get.withArgs('nameRequests/NR 1234567/validate?phone=&email=')
       .returns(new Promise(resolve => resolve({
         data: {
           applicants: {},
@@ -1967,11 +2211,6 @@ describe('App as a COMPLETED Registration Application', () => {
     wrapper.destroy()
   })
 
-  it('fetches NR data properly', () => {
-    expect(rootStore.getNameRequest.nrNum).toBe('NR 1234567')
-    expect(businessStore.getLegalName).toBe('My Name Request')
-  })
-
   it.skip('fetches Registration filing properly', () => {
     expect(businessStore.getIdentifier).toBe('T123456789')
     expect(businessStore.getLegalType).toBe('SP')
@@ -1998,3 +2237,312 @@ describe('App as a COMPLETED Registration Application', () => {
     expect(filingHistoryListStore.filings[0].data.legalFilings).toEqual(['registration'])
   })
 })
+
+describe('App as a draft numbered amalgamation application', () => {
+  let wrapper: Wrapper<Vue>
+
+  beforeAll(() => {
+    // clear store
+    businessStore.setLegalName(null)
+    rootStore.setNameRequest(null)
+    rootStore.setTasks([])
+    filingHistoryListStore.setFilings([])
+
+    sessionStorage.clear()
+    sessionStorage.setItem('KEYCLOAK_TOKEN', KEYCLOAK_TOKEN_USER)
+    sessionStorage.setItem('TEMP_REG_NUMBER', 'T123456789')
+  })
+
+  beforeEach(async () => {
+    // mock "fetchAuthorizations" auth service
+    vi.spyOn(AuthServices, 'fetchAuthorizations').mockImplementation((): any => {
+      return Promise.resolve({
+        data: { roles: ['edit', 'view'] }
+      })
+    })
+
+    // mock "fetchUserInfo" auth service
+    vi.spyOn(AuthServices, 'fetchUserInfo').mockImplementation((): any => {
+      return Promise.resolve(USER_INFO)
+    })
+
+    // mock "fetchDraftApp" legal service
+    vi.spyOn(LegalServices, 'fetchDraftApp').mockImplementation((): any => {
+      return Promise.resolve({
+        filing: {
+          business: {
+            identifier: 'T123456789',
+            legalType: CorpTypeCd.BC_COMPANY
+          },
+          header: {
+            date: '2020-05-21T00:11:55.887740+00:00',
+            filingId: 789,
+            name: FilingTypes.AMALGAMATION_APPLICATION,
+            status: FilingStatus.DRAFT
+          },
+          amalgamationApplication: {
+            nameRequest: {
+              legalType: CorpTypeCd.BC_COMPANY
+            },
+            type: AmalgamationTypes.REGULAR
+          }
+        }
+      })
+    })
+
+    // mock "UpdateLdUser" auth service
+    vi.spyOn(utils, 'UpdateLdUser').mockImplementation((): any => {
+      return Promise.resolve()
+    })
+
+    // create a Local Vue and install router (and store) on it
+    const localVue = createLocalVue()
+    localVue.use(VueRouter)
+    const router = mockRouter.mock()
+    router.push({ name: 'dashboard' })
+
+    wrapper = shallowMount(App, { localVue, router, vuetify })
+
+    // wait for everything to settle
+    await flushPromises()
+  })
+
+  afterEach(() => {
+    wrapper.destroy()
+  })
+
+  it('fetches amalgamation filing properly', () => {
+    expect(rootStore.getNameRequest).toBeNull()
+    expect(rootStore.getEntityStatus).toBe(EntityStatus.DRAFT_AMALGAMATION)
+    expect(businessStore.getIdentifier).toBe('T123456789')
+    expect(businessStore.isBcCompany).toBe(true)
+    expect(businessStore.isGoodStanding).toBe(true)
+    expect(businessStore.getLegalName).toBeNull()
+    expect(rootStore.isDraftAmalgamation).toBe(true)
+    expect(rootStore.isAppTask).toBe(true)
+
+    // verify loaded task
+    expect(rootStore.tasks.length).toBe(1)
+    expect(rootStore.tasks[0].enabled).toBe(true)
+    expect(rootStore.tasks[0].order).toBe(1)
+    expect(rootStore.tasks[0].task.filing.business).not.toBeNull()
+    expect(rootStore.tasks[0].task.filing.header.name).toBe('amalgamationApplication')
+    expect(rootStore.tasks[0].task.filing.header.status).toBe('DRAFT')
+    expect(rootStore.tasks[0].task.filing.amalgamationApplication).not.toBeNull()
+    expect(rootStore.tasks[0].task.filing.displayName).toBe('BC Limited Company Amalgamation Application - Regular')
+  })
+})
+
+describe('App as a draft named amalgamation application', () => {
+  let wrapper: Wrapper<Vue>
+
+  beforeAll(() => {
+    // clear store
+    businessStore.setLegalName(null)
+    rootStore.setNameRequest(null)
+    rootStore.setTasks([])
+    filingHistoryListStore.setFilings([])
+
+    sessionStorage.clear()
+    sessionStorage.setItem('KEYCLOAK_TOKEN', KEYCLOAK_TOKEN_USER)
+    sessionStorage.setItem('TEMP_REG_NUMBER', 'T123456789')
+  })
+
+  beforeEach(async () => {
+    // mock "fetchAuthorizations" auth service
+    vi.spyOn(AuthServices, 'fetchAuthorizations').mockImplementation((): any => {
+      return Promise.resolve({
+        data: { roles: ['edit', 'view'] }
+      })
+    })
+
+    // mock "fetchUserInfo" auth service
+    vi.spyOn(AuthServices, 'fetchUserInfo').mockImplementation((): any => {
+      return Promise.resolve(USER_INFO)
+    })
+
+    // mock "fetchNameRequest" legal service
+    vi.spyOn(LegalServices, 'fetchNameRequest').mockImplementation((): any => {
+      return Promise.resolve({
+        applicants: {},
+        expirationDate: 'Thu, 31 Dec 2099 23:59:59 GMT',
+        legalType: CorpTypeCd.BC_COMPANY,
+        names: [
+          {
+            name: 'My Amalgamated Company',
+            state: 'APPROVED'
+          }
+        ],
+        nrNum: 'NR 1234567',
+        request_action_cd: 'NEW',
+        state: 'APPROVED'
+      })
+    })
+
+    // mock "fetchDraftApp" legal service
+    vi.spyOn(LegalServices, 'fetchDraftApp').mockImplementation((): any => {
+      return Promise.resolve({
+        filing: {
+          business: {
+            identifier: 'T123456789',
+            legalType: CorpTypeCd.BC_COMPANY
+          },
+          header: {
+            date: '2020-05-21T00:11:55.887740+00:00',
+            filingId: 789,
+            name: FilingTypes.AMALGAMATION_APPLICATION,
+            status: FilingStatus.DRAFT
+          },
+          amalgamationApplication: {
+            nameRequest: {
+              nrNumber: 'NR 1234567',
+              legalType: CorpTypeCd.BC_COMPANY
+            },
+            type: AmalgamationTypes.REGULAR
+          }
+        }
+      })
+    })
+
+    // mock "UpdateLdUser" auth service
+    vi.spyOn(utils, 'UpdateLdUser').mockImplementation((): any => {
+      return Promise.resolve()
+    })
+
+    // create a Local Vue and install router (and store) on it
+    const localVue = createLocalVue()
+    localVue.use(VueRouter)
+    const router = mockRouter.mock()
+    router.push({ name: 'dashboard' })
+
+    wrapper = shallowMount(App, { localVue, router, vuetify })
+
+    // wait for everything to settle
+    await flushPromises()
+  })
+
+  afterEach(() => {
+    wrapper.destroy()
+  })
+
+  it('fetches amalgamation filing properly', () => {
+    expect(rootStore.getNameRequest.nrNum).toBe('NR 1234567')
+    expect(rootStore.getEntityStatus).toBe(EntityStatus.DRAFT_AMALGAMATION)
+    expect(businessStore.getIdentifier).toBe('T123456789')
+    expect(businessStore.isBcCompany).toBe(true)
+    expect(businessStore.isGoodStanding).toBe(true)
+    expect(businessStore.getLegalName).toBe('My Amalgamated Company')
+    expect(rootStore.isDraftAmalgamation).toBe(true)
+    expect(rootStore.isAppTask).toBe(true)
+
+    // verify loaded task
+    expect(rootStore.tasks.length).toBe(1)
+    expect(rootStore.tasks[0].enabled).toBe(true)
+    expect(rootStore.tasks[0].order).toBe(1)
+    expect(rootStore.tasks[0].task.filing.business).not.toBeNull()
+    expect(rootStore.tasks[0].task.filing.header.name).toBe('amalgamationApplication')
+    expect(rootStore.tasks[0].task.filing.header.status).toBe('DRAFT')
+    expect(rootStore.tasks[0].task.filing.amalgamationApplication).not.toBeNull()
+    expect(rootStore.tasks[0].task.filing.displayName).toBe('BC Limited Company Amalgamation Application - Regular')
+  })
+})
+
+describe('App as a completed amalgamation application', () => {
+  // Intermediate scenario - still using Temp Reg Number
+  let wrapper: Wrapper<Vue>
+
+  beforeAll(() => {
+    // clear store
+    businessStore.setLegalName(null)
+    rootStore.setNameRequest(null)
+    rootStore.setTasks([])
+    filingHistoryListStore.setFilings([])
+
+    sessionStorage.clear()
+    sessionStorage.setItem('KEYCLOAK_TOKEN', KEYCLOAK_TOKEN_USER)
+    sessionStorage.setItem('TEMP_REG_NUMBER', 'T123456789')
+  })
+
+  beforeEach(async () => {
+    // mock "fetchAuthorizations" auth service
+    vi.spyOn(AuthServices, 'fetchAuthorizations').mockImplementation((): any => {
+      return Promise.resolve({
+        data: { roles: ['edit', 'view'] }
+      })
+    })
+
+    // mock "fetchUserInfo" auth service
+    vi.spyOn(AuthServices, 'fetchUserInfo').mockImplementation((): any => {
+      return Promise.resolve(USER_INFO)
+    })
+
+    // mock "fetchDraftApp" legal service
+    vi.spyOn(LegalServices, 'fetchDraftApp').mockImplementation((): any => {
+      return Promise.resolve({
+        filing: {
+          business: {
+            identifier: 'T123456789',
+            legalType: CorpTypeCd.BC_COMPANY
+          },
+          header: {
+            date: '2020-05-21T00:11:55.887740+00:00',
+            effectiveDate: '2020-05-21T00:11:55.887740+00:00',
+            filingId: 789,
+            name: FilingTypes.AMALGAMATION_APPLICATION,
+            status: FilingStatus.COMPLETED
+          },
+          amalgamationApplication: {
+            nameRequest: {
+              nrNumber: 'NR 1234567',
+              legalType: CorpTypeCd.BC_COMPANY
+            },
+            offices: BCOMP_ADDRESSES,
+            parties: BCOMP_PARTIES,
+            type: AmalgamationTypes.REGULAR
+          }
+        }
+      })
+    })
+
+    // mock "UpdateLdUser" auth service
+    vi.spyOn(utils, 'UpdateLdUser').mockImplementation((): any => {
+      return Promise.resolve()
+    })
+
+    // create a Local Vue and install router on it
+    const localVue = createLocalVue()
+    localVue.use(VueRouter)
+    const router = mockRouter.mock()
+    router.push({ name: 'dashboard' })
+
+    wrapper = shallowMount(App, { localVue, router, vuetify })
+
+    // wait for everything to settle
+    await flushPromises()
+  })
+
+  afterEach(() => {
+    wrapper.destroy()
+  })
+
+  it('fetches amalgamation filing properly', () => {
+    expect(rootStore.getNameRequest).toBeNull()
+    expect(rootStore.getEntityStatus).toBe(EntityStatus.FILED_AMALGAMATION)
+    expect(businessStore.getIdentifier).toBe('T123456789')
+    expect(businessStore.isBcCompany).toBe(true)
+    expect(businessStore.isGoodStanding).toBe(true)
+    expect(businessStore.getLegalName).toBeNull()
+    expect(rootStore.isFiledAmalgamation).toBe(true)
+    expect(rootStore.isAppFiling).toBe(true)
+
+    // verify loaded filing
+    expect(filingHistoryListStore.filings.length).toBe(1)
+    expect(filingHistoryListStore.filings[0].businessIdentifier).toBe('T123456789')
+    expect(filingHistoryListStore.filings[0].displayName).toBe('BC Limited Company Amalgamation Application - Regular')
+    expect(filingHistoryListStore.filings[0].filingSubType).toBe(FilingSubTypes.AMALGAMATION_REGULAR)
+    expect(filingHistoryListStore.filings[0].name).toBe('amalgamationApplication')
+    expect(filingHistoryListStore.filings[0].status).toBe('COMPLETED')
+    expect(filingHistoryListStore.filings[0].data.applicationDate).toBe('2020-05-20')
+    expect(filingHistoryListStore.filings[0].data.legalFilings).toEqual(['amalgamationApplication'])
+  })
+})
diff --git a/tests/unit/Certify.spec.ts b/tests/unit/Certify.spec.ts
index 84e8f5767..72f9224d6 100644
--- a/tests/unit/Certify.spec.ts
+++ b/tests/unit/Certify.spec.ts
@@ -31,7 +31,7 @@ const statementSelector = '.certify-stmt'
 
 const trimmedCertifier = 'Some Certifier'
 const whitespaceCertifier = '  Some  Certifier  '
-const defaultDate = '2019-01-01'
+const defaultDate = 'July 15, 2023'
 
 /**
  * Returns the last event for a given name, to be used for testing event propagation in response to component changes.
@@ -62,11 +62,12 @@ function createComponent (
   isCertified: boolean = undefined,
   currentDate: string = defaultDate
 ): Wrapper<Certify> {
-  rootStore.currentDate = currentDate
+  rootStore.currentDate = '2023-07-15'
 
   return mount(Certify, {
     vuetify,
     propsData: {
+      currentDate,
       certifiedBy,
       isCertified
     }
diff --git a/tests/unit/ConfigurationActions.spec.ts b/tests/unit/ConfigurationActions.spec.ts
index eca45527c..8b4b392b3 100644
--- a/tests/unit/ConfigurationActions.spec.ts
+++ b/tests/unit/ConfigurationActions.spec.ts
@@ -128,7 +128,7 @@ describe('Configuration Actions', () => {
     // call method
     expect(() => {
       setBaseRouteAndBusinessId('ZZ1234567', '/business/', window.location.origin)
-    }).toThrow('Missing or invalid Business ID or Temp Reg Number.')
+    }).toThrow('Missing or invalid Business ID or Temporary Registration Number.')
   })
 
   it('sessions variables correctly set for the SBC header', async () => {
diff --git a/tests/unit/ConsentContinuationOut.spec.ts b/tests/unit/ConsentContinuationOut.spec.ts
index dd0ecaf26..7daf28db6 100644
--- a/tests/unit/ConsentContinuationOut.spec.ts
+++ b/tests/unit/ConsentContinuationOut.spec.ts
@@ -16,7 +16,6 @@ import flushPromises from 'flush-promises'
 import mockRouter from './mockRouter'
 import VueRouter from 'vue-router'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
-import { FilingStatus } from '@/enums'
 
 // suppress various warnings:
 // - "Unknown custom element <affix>" warnings
@@ -313,7 +312,6 @@ describe('Consent to Continue Out for general user and IAs only', () => {
     businessStore.setLegalName('My Test Entity')
     businessStore.setIdentifier('BC0007291')
     businessStore.setFoundingDate('1971-05-12T00:00:00-00:00')
-    rootStore.setCurrentFilingStatus(FilingStatus.NEW)
     rootStore.filingData = []
     rootStore.keycloakRoles = ['user']
 
diff --git a/tests/unit/Dashboard.spec.ts b/tests/unit/Dashboard.spec.ts
index 3a446db9c..59284147f 100644
--- a/tests/unit/Dashboard.spec.ts
+++ b/tests/unit/Dashboard.spec.ts
@@ -6,8 +6,8 @@ import VueRouter from 'vue-router'
 import { shallowMount, createLocalVue, Wrapper } from '@vue/test-utils'
 import mockRouter from './mockRouter'
 import { createPinia, setActivePinia } from 'pinia'
-import { useBusinessStore } from '@/stores'
-import { AllowableActions, CorpTypeCd } from '@/enums'
+import { useBusinessStore, useRootStore } from '@/stores'
+import { AllowableActions, CorpTypeCd, EntityStatus } from '@/enums'
 
 // Components
 import Dashboard from '@/views/Dashboard.vue'
@@ -23,6 +23,7 @@ Vue.use(Vuelidate)
 const vuetify = new Vuetify({})
 setActivePinia(createPinia())
 const businessStore = useBusinessStore()
+const rootStore = useRootStore()
 
 describe('Dashboard - UI', () => {
   const $route = { query: {} }
@@ -64,6 +65,23 @@ describe('Dashboard - UI', () => {
     expect(wrapper.findComponent(DirectorListSm).exists()).toBe(true)
   })
 
+  it('identifies app tasks vs app filings', () => {
+    const tests = [
+      { entityStatus: EntityStatus.DRAFT_AMALGAMATION, isAppTask: true },
+      { entityStatus: EntityStatus.DRAFT_INCORP_APP, isAppTask: true },
+      { entityStatus: EntityStatus.DRAFT_REGISTRATION, isAppTask: true },
+      { entityStatus: EntityStatus.FILED_AMALGAMATION, isAppFiling: true },
+      { entityStatus: EntityStatus.FILED_INCORP_APP, isAppFiling: true },
+      { entityStatus: EntityStatus.FILED_REGISTRATION, isAppFiling: true }
+    ]
+
+    tests.forEach((test) => {
+      rootStore.entityStatus = test.entityStatus
+      expect(vm.isAppTask).toBe(!!test.isAppTask)
+      expect(vm.isAppFiling).toBe(!!test.isAppFiling)
+    })
+  })
+
   it('updates its counts from sub-component events', () => {
     wrapper.findComponent(TodoList).vm.$emit('todo-count', 2)
     // wrapper.findComponent(FilingHistoryList).vm.$emit('history-count', 3)
@@ -80,6 +98,7 @@ describe('Dashboard - UI', () => {
 
     vi.spyOn(vm, 'isHistorical', 'get').mockReturnValue(false)
     businessStore.setAllowedActions({
+      digitalBusinessCard: false,
       filing: {
         filingTypes: [
           { name: 'changeOfAddress' },
@@ -104,6 +123,7 @@ describe('Dashboard - UI', () => {
 
     vi.spyOn(vm, 'isHistorical', 'get').mockReturnValue(false)
     businessStore.setAllowedActions({
+      digitalBusinessCard: false,
       filing: {
         filingTypes: []
       } as any
@@ -198,7 +218,7 @@ describe('Dashboard - Click Tests', () => {
 
     // verify routing to Standalone Office Address Filing page with id=0
     expect(vm.$route.name).toBe('standalone-addresses')
-    expect(vm.$route.params.filingId).toBe(0)
+    expect(vm.$route.params.filingId).toBe('0')
 
     wrapper.destroy()
   })
@@ -231,7 +251,7 @@ describe('Dashboard - Click Tests', () => {
     wrapper.findComponent(CoaWarningDialog).vm.$emit('proceed', true)
 
     expect(vm.$route.name).toBe('standalone-addresses')
-    expect(vm.$route.params.filingId).toBe(0)
+    expect(vm.$route.params.filingId).toBe('0')
 
     wrapper.destroy()
   })
@@ -256,7 +276,7 @@ describe('Dashboard - Click Tests', () => {
 
     // verify routing to Standalone Directors Filing page with id=0
     expect(vm.$route.name).toBe('standalone-directors')
-    expect(vm.$route.params.filingId).toBe(0)
+    expect(vm.$route.params.filingId).toBe('0')
 
     wrapper.destroy()
   })
diff --git a/tests/unit/DateTooltip.spec.ts b/tests/unit/DateTooltip.spec.ts
index ac2cd3f95..0f1fcec8c 100644
--- a/tests/unit/DateTooltip.spec.ts
+++ b/tests/unit/DateTooltip.spec.ts
@@ -15,7 +15,7 @@ describe('Date Tooltip', () => {
 
     // verify content
     expect(wrapper.find('span').text()).toBe('[unknown]')
-    expect(vm.dateTimeString).toBe('[unknown]')
+    expect(vm.dateTimeString).toBeNull()
 
     wrapper.destroy()
   })
diff --git a/tests/unit/EntityHeader.spec.ts b/tests/unit/EntityHeader.spec.ts
index 43816c859..9d54c9b32 100644
--- a/tests/unit/EntityHeader.spec.ts
+++ b/tests/unit/EntityHeader.spec.ts
@@ -7,7 +7,7 @@ import { useBusinessStore, useFilingHistoryListStore, useRootStore } from '@/sto
 import EntityHeader from '@/components/EntityInfo/EntityHeader.vue'
 import mockRouter from './mockRouter'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
-import { EntityStatus } from '@/enums'
+import { EntityStatus, FilingStatus, FilingTypes } from '@/enums'
 
 Vue.use(Vuetify)
 Vue.use(VueRouter)
@@ -35,7 +35,7 @@ describe('Entity Header - data', () => {
     await Vue.nextTick()
 
     expect(wrapper.find('#entity-legal-name').exists()).toBe(false)
-    expect(wrapper.find('#ia-reg-description').exists()).toBe(false)
+    expect(wrapper.find('#app-description').exists()).toBe(false)
   })
 
   it('displays Business entity info properly', async () => {
@@ -54,13 +54,13 @@ describe('Entity Header - data', () => {
 
     // verify displayed text
     expect(wrapper.find('#entity-legal-name').text()).toBe('My Business')
-    expect(wrapper.find('#ia-reg-description').exists()).toBe(false)
+    expect(wrapper.find('#app-description').exists()).toBe(false)
   })
 
   it('displays Draft Incorp App entity info properly - Named Company', async () => {
     // set store properties
     businessStore.setLegalName('My Named Company')
-    rootStore.entityStatus = EntityStatus.DRAFT_APP
+    rootStore.entityStatus = EntityStatus.DRAFT_INCORP_APP
     businessStore.setLegalType(CorpTypeCd.BENEFIT_COMPANY)
 
     const wrapper = shallowMount(EntityHeader, {
@@ -70,14 +70,14 @@ describe('Entity Header - data', () => {
     })
     await Vue.nextTick()
 
-    expect(wrapper.find('#ia-reg-name').text()).toBe('My Named Company')
-    expect(wrapper.find('#ia-reg-description').text()).toBe('BC Benefit Company Incorporation Application')
+    expect(wrapper.find('#app-name').text()).toBe('My Named Company')
+    expect(wrapper.find('#app-description').text()).toBe('BC Benefit Company Incorporation Application')
   })
 
   it('displays Draft Incorp App entity info properly - Numbered Company', async () => {
     // set store properties
     businessStore.setLegalName(null)
-    rootStore.entityStatus = EntityStatus.DRAFT_APP
+    rootStore.entityStatus = EntityStatus.DRAFT_INCORP_APP
     businessStore.setLegalType(CorpTypeCd.BENEFIT_COMPANY)
 
     const wrapper = shallowMount(EntityHeader, {
@@ -87,14 +87,14 @@ describe('Entity Header - data', () => {
     })
     await Vue.nextTick()
 
-    expect(wrapper.find('#ia-reg-name').text()).toBe('Numbered Benefit Company')
-    expect(wrapper.find('#ia-reg-description').text()).toBe('BC Benefit Company Incorporation Application')
+    expect(wrapper.find('#app-name').text()).toBe('Numbered Benefit Company')
+    expect(wrapper.find('#app-description').text()).toBe('BC Benefit Company Incorporation Application')
   })
 
   it('displays Paid (Named) Incorp App entity info properly', async () => {
     // set store properties
     businessStore.setLegalName('My Future Company')
-    rootStore.entityStatus = EntityStatus.FILED_APP
+    rootStore.entityStatus = EntityStatus.FILED_INCORP_APP
     businessStore.setLegalType(CorpTypeCd.BENEFIT_COMPANY)
 
     const wrapper = shallowMount(EntityHeader, {
@@ -104,8 +104,174 @@ describe('Entity Header - data', () => {
     })
     await Vue.nextTick()
 
-    expect(wrapper.find('#ia-reg-name').text()).toBe('My Future Company')
-    expect(wrapper.find('#ia-reg-description').text()).toBe('BC Benefit Company Incorporation Application')
+    expect(wrapper.find('#app-name').text()).toBe('My Future Company')
+    expect(wrapper.find('#app-description').text()).toBe('BC Benefit Company Incorporation Application')
+  })
+
+  it('displays draft numbered amalgamation application', async () => {
+    // set store properties
+    businessStore.setLegalName(null)
+    rootStore.entityStatus = EntityStatus.DRAFT_AMALGAMATION
+    businessStore.setLegalType(CorpTypeCd.BC_COMPANY)
+    filingHistoryListStore.setFilings([])
+    rootStore.setTasks([
+      {
+        task: {
+          filing: {
+            displayName: 'BC Limited Company Amalgamation Application - Regular'
+          }
+        }
+      } as any
+    ])
+
+    const wrapper = shallowMount(EntityHeader, {
+      vuetify,
+      router,
+      propsData: { businessId: null, tempRegNumber: 'T1234567' }
+    })
+    await Vue.nextTick()
+
+    expect(wrapper.find('#app-name').text()).toBe('Numbered Amalgamated Company')
+    expect(wrapper.find('#app-description').text()).toBe('BC Limited Company Amalgamation Application - Regular')
+  })
+
+  it('displays draft named amalgamation application', async () => {
+    // set store properties
+    businessStore.setLegalName('My Amalgamated Company')
+    rootStore.entityStatus = EntityStatus.DRAFT_AMALGAMATION
+    businessStore.setLegalType(CorpTypeCd.BC_COMPANY)
+    filingHistoryListStore.setFilings([])
+    rootStore.setTasks([
+      {
+        task: {
+          filing: {
+            displayName: 'BC Limited Company Amalgamation Application - Regular'
+          }
+        }
+      } as any
+    ])
+
+    const wrapper = shallowMount(EntityHeader, {
+      vuetify,
+      router,
+      propsData: { businessId: null, tempRegNumber: 'T1234567' }
+    })
+    await Vue.nextTick()
+
+    expect(wrapper.find('#app-name').text()).toBe('My Amalgamated Company')
+    expect(wrapper.find('#app-description').text()).toBe('BC Limited Company Amalgamation Application - Regular')
+  })
+
+  it('displays filed numbered amalgamated company', async () => {
+    // set store properties
+    businessStore.setLegalName(null)
+    rootStore.entityStatus = EntityStatus.FILED_AMALGAMATION
+    businessStore.setLegalType(CorpTypeCd.BC_COMPANY)
+    rootStore.setTasks([])
+    filingHistoryListStore.setFilings([
+      {
+        displayLedger: true,
+        displayName: 'BC Limited Company Amalgamation Application - Regular',
+        effectiveDate: '2019-06-02 19:22:59 GMT',
+        name: FilingTypes.AMALGAMATION_APPLICATION,
+        status: FilingStatus.COMPLETED,
+        submittedDate: 'Sun, 02 Jun 2019 19:22:59 GMT'
+      } as any
+    ])
+
+    const wrapper = shallowMount(EntityHeader, {
+      vuetify,
+      router,
+      propsData: { businessId: null, tempRegNumber: 'T1234567' }
+    })
+    await Vue.nextTick()
+
+    expect(wrapper.find('#app-name').text()).toBe('Numbered Amalgamated Company')
+    expect(wrapper.find('#app-description').text()).toBe('BC Limited Company Amalgamation Application - Regular')
+  })
+
+  it('displays filed named amalgamated company', async () => {
+    // set store properties
+    businessStore.setLegalName('My Amalgamated Company')
+    rootStore.entityStatus = EntityStatus.FILED_AMALGAMATION
+    businessStore.setLegalType(CorpTypeCd.BC_COMPANY)
+    rootStore.setTasks([])
+    filingHistoryListStore.setFilings([
+      {
+        displayLedger: true,
+        displayName: 'BC Limited Company Amalgamation Application - Regular',
+        effectiveDate: '2019-06-02 19:22:59 GMT',
+        name: FilingTypes.AMALGAMATION_APPLICATION,
+        status: FilingStatus.COMPLETED,
+        submittedDate: 'Sun, 02 Jun 2019 19:22:59 GMT'
+      } as any
+    ])
+
+    const wrapper = shallowMount(EntityHeader, {
+      vuetify,
+      router,
+      propsData: { businessId: null, tempRegNumber: 'T1234567' }
+    })
+    await Vue.nextTick()
+
+    expect(wrapper.find('#app-name').text()).toBe('My Amalgamated Company')
+    expect(wrapper.find('#app-description').text()).toBe('BC Limited Company Amalgamation Application - Regular')
+  })
+
+  it('displays numbered amalgamated company', async () => {
+    // set store properties
+    businessStore.setLegalName(null)
+    rootStore.entityStatus = null
+    businessStore.setLegalType(CorpTypeCd.BC_COMPANY)
+    rootStore.setTasks([])
+    filingHistoryListStore.setFilings([
+      {
+        displayLedger: true,
+        displayName: 'BC Limited Company Amalgamation Application - Regular',
+        effectiveDate: '2019-06-02 19:22:59 GMT',
+        name: FilingTypes.AMALGAMATION_APPLICATION,
+        status: FilingStatus.COMPLETED,
+        submittedDate: 'Sun, 02 Jun 2019 19:22:59 GMT'
+      } as any
+    ])
+
+    const wrapper = shallowMount(EntityHeader, {
+      vuetify,
+      router,
+      propsData: { businessId: 'BC1234567', tempRegNumber: null }
+    })
+    await Vue.nextTick()
+
+    expect(wrapper.find('#entity-legal-name').text()).toBe('Numbered Limited Company')
+    expect(wrapper.find('#business-description').text()).toBe('BC Limited Company')
+  })
+
+  it('displays named amalgamated company', async () => {
+    // set store properties
+    businessStore.setLegalName('My Amalgamated Company')
+    rootStore.entityStatus = null
+    businessStore.setLegalType(CorpTypeCd.BC_COMPANY)
+    rootStore.setTasks([])
+    filingHistoryListStore.setFilings([
+      {
+        displayLedger: true,
+        displayName: 'BC Limited Company Amalgamation Application - Regular',
+        effectiveDate: '2019-06-02 19:22:59 GMT',
+        name: FilingTypes.AMALGAMATION_APPLICATION,
+        status: FilingStatus.COMPLETED,
+        submittedDate: 'Sun, 02 Jun 2019 19:22:59 GMT'
+      } as any
+    ])
+
+    const wrapper = shallowMount(EntityHeader, {
+      vuetify,
+      router,
+      propsData: { businessId: 'BC1234567', tempRegNumber: null }
+    })
+    await Vue.nextTick()
+
+    expect(wrapper.find('#entity-legal-name').text()).toBe('My Amalgamated Company')
+    expect(wrapper.find('#business-description').text()).toBe('BC Limited Company')
   })
 })
 
diff --git a/tests/unit/EntityInfo.spec.ts b/tests/unit/EntityInfo.spec.ts
index f6fb23bcc..5ec521f46 100644
--- a/tests/unit/EntityInfo.spec.ts
+++ b/tests/unit/EntityInfo.spec.ts
@@ -8,6 +8,7 @@ import EntityInfo from '@/components/EntityInfo.vue'
 import EntityDefinitions from '@/components/EntityInfo/EntityDefinitions.vue'
 import EntityHeader from '@/components/EntityInfo/EntityHeader.vue'
 import EntityMenu from '@/components/EntityInfo/EntityMenu.vue'
+import mockRouter from './mockRouter'
 
 Vue.use(Vuetify)
 Vue.use(VueRouter)
@@ -18,6 +19,8 @@ const businessStore = useBusinessStore()
 const rootStore = useRootStore()
 
 describe('Entity Info component', () => {
+  const router = mockRouter.mock()
+
   it('renders sub-components', async () => {
     // session storage must be set before mounting component
     sessionStorage.clear()
@@ -28,7 +31,7 @@ describe('Entity Info component', () => {
     rootStore.entityStatus = null
     businessStore.setTaxId(null)
 
-    const wrapper = shallowMount(EntityInfo, { vuetify })
+    const wrapper = shallowMount(EntityInfo, { vuetify, router })
     await Vue.nextTick()
 
     expect(wrapper.findComponent(EntityDefinitions).exists()).toBe(true)
diff --git a/tests/unit/EntityMenu.spec.ts b/tests/unit/EntityMenu.spec.ts
index 54ecb36d1..133e0cce6 100644
--- a/tests/unit/EntityMenu.spec.ts
+++ b/tests/unit/EntityMenu.spec.ts
@@ -90,7 +90,7 @@ describe('Entity Menu - entities', () => {
     // set store properties
     businessStore.setLegalName('My Named Company')
     businessStore.setLegalType(CorpTypeCd.BENEFIT_COMPANY)
-    rootStore.entityStatus = EntityStatus.DRAFT_APP
+    rootStore.entityStatus = EntityStatus.DRAFT_INCORP_APP
     rootStore.keycloakRoles = ['staff']
 
     // mock isAllowed mixin method
@@ -124,7 +124,7 @@ describe('Entity Menu - entities', () => {
     // set store properties
     businessStore.setLegalName('My Future Company')
     businessStore.setLegalType(CorpTypeCd.BENEFIT_COMPANY)
-    rootStore.entityStatus = EntityStatus.FILED_APP
+    rootStore.entityStatus = EntityStatus.FILED_INCORP_APP
     rootStore.keycloakRoles = ['staff']
 
     // mock isAllowed mixin method
@@ -173,13 +173,13 @@ describe('Entity Menu - View and Change Business Information button', () => {
     },
     { // 2
       businessId: null,
-      state: 'DRAFT_APP',
+      state: 'DRAFT_INCORP_APP',
       isAllowed: false,
       buttonExists: false
     },
     { // 3
       businessId: null,
-      state: 'FILED_APP',
+      state: 'FILED_INCORP_APP',
       isAllowed: false,
       buttonExists: false
     },
@@ -214,6 +214,7 @@ describe('Entity Menu - View and Change Business Information button', () => {
 
 describe('Entity Menu - View and Change Business Information click tests', () => {
   const { assign } = window.location
+  const router = mockRouter.mock()
 
   beforeAll(() => {
     // mock the window.location.assign function
@@ -245,6 +246,7 @@ describe('Entity Menu - View and Change Business Information click tests', () =>
 
     const wrapper = mount(EntityMenu, {
       vuetify,
+      router,
       mixins: [{ methods: { isAllowed: () => true } }],
       propsData: { businessId: 'BC1234567' }
     })
@@ -273,6 +275,7 @@ describe('Entity Menu - View and Change Business Information click tests', () =>
 
     const wrapper = mount(EntityMenu, {
       vuetify,
+      router,
       mixins: [{ methods: { isAllowed: () => true } }],
       propsData: { businessId: 'CP1234567' }
     })
@@ -289,13 +292,67 @@ describe('Entity Menu - View and Change Business Information click tests', () =>
   })
 })
 
+describe('Entity Menu - Amalgamate button tests', () => {
+  beforeAll(() => {
+    // override feature flag
+    vi.spyOn(utils, 'GetFeatureFlag').mockImplementation(flag => {
+      if (flag === 'supported-agm-extension-entities') return ''
+      if (flag === 'supported-agm-location-chg-entities') return ''
+      if (flag === 'supported-amalgamation-entities') return 'BC'
+      return null
+    })
+  })
+
+  afterAll(() => {
+    // restore feature flag
+    vi.spyOn(utils, 'GetFeatureFlag').mockRestore()
+  })
+
+  it('displays the Amalgamate button', async () => {
+    businessStore.setLegalType(CorpTypeCd.BC_COMPANY)
+    businessStore.$state.businessInfo.state = EntityState.ACTIVE
+
+    const wrapper = mount(EntityMenu, {
+      vuetify,
+      mixins: [{ methods: { isAllowed: () => true } }],
+      propsData: { businessId: 'BC1234567' }
+    })
+
+    await wrapper.find('.menu-btn').trigger('click')
+
+    expect(wrapper.find('#amalgamate-list-item').exists()).toBe(true)
+    expect(wrapper.find('#amalgamate-list-item').text()).toBe('Amalgamate')
+    expect(wrapper.find('#amalgamate-list-item').classes()).not.toContain('v-list-item--disabled') // enabled
+    wrapper.destroy()
+  })
+
+  it('amalgamate button is disabled if not allowed', async () => {
+    businessStore.setLegalType(CorpTypeCd.BC_COMPANY)
+    businessStore.$state.businessInfo.state = EntityState.ACTIVE
+
+    const wrapper = mount(EntityMenu, {
+      vuetify,
+      propsData: { businessId: 'BC1234567' }
+    })
+
+    await wrapper.find('.menu-btn').trigger('click')
+
+    expect(wrapper.find('#amalgamate-list-item').exists()).toBe(true)
+    expect(wrapper.find('#amalgamate-list-item').text()).toBe('Amalgamate')
+    expect(wrapper.find('#amalgamate-list-item').classes()).toContain('v-list-item--disabled') // disabled
+    wrapper.destroy()
+  })
+})
+
 describe('Entity Menu - Dissolve this Business click tests', () => {
+  const router = mockRouter.mock()
+
   it('displays the Dissolve this Business button', async () => {
     businessStore.setState(EntityState.ACTIVE)
 
-    // mount the component and wait for everything to stabilize
     const wrapper = mount(EntityMenu, {
       vuetify,
+      router,
       mixins: [{ methods: { isAllowed: () => true } }],
       propsData: { businessId: 'BC1234567' }
     })
@@ -315,6 +372,7 @@ describe('Entity Menu - Dissolve this Business click tests', () => {
     // mount the component and wait for everything to stabilize
     const wrapper = mount(EntityMenu, {
       vuetify,
+      router,
       mixins: [{ methods: { isAllowed: () => true } }],
       propsData: { businessId: 'BC1234567' }
     })
@@ -335,6 +393,7 @@ describe('Entity Menu - Dissolve this Business click tests', () => {
     // mount the component and wait for everything to stabilize
     const wrapper = mount(EntityMenu, {
       vuetify,
+      router,
       mixins: [{ methods: { isAllowed: () => true } }],
       propsData: { businessId: 'BC1234567' }
     })
@@ -350,10 +409,13 @@ describe('Entity Menu - Dissolve this Business click tests', () => {
 })
 
 describe('Entity Menu - Business Summary click tests', () => {
+  const router = mockRouter.mock()
+
   it('displays the Business Summary button', async () => {
     // mount the component and wait for everything to stabilize
     const wrapper = mount(EntityMenu, {
       vuetify,
+      router,
       mixins: [{ methods: { isAllowed: () => true } }],
       propsData: { businessId: 'BC1234567' }
     })
@@ -370,6 +432,7 @@ describe('Entity Menu - Business Summary click tests', () => {
     // mount the component and wait for everything to stabilize
     const wrapper = mount(EntityMenu, {
       vuetify,
+      router,
       mixins: [{ methods: { isAllowed: () => true } }],
       propsData: { businessId: 'BC1234567' }
     })
@@ -383,19 +446,23 @@ describe('Entity Menu - Business Summary click tests', () => {
   })
 })
 
-describe('Entity Menu - Business Digital Credentials click tests', () => {
-  it('displays the Business Digital Credentials button', async () => {
+describe('Entity Menu - Digital Business Cards click tests', () => {
+  const router = mockRouter.mock()
+
+  it('displays the Digital Business Cards button', async () => {
     // mount the component and wait for everything to stabilize
     const wrapper = mount(EntityMenu, {
       vuetify,
+      router,
       mixins: [{ methods: { isAllowed: () => true } }],
       propsData: { businessId: 'BC1234567' }
     })
-    await Vue.nextTick()
+
+    await wrapper.find('.menu-btn').trigger('click')
 
     const button = wrapper.find('#view-add-digital-credentials-button')
     expect(button.exists()).toBe(true)
-    expect(button.text()).toBe('Business Digital Credentials')
+    expect(button.text()).toBe('Digital Business Cards')
 
     wrapper.destroy()
   })
@@ -404,10 +471,12 @@ describe('Entity Menu - Business Digital Credentials click tests', () => {
     // mount the component and wait for everything to stabilize
     const wrapper = mount(EntityMenu, {
       vuetify,
+      router,
       mixins: [{ methods: { isAllowed: () => true } }],
       propsData: { businessId: 'BC1234567' }
     })
-    await Vue.nextTick()
+
+    await wrapper.find('.menu-btn').trigger('click')
 
     // click the button and verify emitted event
     await wrapper.find('#view-add-digital-credentials-button').trigger('click')
@@ -418,10 +487,13 @@ describe('Entity Menu - Business Digital Credentials click tests', () => {
 })
 
 describe('Entity Menu - More actions click tests', () => {
+  const router = mockRouter.mock()
+
   it('renders More actions correctly', async () => {
     // mount the component and wait for everything to stabilize
     const wrapper = mount(EntityMenu, {
       vuetify,
+      router,
       mixins: [{ methods: { isAllowed: () => true } }],
       propsData: { businessId: 'BC1234567' }
     })
@@ -456,7 +528,22 @@ describe('Entity Menu - More actions click tests', () => {
   })
 })
 
+it('renders More actions if historical and digital credential feature is allowed', async () => {
+  businessStore.setState(EntityState.HISTORICAL)
+
+  const wrapper = mount(EntityMenu, {
+    vuetify,
+    mixins: [{ methods: { isAllowed: () => true } }],
+    propsData: { businessId: 'BC1234567' }
+  })
+
+  expect(wrapper.find('.menu-btn').exists()).toBe(true)
+  wrapper.destroy()
+})
+
 describe('Entity Menu - Consent to Continuation click tests', () => {
+  const router = mockRouter.mock()
+
   it('displays the Consent to Continuation button', async () => {
     businessStore.setLegalType(CorpTypeCd.BC_COMPANY)
     businessStore.setState(EntityState.ACTIVE)
@@ -464,6 +551,7 @@ describe('Entity Menu - Consent to Continuation click tests', () => {
     // mount the component and wait for everything to stabilize
     const wrapper = mount(EntityMenu, {
       vuetify,
+      router,
       mixins: [{ methods: { isAllowed: () => true } }],
       propsData: { businessId: 'BC1234567' }
     })
@@ -479,10 +567,16 @@ describe('Entity Menu - Consent to Continuation click tests', () => {
 })
 
 describe('Entity Menu - Request AGM Extension click tests', () => {
+  const router = mockRouter.mock()
+
   beforeAll(() => {
     // override feature flag
-    vi.spyOn(utils, 'GetFeatureFlag').mockImplementation(
-      (flag) => (flag === 'enable-agm-extension'))
+    vi.spyOn(utils, 'GetFeatureFlag').mockImplementation(flag => {
+      if (flag === 'supported-agm-extension-entities') return 'BEN'
+      if (flag === 'supported-agm-location-chg-entities') return ''
+      if (flag === 'supported-amalgamation-entities') return ''
+      return null
+    })
   })
 
   afterAll(() => {
@@ -491,9 +585,12 @@ describe('Entity Menu - Request AGM Extension click tests', () => {
   })
 
   it('displays the Request AGM Extension button', async () => {
+    businessStore.setLegalType(CorpTypeCd.BENEFIT_COMPANY)
+
     // mount the component and wait for everything to stabilize
     const wrapper = mount(EntityMenu, {
       vuetify,
+      router,
       mixins: [{ methods: { isAllowed: () => true } }],
       propsData: { businessId: 'BC1234567' }
     })
@@ -509,10 +606,16 @@ describe('Entity Menu - Request AGM Extension click tests', () => {
 })
 
 describe('Entity Menu - Request AGM Location Change click tests', () => {
+  const router = mockRouter.mock()
+
   beforeAll(() => {
     // override feature flag
-    vi.spyOn(utils, 'GetFeatureFlag').mockImplementation(
-      (flag) => (flag === 'enable-agm-location-chg'))
+    vi.spyOn(utils, 'GetFeatureFlag').mockImplementation(flag => {
+      if (flag === 'supported-agm-extension-entities') return ''
+      if (flag === 'supported-agm-location-chg-entities') return 'BEN'
+      if (flag === 'supported-amalgamation-entities') return ''
+      return null
+    })
   })
 
   afterAll(() => {
@@ -521,9 +624,12 @@ describe('Entity Menu - Request AGM Location Change click tests', () => {
   })
 
   it('displays the Request AGM Location Change button', async () => {
+    businessStore.setLegalType(CorpTypeCd.BENEFIT_COMPANY)
+
     // mount the component and wait for everything to stabilize
     const wrapper = mount(EntityMenu, {
       vuetify,
+      router,
       mixins: [{ methods: { isAllowed: () => true } }],
       propsData: { businessId: 'BC1234567' }
     })
diff --git a/tests/unit/ExtensionRequest.spec.ts b/tests/unit/ExtensionRequest.spec.ts
new file mode 100644
index 000000000..26c0fcfb5
--- /dev/null
+++ b/tests/unit/ExtensionRequest.spec.ts
@@ -0,0 +1,352 @@
+import Vue from 'vue'
+import Vuetify from 'vuetify'
+import { mount } from '@vue/test-utils'
+import { createPinia, setActivePinia } from 'pinia'
+import ExtensionRequest from '@/components/AgmExtension/ExtensionRequest.vue'
+import { DatePicker } from '@bcrs-shared-components/date-picker'
+import { AgmExtEvalIF, EmptyAgmExtEval } from '@/interfaces'
+
+Vue.use(Vuetify)
+
+const vuetify = new Vuetify({})
+setActivePinia(createPinia())
+
+describe('ExtensionRequest', () => {
+  let wrapper: any
+
+  beforeEach(() => {
+    wrapper = mount(ExtensionRequest, {
+      propsData: {
+        data: {
+          ...EmptyAgmExtEval,
+          currentDate: '2023-10-22',
+          incorporationDate: new Date('2023-01-01T08:00:00.000Z')
+        } as AgmExtEvalIF
+      },
+      vuetify
+    })
+  })
+
+  afterEach(() => {
+    wrapper.destroy()
+  })
+
+  it('displays the initial view properly', () => {
+    // Verify component headers
+    expect(wrapper.find('.v-card').attributes('id')).toBe('extension-request')
+    expect(wrapper.find('header i').attributes('class')).toContain('mdi-calendar-range')
+    expect(wrapper.find('header h2').text()).toBe('Extension Request')
+
+    const rows = wrapper.findAll('.content .row')
+
+    // Verify isFirstAgm radio group
+    expect(rows.at(0).find('.col-sm-3').text()).toBe('Is this the first AGM?')
+    expect(rows.at(0).find('.col-sm-9 .v-input--radio-group').exists()).toBe(true)
+
+    // Verify AGM year text field
+    expect(rows.at(1).find('.col-sm-3').text()).toBe('AGM Year')
+    expect(rows.at(1).find('#year-txt').exists()).toBe(true)
+    expect(rows.at(1).find('#year-txt').attributes().disabled).toBeDefined()
+
+    // Verify isPrevExtension radio group
+    expect(rows.at(2).find('.col-sm-3').text()).toBe('Has an extension been requested for this AGM year already?')
+    expect(rows.at(2).find('.col-sm-9').text())
+      .toContain('Yes - Specify the date the extension expires')
+    expect(rows.at(2).find('.col-sm-9').text()).toContain('No - this is the first extension request for this AGM')
+
+    // Verify intended date picker
+    expect(rows.at(3).find('.col-sm-3').text()).toBe('Intended date this AGM will be held')
+    expect(rows.at(3).find('.col-sm-9').findComponent(DatePicker).exists()).toBe(true)
+  })
+
+  it('displays first agm with no previous extension requested', async () => {
+    // Click "Yes" radio button for isFirstAgm radio group
+    const firstAgmRadios = wrapper.find('#first-agm-radio-group').findAll('input[type="radio"]')
+    await firstAgmRadios.at(0).trigger('click')
+    await Vue.nextTick() // wait for DOM to update
+
+    // Click "No" radio button for isPrevExtension radio group
+    const prevExtensionRadios = wrapper.find('#prev-extension-radio-group').findAll('input[type="radio"]')
+    await prevExtensionRadios.at(1).trigger('click')
+    await Vue.nextTick() // wait for DOM to update
+
+    const rows = wrapper.findAll('.content .row')
+
+    // Verify isFirstAgm radio group
+    expect(firstAgmRadios.at(0).attributes('aria-checked')).toBe('true')
+    expect(firstAgmRadios.at(1).attributes('aria-checked')).toBe('false')
+
+    // Verify AGM year text field
+    expect(rows.at(1).find('#year-txt').attributes().disabled).toBeDefined()
+    expect(wrapper.vm.data.agmYear).toBe('2023')
+
+    // Verify isPrevExtension radio group
+    expect(prevExtensionRadios.at(0).attributes('aria-checked')).toBe('false')
+    expect(prevExtensionRadios.at(1).attributes('aria-checked')).toBe('true')
+  })
+
+  it('displays first agm with previous extension requested', async () => {
+    // Click "Yes" radio button for isFirstAgm radio group
+    const firstAgmRadios = wrapper.find('#first-agm-radio-group').findAll('input[type="radio"]')
+    await firstAgmRadios.at(0).trigger('click')
+    await Vue.nextTick() // wait for DOM to update
+
+    // Click "Yes" radio button for isPrevExtension radio group
+    const prevExtensionRadios = wrapper.find('#prev-extension-radio-group').findAll('input[type="radio"]')
+    await prevExtensionRadios.at(0).trigger('click')
+    await Vue.nextTick() // wait for DOM to update
+
+    const rows = wrapper.findAll('.content .row')
+
+    // Verify isFirstAgm radio group
+    expect(firstAgmRadios.at(0).attributes('aria-checked')).toBe('true')
+    expect(firstAgmRadios.at(1).attributes('aria-checked')).toBe('false')
+
+    // Verify AGM year text field
+    expect(rows.at(1).find('#year-txt').attributes().disabled).toBeDefined()
+    expect(wrapper.vm.data.agmYear).toBe('2023')
+
+    // Verify isPrevExtension radio group
+    expect(prevExtensionRadios.at(0).attributes('aria-checked')).toBe('true')
+    expect(prevExtensionRadios.at(1).attributes('aria-checked')).toBe('false')
+
+    // Verify expiry date picker
+    expect(rows.at(2).find('#date-text-field').attributes().disabled).toBeUndefined()
+  })
+
+  it('displays subsequent agm with no previous extension requested', async () => {
+    // Click "No" radio button for isFirstAgm radio group
+    const firstAgmRadios = wrapper.find('#first-agm-radio-group').findAll('input[type="radio"]')
+    await firstAgmRadios.at(1).trigger('click')
+    await Vue.nextTick() // wait for DOM to update
+
+    // Click "Yes" radio button for isPrevExtension radio group
+    const prevExtensionRadios = wrapper.find('#prev-extension-radio-group').findAll('input[type="radio"]')
+    await prevExtensionRadios.at(1).trigger('click')
+    await Vue.nextTick() // wait for DOM to update
+
+    const rows = wrapper.findAll('.content .row')
+
+    // Verify isFirstAgm radio group
+    expect(firstAgmRadios.at(0).attributes('aria-checked')).toBe('false')
+    expect(firstAgmRadios.at(1).attributes('aria-checked')).toBe('true')
+
+    // Verify AGM year text field
+    expect(rows.at(1).find('#year-txt').attributes().disabled).toBeUndefined()
+
+    // Verify isPrevExtension radio group
+    expect(prevExtensionRadios.at(0).attributes('aria-checked')).toBe('false')
+    expect(prevExtensionRadios.at(1).attributes('aria-checked')).toBe('true')
+
+    // Verify previous agm date picker
+    expect(rows.at(2).find('#date-text-field').exists()).toBe(true)
+  })
+
+  it('displays subsequent agm with previous extension requested', async () => {
+    // Click "No" radio button for isFirstAgm radio group
+    const firstAgmRadios = wrapper.find('#first-agm-radio-group').findAll('input[type="radio"]')
+    await firstAgmRadios.at(1).trigger('click')
+    await Vue.nextTick() // wait for DOM to update
+
+    // Click "Yes" radio button for isPrevExtension radio group
+    const prevExtensionRadios = wrapper.find('#prev-extension-radio-group').findAll('input[type="radio"]')
+    await prevExtensionRadios.at(0).trigger('click')
+    await Vue.nextTick() // wait for DOM to update
+
+    const rows = wrapper.findAll('.content .row')
+
+    // Verify isFirstAgm radio group
+    expect(firstAgmRadios.at(0).attributes('aria-checked')).toBe('false')
+    expect(firstAgmRadios.at(1).attributes('aria-checked')).toBe('true')
+
+    // Verify AGM year text field
+    expect(rows.at(1).find('#year-txt').attributes().disabled).toBeUndefined()
+
+    // Verify isPrevExtension radio group
+    expect(prevExtensionRadios.at(0).attributes('aria-checked')).toBe('true')
+    expect(prevExtensionRadios.at(1).attributes('aria-checked')).toBe('false')
+
+    // Verify previous agm date picker
+    expect(rows.at(2).find('#date-text-field').exists()).toBe(true)
+
+    // Verify expiry date picker
+    expect(rows.at(3).find('#date-text-field').exists()).toBe(true)
+    expect(rows.at(3).find('#date-text-field').attributes().disabled).toBeUndefined()
+  })
+
+  it('handles eligible case for first agm with no previous extension requested', async () => {
+    wrapper.setData({
+      data: {
+        ...wrapper.vm.data,
+        isFirstAgm: true,
+        isPrevExtension: false,
+        incorporationDate: new Date('2022-06-15T08:00:00.000Z')
+      } as AgmExtEvalIF
+    })
+    await Vue.nextTick() // wait for DOM to update
+
+    // Eligible
+    expect(wrapper.vm.data.isEligible).toBe(true)
+    expect(wrapper.vm.data.extensionDuration).toBe(6)
+    expect(wrapper.vm.data.alreadyExtended).toBe(false)
+    expect(wrapper.vm.data.requestExpired).toBe(false)
+  })
+
+  it('handles "request expired" case for first agm with no previous extension requested', async () => {
+    wrapper.setData({
+      data: {
+        ...wrapper.vm.data,
+        isFirstAgm: true,
+        isPrevExtension: false,
+        incorporationDate: new Date('2022-01-01T08:00:00.000Z')
+      } as AgmExtEvalIF
+    })
+    await Vue.nextTick() // wait for DOM to update
+
+    // Not eligible because:
+    // CurrentDate > (IncorporationDate + 18 Months + 5 days)
+    expect(wrapper.vm.data.isEligible).toBe(false)
+    expect(wrapper.vm.data.extensionDuration).toBe(null)
+    expect(wrapper.vm.data.alreadyExtended).toBe(false)
+    expect(wrapper.vm.data.requestExpired).toBe(true)
+  })
+
+  it('handles eligible case for first agm with previous extension requested', async () => {
+    wrapper.setData({
+      data: {
+        ...wrapper.vm.data,
+        isFirstAgm: true,
+        isPrevExtension: true,
+        incorporationDate: new Date('2022-01-01T08:00:00.000Z'),
+        prevExpiryDate: '2023-12-01'
+      } as AgmExtEvalIF
+    })
+    await Vue.nextTick() // wait for DOM to update
+
+    // Eligible
+    expect(wrapper.vm.data.isEligible).toBe(true)
+    expect(wrapper.vm.data.extensionDuration).toBe(6)
+    expect(wrapper.vm.data.alreadyExtended).toBe(false)
+    expect(wrapper.vm.data.requestExpired).toBe(false)
+  })
+
+  it('handles "request expired" case for first agm with previous extension requested', async () => {
+    wrapper.setData({
+      data: {
+        ...wrapper.vm.data,
+        isFirstAgm: true,
+        isPrevExtension: true,
+        incorporationDate: new Date('2021-11-05T08:00:00.000Z'),
+        prevExpiryDate: '2023-08-01'
+      } as AgmExtEvalIF
+    })
+    await Vue.nextTick() // wait for DOM to update
+
+    // Not eligible because:
+    // CurrentDate > (ExpirationDate + 5 days)
+    expect(wrapper.vm.data.isEligible).toBe(false)
+    expect(wrapper.vm.data.extensionDuration).toBe(null)
+    expect(wrapper.vm.data.alreadyExtended).toBe(false)
+    expect(wrapper.vm.data.requestExpired).toBe(true)
+  })
+
+  it('handles eligible case for subsequent agm with no previous extension requested', async () => {
+    wrapper.setData({
+      data: {
+        ...wrapper.vm.data,
+        isFirstAgm: false,
+        isPrevExtension: false,
+        incorporationDate: new Date('1998-08-23T08:00:00.000Z'),
+        prevAgmDate: '2022-11-01'
+      } as AgmExtEvalIF
+    })
+    await Vue.nextTick() // wait for DOM to update
+
+    expect(wrapper.vm.data.isEligible).toBe(true)
+    expect(wrapper.vm.data.extensionDuration).toBe(6)
+    expect(wrapper.vm.data.alreadyExtended).toBe(false)
+    expect(wrapper.vm.data.requestExpired).toBe(false)
+  })
+
+  it('handles "request expired" case for subsequent agm with no previous extension requested', async () => {
+    wrapper.setData({
+      data: {
+        ...wrapper.vm.data,
+        isFirstAgm: false,
+        isPrevExtension: false,
+        incorporationDate: new Date('1998-08-23T08:00:00.000Z'),
+        prevAgmDate: '2020-06-01'
+      } as AgmExtEvalIF
+    })
+    await Vue.nextTick() // wait for DOM to update
+
+    // Not eligible because:
+    // CurrentDate > (PrevAgmDate + 15 Months + 5 days)
+    expect(wrapper.vm.data.isEligible).toBe(false)
+    expect(wrapper.vm.data.extensionDuration).toBe(null)
+    expect(wrapper.vm.data.alreadyExtended).toBe(false)
+    expect(wrapper.vm.data.requestExpired).toBe(true)
+  })
+
+  it('handles eligible case for subsequent agm with previous extension requested', async () => {
+    wrapper.setData({
+      data: {
+        ...wrapper.vm.data,
+        isFirstAgm: false,
+        isPrevExtension: true,
+        incorporationDate: new Date('1998-08-23T08:00:00.000Z'),
+        prevAgmDate: '2022-12-31',
+        prevExpiryDate: '2023-10-31'
+      } as AgmExtEvalIF
+    })
+    await Vue.nextTick() // wait for DOM to update
+
+    // Eligible
+    expect(wrapper.vm.data.isEligible).toBe(true)
+    expect(wrapper.vm.data.extensionDuration).toBe(2)
+    expect(wrapper.vm.data.alreadyExtended).toBe(false)
+    expect(wrapper.vm.data.requestExpired).toBe(false)
+  })
+
+  it('handles "already extended" case for subsequent agm with previous extension requested', async () => {
+    wrapper.setData({
+      data: {
+        ...wrapper.vm.data,
+        isFirstAgm: false,
+        isPrevExtension: true,
+        incorporationDate: new Date('1998-08-23T08:00:00.000Z'),
+        prevAgmDate: '2021-12-31',
+        prevExpiryDate: '2023-10-31'
+      } as AgmExtEvalIF
+    })
+    await Vue.nextTick() // wait for DOM to update
+
+    // Not eligible because:
+    // (ExpirationDate - PrevAgmDate) > 12 months
+    expect(wrapper.vm.data.isEligible).toBe(false)
+    expect(wrapper.vm.data.extensionDuration).toBe(null)
+    expect(wrapper.vm.data.alreadyExtended).toBe(true)
+    expect(wrapper.vm.data.requestExpired).toBe(false)
+  })
+
+  it('handles "request expired" case for subsequent agm with previous extension requested', async () => {
+    wrapper.setData({
+      data: {
+        ...wrapper.vm.data,
+        isFirstAgm: false,
+        isPrevExtension: true,
+        incorporationDate: new Date('1998-08-23T08:00:00.000Z'),
+        prevAgmDate: '2022-12-31',
+        prevExpiryDate: '2023-10-11'
+      } as AgmExtEvalIF
+    })
+    await Vue.nextTick() // wait for DOM to update
+
+    // Not eligible because:
+    // CurrentDate > (ExpirationDate + 5 days)
+    expect(wrapper.vm.data.isEligible).toBe(false)
+    expect(wrapper.vm.data.extensionDuration).toBe(null)
+    expect(wrapper.vm.data.alreadyExtended).toBe(false)
+    expect(wrapper.vm.data.requestExpired).toBe(true)
+  })
+})
diff --git a/tests/unit/FilingHistoryList1.spec.ts b/tests/unit/FilingHistoryList1.spec.ts
index 7ff845297..bc251f9c0 100644
--- a/tests/unit/FilingHistoryList1.spec.ts
+++ b/tests/unit/FilingHistoryList1.spec.ts
@@ -22,8 +22,10 @@ import StaffFiling from '@/components/Dashboard/FilingHistoryList/filings/StaffF
 import LimitedRestoration from '@/components/Dashboard/FilingHistoryList/filings/LimitedRestoration.vue'
 import ConsentContinuationOut from '@/components/Dashboard/FilingHistoryList/filings/ConsentContinuationOut.vue'
 import ContinuationOut from '@/components/Dashboard/FilingHistoryList/filings/ContinuationOut.vue'
-import { CorpTypeCd, FilingTypes } from '@bcrs-shared-components/enums'
-import { FilingStatus, FilingSubTypes } from '@/enums'
+import DefaultFiling from '@/components/Dashboard/FilingHistoryList/filings/DefaultFiling.vue'
+import AgmExtension from '@/components/Dashboard/FilingHistoryList/filings/AgmExtension.vue'
+import { FilingTypes } from '@bcrs-shared-components/enums'
+import { CorpTypeCd, FilingStatus, FilingSubTypes } from '@/enums'
 
 Vue.use(Vuetify)
 Vue.use(Vuelidate)
@@ -47,6 +49,7 @@ describe('Filing History List - misc functionality', () => {
       availableOnPaperOnly: false,
       businessIdentifier: 'CP0001191',
       commentsCount: 0,
+      displayLedger: true,
       displayName: 'Annual Report',
       effectiveDate: '2019-06-02 19:22:59 GMT',
       filingId: 111,
@@ -60,6 +63,7 @@ describe('Filing History List - misc functionality', () => {
       availableOnPaperOnly: false,
       businessIdentifier: 'CP0001191',
       commentsCount: 2,
+      displayLedger: true,
       displayName: 'Change of Address',
       // Effective Date is way in the future so it's always > now
       effectiveDate: '2099-12-13 08:00:00 GMT', // Dec 13, 2099 at 00:00:00 am Pacific
@@ -120,6 +124,7 @@ describe('Filing History List - misc functionality', () => {
         availableOnPaperOnly: false,
         businessIdentifier: 'CP0001191',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Annual Report',
         effectiveDate: '2019-11-20 22:17:54 GMT',
         filingId: 111,
@@ -133,6 +138,7 @@ describe('Filing History List - misc functionality', () => {
         availableOnPaperOnly: false,
         businessIdentifier: 'CP0001191',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Change of Directors',
         effectiveDate: '2019-11-20 22:17:54 GMT',
         filingId: 222,
@@ -146,6 +152,7 @@ describe('Filing History List - misc functionality', () => {
         availableOnPaperOnly: false,
         businessIdentifier: 'CP0001191',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Change of Address',
         effectiveDate: '2019-11-20 22:17:54 GMT',
         filingId: 333,
@@ -159,6 +166,7 @@ describe('Filing History List - misc functionality', () => {
         availableOnPaperOnly: true,
         businessIdentifier: 'CP0001191',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Annual Report',
         effectiveDate: '2019-11-20 22:17:54 GMT',
         filingId: 444,
@@ -172,6 +180,7 @@ describe('Filing History List - misc functionality', () => {
         availableOnPaperOnly: true,
         businessIdentifier: 'CP0001191',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Change of Directors',
         effectiveDate: '2019-11-20 22:17:54 GMT',
         filingId: 555,
@@ -185,6 +194,7 @@ describe('Filing History List - misc functionality', () => {
         availableOnPaperOnly: true,
         businessIdentifier: 'CP0001191',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Change of Address',
         effectiveDate: '2019-11-20 22:17:54 GMT',
         filingId: 666,
@@ -216,6 +226,7 @@ describe('Filing History List - misc functionality', () => {
         availableOnPaperOnly: true,
         businessIdentifier: 'CP0001191',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Change of Directors',
         effectiveDate: '2019-11-20 22:17:54 GMT',
         filingId: 222,
@@ -267,6 +278,7 @@ describe('Filing History List - misc functionality', () => {
         availableOnPaperOnly: false,
         businessIdentifier: 'CP0001191',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Annual Report',
         effectiveDate: '2019-11-20 22:17:54 GMT',
         filingId: 111,
@@ -321,6 +333,7 @@ describe('Filing History List - misc functionality', () => {
         availableOnPaperOnly: false,
         businessIdentifier: 'CP0001191',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Full Restoration Application',
         effectiveDate: '2019-11-20 22:17:54 GMT',
         filingId: 111,
@@ -387,6 +400,7 @@ describe('Filing History List - misc functionality', () => {
             legalName: 'BC1234567 LTD.'
           }
         } as any,
+        displayLedger: true,
         displayName: 'Limited Restoration Application',
         documentsLink: 'http://test',
         effectiveDate: '2019-11-20 22:17:54 GMT',
@@ -603,6 +617,66 @@ describe('Filing History List - misc functionality', () => {
     businessStore.setLegalType(CorpTypeCd.COOP)
     expect(vm.disableCorrection({ ...item, name: 'registration' })).toBe(true)
   })
+
+  it('displays multiple filing items, and remove the filing that displayLedger is false', async () => {
+    // init store
+    businessStore.setIdentifier('CP0001191')
+    filingHistoryListStore.setFilings([
+      {
+        availableOnPaperOnly: false,
+        businessIdentifier: 'CP0001191',
+        commentsCount: 0,
+        displayLedger: true,
+        displayName: 'Annual Report',
+        effectiveDate: '2019-11-20 22:17:54 GMT',
+        filingId: 111,
+        isFutureEffective: false,
+        name: FilingTypes.ANNUAL_REPORT,
+        status: FilingStatus.COMPLETED,
+        submittedDate: 'Tue, 02 July 2019 12:00:00 GMT',
+        submitter: 'Submitter 1'
+      } as any,
+      {
+        availableOnPaperOnly: false,
+        businessIdentifier: 'BC0001191',
+        commentsCount: 0,
+        displayLedger: true,
+        displayName: 'Benefit Company Incorporation Application - ACME Benefit Inc',
+        effectiveDate: '2019-11-20 22:17:54 GMT',
+        filingId: 222,
+        isFutureEffective: false,
+        name: FilingTypes.INCORPORATION_APPLICATION,
+        status: FilingStatus.COMPLETED,
+        submittedDate: 'Thu, 04 Apr 2019 12:00:00 GMT',
+        submitter: 'Submitter 2'
+      },
+      {
+        availableOnPaperOnly: false,
+        businessIdentifier: 'CP0001191',
+        commentsCount: 0,
+        displayLedger: false,
+        displayName: 'Admin Freeze',
+        effectiveDate: '2019-11-20 22:17:54 GMT',
+        filingId: 333,
+        isFutureEffective: false,
+        name: FilingTypes.ADMIN_FREEZE,
+        status: FilingStatus.COMPLETED,
+        submittedDate: 'Mon, 06 May 2019 12:00:00 GMT',
+        submitter: 'Submitter 3'
+      }
+    ])
+
+    const wrapper = mount(FilingHistoryList, { vuetify })
+    const vm = wrapper.vm as any
+    await Vue.nextTick()
+
+    expect(vm.getFilings.length).toEqual(2)
+    expect(wrapper.findAll('.default-filing').length).toEqual(1)
+    expect(wrapper.findAll('.incorporation-application').length).toEqual(1)
+    expect(wrapper.find('.no-results').exists()).toBe(false)
+
+    wrapper.destroy()
+  })
 })
 
 describe('Filing History List - redirections', () => {
@@ -909,6 +983,7 @@ describe('Filing History List - redirections', () => {
         availableOnPaperOnly: false,
         businessIdenfier: 'CP1002587',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Special Resolution',
         effectiveDate: 'Wed, 24 May 2023 18:02:16 GMT',
         filingId: 145190,
@@ -981,6 +1056,7 @@ describe('Filing History List - redirections', () => {
         availableOnPaperOnly: false,
         businessIdenfier: 'BC1234567',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Incorporation Application',
         effectiveDate: '2020-05-06 19:00:00 GMT', // past date
         filingId: 85114,
@@ -1051,6 +1127,7 @@ describe('Filing History List - redirections', () => {
         availableOnPaperOnly: false,
         businessIdenfier: 'CP1002587',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Incorporation Application',
         effectiveDate: '2020-05-06 19:00:00 GMT', // past date
         filingId: 85114,
@@ -1137,6 +1214,7 @@ describe('Filing History List - incorporation applications', () => {
         availableOnPaperOnly: false,
         businessIdentifier: 'T123456789',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'BC Benefit Company Incorporation Application - ACME Benefit Inc',
         effectiveDate: '2020-05-06 19:00:00 GMT', // past date
         filingId: 85114,
@@ -1178,6 +1256,7 @@ describe('Filing History List - incorporation applications', () => {
         availableOnPaperOnly: false,
         businessIdentifier: 'T123456789',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'BC Benefit Company Incorporation Application - Numbered Benefit Company',
         effectiveDate: '2020-05-06 19:00:00 GMT', // past date
         filingId: 85114,
@@ -1219,6 +1298,7 @@ describe('Filing History List - incorporation applications', () => {
         availableOnPaperOnly: false,
         businessIdentifier: 'T123456789',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'BC Benefit Company Incorporation Application - ACME Benefit Inc',
         effectiveDate: '2099-12-31 23:59:59 GMT', // way in the future so it's always > now
         filingId: 85114,
@@ -1282,6 +1362,7 @@ describe('Filing History List - incorporation applications', () => {
         availableOnPaperOnly: false,
         businessIdentifier: 'T123456789',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'BC Benefit Company Incorporation Application - ACME Benefit Inc',
         effectiveDate: '2020-05-06 19:00:00 GMT', // past date
         filingId: 85114,
@@ -1345,6 +1426,7 @@ describe('Filing History List - incorporation applications', () => {
         availableOnPaperOnly: false,
         businessIdentifier: 'T123456789',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Benefit Company Incorporation Application - ACME Benefit Inc',
         effectiveDate: '2020-05-06 19:00:00 GMT', // past date
         filingId: 85114,
@@ -1407,6 +1489,7 @@ describe('Filing History List - incorporation applications', () => {
         availableOnPaperOnly: false,
         businessIdentifier: 'T123456789',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Benefit Company Incorporation Application - ACME Benefit Inc',
         effectiveDate: '2099-12-31 23:59:59 GMT', // way in the future so it's always > now
         filingId: 85114,
@@ -1469,6 +1552,7 @@ describe('Filing History List - incorporation applications', () => {
         availableOnPaperOnly: false,
         businessIdentifier: 'T123456789',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Benefit Company Incorporation Application - ACME Benefit Inc',
         effectiveDate: '2020-05-06 19:00:00 GMT', // past date
         filingId: 85114,
@@ -1531,6 +1615,7 @@ describe('Filing History List - incorporation applications', () => {
         availableOnPaperOnly: false,
         businessIdentifier: 'BC1234567',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Benefit Company Incorporation Application - ACME Benefit Inc',
         effectiveDate: '2020-05-06 19:00:00 GMT', // past date
         filingId: 85114,
@@ -1611,6 +1696,7 @@ describe('Filing History List - paper only and other filings', () => {
         availableOnPaperOnly: true,
         businessIdentifier: 'BC1234567',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Annual Report (2017)',
         effectiveDate: '2017-03-24 19:20:05 GMT',
         filingId: 85114,
@@ -1663,6 +1749,7 @@ describe('Filing History List - paper only and other filings', () => {
         availableOnPaperOnly: false,
         businessIdentifier: 'BC1234567',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Alteration - Change of Company Information',
         effectiveDate: '2020-03-24 19:20:05 GMT',
         filingId: 85114,
@@ -1723,6 +1810,7 @@ describe('Filing History List - paper only and other filings', () => {
         availableOnPaperOnly: false,
         businessIdentifier: 'BC1234567',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Alteration from a BC Limited Company to a BC Benefit Company',
         effectiveDate: '2099-12-31 23:59:59 GMT', // way in the future so it's always > now
         filingId: 85114,
@@ -1788,6 +1876,7 @@ describe('Filing History List - paper only and other filings', () => {
         availableOnPaperOnly: false,
         businessIdentifier: 'BC1234567',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Alteration from a BC Limited Company to a BC Benefit Company',
         effectiveDate: '2020-04-24 19:20:05 GMT', // past date
         filingId: 85114,
@@ -1853,6 +1942,7 @@ describe('Filing History List - paper only and other filings', () => {
         availableOnPaperOnly: false,
         businessIdentifier: 'BC1234567',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Alteration from a BC Limited Company to a BC Benefit Company',
         effectiveDate: '2020-03-24 19:20:05 GMT',
         filingId: 85114,
@@ -1917,6 +2007,7 @@ describe('Filing History List - paper only and other filings', () => {
         availableOnPaperOnly: false,
         businessIdentifier: 'BC1234567',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Registrar\'s Notation',
         effectiveDate: '2021-05-05 20:37:44 GMT',
         filingId: 123,
@@ -1973,6 +2064,7 @@ describe('Filing History List - paper only and other filings', () => {
         availableOnPaperOnly: false,
         businessIdentifier: 'BC1234567',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Registrar\'s Order',
         effectiveDate: '2021-05-05 20:37:44 GMT',
         filingId: 123,
@@ -2029,6 +2121,7 @@ describe('Filing History List - paper only and other filings', () => {
         availableOnPaperOnly: false,
         businessIdentifier: 'BC1234567',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Court Order',
         effectiveDate: '2021-05-05 20:37:44 GMT',
         filingId: 123,
@@ -2085,6 +2178,7 @@ describe('Filing History List - with Court Order documents', () => {
     availableOnPaperOnly: false,
     businessIdentifier: 'BC0871300',
     commentsCounts: 0,
+    displayLedger: true,
     displayName: 'Court Order 17321728',
     documentsLink: 'businesses/BC0871300/filings/111/documents',
     effectiveDate: '2019-12-13 00:00:00 GMT',
@@ -2172,6 +2266,7 @@ describe('Filing History List - with documents', () => {
     availableOnPaperOnly: false,
     businessIdentifier: 'CP0001191',
     commentsCounts: 0,
+    displayLedger: true,
     displayName: 'Annual Report (2019)',
     documentsLink: 'businesses/CP0001191/filings/111/documents',
     effectiveDate: '2019-12-13 00:00:00 GMT',
@@ -2307,6 +2402,7 @@ describe('Filing History List - detail comments', () => {
     businessIdentifier: 'CP0001191',
     commentsCount: 2,
     commentsLink: 'businesses/CP0001191/filings/111/comments',
+    displayLedger: true,
     displayName: 'Annual Report',
     effectiveDate: '2019-06-02 19:22:59 GMT',
     filingId: 111,
@@ -2324,6 +2420,7 @@ describe('Filing History List - detail comments', () => {
         availableOnPaperOnly: false,
         businessIdentifier: 'CP0001191',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Annual Report',
         effectiveDate: '2019-06-02 19:22:59 GMT',
         filingId: 111,
@@ -2351,6 +2448,7 @@ describe('Filing History List - detail comments', () => {
         availableOnPaperOnly: false,
         businessIdentifier: 'CP0001191',
         commentsCount: 2,
+        displayLedger: true,
         displayName: 'Change of Address',
         // Effective Date is way in the future so it's always > now
         effectiveDate: '2099-12-13 08:00:00 GMT', // Dec 13, 2099 at 00:00:00 am Pacific
@@ -2455,6 +2553,7 @@ describe('Filing History List - without documents', () => {
     availableOnPaperOnly: false,
     businessIdentifier: 'CP0001191',
     commentsCounts: 0,
+    displayLedger: true,
     displayName: 'Involuntary Dissolution',
     effectiveDate: '2019-12-13 00:00:00 GMT',
     filingId: 111,
@@ -2480,8 +2579,8 @@ describe('Filing History List - without documents', () => {
   })
 })
 
-describe('Filing History List - expands Consent to continue out', () => {
-  it('expands Consent to continue out', async () => {
+describe('Filing History List - expands Consent to Continue Out', () => {
+  it('expands Consent to Continue Out', async () => {
     // init store
     businessStore.setIdentifier('BC1234567')
     filingHistoryListStore.setFilings([
@@ -2489,6 +2588,7 @@ describe('Filing History List - expands Consent to continue out', () => {
         availableOnPaperOnly: false,
         businessIdentifier: 'BC1234567',
         commentsCount: 0,
+        displayLedger: true,
         displayName: '6-Month Consent to Continue Out',
         effectiveDate: '2022-11-20 22:17:54 GMT',
         filingId: 111,
@@ -2526,8 +2626,8 @@ describe('Filing History List - expands Consent to continue out', () => {
   })
 })
 
-describe('Filing History List - Expands Continuation Out', () => {
-  it('expands to continue out', async () => {
+describe('Filing History List - expands Continuation Out', () => {
+  it('expands Continuation Out', async () => {
     // init store
     businessStore.setIdentifier('BC1234567')
     filingHistoryListStore.setFilings([
@@ -2535,6 +2635,7 @@ describe('Filing History List - Expands Continuation Out', () => {
         availableOnPaperOnly: false,
         businessIdentifier: 'BC1234567',
         commentsCount: 0,
+        displayLedger: true,
         displayName: 'Continuation Out',
         effectiveDate: '2022-11-20 22:17:54 GMT',
         filingId: 111,
@@ -2571,3 +2672,97 @@ describe('Filing History List - Expands Continuation Out', () => {
     wrapper.destroy()
   })
 })
+
+describe('Filing History List - expands AGM Location Change', () => {
+  it('expands AGM Location Change', async () => {
+    // init store
+    businessStore.setIdentifier('BC1234567')
+    filingHistoryListStore.setFilings([
+      {
+        availableOnPaperOnly: false,
+        businessIdentifier: 'BC1234567',
+        commentsCount: 0,
+        displayLedger: true,
+        displayName: 'AGM Location Change',
+        effectiveDate: '2022-11-20 22:17:54 GMT',
+        filingId: 111,
+        isFutureEffective: false,
+        name: FilingTypes.AGM_LOCATION_CHANGE,
+        status: FilingStatus.COMPLETED,
+        submittedDate: '2022-11-20 22:17:54 GMT',
+        submitter: 'BCREGTEST',
+        documentsLink: 'http://test'
+      } as any
+    ])
+
+    const wrapper = mount(FilingHistoryList, { vuetify })
+    const vm = wrapper.vm as any
+
+    vi.spyOn(vm, 'getPanel', 'get').mockReturnValue(0)
+
+    // verify View Documents button
+    const button = wrapper.find('.expand-btn')
+    expect(button.text()).toContain('View Documents')
+
+    // expand panel
+    await button.trigger('click')
+    await flushPromises() // wait for expansion transition
+
+    // verify Hide Documents button
+    expect(wrapper.find('.expand-btn').text()).toContain('Hide Documents')
+
+    // verify details
+    expect(vm.getPanel).toBe(0) // first row is expanded
+    expect(wrapper.findComponent(DefaultFiling).exists()).toBe(true)
+
+    vi.resetAllMocks()
+    wrapper.destroy()
+  })
+})
+
+describe('Filing History List - expands AGM Extension', () => {
+  it('expands AGM Extension', async () => {
+    // init store
+    businessStore.setIdentifier('BC1234567')
+    filingHistoryListStore.setFilings([
+      {
+        availableOnPaperOnly: false,
+        businessIdentifier: 'BC1234567',
+        commentsCount: 0,
+        displayLedger: true,
+        displayName: 'AGM Extension',
+        effectiveDate: '2022-11-20 22:17:54 GMT',
+        filingId: 111,
+        isFutureEffective: false,
+        name: FilingTypes.AGM_EXTENSION,
+        status: FilingStatus.COMPLETED,
+        submittedDate: '2022-11-20 22:17:54 GMT',
+        submitter: 'BCREGTEST',
+        documentsLink: 'http://test'
+      } as any
+    ])
+
+    const wrapper = mount(FilingHistoryList, { vuetify })
+    const vm = wrapper.vm as any
+
+    vi.spyOn(vm, 'getPanel', 'get').mockReturnValue(0)
+
+    // verify View Documents button
+    const button = wrapper.find('.expand-btn')
+    expect(button.text()).toContain('View Documents')
+
+    // expand panel
+    await button.trigger('click')
+    await flushPromises() // wait for expansion transition
+
+    // verify Hide Documents button
+    expect(wrapper.find('.expand-btn').text()).toContain('Hide Documents')
+
+    // verify details
+    expect(vm.getPanel).toBe(0) // first row is expanded
+    expect(wrapper.findComponent(AgmExtension).exists()).toBe(true)
+
+    vi.resetAllMocks()
+    wrapper.destroy()
+  })
+})
diff --git a/tests/unit/FilingHistoryList2.spec.ts b/tests/unit/FilingHistoryList2.spec.ts
index 3c08dafeb..db20ba7f2 100644
--- a/tests/unit/FilingHistoryList2.spec.ts
+++ b/tests/unit/FilingHistoryList2.spec.ts
@@ -7,6 +7,7 @@ import flushPromises from 'flush-promises'
 import axios from '@/axios-auth'
 import sinon from 'sinon'
 import { filings } from './filings.json'
+import { FilingStatus, FilingSubTypes, FilingTypes } from '@/enums'
 
 // Components and sub-components
 import FilingHistoryList from '@/components/Dashboard/FilingHistoryList.vue'
@@ -33,16 +34,17 @@ const itIf = (condition) => condition ? it : it.skip
 const isPaperOnly = (filing) => filing.availableOnPaperOnly
 const isCorrection = (filing) => !!filing.correctedFilingId
 const isCorrected = (filing) => !!filing.correctionFilingId
-const isIncorporationApplication = (filing) => (filing.name === 'incorporationApplication')
+const isIncorporationApplication = (filing) => (filing.name === FilingTypes.INCORPORATION_APPLICATION)
 // const isBcompCoa = (filing) => false FUTURE: implement BComp tests
-const isAlteration = (filing) => (filing.name === 'alteration')
-const isConsentContinuationOut = (filing) => (filing.name === 'consentContinuationOut')
+const isAlteration = (filing) => (filing.name === FilingTypes.ALTERATION)
+const isAmalgamation = (filing) => (filing.name === FilingTypes.AMALGAMATION_APPLICATION)
+const isConsentContinuationOut = (filing) => (filing.name === FilingTypes.CONSENT_CONTINUATION_OUT)
 const isStaff = (filing) => (
-  filing.name === 'registrarsNotation' ||
-  filing.name === 'registrarsOrder' ||
-  filing.name === 'courtOrder' ||
-  filing.name === 'putBackOn' ||
-  (filing.name === 'dissolution' && filing.displayName === 'Administrative Dissolution')
+  filing.name === FilingTypes.REGISTRARS_NOTATION ||
+  filing.name === FilingTypes.REGISTRARS_ORDER ||
+  filing.name === FilingTypes.COURT_ORDER ||
+  filing.name === FilingTypes.PUT_BACK_ON ||
+  (filing.name === FilingTypes.DISSOLUTION && filing.displayName === 'Administrative Dissolution')
 )
 
 // Iterate over sample filings
@@ -65,8 +67,7 @@ filings.forEach((filing: any, index: number) => {
         .returns(new Promise(resolve => resolve({ data: { documents: {} } })))
 
       // mount the component
-      wrapper = mount(FilingHistoryList, {
-        propsData: { dissolutionType: filing?.data?.dissolution?.dissolutionType }, vuetify })
+      wrapper = mount(FilingHistoryList, { vuetify })
       vm = wrapper.vm
     })
 
@@ -110,7 +111,6 @@ filings.forEach((filing: any, index: number) => {
 
     // itIf(isBcompCoa(filing))('BCOMP change of address filing', () => {
     //   expect(vm.getFilings.length).toBe(1) // sanity check
-
     //   expect(item.isFutureEffectiveCoaPending).toBeDefined()
     // })
 
@@ -126,6 +126,25 @@ filings.forEach((filing: any, index: number) => {
       // expect(item.fromLegalType).toBeDefined() // FUTURE: test this more specifically
     })
 
+    itIf(isAmalgamation(filing))('amalgamation filing', () => {
+      // verify data
+      expect(vm.getFilings.length).toBe(1) // sanity check
+      const item = vm.getFilings[0]
+      expect(item.businessIdentifier).toBe('BC1234567')
+      expect(item.data.amalgamationApplication.type).toBe(FilingSubTypes.AMALGAMATION_REGULAR)
+      expect(item.displayName).toBe('Amalgamation Application - Regular')
+      expect(item.name).toBe(FilingTypes.AMALGAMATION_APPLICATION)
+      expect(item.status).toBe(FilingStatus.COMPLETED)
+
+      // verify display
+      expect(wrapper.find('.item-header-title').text()).toBe('Amalgamation Application - Regular')
+      expect(wrapper.find('.item-header-subtitle').text()).toContain('FILED AND PAID')
+      expect(wrapper.find('.item-header-subtitle').text()).toContain('(filed by Registry Staff on Feb 3, 2023)')
+      expect(wrapper.find('.item-header-subtitle').text()).toContain('EFFECTIVE as of Feb 3, 2023')
+      expect(wrapper.find('.view-details').text()).toBe('View Documents')
+      expect(wrapper.find('.hide-details').text()).toBe('Hide Documents')
+    })
+
     itIf(isConsentContinuationOut(filing))('consent to continuation out filing', () => {
       // expect(vm.getFilings.length).toBe(1) // sanity check
       // const item = vm.getFilings[0]
@@ -253,10 +272,10 @@ filings.forEach((filing: any, index: number) => {
       } else if (item.isFutureEffectiveAlterationPending) {
         expect(wrapper.findComponent(FutureEffectivePending).exists()).toBe(true)
       } else if (item.isFutureEffectiveAlteration) {
-        expect(wrapper.ffindComponentind(FutureEffective).exists()).toBe(true)
+        expect(wrapper.findComponent(FutureEffective).exists()).toBe(true)
       // } else if (item.status === 'PAID') {
       //   expect(wrapper.findComponent(PendingFiling).exists()).toBe(true)
-      // // } else if (item.name === 'alteration') {
+      // } else if (item.name === 'alteration') {
       //   expect(wrapper.findComponent(CompletedAlteration).exists()).toBe(true)
       } else if (item.availableOnPaperOnly) {
         expect(wrapper.findComponent(PaperFiling).exists()).toBe(true)
diff --git a/tests/unit/LegalObligation.spec.ts b/tests/unit/LegalObligation.spec.ts
index d6cd9f2ed..132088057 100644
--- a/tests/unit/LegalObligation.spec.ts
+++ b/tests/unit/LegalObligation.spec.ts
@@ -22,6 +22,7 @@ const rootStore = useRootStore()
 const newIncorporationFiling = [
   {
     availableOnPaperOnly: false,
+    displayLedger: true,
     displayName: 'Incorporation Application',
     effectiveDate: '2019-06-02 19:22:59 GMT',
     filingId: 123,
@@ -36,6 +37,7 @@ const newIncorporationFiling = [
 const newRegistrationFiling = [
   {
     availableOnPaperOnly: false,
+    displayLedger: true,
     displayName: 'Registration',
     effectiveDate: '2019-06-02 19:22:59 GMT',
     filingId: 123,
@@ -50,6 +52,7 @@ const newRegistrationFiling = [
 const businessWithMaintenanceFiling = [
   {
     availableOnPaperOnly: false,
+    displayLedger: true,
     displayName: 'Incorporation Application',
     effectiveDate: '2019-06-02 19:22:59 GMT',
     filingId: 123,
@@ -61,6 +64,7 @@ const businessWithMaintenanceFiling = [
   },
   {
     availableOnPaperOnly: false,
+    displayLedger: true,
     displayName: 'Annual Report (2019)',
     effectiveDate: '2019-06-02 19:22:59 GMT',
     filingId: 456,
diff --git a/tests/unit/MissingInformation.spec.ts b/tests/unit/MissingInformation.spec.ts
index e04d86cb2..8edb79b64 100644
--- a/tests/unit/MissingInformation.spec.ts
+++ b/tests/unit/MissingInformation.spec.ts
@@ -7,8 +7,8 @@ import { ContactInfo } from '@/components/common'
 import flushPromises from 'flush-promises'
 
 Vue.use(Vuetify)
-
 const vuetify = new Vuetify({})
+
 setActivePinia(createPinia())
 
 describe('Missing Information component', () => {
diff --git a/tests/unit/NameRequestInfo.spec.ts b/tests/unit/NameRequestInfo.spec.ts
index 0ddf38f52..e51684cc5 100644
--- a/tests/unit/NameRequestInfo.spec.ts
+++ b/tests/unit/NameRequestInfo.spec.ts
@@ -5,6 +5,7 @@ import { createPinia, setActivePinia } from 'pinia'
 import { useBusinessStore } from '@/stores'
 import { NameRequestInfo } from '@/components/common/'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
+import { NameRequestStates, NameRequestTypes } from '@/enums'
 
 Vue.use(Vuetify)
 
@@ -14,7 +15,7 @@ const businessStore = useBusinessStore()
 
 const approvedCpNamerequest = {
   nrNum: 'NR 1234567',
-  legalType: 'CP',
+  legalType: CorpTypeCd.COOP,
   filingId: 0,
   applicants: {
     // address info
@@ -35,18 +36,19 @@ const approvedCpNamerequest = {
   },
   names: [
     {
-      state: 'APPROVED',
+      state: NameRequestStates.APPROVED,
       name: 'Approved CP Namerequest'
     }
   ],
   consentFlag: null,
   expirationDate: '2022-07-05T06:59:00+00:00',
-  state: 'APPROVED'
+  request_action_cd: NameRequestTypes.NEW,
+  state: NameRequestStates.APPROVED
 }
 
 const conditionalSpNamerequest = {
   nrNum: 'NR 1234567',
-  legalType: 'SP',
+  legalType: CorpTypeCd.SOLE_PROP,
   filingId: 0,
   applicants: {
     // address info
@@ -67,13 +69,47 @@ const conditionalSpNamerequest = {
   },
   names: [
     {
-      state: 'CONDITION',
+      state: NameRequestStates.CONDITION,
       name: 'Conditional SP Namerequest'
     }
   ],
   consentFlag: 'X',
   expirationDate: '2021-07-05T06:59:00+00:00',
-  state: 'EXPIRED'
+  request_action_cd: NameRequestTypes.NEW,
+  state: NameRequestStates.EXPIRED
+}
+
+const approvedAmlNamerequest = {
+  nrNum: 'NR 1234567',
+  legalType: CorpTypeCd.BC_COMPANY,
+  filingId: 0,
+  applicants: {
+    // address info
+    addrLine1: '1012 Douglas St',
+    addrLine2: 'Suite 200',
+    addrLine3: 'Second Floor',
+    city: 'Victoria',
+    stateProvinceCd: 'BC',
+    postalCd: 'V8W 2C3',
+    countryTypeCd: 'CA',
+    // contact info
+    emailAddress: 'email@example.com',
+    phoneNumber: '1234567890',
+    // name info
+    firstName: 'First',
+    middleName: 'Middle',
+    lastName: 'Last'
+  },
+  names: [
+    {
+      state: NameRequestStates.APPROVED,
+      name: 'My Amalgamated Company'
+    }
+  ],
+  consentFlag: null,
+  expirationDate: '2022-07-05T06:59:00+00:00',
+  request_action_cd: NameRequestTypes.AMALGAMATION,
+  state: NameRequestStates.APPROVED
 }
 
 describe('NameRequestInfo component', () => {
@@ -176,4 +212,54 @@ describe('NameRequestInfo component', () => {
 
     wrapper.destroy()
   })
+
+  it('renders an amalgamation namerequest correctly', async () => {
+    businessStore.setLegalType(CorpTypeCd.BC_COMPANY)
+    const wrapper = mount(NameRequestInfo,
+      {
+        propsData: { nameRequest: approvedAmlNamerequest },
+        vuetify
+      })
+    await Vue.nextTick()
+
+    // verify first column
+    const firstCol = wrapper.findAll('.col').at(0)
+    expect(firstCol.find('.hdr').text()).toBe('Name Request')
+
+    let keys = firstCol.findAll('.key')
+    expect(keys.at(0).text()).toBe('Entity Type:')
+    expect(keys.at(1).text()).toBe('Request Type:')
+    expect(keys.at(2).text()).toBe('Expiry Date:')
+    expect(keys.at(3).text()).toBe('Status:')
+    expect(keys.at(4).text()).toBe('Condition/Consent:')
+
+    let vals = firstCol.findAll('.val')
+    expect(vals.at(0).text()).toBe('BC Limited Company')
+    expect(vals.at(1).text()).toBe('Amalgamation')
+    expect(vals.at(2).text()).toBe('July 4, 2022 at 11:59 pm Pacific time')
+    expect(vals.at(3).text()).toBe('Approved')
+    expect(vals.at(4).text()).toBe('Not Required')
+
+    expect(firstCol.find('#status .nr-status-icon.mdi-check').exists()).toBe(true)
+    expect(firstCol.find('#condition-consent .nr-status-icon.mdi-check').exists()).toBe(true)
+    expect(firstCol.find('#condition-consent .nr-status-icon.mdi-close').exists()).toBe(false)
+
+    // verify second column
+    const secondCol = wrapper.findAll('.col').at(1)
+    expect(secondCol.find('.hdr').text()).toBe('Name Request Applicant')
+
+    keys = secondCol.findAll('.key')
+    expect(keys.at(0).text()).toBe('Name:')
+    expect(keys.at(1).text()).toBe('Address:')
+    expect(keys.at(2).text()).toBe('Email:')
+    expect(keys.at(3).text()).toBe('Phone:')
+
+    vals = secondCol.findAll('.val')
+    expect(vals.at(0).text()).toBe('First Middle Last')
+    expect(vals.at(1).text()).toBe('1012 Douglas St, Suite 200, Second Floor, Victoria, BC, V8W 2C3, Canada')
+    expect(vals.at(2).text()).toBe('email@example.com')
+    expect(vals.at(3).text()).toBe('(123) 456-7890')
+
+    wrapper.destroy()
+  })
 })
diff --git a/tests/unit/NotEligibleExtensionDialog.spec.ts b/tests/unit/NotEligibleExtensionDialog.spec.ts
new file mode 100644
index 000000000..22210389f
--- /dev/null
+++ b/tests/unit/NotEligibleExtensionDialog.spec.ts
@@ -0,0 +1,41 @@
+import Vue from 'vue'
+import Vuetify from 'vuetify'
+import { mount } from '@vue/test-utils'
+import { createPinia, setActivePinia } from 'pinia'
+import { useRootStore } from '@/stores'
+import { NotEligibleExtensionDialog } from '@/components/dialogs'
+import { ContactInfo } from '@/components/common'
+
+Vue.use(Vuetify)
+
+const vuetify = new Vuetify({})
+setActivePinia(createPinia())
+const rootStore = useRootStore()
+
+describe('NotEligibleExtensionDialog', () => {
+  it('displays everything for normal users', () => {
+    // init store
+    rootStore.keycloakRoles = ['']
+
+    const wrapper = mount(NotEligibleExtensionDialog, { propsData: { dialog: true }, vuetify })
+
+    expect(wrapper.find('#dialog-title').text()).toBe('Not Eligible for Extension')
+    expect(wrapper.find('.v-card__text').text()).toContain('Based on the information provided')
+    expect(wrapper.find('.v-card__text').text()).toContain('If you have any questions about')
+    expect(wrapper.findComponent(ContactInfo).exists()).toBe(true)
+    expect(wrapper.find('#dialog-ok-btn').text()).toBe('OK')
+
+    wrapper.destroy()
+  })
+
+  it('does not display contact info for staff users', () => {
+    // init store
+    rootStore.keycloakRoles = ['staff']
+
+    const wrapper = mount(NotEligibleExtensionDialog, { propsData: { dialog: true }, vuetify })
+
+    expect(wrapper.findComponent(ContactInfo).exists()).toBe(false)
+
+    wrapper.destroy()
+  })
+})
diff --git a/tests/unit/PaymentPendingOnlineBanking.spec.ts b/tests/unit/PaymentPendingOnlineBanking.spec.ts
index ad51709a2..dfd14f31e 100644
--- a/tests/unit/PaymentPendingOnlineBanking.spec.ts
+++ b/tests/unit/PaymentPendingOnlineBanking.spec.ts
@@ -18,13 +18,16 @@ describe('Payment Pending Online Banking', () => {
     expect(wrapper.find('p').text()).toContain('This filing is pending')
 
     const listItems = wrapper.findAll('li')
-    expect(listItems.length).toBe(4)
+    expect(listItems.length).toBe(6)
     expect(listItems.at(0).text()).toContain('If you have not done so')
-    expect(listItems.at(1).text()).toContain('Once submitted through your bank')
-    expect(listItems.at(2).text()).toContain('Changes based on this filing')
-    expect(listItems.at(2).text()).toContain('for this filing is received')
-    expect(listItems.at(3).text()).toContain('You can use a credit card')
-    expect(listItems.at(3).text()).toContain('for this filing immediately')
+    expect(listItems.at(1).text()).toContain('Enter')
+    expect(listItems.at(1).text()).toContain('as payee')
+    expect(listItems.at(2).text()).toContain('Enter the following account number:')
+    expect(listItems.at(3).text()).toContain('Once submitted through your bank')
+    expect(listItems.at(4).text()).toContain('Changes based on this filing')
+    expect(listItems.at(4).text()).toContain('until the payment for this filing')
+    expect(listItems.at(5).text()).toContain('You can use a credit card')
+    expect(listItems.at(5).text()).toContain('for this filing immediately')
 
     wrapper.destroy()
   })
@@ -40,13 +43,15 @@ describe('Payment Pending Online Banking', () => {
     expect(wrapper.find('p').text()).toContain('This Director Change is pending')
 
     const listItems = wrapper.findAll('li')
-    expect(listItems.length).toBe(4)
+    expect(listItems.length).toBe(6)
     expect(listItems.at(0).text()).toContain('If you have not done so')
-    expect(listItems.at(1).text()).toContain('Once submitted through your bank')
-    expect(listItems.at(2).text()).toContain('Changes based on this Director Change')
-    expect(listItems.at(2).text()).toContain('for this Director Change is received')
-    expect(listItems.at(3).text()).toContain('You can use a credit card')
-    expect(listItems.at(3).text()).toContain('for this Director Change immediately')
+    expect(listItems.at(1).text()).toContain('Enter "BC Registries and Online Services"')
+    expect(listItems.at(2).text()).toContain('Enter the following account number:')
+    expect(listItems.at(3).text()).toContain('Once submitted through your bank')
+    expect(listItems.at(4).text()).toContain('Changes based on this Director Change')
+    expect(listItems.at(4).text()).toContain('until the payment for this Director Change')
+    expect(listItems.at(5).text()).toContain('You can use a credit card')
+    expect(listItems.at(5).text()).toContain('for this Director Change immediately')
 
     wrapper.destroy()
   })
diff --git a/tests/unit/StaffNotation.spec.ts b/tests/unit/StaffNotation.spec.ts
index c89747792..76406bb9a 100644
--- a/tests/unit/StaffNotation.spec.ts
+++ b/tests/unit/StaffNotation.spec.ts
@@ -11,6 +11,7 @@ import LegalServices from '@/services/legal-services'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 import { EntityState, FilingSubTypes, FilingTypes } from '@/enums'
 import { waitForUpdate } from '../wait-for-update'
+import * as utils from '@/utils'
 
 Vue.use(Vuetify)
 
@@ -51,6 +52,7 @@ describe('StaffNotation', () => {
     // allow all filings referenced in this component
     // some of these are normally mutually exclusive, but that's OK for testing
     businessStore.setAllowedActions({
+      digitalBusinessCard: false,
       filing: {
         filingTypes: [
           { name: FilingTypes.REGISTRARS_NOTATION },
@@ -116,11 +118,6 @@ describe('StaffNotation', () => {
         label: 'Administrative Dissolution',
         disabled: false
       },
-      {
-        type: 'restoration',
-        label: 'Restore Company',
-        disabled: false
-      },
       {
         type: 'put-back-on',
         label: 'Put Back On',
@@ -130,23 +127,13 @@ describe('StaffNotation', () => {
         type: 'admin-freeze',
         label: 'Freeze Business',
         disabled: false
-      },
+      }
       // only displayed for corps and coops (not firms)
       // {
       //   type: 'consent-continue-out',
       //   label: 'Consent to Continuation Out',
       //   disabled: false
       // },
-      {
-        type: 'extend-limited-restoration',
-        label: 'Extend Limited Restoration',
-        disabled: false
-      },
-      {
-        type: 'convert-full-restoration',
-        label: 'Convert to Full Restoration',
-        disabled: false
-      }
     ]
 
     // verify menu items
@@ -272,6 +259,83 @@ describe('StaffNotation', () => {
     wrapper.destroy()
   })
 
+  it('renders drop down menu correctly - historical', async () => {
+    vi.spyOn(utils, 'GetFeatureFlag').mockImplementation(flag => {
+      if (flag === 'supported-restoration-entities') return 'SP'
+      return null
+    })
+    businessStore.setState(EntityState.HISTORICAL)
+    const wrapper = mount(StaffNotation, { vuetify })
+
+    // open menu
+    await wrapper.find('.menu-btn').trigger('click')
+    expect(wrapper.vm.$data.expand).toBe(true)
+
+    // menu items expected as follows
+    const menuItems = [
+      {
+        type: 'registrars-notation',
+        label: 'Add Registrar\'s Notation',
+        disabled: false
+      },
+      {
+        type: 'registrars-order',
+        label: 'Add Registrar\'s Order',
+        disabled: false
+      },
+      {
+        type: 'court-order',
+        label: 'Add Court Order',
+        disabled: false
+      },
+      {
+        type: 'record-conversion',
+        label: 'Record Conversion',
+        disabled: false
+      },
+      {
+        type: 'put-back-on',
+        label: 'Put Back On',
+        disabled: false
+      },
+      {
+        type: 'admin-freeze',
+        label: 'Freeze Business',
+        disabled: false
+      },
+      {
+        type: 'restoration',
+        label: 'Restore Company',
+        disabled: false
+      },
+      {
+        type: 'extend-limited-restoration',
+        label: 'Extend Limited Restoration',
+        disabled: false
+      },
+      {
+        type: 'convert-full-restoration',
+        label: 'Convert to Full Restoration',
+        disabled: false
+      }
+    ]
+
+    // verify menu items
+    for (const menuItem of menuItems) {
+      const menuItemUnderTest = wrapper.find('[data-type="' + menuItem.type + '"]')
+      expect(menuItemUnderTest.text()).toBe(menuItem.label)
+      if (menuItem.disabled) {
+        expect(menuItemUnderTest.classes()).toContain('v-list-item--disabled')
+      } else {
+        expect(menuItemUnderTest.classes()).not.toContain('v-list-item--disabled')
+      }
+    }
+
+    expect(wrapper.findAll('.v-list-item__title')).toHaveLength(menuItems.length)
+
+    wrapper.destroy()
+  })
+
   const staffFilingTypes = [
     {
       name: 'Registrar\'s Notation',
@@ -437,7 +501,7 @@ describe('StaffNotation', () => {
     // set store specifically for this test
     businessStore.setLegalType(CorpTypeCd.BC_COMPANY) // corp
     businessStore.setIdentifier('BC1234567')
-
+    businessStore.setState(EntityState.HISTORICAL)
     // stub "create draft" endpoint
     sinon.stub(axios, 'post').withArgs('businesses/BC1234567/filings?draft=true').returns(
       new Promise(resolve =>
@@ -477,7 +541,7 @@ describe('StaffNotation', () => {
     // set store specifically for this test
     businessStore.setLegalType(CorpTypeCd.BC_COMPANY)
     businessStore.setIdentifier('BC1234567')
-
+    businessStore.setState(EntityState.HISTORICAL)
     // stub "create draft" endpoint
     sinon.stub(axios, 'post').withArgs('businesses/BC1234567/filings?draft=true').returns(
       new Promise(resolve =>
@@ -521,7 +585,7 @@ describe('StaffNotation', () => {
     businessStore.setLegalType(CorpTypeCd.BENEFIT_COMPANY)
     businessStore.setIdentifier('BC1234567')
     rootStore.currentDate = '2022-12-31'
-    businessStore.setState(EntityState.ACTIVE)
+    businessStore.setState(EntityState.HISTORICAL)
     rootStore.setStateFiling({
       business: {
         state: 'ACTIVE'
diff --git a/tests/unit/StandaloneDirectorsFiling.spec.ts b/tests/unit/StandaloneDirectorsFiling.spec.ts
index cdf4b34b6..4814ddf5a 100644
--- a/tests/unit/StandaloneDirectorsFiling.spec.ts
+++ b/tests/unit/StandaloneDirectorsFiling.spec.ts
@@ -17,7 +17,7 @@ import VueRouter from 'vue-router'
 import mockRouter from './mockRouter'
 import { ConfigJson } from '@/resources/business-config'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
-import { FilingCodes, FilingStatus } from '@/enums'
+import { FilingCodes } from '@/enums'
 
 // suppress various warnings:
 // - "Unknown custom element <affix>" warnings
@@ -1545,7 +1545,6 @@ describe('Standalone Directors Filing - payment required error', () => {
     rootStore.currentDate = '2019-07-15'
 
     rootStore.ARFilingYear = 2017
-    rootStore.setCurrentFilingStatus(FilingStatus.NEW)
 
     // mock "file post" endpoint, with a pay error response
     const p1 = Promise.reject({
diff --git a/tests/unit/StandaloneOfficeAddressFiling.spec.ts b/tests/unit/StandaloneOfficeAddressFiling.spec.ts
index a077b45fd..7c2375a02 100644
--- a/tests/unit/StandaloneOfficeAddressFiling.spec.ts
+++ b/tests/unit/StandaloneOfficeAddressFiling.spec.ts
@@ -14,7 +14,7 @@ import { Certify, OfficeAddresses } from '@/components/common'
 import VueRouter from 'vue-router'
 import mockRouter from './mockRouter'
 import { ConfigJson } from '@/resources/business-config'
-import { CorpTypeCd, FilingStatus } from '@/enums'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 
 // suppress various warnings:
 // - "Unknown custom element <affix>" warnings
@@ -1816,7 +1816,6 @@ describe('Standalone Office Address Filing - payment required error', () => {
     businessStore.setLegalType(CorpTypeCd.COOP)
     businessStore.setLegalName('Legal Name - CP0001191')
     rootStore.ARFilingYear = 2017
-    rootStore.currentFilingStatus = FilingStatus.NEW
 
     // mock "file post" endpoint, with a pay error response
     const p1 = Promise.reject({
diff --git a/tests/unit/TechnicalErrorDialog.spec.ts b/tests/unit/TechnicalErrorDialog.spec.ts
new file mode 100644
index 000000000..5c1da014b
--- /dev/null
+++ b/tests/unit/TechnicalErrorDialog.spec.ts
@@ -0,0 +1,43 @@
+import Vue from 'vue'
+import Vuetify from 'vuetify'
+import { mount } from '@vue/test-utils'
+import { createPinia, setActivePinia } from 'pinia'
+import { useRootStore } from '@/stores'
+import TechnicalErrorDialog from '@/components/dialogs/TechnicalErrorDialog.vue'
+import { ContactInfo } from '@/components/common'
+
+Vue.use(Vuetify)
+
+const vuetify = new Vuetify({})
+setActivePinia(createPinia())
+const rootStore = useRootStore()
+
+describe('TechnicalErrorDialog', () => {
+  it('displays everything for normal users', () => {
+    // init store
+    rootStore.keycloakRoles = ['']
+
+    const wrapper = mount(TechnicalErrorDialog, { propsData: { dialog: true }, vuetify })
+
+    expect(wrapper.find('.v-card__title').text()).toBe('Error')
+    expect(wrapper.find('.v-card__text').text())
+      .toContain('We could not process your action due to a technical issue.')
+    expect(wrapper.find('.v-card__text').text())
+      .toContain('If this error persists, please contact BC Registries staff:')
+    expect(wrapper.findComponent(ContactInfo).exists()).toBe(true)
+    expect(wrapper.find('.v-card__actions').text()).toBe('Close')
+
+    wrapper.destroy()
+  })
+
+  it('does not display contact info for staff users', () => {
+    // init store
+    rootStore.keycloakRoles = ['staff']
+
+    const wrapper = mount(TechnicalErrorDialog, { propsData: { dialog: true }, vuetify })
+
+    expect(wrapper.findComponent(ContactInfo).exists()).toBe(false)
+
+    wrapper.destroy()
+  })
+})
diff --git a/tests/unit/TodoList1.spec.ts b/tests/unit/TodoList1.spec.ts
index bc4cbcaf3..8b699d367 100644
--- a/tests/unit/TodoList1.spec.ts
+++ b/tests/unit/TodoList1.spec.ts
@@ -19,8 +19,7 @@ import PaymentPending from '@/components/Dashboard/TodoList/PaymentPending.vue'
 import PaymentPendingOnlineBanking from '@/components/Dashboard/TodoList/PaymentPendingOnlineBanking.vue'
 import PaymentUnsuccessful from '@/components/Dashboard/TodoList/PaymentUnsuccessful.vue'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
-import { FilingTypes } from '@bcrs-shared-components/enums'
-import { EntityState, EntityStatus, FilingStatus } from '@/enums'
+import { AmalgamationTypes, EntityState, EntityStatus, FilingStatus, FilingTypes } from '@/enums'
 
 // suppress "Avoid mutating a prop directly" warnings
 // ref: https://github.com/vuejs/vue-test-utils/issues/532
@@ -1600,6 +1599,93 @@ describe('TodoList - UI - Incorp Apps', () => {
   })
 })
 
+describe('TodoList - UI - Amalgamation Applications', () => {
+  beforeAll(() => {
+    sessionStorage.clear()
+    sessionStorage.setItem('TEMP_REG_NUMBER', 'T123456789')
+    businessStore.setLegalType(CorpTypeCd.BC_COMPANY)
+  })
+
+  it('displays a DRAFT numbered amalgamation application', async () => {
+    // init store
+    rootStore.nameRequest = null
+    rootStore.tasks = [
+      {
+        task: {
+          filing: {
+            header: {
+              name: FilingTypes.AMALGAMATION_APPLICATION,
+              status: FilingStatus.DRAFT
+            },
+            amalgamationApplication: {
+              type: AmalgamationTypes.REGULAR
+            },
+            displayName: 'BC Limited Company Amalgamation Application - Regular'
+          } as any
+        },
+        enabled: true,
+        order: 1
+      }
+    ]
+
+    const wrapper = mount(TodoList, { vuetify })
+    const vm = wrapper.vm as any
+    await flushPromises()
+
+    expect(vm.todoItems.length).toEqual(1)
+    expect(wrapper.findAll('.todo-item').length).toEqual(1)
+    expect(wrapper.emitted('todo-count')).toEqual([[1]])
+    expect(wrapper.find('.no-results').exists()).toBe(false)
+
+    const item = wrapper.find('.list-item')
+    expect(item.find('.list-item__title').text()).toContain('BC Limited Company Amalgamation Application - Regular')
+    expect(item.find('.list-item__subtitle').text()).toBe('DRAFT')
+    expect(item.find('.btn-draft-resume').text()).toBe('Fill out Amalgamation Application')
+
+    wrapper.destroy()
+  })
+
+  it('displays a DRAFT named amalgamation application', async () => {
+    // init store
+    rootStore.nameRequest = {}
+    rootStore.tasks = [
+      {
+        task: {
+          filing: {
+            header: {
+              name: FilingTypes.AMALGAMATION_APPLICATION,
+              status: FilingStatus.DRAFT
+            },
+            amalgamationApplication: {
+              type: AmalgamationTypes.REGULAR
+            },
+            displayName: 'My Amalgamated Company Amalgamation Application - Regular'
+          } as any
+        },
+        enabled: true,
+        order: 1
+      }
+    ]
+
+    const wrapper = mount(TodoList, { vuetify })
+    const vm = wrapper.vm as any
+    await flushPromises()
+
+    expect(vm.todoItems.length).toEqual(1)
+    expect(wrapper.findAll('.todo-item').length).toEqual(1)
+    expect(wrapper.emitted('todo-count')).toEqual([[1]])
+    expect(wrapper.find('.no-results').exists()).toBe(false)
+
+    const item = wrapper.find('.list-item')
+    expect(item.find('.list-item__title').text()).toContain('My Amalgamated Company Amalgamation Application - Regular')
+    expect(item.find('.expand-btn').text()).toBe('View Details')
+    expect(item.find('.list-item__subtitle').text()).toContain('NR APPROVED')
+    expect(item.find('.btn-draft-resume').text()).toBe('Fill out Amalgamation Application')
+
+    wrapper.destroy()
+  })
+})
+
 describe('TodoList - Click Tests', () => {
   const { assign } = window.location
 
@@ -1666,9 +1752,6 @@ describe('TodoList - Click Tests', () => {
     expect(button.text()).toContain('File Annual Report')
     await button.trigger('click')
 
-    // verify that filing status was set
-    expect(rootStore.currentFilingStatus).toBe('NEW')
-
     // verify routing to Annual Report page with id=0
     expect(vm.$route.name).toBe('annual-report')
     expect(vm.$route.params.filingId).toBe('0')
@@ -1722,9 +1805,6 @@ describe('TodoList - Click Tests', () => {
     expect(button.text()).toContain('Resume')
     await button.trigger('click')
 
-    // verify that filing status was set
-    expect(rootStore.currentFilingStatus).toBe('DRAFT')
-
     // verify routing to Annual Report page with id=123
     expect(vm.$route.name).toBe('annual-report')
     expect(vm.$route.params.filingId).toBe('123')
@@ -2023,9 +2103,6 @@ describe('TodoList - Click Tests - BCOMPs', () => {
     // click File Now button
     await fileNowButton.click()
 
-    // verify that filing status was set
-    expect(rootStore.currentFilingStatus).toBe('NEW')
-
     // verify routing to Annual Report page with id=0
     expect(vm.$route.name).toBe('annual-report')
     expect(vm.$route.params.filingId).toBe('0')
@@ -2076,9 +2153,6 @@ describe('TodoList - Click Tests - BCOMPs', () => {
 
     await button.click()
 
-    // verify that filing status was set
-    expect(rootStore.currentFilingStatus).toBe('DRAFT')
-
     // verify routing to Annual Report page with id=123
     expect(vm.$route.name).toBe('annual-report')
     expect(vm.$route.params.filingId).toBe('123')
@@ -2233,7 +2307,7 @@ describe('TodoList - Click Tests - NRs and Incorp Apps', () => {
       }
     ]
     rootStore.nameRequest = { nrNum: 'NR 1234567' }
-    rootStore.entityStatus = EntityStatus.DRAFT_APP
+    rootStore.entityStatus = EntityStatus.DRAFT_INCORP_APP
 
     const wrapper = mount(TodoList, { vuetify, mixins: [AllowableActionsMixin] })
     const vm = wrapper.vm as any
@@ -2277,7 +2351,7 @@ describe('TodoList - Click Tests - NRs and Incorp Apps', () => {
       }
     ]
     rootStore.nameRequest = null
-    rootStore.entityStatus = EntityStatus.DRAFT_APP
+    rootStore.entityStatus = EntityStatus.DRAFT_INCORP_APP
 
     const wrapper = mount(TodoList, { vuetify, mixins: [AllowableActionsMixin] })
     const vm = wrapper.vm as any
@@ -2299,6 +2373,118 @@ describe('TodoList - Click Tests - NRs and Incorp Apps', () => {
   })
 })
 
+describe('TodoList - Click Tests - Amalgamation Applications', () => {
+  const { assign } = window.location
+
+  beforeAll(() => {
+    // init store
+    sessionStorage.clear()
+    const configuration = {
+      VUE_APP_BUSINESS_CREATE_URL: 'https://create.url/'
+    }
+
+    // set configurations
+    configurationStore.setConfiguration(configuration)
+    sessionStorage.setItem('TEMP_REG_NUMBER', 'T123456789')
+    sessionStorage.setItem('CURRENT_ACCOUNT', '{ "id": "2288" }')
+    businessStore.setLegalName('My Amalgamated Company')
+    businessStore.setLegalType(CorpTypeCd.BC_COMPANY)
+
+    // mock the window.location.assign function
+    delete window.location
+    window.location = { assign: vi.fn() } as any
+  })
+
+  afterAll(() => {
+    window.location.assign = assign
+  })
+
+  it('redirects to Create URL when \'Resume\' is clicked on a numbered amalgamation application', async () => {
+    rootStore.nameRequest = null
+    rootStore.tasks = [
+      {
+        task: {
+          filing: {
+            header: {
+              name: FilingTypes.AMALGAMATION_APPLICATION,
+              status: FilingStatus.DRAFT
+            },
+            amalgamationApplication: {
+              type: AmalgamationTypes.REGULAR
+            },
+            displayName: 'BC Limited Company Amalgamation Application - Regular'
+          } as any
+        },
+        enabled: true,
+        order: 1
+      }
+    ]
+    rootStore.entityStatus = EntityStatus.DRAFT_AMALGAMATION
+
+    const wrapper = mount(TodoList, { vuetify })
+    const vm = wrapper.vm as any
+    await flushPromises()
+
+    expect(vm.todoItems.length).toEqual(1)
+
+    const button = wrapper.find('.list-item__actions .v-btn')
+    expect(button.attributes('disabled')).toBeUndefined()
+    expect(button.find('.v-btn__content').text()).toContain('Fill out Amalgamation Application')
+    await button.trigger('click')
+
+    // verify redirection
+    const accountId = JSON.parse(sessionStorage.getItem('CURRENT_ACCOUNT'))?.id
+    const createUrl = 'https://create.url/?id=T123456789'
+    expect(window.location.assign).toHaveBeenCalledWith(createUrl + '&accountid=' + accountId)
+
+    wrapper.destroy()
+  })
+
+  it('redirects to Create URL when button is clicked on a named amalgamation application', async () => {
+    rootStore.nameRequest = { nrNum: 'NR 1234567' }
+    rootStore.tasks = [
+      {
+        task: {
+          filing: {
+            header: {
+              name: FilingTypes.AMALGAMATION_APPLICATION,
+              status: FilingStatus.DRAFT
+            },
+            amalgamationApplication: {
+              nameRequest: {
+                nrNumber: 'NR 1234567'
+              },
+              type: AmalgamationTypes.REGULAR
+            },
+            displayName: 'BC Limited Company Amalgamation Application - Regular'
+          } as any
+        },
+        enabled: true,
+        order: 1
+      }
+    ]
+    rootStore.entityStatus = EntityStatus.DRAFT_AMALGAMATION
+
+    const wrapper = mount(TodoList, { vuetify })
+    const vm = wrapper.vm as any
+    await flushPromises()
+
+    expect(vm.todoItems.length).toEqual(1)
+
+    const button = wrapper.find('.list-item__actions .v-btn')
+    expect(button.attributes('disabled')).toBeUndefined()
+    expect(button.find('.v-btn__content').text()).toContain('Fill out Amalgamation Application')
+    await button.trigger('click')
+
+    // verify redirection
+    const accountId = JSON.parse(sessionStorage.getItem('CURRENT_ACCOUNT'))?.id
+    const createUrl = 'https://create.url/?id=T123456789'
+    expect(window.location.assign).toHaveBeenCalledWith(createUrl + '&accountid=' + accountId)
+
+    wrapper.destroy()
+  })
+})
+
 describe('TodoList - Click Tests - Corrections', () => {
   const { assign } = window.location
 
@@ -2667,7 +2853,7 @@ describe('TodoList - Delete Draft', () => {
     sessionStorage.setItem('TEMP_REG_NUMBER', 'T123456789')
     businessStore.setIdentifier('T123456789')
     businessStore.setLegalType(CorpTypeCd.BENEFIT_COMPANY)
-    rootStore.entityStatus = EntityStatus.DRAFT_APP
+    rootStore.entityStatus = EntityStatus.DRAFT_INCORP_APP
     rootStore.tasks = [
       {
         'task': {
@@ -2916,7 +3102,7 @@ describe('TodoList - Click Tests - Full and Limited Restoration', () => {
       ]
 
       rootStore.keycloakRoles = ['staff']
-      rootStore.entityStatus = EntityStatus.DRAFT_APP
+      rootStore.entityStatus = EntityStatus.DRAFT_INCORP_APP
 
       const wrapper = mount(TodoList, { vuetify })
       const vm = wrapper.vm as any
@@ -2998,7 +3184,7 @@ describe('TodoList - Click Tests - Extension and Coversion Restoration', () => {
       ]
 
       rootStore.keycloakRoles = ['staff']
-      rootStore.entityStatus = EntityStatus.DRAFT_APP
+      rootStore.entityStatus = EntityStatus.DRAFT_INCORP_APP
 
       const wrapper = mount(TodoList, { vuetify })
       const vm = wrapper.vm as any
diff --git a/tests/unit/allowable-actions-mixin.spec.ts b/tests/unit/allowable-actions-mixin.spec.ts
index dc941d55b..8cd1a9a1f 100644
--- a/tests/unit/allowable-actions-mixin.spec.ts
+++ b/tests/unit/allowable-actions-mixin.spec.ts
@@ -27,6 +27,7 @@ describe('Allowable Actions Mixin', () => {
 
   function setAllowedFilingType (filingType = {}) {
     businessStore.setAllowedActions({
+      digitalBusinessCard: false,
       filing: {
         filingSubmissionLink: '',
         filingTypes: [filingType as FilingTypeIF]
@@ -88,6 +89,16 @@ describe('Allowable Actions Mixin', () => {
     expect(vm.isAllowed(AllowableActions.ADMINISTRATIVE_DISSOLUTION)).toBe(true)
   })
 
+  it('identifies whether Amalgamation is allowed', () => {
+    // verify no allowed filing type
+    setAllowedFilingType()
+    expect(vm.isAllowed(AllowableActions.AMALGAMATION)).toBe(false)
+
+    // verify allowed filing type
+    setAllowedFilingType({ name: FilingTypes.AMALGAMATION_APPLICATION })
+    expect(vm.isAllowed(AllowableActions.AMALGAMATION)).toBe(true)
+  })
+
   it('identifies whether Annual Report is allowed', () => {
     // verify no allowed filing type
     setAllowedFilingType()
diff --git a/tests/unit/auth-services.spec.ts b/tests/unit/auth-services.spec.ts
index e4e788c4b..7d077143b 100644
--- a/tests/unit/auth-services.spec.ts
+++ b/tests/unit/auth-services.spec.ts
@@ -48,7 +48,7 @@ describe('Auth Services', () => {
     const response = await AuthServices.fetchUserInfo('')
 
     // verify data
-    expect(response).toEqual({ data: USER_INFO })
+    expect(response).toEqual(USER_INFO)
   })
 
   it('fetches entity info correctly', async () => {
diff --git a/tests/unit/date-utilities.spec.ts b/tests/unit/date-utilities.spec.ts
new file mode 100644
index 000000000..3b5170913
--- /dev/null
+++ b/tests/unit/date-utilities.spec.ts
@@ -0,0 +1,190 @@
+import { DateUtilities } from '@/services'
+
+describe('Date Utilities', () => {
+  it.skip('returns correct values for dateToYyyyMmDd()', () => {
+    expect(DateUtilities.dateToYyyyMmDd(null)).toBeNull()
+    expect(DateUtilities.dateToYyyyMmDd(new Date('not a date'))).toBeNull()
+    // verify that GMT/UTC is correctly converted to Pacific
+    expect(DateUtilities.dateToYyyyMmDd(new Date('2021-01-01 07:00:00 GMT')))
+      .toBe('2020-12-31') // Standard Time
+    expect(DateUtilities.dateToYyyyMmDd(new Date('2021-01-01 08:00:00 GMT')))
+      .toBe('2021-01-01') // Standard Time
+    expect(DateUtilities.dateToYyyyMmDd(new Date('2021-07-01 06:00:00 GMT')))
+      .toBe('2021-06-30') // Daylight Time
+    expect(DateUtilities.dateToYyyyMmDd(new Date('2021-07-01 07:00:00 GMT')))
+      .toBe('2021-07-01') // Daylight Time
+    // verify that Pacific is correctly converted to Pacific
+    expect(DateUtilities.dateToYyyyMmDd(new Date('2021-01-01 00:00:00 PST')))
+      .toBe('2021-01-01')
+    expect(DateUtilities.dateToYyyyMmDd(new Date('2021-01-01 23:59:59 PST')))
+      .toBe('2021-01-01')
+    expect(DateUtilities.dateToYyyyMmDd(new Date('2021-07-01 00:00:00 PDT')))
+      .toBe('2021-07-01')
+    expect(DateUtilities.dateToYyyyMmDd(new Date('2021-07-01 23:59:59 PDT')))
+      .toBe('2021-07-01')
+    // verify that Eastern is correctly converted to Pacific
+    expect(DateUtilities.dateToYyyyMmDd(new Date('2021-01-01 02:00:00 EST')))
+      .toBe('2020-12-31')
+    expect(DateUtilities.dateToYyyyMmDd(new Date('2021-01-01 03:00:00 EST')))
+      .toBe('2021-01-01')
+    expect(DateUtilities.dateToYyyyMmDd(new Date('2021-07-01 02:00:00 EDT')))
+      .toBe('2021-06-30')
+    expect(DateUtilities.dateToYyyyMmDd(new Date('2021-07-01 03:00:00 EDT')))
+      .toBe('2021-07-01')
+  })
+
+  it('returns correct values for compareYyyyMmDd()', () => {
+    expect(DateUtilities.compareYyyyMmDd(null, '2020-01-01', '<')).toBe(true)
+    expect(DateUtilities.compareYyyyMmDd('2019-12-31', null, '<')).toBe(true)
+    expect(DateUtilities.compareYyyyMmDd('2019-12-31', '2020-01-01', null))
+      .toBe(true)
+    expect(DateUtilities.compareYyyyMmDd('2019-12-31', '2020-01-01', '<'))
+      .toBe(true)
+    expect(DateUtilities.compareYyyyMmDd('2020-01-01', '2019-12-31', '<'))
+      .toBe(false)
+    expect(DateUtilities.compareYyyyMmDd('2019-12-31', '2020-01-01', '>'))
+      .toBe(false)
+    expect(DateUtilities.compareYyyyMmDd('2020-01-01', '2019-12-31', '>'))
+      .toBe(true)
+    expect(DateUtilities.compareYyyyMmDd('2019-12-31', '2020-01-01', '=='))
+      .toBe(false)
+  })
+
+  it('returns correct values for earliestYyyyMmDd()', () => {
+    expect(DateUtilities.earliestYyyyMmDd(null, null)).toBeNull()
+    expect(DateUtilities.earliestYyyyMmDd(null, '2020-01-01'))
+      .toBe('2020-01-01')
+    expect(DateUtilities.earliestYyyyMmDd('2019-12-31', null))
+      .toBe('2019-12-31')
+    expect(DateUtilities.earliestYyyyMmDd('2019-12-31', '2020-01-01'))
+      .toBe('2019-12-31')
+    expect(DateUtilities.earliestYyyyMmDd('2020-01-01', '2019-12-31'))
+      .toBe('2019-12-31')
+  })
+
+  it('returns correct values for latestYyyyMmDd()', () => {
+    expect(DateUtilities.latestYyyyMmDd(null, null)).toBeNull()
+    expect(DateUtilities.latestYyyyMmDd(null, '2020-01-01')).toBe('2020-01-01')
+    expect(DateUtilities.latestYyyyMmDd('2019-12-31', null)).toBe('2019-12-31')
+    expect(DateUtilities.latestYyyyMmDd('2019-12-31', '2020-01-01'))
+      .toBe('2020-01-01')
+    expect(DateUtilities.latestYyyyMmDd('2020-01-01', '2019-12-31'))
+      .toBe('2020-01-01')
+  })
+
+  it('returns correct values for formatYyyyMmDd()', () => {
+    expect(DateUtilities.formatYyyyMmDd(null)).toBeNull()
+    expect(DateUtilities.formatYyyyMmDd('123456789')).toBeNull()
+    expect(DateUtilities.formatYyyyMmDd('2020-01-01')).toBe('Jan 1, 2020')
+  })
+
+  it('returns correct values for apiToPacificDateTime()', () => {
+    expect(DateUtilities.apiToPacificDateTime('2021-01-01T00:00:00+00:00'))
+      .toBe('Dec 31, 2020 at 4:00 pm Pacific time') // PST
+    expect(DateUtilities.apiToPacificDateTime('2021-07-01T00:00:00+00:00'))
+      .toBe('Jun 30, 2021 at 5:00 pm Pacific time') // PDT
+  })
+
+  // FUTURE: fix so this works in GH CI action
+  it.skip('returns correct values for yyyyMmDdToApi()', () => {
+    expect(DateUtilities.yyyyMmDdToApi('2021-01-01'))
+      .toBe('2021-01-01T08:00:00.000+00:00') // PST
+    expect(DateUtilities.yyyyMmDdToApi('2021-07-01'))
+      .toBe('2021-07-01T07:00:00.000+00:00') // PDT
+    expect(DateUtilities.yyyyMmDdToApi('2023/05/03'))
+      .toBe('2023-05-03T07:00:00.000+00:00')
+  })
+
+  it('returns correct values for daysBetweenTwoDates()', () => {
+    const currentJsDate = new Date('2021-11-23T12:00:00')
+
+    expect(DateUtilities.daysBetweenTwoDates(null, null))
+      .toBeNaN()
+    expect(DateUtilities.daysBetweenTwoDates(
+      currentJsDate,
+      new Date(2021, 10, 22))
+    ).toBe(-1) // yesterday
+    expect(DateUtilities.daysBetweenTwoDates(
+      currentJsDate,
+      new Date(2021, 10, 23, 0, 0, 0, 0)
+    )
+    ).toBe(0) // today
+    expect(DateUtilities.daysBetweenTwoDates(
+      currentJsDate,
+      new Date(2021, 10, 23, 23, 59, 59, 999)
+    )
+    ).toBe(0) // today
+    expect(DateUtilities.daysBetweenTwoDates(
+      currentJsDate,
+      new Date(2021, 10, 24)
+    )
+    ).toBe(1) // tomorrow
+  })
+
+  it('returns correct values for DAYLIGHT SAVINGS spring forward daysBetweenTwoDates()', () => {
+    const currentJsDate = new Date('2022-03-01T12:00:00')
+
+    expect(DateUtilities.daysBetweenTwoDates(
+      currentJsDate,
+      new Date(2022, 3 - 1, 2)
+    )
+    ).toBe(1) // before time change
+    expect(DateUtilities.daysBetweenTwoDates(
+      currentJsDate,
+      new Date(2022, 3 - 1, 15)
+    )
+    ).toBe(14) // after time change
+  })
+
+  it('returns correct values for DAYLIGHT SAVINGS fall back daysBetweenTwoDates()', () => {
+    const currentJsDate = new Date('2022-11-01T12:00:00')
+
+    expect(DateUtilities.daysBetweenTwoDates(
+      currentJsDate,
+      new Date(2022, 11 - 1, 2)
+    )
+    ).toBe(1) // before time change
+    expect(DateUtilities.daysBetweenTwoDates(
+      currentJsDate,
+      new Date(2022, 11 - 1, 8)
+    )
+    ).toBe(7) // after time change
+  })
+
+  it('returns correct values for yyyyMmDdToDate()', () => {
+    expect(DateUtilities.yyyyMmDdToDate(null)).toBeNull()
+    expect(DateUtilities.yyyyMmDdToDate('12345678901')).toBeNull()
+    expect(DateUtilities.yyyyMmDdToDate('2021-01-01').toISOString())
+      .toEqual('2021-01-01T08:00:00.000Z') // PST
+    expect(DateUtilities.yyyyMmDdToDate('2021-07-01').toISOString())
+      .toEqual('2021-07-01T07:00:00.000Z') // PDT
+  })
+
+  it('returns correct values for addMonthsToDate()', () => {
+    expect(DateUtilities.addMonthsToDate(null, null)).toBeNull()
+    expect(DateUtilities.addMonthsToDate(1, '12345678901')).toBeNull()
+    expect(DateUtilities.addMonthsToDate(3, '2023-02-03')).toEqual('2023-05-03')
+    expect(DateUtilities.addMonthsToDate(18, '2023-02-03'))
+      .toEqual('2024-08-03')
+    expect(DateUtilities.addMonthsToDate(0, '2023-02-03')).toEqual('2023-02-03')
+    expect(DateUtilities.addMonthsToDate(-3, '2023-02-03'))
+      .toEqual('2022-11-03')
+    expect(DateUtilities.addMonthsToDate(-18, '2023-02-03'))
+      .toEqual('2021-08-03')
+  })
+
+  it('returns correct values for subtractDates()', () => {
+    expect(DateUtilities.subtractDates(null, null)).toBeNull()
+    expect(DateUtilities.subtractDates('12345678901', '12345678901')).toBeNull()
+    expect(DateUtilities.subtractDates('2023-02-03', '2023-04-04'))
+      .toBe(2)
+    expect(DateUtilities.subtractDates('2023-02-03', '2024-08-04'))
+      .toBe(18)
+    expect(DateUtilities.subtractDates('2023-02-03', '2023-02-03'))
+      .toBe(0)
+    expect(DateUtilities.subtractDates('2023-04-04', '2023-02-03'))
+      .toBe(-2)
+    expect(DateUtilities.subtractDates('2024-08-04', '2023-02-03'))
+      .toBe(-18)
+  })
+})
diff --git a/tests/unit/filings.json b/tests/unit/filings.json
index cf5bc6f55..734e614ee 100644
--- a/tests/unit/filings.json
+++ b/tests/unit/filings.json
@@ -12,6 +12,7 @@
           "incorporationApplication"
         ]
       },
+      "displayLedger": true,
       "displayName": "Incorporation Application",
       "documentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/CP0000840/filings/112760/documents",
       "effectiveDate": "Fri, 01 Nov 2019 00:02:26 GMT",
@@ -36,6 +37,7 @@
           "F.18"
         ]
       },
+      "displayLedger": true,
       "displayName": "F.18",
       "documentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/CP0000840/filings/112759/documents",
       "effectiveDate": "Tue, 01 Oct 2019 00:02:26 GMT",
@@ -59,6 +61,7 @@
         ],
         "specialResolution": {}
       },
+      "displayLedger": true,
       "displayName": "Special Resolution",
       "documentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/CP0000840/filings/112758/documents",
       "effectiveDate": "Sun, 01 Sep 2019 00:02:26 GMT",
@@ -91,6 +94,7 @@
           "orderDetails": "A note about order"
         }
       },
+      "displayLedger": true,
       "displayName": "Alteration",
       "documentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/CP0000840/filings/112763/documents",
       "effectiveDate": "Fri, 15 Feb 2019 00:02:26 GMT",
@@ -123,6 +127,7 @@
           "orderDetails": "different order details"
         }
       },
+      "displayLedger": true,
       "displayName": "Alteration",
       "documentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/CP0000840/filings/112762/documents",
       "effectiveDate": "Tue, 01 Jan 2019 00:02:26 GMT",
@@ -141,6 +146,7 @@
       "commentsCount": 0,
       "commentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/CP0000840/filings/112761/comments",
       "data": {},
+      "displayLedger": true,
       "displayName": "Alteration",
       "documentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/CP0000840/filings/112761/documents",
       "effectiveDate": "Sat, 01 Dec 2018 00:02:26 GMT",
@@ -165,6 +171,7 @@
           "correction"
         ]
       },
+      "displayLedger": true,
       "displayName": "Correction - Annual Report (2018)",
       "documentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/CP0000840/filings/112757/documents",
       "effectiveDate": "Thu, 01 Nov 2018 00:02:26 GMT",
@@ -195,6 +202,7 @@
           "changeOfDirectors"
         ]
       },
+      "displayLedger": true,
       "displayName": "Annual Report (2018) - Corrected",
       "documentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/CP0000840/filings/112756/documents",
       "effectiveDate": "Mon, 01 Oct 2018 00:02:26 GMT",
@@ -218,6 +226,7 @@
         ],
         "registrarsOrder": {}
       },
+      "displayLedger": true,
       "displayName": "Registrar's Order",
       "documentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/CP0000840/filings/112755/documents",
       "effectiveDate": "Wed, 01 Aug 2018 00:02:26 GMT",
@@ -241,6 +250,7 @@
         ],
         "registrarsNotation": {}
       },
+      "displayLedger": true,
       "displayName": "Registrar's Notation",
       "documentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/CP0000840/filings/112754/documents",
       "effectiveDate": "Sun, 01 Jul 2018 00:02:26 GMT",
@@ -269,6 +279,7 @@
           "orderDetails": "my order details"
         }
       },
+      "displayLedger": true,
       "displayName": "Court Order",
       "documentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/CP0000840/filings/112753/documents",
       "effectiveDate": "Fri, 01 Jun 2018 00:02:26 GMT",
@@ -292,6 +303,7 @@
         ],
         "transition": {}
       },
+      "displayLedger": true,
       "displayName": "Transition Application",
       "documentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/CP0000840/filings/112752/documents",
       "effectiveDate": "Tue, 01 May 2018 00:02:26 GMT",
@@ -317,6 +329,7 @@
           "dissolution"
         ]
       },
+      "displayLedger": true,
       "displayName": "Dissolution",
       "documentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/CP0000840/filings/112751/documents",
       "effectiveDate": "Sun, 01 Apr 2018 00:02:26 GMT",
@@ -340,6 +353,7 @@
         ],
         "specialResolution": {}
       },
+      "displayLedger": true,
       "displayName": "Special Resolution",
       "documentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/CP0000840/filings/112750/documents",
       "effectiveDate": "Thu, 01 Mar 2018 00:02:26 GMT",
@@ -363,6 +377,7 @@
           "conversion"
         ]
       },
+      "displayLedger": true,
       "displayName": "Conversion",
       "documentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/CP0000840/filings/112749/documents",
       "effectiveDate": "Thu, 01 Feb 2018 00:02:26 GMT",
@@ -389,6 +404,7 @@
           "annualReport"
         ]
       },
+      "displayLedger": true,
       "displayName": "Annual Report (2018)",
       "documentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/CP0000840/filings/112748/documents",
       "effectiveDate": "Mon, 01 Jan 2018 00:02:26 GMT",
@@ -412,6 +428,7 @@
           "changeOfDirectors"
         ]
       },
+      "displayLedger": true,
       "displayName": "Director Change",
       "documentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/CP0000840/filings/112747/documents",
       "effectiveDate": "Fri, 01 Dec 2017 00:02:26 GMT",
@@ -435,6 +452,7 @@
           "changeOfAddress"
         ]
       },
+      "displayLedger": true,
       "displayName": "Address Change",
       "documentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/CP0000840/filings/112746/documents",
       "effectiveDate": "Wed, 01 Nov 2017 00:02:26 GMT",
@@ -459,6 +477,7 @@
           "incorporationApplication"
         ]
       },
+      "displayLedger": true,
       "displayName": "Incorporation Application",
       "documentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/CP0000840/filings/112744/documents",
       "effectiveDate": "Sun, 01 Oct 2017 00:02:26 GMT",
@@ -491,6 +510,7 @@
           "orderDetails": "A note about order"
         }
       },
+      "displayLedger": true,
       "displayName": "Alteration",
       "documentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/CP0000840/filings/112745/documents",
       "effectiveDate": "Sun, 01 Oct 2017 00:02:26 GMT",
@@ -516,6 +536,7 @@
           "dissolution"
         ]
       },
+      "displayLedger": true,
       "displayName": "Administrative Dissolution",
       "documentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/CP0000840/filings/112756/documents",
       "effectiveDate": "Sun, 01 Apr 2018 00:02:26 GMT",
@@ -543,6 +564,7 @@
           "consentContinuationOut"
         ]
       },
+      "displayLedger": true,
       "displayName": "6-Month Consent to Continue Out",
       "documentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/CP0000840/filings/112756/documents",
       "effectiveDate": "Fri, 03 Feb 2023 18:52:00 GMT",
@@ -554,6 +576,32 @@
       "status": "COMPLETED",
       "submittedDate": "Fri, 03 Feb 2023 18:52:00 GMT",
       "submitter": "Registry Staff"
+    },
+    {
+      "availableOnPaperOnly": false,
+      "businessIdentifier": "BC1234567",
+      "commentsCount": 0,
+      "commentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/BC1234567/filings/112751/comments",
+      "data": {
+        "amalgamationApplication": {
+          "type": "regular"
+        },
+        "legalFilings": [
+          "amalgamation"
+        ]
+      },
+      "displayLedger": true,
+      "displayName": "Amalgamation Application - Regular",
+      "documentsLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/BC1234567/filings/112751/documents",
+      "effectiveDate": "Fri, 03 Feb 2023 18:52:00 GMT",
+      "filingId": 112751,
+      "filingLink": "https://legal-api-dev.apps.silver.devops.gov.bc.ca/api/v2/businesses/BC1234567/filings/112751",
+      "isFutureEffective": false,
+      "name": "amalgamationApplication",
+      "paymentStatusCode": null,
+      "status": "COMPLETED",
+      "submittedDate": "Fri, 03 Feb 2023 18:52:00 GMT",
+      "submitter": "Registry Staff"
     }
   ]
 }
diff --git a/tests/unit/legal-services.spec.ts b/tests/unit/legal-services.spec.ts
index e128dc1bb..34e66d010 100644
--- a/tests/unit/legal-services.spec.ts
+++ b/tests/unit/legal-services.spec.ts
@@ -137,7 +137,7 @@ describe('Legal Services', () => {
     }
 
     // mock endpoint
-    get.withArgs('nameRequests/NR1234567')
+    get.withArgs('nameRequests/NR1234567/validate?phone=&email=')
       .returns(new Promise(resolve => resolve({ data: NR })))
 
     // call method
diff --git a/tests/unit/pay-services.spec.ts b/tests/unit/pay-services.spec.ts
index c3b14db5b..e730b3275 100644
--- a/tests/unit/pay-services.spec.ts
+++ b/tests/unit/pay-services.spec.ts
@@ -32,4 +32,21 @@ describe('Pay Services', () => {
     // verify data
     expect(response).toEqual({ ...paymentErrorObj })
   })
+
+  it('fetches cfs account number correctly', async () => {
+    get.withArgs(`accounts/123`)
+      .returns(new Promise(resolve => resolve({
+        data: {
+          cfsAccount: {
+            cfsAccountNumber: '99'
+          }
+        }
+      })))
+
+    const response = await PayServices.fetchCfsAccountId('', 123)
+
+    sinon.assert.called(get)
+    // verify data
+    expect(response).toEqual('99')
+  })
 })
diff --git a/tsconfig.json b/tsconfig.json
index 9338a016f..3e67491e6 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "target": "esnext",
     "module": "esnext",
-    "strict": false,
+    "strict": true,
     "noImplicitAny": false,
     "strictNullChecks": false,
     "jsx": "preserve",