From 4d576f053321bd9a73b5e0932ad729f8a8503b61 Mon Sep 17 00:00:00 2001
From: Addison Beck <github@addisonbeck.com>
Date: Wed, 8 Jan 2025 13:06:19 -0500
Subject: [PATCH 001/150] fix(ci): Resolve errors and warnings exposed by new
 workflow linter (#12755)

* fix(ci): Resolve errors and warnings exposed by new workflow linter

* Add missed warning
---
 .github/workflows/deploy-web.yml           | 130 ++++++++++-----------
 .github/workflows/lint.yml                 |  18 +--
 .github/workflows/publish-cli.yml          |  14 +--
 .github/workflows/publish-desktop.yml      |  34 +++---
 .github/workflows/release-browser.yml      |  20 ++--
 .github/workflows/release-cli.yml          |   6 +-
 .github/workflows/release-desktop-beta.yml |  50 ++++----
 .github/workflows/release-desktop.yml      |  12 +-
 8 files changed, 144 insertions(+), 140 deletions(-)

diff --git a/.github/workflows/deploy-web.yml b/.github/workflows/deploy-web.yml
index b5e84ff875..2dd30a8e96 100644
--- a/.github/workflows/deploy-web.yml
+++ b/.github/workflows/deploy-web.yml
@@ -63,14 +63,14 @@ jobs:
     runs-on: ubuntu-22.04
     outputs:
       environment: ${{ steps.config.outputs.environment }}
-      environment-url: ${{ steps.config.outputs.environment-url }}
-      environment-name: ${{ steps.config.outputs.environment-name }}
-      environment-artifact: ${{ steps.config.outputs.environment-artifact }}
-      azure-login-creds: ${{ steps.config.outputs.azure-login-creds }}
-      retrieve-secrets-keyvault: ${{ steps.config.outputs.retrieve-secrets-keyvault }}
-      sync-utility: ${{ steps.config.outputs.sync-utility }}
-      sync-delete-destination-files: ${{ steps.config.outputs.sync-delete-destination-files }}
-      slack-channel-name: ${{ steps.config.outputs.slack-channel-name }}
+      environment_url: ${{ steps.config.outputs.environment_url }}
+      environment_name: ${{ steps.config.outputs.environment_name }}
+      environment_artifact: ${{ steps.config.outputs.environment_artifact }}
+      azure_login_creds: ${{ steps.config.outputs.azure_login_creds }}
+      retrive_secrets_keyvault: ${{ steps.config.outputs.retrive_secrets_keyvault }}
+      sync_utility: ${{ steps.config.outputs.sync_utility }}
+      sync_delete_destination_files: ${{ steps.config.outputs.sync_delete_destination_files }}
+      slack_channel_name: ${{ steps.config.outputs.slack-channel-name }}
     steps:
       - name: Configure
         id: config
@@ -81,48 +81,48 @@ jobs:
 
           case ${{ inputs.environment }} in
             "USQA")
-              echo "azure-login-creds=AZURE_KV_US_QA_SERVICE_PRINCIPAL" >> $GITHUB_OUTPUT
-              echo "retrieve-secrets-keyvault=bw-webvault-rlktusqa-kv" >> $GITHUB_OUTPUT
-              echo "environment-artifact=web-*-cloud-QA.zip" >> $GITHUB_OUTPUT
-              echo "environment-name=Web Vault - US QA Cloud" >> $GITHUB_OUTPUT
-              echo "environment-url=http://vault.$ENV_NAME_LOWER.bitwarden.pw" >> $GITHUB_OUTPUT
-              echo "slack-channel-name=alerts-deploy-qa"  >> $GITHUB_OUTPUT
+              echo "azure_login_creds=AZURE_KV_US_QA_SERVICE_PRINCIPAL" >> $GITHUB_OUTPUT
+              echo "retrive_secrets_keyvault=bw-webvault-rlktusqa-kv" >> $GITHUB_OUTPUT
+              echo "environment_artifact=web-*-cloud-QA.zip" >> $GITHUB_OUTPUT
+              echo "environment_name=Web Vault - US QA Cloud" >> $GITHUB_OUTPUT
+              echo "environment_url=http://vault.$ENV_NAME_LOWER.bitwarden.pw" >> $GITHUB_OUTPUT
+              echo "slack_channel_name=alerts-deploy-qa"  >> $GITHUB_OUTPUT
               ;;
             "EUQA")
-              echo "azure-login-creds=AZURE_KV_EU_QA_SERVICE_PRINCIPAL" >> $GITHUB_OUTPUT
-              echo "retrieve-secrets-keyvault=webvaulteu-westeurope-qa" >> $GITHUB_OUTPUT
-              echo "environment-artifact=web-*-cloud-euqa.zip" >> $GITHUB_OUTPUT
-              echo "environment-name=Web Vault - EU QA Cloud" >> $GITHUB_OUTPUT
-              echo "environment-url=http://vault.$ENV_NAME_LOWER.bitwarden.pw" >> $GITHUB_OUTPUT
-              echo "slack-channel-name=alerts-deploy-qa"  >> $GITHUB_OUTPUT
+              echo "azure_login_creds=AZURE_KV_EU_QA_SERVICE_PRINCIPAL" >> $GITHUB_OUTPUT
+              echo "retrive_secrets_keyvault=webvaulteu-westeurope-qa" >> $GITHUB_OUTPUT
+              echo "environment_artifact=web-*-cloud-euqa.zip" >> $GITHUB_OUTPUT
+              echo "environment_name=Web Vault - EU QA Cloud" >> $GITHUB_OUTPUT
+              echo "environment_url=http://vault.$ENV_NAME_LOWER.bitwarden.pw" >> $GITHUB_OUTPUT
+              echo "slack_channel_name=alerts-deploy-qa"  >> $GITHUB_OUTPUT
               ;;
             "USPROD")
-              echo "azure-login-creds=AZURE_KV_US_PROD_SERVICE_PRINCIPAL" >> $GITHUB_OUTPUT
-              echo "retrieve-secrets-keyvault=bw-webvault-klrt-kv" >> $GITHUB_OUTPUT
-              echo "environment-artifact=web-*-cloud-COMMERCIAL.zip" >> $GITHUB_OUTPUT
-              echo "environment-name=Web Vault - US Production Cloud" >> $GITHUB_OUTPUT
-              echo "environment-url=http://vault.bitwarden.com" >> $GITHUB_OUTPUT
-              echo "slack-channel-name=alerts-deploy-prd"  >> $GITHUB_OUTPUT
+              echo "azure_login_creds=AZURE_KV_US_PROD_SERVICE_PRINCIPAL" >> $GITHUB_OUTPUT
+              echo "retrive_secrets_keyvault=bw-webvault-klrt-kv" >> $GITHUB_OUTPUT
+              echo "environment_artifact=web-*-cloud-COMMERCIAL.zip" >> $GITHUB_OUTPUT
+              echo "environment_name=Web Vault - US Production Cloud" >> $GITHUB_OUTPUT
+              echo "environment_url=http://vault.bitwarden.com" >> $GITHUB_OUTPUT
+              echo "slack_channel_name=alerts-deploy-prd"  >> $GITHUB_OUTPUT
               ;;
             "EUPROD")
-              echo "azure-login-creds=AZURE_KV_EU_PRD_SERVICE_PRINCIPAL" >> $GITHUB_OUTPUT
-              echo "retrieve-secrets-keyvault=webvault-westeurope-prod" >> $GITHUB_OUTPUT
-              echo "environment-artifact=web-*-cloud-euprd.zip" >> $GITHUB_OUTPUT
-              echo "environment-name=Web Vault - EU Production Cloud" >> $GITHUB_OUTPUT
-              echo "environment-url=http://vault.bitwarden.eu" >> $GITHUB_OUTPUT
-              echo "slack-channel-name=alerts-deploy-prd"  >> $GITHUB_OUTPUT
+              echo "azure_login_creds=AZURE_KV_EU_PRD_SERVICE_PRINCIPAL" >> $GITHUB_OUTPUT
+              echo "retrive_secrets_keyvault=webvault-westeurope-prod" >> $GITHUB_OUTPUT
+              echo "environment_artifact=web-*-cloud-euprd.zip" >> $GITHUB_OUTPUT
+              echo "environment_name=Web Vault - EU Production Cloud" >> $GITHUB_OUTPUT
+              echo "environment_url=http://vault.bitwarden.eu" >> $GITHUB_OUTPUT
+              echo "slack_channel_name=alerts-deploy-prd"  >> $GITHUB_OUTPUT
               ;;
             "USDEV")
-              echo "azure-login-creds=AZURE_KV_US_DEV_SERVICE_PRINCIPAL" >> $GITHUB_OUTPUT
-              echo "retrieve-secrets-keyvault=webvault-eastus-dev" >> $GITHUB_OUTPUT
-              echo "environment-artifact=web-*-cloud-usdev.zip" >> $GITHUB_OUTPUT
-              echo "environment-name=Web Vault - US Development Cloud" >> $GITHUB_OUTPUT
-              echo "environment-url=http://vault.$ENV_NAME_LOWER.bitwarden.pw" >> $GITHUB_OUTPUT
-              echo "slack-channel-name=alerts-deploy-dev"  >> $GITHUB_OUTPUT
+              echo "azure_login_creds=AZURE_KV_US_DEV_SERVICE_PRINCIPAL" >> $GITHUB_OUTPUT
+              echo "retrive_secrets_keyvault=webvault-eastus-dev" >> $GITHUB_OUTPUT
+              echo "environment_artifact=web-*-cloud-usdev.zip" >> $GITHUB_OUTPUT
+              echo "environment_name=Web Vault - US Development Cloud" >> $GITHUB_OUTPUT
+              echo "environment_url=http://vault.$ENV_NAME_LOWER.bitwarden.pw" >> $GITHUB_OUTPUT
+              echo "slack_channel_name=alerts-deploy-dev"  >> $GITHUB_OUTPUT
               ;;
           esac
           # Set the sync utility to use for deployment to the environment (az-sync or azcopy)
-          echo "sync-utility=azcopy" >> $GITHUB_OUTPUT
+          echo "sync_utility=azcopy" >> $GITHUB_OUTPUT
 
       - name: Environment Protection
         env:
@@ -168,10 +168,10 @@ jobs:
           fi
 
   approval:
-    name: Approval for Deployment to ${{ needs.setup.outputs.environment-name }}
+    name: Approval for Deployment to ${{ needs.setup.outputs.environment_name }}
     needs: setup
     runs-on: ubuntu-22.04
-    environment: ${{ needs.setup.outputs.environment-name }}
+    environment: ${{ needs.setup.outputs.environment_name }}
     steps:
       - name: Success Code
         run: exit 0
@@ -181,9 +181,9 @@ jobs:
     runs-on: ubuntu-22.04
     needs: setup
     env:
-      _ENVIRONMENT_ARTIFACT: ${{ needs.setup.outputs.environment-artifact }}
+      _ENVIRONMENT_ARTIFACT: ${{ needs.setup.outputs.environment_artifact }}
     outputs:
-      artifact-build-commit: ${{ steps.set-artifact-commit.outputs.commit }}
+      artifact_build_commit: ${{ steps.set-artifact-commit.outputs.commit }}
     steps:
       - name: 'Download latest cloud asset using GitHub Run ID: ${{ inputs.build-web-run-id }}'
         if: ${{ inputs.build-web-run-id }}
@@ -242,7 +242,7 @@ jobs:
         run: |
           # If run-id was used, get the commit from the download-latest-artifacts-run-id step
           if [ "${{ inputs.build-web-run-id }}" ]; then
-            echo "commit=${{ steps.download-latest-artifacts-run-id.outputs.artifact-build-commit }}" >> $GITHUB_OUTPUT
+            echo "commit=${{ steps.download-latest-artifacts-run-id.outputs.artifact_build_commit }}" >> $GITHUB_OUTPUT
 
           elif [ "${{ steps.download-latest-artifacts.outcome }}" == "failure" ]; then
             # If the download-latest-artifacts step failed, query the GH API to get the commit SHA of the artifact that was just built with trigger-build-web.
@@ -251,7 +251,7 @@ jobs:
 
           else
             # Set the commit to the output of step download-latest-artifacts.
-            echo "commit=${{ steps.download-latest-artifacts.outputs.artifact-build-commit }}" >> $GITHUB_OUTPUT
+            echo "commit=${{ steps.download-latest-artifacts.outputs.artifact_build_commit }}" >> $GITHUB_OUTPUT
           fi
 
   notify-start:
@@ -271,11 +271,11 @@ jobs:
         id: slack-message
         with:
           project: Clients
-          environment: ${{ needs.setup.outputs.environment-name }}
+          environment: ${{ needs.setup.outputs.environment_name }}
           tag: ${{ inputs.branch-or-tag }}
-          slack-channel: ${{ needs.setup.outputs.slack-channel-name }}
+          slack-channel: ${{ needs.setup.outputs.slack_channel_name }}
           event: 'start'
-          commit-sha: ${{ needs.artifact-check.outputs.artifact-build-commit }}
+          commit-sha: ${{ needs.artifact-check.outputs.artifact_build_commit }}
           url: https://github.com/bitwarden/clients/actions/runs/${{ github.run_id }}
           AZURE_KV_CI_SERVICE_PRINCIPAL: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
 
@@ -287,7 +287,7 @@ jobs:
       - name: Display commit SHA
         run: |
           REPO_URL="https://github.com/bitwarden/clients/commit"
-          COMMIT_SHA="${{ needs.artifact-check.outputs.artifact-build-commit }}"
+          COMMIT_SHA="${{ needs.artifact-check.outputs.artifact_build_commit }}"
           echo ":steam_locomotive: View [commit]($REPO_URL/$COMMIT_SHA)" >> $GITHUB_STEP_SUMMARY
 
   azure-deploy:
@@ -299,9 +299,9 @@ jobs:
     runs-on: ubuntu-22.04
     env:
       _ENVIRONMENT: ${{ needs.setup.outputs.environment }}
-      _ENVIRONMENT_URL: ${{ needs.setup.outputs.environment-url }}
-      _ENVIRONMENT_NAME: ${{ needs.setup.outputs.environment-name }}
-      _ENVIRONMENT_ARTIFACT: ${{ needs.setup.outputs.environment-artifact }}
+      _ENVIRONMENT_URL: ${{ needs.setup.outputs.environment_url }}
+      _ENVIRONMENT_NAME: ${{ needs.setup.outputs.environment_name }}
+      _ENVIRONMENT_ARTIFACT: ${{ needs.setup.outputs.environment_artifact }}
     steps:
       - name: Create GitHub deployment
         uses: chrnorm/deployment-action@55729fcebec3d284f60f5bcabbd8376437d696b1 # v2.0.7
@@ -309,31 +309,31 @@ jobs:
         with:
           token: '${{ secrets.GITHUB_TOKEN }}'
           initial-status: 'in_progress'
-          environment-url: ${{ env._ENVIRONMENT_URL }}
+          environment_url: ${{ env._ENVIRONMENT_URL }}
           environment: ${{ env._ENVIRONMENT_NAME }}
           task: 'deploy'
           description: 'Deployment from branch/tag: ${{ inputs.branch-or-tag }}'
-          ref: ${{ needs.artifact-check.outputs.artifact-build-commit }}
+          ref: ${{ needs.artifact-check.outputs.artifact_build_commit }}
 
       - name: Login to Azure
         uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
         with:
-          creds: ${{ secrets[needs.setup.outputs.azure-login-creds] }}
+          creds: ${{ secrets[needs.setup.outputs.azure_login_creds] }}
 
       - name: Retrieve Storage Account connection string for az sync
-        if: ${{ needs.setup.outputs.sync-utility == 'az-sync' }}
+        if: ${{ needs.setup.outputs.sync_utility == 'az-sync' }}
         id: retrieve-secrets-az-sync
         uses: bitwarden/gh-actions/get-keyvault-secrets@main
         with:
-          keyvault: ${{ needs.setup.outputs.retrieve-secrets-keyvault }}
+          keyvault: ${{ needs.setup.outputs.retrive_secrets_keyvault }}
           secrets: "sa-bitwarden-web-vault-dev-key-temp"
 
       - name: Retrieve Storage Account name and SPN credentials for azcopy
-        if: ${{ needs.setup.outputs.sync-utility == 'azcopy' }}
+        if: ${{ needs.setup.outputs.sync_utility == 'azcopy' }}
         id: retrieve-secrets-azcopy
         uses: bitwarden/gh-actions/get-keyvault-secrets@main
         with:
-          keyvault: ${{ needs.setup.outputs.retrieve-secrets-keyvault }}
+          keyvault: ${{ needs.setup.outputs.retrive_secrets_keyvault }}
           secrets: "sa-bitwarden-web-vault-name,sp-bitwarden-web-vault-password,sp-bitwarden-web-vault-appid,sp-bitwarden-web-vault-tenant"
 
       - name: 'Download latest cloud asset using GitHub Run ID: ${{ inputs.build-web-run-id }}'
@@ -363,7 +363,7 @@ jobs:
         run: unzip ${{ env._ENVIRONMENT_ARTIFACT }}
 
       - name: Sync to Azure Storage Account using az storage blob sync
-        if: ${{ needs.setup.outputs.sync-utility == 'az-sync' }}
+        if: ${{ needs.setup.outputs.sync_utility == 'az-sync' }}
         working-directory: apps/web
         run: |
           az storage blob sync \
@@ -373,7 +373,7 @@ jobs:
             --delete-destination=${{ inputs.force-delete-destination }}
 
       - name: Sync to Azure Storage Account using azcopy
-        if: ${{ needs.setup.outputs.sync-utility == 'azcopy' }}
+        if: ${{ needs.setup.outputs.sync_utility == 'azcopy' }}
         working-directory: apps/web
         env:
           AZCOPY_AUTO_LOGIN_TYPE: SPN
@@ -397,7 +397,7 @@ jobs:
         uses: chrnorm/deployment-status@9a72af4586197112e0491ea843682b5dc280d806 # v2.0.3
         with:
           token: '${{ secrets.GITHUB_TOKEN }}'
-          environment-url: ${{ env._ENVIRONMENT_URL }}
+          environment_url: ${{ env._ENVIRONMENT_URL }}
           state: 'success'
           deployment-id: ${{ steps.deployment.outputs.deployment_id }}
 
@@ -406,7 +406,7 @@ jobs:
         uses: chrnorm/deployment-status@9a72af4586197112e0491ea843682b5dc280d806 # v2.0.3
         with:
           token: '${{ secrets.GITHUB_TOKEN }}'
-          environment-url: ${{ env._ENVIRONMENT_URL }}
+          environment_url: ${{ env._ENVIRONMENT_URL }}
           state: 'failure'
           deployment-id: ${{ steps.deployment.outputs.deployment_id }}
 
@@ -424,11 +424,11 @@ jobs:
         uses: bitwarden/gh-actions/report-deployment-status-to-slack@main
         with:
           project: Clients
-          environment: ${{ needs.setup.outputs.environment-name }}
+          environment: ${{ needs.setup.outputs.environment_name }}
           tag: ${{ inputs.branch-or-tag }}
           slack-channel: ${{ needs.notify-start.outputs.channel_id }}
           event: ${{ needs.azure-deploy.result }}
           url: https://github.com/bitwarden/clients/actions/runs/${{ github.run_id }}
-          commit-sha: ${{ needs.artifact-check.outputs.artifact-build-commit }}
+          commit-sha: ${{ needs.artifact-check.outputs.artifact_build_commit }}
           update-ts: ${{ needs.notify-start.outputs.ts }}
           AZURE_KV_CI_SERVICE_PRINCIPAL: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index a907618bd3..867de3844e 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -54,21 +54,25 @@ jobs:
           cache-dependency-path: '**/package-lock.json'
           node-version: ${{ steps.retrieve-node-version.outputs.node_version }}
 
+      - name: Install Node dependencies
+        run: npm ci
+
+      - name: Lint unowned dependencies
+        run: npm run lint:dep-ownership
+
       - name: Run linter
-        run: |
-          npm ci
-          npm run lint
+        run: npm run lint
 
   rust:
     name: Run Rust lint on ${{ matrix.os }}
-    runs-on: ${{ matrix.os || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.os || 'ubuntu-24.04' }}
 
     strategy:
       matrix:
         os:
-          - ubuntu-latest
-          - macos-latest
-          - windows-latest
+          - ubuntu-24.04
+          - macos-14
+          - windows-2022
 
     steps:
       - name: Checkout repo
diff --git a/.github/workflows/publish-cli.yml b/.github/workflows/publish-cli.yml
index 0a56130679..ff85a30d3f 100644
--- a/.github/workflows/publish-cli.yml
+++ b/.github/workflows/publish-cli.yml
@@ -43,8 +43,8 @@ jobs:
     name: Setup
     runs-on: ubuntu-22.04
     outputs:
-      release-version: ${{ steps.version-output.outputs.version }}
-      deployment-id: ${{ steps.deployment.outputs.deployment_id }}
+      release_version: ${{ steps.version-output.outputs.version }}
+      deployment_id: ${{ steps.deployment.outputs.deployment_id }}
     defaults:
       run:
         working-directory: .
@@ -88,7 +88,7 @@ jobs:
     needs: setup
     if: inputs.snap_publish
     env:
-      _PKG_VERSION: ${{ needs.setup.outputs.release-version }}
+      _PKG_VERSION: ${{ needs.setup.outputs.release_version }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -125,7 +125,7 @@ jobs:
     needs: setup
     if: inputs.choco_publish
     env:
-      _PKG_VERSION: ${{ needs.setup.outputs.release-version }}
+      _PKG_VERSION: ${{ needs.setup.outputs.release_version }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -165,7 +165,7 @@ jobs:
     needs: setup
     if: inputs.npm_publish
     env:
-      _PKG_VERSION: ${{ needs.setup.outputs.release-version }}
+      _PKG_VERSION: ${{ needs.setup.outputs.release_version }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -222,7 +222,7 @@ jobs:
         with:
           token: '${{ secrets.GITHUB_TOKEN }}'
           state: 'success'
-          deployment-id: ${{ needs.setup.outputs.deployment-id }}
+          deployment_id: ${{ needs.setup.outputs.deployment_id }}
 
       - name: Update deployment status to Failure
         if: ${{ inputs.publish_type != 'Dry Run' && failure() }}
@@ -230,4 +230,4 @@ jobs:
         with:
           token: '${{ secrets.GITHUB_TOKEN }}'
           state: 'failure'
-          deployment-id: ${{ needs.setup.outputs.deployment-id }}
+          deployment_id: ${{ needs.setup.outputs.deployment_id }}
diff --git a/.github/workflows/publish-desktop.yml b/.github/workflows/publish-desktop.yml
index 5ef378ad43..69ccd84106 100644
--- a/.github/workflows/publish-desktop.yml
+++ b/.github/workflows/publish-desktop.yml
@@ -39,10 +39,10 @@ jobs:
     name: Setup
     runs-on: ubuntu-22.04
     outputs:
-      release-version: ${{ steps.version.outputs.version }}
-      release-channel: ${{ steps.release-channel.outputs.channel }}
-      tag-name: ${{ steps.version.outputs.tag_name }}
-      deployment-id: ${{ steps.deployment.outputs.deployment_id }}
+      release_version: ${{ steps.version.outputs.version }}
+      release_channel: ${{ steps.release_channel.outputs.channel }}
+      tag_name: ${{ steps.version.outputs.tag_name }}
+      deployment_id: ${{ steps.deployment.outputs.deployment_id }}
     steps:
       - name: Branch check
         if: ${{ inputs.publish_type != 'Dry Run' }}
@@ -76,7 +76,7 @@ jobs:
           fi
 
       - name: Get Version Channel
-        id: release-channel
+        id: release_channel
         run: |
           case "${{ steps.version.outputs.version }}" in
             *"alpha"*)
@@ -100,7 +100,7 @@ jobs:
           token: '${{ secrets.GITHUB_TOKEN }}'
           initial-status: 'in_progress'
           environment: 'Desktop - Production'
-          description: 'Deployment ${{ steps.version.outputs.version }} to channel ${{ steps.release-channel.outputs.channel }} from branch ${{ github.ref_name }}'
+          description: 'Deployment ${{ steps.version.outputs.version }} to channel ${{ steps.release_channel.outputs.channel }} from branch ${{ github.ref_name }}'
           task: release
 
   electron-blob:
@@ -108,8 +108,8 @@ jobs:
     runs-on: ubuntu-22.04
     needs: setup
     env:
-      _PKG_VERSION: ${{ needs.setup.outputs.release-version }}
-      _RELEASE_TAG: ${{ needs.setup.outputs.tag-name }}
+      _PKG_VERSION: ${{ needs.setup.outputs.release_version }}
+      _RELEASE_TAG: ${{ needs.setup.outputs.tag_name }}
     steps:
       - name: Login to Azure
         uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
@@ -136,7 +136,7 @@ jobs:
 
       - name: Set staged rollout percentage
         env:
-          RELEASE_CHANNEL: ${{ needs.setup.outputs.release-channel }}
+          RELEASE_CHANNEL: ${{ needs.setup.outputs.release_channel }}
           ROLLOUT_PCT: ${{ inputs.rollout_percentage }}
         run: |
           echo "stagingPercentage: ${ROLLOUT_PCT}" >> apps/desktop/artifacts/${RELEASE_CHANNEL}.yml
@@ -163,7 +163,7 @@ jobs:
         with:
           token: '${{ secrets.GITHUB_TOKEN }}'
           state: 'success'
-          deployment-id: ${{ needs.setup.outputs.deployment-id }}
+          deployment_id: ${{ needs.setup.outputs.deployment_id }}
 
       - name: Update deployment status to Failure
         if: ${{ inputs.publish_type != 'Dry Run' && failure() }}
@@ -171,7 +171,7 @@ jobs:
         with:
           token: '${{ secrets.GITHUB_TOKEN }}'
           state: 'failure'
-          deployment-id: ${{ needs.setup.outputs.deployment-id }}
+          deployment_id: ${{ needs.setup.outputs.deployment_id }}
 
   snap:
     name: Deploy Snap
@@ -179,8 +179,8 @@ jobs:
     needs: setup
     if: inputs.snap_publish
     env:
-      _PKG_VERSION: ${{ needs.setup.outputs.release-version }}
-      _RELEASE_TAG: ${{ needs.setup.outputs.tag-name }}
+      _PKG_VERSION: ${{ needs.setup.outputs.release_version }}
+      _RELEASE_TAG: ${{ needs.setup.outputs.tag_name }}
     steps:
       - name: Checkout Repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -223,8 +223,8 @@ jobs:
     needs: setup
     if: inputs.choco_publish
     env:
-      _PKG_VERSION: ${{ needs.setup.outputs.release-version }}
-      _RELEASE_TAG: ${{ needs.setup.outputs.tag-name }}
+      _PKG_VERSION: ${{ needs.setup.outputs.release_version }}
+      _RELEASE_TAG: ${{ needs.setup.outputs.tag_name }}
     steps:
       - name: Checkout Repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -284,7 +284,7 @@ jobs:
         with:
           token: '${{ secrets.GITHUB_TOKEN }}'
           state: 'success'
-          deployment-id: ${{ needs.setup.outputs.deployment-id }}
+          deployment_id: ${{ needs.setup.outputs.deployment_id }}
 
       - name: Update deployment status to Failure
         if: ${{ inputs.publish_type != 'Dry Run' && failure() }}
@@ -292,4 +292,4 @@ jobs:
         with:
           token: '${{ secrets.GITHUB_TOKEN }}'
           state: 'failure'
-          deployment-id: ${{ needs.setup.outputs.deployment-id }}
+          deployment_id: ${{ needs.setup.outputs.deployment_id }}
diff --git a/.github/workflows/release-browser.yml b/.github/workflows/release-browser.yml
index 7544218751..7e8722dc79 100644
--- a/.github/workflows/release-browser.yml
+++ b/.github/workflows/release-browser.yml
@@ -23,7 +23,7 @@ jobs:
     name: Setup
     runs-on: ubuntu-22.04
     outputs:
-      release-version: ${{ steps.version.outputs.version }}
+      release_version: ${{ steps.version.outputs.version }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -40,7 +40,7 @@ jobs:
 
       - name: Check Release Version
         id: version
-        uses: bitwarden/gh-actions/release-version-check@main
+        uses: bitwarden/gh-actions/release_version-check@main
         with:
           release-type: ${{ github.event.inputs.release_type }}
           project-type: ts
@@ -118,7 +118,7 @@ jobs:
 
       - name: Rename build artifacts
         env:
-          PACKAGE_VERSION: ${{ needs.setup.outputs.release-version }}
+          PACKAGE_VERSION: ${{ needs.setup.outputs.release_version }}
         run: |
           mv browser-source.zip browser-source-$PACKAGE_VERSION.zip
           mv dist-chrome.zip dist-chrome-$PACKAGE_VERSION.zip
@@ -130,14 +130,14 @@ jobs:
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         uses: ncipollo/release-action@2c591bcc8ecdcd2db72b97d6147f871fcd833ba5 # v1.14.0
         with:
-          artifacts: 'browser-source-${{ needs.setup.outputs.release-version }}.zip,
-                      dist-chrome-${{ needs.setup.outputs.release-version }}.zip,
-                      dist-opera-${{ needs.setup.outputs.release-version }}.zip,
-                      dist-firefox-${{ needs.setup.outputs.release-version }}.zip,
-                      dist-edge-${{ needs.setup.outputs.release-version }}.zip'
+          artifacts: 'browser-source-${{ needs.setup.outputs.release_version }}.zip,
+                      dist-chrome-${{ needs.setup.outputs.release_version }}.zip,
+                      dist-opera-${{ needs.setup.outputs.release_version }}.zip,
+                      dist-firefox-${{ needs.setup.outputs.release_version }}.zip,
+                      dist-edge-${{ needs.setup.outputs.release_version }}.zip'
           commit: ${{ github.sha }}
-          tag: "browser-v${{ needs.setup.outputs.release-version }}"
-          name: "Browser v${{ needs.setup.outputs.release-version }}"
+          tag: "browser-v${{ needs.setup.outputs.release_version }}"
+          name: "Browser v${{ needs.setup.outputs.release_version }}"
           body: "<insert release notes here>"
           token: ${{ secrets.GITHUB_TOKEN }}
           draft: true
diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml
index 05c53f9752..d16cd744d7 100644
--- a/.github/workflows/release-cli.yml
+++ b/.github/workflows/release-cli.yml
@@ -23,7 +23,7 @@ jobs:
     name: Setup
     runs-on: ubuntu-22.04
     outputs:
-      release-version: ${{ steps.version.outputs.version }}
+      release_version: ${{ steps.version.outputs.version }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -40,7 +40,7 @@ jobs:
 
       - name: Check Release Version
         id: version
-        uses: bitwarden/gh-actions/release-version-check@main
+        uses: bitwarden/gh-actions/release_version-check@main
         with:
           release-type: ${{ inputs.release_type }}
           project-type: ts
@@ -75,7 +75,7 @@ jobs:
         if: ${{ inputs.release_type != 'Dry Run' }}
         uses: ncipollo/release-action@2c591bcc8ecdcd2db72b97d6147f871fcd833ba5 # v1.14.0
         env:
-          PKG_VERSION: ${{ needs.setup.outputs.release-version }}
+          PKG_VERSION: ${{ needs.setup.outputs.release_version }}
         with:
           artifacts: "apps/cli/bw-oss-windows-${{ env.PKG_VERSION }}.zip,
                       apps/cli/bw-oss-windows-sha256-${{ env.PKG_VERSION }}.txt,
diff --git a/.github/workflows/release-desktop-beta.yml b/.github/workflows/release-desktop-beta.yml
index 3ec11c7785..08174dc552 100644
--- a/.github/workflows/release-desktop-beta.yml
+++ b/.github/workflows/release-desktop-beta.yml
@@ -16,9 +16,9 @@ jobs:
     name: Setup
     runs-on: ubuntu-22.04
     outputs:
-      release-version: ${{ steps.version.outputs.version }}
-      release-channel: ${{ steps.release-channel.outputs.channel }}
-      branch-name: ${{ steps.branch.outputs.branch-name }}
+      release_version: ${{ steps.version.outputs.version }}
+      release_channel: ${{ steps.release_channel.outputs.channel }}
+      branch_name: ${{ steps.branch.outputs.branch_name }}
       build_number: ${{ steps.increment-version.outputs.build_number }}
       node_version: ${{ steps.retrieve-node-version.outputs.node_version }}
     steps:
@@ -47,7 +47,7 @@ jobs:
 
       - name: Check Release Version
         id: version
-        uses: bitwarden/gh-actions/release-version-check@main
+        uses: bitwarden/gh-actions/release_version-check@main
         with:
           release-type: 'Initial Release'
           project-type: ts
@@ -63,7 +63,7 @@ jobs:
           echo "build_number=$BUILD_NUMBER" >> $GITHUB_OUTPUT
 
       - name: Get Version Channel
-        id: release-channel
+        id: release_channel
         run: |
           case "${{ steps.version.outputs.version }}" in
             *"alpha"*)
@@ -102,7 +102,7 @@ jobs:
 
           git push -u origin $branch_name
 
-          echo "branch-name=$branch_name" >> $GITHUB_OUTPUT
+          echo "branch_name=$branch_name" >> $GITHUB_OUTPUT
 
       - name: Get Node Version
         id: retrieve-node-version
@@ -116,7 +116,7 @@ jobs:
     runs-on: ubuntu-22.04
     needs: setup
     env:
-      _PACKAGE_VERSION: ${{ needs.setup.outputs.release-version }}
+      _PACKAGE_VERSION: ${{ needs.setup.outputs.release_version }}
       _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
       NODE_OPTIONS: --max_old_space_size=4096
     defaults:
@@ -126,7 +126,7 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          ref: ${{ needs.setup.outputs.branch-name }}
+          ref: ${{ needs.setup.outputs.branch_name }}
 
       - name: Set up Node
         uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
@@ -195,8 +195,8 @@ jobs:
       - name: Upload auto-update artifact
         uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         with:
-          name: ${{ needs.setup.outputs.release-channel }}-linux.yml
-          path: apps/desktop/dist/${{ needs.setup.outputs.release-channel }}-linux.yml
+          name: ${{ needs.setup.outputs.release_channel }}-linux.yml
+          path: apps/desktop/dist/${{ needs.setup.outputs.release_channel }}-linux.yml
           if-no-files-found: error
 
 
@@ -209,14 +209,14 @@ jobs:
         shell: pwsh
         working-directory: apps/desktop
     env:
-      _PACKAGE_VERSION: ${{ needs.setup.outputs.release-version }}
+      _PACKAGE_VERSION: ${{ needs.setup.outputs.release_version }}
       _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
       NODE_OPTIONS: --max_old_space_size=4096
     steps:
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          ref: ${{ needs.setup.outputs.branch-name }}
+          ref: ${{ needs.setup.outputs.branch_name }}
 
       - name: Set up Node
         uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
@@ -385,8 +385,8 @@ jobs:
       - name: Upload auto-update artifact
         uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         with:
-          name: ${{ needs.setup.outputs.release-channel }}.yml
-          path: apps/desktop/dist/nsis-web/${{ needs.setup.outputs.release-channel }}.yml
+          name: ${{ needs.setup.outputs.release_channel }}.yml
+          path: apps/desktop/dist/nsis-web/${{ needs.setup.outputs.release_channel }}.yml
           if-no-files-found: error
 
 
@@ -395,7 +395,7 @@ jobs:
     runs-on: macos-13
     needs: setup
     env:
-      _PACKAGE_VERSION: ${{ needs.setup.outputs.release-version }}
+      _PACKAGE_VERSION: ${{ needs.setup.outputs.release_version }}
       _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
       NODE_OPTIONS: --max_old_space_size=4096
     defaults:
@@ -405,7 +405,7 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          ref: ${{ needs.setup.outputs.branch-name }}
+          ref: ${{ needs.setup.outputs.branch_name }}
 
       - name: Set up Node
         uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
@@ -529,7 +529,7 @@ jobs:
       - setup
       - macos-build
     env:
-      _PACKAGE_VERSION: ${{ needs.setup.outputs.release-version }}
+      _PACKAGE_VERSION: ${{ needs.setup.outputs.release_version }}
       _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
       NODE_OPTIONS: --max_old_space_size=4096
     defaults:
@@ -539,7 +539,7 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          ref: ${{ needs.setup.outputs.branch-name }}
+          ref: ${{ needs.setup.outputs.branch_name }}
 
       - name: Set up Node
         uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
@@ -730,8 +730,8 @@ jobs:
       - name: Upload auto-update artifact
         uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         with:
-          name: ${{ needs.setup.outputs.release-channel }}-mac.yml
-          path: apps/desktop/dist/${{ needs.setup.outputs.release-channel }}-mac.yml
+          name: ${{ needs.setup.outputs.release_channel }}-mac.yml
+          path: apps/desktop/dist/${{ needs.setup.outputs.release_channel }}-mac.yml
           if-no-files-found: error
 
 
@@ -742,7 +742,7 @@ jobs:
       - setup
       - macos-build
     env:
-      _PACKAGE_VERSION: ${{ needs.setup.outputs.release-version }}
+      _PACKAGE_VERSION: ${{ needs.setup.outputs.release_version }}
       _NODE_VERSION: ${{ needs.setup.outputs.node_version }}
       NODE_OPTIONS: --max_old_space_size=4096
     defaults:
@@ -752,7 +752,7 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          ref: ${{ needs.setup.outputs.branch-name }}
+          ref: ${{ needs.setup.outputs.branch_name }}
 
       - name: Set up Node
         uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
@@ -939,7 +939,7 @@ jobs:
           token: '${{ secrets.GITHUB_TOKEN }}'
           initial-status: 'in_progress'
           environment: 'Desktop - Beta'
-          description: 'Deployment ${{ needs.setup.outputs.release-version }} to channel ${{ needs.setup.outputs.release-channel }} from branch ${{ needs.setup.outputs.branch-name }}'
+          description: 'Deployment ${{ needs.setup.outputs.release_version }} to channel ${{ needs.setup.outputs.release_channel }} from branch ${{ needs.setup.outputs.branch_name }}'
           task: release
 
       - name: Login to Azure
@@ -963,7 +963,7 @@ jobs:
 
       - name: Rename .pkg to .pkg.archive
         env:
-          PKG_VERSION: ${{ needs.setup.outputs.release-version }}
+          PKG_VERSION: ${{ needs.setup.outputs.release_version }}
         working-directory: apps/desktop/artifacts
         run: mv Bitwarden-${{ env.PKG_VERSION }}-universal.pkg Bitwarden-${{ env.PKG_VERSION }}-universal.pkg.archive
 
@@ -1020,5 +1020,5 @@ jobs:
           git config --global url."https://".insteadOf ssh://
       - name: Remove branch
         env:
-          BRANCH: ${{ needs.setup.outputs.branch-name }}
+          BRANCH: ${{ needs.setup.outputs.branch_name }}
         run: git push origin --delete $BRANCH
diff --git a/.github/workflows/release-desktop.yml b/.github/workflows/release-desktop.yml
index d9394347f6..ba934235b4 100644
--- a/.github/workflows/release-desktop.yml
+++ b/.github/workflows/release-desktop.yml
@@ -22,8 +22,8 @@ jobs:
     name: Setup
     runs-on: ubuntu-22.04
     outputs:
-      release-version: ${{ steps.version.outputs.version }}
-      release-channel: ${{ steps.release-channel.outputs.channel }}
+      release_version: ${{ steps.version.outputs.version }}
+      release_channel: ${{ steps.release_channel.outputs.channel }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -40,7 +40,7 @@ jobs:
 
       - name: Check Release Version
         id: version
-        uses: bitwarden/gh-actions/release-version-check@main
+        uses: bitwarden/gh-actions/release_version-check@main
         with:
           release-type: ${{ inputs.release_type }}
           project-type: ts
@@ -49,7 +49,7 @@ jobs:
           monorepo-project: desktop
 
       - name: Get Version Channel
-        id: release-channel
+        id: release_channel
         run: |
           case "${{ steps.version.outputs.version }}" in
             *"alpha"*)
@@ -97,10 +97,10 @@ jobs:
 
       - name: Create Release
         uses: ncipollo/release-action@2c591bcc8ecdcd2db72b97d6147f871fcd833ba5 # v1.14.0
-        if: ${{ steps.release-channel.outputs.channel == 'latest' && github.event.inputs.release_type != 'Dry Run' }}
+        if: ${{ steps.release_channel.outputs.channel == 'latest' && github.event.inputs.release_type != 'Dry Run' }}
         env:
           PKG_VERSION: ${{ steps.version.outputs.version }}
-          RELEASE_CHANNEL: ${{ steps.release-channel.outputs.channel }}
+          RELEASE_CHANNEL: ${{ steps.release_channel.outputs.channel }}
         with:
           artifacts: "apps/desktop/artifacts/Bitwarden-${{ env.PKG_VERSION }}-amd64.deb,
             apps/desktop/artifacts/Bitwarden-${{ env.PKG_VERSION }}-x86_64.rpm,

From 38c1cdfb6295f28cc4692beaa1ff6399c1c91387 Mon Sep 17 00:00:00 2001
From: Jordan Aasen <166539328+jaasen-livefront@users.noreply.github.com>
Date: Wed, 8 Jan 2025 10:36:38 -0800
Subject: [PATCH 002/150] [PM-14289] - vault cipher form - set default owner as
 organization from collection when possible (#12682)

* set default org by referencing collecction

* get organizationId from collection

* always get organizationId from collection when possible
---
 .../vault/individual-vault/vault.component.ts | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts
index 5b68b3fbc2..8c1d08b269 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.component.ts
@@ -779,16 +779,26 @@ export class VaultComponent implements OnInit, OnDestroy {
       null,
       cipherType,
     );
+    const collectionId =
+      this.activeFilter.collectionId !== "AllCollections" && this.activeFilter.collectionId != null
+        ? this.activeFilter.collectionId
+        : null;
+    let organizationId =
+      this.activeFilter.organizationId !== "MyVault" && this.activeFilter.organizationId != null
+        ? this.activeFilter.organizationId
+        : null;
+    // Attempt to get the organization ID from the collection if present
+    if (collectionId) {
+      const organizationIdFromCollection = (
+        await firstValueFrom(this.vaultFilterService.filteredCollections$)
+      ).find((c) => c.id === this.activeFilter.collectionId)?.organizationId;
+      if (organizationIdFromCollection) {
+        organizationId = organizationIdFromCollection;
+      }
+    }
     cipherFormConfig.initialValues = {
-      organizationId:
-        this.activeFilter.organizationId !== "MyVault" && this.activeFilter.organizationId != null
-          ? (this.activeFilter.organizationId as OrganizationId)
-          : null,
-      collectionIds:
-        this.activeFilter.collectionId !== "AllCollections" &&
-        this.activeFilter.collectionId != null
-          ? [this.activeFilter.collectionId as CollectionId]
-          : [],
+      organizationId: organizationId as OrganizationId,
+      collectionIds: [collectionId as CollectionId],
       folderId: this.activeFilter.folderId,
     };
 

From 48f99099b2d881d47e84f8e6c9e92d11eb2e181e Mon Sep 17 00:00:00 2001
From: Oscar Hinton <Hinton@users.noreply.github.com>
Date: Wed, 8 Jan 2025 19:37:08 +0100
Subject: [PATCH 003/150] [PM-16845] Lint unowned dependencies (#12748)

* Lint unowned dependencies

* Split npm ci and run linter

* Set explicit versions for unchanged parts of the workflow ....

* Rename yao-pkg

* Add owners for sdk-internal, fuses and angular-eslint/schematics

* Assign owners for angular and storybook

* Add typescript-strict-plugin

* Add two more unowned dependencies

---------

Co-authored-by: Todd Martin <106564991+trmartin4@users.noreply.github.com>
Co-authored-by: Addison Beck <github@addisonbeck.com>
---
 .github/renovate.json    | 16 +++++++++++++---
 package.json             |  1 +
 scripts/dep-ownership.ts | 31 +++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 scripts/dep-ownership.ts

diff --git a/.github/renovate.json b/.github/renovate.json
index 76a52136ae..776c66af68 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -104,6 +104,8 @@
       "matchPackageNames": [
         "@babel/core",
         "@babel/preset-env",
+        "@bitwarden/sdk-internal",
+        "@electron/fuses",
         "@electron/notarize",
         "@electron/rebuild",
         "@ngtools/webpack",
@@ -115,7 +117,7 @@
         "@types/node",
         "@types/node-forge",
         "@types/node-ipc",
-        "@yao-pkg",
+        "@yao-pkg/pkg",
         "babel-loader",
         "browserslist",
         "copy-webpack-plugin",
@@ -135,6 +137,7 @@
         "tsconfig-paths-webpack-plugin",
         "type-fest",
         "typescript",
+        "typescript-strict-plugin",
         "webpack",
         "webpack-cli",
         "webpack-dev-server",
@@ -151,12 +154,13 @@
         "@angular/cdk",
         "@angular/cli",
         "@angular/common",
-        "@angular/compiler",
         "@angular/compiler-cli",
+        "@angular/compiler",
         "@angular/core",
         "@angular/forms",
+        "@angular/platform-browser-dynamic",
+        "@angular/platform-browser",
         "@angular/platform",
-        "@angular/compiler",
         "@angular/router",
         "@compodoc/compodoc",
         "@ng-select/ng-select",
@@ -164,8 +168,11 @@
         "@storybook/addon-actions",
         "@storybook/addon-designs",
         "@storybook/addon-essentials",
+        "@storybook/addon-interactions",
         "@storybook/addon-links",
         "@storybook/angular",
+        "@storybook/manager-api",
+        "@storybook/theming",
         "@types/react",
         "autoprefixer",
         "bootstrap",
@@ -188,7 +195,9 @@
       "matchPackageNames": [
         "@angular-eslint/eslint-plugin",
         "@angular-eslint/eslint-plugin-template",
+        "@angular-eslint/schematics",
         "@angular-eslint/template-parser",
+        "@angular/elements",
         "@types/jest",
         "@typescript-eslint/eslint-plugin",
         "@typescript-eslint/parser",
@@ -201,6 +210,7 @@
         "eslint-plugin-storybook",
         "eslint-plugin-tailwindcss",
         "husky",
+        "jest-extended",
         "jest-junit",
         "jest-mock-extended",
         "jest-preset-angular",
diff --git a/package.json b/package.json
index 0a78d370d2..2508c543d7 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "test:watch:all": "jest --watchAll",
     "test:types": "node ./scripts/test-types.js",
     "test:locales": "tsc --project ./scripts/tsconfig.json && node ./scripts/dist/test-locales.js",
+    "lint:dep-ownership": "tsc --project ./scripts/tsconfig.json && node ./scripts/dist/dep-ownership.js",
     "docs:json": "compodoc -p ./tsconfig.json -e json -d . --disableRoutesGraph",
     "storybook": "ng run components:storybook",
     "build-storybook": "ng run components:build-storybook",
diff --git a/scripts/dep-ownership.ts b/scripts/dep-ownership.ts
new file mode 100644
index 0000000000..e574a3e9e9
--- /dev/null
+++ b/scripts/dep-ownership.ts
@@ -0,0 +1,31 @@
+/* eslint-disable no-console */
+
+/// Ensure that all dependencies in package.json have an owner in the renovate.json file.
+
+import fs from "fs";
+import path from "path";
+
+const renovateConfig = JSON.parse(
+  fs.readFileSync(path.join(__dirname, "..", "..", ".github", "renovate.json"), "utf8"),
+);
+
+const packagesWithOwners = renovateConfig.packageRules
+  .flatMap((rule: any) => rule.matchPackageNames)
+  .filter((packageName: string) => packageName != null);
+
+const packageJson = JSON.parse(
+  fs.readFileSync(path.join(__dirname, "..", "..", "package.json"), "utf8"),
+);
+const dependencies = Object.keys(packageJson.dependencies).concat(
+  Object.keys(packageJson.devDependencies),
+);
+
+const missingOwners = dependencies.filter((dep) => !packagesWithOwners.includes(dep));
+
+if (missingOwners.length > 0) {
+  console.error("Missing owners for the following dependencies:");
+  console.error(missingOwners.join("\n"));
+  process.exit(1);
+}
+
+console.log("All dependencies have owners.");

From a9ca3615233ff77c8ddb9940e3f130b84d9d4451 Mon Sep 17 00:00:00 2001
From: Addison Beck <github@addisonbeck.com>
Date: Wed, 8 Jan 2025 13:47:45 -0500
Subject: [PATCH 004/150] fix(ci): Adjust for a breaking change in the Slack
 action (#12753)

---
 .github/workflows/build-desktop.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
index 3221c7eef2..b27d1486bd 100644
--- a/.github/workflows/build-desktop.yml
+++ b/.github/workflows/build-desktop.yml
@@ -1196,6 +1196,8 @@ jobs:
         uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d # v2.0.0
         with:
           channel-id: C074F5UESQ0
+          method: chat.postMessage
+          token: ${{ steps.retrieve-slack-secret.outputs.slack-bot-token }}
           payload: |
             {
               "blocks": [
@@ -1209,7 +1211,6 @@ jobs:
               ]
             }
         env:
-          SLACK_BOT_TOKEN: ${{ steps.retrieve-slack-secret.outputs.slack-bot-token }}
           BUILD_NUMBER: ${{ needs.setup.outputs.build_number }}
 
 

From 16a0176f84cba851f8c712724151fa7983e05a47 Mon Sep 17 00:00:00 2001
From: tangowithfoxtrot <5676771+tangowithfoxtrot@users.noreply.github.com>
Date: Wed, 8 Jan 2025 10:53:57 -0800
Subject: [PATCH 005/150] fix: account for different build output on arm
 (#12761)

---
 apps/desktop/resources/com.bitwarden.desktop.devel.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/desktop/resources/com.bitwarden.desktop.devel.yaml b/apps/desktop/resources/com.bitwarden.desktop.devel.yaml
index 234d37905c..02f2474927 100644
--- a/apps/desktop/resources/com.bitwarden.desktop.devel.yaml
+++ b/apps/desktop/resources/com.bitwarden.desktop.devel.yaml
@@ -33,7 +33,11 @@ modules:
       - install bitwarden.sh /app/bin/bitwarden.sh
     sources:
       - type: dir
+        only-arches: [x86_64]
         path: ../dist/linux-unpacked
+      - type: dir
+        only-arches: [aarch64]
+        path: ../dist/linux-arm64-unpacked
       - type: script
         dest-filename: bitwarden.sh
         commands:

From d9e65aca14334398f9c8079da91ef9fbb62e0a59 Mon Sep 17 00:00:00 2001
From: Todd Martin <106564991+trmartin4@users.noreply.github.com>
Date: Wed, 8 Jan 2025 15:34:16 -0500
Subject: [PATCH 006/150] Remove lock and logout settings from Safari Account
 Settings (#12699)

---
 .../popup/settings/account-security.component.html   | 12 ------------
 .../popup/settings/account-security.component.ts     |  6 +-----
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/apps/browser/src/auth/popup/settings/account-security.component.html b/apps/browser/src/auth/popup/settings/account-security.component.html
index 3f874fc1a7..0f2754b2bf 100644
--- a/apps/browser/src/auth/popup/settings/account-security.component.html
+++ b/apps/browser/src/auth/popup/settings/account-security.component.html
@@ -109,18 +109,6 @@
           <i slot="end" class="bwi bwi-external-link" aria-hidden="true"></i>
         </button>
       </bit-item>
-      <bit-item
-        *ngIf="
-          !accountSwitcherEnabled && availableVaultTimeoutActions.includes(VaultTimeoutAction.Lock)
-        "
-      >
-        <button bit-item-content type="button" appStopClick (click)="lock()"></button>
-        {{ "lockNow" | i18n }}
-      </bit-item>
-      <bit-item *ngIf="!accountSwitcherEnabled">
-        <button bit-item-content type="button" appStopClick (click)="logOut()"></button>
-        {{ "logOut" | i18n }}
-      </bit-item>
     </bit-section>
   </div>
 </popup-page>
diff --git a/apps/browser/src/auth/popup/settings/account-security.component.ts b/apps/browser/src/auth/popup/settings/account-security.component.ts
index 099f445be8..158eb797ac 100644
--- a/apps/browser/src/auth/popup/settings/account-security.component.ts
+++ b/apps/browser/src/auth/popup/settings/account-security.component.ts
@@ -63,7 +63,6 @@ import {
 
 import { BiometricErrors, BiometricErrorTypes } from "../../../models/biometricErrors";
 import { BrowserApi } from "../../../platform/browser/browser-api";
-import { enableAccountSwitching } from "../../../platform/flags";
 import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils";
 import { PopOutComponent } from "../../../platform/popup/components/pop-out.component";
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
@@ -107,7 +106,6 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
   hasVaultTimeoutPolicy = false;
   biometricUnavailabilityReason: string;
   showChangeMasterPass = true;
-  accountSwitcherEnabled = false;
 
   form = this.formBuilder.group({
     vaultTimeout: [null as VaultTimeout | null],
@@ -140,9 +138,7 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
     private biometricStateService: BiometricStateService,
     private toastService: ToastService,
     private biometricsService: BiometricsService,
-  ) {
-    this.accountSwitcherEnabled = enableAccountSwitching();
-  }
+  ) {}
 
   async ngOnInit() {
     const hasMasterPassword = await this.userVerificationService.hasMasterPassword();

From bb61b3df3ae9d40bdfb002c02a3c5f69695ef1e0 Mon Sep 17 00:00:00 2001
From: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>
Date: Wed, 8 Jan 2025 16:41:02 -0600
Subject: [PATCH 007/150] [PM-15940] Add regen to SSO login (#12643)

* Add loginSuccessHandlerService to SSO login component

* Update regen service to handle SSO login
---
 libs/auth/src/angular/sso/sso.component.ts    |  7 ++-
 ...symmetric-key-regeneration.service.spec.ts | 50 +++++++++++++++++++
 ...ser-asymmetric-key-regeneration.service.ts | 21 +++++++-
 3 files changed, 72 insertions(+), 6 deletions(-)

diff --git a/libs/auth/src/angular/sso/sso.component.ts b/libs/auth/src/angular/sso/sso.component.ts
index aad0df4e39..3bcc56ae4c 100644
--- a/libs/auth/src/angular/sso/sso.component.ts
+++ b/libs/auth/src/angular/sso/sso.component.ts
@@ -12,6 +12,7 @@ import {
   TrustedDeviceUserDecryptionOption,
   UserDecryptionOptions,
   UserDecryptionOptionsServiceAbstraction,
+  LoginSuccessHandlerService,
 } from "@bitwarden/auth/common";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrgDomainApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization-domain/org-domain-api.service.abstraction";
@@ -35,7 +36,6 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import {
   AsyncActionsModule,
   ButtonModule,
@@ -117,7 +117,7 @@ export class SsoComponent implements OnInit {
     private accountService: AccountService,
     private toastService: ToastService,
     private ssoComponentService: SsoComponentService,
-    private syncService: SyncService,
+    private loginSuccessHandlerService: LoginSuccessHandlerService,
   ) {
     environmentService.environment$.pipe(takeUntilDestroyed()).subscribe((env) => {
       this.redirectUri = env.getWebVaultUrl() + "/sso-connector.html";
@@ -378,8 +378,7 @@ export class SsoComponent implements OnInit {
 
       // Everything after the 2FA check is considered a successful login
       // Just have to figure out where to send the user
-
-      await this.syncService.fullSync(true);
+      await this.loginSuccessHandlerService.run(authResult.userId);
 
       // Save off the OrgSsoIdentifier for use in the TDE flows (or elsewhere)
       // - TDE login decryption options component
diff --git a/libs/key-management/src/user-asymmetric-key-regeneration/services/default-user-asymmetric-key-regeneration.service.spec.ts b/libs/key-management/src/user-asymmetric-key-regeneration/services/default-user-asymmetric-key-regeneration.service.spec.ts
index 77d7ebbb81..5312113d76 100644
--- a/libs/key-management/src/user-asymmetric-key-regeneration/services/default-user-asymmetric-key-regeneration.service.spec.ts
+++ b/libs/key-management/src/user-asymmetric-key-regeneration/services/default-user-asymmetric-key-regeneration.service.spec.ts
@@ -153,6 +153,56 @@ describe("regenerateIfNeeded", () => {
     expect(keyService.setPrivateKey).not.toHaveBeenCalled();
   });
 
+  it("should not regenerate when user symmetric key is unavailable", async () => {
+    const mockVerificationResponse: VerifyAsymmetricKeysResponse = {
+      privateKeyDecryptable: true,
+      validPrivateKey: false,
+    };
+    setupVerificationResponse(mockVerificationResponse, sdkService);
+    keyService.userKey$.mockReturnValue(of(undefined as unknown as UserKey));
+
+    await sut.regenerateIfNeeded(userId);
+
+    expect(
+      userAsymmetricKeysRegenerationApiService.regenerateUserAsymmetricKeys,
+    ).not.toHaveBeenCalled();
+    expect(keyService.setPrivateKey).not.toHaveBeenCalled();
+  });
+
+  it("should not regenerate when user's encrypted private key is unavailable", async () => {
+    const mockVerificationResponse: VerifyAsymmetricKeysResponse = {
+      privateKeyDecryptable: true,
+      validPrivateKey: false,
+    };
+    setupVerificationResponse(mockVerificationResponse, sdkService);
+    keyService.userEncryptedPrivateKey$.mockReturnValue(
+      of(undefined as unknown as EncryptedString),
+    );
+
+    await sut.regenerateIfNeeded(userId);
+
+    expect(
+      userAsymmetricKeysRegenerationApiService.regenerateUserAsymmetricKeys,
+    ).not.toHaveBeenCalled();
+    expect(keyService.setPrivateKey).not.toHaveBeenCalled();
+  });
+
+  it("should not regenerate when user's public key is unavailable", async () => {
+    const mockVerificationResponse: VerifyAsymmetricKeysResponse = {
+      privateKeyDecryptable: true,
+      validPrivateKey: false,
+    };
+    setupVerificationResponse(mockVerificationResponse, sdkService);
+    apiService.getUserPublicKey.mockResolvedValue(undefined as any);
+
+    await sut.regenerateIfNeeded(userId);
+
+    expect(
+      userAsymmetricKeysRegenerationApiService.regenerateUserAsymmetricKeys,
+    ).not.toHaveBeenCalled();
+    expect(keyService.setPrivateKey).not.toHaveBeenCalled();
+  });
+
   it("should regenerate when private key is decryptable and invalid", async () => {
     const mockVerificationResponse: VerifyAsymmetricKeysResponse = {
       privateKeyDecryptable: true,
diff --git a/libs/key-management/src/user-asymmetric-key-regeneration/services/default-user-asymmetric-key-regeneration.service.ts b/libs/key-management/src/user-asymmetric-key-regeneration/services/default-user-asymmetric-key-regeneration.service.ts
index ffaa3a8260..3110ebad63 100644
--- a/libs/key-management/src/user-asymmetric-key-regeneration/services/default-user-asymmetric-key-regeneration.service.ts
+++ b/libs/key-management/src/user-asymmetric-key-regeneration/services/default-user-asymmetric-key-regeneration.service.ts
@@ -49,14 +49,31 @@ export class DefaultUserAsymmetricKeysRegenerationService
   }
 
   private async shouldRegenerate(userId: UserId): Promise<boolean> {
-    const [userKey, userKeyEncryptedPrivateKey, publicKeyResponse] = await firstValueFrom(
+    const userKey = await firstValueFrom(this.keyService.userKey$(userId));
+
+    // For SSO logins from untrusted devices, the userKey will not be available, and the private key regeneration process should be skipped.
+    // In such cases, regeneration will occur on the following device login flow.
+    if (!userKey) {
+      this.logService.info(
+        "[UserAsymmetricKeyRegeneration] User symmetric key unavailable, skipping regeneration for the user.",
+      );
+      return false;
+    }
+
+    const [userKeyEncryptedPrivateKey, publicKeyResponse] = await firstValueFrom(
       combineLatest([
-        this.keyService.userKey$(userId),
         this.keyService.userEncryptedPrivateKey$(userId),
         this.apiService.getUserPublicKey(userId),
       ]),
     );
 
+    if (!userKeyEncryptedPrivateKey || !publicKeyResponse) {
+      this.logService.warning(
+        "[UserAsymmetricKeyRegeneration] User's asymmetric key initialization data is unavailable, skipping regeneration.",
+      );
+      return false;
+    }
+
     const verificationResponse = await firstValueFrom(
       this.sdkService.client$.pipe(
         map((sdk) => {

From 0d5e4c6f581968cdfeaf700cc925d89a1ee2d071 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Thu, 9 Jan 2025 00:24:23 +0100
Subject: [PATCH 008/150] [PM-16859] Fix item creation resetting to login item
 type on browser (#12765)

* Fix broken item creation on browser

* Fix creation of ssh keys items from a filtered vault resetting to login on web
---
 .../new-item-dropdown/new-item-dropdown-v2.component.ts     | 2 +-
 .../src/app/vault/individual-vault/add-edit.component.ts    | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.ts
index be30b29fb1..d57b1d2fe3 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.ts
@@ -50,7 +50,7 @@ export class NewItemDropdownV2Component implements OnInit {
     this.tab = await BrowserApi.getTabFromCurrentWindow();
   }
 
-  async buildQueryParams(type: CipherType): Promise<AddEditQueryParams> {
+  buildQueryParams(type: CipherType): AddEditQueryParams {
     const poppedOut = BrowserPopupUtils.inPopout(window);
 
     const loginDetails: { uri?: string; name?: string } = {};
diff --git a/apps/web/src/app/vault/individual-vault/add-edit.component.ts b/apps/web/src/app/vault/individual-vault/add-edit.component.ts
index 64118e47ee..56db7dc88d 100644
--- a/apps/web/src/app/vault/individual-vault/add-edit.component.ts
+++ b/apps/web/src/app/vault/individual-vault/add-edit.component.ts
@@ -107,7 +107,11 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit, On
 
     // https://bitwarden.atlassian.net/browse/PM-10413
     // cannot generate ssh keys so block creation
-    if (this.type === CipherType.SshKey && this.cipherId == null) {
+    if (
+      this.type === CipherType.SshKey &&
+      this.cipherId == null &&
+      !(await this.configService.getFeatureFlag(FeatureFlag.SSHKeyVaultItem))
+    ) {
       this.type = CipherType.Login;
       this.cipher.type = CipherType.Login;
     }

From a3e876eb8fb534a3bdd9e907baf6b04f0a49143a Mon Sep 17 00:00:00 2001
From: Jordan Aasen <166539328+jaasen-livefront@users.noreply.github.com>
Date: Wed, 8 Jan 2025 16:19:51 -0800
Subject: [PATCH 009/150] fixed icon width (#12721)

---
 libs/angular/src/vault/components/icon.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/angular/src/vault/components/icon.component.html b/libs/angular/src/vault/components/icon.component.html
index 976c6ea421..9fec22f4a6 100644
--- a/libs/angular/src/vault/components/icon.component.html
+++ b/libs/angular/src/vault/components/icon.component.html
@@ -4,7 +4,7 @@
       [src]="data.image"
       [appFallbackSrc]="data.fallbackImage"
       *ngIf="data.imageEnabled && data.image"
-      class="tw-max-h-6 tw-max-w-6 tw-rounded-md"
+      class="tw-h-6 tw-w-6 tw-rounded-md"
       alt=""
       decoding="async"
       loading="lazy"

From 5c96634974e9dd82621489d6e3dd899ccfad1729 Mon Sep 17 00:00:00 2001
From: Addison Beck <github@addisonbeck.com>
Date: Wed, 8 Jan 2025 23:37:26 -0500
Subject: [PATCH 010/150] fix(ci): Adjust variable name missed during lint
 update (#12768)

---
 .github/workflows/deploy-web.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy-web.yml b/.github/workflows/deploy-web.yml
index 2dd30a8e96..9b89049128 100644
--- a/.github/workflows/deploy-web.yml
+++ b/.github/workflows/deploy-web.yml
@@ -70,7 +70,7 @@ jobs:
       retrive_secrets_keyvault: ${{ steps.config.outputs.retrive_secrets_keyvault }}
       sync_utility: ${{ steps.config.outputs.sync_utility }}
       sync_delete_destination_files: ${{ steps.config.outputs.sync_delete_destination_files }}
-      slack_channel_name: ${{ steps.config.outputs.slack-channel-name }}
+      slack_channel_name: ${{ steps.config.outputs.slack_channel_name }}
     steps:
       - name: Configure
         id: config

From aec25b14914f3f8f48f5e4d18959dd27254fd8ec Mon Sep 17 00:00:00 2001
From: Jonas Hendrickx <jhendrickx@bitwarden.com>
Date: Thu, 9 Jan 2025 08:53:29 +0100
Subject: [PATCH 011/150] =?UTF-8?q?[PM-15840]=20When=20org=20reaches=20col?=
 =?UTF-8?q?lection=20limit,=20organization=20upgrade=20pa=E2=80=A6=20(#126?=
 =?UTF-8?q?48)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ganization-subscription-cloud.component.ts | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
index 09a4890549..0805e92ee2 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
@@ -2,7 +2,7 @@
 // @ts-strict-ignore
 import { Component, OnDestroy, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
-import { concatMap, firstValueFrom, lastValueFrom, Observable, Subject, takeUntil } from "rxjs";
+import { firstValueFrom, lastValueFrom, Observable, Subject } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
@@ -42,6 +42,9 @@ import { SecretsManagerSubscriptionOptions } from "./sm-adjust-subscription.comp
   templateUrl: "organization-subscription-cloud.component.html",
 })
 export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy {
+  static readonly QUERY_PARAM_UPGRADE: string = "upgrade";
+  static readonly ROUTE_PARAM_ORGANIZATION_ID: string = "organizationId";
+
   sub: OrganizationSubscriptionResponse;
   lineItems: BillingSubscriptionItemResponse[] = [];
   organizationId: string;
@@ -82,7 +85,19 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
   ) {}
 
   async ngOnInit() {
-    if (this.route.snapshot.queryParamMap.get("upgrade")) {
+    this.organizationId =
+      this.route.snapshot.params[
+        OrganizationSubscriptionCloudComponent.ROUTE_PARAM_ORGANIZATION_ID
+      ];
+    await this.load();
+
+    this.showUpdatedSubscriptionStatusSection$ = this.configService.getFeatureFlag$(
+      FeatureFlag.AC1795_UpdatedSubscriptionStatusSection,
+    );
+
+    if (
+      this.route.snapshot.queryParams[OrganizationSubscriptionCloudComponent.QUERY_PARAM_UPGRADE]
+    ) {
       await this.changePlan();
       const productTierTypeStr = this.route.snapshot.queryParamMap.get("productTierType");
       if (productTierTypeStr != null) {
@@ -92,20 +107,6 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
         }
       }
     }
-
-    this.route.params
-      .pipe(
-        concatMap(async (params) => {
-          this.organizationId = params.organizationId;
-          await this.load();
-        }),
-        takeUntil(this.destroy$),
-      )
-      .subscribe();
-
-    this.showUpdatedSubscriptionStatusSection$ = this.configService.getFeatureFlag$(
-      FeatureFlag.AC1795_UpdatedSubscriptionStatusSection,
-    );
   }
 
   ngOnDestroy() {

From 67a59b60726dc7979685712315af582e55183e06 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Thu, 9 Jan 2025 13:01:49 +0100
Subject: [PATCH 012/150] [PM-15584] Fix autoprompt safari process reload
 (#12352)

* Move ownership of biometrics to key-management

* Move biometrics ipc ownership to km

* Move further files to km; split off preload / ipc to km

* Fix linting

* Fix linting

* Fix tests

* Extract biometric messaging service

* Fix tests

* Update .github/CODEOWNERS

Co-authored-by: Maciej Zieniuk <167752252+mzieniukbw@users.noreply.github.com>

* Update .github/CODEOWNERS

Co-authored-by: Maciej Zieniuk <167752252+mzieniukbw@users.noreply.github.com>

* Change ownership of native messaging to key-management

* Initial refactor

* Initial refactor

* Continued refactor

* Continued refactor

* Add message for when biometric unlock is not configured in desktop app

* Clean up lock component

* Clean up lock component html

* Fix build

* Fix status for windows and linux

* Continue refactor

* Refactor browser

* Fix unlock on extensions and add message enums

* Implement safari and fix setup

* Fix cli and web

* Make tests pass

* Add backward compatibility

* Fix version incompatibility

* Clean up auto-bio-prompt on desktop

* Fix biometric auto prompt on browser

* Fix tests

* Remove logging

* Add null in return type of unlockwithbiometricsforuser

* Move biometrics to libs/key-management

* Add README to capital whitelist

* Update package-lock.json

* Move km to key-management

* Move km to key-management

* Fix build for cli

* Import fixes

* Apply prettier fix

* Fix test

* Import fixes

* Import fixes

* Update libs/key-management/README.md

Co-authored-by: Maciej Zieniuk <167752252+mzieniukbw@users.noreply.github.com>

* Update libs/key-management/package.json

Co-authored-by: Maciej Zieniuk <167752252+mzieniukbw@users.noreply.github.com>

* Update lock file

* Change imports to top level km package

* Change import order

* Fix cli build

* Remove debug logging

* Fix user not showing in "notenabledinconnecteddesktopapp" helptext

* Document autoprompt and enable it on manual account switch

* Fix build

* Fix unlock on windows

* Rename duckduckgo message handler service

* Fix merge conflicts

* Fix codeowners

* Fix biometric message handler naming

* Update codeowners for renamed message handler service

* Fix cli build error

* Fix browser build errors

* Fix tests and update lock components

* Fix linking

* Fix build error

* Fix build error

* Fix build error

* Fix build error

* Fix logging message

* Fix conflicts

* Add jsdoc to biometric status enum

* Add jsdoc to biometric commands

* Remove unused initialization code

* Fix incorrectly checked setup-required status in desktop settings component

* Extract process reload when required

* Remvoe cryptoservice reference

* Remove commented out tests

* Improve tests

* Fix build

* Fix tests

* Fix biometric unlock

* Fix errors from prior merge

* Re-add tests

* Update lock component tests

* Add tests for process reload for biometric ipc unlock

* Fix autoprompt happening when it should not

* Fix lock v2

* Fix lint

* Update apps/browser/src/auth/popup/settings/account-security.component.ts

Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>

* Update apps/desktop/src/app/accounts/settings.component.ts

Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>

* Update apps/desktop/src/key-management/biometrics/main-biometrics.service.ts

Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>

* Update libs/key-management/src/biometrics/biometric.service.ts

Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>

* Update libs/key-management/src/biometrics/biometrics-status.ts

Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>

* Update apps/browser/src/background/nativeMessaging.background.ts

Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>

* Update apps/desktop/src/key-management/biometrics/main-biometrics.service.ts

Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>

* Cleanup

* Remove unavailabilityReason from UI

* Fix autoprompt safari process reload

* Apply changes according to feedback

* Adjust PR according to feedback

* Address feedback

* Fix account settings biometrics setting

* Fix build

* Cleanup

* Fix incorrect merge

* Allow disabling biometrics in browser while desktop app is disconnected

---------

Co-authored-by: Maciej Zieniuk <167752252+mzieniukbw@users.noreply.github.com>
Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>
---
 apps/browser/src/popup/app.component.ts        |  3 +++
 .../angular/lock/components/lock.component.ts  | 11 ++++++++++-
 .../src/biometrics/biometric-state.service.ts  | 18 ++++++++++++++++++
 .../src/biometrics/biometric.state.ts          | 11 +++++++++++
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/apps/browser/src/popup/app.component.ts b/apps/browser/src/popup/app.component.ts
index 8e51152be2..e8a660620a 100644
--- a/apps/browser/src/popup/app.component.ts
+++ b/apps/browser/src/popup/app.component.ts
@@ -21,6 +21,7 @@ import {
   ToastOptions,
   ToastService,
 } from "@bitwarden/components";
+import { BiometricStateService } from "@bitwarden/key-management";
 
 import { PopupCompactModeService } from "../platform/popup/layout/popup-compact-mode.service";
 import { PopupViewCacheService } from "../platform/popup/view-cache/popup-view-cache.service";
@@ -64,6 +65,7 @@ export class AppComponent implements OnInit, OnDestroy {
     private toastService: ToastService,
     private accountService: AccountService,
     private animationControlService: AnimationControlService,
+    private biometricStateService: BiometricStateService,
   ) {}
 
   async ngOnInit() {
@@ -134,6 +136,7 @@ export class AppComponent implements OnInit, OnDestroy {
           } else if (msg.command === "reloadProcess") {
             if (this.platformUtilsService.isSafari()) {
               window.setTimeout(() => {
+                this.biometricStateService.updateLastProcessReload();
                 window.location.reload();
               }, 2000);
             }
diff --git a/libs/key-management/src/angular/lock/components/lock.component.ts b/libs/key-management/src/angular/lock/components/lock.component.ts
index e9c7d0d607..23f1a7a433 100644
--- a/libs/key-management/src/angular/lock/components/lock.component.ts
+++ b/libs/key-management/src/angular/lock/components/lock.component.ts
@@ -70,6 +70,9 @@ const clientTypeToSuccessRouteRecord: Partial<Record<ClientType, string>> = {
   [ClientType.Browser]: "/tabs/current",
 };
 
+/// The minimum amount of time to wait after a process reload for a biometrics auto prompt to be possible
+/// Fixes safari autoprompt behavior
+const AUTOPROMPT_BIOMETRICS_PROCESS_RELOAD_DELAY = 5000;
 @Component({
   selector: "bit-lock",
   templateUrl: "lock.component.html",
@@ -304,7 +307,13 @@ export class LockComponent implements OnInit, OnDestroy {
         (await this.biometricService.getShouldAutopromptNow())
       ) {
         await this.biometricService.setShouldAutopromptNow(false);
-        await this.unlockViaBiometrics();
+        if (
+          (await this.biometricStateService.getLastProcessReload()) == null ||
+          Date.now() - (await this.biometricStateService.getLastProcessReload()).getTime() >
+            AUTOPROMPT_BIOMETRICS_PROCESS_RELOAD_DELAY
+        ) {
+          await this.unlockViaBiometrics();
+        }
       }
     }
   }
diff --git a/libs/key-management/src/biometrics/biometric-state.service.ts b/libs/key-management/src/biometrics/biometric-state.service.ts
index 138e2589b1..c7f958c97a 100644
--- a/libs/key-management/src/biometrics/biometric-state.service.ts
+++ b/libs/key-management/src/biometrics/biometric-state.service.ts
@@ -14,6 +14,7 @@ import {
   PROMPT_AUTOMATICALLY,
   PROMPT_CANCELLED,
   FINGERPRINT_VALIDATED,
+  LAST_PROCESS_RELOAD,
 } from "./biometric.state";
 
 export abstract class BiometricStateService {
@@ -106,6 +107,10 @@ export abstract class BiometricStateService {
    */
   abstract setFingerprintValidated(validated: boolean): Promise<void>;
 
+  abstract updateLastProcessReload(): Promise<void>;
+
+  abstract getLastProcessReload(): Promise<Date>;
+
   abstract logout(userId: UserId): Promise<void>;
 }
 
@@ -117,6 +122,7 @@ export class DefaultBiometricStateService implements BiometricStateService {
   private promptCancelledState: GlobalState<Record<UserId, boolean>>;
   private promptAutomaticallyState: ActiveUserState<boolean>;
   private fingerprintValidatedState: GlobalState<boolean>;
+  private lastProcessReloadState: GlobalState<Date>;
   biometricUnlockEnabled$: Observable<boolean>;
   encryptedClientKeyHalf$: Observable<EncString | undefined>;
   requirePasswordOnStart$: Observable<boolean>;
@@ -124,6 +130,7 @@ export class DefaultBiometricStateService implements BiometricStateService {
   promptCancelled$: Observable<boolean>;
   promptAutomatically$: Observable<boolean>;
   fingerprintValidated$: Observable<boolean>;
+  lastProcessReload$: Observable<Date>;
 
   constructor(private stateProvider: StateProvider) {
     this.biometricUnlockEnabledState = this.stateProvider.getActive(BIOMETRIC_UNLOCK_ENABLED);
@@ -159,6 +166,9 @@ export class DefaultBiometricStateService implements BiometricStateService {
 
     this.fingerprintValidatedState = this.stateProvider.getGlobal(FINGERPRINT_VALIDATED);
     this.fingerprintValidated$ = this.fingerprintValidatedState.state$.pipe(map(Boolean));
+
+    this.lastProcessReloadState = this.stateProvider.getGlobal(LAST_PROCESS_RELOAD);
+    this.lastProcessReload$ = this.lastProcessReloadState.state$;
   }
 
   async setBiometricUnlockEnabled(enabled: boolean): Promise<void> {
@@ -270,6 +280,14 @@ export class DefaultBiometricStateService implements BiometricStateService {
   async setFingerprintValidated(validated: boolean): Promise<void> {
     await this.fingerprintValidatedState.update(() => validated);
   }
+
+  async updateLastProcessReload(): Promise<void> {
+    await this.lastProcessReloadState.update(() => new Date());
+  }
+
+  async getLastProcessReload(): Promise<Date> {
+    return await firstValueFrom(this.lastProcessReload$);
+  }
 }
 
 function encryptedClientKeyHalfToEncString(
diff --git a/libs/key-management/src/biometrics/biometric.state.ts b/libs/key-management/src/biometrics/biometric.state.ts
index f88bd1da58..c37b7d7370 100644
--- a/libs/key-management/src/biometrics/biometric.state.ts
+++ b/libs/key-management/src/biometrics/biometric.state.ts
@@ -95,3 +95,14 @@ export const FINGERPRINT_VALIDATED = new KeyDefinition<boolean>(
     deserializer: (obj) => obj,
   },
 );
+
+/**
+ * Last process reload time
+ */
+export const LAST_PROCESS_RELOAD = new KeyDefinition<Date>(
+  BIOMETRIC_SETTINGS_DISK,
+  "lastProcessReload",
+  {
+    deserializer: (obj) => new Date(obj),
+  },
+);

From a527aa9196d47db7ac0371752d3a6d5a0c901fd3 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Thu, 9 Jan 2025 14:07:40 +0100
Subject: [PATCH 013/150] [PM-2094] Fix windows hello focusing behavior
 (#12255)

* Implement new windows focus behavior

* Fix formatting

* Fix clippy warning

* Fix clippy warning

* Fix build

* Fix build
---
 apps/desktop/desktop_native/Cargo.lock        | 10 --
 apps/desktop/desktop_native/core/Cargo.toml   |  9 +-
 .../desktop_native/core/src/biometric/mod.rs  |  8 +-
 .../core/src/biometric/windows.rs             | 95 ++++++-------------
 .../core/src/biometric/windows_focus.rs       | 28 ++++++
 apps/desktop/desktop_native/core/src/lib.rs   |  6 --
 apps/desktop/desktop_native/proxy/Cargo.toml  |  2 +-
 apps/desktop/desktop_native/proxy/src/main.rs |  9 ++
 .../desktop_native/proxy/src/windows.rs       | 23 +++++
 9 files changed, 97 insertions(+), 93 deletions(-)
 create mode 100644 apps/desktop/desktop_native/core/src/biometric/windows_focus.rs
 create mode 100644 apps/desktop/desktop_native/proxy/src/windows.rs

diff --git a/apps/desktop/desktop_native/Cargo.lock b/apps/desktop/desktop_native/Cargo.lock
index 8affdca776..fceef8e6e7 100644
--- a/apps/desktop/desktop_native/Cargo.lock
+++ b/apps/desktop/desktop_native/Cargo.lock
@@ -916,7 +916,6 @@ dependencies = [
  "pin-project",
  "pkcs8",
  "rand",
- "retry",
  "rsa",
  "russh-cryptovec",
  "scopeguard",
@@ -2388,15 +2387,6 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
-[[package]]
-name = "retry"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9166d72162de3575f950507683fac47e30f6f2c3836b71b7fbc61aa517c9c5f4"
-dependencies = [
- "rand",
-]
-
 [[package]]
 name = "rsa"
 version = "0.9.6"
diff --git a/apps/desktop/desktop_native/core/Cargo.toml b/apps/desktop/desktop_native/core/Cargo.toml
index dde5a3b1c8..cc407f09ec 100644
--- a/apps/desktop/desktop_native/core/Cargo.toml
+++ b/apps/desktop/desktop_native/core/Cargo.toml
@@ -6,18 +6,16 @@ version = "0.0.0"
 publish = false
 
 [features]
-default = ["sys"]
-manual_test = []
-
-sys = [
+default = [
   "dep:widestring",
   "dep:windows",
   "dep:core-foundation",
   "dep:security-framework",
   "dep:security-framework-sys",
   "dep:zbus",
-  "dep:zbus_polkit",
+  "dep:zbus_polkit"
 ]
+manual_test = []
 
 [dependencies]
 aes = "=0.8.4"
@@ -36,7 +34,6 @@ futures = "=0.3.31"
 interprocess = { version = "=2.2.1", features = ["tokio"] }
 log = "=0.4.22"
 rand = "=0.8.5"
-retry = "=2.0.0"
 russh-cryptovec = "=0.7.3"
 scopeguard = "=1.2.0"
 sha2 = "=0.10.8"
diff --git a/apps/desktop/desktop_native/core/src/biometric/mod.rs b/apps/desktop/desktop_native/core/src/biometric/mod.rs
index 7ad9bcb032..79be43b1bf 100644
--- a/apps/desktop/desktop_native/core/src/biometric/mod.rs
+++ b/apps/desktop/desktop_native/core/src/biometric/mod.rs
@@ -3,12 +3,16 @@ use anyhow::{anyhow, Result};
 
 #[allow(clippy::module_inception)]
 #[cfg_attr(target_os = "linux", path = "unix.rs")]
-#[cfg_attr(target_os = "windows", path = "windows.rs")]
 #[cfg_attr(target_os = "macos", path = "macos.rs")]
+#[cfg_attr(target_os = "windows", path = "windows.rs")]
 mod biometric;
 
-use base64::{engine::general_purpose::STANDARD as base64_engine, Engine};
 pub use biometric::Biometric;
+
+#[cfg(target_os = "windows")]
+pub mod windows_focus;
+
+use base64::{engine::general_purpose::STANDARD as base64_engine, Engine};
 use sha2::{Digest, Sha256};
 
 use crate::crypto::{self, CipherString};
diff --git a/apps/desktop/desktop_native/core/src/biometric/windows.rs b/apps/desktop/desktop_native/core/src/biometric/windows.rs
index c91b379c22..70813082fa 100644
--- a/apps/desktop/desktop_native/core/src/biometric/windows.rs
+++ b/apps/desktop/desktop_native/core/src/biometric/windows.rs
@@ -1,12 +1,15 @@
-use std::{ffi::c_void, str::FromStr};
+use std::{
+    ffi::c_void,
+    str::FromStr,
+    sync::{atomic::AtomicBool, Arc},
+};
 
 use anyhow::{anyhow, Result};
 use base64::{engine::general_purpose::STANDARD as base64_engine, Engine};
 use rand::RngCore;
-use retry::delay::Fixed;
 use sha2::{Digest, Sha256};
 use windows::{
-    core::{factory, h, s, HSTRING},
+    core::{factory, h, HSTRING},
     Foundation::IAsyncOperation,
     Security::{
         Credentials::{
@@ -14,17 +17,7 @@ use windows::{
         },
         Cryptography::CryptographicBuffer,
     },
-    Win32::{
-        Foundation::HWND,
-        System::WinRT::IUserConsentVerifierInterop,
-        UI::{
-            Input::KeyboardAndMouse::{
-                keybd_event, GetAsyncKeyState, SetFocus, KEYEVENTF_EXTENDEDKEY, KEYEVENTF_KEYUP,
-                VK_MENU,
-            },
-            WindowsAndMessaging::{FindWindowA, SetForegroundWindow},
-        },
-    },
+    Win32::{Foundation::HWND, System::WinRT::IUserConsentVerifierInterop},
 };
 
 use crate::{
@@ -32,7 +25,10 @@ use crate::{
     crypto::CipherString,
 };
 
-use super::{decrypt, encrypt};
+use super::{
+    decrypt, encrypt,
+    windows_focus::{focus_security_prompt, set_focus},
+};
 
 /// The Windows OS implementation of the biometric trait.
 pub struct Biometric {}
@@ -103,8 +99,22 @@ impl super::BiometricTrait for Biometric {
 
         let challenge_buffer = CryptographicBuffer::CreateFromByteArray(&challenge)?;
         let async_operation = result.Credential()?.RequestSignAsync(&challenge_buffer)?;
-        focus_security_prompt()?;
-        let signature = async_operation.get()?;
+        focus_security_prompt();
+
+        let done = Arc::new(AtomicBool::new(false));
+        let done_clone = done.clone();
+        let _ = std::thread::spawn(move || loop {
+            if !done_clone.load(std::sync::atomic::Ordering::Relaxed) {
+                focus_security_prompt();
+                std::thread::sleep(std::time::Duration::from_millis(500));
+            } else {
+                break;
+            }
+        });
+
+        let signature = async_operation.get();
+        done.store(true, std::sync::atomic::Ordering::Relaxed);
+        let signature = signature?;
 
         if signature.Status()? != KeyCredentialStatus::Success {
             return Err(anyhow!("Failed to sign data"));
@@ -168,57 +178,6 @@ fn random_challenge() -> [u8; 16] {
     challenge
 }
 
-/// Searches for a window that looks like a security prompt and set it as focused.
-///
-/// Gives up after 1.5 seconds with a delay of 500ms between each try.
-fn focus_security_prompt() -> Result<()> {
-    unsafe fn try_find_and_set_focus(
-        class_name: windows::core::PCSTR,
-    ) -> retry::OperationResult<(), ()> {
-        let hwnd = unsafe { FindWindowA(class_name, None) };
-        if let Ok(hwnd) = hwnd {
-            set_focus(hwnd);
-            return retry::OperationResult::Ok(());
-        }
-        retry::OperationResult::Retry(())
-    }
-
-    let class_name = s!("Credential Dialog Xaml Host");
-    retry::retry_with_index(Fixed::from_millis(500), |current_try| {
-        if current_try > 3 {
-            return retry::OperationResult::Err(());
-        }
-
-        unsafe { try_find_and_set_focus(class_name) }
-    })
-    .map_err(|_| anyhow!("Failed to find security prompt"))
-}
-
-fn set_focus(window: HWND) {
-    let mut pressed = false;
-
-    unsafe {
-        // Simulate holding down Alt key to bypass windows limitations
-        //  https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-getasynckeystate#return-value
-        //  The most significant bit indicates if the key is currently being pressed. This means the
-        //  value will be negative if the key is pressed.
-        if GetAsyncKeyState(VK_MENU.0 as i32) >= 0 {
-            pressed = true;
-            keybd_event(VK_MENU.0 as u8, 0, KEYEVENTF_EXTENDEDKEY, 0);
-        }
-        let _ = SetForegroundWindow(window);
-        let _ = SetFocus(window);
-        if pressed {
-            keybd_event(
-                VK_MENU.0 as u8,
-                0,
-                KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP,
-                0,
-            );
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/apps/desktop/desktop_native/core/src/biometric/windows_focus.rs b/apps/desktop/desktop_native/core/src/biometric/windows_focus.rs
new file mode 100644
index 0000000000..d5e92a67de
--- /dev/null
+++ b/apps/desktop/desktop_native/core/src/biometric/windows_focus.rs
@@ -0,0 +1,28 @@
+use windows::{
+    core::s,
+    Win32::{
+        Foundation::HWND,
+        UI::{
+            Input::KeyboardAndMouse::SetFocus,
+            WindowsAndMessaging::{FindWindowA, SetForegroundWindow},
+        },
+    },
+};
+
+/// Searches for a window that looks like a security prompt and set it as focused.
+/// Only works when the process has permission to foreground, either by being in foreground
+/// Or by being given foreground permission https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-setforegroundwindow#remarks
+pub fn focus_security_prompt() {
+    let class_name = s!("Credential Dialog Xaml Host");
+    let hwnd = unsafe { FindWindowA(class_name, None) };
+    if let Ok(hwnd) = hwnd {
+        set_focus(hwnd);
+    }
+}
+
+pub(crate) fn set_focus(window: HWND) {
+    unsafe {
+        let _ = SetForegroundWindow(window);
+        let _ = SetFocus(window);
+    }
+}
diff --git a/apps/desktop/desktop_native/core/src/lib.rs b/apps/desktop/desktop_native/core/src/lib.rs
index b63c773209..4a6686cc1f 100644
--- a/apps/desktop/desktop_native/core/src/lib.rs
+++ b/apps/desktop/desktop_native/core/src/lib.rs
@@ -1,16 +1,10 @@
 pub mod autofill;
-#[cfg(feature = "sys")]
 pub mod biometric;
-#[cfg(feature = "sys")]
 pub mod clipboard;
 pub mod crypto;
 pub mod error;
 pub mod ipc;
-#[cfg(feature = "sys")]
 pub mod password;
-#[cfg(feature = "sys")]
 pub mod powermonitor;
-#[cfg(feature = "sys")]
 pub mod process_isolation;
-#[cfg(feature = "sys")]
 pub mod ssh_agent;
diff --git a/apps/desktop/desktop_native/proxy/Cargo.toml b/apps/desktop/desktop_native/proxy/Cargo.toml
index 06e587b442..3618a11a92 100644
--- a/apps/desktop/desktop_native/proxy/Cargo.toml
+++ b/apps/desktop/desktop_native/proxy/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 
 [dependencies]
 anyhow = "=1.0.94"
-desktop_core = { path = "../core", default-features = false }
+desktop_core = { path = "../core" }
 futures = "=0.3.31"
 log = "=0.4.22"
 simplelog = "=0.12.2"
diff --git a/apps/desktop/desktop_native/proxy/src/main.rs b/apps/desktop/desktop_native/proxy/src/main.rs
index bfd84b206d..ba29e00cf1 100644
--- a/apps/desktop/desktop_native/proxy/src/main.rs
+++ b/apps/desktop/desktop_native/proxy/src/main.rs
@@ -5,6 +5,9 @@ use futures::{FutureExt, SinkExt, StreamExt};
 use log::*;
 use tokio_util::codec::LengthDelimitedCodec;
 
+#[cfg(target_os = "windows")]
+mod windows;
+
 #[cfg(target_os = "macos")]
 embed_plist::embed_info_plist!("../../../resources/info.desktop_proxy.plist");
 
@@ -49,6 +52,9 @@ fn init_logging(log_path: &Path, console_level: LevelFilter, file_level: LevelFi
 ///
 #[tokio::main(flavor = "current_thread")]
 async fn main() {
+    #[cfg(target_os = "windows")]
+    let should_foreground = windows::allow_foreground();
+
     let sock_path = desktop_core::ipc::path("bitwarden");
 
     let log_path = {
@@ -142,6 +148,9 @@ async fn main() {
 
             // Listen to stdin and send messages to ipc processor.
             msg = stdin.next() => {
+                #[cfg(target_os = "windows")]
+                should_foreground.store(true, std::sync::atomic::Ordering::Relaxed);
+
                 match msg {
                     Some(Ok(msg)) => {
                         let m = String::from_utf8(msg.to_vec()).unwrap();
diff --git a/apps/desktop/desktop_native/proxy/src/windows.rs b/apps/desktop/desktop_native/proxy/src/windows.rs
new file mode 100644
index 0000000000..cb0656fc7f
--- /dev/null
+++ b/apps/desktop/desktop_native/proxy/src/windows.rs
@@ -0,0 +1,23 @@
+use std::sync::{
+    atomic::{AtomicBool, Ordering},
+    Arc,
+};
+
+pub fn allow_foreground() -> Arc<AtomicBool> {
+    let should_foreground = Arc::new(AtomicBool::new(false));
+    let should_foreground_clone = should_foreground.clone();
+    let _ = std::thread::spawn(move || loop {
+        if !should_foreground_clone.load(Ordering::Relaxed) {
+            std::thread::sleep(std::time::Duration::from_millis(100));
+            continue;
+        }
+        should_foreground_clone.store(false, Ordering::Relaxed);
+
+        for _ in 0..60 {
+            desktop_core::biometric::windows_focus::focus_security_prompt();
+            std::thread::sleep(std::time::Duration::from_millis(1000));
+        }
+    });
+
+    should_foreground
+}

From 1b64bc246263383693cea778387a1717350d955a Mon Sep 17 00:00:00 2001
From: Brandon Treston <btreston@bitwarden.com>
Date: Thu, 9 Jan 2025 09:58:45 -0500
Subject: [PATCH 014/150] Fix invite member dialog remaining count (#12667)

---
 .../member-dialog/member-dialog.component.html        | 11 ++++++-----
 .../member-dialog/member-dialog.component.ts          |  5 +++++
 apps/web/src/locales/en/messages.json                 |  3 +++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html
index c77c8fc935..3bef1b6ccc 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html
@@ -23,14 +23,15 @@
         <bit-tab [label]="'role' | i18n">
           <ng-container *ngIf="!editMode">
             <p bitTypography="body1">{{ "inviteUserDesc" | i18n }}</p>
-            <bit-form-field>
+            <bit-form-field *ngIf="remainingSeats$ | async as remainingSeats">
               <bit-label>{{ "email" | i18n }}</bit-label>
               <input id="emails" type="text" appAutoFocus bitInput formControlName="emails" />
-              <bit-hint>{{
-                "inviteMultipleEmailDesc"
-                  | i18n
-                    : (organization.productTierType === ProductTierType.TeamsStarter ? "10" : "20")
+              <bit-hint *ngIf="remainingSeats > 1; else singleSeat">{{
+                "inviteMultipleEmailDesc" | i18n: remainingSeats
               }}</bit-hint>
+              <ng-template #singleSeat>
+                <bit-hint>{{ "inviteSingleEmailDesc" | i18n: remainingSeats }}</bit-hint>
+              </ng-template>
             </bit-form-field>
           </ng-container>
           <bit-radio-group formControlName="type">
diff --git a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts
index f4e2fbccbe..514e7701e4 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts
@@ -94,6 +94,7 @@ export class MemberDialogComponent implements OnDestroy {
   PermissionMode = PermissionMode;
   showNoMasterPasswordWarning = false;
   isOnSecretsManagerStandalone: boolean;
+  remainingSeats$: Observable<number>;
 
   protected organization$: Observable<Organization>;
   protected collectionAccessItems: AccessItemView[] = [];
@@ -260,6 +261,10 @@ export class MemberDialogComponent implements OnDestroy {
 
         this.loading = false;
       });
+
+    this.remainingSeats$ = this.organization$.pipe(
+      map((organization) => organization.seats - this.params.numConfirmedMembers),
+    );
   }
 
   private setFormValidators(organization: Organization) {
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 1c7baa3175..3536e9339b 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -3278,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "This user is using two-step login to protect their account."
   },

From 11a7eb2f734abb5e49493613d3d056080306d353 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Thu, 9 Jan 2025 16:06:14 +0100
Subject: [PATCH 015/150] [PM-16612] Prevent emergency access fingerprint
 confirmation dialog being spoofable (#12651)

* Prevent emergency access dialog spoofing

* Fix tests
---
 .../services/emergency-access.service.spec.ts  | 12 ++----------
 .../services/emergency-access.service.ts       |  5 ++---
 .../emergency-access-confirm.component.ts      | 18 ++++++++----------
 .../emergency-access.component.ts              | 15 +++++++++++++--
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/apps/web/src/app/auth/emergency-access/services/emergency-access.service.spec.ts b/apps/web/src/app/auth/emergency-access/services/emergency-access.service.spec.ts
index 6cc94ef2d1..1c7d870175 100644
--- a/apps/web/src/app/auth/emergency-access/services/emergency-access.service.spec.ts
+++ b/apps/web/src/app/auth/emergency-access/services/emergency-access.service.spec.ts
@@ -117,14 +117,7 @@ describe("EmergencyAccessService", () => {
         const granteeId = "grantee-id";
         const mockUserKey = new SymmetricCryptoKey(new Uint8Array(64)) as UserKey;
 
-        const mockPublicKeyB64 = "some-public-key-in-base64";
-
-        // const publicKey = Utils.fromB64ToArray(publicKeyB64);
-
-        const mockUserPublicKeyResponse = new UserKeyResponse({
-          UserId: granteeId,
-          PublicKey: mockPublicKeyB64,
-        });
+        const publicKey = new Uint8Array(64);
 
         const mockUserPublicKeyEncryptedUserKey = new EncString(
           EncryptionType.AesCbc256_HmacSha256_B64,
@@ -132,14 +125,13 @@ describe("EmergencyAccessService", () => {
         );
 
         keyService.getUserKey.mockResolvedValueOnce(mockUserKey);
-        apiService.getUserPublicKey.mockResolvedValueOnce(mockUserPublicKeyResponse);
 
         encryptService.rsaEncrypt.mockResolvedValueOnce(mockUserPublicKeyEncryptedUserKey);
 
         emergencyAccessApiService.postEmergencyAccessConfirm.mockResolvedValueOnce();
 
         // Act
-        await emergencyAccessService.confirm(id, granteeId);
+        await emergencyAccessService.confirm(id, granteeId, publicKey);
 
         // Assert
         expect(emergencyAccessApiService.postEmergencyAccessConfirm).toHaveBeenCalledWith(id, {
diff --git a/apps/web/src/app/auth/emergency-access/services/emergency-access.service.ts b/apps/web/src/app/auth/emergency-access/services/emergency-access.service.ts
index acdf7623f9..62a59da299 100644
--- a/apps/web/src/app/auth/emergency-access/services/emergency-access.service.ts
+++ b/apps/web/src/app/auth/emergency-access/services/emergency-access.service.ts
@@ -153,14 +153,13 @@ export class EmergencyAccessService
    * Intended for grantor.
    * @param id emergency access id
    * @param token secret token provided in email
+   * @param publicKey public key of grantee
    */
-  async confirm(id: string, granteeId: string) {
+  async confirm(id: string, granteeId: string, publicKey: Uint8Array): Promise<void> {
     const userKey = await this.keyService.getUserKey();
     if (!userKey) {
       throw new Error("No user key found");
     }
-    const publicKeyResponse = await this.apiService.getUserPublicKey(granteeId);
-    const publicKey = Utils.fromB64ToArray(publicKeyResponse.publicKey);
 
     try {
       this.logService.debug(
diff --git a/apps/web/src/app/auth/settings/emergency-access/confirm/emergency-access-confirm.component.ts b/apps/web/src/app/auth/settings/emergency-access/confirm/emergency-access-confirm.component.ts
index 9c6296c22a..1180c1a354 100644
--- a/apps/web/src/app/auth/settings/emergency-access/confirm/emergency-access-confirm.component.ts
+++ b/apps/web/src/app/auth/settings/emergency-access/confirm/emergency-access-confirm.component.ts
@@ -4,10 +4,8 @@ import { DialogConfig, DialogRef, DIALOG_DATA } from "@angular/cdk/dialog";
 import { Component, OnInit, Inject } from "@angular/core";
 import { FormBuilder } from "@angular/forms";
 
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationManagementPreferencesService } from "@bitwarden/common/admin-console/abstractions/organization-management-preferences/organization-management-preferences.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { DialogService } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
 
@@ -21,6 +19,8 @@ type EmergencyAccessConfirmDialogData = {
   userId: string;
   /** traces a unique emergency request  */
   emergencyAccessId: string;
+  /** user public key */
+  publicKey: Uint8Array;
 };
 @Component({
   selector: "emergency-access-confirm",
@@ -36,7 +36,6 @@ export class EmergencyAccessConfirmComponent implements OnInit {
   constructor(
     @Inject(DIALOG_DATA) protected params: EmergencyAccessConfirmDialogData,
     private formBuilder: FormBuilder,
-    private apiService: ApiService,
     private keyService: KeyService,
     protected organizationManagementPreferencesService: OrganizationManagementPreferencesService,
     private logService: LogService,
@@ -45,13 +44,12 @@ export class EmergencyAccessConfirmComponent implements OnInit {
 
   async ngOnInit() {
     try {
-      const publicKeyResponse = await this.apiService.getUserPublicKey(this.params.userId);
-      if (publicKeyResponse != null) {
-        const publicKey = Utils.fromB64ToArray(publicKeyResponse.publicKey);
-        const fingerprint = await this.keyService.getFingerprint(this.params.userId, publicKey);
-        if (fingerprint != null) {
-          this.fingerprint = fingerprint.join("-");
-        }
+      const fingerprint = await this.keyService.getFingerprint(
+        this.params.userId,
+        this.params.publicKey,
+      );
+      if (fingerprint != null) {
+        this.fingerprint = fingerprint.join("-");
       }
     } catch (e) {
       this.logService.error(e);
diff --git a/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts b/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts
index 5271e50c9a..73e32add5c 100644
--- a/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts
+++ b/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts
@@ -4,6 +4,7 @@ import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core";
 import { lastValueFrom, Observable, firstValueFrom, switchMap } from "rxjs";
 
 import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { OrganizationManagementPreferencesService } from "@bitwarden/common/admin-console/abstractions/organization-management-preferences/organization-management-preferences.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -13,6 +14,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { DialogService, ToastService } from "@bitwarden/components";
 
 import { EmergencyAccessService } from "../../emergency-access";
@@ -70,6 +72,7 @@ export class EmergencyAccessComponent implements OnInit {
     billingAccountProfileStateService: BillingAccountProfileStateService,
     protected organizationManagementPreferencesService: OrganizationManagementPreferencesService,
     private toastService: ToastService,
+    private apiService: ApiService,
     private accountService: AccountService,
   ) {
     this.canAccessPremium$ = this.accountService.activeAccount$.pipe(
@@ -147,6 +150,9 @@ export class EmergencyAccessComponent implements OnInit {
       return;
     }
 
+    const publicKeyResponse = await this.apiService.getUserPublicKey(contact.granteeId);
+    const publicKey = Utils.fromB64ToArray(publicKeyResponse.publicKey);
+
     const autoConfirm = await firstValueFrom(
       this.organizationManagementPreferencesService.autoConfirmFingerPrints.state$,
     );
@@ -156,11 +162,12 @@ export class EmergencyAccessComponent implements OnInit {
           name: this.userNamePipe.transform(contact),
           emergencyAccessId: contact.id,
           userId: contact?.granteeId,
+          publicKey,
         },
       });
       const result = await lastValueFrom(dialogRef.closed);
       if (result === EmergencyAccessConfirmDialogResult.Confirmed) {
-        await this.emergencyAccessService.confirm(contact.id, contact.granteeId);
+        await this.emergencyAccessService.confirm(contact.id, contact.granteeId, publicKey);
         updateUser();
         this.toastService.showToast({
           variant: "success",
@@ -171,7 +178,11 @@ export class EmergencyAccessComponent implements OnInit {
       return;
     }
 
-    this.actionPromise = this.emergencyAccessService.confirm(contact.id, contact.granteeId);
+    this.actionPromise = this.emergencyAccessService.confirm(
+      contact.id,
+      contact.granteeId,
+      publicKey,
+    );
     await this.actionPromise;
     updateUser();
 

From 1a80ae8968f84aa04bed5de297b57e0e5d6d3074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Ch=C4=99ci=C5=84ski?=
 <mchecinski@bitwarden.com>
Date: Thu, 9 Jan 2025 16:10:28 +0100
Subject: [PATCH 016/150] [BRE-513] Remove brew bump desktop workflow (#12772)

---
 .github/workflows/brew-bump-desktop.yml | 41 -------------------------
 1 file changed, 41 deletions(-)
 delete mode 100644 .github/workflows/brew-bump-desktop.yml

diff --git a/.github/workflows/brew-bump-desktop.yml b/.github/workflows/brew-bump-desktop.yml
deleted file mode 100644
index 1b3c99128b..0000000000
--- a/.github/workflows/brew-bump-desktop.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: Bump Desktop Cask
-
-on:
-  push:
-    tags:
-      - desktop-v**
-  workflow_dispatch:
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  update-desktop-cask:
-    name: Update Bitwarden Desktop Cask
-    runs-on: macos-13
-    steps:
-      - name: Login to Azure
-        uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
-        with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
-
-      - name: Retrieve secrets
-        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
-        with:
-          keyvault: "bitwarden-ci"
-          secrets: "brew-bump-workflow-pat"
-
-      - name: Update Homebrew cask
-        uses: macauley/action-homebrew-bump-cask@445c42390d790569d938f9068d01af39ca030feb # v1.0.0
-        with:
-          # Required, custom GitHub access token with the 'public_repo' and 'workflow' scopes
-          token: ${{ steps.retrieve-secrets.outputs.brew-bump-workflow-pat }}
-          org: bitwarden
-          tap: Homebrew/homebrew-cask
-          cask: bitwarden
-          tag: ${{ github.ref }}
-          revision: ${{ github.sha }}
-          force: true
-          dryrun: true

From 20c8eda9863a4162a6c3ab2c0dc93a41c59d13c6 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Thu, 9 Jan 2025 16:37:16 +0100
Subject: [PATCH 017/150] Fix ssh agent initializiation (#12779)

---
 .../platform/services/ssh-agent.service.ts    | 37 ++++++++++++++++---
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/apps/desktop/src/platform/services/ssh-agent.service.ts b/apps/desktop/src/platform/services/ssh-agent.service.ts
index e860ebe1db..726d28022e5 100644
--- a/apps/desktop/src/platform/services/ssh-agent.service.ts
+++ b/apps/desktop/src/platform/services/ssh-agent.service.ts
@@ -45,6 +45,8 @@ export class SshAgentService implements OnDestroy {
   SSH_VAULT_UNLOCK_REQUEST_TIMEOUT = 60_000;
   SSH_REQUEST_UNLOCK_POLLING_INTERVAL = 100;
 
+  private isFeatureFlagEnabled = false;
+
   private destroy$ = new Subject<void>();
 
   constructor(
@@ -65,18 +67,19 @@ export class SshAgentService implements OnDestroy {
       .getFeatureFlag$(FeatureFlag.SSHAgent)
       .pipe(
         concatMap(async (enabled) => {
-          if (enabled && !(await ipc.platform.sshAgent.isLoaded())) {
-            return this.initSshAgent();
+          this.isFeatureFlagEnabled = enabled;
+          if (!(await ipc.platform.sshAgent.isLoaded()) && enabled) {
+            await ipc.platform.sshAgent.init();
           }
         }),
         takeUntil(this.destroy$),
       )
       .subscribe();
+
+    await this.initListeners();
   }
 
-  private async initSshAgent() {
-    await ipc.platform.sshAgent.init();
-
+  private async initListeners() {
     this.messageListener
       .messages$(new CommandDefinition("sshagent.signrequest"))
       .pipe(
@@ -179,18 +182,30 @@ export class SshAgentService implements OnDestroy {
 
     this.accountService.activeAccount$.pipe(skip(1), takeUntil(this.destroy$)).subscribe({
       next: (account) => {
+        if (!this.isFeatureFlagEnabled) {
+          return;
+        }
+
         this.logService.info("Active account changed, clearing SSH keys");
         ipc.platform.sshAgent
           .clearKeys()
           .catch((e) => this.logService.error("Failed to clear SSH keys", e));
       },
       error: (e: unknown) => {
+        if (!this.isFeatureFlagEnabled) {
+          return;
+        }
+
         this.logService.error("Error in active account observable", e);
         ipc.platform.sshAgent
           .clearKeys()
           .catch((e) => this.logService.error("Failed to clear SSH keys", e));
       },
       complete: () => {
+        if (!this.isFeatureFlagEnabled) {
+          return;
+        }
+
         this.logService.info("Active account observable completed, clearing SSH keys");
         ipc.platform.sshAgent
           .clearKeys()
@@ -204,11 +219,23 @@ export class SshAgentService implements OnDestroy {
     ])
       .pipe(
         concatMap(async ([, enabled]) => {
+          if (!this.isFeatureFlagEnabled) {
+            return;
+          }
+
           if (!enabled) {
             await ipc.platform.sshAgent.clearKeys();
             return;
           }
 
+          const activeAccount = await firstValueFrom(this.accountService.activeAccount$);
+          const authStatus = await firstValueFrom(
+            this.authService.authStatusFor$(activeAccount.id),
+          );
+          if (authStatus !== AuthenticationStatus.Unlocked) {
+            return;
+          }
+
           const ciphers = await this.cipherService.getAllDecrypted();
           if (ciphers == null) {
             await ipc.platform.sshAgent.lock();

From 3550a904dca880802d3c90fc106a1708e3cdc47e Mon Sep 17 00:00:00 2001
From: Jared McCannon <jmccannon@bitwarden.com>
Date: Thu, 9 Jan 2025 10:32:21 -0600
Subject: [PATCH 018/150] [PM-13764] - Update Collection Settings (#12734)

* Updating org when collection settings change.
---
 apps/web/src/app/app.component.ts               | 14 ++++++++++++++
 libs/common/src/enums/notification-type.enum.ts |  1 +
 .../models/response/notification.response.ts    | 17 +++++++++++++++++
 .../src/services/notifications.service.ts       |  5 +++++
 4 files changed, 37 insertions(+)

diff --git a/apps/web/src/app/app.component.ts b/apps/web/src/app/app.component.ts
index 16c783f3a5..ee9f87bc2c 100644
--- a/apps/web/src/app/app.component.ts
+++ b/apps/web/src/app/app.component.ts
@@ -231,6 +231,20 @@ export class AppComponent implements OnDestroy, OnInit {
             }
             break;
           }
+          case "syncOrganizationCollectionSettingChanged": {
+            const { organizationId, limitCollectionCreation, limitCollectionDeletion } = message;
+            const organizations = await firstValueFrom(this.organizationService.organizations$);
+            const organization = organizations.find((org) => org.id === organizationId);
+
+            if (organization) {
+              await this.organizationService.upsert({
+                ...organization,
+                limitCollectionCreation: limitCollectionCreation,
+                limitCollectionDeletion: limitCollectionDeletion,
+              });
+            }
+            break;
+          }
           default:
             break;
         }
diff --git a/libs/common/src/enums/notification-type.enum.ts b/libs/common/src/enums/notification-type.enum.ts
index 69cbdff9dd..db59fcafa6 100644
--- a/libs/common/src/enums/notification-type.enum.ts
+++ b/libs/common/src/enums/notification-type.enum.ts
@@ -23,4 +23,5 @@ export enum NotificationType {
 
   SyncOrganizations = 17,
   SyncOrganizationStatusChanged = 18,
+  SyncOrganizationCollectionSettingChanged = 19,
 }
diff --git a/libs/common/src/models/response/notification.response.ts b/libs/common/src/models/response/notification.response.ts
index 473e6fc1d1..894a00ee88 100644
--- a/libs/common/src/models/response/notification.response.ts
+++ b/libs/common/src/models/response/notification.response.ts
@@ -45,6 +45,9 @@ export class NotificationResponse extends BaseResponse {
       case NotificationType.SyncOrganizationStatusChanged:
         this.payload = new OrganizationStatusPushNotification(payload);
         break;
+      case NotificationType.SyncOrganizationCollectionSettingChanged:
+        this.payload = new OrganizationCollectionSettingChangedPushNotification(payload);
+        break;
       default:
         break;
     }
@@ -126,3 +129,17 @@ export class OrganizationStatusPushNotification extends BaseResponse {
     this.enabled = this.getResponseProperty("Enabled");
   }
 }
+
+export class OrganizationCollectionSettingChangedPushNotification extends BaseResponse {
+  organizationId: string;
+  limitCollectionCreation: boolean;
+  limitCollectionDeletion: boolean;
+
+  constructor(response: any) {
+    super(response);
+
+    this.organizationId = this.getResponseProperty("OrganizationId");
+    this.limitCollectionCreation = this.getResponseProperty("LimitCollectionCreation");
+    this.limitCollectionDeletion = this.getResponseProperty("LimitCollectionDeletion");
+  }
+}
diff --git a/libs/common/src/services/notifications.service.ts b/libs/common/src/services/notifications.service.ts
index 4a14332af8..f88c904bee 100644
--- a/libs/common/src/services/notifications.service.ts
+++ b/libs/common/src/services/notifications.service.ts
@@ -227,6 +227,11 @@ export class NotificationsService implements NotificationsServiceAbstraction {
           await this.syncService.fullSync(true);
         }
         break;
+      case NotificationType.SyncOrganizationCollectionSettingChanged:
+        if (isAuthenticated) {
+          await this.syncService.fullSync(true);
+        }
+        break;
       default:
         break;
     }

From c451f500f900144efad3e73feea112b7adab76f5 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Thu, 9 Jan 2025 18:15:58 +0100
Subject: [PATCH 019/150] Cleanup destkop native loader and support gnu
 fallback loading (#12498)

---
 apps/desktop/desktop_native/napi/index.js | 273 ++++++++--------------
 1 file changed, 98 insertions(+), 175 deletions(-)

diff --git a/apps/desktop/desktop_native/napi/index.js b/apps/desktop/desktop_native/napi/index.js
index a0cfee8e1a..acfd0dffb8 100644
--- a/apps/desktop/desktop_native/napi/index.js
+++ b/apps/desktop/desktop_native/napi/index.js
@@ -1,209 +1,132 @@
-const { existsSync, readFileSync } = require('fs')
-const { join } = require('path')
+const { existsSync } = require("fs");
+const { join } = require("path");
 
-const { platform, arch } = process
+const { platform, arch } = process;
 
-let nativeBinding = null
-let localFileExisted = false
-let loadError = null
+let nativeBinding = null;
+let localFileExisted = false;
+let loadError = null;
 
-function isMusl() {
-  // For Node 10
-  if (!process.report || typeof process.report.getReport !== 'function') {
-    try {
-      return readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
-    } catch (e) {
-      return true
+function loadFirstAvailable(localFiles, nodeModule) {
+  for (const localFile of localFiles) {
+    if (existsSync(join(__dirname, localFile))) {
+      return require(`./${localFile}`);
     }
-  } else {
-    const { glibcVersionRuntime } = process.report.getReport().header
-    return !glibcVersionRuntime
   }
+
+  require(nodeModule);
 }
 
 switch (platform) {
-  case 'android':
+  case "android":
     switch (arch) {
-      case 'arm64':
-        localFileExisted = existsSync(join(__dirname, 'desktop_napi.android-arm64.node'))
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./desktop_napi.android-arm64.node')
-          } else {
-            nativeBinding = require('@bitwarden/desktop-napi-android-arm64')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      case 'arm':
-        localFileExisted = existsSync(join(__dirname, 'desktop_napi.android-arm-eabi.node'))
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./desktop_napi.android-arm-eabi.node')
-          } else {
-            nativeBinding = require('@bitwarden/desktop-napi-android-arm-eabi')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
+      case "arm64":
+        nativeBinding = loadFirstAvailable(
+          ["desktop_napi.android-arm64.node"],
+          "@bitwarden/desktop-napi-android-arm64",
+        );
+        break;
+      case "arm":
+        nativeBinding = loadFirstAvailable(
+          ["desktop_napi.android-arm.node"],
+          "@bitwarden/desktop-napi-android-arm",
+        );
+        break;
       default:
-        throw new Error(`Unsupported architecture on Android ${arch}`)
+        throw new Error(`Unsupported architecture on Android ${arch}`);
     }
-    break
-  case 'win32':
+    break;
+  case "win32":
     switch (arch) {
-      case 'x64':
-        localFileExisted = existsSync(
-          join(__dirname, 'desktop_napi.win32-x64-msvc.node')
-        )
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./desktop_napi.win32-x64-msvc.node')
-          } else {
-            nativeBinding = require('@bitwarden/desktop-napi-win32-x64-msvc')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      case 'ia32':
-        localFileExisted = existsSync(
-          join(__dirname, 'desktop_napi.win32-ia32-msvc.node')
-        )
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./desktop_napi.win32-ia32-msvc.node')
-          } else {
-            nativeBinding = require('@bitwarden/desktop-napi-win32-ia32-msvc')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      case 'arm64':
-        localFileExisted = existsSync(
-          join(__dirname, 'desktop_napi.win32-arm64-msvc.node')
-        )
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./desktop_napi.win32-arm64-msvc.node')
-          } else {
-            nativeBinding = require('@bitwarden/desktop-napi-win32-arm64-msvc')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
+      case "x64":
+        nativeBinding = loadFirstAvailable(
+          ["desktop_napi.win32-x64-msvc.node"],
+          "@bitwarden/desktop-napi-win32-x64-msvc",
+        );
+        break;
+      case "ia32":
+        nativeBinding = loadFirstAvailable(
+          ["desktop_napi.win32-ia32-msvc.node"],
+          "@bitwarden/desktop-napi-win32-ia32-msvc",
+        );
+        break;
+      case "arm64":
+        nativeBinding = loadFirstAvailable(
+          ["desktop_napi.win32-arm64-msvc.node"],
+          "@bitwarden/desktop-napi-win32-arm64-msvc",
+        );
+        break;
       default:
-        throw new Error(`Unsupported architecture on Windows: ${arch}`)
+        throw new Error(`Unsupported architecture on Windows: ${arch}`);
     }
-    break
-  case 'darwin':
+    break;
+  case "darwin":
     switch (arch) {
-      case 'x64':
-        localFileExisted = existsSync(join(__dirname, 'desktop_napi.darwin-x64.node'))
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./desktop_napi.darwin-x64.node')
-          } else {
-            nativeBinding = require('@bitwarden/desktop-napi-darwin-x64')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      case 'arm64':
-        localFileExisted = existsSync(
-          join(__dirname, 'desktop_napi.darwin-arm64.node')
-        )
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./desktop_napi.darwin-arm64.node')
-          } else {
-            nativeBinding = require('@bitwarden/desktop-napi-darwin-arm64')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
+      case "x64":
+        nativeBinding = loadFirstAvailable(
+          ["desktop_napi.darwin-x64.node"],
+          "@bitwarden/desktop-napi-darwin-x64",
+        );
+        break;
+      case "arm64":
+        nativeBinding = loadFirstAvailable(
+          ["desktop_napi.darwin-arm64.node"],
+          "@bitwarden/desktop-napi-darwin-arm64",
+        );
+        break;
       default:
-        throw new Error(`Unsupported architecture on macOS: ${arch}`)
+        throw new Error(`Unsupported architecture on macOS: ${arch}`);
     }
-    break
-  case 'freebsd':
-    if (arch !== 'x64') {
-      throw new Error(`Unsupported architecture on FreeBSD: ${arch}`)
-    }
-    localFileExisted = existsSync(join(__dirname, 'desktop_napi.freebsd-x64.node'))
-    try {
-      if (localFileExisted) {
-        nativeBinding = require('./desktop_napi.freebsd-x64.node')
-      } else {
-        nativeBinding = require('@bitwarden/desktop-napi-freebsd-x64')
-      }
-    } catch (e) {
-      loadError = e
-    }
-    break
-  case 'linux':
+    break;
+  case "freebsd":
+    nativeBinding = loadFirstAvailable(
+      ["desktop_napi.freebsd-x64.node"],
+      "@bitwarden/desktop-napi-freebsd-x64",
+    );
+    break;
+  case "linux":
     switch (arch) {
-      case 'x64':
-        localFileExisted = existsSync(
-          join(__dirname, 'desktop_napi.linux-x64-musl.node')
-        )
+      case "x64":
+        nativeBinding = loadFirstAvailable(
+          ["desktop_napi.linux-x64-musl.node", "desktop_napi.linux-x64-gnu.node"],
+          "@bitwarden/desktop-napi-linux-x64-musl",
+        );
+        break;
+      case "arm64":
+        nativeBinding = loadFirstAvailable(
+          ["desktop_napi.linux-arm64-musl.node", "desktop_napi.linux-arm64-gnu.node"],
+          "@bitwarden/desktop-napi-linux-arm64-musl",
+        );
+        break;
+      case "arm":
+        nativeBinding = loadFirstAvailable(
+          ["desktop_napi.linux-arm-musl.node", "desktop_napi.linux-arm-gnu.node"],
+          "@bitwarden/desktop-napi-linux-arm-musl",
+        );
+        localFileExisted = existsSync(join(__dirname, "desktop_napi.linux-arm-gnueabihf.node"));
         try {
           if (localFileExisted) {
-            nativeBinding = require('./desktop_napi.linux-x64-musl.node')
+            nativeBinding = require("./desktop_napi.linux-arm-gnueabihf.node");
           } else {
-            nativeBinding = require('@bitwarden/desktop-napi-linux-x64-musl')
+            nativeBinding = require("@bitwarden/desktop-napi-linux-arm-gnueabihf");
           }
         } catch (e) {
-          loadError = e
+          loadError = e;
         }
-        break
-      case 'arm64':
-        localFileExisted = existsSync(
-          join(__dirname, 'desktop_napi.linux-arm64-musl.node')
-        )
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./desktop_napi.linux-arm64-musl.node')
-          } else {
-            nativeBinding = require('@bitwarden/desktop-napi-linux-arm64-musl')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      case 'arm':
-        localFileExisted = existsSync(
-          join(__dirname, 'desktop_napi.linux-arm-gnueabihf.node')
-        )
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./desktop_napi.linux-arm-gnueabihf.node')
-          } else {
-            nativeBinding = require('@bitwarden/desktop-napi-linux-arm-gnueabihf')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
+        break;
       default:
-        throw new Error(`Unsupported architecture on Linux: ${arch}`)
+        throw new Error(`Unsupported architecture on Linux: ${arch}`);
     }
-    break
+    break;
   default:
-    throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`)
+    throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`);
 }
 
 if (!nativeBinding) {
   if (loadError) {
-    throw loadError
+    throw loadError;
   }
-  throw new Error(`Failed to load native binding`)
+  throw new Error(`Failed to load native binding`);
 }
 
-module.exports = nativeBinding
+module.exports = nativeBinding;

From 8fe180296374631b8659ab9a3aff4d051344d5f9 Mon Sep 17 00:00:00 2001
From: Jordan Aasen <166539328+jaasen-livefront@users.noreply.github.com>
Date: Thu, 9 Jan 2025 09:27:52 -0800
Subject: [PATCH 020/150] add missing provider in premium-badge story (#12766)

---
 .../src/app/vault/components/premium-badge.stories.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/apps/web/src/app/vault/components/premium-badge.stories.ts b/apps/web/src/app/vault/components/premium-badge.stories.ts
index 17622dbbd5..331f72fd0a 100644
--- a/apps/web/src/app/vault/components/premium-badge.stories.ts
+++ b/apps/web/src/app/vault/components/premium-badge.stories.ts
@@ -2,6 +2,7 @@ import { Meta, moduleMetadata, StoryObj } from "@storybook/angular";
 import { of } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { MessageSender } from "@bitwarden/common/platform/messaging";
@@ -22,6 +23,14 @@ export default {
     moduleMetadata({
       imports: [JslibModule, BadgeModule],
       providers: [
+        {
+          provide: AccountService,
+          useValue: {
+            activeAccount$: of({
+              id: "123",
+            }),
+          },
+        },
         {
           provide: I18nService,
           useFactory: () => {
@@ -39,7 +48,7 @@ export default {
         {
           provide: BillingAccountProfileStateService,
           useValue: {
-            hasPremiumFromAnySource$: of(false),
+            hasPremiumFromAnySource$: () => of(false),
           },
         },
       ],

From 06ca00f3c1b2c50e146a52de7ec036e2d44a8a7a Mon Sep 17 00:00:00 2001
From: Jordan Aasen <166539328+jaasen-livefront@users.noreply.github.com>
Date: Thu, 9 Jan 2025 09:40:59 -0800
Subject: [PATCH 021/150] [PM-13306] - add missing elements to browser vault
 trash list (#12736)

* add missing elements to trash list

* fix failing test
---
 .../vault-popup-items.service.spec.ts         | 19 +++++++--------
 .../services/vault-popup-items.service.ts     | 24 +++++++++++++++++--
 .../trash-list-items-container.component.html | 17 ++++++++++++-
 .../trash-list-items-container.component.ts   | 17 ++++++++++++-
 .../vault/popup/settings/trash.component.ts   |  2 --
 5 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts b/apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts
index 966793921d..ffa09aeb55 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts
@@ -361,20 +361,17 @@ describe("VaultPopupItemsService", () => {
   });
 
   describe("deletedCiphers$", () => {
-    it("should return deleted ciphers", (done) => {
-      const ciphers = [
-        { id: "1", type: CipherType.Login, name: "Login 1", isDeleted: true },
-        { id: "2", type: CipherType.Login, name: "Login 2", isDeleted: true },
-        { id: "3", type: CipherType.Login, name: "Login 3", isDeleted: true },
-        { id: "4", type: CipherType.Login, name: "Login 4", isDeleted: false },
-      ] as CipherView[];
+    it("should return deleted ciphers", async () => {
+      const deletedCipher = new CipherView();
+      deletedCipher.deletedDate = new Date();
+      const ciphers = [new CipherView(), new CipherView(), new CipherView(), deletedCipher];
 
       cipherServiceMock.getAllDecrypted.mockResolvedValue(ciphers);
 
-      service.deletedCiphers$.subscribe((deletedCiphers) => {
-        expect(deletedCiphers.length).toBe(3);
-        done();
-      });
+      (cipherServiceMock.ciphers$ as BehaviorSubject<any>).next(null);
+
+      const deletedCiphers = await firstValueFrom(service.deletedCiphers$);
+      expect(deletedCiphers.length).toBe(1);
     });
   });
 
diff --git a/apps/browser/src/vault/popup/services/vault-popup-items.service.ts b/apps/browser/src/vault/popup/services/vault-popup-items.service.ts
index 1c19a9d8d1..fb230df795 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-items.service.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-items.service.ts
@@ -247,8 +247,28 @@ export class VaultPopupItemsService {
   /**
    * Observable that contains the list of ciphers that have been deleted.
    */
-  deletedCiphers$: Observable<CipherView[]> = this._allDecryptedCiphers$.pipe(
-    map((ciphers) => ciphers.filter((c) => c.isDeleted)),
+  deletedCiphers$: Observable<PopupCipherView[]> = this._allDecryptedCiphers$.pipe(
+    switchMap((ciphers) =>
+      combineLatest([
+        this.organizationService.organizations$,
+        this.collectionService.decryptedCollections$,
+      ]).pipe(
+        map(([organizations, collections]) => {
+          const orgMap = Object.fromEntries(organizations.map((org) => [org.id, org]));
+          const collectionMap = Object.fromEntries(collections.map((col) => [col.id, col]));
+          return ciphers
+            .filter((c) => c.isDeleted)
+            .map(
+              (cipher) =>
+                new PopupCipherView(
+                  cipher,
+                  cipher.collectionIds?.map((colId) => collectionMap[colId as CollectionId]),
+                  orgMap[cipher.organizationId as OrganizationId],
+                ),
+            );
+        }),
+      ),
+    ),
     shareReplay({ refCount: false, bufferSize: 1 }),
   );
 
diff --git a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html
index dce3ba640d..dcbda9fd96 100644
--- a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html
+++ b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html
@@ -13,8 +13,23 @@
         [appA11yTitle]="'viewItemTitle' | i18n: cipher.name"
         (click)="onViewCipher(cipher)"
       >
-        <app-vault-icon slot="start" [cipher]="cipher"></app-vault-icon>
+        <div slot="start" class="tw-justify-start tw-w-7 tw-flex">
+          <app-vault-icon [cipher]="cipher"></app-vault-icon>
+        </div>
         <span data-testid="item-name">{{ cipher.name }}</span>
+        <i
+          *ngIf="cipher.organizationId"
+          appOrgIcon
+          [tierType]="cipher.organization.productTierType"
+          [size]="'small'"
+          [appA11yTitle]="orgIconTooltip(cipher)"
+        ></i>
+        <i
+          *ngIf="cipher.hasAttachments"
+          class="bwi bwi-paperclip bwi-sm"
+          [appA11yTitle]="'attachments' | i18n"
+        ></i>
+        <span slot="secondary">{{ cipher.subTitle }}</span>
       </button>
       <ng-container slot="end" *ngIf="cipher.edit">
         <bit-item-action>
diff --git a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.ts b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.ts
index a35c9cea1d..c56d1c7d10 100644
--- a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.ts
+++ b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.ts
@@ -23,9 +23,12 @@ import {
 import {
   CanDeleteCipherDirective,
   DecryptionFailureDialogComponent,
+  OrgIconDirective,
   PasswordRepromptService,
 } from "@bitwarden/vault";
 
+import { PopupCipherView } from "../../views/popup-cipher.view";
+
 @Component({
   selector: "app-trash-list-items-container",
   templateUrl: "trash-list-items-container.component.html",
@@ -39,6 +42,7 @@ import {
     CanDeleteCipherDirective,
     MenuModule,
     IconButtonModule,
+    OrgIconDirective,
     TypographyModule,
     DecryptionFailureDialogComponent,
   ],
@@ -49,7 +53,7 @@ export class TrashListItemsContainerComponent {
    * The list of trashed items to display.
    */
   @Input()
-  ciphers: CipherView[] = [];
+  ciphers: PopupCipherView[] = [];
 
   @Input()
   headerText: string;
@@ -64,6 +68,17 @@ export class TrashListItemsContainerComponent {
     private router: Router,
   ) {}
 
+  /**
+   * The tooltip text for the organization icon for ciphers that belong to an organization.
+   */
+  orgIconTooltip(cipher: PopupCipherView) {
+    if (cipher.collectionIds.length > 1) {
+      return this.i18nService.t("nCollections", cipher.collectionIds.length);
+    }
+
+    return cipher.collections[0]?.name;
+  }
+
   async restore(cipher: CipherView) {
     try {
       await this.cipherService.restoreWithServer(cipher.id);
diff --git a/apps/browser/src/vault/popup/settings/trash.component.ts b/apps/browser/src/vault/popup/settings/trash.component.ts
index 8bac22df53..61843de31b 100644
--- a/apps/browser/src/vault/popup/settings/trash.component.ts
+++ b/apps/browser/src/vault/popup/settings/trash.component.ts
@@ -8,7 +8,6 @@ import { VaultIcons } from "@bitwarden/vault";
 import { PopOutComponent } from "../../../platform/popup/components/pop-out.component";
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
-import { VaultListItemsContainerComponent } from "../components/vault-v2/vault-list-items-container/vault-list-items-container.component";
 import { VaultPopupItemsService } from "../services/vault-popup-items.service";
 
 import { TrashListItemsContainerComponent } from "./trash-list-items-container/trash-list-items-container.component";
@@ -22,7 +21,6 @@ import { TrashListItemsContainerComponent } from "./trash-list-items-container/t
     PopupPageComponent,
     PopupHeaderComponent,
     PopOutComponent,
-    VaultListItemsContainerComponent,
     TrashListItemsContainerComponent,
     CalloutModule,
     NoItemsModule,

From 14568f11dc3969bbb12f95853b6917f32bf3a147 Mon Sep 17 00:00:00 2001
From: SmithThe4th <gsmith@bitwarden.com>
Date: Thu, 9 Jan 2025 13:12:08 -0500
Subject: [PATCH 022/150] [PM-12034] Remove usage of ActiveUserState from
 vault-banners.service (#11543)

* Migrated banner service from using active user state

* Fixed unit tests for the vault banner service

* Updated component to pass user id required by the banner service

* Updated component tests

* Added comments

* Fixed unit tests

* Updated vault banner service to use lastSync$ version and removed polling

* Updated to use UserDecryptionOptions

* Updated to use getKdfConfig$

* Updated shouldShowVerifyEmailBanner to use account observable

* Added takewhile operator to only make calls when userId is present

* Simplified to use sing userId

* Simplified to use sing userId
---
 .../services/vault-banners.service.spec.ts    | 125 +++++++++--------
 .../services/vault-banners.service.ts         | 129 +++++++-----------
 .../vault-banners.component.spec.ts           |  20 ++-
 .../vault-banners/vault-banners.component.ts  |  22 ++-
 4 files changed, 153 insertions(+), 143 deletions(-)

diff --git a/apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.spec.ts b/apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.spec.ts
index 7f7e0f075b..88fae02275 100644
--- a/apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.spec.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.spec.ts
@@ -1,11 +1,14 @@
 import { TestBed } from "@angular/core/testing";
-import { BehaviorSubject, firstValueFrom } from "rxjs";
+import { BehaviorSubject, firstValueFrom, take, timeout } from "rxjs";
 
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
-import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
+import {
+  UserDecryptionOptions,
+  UserDecryptionOptionsServiceAbstraction,
+} from "@bitwarden/auth/common";
+import { AccountInfo, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { StateProvider } from "@bitwarden/common/platform/state";
 import { FakeStateProvider, mockAccountServiceWith } from "@bitwarden/common/spec";
 import { UserId } from "@bitwarden/common/types/guid";
@@ -22,18 +25,20 @@ describe("VaultBannersService", () => {
   let service: VaultBannersService;
   const isSelfHost = jest.fn().mockReturnValue(false);
   const hasPremiumFromAnySource$ = new BehaviorSubject<boolean>(false);
-  const userId = "user-id" as UserId;
+  const userId = Utils.newGuid() as UserId;
   const fakeStateProvider = new FakeStateProvider(mockAccountServiceWith(userId));
   const getEmailVerified = jest.fn().mockResolvedValue(true);
-  const hasMasterPassword = jest.fn().mockResolvedValue(true);
-  const getKdfConfig = jest
-    .fn()
-    .mockResolvedValue({ kdfType: KdfType.PBKDF2_SHA256, iterations: 600000 });
-  const getLastSync = jest.fn().mockResolvedValue(null);
+  const lastSync$ = new BehaviorSubject<Date | null>(null);
+  const userDecryptionOptions$ = new BehaviorSubject<UserDecryptionOptions>({
+    hasMasterPassword: true,
+  });
+  const kdfConfig$ = new BehaviorSubject({ kdfType: KdfType.PBKDF2_SHA256, iterations: 600000 });
+  const accounts$ = new BehaviorSubject<Record<UserId, AccountInfo>>({
+    [userId]: { email: "test@bitwarden.com", emailVerified: true, name: "name" } as AccountInfo,
+  });
 
   beforeEach(() => {
-    jest.useFakeTimers();
-    getLastSync.mockClear().mockResolvedValue(new Date("2024-05-14"));
+    lastSync$.next(new Date("2024-05-14"));
     isSelfHost.mockClear();
     getEmailVerified.mockClear().mockResolvedValue(true);
 
@@ -52,25 +57,27 @@ describe("VaultBannersService", () => {
           provide: StateProvider,
           useValue: fakeStateProvider,
         },
+        {
+          provide: PlatformUtilsService,
+          useValue: { isSelfHost },
+        },
         {
           provide: AccountService,
-          useValue: mockAccountServiceWith(userId),
-        },
-        {
-          provide: TokenService,
-          useValue: { getEmailVerified },
-        },
-        {
-          provide: UserVerificationService,
-          useValue: { hasMasterPassword },
+          useValue: { accounts$ },
         },
         {
           provide: KdfConfigService,
-          useValue: { getKdfConfig },
+          useValue: { getKdfConfig$: () => kdfConfig$ },
         },
         {
           provide: SyncService,
-          useValue: { getLastSync },
+          useValue: { lastSync$: () => lastSync$ },
+        },
+        {
+          provide: UserDecryptionOptionsServiceAbstraction,
+          useValue: {
+            userDecryptionOptionsById$: () => userDecryptionOptions$,
+          },
         },
       ],
     });
@@ -82,39 +89,38 @@ describe("VaultBannersService", () => {
 
   describe("Premium", () => {
     it("waits until sync is completed before showing premium banner", async () => {
-      getLastSync.mockResolvedValue(new Date("2024-05-14"));
       hasPremiumFromAnySource$.next(false);
       isSelfHost.mockReturnValue(false);
+      lastSync$.next(null);
 
       service = TestBed.inject(VaultBannersService);
 
-      jest.advanceTimersByTime(201);
+      const premiumBanner$ = service.shouldShowPremiumBanner$(userId);
 
-      expect(await firstValueFrom(service.shouldShowPremiumBanner$)).toBe(true);
+      // Should not emit when sync is null
+      await expect(firstValueFrom(premiumBanner$.pipe(take(1), timeout(100)))).rejects.toThrow();
+
+      // Should emit when sync is completed
+      lastSync$.next(new Date("2024-05-14"));
+      expect(await firstValueFrom(premiumBanner$)).toBe(true);
     });
 
     it("does not show a premium banner for self-hosted users", async () => {
-      getLastSync.mockResolvedValue(new Date("2024-05-14"));
       hasPremiumFromAnySource$.next(false);
       isSelfHost.mockReturnValue(true);
 
       service = TestBed.inject(VaultBannersService);
 
-      jest.advanceTimersByTime(201);
-
-      expect(await firstValueFrom(service.shouldShowPremiumBanner$)).toBe(false);
+      expect(await firstValueFrom(service.shouldShowPremiumBanner$(userId))).toBe(false);
     });
 
     it("does not show a premium banner when they have access to premium", async () => {
-      getLastSync.mockResolvedValue(new Date("2024-05-14"));
       hasPremiumFromAnySource$.next(true);
       isSelfHost.mockReturnValue(false);
 
       service = TestBed.inject(VaultBannersService);
 
-      jest.advanceTimersByTime(201);
-
-      expect(await firstValueFrom(service.shouldShowPremiumBanner$)).toBe(false);
+      expect(await firstValueFrom(service.shouldShowPremiumBanner$(userId))).toBe(false);
     });
 
     describe("dismissing", () => {
@@ -125,7 +131,7 @@ describe("VaultBannersService", () => {
         jest.setSystemTime(date.getTime());
 
         service = TestBed.inject(VaultBannersService);
-        await service.dismissBanner(VisibleVaultBanner.Premium);
+        await service.dismissBanner(userId, VisibleVaultBanner.Premium);
       });
 
       afterEach(() => {
@@ -134,7 +140,7 @@ describe("VaultBannersService", () => {
 
       it("updates state on first dismiss", async () => {
         const state = await firstValueFrom(
-          fakeStateProvider.getActive(PREMIUM_BANNER_REPROMPT_KEY).state$,
+          fakeStateProvider.getUser(userId, PREMIUM_BANNER_REPROMPT_KEY).state$,
         );
 
         const oneWeekLater = new Date("2023-06-15");
@@ -148,7 +154,7 @@ describe("VaultBannersService", () => {
 
       it("updates state on second dismiss", async () => {
         const state = await firstValueFrom(
-          fakeStateProvider.getActive(PREMIUM_BANNER_REPROMPT_KEY).state$,
+          fakeStateProvider.getUser(userId, PREMIUM_BANNER_REPROMPT_KEY).state$,
         );
 
         const oneMonthLater = new Date("2023-07-08");
@@ -162,7 +168,7 @@ describe("VaultBannersService", () => {
 
       it("updates state on third dismiss", async () => {
         const state = await firstValueFrom(
-          fakeStateProvider.getActive(PREMIUM_BANNER_REPROMPT_KEY).state$,
+          fakeStateProvider.getUser(userId, PREMIUM_BANNER_REPROMPT_KEY).state$,
         );
 
         const oneYearLater = new Date("2024-06-08");
@@ -178,40 +184,40 @@ describe("VaultBannersService", () => {
 
   describe("KDFSettings", () => {
     beforeEach(async () => {
-      hasMasterPassword.mockResolvedValue(true);
-      getKdfConfig.mockResolvedValue({ kdfType: KdfType.PBKDF2_SHA256, iterations: 599999 });
+      userDecryptionOptions$.next({ hasMasterPassword: true });
+      kdfConfig$.next({ kdfType: KdfType.PBKDF2_SHA256, iterations: 599999 });
     });
 
     it("shows low KDF iteration banner", async () => {
       service = TestBed.inject(VaultBannersService);
 
-      expect(await service.shouldShowLowKDFBanner()).toBe(true);
+      expect(await service.shouldShowLowKDFBanner(userId)).toBe(true);
     });
 
     it("does not show low KDF iteration banner if KDF type is not PBKDF2_SHA256", async () => {
-      getKdfConfig.mockResolvedValue({ kdfType: KdfType.Argon2id, iterations: 600001 });
+      kdfConfig$.next({ kdfType: KdfType.Argon2id, iterations: 600001 });
 
       service = TestBed.inject(VaultBannersService);
 
-      expect(await service.shouldShowLowKDFBanner()).toBe(false);
+      expect(await service.shouldShowLowKDFBanner(userId)).toBe(false);
     });
 
     it("does not show low KDF for iterations about 600,000", async () => {
-      getKdfConfig.mockResolvedValue({ kdfType: KdfType.PBKDF2_SHA256, iterations: 600001 });
+      kdfConfig$.next({ kdfType: KdfType.PBKDF2_SHA256, iterations: 600001 });
 
       service = TestBed.inject(VaultBannersService);
 
-      expect(await service.shouldShowLowKDFBanner()).toBe(false);
+      expect(await service.shouldShowLowKDFBanner(userId)).toBe(false);
     });
 
     it("dismisses low KDF iteration banner", async () => {
       service = TestBed.inject(VaultBannersService);
 
-      expect(await service.shouldShowLowKDFBanner()).toBe(true);
+      expect(await service.shouldShowLowKDFBanner(userId)).toBe(true);
 
-      await service.dismissBanner(VisibleVaultBanner.KDFSettings);
+      await service.dismissBanner(userId, VisibleVaultBanner.KDFSettings);
 
-      expect(await service.shouldShowLowKDFBanner()).toBe(false);
+      expect(await service.shouldShowLowKDFBanner(userId)).toBe(false);
     });
   });
 
@@ -228,39 +234,44 @@ describe("VaultBannersService", () => {
     it("shows outdated browser banner", async () => {
       service = TestBed.inject(VaultBannersService);
 
-      expect(await service.shouldShowUpdateBrowserBanner()).toBe(true);
+      expect(await service.shouldShowUpdateBrowserBanner(userId)).toBe(true);
     });
 
     it("dismisses outdated browser banner", async () => {
       service = TestBed.inject(VaultBannersService);
 
-      expect(await service.shouldShowUpdateBrowserBanner()).toBe(true);
+      expect(await service.shouldShowUpdateBrowserBanner(userId)).toBe(true);
 
-      await service.dismissBanner(VisibleVaultBanner.OutdatedBrowser);
+      await service.dismissBanner(userId, VisibleVaultBanner.OutdatedBrowser);
 
-      expect(await service.shouldShowUpdateBrowserBanner()).toBe(false);
+      expect(await service.shouldShowUpdateBrowserBanner(userId)).toBe(false);
     });
   });
 
   describe("VerifyEmail", () => {
     beforeEach(async () => {
-      getEmailVerified.mockResolvedValue(false);
+      accounts$.next({
+        [userId]: {
+          ...accounts$.value[userId],
+          emailVerified: false,
+        },
+      });
     });
 
     it("shows verify email banner", async () => {
       service = TestBed.inject(VaultBannersService);
 
-      expect(await service.shouldShowVerifyEmailBanner()).toBe(true);
+      expect(await service.shouldShowVerifyEmailBanner(userId)).toBe(true);
     });
 
     it("dismisses verify email banner", async () => {
       service = TestBed.inject(VaultBannersService);
 
-      expect(await service.shouldShowVerifyEmailBanner()).toBe(true);
+      expect(await service.shouldShowVerifyEmailBanner(userId)).toBe(true);
 
-      await service.dismissBanner(VisibleVaultBanner.VerifyEmail);
+      await service.dismissBanner(userId, VisibleVaultBanner.VerifyEmail);
 
-      expect(await service.shouldShowVerifyEmailBanner()).toBe(false);
+      expect(await service.shouldShowVerifyEmailBanner(userId)).toBe(false);
     });
   });
 });
diff --git a/apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.ts b/apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.ts
index c18b046e35..390b95fa2b 100644
--- a/apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-banners/services/vault-banners.service.ts
@@ -1,28 +1,18 @@
 import { Injectable } from "@angular/core";
-import {
-  Subject,
-  Observable,
-  combineLatest,
-  firstValueFrom,
-  map,
-  mergeMap,
-  take,
-  switchMap,
-  of,
-} from "rxjs";
+import { Observable, combineLatest, firstValueFrom, map, filter, mergeMap, take } from "rxjs";
 
+import { UserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
-import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import {
   StateProvider,
-  ActiveUserState,
   PREMIUM_BANNER_DISK_LOCAL,
   BANNERS_DISMISSED_DISK,
   UserKeyDefinition,
+  SingleUserState,
 } from "@bitwarden/common/platform/state";
+import { UserId } from "@bitwarden/common/types/guid";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { PBKDF2KdfConfig, KdfConfigService, KdfType } from "@bitwarden/key-management";
 
@@ -62,47 +52,25 @@ export const BANNERS_DISMISSED_DISK_KEY = new UserKeyDefinition<SessionBanners[]
 
 @Injectable()
 export class VaultBannersService {
-  shouldShowPremiumBanner$: Observable<boolean>;
-
-  private premiumBannerState: ActiveUserState<PremiumBannerReprompt>;
-  private sessionBannerState: ActiveUserState<SessionBanners[]>;
-
-  /**
-   * Emits when the sync service has completed a sync
-   *
-   * This is needed because `hasPremiumFromAnySource$` will emit false until the sync is completed
-   * resulting in the premium banner being shown briefly on startup when the user has access to
-   * premium features.
-   */
-  private syncCompleted$ = new Subject<void>();
-
   constructor(
-    private tokenService: TokenService,
-    private userVerificationService: UserVerificationService,
+    private accountService: AccountService,
     private stateProvider: StateProvider,
     private billingAccountProfileStateService: BillingAccountProfileStateService,
     private platformUtilsService: PlatformUtilsService,
     private kdfConfigService: KdfConfigService,
     private syncService: SyncService,
-    private accountService: AccountService,
-  ) {
-    this.pollUntilSynced();
-    this.premiumBannerState = this.stateProvider.getActive(PREMIUM_BANNER_REPROMPT_KEY);
-    this.sessionBannerState = this.stateProvider.getActive(BANNERS_DISMISSED_DISK_KEY);
+    private userDecryptionOptionsService: UserDecryptionOptionsServiceAbstraction,
+  ) {}
 
-    const premiumSources$ = this.accountService.activeAccount$.pipe(
-      take(1),
-      switchMap((account) => {
-        return combineLatest([
-          account
-            ? this.billingAccountProfileStateService.hasPremiumFromAnySource$(account.id)
-            : of(false),
-          this.premiumBannerState.state$,
-        ]);
-      }),
-    );
+  shouldShowPremiumBanner$(userId: UserId): Observable<boolean> {
+    const premiumBannerState = this.premiumBannerState(userId);
+    const premiumSources$ = combineLatest([
+      this.billingAccountProfileStateService.hasPremiumFromAnySource$(userId),
+      premiumBannerState.state$,
+    ]);
 
-    this.shouldShowPremiumBanner$ = this.syncCompleted$.pipe(
+    return this.syncService.lastSync$(userId).pipe(
+      filter((lastSync) => lastSync !== null),
       take(1), // Wait until the first sync is complete before considering the premium status
       mergeMap(() => premiumSources$),
       map(([canAccessPremium, dismissedState]) => {
@@ -122,9 +90,9 @@ export class VaultBannersService {
   }
 
   /** Returns true when the update browser banner should be shown */
-  async shouldShowUpdateBrowserBanner(): Promise<boolean> {
+  async shouldShowUpdateBrowserBanner(userId: UserId): Promise<boolean> {
     const outdatedBrowser = window.navigator.userAgent.indexOf("MSIE") !== -1;
-    const alreadyDismissed = (await this.getBannerDismissedState()).includes(
+    const alreadyDismissed = (await this.getBannerDismissedState(userId)).includes(
       VisibleVaultBanner.OutdatedBrowser,
     );
 
@@ -132,10 +100,12 @@ export class VaultBannersService {
   }
 
   /** Returns true when the verify email banner should be shown */
-  async shouldShowVerifyEmailBanner(): Promise<boolean> {
-    const needsVerification = !(await this.tokenService.getEmailVerified());
+  async shouldShowVerifyEmailBanner(userId: UserId): Promise<boolean> {
+    const needsVerification = !(
+      await firstValueFrom(this.accountService.accounts$.pipe(map((accounts) => accounts[userId])))
+    )?.emailVerified;
 
-    const alreadyDismissed = (await this.getBannerDismissedState()).includes(
+    const alreadyDismissed = (await this.getBannerDismissedState(userId)).includes(
       VisibleVaultBanner.VerifyEmail,
     );
 
@@ -143,12 +113,14 @@ export class VaultBannersService {
   }
 
   /** Returns true when the low KDF iteration banner should be shown */
-  async shouldShowLowKDFBanner(): Promise<boolean> {
-    const hasLowKDF = (await this.userVerificationService.hasMasterPassword())
-      ? await this.isLowKdfIteration()
+  async shouldShowLowKDFBanner(userId: UserId): Promise<boolean> {
+    const hasLowKDF = (
+      await firstValueFrom(this.userDecryptionOptionsService.userDecryptionOptionsById$(userId))
+    )?.hasMasterPassword
+      ? await this.isLowKdfIteration(userId)
       : false;
 
-    const alreadyDismissed = (await this.getBannerDismissedState()).includes(
+    const alreadyDismissed = (await this.getBannerDismissedState(userId)).includes(
       VisibleVaultBanner.KDFSettings,
     );
 
@@ -156,11 +128,11 @@ export class VaultBannersService {
   }
 
   /** Dismiss the given banner and perform any respective side effects */
-  async dismissBanner(banner: SessionBanners): Promise<void> {
+  async dismissBanner(userId: UserId, banner: SessionBanners): Promise<void> {
     if (banner === VisibleVaultBanner.Premium) {
-      await this.dismissPremiumBanner();
+      await this.dismissPremiumBanner(userId);
     } else {
-      await this.sessionBannerState.update((current) => {
+      await this.sessionBannerState(userId).update((current) => {
         const bannersDismissed = current ?? [];
 
         return [...bannersDismissed, banner];
@@ -168,16 +140,32 @@ export class VaultBannersService {
     }
   }
 
+  /**
+   *
+   * @returns a SingleUserState for the premium banner reprompt state
+   */
+  private premiumBannerState(userId: UserId): SingleUserState<PremiumBannerReprompt> {
+    return this.stateProvider.getUser(userId, PREMIUM_BANNER_REPROMPT_KEY);
+  }
+
+  /**
+   *
+   * @returns a SingleUserState for the session banners dismissed state
+   */
+  private sessionBannerState(userId: UserId): SingleUserState<SessionBanners[]> {
+    return this.stateProvider.getUser(userId, BANNERS_DISMISSED_DISK_KEY);
+  }
+
   /** Returns banners that have already been dismissed */
-  private async getBannerDismissedState(): Promise<SessionBanners[]> {
+  private async getBannerDismissedState(userId: UserId): Promise<SessionBanners[]> {
     // `state$` can emit null when a value has not been set yet,
     // use nullish coalescing to default to an empty array
-    return (await firstValueFrom(this.sessionBannerState.state$)) ?? [];
+    return (await firstValueFrom(this.sessionBannerState(userId).state$)) ?? [];
   }
 
   /** Increment dismissal state of the premium banner  */
-  private async dismissPremiumBanner(): Promise<void> {
-    await this.premiumBannerState.update((current) => {
+  private async dismissPremiumBanner(userId: UserId): Promise<void> {
+    await this.premiumBannerState(userId).update((current) => {
       const numberOfDismissals = current?.numberOfDismissals ?? 0;
       const now = new Date();
 
@@ -213,22 +201,11 @@ export class VaultBannersService {
     });
   }
 
-  private async isLowKdfIteration() {
-    const kdfConfig = await this.kdfConfigService.getKdfConfig();
+  private async isLowKdfIteration(userId: UserId) {
+    const kdfConfig = await firstValueFrom(this.kdfConfigService.getKdfConfig$(userId));
     return (
       kdfConfig.kdfType === KdfType.PBKDF2_SHA256 &&
       kdfConfig.iterations < PBKDF2KdfConfig.ITERATIONS.defaultValue
     );
   }
-
-  /** Poll the `syncService` until a sync is completed */
-  private pollUntilSynced() {
-    const interval = setInterval(async () => {
-      const lastSync = await this.syncService.getLastSync();
-      if (lastSync !== null) {
-        clearInterval(interval);
-        this.syncCompleted$.next();
-      }
-    }, 200);
-  }
 }
diff --git a/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.spec.ts b/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.spec.ts
index 5fdac63e93..f35a93f8b9 100644
--- a/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.spec.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.spec.ts
@@ -2,13 +2,17 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { By } from "@angular/platform-browser";
 import { RouterTestingModule } from "@angular/router/testing";
 import { mock } from "jest-mock-extended";
-import { BehaviorSubject } from "rxjs";
+import { BehaviorSubject, Observable } from "rxjs";
 
 import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { FakeAccountService, mockAccountServiceWith } from "@bitwarden/common/spec";
+import { UserId } from "@bitwarden/common/types/guid";
 import { BannerComponent, BannerModule } from "@bitwarden/components";
 
 import { VerifyEmailComponent } from "../../../auth/settings/verify-email.component";
@@ -21,21 +25,25 @@ describe("VaultBannersComponent", () => {
   let component: VaultBannersComponent;
   let fixture: ComponentFixture<VaultBannersComponent>;
   const premiumBanner$ = new BehaviorSubject<boolean>(false);
+  const mockUserId = Utils.newGuid() as UserId;
 
   const bannerService = mock<VaultBannersService>({
-    shouldShowPremiumBanner$: premiumBanner$,
+    shouldShowPremiumBanner$: jest.fn((userId$: Observable<UserId>) => premiumBanner$),
     shouldShowUpdateBrowserBanner: jest.fn(),
     shouldShowVerifyEmailBanner: jest.fn(),
     shouldShowLowKDFBanner: jest.fn(),
     dismissBanner: jest.fn(),
   });
 
+  const accountService: FakeAccountService = mockAccountServiceWith(mockUserId);
+
   beforeEach(async () => {
-    bannerService.shouldShowPremiumBanner$ = premiumBanner$;
     bannerService.shouldShowUpdateBrowserBanner.mockResolvedValue(false);
     bannerService.shouldShowVerifyEmailBanner.mockResolvedValue(false);
     bannerService.shouldShowLowKDFBanner.mockResolvedValue(false);
 
+    premiumBanner$.next(false);
+
     await TestBed.configureTestingModule({
       imports: [
         BannerModule,
@@ -62,6 +70,10 @@ describe("VaultBannersComponent", () => {
           provide: TokenService,
           useValue: mock<TokenService>(),
         },
+        {
+          provide: AccountService,
+          useValue: accountService,
+        },
       ],
     })
       .overrideProvider(VaultBannersService, { useValue: bannerService })
@@ -135,7 +147,7 @@ describe("VaultBannersComponent", () => {
 
           dismissButton.dispatchEvent(new Event("click"));
 
-          expect(bannerService.dismissBanner).toHaveBeenCalledWith(banner);
+          expect(bannerService.dismissBanner).toHaveBeenCalledWith(mockUserId, banner);
 
           expect(component.visibleBanners).toEqual([]);
         });
diff --git a/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts b/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts
index 933b4899c9..161b2ccb7e 100644
--- a/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts
@@ -2,8 +2,9 @@
 // @ts-strict-ignore
 import { Component, Input, OnInit } from "@angular/core";
 import { Router } from "@angular/router";
-import { Observable } from "rxjs";
+import { firstValueFrom, map, Observable, switchMap } from "rxjs";
 
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { BannerModule } from "@bitwarden/components";
 
@@ -26,12 +27,17 @@ export class VaultBannersComponent implements OnInit {
   VisibleVaultBanner = VisibleVaultBanner;
   @Input() organizationsPaymentStatus: FreeTrial[] = [];
 
+  private activeUserId$ = this.accountService.activeAccount$.pipe(map((a) => a?.id));
+
   constructor(
     private vaultBannerService: VaultBannersService,
     private router: Router,
     private i18nService: I18nService,
+    private accountService: AccountService,
   ) {
-    this.premiumBannerVisible$ = this.vaultBannerService.shouldShowPremiumBanner$;
+    this.premiumBannerVisible$ = this.activeUserId$.pipe(
+      switchMap((userId) => this.vaultBannerService.shouldShowPremiumBanner$(userId)),
+    );
   }
 
   async ngOnInit(): Promise<void> {
@@ -39,7 +45,8 @@ export class VaultBannersComponent implements OnInit {
   }
 
   async dismissBanner(banner: VisibleVaultBanner): Promise<void> {
-    await this.vaultBannerService.dismissBanner(banner);
+    const activeUserId = await firstValueFrom(this.activeUserId$);
+    await this.vaultBannerService.dismissBanner(activeUserId, banner);
 
     await this.determineVisibleBanners();
   }
@@ -57,9 +64,12 @@ export class VaultBannersComponent implements OnInit {
 
   /** Determine which banners should be present */
   private async determineVisibleBanners(): Promise<void> {
-    const showBrowserOutdated = await this.vaultBannerService.shouldShowUpdateBrowserBanner();
-    const showVerifyEmail = await this.vaultBannerService.shouldShowVerifyEmailBanner();
-    const showLowKdf = await this.vaultBannerService.shouldShowLowKDFBanner();
+    const activeUserId = await firstValueFrom(this.activeUserId$);
+
+    const showBrowserOutdated =
+      await this.vaultBannerService.shouldShowUpdateBrowserBanner(activeUserId);
+    const showVerifyEmail = await this.vaultBannerService.shouldShowVerifyEmailBanner(activeUserId);
+    const showLowKdf = await this.vaultBannerService.shouldShowLowKDFBanner(activeUserId);
 
     this.visibleBanners = [
       showBrowserOutdated ? VisibleVaultBanner.OutdatedBrowser : null,

From f1c3c690a7330142af3ec9d69948fe0c55c5d387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=9C=A8=20Audrey=20=E2=9C=A8?= <ajensen@bitwarden.com>
Date: Thu, 9 Jan 2025 13:18:45 -0500
Subject: [PATCH 023/150] remove circular dependency from
 `@bitwarden/generator-core` (#12785)

---
 .../core/src/policies/available-algorithms-policy.ts      | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/libs/tools/generator/core/src/policies/available-algorithms-policy.ts b/libs/tools/generator/core/src/policies/available-algorithms-policy.ts
index f61db0b33e..f37a8b21a3 100644
--- a/libs/tools/generator/core/src/policies/available-algorithms-policy.ts
+++ b/libs/tools/generator/core/src/policies/available-algorithms-policy.ts
@@ -4,12 +4,8 @@ import { PolicyType } from "@bitwarden/common/admin-console/enums";
 // FIXME: use index.ts imports once policy abstractions and models
 // implement ADR-0002
 import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
-import {
-  CredentialAlgorithm,
-  EmailAlgorithms,
-  PasswordAlgorithms,
-  UsernameAlgorithms,
-} from "@bitwarden/generator-core";
+
+import { CredentialAlgorithm, EmailAlgorithms, PasswordAlgorithms, UsernameAlgorithms } from "..";
 
 /** Reduces policies to a set of available algorithms
  *  @param policies the policies to reduce

From a872f675237012e81b3281fd1ac78844e205cffb Mon Sep 17 00:00:00 2001
From: 1fexd <58902674+1fexd@users.noreply.github.com>
Date: Thu, 9 Jan 2025 19:23:17 +0100
Subject: [PATCH 024/150] fix: Don't try to load icon for .onion/.i2p URIs
 (#9125)

Co-authored-by: Bernd Schoolmann <mail@quexten.com>
Co-authored-by: Jason Ng <jng@bitwarden.com>
---
 libs/common/src/vault/icon/build-cipher-icon.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libs/common/src/vault/icon/build-cipher-icon.ts b/libs/common/src/vault/icon/build-cipher-icon.ts
index 78e6ecd7b4..8ffe474956 100644
--- a/libs/common/src/vault/icon/build-cipher-icon.ts
+++ b/libs/common/src/vault/icon/build-cipher-icon.ts
@@ -43,6 +43,12 @@ export function buildCipherIcon(iconsServerUrl: string, cipher: CipherView, show
           isWebsite = hostnameUri.indexOf("http") === 0 && hostnameUri.indexOf(".") > -1;
         }
 
+        if (isWebsite && (hostnameUri.endsWith(".onion") || hostnameUri.endsWith(".i2p"))) {
+          image = null;
+          fallbackImage = "images/bwi-globe.png";
+          break;
+        }
+
         if (showFavicon && isWebsite) {
           try {
             image = `${iconsServerUrl}/${Utils.getHostname(hostnameUri)}/icon.png`;

From 2271062a5ae22e2d32933a34e4d2bffa9eee1f4d Mon Sep 17 00:00:00 2001
From: Jordan Aasen <166539328+jaasen-livefront@users.noreply.github.com>
Date: Thu, 9 Jan 2025 10:38:27 -0800
Subject: [PATCH 025/150] clear cipher cache after deleting a collection
 (#12686)

---
 apps/web/src/app/vault/org-vault/vault.component.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/web/src/app/vault/org-vault/vault.component.ts b/apps/web/src/app/vault/org-vault/vault.component.ts
index ae07df524f..645d81cec1 100644
--- a/apps/web/src/app/vault/org-vault/vault.component.ts
+++ b/apps/web/src/app/vault/org-vault/vault.component.ts
@@ -1175,6 +1175,8 @@ export class VaultComponent implements OnInit, OnDestroy {
 
       // Navigate away if we deleted the collection we were viewing
       if (this.selectedCollection?.node.id === collection.id) {
+        // Clear the cipher cache to clear the deleted collection from the cipher state
+        await this.cipherService.clear();
         void this.router.navigate([], {
           queryParams: { collectionId: this.selectedCollection.parent?.node.id ?? null },
           queryParamsHandling: "merge",

From 8cfa30acb5bbdbc9b240e5f1c1f673f92380f557 Mon Sep 17 00:00:00 2001
From: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>
Date: Thu, 9 Jan 2025 13:07:26 -0600
Subject: [PATCH 026/150] [PM-16889] Add KM lib to tailwind configs (#12783)

Add KM lib to tailwind configs
---
 apps/browser/tailwind.config.js         | 1 +
 apps/desktop/tailwind.config.js         | 1 +
 apps/web/tailwind.config.js             | 1 +
 libs/components/tailwind.config.base.js | 1 +
 4 files changed, 4 insertions(+)

diff --git a/apps/browser/tailwind.config.js b/apps/browser/tailwind.config.js
index 2e8f9c9f81..d0ec8025c6 100644
--- a/apps/browser/tailwind.config.js
+++ b/apps/browser/tailwind.config.js
@@ -5,6 +5,7 @@ config.content = [
   "./src/**/*.{html,ts}",
   "../../libs/components/src/**/*.{html,ts}",
   "../../libs/auth/src/**/*.{html,ts}",
+  "../../libs/key-management/src/**/*.{html,ts}",
   "../../libs/vault/src/**/*.{html,ts}",
   "../../libs/angular/src/**/*.{html,ts}",
   "../../libs/vault/src/**/*.{html,ts}",
diff --git a/apps/desktop/tailwind.config.js b/apps/desktop/tailwind.config.js
index a561b93b21..bf3b67c74a 100644
--- a/apps/desktop/tailwind.config.js
+++ b/apps/desktop/tailwind.config.js
@@ -5,6 +5,7 @@ config.content = [
   "./src/**/*.{html,ts}",
   "../../libs/components/src/**/*.{html,ts}",
   "../../libs/auth/src/**/*.{html,ts}",
+  "../../libs/key-management/src/**/*.{html,ts}",
   "../../libs/angular/src/**/*.{html,ts}",
   "../../libs/vault/src/**/*.{html,ts,mdx}",
 ];
diff --git a/apps/web/tailwind.config.js b/apps/web/tailwind.config.js
index 3ae0778250..2c0108ca3e 100644
--- a/apps/web/tailwind.config.js
+++ b/apps/web/tailwind.config.js
@@ -5,6 +5,7 @@ config.content = [
   "./src/**/*.{html,ts}",
   "../../libs/components/src/**/*.{html,ts}",
   "../../libs/auth/src/**/*.{html,ts}",
+  "../../libs/key-management/src/**/*.{html,ts}",
   "../../libs/vault/src/**/*.{html,ts}",
   "../../libs/angular/src/**/*.{html,ts}",
   "../../bitwarden_license/bit-web/src/**/*.{html,ts}",
diff --git a/libs/components/tailwind.config.base.js b/libs/components/tailwind.config.base.js
index 26616d0715..6e887030c3 100644
--- a/libs/components/tailwind.config.base.js
+++ b/libs/components/tailwind.config.base.js
@@ -11,6 +11,7 @@ module.exports = {
   content: [
     "./src/**/*.{html,ts}",
     "../../libs/components/src/**/*.{html,ts}",
+    "../../libs/key-management/src/**/*.{html,ts}",
     "../../libs/auth/src/**/*.{html,ts}",
   ],
   safelist: [],

From bb8e649048cb5344322c66973188a0ed59c43fd0 Mon Sep 17 00:00:00 2001
From: Jared Snider <116684653+JaredSnider-Bitwarden@users.noreply.github.com>
Date: Thu, 9 Jan 2025 14:14:42 -0500
Subject: [PATCH 027/150] Auth/PM-16896 - Device Management - Remove 3 dot menu
 and remove text from table description (#12787)

* PM-16896 - Remove 3 dot menu and remove text from table description

* PM-16896 - Add requested comment
---
 .../settings/security/device-management.component.html     | 7 ++++---
 apps/web/src/locales/en/messages.json                      | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/web/src/app/auth/settings/security/device-management.component.html b/apps/web/src/app/auth/settings/security/device-management.component.html
index 6bae88fac5..743414aac4 100644
--- a/apps/web/src/app/auth/settings/security/device-management.component.html
+++ b/apps/web/src/app/auth/settings/security/device-management.component.html
@@ -21,7 +21,7 @@
     </div>
   </div>
 
-  <p>{{ "deviceListDescription" | i18n }}</p>
+  <p>{{ "deviceListDescriptionTemp" | i18n }}</p>
 
   <div *ngIf="loading" class="tw-flex tw-justify-center tw-items-center tw-p-4">
     <i class="bwi bwi-spinner bwi-spin tw-text-2xl" aria-hidden="true"></i>
@@ -63,13 +63,14 @@
         }}</span>
       </td>
       <td bitCell>{{ row.firstLogin | date: "medium" }}</td>
-      <td bitCell>
+      <!-- <td bitCell>
         <button
           type="button"
           bitIconButton="bwi-ellipsis-v"
           [bitMenuTriggerFor]="optionsMenu"
         ></button>
         <bit-menu #optionsMenu>
+          Remove device button to be re-added later when we have per device session de-authentication. 
           <button
             type="button"
             bitMenuItem
@@ -82,7 +83,7 @@
             </span>
           </button>
         </bit-menu>
-      </td>
+      </td> -->
     </ng-template>
   </bit-table-scroll>
 </bit-container>
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 3536e9339b..001918ef49 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -9995,6 +9995,9 @@
   "deviceListDescription": {
     "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
   },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },

From 8cabb36c99a7e51af3225f45b4f8a58b042bad68 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Thu, 9 Jan 2025 20:23:55 +0100
Subject: [PATCH 028/150] [PM-16699] Add decrypt trace for decrypt failures
 (#12749)

* Improve decrypt failure logging

* Rename decryptcontext to decrypttrace

* Improve docs

* Revert changes to decrypt logic

* Revert keyservice decryption logic change

* Undo one more change to decrypt logic
---
 .../master-password.service.ts                | 12 +++++--
 .../platform/abstractions/encrypt.service.ts  | 24 +++++++++++--
 .../src/platform/models/domain/domain-base.ts | 21 +++++++++--
 .../src/platform/models/domain/enc-string.ts  | 24 ++++++++-----
 .../encrypt.service.implementation.ts         | 28 ++++++++++-----
 .../src/tools/send/models/domain/send.spec.ts |  7 +++-
 .../vault/models/domain/attachment.spec.ts    |  6 ++--
 .../src/vault/models/domain/attachment.ts     |  7 +++-
 libs/common/src/vault/models/domain/card.ts   |  7 +++-
 libs/common/src/vault/models/domain/cipher.ts | 35 +++++++++++++++----
 .../src/vault/models/domain/identity.ts       |  7 +++-
 .../src/vault/models/domain/login-uri.ts      |  7 +++-
 libs/common/src/vault/models/domain/login.ts  |  4 ++-
 .../src/vault/models/domain/password.ts       |  1 +
 .../src/vault/models/domain/secure-note.ts    |  8 +++--
 .../common/src/vault/models/domain/ssh-key.ts |  7 +++-
 libs/key-management/src/key.service.spec.ts   |  1 +
 libs/key-management/src/key.service.ts        |  2 +-
 18 files changed, 165 insertions(+), 43 deletions(-)

diff --git a/libs/common/src/auth/services/master-password/master-password.service.ts b/libs/common/src/auth/services/master-password/master-password.service.ts
index ea6e1045c1..3ac00adf8e 100644
--- a/libs/common/src/auth/services/master-password/master-password.service.ts
+++ b/libs/common/src/auth/services/master-password/master-password.service.ts
@@ -180,10 +180,18 @@ export class MasterPasswordService implements InternalMasterPasswordServiceAbstr
     let decUserKey: Uint8Array;
 
     if (userKey.encryptionType === EncryptionType.AesCbc256_B64) {
-      decUserKey = await this.encryptService.decryptToBytes(userKey, masterKey);
+      decUserKey = await this.encryptService.decryptToBytes(
+        userKey,
+        masterKey,
+        "Content: User Key; Encrypting Key: Master Key",
+      );
     } else if (userKey.encryptionType === EncryptionType.AesCbc256_HmacSha256_B64) {
       const newKey = await this.keyGenerationService.stretchKey(masterKey);
-      decUserKey = await this.encryptService.decryptToBytes(userKey, newKey);
+      decUserKey = await this.encryptService.decryptToBytes(
+        userKey,
+        newKey,
+        "Content: User Key; Encrypting Key: Stretched Master Key",
+      );
     } else {
       throw new Error("Unsupported encryption type.");
     }
diff --git a/libs/common/src/platform/abstractions/encrypt.service.ts b/libs/common/src/platform/abstractions/encrypt.service.ts
index 5b28b98803..a660524699 100644
--- a/libs/common/src/platform/abstractions/encrypt.service.ts
+++ b/libs/common/src/platform/abstractions/encrypt.service.ts
@@ -8,12 +8,32 @@ import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key";
 export abstract class EncryptService {
   abstract encrypt(plainValue: string | Uint8Array, key: SymmetricCryptoKey): Promise<EncString>;
   abstract encryptToBytes(plainValue: Uint8Array, key: SymmetricCryptoKey): Promise<EncArrayBuffer>;
+  /**
+   * Decrypts an EncString to a string
+   * @param encString - The EncString to decrypt
+   * @param key - The key to decrypt the EncString with
+   * @param decryptTrace - A string to identify the context of the object being decrypted. This can include: field name, encryption type, cipher id, key type, but should not include
+   * sensitive information like encryption keys or data. This is used for logging when decryption errors occur in order to identify what failed to decrypt
+   * @returns The decrypted string
+   */
   abstract decryptToUtf8(
     encString: EncString,
     key: SymmetricCryptoKey,
-    decryptContext?: string,
+    decryptTrace?: string,
   ): Promise<string>;
-  abstract decryptToBytes(encThing: Encrypted, key: SymmetricCryptoKey): Promise<Uint8Array>;
+  /**
+   * Decrypts an Encrypted object to a Uint8Array
+   * @param encThing - The Encrypted object to decrypt
+   * @param key - The key to decrypt the Encrypted object with
+   * @param decryptTrace - A string to identify the context of the object being decrypted. This can include: field name, encryption type, cipher id, key type, but should not include
+   * sensitive information like encryption keys or data. This is used for logging when decryption errors occur in order to identify what failed to decrypt
+   * @returns The decrypted Uint8Array
+   */
+  abstract decryptToBytes(
+    encThing: Encrypted,
+    key: SymmetricCryptoKey,
+    decryptTrace?: string,
+  ): Promise<Uint8Array>;
   abstract rsaEncrypt(data: Uint8Array, publicKey: Uint8Array): Promise<EncString>;
   abstract rsaDecrypt(data: EncString, privateKey: Uint8Array): Promise<Uint8Array>;
   abstract resolveLegacyKey(key: SymmetricCryptoKey, encThing: Encrypted): SymmetricCryptoKey;
diff --git a/libs/common/src/platform/models/domain/domain-base.ts b/libs/common/src/platform/models/domain/domain-base.ts
index bd9139999b..688cf52d4c 100644
--- a/libs/common/src/platform/models/domain/domain-base.ts
+++ b/libs/common/src/platform/models/domain/domain-base.ts
@@ -63,6 +63,7 @@ export default class Domain {
     map: any,
     orgId: string,
     key: SymmetricCryptoKey = null,
+    objectContext: string = "No Domain Context",
   ): Promise<T> {
     const promises = [];
     const self: any = this;
@@ -78,7 +79,11 @@ export default class Domain {
           .then(() => {
             const mapProp = map[theProp] || theProp;
             if (self[mapProp]) {
-              return self[mapProp].decrypt(orgId, key);
+              return self[mapProp].decrypt(
+                orgId,
+                key,
+                `Property: ${prop}; ObjectContext: ${objectContext}`,
+              );
             }
             return null;
           })
@@ -114,12 +119,21 @@ export default class Domain {
     key: SymmetricCryptoKey,
     encryptService: EncryptService,
     _: Constructor<TThis> = this.constructor as Constructor<TThis>,
+    objectContext: string = "No Domain Context",
   ): Promise<DecryptedObject<TThis, TEncryptedKeys>> {
     const promises = [];
 
     for (const prop of encryptedProperties) {
       const value = (this as any)[prop] as EncString;
-      promises.push(this.decryptProperty(prop, value, key, encryptService));
+      promises.push(
+        this.decryptProperty(
+          prop,
+          value,
+          key,
+          encryptService,
+          `Property: ${prop.toString()}; ObjectContext: ${objectContext}`,
+        ),
+      );
     }
 
     const decryptedObjects = await Promise.all(promises);
@@ -137,10 +151,11 @@ export default class Domain {
     value: EncString,
     key: SymmetricCryptoKey,
     encryptService: EncryptService,
+    decryptTrace: string,
   ) {
     let decrypted: string = null;
     if (value) {
-      decrypted = await value.decryptWithKey(key, encryptService);
+      decrypted = await value.decryptWithKey(key, encryptService, decryptTrace);
     } else {
       decrypted = null;
     }
diff --git a/libs/common/src/platform/models/domain/enc-string.ts b/libs/common/src/platform/models/domain/enc-string.ts
index c484c80ee5..b8e0006942 100644
--- a/libs/common/src/platform/models/domain/enc-string.ts
+++ b/libs/common/src/platform/models/domain/enc-string.ts
@@ -156,21 +156,21 @@ export class EncString implements Encrypted {
     return EXPECTED_NUM_PARTS_BY_ENCRYPTION_TYPE[encType] === encPieces.length;
   }
 
-  async decrypt(orgId: string, key: SymmetricCryptoKey = null): Promise<string> {
+  async decrypt(orgId: string, key: SymmetricCryptoKey = null, context?: string): Promise<string> {
     if (this.decryptedValue != null) {
       return this.decryptedValue;
     }
 
-    let keyContext = "provided-key";
+    let decryptTrace = "provided-key";
     try {
       if (key == null) {
         key = await this.getKeyForDecryption(orgId);
-        keyContext = orgId == null ? `domain-orgkey-${orgId}` : "domain-userkey|masterkey";
+        decryptTrace = orgId == null ? `domain-orgkey-${orgId}` : "domain-userkey|masterkey";
         if (orgId != null) {
-          keyContext = `domain-orgkey-${orgId}`;
+          decryptTrace = `domain-orgkey-${orgId}`;
         } else {
           const cryptoService = Utils.getContainerService().getKeyService();
-          keyContext =
+          decryptTrace =
             (await cryptoService.getUserKey()) == null
               ? "domain-withlegacysupport-masterkey"
               : "domain-withlegacysupport-userkey";
@@ -181,20 +181,28 @@ export class EncString implements Encrypted {
       }
 
       const encryptService = Utils.getContainerService().getEncryptService();
-      this.decryptedValue = await encryptService.decryptToUtf8(this, key, keyContext);
+      this.decryptedValue = await encryptService.decryptToUtf8(
+        this,
+        key,
+        decryptTrace == null ? context : `${decryptTrace}${context || ""}`,
+      );
     } catch (e) {
       this.decryptedValue = DECRYPT_ERROR;
     }
     return this.decryptedValue;
   }
 
-  async decryptWithKey(key: SymmetricCryptoKey, encryptService: EncryptService) {
+  async decryptWithKey(
+    key: SymmetricCryptoKey,
+    encryptService: EncryptService,
+    decryptTrace: string = "domain-withkey",
+  ): Promise<string> {
     try {
       if (key == null) {
         throw new Error("No key to decrypt EncString");
       }
 
-      this.decryptedValue = await encryptService.decryptToUtf8(this, key, "domain-withkey");
+      this.decryptedValue = await encryptService.decryptToUtf8(this, key, decryptTrace);
     } catch (e) {
       this.decryptedValue = DECRYPT_ERROR;
     }
diff --git a/libs/common/src/platform/services/cryptography/encrypt.service.implementation.ts b/libs/common/src/platform/services/cryptography/encrypt.service.implementation.ts
index 0a85b34eba..db353f51c9 100644
--- a/libs/common/src/platform/services/cryptography/encrypt.service.implementation.ts
+++ b/libs/common/src/platform/services/cryptography/encrypt.service.implementation.ts
@@ -114,7 +114,7 @@ export class EncryptServiceImplementation implements EncryptService {
       const macsEqual = await this.cryptoFunctionService.compareFast(fastParams.mac, computedMac);
       if (!macsEqual) {
         this.logMacFailed(
-          "[Encrypt service] MAC comparison failed. Key or payload has changed. Key type " +
+          "[Encrypt service] decryptToUtf8 MAC comparison failed. Key or payload has changed. Key type " +
             encryptionTypeName(key.encType) +
             "Payload type " +
             encryptionTypeName(encString.encryptionType) +
@@ -128,7 +128,11 @@ export class EncryptServiceImplementation implements EncryptService {
     return await this.cryptoFunctionService.aesDecryptFast(fastParams, "cbc");
   }
 
-  async decryptToBytes(encThing: Encrypted, key: SymmetricCryptoKey): Promise<Uint8Array> {
+  async decryptToBytes(
+    encThing: Encrypted,
+    key: SymmetricCryptoKey,
+    decryptContext: string = "no context",
+  ): Promise<Uint8Array> {
     if (key == null) {
       throw new Error("No encryption key provided.");
     }
@@ -145,7 +149,9 @@ export class EncryptServiceImplementation implements EncryptService {
         "[Encrypt service] Key has mac key but payload is missing mac bytes. Key type " +
           encryptionTypeName(key.encType) +
           " Payload type " +
-          encryptionTypeName(encThing.encryptionType),
+          encryptionTypeName(encThing.encryptionType) +
+          " Decrypt context: " +
+          decryptContext,
       );
       return null;
     }
@@ -155,7 +161,9 @@ export class EncryptServiceImplementation implements EncryptService {
         "[Encrypt service] Key encryption type does not match payload encryption type. Key type " +
           encryptionTypeName(key.encType) +
           " Payload type " +
-          encryptionTypeName(encThing.encryptionType),
+          encryptionTypeName(encThing.encryptionType) +
+          " Decrypt context: " +
+          decryptContext,
       );
       return null;
     }
@@ -167,11 +175,13 @@ export class EncryptServiceImplementation implements EncryptService {
       const computedMac = await this.cryptoFunctionService.hmac(macData, key.macKey, "sha256");
       if (computedMac === null) {
         this.logMacFailed(
-          "[Encrypt service] Failed to compute MAC." +
+          "[Encrypt service#decryptToBytes] Failed to compute MAC." +
             " Key type " +
             encryptionTypeName(key.encType) +
             " Payload type " +
-            encryptionTypeName(encThing.encryptionType),
+            encryptionTypeName(encThing.encryptionType) +
+            " Decrypt context: " +
+            decryptContext,
         );
         return null;
       }
@@ -179,11 +189,13 @@ export class EncryptServiceImplementation implements EncryptService {
       const macsMatch = await this.cryptoFunctionService.compare(encThing.macBytes, computedMac);
       if (!macsMatch) {
         this.logMacFailed(
-          "[Encrypt service] MAC comparison failed. Key or payload has changed." +
+          "[Encrypt service#decryptToBytes]: MAC comparison failed. Key or payload has changed." +
             " Key type " +
             encryptionTypeName(key.encType) +
             " Payload type " +
-            encryptionTypeName(encThing.encryptionType),
+            encryptionTypeName(encThing.encryptionType) +
+            " Decrypt context: " +
+            decryptContext,
         );
         return null;
       }
diff --git a/libs/common/src/tools/send/models/domain/send.spec.ts b/libs/common/src/tools/send/models/domain/send.spec.ts
index 74c0e77b39..acdb96f0e0 100644
--- a/libs/common/src/tools/send/models/domain/send.spec.ts
+++ b/libs/common/src/tools/send/models/domain/send.spec.ts
@@ -123,7 +123,12 @@ describe("Send", () => {
     const view = await send.decrypt();
 
     expect(text.decrypt).toHaveBeenNthCalledWith(1, "cryptoKey");
-    expect(send.name.decrypt).toHaveBeenNthCalledWith(1, null, "cryptoKey");
+    expect(send.name.decrypt).toHaveBeenNthCalledWith(
+      1,
+      null,
+      "cryptoKey",
+      "Property: name; ObjectContext: No Domain Context",
+    );
 
     expect(view).toMatchObject({
       id: "id",
diff --git a/libs/common/src/vault/models/domain/attachment.spec.ts b/libs/common/src/vault/models/domain/attachment.spec.ts
index 14dec8dea0..b074e7a46a 100644
--- a/libs/common/src/vault/models/domain/attachment.spec.ts
+++ b/libs/common/src/vault/models/domain/attachment.spec.ts
@@ -101,7 +101,7 @@ describe("Attachment", () => {
       it("uses the provided key without depending on KeyService", async () => {
         const providedKey = mock<SymmetricCryptoKey>();
 
-        await attachment.decrypt(null, providedKey);
+        await attachment.decrypt(null, "", providedKey);
 
         expect(keyService.getUserKeyWithLegacySupport).not.toHaveBeenCalled();
         expect(encryptService.decryptToBytes).toHaveBeenCalledWith(attachment.key, providedKey);
@@ -111,7 +111,7 @@ describe("Attachment", () => {
         const orgKey = mock<OrgKey>();
         keyService.getOrgKey.calledWith("orgId").mockResolvedValue(orgKey);
 
-        await attachment.decrypt("orgId", null);
+        await attachment.decrypt("orgId", "", null);
 
         expect(keyService.getOrgKey).toHaveBeenCalledWith("orgId");
         expect(encryptService.decryptToBytes).toHaveBeenCalledWith(attachment.key, orgKey);
@@ -121,7 +121,7 @@ describe("Attachment", () => {
         const userKey = mock<UserKey>();
         keyService.getUserKeyWithLegacySupport.mockResolvedValue(userKey);
 
-        await attachment.decrypt(null, null);
+        await attachment.decrypt(null, "", null);
 
         expect(keyService.getUserKeyWithLegacySupport).toHaveBeenCalled();
         expect(encryptService.decryptToBytes).toHaveBeenCalledWith(attachment.key, userKey);
diff --git a/libs/common/src/vault/models/domain/attachment.ts b/libs/common/src/vault/models/domain/attachment.ts
index 1178f441c5..2b893e33f4 100644
--- a/libs/common/src/vault/models/domain/attachment.ts
+++ b/libs/common/src/vault/models/domain/attachment.ts
@@ -38,7 +38,11 @@ export class Attachment extends Domain {
     );
   }
 
-  async decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<AttachmentView> {
+  async decrypt(
+    orgId: string,
+    context = "No Cipher Context",
+    encKey?: SymmetricCryptoKey,
+  ): Promise<AttachmentView> {
     const view = await this.decryptObj(
       new AttachmentView(this),
       {
@@ -46,6 +50,7 @@ export class Attachment extends Domain {
       },
       orgId,
       encKey,
+      "DomainType: Attachment; " + context,
     );
 
     if (this.key != null) {
diff --git a/libs/common/src/vault/models/domain/card.ts b/libs/common/src/vault/models/domain/card.ts
index 739cbf7846..fccfe3f595 100644
--- a/libs/common/src/vault/models/domain/card.ts
+++ b/libs/common/src/vault/models/domain/card.ts
@@ -37,7 +37,11 @@ export class Card extends Domain {
     );
   }
 
-  decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<CardView> {
+  async decrypt(
+    orgId: string,
+    context = "No Cipher Context",
+    encKey?: SymmetricCryptoKey,
+  ): Promise<CardView> {
     return this.decryptObj(
       new CardView(),
       {
@@ -50,6 +54,7 @@ export class Card extends Domain {
       },
       orgId,
       encKey,
+      "DomainType: Card; " + context,
     );
   }
 
diff --git a/libs/common/src/vault/models/domain/cipher.ts b/libs/common/src/vault/models/domain/cipher.ts
index 437afe2e93..d82f4585e6 100644
--- a/libs/common/src/vault/models/domain/cipher.ts
+++ b/libs/common/src/vault/models/domain/cipher.ts
@@ -136,7 +136,11 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
 
     if (this.key != null) {
       const encryptService = Utils.getContainerService().getEncryptService();
-      const keyBytes = await encryptService.decryptToBytes(this.key, encKey);
+      const keyBytes = await encryptService.decryptToBytes(
+        this.key,
+        encKey,
+        `Cipher Id: ${this.id}; Content: CipherKey; IsEncryptedByOrgKey: ${this.organizationId != null}`,
+      );
       if (keyBytes == null) {
         model.name = "[error: cannot decrypt]";
         model.decryptionFailure = true;
@@ -158,19 +162,36 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
 
     switch (this.type) {
       case CipherType.Login:
-        model.login = await this.login.decrypt(this.organizationId, bypassValidation, encKey);
+        model.login = await this.login.decrypt(
+          this.organizationId,
+          bypassValidation,
+          `Cipher Id: ${this.id}`,
+          encKey,
+        );
         break;
       case CipherType.SecureNote:
-        model.secureNote = await this.secureNote.decrypt(this.organizationId, encKey);
+        model.secureNote = await this.secureNote.decrypt(
+          this.organizationId,
+          `Cipher Id: ${this.id}`,
+          encKey,
+        );
         break;
       case CipherType.Card:
-        model.card = await this.card.decrypt(this.organizationId, encKey);
+        model.card = await this.card.decrypt(this.organizationId, `Cipher Id: ${this.id}`, encKey);
         break;
       case CipherType.Identity:
-        model.identity = await this.identity.decrypt(this.organizationId, encKey);
+        model.identity = await this.identity.decrypt(
+          this.organizationId,
+          `Cipher Id: ${this.id}`,
+          encKey,
+        );
         break;
       case CipherType.SshKey:
-        model.sshKey = await this.sshKey.decrypt(this.organizationId, encKey);
+        model.sshKey = await this.sshKey.decrypt(
+          this.organizationId,
+          `Cipher Id: ${this.id}`,
+          encKey,
+        );
         break;
       default:
         break;
@@ -181,7 +202,7 @@ export class Cipher extends Domain implements Decryptable<CipherView> {
       await this.attachments.reduce((promise, attachment) => {
         return promise
           .then(() => {
-            return attachment.decrypt(this.organizationId, encKey);
+            return attachment.decrypt(this.organizationId, `Cipher Id: ${this.id}`, encKey);
           })
           .then((decAttachment) => {
             attachments.push(decAttachment);
diff --git a/libs/common/src/vault/models/domain/identity.ts b/libs/common/src/vault/models/domain/identity.ts
index e2b7aef52f..570e6c0b4d 100644
--- a/libs/common/src/vault/models/domain/identity.ts
+++ b/libs/common/src/vault/models/domain/identity.ts
@@ -61,7 +61,11 @@ export class Identity extends Domain {
     );
   }
 
-  decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<IdentityView> {
+  decrypt(
+    orgId: string,
+    context: string = "No Cipher Context",
+    encKey?: SymmetricCryptoKey,
+  ): Promise<IdentityView> {
     return this.decryptObj(
       new IdentityView(),
       {
@@ -86,6 +90,7 @@ export class Identity extends Domain {
       },
       orgId,
       encKey,
+      "DomainType: Identity; " + context,
     );
   }
 
diff --git a/libs/common/src/vault/models/domain/login-uri.ts b/libs/common/src/vault/models/domain/login-uri.ts
index 0d7380e034..36782a8150 100644
--- a/libs/common/src/vault/models/domain/login-uri.ts
+++ b/libs/common/src/vault/models/domain/login-uri.ts
@@ -33,7 +33,11 @@ export class LoginUri extends Domain {
     );
   }
 
-  decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<LoginUriView> {
+  decrypt(
+    orgId: string,
+    context: string = "No Cipher Context",
+    encKey?: SymmetricCryptoKey,
+  ): Promise<LoginUriView> {
     return this.decryptObj(
       new LoginUriView(this),
       {
@@ -41,6 +45,7 @@ export class LoginUri extends Domain {
       },
       orgId,
       encKey,
+      context,
     );
   }
 
diff --git a/libs/common/src/vault/models/domain/login.ts b/libs/common/src/vault/models/domain/login.ts
index a0a61a9b85..f9a85cd818 100644
--- a/libs/common/src/vault/models/domain/login.ts
+++ b/libs/common/src/vault/models/domain/login.ts
@@ -55,6 +55,7 @@ export class Login extends Domain {
   async decrypt(
     orgId: string,
     bypassValidation: boolean,
+    context: string = "No Cipher Context",
     encKey?: SymmetricCryptoKey,
   ): Promise<LoginView> {
     const view = await this.decryptObj(
@@ -66,6 +67,7 @@ export class Login extends Domain {
       },
       orgId,
       encKey,
+      `DomainType: Login; ${context}`,
     );
 
     if (this.uris != null) {
@@ -76,7 +78,7 @@ export class Login extends Domain {
           continue;
         }
 
-        const uri = await this.uris[i].decrypt(orgId, encKey);
+        const uri = await this.uris[i].decrypt(orgId, context, encKey);
         // URIs are shared remotely after decryption
         // we need to validate that the string hasn't been changed by a compromised server
         // This validation is tied to the existence of cypher.key for backwards compatibility
diff --git a/libs/common/src/vault/models/domain/password.ts b/libs/common/src/vault/models/domain/password.ts
index 4c4f465654..48063f495f 100644
--- a/libs/common/src/vault/models/domain/password.ts
+++ b/libs/common/src/vault/models/domain/password.ts
@@ -32,6 +32,7 @@ export class Password extends Domain {
       },
       orgId,
       encKey,
+      "DomainType: PasswordHistory",
     );
   }
 
diff --git a/libs/common/src/vault/models/domain/secure-note.ts b/libs/common/src/vault/models/domain/secure-note.ts
index 4769ad062d..693ae38d9f 100644
--- a/libs/common/src/vault/models/domain/secure-note.ts
+++ b/libs/common/src/vault/models/domain/secure-note.ts
@@ -20,8 +20,12 @@ export class SecureNote extends Domain {
     this.type = obj.type;
   }
 
-  decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<SecureNoteView> {
-    return Promise.resolve(new SecureNoteView(this));
+  async decrypt(
+    orgId: string,
+    context = "No Cipher Context",
+    encKey?: SymmetricCryptoKey,
+  ): Promise<SecureNoteView> {
+    return new SecureNoteView(this);
   }
 
   toSecureNoteData(): SecureNoteData {
diff --git a/libs/common/src/vault/models/domain/ssh-key.ts b/libs/common/src/vault/models/domain/ssh-key.ts
index 3a79c1f002..9ce16fe455 100644
--- a/libs/common/src/vault/models/domain/ssh-key.ts
+++ b/libs/common/src/vault/models/domain/ssh-key.ts
@@ -32,7 +32,11 @@ export class SshKey extends Domain {
     );
   }
 
-  decrypt(orgId: string, encKey?: SymmetricCryptoKey): Promise<SshKeyView> {
+  decrypt(
+    orgId: string,
+    context = "No Cipher Context",
+    encKey?: SymmetricCryptoKey,
+  ): Promise<SshKeyView> {
     return this.decryptObj(
       new SshKeyView(),
       {
@@ -42,6 +46,7 @@ export class SshKey extends Domain {
       },
       orgId,
       encKey,
+      "DomainType: SshKey; " + context,
     );
   }
 
diff --git a/libs/key-management/src/key.service.spec.ts b/libs/key-management/src/key.service.spec.ts
index 142a8bbeb8..b77c14ff53 100644
--- a/libs/key-management/src/key.service.spec.ts
+++ b/libs/key-management/src/key.service.spec.ts
@@ -462,6 +462,7 @@ describe("keyService", () => {
       expect(encryptService.decryptToBytes).toHaveBeenCalledWith(
         fakeEncryptedUserPrivateKey,
         userKey,
+        "Content: Encrypted Private Key",
       );
 
       expect(userPrivateKey).toBe(fakeDecryptedUserPrivateKey);
diff --git a/libs/key-management/src/key.service.ts b/libs/key-management/src/key.service.ts
index fba0ce60b7..b1debccb95 100644
--- a/libs/key-management/src/key.service.ts
+++ b/libs/key-management/src/key.service.ts
@@ -382,7 +382,6 @@ export class DefaultKeyService implements KeyServiceAbstraction {
           key: org.key,
         };
       });
-
       return encOrgKeyData;
     });
   }
@@ -891,6 +890,7 @@ export class DefaultKeyService implements KeyServiceAbstraction {
     return (await this.encryptService.decryptToBytes(
       new EncString(encryptedPrivateKey),
       key,
+      "Content: Encrypted Private Key",
     )) as UserPrivateKey;
   }
 

From 6ef3e9a07673ab9d332aa880cb1f212688e1c446 Mon Sep 17 00:00:00 2001
From: Matt Gibson <mgibson@bitwarden.com>
Date: Thu, 9 Jan 2025 18:58:22 -0500
Subject: [PATCH 029/150] [PM-16831] TS Strict crypto function service (#12737)

* strict types in crypto function services

* Improve aesDecrypt types
---
 .../abstractions/crypto-function.service.ts   | 14 +++---
 .../models/domain/decrypt-parameters.ts       | 15 +++---
 .../models/domain/symmetric-crypto-key.ts     | 10 ++--
 .../encrypt.service.implementation.ts         |  2 +-
 .../web-crypto-function.service.spec.ts       | 33 +++++++++----
 .../services/web-crypto-function.service.ts   | 47 ++++++++++++-------
 .../node-crypto-function.service.spec.ts      | 26 ++++++----
 .../services/node-crypto-function.service.ts  | 37 ++++++++++-----
 8 files changed, 117 insertions(+), 67 deletions(-)

diff --git a/libs/common/src/platform/abstractions/crypto-function.service.ts b/libs/common/src/platform/abstractions/crypto-function.service.ts
index 18c14677dd..56b0ee55af 100644
--- a/libs/common/src/platform/abstractions/crypto-function.service.ts
+++ b/libs/common/src/platform/abstractions/crypto-function.service.ts
@@ -1,5 +1,5 @@
 import { CsprngArray } from "../../types/csprng";
-import { DecryptParameters } from "../models/domain/decrypt-parameters";
+import { CbcDecryptParameters, EcbDecryptParameters } from "../models/domain/decrypt-parameters";
 import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key";
 
 export abstract class CryptoFunctionService {
@@ -51,11 +51,13 @@ export abstract class CryptoFunctionService {
     iv: string,
     mac: string,
     key: SymmetricCryptoKey,
-  ): DecryptParameters<Uint8Array | string>;
-  abstract aesDecryptFast(
-    parameters: DecryptParameters<Uint8Array | string>,
-    mode: "cbc" | "ecb",
-  ): Promise<string>;
+  ): CbcDecryptParameters<Uint8Array | string>;
+  abstract aesDecryptFast({
+    mode,
+    parameters,
+  }:
+    | { mode: "cbc"; parameters: CbcDecryptParameters<Uint8Array | string> }
+    | { mode: "ecb"; parameters: EcbDecryptParameters<Uint8Array | string> }): Promise<string>;
   abstract aesDecrypt(
     data: Uint8Array,
     iv: Uint8Array,
diff --git a/libs/common/src/platform/models/domain/decrypt-parameters.ts b/libs/common/src/platform/models/domain/decrypt-parameters.ts
index 784826d3bd..d3b4bf60d4 100644
--- a/libs/common/src/platform/models/domain/decrypt-parameters.ts
+++ b/libs/common/src/platform/models/domain/decrypt-parameters.ts
@@ -1,10 +1,13 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-export class DecryptParameters<T> {
+export type CbcDecryptParameters<T> = {
   encKey: T;
   data: T;
   iv: T;
-  macKey: T;
-  mac: T;
+  macKey?: T;
+  mac?: T;
   macData: T;
-}
+};
+
+export type EcbDecryptParameters<T> = {
+  encKey: T;
+  data: T;
+};
diff --git a/libs/common/src/platform/models/domain/symmetric-crypto-key.ts b/libs/common/src/platform/models/domain/symmetric-crypto-key.ts
index f467cb8d6e..eab4c7b211 100644
--- a/libs/common/src/platform/models/domain/symmetric-crypto-key.ts
+++ b/libs/common/src/platform/models/domain/symmetric-crypto-key.ts
@@ -7,7 +7,7 @@ import { EncryptionType } from "../../enums";
 
 export class SymmetricCryptoKey {
   key: Uint8Array;
-  encKey?: Uint8Array;
+  encKey: Uint8Array;
   macKey?: Uint8Array;
   encType: EncryptionType;
 
@@ -48,12 +48,8 @@ export class SymmetricCryptoKey {
       throw new Error("Unsupported encType/key length.");
     }
 
-    if (this.key != null) {
-      this.keyB64 = Utils.fromBufferToB64(this.key);
-    }
-    if (this.encKey != null) {
-      this.encKeyB64 = Utils.fromBufferToB64(this.encKey);
-    }
+    this.keyB64 = Utils.fromBufferToB64(this.key);
+    this.encKeyB64 = Utils.fromBufferToB64(this.encKey);
     if (this.macKey != null) {
       this.macKeyB64 = Utils.fromBufferToB64(this.macKey);
     }
diff --git a/libs/common/src/platform/services/cryptography/encrypt.service.implementation.ts b/libs/common/src/platform/services/cryptography/encrypt.service.implementation.ts
index db353f51c9..68263cadf2 100644
--- a/libs/common/src/platform/services/cryptography/encrypt.service.implementation.ts
+++ b/libs/common/src/platform/services/cryptography/encrypt.service.implementation.ts
@@ -125,7 +125,7 @@ export class EncryptServiceImplementation implements EncryptService {
       }
     }
 
-    return await this.cryptoFunctionService.aesDecryptFast(fastParams, "cbc");
+    return await this.cryptoFunctionService.aesDecryptFast({ mode: "cbc", parameters: fastParams });
   }
 
   async decryptToBytes(
diff --git a/libs/common/src/platform/services/web-crypto-function.service.spec.ts b/libs/common/src/platform/services/web-crypto-function.service.spec.ts
index 71f2828855..1929e6454e 100644
--- a/libs/common/src/platform/services/web-crypto-function.service.spec.ts
+++ b/libs/common/src/platform/services/web-crypto-function.service.spec.ts
@@ -2,7 +2,7 @@ import { mock } from "jest-mock-extended";
 
 import { Utils } from "../../platform/misc/utils";
 import { PlatformUtilsService } from "../abstractions/platform-utils.service";
-import { DecryptParameters } from "../models/domain/decrypt-parameters";
+import { EcbDecryptParameters } from "../models/domain/decrypt-parameters";
 import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key";
 
 import { WebCryptoFunctionService } from "./web-crypto-function.service";
@@ -253,8 +253,13 @@ describe("WebCrypto Function Service", () => {
       const encData = Utils.fromBufferToB64(encValue);
       const b64Iv = Utils.fromBufferToB64(iv);
       const symKey = new SymmetricCryptoKey(key);
-      const params = cryptoFunctionService.aesDecryptFastParameters(encData, b64Iv, null, symKey);
-      const decValue = await cryptoFunctionService.aesDecryptFast(params, "cbc");
+      const parameters = cryptoFunctionService.aesDecryptFastParameters(
+        encData,
+        b64Iv,
+        null,
+        symKey,
+      );
+      const decValue = await cryptoFunctionService.aesDecryptFast({ mode: "cbc", parameters });
       expect(decValue).toBe(value);
     });
 
@@ -276,8 +281,8 @@ describe("WebCrypto Function Service", () => {
       const iv = Utils.fromBufferToB64(makeStaticByteArray(16));
       const symKey = new SymmetricCryptoKey(makeStaticByteArray(32));
       const data = "ByUF8vhyX4ddU9gcooznwA==";
-      const params = cryptoFunctionService.aesDecryptFastParameters(data, iv, null, symKey);
-      const decValue = await cryptoFunctionService.aesDecryptFast(params, "cbc");
+      const parameters = cryptoFunctionService.aesDecryptFastParameters(data, iv, null, symKey);
+      const decValue = await cryptoFunctionService.aesDecryptFast({ mode: "cbc", parameters });
       expect(decValue).toBe("EncryptMe!");
     });
   });
@@ -287,10 +292,11 @@ describe("WebCrypto Function Service", () => {
       const cryptoFunctionService = getWebCryptoFunctionService();
       const key = makeStaticByteArray(32);
       const data = Utils.fromB64ToArray("z5q2XSxYCdQFdI+qK2yLlw==");
-      const params = new DecryptParameters<string>();
-      params.encKey = Utils.fromBufferToByteString(key);
-      params.data = Utils.fromBufferToByteString(data);
-      const decValue = await cryptoFunctionService.aesDecryptFast(params, "ecb");
+      const parameters: EcbDecryptParameters<string> = {
+        encKey: Utils.fromBufferToByteString(key),
+        data: Utils.fromBufferToByteString(data),
+      };
+      const decValue = await cryptoFunctionService.aesDecryptFast({ mode: "ecb", parameters });
       expect(decValue).toBe("EncryptMe!");
     });
   });
@@ -304,6 +310,15 @@ describe("WebCrypto Function Service", () => {
       const decValue = await cryptoFunctionService.aesDecrypt(data, iv, key, "cbc");
       expect(Utils.fromBufferToUtf8(decValue)).toBe("EncryptMe!");
     });
+
+    it("throws if iv is not provided", async () => {
+      const cryptoFunctionService = getWebCryptoFunctionService();
+      const key = makeStaticByteArray(32);
+      const data = Utils.fromB64ToArray("ByUF8vhyX4ddU9gcooznwA==");
+      await expect(() => cryptoFunctionService.aesDecrypt(data, null, key, "cbc")).rejects.toThrow(
+        "IV is required for CBC mode",
+      );
+    });
   });
 
   describe("aesDecrypt ECB mode", () => {
diff --git a/libs/common/src/platform/services/web-crypto-function.service.ts b/libs/common/src/platform/services/web-crypto-function.service.ts
index c059265484..61edf7a13b 100644
--- a/libs/common/src/platform/services/web-crypto-function.service.ts
+++ b/libs/common/src/platform/services/web-crypto-function.service.ts
@@ -1,12 +1,10 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import * as argon2 from "argon2-browser";
 import * as forge from "node-forge";
 
 import { Utils } from "../../platform/misc/utils";
 import { CsprngArray } from "../../types/csprng";
 import { CryptoFunctionService } from "../abstractions/crypto-function.service";
-import { DecryptParameters } from "../models/domain/decrypt-parameters";
+import { CbcDecryptParameters, EcbDecryptParameters } from "../models/domain/decrypt-parameters";
 import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key";
 
 export class WebCryptoFunctionService implements CryptoFunctionService {
@@ -14,10 +12,14 @@ export class WebCryptoFunctionService implements CryptoFunctionService {
   private subtle: SubtleCrypto;
   private wasmSupported: boolean;
 
-  constructor(globalContext: Window | typeof global) {
-    this.crypto = typeof globalContext.crypto !== "undefined" ? globalContext.crypto : null;
-    this.subtle =
-      !!this.crypto && typeof this.crypto.subtle !== "undefined" ? this.crypto.subtle : null;
+  constructor(globalContext: { crypto: Crypto }) {
+    if (globalContext?.crypto?.subtle == null) {
+      throw new Error(
+        "Could not instantiate WebCryptoFunctionService. Could not locate Subtle crypto.",
+      );
+    }
+    this.crypto = globalContext.crypto;
+    this.subtle = this.crypto.subtle;
     this.wasmSupported = this.checkIfWasmSupported();
   }
 
@@ -220,7 +222,7 @@ export class WebCryptoFunctionService implements CryptoFunctionService {
     hmac.update(a);
     const mac1 = hmac.digest().getBytes();
 
-    hmac.start(null, null);
+    hmac.start("sha256", null);
     hmac.update(b);
     const mac2 = hmac.digest().getBytes();
 
@@ -239,10 +241,10 @@ export class WebCryptoFunctionService implements CryptoFunctionService {
   aesDecryptFastParameters(
     data: string,
     iv: string,
-    mac: string,
+    mac: string | null,
     key: SymmetricCryptoKey,
-  ): DecryptParameters<string> {
-    const p = new DecryptParameters<string>();
+  ): CbcDecryptParameters<string> {
+    const p = {} as CbcDecryptParameters<string>;
     if (key.meta != null) {
       p.encKey = key.meta.encKeyByteString;
       p.macKey = key.meta.macKeyByteString;
@@ -275,7 +277,12 @@ export class WebCryptoFunctionService implements CryptoFunctionService {
     return p;
   }
 
-  aesDecryptFast(parameters: DecryptParameters<string>, mode: "cbc" | "ecb"): Promise<string> {
+  aesDecryptFast({
+    mode,
+    parameters,
+  }:
+    | { mode: "cbc"; parameters: CbcDecryptParameters<string> }
+    | { mode: "ecb"; parameters: EcbDecryptParameters<string> }): Promise<string> {
     const decipher = (forge as any).cipher.createDecipher(
       this.toWebCryptoAesMode(mode),
       parameters.encKey,
@@ -294,21 +301,27 @@ export class WebCryptoFunctionService implements CryptoFunctionService {
 
   async aesDecrypt(
     data: Uint8Array,
-    iv: Uint8Array,
+    iv: Uint8Array | null,
     key: Uint8Array,
     mode: "cbc" | "ecb",
   ): Promise<Uint8Array> {
     if (mode === "ecb") {
       // Web crypto does not support AES-ECB mode, so we need to do this in forge.
-      const params = new DecryptParameters<string>();
-      params.data = this.toByteString(data);
-      params.encKey = this.toByteString(key);
-      const result = await this.aesDecryptFast(params, "ecb");
+      const parameters: EcbDecryptParameters<string> = {
+        data: this.toByteString(data),
+        encKey: this.toByteString(key),
+      };
+      const result = await this.aesDecryptFast({ mode: "ecb", parameters });
       return Utils.fromByteStringToArray(result);
     }
     const impKey = await this.subtle.importKey("raw", key, { name: "AES-CBC" } as any, false, [
       "decrypt",
     ]);
+
+    // CBC
+    if (iv == null) {
+      throw new Error("IV is required for CBC mode.");
+    }
     const buffer = await this.subtle.decrypt({ name: "AES-CBC", iv: iv }, impKey, data);
     return new Uint8Array(buffer);
   }
diff --git a/libs/node/src/services/node-crypto-function.service.spec.ts b/libs/node/src/services/node-crypto-function.service.spec.ts
index 61200b9285..3256d85110 100644
--- a/libs/node/src/services/node-crypto-function.service.spec.ts
+++ b/libs/node/src/services/node-crypto-function.service.spec.ts
@@ -1,5 +1,5 @@
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { DecryptParameters } from "@bitwarden/common/platform/models/domain/decrypt-parameters";
+import { EcbDecryptParameters } from "@bitwarden/common/platform/models/domain/decrypt-parameters";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 
 import { NodeCryptoFunctionService } from "./node-crypto-function.service";
@@ -193,8 +193,8 @@ describe("NodeCrypto Function Service", () => {
       const iv = Utils.fromBufferToB64(makeStaticByteArray(16));
       const symKey = new SymmetricCryptoKey(makeStaticByteArray(32));
       const data = "ByUF8vhyX4ddU9gcooznwA==";
-      const params = nodeCryptoFunctionService.aesDecryptFastParameters(data, iv, null, symKey);
-      const decValue = await nodeCryptoFunctionService.aesDecryptFast(params, "cbc");
+      const parameters = nodeCryptoFunctionService.aesDecryptFastParameters(data, iv, null, symKey);
+      const decValue = await nodeCryptoFunctionService.aesDecryptFast({ mode: "cbc", parameters });
       expect(decValue).toBe("EncryptMe!");
     });
   });
@@ -202,10 +202,11 @@ describe("NodeCrypto Function Service", () => {
   describe("aesDecryptFast ECB mode", () => {
     it("should successfully decrypt data", async () => {
       const nodeCryptoFunctionService = new NodeCryptoFunctionService();
-      const params = new DecryptParameters<Uint8Array>();
-      params.encKey = makeStaticByteArray(32);
-      params.data = Utils.fromB64ToArray("z5q2XSxYCdQFdI+qK2yLlw==");
-      const decValue = await nodeCryptoFunctionService.aesDecryptFast(params, "ecb");
+      const parameters: EcbDecryptParameters<Uint8Array> = {
+        encKey: makeStaticByteArray(32),
+        data: Utils.fromB64ToArray("z5q2XSxYCdQFdI+qK2yLlw=="),
+      };
+      const decValue = await nodeCryptoFunctionService.aesDecryptFast({ mode: "ecb", parameters });
       expect(decValue).toBe("EncryptMe!");
     });
   });
@@ -219,6 +220,15 @@ describe("NodeCrypto Function Service", () => {
       const decValue = await nodeCryptoFunctionService.aesDecrypt(data, iv, key, "cbc");
       expect(Utils.fromBufferToUtf8(decValue)).toBe("EncryptMe!");
     });
+
+    it("throws if IV is not provided", async () => {
+      const nodeCryptoFunctionService = new NodeCryptoFunctionService();
+      const key = makeStaticByteArray(32);
+      const data = Utils.fromB64ToArray("ByUF8vhyX4ddU9gcooznwA==");
+      await expect(
+        async () => await nodeCryptoFunctionService.aesDecrypt(data, null, key, "cbc"),
+      ).rejects.toThrow("Invalid initialization vector");
+    });
   });
 
   describe("aesDecrypt ECB mode", () => {
@@ -454,7 +464,7 @@ function testHmac(algorithm: "sha1" | "sha256" | "sha512", mac: string, fast = f
     const cryptoFunctionService = new NodeCryptoFunctionService();
     const value = Utils.fromUtf8ToArray("SignMe!!");
     const key = Utils.fromUtf8ToArray("secretkey");
-    let computedMac: ArrayBuffer = null;
+    let computedMac: ArrayBuffer;
     if (fast) {
       computedMac = await cryptoFunctionService.hmacFast(value, key, algorithm);
     } else {
diff --git a/libs/node/src/services/node-crypto-function.service.ts b/libs/node/src/services/node-crypto-function.service.ts
index 74d6de2e34..c06f18023b 100644
--- a/libs/node/src/services/node-crypto-function.service.ts
+++ b/libs/node/src/services/node-crypto-function.service.ts
@@ -1,12 +1,13 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import * as crypto from "crypto";
 
 import * as forge from "node-forge";
 
 import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { DecryptParameters } from "@bitwarden/common/platform/models/domain/decrypt-parameters";
+import {
+  CbcDecryptParameters,
+  EcbDecryptParameters,
+} from "@bitwarden/common/platform/models/domain/decrypt-parameters";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { CsprngArray } from "@bitwarden/common/types/csprng";
 
@@ -168,10 +169,10 @@ export class NodeCryptoFunctionService implements CryptoFunctionService {
   aesDecryptFastParameters(
     data: string,
     iv: string,
-    mac: string,
+    mac: string | null,
     key: SymmetricCryptoKey,
-  ): DecryptParameters<Uint8Array> {
-    const p = new DecryptParameters<Uint8Array>();
+  ): CbcDecryptParameters<Uint8Array> {
+    const p = {} as CbcDecryptParameters<Uint8Array>;
     p.encKey = key.encKey;
     p.data = Utils.fromB64ToArray(data);
     p.iv = Utils.fromB64ToArray(iv);
@@ -191,22 +192,25 @@ export class NodeCryptoFunctionService implements CryptoFunctionService {
     return p;
   }
 
-  async aesDecryptFast(
-    parameters: DecryptParameters<Uint8Array>,
-    mode: "cbc" | "ecb",
-  ): Promise<string> {
-    const decBuf = await this.aesDecrypt(parameters.data, parameters.iv, parameters.encKey, mode);
+  async aesDecryptFast({
+    mode,
+    parameters,
+  }:
+    | { mode: "cbc"; parameters: CbcDecryptParameters<Uint8Array> }
+    | { mode: "ecb"; parameters: EcbDecryptParameters<Uint8Array> }): Promise<string> {
+    const iv = mode === "cbc" ? parameters.iv : null;
+    const decBuf = await this.aesDecrypt(parameters.data, iv, parameters.encKey, mode);
     return Utils.fromBufferToUtf8(decBuf);
   }
 
   aesDecrypt(
     data: Uint8Array,
-    iv: Uint8Array,
+    iv: Uint8Array | null,
     key: Uint8Array,
     mode: "cbc" | "ecb",
   ): Promise<Uint8Array> {
     const nodeData = this.toNodeBuffer(data);
-    const nodeIv = mode === "ecb" ? null : this.toNodeBuffer(iv);
+    const nodeIv = this.toNodeBufferOrNull(iv);
     const nodeKey = this.toNodeBuffer(key);
     const decipher = crypto.createDecipheriv(this.toNodeCryptoAesMode(mode), nodeKey, nodeIv);
     const decBuf = Buffer.concat([decipher.update(nodeData), decipher.final()]);
@@ -311,6 +315,13 @@ export class NodeCryptoFunctionService implements CryptoFunctionService {
     return Buffer.from(value);
   }
 
+  private toNodeBufferOrNull(value: Uint8Array | null): Buffer | null {
+    if (value == null) {
+      return null;
+    }
+    return this.toNodeBuffer(value);
+  }
+
   private toUint8Buffer(value: Buffer | string | Uint8Array): Uint8Array {
     let buf: Uint8Array;
     if (typeof value === "string") {

From 138e07eaf7137f810c73cf33cfd010818c8a484f Mon Sep 17 00:00:00 2001
From: Vince Grassia <593223+vgrassia@users.noreply.github.com>
Date: Fri, 10 Jan 2025 03:50:21 -0500
Subject: [PATCH 030/150] Add fetch-depth to checkout step (#12782)

---
 .github/workflows/repository-management.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/repository-management.yml b/.github/workflows/repository-management.yml
index a914a2c4a7..ac2733e765 100644
--- a/.github/workflows/repository-management.yml
+++ b/.github/workflows/repository-management.yml
@@ -461,6 +461,7 @@ jobs:
       - name: Check out main branch
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
+          fetch-depth: 0
           ref: main
           token: ${{ steps.app-token.outputs.token }}
 

From 653b730969fbf6aadf53f1653cd99ffce542d558 Mon Sep 17 00:00:00 2001
From: Oscar Hinton <Hinton@users.noreply.github.com>
Date: Fri, 10 Jan 2025 11:21:38 +0100
Subject: [PATCH 031/150] [PM-16872] Update libs to use explicit dependencies
 (#12770)

Update all libs to use explicit dependencies rather than relying on tsconfig.libs.json. This allows us to more easily understand the dependencies between libs and prevent users from accidentally adding new dependencies.

We still use tsconfig.libs (now renamed tsconfig.spec) for tests.
---
 bitwarden_license/bit-common/tsconfig.json    |  2 +-
 libs/admin-console/jest.config.js             |  2 +-
 libs/admin-console/tsconfig.json              | 10 ++++-
 libs/angular/jest.config.js                   |  2 +-
 libs/angular/tsconfig.json                    | 22 ++++++++++-
 libs/auth/jest.config.js                      |  2 +-
 libs/auth/tsconfig.json                       | 19 ++++++++-
 libs/billing/jest.config.js                   |  2 +-
 libs/billing/tsconfig.json                    |  3 +-
 libs/common/jest.config.js                    |  2 +-
 libs/common/tsconfig.json                     | 12 +++++-
 .../src/form-field/form-field.stories.ts      | 39 ++++++++++++++++++-
 libs/components/tsconfig.json                 |  1 -
 libs/importer/jest.config.js                  |  2 +-
 libs/importer/tsconfig.json                   | 18 ++++++++-
 libs/key-management/jest.config.js            |  2 +-
 libs/key-management/tsconfig.json             | 18 ++++++++-
 libs/node/jest.config.js                      |  2 +-
 libs/node/tsconfig.json                       | 10 ++++-
 libs/platform/jest.config.js                  |  2 +-
 libs/platform/tsconfig.json                   |  5 ++-
 ...{tsconfig.libs.json => tsconfig.spec.json} |  0
 libs/tools/card/jest.config.js                |  2 +-
 libs/tools/card/tsconfig.json                 | 13 ++++++-
 .../vault-export-core/jest.config.js          |  2 +-
 .../vault-export-core/tsconfig.json           | 10 ++++-
 .../vault-export-ui/jest.config.js            |  2 +-
 .../vault-export-ui/tsconfig.json             | 21 +++++++++-
 .../tools/generator/components/jest.config.js |  2 +-
 libs/tools/generator/components/tsconfig.json | 15 ++++++-
 libs/tools/generator/core/jest.config.js      |  2 +-
 libs/tools/generator/core/tsconfig.json       | 11 +++++-
 .../extensions/history/jest.config.js         |  2 +-
 .../extensions/history/tsconfig.json          | 11 +++++-
 .../extensions/legacy/jest.config.js          |  2 +-
 .../generator/extensions/legacy/tsconfig.json | 13 ++++++-
 .../extensions/navigation/jest.config.js      |  2 +-
 .../extensions/navigation/tsconfig.json       | 11 +++++-
 libs/tools/send/send-ui/jest.config.js        |  2 +-
 libs/tools/send/send-ui/tsconfig.json         | 18 ++++++++-
 libs/vault/jest.config.js                     |  2 +-
 libs/vault/tsconfig.json                      | 20 +++++++++-
 scripts/test-types.js                         | 13 +++++--
 43 files changed, 308 insertions(+), 45 deletions(-)
 rename libs/shared/{tsconfig.libs.json => tsconfig.spec.json} (100%)

diff --git a/bitwarden_license/bit-common/tsconfig.json b/bitwarden_license/bit-common/tsconfig.json
index a0a44f2ab3..7791840950 100644
--- a/bitwarden_license/bit-common/tsconfig.json
+++ b/bitwarden_license/bit-common/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../libs/shared/tsconfig.libs",
+  "extends": "../../libs/shared/tsconfig",
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"],
   "compilerOptions": {
diff --git a/libs/admin-console/jest.config.js b/libs/admin-console/jest.config.js
index f2a8e6458a..5131753964 100644
--- a/libs/admin-console/jest.config.js
+++ b/libs/admin-console/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../shared/tsconfig.libs");
+const { compilerOptions } = require("../shared/tsconfig.spec");
 
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
diff --git a/libs/admin-console/tsconfig.json b/libs/admin-console/tsconfig.json
index 6004a56fb5..3d22cb2ec5 100644
--- a/libs/admin-console/tsconfig.json
+++ b/libs/admin-console/tsconfig.json
@@ -1,5 +1,13 @@
 {
-  "extends": "../shared/tsconfig.libs",
+  "extends": "../shared/tsconfig",
+  "compilerOptions": {
+    "paths": {
+      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
+      "@bitwarden/auth/common": ["../auth/src/common"],
+      "@bitwarden/common/*": ["../common/src/*"],
+      "@bitwarden/key-management": ["../key-management/src"]
+    }
+  },
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/angular/jest.config.js b/libs/angular/jest.config.js
index c8e748575c..5e73614eb8 100644
--- a/libs/angular/jest.config.js
+++ b/libs/angular/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../shared/tsconfig.libs");
+const { compilerOptions } = require("../shared/tsconfig.spec");
 
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
diff --git a/libs/angular/tsconfig.json b/libs/angular/tsconfig.json
index 6004a56fb5..6c510f8149 100644
--- a/libs/angular/tsconfig.json
+++ b/libs/angular/tsconfig.json
@@ -1,5 +1,25 @@
 {
-  "extends": "../shared/tsconfig.libs",
+  "extends": "../shared/tsconfig",
+  "compilerOptions": {
+    "paths": {
+      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
+      "@bitwarden/angular/*": ["../angular/src/*"],
+      "@bitwarden/auth/angular": ["../auth/src/angular"],
+      "@bitwarden/auth/common": ["../auth/src/common"],
+      "@bitwarden/common/*": ["../common/src/*"],
+      "@bitwarden/components": ["../components/src"],
+      "@bitwarden/generator-components": ["../tools/generator/components/src"],
+      "@bitwarden/generator-core": ["../tools/generator/core/src"],
+      "@bitwarden/generator-history": ["../tools/generator/extensions/history/src"],
+      "@bitwarden/generator-legacy": ["../tools/generator/extensions/legacy/src"],
+      "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"],
+      "@bitwarden/importer/core": ["../importer/src"],
+      "@bitwarden/key-management": ["../key-management/src"],
+      "@bitwarden/platform": ["../platform/src"],
+      "@bitwarden/vault-export-core": ["../tools/export/vault-export/vault-export-core/src"],
+      "@bitwarden/vault": ["../vault/src"]
+    }
+  },
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/auth/jest.config.js b/libs/auth/jest.config.js
index 8bc834c7da..121d423be1 100644
--- a/libs/auth/jest.config.js
+++ b/libs/auth/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../shared/tsconfig.libs");
+const { compilerOptions } = require("../shared/tsconfig.spec");
 
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
diff --git a/libs/auth/tsconfig.json b/libs/auth/tsconfig.json
index 6004a56fb5..9be942d38d 100644
--- a/libs/auth/tsconfig.json
+++ b/libs/auth/tsconfig.json
@@ -1,5 +1,22 @@
 {
-  "extends": "../shared/tsconfig.libs",
+  "extends": "../shared/tsconfig",
+  "compilerOptions": {
+    "resolveJsonModule": true,
+    "paths": {
+      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
+      "@bitwarden/auth/common": ["../auth/src/common"],
+      "@bitwarden/auth/angular": ["../auth/src/angular"],
+      "@bitwarden/angular/*": ["../angular/src/*"],
+      "@bitwarden/common/*": ["../common/src/*"],
+      "@bitwarden/components": ["../components/src"],
+      "@bitwarden/key-management": ["../key-management/src"],
+      "@bitwarden/platform": ["../platform/src"],
+      "@bitwarden/generator-core": ["../tools/generator/core/src"],
+      "@bitwarden/generator-history": ["../tools/generator/extensions/history/src"],
+      "@bitwarden/generator-legacy": ["../tools/generator/extensions/legacy/src"],
+      "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"]
+    }
+  },
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/billing/jest.config.js b/libs/billing/jest.config.js
index d9bae9633e..c43606191b 100644
--- a/libs/billing/jest.config.js
+++ b/libs/billing/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../shared/tsconfig.libs");
+const { compilerOptions } = require("../shared/tsconfig.spec");
 
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
diff --git a/libs/billing/tsconfig.json b/libs/billing/tsconfig.json
index 6004a56fb5..bb08eb89d1 100644
--- a/libs/billing/tsconfig.json
+++ b/libs/billing/tsconfig.json
@@ -1,5 +1,6 @@
 {
-  "extends": "../shared/tsconfig.libs",
+  "extends": "../shared/tsconfig",
+  "compilerOptions": {},
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/common/jest.config.js b/libs/common/jest.config.js
index d7f78abbf3..7e6c0997b9 100644
--- a/libs/common/jest.config.js
+++ b/libs/common/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../shared/tsconfig.libs");
+const { compilerOptions } = require("../shared/tsconfig.spec");
 
 const sharedConfig = require("../shared/jest.config.ts");
 
diff --git a/libs/common/tsconfig.json b/libs/common/tsconfig.json
index 27d8acbd36..128511ee41 100644
--- a/libs/common/tsconfig.json
+++ b/libs/common/tsconfig.json
@@ -1,5 +1,15 @@
 {
-  "extends": "../shared/tsconfig.libs",
+  "extends": "../shared/tsconfig",
+  "compilerOptions": {
+    "paths": {
+      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
+      "@bitwarden/auth/common": ["../auth/src/common"],
+      "@bitwarden/common/*": ["../common/src/*"],
+      "@bitwarden/components": ["../components/src"],
+      "@bitwarden/key-management": ["../key-management/src"],
+      "@bitwarden/platform": ["../platform/src"]
+    }
+  },
   "include": ["src", "spec", "./custom-matchers.d.ts", "../key-management/src/index.ts"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/components/src/form-field/form-field.stories.ts b/libs/components/src/form-field/form-field.stories.ts
index ccd80d6fa7..6d8323e088 100644
--- a/libs/components/src/form-field/form-field.stories.ts
+++ b/libs/components/src/form-field/form-field.stories.ts
@@ -1,4 +1,7 @@
+// FIXME: Update this file to be type safe and remove this and next line
+// @ts-strict-ignore
 import { TextFieldModule } from "@angular/cdk/text-field";
+import { Directive, ElementRef, Input, OnInit, Renderer2 } from "@angular/core";
 import {
   AbstractControl,
   UntypedFormBuilder,
@@ -10,7 +13,6 @@ import {
 } from "@angular/forms";
 import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
 
-import { A11yTitleDirective } from "@bitwarden/angular/src/directives/a11y-title.directive";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
 import { AsyncActionsModule } from "../async-actions";
@@ -29,6 +31,41 @@ import { I18nMockService } from "../utils/i18n-mock.service";
 import { BitFormFieldComponent } from "./form-field.component";
 import { FormFieldModule } from "./form-field.module";
 
+// TOOD: This solves a circular dependency between components and angular.
+@Directive({
+  selector: "[appA11yTitle]",
+})
+export class A11yTitleDirective implements OnInit {
+  @Input() set appA11yTitle(title: string) {
+    this.title = title;
+    this.setAttributes();
+  }
+
+  private title: string;
+  private originalTitle: string | null;
+  private originalAriaLabel: string | null;
+
+  constructor(
+    private el: ElementRef,
+    private renderer: Renderer2,
+  ) {}
+
+  ngOnInit() {
+    this.originalTitle = this.el.nativeElement.getAttribute("title");
+    this.originalAriaLabel = this.el.nativeElement.getAttribute("aria-label");
+    this.setAttributes();
+  }
+
+  private setAttributes() {
+    if (this.originalTitle === null) {
+      this.renderer.setAttribute(this.el.nativeElement, "title", this.title);
+    }
+    if (this.originalAriaLabel === null) {
+      this.renderer.setAttribute(this.el.nativeElement, "aria-label", this.title);
+    }
+  }
+}
+
 export default {
   title: "Component Library/Form/Field",
   component: BitFormFieldComponent,
diff --git a/libs/components/tsconfig.json b/libs/components/tsconfig.json
index dabcecf78e..71eef15fac 100644
--- a/libs/components/tsconfig.json
+++ b/libs/components/tsconfig.json
@@ -20,7 +20,6 @@
     "lib": ["es2020", "dom"],
     "paths": {
       "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/angular/*": ["../angular/src/*"],
       "@bitwarden/platform": ["../platform/src"]
     },
     "plugins": [
diff --git a/libs/importer/jest.config.js b/libs/importer/jest.config.js
index 68daba3d40..ab449dc775 100644
--- a/libs/importer/jest.config.js
+++ b/libs/importer/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../shared/tsconfig.libs");
+const { compilerOptions } = require("../shared/tsconfig.spec");
 
 const sharedConfig = require("../shared/jest.config.ts");
 
diff --git a/libs/importer/tsconfig.json b/libs/importer/tsconfig.json
index 6004a56fb5..2235cccb5c 100644
--- a/libs/importer/tsconfig.json
+++ b/libs/importer/tsconfig.json
@@ -1,5 +1,21 @@
 {
-  "extends": "../shared/tsconfig.libs",
+  "extends": "../shared/tsconfig",
+  "compilerOptions": {
+    "paths": {
+      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
+      "@bitwarden/angular/*": ["../angular/src/*"],
+      "@bitwarden/auth/common": ["../auth/src/common"],
+      "@bitwarden/common/*": ["../common/src/*"],
+      "@bitwarden/components": ["../components/src"],
+      "@bitwarden/generator-core": ["../tools/generator/core/src"],
+      "@bitwarden/generator-history": ["../tools/generator/extensions/history/src"],
+      "@bitwarden/generator-legacy": ["../tools/generator/extensions/legacy/src"],
+      "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"],
+      "@bitwarden/key-management": ["../key-management/src"],
+      "@bitwarden/platform": ["../platform/src"],
+      "@bitwarden/vault-export-core": ["../tools/export/vault-export/vault-export-core/src"]
+    }
+  },
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/key-management/jest.config.js b/libs/key-management/jest.config.js
index e20d02303d..ad8023e906 100644
--- a/libs/key-management/jest.config.js
+++ b/libs/key-management/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../shared/tsconfig.libs");
+const { compilerOptions } = require("../shared/tsconfig.spec");
 
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
diff --git a/libs/key-management/tsconfig.json b/libs/key-management/tsconfig.json
index 6004a56fb5..8279f14c78 100644
--- a/libs/key-management/tsconfig.json
+++ b/libs/key-management/tsconfig.json
@@ -1,5 +1,21 @@
 {
-  "extends": "../shared/tsconfig.libs",
+  "extends": "../shared/tsconfig",
+  "compilerOptions": {
+    "paths": {
+      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
+      "@bitwarden/angular/*": ["../angular/src/*"],
+      "@bitwarden/auth/angular": ["../auth/src/angular"],
+      "@bitwarden/auth/common": ["../auth/src/common"],
+      "@bitwarden/common/*": ["../common/src/*"],
+      "@bitwarden/components": ["../components/src"],
+      "@bitwarden/key-management": ["../key-management/src"],
+      "@bitwarden/generator-core": ["../tools/generator/core/src"],
+      "@bitwarden/generator-history": ["../tools/generator/extensions/history/src"],
+      "@bitwarden/generator-legacy": ["../tools/generator/extensions/legacy/src"],
+      "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"],
+      "@bitwarden/platform": ["../platform/src"]
+    }
+  },
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/node/jest.config.js b/libs/node/jest.config.js
index dc98adf8dd..1a33ad3940 100644
--- a/libs/node/jest.config.js
+++ b/libs/node/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../shared/tsconfig.libs");
+const { compilerOptions } = require("../shared/tsconfig.spec");
 
 const sharedConfig = require("../shared/jest.config.ts");
 
diff --git a/libs/node/tsconfig.json b/libs/node/tsconfig.json
index 6004a56fb5..3d22cb2ec5 100644
--- a/libs/node/tsconfig.json
+++ b/libs/node/tsconfig.json
@@ -1,5 +1,13 @@
 {
-  "extends": "../shared/tsconfig.libs",
+  "extends": "../shared/tsconfig",
+  "compilerOptions": {
+    "paths": {
+      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
+      "@bitwarden/auth/common": ["../auth/src/common"],
+      "@bitwarden/common/*": ["../common/src/*"],
+      "@bitwarden/key-management": ["../key-management/src"]
+    }
+  },
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/platform/jest.config.js b/libs/platform/jest.config.js
index 4649b293a7..063fb847d8 100644
--- a/libs/platform/jest.config.js
+++ b/libs/platform/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../shared/tsconfig.libs");
+const { compilerOptions } = require("../shared/tsconfig.spec");
 
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
diff --git a/libs/platform/tsconfig.json b/libs/platform/tsconfig.json
index 6004a56fb5..eaa021247d 100644
--- a/libs/platform/tsconfig.json
+++ b/libs/platform/tsconfig.json
@@ -1,5 +1,8 @@
 {
-  "extends": "../shared/tsconfig.libs",
+  "extends": "../shared/tsconfig",
+  "compilerOptions": {
+    "paths": {}
+  },
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/shared/tsconfig.libs.json b/libs/shared/tsconfig.spec.json
similarity index 100%
rename from libs/shared/tsconfig.libs.json
rename to libs/shared/tsconfig.spec.json
diff --git a/libs/tools/card/jest.config.js b/libs/tools/card/jest.config.js
index b68bda8d5c..952e9ce0e2 100644
--- a/libs/tools/card/jest.config.js
+++ b/libs/tools/card/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../../../shared/tsconfig.libs");
+const { compilerOptions } = require("../../../shared/tsconfig.spec");
 
 /** @type {import('jest').Config} */
 module.exports = {
diff --git a/libs/tools/card/tsconfig.json b/libs/tools/card/tsconfig.json
index 52eed3035a..9c910521cc 100644
--- a/libs/tools/card/tsconfig.json
+++ b/libs/tools/card/tsconfig.json
@@ -1,5 +1,16 @@
 {
-  "extends": "../../shared/tsconfig.libs",
+  "extends": "../../shared/tsconfig",
+  "compilerOptions": {
+    "paths": {
+      "@bitwarden/admin-console/common": ["../../admin-console/src/common"],
+      "@bitwarden/angular/*": ["../../angular/src/*"],
+      "@bitwarden/auth/common": ["../../auth/src/common"],
+      "@bitwarden/common/*": ["../../common/src/*"],
+      "@bitwarden/components": ["../../components/src"],
+      "@bitwarden/key-management": ["../../key-management/src"],
+      "@bitwarden/platform": ["../../platform/src"]
+    }
+  },
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/tools/export/vault-export/vault-export-core/jest.config.js b/libs/tools/export/vault-export/vault-export-core/jest.config.js
index 955b8e7763..0a78a9855d 100644
--- a/libs/tools/export/vault-export/vault-export-core/jest.config.js
+++ b/libs/tools/export/vault-export/vault-export-core/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../../../../shared/tsconfig.libs");
+const { compilerOptions } = require("../../../../shared/tsconfig.spec");
 
 /** @type {import('jest').Config} */
 module.exports = {
diff --git a/libs/tools/export/vault-export/vault-export-core/tsconfig.json b/libs/tools/export/vault-export/vault-export-core/tsconfig.json
index 5cb9026037..7652a27104 100644
--- a/libs/tools/export/vault-export/vault-export-core/tsconfig.json
+++ b/libs/tools/export/vault-export/vault-export-core/tsconfig.json
@@ -1,5 +1,13 @@
 {
-  "extends": "../../../../shared/tsconfig.libs",
+  "extends": "../../../../shared/tsconfig",
+  "compilerOptions": {
+    "paths": {
+      "@bitwarden/admin-console/common": ["../../../../admin-console/src/common"],
+      "@bitwarden/auth/common": ["../../../../auth/src/common"],
+      "@bitwarden/common/*": ["../../../../common/src/*"],
+      "@bitwarden/key-management": ["../../../../key-management/src"]
+    }
+  },
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/tools/export/vault-export/vault-export-ui/jest.config.js b/libs/tools/export/vault-export/vault-export-ui/jest.config.js
index 955b8e7763..0a78a9855d 100644
--- a/libs/tools/export/vault-export/vault-export-ui/jest.config.js
+++ b/libs/tools/export/vault-export/vault-export-ui/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../../../../shared/tsconfig.libs");
+const { compilerOptions } = require("../../../../shared/tsconfig.spec");
 
 /** @type {import('jest').Config} */
 module.exports = {
diff --git a/libs/tools/export/vault-export/vault-export-ui/tsconfig.json b/libs/tools/export/vault-export/vault-export-ui/tsconfig.json
index 5cb9026037..8c8a04d4b6 100644
--- a/libs/tools/export/vault-export/vault-export-ui/tsconfig.json
+++ b/libs/tools/export/vault-export/vault-export-ui/tsconfig.json
@@ -1,5 +1,24 @@
 {
-  "extends": "../../../../shared/tsconfig.libs",
+  "extends": "../../../../shared/tsconfig",
+  "compilerOptions": {
+    "paths": {
+      "@bitwarden/admin-console/common": ["../../../../admin-console/src/common"],
+      "@bitwarden/angular/*": ["../../../../angular/src/*"],
+      "@bitwarden/auth/angular": ["../../../../auth/src/angular"],
+      "@bitwarden/auth/common": ["../../../../auth/src/common"],
+      "@bitwarden/common/*": ["../../../../common/src/*"],
+      "@bitwarden/components": ["../../../../components/src"],
+      "@bitwarden/generator-core": ["../../../../tools/generator/core/src"],
+      "@bitwarden/generator-history": ["../../../../tools/generator/extensions/history/src"],
+      "@bitwarden/generator-legacy": ["../../../../tools/generator/extensions/legacy/src"],
+      "@bitwarden/generator-navigation": ["../../../../tools/generator/extensions/navigation/src"],
+      "@bitwarden/key-management": ["../../../../key-management/src"],
+      "@bitwarden/platform": ["../../../../platform/src"],
+      "@bitwarden/vault-export-core": [
+        "../../../../tools/export/vault-export/vault-export-core/src"
+      ]
+    }
+  },
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/tools/generator/components/jest.config.js b/libs/tools/generator/components/jest.config.js
index c34d909fe8..bf5e465f39 100644
--- a/libs/tools/generator/components/jest.config.js
+++ b/libs/tools/generator/components/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../../../shared/tsconfig.libs.json");
+const { compilerOptions } = require("../../../shared/tsconfig.spec.json");
 
 /** @type {import('jest').Config} */
 module.exports = {
diff --git a/libs/tools/generator/components/tsconfig.json b/libs/tools/generator/components/tsconfig.json
index c52bfd7b0d..76b060334f 100644
--- a/libs/tools/generator/components/tsconfig.json
+++ b/libs/tools/generator/components/tsconfig.json
@@ -1,5 +1,18 @@
 {
-  "extends": "../../../shared/tsconfig.libs",
+  "extends": "../../../shared/tsconfig",
+  "compilerOptions": {
+    "paths": {
+      "@bitwarden/admin-console/common": ["../../../admin-console/src/common"],
+      "@bitwarden/angular/*": ["../../../angular/src/*"],
+      "@bitwarden/auth/common": ["../../../auth/src/common"],
+      "@bitwarden/common/*": ["../../../common/src/*"],
+      "@bitwarden/components": ["../../../components/src"],
+      "@bitwarden/generator-core": ["../../../tools/generator/core/src"],
+      "@bitwarden/generator-history": ["../../../tools/generator/extensions/history/src"],
+      "@bitwarden/key-management": ["../../../key-management/src"],
+      "@bitwarden/platform": ["../../../platform/src"]
+    }
+  },
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/tools/generator/core/jest.config.js b/libs/tools/generator/core/jest.config.js
index 71ccbc80b6..b052672c4a 100644
--- a/libs/tools/generator/core/jest.config.js
+++ b/libs/tools/generator/core/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../../../shared/tsconfig.libs");
+const { compilerOptions } = require("../../../shared/tsconfig.spec");
 
 /** @type {import('jest').Config} */
 module.exports = {
diff --git a/libs/tools/generator/core/tsconfig.json b/libs/tools/generator/core/tsconfig.json
index 6eec2cc24a..7c703686b2 100644
--- a/libs/tools/generator/core/tsconfig.json
+++ b/libs/tools/generator/core/tsconfig.json
@@ -1,5 +1,14 @@
 {
-  "extends": "../../../shared/tsconfig.libs",
+  "extends": "../../../shared/tsconfig",
+  "compilerOptions": {
+    "paths": {
+      "@bitwarden/admin-console/common": ["../../../admin-console/src/common"],
+      "@bitwarden/auth/common": ["../../../auth/src/common"],
+      "@bitwarden/common/*": ["../../../common/src/*"],
+      "@bitwarden/generator-core": ["../../../tools/generator/core/src"],
+      "@bitwarden/key-management": ["../../../key-management/src"]
+    }
+  },
   "include": [
     "src",
     "../extensions/src/history/generator-history.abstraction.ts",
diff --git a/libs/tools/generator/extensions/history/jest.config.js b/libs/tools/generator/extensions/history/jest.config.js
index d257f3871c..f90801cd7c 100644
--- a/libs/tools/generator/extensions/history/jest.config.js
+++ b/libs/tools/generator/extensions/history/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../../../../shared/tsconfig.libs");
+const { compilerOptions } = require("../../../../shared/tsconfig.spec");
 
 /** @type {import('jest').Config} */
 module.exports = {
diff --git a/libs/tools/generator/extensions/history/tsconfig.json b/libs/tools/generator/extensions/history/tsconfig.json
index 5cb9026037..5fc1caf014 100644
--- a/libs/tools/generator/extensions/history/tsconfig.json
+++ b/libs/tools/generator/extensions/history/tsconfig.json
@@ -1,5 +1,14 @@
 {
-  "extends": "../../../../shared/tsconfig.libs",
+  "extends": "../../../../shared/tsconfig",
+  "compilerOptions": {
+    "paths": {
+      "@bitwarden/admin-console/common": ["../../../../admin-console/src/common"],
+      "@bitwarden/auth/common": ["../../../../auth/src/common"],
+      "@bitwarden/common/*": ["../../../../common/src/*"],
+      "@bitwarden/generator-core": ["../../../../tools/generator/core/src"],
+      "@bitwarden/key-management": ["../../../../key-management/src"]
+    }
+  },
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/tools/generator/extensions/legacy/jest.config.js b/libs/tools/generator/extensions/legacy/jest.config.js
index d257f3871c..f90801cd7c 100644
--- a/libs/tools/generator/extensions/legacy/jest.config.js
+++ b/libs/tools/generator/extensions/legacy/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../../../../shared/tsconfig.libs");
+const { compilerOptions } = require("../../../../shared/tsconfig.spec");
 
 /** @type {import('jest').Config} */
 module.exports = {
diff --git a/libs/tools/generator/extensions/legacy/tsconfig.json b/libs/tools/generator/extensions/legacy/tsconfig.json
index 5cb9026037..9a09e28ea3 100644
--- a/libs/tools/generator/extensions/legacy/tsconfig.json
+++ b/libs/tools/generator/extensions/legacy/tsconfig.json
@@ -1,5 +1,16 @@
 {
-  "extends": "../../../../shared/tsconfig.libs",
+  "extends": "../../../../shared/tsconfig",
+  "compilerOptions": {
+    "paths": {
+      "@bitwarden/admin-console/common": ["../../../../admin-console/src/common"],
+      "@bitwarden/auth/common": ["../../../../auth/src/common"],
+      "@bitwarden/common/*": ["../../../../common/src/*"],
+      "@bitwarden/generator-core": ["../../../../tools/generator/core/src"],
+      "@bitwarden/generator-history": ["../../../../tools/generator/extensions/history/src"],
+      "@bitwarden/generator-navigation": ["../../../../tools/generator/extensions/navigation/src"],
+      "@bitwarden/key-management": ["../../../../key-management/src"]
+    }
+  },
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/tools/generator/extensions/navigation/jest.config.js b/libs/tools/generator/extensions/navigation/jest.config.js
index d257f3871c..f90801cd7c 100644
--- a/libs/tools/generator/extensions/navigation/jest.config.js
+++ b/libs/tools/generator/extensions/navigation/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../../../../shared/tsconfig.libs");
+const { compilerOptions } = require("../../../../shared/tsconfig.spec");
 
 /** @type {import('jest').Config} */
 module.exports = {
diff --git a/libs/tools/generator/extensions/navigation/tsconfig.json b/libs/tools/generator/extensions/navigation/tsconfig.json
index 5cb9026037..5fc1caf014 100644
--- a/libs/tools/generator/extensions/navigation/tsconfig.json
+++ b/libs/tools/generator/extensions/navigation/tsconfig.json
@@ -1,5 +1,14 @@
 {
-  "extends": "../../../../shared/tsconfig.libs",
+  "extends": "../../../../shared/tsconfig",
+  "compilerOptions": {
+    "paths": {
+      "@bitwarden/admin-console/common": ["../../../../admin-console/src/common"],
+      "@bitwarden/auth/common": ["../../../../auth/src/common"],
+      "@bitwarden/common/*": ["../../../../common/src/*"],
+      "@bitwarden/generator-core": ["../../../../tools/generator/core/src"],
+      "@bitwarden/key-management": ["../../../../key-management/src"]
+    }
+  },
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/tools/send/send-ui/jest.config.js b/libs/tools/send/send-ui/jest.config.js
index b68bda8d5c..952e9ce0e2 100644
--- a/libs/tools/send/send-ui/jest.config.js
+++ b/libs/tools/send/send-ui/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../../../shared/tsconfig.libs");
+const { compilerOptions } = require("../../../shared/tsconfig.spec");
 
 /** @type {import('jest').Config} */
 module.exports = {
diff --git a/libs/tools/send/send-ui/tsconfig.json b/libs/tools/send/send-ui/tsconfig.json
index c52bfd7b0d..671154e0a0 100644
--- a/libs/tools/send/send-ui/tsconfig.json
+++ b/libs/tools/send/send-ui/tsconfig.json
@@ -1,5 +1,21 @@
 {
-  "extends": "../../../shared/tsconfig.libs",
+  "extends": "../../../shared/tsconfig",
+  "compilerOptions": {
+    "paths": {
+      "@bitwarden/admin-console/common": ["../../../admin-console/src/common"],
+      "@bitwarden/angular/*": ["../../../angular/src/*"],
+      "@bitwarden/auth/common": ["../../../auth/src/common"],
+      "@bitwarden/common/*": ["../../../common/src/*"],
+      "@bitwarden/components": ["../../../components/src"],
+      "@bitwarden/generator-components": ["../../../tools/generator/components/src"],
+      "@bitwarden/generator-core": ["../../../tools/generator/core/src"],
+      "@bitwarden/generator-history": ["../../../tools/generator/extensions/history/src"],
+      "@bitwarden/generator-legacy": ["../../../tools/generator/extensions/legacy/src"],
+      "@bitwarden/generator-navigation": ["../../../tools/generator/extensions/navigation/src"],
+      "@bitwarden/key-management": ["../../../key-management/src"],
+      "@bitwarden/platform": ["../../../platform/src"]
+    }
+  },
   "include": ["src"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/vault/jest.config.js b/libs/vault/jest.config.js
index e960eed9f1..e33c115e8d 100644
--- a/libs/vault/jest.config.js
+++ b/libs/vault/jest.config.js
@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("../shared/tsconfig.libs");
+const { compilerOptions } = require("../shared/tsconfig.spec");
 
 const sharedConfig = require("../../libs/shared/jest.config.angular");
 
diff --git a/libs/vault/tsconfig.json b/libs/vault/tsconfig.json
index 6004a56fb5..8318212e81 100644
--- a/libs/vault/tsconfig.json
+++ b/libs/vault/tsconfig.json
@@ -1,5 +1,23 @@
 {
-  "extends": "../shared/tsconfig.libs",
+  "extends": "../shared/tsconfig",
+  "compilerOptions": {
+    "resolveJsonModule": true,
+    "paths": {
+      "@bitwarden/admin-console/common": ["../admin-console/src/common"],
+      "@bitwarden/angular/*": ["../angular/src/*"],
+      "@bitwarden/auth/common": ["../auth/src/common"],
+      "@bitwarden/common/*": ["../common/src/*"],
+      "@bitwarden/components": ["../components/src"],
+      "@bitwarden/generator-components": ["../tools/generator/components/src"],
+      "@bitwarden/generator-core": ["../tools/generator/core/src"],
+      "@bitwarden/generator-history": ["../tools/generator/extensions/history/src"],
+      "@bitwarden/generator-legacy": ["../tools/generator/extensions/legacy/src"],
+      "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"],
+      "@bitwarden/key-management": ["../key-management/src"],
+      "@bitwarden/platform": ["../platform/src"],
+      "@bitwarden/vault": ["../vault/src"]
+    }
+  },
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/scripts/test-types.js b/scripts/test-types.js
index 2155406cdf..9534558af3 100644
--- a/scripts/test-types.js
+++ b/scripts/test-types.js
@@ -16,10 +16,15 @@ function getFiles(dir) {
   return results;
 }
 
-const files = getFiles(path.join(__dirname, "..", "libs")).filter((file) => {
-  const name = path.basename(file);
-  return name === "tsconfig.spec.json";
-});
+const files = getFiles(path.join(__dirname, "..", "libs"))
+  .filter((file) => {
+    const name = path.basename(file);
+    return name === "tsconfig.spec.json";
+  })
+  .filter((path) => {
+    // Exclude shared since it's not actually a library
+    return !path.includes("libs/shared/");
+  });
 
 concurrently([
   {

From c1e3836cc32ad524bc4ab739375d07dcc63bdd4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rui=20Tom=C3=A9?=
 <108268980+r-tome@users.noreply.github.com>
Date: Fri, 10 Jan 2025 11:16:51 +0000
Subject: [PATCH 032/150] [PM-13758] Ensure decrypted cipherId is used for
 event collection in get command (#12459)

---
 apps/cli/src/commands/get.command.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/cli/src/commands/get.command.ts b/apps/cli/src/commands/get.command.ts
index 454db2858a..a1fec7a747 100644
--- a/apps/cli/src/commands/get.command.ts
+++ b/apps/cli/src/commands/get.command.ts
@@ -152,11 +152,9 @@ export class GetCommand extends DownloadCommand {
       }
     }
 
-    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    this.eventCollectionService.collect(
+    await this.eventCollectionService.collect(
       EventType.Cipher_ClientViewed,
-      id,
+      decCipher.id,
       true,
       decCipher.organizationId,
     );

From 7df41a9aea1c4fa4095cb1c84b3d479d95aaf607 Mon Sep 17 00:00:00 2001
From: Daniel James Smith <2670567+djsmith85@users.noreply.github.com>
Date: Fri, 10 Jan 2025 14:51:12 +0100
Subject: [PATCH 033/150] Fix bad imports identified with #12744 (#12802)

Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
---
 .../services/member-access-report.abstraction.ts               | 2 +-
 .../services/member-access-report.service.spec.ts              | 2 +-
 libs/common/src/tools/send/models/domain/send.spec.ts          | 2 +-
 libs/common/src/tools/send/services/send.service.spec.ts       | 2 +-
 .../src/components/lastpass/lastpass-direct-import.service.ts  | 2 +-
 .../generator/components/src/credential-generator.component.ts | 3 +--
 .../generator/components/src/password-generator.component.ts   | 3 +--
 .../generator/components/src/username-generator.component.ts   | 3 +--
 8 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/services/member-access-report.abstraction.ts b/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/services/member-access-report.abstraction.ts
index 9919da8d08..cf2f3b6417 100644
--- a/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/services/member-access-report.abstraction.ts
+++ b/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/services/member-access-report.abstraction.ts
@@ -1,6 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { OrganizationId } from "@bitwarden/common/src/types/guid";
+import { OrganizationId } from "@bitwarden/common/types/guid";
 
 import { MemberAccessExportItem } from "../view/member-access-export.view";
 import { MemberAccessReportView } from "../view/member-access-report.view";
diff --git a/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/services/member-access-report.service.spec.ts b/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/services/member-access-report.service.spec.ts
index 6aab54f77d..7d6beca48e 100644
--- a/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/services/member-access-report.service.spec.ts
+++ b/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/services/member-access-report.service.spec.ts
@@ -1,7 +1,7 @@
 import { mock } from "jest-mock-extended";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { OrganizationId } from "@bitwarden/common/src/types/guid";
+import { OrganizationId } from "@bitwarden/common/types/guid";
 
 import { MemberAccessReportApiService } from "./member-access-report-api.service";
 import { memberAccessReportsMock } from "./member-access-report.mock";
diff --git a/libs/common/src/tools/send/models/domain/send.spec.ts b/libs/common/src/tools/send/models/domain/send.spec.ts
index acdb96f0e0..408a4ea717 100644
--- a/libs/common/src/tools/send/models/domain/send.spec.ts
+++ b/libs/common/src/tools/send/models/domain/send.spec.ts
@@ -2,8 +2,8 @@ import { mock } from "jest-mock-extended";
 
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { UserKey } from "@bitwarden/common/types/key";
+import { KeyService } from "@bitwarden/key-management";
 
-import { KeyService } from "../../../../../../key-management/src/abstractions/key.service";
 import { makeStaticByteArray, mockEnc } from "../../../../../spec";
 import { EncryptService } from "../../../../platform/abstractions/encrypt.service";
 import { ContainerService } from "../../../../platform/services/container.service";
diff --git a/libs/common/src/tools/send/services/send.service.spec.ts b/libs/common/src/tools/send/services/send.service.spec.ts
index 5aca3a4b5c..ff81430251 100644
--- a/libs/common/src/tools/send/services/send.service.spec.ts
+++ b/libs/common/src/tools/send/services/send.service.spec.ts
@@ -3,8 +3,8 @@ import { firstValueFrom, of } from "rxjs";
 
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { SelfHostedEnvironment } from "@bitwarden/common/platform/services/default-environment.service";
+import { KeyService } from "@bitwarden/key-management";
 
-import { KeyService } from "../../../../../key-management/src/abstractions/key.service";
 import {
   FakeAccountService,
   FakeActiveUserState,
diff --git a/libs/importer/src/components/lastpass/lastpass-direct-import.service.ts b/libs/importer/src/components/lastpass/lastpass-direct-import.service.ts
index 368a9b321b..62826ae3fe 100644
--- a/libs/importer/src/components/lastpass/lastpass-direct-import.service.ts
+++ b/libs/importer/src/components/lastpass/lastpass-direct-import.service.ts
@@ -12,9 +12,9 @@ import { EnvironmentService } from "@bitwarden/common/platform/abstractions/envi
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { DialogService } from "@bitwarden/components";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
 
-import { DialogService } from "../../../../components/src/dialog";
 import { ClientInfo, Vault } from "../../importers/lastpass/access";
 import { FederatedUserContext } from "../../importers/lastpass/access/models";
 
diff --git a/libs/tools/generator/components/src/credential-generator.component.ts b/libs/tools/generator/components/src/credential-generator.component.ts
index 3af9d12abd..a2b204eaca 100644
--- a/libs/tools/generator/components/src/credential-generator.component.ts
+++ b/libs/tools/generator/components/src/credential-generator.component.ts
@@ -22,8 +22,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { IntegrationId } from "@bitwarden/common/tools/integration";
 import { UserId } from "@bitwarden/common/types/guid";
-import { ToastService } from "@bitwarden/components";
-import { Option } from "@bitwarden/components/src/select/option";
+import { ToastService, Option } from "@bitwarden/components";
 import {
   AlgorithmInfo,
   CredentialAlgorithm,
diff --git a/libs/tools/generator/components/src/password-generator.component.ts b/libs/tools/generator/components/src/password-generator.component.ts
index 7e230d8bfd..67a1bf2183 100644
--- a/libs/tools/generator/components/src/password-generator.component.ts
+++ b/libs/tools/generator/components/src/password-generator.component.ts
@@ -19,8 +19,7 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { UserId } from "@bitwarden/common/types/guid";
-import { ToastService } from "@bitwarden/components";
-import { Option } from "@bitwarden/components/src/select/option";
+import { ToastService, Option } from "@bitwarden/components";
 import {
   CredentialGeneratorService,
   Generators,
diff --git a/libs/tools/generator/components/src/username-generator.component.ts b/libs/tools/generator/components/src/username-generator.component.ts
index 63293ff7fd..d0230dcba4 100644
--- a/libs/tools/generator/components/src/username-generator.component.ts
+++ b/libs/tools/generator/components/src/username-generator.component.ts
@@ -23,8 +23,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { IntegrationId } from "@bitwarden/common/tools/integration";
 import { UserId } from "@bitwarden/common/types/guid";
-import { ToastService } from "@bitwarden/components";
-import { Option } from "@bitwarden/components/src/select/option";
+import { ToastService, Option } from "@bitwarden/components";
 import {
   AlgorithmInfo,
   CredentialAlgorithm,

From d64cfb67e27623a6bda9a351085d39aa9ece879f Mon Sep 17 00:00:00 2001
From: "bw-ghapp[bot]" <178206702+bw-ghapp[bot]@users.noreply.github.com>
Date: Fri, 10 Jan 2025 15:15:59 +0100
Subject: [PATCH 034/150] Autosync the updated translations (#12796)

Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>
---
 apps/desktop/src/locales/af/messages.json    |  38 +++
 apps/desktop/src/locales/ar/messages.json    |  38 +++
 apps/desktop/src/locales/az/messages.json    |  38 +++
 apps/desktop/src/locales/be/messages.json    |  38 +++
 apps/desktop/src/locales/bg/messages.json    |  38 +++
 apps/desktop/src/locales/bn/messages.json    |  38 +++
 apps/desktop/src/locales/bs/messages.json    |  38 +++
 apps/desktop/src/locales/ca/messages.json    |  38 +++
 apps/desktop/src/locales/cs/messages.json    |  38 +++
 apps/desktop/src/locales/cy/messages.json    |  38 +++
 apps/desktop/src/locales/da/messages.json    |  38 +++
 apps/desktop/src/locales/de/messages.json    |  38 +++
 apps/desktop/src/locales/el/messages.json    |  38 +++
 apps/desktop/src/locales/en_GB/messages.json |  38 +++
 apps/desktop/src/locales/en_IN/messages.json |  38 +++
 apps/desktop/src/locales/eo/messages.json    |  38 +++
 apps/desktop/src/locales/es/messages.json    |  38 +++
 apps/desktop/src/locales/et/messages.json    |  38 +++
 apps/desktop/src/locales/eu/messages.json    |  38 +++
 apps/desktop/src/locales/fa/messages.json    |  38 +++
 apps/desktop/src/locales/fi/messages.json    |  38 +++
 apps/desktop/src/locales/fil/messages.json   |  38 +++
 apps/desktop/src/locales/fr/messages.json    |  38 +++
 apps/desktop/src/locales/gl/messages.json    |  38 +++
 apps/desktop/src/locales/he/messages.json    |  38 +++
 apps/desktop/src/locales/hi/messages.json    |  38 +++
 apps/desktop/src/locales/hr/messages.json    |  38 +++
 apps/desktop/src/locales/hu/messages.json    |  38 +++
 apps/desktop/src/locales/id/messages.json    |  38 +++
 apps/desktop/src/locales/it/messages.json    |  40 +++-
 apps/desktop/src/locales/ja/messages.json    |  38 +++
 apps/desktop/src/locales/ka/messages.json    |  38 +++
 apps/desktop/src/locales/km/messages.json    |  38 +++
 apps/desktop/src/locales/kn/messages.json    |  38 +++
 apps/desktop/src/locales/ko/messages.json    |  38 +++
 apps/desktop/src/locales/lt/messages.json    |  38 +++
 apps/desktop/src/locales/lv/messages.json    |  38 +++
 apps/desktop/src/locales/me/messages.json    |  38 +++
 apps/desktop/src/locales/ml/messages.json    |  38 +++
 apps/desktop/src/locales/mr/messages.json    |  38 +++
 apps/desktop/src/locales/my/messages.json    |  38 +++
 apps/desktop/src/locales/nb/messages.json    |  38 +++
 apps/desktop/src/locales/ne/messages.json    |  38 +++
 apps/desktop/src/locales/nl/messages.json    |  38 +++
 apps/desktop/src/locales/nn/messages.json    |  38 +++
 apps/desktop/src/locales/or/messages.json    |  38 +++
 apps/desktop/src/locales/pl/messages.json    |  38 +++
 apps/desktop/src/locales/pt_BR/messages.json |  38 +++
 apps/desktop/src/locales/pt_PT/messages.json |  38 +++
 apps/desktop/src/locales/ro/messages.json    |  38 +++
 apps/desktop/src/locales/ru/messages.json    |  38 +++
 apps/desktop/src/locales/si/messages.json    |  38 +++
 apps/desktop/src/locales/sk/messages.json    |  38 +++
 apps/desktop/src/locales/sl/messages.json    |  38 +++
 apps/desktop/src/locales/sr/messages.json    |  38 +++
 apps/desktop/src/locales/sv/messages.json    |  38 +++
 apps/desktop/src/locales/te/messages.json    |  38 +++
 apps/desktop/src/locales/th/messages.json    |  38 +++
 apps/desktop/src/locales/tr/messages.json    |  38 +++
 apps/desktop/src/locales/uk/messages.json    |  38 +++
 apps/desktop/src/locales/vi/messages.json    |  38 +++
 apps/desktop/src/locales/zh_CN/messages.json |  50 +++-
 apps/desktop/src/locales/zh_TW/messages.json | 238 +++++++++++--------
 63 files changed, 2501 insertions(+), 107 deletions(-)

diff --git a/apps/desktop/src/locales/af/messages.json b/apps/desktop/src/locales/af/messages.json
index 1f56931995..9339d31aa9 100644
--- a/apps/desktop/src/locales/af/messages.json
+++ b/apps/desktop/src/locales/af/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Fout"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Januarie"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/ar/messages.json b/apps/desktop/src/locales/ar/messages.json
index a15dbb5f07..bb21e0db35 100644
--- a/apps/desktop/src/locales/ar/messages.json
+++ b/apps/desktop/src/locales/ar/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "خطأ"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "يناير"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "لم يُعثر على أي منفذ مجاني لتسجيل الدخول."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "السماح"
   },
diff --git a/apps/desktop/src/locales/az/messages.json b/apps/desktop/src/locales/az/messages.json
index 07519429f1..82fbee8111 100644
--- a/apps/desktop/src/locales/az/messages.json
+++ b/apps/desktop/src/locales/az/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Xəta"
   },
+  "decryptionError": {
+    "message": "Şifrə açma xətası"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden, aşağıda sadalanan seyf element(lər)inin şifrəsini aça bilmədi."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Əlavə data itkisini önləmək üçün",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "müştəri dəstəyi ilə əlaqə saxlayın.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Yanvar"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "SSO giriş üçün açıq port tapıla bilmədi."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Əvvəlcə PIN və ya parol ilə kilid açma tələb olunduğu üçün biometrik ilə kilid açma əlçatmazdır."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometrik kilid açma indi əlçatmazdır."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Yanlış konfiqurasiya edilmiş sistem fayllarına görə biometrik kilid açma əlçatmazdır."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Yanlış konfiqurasiya edilmiş sistem fayllarına görə biometrik kilid açma əlçatmazdır."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Bitwarden masaüstü tətbiqində $EMAIL$ üçün fəal olmadığına görə biometrik kilid açma əlçatmazdır.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Bilinməyən bilinməyən bir səbəbə görə biometrik kilid açma əlçatmazdır."
+  },
   "authorize": {
     "message": "Səlahiyyət ver"
   },
diff --git a/apps/desktop/src/locales/be/messages.json b/apps/desktop/src/locales/be/messages.json
index e89d6b5fa6..288ba2bede 100644
--- a/apps/desktop/src/locales/be/messages.json
+++ b/apps/desktop/src/locales/be/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Памылка"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Студзень"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/bg/messages.json b/apps/desktop/src/locales/bg/messages.json
index 9770e24c5a..3d730a6789 100644
--- a/apps/desktop/src/locales/bg/messages.json
+++ b/apps/desktop/src/locales/bg/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Грешка"
   },
+  "decryptionError": {
+    "message": "Грешка при дешифриране"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Битоурден не може да дешифрира елементите от трезора посочени по-долу."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Свържете се с поддръжката",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "за да избегнете загубата на данни.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "януари"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "Не могат да бъдат открити свободни портове за еднократната идентификация."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Отключването с биометрични данни не е налично, тъй като първо се изисква отключване чрез ПИН или парола."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Отключването с биометрични данни не е налично в момента."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Отключването с биометрични данни не е налично поради неправилно настроени системни файлове."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Отключването с биометрични данни не е налично поради неправилно настроени системни файлове."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Отключването с биометрични данни не е налично, тъй като не е включено за $EMAIL$ в приложението на Битуорден за компютър.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Отключването с биометрични данни не е налично по неизвестна причина."
+  },
   "authorize": {
     "message": "Упълномощаване"
   },
diff --git a/apps/desktop/src/locales/bn/messages.json b/apps/desktop/src/locales/bn/messages.json
index 8fe871a956..e4eb247c59 100644
--- a/apps/desktop/src/locales/bn/messages.json
+++ b/apps/desktop/src/locales/bn/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "ত্রুটি"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "জানুয়ারী"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/bs/messages.json b/apps/desktop/src/locales/bs/messages.json
index e90a7e16c8..9b91d3d7c4 100644
--- a/apps/desktop/src/locales/bs/messages.json
+++ b/apps/desktop/src/locales/bs/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Greška"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Januar"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/ca/messages.json b/apps/desktop/src/locales/ca/messages.json
index ace7e5defc..2367af72d5 100644
--- a/apps/desktop/src/locales/ca/messages.json
+++ b/apps/desktop/src/locales/ca/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Gener"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/cs/messages.json b/apps/desktop/src/locales/cs/messages.json
index f73f76f44a..01d3380d27 100644
--- a/apps/desktop/src/locales/cs/messages.json
+++ b/apps/desktop/src/locales/cs/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Chyba"
   },
+  "decryptionError": {
+    "message": "Chyba dešifrování"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden nemohl dešifrovat níže uvedené položky v trezoru."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Kontaktujte zákaznickou podporu,",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "abyste zabránili ztrátě dat.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Leden"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "Pro přihlášení SSO nebyly nalezeny žádné volné porty."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometrické odemknutí je nedostupné, protože je potřeba nejprve odemknout pomocí PIN nebo hesla."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometrické odemknutí je momentálně nedostupné."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometrické odemknutí není dostupné kvůli chybnému nastavení systémových souborů."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometrické odemknutí není dostupné kvůli chybnému nastavení systémových souborů."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometrické odemknutí není k dispozici, protože není povoleno pro $EMAIL$ v desktopové aplikaci Bitwarden.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometrické odemknutí je momentálně z neznámého důvodu nedostupné."
+  },
   "authorize": {
     "message": "Autorizovat"
   },
diff --git a/apps/desktop/src/locales/cy/messages.json b/apps/desktop/src/locales/cy/messages.json
index 00d79c80ec..907f7498f2 100644
--- a/apps/desktop/src/locales/cy/messages.json
+++ b/apps/desktop/src/locales/cy/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "January"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/da/messages.json b/apps/desktop/src/locales/da/messages.json
index b2867c4072..766f0cf5e7 100644
--- a/apps/desktop/src/locales/da/messages.json
+++ b/apps/desktop/src/locales/da/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Fejl"
   },
+  "decryptionError": {
+    "message": "Dekrypteringsfejl"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden kunne ikke dekryptere boks-emne(r) anført nedenfor."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Kontakt kundeservice",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "for at undgå yderligere tab af data.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Januar"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "Ingen ledige porte fundet til SSO-login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometrisk oplåsning er utilgængelig, da PIN- eller adgangskode kræves først."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometrisk oplåsning er p.t. utilgængelig."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometrisk oplåsning er utilgængelig grundet fejlopsatte systemfiler."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometrisk oplåsning er utilgængelig grundet fejlopsatte systemfiler."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometrisk oplåsning er utilgængelig, da det ikke er aktiveret for $EMAIL$ i Bitwarden computer-appen.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometrisk oplåsning er p.t. utilgængelig grundet en ukendt årsag."
+  },
   "authorize": {
     "message": "Godkend"
   },
diff --git a/apps/desktop/src/locales/de/messages.json b/apps/desktop/src/locales/de/messages.json
index ae20bc0931..d8e946bc3e 100644
--- a/apps/desktop/src/locales/de/messages.json
+++ b/apps/desktop/src/locales/de/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Fehler"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Januar"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "Es konnten keine freien Ports für die SSO-Anmeldung gefunden werden."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Autorisieren"
   },
diff --git a/apps/desktop/src/locales/el/messages.json b/apps/desktop/src/locales/el/messages.json
index 676c016c69..b134c0d3db 100644
--- a/apps/desktop/src/locales/el/messages.json
+++ b/apps/desktop/src/locales/el/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Σφάλμα"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Ιανουάριος"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "Δεν βρέθηκαν ελεύθερες θύρες για τη σύνδεση sso."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/en_GB/messages.json b/apps/desktop/src/locales/en_GB/messages.json
index ee1be4df2e..1f705b5432 100644
--- a/apps/desktop/src/locales/en_GB/messages.json
+++ b/apps/desktop/src/locales/en_GB/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "January"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorise"
   },
diff --git a/apps/desktop/src/locales/en_IN/messages.json b/apps/desktop/src/locales/en_IN/messages.json
index b8afb36f3a..bdabdb2f37 100644
--- a/apps/desktop/src/locales/en_IN/messages.json
+++ b/apps/desktop/src/locales/en_IN/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "January"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorise"
   },
diff --git a/apps/desktop/src/locales/eo/messages.json b/apps/desktop/src/locales/eo/messages.json
index b7fbb2fbe9..7cbd15b596 100644
--- a/apps/desktop/src/locales/eo/messages.json
+++ b/apps/desktop/src/locales/eo/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Eraro"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "januaro"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/es/messages.json b/apps/desktop/src/locales/es/messages.json
index 9cb82ceb92..27f694ec18 100644
--- a/apps/desktop/src/locales/es/messages.json
+++ b/apps/desktop/src/locales/es/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Enero"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/et/messages.json b/apps/desktop/src/locales/et/messages.json
index 276d3565f1..ec73ac1e8b 100644
--- a/apps/desktop/src/locales/et/messages.json
+++ b/apps/desktop/src/locales/et/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Viga"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Jaanuar"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "SSO-ga sisselogimiseks ei leitud ühtegi vaba porti."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/eu/messages.json b/apps/desktop/src/locales/eu/messages.json
index 41e8eda96c..0147b474ab 100644
--- a/apps/desktop/src/locales/eu/messages.json
+++ b/apps/desktop/src/locales/eu/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Akatsa"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Urtarrila"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/fa/messages.json b/apps/desktop/src/locales/fa/messages.json
index fdc9ba6d31..a04c39d4ae 100644
--- a/apps/desktop/src/locales/fa/messages.json
+++ b/apps/desktop/src/locales/fa/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "خطا"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "ژانویه"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/fi/messages.json b/apps/desktop/src/locales/fi/messages.json
index 69092054f2..193553cac8 100644
--- a/apps/desktop/src/locales/fi/messages.json
+++ b/apps/desktop/src/locales/fi/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Virhe"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Tammikuu"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "Kertakirjautumiselle ei löytynyt vapaita portteja."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Valtuuta"
   },
diff --git a/apps/desktop/src/locales/fil/messages.json b/apps/desktop/src/locales/fil/messages.json
index a8a36cd94a..53b2ef9ffb 100644
--- a/apps/desktop/src/locales/fil/messages.json
+++ b/apps/desktop/src/locales/fil/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Mali"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Enero"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/fr/messages.json b/apps/desktop/src/locales/fr/messages.json
index a353653e1e..f1bf424387 100644
--- a/apps/desktop/src/locales/fr/messages.json
+++ b/apps/desktop/src/locales/fr/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Erreur"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Janvier"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Autoriser"
   },
diff --git a/apps/desktop/src/locales/gl/messages.json b/apps/desktop/src/locales/gl/messages.json
index 323d0cd3f7..35d5cf8c03 100644
--- a/apps/desktop/src/locales/gl/messages.json
+++ b/apps/desktop/src/locales/gl/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "January"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/he/messages.json b/apps/desktop/src/locales/he/messages.json
index dfaa195895..09d6e321a1 100644
--- a/apps/desktop/src/locales/he/messages.json
+++ b/apps/desktop/src/locales/he/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "שגיאה"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "ינואר"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/hi/messages.json b/apps/desktop/src/locales/hi/messages.json
index 13bb5edfa9..3263191cd3 100644
--- a/apps/desktop/src/locales/hi/messages.json
+++ b/apps/desktop/src/locales/hi/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "January"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/hr/messages.json b/apps/desktop/src/locales/hr/messages.json
index a87261a202..b1def7c192 100644
--- a/apps/desktop/src/locales/hr/messages.json
+++ b/apps/desktop/src/locales/hr/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Pogreška"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "siječanj"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "Nisu nađeni slobodni portovi za SSO prijavu."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Autoriziraj"
   },
diff --git a/apps/desktop/src/locales/hu/messages.json b/apps/desktop/src/locales/hu/messages.json
index 11091cde86..fb94d34b38 100644
--- a/apps/desktop/src/locales/hu/messages.json
+++ b/apps/desktop/src/locales/hu/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Hiba"
   },
+  "decryptionError": {
+    "message": "Visszafejtési hiba"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "A Bitwarden nem tudta visszafejteni az alább felsorolt ​​széf elemeket."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Ügyfélszolgálat elérés siker",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "további adatvesztés elkerülése érdekében.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "január"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "Nem található szabad port az sso bejelentkezéshez."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "A biometrikus feloldás nem érhető el, mert először PIN kóddal vagy jelszóval kell feloldani."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "A biometrikus feloldás jelenleg nem érhető el."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "A biometrikus feloldás nem érhető el a rosszul konfigurált rendszerfájlok miatt."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "A biometrikus feloldás nem érhető el a rosszul konfigurált rendszerfájlok miatt."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "A biometrikus feloldás nem érhető el, mert nincs engedélyezve $EMAIL$ számára a Bitwarden asztali alkalmazásban.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "A biometrikus feloldás jelenleg ismeretlen okból nem érhető el."
+  },
   "authorize": {
     "message": "Hitelesítés"
   },
diff --git a/apps/desktop/src/locales/id/messages.json b/apps/desktop/src/locales/id/messages.json
index b9af1c0004..989177b1b4 100644
--- a/apps/desktop/src/locales/id/messages.json
+++ b/apps/desktop/src/locales/id/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Galat"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Januari"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/it/messages.json b/apps/desktop/src/locales/it/messages.json
index e035a13606..13e4c692f6 100644
--- a/apps/desktop/src/locales/it/messages.json
+++ b/apps/desktop/src/locales/it/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Errore"
   },
+  "decryptionError": {
+    "message": "Errore di decifrazione"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden non può decifrare gli elementi elencati di seguito."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contatta il cliente correttamente",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "per evitare ulteriori perdite di dati.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Gennaio"
   },
@@ -1320,7 +1334,7 @@
     "description": "Copy credit card number"
   },
   "copyEmail": {
-    "message": "Copia e-mail"
+    "message": "Copia email"
   },
   "copySecurityCode": {
     "message": "Copia codice di sicurezza",
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "Non è stato possibile trovare nessuna porta libera per il login Sso."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Lo sblocco biometrico non è disponibile perché è necessario prima sbloccare con PIN o parola d'accesso."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Lo sblocco biometrico non è attualmente disponibile."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Lo sblocco biometrico non è disponibile a causa di file di sistema mal configurati."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Lo sblocco biometrico non è disponibile a causa di file di sistema mal configurati."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Lo sblocco biometrico non è disponibile perché non è abilitato per $EMAIL$ nell'app desktop Bitwarden.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Lo sblocco biometrico non è attualmente disponibile per un motivo sconosciuto."
+  },
   "authorize": {
     "message": "Autorizza"
   },
diff --git a/apps/desktop/src/locales/ja/messages.json b/apps/desktop/src/locales/ja/messages.json
index 7315d74a70..364de39788 100644
--- a/apps/desktop/src/locales/ja/messages.json
+++ b/apps/desktop/src/locales/ja/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "エラー"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "1月"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "SSO ログインのための空きポートが見つかりませんでした。"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "認可"
   },
diff --git a/apps/desktop/src/locales/ka/messages.json b/apps/desktop/src/locales/ka/messages.json
index 6c554a8270..fef2d56a7c 100644
--- a/apps/desktop/src/locales/ka/messages.json
+++ b/apps/desktop/src/locales/ka/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "შეცდომა"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "იანვარი"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/km/messages.json b/apps/desktop/src/locales/km/messages.json
index 323d0cd3f7..35d5cf8c03 100644
--- a/apps/desktop/src/locales/km/messages.json
+++ b/apps/desktop/src/locales/km/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "January"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/kn/messages.json b/apps/desktop/src/locales/kn/messages.json
index 6182bd3a33..9ce484b381 100644
--- a/apps/desktop/src/locales/kn/messages.json
+++ b/apps/desktop/src/locales/kn/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "ದೋಷ"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "ಜನವರಿ"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/ko/messages.json b/apps/desktop/src/locales/ko/messages.json
index 89c5430a5f..19a13ef3e8 100644
--- a/apps/desktop/src/locales/ko/messages.json
+++ b/apps/desktop/src/locales/ko/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "오류"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "1월"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/lt/messages.json b/apps/desktop/src/locales/lt/messages.json
index 6e07f4ceee..c1fafc59f1 100644
--- a/apps/desktop/src/locales/lt/messages.json
+++ b/apps/desktop/src/locales/lt/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Klaida"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Sausis"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/lv/messages.json b/apps/desktop/src/locales/lv/messages.json
index a3db76ac64..f2317e1d0b 100644
--- a/apps/desktop/src/locales/lv/messages.json
+++ b/apps/desktop/src/locales/lv/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Kļūda"
   },
+  "decryptionError": {
+    "message": "Atšifrēšanas kļūda"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden nevarēja atšifrēt zemāk uzskaitītos glabātavas vienumus."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "lai izvairītos no papildu datu zaudējumiem.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Janvāris"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "Netika atrasti brīvi vienotās (SSO) pieteikšanās porti."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Atslēgšana ar biometriju nav pieejama, jo vispirms ir nepieciešama atslēgšana ar PIN vai paroli."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Atslēgšana ar biometriju pašlaik nav pieejama."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Atslēgšana ar biometriju nav pieejama nepareizi konfigurētu sistēmas datņu dēļ."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Atslēgšana ar biometriju nav pieejama nepareizi konfigurētu sistēmas datņu dēļ."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Atslēgšana ar biometriju nav pieejama, jo tā nav iespējota $EMAIL$ Bitwarden darbvirsmas lietotnē.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Atslēgšana ar biometriju pašlaik nav pieejama nezināma iemesla dēļ."
+  },
   "authorize": {
     "message": "Pilnvarot"
   },
diff --git a/apps/desktop/src/locales/me/messages.json b/apps/desktop/src/locales/me/messages.json
index 49bf2c60f6..50a6ee8df5 100644
--- a/apps/desktop/src/locales/me/messages.json
+++ b/apps/desktop/src/locales/me/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Greška"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Januar"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/ml/messages.json b/apps/desktop/src/locales/ml/messages.json
index d314ee4457..e1516b99b2 100644
--- a/apps/desktop/src/locales/ml/messages.json
+++ b/apps/desktop/src/locales/ml/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "പിശക്"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "ജനുവരി"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/mr/messages.json b/apps/desktop/src/locales/mr/messages.json
index 323d0cd3f7..35d5cf8c03 100644
--- a/apps/desktop/src/locales/mr/messages.json
+++ b/apps/desktop/src/locales/mr/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "January"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/my/messages.json b/apps/desktop/src/locales/my/messages.json
index c1713e0bb3..ce5a50e1f7 100644
--- a/apps/desktop/src/locales/my/messages.json
+++ b/apps/desktop/src/locales/my/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "January"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/nb/messages.json b/apps/desktop/src/locales/nb/messages.json
index f264bb5f09..00970fb0fc 100644
--- a/apps/desktop/src/locales/nb/messages.json
+++ b/apps/desktop/src/locales/nb/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Feil"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Januar"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/ne/messages.json b/apps/desktop/src/locales/ne/messages.json
index fb8d7ec7df..6a5ae864fc 100644
--- a/apps/desktop/src/locales/ne/messages.json
+++ b/apps/desktop/src/locales/ne/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "त्रुटि"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "जनवरी"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/nl/messages.json b/apps/desktop/src/locales/nl/messages.json
index a23ef820ab..729a093927 100644
--- a/apps/desktop/src/locales/nl/messages.json
+++ b/apps/desktop/src/locales/nl/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Fout"
   },
+  "decryptionError": {
+    "message": "Ontsleutelingsfout"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden kon de onderstaande kluisitem(s) niet ontsleutelen."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Neem contact op met de klantenservice",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "om extra dataverlies te voorkomen.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "januari"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "Er zijn geen vrije poorten gevonden voor de sso-login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometrisch ontgrendelen is niet beschikbaar omdat pincode of wachtwoordontgrendeling eerst vereist is."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometrisch ontgrendelen is momenteel niet beschikbaar."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometrisch ontgrendelen is niet beschikbaar vanwege verkeerd geconfigureerde systeembestanden."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometrisch ontgrendelen is niet beschikbaar vanwege verkeerd geconfigureerde systeembestanden."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometrisch ontgrendelen is niet beschikbaar omdat het niet is ingeschakeld voor $EMAIL$ in de Bitwarden-desktopapp.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometrisch ontgrendelen is momenteel niet beschikbaar om een onbekende reden."
+  },
   "authorize": {
     "message": "Autoriseren"
   },
diff --git a/apps/desktop/src/locales/nn/messages.json b/apps/desktop/src/locales/nn/messages.json
index 543f20fc01..7e18c7b77d 100644
--- a/apps/desktop/src/locales/nn/messages.json
+++ b/apps/desktop/src/locales/nn/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Feil"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Januar"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/or/messages.json b/apps/desktop/src/locales/or/messages.json
index 2723db4f88..903fe83af7 100644
--- a/apps/desktop/src/locales/or/messages.json
+++ b/apps/desktop/src/locales/or/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "ତ୍ରୁଟି"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "ଜାନୁଆରୀ"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/pl/messages.json b/apps/desktop/src/locales/pl/messages.json
index 9cddf81546..59cf3a96ab 100644
--- a/apps/desktop/src/locales/pl/messages.json
+++ b/apps/desktop/src/locales/pl/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Błąd"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Styczeń"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "Nie znaleziono wolnych portów dla logowania SSO."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/pt_BR/messages.json b/apps/desktop/src/locales/pt_BR/messages.json
index 3e1b8f5404..0e35de82e7 100644
--- a/apps/desktop/src/locales/pt_BR/messages.json
+++ b/apps/desktop/src/locales/pt_BR/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Erro"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Janeiro"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "Nenhuma porta livre foi encontrada para o cliente final."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Autorizar"
   },
diff --git a/apps/desktop/src/locales/pt_PT/messages.json b/apps/desktop/src/locales/pt_PT/messages.json
index 55b031690a..a63fbca2eb 100644
--- a/apps/desktop/src/locales/pt_PT/messages.json
+++ b/apps/desktop/src/locales/pt_PT/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Erro"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Janeiro"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "Não foi possível encontrar portas livres para o início de sessão sso."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Autorizar"
   },
diff --git a/apps/desktop/src/locales/ro/messages.json b/apps/desktop/src/locales/ro/messages.json
index 0d26dbb2fc..939c329589 100644
--- a/apps/desktop/src/locales/ro/messages.json
+++ b/apps/desktop/src/locales/ro/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Eroare"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "ianuarie"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/ru/messages.json b/apps/desktop/src/locales/ru/messages.json
index 056c9d32ac..d8aa6556a0 100644
--- a/apps/desktop/src/locales/ru/messages.json
+++ b/apps/desktop/src/locales/ru/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Ошибка"
   },
+  "decryptionError": {
+    "message": "Ошибка расшифровки"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden не удалось расшифровать элемент(ы) хранилища, перечисленные ниже."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Обратитесь в службу поддержки,",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "чтобы избежать дополнительной потери данных.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Январь"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "Не удалось найти свободные порты для авторизации SSO."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Биометрическая разблокировка недоступна, поскольку сначала требуется разблокировка с помощью PIN-кода или пароля."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Биометрическая разблокировка в настоящее время недоступна."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Биометрическая разблокировка недоступна из-за неправильно настроенных системных файлов."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Биометрическая разблокировка недоступна из-за неправильно настроенных системных файлов."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Биометрическая разблокировка недоступна, потому что она не включена для $EMAIL$ в приложении Bitwarden для компьютера.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Биометрическая разблокировка в настоящее время недоступна по неизвестной причине."
+  },
   "authorize": {
     "message": "Разрешить"
   },
diff --git a/apps/desktop/src/locales/si/messages.json b/apps/desktop/src/locales/si/messages.json
index 51625639dd..210ccc7383 100644
--- a/apps/desktop/src/locales/si/messages.json
+++ b/apps/desktop/src/locales/si/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "දෝෂය"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "දුරුතු"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/sk/messages.json b/apps/desktop/src/locales/sk/messages.json
index cec06c3c02..bfcfb56f98 100644
--- a/apps/desktop/src/locales/sk/messages.json
+++ b/apps/desktop/src/locales/sk/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Chyba"
   },
+  "decryptionError": {
+    "message": "Chyba dešifrovania"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden nedokázal dešifrovať nižšie uvedené položky trezoru."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Kontaktujte zákaznícku podporu,",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "aby ste predišli ďalším stratám údajov.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Január"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "Pre prihlásenie SSO sa nepodarilo nájsť žiadne voľné porty."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Odomykanie biometrickými údajmi je nedostupné pretože je najskôr potrebné odomykanie pomocou PIN alebo hesla."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Odomykanie biometrickými údajmi je momentálne nedostupné."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Odomykanie biometrickými údajmi je nedostupné v dôsledku zle nastavených systémových súborov."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Odomykanie biometrickými údajmi je nedostupné v dôsledku zle nastavených systémových súborov."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Odomykanie biometrickými údajmi je nedostupné pretože nie je povolené pre $EMAIL$ v aplikácii Bitwarden pre desktop.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Odomykanie biometrickými údajmi je z neznámych dôvodov nedostupné."
+  },
   "authorize": {
     "message": "Autorizovať"
   },
diff --git a/apps/desktop/src/locales/sl/messages.json b/apps/desktop/src/locales/sl/messages.json
index 1973f6c017..0270b7ba3f 100644
--- a/apps/desktop/src/locales/sl/messages.json
+++ b/apps/desktop/src/locales/sl/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Napaka"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Januar"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/sr/messages.json b/apps/desktop/src/locales/sr/messages.json
index 9f9dec2dd6..d8544d8285 100644
--- a/apps/desktop/src/locales/sr/messages.json
+++ b/apps/desktop/src/locales/sr/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Грешка"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Јануар"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "Нису пронађени портови за SSO пријаву."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Ауторизуј"
   },
diff --git a/apps/desktop/src/locales/sv/messages.json b/apps/desktop/src/locales/sv/messages.json
index c9a463246d..023b74b12b 100644
--- a/apps/desktop/src/locales/sv/messages.json
+++ b/apps/desktop/src/locales/sv/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Fel"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Januari"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/te/messages.json b/apps/desktop/src/locales/te/messages.json
index 323d0cd3f7..35d5cf8c03 100644
--- a/apps/desktop/src/locales/te/messages.json
+++ b/apps/desktop/src/locales/te/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "January"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/th/messages.json b/apps/desktop/src/locales/th/messages.json
index 16961afcc5..b5cc86b1e5 100644
--- a/apps/desktop/src/locales/th/messages.json
+++ b/apps/desktop/src/locales/th/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "ข้อผิดพลาด"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "มกราคม"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "No free ports could be found for the sso login."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/tr/messages.json b/apps/desktop/src/locales/tr/messages.json
index 8357f8616b..5f11450a20 100644
--- a/apps/desktop/src/locales/tr/messages.json
+++ b/apps/desktop/src/locales/tr/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Hata"
   },
+  "decryptionError": {
+    "message": "Şifre çözme sorunu"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Ocak"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "SSO girişi için açık port bulunamadı."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Yetkilendir"
   },
diff --git a/apps/desktop/src/locales/uk/messages.json b/apps/desktop/src/locales/uk/messages.json
index 4103e8b28a..d4126a6b64 100644
--- a/apps/desktop/src/locales/uk/messages.json
+++ b/apps/desktop/src/locales/uk/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Помилка"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Січень"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "Не знайдено вільних портів для цього входу SSO."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Авторизувати"
   },
diff --git a/apps/desktop/src/locales/vi/messages.json b/apps/desktop/src/locales/vi/messages.json
index e514124414..fcd113f307 100644
--- a/apps/desktop/src/locales/vi/messages.json
+++ b/apps/desktop/src/locales/vi/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "Lỗi"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "Tháng 1"
   },
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "Không thể tìm thấy cổng trống để đăng nhập SSO."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authorize": {
     "message": "Authorize"
   },
diff --git a/apps/desktop/src/locales/zh_CN/messages.json b/apps/desktop/src/locales/zh_CN/messages.json
index 9bff79aa85..0285842f04 100644
--- a/apps/desktop/src/locales/zh_CN/messages.json
+++ b/apps/desktop/src/locales/zh_CN/messages.json
@@ -249,6 +249,20 @@
   "error": {
     "message": "错误"
   },
+  "decryptionError": {
+    "message": "解密错误"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden 无法解密下列密码库项目。"
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "联系客户成功团队",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "以避免额外的数据丢失。",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "一月"
   },
@@ -975,13 +989,13 @@
     "message": "您的登录会话已过期。"
   },
   "restartRegistration": {
-    "message": "重新开始注册"
+    "message": "重启注册"
   },
   "expiredLink": {
     "message": "失效链接"
   },
   "pleaseRestartRegistrationOrTryLoggingIn": {
-    "message": "请重新注册或尝试登录。"
+    "message": "请重启注册或尝试登录。"
   },
   "youMayAlreadyHaveAnAccount": {
     "message": "您可能已经有一个账户了"
@@ -1008,7 +1022,7 @@
     "message": "账户"
   },
   "loading": {
-    "message": "加载中…"
+    "message": "正在加载..."
   },
   "lockVault": {
     "message": "锁定密码库"
@@ -2255,7 +2269,7 @@
     "message": "更新主密码"
   },
   "updateMasterPasswordWarning": {
-    "message": "您的主密码最近被您组织的管理员更改过。要访问密码库，您必须立即更新它。继续操作将使您退出当前会话并要求您重新登录。其他设备上的活动会话可能会继续保持活动状态长达一小时。"
+    "message": "您的主密码最近被您组织的管理员更改过。要访问密码库，您必须立即更新它。继续操作将使您退出当前会话，并要求您重新登录。其他设备上的活动会话可能会继续保持活动状态长达一小时。"
   },
   "updateWeakMasterPasswordWarning": {
     "message": "您的主密码不符合某一项或多项组织策略要求。要访问密码库，必须立即更新您的主密码。继续操作将使您退出当前会话，并要求您重新登录。其他设备上的活动会话可能会继续保持活动状态长达一小时。"
@@ -2495,7 +2509,7 @@
     }
   },
   "passwordLengthRecommendationHint": {
-    "message": " 使用 $RECOMMENDED$ 或更多个字符生成强大的密码。",
+    "message": " 使用 $RECOMMENDED$ 个或更多字符生成强大的密码。",
     "description": "Appended to `spinboxBoundariesHint` to recommend a length to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -2505,7 +2519,7 @@
     }
   },
   "passphraseNumWordsRecommendationHint": {
-    "message": " 使用 $RECOMMENDED$ 或更多个单词生成强大的密码短语。",
+    "message": " 使用 $RECOMMENDED$ 个或更多单词生成强大的密码短语。",
     "description": "Appended to `spinboxBoundariesHint` to recommend a number of words to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -3362,6 +3376,30 @@
   "ssoError": {
     "message": "找不到用于 SSO 登录的可用端口。"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "生物识别解锁不可用，因为需要先使用 PIN 或密码解锁。"
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "生物识别解锁当前不可用。"
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "由于系统文件配置错误，生物识别解锁不可用。"
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "由于系统文件配置错误，生物识别解锁不可用。"
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "生物识别解锁不可用，因为在 Bitwarden 桌面 App 中没有为 $EMAIL$ 启用生物识别解锁。",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "由于某个未知的原因，生物识别解锁当前不可用。"
+  },
   "authorize": {
     "message": "批准"
   },
diff --git a/apps/desktop/src/locales/zh_TW/messages.json b/apps/desktop/src/locales/zh_TW/messages.json
index 3c7884a22c..b5ca02d6c8 100644
--- a/apps/desktop/src/locales/zh_TW/messages.json
+++ b/apps/desktop/src/locales/zh_TW/messages.json
@@ -27,7 +27,7 @@
     "message": "安全筆記"
   },
   "typeSshKey": {
-    "message": "SSH key"
+    "message": "SSH 金鑰"
   },
   "folders": {
     "message": "資料夾"
@@ -64,7 +64,7 @@
     }
   },
   "welcomeBack": {
-    "message": "Welcome back"
+    "message": "歡迎回來"
   },
   "moveToOrgDesc": {
     "message": "選擇您希望將這個項目移動到哪個組織。項目的擁有權將會轉移到該組織。一經移動，您將不再是此項目的直接擁有者。"
@@ -181,16 +181,16 @@
     "message": "地址"
   },
   "sshPrivateKey": {
-    "message": "Private key"
+    "message": "私密金鑰"
   },
   "sshPublicKey": {
-    "message": "Public key"
+    "message": "公開金鑰"
   },
   "sshFingerprint": {
-    "message": "Fingerprint"
+    "message": "指紋"
   },
   "sshKeyAlgorithm": {
-    "message": "Key type"
+    "message": "金鑰類型"
   },
   "sshKeyAlgorithmED25519": {
     "message": "ED25519"
@@ -208,19 +208,19 @@
     "message": "一組SSH金鑰已在之前生成了"
   },
   "sshKeyWrongPassword": {
-    "message": "The password you entered is incorrect."
+    "message": "您輸入的密碼錯誤。"
   },
   "importSshKey": {
-    "message": "Import"
+    "message": "匯入"
   },
   "confirmSshKeyPassword": {
-    "message": "Confirm password"
+    "message": "確認密碼"
   },
   "enterSshKeyPasswordDesc": {
-    "message": "Enter the password for the SSH key."
+    "message": "輸入 SSH 金鑰的密碼"
   },
   "enterSshKeyPassword": {
-    "message": "Enter password"
+    "message": "請輸入密碼"
   },
   "sshAgentUnlockRequired": {
     "message": "請解鎖密碼庫以核准SSh金鑰的請求"
@@ -229,7 +229,7 @@
     "message": "SSH金鑰請求超時"
   },
   "enableSshAgent": {
-    "message": "啟用SSH代理"
+    "message": "啟用 SSH 代理程式"
   },
   "enableSshAgentDesc": {
     "message": "啟用SSBitwardenH代理以從 Bitwarden 密碼庫簽發SSH請求"
@@ -249,6 +249,20 @@
   "error": {
     "message": "錯誤"
   },
+  "decryptionError": {
+    "message": "解密發生錯誤"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden 無法解密您密碼庫中下面的項目。"
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "聯絡客戶支援部門",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "來避免更多資料遺失。",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "january": {
     "message": "一月"
   },
@@ -510,7 +524,7 @@
     "description": "Label for the password generator uppercase character checkbox"
   },
   "lowercaseDescription": {
-    "message": "Include lowercase characters",
+    "message": "包含小寫字元",
     "description": "Full description for the password generator lowercase character checkbox"
   },
   "lowercaseLabel": {
@@ -642,10 +656,10 @@
     "message": "以通行密鑰 (passkey) 登入"
   },
   "loginWithDevice": {
-    "message": "Log in with device"
+    "message": "使用裝置登入"
   },
   "useSingleSignOn": {
-    "message": "Use single sign-on"
+    "message": "使用單一登入"
   },
   "submit": {
     "message": "送出"
@@ -666,7 +680,7 @@
     "message": "主密碼提示（選用）"
   },
   "masterPassHintText": {
-    "message": "If you forget your password, the password hint can be sent to your email. $CURRENT$/$MAXIMUM$ character maximum.",
+    "message": "如果您忘記了密碼，可以傳送密碼提示到您的電子郵件。$CURRENT$ / 最多 $MAXIMUM$ 個字元",
     "placeholders": {
       "current": {
         "content": "$1",
@@ -703,7 +717,7 @@
     }
   },
   "finishJoiningThisOrganizationBySettingAMasterPassword": {
-    "message": "Finish joining this organization by setting a master password."
+    "message": "設定主密碼以完成加入這個組織"
   },
   "settings": {
     "message": "設定"
@@ -712,13 +726,13 @@
     "message": "電子郵件帳戶："
   },
   "requestHint": {
-    "message": "Request hint"
+    "message": "請求提示"
   },
   "requestPasswordHint": {
     "message": "主密碼提示"
   },
   "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou": {
-    "message": "Enter your account email address and your password hint will be sent to you"
+    "message": "輸入您帳號的電子郵件，您的密碼提示會傳送給您"
   },
   "passwordHint": {
     "message": "密碼提示"
@@ -764,7 +778,7 @@
     "message": "帳戶已建立！現在可以登入了。"
   },
   "newAccountCreated2": {
-    "message": "Your new account has been created!"
+    "message": "您已成功建立新帳號！"
   },
   "youHaveBeenLoggedIn": {
     "message": "你已經登入!"
@@ -854,17 +868,17 @@
     "message": "驗證器應用程式"
   },
   "authenticatorAppDescV2": {
-    "message": "Enter a code generated by an authenticator app like Bitwarden Authenticator.",
+    "message": "輸入驗證器應用程式產生的驗證碼，例如 Bitwarden 驗證器。",
     "description": "'Bitwarden Authenticator' is a product name and should not be translated."
   },
   "yubiKeyTitleV2": {
-    "message": "Yubico OTP security key"
+    "message": "YubiKey OTP 安全金鑰"
   },
   "yubiKeyDesc": {
     "message": "使用 YubiKey 來存取您的帳戶。支援 YubiKey 4、4 Nano、4C、以及 NEO 裝置。"
   },
   "duoDescV2": {
-    "message": "Enter a code generated by Duo Security.",
+    "message": "輸入 Duo 應用程式產生的驗證碼。",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "duoOrganizationDesc": {
@@ -881,7 +895,7 @@
     "message": "電子郵件"
   },
   "emailDescV2": {
-    "message": "Enter a code sent to your email."
+    "message": "輸入寄送到您電子郵件信箱的驗證碼。"
   },
   "loginUnavailable": {
     "message": "登入無法使用"
@@ -902,13 +916,13 @@
     "message": "指定您本地托管的 Bitwarden 安裝之基礎 URL。"
   },
   "selfHostedBaseUrlHint": {
-    "message": "Specify the base URL of your on-premises hosted Bitwarden installation. Example: https://bitwarden.company.com"
+    "message": "指定您自建的 Bitwarden 伺服器的網域 URL。例如：https://bitwarden.company.com"
   },
   "selfHostedCustomEnvHeader": {
-    "message": "For advanced configuration, you can specify the base URL of each service independently."
+    "message": "適用於進階設定。您可以單獨指定各個服務的網域 URL。"
   },
   "selfHostedEnvFormInvalid": {
-    "message": "You must add either the base Server URL or at least one custom environment."
+    "message": "您必須新增伺服器網域 URL 或至少一個自定義環境。"
   },
   "customEnvironment": {
     "message": "自訂環境"
@@ -920,13 +934,13 @@
     "message": "伺服器 URL"
   },
   "authenticationTimeout": {
-    "message": "Authentication timeout"
+    "message": "驗證逾時"
   },
   "authenticationSessionTimedOut": {
-    "message": "The authentication session timed out. Please restart the login process."
+    "message": "驗證工作階段因時間過久已逾時。請重試登入。"
   },
   "selfHostBaseUrl": {
-    "message": "Self-host server URL",
+    "message": "自建伺服器 URL",
     "description": "Label for field requesting a self-hosted integration service URL"
   },
   "apiUrl": {
@@ -969,22 +983,22 @@
     "message": "已登出"
   },
   "loggedOutDesc": {
-    "message": "You have been logged out of your account."
+    "message": "您已經登出了您的帳號。"
   },
   "loginExpired": {
     "message": "您的登入會話已過期。"
   },
   "restartRegistration": {
-    "message": "Restart registration"
+    "message": "重新啟動註冊"
   },
   "expiredLink": {
-    "message": "Expired link"
+    "message": "過期連結"
   },
   "pleaseRestartRegistrationOrTryLoggingIn": {
-    "message": "Please restart registration or try logging in."
+    "message": "請重新啟動註冊流程或是重試登入。"
   },
   "youMayAlreadyHaveAnAccount": {
-    "message": "You may already have an account"
+    "message": "您可能已經有帳號"
   },
   "logOutConfirmation": {
     "message": "您確定要登出嗎？"
@@ -1041,10 +1055,10 @@
     "message": "變更主密碼"
   },
   "continueToWebApp": {
-    "message": "Continue to web app?"
+    "message": "前往網頁應用程式嗎？"
   },
   "changeMasterPasswordOnWebConfirmation": {
-    "message": "You can change your master password on the Bitwarden web app."
+    "message": "您可以在 Bitwarden 網頁應用程式上變更主密碼。"
   },
   "fingerprintPhrase": {
     "message": "指紋短語",
@@ -1073,16 +1087,16 @@
     "message": "您的密碼庫已鎖定。請驗證身分以繼續。"
   },
   "yourAccountIsLocked": {
-    "message": "Your account is locked"
+    "message": "您的帳戶已被鎖定。"
   },
   "or": {
-    "message": "or"
+    "message": "或"
   },
   "unlockWithBiometrics": {
-    "message": "Unlock with biometrics"
+    "message": "使用生物辨識解鎖"
   },
   "unlockWithMasterPassword": {
-    "message": "Unlock with master password"
+    "message": "使用主密碼解鎖"
   },
   "unlock": {
     "message": "解鎖"
@@ -1113,7 +1127,7 @@
     "message": "密碼庫逾時時間"
   },
   "vaultTimeout1": {
-    "message": "Timeout"
+    "message": "逾時"
   },
   "vaultTimeoutDesc": {
     "message": "選擇密碼庫何時執行密碼庫逾時動作。"
@@ -1320,7 +1334,7 @@
     "description": "Copy credit card number"
   },
   "copyEmail": {
-    "message": "Copy email"
+    "message": "複製電子郵件地址"
   },
   "copySecurityCode": {
     "message": "複製安全代碼",
@@ -1369,7 +1383,7 @@
     "message": "您可以在 bitwarden.com 網頁版密碼庫購買進階會員資格。現在要前往嗎？"
   },
   "premiumPurchaseAlertV2": {
-    "message": "You can purchase Premium from your account settings on the Bitwarden web app."
+    "message": "您可以在 Bitwarden 網頁應用程式的帳號設定中購買進階版。"
   },
   "premiumCurrentMember": {
     "message": "您目前是進階會員！"
@@ -1393,13 +1407,13 @@
     "message": "密碼歷史記錄"
   },
   "generatorHistory": {
-    "message": "Generator history"
+    "message": "產生器歷史記錄"
   },
   "clearGeneratorHistoryTitle": {
-    "message": "Clear generator history"
+    "message": "清除產生器歷史記錄"
   },
   "cleargGeneratorHistoryDescription": {
-    "message": "If you continue, all entries will be permanently deleted from generator's history. Are you sure you want to continue?"
+    "message": "若繼續，所有產生器曾經產生的記錄會被刪除。您確定要繼續？"
   },
   "clear": {
     "message": "清除",
@@ -1409,13 +1423,13 @@
     "message": "沒有可列出的密碼。"
   },
   "clearHistory": {
-    "message": "Clear history"
+    "message": "清除歷史紀錄"
   },
   "nothingToShow": {
-    "message": "Nothing to show"
+    "message": "沒有可顯示的內容"
   },
   "nothingGeneratedRecently": {
-    "message": "You haven't generated anything recently"
+    "message": "您最近未產生任何密碼"
   },
   "undo": {
     "message": "復原"
@@ -1492,13 +1506,13 @@
     }
   },
   "copySuccessful": {
-    "message": "Copy Successful"
+    "message": "複製成功"
   },
   "errorRefreshingAccessToken": {
-    "message": "Access Token Refresh Error"
+    "message": "存取權杖更新失敗"
   },
   "errorRefreshingAccessTokenDesc": {
-    "message": "No refresh token or API keys found. Please try logging out and logging back in."
+    "message": "未找到存取權杖或 API 密鑰。請重試登出再登入。"
   },
   "help": {
     "message": "說明"
@@ -1588,7 +1602,7 @@
     "description": "ex. Date this password was updated"
   },
   "exportFrom": {
-    "message": "Export from"
+    "message": "匯出自"
   },
   "exportVault": {
     "message": "匯出密碼庫"
@@ -1720,7 +1734,7 @@
     "message": "無效的 PIN 碼。"
   },
   "tooManyInvalidPinEntryAttemptsLoggingOut": {
-    "message": "Too many invalid PIN entry attempts. Logging out."
+    "message": "輸入太多無效 PIN 碼。 正在登出。"
   },
   "unlockWithWindowsHello": {
     "message": "使用 Windows Hello 解鎖"
@@ -1729,7 +1743,7 @@
     "message": "額外的 Windows Hello 設定"
   },
   "unlockWithPolkit": {
-    "message": "Unlock with system authentication"
+    "message": "使用系統驗證解鎖"
   },
   "windowsHelloConsentMessage": {
     "message": "驗證 Bitwarden。"
@@ -1747,7 +1761,7 @@
     "message": "啟動應用程式時詢問 Windows Hello"
   },
   "autoPromptPolkit": {
-    "message": "Ask for system authentication on launch"
+    "message": "在啟動時詢問系統驗證"
   },
   "autoPromptTouchId": {
     "message": "啟動應用程式時要求 Touch ID"
@@ -1759,7 +1773,7 @@
     "message": "為提升安全，建議使用。"
   },
   "lockWithMasterPassOnRestart1": {
-    "message": "Lock with master password on restart"
+    "message": "重啟後使用主密碼鎖定"
   },
   "deleteAccount": {
     "message": "刪除帳戶"
@@ -1771,7 +1785,7 @@
     "message": "刪除您的帳戶是永久性的。並且無法復原。"
   },
   "cannotDeleteAccount": {
-    "message": "Cannot delete account"
+    "message": "無法刪除帳號"
   },
   "cannotDeleteAccountDesc": {
     "message": "This action cannot be completed because your account is owned by an organization. Contact your organization administrator for additional details."
@@ -2908,10 +2922,10 @@
     "message": "裝置需要取得核准。請在下面選擇一個核准選項："
   },
   "deviceApprovalRequiredV2": {
-    "message": "Device approval required"
+    "message": "需要核准裝置"
   },
   "selectAnApprovalOptionBelow": {
-    "message": "Select an approval option below"
+    "message": "選擇下面的一個核准選項"
   },
   "rememberThisDevice": {
     "message": "記住這個裝置"
@@ -2966,7 +2980,7 @@
     "message": "缺少使用者電子郵件地址"
   },
   "activeUserEmailNotFoundLoggingYouOut": {
-    "message": "Active user email not found. Logging you out."
+    "message": "未找到使用中帳號的電子郵件。正在將您登出。"
   },
   "deviceTrusted": {
     "message": "裝置已信任"
@@ -3072,7 +3086,7 @@
     "message": "子選單"
   },
   "toggleSideNavigation": {
-    "message": "Toggle side navigation"
+    "message": "切換側邊欄"
   },
   "skipToContent": {
     "message": "跳至內容"
@@ -3130,16 +3144,16 @@
     }
   },
   "duoHealthCheckResultsInNullAuthUrlError": {
-    "message": "Error connecting with the Duo service. Use a different two-step login method or contact Duo for assistance."
+    "message": "連接到 Duo 服務時發生錯誤。使用不同的兩階段認證或聯繫 Duo 來獲得支援。"
   },
   "launchDuoAndFollowStepsToFinishLoggingIn": {
-    "message": "Launch Duo and follow the steps to finish logging in."
+    "message": "啟動 Duo 並依照步驟完成登入。"
   },
   "duoRequiredByOrgForAccount": {
-    "message": "Duo two-step login is required for your account."
+    "message": "您的帳號要求使用 Duo 兩步驟驗證登入。"
   },
   "launchDuo": {
-    "message": "Launch Duo in Browser"
+    "message": "使用瀏覽器啟動 Duo"
   },
   "importFormatError": {
     "message": "資料格式不正確。請檢查匯入檔案後再試一次。"
@@ -3154,7 +3168,7 @@
     "message": "檔案密碼無效，請使用您當初匯出檔案時輸入的密碼。"
   },
   "destination": {
-    "message": "Destination"
+    "message": "目的"
   },
   "learnAboutImportOptions": {
     "message": "瞭解更多匯入選項"
@@ -3293,7 +3307,7 @@
     "description": "Label indicating the most common import formats"
   },
   "success": {
-    "message": "Success"
+    "message": "成功"
   },
   "troubleshooting": {
     "message": "疑難排解"
@@ -3311,13 +3325,13 @@
     "message": "密碼金鑰已移除"
   },
   "errorAssigningTargetCollection": {
-    "message": "Error assigning target collection."
+    "message": "指定目標集合時發生錯誤。"
   },
   "errorAssigningTargetFolder": {
-    "message": "Error assigning target folder."
+    "message": "指定目標資料夾時發生錯誤。"
   },
   "viewItemsIn": {
-    "message": "View items in $NAME$",
+    "message": "檢視 $NAME$ 中的項目",
     "description": "Button to view the contents of a folder or collection",
     "placeholders": {
       "name": {
@@ -3327,7 +3341,7 @@
     }
   },
   "backTo": {
-    "message": "Back to $NAME$",
+    "message": "回到 $NAME$",
     "description": "Navigate back to a previous folder or collection",
     "placeholders": {
       "name": {
@@ -3337,11 +3351,11 @@
     }
   },
   "back": {
-    "message": "Back",
+    "message": "返回",
     "description": "Button text to navigate back"
   },
   "removeItem": {
-    "message": "Remove $NAME$",
+    "message": "移除 $NAME$",
     "description": "Remove a selected option, such as a folder or collection",
     "placeholders": {
       "name": {
@@ -3351,67 +3365,91 @@
     }
   },
   "data": {
-    "message": "Data"
+    "message": "資料"
   },
   "fileSends": {
-    "message": "File Sends"
+    "message": "檔案 Send"
   },
   "textSends": {
-    "message": "Text Sends"
+    "message": "文字 Sends"
   },
   "ssoError": {
-    "message": "No free ports could be found for the sso login."
+    "message": "無法找到可用於 SSO 登入的空閒連接埠。"
+  },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "需要 PIN 碼或密碼解鎖才能使用生物辨識解鎖。"
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "生物辨識解鎖暫時無法使用。"
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "由於系統檔案不正確，生物辨識解鎖無法使用。"
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "由於系統檔案不正確，生物辨識解鎖無法使用。"
+  },
+  "biometricsStatusHelptextNotEnabledLocally": {
+    "message": "由於未在 Bitwarden 桌面應用程式的 $EMAIL$ 帳號上啟動，生物辨識解鎖無法使用。",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "基於不明原因，生物辨識解鎖無法使用。"
   },
   "authorize": {
-    "message": "Authorize"
+    "message": "授權"
   },
   "deny": {
-    "message": "Deny"
+    "message": "拒絕"
   },
   "sshkeyApprovalTitle": {
-    "message": "Confirm SSH key usage"
+    "message": "確認 SSH 密鑰使用"
   },
   "sshkeyApprovalMessageInfix": {
-    "message": "is requesting access to"
+    "message": "正在請求存取權限到"
   },
   "unknownApplication": {
-    "message": "An application"
+    "message": "應用程式"
   },
   "sshKeyPasswordUnsupported": {
-    "message": "Importing password protected SSH keys is not yet supported"
+    "message": "匯入密碼保護的 SSH 密鑰暫時還未支援"
   },
   "invalidSshKey": {
-    "message": "The SSH key is invalid"
+    "message": "SSH 密鑰不正確"
   },
   "sshKeyTypeUnsupported": {
-    "message": "The SSH key type is not supported"
+    "message": "SSH 密鑰類型不支援"
   },
   "importSshKeyFromClipboard": {
-    "message": "Import key from clipboard"
+    "message": "從剪貼簿中匯入密鑰"
   },
   "sshKeyPasted": {
-    "message": "SSH key imported successfully"
+    "message": "SSH 密鑰成功匯入"
   },
   "fileSavedToDevice": {
-    "message": "File saved to device. Manage from your device downloads."
+    "message": "檔案已儲存到裝置。在您的裝置上管理下載檔案。"
   },
   "importantNotice": {
-    "message": "Important notice"
+    "message": "重要通知"
   },
   "setupTwoStepLogin": {
-    "message": "Set up two-step login"
+    "message": "啟動兩階段登入"
   },
   "newDeviceVerificationNoticeContentPage1": {
-    "message": "Bitwarden will send a code to your account email to verify logins from new devices starting in February 2025."
+    "message": "從 2025 年 2 月開始，Bitwarden 會傳送代碼到您的帳號電子郵件中來驗證新裝置的登入。"
   },
   "newDeviceVerificationNoticeContentPage2": {
-    "message": "You can set up two-step login as an alternative way to protect your account or change your email to one you can access."
+    "message": "您可以啟動兩階段認證來保護您的帳號或更改您可以存取的電子郵件位址。"
   },
   "remindMeLater": {
-    "message": "Remind me later"
+    "message": "稍後再提醒我"
   },
   "newDeviceVerificationNoticePageOneFormContent": {
-    "message": "Do you have reliable access to your email, $EMAIL$?",
+    "message": "您可以存取您的電子郵件位址 $EMAIL$ 嗎？",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3420,15 +3458,15 @@
     }
   },
   "newDeviceVerificationNoticePageOneEmailAccessNo": {
-    "message": "No, I do not"
+    "message": "不，我不行"
   },
   "newDeviceVerificationNoticePageOneEmailAccessYes": {
-    "message": "Yes, I can reliably access my email"
+    "message": "是，我可以存取我的電子郵件位址"
   },
   "turnOnTwoStepLogin": {
-    "message": "Turn on two-step login"
+    "message": "啟動兩階段登入"
   },
   "changeAcctEmail": {
-    "message": "Change account email"
+    "message": "更改帳號電子郵件位址"
   }
 }

From fa61928daf02796c1ebe34bd7c1316df0cc0e7f2 Mon Sep 17 00:00:00 2001
From: Nick Krantz <125900171+nick-livefront@users.noreply.github.com>
Date: Fri, 10 Jan 2025 08:58:47 -0600
Subject: [PATCH 035/150] [CL] add ToastVariant to CL barrel file (#12804)

---
 libs/angular/src/directives/copy-click.directive.ts | 3 +--
 libs/components/src/toast/index.ts                  | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/angular/src/directives/copy-click.directive.ts b/libs/angular/src/directives/copy-click.directive.ts
index cb346ebf8d..ece867c09f 100644
--- a/libs/angular/src/directives/copy-click.directive.ts
+++ b/libs/angular/src/directives/copy-click.directive.ts
@@ -4,8 +4,7 @@ import { Directive, HostListener, Input } from "@angular/core";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { ToastService } from "@bitwarden/components";
-import { ToastVariant } from "@bitwarden/components/src/toast/toast.component";
+import { ToastService, ToastVariant } from "@bitwarden/components";
 
 @Directive({
   selector: "[appCopyClick]",
diff --git a/libs/components/src/toast/index.ts b/libs/components/src/toast/index.ts
index f0b5540219..5afed111c0 100644
--- a/libs/components/src/toast/index.ts
+++ b/libs/components/src/toast/index.ts
@@ -1,2 +1,3 @@
 export * from "./toast.module";
 export * from "./toast.service";
+export type { ToastVariant } from "./toast.component";

From db84ccf935a1069234846b8ba92c72e8b293ac57 Mon Sep 17 00:00:00 2001
From: Oscar Hinton <Hinton@users.noreply.github.com>
Date: Fri, 10 Jan 2025 16:37:34 +0100
Subject: [PATCH 036/150] [PM-16838] Forbid imports containing /src/ (#12744)

Forbids bad imports containing /src/.
---
 .eslintrc.json                                | 173 +++---------------
 .../extension-anon-layout-wrapper.stories.ts  |   2 +
 .../popup/two-factor-auth-duo.component.ts    |  12 ++
 .../popup/two-factor-auth-email.component.ts  |  14 ++
 .../auth/popup/two-factor-auth.component.ts   |   2 +
 .../src/autofill/content/notification-bar.ts  |   2 +
 apps/browser/src/autofill/types/index.ts      |   2 +
 .../foreground-vault-timeout.service.ts       |   6 +-
 .../vault-header/vault-header-v2.component.ts |   2 +
 .../vault-password-history-v2.component.ts    |   2 +
 .../vault-v2/view-v2/view-v2.component.ts     |   4 +
 .../vault-popup-autofill.service.spec.ts      |   2 +
 .../services/vault-popup-autofill.service.ts  |   2 +
 .../vault-popup-items.service.spec.ts         |   2 +
 .../popup/settings/appearance-v2.component.ts |   6 +
 .../popup/settings/folders-v2.component.ts    |   6 +
 .../src/commands/bw-credential-create.ts      |   1 +
 .../src/commands/bw-credential-update.ts      |   1 +
 .../src/ipc.service.ts                        |   2 +
 .../src/native-message.service.ts             |   8 +
 .../src/auth/two-factor-auth-duo.component.ts |   2 +
 .../src/auth/two-factor-auth.component.ts     |  28 +++
 .../components/approve-ssh-request.ts         |   2 +-
 .../device-approval/approve.command.ts        |   2 +
 .../device-approval/deny-all.command.ts       |   2 +
 .../device-approval/deny.command.ts           |   2 +
 .../overview/overview.module.ts               |   2 +
 .../guards/project-access.guard.spec.ts       |   2 +
 .../service-account-access.guard.spec.ts      |   2 +
 .../src/services/jslib-services.module.ts     |   2 +
 ...w-device-verification-notice.guard.spec.ts |   2 +
 .../new-device-verification-notice.guard.ts   |   2 +
 .../services/vault-filter.service.ts          |   2 +
 .../anon-layout-wrapper.stories.ts            |   3 +-
 .../anon-layout/anon-layout.component.ts      |   6 +
 .../anon-layout/anon-layout.stories.ts        |   4 +
 .../input-password.component.ts               |   4 +
 .../input-password/input-password.stories.ts  |   3 +-
 .../registration-start.stories.ts             |   3 +-
 .../set-password-jit.component.ts             |   2 +
 .../models/domain/user-decryption-options.ts  |   2 +
 .../login-email/login-email.service.ts        |   2 +
 .../login-strategy.service.ts                 |   2 +
 .../user-decryption-options.service.ts        |   2 +
 .../webauthn-rotate-credential.request.ts     |   2 +
 .../auth/services/anonymous-hub.service.ts    |   2 +
 .../src/auth/services/auth.service.spec.ts    |   2 +
 libs/common/src/auth/services/auth.service.ts |   2 +
 .../device-trust.service.implementation.ts    |   2 +
 .../services/device-trust.service.spec.ts     |   4 +
 .../services/key-connector.service.spec.ts    |   2 +
 ...-enrollment.service.implementation.spec.ts |   4 +
 ...reset-enrollment.service.implementation.ts |   2 +
 .../user-verification.service.spec.ts         |   2 +
 .../user-verification.service.ts              |   2 +
 .../default-process-reload.service.ts         |   2 +
 libs/common/src/platform/misc/utils.ts        |   2 +
 .../platform/models/domain/enc-string.spec.ts |   2 +
 .../platform/services/container.service.ts    |   2 +
 .../user-auto-unlock-key.service.spec.ts      |   2 +
 .../services/user-auto-unlock-key.service.ts  |   2 +
 .../src/platform/sync/default-sync.service.ts |   6 +
 .../vault-timeout-settings.service.spec.ts    |   2 +
 .../vault-timeout-settings.service.ts         |   2 +
 .../vault/models/domain/attachment.spec.ts    |   2 +
 .../src/vault/models/domain/cipher.spec.ts    |   2 +
 .../src/vault/services/cipher.service.spec.ts |   2 +
 .../src/vault/services/cipher.service.ts      |   2 +
 .../services/folder/folder.service.spec.ts    |   2 +
 .../vault/services/folder/folder.service.ts   |   2 +
 .../src/async-actions/in-forms.stories.ts     |   2 +
 .../src/checkbox/checkbox.stories.ts          |   2 +
 .../src/chip-select/chip-select.component.ts  |   2 +
 .../src/abstractions/key.service.ts           |  16 ++
 .../src/biometrics/biometric-state.service.ts |   6 +
 .../src/biometrics/biometric.state.ts         |   6 +
 .../src/kdf-config.service.spec.ts            |   4 +
 libs/key-management/src/kdf-config.service.ts |   4 +
 libs/key-management/src/key.service.spec.ts   |  42 +++++
 libs/key-management/src/key.service.ts        |  58 ++++++
 libs/key-management/src/models/kdf-config.ts  |   2 +
 .../src/cipher-form/cipher-form.stories.ts    |   3 +-
 .../custom-fields.component.spec.ts           |   2 +
 .../login-details-section.component.spec.ts   |   2 +
 .../login-credentials-view.component.spec.ts  |   4 +
 .../login-credentials-view.component.ts       |   2 +
 .../view-identity-sections.component.spec.ts  |   2 +
 .../password-history-view.component.spec.ts   |   2 +
 .../password-reprompt.service.spec.ts         |   2 +
 89 files changed, 406 insertions(+), 153 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index c606b8f933..c10904c867 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -141,8 +141,7 @@
               }
             ]
           }
-        ],
-        "no-restricted-imports": ["error", { "patterns": ["src/**/*"] }]
+        ]
       }
     },
     {
@@ -164,147 +163,6 @@
         "tailwindcss/no-contradicting-classname": "error"
       }
     },
-    {
-      "files": ["libs/admin-console/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          { "patterns": ["@bitwarden/admin-console/*", "src/**/*"] }
-        ]
-      }
-    },
-    {
-      "files": ["libs/angular/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": ["error", { "patterns": ["@bitwarden/angular/*", "src/**/*"] }]
-      }
-    },
-    {
-      "files": ["libs/auth/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": ["error", { "patterns": ["@bitwarden/auth/*", "src/**/*"] }]
-      }
-    },
-    {
-      "files": ["libs/billing/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": ["error", { "patterns": ["@bitwarden/billing/*", "src/**/*"] }]
-      }
-    },
-    {
-      "files": ["libs/common/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": ["error", { "patterns": ["@bitwarden/common/*", "src/**/*"] }]
-      }
-    },
-    {
-      "files": ["libs/components/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          { "patterns": ["@bitwarden/components/*", "src/**/*", "@bitwarden/angular/*"] }
-        ]
-      }
-    },
-    {
-      "files": ["libs/tools/generator/components/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          { "patterns": ["@bitwarden/generator-components/*", "src/**/*"] }
-        ]
-      }
-    },
-    {
-      "files": ["libs/tools/generator/core/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          { "patterns": ["@bitwarden/generator-core/*", "src/**/*"] }
-        ]
-      }
-    },
-    {
-      "files": ["libs/tools/generator/extensions/history/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          { "patterns": ["@bitwarden/generator-history/*", "src/**/*"] }
-        ]
-      }
-    },
-    {
-      "files": ["libs/tools/generator/extensions/legacy/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          { "patterns": ["@bitwarden/generator-legacy/*", "src/**/*"] }
-        ]
-      }
-    },
-    {
-      "files": ["libs/tools/generator/extensions/navigation/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          { "patterns": ["@bitwarden/generator-navigation/*", "src/**/*"] }
-        ]
-      }
-    },
-    {
-      "files": ["libs/tools/export/vault-export/vault-export-core/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          { "patterns": ["@bitwarden/vault-export-core/*", "src/**/*"] }
-        ]
-      }
-    },
-    {
-      "files": ["libs/tools/export/vault-export/vault-export-ui/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          { "patterns": ["@bitwarden/vault-export-ui/*", "src/**/*"] }
-        ]
-      }
-    },
-    {
-      "files": ["libs/importer/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": ["error", { "patterns": ["@bitwarden/importer/*", "src/**/*"] }]
-      }
-    },
-    {
-      "files": ["libs/node/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": ["error", { "patterns": ["@bitwarden/node/*", "src/**/*"] }]
-      }
-    },
-    {
-      "files": ["libs/platform/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": ["error", { "patterns": ["@bitwarden/platform/*", "src/**/*"] }]
-      }
-    },
-    {
-      "files": ["libs/tools/send/send-ui/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": ["error", { "patterns": ["@bitwarden/send-ui/*", "src/**/*"] }]
-      }
-    },
-    {
-      "files": ["libs/tools/card/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": ["error", { "patterns": ["@bitwarden/tools-card/*", "src/**/*"] }]
-      }
-    },
-    {
-      "files": ["libs/vault/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": ["error", { "patterns": ["@bitwarden/vault/*", "src/**/*"] }]
-      }
-    },
     {
       "files": ["apps/browser/src/**/*.ts", "libs/**/*.ts"],
       "excludedFiles": [
@@ -344,10 +202,30 @@
         ]
       }
     },
+    {
+      "files": ["**/src/**/*.ts"],
+      "excludedFiles": ["**/platform/**/*.ts"],
+      "rules": {
+        "no-restricted-imports": [
+          "error",
+          {
+            "patterns": [
+              "**/platform/**/internal", // General internal pattern
+              // All features that have been converted to barrel files
+              "**/platform/messaging/**",
+              "**/src/**/*" // Prevent relative imports across libs.
+            ]
+          }
+        ]
+      }
+    },
     {
       "files": ["bitwarden_license/bit-common/src/**/*.ts"],
       "rules": {
-        "no-restricted-imports": ["error", { "patterns": ["@bitwarden/bit-common/*", "src/**/*"] }]
+        "no-restricted-imports": [
+          "error",
+          { "patterns": ["@bitwarden/bit-common/*", "**/src/**/*"] }
+        ]
       }
     },
     {
@@ -357,7 +235,12 @@
         "no-restricted-imports": [
           "error",
           {
-            "patterns": ["biwarden_license/**", "@bitwarden/bit-common/*", "@bitwarden/bit-web/*"]
+            "patterns": [
+              "biwarden_license/**",
+              "@bitwarden/bit-common/*",
+              "@bitwarden/bit-web/*",
+              "**/src/**/*"
+            ]
           }
         ],
         // Catches dynamic imports, e.g. in routing modules where modules are lazy-loaded
diff --git a/apps/browser/src/auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper.stories.ts b/apps/browser/src/auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper.stories.ts
index ad7e6f6736..841eefda0a 100644
--- a/apps/browser/src/auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper.stories.ts
+++ b/apps/browser/src/auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper.stories.ts
@@ -25,6 +25,8 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { UserId } from "@bitwarden/common/types/guid";
 import { ButtonModule, I18nMockService } from "@bitwarden/components";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { RegistrationCheckEmailIcon } from "../../../../../../libs/auth/src/angular/icons/registration-check-email.icon";
 import { PopupRouterCacheService } from "../../../platform/popup/view-cache/popup-router-cache.service";
 import { AccountSwitcherService } from "../account-switching/services/account-switcher.service";
diff --git a/apps/browser/src/auth/popup/two-factor-auth-duo.component.ts b/apps/browser/src/auth/popup/two-factor-auth-duo.component.ts
index 0917b2703c..53aedc7a5f 100644
--- a/apps/browser/src/auth/popup/two-factor-auth-duo.component.ts
+++ b/apps/browser/src/auth/popup/two-factor-auth-duo.component.ts
@@ -13,11 +13,23 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { ToastService } from "@bitwarden/components";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { AsyncActionsModule } from "../../../../../libs/components/src/async-actions";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { ButtonModule } from "../../../../../libs/components/src/button";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { FormFieldModule } from "../../../../../libs/components/src/form-field";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { LinkModule } from "../../../../../libs/components/src/link";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { I18nPipe } from "../../../../../libs/components/src/shared/i18n.pipe";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { TypographyModule } from "../../../../../libs/components/src/typography";
 import { ZonedMessageListenerService } from "../../platform/browser/zoned-message-listener.service";
 
diff --git a/apps/browser/src/auth/popup/two-factor-auth-email.component.ts b/apps/browser/src/auth/popup/two-factor-auth-email.component.ts
index b6211bba05..723152adfa 100644
--- a/apps/browser/src/auth/popup/two-factor-auth-email.component.ts
+++ b/apps/browser/src/auth/popup/two-factor-auth-email.component.ts
@@ -6,12 +6,26 @@ import { ReactiveFormsModule, FormsModule } from "@angular/forms";
 import { TwoFactorAuthEmailComponent as TwoFactorAuthEmailBaseComponent } from "@bitwarden/angular/auth/components/two-factor-auth/two-factor-auth-email.component";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { AsyncActionsModule } from "../../../../../libs/components/src/async-actions";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { ButtonModule } from "../../../../../libs/components/src/button";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { DialogService } from "../../../../../libs/components/src/dialog";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { FormFieldModule } from "../../../../../libs/components/src/form-field";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { LinkModule } from "../../../../../libs/components/src/link";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { I18nPipe } from "../../../../../libs/components/src/shared/i18n.pipe";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { TypographyModule } from "../../../../../libs/components/src/typography";
 import BrowserPopupUtils from "../../platform/popup/browser-popup-utils";
 
diff --git a/apps/browser/src/auth/popup/two-factor-auth.component.ts b/apps/browser/src/auth/popup/two-factor-auth.component.ts
index 3cb8211859..f22bbbe202 100644
--- a/apps/browser/src/auth/popup/two-factor-auth.component.ts
+++ b/apps/browser/src/auth/popup/two-factor-auth.component.ts
@@ -37,6 +37,8 @@ import {
   ToastService,
 } from "@bitwarden/components";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import {
   LoginStrategyServiceAbstraction,
   LoginEmailServiceAbstraction,
diff --git a/apps/browser/src/autofill/content/notification-bar.ts b/apps/browser/src/autofill/content/notification-bar.ts
index b260bfef63..24b63d6b9e 100644
--- a/apps/browser/src/autofill/content/notification-bar.ts
+++ b/apps/browser/src/autofill/content/notification-bar.ts
@@ -1,5 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { ServerConfig } from "../../../../../libs/common/src/platform/abstractions/config/server-config";
 import {
   AddLoginMessageData,
diff --git a/apps/browser/src/autofill/types/index.ts b/apps/browser/src/autofill/types/index.ts
index a14ef1330c..606b36e1fb 100644
--- a/apps/browser/src/autofill/types/index.ts
+++ b/apps/browser/src/autofill/types/index.ts
@@ -1,4 +1,6 @@
 import { Region } from "@bitwarden/common/platform/abstractions/environment.service";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { VaultTimeoutAction } from "@bitwarden/common/src/enums/vault-timeout-action.enum";
 import { VaultTimeout } from "@bitwarden/common/types/vault-timeout.type";
 import { CipherType } from "@bitwarden/common/vault/enums";
diff --git a/apps/browser/src/services/vault-timeout/foreground-vault-timeout.service.ts b/apps/browser/src/services/vault-timeout/foreground-vault-timeout.service.ts
index 6270b3503b..0d49595d2e 100644
--- a/apps/browser/src/services/vault-timeout/foreground-vault-timeout.service.ts
+++ b/apps/browser/src/services/vault-timeout/foreground-vault-timeout.service.ts
@@ -1,8 +1,8 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { VaultTimeoutService as BaseVaultTimeoutService } from "@bitwarden/common/src/abstractions/vault-timeout/vault-timeout.service";
-import { MessagingService } from "@bitwarden/common/src/platform/abstractions/messaging.service";
-import { UserId } from "@bitwarden/common/src/types/guid";
+import { VaultTimeoutService as BaseVaultTimeoutService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout.service";
+import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
+import { UserId } from "@bitwarden/common/types/guid";
 
 export class ForegroundVaultTimeoutService implements BaseVaultTimeoutService {
   constructor(protected messagingService: MessagingService) {}
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.ts
index 8ec04045e6..3b9dc9a164 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.ts
@@ -8,6 +8,8 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { DisclosureTriggerForDirective, IconButtonModule } from "@bitwarden/components";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { DisclosureComponent } from "../../../../../../../../libs/components/src/disclosure/disclosure.component";
 import { runInsideAngular } from "../../../../../platform/browser/run-inside-angular.operator";
 import { VaultPopupListFiltersService } from "../../../../../vault/popup/services/vault-popup-list-filters.service";
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-password-history-v2/vault-password-history-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-password-history-v2/vault-password-history-v2.component.ts
index c8f590ced5..67e069d388 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-password-history-v2/vault-password-history-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-password-history-v2/vault-password-history-v2.component.ts
@@ -12,6 +12,8 @@ import { UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { PasswordHistoryViewComponent } from "../../../../../../../../libs/vault/src/components/password-history-view/password-history-view.component";
 import { PopOutComponent } from "../../../../../platform/popup/components/pop-out.component";
 import { PopupHeaderComponent } from "../../../../../platform/popup/layout/popup-header.component";
diff --git a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts
index 55b59c087c..6532fb004c 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts
@@ -37,7 +37,11 @@ import {
 } from "@bitwarden/components";
 import { CopyCipherFieldService } from "@bitwarden/vault";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { PremiumUpgradePromptService } from "../../../../../../../../libs/common/src/vault/abstractions/premium-upgrade-prompt.service";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { CipherViewComponent } from "../../../../../../../../libs/vault/src/cipher-view";
 import { BrowserApi } from "../../../../../platform/browser/browser-api";
 import BrowserPopupUtils from "../../../../../platform/popup/browser-popup-utils";
diff --git a/apps/browser/src/vault/popup/services/vault-popup-autofill.service.spec.ts b/apps/browser/src/vault/popup/services/vault-popup-autofill.service.spec.ts
index 25a7d7594a..ae8d466665 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-autofill.service.spec.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-autofill.service.spec.ts
@@ -20,6 +20,8 @@ import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
 import { ToastService } from "@bitwarden/components";
 import { PasswordRepromptService } from "@bitwarden/vault";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { InlineMenuFieldQualificationService } from "../../../../../browser/src/autofill/services/inline-menu-field-qualification.service";
 import {
   AutoFillOptions,
diff --git a/apps/browser/src/vault/popup/services/vault-popup-autofill.service.ts b/apps/browser/src/vault/popup/services/vault-popup-autofill.service.ts
index e4863d5ee4..586e918281 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-autofill.service.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-autofill.service.ts
@@ -26,6 +26,8 @@ import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view
 import { ToastService } from "@bitwarden/components";
 import { PasswordRepromptService } from "@bitwarden/vault";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { InlineMenuFieldQualificationService } from "../../../../../browser/src/autofill/services/inline-menu-field-qualification.service";
 import {
   AutofillService,
diff --git a/apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts b/apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts
index ffa09aeb55..528aae111c 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts
@@ -15,6 +15,8 @@ import { VaultSettingsService } from "@bitwarden/common/vault/abstractions/vault
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { InlineMenuFieldQualificationService } from "../../../../../browser/src/autofill/services/inline-menu-field-qualification.service";
 import { BrowserApi } from "../../../platform/browser/browser-api";
 
diff --git a/apps/browser/src/vault/popup/settings/appearance-v2.component.ts b/apps/browser/src/vault/popup/settings/appearance-v2.component.ts
index 7f300a508a..3aab9f935e 100644
--- a/apps/browser/src/vault/popup/settings/appearance-v2.component.ts
+++ b/apps/browser/src/vault/popup/settings/appearance-v2.component.ts
@@ -16,8 +16,14 @@ import { ThemeType } from "@bitwarden/common/platform/enums";
 import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
 import { BadgeModule, CheckboxModule, Option } from "@bitwarden/components";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { CardComponent } from "../../../../../../libs/components/src/card/card.component";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { FormFieldModule } from "../../../../../../libs/components/src/form-field/form-field.module";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { SelectModule } from "../../../../../../libs/components/src/select/select.module";
 import { PopOutComponent } from "../../../platform/popup/components/pop-out.component";
 import { PopupCompactModeService } from "../../../platform/popup/layout/popup-compact-mode.service";
diff --git a/apps/browser/src/vault/popup/settings/folders-v2.component.ts b/apps/browser/src/vault/popup/settings/folders-v2.component.ts
index b1db949f2e..8abc3f906c 100644
--- a/apps/browser/src/vault/popup/settings/folders-v2.component.ts
+++ b/apps/browser/src/vault/popup/settings/folders-v2.component.ts
@@ -15,8 +15,14 @@ import {
 } from "@bitwarden/components";
 import { VaultIcons } from "@bitwarden/vault";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { ItemGroupComponent } from "../../../../../../libs/components/src/item/item-group.component";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { ItemModule } from "../../../../../../libs/components/src/item/item.module";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { NoItemsModule } from "../../../../../../libs/components/src/no-items/no-items.module";
 import { PopOutComponent } from "../../../platform/popup/components/pop-out.component";
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-create.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-create.ts
index 2f8e61c68a..8d2d734677 100644
--- a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-create.ts
+++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-create.ts
@@ -7,6 +7,7 @@ import { hideBin } from "yargs/helpers";
 
 import { NativeMessagingVersion } from "@bitwarden/common/enums";
 
+// eslint-disable-next-line no-restricted-imports
 import { CredentialCreatePayload } from "../../../src/models/native-messaging/encrypted-message-payloads/credential-create-payload";
 import { LogUtils } from "../log-utils";
 import NativeMessageService from "../native-message.service";
diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-update.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-update.ts
index 4f17bb5658..93598bf9ee 100644
--- a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-update.ts
+++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-update.ts
@@ -7,6 +7,7 @@ import { hideBin } from "yargs/helpers";
 
 import { NativeMessagingVersion } from "@bitwarden/common/enums";
 
+// eslint-disable-next-line no-restricted-imports
 import { CredentialUpdatePayload } from "../../../src/models/native-messaging/encrypted-message-payloads/credential-update-payload";
 import { LogUtils } from "../log-utils";
 import NativeMessageService from "../native-message.service";
diff --git a/apps/desktop/native-messaging-test-runner/src/ipc.service.ts b/apps/desktop/native-messaging-test-runner/src/ipc.service.ts
index ee17e672a7..8513363956 100644
--- a/apps/desktop/native-messaging-test-runner/src/ipc.service.ts
+++ b/apps/desktop/native-messaging-test-runner/src/ipc.service.ts
@@ -4,7 +4,9 @@ import { homedir } from "os";
 
 import * as NodeIPC from "node-ipc";
 
+// eslint-disable-next-line no-restricted-imports
 import { MessageCommon } from "../../src/models/native-messaging/message-common";
+// eslint-disable-next-line no-restricted-imports
 import { UnencryptedMessageResponse } from "../../src/models/native-messaging/unencrypted-message-response";
 
 import Deferred from "./deferred";
diff --git a/apps/desktop/native-messaging-test-runner/src/native-message.service.ts b/apps/desktop/native-messaging-test-runner/src/native-message.service.ts
index cd84504c63..94fdde026b 100644
--- a/apps/desktop/native-messaging-test-runner/src/native-message.service.ts
+++ b/apps/desktop/native-messaging-test-runner/src/native-message.service.ts
@@ -9,13 +9,21 @@ import { ConsoleLogService } from "@bitwarden/common/platform/services/console-l
 import { EncryptServiceImplementation } from "@bitwarden/common/platform/services/cryptography/encrypt.service.implementation";
 import { NodeCryptoFunctionService } from "@bitwarden/node/services/node-crypto-function.service";
 
+// eslint-disable-next-line no-restricted-imports
 import { DecryptedCommandData } from "../../src/models/native-messaging/decrypted-command-data";
+// eslint-disable-next-line no-restricted-imports
 import { EncryptedMessage } from "../../src/models/native-messaging/encrypted-message";
+// eslint-disable-next-line no-restricted-imports
 import { CredentialCreatePayload } from "../../src/models/native-messaging/encrypted-message-payloads/credential-create-payload";
+// eslint-disable-next-line no-restricted-imports
 import { CredentialUpdatePayload } from "../../src/models/native-messaging/encrypted-message-payloads/credential-update-payload";
+// eslint-disable-next-line no-restricted-imports
 import { EncryptedMessageResponse } from "../../src/models/native-messaging/encrypted-message-response";
+// eslint-disable-next-line no-restricted-imports
 import { MessageCommon } from "../../src/models/native-messaging/message-common";
+// eslint-disable-next-line no-restricted-imports
 import { UnencryptedMessage } from "../../src/models/native-messaging/unencrypted-message";
+// eslint-disable-next-line no-restricted-imports
 import { UnencryptedMessageResponse } from "../../src/models/native-messaging/unencrypted-message-response";
 
 import IPCService, { IPCOptions } from "./ipc.service";
diff --git a/apps/desktop/src/auth/two-factor-auth-duo.component.ts b/apps/desktop/src/auth/two-factor-auth-duo.component.ts
index 72137dc536..c238b753b6 100644
--- a/apps/desktop/src/auth/two-factor-auth-duo.component.ts
+++ b/apps/desktop/src/auth/two-factor-auth-duo.component.ts
@@ -21,6 +21,8 @@ import {
   TypographyModule,
 } from "@bitwarden/components";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { TwoFactorAuthDuoComponent as TwoFactorAuthDuoBaseComponent } from "../../../../libs/angular/src/auth/components/two-factor-auth/two-factor-auth-duo.component";
 
 const BroadcasterSubscriptionId = "TwoFactorComponent";
diff --git a/apps/desktop/src/auth/two-factor-auth.component.ts b/apps/desktop/src/auth/two-factor-auth.component.ts
index 29271b565c..9e0898c39e 100644
--- a/apps/desktop/src/auth/two-factor-auth.component.ts
+++ b/apps/desktop/src/auth/two-factor-auth.component.ts
@@ -4,19 +4,47 @@ import { Component } from "@angular/core";
 import { ReactiveFormsModule } from "@angular/forms";
 import { RouterLink } from "@angular/router";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { TwoFactorAuthAuthenticatorComponent } from "../../../../libs/angular/src/auth/components/two-factor-auth/two-factor-auth-authenticator.component";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { TwoFactorAuthEmailComponent } from "../../../../libs/angular/src/auth/components/two-factor-auth/two-factor-auth-email.component";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { TwoFactorAuthWebAuthnComponent } from "../../../../libs/angular/src/auth/components/two-factor-auth/two-factor-auth-webauthn.component";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { TwoFactorAuthYubikeyComponent } from "../../../../libs/angular/src/auth/components/two-factor-auth/two-factor-auth-yubikey.component";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { TwoFactorAuthComponent as BaseTwoFactorAuthComponent } from "../../../../libs/angular/src/auth/components/two-factor-auth/two-factor-auth.component";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { TwoFactorOptionsComponent } from "../../../../libs/angular/src/auth/components/two-factor-auth/two-factor-options.component";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { JslibModule } from "../../../../libs/angular/src/jslib.module";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { AsyncActionsModule } from "../../../../libs/components/src/async-actions";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { ButtonModule } from "../../../../libs/components/src/button";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { CheckboxModule } from "../../../../libs/components/src/checkbox";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { FormFieldModule } from "../../../../libs/components/src/form-field";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { LinkModule } from "../../../../libs/components/src/link";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { I18nPipe } from "../../../../libs/components/src/shared/i18n.pipe";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { TypographyModule } from "../../../../libs/components/src/typography";
 
 import { TwoFactorAuthDuoComponent } from "./two-factor-auth-duo.component";
diff --git a/apps/desktop/src/platform/components/approve-ssh-request.ts b/apps/desktop/src/platform/components/approve-ssh-request.ts
index 62200962dc..0443034f55 100644
--- a/apps/desktop/src/platform/components/approve-ssh-request.ts
+++ b/apps/desktop/src/platform/components/approve-ssh-request.ts
@@ -10,8 +10,8 @@ import {
   DialogModule,
   FormFieldModule,
   IconButtonModule,
+  DialogService,
 } from "@bitwarden/components";
-import { DialogService } from "@bitwarden/components/src/dialog";
 import { CipherFormGeneratorComponent } from "@bitwarden/vault";
 
 export interface ApproveSshRequestParams {
diff --git a/bitwarden_license/bit-cli/src/admin-console/device-approval/approve.command.ts b/bitwarden_license/bit-cli/src/admin-console/device-approval/approve.command.ts
index dc6a6d8e90..f8ce50a849 100644
--- a/bitwarden_license/bit-cli/src/admin-console/device-approval/approve.command.ts
+++ b/bitwarden_license/bit-cli/src/admin-console/device-approval/approve.command.ts
@@ -4,6 +4,8 @@ import { Response } from "@bitwarden/cli/models/response";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { OrganizationAuthRequestService } from "../../../../bit-common/src/admin-console/auth-requests";
 import { ServiceContainer } from "../../service-container";
 
diff --git a/bitwarden_license/bit-cli/src/admin-console/device-approval/deny-all.command.ts b/bitwarden_license/bit-cli/src/admin-console/device-approval/deny-all.command.ts
index f5dff801f2..c3cbd00ad3 100644
--- a/bitwarden_license/bit-cli/src/admin-console/device-approval/deny-all.command.ts
+++ b/bitwarden_license/bit-cli/src/admin-console/device-approval/deny-all.command.ts
@@ -7,6 +7,8 @@ import { MessageResponse } from "@bitwarden/cli/models/response/message.response
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { OrganizationAuthRequestService } from "../../../../bit-common/src/admin-console/auth-requests";
 import { ServiceContainer } from "../../service-container";
 
diff --git a/bitwarden_license/bit-cli/src/admin-console/device-approval/deny.command.ts b/bitwarden_license/bit-cli/src/admin-console/device-approval/deny.command.ts
index 58c1c57643..1036602b0f 100644
--- a/bitwarden_license/bit-cli/src/admin-console/device-approval/deny.command.ts
+++ b/bitwarden_license/bit-cli/src/admin-console/device-approval/deny.command.ts
@@ -4,6 +4,8 @@ import { Response } from "@bitwarden/cli/models/response";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { OrganizationAuthRequestService } from "../../../../bit-common/src/admin-console/auth-requests";
 import { ServiceContainer } from "../../service-container";
 
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.module.ts b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.module.ts
index b9c09a0d67..b410bbec21 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.module.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.module.ts
@@ -2,6 +2,8 @@ import { NgModule } from "@angular/core";
 
 import { BannerModule } from "@bitwarden/components";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { OnboardingModule } from "../../../../../../apps/web/src/app/shared/components/onboarding/onboarding.module";
 import { SecretsManagerSharedModule } from "../shared/sm-shared.module";
 
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/guards/project-access.guard.spec.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/guards/project-access.guard.spec.ts
index 631f640974..8447127fc9 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/guards/project-access.guard.spec.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/guards/project-access.guard.spec.ts
@@ -9,6 +9,8 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { ToastService } from "@bitwarden/components";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { RouterService } from "../../../../../../../apps/web/src/app/core/router.service";
 import { ProjectView } from "../../models/view/project.view";
 import { ProjectService } from "../project.service";
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.spec.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.spec.ts
index ebd00a83ea..ef29f6be7e 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.spec.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.spec.ts
@@ -9,6 +9,8 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { ToastService } from "@bitwarden/components";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { RouterService } from "../../../../../../../../clients/apps/web/src/app/core/router.service";
 import { ServiceAccountView } from "../../models/view/service-account.view";
 import { ServiceAccountService } from "../service-account.service";
diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts
index f5940b8e14..93d25af1a5 100644
--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -301,6 +301,8 @@ import {
   IndividualVaultExportServiceAbstraction,
 } from "@bitwarden/vault-export-core";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { NewDeviceVerificationNoticeService } from "../../../vault/src/services/new-device-verification-notice.service";
 import { FormValidationErrorsService as FormValidationErrorsServiceAbstraction } from "../platform/abstractions/form-validation-errors.service";
 import { ViewCacheService } from "../platform/abstractions/view-cache.service";
diff --git a/libs/angular/src/vault/guards/new-device-verification-notice.guard.spec.ts b/libs/angular/src/vault/guards/new-device-verification-notice.guard.spec.ts
index e278113a65..ba19cf808e 100644
--- a/libs/angular/src/vault/guards/new-device-verification-notice.guard.spec.ts
+++ b/libs/angular/src/vault/guards/new-device-verification-notice.guard.spec.ts
@@ -9,6 +9,8 @@ import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { NewDeviceVerificationNoticeService } from "../../../../vault/src/services/new-device-verification-notice.service";
 import { VaultProfileService } from "../services/vault-profile.service";
 
diff --git a/libs/angular/src/vault/guards/new-device-verification-notice.guard.ts b/libs/angular/src/vault/guards/new-device-verification-notice.guard.ts
index 20550e0e8c..8b406877a1 100644
--- a/libs/angular/src/vault/guards/new-device-verification-notice.guard.ts
+++ b/libs/angular/src/vault/guards/new-device-verification-notice.guard.ts
@@ -9,6 +9,8 @@ import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { NewDeviceVerificationNoticeService } from "../../../../vault/src/services/new-device-verification-notice.service";
 import { VaultProfileService } from "../services/vault-profile.service";
 
diff --git a/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts b/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts
index dd0b49f356..260780e196 100644
--- a/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts
+++ b/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts
@@ -22,6 +22,8 @@ import { ServiceUtils } from "@bitwarden/common/vault/service-utils";
 import { DeprecatedVaultFilterService as DeprecatedVaultFilterServiceAbstraction } from "../../abstractions/deprecated-vault-filter.service";
 import { DynamicTreeNode } from "../models/dynamic-tree-node.model";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { COLLAPSED_GROUPINGS } from "./../../../../../common/src/vault/services/key-state/collapsed-groupings.state";
 
 const NestingDelimiter = "/";
diff --git a/libs/auth/src/angular/anon-layout/anon-layout-wrapper.stories.ts b/libs/auth/src/angular/anon-layout/anon-layout-wrapper.stories.ts
index b07504b7c8..9f504c75d2 100644
--- a/libs/auth/src/angular/anon-layout/anon-layout-wrapper.stories.ts
+++ b/libs/auth/src/angular/anon-layout/anon-layout-wrapper.stories.ts
@@ -18,7 +18,8 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { ButtonModule } from "@bitwarden/components";
 
 // FIXME: remove `/apps` import from `/libs`
-// eslint-disable-next-line import/no-restricted-paths
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line import/no-restricted-paths, no-restricted-imports
 import { PreloadedEnglishI18nModule } from "../../../../../apps/web/src/app/core/tests";
 import { LockIcon } from "../icons";
 import { RegistrationCheckEmailIcon } from "../icons/registration-check-email.icon";
diff --git a/libs/auth/src/angular/anon-layout/anon-layout.component.ts b/libs/auth/src/angular/anon-layout/anon-layout.component.ts
index 91229f38ab..05ddb9614f 100644
--- a/libs/auth/src/angular/anon-layout/anon-layout.component.ts
+++ b/libs/auth/src/angular/anon-layout/anon-layout.component.ts
@@ -9,8 +9,14 @@ import { ClientType } from "@bitwarden/common/enums";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { IconModule, Icon } from "../../../../components/src/icon";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { SharedModule } from "../../../../components/src/shared";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { TypographyModule } from "../../../../components/src/typography";
 import { BitwardenLogo, BitwardenShield } from "../icons";
 
diff --git a/libs/auth/src/angular/anon-layout/anon-layout.stories.ts b/libs/auth/src/angular/anon-layout/anon-layout.stories.ts
index 27eb27c53b..c7e15d9dcf 100644
--- a/libs/auth/src/angular/anon-layout/anon-layout.stories.ts
+++ b/libs/auth/src/angular/anon-layout/anon-layout.stories.ts
@@ -7,7 +7,11 @@ import { EnvironmentService } from "@bitwarden/common/platform/abstractions/envi
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { ButtonModule } from "../../../../components/src/button";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { I18nMockService } from "../../../../components/src/utils/i18n-mock.service";
 import { LockIcon } from "../icons";
 
diff --git a/libs/auth/src/angular/input-password/input-password.component.ts b/libs/auth/src/angular/input-password/input-password.component.ts
index 94baecb9ef..c613cf5f53 100644
--- a/libs/auth/src/angular/input-password/input-password.component.ts
+++ b/libs/auth/src/angular/input-password/input-password.component.ts
@@ -26,7 +26,11 @@ import {
 } from "@bitwarden/components";
 import { DEFAULT_KDF_CONFIG, KeyService } from "@bitwarden/key-management";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { InputsFieldMatch } from "../../../../angular/src/auth/validators/inputs-field-match.validator";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { SharedModule } from "../../../../components/src/shared";
 import { PasswordCalloutComponent } from "../password-callout/password-callout.component";
 
diff --git a/libs/auth/src/angular/input-password/input-password.stories.ts b/libs/auth/src/angular/input-password/input-password.stories.ts
index 99c0aba81b..41577328f8 100644
--- a/libs/auth/src/angular/input-password/input-password.stories.ts
+++ b/libs/auth/src/angular/input-password/input-password.stories.ts
@@ -14,7 +14,8 @@ import { DialogService, ToastService } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
 
 // FIXME: remove `/apps` import from `/libs`
-// eslint-disable-next-line import/no-restricted-paths
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line import/no-restricted-paths, no-restricted-imports
 import { PreloadedEnglishI18nModule } from "../../../../../apps/web/src/app/core/tests";
 
 import { InputPasswordComponent } from "./input-password.component";
diff --git a/libs/auth/src/angular/registration/registration-start/registration-start.stories.ts b/libs/auth/src/angular/registration/registration-start/registration-start.stories.ts
index fa3ad2ae2b..6047cc3d27 100644
--- a/libs/auth/src/angular/registration/registration-start/registration-start.stories.ts
+++ b/libs/auth/src/angular/registration/registration-start/registration-start.stories.ts
@@ -28,7 +28,8 @@ import {
 } from "@bitwarden/components";
 
 // FIXME: remove `/apps` import from `/libs`
-// eslint-disable-next-line import/no-restricted-paths
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line import/no-restricted-paths, no-restricted-imports
 import { PreloadedEnglishI18nModule } from "../../../../../../apps/web/src/app/core/tests";
 import { LoginEmailService } from "../../../common";
 import { AnonLayoutWrapperDataService } from "../../anon-layout/anon-layout-wrapper-data.service";
diff --git a/libs/auth/src/angular/set-password-jit/set-password-jit.component.ts b/libs/auth/src/angular/set-password-jit/set-password-jit.component.ts
index 0557227938..b54529f6a2 100644
--- a/libs/auth/src/angular/set-password-jit/set-password-jit.component.ts
+++ b/libs/auth/src/angular/set-password-jit/set-password-jit.component.ts
@@ -15,6 +15,8 @@ import { ValidationService } from "@bitwarden/common/platform/abstractions/valid
 import { UserId } from "@bitwarden/common/types/guid";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { ToastService } from "../../../../components/src/toast";
 import { InputPasswordComponent } from "../input-password/input-password.component";
 import { PasswordInputResult } from "../input-password/password-input-result";
diff --git a/libs/auth/src/common/models/domain/user-decryption-options.ts b/libs/auth/src/common/models/domain/user-decryption-options.ts
index 95efe2b007..00b78064d8 100644
--- a/libs/auth/src/common/models/domain/user-decryption-options.ts
+++ b/libs/auth/src/common/models/domain/user-decryption-options.ts
@@ -4,6 +4,8 @@ import { Jsonify } from "type-fest";
 
 import { KeyConnectorUserDecryptionOptionResponse } from "@bitwarden/common/auth/models/response/user-decryption-options/key-connector-user-decryption-option.response";
 import { TrustedDeviceUserDecryptionOptionResponse } from "@bitwarden/common/auth/models/response/user-decryption-options/trusted-device-user-decryption-option.response";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { IdentityTokenResponse } from "@bitwarden/common/src/auth/models/response/identity-token.response";
 
 /**
diff --git a/libs/auth/src/common/services/login-email/login-email.service.ts b/libs/auth/src/common/services/login-email/login-email.service.ts
index feb0cba1bd..aa13afd500 100644
--- a/libs/auth/src/common/services/login-email/login-email.service.ts
+++ b/libs/auth/src/common/services/login-email/login-email.service.ts
@@ -6,6 +6,8 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import {
   GlobalState,
   KeyDefinition,
diff --git a/libs/auth/src/common/services/login-strategies/login-strategy.service.ts b/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
index 1f98a117c8..57a653b205 100644
--- a/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
+++ b/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
@@ -35,6 +35,8 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { TaskSchedulerService, ScheduledTaskNames } from "@bitwarden/common/platform/scheduling";
 import { GlobalState, GlobalStateProvider } from "@bitwarden/common/platform/state";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { DeviceTrustServiceAbstraction } from "@bitwarden/common/src/auth/abstractions/device-trust.service.abstraction";
 import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
 import { MasterKey } from "@bitwarden/common/types/key";
diff --git a/libs/auth/src/common/services/user-decryption-options/user-decryption-options.service.ts b/libs/auth/src/common/services/user-decryption-options/user-decryption-options.service.ts
index ffb660e6a7..7c44a6f168 100644
--- a/libs/auth/src/common/services/user-decryption-options/user-decryption-options.service.ts
+++ b/libs/auth/src/common/services/user-decryption-options/user-decryption-options.service.ts
@@ -8,6 +8,8 @@ import {
   USER_DECRYPTION_OPTIONS_DISK,
   UserKeyDefinition,
 } from "@bitwarden/common/platform/state";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { UserId } from "@bitwarden/common/src/types/guid";
 
 import { InternalUserDecryptionOptionsServiceAbstraction } from "../../abstractions/user-decryption-options.service.abstraction";
diff --git a/libs/common/src/auth/models/request/webauthn-rotate-credential.request.ts b/libs/common/src/auth/models/request/webauthn-rotate-credential.request.ts
index 791c468807..588f75bde4 100644
--- a/libs/common/src/auth/models/request/webauthn-rotate-credential.request.ts
+++ b/libs/common/src/auth/models/request/webauthn-rotate-credential.request.ts
@@ -2,6 +2,8 @@
 // @ts-strict-ignore
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { RotateableKeySet } from "../../../../../auth/src/common/models";
 
 export class WebauthnRotateCredentialRequest {
diff --git a/libs/common/src/auth/services/anonymous-hub.service.ts b/libs/common/src/auth/services/anonymous-hub.service.ts
index a268c8a271..3900dd53ee 100644
--- a/libs/common/src/auth/services/anonymous-hub.service.ts
+++ b/libs/common/src/auth/services/anonymous-hub.service.ts
@@ -9,6 +9,8 @@ import {
 import { MessagePackHubProtocol } from "@microsoft/signalr-protocol-msgpack";
 import { firstValueFrom } from "rxjs";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { AuthRequestServiceAbstraction } from "../../../../auth/src/common/abstractions";
 import { NotificationType } from "../../enums";
 import {
diff --git a/libs/common/src/auth/services/auth.service.spec.ts b/libs/common/src/auth/services/auth.service.spec.ts
index 5663384714..4b7b8a2b26 100644
--- a/libs/common/src/auth/services/auth.service.spec.ts
+++ b/libs/common/src/auth/services/auth.service.spec.ts
@@ -1,6 +1,8 @@
 import { MockProxy, mock } from "jest-mock-extended";
 import { firstValueFrom, of } from "rxjs";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import {
   FakeAccountService,
diff --git a/libs/common/src/auth/services/auth.service.ts b/libs/common/src/auth/services/auth.service.ts
index bab83fc55d..d855a1be34 100644
--- a/libs/common/src/auth/services/auth.service.ts
+++ b/libs/common/src/auth/services/auth.service.ts
@@ -11,6 +11,8 @@ import {
   switchMap,
 } from "rxjs";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { ApiService } from "../../abstractions/api.service";
 import { StateService } from "../../platform/abstractions/state.service";
diff --git a/libs/common/src/auth/services/device-trust.service.implementation.ts b/libs/common/src/auth/services/device-trust.service.implementation.ts
index 409150552a..c40091a66f 100644
--- a/libs/common/src/auth/services/device-trust.service.implementation.ts
+++ b/libs/common/src/auth/services/device-trust.service.implementation.ts
@@ -4,6 +4,8 @@ import { firstValueFrom, map, Observable } from "rxjs";
 
 import { UserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { AppIdService } from "../../platform/abstractions/app-id.service";
 import { ConfigService } from "../../platform/abstractions/config/config.service";
diff --git a/libs/common/src/auth/services/device-trust.service.spec.ts b/libs/common/src/auth/services/device-trust.service.spec.ts
index 66a91a693e..943653e312 100644
--- a/libs/common/src/auth/services/device-trust.service.spec.ts
+++ b/libs/common/src/auth/services/device-trust.service.spec.ts
@@ -3,7 +3,11 @@ import { BehaviorSubject, of } from "rxjs";
 
 import { UserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { UserDecryptionOptions } from "../../../../auth/src/common/models/domain/user-decryption-options";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { FakeAccountService, mockAccountServiceWith } from "../../../spec/fake-account-service";
 import { FakeActiveUserState } from "../../../spec/fake-state";
diff --git a/libs/common/src/auth/services/key-connector.service.spec.ts b/libs/common/src/auth/services/key-connector.service.spec.ts
index b1bf87693c..660f1124f4 100644
--- a/libs/common/src/auth/services/key-connector.service.spec.ts
+++ b/libs/common/src/auth/services/key-connector.service.spec.ts
@@ -1,5 +1,7 @@
 import { mock } from "jest-mock-extended";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { FakeAccountService, FakeStateProvider, mockAccountServiceWith } from "../../../spec";
 import { ApiService } from "../../abstractions/api.service";
diff --git a/libs/common/src/auth/services/password-reset-enrollment.service.implementation.spec.ts b/libs/common/src/auth/services/password-reset-enrollment.service.implementation.spec.ts
index ed622b21c8..95b6f3f8b9 100644
--- a/libs/common/src/auth/services/password-reset-enrollment.service.implementation.spec.ts
+++ b/libs/common/src/auth/services/password-reset-enrollment.service.implementation.spec.ts
@@ -4,7 +4,11 @@ import { BehaviorSubject } from "rxjs";
 import { OrganizationUserApiService } from "@bitwarden/admin-console/common";
 import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { UserId } from "../../../../common/src/types/guid";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { OrganizationApiServiceAbstraction } from "../../admin-console/abstractions/organization/organization-api.service.abstraction";
 import { OrganizationAutoEnrollStatusResponse } from "../../admin-console/models/response/organization-auto-enroll-status.response";
diff --git a/libs/common/src/auth/services/password-reset-enrollment.service.implementation.ts b/libs/common/src/auth/services/password-reset-enrollment.service.implementation.ts
index c5451ce30c..0bdf98cef7 100644
--- a/libs/common/src/auth/services/password-reset-enrollment.service.implementation.ts
+++ b/libs/common/src/auth/services/password-reset-enrollment.service.implementation.ts
@@ -8,6 +8,8 @@ import {
 } from "@bitwarden/admin-console/common";
 import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { OrganizationApiServiceAbstraction } from "../../admin-console/abstractions/organization/organization-api.service.abstraction";
 import { I18nService } from "../../platform/abstractions/i18n.service";
diff --git a/libs/common/src/auth/services/user-verification/user-verification.service.spec.ts b/libs/common/src/auth/services/user-verification/user-verification.service.spec.ts
index 081dafb170..102e4bac8d 100644
--- a/libs/common/src/auth/services/user-verification/user-verification.service.spec.ts
+++ b/libs/common/src/auth/services/user-verification/user-verification.service.spec.ts
@@ -14,6 +14,8 @@ import {
   KeyService,
 } from "@bitwarden/key-management";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KdfConfigService } from "../../../../../key-management/src/abstractions/kdf-config.service";
 import { FakeAccountService, mockAccountServiceWith } from "../../../../spec";
 import { VaultTimeoutSettingsService } from "../../../abstractions/vault-timeout/vault-timeout-settings.service";
diff --git a/libs/common/src/auth/services/user-verification/user-verification.service.ts b/libs/common/src/auth/services/user-verification/user-verification.service.ts
index 2935c1958a..3f0a0adfcb 100644
--- a/libs/common/src/auth/services/user-verification/user-verification.service.ts
+++ b/libs/common/src/auth/services/user-verification/user-verification.service.ts
@@ -10,6 +10,8 @@ import {
   KeyService,
 } from "@bitwarden/key-management";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { PinServiceAbstraction } from "../../../../../auth/src/common/abstractions/pin.service.abstraction";
 import { I18nService } from "../../../platform/abstractions/i18n.service";
 import { HashPurpose } from "../../../platform/enums";
diff --git a/libs/common/src/key-management/services/default-process-reload.service.ts b/libs/common/src/key-management/services/default-process-reload.service.ts
index 8c1d1117c8..f1c3aed6a5 100644
--- a/libs/common/src/key-management/services/default-process-reload.service.ts
+++ b/libs/common/src/key-management/services/default-process-reload.service.ts
@@ -6,6 +6,8 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { BiometricStateService } from "@bitwarden/key-management";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { PinServiceAbstraction } from "../../../../auth/src/common/abstractions";
 import { VaultTimeoutSettingsService } from "../../abstractions/vault-timeout/vault-timeout-settings.service";
 import { AccountService } from "../../auth/abstractions/account.service";
diff --git a/libs/common/src/platform/misc/utils.ts b/libs/common/src/platform/misc/utils.ts
index d2bf11a20c..95d17e6d04 100644
--- a/libs/common/src/platform/misc/utils.ts
+++ b/libs/common/src/platform/misc/utils.ts
@@ -8,6 +8,8 @@ import { Observable, of, switchMap } from "rxjs";
 import { getHostname, parse } from "tldts";
 import { Merge } from "type-fest";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { EncryptService } from "../abstractions/encrypt.service";
 import { I18nService } from "../abstractions/i18n.service";
diff --git a/libs/common/src/platform/models/domain/enc-string.spec.ts b/libs/common/src/platform/models/domain/enc-string.spec.ts
index 85108a9609..b4916b9f70 100644
--- a/libs/common/src/platform/models/domain/enc-string.spec.ts
+++ b/libs/common/src/platform/models/domain/enc-string.spec.ts
@@ -1,5 +1,7 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KeyService } from "../../../../../key-management/src/abstractions/key.service";
 import { makeEncString, makeStaticByteArray } from "../../../../spec";
 import { EncryptService } from "../../../platform/abstractions/encrypt.service";
diff --git a/libs/common/src/platform/services/container.service.ts b/libs/common/src/platform/services/container.service.ts
index 6022e097ab..c3e727a2e1 100644
--- a/libs/common/src/platform/services/container.service.ts
+++ b/libs/common/src/platform/services/container.service.ts
@@ -1,3 +1,5 @@
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { EncryptService } from "../abstractions/encrypt.service";
 
diff --git a/libs/common/src/platform/services/user-auto-unlock-key.service.spec.ts b/libs/common/src/platform/services/user-auto-unlock-key.service.spec.ts
index 23a8ba3138..16b3968045 100644
--- a/libs/common/src/platform/services/user-auto-unlock-key.service.spec.ts
+++ b/libs/common/src/platform/services/user-auto-unlock-key.service.spec.ts
@@ -1,5 +1,7 @@
 import { mock } from "jest-mock-extended";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { DefaultKeyService } from "../../../../key-management/src/key.service";
 import { CsprngArray } from "../../types/csprng";
 import { UserId } from "../../types/guid";
diff --git a/libs/common/src/platform/services/user-auto-unlock-key.service.ts b/libs/common/src/platform/services/user-auto-unlock-key.service.ts
index abb8993c39..a8947a49f4 100644
--- a/libs/common/src/platform/services/user-auto-unlock-key.service.ts
+++ b/libs/common/src/platform/services/user-auto-unlock-key.service.ts
@@ -1,3 +1,5 @@
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { UserId } from "../../types/guid";
 import { KeySuffixOptions } from "../enums";
diff --git a/libs/common/src/platform/sync/default-sync.service.ts b/libs/common/src/platform/sync/default-sync.service.ts
index 9e36aa6941..138c7c0331 100644
--- a/libs/common/src/platform/sync/default-sync.service.ts
+++ b/libs/common/src/platform/sync/default-sync.service.ts
@@ -8,8 +8,14 @@ import {
   CollectionDetailsResponse,
 } from "@bitwarden/admin-console/common";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { UserDecryptionOptionsServiceAbstraction } from "../../../../auth/src/common/abstractions";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { LogoutReason } from "../../../../auth/src/common/types";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { ApiService } from "../../abstractions/api.service";
 import { InternalOrganizationServiceAbstraction } from "../../admin-console/abstractions/organization/organization.service.abstraction";
diff --git a/libs/common/src/services/vault-timeout/vault-timeout-settings.service.spec.ts b/libs/common/src/services/vault-timeout/vault-timeout-settings.service.spec.ts
index 540f26bba2..4168baf138 100644
--- a/libs/common/src/services/vault-timeout/vault-timeout-settings.service.spec.ts
+++ b/libs/common/src/services/vault-timeout/vault-timeout-settings.service.spec.ts
@@ -10,6 +10,8 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { UserId } from "@bitwarden/common/types/guid";
 import { BiometricStateService } from "@bitwarden/key-management";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { FakeAccountService, mockAccountServiceWith, FakeStateProvider } from "../../../spec";
 import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "../../abstractions/vault-timeout/vault-timeout-settings.service";
diff --git a/libs/common/src/services/vault-timeout/vault-timeout-settings.service.ts b/libs/common/src/services/vault-timeout/vault-timeout-settings.service.ts
index 0f5bdca93d..ffc8b6e014 100644
--- a/libs/common/src/services/vault-timeout/vault-timeout-settings.service.ts
+++ b/libs/common/src/services/vault-timeout/vault-timeout-settings.service.ts
@@ -21,6 +21,8 @@ import {
 } from "@bitwarden/auth/common";
 import { BiometricStateService } from "@bitwarden/key-management";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "../../abstractions/vault-timeout/vault-timeout-settings.service";
 import { PolicyService } from "../../admin-console/abstractions/policy/policy.service.abstraction";
diff --git a/libs/common/src/vault/models/domain/attachment.spec.ts b/libs/common/src/vault/models/domain/attachment.spec.ts
index b074e7a46a..8cae717073 100644
--- a/libs/common/src/vault/models/domain/attachment.spec.ts
+++ b/libs/common/src/vault/models/domain/attachment.spec.ts
@@ -1,5 +1,7 @@
 import { mock, MockProxy } from "jest-mock-extended";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KeyService } from "../../../../../key-management/src/abstractions/key.service";
 import { makeStaticByteArray, mockEnc, mockFromJson } from "../../../../spec";
 import { EncryptService } from "../../../platform/abstractions/encrypt.service";
diff --git a/libs/common/src/vault/models/domain/cipher.spec.ts b/libs/common/src/vault/models/domain/cipher.spec.ts
index 509a17a8a0..64df3204ac 100644
--- a/libs/common/src/vault/models/domain/cipher.spec.ts
+++ b/libs/common/src/vault/models/domain/cipher.spec.ts
@@ -3,6 +3,8 @@ import { Jsonify } from "type-fest";
 
 import { UserId } from "@bitwarden/common/types/guid";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KeyService } from "../../../../../key-management/src/abstractions/key.service";
 import { makeStaticByteArray, mockEnc, mockFromJson } from "../../../../spec/utils";
 import { UriMatchStrategy } from "../../../models/domain/domain-service";
diff --git a/libs/common/src/vault/services/cipher.service.spec.ts b/libs/common/src/vault/services/cipher.service.spec.ts
index e6ea762c12..8ab6a2d3d3 100644
--- a/libs/common/src/vault/services/cipher.service.spec.ts
+++ b/libs/common/src/vault/services/cipher.service.spec.ts
@@ -3,6 +3,8 @@ import { BehaviorSubject, map, of } from "rxjs";
 
 import { BulkEncryptService } from "@bitwarden/common/platform/abstractions/bulk-encrypt.service";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import {
   CipherDecryptionKeys,
   KeyService,
diff --git a/libs/common/src/vault/services/cipher.service.ts b/libs/common/src/vault/services/cipher.service.ts
index 36db5b8707..12712f169a 100644
--- a/libs/common/src/vault/services/cipher.service.ts
+++ b/libs/common/src/vault/services/cipher.service.ts
@@ -18,6 +18,8 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { BulkEncryptService } from "@bitwarden/common/platform/abstractions/bulk-encrypt.service";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { ApiService } from "../../abstractions/api.service";
 import { SearchService } from "../../abstractions/search.service";
diff --git a/libs/common/src/vault/services/folder/folder.service.spec.ts b/libs/common/src/vault/services/folder/folder.service.spec.ts
index 612cd83d99..9fdb4327b9 100644
--- a/libs/common/src/vault/services/folder/folder.service.spec.ts
+++ b/libs/common/src/vault/services/folder/folder.service.spec.ts
@@ -1,6 +1,8 @@
 import { mock, MockProxy } from "jest-mock-extended";
 import { BehaviorSubject, firstValueFrom } from "rxjs";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KeyService } from "../../../../../key-management/src/abstractions/key.service";
 import { makeEncString } from "../../../../spec";
 import { FakeAccountService, mockAccountServiceWith } from "../../../../spec/fake-account-service";
diff --git a/libs/common/src/vault/services/folder/folder.service.ts b/libs/common/src/vault/services/folder/folder.service.ts
index 3aac5374fc..fe77806877 100644
--- a/libs/common/src/vault/services/folder/folder.service.ts
+++ b/libs/common/src/vault/services/folder/folder.service.ts
@@ -5,6 +5,8 @@ import { Observable, Subject, firstValueFrom, map, shareReplay, switchMap, merge
 import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KeyService } from "../../../../../key-management/src/abstractions/key.service";
 import { I18nService } from "../../../platform/abstractions/i18n.service";
 import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
diff --git a/libs/components/src/async-actions/in-forms.stories.ts b/libs/components/src/async-actions/in-forms.stories.ts
index fb94e43b19..7ddb32da28 100644
--- a/libs/components/src/async-actions/in-forms.stories.ts
+++ b/libs/components/src/async-actions/in-forms.stories.ts
@@ -5,6 +5,8 @@ import { Meta, moduleMetadata, StoryObj } from "@storybook/angular";
 import { delay, of } from "rxjs";
 
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { I18nService } from "@bitwarden/common/src/platform/abstractions/i18n.service";
 
 import { ButtonModule } from "../button";
diff --git a/libs/components/src/checkbox/checkbox.stories.ts b/libs/components/src/checkbox/checkbox.stories.ts
index c322f29b95..f3e5a5cb3f 100644
--- a/libs/components/src/checkbox/checkbox.stories.ts
+++ b/libs/components/src/checkbox/checkbox.stories.ts
@@ -9,6 +9,8 @@ import {
 } from "@angular/forms";
 import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { I18nService } from "@bitwarden/common/src/platform/abstractions/i18n.service";
 
 import { BadgeModule } from "../badge";
diff --git a/libs/components/src/chip-select/chip-select.component.ts b/libs/components/src/chip-select/chip-select.component.ts
index 5b07d0bbb9..a653d79f83 100644
--- a/libs/components/src/chip-select/chip-select.component.ts
+++ b/libs/components/src/chip-select/chip-select.component.ts
@@ -18,6 +18,8 @@ import {
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from "@angular/forms";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { compareValues } from "../../../common/src/platform/misc/compare-values";
 import { ButtonModule } from "../button";
 import { IconButtonModule } from "../icon-button";
diff --git a/libs/key-management/src/abstractions/key.service.ts b/libs/key-management/src/abstractions/key.service.ts
index f5ab624bb2..da59c2986b 100644
--- a/libs/key-management/src/abstractions/key.service.ts
+++ b/libs/key-management/src/abstractions/key.service.ts
@@ -5,13 +5,29 @@ import { Observable } from "rxjs";
 import { EncryptedOrganizationKeyData } from "@bitwarden/common/admin-console/models/data/encrypted-organization-key.data";
 import { KdfConfig } from "@bitwarden/key-management";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { ProfileOrganizationResponse } from "../../../common/src/admin-console/models/response/profile-organization.response";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { ProfileProviderOrganizationResponse } from "../../../common/src/admin-console/models/response/profile-provider-organization.response";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { ProfileProviderResponse } from "../../../common/src/admin-console/models/response/profile-provider.response";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KeySuffixOptions, HashPurpose } from "../../../common/src/platform/enums";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { EncryptedString, EncString } from "../../../common/src/platform/models/domain/enc-string";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { SymmetricCryptoKey } from "../../../common/src/platform/models/domain/symmetric-crypto-key";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { OrganizationId, UserId } from "../../../common/src/types/guid";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import {
   UserKey,
   MasterKey,
diff --git a/libs/key-management/src/biometrics/biometric-state.service.ts b/libs/key-management/src/biometrics/biometric-state.service.ts
index c7f958c97a..ae6e52ce63 100644
--- a/libs/key-management/src/biometrics/biometric-state.service.ts
+++ b/libs/key-management/src/biometrics/biometric-state.service.ts
@@ -2,8 +2,14 @@
 // @ts-strict-ignore
 import { Observable, firstValueFrom, map, combineLatest } from "rxjs";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { EncryptedString, EncString } from "../../../common/src/platform/models/domain/enc-string";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { ActiveUserState, GlobalState, StateProvider } from "../../../common/src/platform/state";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { UserId } from "../../../common/src/types/guid";
 
 import {
diff --git a/libs/key-management/src/biometrics/biometric.state.ts b/libs/key-management/src/biometrics/biometric.state.ts
index c37b7d7370..e5ea4fbae3 100644
--- a/libs/key-management/src/biometrics/biometric.state.ts
+++ b/libs/key-management/src/biometrics/biometric.state.ts
@@ -1,9 +1,15 @@
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { EncryptedString } from "../../../common/src/platform/models/domain/enc-string";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import {
   KeyDefinition,
   BIOMETRIC_SETTINGS_DISK,
   UserKeyDefinition,
 } from "../../../common/src/platform/state";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { UserId } from "../../../common/src/types/guid";
 
 /**
diff --git a/libs/key-management/src/kdf-config.service.spec.ts b/libs/key-management/src/kdf-config.service.spec.ts
index c9912930e2..76a13fe10f 100644
--- a/libs/key-management/src/kdf-config.service.spec.ts
+++ b/libs/key-management/src/kdf-config.service.spec.ts
@@ -3,8 +3,12 @@ import {
   FakeStateProvider,
   mockAccountServiceWith,
 } from "@bitwarden/common/spec";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { UserId } from "@bitwarden/common/src/types/guid";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { Utils } from "../../common/src/platform/misc/utils";
 
 import { DefaultKdfConfigService } from "./kdf-config.service";
diff --git a/libs/key-management/src/kdf-config.service.ts b/libs/key-management/src/kdf-config.service.ts
index 884a94fb95..f0c964c5d2 100644
--- a/libs/key-management/src/kdf-config.service.ts
+++ b/libs/key-management/src/kdf-config.service.ts
@@ -2,8 +2,12 @@
 // @ts-strict-ignore
 import { firstValueFrom, Observable } from "rxjs";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { UserId } from "@bitwarden/common/src/types/guid";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KDF_CONFIG_DISK, StateProvider, UserKeyDefinition } from "../../common/src/platform/state";
 
 import { KdfConfigService } from "./abstractions/kdf-config.service";
diff --git a/libs/key-management/src/key.service.spec.ts b/libs/key-management/src/key.service.spec.ts
index b77c14ff53..62cdce230e 100644
--- a/libs/key-management/src/key.service.spec.ts
+++ b/libs/key-management/src/key.service.spec.ts
@@ -3,6 +3,8 @@ import { bufferCount, firstValueFrom, lastValueFrom, of, take, tap } from "rxjs"
 
 import { EncryptedOrganizationKeyData } from "@bitwarden/common/admin-console/models/data/encrypted-organization-key.data";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { PinServiceAbstraction } from "../../auth/src/common/abstractions";
 import {
   awaitAsync,
@@ -13,29 +15,69 @@ import {
 import { FakeAccountService, mockAccountServiceWith } from "../../common/spec/fake-account-service";
 import { FakeActiveUserState, FakeSingleUserState } from "../../common/spec/fake-state";
 import { FakeStateProvider } from "../../common/spec/fake-state-provider";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { FakeMasterPasswordService } from "../../common/src/auth/services/master-password/fake-master-password.service";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { CryptoFunctionService } from "../../common/src/platform/abstractions/crypto-function.service";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { EncryptService } from "../../common/src/platform/abstractions/encrypt.service";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KeyGenerationService } from "../../common/src/platform/abstractions/key-generation.service";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { LogService } from "../../common/src/platform/abstractions/log.service";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { PlatformUtilsService } from "../../common/src/platform/abstractions/platform-utils.service";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { StateService } from "../../common/src/platform/abstractions/state.service";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { Encrypted } from "../../common/src/platform/interfaces/encrypted";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { Utils } from "../../common/src/platform/misc/utils";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { EncString, EncryptedString } from "../../common/src/platform/models/domain/enc-string";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { SymmetricCryptoKey } from "../../common/src/platform/models/domain/symmetric-crypto-key";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { USER_ENCRYPTED_ORGANIZATION_KEYS } from "../../common/src/platform/services/key-state/org-keys.state";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { USER_ENCRYPTED_PROVIDER_KEYS } from "../../common/src/platform/services/key-state/provider-keys.state";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import {
   USER_ENCRYPTED_PRIVATE_KEY,
   USER_EVER_HAD_USER_KEY,
   USER_KEY,
 } from "../../common/src/platform/services/key-state/user-key.state";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { UserKeyDefinition } from "../../common/src/platform/state";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { VAULT_TIMEOUT } from "../../common/src/services/vault-timeout/vault-timeout-settings.state";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { CsprngArray } from "../../common/src/types/csprng";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { OrganizationId, UserId } from "../../common/src/types/guid";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { UserKey, MasterKey } from "../../common/src/types/key";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { VaultTimeoutStringType } from "../../common/src/types/vault-timeout.type";
 
 import { KdfConfigService } from "./abstractions/kdf-config.service";
diff --git a/libs/key-management/src/key.service.ts b/libs/key-management/src/key.service.ts
index b1debccb95..5425dbc53f 100644
--- a/libs/key-management/src/key.service.ts
+++ b/libs/key-management/src/key.service.ts
@@ -12,37 +12,93 @@ import {
   switchMap,
 } from "rxjs";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { PinServiceAbstraction } from "../../auth/src/common/abstractions";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { EncryptedOrganizationKeyData } from "../../common/src/admin-console/models/data/encrypted-organization-key.data";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { BaseEncryptedOrganizationKey } from "../../common/src/admin-console/models/domain/encrypted-organization-key";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { ProfileOrganizationResponse } from "../../common/src/admin-console/models/response/profile-organization.response";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { ProfileProviderOrganizationResponse } from "../../common/src/admin-console/models/response/profile-provider-organization.response";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { ProfileProviderResponse } from "../../common/src/admin-console/models/response/profile-provider.response";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { AccountService } from "../../common/src/auth/abstractions/account.service";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { InternalMasterPasswordServiceAbstraction } from "../../common/src/auth/abstractions/master-password.service.abstraction";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { CryptoFunctionService } from "../../common/src/platform/abstractions/crypto-function.service";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { EncryptService } from "../../common/src/platform/abstractions/encrypt.service";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KeyGenerationService } from "../../common/src/platform/abstractions/key-generation.service";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { LogService } from "../../common/src/platform/abstractions/log.service";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { PlatformUtilsService } from "../../common/src/platform/abstractions/platform-utils.service";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { StateService } from "../../common/src/platform/abstractions/state.service";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { KeySuffixOptions, HashPurpose } from "../../common/src/platform/enums";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { convertValues } from "../../common/src/platform/misc/convert-values";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { Utils } from "../../common/src/platform/misc/utils";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { EFFLongWordList } from "../../common/src/platform/misc/wordlist";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { EncString, EncryptedString } from "../../common/src/platform/models/domain/enc-string";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { SymmetricCryptoKey } from "../../common/src/platform/models/domain/symmetric-crypto-key";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { USER_ENCRYPTED_ORGANIZATION_KEYS } from "../../common/src/platform/services/key-state/org-keys.state";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { USER_ENCRYPTED_PROVIDER_KEYS } from "../../common/src/platform/services/key-state/provider-keys.state";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import {
   USER_ENCRYPTED_PRIVATE_KEY,
   USER_EVER_HAD_USER_KEY,
   USER_KEY,
 } from "../../common/src/platform/services/key-state/user-key.state";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { ActiveUserState, StateProvider } from "../../common/src/platform/state";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { VAULT_TIMEOUT } from "../../common/src/services/vault-timeout/vault-timeout-settings.state";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { CsprngArray } from "../../common/src/types/csprng";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { OrganizationId, ProviderId, UserId } from "../../common/src/types/guid";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import {
   OrgKey,
   UserKey,
@@ -52,6 +108,8 @@ import {
   UserPrivateKey,
   UserPublicKey,
 } from "../../common/src/types/key";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { VaultTimeoutStringType } from "../../common/src/types/vault-timeout.type";
 
 import { KdfConfigService } from "./abstractions/kdf-config.service";
diff --git a/libs/key-management/src/models/kdf-config.ts b/libs/key-management/src/models/kdf-config.ts
index 11431337a3..fe9c0de255 100644
--- a/libs/key-management/src/models/kdf-config.ts
+++ b/libs/key-management/src/models/kdf-config.ts
@@ -1,5 +1,7 @@
 import { Jsonify } from "type-fest";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { RangeWithDefault } from "../../../common/src/platform/misc/range-with-default";
 import { KdfType } from "../enums/kdf-type.enum";
 
diff --git a/libs/vault/src/cipher-form/cipher-form.stories.ts b/libs/vault/src/cipher-form/cipher-form.stories.ts
index 72c4acb23c..f7146776b7 100644
--- a/libs/vault/src/cipher-form/cipher-form.stories.ts
+++ b/libs/vault/src/cipher-form/cipher-form.stories.ts
@@ -31,7 +31,8 @@ import {
   PasswordRepromptService,
 } from "@bitwarden/vault";
 // FIXME: remove `/apps` import from `/libs`
-// eslint-disable-next-line import/no-restricted-paths
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line import/no-restricted-paths, no-restricted-imports
 import { PreloadedEnglishI18nModule } from "@bitwarden/web-vault/src/app/core/tests";
 
 import { CipherFormService } from "./abstractions/cipher-form.service";
diff --git a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.spec.ts b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.spec.ts
index 0c0fa1b418..a5e57d2858 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.spec.ts
@@ -19,6 +19,8 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
 import { DialogService } from "@bitwarden/components";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { BitPasswordInputToggleDirective } from "../../../../../components/src/form-field/password-input-toggle.directive";
 import { CipherFormConfig } from "../../abstractions/cipher-form-config.service";
 import { CipherFormContainer } from "../../cipher-form-container";
diff --git a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.spec.ts b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.spec.ts
index 182427f7f4..69cfd41974 100644
--- a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.spec.ts
@@ -14,6 +14,8 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { Fido2CredentialView } from "@bitwarden/common/vault/models/view/fido2-credential.view";
 import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
 import { ToastService } from "@bitwarden/components";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { BitPasswordInputToggleDirective } from "@bitwarden/components/src/form-field/password-input-toggle.directive";
 
 import { CipherFormGenerationService } from "../../abstractions/cipher-form-generation.service";
diff --git a/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.spec.ts b/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.spec.ts
index 9c09028650..9bb96d1acc 100644
--- a/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.spec.ts
+++ b/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.spec.ts
@@ -18,7 +18,11 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { Fido2CredentialView } from "@bitwarden/common/vault/models/view/fido2-credential.view";
 import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
 import { BitFormFieldComponent, ToastService } from "@bitwarden/components";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { ColorPasswordComponent } from "@bitwarden/components/src/color-password/color-password.component";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { BitPasswordInputToggleDirective } from "@bitwarden/components/src/form-field/password-input-toggle.directive";
 
 import { LoginCredentialsViewComponent } from "./login-credentials-view.component";
diff --git a/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.ts b/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.ts
index b24fcdfa1f..7533ac2647 100644
--- a/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.ts
+++ b/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.ts
@@ -21,6 +21,8 @@ import {
   ColorPasswordModule,
 } from "@bitwarden/components";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { PremiumUpgradePromptService } from "../../../../../libs/common/src/vault/abstractions/premium-upgrade-prompt.service";
 import { BitTotpCountdownComponent } from "../../components/totp-countdown/totp-countdown.component";
 import { ReadOnlyCipherCardComponent } from "../read-only-cipher-card/read-only-cipher-card.component";
diff --git a/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.spec.ts b/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.spec.ts
index 4c84b2852a..21f82234b2 100644
--- a/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.spec.ts
+++ b/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.spec.ts
@@ -8,6 +8,8 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view";
 import { SectionHeaderComponent } from "@bitwarden/components";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { BitInputDirective } from "../../../../components/src/input/input.directive";
 
 import { ViewIdentitySectionsComponent } from "./view-identity-sections.component";
diff --git a/libs/vault/src/components/password-history-view/password-history-view.component.spec.ts b/libs/vault/src/components/password-history-view/password-history-view.component.spec.ts
index 461cc734d7..fb90df4d6a 100644
--- a/libs/vault/src/components/password-history-view/password-history-view.component.spec.ts
+++ b/libs/vault/src/components/password-history-view/password-history-view.component.spec.ts
@@ -10,6 +10,8 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.servi
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { ColorPasswordModule, ItemModule } from "@bitwarden/components";
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { ColorPasswordComponent } from "@bitwarden/components/src/color-password/color-password.component";
 
 import { PasswordHistoryViewComponent } from "./password-history-view.component";
diff --git a/libs/vault/src/services/password-reprompt.service.spec.ts b/libs/vault/src/services/password-reprompt.service.spec.ts
index 300b98215c..7d0a834b2d 100644
--- a/libs/vault/src/services/password-reprompt.service.spec.ts
+++ b/libs/vault/src/services/password-reprompt.service.spec.ts
@@ -1,5 +1,7 @@
 import { MockProxy, mock } from "jest-mock-extended";
 
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line no-restricted-imports
 import { UserVerificationService } from "@bitwarden/common/src/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { DialogService } from "@bitwarden/components";
 

From c0dfac4495fc96c0f1333c6a8066f1c5fdbe75c2 Mon Sep 17 00:00:00 2001
From: "bw-ghapp[bot]" <178206702+bw-ghapp[bot]@users.noreply.github.com>
Date: Fri, 10 Jan 2025 17:11:15 +0100
Subject: [PATCH 037/150] Autosync the updated translations (#12794)

Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>
---
 apps/browser/src/_locales/ar/messages.json    |  56 ++
 apps/browser/src/_locales/az/messages.json    |  56 ++
 apps/browser/src/_locales/be/messages.json    |  56 ++
 apps/browser/src/_locales/bg/messages.json    |  56 ++
 apps/browser/src/_locales/bn/messages.json    |  56 ++
 apps/browser/src/_locales/bs/messages.json    |  56 ++
 apps/browser/src/_locales/ca/messages.json    |  56 ++
 apps/browser/src/_locales/cs/messages.json    |  56 ++
 apps/browser/src/_locales/cy/messages.json    |  56 ++
 apps/browser/src/_locales/da/messages.json    |  56 ++
 apps/browser/src/_locales/de/messages.json    |  56 ++
 apps/browser/src/_locales/el/messages.json    |  58 +-
 apps/browser/src/_locales/en_GB/messages.json |  56 ++
 apps/browser/src/_locales/en_IN/messages.json |  56 ++
 apps/browser/src/_locales/es/messages.json    |  56 ++
 apps/browser/src/_locales/et/messages.json    |  56 ++
 apps/browser/src/_locales/eu/messages.json    |  56 ++
 apps/browser/src/_locales/fa/messages.json    |  56 ++
 apps/browser/src/_locales/fi/messages.json    |  56 ++
 apps/browser/src/_locales/fil/messages.json   |  56 ++
 apps/browser/src/_locales/fr/messages.json    |  56 ++
 apps/browser/src/_locales/gl/messages.json    |  56 ++
 apps/browser/src/_locales/he/messages.json    |  56 ++
 apps/browser/src/_locales/hi/messages.json    |  56 ++
 apps/browser/src/_locales/hr/messages.json    |  56 ++
 apps/browser/src/_locales/hu/messages.json    |  56 ++
 apps/browser/src/_locales/id/messages.json    |  56 ++
 apps/browser/src/_locales/it/messages.json    |  56 ++
 apps/browser/src/_locales/ja/messages.json    |  56 ++
 apps/browser/src/_locales/ka/messages.json    |  56 ++
 apps/browser/src/_locales/km/messages.json    |  56 ++
 apps/browser/src/_locales/kn/messages.json    |  56 ++
 apps/browser/src/_locales/ko/messages.json    |  56 ++
 apps/browser/src/_locales/lt/messages.json    |  56 ++
 apps/browser/src/_locales/lv/messages.json    |  56 ++
 apps/browser/src/_locales/ml/messages.json    |  56 ++
 apps/browser/src/_locales/mr/messages.json    |  56 ++
 apps/browser/src/_locales/my/messages.json    |  56 ++
 apps/browser/src/_locales/nb/messages.json    |  56 ++
 apps/browser/src/_locales/ne/messages.json    |  56 ++
 apps/browser/src/_locales/nl/messages.json    |  56 ++
 apps/browser/src/_locales/nn/messages.json    |  56 ++
 apps/browser/src/_locales/or/messages.json    |  56 ++
 apps/browser/src/_locales/pl/messages.json    |  56 ++
 apps/browser/src/_locales/pt_BR/messages.json |  56 ++
 apps/browser/src/_locales/pt_PT/messages.json |  56 ++
 apps/browser/src/_locales/ro/messages.json    |  56 ++
 apps/browser/src/_locales/ru/messages.json    |  56 ++
 apps/browser/src/_locales/si/messages.json    |  56 ++
 apps/browser/src/_locales/sk/messages.json    |  56 ++
 apps/browser/src/_locales/sl/messages.json    |  56 ++
 apps/browser/src/_locales/sr/messages.json    |  56 ++
 apps/browser/src/_locales/sv/messages.json    |  56 ++
 apps/browser/src/_locales/te/messages.json    |  56 ++
 apps/browser/src/_locales/th/messages.json    |  56 ++
 apps/browser/src/_locales/tr/messages.json    |  56 ++
 apps/browser/src/_locales/uk/messages.json    |  56 ++
 apps/browser/src/_locales/vi/messages.json    |  56 ++
 apps/browser/src/_locales/zh_CN/messages.json |  82 +-
 apps/browser/src/_locales/zh_TW/messages.json | 746 ++++++++++--------
 apps/browser/store/locales/zh_CN/copy.resx    |   4 +-
 61 files changed, 3721 insertions(+), 361 deletions(-)

diff --git a/apps/browser/src/_locales/ar/messages.json b/apps/browser/src/_locales/ar/messages.json
index 46f119bdaf..8b4bbe23e0 100644
--- a/apps/browser/src/_locales/ar/messages.json
+++ b/apps/browser/src/_locales/ar/messages.json
@@ -2324,6 +2324,9 @@
     "message": "النطاقات",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "النطاقات المستبعدة"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden لن يطلب حفظ تفاصيل تسجيل الدخول لهذه النطافات لجميع الحسابات مسجلة الدخول. يجب عليك تحديث الصفحة لكي تصبح التغييرات نافذة المفعول."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "الموقع $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "تم حفظ تغييرات استبعاد النطاقات"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "خطأ"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "إنشاء اسم المستخدم"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/az/messages.json b/apps/browser/src/_locales/az/messages.json
index 51bfe95a48..86f1d07fb3 100644
--- a/apps/browser/src/_locales/az/messages.json
+++ b/apps/browser/src/_locales/az/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domenlər",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Əngəllənmiş domenlər"
+  },
   "excludedDomains": {
     "message": "İstisna edilən domenlər"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden, giriş etmiş bütün hesablar üçün bu domenlərin giriş detallarını saxlamağı soruşmayacaq. Dəyişikliklərin qüvvəyə minməsi üçün səhifəni təzələməlisiniz."
   },
+  "blockedDomainsDesc": {
+    "message": "Bu veb saytlar üçün avto-doldurma və digər əlaqəli özəlliklər təklif olunmayacaq. Dəyişikliklərin qüvvəyə minməsi üçün səhifəni təzələməlisiniz."
+  },
+  "autofillBlockedNotice": {
+    "message": "Bu veb sayt üçün avto-doldurma əngəllənib. Bunu ayarlarda incələyin və ya dəyişdirin."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Bu veb saytda avto-doldurma əngəllənib. Ayarlarda incələyin."
+  },
   "websiteItemLabel": {
     "message": "Veb sayt $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Əngəllənmiş domen dəyişiklikləri saxlanıldı"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "İstisna domen dəyişikliyi saxlanıldı"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Xəta"
   },
+  "decryptionError": {
+    "message": "Şifrə açma xətası"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden, aşağıda sadalanan seyf element(lər)inin şifrəsini aça bilmədi."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Əlavə data itkisini önləmək üçün",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "müştəri dəstəyi ilə əlaqə saxlayın.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "İstifadəçi adı yarat"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "Bu elementə düzəliş etmə icazəniz yoxdur"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Əvvəlcə PIN və ya parol ilə kilid açma tələb olunduğu üçün biometrik ilə kilid açma əlçatmazdır."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometrik kilid açma indi əlçatmazdır."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Yanlış konfiqurasiya edilmiş sistem fayllarına görə biometrik kilid açma əlçatmazdır."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Yanlış konfiqurasiya edilmiş sistem fayllarına görə biometrik kilid açma əlçatmazdır."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Bitwarden masaüstü tətbiqi bağlı olduğu üçün biometrik kilid açma əlçatmazdır."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Bitwarden masaüstü tətbiqində $EMAIL$ üçün fəal olmadığına görə biometrik kilid açma əlçatmazdır.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Bilinməyən bilinməyən bir səbəbə görə biometrik kilid açma əlçatmazdır."
+  },
   "authenticating": {
     "message": "Kimlik doğrulama"
   },
diff --git a/apps/browser/src/_locales/be/messages.json b/apps/browser/src/_locales/be/messages.json
index 46c804d27d..036b1dfcb2 100644
--- a/apps/browser/src/_locales/be/messages.json
+++ b/apps/browser/src/_locales/be/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Дамены",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Выключаныя дамены"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Вэб-сайт $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Памылка"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Генерыраваць імя карыстальніка"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/bg/messages.json b/apps/browser/src/_locales/bg/messages.json
index 7cbbdc07be..098e2b9105 100644
--- a/apps/browser/src/_locales/bg/messages.json
+++ b/apps/browser/src/_locales/bg/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Домейни",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Блокирани домейни"
+  },
   "excludedDomains": {
     "message": "Изключени домейни"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Битуорден няма да пита дали да запазва данните за вход в тези сайтове за всички регистрации, в които сте вписан(а). За да влезе правилото в сила, презаредете страницата."
   },
+  "blockedDomainsDesc": {
+    "message": "Автоматичното попълване и други свързани функции няма да бъдат предлагани за тези уеб сайтове. Трябва да презаредите страницата, за да влязат в сила промените."
+  },
+  "autofillBlockedNotice": {
+    "message": "Автоматичното попълване е блокирано за този уеб сайт. Можете да прегледате и промените това в настройките."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Автоматичното попълване е блокирано за този уеб сайт. Можете да прегледате това в настройките."
+  },
   "websiteItemLabel": {
     "message": "Уеб сайт $number$ (адрес)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Промените на блокираните домейни са запазени"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Промените на изключените домейни са запазени"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Грешка"
   },
+  "decryptionError": {
+    "message": "Грешка при дешифриране"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Битоурден не може да дешифрира елементите от трезора посочени по-долу."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Свържете се с поддръжката",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "за да избегнете загубата на данни.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Генериране на потр. име"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "Нямате право за редактиране на този елемент"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Отключването с биометрични данни не е налично, тъй като първо се изисква отключване чрез ПИН или парола."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Отключването с биометрични данни не е налично в момента."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Отключването с биометрични данни не е налично поради неправилно настроени системни файлове."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Отключването с биометрични данни не е налично поради неправилно настроени системни файлове."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Отключването с биометрични данни не е налично, тъй като приложението на Биуорден за компютър не работи."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Отключването с биометрични данни не е налично, тъй като не е включено за $EMAIL$ в приложението на Битуорден за компютър.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Отключването с биометрични данни не е налично по неизвестна причина."
+  },
   "authenticating": {
     "message": "Удостоверяване"
   },
diff --git a/apps/browser/src/_locales/bn/messages.json b/apps/browser/src/_locales/bn/messages.json
index 2da7b40554..f60fc2c968 100644
--- a/apps/browser/src/_locales/bn/messages.json
+++ b/apps/browser/src/_locales/bn/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Excluded domains"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Generate username"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/bs/messages.json b/apps/browser/src/_locales/bs/messages.json
index 9f5a610c35..aaf04da98b 100644
--- a/apps/browser/src/_locales/bs/messages.json
+++ b/apps/browser/src/_locales/bs/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Excluded domains"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Generate username"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/ca/messages.json b/apps/browser/src/_locales/ca/messages.json
index b38783abc8..e7113d5aab 100644
--- a/apps/browser/src/_locales/ca/messages.json
+++ b/apps/browser/src/_locales/ca/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Dominis",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Dominis exclosos"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden no demanarà que es guarden les dades d'inici de sessió d'aquests dominis per a tots els comptes iniciats. Heu d'actualitzar la pàgina perquè els canvis tinguen efecte."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Genera un nom d'usuari"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/cs/messages.json b/apps/browser/src/_locales/cs/messages.json
index bcc7020ffb..eb2f9149da 100644
--- a/apps/browser/src/_locales/cs/messages.json
+++ b/apps/browser/src/_locales/cs/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domény",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blokované domény"
+  },
   "excludedDomains": {
     "message": "Vyloučené domény"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden nebude žádat o uložení přihlašovacích údajů pro tyto domény pro všechny přihlášené účty. Aby se změny projevily, musíte stránku obnovit."
   },
+  "blockedDomainsDesc": {
+    "message": "Automatické vyplňování a další související funkce nebudou pro tyto webové stránky nabízeny. Aby se změny projevily, musíte stránku aktualizovat."
+  },
+  "autofillBlockedNotice": {
+    "message": "Automatické vyplňování je pro tento web zablokováno. Zkontrolujte to nebo to změňte v nastavení."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Automatické vyplňování je pro tento web zablokováno. Zkontrolujte to v nastavení."
+  },
   "websiteItemLabel": {
     "message": "Webová stránka $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Změny v zablokovaných doménách byly uloženy"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Vyloučené změny domény byly uloženy"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Chyba"
   },
+  "decryptionError": {
+    "message": "Chyba dešifrování"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden nemohl dešifrovat níže uvedené položky v trezoru."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Kontaktujte zákaznickou podporu,",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "abyste zabránili ztrátě dat.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Vygenerovat uživatelské jméno"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "Nemáte oprávnění upravit tuto položku"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometrické odemknutí je nedostupné, protože je potřeba nejprve odemknout pomocí PIN nebo hesla."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometrické odemknutí je momentálně nedostupné."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometrické odemknutí není dostupné kvůli chybnému nastavení systémových souborů."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometrické odemknutí není dostupné kvůli chybnému nastavení systémových souborů."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometrické odemknutí není dostupné, protože je aplikace Bitwarden zavřena."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometrické odemknutí není dostupné, protože není povoleno pro $EMAIL$ v desktopové aplikaci Bitwarden.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometrické odemknutí je momentálně z neznámého důvodu nedostupné."
+  },
   "authenticating": {
     "message": "Ověřování"
   },
diff --git a/apps/browser/src/_locales/cy/messages.json b/apps/browser/src/_locales/cy/messages.json
index 3bc85b10fb..8ad494f0bf 100644
--- a/apps/browser/src/_locales/cy/messages.json
+++ b/apps/browser/src/_locales/cy/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Parthau wedi'u heithrio"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Gwall"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Cynhyrchu enw defnyddiwr"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/da/messages.json b/apps/browser/src/_locales/da/messages.json
index 433cdebbb1..9008049e1a 100644
--- a/apps/browser/src/_locales/da/messages.json
+++ b/apps/browser/src/_locales/da/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domæner",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blokerede domæner"
+  },
   "excludedDomains": {
     "message": "Ekskluderede domæner"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden vil ikke anmode om at gemme login-detaljer for disse domæner for alle indloggede konti. Siden skal opfriskes for at effektuere ændringerne."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofyldning og andre relaterede funktioner tilbydes ikke på disse websteder. Siden skal opdateres for at effektuere ændringerne."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autoudfyldning er blokeret på dette websted. Gennemgå eller ændr dette i Indstillinger."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autoudfyldning er blokeret på dette websted. Gennemgå i Indstillinger."
+  },
   "websiteItemLabel": {
     "message": "Websted $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blokeret domæne-ændringer gemt"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Ekskluderet domæne-ændringer gemt"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Fejl"
   },
+  "decryptionError": {
+    "message": "Dekrypteringsfejl"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden kunne ikke dekryptere boks-emne(r) anført nedenfor."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Kontakt kundeservice",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "for at undgå yderligere tab af data.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Generér brugernavn"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "Ingen tilladelse til at redigere dette emne"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometrisk oplåsning er utilgængelig, da PIN- eller adgangskode kræves først."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometrisk oplåsning er p.t. utilgængelig."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometrisk oplåsning er utilgængelig grundet fejlopsatte systemfiler."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometrisk oplåsning er utilgængelig grundet fejlopsatte systemfiler."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometrisk oplåsning er utilgængelig, da Bitwarden-appen er lukket."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometrisk oplåsning er utilgængelig, da det ikke er aktiveret for $EMAIL$ i Bitwarden computer-appen.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometrisk oplåsning er p.t. utilgængelig grundet en ukendt årsag."
+  },
   "authenticating": {
     "message": "Godkender"
   },
diff --git a/apps/browser/src/_locales/de/messages.json b/apps/browser/src/_locales/de/messages.json
index 2fc5297205..bc1158bfc2 100644
--- a/apps/browser/src/_locales/de/messages.json
+++ b/apps/browser/src/_locales/de/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Ausgeschlossene Domains"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden wird für alle angemeldeten Konten nicht danach fragen Zugangsdaten für diese Domains speichern. Du musst die Seite neu laden, damit die Änderungen wirksam werden."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill und andere zugehörige Funktionen werden für diese Websites nicht angeboten. Sie müssen die Seite aktualisieren, damit die Änderungen wirksam werden."
+  },
+  "autofillBlockedNotice": {
+    "message": "Das automatische Ausfüllen ist für diese Website gesperrt. Dieses Verhalten kann in den Einstellungen überprüft oder geändert werden."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Änderungen der ausgeschlossenen Domain gespeichert"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Fehler"
   },
+  "decryptionError": {
+    "message": "Entschlüsselungsfehler"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden konnte den unten aufgelisteten Tresoreintrag bzw. die Tresoreinträge nicht entschlüsseln."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Benutzername generieren"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "Du bist nicht berechtigt, diesen Eintrag zu bearbeiten"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authentifizierung"
   },
diff --git a/apps/browser/src/_locales/el/messages.json b/apps/browser/src/_locales/el/messages.json
index a33bc4d0e2..bdb0eb2c17 100644
--- a/apps/browser/src/_locales/el/messages.json
+++ b/apps/browser/src/_locales/el/messages.json
@@ -1005,7 +1005,7 @@
     "message": "Λίστα στοιχείων ταυτότητας στη σελίδα Καρτέλας για εύκολη αυτόματη συμπλήρωση."
   },
   "clickToAutofillOnVault": {
-    "message": "Click items to autofill on Vault view"
+    "message": "Κάντε κλικ στα αντικείμενα για αυτόματη συμπλήρωση στην προβολή Θησαυ/κίου"
   },
   "clearClipboard": {
     "message": "Εκκαθάριση Πρόχειρου",
@@ -2324,6 +2324,9 @@
     "message": "Τομείς",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Αποκλεισμένοι τομείς"
+  },
   "excludedDomains": {
     "message": "Εξαιρούμενοι Τομείς"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Το Bitwarden δε θα ρωτήσει για να αποθηκεύσετε τα στοιχεία σύνδεσης για αυτούς τους τομείς, για όλους τους συνδεδεμένους λογαριασμούς. Πρέπει να ανανεώσετε τη σελίδα για να τεθούν σε ισχύ οι αλλαγές."
   },
+  "blockedDomainsDesc": {
+    "message": "Η αυτόματη συμπλήρωση και άλλες σχετικές λειτουργίες δεν θα προσφερθούν για αυτούς τους ιστότοπους. Πρέπει να ανανεώσετε τη σελίδα για να τεθούν σε ισχύ οι αλλαγές."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Ιστοσελίδα $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Οι αλλαγές αποκλεισμένων τομέων αποθηκεύτηκαν"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Σφάλμα"
   },
+  "decryptionError": {
+    "message": "Σφάλμα αποκρυπτογράφησης"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Το Bitwarden δεν μπόρεσε να αποκρυπτογραφήσει τα αντικείμενα θησαυ/κίου που αναφέρονται παρακάτω."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Δημιουργία ονόματος χρήστη"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "Δεν έχετε δικαίωμα να επεξεργαστείτε αυτό το αντικείμενο"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Το βιομετρικό ξεκλείδωμα δεν είναι διαθέσιμο επειδή απαιτείται πρώτα το ξεκλείδωμα με PIN ή κωδικό πρόσβασης."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Το βιομετρικό ξεκλείδωμα δεν είναι διαθέσιμο προς το παρόν."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Το βιομετρικό ξεκλείδωμα δεν είναι διαθέσιμο λόγω εσφαλμένων ρυθμίσεων αρχείων συστήματος."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Το βιομετρικό ξεκλείδωμα δεν είναι διαθέσιμο λόγω εσφαλμένων ρυθμίσεων αρχείων συστήματος."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Το βιομετρικό ξεκλείδωμα δεν είναι διαθέσιμο επειδή η εφαρμογή Bitwarden επιφάνειας εργασίας είναι κλειστή."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Ταυτοποίηση"
   },
diff --git a/apps/browser/src/_locales/en_GB/messages.json b/apps/browser/src/_locales/en_GB/messages.json
index 2c13f1b925..7e938bb6b2 100644
--- a/apps/browser/src/_locales/en_GB/messages.json
+++ b/apps/browser/src/_locales/en_GB/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Excluded domains"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Generate username"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/en_IN/messages.json b/apps/browser/src/_locales/en_IN/messages.json
index b6031381d2..70e725c3a8 100644
--- a/apps/browser/src/_locales/en_IN/messages.json
+++ b/apps/browser/src/_locales/en_IN/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Excluded Domains"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Generate Username"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/es/messages.json b/apps/browser/src/_locales/es/messages.json
index d26716dd90..d9cd251781 100644
--- a/apps/browser/src/_locales/es/messages.json
+++ b/apps/browser/src/_locales/es/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Dominios",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Dominios excluidos"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden no pedirá que se guarden los datos de acceso para estos dominios en todas las sesiones iniciadas. Debe actualizar la página para que los cambios surtan efecto."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Generar nombre de usuario"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "No tiene permiso de editar este elemento"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/et/messages.json b/apps/browser/src/_locales/et/messages.json
index 069135ddb0..5245de4fb7 100644
--- a/apps/browser/src/_locales/et/messages.json
+++ b/apps/browser/src/_locales/et/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Väljajäetud domeenid"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Viga"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Genereeri kasutajanimi"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/eu/messages.json b/apps/browser/src/_locales/eu/messages.json
index 47a56583c6..fc875be6da 100644
--- a/apps/browser/src/_locales/eu/messages.json
+++ b/apps/browser/src/_locales/eu/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Kanporatutako domeinuak"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Akatsa"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Sortu erabiltzaile izena"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/fa/messages.json b/apps/browser/src/_locales/fa/messages.json
index 2b8a5e20da..d2362a2655 100644
--- a/apps/browser/src/_locales/fa/messages.json
+++ b/apps/browser/src/_locales/fa/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "دامنه های مستثنی"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "خطا"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "ایجاد نام کاربری"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/fi/messages.json b/apps/browser/src/_locales/fi/messages.json
index 718c063115..0dd96ef9a0 100644
--- a/apps/browser/src/_locales/fi/messages.json
+++ b/apps/browser/src/_locales/fi/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Verkkotunnukset",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Ohitettavat verkkotunnukset"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden ei pyydä kirjautumistietojen tallennusta näillä verkkotunnuksilla. Koskee kaikkia kirjautuneita tilejä. Ota muutokset käyttöön päivittämällä sivu."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Verkkotunnus $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Rajoitettujen verkkotunnusten muutokset tallennettiin"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Virhe"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Luo käyttäjätunnus"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "Sinulla ei ole oikeutta muokata tätä kohdetta"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Todennetaan"
   },
diff --git a/apps/browser/src/_locales/fil/messages.json b/apps/browser/src/_locales/fil/messages.json
index a504cbd317..d0fdf1018f 100644
--- a/apps/browser/src/_locales/fil/messages.json
+++ b/apps/browser/src/_locales/fil/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Inilayo na Domain"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Mali"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Lumikha ng username"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/fr/messages.json b/apps/browser/src/_locales/fr/messages.json
index 9566f45786..913391d218 100644
--- a/apps/browser/src/_locales/fr/messages.json
+++ b/apps/browser/src/_locales/fr/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domaines",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Domaines bloqués"
+  },
   "excludedDomains": {
     "message": "Domaines exclus"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden ne demandera pas d'enregistrer les détails de connexion pour ces domaines pour tous les comptes connectés. Vous devez actualiser la page pour que les modifications prennent effet."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Site web $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Changements de domaines exclus enregistrés"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Erreur"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Générer un nom d'utilisateur"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "Vous n'êtes pas autorisé à modifier cet élément"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authentification"
   },
diff --git a/apps/browser/src/_locales/gl/messages.json b/apps/browser/src/_locales/gl/messages.json
index b3eaae6448..e655159f24 100644
--- a/apps/browser/src/_locales/gl/messages.json
+++ b/apps/browser/src/_locales/gl/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Dominios",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Dominios excluídos"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden non ofrecerá gardar contas para estes dominios en ningunha das sesións iniciadas. Recarga a páxina para que os cambios fornezan efecto."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Web $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Dominios excluídos gardados"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Erro"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Xerar nome de usuario"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "Non tes permiso para modificar esta entrada"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Autenticando"
   },
diff --git a/apps/browser/src/_locales/he/messages.json b/apps/browser/src/_locales/he/messages.json
index 5101c11a65..1a3057ac29 100644
--- a/apps/browser/src/_locales/he/messages.json
+++ b/apps/browser/src/_locales/he/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Excluded domains"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "שגיאה"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Generate username"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/hi/messages.json b/apps/browser/src/_locales/hi/messages.json
index 10ad502be8..fd4a6612af 100644
--- a/apps/browser/src/_locales/hi/messages.json
+++ b/apps/browser/src/_locales/hi/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "बहिष्कृत डोमेन"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "एरर"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "उपयोगकर्ता नाम बनाएँ"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/hr/messages.json b/apps/browser/src/_locales/hr/messages.json
index c93922cb91..331bc10930 100644
--- a/apps/browser/src/_locales/hr/messages.json
+++ b/apps/browser/src/_locales/hr/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domene",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Izuzete domene"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden neće nuditi spremanje podataka za prijavu za ove domene za sve prijavljene račune. Moraš osvježiti stranicu kako bi promjene stupile na snagu."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Web stranica $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Spremljene promjene izuzete domene"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Pogreška"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Generiraj korisničko ime"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "Nemaš prava za uređivanje ove stavke"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Autentifikacija"
   },
diff --git a/apps/browser/src/_locales/hu/messages.json b/apps/browser/src/_locales/hu/messages.json
index 8b8c972290..0aea2c7ece 100644
--- a/apps/browser/src/_locales/hu/messages.json
+++ b/apps/browser/src/_locales/hu/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Tartomány",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Letiltott tartományok"
+  },
   "excludedDomains": {
     "message": "Kizárt domainek"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "A Bitwarden nem kéri a bejelentkezési adatok mentését ezeknél a tartományoknál az összes bejelentkezési fiókra vonatkozva. A változtatások életbe lépéséhez frissíteni kell az oldalt."
   },
+  "blockedDomainsDesc": {
+    "message": "Az automatikus kitöltés és az egyéb kapcsolódó funkciók ezeken a webhelyeken nincsenek a kínálatban. A változtatások életbe lépéséhez frissíteni kell az oldalt."
+  },
+  "autofillBlockedNotice": {
+    "message": "Az automatikus kitöltés le van tiltva ezen a webhelyen. Tekintsük át vagy módosítsuk ezt a beállításokban."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Az automatikus kitöltés le van tiltva ezen a webhelyen. Tekintsük át ezt a beállításokban."
+  },
   "websiteItemLabel": {
     "message": "Webhely $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "A letiltott tartomány módosítások mentésre kerültek."
+  },
   "excludedDomainsSavedSuccess": {
     "message": "A kizárt tartomány módosítások mentésre kerültek."
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Hiba"
   },
+  "decryptionError": {
+    "message": "Visszafejtési hiba"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "A Bitwarden nem tudta visszafejteni az alább felsorolt ​​széf elemeket."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Ügyfélszolgálat elérése",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "további adatvesztés elkerülése érdekében.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Felhasználónév generálása"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "Nincs jogosulltság ezen elem szerkesztéséheu."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "A biometrikus feloldás nem érhető el, mert először PIN kóddal vagy jelszóval kell feloldani."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "A biometrikus feloldás jelenleg nem érhető el."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "A biometrikus feloldás nem érhető el a rosszul konfigurált rendszerfájlok miatt."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "A biometrikus feloldás nem érhető el a rosszul konfigurált rendszerfájlok miatt."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "A biometrikus feloldás nem érhető el, mert a Bitwarden asztali alkalmazás be van zárva."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "A biometrikus feloldás nem érhető el, mert nincs engedélyezve $EMAIL$ számára a Bitwarden asztali alkalmazásban.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "A biometrikus feloldás jelenleg ismeretlen okból nem érhető el."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/id/messages.json b/apps/browser/src/_locales/id/messages.json
index 7b1ad51e0b..82776a8e82 100644
--- a/apps/browser/src/_locales/id/messages.json
+++ b/apps/browser/src/_locales/id/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domain",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Domain yang Dikecualikan"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden tidak akan meminta untuk menyimpan rincian login untuk domain tersebut. Anda harus menyegarkan halaman agar perubahan diterapkan."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Situs web $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Perubahan domain yang diabaikan telah disimpan"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Galat"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Buat nama pengguna baru"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/it/messages.json b/apps/browser/src/_locales/it/messages.json
index 6490a44183..0653623f07 100644
--- a/apps/browser/src/_locales/it/messages.json
+++ b/apps/browser/src/_locales/it/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domini",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Domini bloccati"
+  },
   "excludedDomains": {
     "message": "Domini esclusi"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden non chiederà di salvare le credenziali di accesso per questi domini per tutti gli account sul dispositivo. Ricarica la pagina affinché le modifiche abbiano effetto."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Sito $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Modifiche del dominio escluso salvate"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Errore"
   },
+  "decryptionError": {
+    "message": "Errore di decifrazione"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden non può decifrare gli elementi elencati di seguito."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contatta il cliente correttamente",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "per evitare ulteriori perdite di dati.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Genera nome utente"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "Non hai i permessi per modificare questo elemento"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Lo sblocco biometrico non è disponibile perché è necessario prima sbloccare con PIN o parola d'accesso."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Lo sblocco biometrico non è attualmente disponibile."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Lo sblocco biometrico non è disponibile a causa di file di sistema mal configurati."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Lo sblocco biometrico non è disponibile a causa di file di sistema mal configurati."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Lo sblocco biometrico non è disponibile perché l'app desktop Bitwarden è chiusa."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Lo sblocco biometrico non è disponibile perché non è abilitato per $EMAIL$ nell'app desktop Bitwarden.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Lo sblocco biometrico non è attualmente disponibile per un motivo sconosciuto."
+  },
   "authenticating": {
     "message": "Autenticazione"
   },
diff --git a/apps/browser/src/_locales/ja/messages.json b/apps/browser/src/_locales/ja/messages.json
index 42dd73020e..cc1f34e498 100644
--- a/apps/browser/src/_locales/ja/messages.json
+++ b/apps/browser/src/_locales/ja/messages.json
@@ -2324,6 +2324,9 @@
     "message": "ドメイン",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "除外するドメイン"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden はログインしているすべてのアカウントで、これらのドメインのログイン情報を保存するよう要求しません。 変更を有効にするにはページを更新する必要があります。"
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "ウェブサイト $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "除外ドメインの変更を保存しました"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "エラー"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "ユーザー名を生成"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "このアイテムを編集する権限がありません"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "認証中"
   },
diff --git a/apps/browser/src/_locales/ka/messages.json b/apps/browser/src/_locales/ka/messages.json
index 5da73c6755..50fdc6613c 100644
--- a/apps/browser/src/_locales/ka/messages.json
+++ b/apps/browser/src/_locales/ka/messages.json
@@ -2324,6 +2324,9 @@
     "message": "დომენები",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Excluded domains"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "შეცდომა"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Generate username"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "ავთენტიკაცია"
   },
diff --git a/apps/browser/src/_locales/km/messages.json b/apps/browser/src/_locales/km/messages.json
index 6ab3755c8f..e34751eea7 100644
--- a/apps/browser/src/_locales/km/messages.json
+++ b/apps/browser/src/_locales/km/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Excluded domains"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Generate username"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/kn/messages.json b/apps/browser/src/_locales/kn/messages.json
index 09e26c18b5..3f9e99e563 100644
--- a/apps/browser/src/_locales/kn/messages.json
+++ b/apps/browser/src/_locales/kn/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "ಹೊರತುಪಡಿಸಿದ ಡೊಮೇನ್ಗಳು"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Generate username"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/ko/messages.json b/apps/browser/src/_locales/ko/messages.json
index d6da55f600..4ac6d281b0 100644
--- a/apps/browser/src/_locales/ko/messages.json
+++ b/apps/browser/src/_locales/ko/messages.json
@@ -2324,6 +2324,9 @@
     "message": "도메인",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "제외된 도메인"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "BItwarden은 로그인한 모든 계정에 대해 이러한 도메인에 대한 로그인 세부 정보를 저장하도록 요청하지 않습니다. 변경 사항을 적용하려면 페이지를 새로 고쳐야 합니다"
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "웹사이트 $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "제외된 도메인 변경 사항 저장됨"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "오류"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "아이디 생성"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "아이템을 수정할 권한이 없습니다."
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "인증 중"
   },
diff --git a/apps/browser/src/_locales/lt/messages.json b/apps/browser/src/_locales/lt/messages.json
index eaf1cb9f9d..3c81df00f1 100644
--- a/apps/browser/src/_locales/lt/messages.json
+++ b/apps/browser/src/_locales/lt/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domenai",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Išskirti domenai"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "„Bitwarden“ neprašys išsaugoti prisijungimo detalių šiems domenams, visose prisijungusiose paskyrose. Turite atnaujinti puslapį, kad pokyčiai pradėtų galioti."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Klaida"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Generuoti vartotojo vardą"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/lv/messages.json b/apps/browser/src/_locales/lv/messages.json
index 2c2a9c3c69..fc682ced38 100644
--- a/apps/browser/src/_locales/lv/messages.json
+++ b/apps/browser/src/_locales/lv/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domēna vārdi",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Liegtie domēna vārdi"
+  },
   "excludedDomains": {
     "message": "Izņēmuma domēni"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden nevaicās saglabāt pieteikšanās datus visiem šī domēna kontiem, kuri ir pieteikušies. Ir jāpārlādē lapa, lai iedarbotos izmaiņas."
   },
+  "blockedDomainsDesc": {
+    "message": "Automātiskā aizpilde un citas saistītās iespējas šajās tīmekļvietnēs netiks piedāvātas. Ir jāatsvaidzina lapa, lai izmaiņas iedarbotos."
+  },
+  "autofillBlockedNotice": {
+    "message": "Automātiskā aizpilde šajā tīmekļvietnē ir liegta. Šo pārskatīt vai mainīt var iestatījumos."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Automātiskā aizpilde šajā tīmekļvietnē ir liegta. Šo var pārskatīt iestatījumos."
+  },
   "websiteItemLabel": {
     "message": "Tīmekļvietne $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Liegtā domēna vārda izmaiņas sglabātas"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Saglabātas vērā neņemto domēna vārdu izmaiņas"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Kļūda"
   },
+  "decryptionError": {
+    "message": "Atšifrēšanas kļūda"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden nevarēja atšifrēt zemāk uzskaitītos glabātavas vienumus."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Jāsazinās ar klientu atbalstu,",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "lai izvairītos no papildu datu zaudējumiem.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Izveidot lietotājvārdu"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "Nav nepieciešamo atļauju, lai labotu šo vienumu"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Atslēgšana ar biometriju nav pieejama, jo vispirms ir nepieciešama atslēgšana ar PIN vai paroli."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Atslēgšana ar biometriju pašlaik nav pieejama."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Atslēgšana ar biometriju nav pieejama nepareizi konfigurētu sistēmas datņu dēļ."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Atslēgšana ar biometriju nav pieejama nepareizi konfigurētu sistēmas datņu dēļ."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Atslēgšana ar biometriju nav pieejama, jo Bitwarden darbvirsmas lietotne ir aizvērta."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Atslēgšana ar biometriju nav pieejama, jo tā nav iespējota $EMAIL$ Bitwarden darbvirsmas lietotnē.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Atslēgšana ar biometriju pašlaik nav pieejama nezināma iemesla dēļ."
+  },
   "authenticating": {
     "message": "Autentificē"
   },
diff --git a/apps/browser/src/_locales/ml/messages.json b/apps/browser/src/_locales/ml/messages.json
index cd210c85ce..4cbbfc46d6 100644
--- a/apps/browser/src/_locales/ml/messages.json
+++ b/apps/browser/src/_locales/ml/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Excluded domains"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Generate username"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/mr/messages.json b/apps/browser/src/_locales/mr/messages.json
index d156e6d645..cbb0b1bdf1 100644
--- a/apps/browser/src/_locales/mr/messages.json
+++ b/apps/browser/src/_locales/mr/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Excluded domains"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Generate username"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/my/messages.json b/apps/browser/src/_locales/my/messages.json
index 6ab3755c8f..e34751eea7 100644
--- a/apps/browser/src/_locales/my/messages.json
+++ b/apps/browser/src/_locales/my/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Excluded domains"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Generate username"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/nb/messages.json b/apps/browser/src/_locales/nb/messages.json
index 16469051a0..0e45e970ad 100644
--- a/apps/browser/src/_locales/nb/messages.json
+++ b/apps/browser/src/_locales/nb/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domener",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Ekskluderte domener"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Feil"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Generer brukernavn"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Autentiserer"
   },
diff --git a/apps/browser/src/_locales/ne/messages.json b/apps/browser/src/_locales/ne/messages.json
index 6ab3755c8f..e34751eea7 100644
--- a/apps/browser/src/_locales/ne/messages.json
+++ b/apps/browser/src/_locales/ne/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Excluded domains"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Generate username"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/nl/messages.json b/apps/browser/src/_locales/nl/messages.json
index d167ba220c..0112ded198 100644
--- a/apps/browser/src/_locales/nl/messages.json
+++ b/apps/browser/src/_locales/nl/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domeinen",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Geblokkeerde domeinen"
+  },
   "excludedDomains": {
     "message": "Uitgesloten domeinen"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden zal voor deze domeinen niet vragen om de wachtwoorden op te slaan voor alle ingelogde accounts. Je moet de pagina verversen om de wijzigingen op te slaan."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill en andere gerelateerde functies worden niet aangeboden voor deze websites. Vernieuw de pagina om de wijzigingen toe te passen."
+  },
+  "autofillBlockedNotice": {
+    "message": "Automatisch invullen is geblokkeerd voor deze website. Bekijk of verander dit in de instellingen."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Automatisch invullen is geblokkeerd voor deze website. Bekijk in de instellingen."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Wijzigingen in geblokkeerde domeinen opgeslagen"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Uitgesloten domeinwijzigingen opgeslagen"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Fout"
   },
+  "decryptionError": {
+    "message": "Ontsleutelingsfout"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden kon de onderstaande kluisitem(s) niet ontsleutelen."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Neem contact op met de klantenservice",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "om extra dataverlies te voorkomen.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Gebruikersnamen genereren"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "Je hebt geen toestemming om dit item te bewerken"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometrisch ontgrendelen is niet beschikbaar omdat pincode of wachtwoordontgrendeling eerst vereist is."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometrisch ontgrendelen is momenteel niet beschikbaar."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometrisch ontgrendelen is niet beschikbaar vanwege verkeerd geconfigureerde systeembestanden."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometrisch ontgrendelen is niet beschikbaar vanwege verkeerd geconfigureerde systeembestanden."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometrisch ontgrendelen is niet beschikbaar omdat de Bitwarden-desktopapp is afgesloten."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometrisch ontgrendelen is niet beschikbaar omdat het niet is ingeschakeld voor $EMAIL$ in de Bitwarden-desktopapp.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometrisch ontgrendelen is momenteel niet beschikbaar om een onbekende reden."
+  },
   "authenticating": {
     "message": "Aan het inloggen"
   },
diff --git a/apps/browser/src/_locales/nn/messages.json b/apps/browser/src/_locales/nn/messages.json
index 6ab3755c8f..e34751eea7 100644
--- a/apps/browser/src/_locales/nn/messages.json
+++ b/apps/browser/src/_locales/nn/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Excluded domains"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Generate username"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/or/messages.json b/apps/browser/src/_locales/or/messages.json
index 6ab3755c8f..e34751eea7 100644
--- a/apps/browser/src/_locales/or/messages.json
+++ b/apps/browser/src/_locales/or/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Excluded domains"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Generate username"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/pl/messages.json b/apps/browser/src/_locales/pl/messages.json
index a429059ea7..4b7d3a19fc 100644
--- a/apps/browser/src/_locales/pl/messages.json
+++ b/apps/browser/src/_locales/pl/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domeny",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Wykluczone domeny"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Aplikacja Bitwarden nie będzie proponować zapisywania danych logowania dla tych domen dla wszystkich zalogowanych kont. Musisz odświeżyć stronę, aby zastosowywać zmiany."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Strona internetowa $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Zmiany w wykluczonych domenach zapisane"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Błąd"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Wygeneruj nazwę użytkownika"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "Nie masz uprawnień do edycji tego elementu"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Uwierzytelnianie"
   },
diff --git a/apps/browser/src/_locales/pt_BR/messages.json b/apps/browser/src/_locales/pt_BR/messages.json
index cd0c997910..e3409b1da5 100644
--- a/apps/browser/src/_locales/pt_BR/messages.json
+++ b/apps/browser/src/_locales/pt_BR/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domínios",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Domínios Excluídos"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "O Bitwarden não irá pedir para salvar os detalhes de credencial para estes domínios. Você deve atualizar a página para que as alterações entrem em vigor."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Site $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Mudanças de domínios excluídos salvas"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Erro"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Gerar Usuário"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "Você não tem permissão para editar este arquivo"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Autenticando"
   },
diff --git a/apps/browser/src/_locales/pt_PT/messages.json b/apps/browser/src/_locales/pt_PT/messages.json
index def50289ae..6b3c190f0b 100644
--- a/apps/browser/src/_locales/pt_PT/messages.json
+++ b/apps/browser/src/_locales/pt_PT/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domínios",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Domínios bloqueados"
+  },
   "excludedDomains": {
     "message": "Domínios excluídos"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "O Bitwarden não pedirá para guardar os detalhes de início de sessão destes domínios para todas as contas com sessão iniciada. É necessário atualizar a página para que as alterações tenham efeito."
   },
+  "blockedDomainsDesc": {
+    "message": "O preenchimento automático e outras funcionalidades relacionadas não serão disponibilizados para estes sites. É necessário atualizar a página para que as alterações tenham efeito."
+  },
+  "autofillBlockedNotice": {
+    "message": "O preenchimento automático está bloqueado para este site. Reveja ou altere esta opção nas definições."
+  },
+  "autofillBlockedTooltip": {
+    "message": "O preenchimento automático está bloqueado neste site. Reveja nas definições."
+  },
   "websiteItemLabel": {
     "message": "Site $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Alterações do domínio bloqueado guardadas"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Alterações do domínio excluído guardadas"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Erro"
   },
+  "decryptionError": {
+    "message": "Erro de desencriptação"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "O Bitwarden não conseguiu desencriptar o(s) item(ns) do cofre listado(s) abaixo."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contacte o serviço de apoio ao cliente",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "para evitar perdas adicionais de dados.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Gerar nome de utilizador"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "Não tem permissão para editar este item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "O desbloqueio biométrico não está disponível porque o desbloqueio por PIN ou palavra-passe é necessário primeiro."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "O desbloqueio biométrico está atualmente indisponível."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "O desbloqueio biométrico não está disponível devido a ficheiros de sistema mal configurados."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "O desbloqueio biométrico não está disponível devido a ficheiros de sistema mal configurados."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "O desbloqueio biométrico não está disponível porque a app para computador Bitwarden está fechada."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "O desbloqueio biométrico não está disponível porque não está ativado para $EMAIL$ na app Bitwarden para computador.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "O desbloqueio biométrico está atualmente indisponível por um motivo desconhecido."
+  },
   "authenticating": {
     "message": "A autenticar"
   },
diff --git a/apps/browser/src/_locales/ro/messages.json b/apps/browser/src/_locales/ro/messages.json
index 58c0a313f6..114c01aff4 100644
--- a/apps/browser/src/_locales/ro/messages.json
+++ b/apps/browser/src/_locales/ro/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Domenii excluse"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Eroare"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Generare nume de utilizator"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/ru/messages.json b/apps/browser/src/_locales/ru/messages.json
index acdee563ce..53f31813ac 100644
--- a/apps/browser/src/_locales/ru/messages.json
+++ b/apps/browser/src/_locales/ru/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Домены",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Заблокированные домены"
+  },
   "excludedDomains": {
     "message": "Исключенные домены"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden не будет предлагать сохранение логинов для этих доменов для всех авторизованных аккаунтов. Для вступления изменений в силу необходимо обновить страницу."
   },
+  "blockedDomainsDesc": {
+    "message": "Автозаполнение и другие связанные с ним функции не будут предлагаться для этих сайтов. Чтобы изменения вступили в силу, необходимо обновить страницу."
+  },
+  "autofillBlockedNotice": {
+    "message": "Автозаполнение для этого сайта заблокировано. Просмотрите или измените это в настройках."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Автозаполнение на этом сайте заблокировано. Просмотрите в настройках."
+  },
   "websiteItemLabel": {
     "message": "Сайт $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Изменения в заблокированном домене сохранены"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Изменения в исключенном домене сохранены"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Ошибка"
   },
+  "decryptionError": {
+    "message": "Ошибка расшифровки"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden не удалось расшифровать элемент(ы) хранилища, перечисленные ниже."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Обратитесь в службу поддержки,",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "чтобы избежать дополнительной потери данных.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Создать имя пользователя"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "У вас нет разрешения на редактирование этого элемента"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Биометрическая разблокировка недоступна, поскольку сначала требуется разблокировка с помощью PIN-кода или пароля."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Биометрическая разблокировка в настоящее время недоступна."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Биометрическая разблокировка недоступна из-за неправильно настроенных системных файлов."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Биометрическая разблокировка недоступна из-за неправильно настроенных системных файлов."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Биометрическая разблокировка недоступна, поскольку Bitwarden для компьютера закрыт."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Биометрическая разблокировка недоступна, потому что она не включена для $EMAIL$ в приложении Bitwarden для компьютера.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Биометрическая разблокировка в настоящее время недоступна по неизвестной причине."
+  },
   "authenticating": {
     "message": "Аутентификация"
   },
diff --git a/apps/browser/src/_locales/si/messages.json b/apps/browser/src/_locales/si/messages.json
index b25c2fd30d..56cf378344 100644
--- a/apps/browser/src/_locales/si/messages.json
+++ b/apps/browser/src/_locales/si/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "බැහැර වසම්"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Generate username"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/sk/messages.json b/apps/browser/src/_locales/sk/messages.json
index 5d11227f00..08bfcc79f6 100644
--- a/apps/browser/src/_locales/sk/messages.json
+++ b/apps/browser/src/_locales/sk/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domény",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blokované domény"
+  },
   "excludedDomains": {
     "message": "Vylúčené domény"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden nebude požadovať ukladanie prihlasovacích údajov pre tieto domény pre všetky prihlásené účty. Aby sa zmeny prejavili, musíte stránku obnoviť."
   },
+  "blockedDomainsDesc": {
+    "message": "Automatické vypĺňanie a ďalšie súvisiace funkcie sa na týchto webových stránkach nebudú ponúkať. Aby sa zmeny prejavili, musíte stránku obnoviť."
+  },
+  "autofillBlockedNotice": {
+    "message": "Automatické vypĺňanie je pre túto webovú stránku zablokované. Skontrolujte alebo zmeňte to v nastaveniach."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Automatické vypĺňanie je na tejto webovej stránke zablokované. Pozrite v nastaveniach."
+  },
   "websiteItemLabel": {
     "message": "Webstránka $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Zmeny v blokovaných doménach boli uložené"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Uložené zmeny vylúčenej domény"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Chyba"
   },
+  "decryptionError": {
+    "message": "Chyba dešifrovania"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden nedokázal dešifrovať nižšie uvedené položky trezoru."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Kontaktujte zákaznícku podporu,",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "aby ste predišli ďalším stratám údajov.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Vygenerovať používateľské meno"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "Na úpravu tejto položky nemáte oprávnenie"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Odomykanie biometrickými údajmi je nedostupné pretože je najskôr potrebné odomykanie pomocou PIN alebo hesla."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Odomykanie biometrickými údajmi je momentálne nedostupné."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Odomykanie biometrickými údajmi je nedostupné v dôsledku zle nastavených systémových súborov."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Odomykanie biometrickými údajmi je nedostupné v dôsledku zle nastavených systémových súborov."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Odomykanie biometrickými údajmi je nedostupné, pretože aplikácia Bitwarden pre desktop je zatvorená."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Odomykanie biometrickými údajmi je nedostupné, pretože nie je povolené pre $EMAIL$ v aplikácii Bitwarden pre desktop.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Odomykanie biometrickými údajmi je momentálne z neznámych dôvodov nedostupné."
+  },
   "authenticating": {
     "message": "Overuje sa"
   },
diff --git a/apps/browser/src/_locales/sl/messages.json b/apps/browser/src/_locales/sl/messages.json
index 490f991d25..2d2ee45541 100644
--- a/apps/browser/src/_locales/sl/messages.json
+++ b/apps/browser/src/_locales/sl/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Izključene domene"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Napaka"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Ustvari uporabniško ime"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/sr/messages.json b/apps/browser/src/_locales/sr/messages.json
index d515c2a0c6..01d95a6ed1 100644
--- a/apps/browser/src/_locales/sr/messages.json
+++ b/apps/browser/src/_locales/sr/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Домени",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Изузети домени"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden неће тражити да сачува податке за пријављивање за ове домене за све пријављене налоге. Морате освежити страницу да би промене ступиле на снагу."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Сајт $number$ (УРЛ)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Изузете промене домена су сачуване"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Грешка"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Генериши име"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "Немате дозволу да уређујете ову ставку"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Аутентификација"
   },
diff --git a/apps/browser/src/_locales/sv/messages.json b/apps/browser/src/_locales/sv/messages.json
index 84de9bbfa0..a443a8e6b2 100644
--- a/apps/browser/src/_locales/sv/messages.json
+++ b/apps/browser/src/_locales/sv/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domäner",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Exkluderade domäner"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Webbplats $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Fel"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Generera användarnamn"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/te/messages.json b/apps/browser/src/_locales/te/messages.json
index 6ab3755c8f..e34751eea7 100644
--- a/apps/browser/src/_locales/te/messages.json
+++ b/apps/browser/src/_locales/te/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Excluded domains"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Generate username"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/th/messages.json b/apps/browser/src/_locales/th/messages.json
index d9ff1c3f07..1b493de3d2 100644
--- a/apps/browser/src/_locales/th/messages.json
+++ b/apps/browser/src/_locales/th/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Domains",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Excluded domains"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Excluded domain changes saved"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Generate username"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/tr/messages.json b/apps/browser/src/_locales/tr/messages.json
index e1236b3f86..8095a9f604 100644
--- a/apps/browser/src/_locales/tr/messages.json
+++ b/apps/browser/src/_locales/tr/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Alan adları",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Engellenen alan adları"
+  },
   "excludedDomains": {
     "message": "Hariç tutulan alan adları"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden, oturum açmış tüm hesaplar için bu alan adlarının hesap bilgilerini kaydetmeyi sormayacaktır. Değişikliklerin etkili olması için sayfayı yenilemeniz gerekir."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Web sitesi $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Engelli alan adı değişiklikleri kaydedildi"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Alan adı istisnası değişiklikleri kaydedildi"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Hata"
   },
+  "decryptionError": {
+    "message": "Şifre çözme sorunu"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Kullanıcı adı oluştur"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "Bu kaydı düzenleme yetkisine sahip değilsiniz"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Kimlik doğrulanıyor"
   },
diff --git a/apps/browser/src/_locales/uk/messages.json b/apps/browser/src/_locales/uk/messages.json
index 8e20bc56ff..d6b0b88ead 100644
--- a/apps/browser/src/_locales/uk/messages.json
+++ b/apps/browser/src/_locales/uk/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Домени",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Заблоковані домени"
+  },
   "excludedDomains": {
     "message": "Виключені домени"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden не запитуватиме про збереження даних входу для цих доменів для всіх облікових записів, до яких виконано вхід. Потрібно оновити сторінку для застосування змін."
   },
+  "blockedDomainsDesc": {
+    "message": "Автозаповнення та інші пов'язані функції не пропонуватимуться для цих вебсайтів. Вам слід оновити сторінку для застосування змін."
+  },
+  "autofillBlockedNotice": {
+    "message": "Автозаповнення заблоковано для цього вебсайту. Перегляньте або змініть це в налаштуваннях."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Автозаповнення заблоковано на цьому вебсайті. Перевірте налаштування."
+  },
   "websiteItemLabel": {
     "message": "Вебсайт $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Зміни заблокованих доменів збережено"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Виняток для домену збережено"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Помилка"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Генерувати ім'я користувача"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "Вам не дозволено редагувати цей запис"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Аутентифікація"
   },
diff --git a/apps/browser/src/_locales/vi/messages.json b/apps/browser/src/_locales/vi/messages.json
index 268b12a625..4ccdaf808f 100644
--- a/apps/browser/src/_locales/vi/messages.json
+++ b/apps/browser/src/_locales/vi/messages.json
@@ -2324,6 +2324,9 @@
     "message": "Các tên miền",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "Blocked domains"
+  },
   "excludedDomains": {
     "message": "Tên miền đã loại trừ"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "Bitwarden sẽ không yêu cầu lưu thông tin đăng nhập cho các miền này. Bạn phải làm mới trang để các thay đổi có hiệu lực."
   },
+  "blockedDomainsDesc": {
+    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+  },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Trang Web $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "Blocked domain changes saved"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "Các thay đổi tên miền loại trừ đã được lưu"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "Lỗi"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "Tạo tên người dùng"
   },
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "You don't have permission to edit this item"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "Biometric unlock is currently unavailable."
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "Biometric unlock is unavailable due to misconfigured system files."
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "Biometric unlock is currently unavailable for an unknown reason."
+  },
   "authenticating": {
     "message": "Authenticating"
   },
diff --git a/apps/browser/src/_locales/zh_CN/messages.json b/apps/browser/src/_locales/zh_CN/messages.json
index 69c1194af4..f11f0860d1 100644
--- a/apps/browser/src/_locales/zh_CN/messages.json
+++ b/apps/browser/src/_locales/zh_CN/messages.json
@@ -7,7 +7,7 @@
     "description": "Extension name, MUST be less than 40 characters (Safari restriction)"
   },
   "extDesc": {
-    "message": "无论是在家里、工作中还是在外出时，Bitwarden 都可以轻松地保护您的所有密码、通行密钥和敏感信息。",
+    "message": "无论是在家中、工作中还是在旅途中，Bitwarden 都可以轻松地保护您的所有密码、通行密钥和敏感信息。",
     "description": "Extension description, MUST be less than 112 characters (Safari restriction)"
   },
   "loginOrCreateNewAccount": {
@@ -855,13 +855,13 @@
     "message": "登录到 Bitwarden"
   },
   "restartRegistration": {
-    "message": "重新开始注册"
+    "message": "重启注册"
   },
   "expiredLink": {
     "message": "失效链接"
   },
   "pleaseRestartRegistrationOrTryLoggingIn": {
-    "message": "请重新注册或尝试登录。"
+    "message": "请重启注册或尝试登录。"
   },
   "youMayAlreadyHaveAnAccount": {
     "message": "您可能已经有一个账户了"
@@ -2324,6 +2324,9 @@
     "message": "域名",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "已屏蔽的域名"
+  },
   "excludedDomains": {
     "message": "排除域名"
   },
@@ -2331,7 +2334,16 @@
     "message": "Bitwarden 将不会询问是否为这些域名保存登录信息。您必须刷新页面才能使更改生效。"
   },
   "excludedDomainsDescAlt": {
-    "message": "Bitwarden 不会询问保存所有已登录的账户的这些域名的登录信息。必须刷新页面才能使更改生效。"
+    "message": "Bitwarden 将不会询问是否为所有已登录账户的这些域名保存登录信息。您必须刷新页面才能使更改生效。"
+  },
+  "blockedDomainsDesc": {
+    "message": "将不会为这些网站提供自动填充和其他相关功能。您必须刷新页面才能使更改生效。"
+  },
+  "autofillBlockedNotice": {
+    "message": "该网站的自动填充功能已被阻止。请在设置中查看或更改。"
+  },
+  "autofillBlockedTooltip": {
+    "message": "该网站的自动填充功能已被阻止。请在设置中查看。"
   },
   "websiteItemLabel": {
     "message": "网站 $number$ (URI)",
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "已屏蔽的域名更改已保存"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "排除域名更改已保存"
   },
@@ -2601,7 +2616,7 @@
     "message": "更新主密码"
   },
   "updateMasterPasswordWarning": {
-    "message": "您的主密码最近被您组织的管理员更改过。要访问密码库，您必须立即更新它。继续操作将使您退出当前会话并要求您重新登录。其他设备上的活动会话可能会继续保持活动状态长达一小时。"
+    "message": "您的主密码最近被您组织的管理员更改过。要访问密码库，您必须立即更新它。继续操作将使您退出当前会话，并要求您重新登录。其他设备上的活动会话可能会继续保持活动状态长达一小时。"
   },
   "updateWeakMasterPasswordWarning": {
     "message": "您的主密码不符合某一项或多项组织策略要求。要访问密码库，必须立即更新您的主密码。继续操作将使您退出当前会话，并要求您重新登录。其他设备上的活动会话可能会继续保持活动状态长达一小时。"
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "错误"
   },
+  "decryptionError": {
+    "message": "解密错误"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden 无法解密下列密码库项目。"
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "联系客户成功团队",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "以避免额外的数据丢失。",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "生成用户名"
   },
@@ -2810,7 +2839,7 @@
     }
   },
   "passwordLengthRecommendationHint": {
-    "message": " 使用 $RECOMMENDED$ 或更多个字符生成强大的密码。",
+    "message": " 使用 $RECOMMENDED$ 个或更多字符生成强大的密码。",
     "description": "Appended to `spinboxBoundariesHint` to recommend a length to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -2820,7 +2849,7 @@
     }
   },
   "passphraseNumWordsRecommendationHint": {
-    "message": " 使用 $RECOMMENDED$ 或更多个单词生成强大的密码短语。",
+    "message": " 使用 $RECOMMENDED$ 个或更多单词生成强大的密码短语。",
     "description": "Appended to `spinboxBoundariesHint` to recommend a number of words to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -3413,11 +3442,11 @@
     "description": "Notification button text for starting a fileless import."
   },
   "importing": {
-    "message": "导入中...",
+    "message": "正在导入...",
     "description": "Notification message for when an import is in progress."
   },
   "dataSuccessfullyImported": {
-    "message": "数据导入成功！",
+    "message": "数据成功导入！",
     "description": "Notification message for when an import has completed successfully."
   },
   "dataImportFailed": {
@@ -3926,7 +3955,7 @@
     "description": "Body content for dialog which asks if the user wants to proceed to the browser's keyboard shortcut settings page"
   },
   "overrideDefaultBrowserAutofillTitle": {
-    "message": "将 Bitwarden 设置为您的默认密码管理器吗？",
+    "message": "将 Bitwarden 设置为默认密码管理器吗？",
     "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior"
   },
   "overrideDefaultBrowserAutofillDescription": {
@@ -3934,7 +3963,7 @@
     "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior"
   },
   "overrideDefaultBrowserAutoFillSettings": {
-    "message": "将 Bitwarden 设置为您的默认密码管理器",
+    "message": "将 Bitwarden 设置为默认密码管理器",
     "description": "Label for the setting that allows overriding the default browser autofill settings"
   },
   "privacyPermissionAdditionNotGrantedTitle": {
@@ -3991,7 +4020,7 @@
     "message": "没有搜索到匹配的项目"
   },
   "clearFiltersOrTryAnother": {
-    "message": "清除筛选器或尝试另一个搜索词"
+    "message": "清除筛选或尝试另一个搜索词"
   },
   "copyInfoTitle": {
     "message": "复制信息 - $ITEMNAME$",
@@ -4567,7 +4596,7 @@
     "message": "账户操作"
   },
   "showNumberOfAutofillSuggestions": {
-    "message": "在扩展图标上显示自动填充建议的登录的数量"
+    "message": "在扩展图标上显示自动填充建议的登录数量"
   },
   "showQuickCopyActions": {
     "message": "在密码库上显示快速复制操作"
@@ -4641,6 +4670,33 @@
   "noEditPermissions": {
     "message": "您没有编辑此项目的权限"
   },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "生物识别解锁不可用，因为需要先使用 PIN 或密码解锁。"
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "生物识别解锁当前不可用。"
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "由于系统文件配置错误，生物识别解锁不可用。"
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "由于系统文件配置错误，生物识别解锁不可用。"
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "生物识别解锁不可用，因为 Bitwarden 桌面 App 已关闭。"
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "生物识别解锁不可用，因为在 Bitwarden 桌面 App 中没有为 $EMAIL$ 启用生物识别解锁。",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "由于某个未知的原因，生物识别解锁当前不可用。"
+  },
   "authenticating": {
     "message": "正在验证"
   },
diff --git a/apps/browser/src/_locales/zh_TW/messages.json b/apps/browser/src/_locales/zh_TW/messages.json
index 4b215df6ba..467deffd81 100644
--- a/apps/browser/src/_locales/zh_TW/messages.json
+++ b/apps/browser/src/_locales/zh_TW/messages.json
@@ -20,7 +20,7 @@
     "message": "建立帳戶"
   },
   "newToBitwarden": {
-    "message": "New to Bitwarden?"
+    "message": "第一次使用 Bitwarden？"
   },
   "logInWithPasskey": {
     "message": "使用密碼金鑰登入"
@@ -29,7 +29,7 @@
     "message": "使用單一登入"
   },
   "welcomeBack": {
-    "message": "Welcome back"
+    "message": "歡迎回來"
   },
   "setAStrongPassword": {
     "message": "設定一個強密碼"
@@ -84,7 +84,7 @@
     "message": "加入組織"
   },
   "joinOrganizationName": {
-    "message": "Join $ORGANIZATIONNAME$",
+    "message": "加入 $ORGANIZATIONNAME$",
     "placeholders": {
       "organizationName": {
         "content": "$1",
@@ -120,7 +120,7 @@
     "message": "複製密碼"
   },
   "copyPassphrase": {
-    "message": "Copy passphrase"
+    "message": "複製密碼短語"
   },
   "copyNote": {
     "message": "複製備註"
@@ -153,13 +153,13 @@
     "message": "複製駕照號碼"
   },
   "copyPrivateKey": {
-    "message": "Copy private key"
+    "message": "複製私密金鑰"
   },
   "copyPublicKey": {
-    "message": "Copy public key"
+    "message": "複製公開金鑰"
   },
   "copyFingerprint": {
-    "message": "Copy fingerprint"
+    "message": "複製指紋"
   },
   "copyCustomField": {
     "message": "複製 $FIELD$",
@@ -177,7 +177,7 @@
     "message": "複製備註"
   },
   "fill": {
-    "message": "Fill",
+    "message": "填入",
     "description": "This string is used on the vault page to indicate autofilling. Horizontal space is limited in the interface here so try and keep translations as concise as possible."
   },
   "autoFill": {
@@ -193,10 +193,10 @@
     "message": "自動填入身分資訊"
   },
   "fillVerificationCode": {
-    "message": "Fill verification code"
+    "message": "填入驗證碼"
   },
   "fillVerificationCodeAria": {
-    "message": "Fill Verification Code",
+    "message": "填入驗證碼",
     "description": "Aria label for the heading displayed the inline menu for totp code autofill"
   },
   "generatePasswordCopied": {
@@ -337,22 +337,22 @@
     "message": "您可以使用 Bitwarden 驗證器儲存驗證器金鑰，並為兩步驟驗證流程產生 TOTP 代碼。前往 bitwarden.com 網站以了解更多資訊。"
   },
   "bitwardenSecretsManager": {
-    "message": "Bitwarden Secrets Manager"
+    "message": "Bitwarden 密鑰管理"
   },
   "continueToSecretsManagerPageDesc": {
-    "message": "Securely store, manage, and share developer secrets with Bitwarden Secrets Manager. Learn more on the bitwarden.com website."
+    "message": "使用 Bitwarden 密鑰管理來安全儲存、管理並分享開發人員密鑰。在 bitwarden.com 網站上了解更多。"
   },
   "passwordlessDotDev": {
     "message": "Passwordless.dev"
   },
   "continueToPasswordlessDotDevPageDesc": {
-    "message": "Create smooth and secure login experiences free from traditional passwords with Passwordless.dev. Learn more on the bitwarden.com website."
+    "message": "使用 Passwordless.dev 建立流暢且安全的登入體驗，無需使用傳統密碼。在 bitwarden 網站上了解更多。"
   },
   "freeBitwardenFamilies": {
-    "message": "Free Bitwarden Families"
+    "message": "免費的 Bitwarden 家庭方案"
   },
   "freeBitwardenFamiliesPageDesc": {
-    "message": "You are eligible for Free Bitwarden Families. Redeem this offer today in the web app."
+    "message": "您符合免費 Bitwarden 家庭方案的資格要求。在網頁應用程式中兌換您的優惠。"
   },
   "version": {
     "message": "版本"
@@ -379,16 +379,16 @@
     "message": "資料夾名稱"
   },
   "folderHintText": {
-    "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
+    "message": "在資料夾名稱後面使用「/」來建立樹狀結構。\n例如：社交網路/論壇"
   },
   "noFoldersAdded": {
-    "message": "No folders added"
+    "message": "未新增資料夾"
   },
   "createFoldersToOrganize": {
-    "message": "Create folders to organize your vault items"
+    "message": "建立資料夾來管理您的密碼庫項目"
   },
   "deleteFolderPermanently": {
-    "message": "Are you sure you want to permanently delete this folder?"
+    "message": "您確定要永久刪除此資料夾嗎？"
   },
   "deleteFolder": {
     "message": "刪除資料夾"
@@ -431,7 +431,7 @@
     "message": "自動產生安全、唯一的登入密碼。"
   },
   "bitWebVaultApp": {
-    "message": "Bitwarden web app"
+    "message": "Bitwarden 網頁應用程式"
   },
   "importItems": {
     "message": "匯入項目"
@@ -443,7 +443,7 @@
     "message": "產生密碼"
   },
   "generatePassphrase": {
-    "message": "Generate passphrase"
+    "message": "產生密碼短語"
   },
   "regeneratePassword": {
     "message": "重新產生密碼"
@@ -475,7 +475,7 @@
     "description": "Card header for password generator include block"
   },
   "uppercaseDescription": {
-    "message": "Include uppercase characters",
+    "message": "包含大寫字元",
     "description": "Tooltip for the password generator uppercase character checkbox"
   },
   "uppercaseLabel": {
@@ -483,7 +483,7 @@
     "description": "Label for the password generator uppercase character checkbox"
   },
   "lowercaseDescription": {
-    "message": "Include lowercase characters",
+    "message": "包含小寫字元",
     "description": "Full description for the password generator lowercase character checkbox"
   },
   "lowercaseLabel": {
@@ -491,7 +491,7 @@
     "description": "Label for the password generator lowercase character checkbox"
   },
   "numbersDescription": {
-    "message": "Include numbers",
+    "message": "包含數字",
     "description": "Full description for the password generator numbers checkbox"
   },
   "numbersLabel": {
@@ -499,7 +499,7 @@
     "description": "Label for the password generator numbers checkbox"
   },
   "specialCharactersDescription": {
-    "message": "Include special characters",
+    "message": "包含特殊字元",
     "description": "Full description for the password generator special characters checkbox"
   },
   "specialCharactersLabel": {
@@ -526,11 +526,11 @@
     "message": "最少符號位數"
   },
   "avoidAmbiguous": {
-    "message": "Avoid ambiguous characters",
+    "message": "避免易混淆的字元",
     "description": "Label for the avoid ambiguous characters checkbox."
   },
   "generatorPolicyInEffect": {
-    "message": "Enterprise policy requirements have been applied to your generator options.",
+    "message": "企業原則之要求已在你的產生器選項中生效",
     "description": "Indicates that a policy limits the credential generator screen."
   },
   "searchVault": {
@@ -564,19 +564,19 @@
     "message": "我的最愛"
   },
   "unfavorite": {
-    "message": "Unfavorite"
+    "message": "取消最愛"
   },
   "itemAddedToFavorites": {
-    "message": "Item added to favorites"
+    "message": "項目已加入到最愛"
   },
   "itemRemovedFromFavorites": {
-    "message": "Item removed from favorites"
+    "message": "項目已從最愛中移除"
   },
   "notes": {
     "message": "備註"
   },
   "privateNote": {
-    "message": "Private note"
+    "message": "私人備註"
   },
   "note": {
     "message": "備註"
@@ -600,7 +600,7 @@
     "message": "開啟網站"
   },
   "launchWebsiteName": {
-    "message": "Launch website $ITEMNAME$",
+    "message": "開啟網站 $ITEMNAME$",
     "placeholders": {
       "itemname": {
         "content": "$1",
@@ -651,7 +651,7 @@
     "message": "您的密碼庫已鎖定。請驗證身分以繼續。"
   },
   "yourVaultIsLockedV2": {
-    "message": "Your vault is locked"
+    "message": "您的密碼庫已被鎖定"
   },
   "yourAccountIsLocked": {
     "message": "您的帳戶已被鎖定。"
@@ -742,7 +742,7 @@
     "message": "主密碼"
   },
   "masterPassImportant": {
-    "message": "Your master password cannot be recovered if you forget it!"
+    "message": "若您忘記主密碼，將會無法找回！"
   },
   "masterPassHintLabel": {
     "message": "您已成功創建新帳戶！"
@@ -782,7 +782,7 @@
     "message": "您已成功創建新帳戶！"
   },
   "youHaveBeenLoggedIn": {
-    "message": "You have been logged in!"
+    "message": "你已經登入！"
   },
   "youSuccessfullyLoggedIn": {
     "message": "登入成功"
@@ -797,7 +797,7 @@
     "message": "必須填入驗證碼。"
   },
   "webauthnCancelOrTimeout": {
-    "message": "The authentication was cancelled or took too long. Please try again."
+    "message": "驗證已被取消或時間超過。請再試一次。"
   },
   "invalidVerificationCode": {
     "message": "無效的驗證碼"
@@ -834,7 +834,7 @@
     "message": "Bitwarden 可以儲存並填入兩步驟驗證碼。選擇相機圖示來截取此網站的驗證器QR code，或手動複製金鑰並貼上到此欄位。"
   },
   "learnMoreAboutAuthenticators": {
-    "message": "Learn more about authenticators"
+    "message": "了解更多驗證程式"
   },
   "copyTOTP": {
     "message": "複製驗證器金鑰 (TOTP)"
@@ -852,19 +852,19 @@
     "message": "登入"
   },
   "logInToBitwarden": {
-    "message": "Log in to Bitwarden"
+    "message": "登入 Bitwarden"
   },
   "restartRegistration": {
-    "message": "Restart registration"
+    "message": "重新啟動註冊"
   },
   "expiredLink": {
-    "message": "Expired link"
+    "message": "過期連結"
   },
   "pleaseRestartRegistrationOrTryLoggingIn": {
-    "message": "Please restart registration or try logging in."
+    "message": "請重新啟動註冊流程或是重試登入。"
   },
   "youMayAlreadyHaveAnAccount": {
-    "message": "You may already have an account"
+    "message": "您可能已經有帳號"
   },
   "logOutConfirmation": {
     "message": "您確定要登出嗎？"
@@ -888,7 +888,7 @@
     "message": "兩步驟登入需要您從其他裝置（例如安全鑰匙、驗證器程式、SMS、手機或電子郵件）來驗證您的登入，這使您的帳戶更加安全。兩步驟登入可以在 bitwarden.com 網頁版密碼庫啟用。現在要前往嗎？"
   },
   "twoStepLoginConfirmationContent": {
-    "message": "Make your account more secure by setting up two-step login in the Bitwarden web app."
+    "message": "在 Bitwarden 網頁應用程式中設定兩步驟登入，讓您的帳號更加安全。"
   },
   "twoStepLoginConfirmationTitle": {
     "message": "前往網頁 App 嗎？"
@@ -934,7 +934,7 @@
     "message": "新增 URI"
   },
   "addDomain": {
-    "message": "Add domain",
+    "message": "新增網域",
     "description": "'Domain' here refers to an internet domain name (e.g. 'bitwarden.com') and the message in whole described the act of putting a domain value into the context."
   },
   "addedItem": {
@@ -1005,7 +1005,7 @@
     "message": "於分頁頁面顯示身分以便於自動填入。"
   },
   "clickToAutofillOnVault": {
-    "message": "Click items to autofill on Vault view"
+    "message": "在密碼庫檢視中點擊項目來自動填入"
   },
   "clearClipboard": {
     "message": "清除剪貼簿",
@@ -1317,10 +1317,10 @@
     "message": "輸入驗證器應用程式提供的 6 位數驗證碼。"
   },
   "authenticationTimeout": {
-    "message": "Authentication timeout"
+    "message": "驗證逾時"
   },
   "authenticationSessionTimedOut": {
-    "message": "The authentication session timed out. Please restart the login process."
+    "message": "驗證工作階段因時間過久已逾時。請重試登入。"
   },
   "enterVerificationCodeEmail": {
     "message": "輸入已傳送至 $EMAIL$ 的 6 位數驗證碼。",
@@ -1386,17 +1386,17 @@
     "message": "驗證器應用程式"
   },
   "authenticatorAppDescV2": {
-    "message": "Enter a code generated by an authenticator app like Bitwarden Authenticator.",
+    "message": "輸入驗證器應用程式產生的驗證碼，例如 Bitwarden 驗證器。",
     "description": "'Bitwarden Authenticator' is a product name and should not be translated."
   },
   "yubiKeyTitleV2": {
-    "message": "Yubico OTP Security Key"
+    "message": "YubiKey OTP 安全金鑰"
   },
   "yubiKeyDesc": {
     "message": "使用 YubiKey 存取您的帳戶。支援 YubiKey 4、4 Nano、4C、以及 NEO 裝置。"
   },
   "duoDescV2": {
-    "message": "Enter a code generated by Duo Security.",
+    "message": "輸入 Duo 應用程式產生的驗證碼。",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "duoOrganizationDesc": {
@@ -1413,7 +1413,7 @@
     "message": "電子郵件"
   },
   "emailDescV2": {
-    "message": "Enter a code sent to your email."
+    "message": "輸入寄送到您電子郵件信箱的驗證碼。"
   },
   "selfHostedEnvironment": {
     "message": "自我裝載環境"
@@ -1422,13 +1422,13 @@
     "message": "指定您內部部署的 Bitwarden 安裝之基礎 URL。"
   },
   "selfHostedBaseUrlHint": {
-    "message": "Specify the base URL of your on-premises hosted Bitwarden installation. Example: https://bitwarden.company.com"
+    "message": "指定您自建的 Bitwarden 伺服器的網域 URL。例如：https://bitwarden.company.com"
   },
   "selfHostedCustomEnvHeader": {
-    "message": "For advanced configuration, you can specify the base URL of each service independently."
+    "message": "適用於進階設定。您可以單獨指定各個服務的網域 URL。"
   },
   "selfHostedEnvFormInvalid": {
-    "message": "You must add either the base Server URL or at least one custom environment."
+    "message": "您必須新增伺服器網域 URL 或至少一個自定義環境。"
   },
   "customEnvironment": {
     "message": "自訂環境"
@@ -1440,7 +1440,7 @@
     "message": "伺服器 URL"
   },
   "selfHostBaseUrl": {
-    "message": "Self-host server URL",
+    "message": "自建伺服器 URL",
     "description": "Label for field requesting a self-hosted integration service URL"
   },
   "apiUrl": {
@@ -1466,22 +1466,22 @@
     "description": "Represents the message for allowing the user to enable the autofill overlay"
   },
   "autofillSuggestionsSectionTitle": {
-    "message": "Autofill suggestions"
+    "message": "自動填入建議"
   },
   "showInlineMenuLabel": {
-    "message": "Show autofill suggestions on form fields"
+    "message": "在表單欄位上顯示自動填入選單"
   },
   "showInlineMenuIdentitiesLabel": {
-    "message": "Display identities as suggestions"
+    "message": "顯示身分建議"
   },
   "showInlineMenuCardsLabel": {
-    "message": "Display cards as suggestions"
+    "message": "顯示信用卡建議"
   },
   "showInlineMenuOnIconSelectionLabel": {
-    "message": "Display suggestions when icon is selected"
+    "message": "當選擇圖示時，顯示建議"
   },
   "showInlineMenuOnFormFieldsDescAlt": {
-    "message": "Applies to all logged in accounts."
+    "message": "適用於所有已登入的帳戶。"
   },
   "turnOffBrowserBuiltInPasswordManagerSettings": {
     "message": "關閉你的瀏覽器內建密碼管理器設定以避免衝突。"
@@ -1502,7 +1502,7 @@
     "description": "Overlay appearance select option for showing the field on click of the overlay icon"
   },
   "enableAutoFillOnPageLoadSectionTitle": {
-    "message": "Autofill on page load"
+    "message": "頁面載入時自動填入"
   },
   "enableAutoFillOnPageLoad": {
     "message": "頁面載入時自動填入"
@@ -1514,7 +1514,7 @@
     "message": "被入侵或不被信任的網站，可能會濫用頁面載入的自動填入功能。"
   },
   "learnMoreAboutAutofillOnPageLoadLinkText": {
-    "message": "Learn more about risks"
+    "message": "了解更多風險"
   },
   "learnMoreAboutAutofill": {
     "message": "進一步瞭解「自動填入」功能"
@@ -1544,13 +1544,13 @@
     "message": "在側邊欄中開啟密碼庫"
   },
   "commandAutofillLoginDesc": {
-    "message": "Autofill the last used login for the current website"
+    "message": "自動將上次使用的登入資料填入目前網站"
   },
   "commandAutofillCardDesc": {
-    "message": "Autofill the last used card for the current website"
+    "message": "自動將上次使用的信用卡填入目前網站"
   },
   "commandAutofillIdentityDesc": {
-    "message": "Autofill the last used identity for the current website"
+    "message": "自動將上次使用的身分資料填入目前網站"
   },
   "commandGeneratePasswordDesc": {
     "message": "產生一組新的隨機密碼並將它複製到剪貼簿中。"
@@ -1768,7 +1768,7 @@
     "message": "身分"
   },
   "typeSshKey": {
-    "message": "SSH key"
+    "message": "SSH 金鑰"
   },
   "newItemHeader": {
     "message": "新增 $TYPE$",
@@ -1801,13 +1801,13 @@
     "message": "密碼歷史記錄"
   },
   "generatorHistory": {
-    "message": "Generator history"
+    "message": "產生器歷史記錄"
   },
   "clearGeneratorHistoryTitle": {
-    "message": "Clear generator history"
+    "message": "清除產生器歷史記錄"
   },
   "cleargGeneratorHistoryDescription": {
-    "message": "If you continue, all entries will be permanently deleted from generator's history. Are you sure you want to continue?"
+    "message": "若繼續，所有產生器曾經產生的記錄會被刪除。您確定要繼續？"
   },
   "back": {
     "message": "返回"
@@ -1846,7 +1846,7 @@
     "message": "安全筆記"
   },
   "sshKeys": {
-    "message": "SSH Keys"
+    "message": "SSH 金鑰"
   },
   "clear": {
     "message": "清除",
@@ -1929,10 +1929,10 @@
     "message": "清除歷史紀錄"
   },
   "nothingToShow": {
-    "message": "Nothing to show"
+    "message": "沒有可顯示的內容"
   },
   "nothingGeneratedRecently": {
-    "message": "You haven't generated anything recently"
+    "message": "您最近未產生任何密碼"
   },
   "remove": {
     "message": "移除"
@@ -2002,7 +2002,7 @@
     "message": "設定您用來解鎖 Bitwarden 的 PIN 碼。您的 PIN 設定將在您完全登出本應用程式時被重設。"
   },
   "setYourPinCode1": {
-    "message": "Your PIN will be used to unlock Bitwarden instead of your master password. Your PIN will reset if you ever fully log out of Bitwarden."
+    "message": "您的 PIN 碼會取代主密碼用來解鎖 Bitwarden。您的 PIN 碼會重置，若您完全登出 Bitwarden。"
   },
   "pinRequired": {
     "message": "必須填入 PIN 碼。"
@@ -2017,7 +2017,7 @@
     "message": "使用生物特徵辨識解鎖"
   },
   "unlockWithMasterPassword": {
-    "message": "Unlock with master password"
+    "message": "使用主密碼解鎖"
   },
   "awaitDesktop": {
     "message": "等待來自桌面應用程式的確認"
@@ -2029,7 +2029,7 @@
     "message": "瀏覽器重啟後使用主密碼鎖定"
   },
   "lockWithMasterPassOnRestart1": {
-    "message": "Require master password on browser restart"
+    "message": "瀏覽器重啟後使用主密碼鎖定"
   },
   "selectOneCollection": {
     "message": "您必須至少選擇一個集合。"
@@ -2041,26 +2041,26 @@
     "message": "克隆"
   },
   "passwordGenerator": {
-    "message": "Password generator"
+    "message": "密碼產生器"
   },
   "usernameGenerator": {
-    "message": "Username generator"
+    "message": "使用者名稱產生器"
   },
   "useThisPassword": {
-    "message": "Use this password"
+    "message": "使用此密碼"
   },
   "useThisUsername": {
-    "message": "Use this username"
+    "message": "使用此使用者名稱"
   },
   "securePasswordGenerated": {
-    "message": "Secure password generated! Don't forget to also update your password on the website."
+    "message": "已產生安全的密碼！請不要忘記同時更新您網站上的密碼。"
   },
   "useGeneratorHelpTextPartOne": {
-    "message": "Use the generator",
+    "message": "使用產生器",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "useGeneratorHelpTextPartTwo": {
-    "message": "to create a strong unique password",
+    "message": "來產生高強度且唯一的密碼",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "vaultTimeoutAction": {
@@ -2096,7 +2096,7 @@
     "message": "項目已還原"
   },
   "alreadyHaveAccount": {
-    "message": "Already have an account?"
+    "message": "已經有帳號了嗎？"
   },
   "vaultTimeoutLogOutConfirmation": {
     "message": "選擇登出將會在密碼庫逾時後移除對密碼庫的所有存取權限，若要重新驗證則需連線網路。確定要使用此設定嗎？"
@@ -2108,7 +2108,7 @@
     "message": "自動填入並儲存"
   },
   "fillAndSave": {
-    "message": "Fill and save"
+    "message": "填入並儲存"
   },
   "autoFillSuccessAndSavedUri": {
     "message": "項目已自動填入並且已儲存統一資源標識符（URI）"
@@ -2189,19 +2189,19 @@
     "message": "您新的主密碼不符合原則要求。"
   },
   "receiveMarketingEmailsV2": {
-    "message": "Get advice, announcements, and research opportunities from Bitwarden in your inbox."
+    "message": "獲得來自 Bitwarden 的公告、建議及研究資訊電子郵件。"
   },
   "unsubscribe": {
-    "message": "Unsubscribe"
+    "message": "取消訂閱"
   },
   "atAnyTime": {
-    "message": "at any time."
+    "message": "在任何時間。"
   },
   "byContinuingYouAgreeToThe": {
-    "message": "By continuing, you agree to the"
+    "message": "若是繼續，則代表您同意"
   },
   "and": {
-    "message": "and"
+    "message": "和"
   },
   "acceptPolicies": {
     "message": "選中此選取框，即表示您同意下列條款："
@@ -2222,10 +2222,10 @@
     "message": "確定"
   },
   "errorRefreshingAccessToken": {
-    "message": "Access Token Refresh Error"
+    "message": "存取權杖更新失敗"
   },
   "errorRefreshingAccessTokenDesc": {
-    "message": "No refresh token or API keys found. Please try logging out and logging back in."
+    "message": "未找到存取權杖或 API 密鑰。請重試登出再登入。"
   },
   "desktopSyncVerificationTitle": {
     "message": "桌面同步驗證"
@@ -2264,10 +2264,10 @@
     "message": "帳戶不相符"
   },
   "nativeMessagingWrongUserKeyTitle": {
-    "message": "Biometric key missmatch"
+    "message": "生物辨識金鑰錯誤"
   },
   "nativeMessagingWrongUserKeyDesc": {
-    "message": "Biometric unlock failed. The biometric secret key failed to unlock the vault. Please try to set up biometrics again."
+    "message": "生物辨識解鎖失敗。生物辨識金鑰解鎖密碼庫失敗。請嘗試重新設定生物辨識。"
   },
   "biometricsNotEnabledTitle": {
     "message": "生物特徵辨識未設定"
@@ -2282,16 +2282,16 @@
     "message": "此裝置不支援瀏覽器生物特徵辨識。"
   },
   "biometricsNotUnlockedTitle": {
-    "message": "User locked or logged out"
+    "message": "使用者已鎖定或登出"
   },
   "biometricsNotUnlockedDesc": {
-    "message": "Please unlock this user in the desktop application and try again."
+    "message": "請在桌面應用程式解鎖此使用者之後再重試。"
   },
   "biometricsNotAvailableTitle": {
     "message": "生物辨識解鎖不可用"
   },
   "biometricsNotAvailableDesc": {
-    "message": "Biometric unlock is currently unavailable. Please try again later."
+    "message": "生物辨識解鎖現在無法使用。請稍後重試。"
   },
   "biometricsFailedTitle": {
     "message": "生物特徵辨識失敗"
@@ -2324,6 +2324,9 @@
     "message": "網域",
     "description": "A category title describing the concept of web domains"
   },
+  "blockedDomains": {
+    "message": "已封鎖的網域"
+  },
   "excludedDomains": {
     "message": "排除網域"
   },
@@ -2333,6 +2336,15 @@
   "excludedDomainsDescAlt": {
     "message": "對於所有已登入的帳戶，Bitwarden 不會詢問是否儲存這些網域的登入資訊。您必須重新整理頁面變更才會生效。"
   },
+  "blockedDomainsDesc": {
+    "message": "自動填入及其它相關的功能無法在這些網站上使用。您必須重新整理頁面來使變更生效。"
+  },
+  "autofillBlockedNotice": {
+    "message": "自動填入已在此網站被封鎖。請在設定中檢視或更改此限制。"
+  },
+  "autofillBlockedTooltip": {
+    "message": "自動填入已在此網站被封鎖。請在設定中檢視。"
+  },
   "websiteItemLabel": {
     "message": "網站 $number$ (URI)",
     "placeholders": {
@@ -2351,6 +2363,9 @@
       }
     }
   },
+  "blockedDomainsSavedSuccess": {
+    "message": "已儲存封鎖的網域"
+  },
   "excludedDomainsSavedSuccess": {
     "message": "例外網域更改已儲存"
   },
@@ -2789,6 +2804,20 @@
   "error": {
     "message": "錯誤"
   },
+  "decryptionError": {
+    "message": "解密發生錯誤"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden 無法解密您密碼庫中下面的項目。"
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "聯絡客戶支援部門",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "來避免更多資料遺失。",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "generateUsername": {
     "message": "產生使用者名稱"
   },
@@ -2887,7 +2916,7 @@
     "description": "Displayed with the address on the forwarding service's configuration screen."
   },
   "forwarderGeneratedByWithWebsite": {
-    "message": "Website: $WEBSITE$. Generated by Bitwarden.",
+    "message": "網站：$WEBSITE$。透過 Bitwarden 產生。",
     "description": "Displayed with the address on the forwarding service's configuration screen.",
     "placeholders": {
       "WEBSITE": {
@@ -2897,7 +2926,7 @@
     }
   },
   "forwaderInvalidToken": {
-    "message": "Invalid $SERVICENAME$ API token",
+    "message": "無效的 $SERVICENAME$ API 權杖",
     "description": "Displayed when the user's API token is empty or rejected by the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -2907,7 +2936,7 @@
     }
   },
   "forwaderInvalidTokenWithMessage": {
-    "message": "Invalid $SERVICENAME$ API token: $ERRORMESSAGE$",
+    "message": "無效的 $SERVICENAME$ API 權杖：$ERRORMESSAGE$",
     "description": "Displayed when the user's API token is rejected by the forwarding service with an error message.",
     "placeholders": {
       "servicename": {
@@ -2921,7 +2950,7 @@
     }
   },
   "forwarderNoAccountId": {
-    "message": "Unable to obtain $SERVICENAME$ masked email account ID.",
+    "message": "無法獲得 $SERVICENAME$ 的轉送電子郵件帳號。",
     "description": "Displayed when the forwarding service fails to return an account ID.",
     "placeholders": {
       "servicename": {
@@ -2931,7 +2960,7 @@
     }
   },
   "forwarderNoDomain": {
-    "message": "Invalid $SERVICENAME$ domain.",
+    "message": "無效的 $SERVICENAME$ 網域。",
     "description": "Displayed when the domain is empty or domain authorization failed at the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -2941,7 +2970,7 @@
     }
   },
   "forwarderNoUrl": {
-    "message": "Invalid $SERVICENAME$ url.",
+    "message": "無效的 $SERVICENAME$ URI。",
     "description": "Displayed when the url of the forwarding service wasn't supplied.",
     "placeholders": {
       "servicename": {
@@ -2951,7 +2980,7 @@
     }
   },
   "forwarderUnknownError": {
-    "message": "Unknown $SERVICENAME$ error occurred.",
+    "message": "發生未知的 $SERVICENAME$ 錯誤。",
     "description": "Displayed when the forwarding service failed due to an unknown error.",
     "placeholders": {
       "servicename": {
@@ -2961,7 +2990,7 @@
     }
   },
   "forwarderUnknownForwarder": {
-    "message": "Unknown forwarder: '$SERVICENAME$'.",
+    "message": "未知的轉送服務提供商：$SERVICENAME$。",
     "description": "Displayed when the forwarding service is not supported.",
     "placeholders": {
       "servicename": {
@@ -3068,25 +3097,25 @@
     "message": "重新傳送通知"
   },
   "viewAllLogInOptions": {
-    "message": "View all log in options"
+    "message": "檢視所有登入選項"
   },
   "viewAllLoginOptionsV1": {
-    "message": "View all log in options"
+    "message": "檢視所有登入選項"
   },
   "notificationSentDevice": {
     "message": "已傳送通知至您的裝置。"
   },
   "aNotificationWasSentToYourDevice": {
-    "message": "A notification was sent to your device"
+    "message": "已傳送通知至您的裝置"
   },
   "makeSureYourAccountIsUnlockedAndTheFingerprintEtc": {
-    "message": "Make sure your account is unlocked and the fingerprint phrase matches on the other device"
+    "message": "請確保您的帳號已解鎖，並且指紋短語與其他裝置一致。"
   },
   "youWillBeNotifiedOnceTheRequestIsApproved": {
-    "message": "You will be notified once the request is approved"
+    "message": "一旦您的請求被通過，您會獲得通知。"
   },
   "needAnotherOptionV1": {
-    "message": "Need another option?"
+    "message": "需要另一個選項嗎？"
   },
   "loginInitiated": {
     "message": "登入已啟動"
@@ -3146,22 +3175,22 @@
     "message": "自動填入設定"
   },
   "autofillKeyboardShortcutSectionTitle": {
-    "message": "Autofill shortcut"
+    "message": "自動填入快速鍵"
   },
   "autofillKeyboardShortcutUpdateLabel": {
-    "message": "Change shortcut"
+    "message": "修改鍵盤快速鍵"
   },
   "autofillKeyboardManagerShortcutsLabel": {
-    "message": "Manage shortcuts"
+    "message": "管理鍵盤快速鍵"
   },
   "autofillShortcut": {
     "message": "自動填入鍵盤快速鍵"
   },
   "autofillLoginShortcutNotSet": {
-    "message": "The autofill login shortcut is not set. Change this in the browser's settings."
+    "message": "自動填入快速鍵尚未設定。請在瀏覽器的設定中變更。"
   },
   "autofillLoginShortcutText": {
-    "message": "The autofill login shortcut is $COMMAND$. Manage all shortcuts in the browser's settings.",
+    "message": "自動填入快速鍵是 $COMMAND$。請在瀏覽器的設定中變更。",
     "placeholders": {
       "command": {
         "content": "$1",
@@ -3182,16 +3211,16 @@
     "message": "在新視窗開啟"
   },
   "rememberThisDeviceToMakeFutureLoginsSeamless": {
-    "message": "Remember this device to make future logins seamless"
+    "message": "記住此裝置來讓未來的登入體驗更簡易"
   },
   "deviceApprovalRequired": {
     "message": "裝置需要取得核准。請在下面選擇一個核准選項："
   },
   "deviceApprovalRequiredV2": {
-    "message": "Device approval required"
+    "message": "需要核准裝置"
   },
   "selectAnApprovalOptionBelow": {
-    "message": "Select an approval option below"
+    "message": "選擇下面的一個核准選項"
   },
   "rememberThisDevice": {
     "message": "記住這個裝置"
@@ -3212,25 +3241,25 @@
     "message": "需要組織 SSO 識別碼。"
   },
   "creatingAccountOn": {
-    "message": "Creating account on"
+    "message": "建立帳號於"
   },
   "checkYourEmail": {
-    "message": "Check your email"
+    "message": "檢查您的電子郵件"
   },
   "followTheLinkInTheEmailSentTo": {
-    "message": "Follow the link in the email sent to"
+    "message": "跟隨電子郵件中的連結"
   },
   "andContinueCreatingYourAccount": {
-    "message": "and continue creating your account."
+    "message": "並繼續建立您的帳號"
   },
   "noEmail": {
-    "message": "No email?"
+    "message": "沒有電子郵件？"
   },
   "goBack": {
-    "message": "Go back"
+    "message": "返回"
   },
   "toEditYourEmailAddress": {
-    "message": "to edit your email address."
+    "message": "來編輯您的電子郵件位址。"
   },
   "eu": {
     "message": "歐盟",
@@ -3267,17 +3296,17 @@
     "message": "缺少使用者電子郵件地址"
   },
   "activeUserEmailNotFoundLoggingYouOut": {
-    "message": "Active user email not found. Logging you out."
+    "message": "未找到使用中帳號的電子郵件。正在將您登出。"
   },
   "deviceTrusted": {
     "message": "裝置已信任"
   },
   "sendsNoItemsTitle": {
-    "message": "No active Sends",
+    "message": "沒有可用的 Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendsNoItemsMessage": {
-    "message": "Use Send to securely share encrypted information with anyone.",
+    "message": "使用 Send 可以與任何人安全地共用加密資訊。",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "inputRequired": {
@@ -3354,10 +3383,10 @@
     }
   },
   "singleFieldNeedsAttention": {
-    "message": "1 field needs your attention."
+    "message": "您需注意上方的 1 個欄位。"
   },
   "multipleFieldsNeedAttention": {
-    "message": "$COUNT$ fields need your attention.",
+    "message": "您需注意上方的 $COUNT$ 個欄位。",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3444,7 +3473,7 @@
     "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item."
   },
   "toggleSideNavigation": {
-    "message": "Toggle side navigation"
+    "message": "切換側邊欄"
   },
   "skipToContent": {
     "message": "跳至內容"
@@ -3466,7 +3495,7 @@
     "description": "Text to display in overlay when the account is locked."
   },
   "unlockYourAccountToViewAutofillSuggestions": {
-    "message": "Unlock your account to view autofill suggestions",
+    "message": "解鎖您的帳號來查看建議的自動填入",
     "description": "Text to display in overlay when the account is locked."
   },
   "unlockAccount": {
@@ -3474,15 +3503,15 @@
     "description": "Button text to display in overlay when the account is locked."
   },
   "unlockAccountAria": {
-    "message": "Unlock your account, opens in a new window",
+    "message": "解鎖您的帳號，並開啟在新視窗",
     "description": "Screen reader text (aria-label) for unlock account button in overlay"
   },
   "totpCodeAria": {
-    "message": "Time-based One-Time Password Verification Code",
+    "message": "基於時間的一次性驗證碼",
     "description": "Aria label for the totp code displayed in the inline menu for autofill"
   },
   "totpSecondsSpanAria": {
-    "message": "Time remaining before current TOTP expires",
+    "message": "現在的 TOTP 到期剩餘時間",
     "description": "Aria label for the totp seconds displayed in the inline menu for autofill"
   },
   "fillCredentialsFor": {
@@ -3510,23 +3539,23 @@
     "description": "Button text to display within inline menu when there are no matching items on a login field"
   },
   "addNewLoginItemAria": {
-    "message": "Add new vault login item, opens in a new window",
+    "message": "新增新的密碼庫登入項目，在新視窗中顯示",
     "description": "Screen reader text (aria-label) for new login button within inline menu"
   },
   "newCard": {
-    "message": "New card",
+    "message": "新信用卡",
     "description": "Button text to display within inline menu when there are no matching items on a credit card field"
   },
   "addNewCardItemAria": {
-    "message": "Add new vault card item, opens in a new window",
+    "message": "新增新的密碼庫信用卡項目，在新視窗中顯示",
     "description": "Screen reader text (aria-label) for new card button within inline menu"
   },
   "newIdentity": {
-    "message": "New identity",
+    "message": "新身份識別",
     "description": "Button text to display within inline menu when there are no matching items on an identity field"
   },
   "addNewIdentityItemAria": {
-    "message": "Add new vault identity item, opens in a new window",
+    "message": "新增新的密碼庫身分項目，在新視窗中顯示",
     "description": "Screen reader text (aria-label) for new identity button within inline menu"
   },
   "bitwardenOverlayMenuAvailable": {
@@ -3616,19 +3645,19 @@
     }
   },
   "duoHealthCheckResultsInNullAuthUrlError": {
-    "message": "Error connecting with the Duo service. Use a different two-step login method or contact Duo for assistance."
+    "message": "連接到 Duo 服務時發生錯誤。使用不同的兩階段認證或聯繫 Duo 來獲得支援。"
   },
   "launchDuoAndFollowStepsToFinishLoggingIn": {
     "message": "啟動 Duo 並依照步驟完成登入。"
   },
   "duoRequiredForAccount": {
-    "message": "Duo two-step login is required for your account."
+    "message": "您的帳號要求使用 Duo 兩步驟驗證登入。"
   },
   "popoutTheExtensionToCompleteLogin": {
-    "message": "Popout the extension to complete login."
+    "message": "彈出擴充套件視窗來完成登入。"
   },
   "popoutExtension": {
-    "message": "Popout extension"
+    "message": "彈出擴充套件視窗"
   },
   "launchDuo": {
     "message": "開啟Duo"
@@ -3646,7 +3675,7 @@
     "message": "檔案密碼無效，請使用您當初匯出檔案時輸入的密碼。"
   },
   "destination": {
-    "message": "Destination"
+    "message": "目的"
   },
   "learnAboutImportOptions": {
     "message": "瞭解更多匯入選項"
@@ -3705,16 +3734,16 @@
     "message": "確認檔案密碼"
   },
   "exportSuccess": {
-    "message": "Vault data exported"
+    "message": "密碼庫資料已匯出"
   },
   "typePasskey": {
     "message": "密碼金鑰"
   },
   "accessing": {
-    "message": "Accessing"
+    "message": "正在存取"
   },
   "loggedInExclamation": {
-    "message": "Logged in!"
+    "message": "已登入！"
   },
   "passkeyNotCopied": {
     "message": "密碼金鑰不會被複製"
@@ -3738,7 +3767,7 @@
     "message": "您沒有符合該網站的登入資訊。"
   },
   "noMatchingLoginsForSite": {
-    "message": "No matching logins for this site"
+    "message": "未找到此網站的登入資訊"
   },
   "searchSavePasskeyNewLogin": {
     "message": "搜尋或將密碼金鑰儲存為新的登入資訊"
@@ -3877,19 +3906,19 @@
     "message": "伺服器"
   },
   "hostedAt": {
-    "message": "hosted at"
+    "message": "架設在"
   },
   "useDeviceOrHardwareKey": {
-    "message": "Use your device or hardware key"
+    "message": "使用您的裝置或密碼金鑰"
   },
   "justOnce": {
     "message": "僅此一次"
   },
   "alwaysForThisSite": {
-    "message": "Always for this site"
+    "message": "永遠針對此網站"
   },
   "domainAddedToExcludedDomains": {
-    "message": "$DOMAIN$ added to excluded domains.",
+    "message": "$DOMAIN$ 已新增到排除的網域。",
     "placeholders": {
       "domain": {
         "content": "$1",
@@ -3898,51 +3927,51 @@
     }
   },
   "commonImportFormats": {
-    "message": "Common formats",
+    "message": "常見格式",
     "description": "Label indicating the most common import formats"
   },
   "confirmContinueToBrowserSettingsTitle": {
-    "message": "Continue to browser settings?",
+    "message": "繼續前往瀏覽器設定？",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
   },
   "confirmContinueToHelpCenter": {
-    "message": "Continue to Help Center?",
+    "message": "繼續前往說明中心？",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant Help Center page"
   },
   "confirmContinueToHelpCenterPasswordManagementContent": {
-    "message": "Change your browser's autofill and password management settings.",
+    "message": "在您瀏覽器的偏好設定中更改自動填入及密碼管理。",
     "description": "Body content for dialog which asks if the user wants to proceed to the Help Center's page about browser password management settings"
   },
   "confirmContinueToHelpCenterKeyboardShortcutsContent": {
-    "message": "You can view and set extension shortcuts in your browser's settings.",
+    "message": "您可以在您瀏覽器的偏好設定中檢視及設定擴充套件的快速鍵。",
     "description": "Body content for dialog which asks if the user wants to proceed to the Help Center's page about browser keyboard shortcut settings"
   },
   "confirmContinueToBrowserPasswordManagementSettingsContent": {
-    "message": "Change your browser's autofill and password management settings.",
+    "message": "在您瀏覽器的偏好設定中更改自動填入及密碼管理。",
     "description": "Body content for dialog which asks if the user wants to proceed to the browser's password management settings page"
   },
   "confirmContinueToBrowserKeyboardShortcutSettingsContent": {
-    "message": "You can view and set extension shortcuts in your browser's settings.",
+    "message": "您可以在您瀏覽器的偏好設定中檢視及設定擴充套件的快速鍵。",
     "description": "Body content for dialog which asks if the user wants to proceed to the browser's keyboard shortcut settings page"
   },
   "overrideDefaultBrowserAutofillTitle": {
-    "message": "Make Bitwarden your default password manager?",
+    "message": "使用 Bitwarden 作為預設的密碼管理器？",
     "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior"
   },
   "overrideDefaultBrowserAutofillDescription": {
-    "message": "Ignoring this option may cause conflicts between Bitwarden autofill suggestions and your browser's.",
+    "message": "忽略此設定可能會導致 Bitwarden 自動填入選單與您的瀏覽器產生衝突。",
     "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior"
   },
   "overrideDefaultBrowserAutoFillSettings": {
-    "message": "Make Bitwarden your default password manager",
+    "message": "使用 Bitwarden 作為預設的密碼管理器",
     "description": "Label for the setting that allows overriding the default browser autofill settings"
   },
   "privacyPermissionAdditionNotGrantedTitle": {
-    "message": "Unable to set Bitwarden as the default password manager",
+    "message": "無法設定 Bitwarden 作為預設的密碼管理器",
     "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings"
   },
   "privacyPermissionAdditionNotGrantedDescription": {
-    "message": "You must grant browser privacy permissions to Bitwarden to set it as the default password manager.",
+    "message": "您必須同意您瀏覽器的隱私權限設定來設定 Bitwarden 為預設的密碼管理器。",
     "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings"
   },
   "makeDefault": {
@@ -3950,19 +3979,19 @@
     "description": "Button text for the setting that allows overriding the default browser autofill settings"
   },
   "saveCipherAttemptSuccess": {
-    "message": "Credentials saved successfully!",
+    "message": "憑證資訊成功儲存！",
     "description": "Notification message for when saving credentials has succeeded."
   },
   "passwordSaved": {
-    "message": "Password saved!",
+    "message": "密碼已儲存！",
     "description": "Notification message for when saving credentials has succeeded."
   },
   "updateCipherAttemptSuccess": {
-    "message": "Credentials updated successfully!",
+    "message": "憑證資訊成功更新！",
     "description": "Notification message for when updating credentials has succeeded."
   },
   "passwordUpdated": {
-    "message": "Password updated!",
+    "message": "密碼已更新！",
     "description": "Notification message for when updating credentials has succeeded."
   },
   "saveCipherAttemptFailed": {
@@ -3970,7 +3999,7 @@
     "description": "Notification message for when saving credentials has failed."
   },
   "success": {
-    "message": "Success"
+    "message": "成功"
   },
   "removePasskey": {
     "message": "移除密碼金鑰"
@@ -3979,19 +4008,19 @@
     "message": "密碼金鑰已移除"
   },
   "autofillSuggestions": {
-    "message": "Autofill suggestions"
+    "message": "自動填入建議"
   },
   "autofillSuggestionsTip": {
-    "message": "Save a login item for this site to autofill"
+    "message": "對此網站儲存登入項目為自動填入"
   },
   "yourVaultIsEmpty": {
-    "message": "Your vault is empty"
+    "message": "您的密碼庫是空的"
   },
   "noItemsMatchSearch": {
-    "message": "No items match your search"
+    "message": "沒有找到相符的項目。"
   },
   "clearFiltersOrTryAnother": {
-    "message": "Clear filters or try another search term"
+    "message": "清除過濾器或更換另一個搜尋條件"
   },
   "copyInfoTitle": {
     "message": "複製資訊 - $ITEMNAME$",
@@ -4004,7 +4033,7 @@
     }
   },
   "copyNoteTitle": {
-    "message": "Copy Note - $ITEMNAME$",
+    "message": "複製備註 - $ITEMNAME$",
     "description": "Title for a button copies a note to the clipboard.",
     "placeholders": {
       "itemname": {
@@ -4034,7 +4063,7 @@
     }
   },
   "viewItemTitle": {
-    "message": "View item - $ITEMNAME$",
+    "message": "檢視項目 - $ITEMNAME$",
     "description": "Title for a link that opens a view for an item.",
     "placeholders": {
       "itemname": {
@@ -4044,7 +4073,7 @@
     }
   },
   "autofillTitle": {
-    "message": "Autofill - $ITEMNAME$",
+    "message": "自動填入 - $ITEMNAME$",
     "description": "Title for a button that autofills a login item.",
     "placeholders": {
       "itemname": {
@@ -4054,22 +4083,22 @@
     }
   },
   "noValuesToCopy": {
-    "message": "No values to copy"
+    "message": "沒有資料可以複製"
   },
   "assignToCollections": {
     "message": "指派至集合"
   },
   "copyEmail": {
-    "message": "Copy email"
+    "message": "複製電子郵件地址"
   },
   "copyPhone": {
-    "message": "Copy phone"
+    "message": "複製電話"
   },
   "copyAddress": {
-    "message": "Copy address"
+    "message": "複製地址"
   },
   "adminConsole": {
-    "message": "Admin Console"
+    "message": "管理控制台"
   },
   "accountSecurity": {
     "message": "帳戶安全性"
@@ -4081,13 +4110,13 @@
     "message": "外觀"
   },
   "errorAssigningTargetCollection": {
-    "message": "Error assigning target collection."
+    "message": "指定目標集合時發生錯誤。"
   },
   "errorAssigningTargetFolder": {
-    "message": "Error assigning target folder."
+    "message": "指定目標資料夾時發生錯誤。"
   },
   "viewItemsIn": {
-    "message": "View items in $NAME$",
+    "message": "檢視 $NAME$ 中的項目",
     "description": "Button to view the contents of a folder or collection",
     "placeholders": {
       "name": {
@@ -4097,7 +4126,7 @@
     }
   },
   "backTo": {
-    "message": "Back to $NAME$",
+    "message": "回到 $NAME$",
     "description": "Navigate back to a previous folder or collection",
     "placeholders": {
       "name": {
@@ -4107,7 +4136,7 @@
     }
   },
   "new": {
-    "message": "New"
+    "message": "新增"
   },
   "removeItem": {
     "message": "移除 $NAME$",
@@ -4120,16 +4149,16 @@
     }
   },
   "itemsWithNoFolder": {
-    "message": "Items with no folder"
+    "message": "不在任何資料夾中的項目"
   },
   "itemDetails": {
     "message": "項目詳細資訊"
   },
   "itemName": {
-    "message": "Item name"
+    "message": "項目名稱"
   },
   "cannotRemoveViewOnlyCollections": {
-    "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
+    "message": "若您只有檢視權限，無法移除集合 $COLLECTIONS$。",
     "placeholders": {
       "collections": {
         "content": "$1",
@@ -4138,47 +4167,47 @@
     }
   },
   "organizationIsDeactivated": {
-    "message": "Organization is deactivated"
+    "message": "組織已被停用"
   },
   "owner": {
-    "message": "Owner"
+    "message": "擁有者"
   },
   "selfOwnershipLabel": {
-    "message": "You",
+    "message": "您",
     "description": "Used as a label to indicate that the user is the owner of an item."
   },
   "contactYourOrgAdmin": {
-    "message": "Items in deactivated organizations cannot be accessed. Contact your organization owner for assistance."
+    "message": "無法存取已停用組織中的項目。請聯絡您組織的擁有者以獲取協助。"
   },
   "additionalInformation": {
-    "message": "Additional information"
+    "message": "更多資訊"
   },
   "itemHistory": {
-    "message": "Item history"
+    "message": "項目歷史記錄"
   },
   "lastEdited": {
-    "message": "Last edited"
+    "message": "最後編輯"
   },
   "ownerYou": {
-    "message": "Owner: You"
+    "message": "擁有者： 您"
   },
   "linked": {
-    "message": "Linked"
+    "message": "連結"
   },
   "copySuccessful": {
-    "message": "Copy Successful"
+    "message": "複製成功"
   },
   "upload": {
-    "message": "Upload"
+    "message": "上傳"
   },
   "addAttachment": {
-    "message": "Add attachment"
+    "message": "新增附件"
   },
   "maxFileSizeSansPunctuation": {
-    "message": "Maximum file size is 500 MB"
+    "message": "最大檔案大小為 500MB"
   },
   "deleteAttachmentName": {
-    "message": "Delete attachment $NAME$",
+    "message": "刪除附檔 $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -4187,7 +4216,7 @@
     }
   },
   "downloadAttachmentName": {
-    "message": "Download $NAME$",
+    "message": "下載 $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -4196,25 +4225,25 @@
     }
   },
   "permanentlyDeleteAttachmentConfirmation": {
-    "message": "Are you sure you want to permanently delete this attachment?"
+    "message": "您確定要永久刪除此附檔嗎？"
   },
   "premium": {
     "message": "進階版"
   },
   "freeOrgsCannotUseAttachments": {
-    "message": "Free organizations cannot use attachments"
+    "message": "免費組織無法使用附檔"
   },
   "filters": {
-    "message": "Filters"
+    "message": "篩選器"
   },
   "filterVault": {
-    "message": "Filter vault"
+    "message": "過濾密碼庫"
   },
   "filterApplied": {
-    "message": "One filter applied"
+    "message": "套用了一個過濾條件"
   },
   "filterAppliedPlural": {
-    "message": "$COUNT$ filters applied",
+    "message": "套用了 $COUNT$ 個過濾條件",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4226,13 +4255,13 @@
     "message": "個人資訊"
   },
   "identification": {
-    "message": "Identification"
+    "message": "身份"
   },
   "contactInfo": {
-    "message": "Contact info"
+    "message": "聯繫資訊"
   },
   "downloadAttachment": {
-    "message": "Download - $ITEMNAME$",
+    "message": "下載 - $ITEMNAME$",
     "placeholders": {
       "itemname": {
         "content": "$1",
@@ -4241,23 +4270,23 @@
     }
   },
   "cardNumberEndsWith": {
-    "message": "card number ends with",
+    "message": "以此號碼結尾的信用卡",
     "description": "Used within the inline menu to provide an aria description when users are attempting to fill a card cipher."
   },
   "loginCredentials": {
-    "message": "Login credentials"
+    "message": "登入資訊"
   },
   "authenticatorKey": {
-    "message": "Authenticator key"
+    "message": "驗證器金鑰"
   },
   "autofillOptions": {
     "message": "自動填入選項"
   },
   "websiteUri": {
-    "message": "Website (URI)"
+    "message": "網站 (URI)"
   },
   "websiteUriCount": {
-    "message": "Website (URI) $COUNT$",
+    "message": "網站 (URI) $COUNT$",
     "description": "Label for an input field that contains a website URI. The input field is part of a list of fields, and the count indicates the position of the field in the list.",
     "placeholders": {
       "count": {
@@ -4267,16 +4296,16 @@
     }
   },
   "websiteAdded": {
-    "message": "Website added"
+    "message": "網站已新增"
   },
   "addWebsite": {
-    "message": "Add website"
+    "message": "新增網站"
   },
   "deleteWebsite": {
-    "message": "Delete website"
+    "message": "刪除網站"
   },
   "defaultLabel": {
-    "message": "Default ($VALUE$)",
+    "message": "預設 （$VALUE$）",
     "description": "A label that indicates the default value for a field with the current default value in parentheses.",
     "placeholders": {
       "value": {
@@ -4286,7 +4315,7 @@
     }
   },
   "showMatchDetection": {
-    "message": "Show match detection $WEBSITE$",
+    "message": "顯示偵測到的吻合 $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -4295,7 +4324,7 @@
     }
   },
   "hideMatchDetection": {
-    "message": "Hide match detection $WEBSITE$",
+    "message": "隱藏偵測到的吻合 $WEBSITE$",
     "placeholders": {
       "website": {
         "content": "$1",
@@ -4304,13 +4333,13 @@
     }
   },
   "autoFillOnPageLoad": {
-    "message": "Autofill on page load?"
+    "message": "在頁面載入時自動填寫？"
   },
   "cardExpiredTitle": {
-    "message": "Expired card"
+    "message": "過期的信用卡"
   },
   "cardExpiredMessage": {
-    "message": "If you've renewed it, update the card's information"
+    "message": "如果您已續期，請更新信用卡資訊"
   },
   "cardDetails": {
     "message": "信用卡詳細資料"
@@ -4334,17 +4363,17 @@
     "message": "新增帳戶"
   },
   "loading": {
-    "message": "Loading"
+    "message": "正在載入"
   },
   "data": {
-    "message": "Data"
+    "message": "資料"
   },
   "passkeys": {
     "message": "密碼金鑰",
     "description": "A section header for a list of passkeys."
   },
   "passwords": {
-    "message": "Passwords",
+    "message": "密碼",
     "description": "A section header for a list of passwords."
   },
   "logInWithPasskeyAriaLabel": {
@@ -4352,16 +4381,16 @@
     "description": "ARIA label for the inline menu button that logs in with a passkey."
   },
   "assign": {
-    "message": "Assign"
+    "message": "指定"
   },
   "bulkCollectionAssignmentDialogDescriptionSingular": {
-    "message": "Only organization members with access to these collections will be able to see the item."
+    "message": "只有可以檢視集合的組織成員才能看到其中的項目。"
   },
   "bulkCollectionAssignmentDialogDescriptionPlural": {
-    "message": "Only organization members with access to these collections will be able to see the items."
+    "message": "只有可以檢視集合的組織成員才能看到其中的項目。"
   },
   "bulkCollectionAssignmentWarning": {
-    "message": "You have selected $TOTAL_COUNT$ items. You cannot update $READONLY_COUNT$ of the items because you do not have edit permissions.",
+    "message": "您已經選擇 $TOTAL_COUNT$ 個項目。由於您沒有編輯權限，無法更新其中的 $READONLY_COUNT$ 個項目。",
     "placeholders": {
       "total_count": {
         "content": "$1",
@@ -4373,37 +4402,37 @@
     }
   },
   "addField": {
-    "message": "Add field"
+    "message": "新增欄位"
   },
   "add": {
-    "message": "Add"
+    "message": "新增"
   },
   "fieldType": {
-    "message": "Field type"
+    "message": "欄位類型"
   },
   "fieldLabel": {
-    "message": "Field label"
+    "message": "欄位標籤"
   },
   "textHelpText": {
-    "message": "Use text fields for data like security questions"
+    "message": "像是安全問答的資訊可以使用文字欄位來儲存"
   },
   "hiddenHelpText": {
-    "message": "Use hidden fields for sensitive data like a password"
+    "message": "像是密碼的機密資訊可以使用隱藏欄位來儲存"
   },
   "checkBoxHelpText": {
-    "message": "Use checkboxes if you'd like to autofill a form's checkbox, like a remember email"
+    "message": "若您想自動填入欄位中的核取方塊，例如儲存電子郵件，可以使用核取方塊。"
   },
   "linkedHelpText": {
-    "message": "Use a linked field when you are experiencing autofill issues for a specific website."
+    "message": "使用連結欄位若您在特定網站上遇到自動填入問題。"
   },
   "linkedLabelHelpText": {
-    "message": "Enter the the field's html id, name, aria-label, or placeholder."
+    "message": "填入欄位的 html id、名稱、標籤或預留字元"
   },
   "editField": {
-    "message": "Edit field"
+    "message": "編輯欄位"
   },
   "editFieldLabel": {
-    "message": "Edit $LABEL$",
+    "message": "編輯 $LABEL$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4412,7 +4441,7 @@
     }
   },
   "deleteCustomField": {
-    "message": "Delete $LABEL$",
+    "message": "刪除 $LABEL$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4421,7 +4450,7 @@
     }
   },
   "fieldAdded": {
-    "message": "$LABEL$ added",
+    "message": "$LABEL$ 已新增",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4430,7 +4459,7 @@
     }
   },
   "reorderToggleButton": {
-    "message": "Reorder $LABEL$. Use arrow key to move item up or down.",
+    "message": "重新排序 $LABEL$。使用方向鍵來往上或下移動。",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4439,7 +4468,7 @@
     }
   },
   "reorderFieldUp": {
-    "message": "$LABEL$ moved up, position $INDEX$ of $LENGTH$",
+    "message": "往上移動 $LABEL$，位置 $LENGTH$ 之 $INDEX$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4459,10 +4488,10 @@
     "message": "選擇要指派的集合"
   },
   "personalItemTransferWarningSingular": {
-    "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
+    "message": "1 個項目會被永久移到選擇的組織。您將不再擁有此項目。"
   },
   "personalItemsTransferWarningPlural": {
-    "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
+    "message": "$PERSONAL_ITEMS_COUNT$ 個項目會被永久移到選擇的組織。您將不再擁有這些項目。",
     "placeholders": {
       "personal_items_count": {
         "content": "$1",
@@ -4471,7 +4500,7 @@
     }
   },
   "personalItemWithOrgTransferWarningSingular": {
-    "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
+    "message": "1 個項目會被永久移到 $ORG$。您將不再擁有此項目。",
     "placeholders": {
       "org": {
         "content": "$1",
@@ -4480,7 +4509,7 @@
     }
   },
   "personalItemsWithOrgTransferWarningPlural": {
-    "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
+    "message": "$PERSONAL_ITEMS_COUNT$ 個項目會被永久移到 $ORG$。您將不再擁有這些項目。",
     "placeholders": {
       "personal_items_count": {
         "content": "$1",
@@ -4496,10 +4525,10 @@
     "message": "指派集合成功"
   },
   "nothingSelected": {
-    "message": "You have not selected anything."
+    "message": "您沒有選擇任何項目。"
   },
   "movedItemsToOrg": {
-    "message": "Selected items moved to $ORGNAME$",
+    "message": "將已選取項目移動至 $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -4508,7 +4537,7 @@
     }
   },
   "itemsMovedToOrg": {
-    "message": "Items moved to $ORGNAME$",
+    "message": "項目已移到 $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -4517,7 +4546,7 @@
     }
   },
   "itemMovedToOrg": {
-    "message": "Item moved to $ORGNAME$",
+    "message": "項目已移到 $ORGNAME$",
     "placeholders": {
       "orgname": {
         "content": "$1",
@@ -4526,7 +4555,7 @@
     }
   },
   "reorderFieldDown": {
-    "message": "$LABEL$ moved down, position $INDEX$ of $LENGTH$",
+    "message": "往下移動 $LABEL$，位置 $LENGTH$ 之 $INDEX$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4543,52 +4572,52 @@
     }
   },
   "itemLocation": {
-    "message": "Item Location"
+    "message": "項目位置"
   },
   "fileSend": {
-    "message": "File Send"
+    "message": "檔案 Send"
   },
   "fileSends": {
-    "message": "File Sends"
+    "message": "檔案 Send"
   },
   "textSend": {
-    "message": "Text Send"
+    "message": "文字 Send"
   },
   "textSends": {
-    "message": "Text Sends"
+    "message": "文字 Sends"
   },
   "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
+    "message": "Bitwarden 有了新外觀！"
   },
   "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
+    "message": "更容易使用的自動填入及密碼庫搜尋體驗。試試看吧！"
   },
   "accountActions": {
-    "message": "Account actions"
+    "message": "帳號動作"
   },
   "showNumberOfAutofillSuggestions": {
-    "message": "Show number of login autofill suggestions on extension icon"
+    "message": "在擴充套件圖示上顯示自動填入建議的數量"
   },
   "showQuickCopyActions": {
-    "message": "Show quick copy actions on Vault"
+    "message": "在密碼庫中顯示快速複製"
   },
   "systemDefault": {
-    "message": "System default"
+    "message": "系統預設值"
   },
   "enterprisePolicyRequirementsApplied": {
-    "message": "Enterprise policy requirements have been applied to this setting"
+    "message": "企業政策已套用至您的選項中"
   },
   "sshPrivateKey": {
-    "message": "Private key"
+    "message": "私密金鑰"
   },
   "sshPublicKey": {
-    "message": "Public key"
+    "message": "公共金鑰"
   },
   "sshFingerprint": {
-    "message": "Fingerprint"
+    "message": "指紋"
   },
   "sshKeyAlgorithm": {
-    "message": "Key type"
+    "message": "金鑰類型"
   },
   "sshKeyAlgorithmED25519": {
     "message": "ED25519"
@@ -4603,223 +4632,250 @@
     "message": "RSA 4096-Bit"
   },
   "retry": {
-    "message": "Retry"
+    "message": "重試"
   },
   "vaultCustomTimeoutMinimum": {
-    "message": "Minimum custom timeout is 1 minute."
+    "message": "自訂逾時時間最小為 1 分鐘。"
   },
   "additionalContentAvailable": {
-    "message": "Additional content is available"
+    "message": "以及更多內容"
   },
   "fileSavedToDevice": {
-    "message": "File saved to device. Manage from your device downloads."
+    "message": "檔案已儲存到裝置。在您的裝置上管理下載檔案。"
   },
   "showCharacterCount": {
-    "message": "Show character count"
+    "message": "顯示字元數"
   },
   "hideCharacterCount": {
-    "message": "Hide character count"
+    "message": "隱藏字元數"
   },
   "itemsInTrash": {
-    "message": "Items in trash"
+    "message": "在垃圾桶中的項目"
   },
   "noItemsInTrash": {
-    "message": "No items in trash"
+    "message": "垃圾桶中沒有項目"
   },
   "noItemsInTrashDesc": {
-    "message": "Items you delete will appear here and be permanently deleted after 30 days"
+    "message": "您刪除的項目會在此顯示，並會在 30 天之後永久刪除"
   },
   "trashWarning": {
-    "message": "Items that have been in trash more than 30 days will automatically be deleted"
+    "message": "垃圾桶中超過 30 天的項目將會被自動刪除。"
   },
   "restore": {
-    "message": "Restore"
+    "message": "還原"
   },
   "deleteForever": {
-    "message": "Delete forever"
+    "message": "永遠刪除"
   },
   "noEditPermissions": {
-    "message": "You don't have permission to edit this item"
+    "message": "你沒有權限編輯這個項目"
+  },
+  "biometricsStatusHelptextUnlockNeeded": {
+    "message": "需要 PIN 碼或密碼解鎖才能使用生物辨識解鎖。"
+  },
+  "biometricsStatusHelptextHardwareUnavailable": {
+    "message": "生物辨識解鎖暫時無法使用。"
+  },
+  "biometricsStatusHelptextAutoSetupNeeded": {
+    "message": "由於系統檔案不正確，生物辨識解鎖無法使用。"
+  },
+  "biometricsStatusHelptextManualSetupNeeded": {
+    "message": "由於系統檔案不正確，生物辨識解鎖無法使用。"
+  },
+  "biometricsStatusHelptextDesktopDisconnected": {
+    "message": "由於 Bitwarden 桌面應用程式已關閉，生物辨識解鎖無法使用。"
+  },
+  "biometricsStatusHelptextNotEnabledInDesktop": {
+    "message": "由於未 Bitwarden 桌面應用程式的 $EMAIL$ 帳號上啟動，生物辨識解鎖無法使用。",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "mail@example.com"
+      }
+    }
+  },
+  "biometricsStatusHelptextUnavailableReasonUnknown": {
+    "message": "基於不明原因，生物辨識解鎖無法使用。"
   },
   "authenticating": {
-    "message": "Authenticating"
+    "message": "驗證中"
   },
   "fillGeneratedPassword": {
-    "message": "Fill generated password",
+    "message": "自動填入產生的密碼",
     "description": "Heading for the password generator within the inline menu"
   },
   "passwordRegenerated": {
-    "message": "Password regenerated",
+    "message": "密碼已重新產生",
     "description": "Notification message for when a password has been regenerated"
   },
   "saveLoginToBitwarden": {
-    "message": "Save login to Bitwarden?",
+    "message": "在 Bitwarden 中儲存登入資訊？",
     "description": "Confirmation message for saving a login to Bitwarden"
   },
   "spaceCharacterDescriptor": {
-    "message": "Space",
+    "message": "空格",
     "description": "Represents the space key in screen reader content as a readable word"
   },
   "tildeCharacterDescriptor": {
-    "message": "Tilde",
+    "message": "波浪",
     "description": "Represents the ~ key in screen reader content as a readable word"
   },
   "backtickCharacterDescriptor": {
-    "message": "Backtick",
+    "message": "重音符",
     "description": "Represents the ` key in screen reader content as a readable word"
   },
   "exclamationCharacterDescriptor": {
-    "message": "Exclamation mark",
+    "message": "驚歎號",
     "description": "Represents the ! key in screen reader content as a readable word"
   },
   "atSignCharacterDescriptor": {
-    "message": "At sign",
+    "message": "在符號",
     "description": "Represents the @ key in screen reader content as a readable word"
   },
   "hashSignCharacterDescriptor": {
-    "message": "Hash sign",
+    "message": "井字號",
     "description": "Represents the # key in screen reader content as a readable word"
   },
   "dollarSignCharacterDescriptor": {
-    "message": "Dollar sign",
+    "message": "錢字號",
     "description": "Represents the $ key in screen reader content as a readable word"
   },
   "percentSignCharacterDescriptor": {
-    "message": "Percent sign",
+    "message": "百分比",
     "description": "Represents the % key in screen reader content as a readable word"
   },
   "caretCharacterDescriptor": {
-    "message": "Caret",
+    "message": "插入號",
     "description": "Represents the ^ key in screen reader content as a readable word"
   },
   "ampersandCharacterDescriptor": {
-    "message": "Ampersand",
+    "message": "和符號",
     "description": "Represents the & key in screen reader content as a readable word"
   },
   "asteriskCharacterDescriptor": {
-    "message": "Asterisk",
+    "message": "星號",
     "description": "Represents the * key in screen reader content as a readable word"
   },
   "parenLeftCharacterDescriptor": {
-    "message": "Left parenthesis",
+    "message": "左括號",
     "description": "Represents the ( key in screen reader content as a readable word"
   },
   "parenRightCharacterDescriptor": {
-    "message": "Right parenthesis",
+    "message": "右括號",
     "description": "Represents the ) key in screen reader content as a readable word"
   },
   "hyphenCharacterDescriptor": {
-    "message": "Underscore",
+    "message": "底線",
     "description": "Represents the _ key in screen reader content as a readable word"
   },
   "underscoreCharacterDescriptor": {
-    "message": "Hyphen",
+    "message": "連字號",
     "description": "Represents the - key in screen reader content as a readable word"
   },
   "plusCharacterDescriptor": {
-    "message": "Plus",
+    "message": "加號",
     "description": "Represents the + key in screen reader content as a readable word"
   },
   "equalsCharacterDescriptor": {
-    "message": "Equals",
+    "message": "等號",
     "description": "Represents the = key in screen reader content as a readable word"
   },
   "braceLeftCharacterDescriptor": {
-    "message": "Left brace",
+    "message": "左大括號",
     "description": "Represents the { key in screen reader content as a readable word"
   },
   "braceRightCharacterDescriptor": {
-    "message": "Right brace",
+    "message": "右大括號",
     "description": "Represents the } key in screen reader content as a readable word"
   },
   "bracketLeftCharacterDescriptor": {
-    "message": "Left bracket",
+    "message": "左中括號",
     "description": "Represents the [ key in screen reader content as a readable word"
   },
   "bracketRightCharacterDescriptor": {
-    "message": "Right bracket",
+    "message": "右中括號",
     "description": "Represents the ] key in screen reader content as a readable word"
   },
   "pipeCharacterDescriptor": {
-    "message": "Pipe",
+    "message": "垂直符號",
     "description": "Represents the | key in screen reader content as a readable word"
   },
   "backSlashCharacterDescriptor": {
-    "message": "Back slash",
+    "message": "反斜線",
     "description": "Represents the back slash key in screen reader content as a readable word"
   },
   "colonCharacterDescriptor": {
-    "message": "Colon",
+    "message": "冒號",
     "description": "Represents the : key in screen reader content as a readable word"
   },
   "semicolonCharacterDescriptor": {
-    "message": "Semicolon",
+    "message": "分號",
     "description": "Represents the ; key in screen reader content as a readable word"
   },
   "doubleQuoteCharacterDescriptor": {
-    "message": "Double quote",
+    "message": "雙引號",
     "description": "Represents the double quote key in screen reader content as a readable word"
   },
   "singleQuoteCharacterDescriptor": {
-    "message": "Single quote",
+    "message": "單引號",
     "description": "Represents the ' key in screen reader content as a readable word"
   },
   "lessThanCharacterDescriptor": {
-    "message": "Less than",
+    "message": "小於",
     "description": "Represents the < key in screen reader content as a readable word"
   },
   "greaterThanCharacterDescriptor": {
-    "message": "Greater than",
+    "message": "大於",
     "description": "Represents the > key in screen reader content as a readable word"
   },
   "commaCharacterDescriptor": {
-    "message": "Comma",
+    "message": "逗號",
     "description": "Represents the , key in screen reader content as a readable word"
   },
   "periodCharacterDescriptor": {
-    "message": "Period",
+    "message": "句號",
     "description": "Represents the . key in screen reader content as a readable word"
   },
   "questionCharacterDescriptor": {
-    "message": "Question mark",
+    "message": "問號",
     "description": "Represents the ? key in screen reader content as a readable word"
   },
   "forwardSlashCharacterDescriptor": {
-    "message": "Forward slash",
+    "message": "斜線",
     "description": "Represents the / key in screen reader content as a readable word"
   },
   "lowercaseAriaLabel": {
-    "message": "Lowercase"
+    "message": "小寫"
   },
   "uppercaseAriaLabel": {
-    "message": "Uppercase"
+    "message": "大寫"
   },
   "generatedPassword": {
-    "message": "Generated password"
+    "message": "已產生的密碼"
   },
   "compactMode": {
-    "message": "Compact mode"
+    "message": "緊湊模式"
   },
   "beta": {
-    "message": "Beta"
+    "message": "測試版"
   },
   "importantNotice": {
-    "message": "Important notice"
+    "message": "重要通知"
   },
   "setupTwoStepLogin": {
-    "message": "Set up two-step login"
+    "message": "啟動兩階段登入"
   },
   "newDeviceVerificationNoticeContentPage1": {
-    "message": "Bitwarden will send a code to your account email to verify logins from new devices starting in February 2025."
+    "message": "從 2025 年 2 月開始，Bitwarden 會傳送代碼到您的帳號電子郵件中來驗證新裝置的登入。"
   },
   "newDeviceVerificationNoticeContentPage2": {
-    "message": "You can set up two-step login as an alternative way to protect your account or change your email to one you can access."
+    "message": "您可以啟動兩階段認證來保護您的帳號或更改您可以存取的電子郵件位址。"
   },
   "remindMeLater": {
-    "message": "Remind me later"
+    "message": "稍後再提醒我"
   },
   "newDeviceVerificationNoticePageOneFormContent": {
-    "message": "Do you have reliable access to your email, $EMAIL$?",
+    "message": "您可以存取您的電子郵件位址 $EMAIL$ 嗎？",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -4828,24 +4884,24 @@
     }
   },
   "newDeviceVerificationNoticePageOneEmailAccessNo": {
-    "message": "No, I do not"
+    "message": "不，我不行"
   },
   "newDeviceVerificationNoticePageOneEmailAccessYes": {
-    "message": "Yes, I can reliably access my email"
+    "message": "是，我可以存取我的電子郵件位址"
   },
   "turnOnTwoStepLogin": {
-    "message": "Turn on two-step login"
+    "message": "啟動兩階段登入"
   },
   "changeAcctEmail": {
-    "message": "Change account email"
+    "message": "更改帳號電子郵件位址"
   },
   "extensionWidth": {
-    "message": "Extension width"
+    "message": "擴充套件寬度"
   },
   "wide": {
-    "message": "Wide"
+    "message": "寬度"
   },
   "extraWide": {
-    "message": "Extra wide"
+    "message": "更寬"
   }
 }
diff --git a/apps/browser/store/locales/zh_CN/copy.resx b/apps/browser/store/locales/zh_CN/copy.resx
index ea98321a49..3348cf1910 100644
--- a/apps/browser/store/locales/zh_CN/copy.resx
+++ b/apps/browser/store/locales/zh_CN/copy.resx
@@ -121,7 +121,7 @@
     <value>Bitwarden 密码管理器</value>
   </data>
   <data name="Summary" xml:space="preserve">
-    <value>无论是在家里、工作中还是在外出时，Bitwarden 都可以轻松地保护您的所有密码、通行密钥和敏感信息。</value>
+    <value>无论是在家中、工作中还是在旅途中，Bitwarden 都可以轻松地保护您的所有密码、通行密钥和敏感信息。</value>
   </data>
   <data name="Description" xml:space="preserve">
     <value>被 PCMag、WIRED、The Verge、CNET、G2 等评为最佳的密码管理器！
@@ -167,7 +167,7 @@ Bitwarden 保护的不仅仅是密码
 Bitwarden 的端对端加密凭据管理解决方案使组织能够保护所有内容，包括开发人员机密和通行密钥体验。访问 Bitwarden.com 了解更多关于 Bitwarden Secrets Manager 和 Bitwarden Passwordless.dev 的信息！</value>
   </data>
   <data name="AssetTitle" xml:space="preserve">
-    <value>无论是在家里、工作中还是在外出时，Bitwarden 都可以轻松地保护您的所有密码、通行密钥和敏感信息。</value>
+    <value>无论是在家中、工作中还是在旅途中，Bitwarden 都可以轻松地保护您的所有密码、通行密钥和敏感信息。</value>
   </data>
   <data name="ScreenshotSync" xml:space="preserve">
     <value>在多个设备间同步和访问您的密码库</value>

From f6a0496656d5a7ea04a0ce47b6468147cddc90e7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 Jan 2025 12:00:40 -0500
Subject: [PATCH 038/150] [deps] AC: Update sass to v1.83.1 (#12302)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7994c8b0c2..4867ac134c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -166,7 +166,7 @@
         "process": "0.11.10",
         "remark-gfm": "4.0.0",
         "rimraf": "6.0.1",
-        "sass": "1.81.0",
+        "sass": "1.83.1",
         "sass-loader": "16.0.4",
         "storybook": "8.4.7",
         "style-loader": "4.0.0",
@@ -28777,9 +28777,9 @@
       }
     },
     "node_modules/sass": {
-      "version": "1.81.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.81.0.tgz",
-      "integrity": "sha512-Q4fOxRfhmv3sqCLoGfvrC9pRV8btc0UtqL9mN6Yrv6Qi9ScL55CVH1vlPP863ISLEEMNLLuu9P+enCeGHlnzhA==",
+      "version": "1.83.1",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.1.tgz",
+      "integrity": "sha512-EVJbDaEs4Rr3F0glJzFSOvtg2/oy2V/YrGFPqPY24UqcLDWcI9ZY5sN+qyO3c/QCZwzgfirvhXvINiJCE/OLcA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -28839,9 +28839,9 @@
       }
     },
     "node_modules/sass/node_modules/chokidar": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
-      "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 2508c543d7..97e2b96f6a 100644
--- a/package.json
+++ b/package.json
@@ -126,7 +126,7 @@
     "process": "0.11.10",
     "remark-gfm": "4.0.0",
     "rimraf": "6.0.1",
-    "sass": "1.81.0",
+    "sass": "1.83.1",
     "sass-loader": "16.0.4",
     "storybook": "8.4.7",
     "style-loader": "4.0.0",

From 9e33e6960b4cae75e2e6e7ecd3bee8295e8ca863 Mon Sep 17 00:00:00 2001
From: Jonathan Prusik <jprusik@users.noreply.github.com>
Date: Fri, 10 Jan 2025 12:11:21 -0500
Subject: [PATCH 039/150] fix bad imports (#12803)

---
 apps/browser/src/autofill/content/notification-bar.ts | 5 ++---
 apps/browser/src/autofill/types/index.ts              | 4 +---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/apps/browser/src/autofill/content/notification-bar.ts b/apps/browser/src/autofill/content/notification-bar.ts
index 24b63d6b9e..d3e9c29ab5 100644
--- a/apps/browser/src/autofill/content/notification-bar.ts
+++ b/apps/browser/src/autofill/content/notification-bar.ts
@@ -1,8 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { ServerConfig } from "../../../../../libs/common/src/platform/abstractions/config/server-config";
+import { ServerConfig } from "@bitwarden/common/platform/abstractions/config/server-config";
+
 import {
   AddLoginMessageData,
   ChangePasswordMessageData,
diff --git a/apps/browser/src/autofill/types/index.ts b/apps/browser/src/autofill/types/index.ts
index 606b36e1fb..58ac95e7ed 100644
--- a/apps/browser/src/autofill/types/index.ts
+++ b/apps/browser/src/autofill/types/index.ts
@@ -1,7 +1,5 @@
+import { VaultTimeoutAction } from "@bitwarden/common/enums/vault-timeout-action.enum";
 import { Region } from "@bitwarden/common/platform/abstractions/environment.service";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { VaultTimeoutAction } from "@bitwarden/common/src/enums/vault-timeout-action.enum";
 import { VaultTimeout } from "@bitwarden/common/types/vault-timeout.type";
 import { CipherType } from "@bitwarden/common/vault/enums";
 

From 5fcd37833ce3a009f6295b6ce0b9ecefbc4f0358 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 Jan 2025 12:51:20 -0500
Subject: [PATCH 040/150] [deps] Autofill: Update tldts to v6.1.71 (#12702)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 apps/cli/package.json |  2 +-
 package-lock.json     | 18 +++++++++---------
 package.json          |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/cli/package.json b/apps/cli/package.json
index 40f7933ef8..28432bd555 100644
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -80,7 +80,7 @@
     "papaparse": "5.4.1",
     "proper-lockfile": "4.1.2",
     "rxjs": "7.8.1",
-    "tldts": "6.1.69",
+    "tldts": "6.1.71",
     "zxcvbn": "4.4.2"
   }
 }
diff --git a/package-lock.json b/package-lock.json
index 4867ac134c..066a9781a9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -70,7 +70,7 @@
         "qrious": "4.0.2",
         "rxjs": "7.8.1",
         "tabbable": "6.2.0",
-        "tldts": "6.1.69",
+        "tldts": "6.1.71",
         "utf-8-validate": "6.0.5",
         "zone.js": "0.14.10",
         "zxcvbn": "4.4.2"
@@ -223,7 +223,7 @@
         "papaparse": "5.4.1",
         "proper-lockfile": "4.1.2",
         "rxjs": "7.8.1",
-        "tldts": "6.1.69",
+        "tldts": "6.1.71",
         "zxcvbn": "4.4.2"
       },
       "bin": {
@@ -30719,21 +30719,21 @@
       }
     },
     "node_modules/tldts": {
-      "version": "6.1.69",
-      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.69.tgz",
-      "integrity": "sha512-Oh/CqRQ1NXNY7cy9NkTPUauOWiTro0jEYZTioGbOmcQh6EC45oribyIMJp0OJO3677r13tO6SKdWoGZUx2BDFw==",
+      "version": "6.1.71",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.71.tgz",
+      "integrity": "sha512-LQIHmHnuzfZgZWAf2HzL83TIIrD8NhhI0DVxqo9/FdOd4ilec+NTNZOlDZf7EwrTNoutccbsHjvWHYXLAtvxjw==",
       "license": "MIT",
       "dependencies": {
-        "tldts-core": "^6.1.69"
+        "tldts-core": "^6.1.71"
       },
       "bin": {
         "tldts": "bin/cli.js"
       }
     },
     "node_modules/tldts-core": {
-      "version": "6.1.69",
-      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.69.tgz",
-      "integrity": "sha512-nygxy9n2PBUFQUtAXAc122gGo+04/j5qr5TGQFZTHafTKYvmARVXt2cA5rgero2/dnXUfkdPtiJoKmrd3T+wdA==",
+      "version": "6.1.71",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.71.tgz",
+      "integrity": "sha512-LRbChn2YRpic1KxY+ldL1pGXN/oVvKfCVufwfVzEQdFYNo39uF7AJa/WXdo+gYO7PTvdfkCPCed6Hkvz/kR7jg==",
       "license": "MIT"
     },
     "node_modules/tmp": {
diff --git a/package.json b/package.json
index 97e2b96f6a..12d89fa8bc 100644
--- a/package.json
+++ b/package.json
@@ -201,7 +201,7 @@
     "qrious": "4.0.2",
     "rxjs": "7.8.1",
     "tabbable": "6.2.0",
-    "tldts": "6.1.69",
+    "tldts": "6.1.71",
     "utf-8-validate": "6.0.5",
     "zone.js": "0.14.10",
     "zxcvbn": "4.4.2"

From d0973529788ff66c88e9c7526fa0898c544a5ed0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 Jan 2025 12:55:59 -0500
Subject: [PATCH 041/150] [deps] Platform: Update @types/node to v22.10.5
 (#12703)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .../native-messaging-test-runner/package-lock.json        | 8 ++++----
 apps/desktop/native-messaging-test-runner/package.json    | 2 +-
 package-lock.json                                         | 8 ++++----
 package.json                                              | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/desktop/native-messaging-test-runner/package-lock.json b/apps/desktop/native-messaging-test-runner/package-lock.json
index 4bf939c8b4..f7e70babc4 100644
--- a/apps/desktop/native-messaging-test-runner/package-lock.json
+++ b/apps/desktop/native-messaging-test-runner/package-lock.json
@@ -18,7 +18,7 @@
         "yargs": "17.7.2"
       },
       "devDependencies": {
-        "@types/node": "22.10.2",
+        "@types/node": "22.10.5",
         "@types/node-ipc": "9.2.3",
         "typescript": "4.7.4"
       }
@@ -106,9 +106,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.10.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.2.tgz",
-      "integrity": "sha512-Xxr6BBRCAOQixvonOye19wnzyDiUtTeqldOOmj3CkeblonbccA12PFwlufvRdrpjXxqnmUaeiU5EOA+7s5diUQ==",
+      "version": "22.10.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.5.tgz",
+      "integrity": "sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.20.0"
diff --git a/apps/desktop/native-messaging-test-runner/package.json b/apps/desktop/native-messaging-test-runner/package.json
index 6ab267be4a..39e43f3a97 100644
--- a/apps/desktop/native-messaging-test-runner/package.json
+++ b/apps/desktop/native-messaging-test-runner/package.json
@@ -23,7 +23,7 @@
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@types/node": "22.10.2",
+    "@types/node": "22.10.5",
     "@types/node-ipc": "9.2.3",
     "typescript": "4.7.4"
   },
diff --git a/package-lock.json b/package-lock.json
index 066a9781a9..0be1e2602e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -113,7 +113,7 @@
         "@types/koa-json": "2.0.23",
         "@types/lowdb": "1.0.15",
         "@types/lunr": "2.3.7",
-        "@types/node": "22.10.2",
+        "@types/node": "22.10.5",
         "@types/node-fetch": "2.6.4",
         "@types/node-forge": "1.3.11",
         "@types/node-ipc": "9.2.3",
@@ -9772,9 +9772,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "22.10.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.2.tgz",
-      "integrity": "sha512-Xxr6BBRCAOQixvonOye19wnzyDiUtTeqldOOmj3CkeblonbccA12PFwlufvRdrpjXxqnmUaeiU5EOA+7s5diUQ==",
+      "version": "22.10.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.5.tgz",
+      "integrity": "sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 12d89fa8bc..f03dc6c9d0 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "@types/koa-json": "2.0.23",
     "@types/lowdb": "1.0.15",
     "@types/lunr": "2.3.7",
-    "@types/node": "22.10.2",
+    "@types/node": "22.10.5",
     "@types/node-fetch": "2.6.4",
     "@types/node-forge": "1.3.11",
     "@types/node-ipc": "9.2.3",

From 0badd04033b7380c5b700c0ad09ccae3aeec6452 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 Jan 2025 12:56:53 -0500
Subject: [PATCH 042/150] [deps] Autofill: Update concurrently to v9.1.2
 (#12701)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0be1e2602e..591478d351 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -130,7 +130,7 @@
         "base64-loader": "1.0.0",
         "browserslist": "4.23.2",
         "chromatic": "11.20.2",
-        "concurrently": "9.1.0",
+        "concurrently": "9.1.2",
         "copy-webpack-plugin": "12.0.2",
         "cross-env": "7.0.3",
         "css-loader": "7.1.2",
@@ -13825,9 +13825,9 @@
       }
     },
     "node_modules/concurrently": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-9.1.0.tgz",
-      "integrity": "sha512-VxkzwMAn4LP7WyMnJNbHN5mKV9L2IbyDjpzemKr99sXNR3GqRNMMHdm7prV1ws9wg7ETj6WUkNOigZVsptwbgg==",
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-9.1.2.tgz",
+      "integrity": "sha512-H9MWcoPsYddwbOGM6difjVwVZHl63nwMEwDJG/L7VGtuaJhb12h2caPG2tVPWs7emuYix252iGfqOyrz1GczTQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index f03dc6c9d0..3dcb2c142e 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "base64-loader": "1.0.0",
     "browserslist": "4.23.2",
     "chromatic": "11.20.2",
-    "concurrently": "9.1.0",
+    "concurrently": "9.1.2",
     "copy-webpack-plugin": "12.0.2",
     "cross-env": "7.0.3",
     "css-loader": "7.1.2",

From 2a30c27d18d14aa5f151e46ad94d3a28abef2844 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 Jan 2025 12:58:44 -0500
Subject: [PATCH 043/150] [deps]: Update uuid to v11.0.5 (#12705)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .../native-messaging-test-runner/package-lock.json        | 8 ++++----
 apps/desktop/native-messaging-test-runner/package.json    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/desktop/native-messaging-test-runner/package-lock.json b/apps/desktop/native-messaging-test-runner/package-lock.json
index f7e70babc4..f727c903a7 100644
--- a/apps/desktop/native-messaging-test-runner/package-lock.json
+++ b/apps/desktop/native-messaging-test-runner/package-lock.json
@@ -14,7 +14,7 @@
         "module-alias": "2.2.3",
         "node-ipc": "9.2.1",
         "ts-node": "10.9.2",
-        "uuid": "11.0.3",
+        "uuid": "11.0.5",
         "yargs": "17.7.2"
       },
       "devDependencies": {
@@ -421,9 +421,9 @@
       "license": "MIT"
     },
     "node_modules/uuid": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.3.tgz",
-      "integrity": "sha512-d0z310fCWv5dJwnX1Y/MncBAqGMKEzlBb1AOf7z9K8ALnd0utBX/msg/fA0+sbyN1ihbMsLhrBlnl1ak7Wa0rg==",
+      "version": "11.0.5",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.5.tgz",
+      "integrity": "sha512-508e6IcKLrhxKdBbcA2b4KQZlLVp2+J5UwQ6F7Drckkc5N9ZJwFa4TgWtsww9UG8fGHbm6gbV19TdM5pQ4GaIA==",
       "funding": [
         "https://github.com/sponsors/broofa",
         "https://github.com/sponsors/ctavan"
diff --git a/apps/desktop/native-messaging-test-runner/package.json b/apps/desktop/native-messaging-test-runner/package.json
index 39e43f3a97..b7da729d7d 100644
--- a/apps/desktop/native-messaging-test-runner/package.json
+++ b/apps/desktop/native-messaging-test-runner/package.json
@@ -19,7 +19,7 @@
     "module-alias": "2.2.3",
     "node-ipc": "9.2.1",
     "ts-node": "10.9.2",
-    "uuid": "11.0.3",
+    "uuid": "11.0.5",
     "yargs": "17.7.2"
   },
   "devDependencies": {

From b8f57f34642764cc91bd259fcbf48292b1e8ff81 Mon Sep 17 00:00:00 2001
From: Jordan Aasen <166539328+jaasen-livefront@users.noreply.github.com>
Date: Fri, 10 Jan 2025 10:00:57 -0800
Subject: [PATCH 044/150] [PM-12759] - Admin Console - Link to vault cipher is
 not opening cipher modal (#12738)

* fix initial load emission race

* prevent double dialog render

* put logic back in place
---
 .../app/vault/org-vault/vault.component.ts    | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/apps/web/src/app/vault/org-vault/vault.component.ts b/apps/web/src/app/vault/org-vault/vault.component.ts
index 645d81cec1..14550968ba 100644
--- a/apps/web/src/app/vault/org-vault/vault.component.ts
+++ b/apps/web/src/app/vault/org-vault/vault.component.ts
@@ -32,7 +32,6 @@ import {
   switchMap,
   takeUntil,
   tap,
-  withLatestFrom,
 } from "rxjs/operators";
 
 import {
@@ -194,6 +193,7 @@ export class VaultComponent implements OnInit, OnDestroy {
   protected currentSearchText$: Observable<string>;
   protected freeTrial$: Observable<FreeTrial>;
   protected resellerWarning$: Observable<ResellerWarning | null>;
+  protected prevCipherId: string | null = null;
   /**
    * A list of collections that the user can assign items to and edit those items within.
    * @protected
@@ -538,25 +538,26 @@ export class VaultComponent implements OnInit, OnDestroy {
 
     firstSetup$
       .pipe(
-        switchMap(() => this.route.queryParams),
-        // Only process the queryParams if the dialog is not open (only when extension refresh is enabled)
+        switchMap(() => combineLatest([this.route.queryParams, allCipherMap$])),
         filter(() => this.vaultItemDialogRef == undefined || !this.extensionRefreshEnabled),
-        withLatestFrom(allCipherMap$, allCollections$, organization$),
         switchMap(async ([qParams, allCiphersMap]) => {
           const cipherId = getCipherIdFromParams(qParams);
+
           if (!cipherId) {
+            this.prevCipherId = null;
             return;
           }
-          const cipher = allCiphersMap[cipherId];
 
+          if (cipherId === this.prevCipherId) {
+            return;
+          }
+
+          this.prevCipherId = cipherId;
+
+          const cipher = allCiphersMap[cipherId];
           if (cipher) {
             let action = qParams.action;
 
-            // Default to "view" if extension refresh is enabled
-            if (action == null && this.extensionRefreshEnabled) {
-              action = "view";
-            }
-
             if (action == "showFailedToDecrypt") {
               DecryptionFailureDialogComponent.open(this.dialogService, {
                 cipherIds: [cipherId as CipherId],
@@ -569,6 +570,11 @@ export class VaultComponent implements OnInit, OnDestroy {
               return;
             }
 
+            // Default to "view" if extension refresh is enabled
+            if (action == null && this.extensionRefreshEnabled) {
+              action = "view";
+            }
+
             if (action === "view") {
               await this.viewCipherById(cipher);
             } else {

From 3c994930acda68c656cc11de62b66840d3f31708 Mon Sep 17 00:00:00 2001
From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com>
Date: Fri, 10 Jan 2025 14:41:10 -0600
Subject: [PATCH 045/150] fix: replace bad import statements, refs PM-16928
 (#12805)

---
 .../src/admin-console/device-approval/approve.command.ts      | 4 +---
 .../src/admin-console/device-approval/deny-all.command.ts     | 4 +---
 .../bit-cli/src/admin-console/device-approval/deny.command.ts | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/bitwarden_license/bit-cli/src/admin-console/device-approval/approve.command.ts b/bitwarden_license/bit-cli/src/admin-console/device-approval/approve.command.ts
index f8ce50a849..1c51f9397c 100644
--- a/bitwarden_license/bit-cli/src/admin-console/device-approval/approve.command.ts
+++ b/bitwarden_license/bit-cli/src/admin-console/device-approval/approve.command.ts
@@ -1,12 +1,10 @@
 import { firstValueFrom } from "rxjs";
 
+import { OrganizationAuthRequestService } from "@bitwarden/bit-common/admin-console/auth-requests";
 import { Response } from "@bitwarden/cli/models/response";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { OrganizationAuthRequestService } from "../../../../bit-common/src/admin-console/auth-requests";
 import { ServiceContainer } from "../../service-container";
 
 export class ApproveCommand {
diff --git a/bitwarden_license/bit-cli/src/admin-console/device-approval/deny-all.command.ts b/bitwarden_license/bit-cli/src/admin-console/device-approval/deny-all.command.ts
index c3cbd00ad3..767acea99f 100644
--- a/bitwarden_license/bit-cli/src/admin-console/device-approval/deny-all.command.ts
+++ b/bitwarden_license/bit-cli/src/admin-console/device-approval/deny-all.command.ts
@@ -2,14 +2,12 @@
 // @ts-strict-ignore
 import { firstValueFrom } from "rxjs";
 
+import { OrganizationAuthRequestService } from "@bitwarden/bit-common/admin-console/auth-requests";
 import { Response } from "@bitwarden/cli/models/response";
 import { MessageResponse } from "@bitwarden/cli/models/response/message.response";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { OrganizationAuthRequestService } from "../../../../bit-common/src/admin-console/auth-requests";
 import { ServiceContainer } from "../../service-container";
 
 export class DenyAllCommand {
diff --git a/bitwarden_license/bit-cli/src/admin-console/device-approval/deny.command.ts b/bitwarden_license/bit-cli/src/admin-console/device-approval/deny.command.ts
index 1036602b0f..87e633b2be 100644
--- a/bitwarden_license/bit-cli/src/admin-console/device-approval/deny.command.ts
+++ b/bitwarden_license/bit-cli/src/admin-console/device-approval/deny.command.ts
@@ -1,12 +1,10 @@
 import { firstValueFrom } from "rxjs";
 
+import { OrganizationAuthRequestService } from "@bitwarden/bit-common/admin-console/auth-requests";
 import { Response } from "@bitwarden/cli/models/response";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { OrganizationAuthRequestService } from "../../../../bit-common/src/admin-console/auth-requests";
 import { ServiceContainer } from "../../service-container";
 
 export class DenyCommand {

From e1434d8dd5d192bf732a332d7f0dfb8ffd3ad80c Mon Sep 17 00:00:00 2001
From: Jordan Aasen <166539328+jaasen-livefront@users.noreply.github.com>
Date: Fri, 10 Jan 2025 17:21:12 -0800
Subject: [PATCH 046/150] [PM-16858] - adjust generator dialog action button to
 match browser extension UI (#12788)

* adjust generator dialog buttons to match browser extension UI

* put dialog label into generator config

* fix types. remove i18n key

* use event emitted pattern for getting algorithm config

* favor arrow function

* move function call

* append key to i18n prop

* fix test
---
 apps/desktop/src/locales/en/messages.json                 | 6 ++++++
 .../app/vault/credential-generator-dialog.component.html  | 8 +++-----
 .../app/vault/credential-generator-dialog.component.ts    | 6 ++++++
 .../components/src/password-generator.component.ts        | 5 +++++
 .../components/src/username-generator.component.ts        | 5 +++++
 libs/tools/generator/core/src/data/generators.ts          | 6 ++++++
 .../src/services/credential-generator.service.spec.ts     | 2 ++
 .../core/src/services/credential-generator.service.ts     | 1 +
 .../core/src/types/credential-generator-configuration.ts  | 6 ++++++
 .../cipher-generator/cipher-form-generator.component.html | 2 ++
 .../cipher-generator/cipher-form-generator.component.ts   | 5 ++++-
 11 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index 35d5cf8c03..1a02e5db4e 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/vault/app/vault/credential-generator-dialog.component.html b/apps/desktop/src/vault/app/vault/credential-generator-dialog.component.html
index a294ce1f63..d16f8e4f1c 100644
--- a/apps/desktop/src/vault/app/vault/credential-generator-dialog.component.html
+++ b/apps/desktop/src/vault/app/vault/credential-generator-dialog.component.html
@@ -4,6 +4,7 @@
     <vault-cipher-form-generator
       [type]="data.type"
       (valueGenerated)="onCredentialGenerated($event)"
+      [algorithm]="algorithm"
     />
     <bit-item>
       <button
@@ -25,13 +26,10 @@
         type="button"
         class="primary"
         (click)="applyCredentials()"
-        appA11yTitle="{{ 'select' | i18n }}"
+        appA11yTitle="{{ buttonLabel }}"
         bitDialogClose
       >
-        <i class="bwi bwi-lg bwi-fw bwi-check" aria-hidden="true"></i>
-      </button>
-      <button type="button" data-dismiss="modal" (click)="clearCredentials()" bitDialogClose>
-        {{ "cancel" | i18n }}
+        {{ buttonLabel }}
       </button>
     </div>
   </ng-container>
diff --git a/apps/desktop/src/vault/app/vault/credential-generator-dialog.component.ts b/apps/desktop/src/vault/app/vault/credential-generator-dialog.component.ts
index abf7437191..ae6f031005 100644
--- a/apps/desktop/src/vault/app/vault/credential-generator-dialog.component.ts
+++ b/apps/desktop/src/vault/app/vault/credential-generator-dialog.component.ts
@@ -14,6 +14,7 @@ import {
   CredentialGeneratorHistoryDialogComponent,
   GeneratorModule,
 } from "@bitwarden/generator-components";
+import { AlgorithmInfo } from "@bitwarden/generator-core";
 import { CipherFormGeneratorComponent } from "@bitwarden/vault";
 
 type CredentialGeneratorParams = {
@@ -38,12 +39,17 @@ type CredentialGeneratorParams = {
 })
 export class CredentialGeneratorDialogComponent {
   credentialValue?: string;
+  buttonLabel?: string;
 
   constructor(
     @Inject(DIALOG_DATA) protected data: CredentialGeneratorParams,
     private dialogService: DialogService,
   ) {}
 
+  algorithm = (selected: AlgorithmInfo) => {
+    this.buttonLabel = selected.useGeneratedValue;
+  };
+
   applyCredentials = () => {
     this.data.onCredentialGenerated(this.credentialValue);
   };
diff --git a/libs/tools/generator/components/src/password-generator.component.ts b/libs/tools/generator/components/src/password-generator.component.ts
index 67a1bf2183..85363412ff 100644
--- a/libs/tools/generator/components/src/password-generator.component.ts
+++ b/libs/tools/generator/components/src/password-generator.component.ts
@@ -93,6 +93,10 @@ export class PasswordGeneratorComponent implements OnInit, OnDestroy {
   @Output()
   readonly onGenerated = new EventEmitter<GeneratedCredential>();
 
+  /** emits algorithm info when the selected algorithm changes */
+  @Output()
+  readonly onAlgorithm = new EventEmitter<AlgorithmInfo>();
+
   async ngOnInit() {
     if (this.userId) {
       this.userId$.next(this.userId);
@@ -185,6 +189,7 @@ export class PasswordGeneratorComponent implements OnInit, OnDestroy {
         // template bindings refresh immediately
         this.zone.run(() => {
           this.algorithm$.next(algorithm);
+          this.onAlgorithm.next(algorithm);
         });
       });
 
diff --git a/libs/tools/generator/components/src/username-generator.component.ts b/libs/tools/generator/components/src/username-generator.component.ts
index d0230dcba4..63c1adc602 100644
--- a/libs/tools/generator/components/src/username-generator.component.ts
+++ b/libs/tools/generator/components/src/username-generator.component.ts
@@ -78,6 +78,10 @@ export class UsernameGeneratorComponent implements OnInit, OnDestroy {
   @Output()
   readonly onGenerated = new EventEmitter<GeneratedCredential>();
 
+  /** emits algorithm info when the selected algorithm changes */
+  @Output()
+  readonly onAlgorithm = new EventEmitter<AlgorithmInfo>();
+
   /** Removes bottom margin from internal elements */
   @Input({ transform: coerceBooleanProperty }) disableMargin = false;
 
@@ -247,6 +251,7 @@ export class UsernameGeneratorComponent implements OnInit, OnDestroy {
         // template bindings refresh immediately
         this.zone.run(() => {
           this.algorithm$.next(algorithm);
+          this.onAlgorithm.next(algorithm);
         });
       });
 
diff --git a/libs/tools/generator/core/src/data/generators.ts b/libs/tools/generator/core/src/data/generators.ts
index afd7da6499..92b20b02b7 100644
--- a/libs/tools/generator/core/src/data/generators.ts
+++ b/libs/tools/generator/core/src/data/generators.ts
@@ -58,6 +58,7 @@ const PASSPHRASE: CredentialGeneratorConfiguration<
   generateKey: "generatePassphrase",
   generatedValueKey: "passphrase",
   copyKey: "copyPassphrase",
+  useGeneratedValueKey: "useThisPassphrase",
   onlyOnRequest: false,
   request: [],
   engine: {
@@ -119,6 +120,7 @@ const PASSWORD: CredentialGeneratorConfiguration<
   generateKey: "generatePassword",
   generatedValueKey: "password",
   copyKey: "copyPassword",
+  useGeneratedValueKey: "useThisPassword",
   onlyOnRequest: false,
   request: [],
   engine: {
@@ -195,6 +197,7 @@ const USERNAME: CredentialGeneratorConfiguration<EffUsernameGenerationOptions, N
     generateKey: "generateUsername",
     generatedValueKey: "username",
     copyKey: "copyUsername",
+    useGeneratedValueKey: "useThisUsername",
     onlyOnRequest: false,
     request: [],
     engine: {
@@ -247,6 +250,7 @@ const CATCHALL: CredentialGeneratorConfiguration<CatchallGenerationOptions, NoPo
     generateKey: "generateEmail",
     generatedValueKey: "email",
     copyKey: "copyEmail",
+    useGeneratedValueKey: "useThisEmail",
     onlyOnRequest: false,
     request: [],
     engine: {
@@ -302,6 +306,7 @@ const SUBADDRESS: CredentialGeneratorConfiguration<SubaddressGenerationOptions,
     generateKey: "generateEmail",
     generatedValueKey: "email",
     copyKey: "copyEmail",
+    useGeneratedValueKey: "useThisEmail",
     onlyOnRequest: false,
     request: [],
     engine: {
@@ -359,6 +364,7 @@ export function toCredentialGeneratorConfiguration<Settings extends ApiSettings
     generateKey: "generateEmail",
     generatedValueKey: "email",
     copyKey: "copyEmail",
+    useGeneratedValueKey: "useThisEmail",
     onlyOnRequest: true,
     request: configuration.forwarder.request,
     engine: {
diff --git a/libs/tools/generator/core/src/services/credential-generator.service.spec.ts b/libs/tools/generator/core/src/services/credential-generator.service.spec.ts
index 160da70693..ff6f9b8fd5 100644
--- a/libs/tools/generator/core/src/services/credential-generator.service.spec.ts
+++ b/libs/tools/generator/core/src/services/credential-generator.service.spec.ts
@@ -74,6 +74,7 @@ const SomeNameKey = "passphraseKey";
 const SomeGenerateKey = "generateKey";
 const SomeGeneratedValueKey = "generatedValueKey";
 const SomeCopyKey = "copyKey";
+const SomeUseGeneratedValueKey = "useGeneratedValueKey";
 
 // fake the configuration
 const SomeConfiguration: CredentialGeneratorConfiguration<SomeSettings, SomePolicy> = {
@@ -83,6 +84,7 @@ const SomeConfiguration: CredentialGeneratorConfiguration<SomeSettings, SomePoli
   generateKey: SomeGenerateKey,
   generatedValueKey: SomeGeneratedValueKey,
   copyKey: SomeCopyKey,
+  useGeneratedValueKey: SomeUseGeneratedValueKey,
   onlyOnRequest: false,
   request: [],
   engine: {
diff --git a/libs/tools/generator/core/src/services/credential-generator.service.ts b/libs/tools/generator/core/src/services/credential-generator.service.ts
index 405cd220ab..9659076ec0 100644
--- a/libs/tools/generator/core/src/services/credential-generator.service.ts
+++ b/libs/tools/generator/core/src/services/credential-generator.service.ts
@@ -258,6 +258,7 @@ export class CredentialGeneratorService {
       generate: this.i18nService.t(generator.generateKey),
       generatedValue: this.i18nService.t(generator.generatedValueKey),
       copy: this.i18nService.t(generator.copyKey),
+      useGeneratedValue: this.i18nService.t(generator.useGeneratedValueKey),
       onlyOnRequest: generator.onlyOnRequest,
       request: generator.request,
     };
diff --git a/libs/tools/generator/core/src/types/credential-generator-configuration.ts b/libs/tools/generator/core/src/types/credential-generator-configuration.ts
index 22bfa31441..0650ae5d34 100644
--- a/libs/tools/generator/core/src/types/credential-generator-configuration.ts
+++ b/libs/tools/generator/core/src/types/credential-generator-configuration.ts
@@ -37,6 +37,9 @@ export type AlgorithmInfo = {
   /* Localized copy button label */
   copy: string;
 
+  /* Localized dialog button label */
+  useGeneratedValue: string;
+
   /* Localized generated value label */
   generatedValue: string;
 
@@ -82,6 +85,9 @@ export type CredentialGeneratorInfo = {
   /* Localization key for the copy button label */
   copyKey: string;
 
+  /* Localized "use generated credential" button label */
+  useGeneratedValueKey: string;
+
   /* Localization key for describing values generated by this generator */
   generatedValueKey: string;
 
diff --git a/libs/vault/src/cipher-form/components/cipher-generator/cipher-form-generator.component.html b/libs/vault/src/cipher-form/components/cipher-generator/cipher-form-generator.component.html
index 445908679c..16bccebb93 100644
--- a/libs/vault/src/cipher-form/components/cipher-generator/cipher-form-generator.component.html
+++ b/libs/vault/src/cipher-form/components/cipher-generator/cipher-form-generator.component.html
@@ -2,9 +2,11 @@
   *ngIf="type === 'password'"
   [disableMargin]="disableMargin"
   (onGenerated)="onCredentialGenerated($event)"
+  (onAlgorithm)="algorithm($event)"
 ></tools-password-generator>
 <tools-username-generator
   *ngIf="type === 'username'"
   [disableMargin]="disableMargin"
   (onGenerated)="onCredentialGenerated($event)"
+  (onAlgorithm)="algorithm($event)"
 ></tools-username-generator>
diff --git a/libs/vault/src/cipher-form/components/cipher-generator/cipher-form-generator.component.ts b/libs/vault/src/cipher-form/components/cipher-generator/cipher-form-generator.component.ts
index 1a2bac2ce5..fdde5e15d9 100644
--- a/libs/vault/src/cipher-form/components/cipher-generator/cipher-form-generator.component.ts
+++ b/libs/vault/src/cipher-form/components/cipher-generator/cipher-form-generator.component.ts
@@ -5,7 +5,7 @@ import { CommonModule } from "@angular/common";
 import { Component, EventEmitter, Input, Output } from "@angular/core";
 
 import { GeneratorModule } from "@bitwarden/generator-components";
-import { GeneratedCredential } from "@bitwarden/generator-core";
+import { AlgorithmInfo, GeneratedCredential } from "@bitwarden/generator-core";
 
 /**
  * Renders a password or username generator UI and emits the most recently generated value.
@@ -18,6 +18,9 @@ import { GeneratedCredential } from "@bitwarden/generator-core";
   imports: [CommonModule, GeneratorModule],
 })
 export class CipherFormGeneratorComponent {
+  @Input()
+  algorithm: (selected: AlgorithmInfo) => void;
+
   /**
    * The type of generator form to show.
    */

From 4c8565f7f382f6e05fcf936fc04396db891e0711 Mon Sep 17 00:00:00 2001
From: Todd Martin <106564991+trmartin4@users.noreply.github.com>
Date: Sun, 12 Jan 2025 16:37:15 -0500
Subject: [PATCH 047/150] Modify Edge and Opera artifacts to build Mv3 - Part 1
 (#12674)

* Modify Edge and Chrome artifacts to build Mv3 version to mimic Chrome

* Added back the Mv3 scripts so that workflows run on the PR will pass
---
 .github/workflows/build-browser.yml | 12 ++----------
 apps/browser/package.json           |  4 ++--
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-browser.yml b/.github/workflows/build-browser.yml
index aa62d602ad..64cbaa0c7f 100644
--- a/.github/workflows/build-browser.yml
+++ b/.github/workflows/build-browser.yml
@@ -196,11 +196,7 @@ jobs:
           - name: "edge"
             npm_command: "dist:edge"
             archive_name: "dist-edge.zip"
-            artifact_name: "dist-edge"
-          - name: "edge-mv3"
-            npm_command: "dist:edge:mv3"
-            archive_name: "dist-edge.zip"
-            artifact_name: "DO-NOT-USE-FOR-PROD-dist-edge-MV3"
+            artifact_name: "dist-edge-MV3"
           - name: "firefox"
             npm_command: "dist:firefox"
             archive_name: "dist-firefox.zip"
@@ -212,11 +208,7 @@ jobs:
           - name: "opera"
             npm_command: "dist:opera"
             archive_name: "dist-opera.zip"
-            artifact_name: "dist-opera"
-          - name: "opera-mv3"
-            npm_command: "dist:opera:mv3"
-            archive_name: "dist-opera.zip"
-            artifact_name: "DO-NOT-USE-FOR-PROD-dist-opera-MV3"
+            artifact_name: "dist-opera-MV3"
     steps:
       - name: Check out repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
diff --git a/apps/browser/package.json b/apps/browser/package.json
index 3adeb292b6..cf9309728a 100644
--- a/apps/browser/package.json
+++ b/apps/browser/package.json
@@ -4,9 +4,9 @@
   "scripts": {
     "build": "npm run build:chrome",
     "build:chrome": "cross-env BROWSER=chrome MANIFEST_VERSION=3 webpack",
-    "build:edge": "cross-env BROWSER=edge webpack",
+    "build:edge": "cross-env BROWSER=edge MANIFEST_VERSION=3 webpack",
     "build:firefox": "cross-env BROWSER=firefox webpack",
-    "build:opera": "cross-env BROWSER=opera webpack",
+    "build:opera": "cross-env BROWSER=opera MANIFEST_VERSION=3 webpack",
     "build:safari": "cross-env BROWSER=safari webpack",
     "build:watch": "npm run build:watch:chrome",
     "build:watch:chrome": "npm run build:chrome -- --watch",

From 5dc523bacb7b1da5ea2773794bad91e2627ab701 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Mon, 13 Jan 2025 09:29:42 +0100
Subject: [PATCH 048/150] [PM-16895] Fix biometric prompt showing up in browser
 while disabled (#12781)

---
 .../extension-lock-component.service.spec.ts    | 14 +++++++++++++-
 .../extension-lock-component.service.ts         | 17 ++++++++++++++---
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/apps/browser/src/key-management/lock/services/extension-lock-component.service.spec.ts b/apps/browser/src/key-management/lock/services/extension-lock-component.service.spec.ts
index 4b0323d5eb..92830c35ac 100644
--- a/apps/browser/src/key-management/lock/services/extension-lock-component.service.spec.ts
+++ b/apps/browser/src/key-management/lock/services/extension-lock-component.service.spec.ts
@@ -9,7 +9,12 @@ import {
 import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { UserId } from "@bitwarden/common/types/guid";
-import { KeyService, BiometricsService, BiometricsStatus } from "@bitwarden/key-management";
+import {
+  KeyService,
+  BiometricsService,
+  BiometricsStatus,
+  BiometricStateService,
+} from "@bitwarden/key-management";
 import { UnlockOptions } from "@bitwarden/key-management/angular";
 
 import { BrowserRouterService } from "../../../platform/popup/services/browser-router.service";
@@ -26,6 +31,7 @@ describe("ExtensionLockComponentService", () => {
   let vaultTimeoutSettingsService: MockProxy<VaultTimeoutSettingsService>;
   let keyService: MockProxy<KeyService>;
   let routerService: MockProxy<BrowserRouterService>;
+  let biometricStateService: MockProxy<BiometricStateService>;
 
   beforeEach(() => {
     userDecryptionOptionsService = mock<UserDecryptionOptionsServiceAbstraction>();
@@ -35,6 +41,7 @@ describe("ExtensionLockComponentService", () => {
     vaultTimeoutSettingsService = mock<VaultTimeoutSettingsService>();
     keyService = mock<KeyService>();
     routerService = mock<BrowserRouterService>();
+    biometricStateService = mock<BiometricStateService>();
 
     TestBed.configureTestingModule({
       providers: [
@@ -67,6 +74,10 @@ describe("ExtensionLockComponentService", () => {
           provide: BrowserRouterService,
           useValue: routerService,
         },
+        {
+          provide: BiometricStateService,
+          useValue: biometricStateService,
+        },
       ],
     });
 
@@ -306,6 +317,7 @@ describe("ExtensionLockComponentService", () => {
       platformUtilsService.supportsSecureStorage.mockReturnValue(
         mockInputs.platformSupportsSecureStorage,
       );
+      biometricStateService.biometricUnlockEnabled$ = of(true);
 
       //  PIN
       pinService.isPinDecryptionAvailable.mockResolvedValue(mockInputs.pinDecryptionAvailable);
diff --git a/apps/browser/src/key-management/lock/services/extension-lock-component.service.ts b/apps/browser/src/key-management/lock/services/extension-lock-component.service.ts
index f21beb91cf..77c0fcaf50 100644
--- a/apps/browser/src/key-management/lock/services/extension-lock-component.service.ts
+++ b/apps/browser/src/key-management/lock/services/extension-lock-component.service.ts
@@ -1,14 +1,18 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { inject } from "@angular/core";
-import { combineLatest, defer, map, Observable } from "rxjs";
+import { combineLatest, defer, firstValueFrom, map, Observable } from "rxjs";
 
 import {
   PinServiceAbstraction,
   UserDecryptionOptionsServiceAbstraction,
 } from "@bitwarden/auth/common";
 import { UserId } from "@bitwarden/common/types/guid";
-import { BiometricsService, BiometricsStatus } from "@bitwarden/key-management";
+import {
+  BiometricsService,
+  BiometricsStatus,
+  BiometricStateService,
+} from "@bitwarden/key-management";
 import { LockComponentService, UnlockOptions } from "@bitwarden/key-management/angular";
 
 import { BiometricErrors, BiometricErrorTypes } from "../../../models/biometricErrors";
@@ -19,6 +23,7 @@ export class ExtensionLockComponentService implements LockComponentService {
   private readonly biometricsService = inject(BiometricsService);
   private readonly pinService = inject(PinServiceAbstraction);
   private readonly routerService = inject(BrowserRouterService);
+  private readonly biometricStateService = inject(BiometricStateService);
 
   getPreviousUrl(): string | null {
     return this.routerService.getPreviousUrl();
@@ -45,7 +50,13 @@ export class ExtensionLockComponentService implements LockComponentService {
   getAvailableUnlockOptions$(userId: UserId): Observable<UnlockOptions> {
     return combineLatest([
       // Note: defer is preferable b/c it delays the execution of the function until the observable is subscribed to
-      defer(async () => await this.biometricsService.getBiometricsStatusForUser(userId)),
+      defer(async () => {
+        if (!(await firstValueFrom(this.biometricStateService.biometricUnlockEnabled$))) {
+          return BiometricsStatus.NotEnabledLocally;
+        } else {
+          return await this.biometricsService.getBiometricsStatusForUser(userId);
+        }
+      }),
       this.userDecryptionOptionsService.userDecryptionOptionsById$(userId),
       defer(() => this.pinService.isPinDecryptionAvailable(userId)),
     ]).pipe(

From 6872100f0705c7c8f5169ebdfd3f26660bc66c71 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Mon, 13 Jan 2025 09:30:30 +0100
Subject: [PATCH 049/150] Fix biometrics being disabled before permission is
 granted (#12792)

---
 .../src/auth/popup/settings/account-security.component.ts        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/browser/src/auth/popup/settings/account-security.component.ts b/apps/browser/src/auth/popup/settings/account-security.component.ts
index 158eb797ac..3b1727f89a 100644
--- a/apps/browser/src/auth/popup/settings/account-security.component.ts
+++ b/apps/browser/src/auth/popup/settings/account-security.component.ts
@@ -206,6 +206,7 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
         switchMap(async () => {
           const status = await this.biometricsService.getBiometricsStatusForUser(activeAccount.id);
           const biometricSettingAvailable =
+            !(await BrowserApi.permissionsGranted(["nativeMessaging"])) ||
             (status !== BiometricsStatus.DesktopDisconnected &&
               status !== BiometricsStatus.NotEnabledInConnectedDesktopApp) ||
             (await this.vaultTimeoutSettingsService.isBiometricLockSet());

From ae92ddf17707b09a3398950d5b72a496321a495c Mon Sep 17 00:00:00 2001
From: "bw-ghapp[bot]" <178206702+bw-ghapp[bot]@users.noreply.github.com>
Date: Mon, 13 Jan 2025 09:34:24 +0000
Subject: [PATCH 050/150] Autosync the updated translations (#12825)

Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>
---
 apps/browser/src/_locales/de/messages.json    |  22 +-
 apps/browser/src/_locales/it/messages.json    |   8 +-
 apps/browser/src/_locales/nb/messages.json    | 390 +++++++++---------
 apps/browser/src/_locales/zh_CN/messages.json |  16 +-
 apps/browser/store/locales/zh_CN/copy.resx    |   5 +-
 5 files changed, 221 insertions(+), 220 deletions(-)

diff --git a/apps/browser/src/_locales/de/messages.json b/apps/browser/src/_locales/de/messages.json
index bc1158bfc2..fce84d1b43 100644
--- a/apps/browser/src/_locales/de/messages.json
+++ b/apps/browser/src/_locales/de/messages.json
@@ -2325,7 +2325,7 @@
     "description": "A category title describing the concept of web domains"
   },
   "blockedDomains": {
-    "message": "Blocked domains"
+    "message": "Gesperrte Domains"
   },
   "excludedDomains": {
     "message": "Ausgeschlossene Domains"
@@ -2337,7 +2337,7 @@
     "message": "Bitwarden wird für alle angemeldeten Konten nicht danach fragen Zugangsdaten für diese Domains speichern. Du musst die Seite neu laden, damit die Änderungen wirksam werden."
   },
   "blockedDomainsDesc": {
-    "message": "Autofill und andere zugehörige Funktionen werden für diese Websites nicht angeboten. Sie müssen die Seite aktualisieren, damit die Änderungen wirksam werden."
+    "message": "Automatisches Ausfüllen und andere zugehörige Funktionen werden für diese Webseiten nicht angeboten. Sie müssen die Seite aktualisieren, damit die Änderungen wirksam werden."
   },
   "autofillBlockedNotice": {
     "message": "Das automatische Ausfüllen ist für diese Website gesperrt. Dieses Verhalten kann in den Einstellungen überprüft oder geändert werden."
@@ -2364,7 +2364,7 @@
     }
   },
   "blockedDomainsSavedSuccess": {
-    "message": "Blocked domain changes saved"
+    "message": "Änderungen gesperrter Domains gespeichert"
   },
   "excludedDomainsSavedSuccess": {
     "message": "Änderungen der ausgeschlossenen Domain gespeichert"
@@ -2815,7 +2815,7 @@
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "contactCSToAvoidDataLossPart2": {
-    "message": "to avoid additional data loss.",
+    "message": "um zusätzlichen Datenverlust zu vermeiden.",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "generateUsername": {
@@ -4671,22 +4671,22 @@
     "message": "Du bist nicht berechtigt, diesen Eintrag zu bearbeiten"
   },
   "biometricsStatusHelptextUnlockNeeded": {
-    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+    "message": "Biometrisches Entsperren ist nicht verfügbar, da zuerst mit PIN oder Passwort entsperrt werden muss."
   },
   "biometricsStatusHelptextHardwareUnavailable": {
-    "message": "Biometric unlock is currently unavailable."
+    "message": "Biometrisches Entsperren ist derzeit nicht verfügbar."
   },
   "biometricsStatusHelptextAutoSetupNeeded": {
-    "message": "Biometric unlock is unavailable due to misconfigured system files."
+    "message": "Biometrisches Entsperren ist aufgrund falsch konfigurierter Systemdateien nicht verfügbar."
   },
   "biometricsStatusHelptextManualSetupNeeded": {
-    "message": "Biometric unlock is unavailable due to misconfigured system files."
+    "message": "Biometrisches Entsperren ist aufgrund falsch konfigurierter Systemdateien nicht verfügbar."
   },
   "biometricsStatusHelptextDesktopDisconnected": {
-    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+    "message": "Biometrisches Entsperren ist nicht verfügbar, da die Bitwarden Desktop-App geschlossen ist."
   },
   "biometricsStatusHelptextNotEnabledInDesktop": {
-    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "message": "Biometrisches Entsperren ist nicht verfügbar, da es für $EMAIL$ in der Bitwarden Desktop-App nicht aktiviert ist.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -4695,7 +4695,7 @@
     }
   },
   "biometricsStatusHelptextUnavailableReasonUnknown": {
-    "message": "Biometric unlock is currently unavailable for an unknown reason."
+    "message": "Biometrisches Entsperren ist derzeit aus einem unbekannten Grund nicht verfügbar."
   },
   "authenticating": {
     "message": "Authentifizierung"
diff --git a/apps/browser/src/_locales/it/messages.json b/apps/browser/src/_locales/it/messages.json
index 0653623f07..04e2c4ee64 100644
--- a/apps/browser/src/_locales/it/messages.json
+++ b/apps/browser/src/_locales/it/messages.json
@@ -2337,13 +2337,13 @@
     "message": "Bitwarden non chiederà di salvare le credenziali di accesso per questi domini per tutti gli account sul dispositivo. Ricarica la pagina affinché le modifiche abbiano effetto."
   },
   "blockedDomainsDesc": {
-    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+    "message": "Per questi siti, l'auto-completamento e funzionalità simili non saranno disponibili. Ricarica la pagina per applicare le modifiche."
   },
   "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+    "message": "L'auto-completamento è bloccato per questo sito. Modifica questa scelta nelle impostazioni."
   },
   "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+    "message": "L'auto-completamento è bloccato per questo sito. Verifica nelle impostazioni."
   },
   "websiteItemLabel": {
     "message": "Sito $number$ (URI)",
@@ -2364,7 +2364,7 @@
     }
   },
   "blockedDomainsSavedSuccess": {
-    "message": "Blocked domain changes saved"
+    "message": "Modifiche ai domini bloccati salvate"
   },
   "excludedDomainsSavedSuccess": {
     "message": "Modifiche del dominio escluso salvate"
diff --git a/apps/browser/src/_locales/nb/messages.json b/apps/browser/src/_locales/nb/messages.json
index 0e45e970ad..3a12c9ae4f 100644
--- a/apps/browser/src/_locales/nb/messages.json
+++ b/apps/browser/src/_locales/nb/messages.json
@@ -20,19 +20,19 @@
     "message": "Opprett en konto"
   },
   "newToBitwarden": {
-    "message": "New to Bitwarden?"
+    "message": "Er du ny til Bitwarden?"
   },
   "logInWithPasskey": {
-    "message": "Log in with passkey"
+    "message": "Logg inn med passnøkkel"
   },
   "useSingleSignOn": {
     "message": "Use single sign-on"
   },
   "welcomeBack": {
-    "message": "Welcome back"
+    "message": "Velkommen tilbake"
   },
   "setAStrongPassword": {
-    "message": "Set a strong password"
+    "message": "Velg et sterkt passord"
   },
   "finishCreatingYourAccountBySettingAPassword": {
     "message": "Finish creating your account by setting a password"
@@ -138,31 +138,31 @@
     "message": "Kopier sikkerhetskoden"
   },
   "copyName": {
-    "message": "Copy name"
+    "message": "Kopiér navn"
   },
   "copyCompany": {
     "message": "Copy company"
   },
   "copySSN": {
-    "message": "Copy Social Security number"
+    "message": "Kopiér fødselsnummer"
   },
   "copyPassportNumber": {
-    "message": "Copy passport number"
+    "message": "Kopiér passnummer"
   },
   "copyLicenseNumber": {
-    "message": "Copy license number"
+    "message": "Kopiér lisensnummer"
   },
   "copyPrivateKey": {
-    "message": "Copy private key"
+    "message": "Kopiér privat nøkkel"
   },
   "copyPublicKey": {
-    "message": "Copy public key"
+    "message": "Kopiér offentlig nøkkel"
   },
   "copyFingerprint": {
-    "message": "Copy fingerprint"
+    "message": "Kopiér fingeravtrykk"
   },
   "copyCustomField": {
-    "message": "Copy $FIELD$",
+    "message": "Kopiér $FIELD$",
     "placeholders": {
       "field": {
         "content": "$1",
@@ -171,13 +171,13 @@
     }
   },
   "copyWebsite": {
-    "message": "Copy website"
+    "message": "Kopiér nettsted"
   },
   "copyNotes": {
-    "message": "Copy notes"
+    "message": "Kopiér notater"
   },
   "fill": {
-    "message": "Fill",
+    "message": "Fyll",
     "description": "This string is used on the vault page to indicate autofilling. Horizontal space is limited in the interface here so try and keep translations as concise as possible."
   },
   "autoFill": {
@@ -193,10 +193,10 @@
     "message": "Auto-utfyll identitet"
   },
   "fillVerificationCode": {
-    "message": "Fill verification code"
+    "message": "Fyll inn verifiseringskode"
   },
   "fillVerificationCodeAria": {
-    "message": "Fill Verification Code",
+    "message": "Fyll inn verifiseringskode",
     "description": "Aria label for the heading displayed the inline menu for totp code autofill"
   },
   "generatePasswordCopied": {
@@ -239,13 +239,13 @@
     "message": "Legg til en gjenstand"
   },
   "accountEmail": {
-    "message": "Account email"
+    "message": "Kontoens E-postadresse"
   },
   "requestHint": {
-    "message": "Request hint"
+    "message": "Be om et hint"
   },
   "requestPasswordHint": {
-    "message": "Request password hint"
+    "message": "Be om passordhint"
   },
   "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou": {
     "message": "Enter your account email address and your password hint will be sent to you"
@@ -316,7 +316,7 @@
     "message": "Logg ut"
   },
   "aboutBitwarden": {
-    "message": "About Bitwarden"
+    "message": "Om Bitwarden"
   },
   "about": {
     "message": "Om"
@@ -325,7 +325,7 @@
     "message": "More from Bitwarden"
   },
   "continueToBitwardenDotCom": {
-    "message": "Continue to bitwarden.com?"
+    "message": "Vil du fortsette til bitwarden.com?"
   },
   "bitwardenForBusiness": {
     "message": "Bitwarden for Business"
@@ -382,7 +382,7 @@
     "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums"
   },
   "noFoldersAdded": {
-    "message": "No folders added"
+    "message": "Ingen mapper er lagt til"
   },
   "createFoldersToOrganize": {
     "message": "Create folders to organize your vault items"
@@ -475,7 +475,7 @@
     "description": "Card header for password generator include block"
   },
   "uppercaseDescription": {
-    "message": "Include uppercase characters",
+    "message": "Inkluder store bokstaver",
     "description": "Tooltip for the password generator uppercase character checkbox"
   },
   "uppercaseLabel": {
@@ -483,7 +483,7 @@
     "description": "Label for the password generator uppercase character checkbox"
   },
   "lowercaseDescription": {
-    "message": "Include lowercase characters",
+    "message": "Inkluder små bokstaver",
     "description": "Full description for the password generator lowercase character checkbox"
   },
   "lowercaseLabel": {
@@ -499,7 +499,7 @@
     "description": "Label for the password generator numbers checkbox"
   },
   "specialCharactersDescription": {
-    "message": "Include special characters",
+    "message": "Inkluder spesialtegn",
     "description": "Full description for the password generator special characters checkbox"
   },
   "specialCharactersLabel": {
@@ -526,7 +526,7 @@
     "message": "Minste antall spesialtegn"
   },
   "avoidAmbiguous": {
-    "message": "Avoid ambiguous characters",
+    "message": "Unngå forvekslingsbare tegn",
     "description": "Label for the avoid ambiguous characters checkbox."
   },
   "generatorPolicyInEffect": {
@@ -564,19 +564,19 @@
     "message": "Favoritt"
   },
   "unfavorite": {
-    "message": "Unfavorite"
+    "message": "Fjern favorittstempel"
   },
   "itemAddedToFavorites": {
-    "message": "Item added to favorites"
+    "message": "Gjenstand lagt til i favorittene"
   },
   "itemRemovedFromFavorites": {
-    "message": "Item removed from favorites"
+    "message": "Gjenstand fjernet fra favorittene"
   },
   "notes": {
     "message": "Notater"
   },
   "privateNote": {
-    "message": "Private note"
+    "message": "Privat notat"
   },
   "note": {
     "message": "Notat"
@@ -597,10 +597,10 @@
     "message": "Åpne"
   },
   "launchWebsite": {
-    "message": "Launch website"
+    "message": "Åpne nettstedet"
   },
   "launchWebsiteName": {
-    "message": "Launch website $ITEMNAME$",
+    "message": "Åpne nettstedet $ITEMNAME$",
     "placeholders": {
       "itemname": {
         "content": "$1",
@@ -657,7 +657,7 @@
     "message": "Your account is locked"
   },
   "or": {
-    "message": "or"
+    "message": "eller"
   },
   "unlock": {
     "message": "Lås opp"
@@ -745,7 +745,7 @@
     "message": "Your master password cannot be recovered if you forget it!"
   },
   "masterPassHintLabel": {
-    "message": "Master password hint"
+    "message": "Få et hint om hovedpassordet"
   },
   "errorOccurred": {
     "message": "En feil har oppstått"
@@ -785,10 +785,10 @@
     "message": "You have been logged in!"
   },
   "youSuccessfullyLoggedIn": {
-    "message": "You successfully logged in"
+    "message": "Du har vellykket logget inn"
   },
   "youMayCloseThisWindow": {
-    "message": "You may close this window"
+    "message": "Du kan lukke dette vinduet"
   },
   "masterPassSent": {
     "message": "Vi har sendt deg en E-post med hintet til superpassordet."
@@ -834,10 +834,10 @@
     "message": "Bitwarden can store and fill 2-step verification codes. Select the camera icon to take a screenshot of this website's authenticator QR code, or copy and paste the key into this field."
   },
   "learnMoreAboutAuthenticators": {
-    "message": "Learn more about authenticators"
+    "message": "Lær mer om autentisering"
   },
   "copyTOTP": {
-    "message": "Copy Authenticator key (TOTP)"
+    "message": "Kopier autentiseringsnøkkel (TOTP)"
   },
   "loggedOut": {
     "message": "Logget av"
@@ -852,19 +852,19 @@
     "message": "Logg inn"
   },
   "logInToBitwarden": {
-    "message": "Log in to Bitwarden"
+    "message": "Logg inn på Bitwarden"
   },
   "restartRegistration": {
     "message": "Restart registration"
   },
   "expiredLink": {
-    "message": "Expired link"
+    "message": "Utløpt lenke"
   },
   "pleaseRestartRegistrationOrTryLoggingIn": {
     "message": "Please restart registration or try logging in."
   },
   "youMayAlreadyHaveAnAccount": {
-    "message": "You may already have an account"
+    "message": "Du har kanskje allerede en konto"
   },
   "logOutConfirmation": {
     "message": "Er du sikker på at du vil logge av?"
@@ -1049,7 +1049,7 @@
     "message": "Lås opp"
   },
   "additionalOptions": {
-    "message": "Additional options"
+    "message": "Ekstra innstillinger"
   },
   "enableContextMenuItem": {
     "message": "Vis alternativer for kontekstmeny"
@@ -1113,7 +1113,7 @@
     "message": "Set a file password to encrypt the export and import it to any Bitwarden account using the password for decryption."
   },
   "exportTypeHeading": {
-    "message": "Export type"
+    "message": "Eksporttype"
   },
   "accountRestricted": {
     "message": "Account restricted"
@@ -1126,7 +1126,7 @@
     "description": "WARNING (should stay in capitalized letters if the language permits)"
   },
   "warningCapitalized": {
-    "message": "Warning",
+    "message": "Advarsel",
     "description": "Warning (should maintain locale-relevant capitalization)"
   },
   "confirmVaultExport": {
@@ -1206,7 +1206,7 @@
     "message": "Fil"
   },
   "fileToShare": {
-    "message": "File to share"
+    "message": "Filen som skal deles"
   },
   "selectFile": {
     "message": "Velg en fil."
@@ -1242,7 +1242,7 @@
     "message": "1 GB med kryptert fillagring for filvedlegg."
   },
   "premiumSignUpEmergency": {
-    "message": "Emergency access."
+    "message": "Nødtilgang."
   },
   "premiumSignUpTwoStepOptions": {
     "message": "Proprietary two-step login options such as YubiKey and Duo."
@@ -1413,7 +1413,7 @@
     "message": "E-post"
   },
   "emailDescV2": {
-    "message": "Enter a code sent to your email."
+    "message": "Skriv inn koden du har fått tilsendt på E-post."
   },
   "selfHostedEnvironment": {
     "message": "Selvbetjent miljø"
@@ -1466,7 +1466,7 @@
     "description": "Represents the message for allowing the user to enable the autofill overlay"
   },
   "autofillSuggestionsSectionTitle": {
-    "message": "Autofill suggestions"
+    "message": "Autoutfyllingsforslag"
   },
   "showInlineMenuLabel": {
     "message": "Show autofill suggestions on form fields"
@@ -1514,7 +1514,7 @@
     "message": "Kompromitterte eller upålitelige nettsider kan utnytte auto-utfylling når du laster inn siden."
   },
   "learnMoreAboutAutofillOnPageLoadLinkText": {
-    "message": "Learn more about risks"
+    "message": "Lær mer om risikoer"
   },
   "learnMoreAboutAutofill": {
     "message": "Lær mer om auto-utfylling"
@@ -1768,10 +1768,10 @@
     "message": "Identitet"
   },
   "typeSshKey": {
-    "message": "SSH key"
+    "message": "SSH-nøkkel"
   },
   "newItemHeader": {
-    "message": "New $TYPE$",
+    "message": "Ny $TYPE$",
     "placeholders": {
       "type": {
         "content": "$1",
@@ -1780,7 +1780,7 @@
     }
   },
   "editItemHeader": {
-    "message": "Edit $TYPE$",
+    "message": "Rediger $TYPE$",
     "placeholders": {
       "type": {
         "content": "$1",
@@ -1789,7 +1789,7 @@
     }
   },
   "viewItemHeader": {
-    "message": "View $TYPE$",
+    "message": "Vis $TYPE$",
     "placeholders": {
       "type": {
         "content": "$1",
@@ -1801,7 +1801,7 @@
     "message": "Passordhistorikk"
   },
   "generatorHistory": {
-    "message": "Generator history"
+    "message": "Generatorhistorikk"
   },
   "clearGeneratorHistoryTitle": {
     "message": "Clear generator history"
@@ -1846,7 +1846,7 @@
     "message": "Sikre notiser"
   },
   "sshKeys": {
-    "message": "SSH Keys"
+    "message": "SSH-nøkler"
   },
   "clear": {
     "message": "Tøm",
@@ -1929,7 +1929,7 @@
     "message": "Tøm historikk"
   },
   "nothingToShow": {
-    "message": "Nothing to show"
+    "message": "Ingenting å vise"
   },
   "nothingGeneratedRecently": {
     "message": "You haven't generated anything recently"
@@ -2017,7 +2017,7 @@
     "message": "Lås opp med biometri"
   },
   "unlockWithMasterPassword": {
-    "message": "Unlock with master password"
+    "message": "Lås opp med hovedpassord"
   },
   "awaitDesktop": {
     "message": "Venter på bekreftelse fra skrivebordsprogrammet"
@@ -2029,7 +2029,7 @@
     "message": "Lås med hovedpassordet når du starter nettleseren på nytt"
   },
   "lockWithMasterPassOnRestart1": {
-    "message": "Require master password on browser restart"
+    "message": "Krev hovedpassord ved omstart av nettleseren"
   },
   "selectOneCollection": {
     "message": "Du må velge minst én samling."
@@ -2041,22 +2041,22 @@
     "message": "Klon"
   },
   "passwordGenerator": {
-    "message": "Password generator"
+    "message": "Passordgenerator"
   },
   "usernameGenerator": {
-    "message": "Username generator"
+    "message": "Brukernavngenerator"
   },
   "useThisPassword": {
     "message": "Bruk dette passordet"
   },
   "useThisUsername": {
-    "message": "Use this username"
+    "message": "Bruk dette brukernavnet"
   },
   "securePasswordGenerated": {
     "message": "Secure password generated! Don't forget to also update your password on the website."
   },
   "useGeneratorHelpTextPartOne": {
-    "message": "Use the generator",
+    "message": "Bruk denne generatoren",
     "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'"
   },
   "useGeneratorHelpTextPartTwo": {
@@ -2096,7 +2096,7 @@
     "message": "Gjenopprettet objekt"
   },
   "alreadyHaveAccount": {
-    "message": "Already have an account?"
+    "message": "Har du allerede en konto?"
   },
   "vaultTimeoutLogOutConfirmation": {
     "message": "Hvis du logger ut, fjerner du all tilgang til hvelvet ditt og krever online godkjenning etter tidsavbrudd. Er du sikker på at du vil bruke denne innstillingen?"
@@ -2108,7 +2108,7 @@
     "message": "Autofyll og lagre"
   },
   "fillAndSave": {
-    "message": "Fill and save"
+    "message": "Fyll og lagre"
   },
   "autoFillSuccessAndSavedUri": {
     "message": "Autoutfylt objekt og lagret URI"
@@ -2195,10 +2195,10 @@
     "message": "Avslutt abonnement"
   },
   "atAnyTime": {
-    "message": "at any time."
+    "message": "når som helst."
   },
   "byContinuingYouAgreeToThe": {
-    "message": "By continuing, you agree to the"
+    "message": "Ved å fortsette, samtykker du til"
   },
   "and": {
     "message": "og"
@@ -2325,7 +2325,7 @@
     "description": "A category title describing the concept of web domains"
   },
   "blockedDomains": {
-    "message": "Blocked domains"
+    "message": "Blokkerte domener"
   },
   "excludedDomains": {
     "message": "Ekskluderte domener"
@@ -2370,7 +2370,7 @@
     "message": "Excluded domain changes saved"
   },
   "limitSendViews": {
-    "message": "Limit views"
+    "message": "Begrens visninger"
   },
   "limitSendViewsHint": {
     "message": "No one can view this Send after the limit is reached.",
@@ -2398,7 +2398,7 @@
     "message": "Tekst"
   },
   "sendTypeTextToShare": {
-    "message": "Text to share"
+    "message": "Teksten som skal deles"
   },
   "sendTypeFile": {
     "message": "Fil"
@@ -2634,7 +2634,7 @@
     "message": "Velg mappe …"
   },
   "noFoldersFound": {
-    "message": "No folders found",
+    "message": "Ingen mapper ble funnet",
     "description": "Used as a message within the notification bar when no folders are found"
   },
   "orgPermissionsUpdatedMustSetPassword": {
@@ -2646,7 +2646,7 @@
     "description": "Used as a card title description on the set password page to explain why the user is there"
   },
   "cardMetrics": {
-    "message": "out of $TOTAL$",
+    "message": "av $TOTAL$",
     "placeholders": {
       "total": {
         "content": "$1",
@@ -2805,7 +2805,7 @@
     "message": "Feil"
   },
   "decryptionError": {
-    "message": "Decryption error"
+    "message": "Dekrypteringsfeil"
   },
   "couldNotDecryptVaultItemsBelow": {
     "message": "Bitwarden could not decrypt the vault item(s) listed below."
@@ -2825,7 +2825,7 @@
     "message": "Generate email"
   },
   "spinboxBoundariesHint": {
-    "message": "Value must be between $MIN$ and $MAX$.",
+    "message": "Verdien må være mellom $MIN$ og $MAX$.",
     "description": "Explains spin box minimum and maximum values to the user",
     "placeholders": {
       "min": {
@@ -2890,7 +2890,7 @@
     "message": "Generer et e-postalias med en ekstern videresendingstjeneste."
   },
   "forwarderDomainName": {
-    "message": "Email domain",
+    "message": "E-postdomene",
     "description": "Labels the domain name email forwarder service option"
   },
   "forwarderDomainNameHint": {
@@ -2912,11 +2912,11 @@
     }
   },
   "forwarderGeneratedBy": {
-    "message": "Generated by Bitwarden.",
+    "message": "Generert av Bitwarden.",
     "description": "Displayed with the address on the forwarding service's configuration screen."
   },
   "forwarderGeneratedByWithWebsite": {
-    "message": "Website: $WEBSITE$. Generated by Bitwarden.",
+    "message": "Nettsted: $WEBSITE$. Generert av Bitwarden.",
     "description": "Displayed with the address on the forwarding service's configuration screen.",
     "placeholders": {
       "WEBSITE": {
@@ -2960,7 +2960,7 @@
     }
   },
   "forwarderNoDomain": {
-    "message": "Invalid $SERVICENAME$ domain.",
+    "message": "Ugyldig $SERVICENAME$-domene.",
     "description": "Displayed when the domain is empty or domain authorization failed at the forwarding service.",
     "placeholders": {
       "servicename": {
@@ -3097,16 +3097,16 @@
     "message": "Send varslingen på nytt"
   },
   "viewAllLogInOptions": {
-    "message": "View all log in options"
+    "message": "Vis alle påloggingsalternativer"
   },
   "viewAllLoginOptionsV1": {
-    "message": "View all log in options"
+    "message": "Vis alle påloggingsalternativer"
   },
   "notificationSentDevice": {
     "message": "Et varsel er sendt til enheten din."
   },
   "aNotificationWasSentToYourDevice": {
-    "message": "A notification was sent to your device"
+    "message": "Et varsel ble sendt til enheten din"
   },
   "makeSureYourAccountIsUnlockedAndTheFingerprintEtc": {
     "message": "Make sure your account is unlocked and the fingerprint phrase matches on the other device"
@@ -3115,7 +3115,7 @@
     "message": "You will be notified once the request is approved"
   },
   "needAnotherOptionV1": {
-    "message": "Need another option?"
+    "message": "Trenger du et annet alternativ?"
   },
   "loginInitiated": {
     "message": "Login initiated"
@@ -3217,7 +3217,7 @@
     "message": "Device approval required. Select an approval option below:"
   },
   "deviceApprovalRequiredV2": {
-    "message": "Device approval required"
+    "message": "Enhetsgodkjennelse kreves"
   },
   "selectAnApprovalOptionBelow": {
     "message": "Select an approval option below"
@@ -3241,7 +3241,7 @@
     "message": "Organization SSO identifier is required."
   },
   "creatingAccountOn": {
-    "message": "Creating account on"
+    "message": "Oppretter en konto på"
   },
   "checkYourEmail": {
     "message": "Check your email"
@@ -3259,7 +3259,7 @@
     "message": "Gå tilbake"
   },
   "toEditYourEmailAddress": {
-    "message": "to edit your email address."
+    "message": "for å redigere E-postadressen din."
   },
   "eu": {
     "message": "EU",
@@ -3287,7 +3287,7 @@
     "message": "Du vil bli varslet når det er godkjent."
   },
   "troubleLoggingIn": {
-    "message": "Trouble logging in?"
+    "message": "Har du problemer med å logge inn?"
   },
   "loginApproved": {
     "message": "Innlogging godkjent"
@@ -3299,7 +3299,7 @@
     "message": "Active user email not found. Logging you out."
   },
   "deviceTrusted": {
-    "message": "Device trusted"
+    "message": "Enheten er betrodd"
   },
   "sendsNoItemsTitle": {
     "message": "No active Sends",
@@ -3450,7 +3450,7 @@
     "description": "Notification message for when an import has completed successfully."
   },
   "dataImportFailed": {
-    "message": "Error importing. Check console for details.",
+    "message": "Feil under importering. Sjekk loggkonsollen for detaljer.",
     "description": "Notification message for when an import has failed."
   },
   "importNetworkError": {
@@ -3487,7 +3487,7 @@
     "description": "Screen reader and tool tip label for the overlay button"
   },
   "bitwardenVault": {
-    "message": "Bitwarden autofill menu",
+    "message": "Bitwardens autoutfyllingsmeny",
     "description": "Page title in overlay"
   },
   "unlockYourAccountToViewMatchingLogins": {
@@ -3543,7 +3543,7 @@
     "description": "Screen reader text (aria-label) for new login button within inline menu"
   },
   "newCard": {
-    "message": "New card",
+    "message": "Nytt kort",
     "description": "Button text to display within inline menu when there are no matching items on a credit card field"
   },
   "addNewCardItemAria": {
@@ -3573,7 +3573,7 @@
     "description": "Used for the header of the import dialog, the import button and within the file-password-prompt"
   },
   "importError": {
-    "message": "Import error"
+    "message": "Importeringsfeil"
   },
   "importErrorDesc": {
     "message": "There was a problem with the data you tried to import. Please resolve the errors listed below in your source file and try again."
@@ -3737,16 +3737,16 @@
     "message": "Vault data exported"
   },
   "typePasskey": {
-    "message": "Passkey"
+    "message": "Passnøkkel"
   },
   "accessing": {
     "message": "Accessing"
   },
   "loggedInExclamation": {
-    "message": "Logged in!"
+    "message": "Innlogget!"
   },
   "passkeyNotCopied": {
-    "message": "Passkey will not be copied"
+    "message": "Passkoden vil ikke bli kopiert"
   },
   "passkeyNotCopiedAlert": {
     "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?"
@@ -3776,10 +3776,10 @@
     "message": "Bekreft"
   },
   "savePasskey": {
-    "message": "Save passkey"
+    "message": "Lagre passnøkkel"
   },
   "savePasskeyNewLogin": {
-    "message": "Save passkey as new login"
+    "message": "Lagre passnøkkelen som en ny pålogging"
   },
   "chooseCipherForPasskeySave": {
     "message": "Choose a login to save this passkey to"
@@ -3842,7 +3842,7 @@
     "message": "Approve the login request in your authentication app or enter a one-time passcode."
   },
   "passcode": {
-    "message": "Passcode"
+    "message": "Passkode"
   },
   "lastPassMasterPassword": {
     "message": "LastPass-hovedpassord"
@@ -3882,7 +3882,7 @@
     "message": "Bytt kontoer"
   },
   "switchToAccount": {
-    "message": "Switch to account"
+    "message": "Bytt til konto"
   },
   "activeAccount": {
     "message": "Aktiv konto"
@@ -3903,13 +3903,13 @@
     "message": "låst opp"
   },
   "server": {
-    "message": "server"
+    "message": "tjener"
   },
   "hostedAt": {
     "message": "betjent hos"
   },
   "useDeviceOrHardwareKey": {
-    "message": "Use your device or hardware key"
+    "message": "Bruk enhets- eller maskinvarenøkkel"
   },
   "justOnce": {
     "message": "Kun én gang"
@@ -3931,7 +3931,7 @@
     "description": "Label indicating the most common import formats"
   },
   "confirmContinueToBrowserSettingsTitle": {
-    "message": "Continue to browser settings?",
+    "message": "Vil du fortsette til nettleserinnstillingene?",
     "description": "Title for dialog which asks if the user wants to proceed to a relevant browser settings page"
   },
   "confirmContinueToHelpCenter": {
@@ -3975,7 +3975,7 @@
     "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings"
   },
   "makeDefault": {
-    "message": "Make default",
+    "message": "Gjør det til standarden",
     "description": "Button text for the setting that allows overriding the default browser autofill settings"
   },
   "saveCipherAttemptSuccess": {
@@ -3983,7 +3983,7 @@
     "description": "Notification message for when saving credentials has succeeded."
   },
   "passwordSaved": {
-    "message": "Password saved!",
+    "message": "Passordet ble lagret!",
     "description": "Notification message for when saving credentials has succeeded."
   },
   "updateCipherAttemptSuccess": {
@@ -3991,7 +3991,7 @@
     "description": "Notification message for when updating credentials has succeeded."
   },
   "passwordUpdated": {
-    "message": "Password updated!",
+    "message": "Passordet ble oppdatert!",
     "description": "Notification message for when updating credentials has succeeded."
   },
   "saveCipherAttemptFailed": {
@@ -4002,19 +4002,19 @@
     "message": "Suksess"
   },
   "removePasskey": {
-    "message": "Remove passkey"
+    "message": "Fjern passordnøkkel"
   },
   "passkeyRemoved": {
     "message": "Passkey removed"
   },
   "autofillSuggestions": {
-    "message": "Autofill suggestions"
+    "message": "Autoutfyllingsforslag"
   },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
   "yourVaultIsEmpty": {
-    "message": "Your vault is empty"
+    "message": "Hvelvet ditt er tomt"
   },
   "noItemsMatchSearch": {
     "message": "No items match your search"
@@ -4043,7 +4043,7 @@
     }
   },
   "moreOptionsLabel": {
-    "message": "More options, $ITEMNAME$",
+    "message": "Flere innstillinger, $ITEMNAME$",
     "description": "Aria label for a button that opens a menu with more options for an item.",
     "placeholders": {
       "itemname": {
@@ -4053,7 +4053,7 @@
     }
   },
   "moreOptionsTitle": {
-    "message": "More options - $ITEMNAME$",
+    "message": "Flere innstillinger - $ITEMNAME$",
     "description": "Title for a button that opens a menu with more options for an item.",
     "placeholders": {
       "itemname": {
@@ -4063,7 +4063,7 @@
     }
   },
   "viewItemTitle": {
-    "message": "View item - $ITEMNAME$",
+    "message": "Vis gjenstand - $ITEMNAME$",
     "description": "Title for a link that opens a view for an item.",
     "placeholders": {
       "itemname": {
@@ -4073,7 +4073,7 @@
     }
   },
   "autofillTitle": {
-    "message": "Autofill - $ITEMNAME$",
+    "message": "Autoutfyll - $ITEMNAME$",
     "description": "Title for a button that autofills a login item.",
     "placeholders": {
       "itemname": {
@@ -4086,7 +4086,7 @@
     "message": "No values to copy"
   },
   "assignToCollections": {
-    "message": "Assign to collections"
+    "message": "Legg til i samlinger"
   },
   "copyEmail": {
     "message": "Copy email"
@@ -4116,7 +4116,7 @@
     "message": "Error assigning target folder."
   },
   "viewItemsIn": {
-    "message": "View items in $NAME$",
+    "message": "Vis gjenstander i $NAME$",
     "description": "Button to view the contents of a folder or collection",
     "placeholders": {
       "name": {
@@ -4126,7 +4126,7 @@
     }
   },
   "backTo": {
-    "message": "Back to $NAME$",
+    "message": "Tilbake til $NAME$",
     "description": "Navigate back to a previous folder or collection",
     "placeholders": {
       "name": {
@@ -4139,7 +4139,7 @@
     "message": "Ny"
   },
   "removeItem": {
-    "message": "Remove $NAME$",
+    "message": "Fjern $NAME$",
     "description": "Remove a selected option, such as a folder or collection",
     "placeholders": {
       "name": {
@@ -4149,13 +4149,13 @@
     }
   },
   "itemsWithNoFolder": {
-    "message": "Items with no folder"
+    "message": "Gjenstander uten mappe"
   },
   "itemDetails": {
-    "message": "Item details"
+    "message": "Gjenstandens detaljer"
   },
   "itemName": {
-    "message": "Item name"
+    "message": "Gjenstandens navn"
   },
   "cannotRemoveViewOnlyCollections": {
     "message": "You cannot remove collections with View only permissions: $COLLECTIONS$",
@@ -4183,10 +4183,10 @@
     "message": "Tilleggsinformasjon"
   },
   "itemHistory": {
-    "message": "Item history"
+    "message": "Gjenstandshistorikk"
   },
   "lastEdited": {
-    "message": "Last edited"
+    "message": "Nyligst redigert"
   },
   "ownerYou": {
     "message": "Owner: You"
@@ -4201,10 +4201,10 @@
     "message": "Last opp"
   },
   "addAttachment": {
-    "message": "Add attachment"
+    "message": "Legg til vedlegg"
   },
   "maxFileSizeSansPunctuation": {
-    "message": "Maximum file size is 500 MB"
+    "message": "Maksimal filstørrelse er 500 MB"
   },
   "deleteAttachmentName": {
     "message": "Delete attachment $NAME$",
@@ -4216,7 +4216,7 @@
     }
   },
   "downloadAttachmentName": {
-    "message": "Download $NAME$",
+    "message": "Last ned $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -4240,10 +4240,10 @@
     "message": "Filter vault"
   },
   "filterApplied": {
-    "message": "One filter applied"
+    "message": "Ett filter er benyttet"
   },
   "filterAppliedPlural": {
-    "message": "$COUNT$ filters applied",
+    "message": "$COUNT$ filtre er benyttet",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4252,16 +4252,16 @@
     }
   },
   "personalDetails": {
-    "message": "Personal details"
+    "message": "Personlige detaljer"
   },
   "identification": {
-    "message": "Identification"
+    "message": "Identifikasjon"
   },
   "contactInfo": {
     "message": "Kontaktinfo"
   },
   "downloadAttachment": {
-    "message": "Download - $ITEMNAME$",
+    "message": "Last ned - $ITEMNAME$",
     "placeholders": {
       "itemname": {
         "content": "$1",
@@ -4270,17 +4270,17 @@
     }
   },
   "cardNumberEndsWith": {
-    "message": "card number ends with",
+    "message": "kortnummeret slutter med",
     "description": "Used within the inline menu to provide an aria description when users are attempting to fill a card cipher."
   },
   "loginCredentials": {
     "message": "Legitimasjoner for innlogging"
   },
   "authenticatorKey": {
-    "message": "Authenticator key"
+    "message": "Autentiseringsnøkkel"
   },
   "autofillOptions": {
-    "message": "Autofill options"
+    "message": "Autoutfyllings-innstillinger"
   },
   "websiteUri": {
     "message": "Website (URI)"
@@ -4296,7 +4296,7 @@
     }
   },
   "websiteAdded": {
-    "message": "Website added"
+    "message": "Nettsted lagt til"
   },
   "addWebsite": {
     "message": "Legg til nettsted"
@@ -4305,7 +4305,7 @@
     "message": "Slett nettsted"
   },
   "defaultLabel": {
-    "message": "Default ($VALUE$)",
+    "message": "Standard ($VALUE$)",
     "description": "A label that indicates the default value for a field with the current default value in parentheses.",
     "placeholders": {
       "value": {
@@ -4336,16 +4336,16 @@
     "message": "Autofill on page load?"
   },
   "cardExpiredTitle": {
-    "message": "Expired card"
+    "message": "Utløpt kort"
   },
   "cardExpiredMessage": {
     "message": "If you've renewed it, update the card's information"
   },
   "cardDetails": {
-    "message": "Card details"
+    "message": "Kortdetaljer"
   },
   "cardBrandDetails": {
-    "message": "$BRAND$ details",
+    "message": "$BRAND$-detaljer",
     "placeholders": {
       "brand": {
         "content": "$1",
@@ -4357,7 +4357,7 @@
     "message": "Aktiver animasjoner"
   },
   "showAnimations": {
-    "message": "Show animations"
+    "message": "Vis animasjoner"
   },
   "addAccount": {
     "message": "Legg til konto"
@@ -4369,15 +4369,15 @@
     "message": "Data"
   },
   "passkeys": {
-    "message": "Passkeys",
+    "message": "Passnøkler",
     "description": "A section header for a list of passkeys."
   },
   "passwords": {
-    "message": "Passwords",
+    "message": "Passord",
     "description": "A section header for a list of passwords."
   },
   "logInWithPasskeyAriaLabel": {
-    "message": "Log in with passkey",
+    "message": "Logg inn med passnøkkel",
     "description": "ARIA label for the inline menu button that logs in with a passkey."
   },
   "assign": {
@@ -4402,16 +4402,16 @@
     }
   },
   "addField": {
-    "message": "Add field"
+    "message": "Legg til felt"
   },
   "add": {
     "message": "Legg til"
   },
   "fieldType": {
-    "message": "Field type"
+    "message": "Felttype"
   },
   "fieldLabel": {
-    "message": "Field label"
+    "message": "Feltetikett"
   },
   "textHelpText": {
     "message": "Use text fields for data like security questions"
@@ -4441,7 +4441,7 @@
     }
   },
   "deleteCustomField": {
-    "message": "Delete $LABEL$",
+    "message": "Slett $LABEL$",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4450,7 +4450,7 @@
     }
   },
   "fieldAdded": {
-    "message": "$LABEL$ added",
+    "message": "$LABEL$ er lagt til",
     "placeholders": {
       "label": {
         "content": "$1",
@@ -4572,7 +4572,7 @@
     }
   },
   "itemLocation": {
-    "message": "Item Location"
+    "message": "Gjenstandens plassering"
   },
   "fileSend": {
     "message": "File Send"
@@ -4587,7 +4587,7 @@
     "message": "Text Sends"
   },
   "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
+    "message": "Bitwarden har fått et nytt utseende!"
   },
   "bitwardenNewLookDesc": {
     "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
@@ -4608,16 +4608,16 @@
     "message": "Enterprise policy requirements have been applied to this setting"
   },
   "sshPrivateKey": {
-    "message": "Private key"
+    "message": "Privat nøkkel"
   },
   "sshPublicKey": {
-    "message": "Public key"
+    "message": "Offentlig nøkkel"
   },
   "sshFingerprint": {
-    "message": "Fingerprint"
+    "message": "Fingeravtrykk"
   },
   "sshKeyAlgorithm": {
-    "message": "Key type"
+    "message": "Nøkkeltype"
   },
   "sshKeyAlgorithmED25519": {
     "message": "ED25519"
@@ -4638,22 +4638,22 @@
     "message": "Minimum custom timeout is 1 minute."
   },
   "additionalContentAvailable": {
-    "message": "Additional content is available"
+    "message": "Ytterligere innhold er tilgjengelig"
   },
   "fileSavedToDevice": {
     "message": "File saved to device. Manage from your device downloads."
   },
   "showCharacterCount": {
-    "message": "Show character count"
+    "message": "Vis tegntelleren"
   },
   "hideCharacterCount": {
-    "message": "Hide character count"
+    "message": "Skjul tegntelleren"
   },
   "itemsInTrash": {
-    "message": "Items in trash"
+    "message": "Gjenstander i papirkurven"
   },
   "noItemsInTrash": {
-    "message": "No items in trash"
+    "message": "Ingen gjenstander i papirkurven"
   },
   "noItemsInTrashDesc": {
     "message": "Items you delete will appear here and be permanently deleted after 30 days"
@@ -4709,11 +4709,11 @@
     "description": "Notification message for when a password has been regenerated"
   },
   "saveLoginToBitwarden": {
-    "message": "Save login to Bitwarden?",
+    "message": "Vil du lagre påloggingen i Bitwarden?",
     "description": "Confirmation message for saving a login to Bitwarden"
   },
   "spaceCharacterDescriptor": {
-    "message": "Space",
+    "message": "Mellomrom",
     "description": "Represents the space key in screen reader content as a readable word"
   },
   "tildeCharacterDescriptor": {
@@ -4721,15 +4721,15 @@
     "description": "Represents the ~ key in screen reader content as a readable word"
   },
   "backtickCharacterDescriptor": {
-    "message": "Backtick",
+    "message": "Baklengs apostrof",
     "description": "Represents the ` key in screen reader content as a readable word"
   },
   "exclamationCharacterDescriptor": {
-    "message": "Exclamation mark",
+    "message": "Utropstegn",
     "description": "Represents the ! key in screen reader content as a readable word"
   },
   "atSignCharacterDescriptor": {
-    "message": "At sign",
+    "message": "Alfakrøll",
     "description": "Represents the @ key in screen reader content as a readable word"
   },
   "hashSignCharacterDescriptor": {
@@ -4737,11 +4737,11 @@
     "description": "Represents the # key in screen reader content as a readable word"
   },
   "dollarSignCharacterDescriptor": {
-    "message": "Dollar sign",
+    "message": "Dollartegn",
     "description": "Represents the $ key in screen reader content as a readable word"
   },
   "percentSignCharacterDescriptor": {
-    "message": "Percent sign",
+    "message": "Prosenttegn",
     "description": "Represents the % key in screen reader content as a readable word"
   },
   "caretCharacterDescriptor": {
@@ -4749,7 +4749,7 @@
     "description": "Represents the ^ key in screen reader content as a readable word"
   },
   "ampersandCharacterDescriptor": {
-    "message": "Ampersand",
+    "message": "Prosenttegn",
     "description": "Represents the & key in screen reader content as a readable word"
   },
   "asteriskCharacterDescriptor": {
@@ -4757,23 +4757,23 @@
     "description": "Represents the * key in screen reader content as a readable word"
   },
   "parenLeftCharacterDescriptor": {
-    "message": "Left parenthesis",
+    "message": "Venstre parantes",
     "description": "Represents the ( key in screen reader content as a readable word"
   },
   "parenRightCharacterDescriptor": {
-    "message": "Right parenthesis",
+    "message": "Høyre parantes",
     "description": "Represents the ) key in screen reader content as a readable word"
   },
   "hyphenCharacterDescriptor": {
-    "message": "Underscore",
+    "message": "Understrek",
     "description": "Represents the _ key in screen reader content as a readable word"
   },
   "underscoreCharacterDescriptor": {
-    "message": "Hyphen",
+    "message": "Bindestrek",
     "description": "Represents the - key in screen reader content as a readable word"
   },
   "plusCharacterDescriptor": {
-    "message": "Plus",
+    "message": "Plusstegn",
     "description": "Represents the + key in screen reader content as a readable word"
   },
   "equalsCharacterDescriptor": {
@@ -4781,19 +4781,19 @@
     "description": "Represents the = key in screen reader content as a readable word"
   },
   "braceLeftCharacterDescriptor": {
-    "message": "Left brace",
+    "message": "Venstre krøllparentes",
     "description": "Represents the { key in screen reader content as a readable word"
   },
   "braceRightCharacterDescriptor": {
-    "message": "Right brace",
+    "message": "Høyre krøllparentes",
     "description": "Represents the } key in screen reader content as a readable word"
   },
   "bracketLeftCharacterDescriptor": {
-    "message": "Left bracket",
+    "message": "Venstre firkantparantes",
     "description": "Represents the [ key in screen reader content as a readable word"
   },
   "bracketRightCharacterDescriptor": {
-    "message": "Right bracket",
+    "message": "Høyre firkantparantes",
     "description": "Represents the ] key in screen reader content as a readable word"
   },
   "pipeCharacterDescriptor": {
@@ -4801,69 +4801,69 @@
     "description": "Represents the | key in screen reader content as a readable word"
   },
   "backSlashCharacterDescriptor": {
-    "message": "Back slash",
+    "message": "Skråstrek bakover",
     "description": "Represents the back slash key in screen reader content as a readable word"
   },
   "colonCharacterDescriptor": {
-    "message": "Colon",
+    "message": "Kolon",
     "description": "Represents the : key in screen reader content as a readable word"
   },
   "semicolonCharacterDescriptor": {
-    "message": "Semicolon",
+    "message": "Semikolon",
     "description": "Represents the ; key in screen reader content as a readable word"
   },
   "doubleQuoteCharacterDescriptor": {
-    "message": "Double quote",
+    "message": "Hermetegn",
     "description": "Represents the double quote key in screen reader content as a readable word"
   },
   "singleQuoteCharacterDescriptor": {
-    "message": "Single quote",
+    "message": "Apostrofe",
     "description": "Represents the ' key in screen reader content as a readable word"
   },
   "lessThanCharacterDescriptor": {
-    "message": "Less than",
+    "message": "Mindre enn",
     "description": "Represents the < key in screen reader content as a readable word"
   },
   "greaterThanCharacterDescriptor": {
-    "message": "Greater than",
+    "message": "Større enn",
     "description": "Represents the > key in screen reader content as a readable word"
   },
   "commaCharacterDescriptor": {
-    "message": "Comma",
+    "message": "Komma",
     "description": "Represents the , key in screen reader content as a readable word"
   },
   "periodCharacterDescriptor": {
-    "message": "Period",
+    "message": "Tidsperiode",
     "description": "Represents the . key in screen reader content as a readable word"
   },
   "questionCharacterDescriptor": {
-    "message": "Question mark",
+    "message": "Spørsmålstegn",
     "description": "Represents the ? key in screen reader content as a readable word"
   },
   "forwardSlashCharacterDescriptor": {
-    "message": "Forward slash",
+    "message": "Skråstrek",
     "description": "Represents the / key in screen reader content as a readable word"
   },
   "lowercaseAriaLabel": {
-    "message": "Lowercase"
+    "message": "Små bokstaver"
   },
   "uppercaseAriaLabel": {
-    "message": "Uppercase"
+    "message": "Store bokstaver"
   },
   "generatedPassword": {
-    "message": "Generated password"
+    "message": "Generert passord"
   },
   "compactMode": {
-    "message": "Compact mode"
+    "message": "Kompakt modus"
   },
   "beta": {
     "message": "Beta"
   },
   "importantNotice": {
-    "message": "Important notice"
+    "message": "Viktig melding"
   },
   "setupTwoStepLogin": {
-    "message": "Set up two-step login"
+    "message": "Sett opp 2-trinnspålogging"
   },
   "newDeviceVerificationNoticeContentPage1": {
     "message": "Bitwarden will send a code to your account email to verify logins from new devices starting in February 2025."
@@ -4884,7 +4884,7 @@
     }
   },
   "newDeviceVerificationNoticePageOneEmailAccessNo": {
-    "message": "No, I do not"
+    "message": "Nei, det gjør jeg ikke"
   },
   "newDeviceVerificationNoticePageOneEmailAccessYes": {
     "message": "Yes, I can reliably access my email"
@@ -4893,15 +4893,15 @@
     "message": "Turn on two-step login"
   },
   "changeAcctEmail": {
-    "message": "Change account email"
+    "message": "Endre kontoens E-postadresse"
   },
   "extensionWidth": {
-    "message": "Extension width"
+    "message": "Utvidelsens bredde"
   },
   "wide": {
-    "message": "Wide"
+    "message": "Bred"
   },
   "extraWide": {
-    "message": "Extra wide"
+    "message": "Ekstra bred"
   }
 }
diff --git a/apps/browser/src/_locales/zh_CN/messages.json b/apps/browser/src/_locales/zh_CN/messages.json
index f11f0860d1..dd6a2286c4 100644
--- a/apps/browser/src/_locales/zh_CN/messages.json
+++ b/apps/browser/src/_locales/zh_CN/messages.json
@@ -290,7 +290,7 @@
     "message": "前往帮助中心吗？"
   },
   "continueToHelpCenterDesc": {
-    "message": "访问帮助中心了解更多如何使用 Bitwarden 的信息。"
+    "message": "在帮助中心进一步了解如何使用 Bitwarden。"
   },
   "continueToBrowserExtensionStore": {
     "message": "前往浏览器扩展商店吗？"
@@ -834,7 +834,7 @@
     "message": "Bitwarden 可以存储并填充两步验证码。选择相机图标来截取此网站的验证器二维码，或者手动复制并粘贴密钥到此字段。"
   },
   "learnMoreAboutAuthenticators": {
-    "message": "了解更多关于验证器的信息"
+    "message": "进一步了解验证器"
   },
   "copyTOTP": {
     "message": "复制验证器密钥 (TOTP)"
@@ -1514,10 +1514,10 @@
     "message": "不完整或不信任的网站可以利用页面加载时的自动填充功能。"
   },
   "learnMoreAboutAutofillOnPageLoadLinkText": {
-    "message": "了解更多关于风险的信息"
+    "message": "进一步了解风险"
   },
   "learnMoreAboutAutofill": {
-    "message": "了解更多关于自动填充的信息"
+    "message": "进一步了解自动填充"
   },
   "defaultAutoFillOnPageLoad": {
     "message": "登录项目的默认自动填充设置"
@@ -2318,14 +2318,14 @@
     "message": "一个组织策略正影响您的所有权选项。"
   },
   "personalOwnershipPolicyInEffectImports": {
-    "message": "组织策略已阻止将项目导入您的个人密码库。"
+    "message": "某个组织策略已阻止将项目导入您的个人密码库。"
   },
   "domainsTitle": {
     "message": "域名",
     "description": "A category title describing the concept of web domains"
   },
   "blockedDomains": {
-    "message": "已屏蔽的域名"
+    "message": "屏蔽域名"
   },
   "excludedDomains": {
     "message": "排除域名"
@@ -2364,7 +2364,7 @@
     }
   },
   "blockedDomainsSavedSuccess": {
-    "message": "已屏蔽的域名更改已保存"
+    "message": "屏蔽域名更改已保存"
   },
   "excludedDomainsSavedSuccess": {
     "message": "排除域名更改已保存"
@@ -4875,7 +4875,7 @@
     "message": "稍后提醒我"
   },
   "newDeviceVerificationNoticePageOneFormContent": {
-    "message": "您能可正常访问您的电子邮箱 $EMAIL$ 吗？",
+    "message": "您可以正常访问您的电子邮箱 $EMAIL$ 吗？",
     "placeholders": {
       "email": {
         "content": "$1",
diff --git a/apps/browser/store/locales/zh_CN/copy.resx b/apps/browser/store/locales/zh_CN/copy.resx
index 3348cf1910..0f73ccd661 100644
--- a/apps/browser/store/locales/zh_CN/copy.resx
+++ b/apps/browser/store/locales/zh_CN/copy.resx
@@ -135,11 +135,12 @@
 每个人都应该拥有的保持在线安全的工具
 使用 Bitwarden 是免费的，没有广告，不会出售数据。Bitwarden 相信每个人都应该拥有保持在线安全的能力。高级计划提供了对高级功能的访问。
 
-使用 BITWARDEN 为您的团队提供支持
+使用 Bitwarden 为您的团队提供支持
 团队计划和企业计划具有专业的商业功能。例如 SSO 集成、自托管、目录集成，以及 SCIM 配置、全局策略、API 访问、事件日志等。
 
 使用 Bitwarden 保护您的劳动成果，并与同事共享敏感信息。
 
+
 选择 Bitwarden 的更多理由：
 
 世界级加密
@@ -164,7 +165,7 @@ Bitwarden 的翻译涵盖 60 多种语言，由全球社区使用 Crowdin 翻译
 从任何浏览器、移动设备或桌面操作系统中安全地访问和共享 Bitwarden 密码库中的敏感数据。
 
 Bitwarden 保护的不仅仅是密码
-Bitwarden 的端对端加密凭据管理解决方案使组织能够保护所有内容，包括开发人员机密和通行密钥体验。访问 Bitwarden.com 了解更多关于 Bitwarden Secrets Manager 和 Bitwarden Passwordless.dev 的信息！</value>
+Bitwarden 的端对端加密凭据管理解决方案使组织能够保护所有内容，包括开发人员机密和通行密钥体验。访问 Bitwarden.com 进一步了解 Bitwarden Secrets Manager 和 Bitwarden Passwordless.dev！</value>
   </data>
   <data name="AssetTitle" xml:space="preserve">
     <value>无论是在家中、工作中还是在旅途中，Bitwarden 都可以轻松地保护您的所有密码、通行密钥和敏感信息。</value>

From a8ab649fa6846dda01ce6651103e22a6515e6f29 Mon Sep 17 00:00:00 2001
From: "bw-ghapp[bot]" <178206702+bw-ghapp[bot]@users.noreply.github.com>
Date: Mon, 13 Jan 2025 10:40:44 +0100
Subject: [PATCH 051/150] Autosync the updated translations (#12795)

Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>
---
 apps/web/src/locales/af/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/ar/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/az/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/be/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/bg/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/bn/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/bs/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/ca/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/cs/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/cy/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/da/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/de/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/el/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/en_GB/messages.json |  74 ++++++++++++++++
 apps/web/src/locales/en_IN/messages.json |  74 ++++++++++++++++
 apps/web/src/locales/eo/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/es/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/et/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/eu/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/fa/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/fi/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/fil/messages.json   |  74 ++++++++++++++++
 apps/web/src/locales/fr/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/gl/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/he/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/hi/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/hr/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/hu/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/id/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/it/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/ja/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/ka/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/km/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/kn/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/ko/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/lv/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/ml/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/mr/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/my/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/nb/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/ne/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/nl/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/nn/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/or/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/pl/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/pt_BR/messages.json |  74 ++++++++++++++++
 apps/web/src/locales/pt_PT/messages.json |  74 ++++++++++++++++
 apps/web/src/locales/ro/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/ru/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/si/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/sk/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/sl/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/sr/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/sr_CS/messages.json |  74 ++++++++++++++++
 apps/web/src/locales/sv/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/te/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/th/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/tr/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/uk/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/vi/messages.json    |  74 ++++++++++++++++
 apps/web/src/locales/zh_CN/messages.json | 106 +++++++++++++++++++----
 apps/web/src/locales/zh_TW/messages.json |  74 ++++++++++++++++
 62 files changed, 4604 insertions(+), 16 deletions(-)

diff --git a/apps/web/src/locales/af/messages.json b/apps/web/src/locales/af/messages.json
index f86b6ab497..1dd2d62f2a 100644
--- a/apps/web/src/locales/af/messages.json
+++ b/apps/web/src/locales/af/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Teken asb. weer aan."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Teken asb. weer aan. Indien u ander Bitwarden-toepassings gebruik, teken daarop ook weer uit en aan."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "This user is using two-step login to protect their account."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Toestel"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Fout"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Keur versoek goed"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "Geen toestelversoeke"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/ar/messages.json b/apps/web/src/locales/ar/messages.json
index ed843a62cd..2c2549e2f1 100644
--- a/apps/web/src/locales/ar/messages.json
+++ b/apps/web/src/locales/ar/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "بَدْء تسجيل الدخول"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "الرجاء تسجيل الدخول مرة أخرى."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Please log back in. If you are using other Bitwarden applications log out and back in to those as well."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "This user is using two-step login to protect their account."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "الجهاز"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "خطأ"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/az/messages.json b/apps/web/src/locales/az/messages.json
index b8111a0e99..b140ae320b 100644
--- a/apps/web/src/locales/az/messages.json
+++ b/apps/web/src/locales/az/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Kimliyinizi doğrulayın"
   },
+  "whatIsADevice": {
+    "message": "Cihaz nədir?"
+  },
+  "aDeviceIs": {
+    "message": "Cihaz, giriş etdiyiniz Bitwarden tətbiqinin unikal quraşdırmasıdır. Yenidən quraşdırılması, tətbiq datasının təmizlənməsi və ya çərəzlərin təmizlənməsi, cihazın bir neçə dəfə görünməsinə səbəb ola bilər."
+  },
   "logInInitiated": {
     "message": "Giriş etmə başladıldı"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Lütfən yenidən giriş edin."
   },
+  "currentSession": {
+    "message": "Hazırkı seans"
+  },
+  "requestPending": {
+    "message": "Tələb gözlənir"
+  },
   "logBackInOthersToo": {
     "message": "Lütfən yenidən giriş edin. Digər Bitwarden tətbiqlərini istifadə edirsinizsə, onlardan da çıxış edib təkrar giriş etməlisiniz."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "1 dəvət haqqınız var."
+  },
   "userUsingTwoStep": {
     "message": "Bu istifadəçinin hesabını qorumaq üçün iki addımlı giriş istifadə edilir."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Cihaz"
   },
+  "loginStatus": {
+    "message": "Giriş statusu"
+  },
+  "firstLogin": {
+    "message": "İlk giriş"
+  },
+  "trusted": {
+    "message": "Güvənli"
+  },
   "creatingAccountOn": {
     "message": "Hesab yaradılır"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Xəta"
   },
+  "decryptionError": {
+    "message": "Şifrə açma xətası"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden, aşağıda sadalanan seyf element(lər)inin şifrəsini aça bilmədi."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Əlavə data itkisini önləmək üçün",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "müştəri dəstəyi ilə əlaqə saxlayın.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "İdarə edilən istifadəçilərə həm də \"Hesab geri qaytarılmasını idarə et\" icazəsi verilməlidir"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Tələbi təsdiqlə"
   },
+  "deviceApproved": {
+    "message": "Cihaz təsdiqləndi"
+  },
+  "deviceRemoved": {
+    "message": "Cihaz silindi"
+  },
+  "removeDevice": {
+    "message": "Cihazı sil"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Bu cihazı silmək istədiyinizə əminsiniz?"
+  },
   "noDeviceRequests": {
     "message": "Heç bir cihaz tələbi yoxdur"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Üzvləri çıxart"
   },
+  "devices": {
+    "message": "Cihazlar"
+  },
+  "deviceListDescription": {
+    "message": "Aşağıdakı cihazların hər birində hesabınıza giriş edilib. Tanımadığınız cihaz varsa, onu silin."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Aşağıdakı cihazların hər birində hesabınıza giriş edilib."
+  },
   "claimedDomains": {
     "message": "Götürülmüş domenlər"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Təşkilat abunəliyi yenidən başladıldı"
+  },
+  "restartSubscription": {
+    "message": "Abunəliyinizi yenidən başladın"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Kömək üçün $PROVIDER$ ilə əlaqə saxlayın.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/be/messages.json b/apps/web/src/locales/be/messages.json
index ea705b38b4..2a037c5b11 100644
--- a/apps/web/src/locales/be/messages.json
+++ b/apps/web/src/locales/be/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Ініцыяваны ўваход"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Калі ласка, увайдзіце паўторна."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Калі ласка, увайдзіце паўторна. Калі вы выкарыстоўваеце іншыя праграмы Bitwarden, выйдзіце з іх, а потым увайдзіце яшчэ раз."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "Гэты карыстальнік выкарыстоўвае двухэтапны ўваход для абароны свайго ўліковага запісу."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Прылада"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Памылка"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Для кіравання карыстальнікамі неабходна даць дазвол на кіраванне аднаўленнем уліковым запісам"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Ухваліць запыт"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "Няма запытаў ад прылады"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/bg/messages.json b/apps/web/src/locales/bg/messages.json
index 1f5fb8d8c7..531cfd18a4 100644
--- a/apps/web/src/locales/bg/messages.json
+++ b/apps/web/src/locales/bg/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Потвърдете самоличността си"
   },
+  "whatIsADevice": {
+    "message": "Какво представлява едно устройство?"
+  },
+  "aDeviceIs": {
+    "message": "Едно устройство наричаме инсталацията на приложението Битуорден, където сте се вписали. Ако преинсталирате приложението, изчистите данните му или изтриете бисквитките си, това устройство може да се появи няколко пъти в списъка."
+  },
   "logInInitiated": {
     "message": "Вписването е стартирано"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Впишете се отново."
   },
+  "currentSession": {
+    "message": "Текуща сесия"
+  },
+  "requestPending": {
+    "message": "Чакаща заявка"
+  },
   "logBackInOthersToo": {
     "message": "Впишете се отново. Ако използвате и други приложения на Битуорден, впишете се отново и в тях."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "Имате 1 оставаща покана."
+  },
   "userUsingTwoStep": {
     "message": "Този потребител използва двустепенна защита за достъп."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Устройство"
   },
+  "loginStatus": {
+    "message": "Състояние на вписването"
+  },
+  "firstLogin": {
+    "message": "Първо вписване"
+  },
+  "trusted": {
+    "message": "Доверено"
+  },
   "creatingAccountOn": {
     "message": "Създаване на регистрация в"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Грешка"
   },
+  "decryptionError": {
+    "message": "Грешка при дешифриране"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Битоурден не може да дешифрира елементите от трезора посочени по-долу."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Свържете се с поддръжката",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "за да избегнете загубата на данни.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Управлението на потребителите трябва да бъде дадено заедно с разрешението за Управление на възстановяването на регистрации"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Одобряване на заявката"
   },
+  "deviceApproved": {
+    "message": "Устройството е одобрено"
+  },
+  "deviceRemoved": {
+    "message": "Устройството е премахнато"
+  },
+  "removeDevice": {
+    "message": "Премахване на устройството"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Наистина ли искате да премахнете това устройство?"
+  },
   "noDeviceRequests": {
     "message": "Няма заявки от устройства"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Премахване на членовете"
   },
+  "devices": {
+    "message": "Устройства"
+  },
+  "deviceListDescription": {
+    "message": "Вие сте се вписали във всяко от устройствата по-долу. Ако не разпознавате някое от тях, премахнете го сега."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Вашият акаунт е вписан във всяко от устройствата по-долу."
+  },
   "claimedDomains": {
     "message": "Присвоени домейни"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Абонаментът на организацията е рестартиран"
+  },
+  "restartSubscription": {
+    "message": "Рестартирайте абонамента си"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Свържете се с $PROVIDER$ за помощ.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/bn/messages.json b/apps/web/src/locales/bn/messages.json
index 56a04f3d87..b215e56e19 100644
--- a/apps/web/src/locales/bn/messages.json
+++ b/apps/web/src/locales/bn/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Please log back in."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Please log back in. If you are using other Bitwarden applications log out and back in to those as well."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "This user is using two-step login to protect their account."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Device"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/bs/messages.json b/apps/web/src/locales/bs/messages.json
index 3e9c4525b0..5f2605e71b 100644
--- a/apps/web/src/locales/bs/messages.json
+++ b/apps/web/src/locales/bs/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Please log back in."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Please log back in. If you are using other Bitwarden applications log out and back in to those as well."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "This user is using two-step login to protect their account."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Device"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/ca/messages.json b/apps/web/src/locales/ca/messages.json
index 1cf16dcc0f..30649f3296 100644
--- a/apps/web/src/locales/ca/messages.json
+++ b/apps/web/src/locales/ca/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verificació de la vostra identitat"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "S'ha iniciat la sessió"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Torneu a iniciar sessió."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Torneu a iniciar la sessió. Si esteu utilitzant altres aplicacions Bitwarden, tanqueu-les i torneu-les a obrir també."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "Aquest usuari fa servir l'inici de sessió en dues passes per protegir el seu compte."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Dispositiu"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "L'administració d'usuaris també ha d'estar habilitada amb el permís de recuperació del compte de gestió"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Aprova la sol·licitud"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No hi ha sol·licituds de dispositiu"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/cs/messages.json b/apps/web/src/locales/cs/messages.json
index 64ce764de8..7c8978fac8 100644
--- a/apps/web/src/locales/cs/messages.json
+++ b/apps/web/src/locales/cs/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Ověřte svou totožnost"
   },
+  "whatIsADevice": {
+    "message": "Co je to zařízení?"
+  },
+  "aDeviceIs": {
+    "message": "Zařízení je jedinečná instalace aplikace Bitwarden, ve které jste se přihlásili. Přeinstalování, vymazání dat aplikace nebo vymazání souborů cookie může vést k tomu, že se zařízení objeví vícekrát."
+  },
   "logInInitiated": {
     "message": "Bylo zahájeno přihlášení"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Přihlaste se znovu."
   },
+  "currentSession": {
+    "message": "Aktuální relace"
+  },
+  "requestPending": {
+    "message": "Čekající požadavek"
+  },
   "logBackInOthersToo": {
     "message": "Přihlaste se znovu. Používáte-li jiné aplikace Bitwardenu, přihlaste se znovu i v nich."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "Zbývá Vám 1 pozvánka."
+  },
   "userUsingTwoStep": {
     "message": "Tento uživatel používá pro ochranu svého účtu dvoufázové přihlášení."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Zařízení"
   },
+  "loginStatus": {
+    "message": "Stav přihlášení"
+  },
+  "firstLogin": {
+    "message": "První přihlášení"
+  },
+  "trusted": {
+    "message": "Důvěryhodný"
+  },
   "creatingAccountOn": {
     "message": "Vytváření účtu na"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Chyba"
   },
+  "decryptionError": {
+    "message": "Chyba dešifrování"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden nemohl dešifrovat níže uvedené položky v trezoru."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Kontaktujte zákaznickou podporu,",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "abyste zabránili ztrátě dat.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "S oprávněním spravovat obnovení hesla musí být povolena také správa uživatelů"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Schválit žádost"
   },
+  "deviceApproved": {
+    "message": "Zařízení schváleno"
+  },
+  "deviceRemoved": {
+    "message": "Zařízení odebráno"
+  },
+  "removeDevice": {
+    "message": "Odebrat zařízení"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Opravdu chcete odebrat toto zařízení?"
+  },
   "noDeviceRequests": {
     "message": "Žádné žádosti ze zařízení"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Odebrat členy"
   },
+  "devices": {
+    "message": "Zařízení"
+  },
+  "deviceListDescription": {
+    "message": "Váš účet byl přihlášen do každého z níže uvedených zařízení. Pokud zařízení nepoznáváte, odeberte jej nyní."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Váš účet byl přihlášen do každého z níže uvedených zařízení."
+  },
   "claimedDomains": {
     "message": "Uplatněné domény"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Předplatné organizace bylo restartováno"
+  },
+  "restartSubscription": {
+    "message": "Restartovat Vaše předplatné"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Kontaktujte $PROVIDER$ pro pomoc.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/cy/messages.json b/apps/web/src/locales/cy/messages.json
index c0c39c91d3..ed8a03eb8b 100644
--- a/apps/web/src/locales/cy/messages.json
+++ b/apps/web/src/locales/cy/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Please log back in."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Please log back in. If you are using other Bitwarden applications log out and back in to those as well."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "This user is using two-step login to protect their account."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Device"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/da/messages.json b/apps/web/src/locales/da/messages.json
index f71e1feeb3..9731c344e6 100644
--- a/apps/web/src/locales/da/messages.json
+++ b/apps/web/src/locales/da/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Bekræft din identitet"
   },
+  "whatIsADevice": {
+    "message": "Hvad er en enhed?"
+  },
+  "aDeviceIs": {
+    "message": "En enhed er en unik installation af Bitwarden-appen, hvor man har logget ind. Geninstallation, rydning af app-data eller rydning af cookies kan medføre, at en enhed vises op flere gange."
+  },
   "logInInitiated": {
     "message": "Indlogning påbegyndt"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Log ind igen."
   },
+  "currentSession": {
+    "message": "Aktuel session"
+  },
+  "requestPending": {
+    "message": "Anmodning afventer"
+  },
   "logBackInOthersToo": {
     "message": "Log ind igen. Bruger du andre Bitwarden-applikationer, så log også ud og ind igen på disse."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "Der er 1 invitation tilbage."
+  },
   "userUsingTwoStep": {
     "message": "Denne bruger benytter totrins-login for at beskytte kontoen."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Enhed"
   },
+  "loginStatus": {
+    "message": "Indlogningsstatus"
+  },
+  "firstLogin": {
+    "message": "Første login"
+  },
+  "trusted": {
+    "message": "Betroet"
+  },
   "creatingAccountOn": {
     "message": "Opretter konto på"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Fejl"
   },
+  "decryptionError": {
+    "message": "Dekrypteringsfejl"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden kunne ikke dekryptere boks-emne(r) anført nedenfor."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Kontakt kundeservice",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "for at undgå yderligere tab af data.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Håndtér brugere skal også tildeles med tilladelsen håndtér kontogendannelse"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Godkend anmodning"
   },
+  "deviceApproved": {
+    "message": "Enhed godkendt"
+  },
+  "deviceRemoved": {
+    "message": "Enhed fjernet"
+  },
+  "removeDevice": {
+    "message": "Fjern enhed"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Sikker på, at denne enhed skal fjernes?"
+  },
   "noDeviceRequests": {
     "message": "Ingen enhedsanmodninger"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Fjern medlemmer"
   },
+  "devices": {
+    "message": "Enheder"
+  },
+  "deviceListDescription": {
+    "message": "Der er blevet logget ind på kontoen på hver af enhederne nedenfor. Genkendes en enhed ikke, fjern den nu."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Der er blevet logget ind på kontoen på hver af enhederne nedenfor."
+  },
   "claimedDomains": {
     "message": "Registrerede domæner"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organisationsabonnement genstartet"
+  },
+  "restartSubscription": {
+    "message": "Genstart abonnementet"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Kontakt $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/de/messages.json b/apps/web/src/locales/de/messages.json
index 9342247145..540db2dec0 100644
--- a/apps/web/src/locales/de/messages.json
+++ b/apps/web/src/locales/de/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verifiziere deine Identität"
   },
+  "whatIsADevice": {
+    "message": "Was ist ein \"Gerät\"?"
+  },
+  "aDeviceIs": {
+    "message": "Ein \"Gerät\" ist eine einzigartige Installation der Bitwarden-App, in der du dich angemeldet hast. Eine Neuinstallation, das Löschen von App-Daten oder das Löschen von Cookies könnte dazu führen, dass ein \"Gerät\" mehrfach erscheint."
+  },
   "logInInitiated": {
     "message": "Anmeldung eingeleitet"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Bitte melden Sie sich erneut an."
   },
+  "currentSession": {
+    "message": "Aktuelle Sitzung"
+  },
+  "requestPending": {
+    "message": "Anfrage ausstehend"
+  },
   "logBackInOthersToo": {
     "message": "Bitte melden Sie sich wieder an. Wenn Sie andere Bitwarden-Anwendungen verwenden, melden Sie sich auch dort ab und wieder neu an."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "Du hast noch eine Einladung übrig."
+  },
   "userUsingTwoStep": {
     "message": "Dieser Benutzer hat sein Konto mit einer Zwei-Faktor-Authentifizierung geschützt."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Gerät"
   },
+  "loginStatus": {
+    "message": "Anmeldestatus"
+  },
+  "firstLogin": {
+    "message": "Erste Anmeldung"
+  },
+  "trusted": {
+    "message": "Vertrauenswürdig"
+  },
   "creatingAccountOn": {
     "message": "Konto wird erstellt bei"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Fehler"
   },
+  "decryptionError": {
+    "message": "Entschlüsselungsfehler"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden konnte folgende(n) Tresor-Eintrag/Einträge nicht entschlüsseln."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Kontaktiere das Kundenerfolgsteam",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "um zusätzlichen Datenverlust zu vermeiden.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "\"Benutzer verwalten\" muss zusammen mit der \"Kontowiederherstellung verwalten\"-Berechtigung erteilt werden"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Anfrage genehmigen"
   },
+  "deviceApproved": {
+    "message": "\"Gerät\" genehmigt"
+  },
+  "deviceRemoved": {
+    "message": "\"Gerät\" entfernt"
+  },
+  "removeDevice": {
+    "message": "\"Gerät\" entfernen"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Möchtest du das \"Gerät\" wirklich entfernen?"
+  },
   "noDeviceRequests": {
     "message": "Keine Geräteanfragen"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Mitglieder entfernen"
   },
+  "devices": {
+    "message": "\"Geräte\""
+  },
+  "deviceListDescription": {
+    "message": "Dein Konto wurde bei jedem der folgenden \"Geräte\" eingeloggt. Wenn du ein \"Gerät\" nicht wiedererkennst, dann entferne es jetzt."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Dein Konto wurde bei jedem der folgenden \"Geräte\" eingeloggt."
+  },
   "claimedDomains": {
     "message": "Beanspruchte Domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organisations-Abonnement neu gestartet"
+  },
+  "restartSubscription": {
+    "message": "Abonnement neu starten"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Kontaktiere $PROVIDER$ für Hilfe.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/el/messages.json b/apps/web/src/locales/el/messages.json
index 42d24fae72..adfb86665a 100644
--- a/apps/web/src/locales/el/messages.json
+++ b/apps/web/src/locales/el/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Επαληθεύστε την ταυτότητά σας"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Η σύνδεση ξεκίνησε"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Παρακαλούμε συνδεθείτε ξανά."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Παρακαλούμε συνδεθείτε ξανά. Εάν χρησιμοποιείτε άλλες εφαρμογές Bitwarden, αποσυνδεθείτε και επιστρέψτε σε αυτές επίσης."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "Αυτός ο χρήστης χρησιμοποιεί τρόπο σύνδεσης δύο βημάτων για να προστατεύσει το λογαριασμό του."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Συσκευή"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Δημιουργία λογαριασμού στο"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Σφάλμα"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Έγκριση αιτήματος"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/en_GB/messages.json b/apps/web/src/locales/en_GB/messages.json
index f37aa8150c..a2002039ab 100644
--- a/apps/web/src/locales/en_GB/messages.json
+++ b/apps/web/src/locales/en_GB/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Please log back in."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Please log back in. If you are using other Bitwarden applications, log out and back in to those as well."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "This user is using two-step login to protect their account."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Device"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognise a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organisation subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/en_IN/messages.json b/apps/web/src/locales/en_IN/messages.json
index ec67bb192c..2564812802 100644
--- a/apps/web/src/locales/en_IN/messages.json
+++ b/apps/web/src/locales/en_IN/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Please log back in."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Please log back in. If you are using other Bitwarden applications, log out and back in to those as well."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "This user is using two-step login to protect their account."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Device"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognise a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organisation subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/eo/messages.json b/apps/web/src/locales/eo/messages.json
index 0170c225c0..21eba5a4a9 100644
--- a/apps/web/src/locales/eo/messages.json
+++ b/apps/web/src/locales/eo/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Bonvolu saluti refoje."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Bonvolu saluti refoje. Se vi uzas aliajn programojn de Bitwarden, adiaŭu kaj ankaŭ salutu ilin."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "Ĉi tiu uzanto uzas du-paŝan ensaluton por protekti sian konton."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Aparato"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Eraro"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/es/messages.json b/apps/web/src/locales/es/messages.json
index 3c3d7bb135..1393fe59b2 100644
--- a/apps/web/src/locales/es/messages.json
+++ b/apps/web/src/locales/es/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verifica tu identidad"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Inicio de sesión en proceso"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Por favor, vuelve a acceder."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Por favor, vuelve a acceder. Si estás utilizando otras aplicaciones de Bitwarden, cierra sesión y vuelva a acceder en ellas también."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "Este usuario está usando autenticación de dos pasos para proteger su cuenta."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Dispositivo"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creando una cuenta en"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "El permiso \"gestionar usuarios\" también debe ser otorgado junto con el permiso \"gestionar cuenta\""
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Aprobar solicitud"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No hay solicitudes de dispositivo"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/et/messages.json b/apps/web/src/locales/et/messages.json
index 700c748add..9122e4b877 100644
--- a/apps/web/src/locales/et/messages.json
+++ b/apps/web/src/locales/et/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Kinnitage oma Identiteet"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Sisselogimine käivitatud"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Palun logi uuesti sisse."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Palun logi uuesti sisse. Kui kasutad teisi Bitwardeni rakendusi, pead ka nendes uuesti sisse logima."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "Sellel kasutajal on kaheastmeline kinnitamine sisse lülitatud."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Seade"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Konto loomise asukoht"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Viga"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/eu/messages.json b/apps/web/src/locales/eu/messages.json
index 4c7719ada1..576d8207aa 100644
--- a/apps/web/src/locales/eu/messages.json
+++ b/apps/web/src/locales/eu/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Saioa hastea martxan da"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Mesedez, hasi saioa berriro."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Mesedez, hasi saioa berriro. Bitwardenen beste aplikazioren bat erabiltzen ari bazara, itxi saioa eta hasi saioa berriro aplikazio horretan ere."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "Erabiltzaile hau bi urratseko saio hasiera erabiltzen ari da bere kontua babesteko."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Gailua"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Akatsa"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/fa/messages.json b/apps/web/src/locales/fa/messages.json
index fe0ba063a7..589a019973 100644
--- a/apps/web/src/locales/fa/messages.json
+++ b/apps/web/src/locales/fa/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "ورود به سیستم آغاز شد"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "لطفاً دوباره وارد شوید."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "لطفاً دوباره وارد شوید. اگر از سایر برنامه‌های Bitwarden استفاده می‌کنید، از سیستم خارج شوید و دوباره به آن‌ها وارد شوید."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "این کاربر از ورود دو مرحله ای برای محافظت از حساب خود استفاده می‌کند."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "دستگاه"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "خطا"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "مدیر کاربران همچنین باید مجوز مدیریت بازیابی حساب کاربری را داشته باشد"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "درخواست تأیید"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "بدون درخواست دستگاه"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/fi/messages.json b/apps/web/src/locales/fi/messages.json
index 234cfb0ee3..b6825bed16 100644
--- a/apps/web/src/locales/fi/messages.json
+++ b/apps/web/src/locales/fi/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Vahvista henkilöllisyytesi"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Kirjautuminen aloitettu"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Kirjaudu sisään uudelleen."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Kirjaudu uudelleen sisään. Jos käytät muita Bitwarden-sovelluksia, kirjaudu myös niihin uudelleen."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "Käyttäjä on suojannut tilinsä kaksivaiheisella kirjautumisella."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Laite"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Luodaan tili palvelimelle"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Virhe"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "\"Tilien palautusavun hallinta\" -oikeuden kanssa on myönnettävä myös \"Käyttäjien hallinta\" -oikeus."
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Hyväksy pyyntö"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "Laitepyyntöjä ei ole"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Poista jäsenet"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/fil/messages.json b/apps/web/src/locales/fil/messages.json
index f5a9b07898..9dcacdb44f 100644
--- a/apps/web/src/locales/fil/messages.json
+++ b/apps/web/src/locales/fil/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Sinimulan ang pag-log in"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Mangyaring mag-log in ulit."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Mangyaring mag-log in ulit. Kung gumagamit ka ng iba pang mga aplikasyon pang-Bitwarden, mag-log out at log in rin ulit sa mga iyon."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "Gumagamit ang user na ito ng dalawang hakbang na pag login upang maprotektahan ang kanilang account."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Device"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Mali"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/fr/messages.json b/apps/web/src/locales/fr/messages.json
index e6c402293f..933bfd8759 100644
--- a/apps/web/src/locales/fr/messages.json
+++ b/apps/web/src/locales/fr/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Vérifiez votre Identité"
   },
+  "whatIsADevice": {
+    "message": "Qu'est-ce qu'un appareil ?"
+  },
+  "aDeviceIs": {
+    "message": "Un appareil est une installation unique de l'application Bitwarden où vous vous êtes connecté. Réinstaller, effacer les données de l'application ou effacer vos cookies peut entraîner l'apparition d'un appareil plusieurs fois."
+  },
   "logInInitiated": {
     "message": "Connexion initiée"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Veuillez vous reconnecter."
   },
+  "currentSession": {
+    "message": "Session en cours"
+  },
+  "requestPending": {
+    "message": "Demande en attente"
+  },
   "logBackInOthersToo": {
     "message": "Veuillez vous reconnecter. Si vous utilisez d'autres applications Bitwarden, déconnectez-vous et reconnectez-vous également de celles-ci."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "Cet utilisateur utilise l'authentification à deux facteurs pour protéger son compte."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Appareil"
   },
+  "loginStatus": {
+    "message": "Statut de connexion"
+  },
+  "firstLogin": {
+    "message": "Première connexion"
+  },
+  "trusted": {
+    "message": "Approuvé"
+  },
   "creatingAccountOn": {
     "message": "Création du compte sur"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Erreur"
   },
+  "decryptionError": {
+    "message": "Erreur de déchiffrement"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden n'a pas pu déchiffrer le(s) élément(s) du coffre listé(s) ci-dessous."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contacter Customer Success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "pour éviter des pertes de données supplémentaires.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Gérer les utilisateurs exige également d'avoir l'autorisation de gérer la restauration de compte"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approuver la demande"
   },
+  "deviceApproved": {
+    "message": "Appareil approuvé"
+  },
+  "deviceRemoved": {
+    "message": "Appareil supprimé"
+  },
+  "removeDevice": {
+    "message": "Supprimer l'appareil"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Êtes-vous sûr de vouloir supprimer cet appareil ?"
+  },
   "noDeviceRequests": {
     "message": "Aucune demande de l'appareil"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Retirer des membres"
   },
+  "devices": {
+    "message": "Appareils"
+  },
+  "deviceListDescription": {
+    "message": "Votre compte a été connecté à chacun des appareils ci-dessous. Si vous ne reconnaissez pas un appareil, supprimez-le maintenant."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Votre compte a été connecté à chacun des appareils ci-dessous."
+  },
   "claimedDomains": {
     "message": "Domaines réclamés"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "L'abonnement à l'organisation a été redémarré"
+  },
+  "restartSubscription": {
+    "message": "Redémarrez votre abonnement"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contactez $PROVIDER$ pour obtenir de l'aide.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/gl/messages.json b/apps/web/src/locales/gl/messages.json
index 986350b063..3e2c116106 100644
--- a/apps/web/src/locales/gl/messages.json
+++ b/apps/web/src/locales/gl/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Please log back in."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Please log back in. If you are using other Bitwarden applications log out and back in to those as well."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "This user is using two-step login to protect their account."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Device"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/he/messages.json b/apps/web/src/locales/he/messages.json
index 9c4ef53072..6db8255c46 100644
--- a/apps/web/src/locales/he/messages.json
+++ b/apps/web/src/locales/he/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "אנא התחבר שוב."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "אנא התחבר שוב. אם אתה משתמש באפליקציות נוספות של Bitwarden, סגור את החיבור והתחבר שוב גם באפליקציות הללו."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "משתמש זה הפעיל כניסה דו שלבית כדי להגן על חשבונו."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "מכשיר"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/hi/messages.json b/apps/web/src/locales/hi/messages.json
index 82a0c12a39..25f7bc6e6f 100644
--- a/apps/web/src/locales/hi/messages.json
+++ b/apps/web/src/locales/hi/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Please log back in."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Please log back in. If you are using other Bitwarden applications log out and back in to those as well."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "This user is using two-step login to protect their account."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Device"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/hr/messages.json b/apps/web/src/locales/hr/messages.json
index 7b77ae9d58..610b63d68c 100644
--- a/apps/web/src/locales/hr/messages.json
+++ b/apps/web/src/locales/hr/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Potvrdi svoj identitet"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Pokrenuta prijava"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Molimo, ponovno se prijavi."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Molimo, ponovno se prijavi. Ako koristiš druge aplikacije Bitwarden i u njima napravi odjavu/prijavu."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "Ovaj korisnik upotrebljava prijavu u dva koraka za zaštitu svog računa."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Uređaj"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Stvaranje računa na"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Greška"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Upravljanje korisnicima mora također biti uključeno s dozvolom za Upravljanje ponovnim postavljanjem lozinke"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Odobri zahtjev"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "Nema zahtjeva na čekanju"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Ukloni članove"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Potvrđene domene"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/hu/messages.json b/apps/web/src/locales/hu/messages.json
index ecd7db04ca..163355b20d 100644
--- a/apps/web/src/locales/hu/messages.json
+++ b/apps/web/src/locales/hu/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Személyazonosság ellenőrzése"
   },
+  "whatIsADevice": {
+    "message": "Mi az eszköz?"
+  },
+  "aDeviceIs": {
+    "message": "Az eszköz a Bitwarden alkalmazás egyedi telepítése, amelyre bejelentkeztünk. Az alkalmazás adatok újratelepítése, törlése vagy a sütik törlése azt eredményezheti, hogy egy eszköz többször is megjelenhet."
+  },
   "logInInitiated": {
     "message": "A bejelentkezés elindításra került."
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Ismételten be kell jelentkezni."
   },
+  "currentSession": {
+    "message": "Jelenlegi munkamenet"
+  },
+  "requestPending": {
+    "message": "Függőben lévő kérelem"
+  },
   "logBackInOthersToo": {
     "message": "Ismételten be kell jelentkezni. Ha másik Bitwarden alkalmazásokat használunk, ott is jelentkezzünk ki és ismételten be."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "1 meghívó maradt."
+  },
   "userUsingTwoStep": {
     "message": "Ez a felhasználó kétlépcsős bejelentkezést használ fiókja védelmére."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Eszköz"
   },
+  "loginStatus": {
+    "message": "Bejelentkezési állapot"
+  },
+  "firstLogin": {
+    "message": "Első bejelentkezés"
+  },
+  "trusted": {
+    "message": "Megbízható"
+  },
   "creatingAccountOn": {
     "message": "Fiók létrehozása:"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Hiba"
   },
+  "decryptionError": {
+    "message": "Visszafejtési hiba"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "A Bitwarden nem tudta visszafejteni az alább felsorolt ​​széf elemeket."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Ügyfélszolgálat elérése",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "további adatvesztés elkerülése érdekében.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "A felhasználók kezelését engedélyezni kell a Jelszó visszaállításának kezelése jogosultsággal is."
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Kérés megerősítése"
   },
+  "deviceApproved": {
+    "message": "Az eszköz jóváhagyásra került."
+  },
+  "deviceRemoved": {
+    "message": "Az eszköz eltávolításra került."
+  },
+  "removeDevice": {
+    "message": "Eszköz eltávolítása"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Biztos eltávolításra kerüljön ez az eszköz?"
+  },
   "noDeviceRequests": {
     "message": "Nincs eszköz kérés"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Tagok eltávolítása"
   },
+  "devices": {
+    "message": "Eszközök"
+  },
+  "deviceListDescription": {
+    "message": "A fiók az alábbi eszközök mindegyikére bejelentkezett. Ha nem ismerünk fel egy eszközt, távolítsuk el most."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "A fiók az alábbi eszközök mindegyikére bejelentkezett."
+  },
   "claimedDomains": {
     "message": "Igényelt tartományok"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "A szervezeti feliratkozás újraindult."
+  },
+  "restartSubscription": {
+    "message": "Feliratkozás újra indítása"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Segítséget $PROVIDER$ szolgáltatótól kaphatunk.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/id/messages.json b/apps/web/src/locales/id/messages.json
index 7517cac5ae..3b861fb16d 100644
--- a/apps/web/src/locales/id/messages.json
+++ b/apps/web/src/locales/id/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Harap masuk kembali."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Harap masuk kembali. Jika Anda menggunakan aplikasi Bitwarden lain, keluarlah dan masuk kembali ke sana juga."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "Pengguna ini menggunakan proses masuk dua langkah untuk melindungi akun mereka."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Perangkat"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Galat"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/it/messages.json b/apps/web/src/locales/it/messages.json
index 0154a3c8c7..8ce01a4737 100644
--- a/apps/web/src/locales/it/messages.json
+++ b/apps/web/src/locales/it/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verifica la tua identità"
   },
+  "whatIsADevice": {
+    "message": "Cos'è un dispositivo?"
+  },
+  "aDeviceIs": {
+    "message": "Un dispositivo è un'installazione unica dell'app Bitwarden con la quale hai effettuato l'accesso. Reinstallazione, eliminazione dei dati dell'app o cancellazione dei cookie potrebbero causare la comparsa di un dispositivo più volte."
+  },
   "logInInitiated": {
     "message": "Login avviato"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Accedi di nuovo."
   },
+  "currentSession": {
+    "message": "Sessione attuale"
+  },
+  "requestPending": {
+    "message": "Richiesta in attesa"
+  },
   "logBackInOthersToo": {
     "message": "Accedi di nuovo. Se stai usando Bitwarden su altre app, esci e rientra anche in quelle."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "Hai ancora 1 invito."
+  },
   "userUsingTwoStep": {
     "message": "Questo utente usa la verifica in due passaggi per proteggere il suo account."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Dispositivo"
   },
+  "loginStatus": {
+    "message": "Stato accesso"
+  },
+  "firstLogin": {
+    "message": "Primo accesso"
+  },
+  "trusted": {
+    "message": "Di fiducia"
+  },
   "creatingAccountOn": {
     "message": "Creazione account su"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Errore"
   },
+  "decryptionError": {
+    "message": "Errore di decifrazione"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden non può decifrare gli elementi elencati di seguito."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contatta il cliente correttamente",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "per evitare ulteriori perdite di dati.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Gestisci utenti deve essere abilitato con il permesso di gestire il ripristino delle password"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approva richiesta"
   },
+  "deviceApproved": {
+    "message": "Dispositivo approvato"
+  },
+  "deviceRemoved": {
+    "message": "Dispositivo rimosso"
+  },
+  "removeDevice": {
+    "message": "Rimuovi dispositivo"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Sei sicuro di voler rimuovere il dispositivo?"
+  },
   "noDeviceRequests": {
     "message": "Nessuna richiesta da approvare"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Dispositivi"
+  },
+  "deviceListDescription": {
+    "message": "Il tuo account è stato connesso a ciascuno dei dispositivi qui sotto. Se non riconosci un dispositivo, rimuovilo ora."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Il tuo account è stato connesso a ciascuno dei dispositivi qui sotto."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Abbonamento organizzazione riavviato"
+  },
+  "restartSubscription": {
+    "message": "Riavvia il tuo abbonamento"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contatta $PROVIDER$ per assistenza.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/ja/messages.json b/apps/web/src/locales/ja/messages.json
index 6b3b6f13b4..44213d143a 100644
--- a/apps/web/src/locales/ja/messages.json
+++ b/apps/web/src/locales/ja/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "本人確認"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "ログイン開始"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "ログインし直してください"
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "ログインし直してください。他のBitwardenのアプリを使用している場合、同様にログインし直してください。"
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "このユーザーはアカウントを保護するため二段階認証を利用しています。"
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "デバイス"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "アカウント作成："
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "エラー"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "ユーザーを管理するには、アカウントのリカバリ管理権限を付与する必要があります。"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "リクエストを承認"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "デバイスリクエストはありません"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "メンバーを削除"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/ka/messages.json b/apps/web/src/locales/ka/messages.json
index cc4dc22210..610bc0f6d8 100644
--- a/apps/web/src/locales/ka/messages.json
+++ b/apps/web/src/locales/ka/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "ავტორიზაცია დაწყებულია"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Please log back in."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Please log back in. If you are using other Bitwarden applications log out and back in to those as well."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "This user is using two-step login to protect their account."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Device"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/km/messages.json b/apps/web/src/locales/km/messages.json
index 36ab005070..e6cce3405d 100644
--- a/apps/web/src/locales/km/messages.json
+++ b/apps/web/src/locales/km/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Please log back in."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Please log back in. If you are using other Bitwarden applications log out and back in to those as well."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "This user is using two-step login to protect their account."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Device"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/kn/messages.json b/apps/web/src/locales/kn/messages.json
index e1fd4cc9ac..215bde966a 100644
--- a/apps/web/src/locales/kn/messages.json
+++ b/apps/web/src/locales/kn/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "ದಯವಿಟ್ಟು ಮತ್ತೆ ಲಾಗ್ ಇನ್ ಮಾಡಿ."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "ದಯವಿಟ್ಟು ಮತ್ತೆ ಲಾಗ್ ಇನ್ ಮಾಡಿ. ನೀವು ಇತರ ಬಿಟ್‌ವಾರ್ಡೆನ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಬಳಸುತ್ತಿದ್ದರೆ ಲಾಗ್ಔಟ್ ಮಾಡಿ ಮತ್ತು ಅವುಗಳಿಗೆ ಹಿಂತಿರುಗಿ."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "ಈ ಬಳಕೆದಾರರು ತಮ್ಮ ಖಾತೆಯನ್ನು ರಕ್ಷಿಸಲು ಎರಡು-ಹಂತದ ಲಾಗಿನ್ ಅನ್ನು ಬಳಸುತ್ತಿದ್ದಾರೆ."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "ಡಿವೈಸ್"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "ದೋಷ"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/ko/messages.json b/apps/web/src/locales/ko/messages.json
index 7966191f53..0cd1302ea2 100644
--- a/apps/web/src/locales/ko/messages.json
+++ b/apps/web/src/locales/ko/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "다시 로그인해 주세요."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "다시 로그인해 주세요. 다른 Bitwarden 앱을 사용 중인 경우 해당 앱에서도 다시 로그인해야 합니다."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "이 사용자는 계정을 보호하기 위해 2단계 로그인을 사용하고 있습니다."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "기기"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "오류"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/lv/messages.json b/apps/web/src/locales/lv/messages.json
index 0b830e6dc9..51ca6a0f79 100644
--- a/apps/web/src/locales/lv/messages.json
+++ b/apps/web/src/locales/lv/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Jāapliecina sava identitāte"
   },
+  "whatIsADevice": {
+    "message": "Kas ir ierīce?"
+  },
+  "aDeviceIs": {
+    "message": "Ierīce ir atsevišķa uzstādīta Bitwarde lietotne, kurā ir veikta pieteikšanās. Atkārtota uzstādīšana, lietotnes datu vai sīkdatņu notīrīšana var beigties ar ierīces vairākkārtīgu parādīšanos."
+  },
   "logInInitiated": {
     "message": "Uzsākta pieteikšanās"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Lūgums pieteikties atkārtoti."
   },
+  "currentSession": {
+    "message": "Pašreizējā sesija"
+  },
+  "requestPending": {
+    "message": "Pieprasījums ir apstrādē"
+  },
   "logBackInOthersToo": {
     "message": "Lūgums pieteikties atkārtoti. Ja tiek izmantotas citas Bitwarden lietotnes, ir nepieciešams atteikties un atkārtoti pieteikties arī tajās."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "Tev ir atlicis 1 uzaicinājums."
+  },
   "userUsingTwoStep": {
     "message": "Šis lietotājs izmanto divpakāpju pieteikšanos, lai aizsargātu savu kontu."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Ierīce"
   },
+  "loginStatus": {
+    "message": "Pieteikšanās stāvoklis"
+  },
+  "firstLogin": {
+    "message": "Pirmā pieteikšanās"
+  },
+  "trusted": {
+    "message": "Uzticama"
+  },
   "creatingAccountOn": {
     "message": "Tiek veidots konts"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Kļūda"
   },
+  "decryptionError": {
+    "message": "Atšifrēšanas kļūda"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden nevarēja atšifrēt zemāk uzskaitītos glabātavas vienumus."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Jāsazinās ar klientu atbalstu,",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "lai izvairītos no papildu datu zaudējumiem.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Lietotāju pārvaldīšanai ir jābūt iespējotai arī ar konta atkopšanas pārvaldīšanas atļauju"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Apstiprināt pieprasījumu"
   },
+  "deviceApproved": {
+    "message": "Ierīce apstiprināta"
+  },
+  "deviceRemoved": {
+    "message": "Ierīce noņemta"
+  },
+  "removeDevice": {
+    "message": "Noņemt ierīci"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Vai tiešām noņemt šo ierīci?"
+  },
   "noDeviceRequests": {
     "message": "Nav ierīču pieprasījumu"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Noņemt dalībniekus"
   },
+  "devices": {
+    "message": "Ierīces"
+  },
+  "deviceListDescription": {
+    "message": "Kontā ir notikusi pieteikšanās katrā no zemāk uzskaitītajām ierīcēm. Ja kāda no tām nav atpazīstama, tā ir uzreiz jānoņem."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Ar kontu ir veikta pieteikšanās katrā no zemāk uzskaitītajām ierīcēm."
+  },
   "claimedDomains": {
     "message": "Pieteiktie domēni"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Apvienības abonements atsākts"
+  },
+  "restartSubscription": {
+    "message": "Atsākt savu abonementu"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Jāsazinās ar $PROVIDER$, lai iegūtu palīdzību.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/ml/messages.json b/apps/web/src/locales/ml/messages.json
index c6f9aa8d85..a6eb0e474f 100644
--- a/apps/web/src/locales/ml/messages.json
+++ b/apps/web/src/locales/ml/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "ദയവായി തിരികെ പ്രവേശിക്കുക."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Please log back in. If you are using other Bitwarden applications log out and back in to those as well."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "ഈ ഉപയോക്താവ് അവരുടെ അക്കൗണ്ട് രണ്ട്-പ്രവേശനം ഉപയോഗിച്ച് സുരക്ഷിതമാക്കിയിരിക്കുന്നു."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "ഉപകരണം"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/mr/messages.json b/apps/web/src/locales/mr/messages.json
index 36ab005070..e6cce3405d 100644
--- a/apps/web/src/locales/mr/messages.json
+++ b/apps/web/src/locales/mr/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Please log back in."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Please log back in. If you are using other Bitwarden applications log out and back in to those as well."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "This user is using two-step login to protect their account."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Device"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/my/messages.json b/apps/web/src/locales/my/messages.json
index 36ab005070..e6cce3405d 100644
--- a/apps/web/src/locales/my/messages.json
+++ b/apps/web/src/locales/my/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Please log back in."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Please log back in. If you are using other Bitwarden applications log out and back in to those as well."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "This user is using two-step login to protect their account."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Device"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/nb/messages.json b/apps/web/src/locales/nb/messages.json
index af26fc4df9..da80546c9a 100644
--- a/apps/web/src/locales/nb/messages.json
+++ b/apps/web/src/locales/nb/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Pålogging startet"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Vennligst logg på igjen."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Vennligst logg inn på nytt. Dersom du bruker andre Bitwarden-applikasjoner logg av og på på dem også."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "Denne brukeren bruker 2-trinnsinnlogging til å beskytte kontoen sin."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Enhet"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Feil"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/ne/messages.json b/apps/web/src/locales/ne/messages.json
index e51fb3ced6..7ebca5938e 100644
--- a/apps/web/src/locales/ne/messages.json
+++ b/apps/web/src/locales/ne/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Please log back in."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Please log back in. If you are using other Bitwarden applications log out and back in to those as well."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "This user is using two-step login to protect their account."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Device"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/nl/messages.json b/apps/web/src/locales/nl/messages.json
index cd72a94251..b38e6f4c3c 100644
--- a/apps/web/src/locales/nl/messages.json
+++ b/apps/web/src/locales/nl/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Controleer je identiteit"
   },
+  "whatIsADevice": {
+    "message": "Wat is een apparaat?"
+  },
+  "aDeviceIs": {
+    "message": "Een apparaat is een unieke installatie van de Bitwarden-app waar je bent ingelogd. Het opnieuw installeren, verwijderen van app-gegevens of het wissen van uw cookies kan zorgen voor het meerdere keren weergeven van dat apparaat."
+  },
   "logInInitiated": {
     "message": "Inloggen gestart"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Log opnieuw in."
   },
+  "currentSession": {
+    "message": "Huidige sessie"
+  },
+  "requestPending": {
+    "message": "Verzoek in behandeling"
+  },
   "logBackInOthersToo": {
     "message": "Svp opnieuw inloggen. Als je andere Bitwarden-applicaties gebruikt, dan moet je daar ook uit- en inloggen."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "Je hebt 1 uitnodiging over."
+  },
   "userUsingTwoStep": {
     "message": "Het account van deze gebruiker is beschermd met tweestapsaanmelding."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Apparaat"
   },
+  "loginStatus": {
+    "message": "Loginstatus"
+  },
+  "firstLogin": {
+    "message": "Eerst inloggen"
+  },
+  "trusted": {
+    "message": "Vertrouwd"
+  },
   "creatingAccountOn": {
     "message": "Account maken bij"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Fout"
   },
+  "decryptionError": {
+    "message": "Ontsleutelingsfout"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden kon de onderstaande kluisitem(s) niet ontsleutelen."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Neem contact op met de klantenservice",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "om extra dataverlies te voorkomen.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Gebruikers beheren moet je ook accountherstel beheren toekennen"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Aanvraag goedkeuren"
   },
+  "deviceApproved": {
+    "message": "Apparaat goedgekeurd"
+  },
+  "deviceRemoved": {
+    "message": "Apparaat verwijderd"
+  },
+  "removeDevice": {
+    "message": "Apparaat verwijderen"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Weet je zeker dat je dit apparaat wilt verwijderen?"
+  },
   "noDeviceRequests": {
     "message": "Geen apparaatverzoeken"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Leden verwijderen"
   },
+  "devices": {
+    "message": "Apparaten"
+  },
+  "deviceListDescription": {
+    "message": "Je account is op elk van de onderstaande apparaten aangemeld. Als je een apparaat niet herkent, verwijder het nu."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Je account is op elk van de onderstaande apparaten aangemeld."
+  },
   "claimedDomains": {
     "message": "Geverifieerde domeinen"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organisatieabonnement hervat"
+  },
+  "restartSubscription": {
+    "message": "Abonnement hervatten"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Neem contact op met $PROVIDER$ voor hulp.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/nn/messages.json b/apps/web/src/locales/nn/messages.json
index 0e3c134ba4..cb6d070485 100644
--- a/apps/web/src/locales/nn/messages.json
+++ b/apps/web/src/locales/nn/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Please log back in."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Please log back in. If you are using other Bitwarden applications log out and back in to those as well."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "This user is using two-step login to protect their account."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Eining"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/or/messages.json b/apps/web/src/locales/or/messages.json
index 36ab005070..e6cce3405d 100644
--- a/apps/web/src/locales/or/messages.json
+++ b/apps/web/src/locales/or/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Please log back in."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Please log back in. If you are using other Bitwarden applications log out and back in to those as well."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "This user is using two-step login to protect their account."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Device"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/pl/messages.json b/apps/web/src/locales/pl/messages.json
index 58e4de9531..d063fa818a 100644
--- a/apps/web/src/locales/pl/messages.json
+++ b/apps/web/src/locales/pl/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Zweryfikuj swoją tożsamość"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Logowanie rozpoczęte"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Zaloguj się ponownie."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Zaloguj się ponownie. Jeśli używasz innych aplikacji Bitwarden, wyloguj się i zaloguj ponownie również w nich."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "Ten użytkownik korzysta z logowania dwustopniowego, aby chronić swoje konto."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Urządzenie"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Tworzenie konta na"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Błąd"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Zarządzanie użytkownikami musi być również przyznane z uprawnieniem do zarządzania odzyskiwaniem kont"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Zatwierdź prośbę"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "Brak urządzeń do zatwierdzenia"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/pt_BR/messages.json b/apps/web/src/locales/pt_BR/messages.json
index 463b7f5e06..b911d5b273 100644
--- a/apps/web/src/locales/pt_BR/messages.json
+++ b/apps/web/src/locales/pt_BR/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verifique sua identidade"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Login iniciado"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Por favor, reinicie a sessão."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Por favor, reinicie a sessão. Se estiver usando outros aplicativos do Bitwarden, encerre a sessão e reinicie também."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "Este usuário está usando o login em duas etapas para proteger a sua conta."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Dispositivo"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Criando conta em"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Erro"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Gerenciar usuários também devem ser concedidos com a permissão de gerenciar a recuperação de contas"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Aprovar solicitação"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "Nenhum pedido de dispositivo"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remover membro?"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/pt_PT/messages.json b/apps/web/src/locales/pt_PT/messages.json
index 57a2eee7cf..637c65f644 100644
--- a/apps/web/src/locales/pt_PT/messages.json
+++ b/apps/web/src/locales/pt_PT/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verifique a sua identidade"
   },
+  "whatIsADevice": {
+    "message": "O que é um dispositivo?"
+  },
+  "aDeviceIs": {
+    "message": "Um dispositivo é uma instalação única da app Bitwarden onde o utilizador iniciou sessão. Reinstalar, limpar os dados da aplicação ou limpar os seus cookies pode fazer com que um dispositivo apareça várias vezes."
+  },
   "logInInitiated": {
     "message": "A preparar o início de sessão"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Por favor, inicie sessão novamente."
   },
+  "currentSession": {
+    "message": "Sessão atual"
+  },
+  "requestPending": {
+    "message": "Pedido pendente"
+  },
   "logBackInOthersToo": {
     "message": "Por favor, inicie sessão novamente. Se estiver a utilizar outras aplicações Bitwarden, termine a sessão e volte a iniciar sessão nessas também."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "Ainda tem 1 convite."
+  },
   "userUsingTwoStep": {
     "message": "Este utilizador está a utilizar a verificação de dois passos para proteger a sua conta."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Dispositivo"
   },
+  "loginStatus": {
+    "message": "Estado do início de sessão"
+  },
+  "firstLogin": {
+    "message": "Primeiro início de sessão"
+  },
+  "trusted": {
+    "message": "Confiável"
+  },
   "creatingAccountOn": {
     "message": "A criar conta em"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Erro"
   },
+  "decryptionError": {
+    "message": "Erro de desencriptação"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "O Bitwarden não conseguiu desencriptar o(s) item(ns) do cofre listado(s) abaixo."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contacte o serviço de apoio ao cliente",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "para evitar perdas adicionais de dados.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "A permissão para gerir utilizadores deve também ser concedida com a permissão para gerir a recuperação da conta"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Aprovar pedido"
   },
+  "deviceApproved": {
+    "message": "Dispositivo aprovado"
+  },
+  "deviceRemoved": {
+    "message": "Dispositivo removido"
+  },
+  "removeDevice": {
+    "message": "Remover dispositivo"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Tem a certeza de que pretende remover este dispositivo?"
+  },
   "noDeviceRequests": {
     "message": "Sem pedidos de dispositivos"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remover membros"
   },
+  "devices": {
+    "message": "Dispositivos"
+  },
+  "deviceListDescription": {
+    "message": "A sua conta foi iniciada em cada um dos dispositivos abaixo. Se não reconhecer um dispositivo, remova-o agora."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Tem sessão iniciada em cada um dos dispositivos abaixo."
+  },
   "claimedDomains": {
     "message": "Domínios reivindicados"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Subscrição da organização reiniciada"
+  },
+  "restartSubscription": {
+    "message": "Reinicie a sua subscrição"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contacte a $PROVIDER$ para obter assistência.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/ro/messages.json b/apps/web/src/locales/ro/messages.json
index 18ff0b2158..42d1368844 100644
--- a/apps/web/src/locales/ro/messages.json
+++ b/apps/web/src/locales/ro/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Autentificare inițiată"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Vă rugăm să vă conectați din nou."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Vă rugăm să vă reconectați. Dacă utilizați și alte aplicații Bitwarden, reconectați-vă la ele de asemenea."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "Acest utilizator folosește conectarea în două etape pentru a-și proteja contul."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Dispozitiv"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Eroare"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/ru/messages.json b/apps/web/src/locales/ru/messages.json
index 89209f2fa5..28386190d1 100644
--- a/apps/web/src/locales/ru/messages.json
+++ b/apps/web/src/locales/ru/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Подтвердите вашу личность"
   },
+  "whatIsADevice": {
+    "message": "Что такое устройство?"
+  },
+  "aDeviceIs": {
+    "message": "Устройство - это уникальная установка приложения Bitwarden, в которой вы авторизовались. Переустановка, очистка данных приложения или очистка файлов cookie может привести к тому, что устройство будет отображаться несколько раз."
+  },
   "logInInitiated": {
     "message": "Вход инициирован"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Пожалуйста, войдите снова."
   },
+  "currentSession": {
+    "message": "Текущая сессия"
+  },
+  "requestPending": {
+    "message": "Запрос в ожидании"
+  },
   "logBackInOthersToo": {
     "message": "Пожалуйста, войдите снова. Если вы используете другие приложения Bitwarden, выполните на них выход и повторный вход."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "У вас осталось 1 приглашение."
+  },
   "userUsingTwoStep": {
     "message": "Этот пользователь использует двухэтапную аутентификацию для защиты своего аккаунта."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Устройство"
   },
+  "loginStatus": {
+    "message": "Статус входа"
+  },
+  "firstLogin": {
+    "message": "Первый вход"
+  },
+  "trusted": {
+    "message": "Доверенный"
+  },
   "creatingAccountOn": {
     "message": "Создание аккаунта"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Ошибка"
   },
+  "decryptionError": {
+    "message": "Ошибка расшифровки"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden не удалось расшифровать элемент(ы) хранилища, перечисленные ниже."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Обратитесь в службу поддержки,",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "чтобы избежать дополнительной потери данных.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Для управления пользователями также необходимо предоставить разрешение на управление восстановлением аккаунта"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Одобрить запрос"
   },
+  "deviceApproved": {
+    "message": "Устройство одобрено"
+  },
+  "deviceRemoved": {
+    "message": "Устройство удалено"
+  },
+  "removeDevice": {
+    "message": "Удалить устройство"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Вы уверены, что хотите удалить это устройство?"
+  },
   "noDeviceRequests": {
     "message": "Нет запросов устройств"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Удалить участников"
   },
+  "devices": {
+    "message": "Устройства"
+  },
+  "deviceListDescription": {
+    "message": "Ваш аккаунт был авторизован на каждом из перечисленных ниже устройств. Если устройство вам не знакомо, удалите его сейчас."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Ваш аккаунт авторизован на перечисленных ниже устройствах."
+  },
   "claimedDomains": {
     "message": "Зарегистрированные домены"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Подписка организации перезапущена"
+  },
+  "restartSubscription": {
+    "message": "Перезапустить подписку"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Обратитесь за помощью к $PROVIDER$.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/si/messages.json b/apps/web/src/locales/si/messages.json
index 0649f83f51..df5803c0fd 100644
--- a/apps/web/src/locales/si/messages.json
+++ b/apps/web/src/locales/si/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Please log back in."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Please log back in. If you are using other Bitwarden applications log out and back in to those as well."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "This user is using two-step login to protect their account."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Device"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/sk/messages.json b/apps/web/src/locales/sk/messages.json
index dbffa25048..d8adb9116e 100644
--- a/apps/web/src/locales/sk/messages.json
+++ b/apps/web/src/locales/sk/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Overte svoju totožnosť"
   },
+  "whatIsADevice": {
+    "message": "Čo je zariadenie?"
+  },
+  "aDeviceIs": {
+    "message": "Zariadenie je jednotlivá inštalácia aplikácie Bitwarden, do ktorej ste sa prihlásili. Preinštalovanie, vymazanie údajov aplikácie alebo vymazanie súborov cookie môže mať za následok, že sa zariadenie objaví viackrát."
+  },
   "logInInitiated": {
     "message": "Iniciované prihlásenie"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Prosím, opäť sa prihláste."
   },
+  "currentSession": {
+    "message": "Aktuálna relácia"
+  },
+  "requestPending": {
+    "message": "Žiadosť čaká na spracovanie"
+  },
   "logBackInOthersToo": {
     "message": "Prosím odhláste sa. Ak používate iné Bitwarden aplikácie, odhláste sa a opäť sa prihláste aj v nich."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "Ostáva vám 1 pozvánka."
+  },
   "userUsingTwoStep": {
     "message": "Tento používateľ používa dvojstupňové overovanie aby si zabezpečil konto."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Zariadenie"
   },
+  "loginStatus": {
+    "message": "Stav prihlásenia"
+  },
+  "firstLogin": {
+    "message": "Prvé prihlásenie"
+  },
+  "trusted": {
+    "message": "Dôveryhodné"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Chyba"
   },
+  "decryptionError": {
+    "message": "Chyba dešifrovania"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden nedokázal dešifrovať nižšie uvedené položky trezoru."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Kontaktujte zákaznícku podporu,",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "aby ste predišli ďalším stratám údajov.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Schváliť žiadosť"
   },
+  "deviceApproved": {
+    "message": "Zariadenie schválené"
+  },
+  "deviceRemoved": {
+    "message": "Zariadenie odstránené"
+  },
+  "removeDevice": {
+    "message": "Odstrániť zariadenie"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Ste si istí, že chcete odstrániť toto zariadenie?"
+  },
   "noDeviceRequests": {
     "message": "Žiadne žiadosti pre zariadenia"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Odstrániť členov"
   },
+  "devices": {
+    "message": "Zariadenia"
+  },
+  "deviceListDescription": {
+    "message": "Vaše konto bolo prihlásené do každého z nižšie uvedených zariadení. Ak niektoré zariadenie nepoznáte, teraz ho odstráňte."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Privlastnené domény"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/sl/messages.json b/apps/web/src/locales/sl/messages.json
index 9a9535aeba..75ad87494f 100644
--- a/apps/web/src/locales/sl/messages.json
+++ b/apps/web/src/locales/sl/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Prijava se je začela"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Prosimo, ponovno se prijavite."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Prosimo, ponovno se prijavite. Če uporabljate druge Bitwarden aplikacije, se odjavite in ponovno prijavite tudi tam."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "This user is using two-step login to protect their account."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Device"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/sr/messages.json b/apps/web/src/locales/sr/messages.json
index e15d6d6665..0f3853331c 100644
--- a/apps/web/src/locales/sr/messages.json
+++ b/apps/web/src/locales/sr/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Потврдите идентитет"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Пријава је покренута"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Молимо да се поново пријавите."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Молимо вас да се поново пријавите. Ако користите друге Bitwarden апликације, одјавите се и вратите се и на њих."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "Овај корисник користи пријаву у два корака за заштиту свог налога."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Уређај"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Креирај налог на"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Грешка"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Корисницима за управљање такође мора бити додељена дозвола за опоравак налога за управљање"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Одобри захтев"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "Нема захтева уређаја"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Уклони чланове"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/sr_CS/messages.json b/apps/web/src/locales/sr_CS/messages.json
index b2cd3a877d..06572d08fe 100644
--- a/apps/web/src/locales/sr_CS/messages.json
+++ b/apps/web/src/locales/sr_CS/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Please log back in."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Please log back in. If you are using other Bitwarden applications log out and back in to those as well."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "This user is using two-step login to protect their account."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Device"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/sv/messages.json b/apps/web/src/locales/sv/messages.json
index 14d7bc4572..f973764363 100644
--- a/apps/web/src/locales/sv/messages.json
+++ b/apps/web/src/locales/sv/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Inloggning påbörjad"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Vänligen logga in igen."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Vänligen logga in igen. Om du använder andra Bitwarden-applikationer, logga ut och in igen i dem också."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "Denna användare använder tvåstegsverifiering för att skydda sitt konto."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Enhet"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Skapa konto på"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Fel"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "Inga enhetsförfrågningar"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/te/messages.json b/apps/web/src/locales/te/messages.json
index 36ab005070..e6cce3405d 100644
--- a/apps/web/src/locales/te/messages.json
+++ b/apps/web/src/locales/te/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Please log back in."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Please log back in. If you are using other Bitwarden applications log out and back in to those as well."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "This user is using two-step login to protect their account."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Device"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/th/messages.json b/apps/web/src/locales/th/messages.json
index c731b9ff87..5f5818581f 100644
--- a/apps/web/src/locales/th/messages.json
+++ b/apps/web/src/locales/th/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Please log back in."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Please log back in. If you are using other Bitwarden applications log out and back in to those as well."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "This user is using two-step login to protect their account."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Device"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/tr/messages.json b/apps/web/src/locales/tr/messages.json
index ba53ebe7dd..97c0d00dec 100644
--- a/apps/web/src/locales/tr/messages.json
+++ b/apps/web/src/locales/tr/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Kimliğinizi doğrulayın"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Giriş başlatıldı"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Lütfen yeniden giriş yapın."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Lütfen yeniden oturum açın. Diğer Bitwarden uygulamalarını kullanıyorsanız onlarda da oturumunuzu kapatıp yeniden açın."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "1 davetiyeniz kaldı."
+  },
   "userUsingTwoStep": {
     "message": "Bu kullanıcı hesabını korumak için iki aşamalı giriş kullanıyor."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Cihaz"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Hesap oluşturuluyor:"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Hata"
   },
+  "decryptionError": {
+    "message": "Şifre çözme sorunu"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "İsteği onayla"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "Cihaz isteği yok"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Hesabınıza aşağıdaki cihazlardan giriş yapıldı."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/uk/messages.json b/apps/web/src/locales/uk/messages.json
index c17befc27c..d8cd927076 100644
--- a/apps/web/src/locales/uk/messages.json
+++ b/apps/web/src/locales/uk/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Підтвердьте свою особу"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Ініційовано вхід"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Повторно виконайте вхід."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Будь ласка, повторно виконайте вхід. Якщо ви користуєтесь іншими програмами Bitwarden, також вийдіть із них, і знову увійдіть."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "Цей користувач використовує двоетапну перевірку для захисту свого облікового запису."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Пристрій"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Створення облікового запису"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Помилка"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Разом із дозволом на керування відновленням облікового запису також необхідно надати дозвіл на керування користувачами"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Схвалити запит"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "Немає запитів з пристрою"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Вилучити учасників"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Заявлені домени"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/vi/messages.json b/apps/web/src/locales/vi/messages.json
index 9f4156014c..ff9f789f6f 100644
--- a/apps/web/src/locales/vi/messages.json
+++ b/apps/web/src/locales/vi/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "Xác minh danh tính của bạn"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "Log in initiated"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "Hãy đăng nhập lại."
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "Vui lòng đăng nhập lại. Nếu bạn đang dùng những ứng dụng Bitwarden khác, vui lòng đăng xuất and đăng nhập lại những ứng dụng đó."
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "This user is using two-step login to protect their account."
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "Thiết bị"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "Error"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "Manage users must also be granted with the manage account recovery permission"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "Approve request"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "No device requests"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/zh_CN/messages.json b/apps/web/src/locales/zh_CN/messages.json
index f293adcf62..ae0b3744ec 100644
--- a/apps/web/src/locales/zh_CN/messages.json
+++ b/apps/web/src/locales/zh_CN/messages.json
@@ -172,7 +172,7 @@
     "message": "登录凭据"
   },
   "personalDetails": {
-    "message": "个人信息"
+    "message": "个人详细信息"
   },
   "identification": {
     "message": "身份"
@@ -181,10 +181,10 @@
     "message": "联系信息"
   },
   "cardDetails": {
-    "message": "支付卡详情"
+    "message": "支付卡详细信息"
   },
   "cardBrandDetails": {
-    "message": "$BRAND$ 详情",
+    "message": "$BRAND$ 详细信息",
     "placeholders": {
       "brand": {
         "content": "$1",
@@ -684,7 +684,7 @@
     "message": "项目"
   },
   "itemDetails": {
-    "message": "项目详情"
+    "message": "项目详细信息"
   },
   "itemName": {
     "message": "项目名称"
@@ -958,13 +958,13 @@
     "message": "您的登录会话已过期。"
   },
   "restartRegistration": {
-    "message": "重新开始注册"
+    "message": "重启注册"
   },
   "expiredLink": {
     "message": "失效链接"
   },
   "pleaseRestartRegistrationOrTryLoggingIn": {
-    "message": "请重新注册或尝试登录。"
+    "message": "请重启注册或尝试登录。"
   },
   "youMayAlreadyHaveAnAccount": {
     "message": "您可能已经有一个账户了"
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "验证您的身份"
   },
+  "whatIsADevice": {
+    "message": "什么是设备？"
+  },
+  "aDeviceIs": {
+    "message": "设备是您登录过的 Bitwarden App 的独立安装。重新安装、清除 App 数据或清除 Cookie，可能会导致设备多次出现。"
+  },
   "logInInitiated": {
     "message": "登录已发起"
   },
@@ -1707,7 +1713,7 @@
     }
   },
   "loggedOutWarning": {
-    "message": "接下来将会注销您当前的会话，要求您重新登录。其他设备上的活动会话可能会继续保持最多一小时。"
+    "message": "继续操作将使您退出当前会话，并要求您重新登录。其他设备上的活动会话可能会继续保持活动状态长达一小时。"
   },
   "emailChanged": {
     "message": "电子邮箱已保存"
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "请重新登录。"
   },
+  "currentSession": {
+    "message": "当前会话"
+  },
+  "requestPending": {
+    "message": "请求待处理"
+  },
   "logBackInOthersToo": {
     "message": "请重新登录。如果您还在使用其他 Bitwarden 应用程序，也请注销并重新登陆。"
   },
@@ -1795,7 +1807,7 @@
     "message": "您是否担心自己的账户在其他设备上登录过？请按照以下步骤取消对之前使用过的所有计算机或设备的授权。如果您以前使用过公共计算机或不小心曾将密码保存在不属于您的设备上，则建议执行此安全步骤。此步骤还将清除所有以前记住的两步登录会话。"
   },
   "deauthorizeSessionsWarning": {
-    "message": "接下来将会注销您当前的会话，并要求您重新登录。如果有设置两步登录，也需要重新认证。其他设备上的活动会话可能会继续保持最多一小时。"
+    "message": "继续操作还将使您退出当前会话，并要求您重新登录。如果有设置两步登录，也需要重新验证。其他设备上的活动会话可能会继续保持活动状态长达一小时。"
   },
   "sessionsDeauthorized": {
     "message": "已取消所有会话授权"
@@ -2141,7 +2153,7 @@
     "message": "前往 bitwarden.com 吗？"
   },
   "twoStepContinueToBitwardenUrlDesc": {
-    "message": "Bitwarden 验证器允许您存储验证器密钥以及为两步验证流程生成 TOTP 代码。在 bitwarden.com 网站上了解更多信息。"
+    "message": "Bitwarden 验证器允许您存储验证器密钥以及为两步验证流程生成 TOTP 代码。访问 bitwarden.com 网站了解更多信息。"
   },
   "twoStepAuthenticatorScanCodeV2": {
     "message": "用您的验证器 App 扫描下面的二维码或输入密钥。"
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "您还剩下 1 个邀请。"
+  },
   "userUsingTwoStep": {
     "message": "此用户正在使用两步登录来保护他们的账户。"
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "设备"
   },
+  "loginStatus": {
+    "message": "登录状态"
+  },
+  "firstLogin": {
+    "message": "首次登录"
+  },
+  "trusted": {
+    "message": "信任"
+  },
   "creatingAccountOn": {
     "message": "创建账户至"
   },
@@ -4819,7 +4843,7 @@
     "message": "先决条件"
   },
   "requireSsoPolicyReq": {
-    "message": "激活此策略前，需先开启「单一组织」企业策略。"
+    "message": "必须先开启「单一组织」企业策略，然后才能激活此策略。"
   },
   "requireSsoPolicyReqError": {
     "message": "单一组织策略未启用。"
@@ -5545,7 +5569,7 @@
     "message": "对于具有主密码的现有账户，需要成员自行注册后，管理员才可以恢复他们的账户。对于新的成员，自动注册后将打开账户恢复功能。"
   },
   "accountRecoverySingleOrgRequirementDesc": {
-    "message": "激活此策略前，需先开启「单一组织」企业策略。"
+    "message": "必须先开启「单一组织」企业策略，然后才能激活此策略。"
   },
   "resetPasswordPolicyAutoEnroll": {
     "message": "自动注册"
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "错误"
   },
+  "decryptionError": {
+    "message": "解密错误"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden 无法解密下列密码库项目。"
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "联系客户成功团队",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "以避免额外的数据丢失。",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "授予「管理账户恢复」权限时，必须同时授予「管理用户」权限"
   },
@@ -5793,10 +5831,10 @@
     "message": "更新主密码"
   },
   "updateMasterPasswordWarning": {
-    "message": "您的主密码最近被您组织的管理员更改过。要访问此密码库，必须立即更新您的主密码。继续操作将使您退出当前会话，要求您重新登录。其他设备上的活动会话可能会继续保持活动状态长达一小时。"
+    "message": "您的主密码最近被您组织的管理员更改过。要访问密码库，必须立即更新您的主密码。继续操作将使您退出当前会话，并要求您重新登录。其他设备上的活动会话可能会继续保持活动状态长达一小时。"
   },
   "masterPasswordInvalidWarning": {
-    "message": "您的主密码不符合此组织的策略要求。要加入此组织，必须立即更新您的主密码。继续操作将使您退出当前会话，要求您重新登录。其他设备上的活动会话可能会继续保持活动状态长达一小时。"
+    "message": "您的主密码不符合此组织的策略要求。要加入此组织，必须立即更新您的主密码。继续操作将使您退出当前会话，并要求您重新登录。其他设备上的活动会话可能会继续保持活动状态长达一小时。"
   },
   "updateWeakMasterPasswordWarning": {
     "message": "您的主密码不符合某一项或多项组织策略要求。要访问密码库，必须立即更新您的主密码。继续操作将使您退出当前会话，并要求您重新登录。其他设备上的活动会话可能会继续保持活动状态长达一小时。"
@@ -6546,7 +6584,7 @@
     }
   },
   "passwordLengthRecommendationHint": {
-    "message": " 使用 $RECOMMENDED$ 或更多个字符生成强大的密码。",
+    "message": " 使用 $RECOMMENDED$ 个或更多字符生成强大的密码。",
     "description": "Appended to `spinboxBoundariesHint` to recommend a length to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -6556,7 +6594,7 @@
     }
   },
   "passphraseNumWordsRecommendationHint": {
-    "message": " 使用 $RECOMMENDED$ 或更多个单词生成强大的密码短语。",
+    "message": " 使用 $RECOMMENDED$ 个或更多单词生成强大的密码短语。",
     "description": "Appended to `spinboxBoundariesHint` to recommend a number of words to the user. This must include any language-specific 'sentence' separator characters (e.g. a space in english).",
     "placeholders": {
       "recommended": {
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "批准请求"
   },
+  "deviceApproved": {
+    "message": "设备已批准"
+  },
+  "deviceRemoved": {
+    "message": "设备已移除"
+  },
+  "removeDevice": {
+    "message": "移除设备"
+  },
+  "removeDeviceConfirmation": {
+    "message": "确定要移除此设备吗？"
+  },
   "noDeviceRequests": {
     "message": "无设备请求"
   },
@@ -8975,7 +9025,7 @@
     }
   },
   "deleteProviderWarningDescription": {
-    "message": "删除 $ID$ 之前，您必须取消链接所有的客户。",
+    "message": "您必须取消链接所有的客户，然后才能删除 $ID$。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "移除成员"
   },
+  "devices": {
+    "message": "设备"
+  },
+  "deviceListDescription": {
+    "message": "您的账户在以下设备上登录过。如果您无法识别某个设备，请立即将其移除。"
+  },
+  "deviceListDescriptionTemp": {
+    "message": "您的账户在以下设备上登录过。"
+  },
   "claimedDomains": {
     "message": "已声明的域名"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "组织订阅已重启"
+  },
+  "restartSubscription": {
+    "message": "重启您的订阅"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "联系 $PROVIDER$ 获取协助。",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }
diff --git a/apps/web/src/locales/zh_TW/messages.json b/apps/web/src/locales/zh_TW/messages.json
index ae60ea3cdb..002d0d55e0 100644
--- a/apps/web/src/locales/zh_TW/messages.json
+++ b/apps/web/src/locales/zh_TW/messages.json
@@ -1128,6 +1128,12 @@
   "verifyIdentity": {
     "message": "核實你的身份"
   },
+  "whatIsADevice": {
+    "message": "What is a device?"
+  },
+  "aDeviceIs": {
+    "message": "A device is a unique installation of the Bitwarden app where you have logged in. Reinstalling, clearing app data, or clearing your cookies could result in a device appearing multiple times."
+  },
   "logInInitiated": {
     "message": "登入已發起"
   },
@@ -1715,6 +1721,12 @@
   "logBackIn": {
     "message": "請重新登入。"
   },
+  "currentSession": {
+    "message": "Current session"
+  },
+  "requestPending": {
+    "message": "Request pending"
+  },
   "logBackInOthersToo": {
     "message": "請重新登入。若您還在使用其他 Bitwarden 應用程式，也請登出後再重新登入。"
   },
@@ -3266,6 +3278,9 @@
       }
     }
   },
+  "inviteSingleEmailDesc": {
+    "message": "You have 1 invite remaining."
+  },
   "userUsingTwoStep": {
     "message": "此使用者正在使用兩步驟登入保護帳戶。"
   },
@@ -3765,6 +3780,15 @@
   "device": {
     "message": "裝置"
   },
+  "loginStatus": {
+    "message": "Login status"
+  },
+  "firstLogin": {
+    "message": "First login"
+  },
+  "trusted": {
+    "message": "Trusted"
+  },
   "creatingAccountOn": {
     "message": "建立帳號於"
   },
@@ -5655,6 +5679,20 @@
   "error": {
     "message": "錯誤"
   },
+  "decryptionError": {
+    "message": "Decryption error"
+  },
+  "couldNotDecryptVaultItemsBelow": {
+    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+  },
+  "contactCSToAvoidDataLossPart1": {
+    "message": "Contact customer success",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
+  "contactCSToAvoidDataLossPart2": {
+    "message": "to avoid additional data loss.",
+    "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
+  },
   "accountRecoveryManageUsers": {
     "message": "管理使用者也必須被授予管理帳戶復原的權限"
   },
@@ -8236,6 +8274,18 @@
   "approveRequest": {
     "message": "核准要求"
   },
+  "deviceApproved": {
+    "message": "Device approved"
+  },
+  "deviceRemoved": {
+    "message": "Device removed"
+  },
+  "removeDevice": {
+    "message": "Remove device"
+  },
+  "removeDeviceConfirmation": {
+    "message": "Are you sure you want to remove this device?"
+  },
   "noDeviceRequests": {
     "message": "沒有裝置要求"
   },
@@ -9935,6 +9985,15 @@
   "removeMembers": {
     "message": "Remove members"
   },
+  "devices": {
+    "message": "Devices"
+  },
+  "deviceListDescription": {
+    "message": "Your account was logged in to each of the devices below. If you do not recognize a device, remove it now."
+  },
+  "deviceListDescriptionTemp": {
+    "message": "Your account was logged in to each of the devices below."
+  },
   "claimedDomains": {
     "message": "Claimed domains"
   },
@@ -10062,5 +10121,20 @@
         "example": "02/14/2024"
       }
     }
+  },
+  "restartOrganizationSubscription": {
+    "message": "Organization subscription restarted"
+  },
+  "restartSubscription": {
+    "message": "Restart your subscription"
+  },
+  "suspendedManagedOrgMessage": {
+    "message": "Contact $PROVIDER$ for assistance.",
+    "placeholders": {
+      "provider": {
+        "content": "$1",
+        "example": "Acme c"
+      }
+    }
   }
 }

From 53618e8f8671009cd1907eeaa6cb7083fab337f1 Mon Sep 17 00:00:00 2001
From: "bw-ghapp[bot]" <178206702+bw-ghapp[bot]@users.noreply.github.com>
Date: Mon, 13 Jan 2025 09:52:18 +0000
Subject: [PATCH 052/150] Autosync the updated translations (#12824)

Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>
---
 apps/desktop/src/locales/af/messages.json    |  6 +++++
 apps/desktop/src/locales/ar/messages.json    |  6 +++++
 apps/desktop/src/locales/az/messages.json    |  6 +++++
 apps/desktop/src/locales/be/messages.json    |  6 +++++
 apps/desktop/src/locales/bg/messages.json    |  6 +++++
 apps/desktop/src/locales/bn/messages.json    |  6 +++++
 apps/desktop/src/locales/bs/messages.json    |  6 +++++
 apps/desktop/src/locales/ca/messages.json    |  6 +++++
 apps/desktop/src/locales/cs/messages.json    |  6 +++++
 apps/desktop/src/locales/cy/messages.json    |  6 +++++
 apps/desktop/src/locales/da/messages.json    |  6 +++++
 apps/desktop/src/locales/de/messages.json    | 26 ++++++++++++--------
 apps/desktop/src/locales/el/messages.json    |  6 +++++
 apps/desktop/src/locales/en_GB/messages.json |  6 +++++
 apps/desktop/src/locales/en_IN/messages.json |  6 +++++
 apps/desktop/src/locales/eo/messages.json    |  6 +++++
 apps/desktop/src/locales/es/messages.json    |  6 +++++
 apps/desktop/src/locales/et/messages.json    |  6 +++++
 apps/desktop/src/locales/eu/messages.json    |  6 +++++
 apps/desktop/src/locales/fa/messages.json    |  6 +++++
 apps/desktop/src/locales/fi/messages.json    |  6 +++++
 apps/desktop/src/locales/fil/messages.json   |  6 +++++
 apps/desktop/src/locales/fr/messages.json    |  6 +++++
 apps/desktop/src/locales/gl/messages.json    |  6 +++++
 apps/desktop/src/locales/he/messages.json    |  6 +++++
 apps/desktop/src/locales/hi/messages.json    |  6 +++++
 apps/desktop/src/locales/hr/messages.json    |  6 +++++
 apps/desktop/src/locales/hu/messages.json    |  6 +++++
 apps/desktop/src/locales/id/messages.json    |  6 +++++
 apps/desktop/src/locales/it/messages.json    |  6 +++++
 apps/desktop/src/locales/ja/messages.json    |  6 +++++
 apps/desktop/src/locales/ka/messages.json    |  6 +++++
 apps/desktop/src/locales/km/messages.json    |  6 +++++
 apps/desktop/src/locales/kn/messages.json    |  6 +++++
 apps/desktop/src/locales/ko/messages.json    |  6 +++++
 apps/desktop/src/locales/lt/messages.json    |  6 +++++
 apps/desktop/src/locales/lv/messages.json    |  6 +++++
 apps/desktop/src/locales/me/messages.json    |  6 +++++
 apps/desktop/src/locales/ml/messages.json    |  6 +++++
 apps/desktop/src/locales/mr/messages.json    |  6 +++++
 apps/desktop/src/locales/my/messages.json    |  6 +++++
 apps/desktop/src/locales/nb/messages.json    |  6 +++++
 apps/desktop/src/locales/ne/messages.json    |  6 +++++
 apps/desktop/src/locales/nl/messages.json    |  6 +++++
 apps/desktop/src/locales/nn/messages.json    |  6 +++++
 apps/desktop/src/locales/or/messages.json    |  6 +++++
 apps/desktop/src/locales/pl/messages.json    |  6 +++++
 apps/desktop/src/locales/pt_BR/messages.json |  6 +++++
 apps/desktop/src/locales/pt_PT/messages.json | 26 ++++++++++++--------
 apps/desktop/src/locales/ro/messages.json    |  6 +++++
 apps/desktop/src/locales/ru/messages.json    |  6 +++++
 apps/desktop/src/locales/si/messages.json    |  6 +++++
 apps/desktop/src/locales/sk/messages.json    |  6 +++++
 apps/desktop/src/locales/sl/messages.json    |  6 +++++
 apps/desktop/src/locales/sr/messages.json    |  6 +++++
 apps/desktop/src/locales/sv/messages.json    |  6 +++++
 apps/desktop/src/locales/te/messages.json    |  6 +++++
 apps/desktop/src/locales/th/messages.json    |  6 +++++
 apps/desktop/src/locales/tr/messages.json    |  6 +++++
 apps/desktop/src/locales/uk/messages.json    |  6 +++++
 apps/desktop/src/locales/vi/messages.json    |  6 +++++
 apps/desktop/src/locales/zh_CN/messages.json |  6 +++++
 apps/desktop/src/locales/zh_TW/messages.json |  6 +++++
 63 files changed, 398 insertions(+), 20 deletions(-)

diff --git a/apps/desktop/src/locales/af/messages.json b/apps/desktop/src/locales/af/messages.json
index 9339d31aa9..5ee3ba7e02 100644
--- a/apps/desktop/src/locales/af/messages.json
+++ b/apps/desktop/src/locales/af/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Swak wagwoord geidentifiseer en gevind in 'n data lekkasie. Gebruik 'n sterk en unieke wagwoord om jou rekening te beskerm. Is jy seker dat jy hierdie wagwoord wil gebruik?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Kontroleer bekende data lekkasies vir hierdie wagwoord"
   },
diff --git a/apps/desktop/src/locales/ar/messages.json b/apps/desktop/src/locales/ar/messages.json
index bb21e0db35..132021f776 100644
--- a/apps/desktop/src/locales/ar/messages.json
+++ b/apps/desktop/src/locales/ar/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "كلمة مرور ضعيفة محددة وموجودة في خرق البيانات. استخدم كلمة مرور قوية وفريدة لحماية حسابك. هل أنت متأكد من أنك تريد استخدام كلمة المرور هذه؟"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "تحقق من خروقات البيانات المعروفة لكلمة المرور هذه"
   },
diff --git a/apps/desktop/src/locales/az/messages.json b/apps/desktop/src/locales/az/messages.json
index 82fbee8111..9af089d1ef 100644
--- a/apps/desktop/src/locales/az/messages.json
+++ b/apps/desktop/src/locales/az/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Zəif parol məlumat pozuntusunda aşkarlandı və tapıldı. Hesabınızı qorumaq üçün güclü və unikal bir parol istifadə edin. Bu parolu istifadə etmək istədiyinizə əminsiniz?"
   },
+  "useThisPassword": {
+    "message": "Bu parolu istifadə et"
+  },
+  "useThisUsername": {
+    "message": "Bu istifadəçi adını istifadə et"
+  },
   "checkForBreaches": {
     "message": "Bu parol üçün bilinən məlumat pozuntularını yoxlayın"
   },
diff --git a/apps/desktop/src/locales/be/messages.json b/apps/desktop/src/locales/be/messages.json
index 288ba2bede..e778c59525 100644
--- a/apps/desktop/src/locales/be/messages.json
+++ b/apps/desktop/src/locales/be/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Вызначаны ненадзейны пароль, які знойдзены ва ўцечках даных. Выкарыстоўвайце надзейныя і ўнікальныя паролі для абароны свайго ўліковага запісу. Вы сапраўды хочаце выкарыстоўваць гэты пароль?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Праверыць у вядомых уцечках даных для гэтага пароля"
   },
diff --git a/apps/desktop/src/locales/bg/messages.json b/apps/desktop/src/locales/bg/messages.json
index 3d730a6789..9b000177bb 100644
--- a/apps/desktop/src/locales/bg/messages.json
+++ b/apps/desktop/src/locales/bg/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Разпозната е слаба парола. Използвайте силна парола, за да защитете данните си. Наистина ли искате да използвате слаба парола?"
   },
+  "useThisPassword": {
+    "message": "Използване на тази парола"
+  },
+  "useThisUsername": {
+    "message": "Използване на това потребителско име"
+  },
   "checkForBreaches": {
     "message": "Проверяване в известните случаи на изтекли данни за тази парола"
   },
diff --git a/apps/desktop/src/locales/bn/messages.json b/apps/desktop/src/locales/bn/messages.json
index e4eb247c59..069c58d751 100644
--- a/apps/desktop/src/locales/bn/messages.json
+++ b/apps/desktop/src/locales/bn/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/bs/messages.json b/apps/desktop/src/locales/bs/messages.json
index 9b91d3d7c4..f5052559de 100644
--- a/apps/desktop/src/locales/bs/messages.json
+++ b/apps/desktop/src/locales/bs/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/ca/messages.json b/apps/desktop/src/locales/ca/messages.json
index 2367af72d5..9d82ad59fa 100644
--- a/apps/desktop/src/locales/ca/messages.json
+++ b/apps/desktop/src/locales/ca/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Contrasenya feble identificada i trobada en una filtració de dades. Utilitzeu una contrasenya única i segura per protegir el vostre compte. Esteu segur que voleu utilitzar aquesta contrasenya?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Comproveu les filtracions de dades conegudes per a aquesta contrasenya"
   },
diff --git a/apps/desktop/src/locales/cs/messages.json b/apps/desktop/src/locales/cs/messages.json
index 01d3380d27..83f2840b72 100644
--- a/apps/desktop/src/locales/cs/messages.json
+++ b/apps/desktop/src/locales/cs/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Slabé heslo bylo nalezeno mezi odhalenými hesly. K zabezpečení Vašeho účtu používejte silné a jedinečné heslo. Opravdu chcete používat toto heslo?"
   },
+  "useThisPassword": {
+    "message": "Použít toto heslo"
+  },
+  "useThisUsername": {
+    "message": "Použít toto uživatelské jméno"
+  },
   "checkForBreaches": {
     "message": "Zkontrolovat heslo, zda nebylo odhaleno"
   },
diff --git a/apps/desktop/src/locales/cy/messages.json b/apps/desktop/src/locales/cy/messages.json
index 907f7498f2..f4e0853a93 100644
--- a/apps/desktop/src/locales/cy/messages.json
+++ b/apps/desktop/src/locales/cy/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/da/messages.json b/apps/desktop/src/locales/da/messages.json
index 766f0cf5e7..ebe74818f4 100644
--- a/apps/desktop/src/locales/da/messages.json
+++ b/apps/desktop/src/locales/da/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Svag adgangskode identificeret og fundet i datalæk. Brug en unik adgangskode til at beskytte din konto. Sikker på, at at denne adgangskode skal bruges?"
   },
+  "useThisPassword": {
+    "message": "Anvend denne adgangskode"
+  },
+  "useThisUsername": {
+    "message": "Anvend dette brugernavn"
+  },
   "checkForBreaches": {
     "message": "Tjek kendte datalæk for denne adgangskode"
   },
diff --git a/apps/desktop/src/locales/de/messages.json b/apps/desktop/src/locales/de/messages.json
index d8e946bc3e..133d98c3fa 100644
--- a/apps/desktop/src/locales/de/messages.json
+++ b/apps/desktop/src/locales/de/messages.json
@@ -250,17 +250,17 @@
     "message": "Fehler"
   },
   "decryptionError": {
-    "message": "Decryption error"
+    "message": "Entschlüsselungsfehler"
   },
   "couldNotDecryptVaultItemsBelow": {
-    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+    "message": "Bitwarden konnte folgende(n) Tresor-Eintrag/Einträge nicht entschlüsseln."
   },
   "contactCSToAvoidDataLossPart1": {
-    "message": "Contact customer success",
+    "message": "Kundensupport kontaktieren",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "contactCSToAvoidDataLossPart2": {
-    "message": "to avoid additional data loss.",
+    "message": "um zusätzlichen Datenverlust zu vermeiden.",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "january": {
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Schwaches Passwort erkannt und in einem Datendiebstahl gefunden. Verwende ein starkes und einzigartiges Passwort, um dein Konto zu schützen. Bist du sicher, dass du dieses Passwort verwenden möchtest?"
   },
+  "useThisPassword": {
+    "message": "Dieses Passwort verwenden"
+  },
+  "useThisUsername": {
+    "message": "Diesen Benutzernamen verwenden"
+  },
   "checkForBreaches": {
     "message": "Bekannte Datendiebstähle auf dieses Passwort überprüfen"
   },
@@ -3377,19 +3383,19 @@
     "message": "Es konnten keine freien Ports für die SSO-Anmeldung gefunden werden."
   },
   "biometricsStatusHelptextUnlockNeeded": {
-    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+    "message": "Biometrisches Entsperren ist nicht verfügbar, da zuerst mit PIN oder Passwort entsperrt werden muss."
   },
   "biometricsStatusHelptextHardwareUnavailable": {
-    "message": "Biometric unlock is currently unavailable."
+    "message": "Biometrisches Entsperren ist derzeit nicht verfügbar."
   },
   "biometricsStatusHelptextAutoSetupNeeded": {
-    "message": "Biometric unlock is unavailable due to misconfigured system files."
+    "message": "Biometrisches Entsperren ist aufgrund falsch konfigurierter Systemdateien nicht verfügbar."
   },
   "biometricsStatusHelptextManualSetupNeeded": {
-    "message": "Biometric unlock is unavailable due to misconfigured system files."
+    "message": "Biometrisches Entsperren ist aufgrund falsch konfigurierter Systemdateien nicht verfügbar."
   },
   "biometricsStatusHelptextNotEnabledLocally": {
-    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "message": "Biometrisches Entsperren ist nicht verfügbar, da es für $EMAIL$ in der Bitwarden Desktop-App nicht aktiviert ist.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3398,7 +3404,7 @@
     }
   },
   "biometricsStatusHelptextUnavailableReasonUnknown": {
-    "message": "Biometric unlock is currently unavailable for an unknown reason."
+    "message": "Biometrisches Entsperren ist derzeit aus einem unbekannten Grund nicht verfügbar."
   },
   "authorize": {
     "message": "Autorisieren"
diff --git a/apps/desktop/src/locales/el/messages.json b/apps/desktop/src/locales/el/messages.json
index b134c0d3db..145f386c6b 100644
--- a/apps/desktop/src/locales/el/messages.json
+++ b/apps/desktop/src/locales/el/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Βρέθηκε και ταυτοποιήθηκε αδύναμος κωδικός σε μια διαρροή δεδομένων. Χρησιμοποιήστε ένα ισχυρό και μοναδικό κωδικό πρόσβασης για την προστασία του λογαριασμού σας. Είστε σίγουροι ότι θέλετε να χρησιμοποιήσετε αυτόν τον κωδικό πρόσβασης;"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Ελέγξτε γνωστές διαρροές δεδομένων για αυτόν τον κωδικό"
   },
diff --git a/apps/desktop/src/locales/en_GB/messages.json b/apps/desktop/src/locales/en_GB/messages.json
index 1f705b5432..acca06b8b4 100644
--- a/apps/desktop/src/locales/en_GB/messages.json
+++ b/apps/desktop/src/locales/en_GB/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/en_IN/messages.json b/apps/desktop/src/locales/en_IN/messages.json
index bdabdb2f37..122217dae9 100644
--- a/apps/desktop/src/locales/en_IN/messages.json
+++ b/apps/desktop/src/locales/en_IN/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/eo/messages.json b/apps/desktop/src/locales/eo/messages.json
index 7cbd15b596..a4621439f5 100644
--- a/apps/desktop/src/locales/eo/messages.json
+++ b/apps/desktop/src/locales/eo/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/es/messages.json b/apps/desktop/src/locales/es/messages.json
index 27f694ec18..1915002b6b 100644
--- a/apps/desktop/src/locales/es/messages.json
+++ b/apps/desktop/src/locales/es/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Contraseña débil encontrada en una filtración de datos. Utilice una contraseña única para proteger su cuenta. ¿Está seguro de que desea utilizar una contraseña comprometida?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Comprobar filtración de datos conocidos para esta contraseña"
   },
diff --git a/apps/desktop/src/locales/et/messages.json b/apps/desktop/src/locales/et/messages.json
index ec73ac1e8b..8396316416 100644
--- a/apps/desktop/src/locales/et/messages.json
+++ b/apps/desktop/src/locales/et/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Tuvastati nõrk ning andmelekkes lekkinud ülemparool. Kasuta konto paremaks turvamiseks tugevamat parooli. Oled kindel, et soovid nõrga parooliga jätkata?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Otsi seda parooli teadaolevatest andmeleketest"
   },
diff --git a/apps/desktop/src/locales/eu/messages.json b/apps/desktop/src/locales/eu/messages.json
index 0147b474ab..2daed855e5 100644
--- a/apps/desktop/src/locales/eu/messages.json
+++ b/apps/desktop/src/locales/eu/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/fa/messages.json b/apps/desktop/src/locales/fa/messages.json
index a04c39d4ae..b79dc2d90e 100644
--- a/apps/desktop/src/locales/fa/messages.json
+++ b/apps/desktop/src/locales/fa/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "کلمه عبور ضعیف شناسایی و در یک نقض داده پیدا شد. از یک کلمه عبور قوی و منحصر به فرد برای محافظت از حساب خود استفاده کنید. آیا مطمئنید که می‌خواهید از این کلمه عبور استفاده کنید؟"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "نقض اطلاعات شناخته شده برای این کلمه عبور را بررسی کنید"
   },
diff --git a/apps/desktop/src/locales/fi/messages.json b/apps/desktop/src/locales/fi/messages.json
index 193553cac8..2d0a8cae99 100644
--- a/apps/desktop/src/locales/fi/messages.json
+++ b/apps/desktop/src/locales/fi/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Havaittiin heikko ja tietovuodosta löytynyt salasana. Sinun tulisi suojata tilisi vahvalla ja ainutlaatuisella salasanalla. Haluatko varmasti käyttää tätä salasanaa?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Tarkasta esiintyykö salasanaa tunnetuissa tietovuodoissa"
   },
diff --git a/apps/desktop/src/locales/fil/messages.json b/apps/desktop/src/locales/fil/messages.json
index 53b2ef9ffb..1f77b85e3c 100644
--- a/apps/desktop/src/locales/fil/messages.json
+++ b/apps/desktop/src/locales/fil/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Mahinang password na nakilala at nakita sa data breach. Gamitin ang malakas at natatanging password upang makaproteksyon sa iyong account. Sigurado ka ba na gusto mong gamitin ang password na ito?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Tingnan ang kilalang breaches ng data para sa password na ito"
   },
diff --git a/apps/desktop/src/locales/fr/messages.json b/apps/desktop/src/locales/fr/messages.json
index f1bf424387..f0ab36ba63 100644
--- a/apps/desktop/src/locales/fr/messages.json
+++ b/apps/desktop/src/locales/fr/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Mot de passe faible identifié et trouvé dans une brèche de données. Utilisez un mot de passe robuste et unique pour protéger votre compte. Êtes-vous sûr de vouloir utiliser ce mot de passe ?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Vérifier les brèches de données connues pour ce mot de passe"
   },
diff --git a/apps/desktop/src/locales/gl/messages.json b/apps/desktop/src/locales/gl/messages.json
index 35d5cf8c03..1a02e5db4e 100644
--- a/apps/desktop/src/locales/gl/messages.json
+++ b/apps/desktop/src/locales/gl/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/he/messages.json b/apps/desktop/src/locales/he/messages.json
index 09d6e321a1..df61cefe73 100644
--- a/apps/desktop/src/locales/he/messages.json
+++ b/apps/desktop/src/locales/he/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/hi/messages.json b/apps/desktop/src/locales/hi/messages.json
index 3263191cd3..723ea0f699 100644
--- a/apps/desktop/src/locales/hi/messages.json
+++ b/apps/desktop/src/locales/hi/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/hr/messages.json b/apps/desktop/src/locales/hr/messages.json
index b1def7c192..109a1abff2 100644
--- a/apps/desktop/src/locales/hr/messages.json
+++ b/apps/desktop/src/locales/hr/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Slaba lozinka je nađena među ukradenima tijekom krađa podataka. Za zaštitu svog računa koristi jaku i jedinstvenu lozinku. Želiš li svejedno korisiti slabu, ukradenu lozinku?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Provjeri je li lozinka ukradena prilikom krađe podataka"
   },
diff --git a/apps/desktop/src/locales/hu/messages.json b/apps/desktop/src/locales/hu/messages.json
index fb94d34b38..3716e1e67a 100644
--- a/apps/desktop/src/locales/hu/messages.json
+++ b/apps/desktop/src/locales/hu/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Gyenge jelszó lett azonosítva és megtalálva egy adatvédelmi incidens során. A fók védelme érdekében használjunk erős és egyedi jelszót. Biztosan használni szeretnénk ezt a jelszót?"
   },
+  "useThisPassword": {
+    "message": "Jelszó használata"
+  },
+  "useThisUsername": {
+    "message": "Felhasználónév használata"
+  },
   "checkForBreaches": {
     "message": "Az ehhez a jelszóhoz tartozó ismert adatvédelmi incidensek ellenőrzése"
   },
diff --git a/apps/desktop/src/locales/id/messages.json b/apps/desktop/src/locales/id/messages.json
index 989177b1b4..d4bcded0ee 100644
--- a/apps/desktop/src/locales/id/messages.json
+++ b/apps/desktop/src/locales/id/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Periksa pelanggaran data yang diketahui untuk kata sandi ini"
   },
diff --git a/apps/desktop/src/locales/it/messages.json b/apps/desktop/src/locales/it/messages.json
index 13e4c692f6..c85127fce2 100644
--- a/apps/desktop/src/locales/it/messages.json
+++ b/apps/desktop/src/locales/it/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Password debole e trovata in una violazione dei dati. Usa una password forte e unica per proteggere il tuo account. Sei sicuro di voler usare questa password?"
   },
+  "useThisPassword": {
+    "message": "Usa questa parola d'accesso"
+  },
+  "useThisUsername": {
+    "message": "Usa questo nome utente"
+  },
   "checkForBreaches": {
     "message": "Controlla se la tua password è presente in una violazione dei dati"
   },
diff --git a/apps/desktop/src/locales/ja/messages.json b/apps/desktop/src/locales/ja/messages.json
index 364de39788..9ce8f6a3ea 100644
--- a/apps/desktop/src/locales/ja/messages.json
+++ b/apps/desktop/src/locales/ja/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "入力されたパスワードは脆弱かつすでに流出済みです。アカウントを守るためより強力で一意なパスワードを使用してください。本当にこの脆弱なパスワードを使用しますか？"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "このパスワードの既知のデータ流出を確認"
   },
diff --git a/apps/desktop/src/locales/ka/messages.json b/apps/desktop/src/locales/ka/messages.json
index fef2d56a7c..bf434a6c29 100644
--- a/apps/desktop/src/locales/ka/messages.json
+++ b/apps/desktop/src/locales/ka/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/km/messages.json b/apps/desktop/src/locales/km/messages.json
index 35d5cf8c03..1a02e5db4e 100644
--- a/apps/desktop/src/locales/km/messages.json
+++ b/apps/desktop/src/locales/km/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/kn/messages.json b/apps/desktop/src/locales/kn/messages.json
index 9ce484b381..f3401477f4 100644
--- a/apps/desktop/src/locales/kn/messages.json
+++ b/apps/desktop/src/locales/kn/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/ko/messages.json b/apps/desktop/src/locales/ko/messages.json
index 19a13ef3e8..1aafdc4bc6 100644
--- a/apps/desktop/src/locales/ko/messages.json
+++ b/apps/desktop/src/locales/ko/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/lt/messages.json b/apps/desktop/src/locales/lt/messages.json
index c1fafc59f1..11c70dd419 100644
--- a/apps/desktop/src/locales/lt/messages.json
+++ b/apps/desktop/src/locales/lt/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Silpnas slaptažodis nustatytas ir rastas per duomenų pažeidimą. Norėdami apsaugoti paskyrą, naudokite stiprų ir unikalų slaptažodį. Ar tikrai norite naudoti šį slaptažodį?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Patikrinti žinomus šio slaptažodžio duomenų pažeidimus"
   },
diff --git a/apps/desktop/src/locales/lv/messages.json b/apps/desktop/src/locales/lv/messages.json
index f2317e1d0b..68495a2513 100644
--- a/apps/desktop/src/locales/lv/messages.json
+++ b/apps/desktop/src/locales/lv/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Noteikta vāja parole, un tā ir atrasta datu noplūdē. Jāizmanto spēcīga un neatkārtojama parole, lai aizsargātu savu kontu. Vai tiešām izmantot šo paroli?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Meklēt šo paroli zināmās datu noplūdēs"
   },
diff --git a/apps/desktop/src/locales/me/messages.json b/apps/desktop/src/locales/me/messages.json
index 50a6ee8df5..ac9994c313 100644
--- a/apps/desktop/src/locales/me/messages.json
+++ b/apps/desktop/src/locales/me/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/ml/messages.json b/apps/desktop/src/locales/ml/messages.json
index e1516b99b2..15d4de334e 100644
--- a/apps/desktop/src/locales/ml/messages.json
+++ b/apps/desktop/src/locales/ml/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/mr/messages.json b/apps/desktop/src/locales/mr/messages.json
index 35d5cf8c03..1a02e5db4e 100644
--- a/apps/desktop/src/locales/mr/messages.json
+++ b/apps/desktop/src/locales/mr/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/my/messages.json b/apps/desktop/src/locales/my/messages.json
index ce5a50e1f7..ca39973149 100644
--- a/apps/desktop/src/locales/my/messages.json
+++ b/apps/desktop/src/locales/my/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/nb/messages.json b/apps/desktop/src/locales/nb/messages.json
index 00970fb0fc..0ebecf3be8 100644
--- a/apps/desktop/src/locales/nb/messages.json
+++ b/apps/desktop/src/locales/nb/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/ne/messages.json b/apps/desktop/src/locales/ne/messages.json
index 6a5ae864fc..624547d212 100644
--- a/apps/desktop/src/locales/ne/messages.json
+++ b/apps/desktop/src/locales/ne/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/nl/messages.json b/apps/desktop/src/locales/nl/messages.json
index 729a093927..6f3670afa3 100644
--- a/apps/desktop/src/locales/nl/messages.json
+++ b/apps/desktop/src/locales/nl/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Zwak wachtwoord geïdentificeerd en gevonden in een datalek. Gebruik een sterk en uniek wachtwoord om je account te beschermen. Weet je zeker dat je dit wachtwoord wilt gebruiken?"
   },
+  "useThisPassword": {
+    "message": "Dit wachtwoord gebruiken"
+  },
+  "useThisUsername": {
+    "message": "Deze gebruikersnaam gebruiken"
+  },
   "checkForBreaches": {
     "message": "Bekende datalekken voor dit wachtwoord controleren"
   },
diff --git a/apps/desktop/src/locales/nn/messages.json b/apps/desktop/src/locales/nn/messages.json
index 7e18c7b77d..df2f70ae83 100644
--- a/apps/desktop/src/locales/nn/messages.json
+++ b/apps/desktop/src/locales/nn/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/or/messages.json b/apps/desktop/src/locales/or/messages.json
index 903fe83af7..ea55a1c602 100644
--- a/apps/desktop/src/locales/or/messages.json
+++ b/apps/desktop/src/locales/or/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/pl/messages.json b/apps/desktop/src/locales/pl/messages.json
index 59cf3a96ab..d7b950100f 100644
--- a/apps/desktop/src/locales/pl/messages.json
+++ b/apps/desktop/src/locales/pl/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Słabe hasło ujawnione w wyniku naruszenia ochrony danych. Użyj silnego i unikalnego hasła, aby chronić swoje konto. Czy na pewno chcesz użyć tego hasła?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Sprawdź znane naruszenia ochrony danych tego hasła"
   },
diff --git a/apps/desktop/src/locales/pt_BR/messages.json b/apps/desktop/src/locales/pt_BR/messages.json
index 0e35de82e7..312fe4e8e8 100644
--- a/apps/desktop/src/locales/pt_BR/messages.json
+++ b/apps/desktop/src/locales/pt_BR/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Senha fraca identificada e encontrada em um vazamento de dados. Use uma senha forte e única para proteger a sua conta. Tem certeza de que deseja usar essa senha?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Verificar vazamentos de dados conhecidos para esta senha"
   },
diff --git a/apps/desktop/src/locales/pt_PT/messages.json b/apps/desktop/src/locales/pt_PT/messages.json
index a63fbca2eb..d88862a798 100644
--- a/apps/desktop/src/locales/pt_PT/messages.json
+++ b/apps/desktop/src/locales/pt_PT/messages.json
@@ -250,17 +250,17 @@
     "message": "Erro"
   },
   "decryptionError": {
-    "message": "Decryption error"
+    "message": "Erro de desencriptação"
   },
   "couldNotDecryptVaultItemsBelow": {
-    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+    "message": "O Bitwarden não conseguiu desencriptar o(s) item(ns) do cofre listado(s) abaixo."
   },
   "contactCSToAvoidDataLossPart1": {
-    "message": "Contact customer success",
+    "message": "Contacte o serviço de apoio ao cliente",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "contactCSToAvoidDataLossPart2": {
-    "message": "to avoid additional data loss.",
+    "message": "para evitar perdas adicionais de dados.",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "january": {
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Palavra-passe fraca identificada e encontrada numa violação de dados. Utilize uma palavra-passe forte e única para proteger a sua conta. Tem a certeza de que pretende utilizar esta palavra-passe?"
   },
+  "useThisPassword": {
+    "message": "Utilizar esta palavra-passe"
+  },
+  "useThisUsername": {
+    "message": "Utilizar este nome de utilizador"
+  },
   "checkForBreaches": {
     "message": "Verificar violações de dados conhecidas para esta palavra-passe"
   },
@@ -3377,19 +3383,19 @@
     "message": "Não foi possível encontrar portas livres para o início de sessão sso."
   },
   "biometricsStatusHelptextUnlockNeeded": {
-    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+    "message": "O desbloqueio biométrico não está disponível porque o desbloqueio por PIN ou palavra-passe é necessário primeiro."
   },
   "biometricsStatusHelptextHardwareUnavailable": {
-    "message": "Biometric unlock is currently unavailable."
+    "message": "O desbloqueio biométrico está atualmente indisponível."
   },
   "biometricsStatusHelptextAutoSetupNeeded": {
-    "message": "Biometric unlock is unavailable due to misconfigured system files."
+    "message": "O desbloqueio biométrico não está disponível devido a ficheiros de sistema mal configurados."
   },
   "biometricsStatusHelptextManualSetupNeeded": {
-    "message": "Biometric unlock is unavailable due to misconfigured system files."
+    "message": "O desbloqueio biométrico não está disponível devido a ficheiros de sistema mal configurados."
   },
   "biometricsStatusHelptextNotEnabledLocally": {
-    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "message": "O desbloqueio biométrico não está disponível porque não está ativado para $EMAIL$ na app Bitwarden para computador.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -3398,7 +3404,7 @@
     }
   },
   "biometricsStatusHelptextUnavailableReasonUnknown": {
-    "message": "Biometric unlock is currently unavailable for an unknown reason."
+    "message": "O desbloqueio biométrico está atualmente indisponível por um motivo desconhecido."
   },
   "authorize": {
     "message": "Autorizar"
diff --git a/apps/desktop/src/locales/ro/messages.json b/apps/desktop/src/locales/ro/messages.json
index 939c329589..d4ca5e21a5 100644
--- a/apps/desktop/src/locales/ro/messages.json
+++ b/apps/desktop/src/locales/ro/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/ru/messages.json b/apps/desktop/src/locales/ru/messages.json
index d8aa6556a0..46e04b7770 100644
--- a/apps/desktop/src/locales/ru/messages.json
+++ b/apps/desktop/src/locales/ru/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Обнаружен слабый пароль, найденный в утечке данных. Используйте надежный и уникальный пароль для защиты вашего аккаунта. Вы уверены, что хотите использовать этот пароль?"
   },
+  "useThisPassword": {
+    "message": "Использовать этот пароль"
+  },
+  "useThisUsername": {
+    "message": "Использовать это имя пользователя"
+  },
   "checkForBreaches": {
     "message": "Проверять известные случаи утечки данных для этого пароля"
   },
diff --git a/apps/desktop/src/locales/si/messages.json b/apps/desktop/src/locales/si/messages.json
index 210ccc7383..5372bf5963 100644
--- a/apps/desktop/src/locales/si/messages.json
+++ b/apps/desktop/src/locales/si/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/sk/messages.json b/apps/desktop/src/locales/sk/messages.json
index bfcfb56f98..07851ddc47 100644
--- a/apps/desktop/src/locales/sk/messages.json
+++ b/apps/desktop/src/locales/sk/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Nájdené slabé heslo v uniknuných údajoch. Na ochranu svojho účtu používajte silné a jedinečné heslo. Naozaj chcete používať toto heslo?"
   },
+  "useThisPassword": {
+    "message": "Použiť toto heslo"
+  },
+  "useThisUsername": {
+    "message": "Použiť toto používateľské meno"
+  },
   "checkForBreaches": {
     "message": "Skontrolovať známe úniky údajov pre toto heslo"
   },
diff --git a/apps/desktop/src/locales/sl/messages.json b/apps/desktop/src/locales/sl/messages.json
index 0270b7ba3f..c4fae11c81 100644
--- a/apps/desktop/src/locales/sl/messages.json
+++ b/apps/desktop/src/locales/sl/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/sr/messages.json b/apps/desktop/src/locales/sr/messages.json
index d8544d8285..03cc5b8c26 100644
--- a/apps/desktop/src/locales/sr/messages.json
+++ b/apps/desktop/src/locales/sr/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Идентификована је слаба лозинка и пронађена у упаду података. Користите јаку и јединствену лозинку да заштитите свој налог. Да ли сте сигурни да желите да користите ову лозинку?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Проверите познате упада података за ову лозинку"
   },
diff --git a/apps/desktop/src/locales/sv/messages.json b/apps/desktop/src/locales/sv/messages.json
index 023b74b12b..920981908f 100644
--- a/apps/desktop/src/locales/sv/messages.json
+++ b/apps/desktop/src/locales/sv/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Lösenordet är svagt och avslöjades vid ett dataintrång. Använd ett starkt och unikt lösenord för att skydda ditt konto. Är det säkert att du vill använda detta lösenord?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Kontrollera kända dataintrång för detta lösenord"
   },
diff --git a/apps/desktop/src/locales/te/messages.json b/apps/desktop/src/locales/te/messages.json
index 35d5cf8c03..1a02e5db4e 100644
--- a/apps/desktop/src/locales/te/messages.json
+++ b/apps/desktop/src/locales/te/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/th/messages.json b/apps/desktop/src/locales/th/messages.json
index b5cc86b1e5..7f7e373132 100644
--- a/apps/desktop/src/locales/th/messages.json
+++ b/apps/desktop/src/locales/th/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Weak password identified and found in a data breach. Use a strong and unique password to protect your account. Are you sure you want to use this password?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Check known data breaches for this password"
   },
diff --git a/apps/desktop/src/locales/tr/messages.json b/apps/desktop/src/locales/tr/messages.json
index 5f11450a20..2fbd751ddb 100644
--- a/apps/desktop/src/locales/tr/messages.json
+++ b/apps/desktop/src/locales/tr/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Hem zayıf hem de veri ihlalinde yer alan bir tespit edildi. Hesabınızı korumak için güçlü bir parola seçin ve o parolayı başka yerlerde kullanmayın. Bu parolayı kullanmak istediğinizden emin misiniz?"
   },
+  "useThisPassword": {
+    "message": "Bu parolayı kullan"
+  },
+  "useThisUsername": {
+    "message": "Bu kullanıcı adını kullan"
+  },
   "checkForBreaches": {
     "message": "Bilinen veri ihlallerinde bu parolayı kontrol et"
   },
diff --git a/apps/desktop/src/locales/uk/messages.json b/apps/desktop/src/locales/uk/messages.json
index d4126a6b64..db0259adc0 100644
--- a/apps/desktop/src/locales/uk/messages.json
+++ b/apps/desktop/src/locales/uk/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Виявлено слабкий пароль, який знайдено у витоку даних. Використовуйте надійний та унікальний пароль для захисту свого облікового запису. Ви дійсно хочете використати цей пароль?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Перевірити відомі витоки даних для цього пароля"
   },
diff --git a/apps/desktop/src/locales/vi/messages.json b/apps/desktop/src/locales/vi/messages.json
index fcd113f307..07dcdfd373 100644
--- a/apps/desktop/src/locales/vi/messages.json
+++ b/apps/desktop/src/locales/vi/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "Mật khẩu yếu này đã bị rò rỉ trong một vụ tấn công dữ liệu. Dùng mật khẩu mới và an toàn để bảo vệ tài khoản bạn. Bạn có chắc muốn sử dụng mật khẩu đã bị rò rỉ?"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "Kiểm tra mật khẩu có lộ trong các vụ rò rỉ dữ liệu hay không"
   },
diff --git a/apps/desktop/src/locales/zh_CN/messages.json b/apps/desktop/src/locales/zh_CN/messages.json
index 0285842f04..c9046b34a5 100644
--- a/apps/desktop/src/locales/zh_CN/messages.json
+++ b/apps/desktop/src/locales/zh_CN/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "识别到弱密码且其出现在数据泄露中。请使用一个强且唯一的密码以保护你的账户。确定要使用这个密码吗？"
   },
+  "useThisPassword": {
+    "message": "使用此密码"
+  },
+  "useThisUsername": {
+    "message": "使用此用户名"
+  },
   "checkForBreaches": {
     "message": "检查已知的数据泄露是否包含此密码"
   },
diff --git a/apps/desktop/src/locales/zh_TW/messages.json b/apps/desktop/src/locales/zh_TW/messages.json
index b5ca02d6c8..a9206a50df 100644
--- a/apps/desktop/src/locales/zh_TW/messages.json
+++ b/apps/desktop/src/locales/zh_TW/messages.json
@@ -2879,6 +2879,12 @@
   "weakAndBreachedMasterPasswordDesc": {
     "message": "密碼強度不足，且該密碼已洩露。請使用一個強度足夠和獨特的密碼來保護您的帳戶。您確定要使用這個密碼嗎？"
   },
+  "useThisPassword": {
+    "message": "Use this password"
+  },
+  "useThisUsername": {
+    "message": "Use this username"
+  },
   "checkForBreaches": {
     "message": "檢查外洩的密碼資料庫中是否包含此密碼"
   },

From fe9b0976ee85908f3c0f7da648b78b60dc363e20 Mon Sep 17 00:00:00 2001
From: cyprain-okeke <108260115+cyprain-okeke@users.noreply.github.com>
Date: Mon, 13 Jan 2025 12:17:30 +0100
Subject: [PATCH 053/150] Fix the page loading issue (#12828)

---
 .../app/billing/organizations/change-plan-dialog.component.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts b/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
index d7ac442c40..bc5c7da8db 100644
--- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
+++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
@@ -311,7 +311,9 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
 
   setInitialPlanSelection() {
     this.focusedIndex = this.selectableProducts.length - 1;
-    this.selectPlan(this.getPlanByType(ProductTierType.Enterprise));
+    if (!this.isSubscriptionCanceled) {
+      this.selectPlan(this.getPlanByType(ProductTierType.Enterprise));
+    }
   }
 
   getPlanByType(productTier: ProductTierType) {

From 22f4822efc4b1b89b2ecfc492043327000374b89 Mon Sep 17 00:00:00 2001
From: Daniel James Smith <2670567+djsmith85@users.noreply.github.com>
Date: Mon, 13 Jan 2025 14:44:42 +0100
Subject: [PATCH 054/150] [PM-16470] Remove v1 autofill owned refresh code
 (#12579)

* Remove v1 autofill owned settings

* Remove Fido2 v1 components

* Remove conditional to enable AutofillOnPageLoadOrgPolicy

---------

Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
---
 .../fido2/fido2-cipher-row-v1.component.html  |  36 --
 .../fido2/fido2-cipher-row-v1.component.ts    |  41 --
 .../fido2-use-browser-link-v1.component.html  |  52 --
 .../fido2-use-browser-link-v1.component.ts    | 115 -----
 .../popup/fido2/fido2-v1.component.html       | 142 ------
 .../popup/fido2/fido2-v1.component.ts         | 445 ------------------
 .../popup/settings/autofill-v1.component.html | 270 -----------
 .../popup/settings/autofill-v1.component.ts   | 344 --------------
 .../excluded-domains-v1.component.html        |  91 ----
 .../settings/excluded-domains-v1.component.ts | 143 ------
 .../settings/notifications-v1.component.html  |  89 ----
 .../settings/notifications-v1.component.ts    |  53 ---
 .../src/background/runtime.background.ts      |   8 +-
 apps/browser/src/popup/app-routing.module.ts  |  25 +-
 apps/browser/src/popup/app.module.ts          |  20 -
 15 files changed, 14 insertions(+), 1860 deletions(-)
 delete mode 100644 apps/browser/src/autofill/popup/fido2/fido2-cipher-row-v1.component.html
 delete mode 100644 apps/browser/src/autofill/popup/fido2/fido2-cipher-row-v1.component.ts
 delete mode 100644 apps/browser/src/autofill/popup/fido2/fido2-use-browser-link-v1.component.html
 delete mode 100644 apps/browser/src/autofill/popup/fido2/fido2-use-browser-link-v1.component.ts
 delete mode 100644 apps/browser/src/autofill/popup/fido2/fido2-v1.component.html
 delete mode 100644 apps/browser/src/autofill/popup/fido2/fido2-v1.component.ts
 delete mode 100644 apps/browser/src/autofill/popup/settings/autofill-v1.component.html
 delete mode 100644 apps/browser/src/autofill/popup/settings/autofill-v1.component.ts
 delete mode 100644 apps/browser/src/autofill/popup/settings/excluded-domains-v1.component.html
 delete mode 100644 apps/browser/src/autofill/popup/settings/excluded-domains-v1.component.ts
 delete mode 100644 apps/browser/src/autofill/popup/settings/notifications-v1.component.html
 delete mode 100644 apps/browser/src/autofill/popup/settings/notifications-v1.component.ts

diff --git a/apps/browser/src/autofill/popup/fido2/fido2-cipher-row-v1.component.html b/apps/browser/src/autofill/popup/fido2/fido2-cipher-row-v1.component.html
deleted file mode 100644
index 852fd4a0e8..0000000000
--- a/apps/browser/src/autofill/popup/fido2/fido2-cipher-row-v1.component.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<div
-  role="group"
-  appA11yTitle="{{ cipher.name }} {{ cipher.subTitle }}"
-  class="virtual-scroll-item"
-  [ngClass]="{ 'override-last': !last }"
->
-  <div class="box-content-row box-content-row-flex">
-    <button
-      type="button"
-      (click)="selectCipher(cipher)"
-      tabindex="0"
-      appStopClick
-      title="{{ title }} - {{ cipher.name }}"
-      [ngClass]="{ 'row-main': true, 'row-selected': isSelected && !isSearching }"
-    >
-      <app-vault-icon [cipher]="cipher"></app-vault-icon>
-      <div class="row-main-content">
-        <span class="text">
-          <span class="truncate-box">
-            <span class="truncate">{{ cipher.name }}</span>
-            <ng-container *ngIf="cipher.organizationId">
-              <i
-                class="bwi bwi-collection text-muted"
-                title="{{ 'shared' | i18n }}"
-                aria-hidden="true"
-              ></i>
-              <span class="sr-only">{{ "shared" | i18n }}</span>
-            </ng-container>
-          </span>
-        </span>
-        <span class="detail" *ngIf="getSubName(cipher)">{{ getSubName(cipher) }}</span>
-        <span class="detail" *ngIf="cipher.subTitle">{{ cipher.subTitle }}</span>
-      </div>
-    </button>
-  </div>
-</div>
diff --git a/apps/browser/src/autofill/popup/fido2/fido2-cipher-row-v1.component.ts b/apps/browser/src/autofill/popup/fido2/fido2-cipher-row-v1.component.ts
deleted file mode 100644
index 2101979fe3..0000000000
--- a/apps/browser/src/autofill/popup/fido2/fido2-cipher-row-v1.component.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, EventEmitter, Input, Output, ChangeDetectionStrategy } from "@angular/core";
-
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-
-@Component({
-  selector: "app-fido2-cipher-row-v1",
-  templateUrl: "fido2-cipher-row-v1.component.html",
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class Fido2CipherRowV1Component {
-  @Output() onSelected = new EventEmitter<CipherView>();
-  @Input() cipher: CipherView;
-  @Input() last: boolean;
-  @Input() title: string;
-  @Input() isSearching: boolean;
-  @Input() isSelected: boolean;
-
-  protected selectCipher(c: CipherView) {
-    this.onSelected.emit(c);
-  }
-
-  /**
-   * Returns a subname for the cipher.
-   * If this has a FIDO2 credential, and the cipher.name is different from the FIDO2 credential's rpId, return the rpId.
-   * @param c Cipher
-   * @returns
-   */
-  protected getSubName(c: CipherView): string | null {
-    const fido2Credentials = c.login?.fido2Credentials;
-
-    if (!fido2Credentials || fido2Credentials.length === 0) {
-      return null;
-    }
-
-    const [fido2Credential] = fido2Credentials;
-
-    return c.name !== fido2Credential.rpId ? fido2Credential.rpId : null;
-  }
-}
diff --git a/apps/browser/src/autofill/popup/fido2/fido2-use-browser-link-v1.component.html b/apps/browser/src/autofill/popup/fido2/fido2-use-browser-link-v1.component.html
deleted file mode 100644
index 9f6c0aca50..0000000000
--- a/apps/browser/src/autofill/popup/fido2/fido2-use-browser-link-v1.component.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<ng-container *ngIf="(fido2PopoutSessionData$ | async).fallbackSupported">
-  <div class="useBrowserlink">
-    <button
-      type="button"
-      (click)="toggle()"
-      cdkOverlayOrigin
-      #trigger="cdkOverlayOrigin"
-      aria-haspopup="dialog"
-      aria-controls="cdk-overlay-container"
-    >
-      <span class="text-primary">
-        {{ "useDeviceOrHardwareKey" | i18n }}
-      </span>
-      <i class="bwi bwi-fw bwi-sm bwi-angle-down" aria-hidden="true"></i>
-    </button>
-  </div>
-
-  <ng-template
-    cdkConnectedOverlay
-    [cdkConnectedOverlayOrigin]="trigger"
-    [cdkConnectedOverlayOpen]="isOpen"
-    [cdkConnectedOverlayPositions]="overlayPosition"
-    [cdkConnectedOverlayHasBackdrop]="true"
-    [cdkConnectedOverlayBackdropClass]="'cdk-overlay-transparent-backdrop'"
-    (backdropClick)="isOpen = false"
-    (detach)="close()"
-  >
-    <div class="box-content">
-      <div
-        class="fido2-browser-selector-dropdown"
-        [@transformPanel]="'open'"
-        cdkTrapFocus
-        cdkTrapFocusAutoCapture
-        role="dialog"
-        aria-modal="true"
-      >
-        <button type="button" class="fido2-browser-selector-dropdown-item" (click)="abort(false)">
-          <span>{{ "justOnce" | i18n }}</span>
-        </button>
-        <br />
-        <button type="button" class="fido2-browser-selector-dropdown-item" (click)="abort()">
-          <span>{{ "alwaysForThisSite" | i18n }}</span>
-        </button>
-      </div>
-    </div>
-  </ng-template>
-
-  <div
-    *ngIf="showOverlay"
-    class="tw-absolute tw-w-full tw-h-full tw-bg-background-alt tw-inset-0 tw-bg-opacity-80 tw-z-50"
-  ></div>
-</ng-container>
diff --git a/apps/browser/src/autofill/popup/fido2/fido2-use-browser-link-v1.component.ts b/apps/browser/src/autofill/popup/fido2/fido2-use-browser-link-v1.component.ts
deleted file mode 100644
index b7a1bc195a..0000000000
--- a/apps/browser/src/autofill/popup/fido2/fido2-use-browser-link-v1.component.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { animate, state, style, transition, trigger } from "@angular/animations";
-import { ConnectedPosition } from "@angular/cdk/overlay";
-import { Component } from "@angular/core";
-import { firstValueFrom } from "rxjs";
-
-import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
-import { NeverDomains } from "@bitwarden/common/models/domain/domain-service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
-
-import { fido2PopoutSessionData$ } from "../../../vault/popup/utils/fido2-popout-session-data";
-import { BrowserFido2UserInterfaceSession } from "../../fido2/services/browser-fido2-user-interface.service";
-
-@Component({
-  selector: "app-fido2-use-browser-link-v1",
-  templateUrl: "fido2-use-browser-link-v1.component.html",
-  animations: [
-    trigger("transformPanel", [
-      state(
-        "void",
-        style({
-          opacity: 0,
-        }),
-      ),
-      transition(
-        "void => open",
-        animate(
-          "100ms linear",
-          style({
-            opacity: 1,
-          }),
-        ),
-      ),
-      transition("* => void", animate("100ms linear", style({ opacity: 0 }))),
-    ]),
-  ],
-})
-export class Fido2UseBrowserLinkV1Component {
-  showOverlay = false;
-  isOpen = false;
-  overlayPosition: ConnectedPosition[] = [
-    {
-      originX: "start",
-      originY: "bottom",
-      overlayX: "start",
-      overlayY: "top",
-      offsetY: 5,
-    },
-  ];
-
-  protected fido2PopoutSessionData$ = fido2PopoutSessionData$();
-
-  constructor(
-    private domainSettingsService: DomainSettingsService,
-    private platformUtilsService: PlatformUtilsService,
-    private i18nService: I18nService,
-  ) {}
-
-  toggle() {
-    this.isOpen = !this.isOpen;
-  }
-
-  close() {
-    this.isOpen = false;
-  }
-
-  /**
-   * Aborts the current FIDO2 session and fallsback to the browser.
-   * @param excludeDomain - Identifies if the domain should be excluded from future FIDO2 prompts.
-   */
-  protected async abort(excludeDomain = true) {
-    this.close();
-    const sessionData = await firstValueFrom(this.fido2PopoutSessionData$);
-
-    if (!excludeDomain) {
-      this.abortSession(sessionData.sessionId);
-      return;
-    }
-    // Show overlay to prevent the user from interacting with the page.
-    this.showOverlay = true;
-    await this.handleDomainExclusion(sessionData.senderUrl);
-    // Give the user a chance to see the toast before closing the popout.
-    await Utils.delay(2000);
-    this.abortSession(sessionData.sessionId);
-  }
-
-  /**
-   * Excludes the domain from future FIDO2 prompts.
-   * @param uri - The domain uri to exclude from future FIDO2 prompts.
-   */
-  private async handleDomainExclusion(uri: string) {
-    const existingDomains = await firstValueFrom(this.domainSettingsService.neverDomains$);
-
-    const validDomain = Utils.getHostname(uri);
-    const savedDomains: NeverDomains = {
-      ...existingDomains,
-    };
-    savedDomains[validDomain] = null;
-
-    await this.domainSettingsService.setNeverDomains(savedDomains);
-
-    this.platformUtilsService.showToast(
-      "success",
-      null,
-      this.i18nService.t("domainAddedToExcludedDomains", validDomain),
-    );
-  }
-
-  private abortSession(sessionId: string) {
-    BrowserFido2UserInterfaceSession.abortPopout(sessionId, true);
-  }
-}
diff --git a/apps/browser/src/autofill/popup/fido2/fido2-v1.component.html b/apps/browser/src/autofill/popup/fido2/fido2-v1.component.html
deleted file mode 100644
index 8a052fbc5b..0000000000
--- a/apps/browser/src/autofill/popup/fido2/fido2-v1.component.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<ng-container *ngIf="data$ | async as data">
-  <div class="auth-wrapper">
-    <div class="auth-header">
-      <div class="left">
-        <ng-container *ngIf="data.message.type != BrowserFido2MessageTypes.PickCredentialRequest">
-          <div class="logo">
-            <i class="bwi bwi-shield"></i>
-          </div>
-        </ng-container>
-        <ng-container *ngIf="data.message.type === BrowserFido2MessageTypes.PickCredentialRequest">
-          <div class="logo">
-            <i class="bwi bwi-shield"></i><span><strong>bit</strong>warden</span>
-          </div>
-        </ng-container>
-      </div>
-      <ng-container
-        *ngIf="data.message.type === BrowserFido2MessageTypes.ConfirmNewCredentialRequest"
-      >
-        <div class="search">
-          <input
-            type="{{ searchTypeSearch ? 'search' : 'text' }}"
-            placeholder="{{ 'searchVault' | i18n }}"
-            id="search"
-            [(ngModel)]="searchText"
-            (input)="search()"
-            autocomplete="off"
-            appAutofocus
-          />
-          <i class="bwi bwi-search" aria-hidden="true"></i>
-        </div>
-        <div class="right">
-          <button type="button" (click)="addCipher()" appA11yTitle="{{ 'addItem' | i18n }}">
-            <i class="bwi bwi-plus bwi-lg bwi-fw" aria-hidden="true"></i>
-          </button>
-        </div>
-      </ng-container>
-    </div>
-
-    <ng-container>
-      <ng-container
-        *ngIf="
-          data.message.type === BrowserFido2MessageTypes.PickCredentialRequest ||
-          data.message.type === BrowserFido2MessageTypes.ConfirmNewCredentialRequest
-        "
-      >
-        <div class="auth-flow">
-          <p class="subtitle" appA11yTitle="{{ subtitleText | i18n }}">
-            {{ subtitleText | i18n }}
-          </p>
-          <!-- Display when ciphers exist -->
-          <ng-container *ngIf="displayedCiphers.length > 0">
-            <div class="box list">
-              <div class="box-content">
-                <app-fido2-cipher-row-v1
-                  *ngFor="let cipherItem of displayedCiphers"
-                  [cipher]="cipherItem"
-                  [isSearching]="searchPending"
-                  title="{{ 'passkeyItem' | i18n }}"
-                  (onSelected)="selectedPasskey($event)"
-                  [isSelected]="cipher === cipherItem"
-                ></app-fido2-cipher-row-v1>
-              </div>
-            </div>
-
-            <div class="box">
-              <button
-                type="submit"
-                (click)="submit()"
-                class="btn primary block"
-                appA11yTitle="{{ credentialText | i18n }}"
-              >
-                <span [hidden]="loading">
-                  {{ credentialText | i18n }}
-                </span>
-                <i
-                  class="bwi bwi-spinner bwi-lg bwi-spin"
-                  [hidden]="!loading"
-                  aria-hidden="true"
-                ></i>
-              </button>
-            </div>
-          </ng-container>
-
-          <ng-container *ngIf="!displayedCiphers.length">
-            <div class="box">
-              <button
-                type="submit"
-                (click)="saveNewLogin()"
-                class="btn primary block"
-                appA11yTitle="{{ 'savePasskeyNewLogin' | i18n }}"
-              >
-                <span [hidden]="loading">
-                  {{ "savePasskeyNewLogin" | i18n }}
-                </span>
-                <i
-                  class="bwi bwi-spinner bwi-lg bwi-spin"
-                  [hidden]="!loading"
-                  aria-hidden="true"
-                ></i>
-              </button>
-            </div>
-          </ng-container>
-        </div>
-      </ng-container>
-      <ng-container
-        *ngIf="data.message.type === BrowserFido2MessageTypes.InformExcludedCredentialRequest"
-      >
-        <div class="auth-flow">
-          <p class="subtitle">{{ "passkeyAlreadyExists" | i18n }}</p>
-          <div class="box list">
-            <div class="box-content">
-              <app-fido2-cipher-row-v1
-                *ngFor="let cipherItem of displayedCiphers"
-                [cipher]="cipherItem"
-                title="{{ 'passkeyItem' | i18n }}"
-                (onSelected)="selectedPasskey($event)"
-                [isSelected]="cipher === cipherItem"
-              ></app-fido2-cipher-row-v1>
-            </div>
-          </div>
-          <button type="button" class="btn primary block" (click)="viewPasskey()">
-            <span [hidden]="loading">{{ "viewItem" | i18n }}</span>
-            <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!loading" aria-hidden="true"></i>
-          </button>
-        </div>
-      </ng-container>
-      <ng-container
-        *ngIf="data.message.type === BrowserFido2MessageTypes.InformCredentialNotFoundRequest"
-      >
-        <div class="auth-flow">
-          <p class="subtitle">{{ "noPasskeysFoundForThisApplication" | i18n }}</p>
-        </div>
-        <button type="button" class="btn primary block" (click)="abort(false)">
-          <span [hidden]="loading">{{ "close" | i18n }}</span>
-          <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!loading" aria-hidden="true"></i>
-        </button>
-      </ng-container>
-    </ng-container>
-
-    <app-fido2-use-browser-link-v1></app-fido2-use-browser-link-v1>
-  </div>
-</ng-container>
diff --git a/apps/browser/src/autofill/popup/fido2/fido2-v1.component.ts b/apps/browser/src/autofill/popup/fido2/fido2-v1.component.ts
deleted file mode 100644
index 8dc603cfe2..0000000000
--- a/apps/browser/src/autofill/popup/fido2/fido2-v1.component.ts
+++ /dev/null
@@ -1,445 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, OnDestroy, OnInit } from "@angular/core";
-import { ActivatedRoute, Router } from "@angular/router";
-import {
-  BehaviorSubject,
-  combineLatest,
-  concatMap,
-  filter,
-  firstValueFrom,
-  map,
-  Observable,
-  Subject,
-  take,
-  takeUntil,
-} from "rxjs";
-
-import { SearchService } from "@bitwarden/common/abstractions/search.service";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { CipherType, SecureNoteType } from "@bitwarden/common/vault/enums";
-import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
-import { CardView } from "@bitwarden/common/vault/models/view/card.view";
-import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view";
-import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
-import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
-import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view";
-import { DialogService } from "@bitwarden/components";
-import { PasswordRepromptService } from "@bitwarden/vault";
-
-import { ZonedMessageListenerService } from "../../../platform/browser/zoned-message-listener.service";
-import { VaultPopoutType } from "../../../vault/popup/utils/vault-popout-window";
-import { Fido2UserVerificationService } from "../../../vault/services/fido2-user-verification.service";
-import {
-  BrowserFido2Message,
-  BrowserFido2UserInterfaceSession,
-  BrowserFido2MessageTypes,
-} from "../../fido2/services/browser-fido2-user-interface.service";
-
-interface ViewData {
-  message: BrowserFido2Message;
-  fallbackSupported: boolean;
-}
-
-@Component({
-  selector: "app-fido2-v1",
-  templateUrl: "fido2-v1.component.html",
-  styleUrls: [],
-})
-export class Fido2V1Component implements OnInit, OnDestroy {
-  private destroy$ = new Subject<void>();
-  private hasSearched = false;
-
-  protected cipher: CipherView;
-  protected searchTypeSearch = false;
-  protected searchPending = false;
-  protected searchText: string;
-  protected url: string;
-  protected hostname: string;
-  protected data$: Observable<ViewData>;
-  protected sessionId?: string;
-  protected senderTabId?: string;
-  protected ciphers?: CipherView[] = [];
-  protected displayedCiphers?: CipherView[] = [];
-  protected loading = false;
-  protected subtitleText: string;
-  protected credentialText: string;
-  protected BrowserFido2MessageTypes = BrowserFido2MessageTypes;
-
-  private message$ = new BehaviorSubject<BrowserFido2Message>(null);
-
-  constructor(
-    private router: Router,
-    private activatedRoute: ActivatedRoute,
-    private cipherService: CipherService,
-    private platformUtilsService: PlatformUtilsService,
-    private domainSettingsService: DomainSettingsService,
-    private searchService: SearchService,
-    private logService: LogService,
-    private dialogService: DialogService,
-    private browserMessagingApi: ZonedMessageListenerService,
-    private passwordRepromptService: PasswordRepromptService,
-    private fido2UserVerificationService: Fido2UserVerificationService,
-    private accountService: AccountService,
-  ) {}
-
-  ngOnInit() {
-    this.searchTypeSearch = !this.platformUtilsService.isSafari();
-
-    const queryParams$ = this.activatedRoute.queryParamMap.pipe(
-      take(1),
-      map((queryParamMap) => ({
-        sessionId: queryParamMap.get("sessionId"),
-        senderTabId: queryParamMap.get("senderTabId"),
-        senderUrl: queryParamMap.get("senderUrl"),
-      })),
-    );
-
-    combineLatest([
-      queryParams$,
-      this.browserMessagingApi.messageListener$() as Observable<BrowserFido2Message>,
-    ])
-      .pipe(
-        concatMap(async ([queryParams, message]) => {
-          this.sessionId = queryParams.sessionId;
-          this.senderTabId = queryParams.senderTabId;
-          this.url = queryParams.senderUrl;
-          // For a 'NewSessionCreatedRequest', abort if it doesn't belong to the current session.
-          if (
-            message.type === BrowserFido2MessageTypes.NewSessionCreatedRequest &&
-            message.sessionId !== queryParams.sessionId
-          ) {
-            this.abort(false);
-            return;
-          }
-
-          // Ignore messages that don't belong to the current session.
-          if (message.sessionId !== queryParams.sessionId) {
-            return;
-          }
-
-          if (message.type === BrowserFido2MessageTypes.AbortRequest) {
-            this.abort(false);
-            return;
-          }
-
-          return message;
-        }),
-        filter((message) => !!message),
-        takeUntil(this.destroy$),
-      )
-      .subscribe((message) => {
-        this.message$.next(message);
-      });
-
-    this.data$ = this.message$.pipe(
-      filter((message) => message != undefined),
-      concatMap(async (message) => {
-        switch (message.type) {
-          case BrowserFido2MessageTypes.ConfirmNewCredentialRequest: {
-            const equivalentDomains = await firstValueFrom(
-              this.domainSettingsService.getUrlEquivalentDomains(this.url),
-            );
-
-            this.ciphers = (await this.cipherService.getAllDecrypted()).filter(
-              (cipher) => cipher.type === CipherType.Login && !cipher.isDeleted,
-            );
-            this.displayedCiphers = this.ciphers.filter(
-              (cipher) =>
-                cipher.login.matchesUri(this.url, equivalentDomains) &&
-                this.hasNoOtherPasskeys(cipher, message.userHandle),
-            );
-
-            if (this.displayedCiphers.length > 0) {
-              this.selectedPasskey(this.displayedCiphers[0]);
-            }
-            break;
-          }
-
-          case BrowserFido2MessageTypes.PickCredentialRequest: {
-            const activeUserId = await firstValueFrom(
-              this.accountService.activeAccount$.pipe(map((a) => a?.id)),
-            );
-
-            this.ciphers = await Promise.all(
-              message.cipherIds.map(async (cipherId) => {
-                const cipher = await this.cipherService.get(cipherId);
-                return cipher.decrypt(
-                  await this.cipherService.getKeyForCipherKeyDecryption(cipher, activeUserId),
-                );
-              }),
-            );
-            this.displayedCiphers = [...this.ciphers];
-            if (this.displayedCiphers.length > 0) {
-              this.selectedPasskey(this.displayedCiphers[0]);
-            }
-            break;
-          }
-
-          case BrowserFido2MessageTypes.InformExcludedCredentialRequest: {
-            const activeUserId = await firstValueFrom(
-              this.accountService.activeAccount$.pipe(map((a) => a?.id)),
-            );
-
-            this.ciphers = await Promise.all(
-              message.existingCipherIds.map(async (cipherId) => {
-                const cipher = await this.cipherService.get(cipherId);
-                return cipher.decrypt(
-                  await this.cipherService.getKeyForCipherKeyDecryption(cipher, activeUserId),
-                );
-              }),
-            );
-            this.displayedCiphers = [...this.ciphers];
-
-            if (this.displayedCiphers.length > 0) {
-              this.selectedPasskey(this.displayedCiphers[0]);
-            }
-            break;
-          }
-        }
-
-        this.subtitleText =
-          this.displayedCiphers.length > 0
-            ? this.getCredentialSubTitleText(message.type)
-            : "noMatchingPasskeyLogin";
-
-        this.credentialText = this.getCredentialButtonText(message.type);
-        return {
-          message,
-          fallbackSupported: "fallbackSupported" in message && message.fallbackSupported,
-        };
-      }),
-      takeUntil(this.destroy$),
-    );
-
-    queryParams$.pipe(takeUntil(this.destroy$)).subscribe((queryParams) => {
-      this.send({
-        sessionId: queryParams.sessionId,
-        type: BrowserFido2MessageTypes.ConnectResponse,
-      });
-    });
-  }
-
-  protected async submit() {
-    const data = this.message$.value;
-    if (data?.type === BrowserFido2MessageTypes.PickCredentialRequest) {
-      // TODO: Revert to use fido2 user verification service once user verification for passkeys is approved for production.
-      // PM-4577 - https://github.com/bitwarden/clients/pull/8746
-      const userVerified = await this.handleUserVerification(data.userVerification, this.cipher);
-
-      this.send({
-        sessionId: this.sessionId,
-        cipherId: this.cipher.id,
-        type: BrowserFido2MessageTypes.PickCredentialResponse,
-        userVerified,
-      });
-    } else if (data?.type === BrowserFido2MessageTypes.ConfirmNewCredentialRequest) {
-      if (this.cipher.login.hasFido2Credentials) {
-        const confirmed = await this.dialogService.openSimpleDialog({
-          title: { key: "overwritePasskey" },
-          content: { key: "overwritePasskeyAlert" },
-          type: "info",
-        });
-
-        if (!confirmed) {
-          return false;
-        }
-      }
-
-      // TODO: Revert to use fido2 user verification service once user verification for passkeys is approved for production.
-      // PM-4577 - https://github.com/bitwarden/clients/pull/8746
-      const userVerified = await this.handleUserVerification(data.userVerification, this.cipher);
-
-      this.send({
-        sessionId: this.sessionId,
-        cipherId: this.cipher.id,
-        type: BrowserFido2MessageTypes.ConfirmNewCredentialResponse,
-        userVerified,
-      });
-    }
-
-    this.loading = true;
-  }
-
-  protected async saveNewLogin() {
-    const data = this.message$.value;
-    if (data?.type === BrowserFido2MessageTypes.ConfirmNewCredentialRequest) {
-      const name = data.credentialName || data.rpId;
-      // TODO: Revert to check for user verification once user verification for passkeys is approved for production.
-      // PM-4577 - https://github.com/bitwarden/clients/pull/8746
-      await this.createNewCipher(name, data.userName);
-
-      // We are bypassing user verification pending approval.
-      this.send({
-        sessionId: this.sessionId,
-        cipherId: this.cipher?.id,
-        type: BrowserFido2MessageTypes.ConfirmNewCredentialResponse,
-        userVerified: data.userVerification,
-      });
-    }
-
-    this.loading = true;
-  }
-
-  getCredentialSubTitleText(messageType: string): string {
-    return messageType == BrowserFido2MessageTypes.ConfirmNewCredentialRequest
-      ? "chooseCipherForPasskeySave"
-      : "logInWithPasskeyQuestion";
-  }
-
-  getCredentialButtonText(messageType: string): string {
-    return messageType == BrowserFido2MessageTypes.ConfirmNewCredentialRequest
-      ? "savePasskey"
-      : "confirm";
-  }
-
-  selectedPasskey(item: CipherView) {
-    this.cipher = item;
-  }
-
-  viewPasskey() {
-    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    this.router.navigate(["/view-cipher"], {
-      queryParams: {
-        cipherId: this.cipher.id,
-        uilocation: "popout",
-        senderTabId: this.senderTabId,
-        sessionId: this.sessionId,
-        singleActionPopout: `${VaultPopoutType.fido2Popout}_${this.sessionId}`,
-      },
-    });
-  }
-
-  addCipher() {
-    const data = this.message$.value;
-
-    if (data?.type !== BrowserFido2MessageTypes.ConfirmNewCredentialRequest) {
-      return;
-    }
-
-    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    this.router.navigate(["/add-cipher"], {
-      queryParams: {
-        name: data.credentialName || data.rpId,
-        uri: this.url,
-        type: CipherType.Login.toString(),
-        uilocation: "popout",
-        username: data.userName,
-        senderTabId: this.senderTabId,
-        sessionId: this.sessionId,
-        userVerification: data.userVerification,
-        singleActionPopout: `${VaultPopoutType.fido2Popout}_${this.sessionId}`,
-      },
-    });
-  }
-
-  protected async search() {
-    this.hasSearched = await this.searchService.isSearchable(this.searchText);
-    this.searchPending = true;
-    if (this.hasSearched) {
-      this.displayedCiphers = await this.searchService.searchCiphers(
-        this.searchText,
-        null,
-        this.ciphers,
-      );
-    } else {
-      const equivalentDomains = await firstValueFrom(
-        this.domainSettingsService.getUrlEquivalentDomains(this.url),
-      );
-      this.displayedCiphers = this.ciphers.filter((cipher) =>
-        cipher.login.matchesUri(this.url, equivalentDomains),
-      );
-    }
-    this.searchPending = false;
-    this.selectedPasskey(this.displayedCiphers[0]);
-  }
-
-  abort(fallback: boolean) {
-    this.unload(fallback);
-    window.close();
-  }
-
-  unload(fallback = false) {
-    this.send({
-      sessionId: this.sessionId,
-      type: BrowserFido2MessageTypes.AbortResponse,
-      fallbackRequested: fallback,
-    });
-  }
-
-  ngOnDestroy(): void {
-    this.destroy$.next();
-    this.destroy$.complete();
-  }
-
-  private buildCipher(name: string, username: string) {
-    this.cipher = new CipherView();
-    this.cipher.name = name;
-
-    this.cipher.type = CipherType.Login;
-    this.cipher.login = new LoginView();
-    this.cipher.login.username = username;
-    this.cipher.login.uris = [new LoginUriView()];
-    this.cipher.login.uris[0].uri = this.url;
-    this.cipher.card = new CardView();
-    this.cipher.identity = new IdentityView();
-    this.cipher.secureNote = new SecureNoteView();
-    this.cipher.secureNote.type = SecureNoteType.Generic;
-    this.cipher.reprompt = CipherRepromptType.None;
-  }
-
-  private async createNewCipher(name: string, username: string) {
-    const activeUserId = await firstValueFrom(
-      this.accountService.activeAccount$.pipe(map((a) => a?.id)),
-    );
-
-    this.buildCipher(name, username);
-    const cipher = await this.cipherService.encrypt(this.cipher, activeUserId);
-    try {
-      await this.cipherService.createWithServer(cipher);
-      this.cipher.id = cipher.id;
-    } catch (e) {
-      this.logService.error(e);
-    }
-  }
-
-  // TODO: Remove and use fido2 user verification service once user verification for passkeys is approved for production.
-  private async handleUserVerification(
-    userVerificationRequested: boolean,
-    cipher: CipherView,
-  ): Promise<boolean> {
-    const masterPasswordRepromptRequired = cipher && cipher.reprompt !== 0;
-
-    if (masterPasswordRepromptRequired) {
-      return await this.passwordRepromptService.showPasswordPrompt();
-    }
-
-    return userVerificationRequested;
-  }
-
-  private send(msg: BrowserFido2Message) {
-    BrowserFido2UserInterfaceSession.sendMessage({
-      sessionId: this.sessionId,
-      ...msg,
-    });
-  }
-
-  /**
-   * This methods returns true if a cipher either has no passkeys, or has a passkey matching with userHandle
-   * @param userHandle
-   */
-  private hasNoOtherPasskeys(cipher: CipherView, userHandle: string): boolean {
-    if (cipher.login.fido2Credentials == null || cipher.login.fido2Credentials.length === 0) {
-      return true;
-    }
-
-    return cipher.login.fido2Credentials.some((passkey) => passkey.userHandle === userHandle);
-  }
-}
diff --git a/apps/browser/src/autofill/popup/settings/autofill-v1.component.html b/apps/browser/src/autofill/popup/settings/autofill-v1.component.html
deleted file mode 100644
index 1c16ee1fe1..0000000000
--- a/apps/browser/src/autofill/popup/settings/autofill-v1.component.html
+++ /dev/null
@@ -1,270 +0,0 @@
-<header>
-  <div class="left">
-    <button type="button" routerLink="/tabs/settings">
-      <span class="header-icon"><i class="bwi bwi-angle-left" aria-hidden="true"></i></span>
-      <span>{{ "back" | i18n }}</span>
-    </button>
-  </div>
-  <h1 class="center">
-    <span class="title">{{ "autofill" | i18n }}</span>
-  </h1>
-  <div class="right"></div>
-</header>
-<main tabindex="-1">
-  <div class="box tw-mt-4">
-    <div class="box-content">
-      <button
-        type="button"
-        class="box-content-row box-content-row-link box-content-row-flex"
-        (click)="commandSettings()"
-      >
-        <div class="row-main">{{ "autofillShortcut" | i18n }}</div>
-        <i class="bwi bwi-external-link bwi-lg bwi-fw" aria-hidden="true"></i>
-      </button>
-    </div>
-    <div id="autofillKeyboardHelp" class="box-footer">
-      {{ autofillKeyboardHelperText }}
-    </div>
-  </div>
-  <div class="box">
-    <div class="box-content">
-      <div class="box-content-row" appBoxRow>
-        <label for="autofill-overlay-settings">{{ "showAutoFillMenuOnFormFields" | i18n }}</label>
-        <select
-          id="autofill-overlay-settings"
-          name="autofill-overlay-settings"
-          [(ngModel)]="autoFillOverlayVisibility"
-          (change)="updateAutoFillOverlayVisibility()"
-        >
-          <option *ngFor="let o of autoFillOverlayVisibilityOptions" [ngValue]="o.value">
-            {{ o.name }}
-          </option>
-        </select>
-      </div>
-      <div class="box-footer" *ngIf="accountSwitcherEnabled || !canOverrideBrowserAutofillSetting">
-        <span *ngIf="accountSwitcherEnabled">{{ "showInlineMenuOnFormFieldsDescAlt" | i18n }}</span>
-        <span *ngIf="!canOverrideBrowserAutofillSetting">
-          {{ "turnOffBrowserBuiltInPasswordManagerSettings" | i18n }}
-          <a
-            [attr.href]="disablePasswordManagerLink"
-            (click)="openDisablePasswordManagerLink($event)"
-            target="_blank"
-            rel="noreferrer"
-          >
-            {{ "turnOffBrowserBuiltInPasswordManagerSettingsLink" | i18n }}
-          </a>
-        </span>
-      </div>
-    </div>
-  </div>
-  <div class="box tw-mb-5" *ngIf="inlineMenuPositioningImprovementsEnabled && inlineMenuIsEnabled">
-    <div class="box-content">
-      <div class="box-content-row box-content-row-checkbox" appBoxRow>
-        <label for="show-inline-menu-identities" class="!tw-mr-0">{{
-          "showInlineMenuIdentitiesLabel" | i18n
-        }}</label>
-        <input
-          id="show-inline-menu-identities"
-          type="checkbox"
-          (change)="updateShowInlineMenuIdentities()"
-          [(ngModel)]="showInlineMenuIdentities"
-        />
-      </div>
-      <div class="box-content-row box-content-row-checkbox" appBoxRow>
-        <label for="show-inline-menu-cards" class="!tw-mr-0">{{
-          "showInlineMenuCardsLabel" | i18n
-        }}</label>
-        <input
-          id="show-inline-menu-cards"
-          type="checkbox"
-          (change)="updateShowInlineMenuCards()"
-          [(ngModel)]="showInlineMenuCards"
-        />
-      </div>
-    </div>
-  </div>
-  <div class="box">
-    <div class="box-content" *ngIf="canOverrideBrowserAutofillSetting">
-      <div class="box-content-row box-content-row-checkbox" appBoxRow>
-        <label for="overrideBrowserAutofill" class="!tw-mr-0">{{
-          "overrideDefaultBrowserAutoFillSettings" | i18n
-        }}</label>
-        <input
-          id="overrideBrowserAutofill"
-          type="checkbox"
-          (change)="updateDefaultBrowserAutofillDisabled()"
-          [(ngModel)]="defaultBrowserAutofillDisabled"
-        />
-      </div>
-    </div>
-    <div class="box-footer" *ngIf="canOverrideBrowserAutofillSetting">
-      <span *ngIf="accountSwitcherEnabled">{{ "showInlineMenuOnFormFieldsDescAlt" | i18n }}</span>
-      {{ "turnOffBrowserBuiltInPasswordManagerSettings" | i18n }}
-      <a
-        [attr.href]="disablePasswordManagerLink"
-        (click)="openDisablePasswordManagerLink($event)"
-        target="_blank"
-        rel="noreferrer"
-      >
-        {{ "turnOffBrowserBuiltInPasswordManagerSettingsLink" | i18n }}
-      </a>
-    </div>
-  </div>
-  <div class="box tw-mt-4">
-    <div class="box-content">
-      <div class="box-content-row box-content-row-checkbox" appBoxRow>
-        <label for="autofill">{{ "enableAutoFillOnPageLoad" | i18n }}</label>
-        <input
-          id="autofill"
-          type="checkbox"
-          aria-describedby="autofillHelp"
-          (change)="updateAutoFillOnPageLoad()"
-          [(ngModel)]="enableAutoFillOnPageLoad"
-        />
-      </div>
-    </div>
-    <div id="autofillHelp" class="box-footer">
-      {{ "enableAutoFillOnPageLoadDesc" | i18n }}
-      <b>{{ "warning" | i18n }}</b
-      >: {{ "experimentalFeature" | i18n }}
-      <a href="https://bitwarden.com/help/auto-fill-browser/" target="_blank" rel="noreferrer">
-        {{ "learnMoreAboutAutofill" | i18n }}.
-        <i
-          [attr.aria-label]="'opensInANewWindow' | i18n"
-          class="bwi bwi-external-link bwi-sm bwi-fw"
-        ></i>
-      </a>
-    </div>
-  </div>
-  <div class="box">
-    <div class="box-content">
-      <div class="box-content-row" appBoxRow>
-        <label for="defaultAutofill">{{ "defaultAutoFillOnPageLoad" | i18n }}</label>
-        <select
-          id="defaultAutofill"
-          name="DefaultAutofill"
-          aria-describedby="defaultAutofillHelp"
-          [(ngModel)]="autoFillOnPageLoadDefault"
-          (change)="updateAutoFillOnPageLoadDefault()"
-          [disabled]="!enableAutoFillOnPageLoad"
-        >
-          <option *ngFor="let o of autoFillOnPageLoadOptions" [ngValue]="o.value">
-            {{ o.name }}
-          </option>
-        </select>
-      </div>
-    </div>
-    <div id="defaultAutofillHelp" class="box-footer">
-      {{ "defaultAutoFillOnPageLoadDesc" | i18n }}
-    </div>
-  </div>
-  <div class="box">
-    <h2 class="box-header">{{ "additionalOptions" | i18n }}</h2>
-    <div class="box-content">
-      <div class="box-content-row box-content-row-checkbox" appBoxRow>
-        <label for="context-menu">{{ "enableContextMenuItem" | i18n }}</label>
-        <input
-          id="context-menu"
-          type="checkbox"
-          aria-describedby="context-menuHelp"
-          (change)="updateContextMenuItem()"
-          [(ngModel)]="enableContextMenuItem"
-        />
-      </div>
-    </div>
-    <div id="context-menuHelp" class="box-footer">
-      {{
-        accountSwitcherEnabled ? ("contextMenuItemDescAlt" | i18n) : ("contextMenuItemDesc" | i18n)
-      }}
-    </div>
-    <div class="box-content">
-      <div class="box-content-row box-content-row-checkbox" appBoxRow>
-        <label for="totp">{{ "enableAutoTotpCopy" | i18n }}</label>
-        <input
-          id="totp"
-          type="checkbox"
-          aria-describedby="totpHelp"
-          (change)="updateAutoTotpCopy()"
-          [(ngModel)]="enableAutoTotpCopy"
-        />
-      </div>
-    </div>
-    <div id="totpHelp" class="box-footer">{{ "disableAutoTotpCopyDesc" | i18n }}</div>
-    <div class="box-content">
-      <div class="box-content-row" appBoxRow>
-        <label for="clearClipboard">{{ "clearClipboard" | i18n }}</label>
-        <select
-          id="clearClipboard"
-          name="ClearClipboard"
-          aria-describedby="clearClipboardHelp"
-          [(ngModel)]="clearClipboard"
-          (change)="saveClearClipboard()"
-        >
-          <option *ngFor="let o of clearClipboardOptions" [ngValue]="o.value">
-            {{ o.name }}
-          </option>
-        </select>
-      </div>
-    </div>
-    <div id="clearClipboardHelp" class="box-footer">{{ "clearClipboardDesc" | i18n }}</div>
-    <div class="box-content">
-      <div class="box-content-row" appBoxRow>
-        <label for="defaultUriMatch">{{ "defaultUriMatchDetection" | i18n }}</label>
-        <select
-          id="defaultUriMatch"
-          name="DefaultUriMatch"
-          aria-describedby="defaultUriMatchHelp"
-          [(ngModel)]="defaultUriMatch"
-          (change)="saveDefaultUriMatch()"
-        >
-          <option *ngFor="let o of uriMatchOptions" [ngValue]="o.value">{{ o.name }}</option>
-        </select>
-      </div>
-    </div>
-    <div id="defaultUriMatchHelp" class="box-footer">
-      {{ "defaultUriMatchDetectionDesc" | i18n }}
-    </div>
-    <div class="box-content">
-      <div class="box-content-row box-content-row-checkbox" appBoxRow>
-        <label for="showCardsCurrentTab">{{ "showCardsCurrentTab" | i18n }}</label>
-        <input
-          id="showCardsCurrentTab"
-          type="checkbox"
-          aria-describedby="showCardsCurrentTabHelp"
-          (change)="updateShowCardsCurrentTab()"
-          [(ngModel)]="showCardsCurrentTab"
-        />
-      </div>
-    </div>
-    <div id="showCardsCurrentTabHelp" class="box-footer">
-      {{ "showCardsCurrentTabDesc" | i18n }}
-    </div>
-    <div class="box-content">
-      <div class="box-content-row box-content-row-checkbox" appBoxRow>
-        <label for="showIdentitiesCurrentTab">{{ "showIdentitiesCurrentTab" | i18n }}</label>
-        <input
-          id="showIdentitiesCurrentTab"
-          type="checkbox"
-          aria-describedby="showIdentitiesCurrentTabHelp"
-          (change)="updateShowIdentitiesCurrentTab()"
-          [(ngModel)]="showIdentitiesCurrentTab"
-        />
-      </div>
-    </div>
-    <div id="showIdentitiesCurrentTabHelp" class="box-footer">
-      {{ "showIdentitiesCurrentTabDesc" | i18n }}
-    </div>
-  </div>
-  <div class="box list" *ngIf="blockBrowserInjectionsByDomainEnabled">
-    <div class="box-content single-line">
-      <button
-        type="button"
-        class="box-content-row box-content-row-flex text-default"
-        routerLink="/blocked-domains"
-      >
-        <div class="row-main">{{ "blockedDomains" | i18n }}</div>
-        <i class="bwi bwi-angle-right bwi-lg row-sub-icon" aria-hidden="true"></i>
-      </button>
-    </div>
-  </div>
-</main>
diff --git a/apps/browser/src/autofill/popup/settings/autofill-v1.component.ts b/apps/browser/src/autofill/popup/settings/autofill-v1.component.ts
deleted file mode 100644
index 9f015d990e..0000000000
--- a/apps/browser/src/autofill/popup/settings/autofill-v1.component.ts
+++ /dev/null
@@ -1,344 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, OnInit } from "@angular/core";
-import { firstValueFrom } from "rxjs";
-
-import { AutofillOverlayVisibility } from "@bitwarden/common/autofill/constants";
-import { AutofillSettingsServiceAbstraction } from "@bitwarden/common/autofill/services/autofill-settings.service";
-import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
-import {
-  InlineMenuVisibilitySetting,
-  ClearClipboardDelaySetting,
-} from "@bitwarden/common/autofill/types";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import {
-  UriMatchStrategy,
-  UriMatchStrategySetting,
-} from "@bitwarden/common/models/domain/domain-service";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { VaultSettingsService } from "@bitwarden/common/vault/abstractions/vault-settings/vault-settings.service";
-import { DialogService } from "@bitwarden/components";
-
-import { BrowserApi } from "../../../platform/browser/browser-api";
-import { enableAccountSwitching } from "../../../platform/flags";
-
-@Component({
-  selector: "app-autofill-v1",
-  templateUrl: "autofill-v1.component.html",
-})
-export class AutofillV1Component implements OnInit {
-  protected canOverrideBrowserAutofillSetting = false;
-  protected defaultBrowserAutofillDisabled = false;
-  protected autoFillOverlayVisibility: InlineMenuVisibilitySetting;
-  protected autoFillOverlayVisibilityOptions: any[];
-  protected disablePasswordManagerLink: string;
-  protected inlineMenuPositioningImprovementsEnabled: boolean = false;
-  protected blockBrowserInjectionsByDomainEnabled: boolean = false;
-  protected showInlineMenuIdentities: boolean = true;
-  protected showInlineMenuCards: boolean = true;
-  inlineMenuIsEnabled: boolean = false;
-  enableAutoFillOnPageLoad = false;
-  autoFillOnPageLoadDefault = false;
-  autoFillOnPageLoadOptions: any[];
-  enableContextMenuItem = false;
-  enableAutoTotpCopy = false; // TODO: Does it matter if this is set to false or true?
-  clearClipboard: ClearClipboardDelaySetting;
-  clearClipboardOptions: any[];
-  defaultUriMatch: UriMatchStrategySetting = UriMatchStrategy.Domain;
-  uriMatchOptions: any[];
-  showCardsCurrentTab = false;
-  showIdentitiesCurrentTab = false;
-  autofillKeyboardHelperText: string;
-  accountSwitcherEnabled = false;
-
-  constructor(
-    private i18nService: I18nService,
-    private platformUtilsService: PlatformUtilsService,
-    private domainSettingsService: DomainSettingsService,
-    private configService: ConfigService,
-    private dialogService: DialogService,
-    private autofillSettingsService: AutofillSettingsServiceAbstraction,
-    private messagingService: MessagingService,
-    private vaultSettingsService: VaultSettingsService,
-  ) {
-    this.autoFillOverlayVisibilityOptions = [
-      {
-        name: i18nService.t("autofillOverlayVisibilityOff"),
-        value: AutofillOverlayVisibility.Off,
-      },
-      {
-        name: i18nService.t("autofillOverlayVisibilityOnFieldFocus"),
-        value: AutofillOverlayVisibility.OnFieldFocus,
-      },
-      {
-        name: i18nService.t("autofillOverlayVisibilityOnButtonClick"),
-        value: AutofillOverlayVisibility.OnButtonClick,
-      },
-    ];
-    this.autoFillOnPageLoadOptions = [
-      { name: i18nService.t("autoFillOnPageLoadYes"), value: true },
-      { name: i18nService.t("autoFillOnPageLoadNo"), value: false },
-    ];
-    this.clearClipboardOptions = [
-      { name: i18nService.t("never"), value: null },
-      { name: i18nService.t("tenSeconds"), value: 10 },
-      { name: i18nService.t("twentySeconds"), value: 20 },
-      { name: i18nService.t("thirtySeconds"), value: 30 },
-      { name: i18nService.t("oneMinute"), value: 60 },
-      { name: i18nService.t("twoMinutes"), value: 120 },
-      { name: i18nService.t("fiveMinutes"), value: 300 },
-    ];
-    this.uriMatchOptions = [
-      { name: i18nService.t("baseDomainOptionRecommended"), value: UriMatchStrategy.Domain },
-      { name: i18nService.t("host"), value: UriMatchStrategy.Host },
-      { name: i18nService.t("startsWith"), value: UriMatchStrategy.StartsWith },
-      { name: i18nService.t("regEx"), value: UriMatchStrategy.RegularExpression },
-      { name: i18nService.t("exact"), value: UriMatchStrategy.Exact },
-      { name: i18nService.t("never"), value: UriMatchStrategy.Never },
-    ];
-
-    this.accountSwitcherEnabled = enableAccountSwitching();
-    this.disablePasswordManagerLink = this.getDisablePasswordManagerLink();
-  }
-
-  async ngOnInit() {
-    this.canOverrideBrowserAutofillSetting =
-      this.platformUtilsService.isChrome() ||
-      this.platformUtilsService.isEdge() ||
-      this.platformUtilsService.isOpera() ||
-      this.platformUtilsService.isVivaldi();
-
-    this.defaultBrowserAutofillDisabled = await this.browserAutofillSettingCurrentlyOverridden();
-
-    this.autoFillOverlayVisibility = await firstValueFrom(
-      this.autofillSettingsService.inlineMenuVisibility$,
-    );
-
-    this.inlineMenuPositioningImprovementsEnabled = await this.configService.getFeatureFlag(
-      FeatureFlag.InlineMenuPositioningImprovements,
-    );
-
-    this.blockBrowserInjectionsByDomainEnabled = await this.configService.getFeatureFlag(
-      FeatureFlag.BlockBrowserInjectionsByDomain,
-    );
-
-    this.inlineMenuIsEnabled = this.isInlineMenuEnabled();
-
-    this.showInlineMenuIdentities =
-      this.inlineMenuPositioningImprovementsEnabled &&
-      (await firstValueFrom(this.autofillSettingsService.showInlineMenuIdentities$));
-
-    this.showInlineMenuCards =
-      this.inlineMenuPositioningImprovementsEnabled &&
-      (await firstValueFrom(this.autofillSettingsService.showInlineMenuCards$));
-
-    this.enableAutoFillOnPageLoad = await firstValueFrom(
-      this.autofillSettingsService.autofillOnPageLoad$,
-    );
-
-    this.autoFillOnPageLoadDefault = await firstValueFrom(
-      this.autofillSettingsService.autofillOnPageLoadDefault$,
-    );
-
-    this.enableContextMenuItem = await firstValueFrom(
-      this.autofillSettingsService.enableContextMenu$,
-    );
-
-    this.enableAutoTotpCopy = await firstValueFrom(this.autofillSettingsService.autoCopyTotp$);
-
-    this.clearClipboard = await firstValueFrom(this.autofillSettingsService.clearClipboardDelay$);
-
-    const defaultUriMatch = await firstValueFrom(
-      this.domainSettingsService.defaultUriMatchStrategy$,
-    );
-    this.defaultUriMatch = defaultUriMatch == null ? UriMatchStrategy.Domain : defaultUriMatch;
-
-    const command = await this.platformUtilsService.getAutofillKeyboardShortcut();
-    await this.setAutofillKeyboardHelperText(command);
-
-    this.showCardsCurrentTab = await firstValueFrom(this.vaultSettingsService.showCardsCurrentTab$);
-
-    this.showIdentitiesCurrentTab = await firstValueFrom(
-      this.vaultSettingsService.showIdentitiesCurrentTab$,
-    );
-  }
-
-  isInlineMenuEnabled() {
-    return (
-      this.autoFillOverlayVisibility === AutofillOverlayVisibility.OnFieldFocus ||
-      this.autoFillOverlayVisibility === AutofillOverlayVisibility.OnButtonClick
-    );
-  }
-
-  async updateAutoFillOverlayVisibility() {
-    await this.autofillSettingsService.setInlineMenuVisibility(this.autoFillOverlayVisibility);
-    await this.requestPrivacyPermission();
-
-    this.inlineMenuIsEnabled = this.isInlineMenuEnabled();
-  }
-
-  async updateAutoFillOnPageLoad() {
-    await this.autofillSettingsService.setAutofillOnPageLoad(this.enableAutoFillOnPageLoad);
-  }
-
-  async updateAutoFillOnPageLoadDefault() {
-    await this.autofillSettingsService.setAutofillOnPageLoadDefault(this.autoFillOnPageLoadDefault);
-  }
-
-  async saveDefaultUriMatch() {
-    await this.domainSettingsService.setDefaultUriMatchStrategy(this.defaultUriMatch);
-  }
-
-  private async setAutofillKeyboardHelperText(command: string) {
-    if (command) {
-      this.autofillKeyboardHelperText = this.i18nService.t("autofillLoginShortcutText", command);
-    } else {
-      this.autofillKeyboardHelperText = this.i18nService.t("autofillLoginShortcutNotSet");
-    }
-  }
-
-  async commandSettings() {
-    if (this.platformUtilsService.isChrome()) {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      BrowserApi.createNewTab("chrome://extensions/shortcuts");
-    } else if (this.platformUtilsService.isOpera()) {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      BrowserApi.createNewTab("opera://extensions/shortcuts");
-    } else if (this.platformUtilsService.isEdge()) {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      BrowserApi.createNewTab("edge://extensions/shortcuts");
-    } else if (this.platformUtilsService.isVivaldi()) {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      BrowserApi.createNewTab("vivaldi://extensions/shortcuts");
-    } else {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      BrowserApi.createNewTab("https://bitwarden.com/help/keyboard-shortcuts");
-    }
-  }
-
-  private getDisablePasswordManagerLink(): string {
-    if (this.platformUtilsService.isChrome()) {
-      return "chrome://settings/autofill";
-    }
-    if (this.platformUtilsService.isOpera()) {
-      return "opera://settings/autofill";
-    }
-    if (this.platformUtilsService.isEdge()) {
-      return "edge://settings/passwords";
-    }
-    if (this.platformUtilsService.isVivaldi()) {
-      return "vivaldi://settings/autofill";
-    }
-
-    return "https://bitwarden.com/help/disable-browser-autofill/";
-  }
-
-  protected openDisablePasswordManagerLink(event: Event) {
-    event.preventDefault();
-    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    BrowserApi.createNewTab(this.disablePasswordManagerLink);
-  }
-
-  async requestPrivacyPermission() {
-    if (
-      this.autoFillOverlayVisibility === AutofillOverlayVisibility.Off ||
-      !this.canOverrideBrowserAutofillSetting ||
-      (await this.browserAutofillSettingCurrentlyOverridden())
-    ) {
-      return;
-    }
-
-    await this.dialogService.openSimpleDialog({
-      title: { key: "overrideDefaultBrowserAutofillTitle" },
-      content: { key: "overrideDefaultBrowserAutofillDescription" },
-      acceptButtonText: { key: "makeDefault" },
-      acceptAction: async () => await this.handleOverrideDialogAccept(),
-      cancelButtonText: { key: "ignore" },
-      type: "info",
-    });
-  }
-
-  async updateDefaultBrowserAutofillDisabled() {
-    const privacyPermissionGranted = await this.privacyPermissionGranted();
-    if (!this.defaultBrowserAutofillDisabled && !privacyPermissionGranted) {
-      return;
-    }
-
-    if (
-      !privacyPermissionGranted &&
-      !(await BrowserApi.requestPermission({ permissions: ["privacy"] }))
-    ) {
-      await this.dialogService.openSimpleDialog({
-        title: { key: "privacyPermissionAdditionNotGrantedTitle" },
-        content: { key: "privacyPermissionAdditionNotGrantedDescription" },
-        acceptButtonText: { key: "ok" },
-        cancelButtonText: null,
-        type: "warning",
-      });
-      this.defaultBrowserAutofillDisabled = false;
-
-      return;
-    }
-
-    BrowserApi.updateDefaultBrowserAutofillSettings(!this.defaultBrowserAutofillDisabled);
-  }
-
-  private handleOverrideDialogAccept = async () => {
-    this.defaultBrowserAutofillDisabled = true;
-    await this.updateDefaultBrowserAutofillDisabled();
-  };
-
-  async browserAutofillSettingCurrentlyOverridden() {
-    if (!this.canOverrideBrowserAutofillSetting) {
-      return false;
-    }
-
-    if (!(await this.privacyPermissionGranted())) {
-      return false;
-    }
-
-    return await BrowserApi.browserAutofillSettingsOverridden();
-  }
-
-  async privacyPermissionGranted(): Promise<boolean> {
-    return await BrowserApi.permissionsGranted(["privacy"]);
-  }
-
-  async updateContextMenuItem() {
-    await this.autofillSettingsService.setEnableContextMenu(this.enableContextMenuItem);
-    this.messagingService.send("bgUpdateContextMenu");
-  }
-
-  async updateAutoTotpCopy() {
-    await this.autofillSettingsService.setAutoCopyTotp(this.enableAutoTotpCopy);
-  }
-
-  async saveClearClipboard() {
-    await this.autofillSettingsService.setClearClipboardDelay(this.clearClipboard);
-  }
-
-  async updateShowCardsCurrentTab() {
-    await this.vaultSettingsService.setShowCardsCurrentTab(this.showCardsCurrentTab);
-  }
-
-  async updateShowIdentitiesCurrentTab() {
-    await this.vaultSettingsService.setShowIdentitiesCurrentTab(this.showIdentitiesCurrentTab);
-  }
-
-  async updateShowInlineMenuCards() {
-    await this.autofillSettingsService.setShowInlineMenuCards(this.showInlineMenuCards);
-  }
-
-  async updateShowInlineMenuIdentities() {
-    await this.autofillSettingsService.setShowInlineMenuIdentities(this.showInlineMenuIdentities);
-  }
-}
diff --git a/apps/browser/src/autofill/popup/settings/excluded-domains-v1.component.html b/apps/browser/src/autofill/popup/settings/excluded-domains-v1.component.html
deleted file mode 100644
index 8f78ac1640..0000000000
--- a/apps/browser/src/autofill/popup/settings/excluded-domains-v1.component.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<form #form (ngSubmit)="submit()">
-  <header>
-    <div class="left">
-      <button type="button" routerLink="/notifications">
-        <span class="header-icon"><i class="bwi bwi-angle-left" aria-hidden="true"></i></span>
-        <span>{{ "back" | i18n }}</span>
-      </button>
-    </div>
-    <h1 class="center">
-      <span class="title">{{ "excludedDomains" | i18n }}</span>
-    </h1>
-    <div class="right">
-      <button type="submit">{{ "save" | i18n }}</button>
-    </div>
-  </header>
-  <main tabindex="-1">
-    <div class="box">
-      <div class="box-content">
-        <div class="box-footer" [ngStyle]="{ marginTop: '10px' }">
-          {{
-            accountSwitcherEnabled
-              ? ("excludedDomainsDescAlt" | i18n)
-              : ("excludedDomainsDesc" | i18n)
-          }}
-        </div>
-        <ng-container *ngIf="excludedDomains">
-          <div
-            class="box-content-row box-content-row-multi"
-            appBoxRow
-            *ngFor="let domain of excludedDomains; let i = index; trackBy: trackByFunction"
-          >
-            <button
-              type="button"
-              appStopClick
-              (click)="removeUri(i)"
-              appA11yTitle="{{ 'remove' | i18n }}"
-            >
-              <i class="bwi bwi-minus-circle bwi-lg" aria-hidden="true"></i>
-            </button>
-            <div class="row-main">
-              <label for="excludedDomain{{ i }}">{{ "uriPosition" | i18n: i + 1 }}</label>
-              <input
-                id="excludedDomain{{ i }}"
-                name="excludedDomain{{ i }}"
-                type="text"
-                [(ngModel)]="domain.uri"
-                placeholder="{{ 'ex' | i18n }} https://google.com"
-                inputmode="url"
-                appInputVerbatim
-              />
-              <label for="currentUris{{ i }}" class="sr-only">
-                {{ "currentUri" | i18n }} {{ i + 1 }}
-              </label>
-              <select
-                *ngIf="currentUris && currentUris.length"
-                id="currentUris{{ i }}"
-                name="currentUris{{ i }}"
-                [(ngModel)]="domain.uri"
-                [hidden]="!domain.showCurrentUris"
-              >
-                <option [ngValue]="null">-- {{ "select" | i18n }} --</option>
-                <option *ngFor="let u of currentUris" [ngValue]="u">{{ u }}</option>
-              </select>
-            </div>
-            <div class="action-buttons">
-              <button
-                type="button"
-                *ngIf="currentUris && currentUris.length"
-                class="row-btn"
-                appStopClick
-                appA11yTitle="{{ 'toggleCurrentUris' | i18n }}"
-                (click)="toggleUriInput(domain)"
-                [attr.aria-pressed]="domain.showCurrentUris === true"
-              >
-                <i aria-hidden="true" class="bwi bwi-lg bwi-list"></i>
-              </button>
-            </div>
-          </div>
-        </ng-container>
-        <button
-          type="button"
-          appStopClick
-          (click)="addUri()"
-          class="box-content-row box-content-row-newmulti single-line"
-        >
-          <i class="bwi bwi-plus-circle bwi-fw bwi-lg" aria-hidden="true"></i> {{ "newUri" | i18n }}
-        </button>
-      </div>
-    </div>
-  </main>
-</form>
diff --git a/apps/browser/src/autofill/popup/settings/excluded-domains-v1.component.ts b/apps/browser/src/autofill/popup/settings/excluded-domains-v1.component.ts
deleted file mode 100644
index 1a7dcd9c2d..0000000000
--- a/apps/browser/src/autofill/popup/settings/excluded-domains-v1.component.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, NgZone, OnDestroy, OnInit } from "@angular/core";
-import { Router } from "@angular/router";
-import { firstValueFrom } from "rxjs";
-
-import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
-import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
-
-import { BrowserApi } from "../../../platform/browser/browser-api";
-import { enableAccountSwitching } from "../../../platform/flags";
-
-interface ExcludedDomain {
-  uri: string;
-  showCurrentUris: boolean;
-}
-
-const BroadcasterSubscriptionId = "excludedDomains";
-
-@Component({
-  selector: "app-excluded-domains-v1",
-  templateUrl: "excluded-domains-v1.component.html",
-})
-export class ExcludedDomainsV1Component implements OnInit, OnDestroy {
-  excludedDomains: ExcludedDomain[] = [];
-  existingExcludedDomains: ExcludedDomain[] = [];
-  currentUris: string[];
-  loadCurrentUrisTimeout: number;
-  accountSwitcherEnabled = false;
-
-  constructor(
-    private domainSettingsService: DomainSettingsService,
-    private i18nService: I18nService,
-    private router: Router,
-    private broadcasterService: BroadcasterService,
-    private ngZone: NgZone,
-    private platformUtilsService: PlatformUtilsService,
-  ) {
-    this.accountSwitcherEnabled = enableAccountSwitching();
-  }
-
-  async ngOnInit() {
-    const savedDomains = await firstValueFrom(this.domainSettingsService.neverDomains$);
-    if (savedDomains) {
-      for (const uri of Object.keys(savedDomains)) {
-        this.excludedDomains.push({ uri: uri, showCurrentUris: false });
-        this.existingExcludedDomains.push({ uri: uri, showCurrentUris: false });
-      }
-    }
-
-    await this.loadCurrentUris();
-
-    this.broadcasterService.subscribe(BroadcasterSubscriptionId, (message: any) => {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.ngZone.run(async () => {
-        switch (message.command) {
-          case "tabChanged":
-          case "windowChanged":
-            if (this.loadCurrentUrisTimeout != null) {
-              window.clearTimeout(this.loadCurrentUrisTimeout);
-            }
-            this.loadCurrentUrisTimeout = window.setTimeout(
-              async () => await this.loadCurrentUris(),
-              500,
-            );
-            break;
-          default:
-            break;
-        }
-      });
-    });
-  }
-
-  ngOnDestroy() {
-    this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
-  }
-
-  async addUri() {
-    this.excludedDomains.push({ uri: "", showCurrentUris: false });
-  }
-
-  async removeUri(i: number) {
-    this.excludedDomains.splice(i, 1);
-  }
-
-  async submit() {
-    const savedDomains: { [name: string]: null } = {};
-    const newExcludedDomains = this.getNewlyAddedDomains(this.excludedDomains);
-    for (const domain of this.excludedDomains) {
-      const resp = newExcludedDomains.filter((e) => e.uri === domain.uri);
-      if (resp.length === 0) {
-        savedDomains[domain.uri] = null;
-      } else {
-        if (domain.uri && domain.uri !== "") {
-          const validDomain = Utils.getHostname(domain.uri);
-          if (!validDomain) {
-            this.platformUtilsService.showToast(
-              "error",
-              null,
-              this.i18nService.t("excludedDomainsInvalidDomain", domain.uri),
-            );
-            return;
-          }
-          savedDomains[validDomain] = null;
-        }
-      }
-    }
-
-    await this.domainSettingsService.setNeverDomains(savedDomains);
-    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    this.router.navigate(["/tabs/settings"]);
-  }
-
-  trackByFunction(index: number, item: any) {
-    return index;
-  }
-
-  getNewlyAddedDomains(domain: ExcludedDomain[]): ExcludedDomain[] {
-    const result = this.excludedDomains.filter(
-      (newDomain) =>
-        !this.existingExcludedDomains.some((oldDomain) => newDomain.uri === oldDomain.uri),
-    );
-    return result;
-  }
-
-  toggleUriInput(domain: ExcludedDomain) {
-    domain.showCurrentUris = !domain.showCurrentUris;
-  }
-
-  async loadCurrentUris() {
-    const tabs = await BrowserApi.tabsQuery({ windowType: "normal" });
-    if (tabs) {
-      const uriSet = new Set(tabs.map((tab) => Utils.getHostname(tab.url)));
-      uriSet.delete(null);
-      this.currentUris = Array.from(uriSet);
-    }
-  }
-}
diff --git a/apps/browser/src/autofill/popup/settings/notifications-v1.component.html b/apps/browser/src/autofill/popup/settings/notifications-v1.component.html
deleted file mode 100644
index 89d83c9e48..0000000000
--- a/apps/browser/src/autofill/popup/settings/notifications-v1.component.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<header>
-  <div class="left">
-    <button type="button" routerLink="/tabs/settings">
-      <span class="header-icon"><i class="bwi bwi-angle-left" aria-hidden="true"></i></span>
-      <span>{{ "back" | i18n }}</span>
-    </button>
-  </div>
-  <h1 class="center">
-    <span class="title">{{ "notifications" | i18n }}</span>
-  </h1>
-  <div class="right">
-    <app-pop-out></app-pop-out>
-  </div>
-</header>
-<main tabindex="-1">
-  <div class="box">
-    <div class="box-content">
-      <div class="box-content-row box-content-row-checkbox" appBoxRow>
-        <label for="use-passkeys">{{ "enableUsePasskeys" | i18n }}</label>
-        <input
-          id="use-passkeys"
-          type="checkbox"
-          aria-describedby="use-passkeysHelp"
-          (change)="updateEnablePasskeys()"
-          [(ngModel)]="enablePasskeys"
-        />
-      </div>
-    </div>
-    <div id="use-passkeysHelp" class="box-footer">
-      {{ "usePasskeysDesc" | i18n }}
-    </div>
-  </div>
-  <div class="box">
-    <div class="box-content">
-      <div class="box-content-row box-content-row-checkbox" appBoxRow>
-        <label for="addlogin-notification-bar">{{ "enableAddLoginNotification" | i18n }}</label>
-        <input
-          id="addlogin-notification-bar"
-          type="checkbox"
-          aria-describedby="addlogin-notification-barHelp"
-          (change)="updateAddLoginNotification()"
-          [(ngModel)]="enableAddLoginNotification"
-        />
-      </div>
-    </div>
-    <div id="addlogin-notification-barHelp" class="box-footer">
-      {{
-        accountSwitcherEnabled
-          ? ("addLoginNotificationDescAlt" | i18n)
-          : ("addLoginNotificationDesc" | i18n)
-      }}
-    </div>
-  </div>
-  <div class="box">
-    <div class="box-content">
-      <div class="box-content-row box-content-row-checkbox" appBoxRow>
-        <label for="changedpass-notification-bar">{{
-          "enableChangedPasswordNotification" | i18n
-        }}</label>
-        <input
-          id="changedpass-notification-bar"
-          type="checkbox"
-          aria-describedby="changedpass-notification-barHelp"
-          (change)="updateChangedPasswordNotification()"
-          [(ngModel)]="enableChangedPasswordNotification"
-        />
-      </div>
-    </div>
-    <div id="changedpass-notification-barHelp" class="box-footer">
-      {{
-        accountSwitcherEnabled
-          ? ("changedPasswordNotificationDescAlt" | i18n)
-          : ("changedPasswordNotificationDesc" | i18n)
-      }}
-    </div>
-  </div>
-  <div class="box list">
-    <div class="box-content single-line">
-      <button
-        type="button"
-        class="box-content-row box-content-row-flex text-default"
-        routerLink="/excluded-domains"
-      >
-        <div class="row-main">{{ "excludedDomains" | i18n }}</div>
-        <i class="bwi bwi-angle-right bwi-lg row-sub-icon" aria-hidden="true"></i>
-      </button>
-    </div>
-  </div>
-</main>
diff --git a/apps/browser/src/autofill/popup/settings/notifications-v1.component.ts b/apps/browser/src/autofill/popup/settings/notifications-v1.component.ts
deleted file mode 100644
index 442e91e55e..0000000000
--- a/apps/browser/src/autofill/popup/settings/notifications-v1.component.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { Component, OnInit } from "@angular/core";
-import { firstValueFrom } from "rxjs";
-
-import { UserNotificationSettingsServiceAbstraction } from "@bitwarden/common/autofill/services/user-notification-settings.service";
-import { VaultSettingsService } from "@bitwarden/common/vault/abstractions/vault-settings/vault-settings.service";
-
-import { enableAccountSwitching } from "../../../platform/flags";
-
-@Component({
-  selector: "autofill-notification-v1-settings",
-  templateUrl: "notifications-v1.component.html",
-})
-export class NotificationsSettingsV1Component implements OnInit {
-  enableAddLoginNotification = false;
-  enableChangedPasswordNotification = false;
-  enablePasskeys = true;
-  accountSwitcherEnabled = false;
-
-  constructor(
-    private userNotificationSettingsService: UserNotificationSettingsServiceAbstraction,
-    private vaultSettingsService: VaultSettingsService,
-  ) {
-    this.accountSwitcherEnabled = enableAccountSwitching();
-  }
-
-  async ngOnInit() {
-    this.enableAddLoginNotification = await firstValueFrom(
-      this.userNotificationSettingsService.enableAddedLoginPrompt$,
-    );
-
-    this.enableChangedPasswordNotification = await firstValueFrom(
-      this.userNotificationSettingsService.enableChangedPasswordPrompt$,
-    );
-
-    this.enablePasskeys = await firstValueFrom(this.vaultSettingsService.enablePasskeys$);
-  }
-
-  async updateAddLoginNotification() {
-    await this.userNotificationSettingsService.setEnableAddedLoginPrompt(
-      this.enableAddLoginNotification,
-    );
-  }
-
-  async updateChangedPasswordNotification() {
-    await this.userNotificationSettingsService.setEnableChangedPasswordPrompt(
-      this.enableChangedPasswordNotification,
-    );
-  }
-
-  async updateEnablePasskeys() {
-    await this.vaultSettingsService.setEnablePasskeys(this.enablePasskeys);
-  }
-}
diff --git a/apps/browser/src/background/runtime.background.ts b/apps/browser/src/background/runtime.background.ts
index 863ca26b36..38bb2ec50c 100644
--- a/apps/browser/src/background/runtime.background.ts
+++ b/apps/browser/src/background/runtime.background.ts
@@ -259,9 +259,7 @@ export default class RuntimeBackground {
         await this.main.refreshBadge();
         await this.main.refreshMenu(false);
 
-        if (await this.configService.getFeatureFlag(FeatureFlag.ExtensionRefresh)) {
-          await this.autofillService.setAutoFillOnPageLoadOrgPolicy();
-        }
+        await this.autofillService.setAutoFillOnPageLoadOrgPolicy();
         break;
       }
       case "addToLockedVaultPendingNotifications":
@@ -288,9 +286,7 @@ export default class RuntimeBackground {
           await this.configService.ensureConfigFetched();
           await this.main.updateOverlayCiphers();
 
-          if (await this.configService.getFeatureFlag(FeatureFlag.ExtensionRefresh)) {
-            await this.autofillService.setAutoFillOnPageLoadOrgPolicy();
-          }
+          await this.autofillService.setAutoFillOnPageLoadOrgPolicy();
         }
         break;
       case "openPopup":
diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts
index 8e48104737..d55bebfa0c 100644
--- a/apps/browser/src/popup/app-routing.module.ts
+++ b/apps/browser/src/popup/app-routing.module.ts
@@ -17,7 +17,6 @@ import {
   unauthGuardFn,
 } from "@bitwarden/angular/auth/guards";
 import { canAccessFeature } from "@bitwarden/angular/platform/guard/feature-flag.guard";
-import { extensionRefreshSwap } from "@bitwarden/angular/utils/extension-refresh-swap";
 import { twofactorRefactorSwap } from "@bitwarden/angular/utils/two-factor-component-refactor-route-swap";
 import { NewDeviceVerificationNoticeGuard } from "@bitwarden/angular/vault/guards";
 import {
@@ -71,14 +70,10 @@ import { TwoFactorAuthComponent } from "../auth/popup/two-factor-auth.component"
 import { TwoFactorOptionsComponent } from "../auth/popup/two-factor-options.component";
 import { TwoFactorComponent } from "../auth/popup/two-factor.component";
 import { UpdateTempPasswordComponent } from "../auth/popup/update-temp-password.component";
-import { Fido2V1Component } from "../autofill/popup/fido2/fido2-v1.component";
 import { Fido2Component } from "../autofill/popup/fido2/fido2.component";
-import { AutofillV1Component } from "../autofill/popup/settings/autofill-v1.component";
 import { AutofillComponent } from "../autofill/popup/settings/autofill.component";
 import { BlockedDomainsComponent } from "../autofill/popup/settings/blocked-domains.component";
-import { ExcludedDomainsV1Component } from "../autofill/popup/settings/excluded-domains-v1.component";
 import { ExcludedDomainsComponent } from "../autofill/popup/settings/excluded-domains.component";
-import { NotificationsSettingsV1Component } from "../autofill/popup/settings/notifications-v1.component";
 import { NotificationsSettingsComponent } from "../autofill/popup/settings/notifications.component";
 import { PremiumV2Component } from "../billing/popup/settings/premium-v2.component";
 import BrowserPopupUtils from "../platform/popup/browser-popup-utils";
@@ -148,11 +143,12 @@ const routes: Routes = [
     canActivate: [unauthGuardFn(unauthRouteOverrides), unauthUiRefreshRedirect("/login")],
     data: { elevation: 1 } satisfies RouteDataProperties,
   },
-  ...extensionRefreshSwap(Fido2V1Component, Fido2Component, {
+  {
     path: "fido2",
+    component: Fido2Component,
     canActivate: [fido2AuthGuard],
     data: { elevation: 1 } satisfies RouteDataProperties,
-  }),
+  },
   ...twofactorRefactorSwap(
     TwoFactorComponent,
     AnonLayoutWrapperComponent,
@@ -321,22 +317,24 @@ const routes: Routes = [
     canActivate: [authGuard],
     data: { elevation: 2 } satisfies RouteDataProperties,
   },
-  ...extensionRefreshSwap(AutofillV1Component, AutofillComponent, {
+  {
     path: "autofill",
+    component: AutofillComponent,
     canActivate: [authGuard],
     data: { elevation: 1 } satisfies RouteDataProperties,
-  }),
+  },
   {
     path: "account-security",
     component: AccountSecurityComponent,
     canActivate: [authGuard],
     data: { elevation: 1 } satisfies RouteDataProperties,
   },
-  ...extensionRefreshSwap(NotificationsSettingsV1Component, NotificationsSettingsComponent, {
+  {
     path: "notifications",
+    component: NotificationsSettingsComponent,
     canActivate: [authGuard],
     data: { elevation: 1 } satisfies RouteDataProperties,
-  }),
+  },
   {
     path: "vault-settings",
     component: VaultSettingsV2Component,
@@ -355,11 +353,12 @@ const routes: Routes = [
     canActivate: [authGuard],
     data: { elevation: 2 } satisfies RouteDataProperties,
   },
-  ...extensionRefreshSwap(ExcludedDomainsV1Component, ExcludedDomainsComponent, {
+  {
     path: "excluded-domains",
+    component: ExcludedDomainsComponent,
     canActivate: [authGuard],
     data: { elevation: 2 } satisfies RouteDataProperties,
-  }),
+  },
   {
     path: "premium",
     component: PremiumV2Component,
diff --git a/apps/browser/src/popup/app.module.ts b/apps/browser/src/popup/app.module.ts
index 1fe8f1f18d..15a898aef5 100644
--- a/apps/browser/src/popup/app.module.ts
+++ b/apps/browser/src/popup/app.module.ts
@@ -35,17 +35,7 @@ import { SsoComponentV1 } from "../auth/popup/sso-v1.component";
 import { TwoFactorOptionsComponent } from "../auth/popup/two-factor-options.component";
 import { TwoFactorComponent } from "../auth/popup/two-factor.component";
 import { UpdateTempPasswordComponent } from "../auth/popup/update-temp-password.component";
-import { Fido2CipherRowV1Component } from "../autofill/popup/fido2/fido2-cipher-row-v1.component";
-import { Fido2CipherRowComponent } from "../autofill/popup/fido2/fido2-cipher-row.component";
-import { Fido2UseBrowserLinkV1Component } from "../autofill/popup/fido2/fido2-use-browser-link-v1.component";
-import { Fido2UseBrowserLinkComponent } from "../autofill/popup/fido2/fido2-use-browser-link.component";
-import { Fido2V1Component } from "../autofill/popup/fido2/fido2-v1.component";
-import { Fido2Component } from "../autofill/popup/fido2/fido2.component";
-import { AutofillV1Component } from "../autofill/popup/settings/autofill-v1.component";
 import { AutofillComponent } from "../autofill/popup/settings/autofill.component";
-import { ExcludedDomainsV1Component } from "../autofill/popup/settings/excluded-domains-v1.component";
-import { ExcludedDomainsComponent } from "../autofill/popup/settings/excluded-domains.component";
-import { NotificationsSettingsV1Component } from "../autofill/popup/settings/notifications-v1.component";
 import { NotificationsSettingsComponent } from "../autofill/popup/settings/notifications.component";
 import { PopOutComponent } from "../platform/popup/components/pop-out.component";
 import { HeaderComponent } from "../platform/popup/header.component";
@@ -87,10 +77,6 @@ import "../platform/popup/locales";
     ScrollingModule,
     ServicesModule,
     DialogModule,
-    ExcludedDomainsComponent,
-    Fido2CipherRowComponent,
-    Fido2Component,
-    Fido2UseBrowserLinkComponent,
     FilePopoutCalloutComponent,
     AvatarModule,
     AccountComponent,
@@ -112,15 +98,11 @@ import "../platform/popup/locales";
     ColorPasswordPipe,
     ColorPasswordCountPipe,
     EnvironmentComponent,
-    ExcludedDomainsV1Component,
-    Fido2CipherRowV1Component,
-    Fido2UseBrowserLinkV1Component,
     HintComponent,
     HomeComponent,
     LoginViaAuthRequestComponentV1,
     LoginComponentV1,
     LoginDecryptionOptionsComponentV1,
-    NotificationsSettingsV1Component,
     RegisterComponent,
     SetPasswordComponent,
     SsoComponentV1,
@@ -131,8 +113,6 @@ import "../platform/popup/locales";
     UserVerificationComponent,
     VaultTimeoutInputComponent,
     RemovePasswordComponent,
-    Fido2V1Component,
-    AutofillV1Component,
     EnvironmentSelectorComponent,
   ],
   exports: [],

From fb4d7e8f056bdc95b284ee06b99ead5d89524bab Mon Sep 17 00:00:00 2001
From: Jonathan Prusik <jprusik@users.noreply.github.com>
Date: Mon, 13 Jan 2025 09:01:16 -0500
Subject: [PATCH 055/150] fix broken blockedInteractionsUris state contruction
 (#12813)

---
 .../platform/services/browser-script-injector.service.spec.ts | 2 +-
 .../src/tools/background/fileless-importer.background.spec.ts | 2 +-
 .../src/autofill/services/domain-settings.service.spec.ts     | 2 +-
 libs/common/src/autofill/services/domain-settings.service.ts  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/browser/src/platform/services/browser-script-injector.service.spec.ts b/apps/browser/src/platform/services/browser-script-injector.service.spec.ts
index 0919de4677..b177497305 100644
--- a/apps/browser/src/platform/services/browser-script-injector.service.spec.ts
+++ b/apps/browser/src/platform/services/browser-script-injector.service.spec.ts
@@ -63,7 +63,7 @@ describe("ScriptInjectorService", () => {
     configService.getFeatureFlag$.mockImplementation(() => of(false));
     domainSettingsService = new DefaultDomainSettingsService(fakeStateProvider, configService);
     domainSettingsService.equivalentDomains$ = of(mockEquivalentDomains);
-    domainSettingsService.blockedInteractionsUris$ = of(null);
+    domainSettingsService.blockedInteractionsUris$ = of({});
     scriptInjectorService = new BrowserScriptInjectorService(
       domainSettingsService,
       platformUtilsService,
diff --git a/apps/browser/src/tools/background/fileless-importer.background.spec.ts b/apps/browser/src/tools/background/fileless-importer.background.spec.ts
index 429a0e1218..409fac9790 100644
--- a/apps/browser/src/tools/background/fileless-importer.background.spec.ts
+++ b/apps/browser/src/tools/background/fileless-importer.background.spec.ts
@@ -39,7 +39,7 @@ describe("FilelessImporterBackground ", () => {
   let tabMock: chrome.tabs.Tab;
 
   beforeEach(() => {
-    domainSettingsService.blockedInteractionsUris$ = of(null);
+    domainSettingsService.blockedInteractionsUris$ = of({});
     policyService.policyAppliesToActiveUser$.mockImplementation(() => of(true));
     scriptInjectorService = new BrowserScriptInjectorService(
       domainSettingsService,
diff --git a/libs/common/src/autofill/services/domain-settings.service.spec.ts b/libs/common/src/autofill/services/domain-settings.service.spec.ts
index a25653f168..5c5f85e7e6 100644
--- a/libs/common/src/autofill/services/domain-settings.service.spec.ts
+++ b/libs/common/src/autofill/services/domain-settings.service.spec.ts
@@ -29,7 +29,7 @@ describe("DefaultDomainSettingsService", () => {
 
     jest.spyOn(domainSettingsService, "getUrlEquivalentDomains");
     domainSettingsService.equivalentDomains$ = of(mockEquivalentDomains);
-    domainSettingsService.blockedInteractionsUris$ = of(null);
+    domainSettingsService.blockedInteractionsUris$ = of({});
   });
 
   describe("getUrlEquivalentDomains", () => {
diff --git a/libs/common/src/autofill/services/domain-settings.service.ts b/libs/common/src/autofill/services/domain-settings.service.ts
index aeb3af69da..7d25c4e25d 100644
--- a/libs/common/src/autofill/services/domain-settings.service.ts
+++ b/libs/common/src/autofill/services/domain-settings.service.ts
@@ -36,7 +36,7 @@ const BLOCKED_INTERACTIONS_URIS = new KeyDefinition(
   DOMAIN_SETTINGS_DISK,
   "blockedInteractionsUris",
   {
-    deserializer: (value: NeverDomains) => value ?? null,
+    deserializer: (value: NeverDomains) => value ?? {},
   },
 );
 
@@ -131,7 +131,7 @@ export class DefaultDomainSettingsService implements DomainSettingsService {
         switchMap((featureIsEnabled) =>
           featureIsEnabled ? this.blockedInteractionsUrisState.state$ : of({} as NeverDomains),
         ),
-        map((disabledUris) => (Object.keys(disabledUris).length ? disabledUris : null)),
+        map((disabledUris) => (Object.keys(disabledUris).length ? disabledUris : {})),
       );
 
     this.equivalentDomainsState = this.stateProvider.getActive(EQUIVALENT_DOMAINS);

From 8062475044bea54af8a02c5d7cb6a0cfaacc8254 Mon Sep 17 00:00:00 2001
From: Victoria League <vleague@bitwarden.com>
Date: Mon, 13 Jan 2025 10:37:26 -0500
Subject: [PATCH 056/150] [PM-16243] Allow users to collapse extension sections
 (#12756)

---
 .../vault-list-items-container.component.html |  87 +++++++++---
 .../vault-list-items-container.component.ts   |  66 ++++++++-
 .../vault-v2/vault-v2.component.html          |   2 +
 .../services/vault-popup-section.service.ts   | 129 ++++++++++++++++++
 .../src/section/section-header.component.html |   2 +-
 5 files changed, 266 insertions(+), 20 deletions(-)
 create mode 100644 apps/browser/src/vault/popup/services/vault-popup-section.service.ts

diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html b/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html
index b5d92a386b..293bf3e67e 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html
@@ -1,23 +1,76 @@
 <bit-section *ngIf="ciphers?.length > 0 || description" [disableMargin]="disableSectionMargin">
-  <div class="tw-ml-1">
-    <bit-section-header>
-      <h2 bitTypography="h6">
-        {{ title }}
-      </h2>
-      <button
-        *ngIf="showRefresh"
-        bitIconButton="bwi-refresh"
-        type="button"
-        size="small"
-        (click)="onRefresh.emit()"
-        [appA11yTitle]="'refresh' | i18n"
-      ></button>
-      <span bitTypography="body2" slot="end">{{ ciphers.length }}</span>
-    </bit-section-header>
-  </div>
+  <ng-container *ngIf="collapsibleKey">
+    <button
+      class="tw-group/vault-section-header hover:tw-bg-secondary-100 tw-pl-1 tw-w-full tw-border-x-0 tw-border-t-0 tw-border-b tw-border-solid focus-visible:tw-outline-none focus-visible:tw-rounded-md focus-visible:tw-ring-inset focus-visible:tw-ring-2 focus-visible:tw-ring-primary-600"
+      [ngClass]="{
+        'tw-border-b-secondary-300': !sectionOpenState(),
+        'tw-border-b-transparent': sectionOpenState(),
+      }"
+      type="button"
+      [bitDisclosureTriggerFor]="disclosureRef"
+      (click)="toggleSectionOpen()"
+    >
+      <ng-container *ngTemplateOutlet="sectionHeader"></ng-container>
+    </button>
+    <ng-container *ngTemplateOutlet="descriptionText"></ng-container>
+    <bit-disclosure #disclosureRef [open]="sectionOpenState()" (openChange)="rerenderViewport()">
+      <ng-container *ngTemplateOutlet="itemGroup"></ng-container>
+    </bit-disclosure>
+  </ng-container>
+  <ng-container *ngIf="!collapsibleKey">
+    <div class="tw-pl-1">
+      <ng-container *ngTemplateOutlet="sectionHeader"></ng-container>
+    </div>
+    <ng-container *ngTemplateOutlet="descriptionText"></ng-container>
+    <ng-container *ngTemplateOutlet="itemGroup"></ng-container>
+  </ng-container>
+</bit-section>
+
+<ng-template #sectionHeader>
+  <bit-section-header class="tw-p-0.5 -tw-mt-0.5 -tw-mx-0.5">
+    <h2 bitTypography="h6">
+      {{ title }}
+    </h2>
+    <button
+      *ngIf="showRefresh"
+      bitIconButton="bwi-refresh"
+      type="button"
+      size="small"
+      (click)="onRefresh.emit()"
+      [appA11yTitle]="'refresh' | i18n"
+    ></button>
+    <span bitTypography="body2" slot="end">
+      <span
+        [ngClass]="{
+          'group-hover/vault-section-header:tw-hidden group-focus-visible/vault-section-header:tw-hidden':
+            collapsibleKey && sectionOpenState(),
+          'tw-hidden': collapsibleKey && !sectionOpenState(),
+        }"
+      >
+        {{ ciphers.length }}
+      </span>
+      <span class="tw-pr-1" *ngIf="collapsibleKey">
+        <i
+          class="bwi"
+          [ngClass]="{
+            'bwi-angle-down tw-inline-block': !sectionOpenState(),
+            'bwi-angle-up tw-hidden group-hover/vault-section-header:tw-inline-block group-focus-visible/vault-section-header:tw-inline-block':
+              sectionOpenState(),
+          }"
+          aria-hidden="true"
+        ></i>
+      </span>
+    </span>
+  </bit-section-header>
+</ng-template>
+
+<ng-template #descriptionText>
   <div *ngIf="description" class="tw-text-muted tw-px-1 tw-mb-2" bitTypography="body2">
     {{ description }}
   </div>
+</ng-template>
+
+<ng-template #itemGroup>
   <bit-item-group>
     <cdk-virtual-scroll-viewport
       [itemSize]="itemHeight$ | async"
@@ -85,4 +138,4 @@
       </bit-item>
     </cdk-virtual-scroll-viewport>
   </bit-item-group>
-</bit-section>
+</ng-template>
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts
index 5bcdaf56bb..579cbf6692 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts
@@ -1,6 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { ScrollingModule } from "@angular/cdk/scrolling";
+import { CdkVirtualScrollViewport, ScrollingModule } from "@angular/cdk/scrolling";
 import { CommonModule } from "@angular/common";
 import {
   AfterViewInit,
@@ -9,8 +9,11 @@ import {
   EventEmitter,
   inject,
   Input,
+  OnInit,
   Output,
+  Signal,
   signal,
+  ViewChild,
 } from "@angular/core";
 import { Router, RouterLink } from "@angular/router";
 import { map } from "rxjs";
@@ -25,6 +28,8 @@ import {
   BadgeModule,
   ButtonModule,
   CompactModeService,
+  DisclosureComponent,
+  DisclosureTriggerForDirective,
   DialogService,
   IconButtonModule,
   ItemModule,
@@ -41,6 +46,7 @@ import {
 import { BrowserApi } from "../../../../../platform/browser/browser-api";
 import BrowserPopupUtils from "../../../../../platform/popup/browser-popup-utils";
 import { VaultPopupAutofillService } from "../../../services/vault-popup-autofill.service";
+import { VaultPopupSectionService } from "../../../services/vault-popup-section.service";
 import { PopupCipherView } from "../../../views/popup-cipher.view";
 import { ItemCopyActionsComponent } from "../item-copy-action/item-copy-actions.component";
 import { ItemMoreOptionsComponent } from "../item-more-options/item-more-options.component";
@@ -61,14 +67,25 @@ import { ItemMoreOptionsComponent } from "../item-more-options/item-more-options
     ItemMoreOptionsComponent,
     OrgIconDirective,
     ScrollingModule,
+    DisclosureComponent,
+    DisclosureTriggerForDirective,
     DecryptionFailureDialogComponent,
   ],
   selector: "app-vault-list-items-container",
   templateUrl: "vault-list-items-container.component.html",
   standalone: true,
 })
-export class VaultListItemsContainerComponent implements AfterViewInit {
+export class VaultListItemsContainerComponent implements OnInit, AfterViewInit {
   private compactModeService = inject(CompactModeService);
+  private vaultPopupSectionService = inject(VaultPopupSectionService);
+
+  @ViewChild(CdkVirtualScrollViewport, { static: false }) viewPort: CdkVirtualScrollViewport;
+  @ViewChild(DisclosureComponent) disclosure: DisclosureComponent;
+
+  /**
+   * Indicates whether the section should be open or closed if collapsibleKey is provided
+   */
+  protected sectionOpenState: Signal<boolean> | undefined;
 
   /**
    * The class used to set the height of a bit item's inner content.
@@ -106,6 +123,15 @@ export class VaultListItemsContainerComponent implements AfterViewInit {
   @Input()
   title: string;
 
+  /**
+   * Optionally allow the items to be collapsed.
+   *
+   * The key must be added to the state definition in `vault-popup-section.service.ts` since the
+   * collapsed state is stored locally.
+   */
+  @Input()
+  collapsibleKey: "favorites" | "allItems" | undefined;
+
   /**
    * Optional description for the vault list item section. Will be shown below the title even when
    * no ciphers are available.
@@ -168,6 +194,16 @@ export class VaultListItemsContainerComponent implements AfterViewInit {
     private dialogService: DialogService,
   ) {}
 
+  ngOnInit(): void {
+    if (!this.collapsibleKey) {
+      return;
+    }
+
+    this.sectionOpenState = this.vaultPopupSectionService.getOpenDisplayStateForSection(
+      this.collapsibleKey,
+    );
+  }
+
   async ngAfterViewInit() {
     const autofillShortcut = await this.platformUtilsService.getAutofillKeyboardShortcut();
 
@@ -239,4 +275,30 @@ export class VaultListItemsContainerComponent implements AfterViewInit {
       cipher.canLaunch ? 200 : 0,
     );
   }
+
+  /**
+   * Update section open/close state based on user action
+   */
+  async toggleSectionOpen() {
+    if (!this.collapsibleKey) {
+      return;
+    }
+
+    await this.vaultPopupSectionService.updateSectionOpenStoredState(
+      this.collapsibleKey,
+      this.disclosure.open,
+    );
+  }
+
+  /**
+   * Force virtual scroll to update its viewport size to avoid display bugs
+   *
+   * Angular CDK scroll has a bug when used with conditional rendering:
+   * https://github.com/angular/components/issues/24362
+   */
+  protected rerenderViewport() {
+    setTimeout(() => {
+      this.viewPort.checkViewportSize();
+    });
+  }
 }
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.html b/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.html
index 4798ddf4df..c5a3c860c8 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.html
@@ -66,12 +66,14 @@
         [title]="'favorites' | i18n"
         [ciphers]="favoriteCiphers$ | async"
         id="favorites"
+        collapsibleKey="favorites"
       ></app-vault-list-items-container>
       <app-vault-list-items-container
         [title]="'allItems' | i18n"
         [ciphers]="remainingCiphers$ | async"
         id="allItems"
         disableSectionMargin
+        collapsibleKey="allItems"
       ></app-vault-list-items-container>
     </div>
   </ng-container>
diff --git a/apps/browser/src/vault/popup/services/vault-popup-section.service.ts b/apps/browser/src/vault/popup/services/vault-popup-section.service.ts
new file mode 100644
index 0000000000..ed641e0cdf
--- /dev/null
+++ b/apps/browser/src/vault/popup/services/vault-popup-section.service.ts
@@ -0,0 +1,129 @@
+import { computed, effect, inject, Injectable, signal, Signal } from "@angular/core";
+import { toSignal } from "@angular/core/rxjs-interop";
+import { map } from "rxjs";
+
+import {
+  KeyDefinition,
+  StateProvider,
+  VAULT_SETTINGS_DISK,
+} from "@bitwarden/common/platform/state";
+
+import { VaultPopupItemsService } from "./vault-popup-items.service";
+
+export type PopupSectionOpen = {
+  favorites: boolean;
+  allItems: boolean;
+};
+
+const SECTION_OPEN_KEY = new KeyDefinition<PopupSectionOpen>(VAULT_SETTINGS_DISK, "sectionOpen", {
+  deserializer: (obj) => obj,
+});
+
+const INITIAL_OPEN: PopupSectionOpen = {
+  favorites: true,
+  allItems: true,
+};
+
+@Injectable({
+  providedIn: "root",
+})
+export class VaultPopupSectionService {
+  private vaultPopupItemsService = inject(VaultPopupItemsService);
+  private stateProvider = inject(StateProvider);
+
+  private hasFilterOrSearchApplied = toSignal(
+    this.vaultPopupItemsService.hasFilterApplied$.pipe(map((hasFilter) => hasFilter)),
+  );
+
+  /**
+   * Used to change the open/close state without persisting it to the local disk. Reflects
+   * application-applied overrides.
+   * `null` means there is no current override
+   */
+  private temporaryStateOverride = signal<Partial<PopupSectionOpen> | null>(null);
+
+  constructor() {
+    effect(
+      () => {
+        /**
+         * auto-open all sections when search or filter is applied, and remove
+         * override when search or filter is removed
+         */
+        if (this.hasFilterOrSearchApplied()) {
+          this.temporaryStateOverride.set(INITIAL_OPEN);
+        } else {
+          this.temporaryStateOverride.set(null);
+        }
+      },
+      {
+        allowSignalWrites: true,
+      },
+    );
+  }
+
+  /**
+   * Stored disk state for the open/close state of the sections. Will be `null` if user has never
+   * opened/closed a section
+   */
+  private sectionOpenStateProvider = this.stateProvider.getGlobal(SECTION_OPEN_KEY);
+
+  /**
+   * Stored disk state for the open/close state of the sections, with an initial value provided
+   * if the stored disk state does not yet exist.
+   */
+  private sectionOpenStoredState = toSignal<PopupSectionOpen | null>(
+    this.sectionOpenStateProvider.state$.pipe(map((sectionOpen) => sectionOpen ?? INITIAL_OPEN)),
+    // Indicates that the state value is loading
+    { initialValue: null },
+  );
+
+  /**
+   * Indicates the current open/close display state of each section, accounting for temporary
+   * non-persisted overrides.
+   */
+  sectionOpenDisplayState: Signal<Partial<PopupSectionOpen>> = computed(() => ({
+    ...this.sectionOpenStoredState(),
+    ...this.temporaryStateOverride(),
+  }));
+
+  /**
+   * Retrieve the open/close display state for a given section.
+   *
+   * @param sectionKey section key
+   */
+  getOpenDisplayStateForSection(sectionKey: keyof PopupSectionOpen): Signal<boolean | undefined> {
+    return computed(() => this.sectionOpenDisplayState()?.[sectionKey]);
+  }
+
+  /**
+   * Updates the stored open/close state of a given section. Should be called only when a user action
+   * is taken directly to change the open/close state.
+   *
+   * Removes any current temporary override for the given section, as direct user action should
+   * supersede any application-applied overrides.
+   *
+   * @param sectionKey section key
+   */
+  async updateSectionOpenStoredState(
+    sectionKey: keyof PopupSectionOpen,
+    open: boolean,
+  ): Promise<void> {
+    await this.sectionOpenStateProvider.update((currentState) => {
+      return {
+        ...(currentState ?? INITIAL_OPEN),
+        [sectionKey]: open,
+      };
+    });
+
+    this.temporaryStateOverride.update((prev) => {
+      if (prev !== null) {
+        return {
+          ...prev,
+          [sectionKey]: open,
+        };
+      }
+
+      return prev;
+    });
+  }
+}
diff --git a/libs/components/src/section/section-header.component.html b/libs/components/src/section/section-header.component.html
index 3f96e22540..f070cfeae0 100644
--- a/libs/components/src/section/section-header.component.html
+++ b/libs/components/src/section/section-header.component.html
@@ -2,7 +2,7 @@
   <div class="[&>*]:tw-mb-0 [&>*]:tw-text-main tw-flex tw-items-center tw-gap-1">
     <ng-content></ng-content>
   </div>
-  <div class="tw-text-muted has-[button]:-tw-mb-1">
+  <div class="tw-text-muted -tw-mb-0.5">
     <ng-content select="[slot=end]"></ng-content>
   </div>
 </div>

From 52b6bfea1da5d67a69c92e1047479f4936b44f64 Mon Sep 17 00:00:00 2001
From: Tom <144813356+ttalty@users.noreply.github.com>
Date: Mon, 13 Jan 2025 11:18:03 -0500
Subject: [PATCH 057/150] [PM-16104] [PM-15929] Org at risk members click on
 the card (#12732)

* Org at risk members click on the card

* Fixing at risk member counts

* At risk member text modification

* Changing ok button to close
---
 apps/web/src/locales/en/messages.json         | 21 +++++++++++
 .../risk-insights/models/password-health.ts   | 10 ++++++
 .../services/risk-insights-report.service.ts  | 25 +++++++++++++
 .../all-applications.component.html           |  5 +--
 .../all-applications.component.ts             | 19 ++++++++++
 .../app-at-risk-members-dialog.component.html | 21 +++++++++++
 .../app-at-risk-members-dialog.component.ts   | 35 +++++++++++++++++++
 .../org-at-risk-members-dialog.component.html | 27 ++++++++++++++
 .../org-at-risk-members-dialog.component.ts   | 24 +++++++++++++
 9 files changed, 185 insertions(+), 2 deletions(-)
 create mode 100644 bitwarden_license/bit-web/src/app/tools/access-intelligence/app-at-risk-members-dialog.component.html
 create mode 100644 bitwarden_license/bit-web/src/app/tools/access-intelligence/app-at-risk-members-dialog.component.ts
 create mode 100644 bitwarden_license/bit-web/src/app/tools/access-intelligence/org-at-risk-members-dialog.component.html
 create mode 100644 bitwarden_license/bit-web/src/app/tools/access-intelligence/org-at-risk-members-dialog.component.ts

diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 001918ef49..0181d4f9c7 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -113,6 +113,27 @@
   "atRiskMembers": {
     "message": "At-risk members"
   },
+  "atRiskMembersWithCount": {
+    "message": "At-risk members ($COUNT$)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "atRiskMembersDescription": {
+    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  },
+  "atRiskMembersDescriptionWithApp": {
+    "message": "These members are logging into $APPNAME$ with weak, exposed, or reused passwords.",
+    "placeholders": {
+      "appname": {
+        "content": "$1",
+        "example": "Salesforce"
+      }
+    }
+  },
   "totalMembers": {
     "message": "Total members"
   },
diff --git a/bitwarden_license/bit-common/src/tools/reports/risk-insights/models/password-health.ts b/bitwarden_license/bit-common/src/tools/reports/risk-insights/models/password-health.ts
index b8d5852088..ad87f319e7 100644
--- a/bitwarden_license/bit-common/src/tools/reports/risk-insights/models/password-health.ts
+++ b/bitwarden_license/bit-common/src/tools/reports/risk-insights/models/password-health.ts
@@ -90,3 +90,13 @@ export type MemberDetailsFlat = {
   email: string;
   cipherId: string;
 };
+
+/**
+ * Member email with the number of at risk passwords
+ * At risk member detail that contains the email
+ * and the count of at risk ciphers
+ */
+export type AtRiskMemberDetail = {
+  email: string;
+  atRiskPasswordCount: number;
+};
diff --git a/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/risk-insights-report.service.ts b/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/risk-insights-report.service.ts
index d0530dfd82..d97550b588 100644
--- a/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/risk-insights-report.service.ts
+++ b/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/risk-insights-report.service.ts
@@ -12,6 +12,7 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import {
   ApplicationHealthReportDetail,
   ApplicationHealthReportSummary,
+  AtRiskMemberDetail,
   CipherHealthReportDetail,
   CipherHealthReportUriDetail,
   ExposedPasswordDetail,
@@ -89,6 +90,30 @@ export class RiskInsightsReportService {
     return results$;
   }
 
+  /**
+   * Generates a list of members with at-risk passwords along with the number of at-risk passwords.
+   */
+  generateAtRiskMemberList(
+    cipherHealthReportDetails: ApplicationHealthReportDetail[],
+  ): AtRiskMemberDetail[] {
+    const memberRiskMap = new Map<string, number>();
+
+    cipherHealthReportDetails.forEach((app) => {
+      app.atRiskMemberDetails.forEach((member) => {
+        if (memberRiskMap.has(member.email)) {
+          memberRiskMap.set(member.email, memberRiskMap.get(member.email) + 1);
+        } else {
+          memberRiskMap.set(member.email, 1);
+        }
+      });
+    });
+
+    return Array.from(memberRiskMap.entries()).map(([email, atRiskPasswordCount]) => ({
+      email,
+      atRiskPasswordCount,
+    }));
+  }
+
   /**
    * Gets the summary from the application health report. Returns total members and applications as well
    * as the total at risk members and at risk applications
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.html b/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.html
index ea1a4f9db3..0493f7e44b 100644
--- a/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.html
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.html
@@ -27,10 +27,11 @@
   <h2 class="tw-mb-6" bitTypography="h2">{{ "allApplications" | i18n }}</h2>
   <div class="tw-flex tw-gap-6">
     <tools-card
-      class="tw-flex-1"
+      class="tw-flex-1 tw-cursor-pointer"
       [title]="'atRiskMembers' | i18n"
       [value]="applicationSummary.totalAtRiskMemberCount"
       [maxValue]="applicationSummary.totalMemberCount"
+      (click)="showOrgAtRiskMembers()"
     >
     </tools-card>
     <tools-card
@@ -82,7 +83,7 @@
             (change)="onCheckboxChange(r.id, $event)"
           />
         </td>
-        <td bitCell>
+        <td class="tw-cursor-pointer" (click)="showAppAtRiskMembers(r.applicationName)" bitCell>
           <span>{{ r.applicationName }}</span>
         </td>
         <td bitCell>
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.ts
index f4d3656071..00708de282 100644
--- a/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.ts
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.ts
@@ -19,6 +19,7 @@ import { ConfigService } from "@bitwarden/common/platform/abstractions/config/co
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import {
+  DialogService,
   Icons,
   NoItemsModule,
   SearchModule,
@@ -30,6 +31,8 @@ import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.mod
 import { SharedModule } from "@bitwarden/web-vault/app/shared";
 import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module";
 
+import { openAppAtRiskMembersDialog } from "./app-at-risk-members-dialog.component";
+import { OrgAtRiskMembersDialogComponent } from "./org-at-risk-members-dialog.component";
 import { ApplicationsLoadingComponent } from "./risk-insights-loading.component";
 
 @Component({
@@ -99,6 +102,7 @@ export class AllApplicationsComponent implements OnInit, OnDestroy {
     protected dataService: RiskInsightsDataService,
     protected organizationService: OrganizationService,
     protected reportService: RiskInsightsReportService,
+    protected dialogService: DialogService,
   ) {
     this.searchControl.valueChanges
       .pipe(debounceTime(200), takeUntilDestroyed())
@@ -135,6 +139,21 @@ export class AllApplicationsComponent implements OnInit, OnDestroy {
     return item.applicationName;
   }
 
+  showAppAtRiskMembers = async (applicationName: string) => {
+    openAppAtRiskMembersDialog(this.dialogService, {
+      members:
+        this.dataSource.data.find((app) => app.applicationName === applicationName)
+          ?.atRiskMemberDetails ?? [],
+      applicationName,
+    });
+  };
+
+  showOrgAtRiskMembers = async () => {
+    this.dialogService.open(OrgAtRiskMembersDialogComponent, {
+      data: this.reportService.generateAtRiskMemberList(this.dataSource.data),
+    });
+  };
+
   onCheckboxChange(id: number, event: Event) {
     const isChecked = (event.target as HTMLInputElement).checked;
     if (isChecked) {
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/app-at-risk-members-dialog.component.html b/bitwarden_license/bit-web/src/app/tools/access-intelligence/app-at-risk-members-dialog.component.html
new file mode 100644
index 0000000000..383a1eccab
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/app-at-risk-members-dialog.component.html
@@ -0,0 +1,21 @@
+<bit-dialog>
+  <span bitDialogTitle>{{ applicationName }}</span>
+  <ng-container bitDialogContent>
+    <div class="tw-flex tw-flex-col tw-gap-2">
+      <span bitDialogTitle>{{ "atRiskMembersWithCount" | i18n: members.length }} </span>
+      <span class="tw-text-muted">{{
+        "atRiskMembersDescriptionWithApp" | i18n: applicationName
+      }}</span>
+      <div class="tw-mt-1">
+        <ng-container *ngFor="let member of members">
+          <div>{{ member.email }}</div>
+        </ng-container>
+      </div>
+    </div>
+  </ng-container>
+  <ng-container bitDialogFooter>
+    <button bitButton bitDialogClose buttonType="secondary" type="button">
+      {{ "close" | i18n }}
+    </button>
+  </ng-container>
+</bit-dialog>
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/app-at-risk-members-dialog.component.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/app-at-risk-members-dialog.component.ts
new file mode 100644
index 0000000000..d6a757fe89
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/app-at-risk-members-dialog.component.ts
@@ -0,0 +1,35 @@
+import { DIALOG_DATA } from "@angular/cdk/dialog";
+import { CommonModule } from "@angular/common";
+import { Component, Inject } from "@angular/core";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { MemberDetailsFlat } from "@bitwarden/bit-common/tools/reports/risk-insights/models/password-health";
+import { ButtonModule, DialogModule, DialogService } from "@bitwarden/components";
+
+type AppAtRiskMembersDialogParams = {
+  members: MemberDetailsFlat[];
+  applicationName: string;
+};
+
+export const openAppAtRiskMembersDialog = (
+  dialogService: DialogService,
+  dialogConfig: AppAtRiskMembersDialogParams,
+) =>
+  dialogService.open<boolean, AppAtRiskMembersDialogParams>(AppAtRiskMembersDialogComponent, {
+    data: dialogConfig,
+  });
+
+@Component({
+  standalone: true,
+  templateUrl: "./app-at-risk-members-dialog.component.html",
+  imports: [ButtonModule, CommonModule, JslibModule, DialogModule],
+})
+export class AppAtRiskMembersDialogComponent {
+  protected members: MemberDetailsFlat[];
+  protected applicationName: string;
+
+  constructor(@Inject(DIALOG_DATA) private params: AppAtRiskMembersDialogParams) {
+    this.members = params.members;
+    this.applicationName = params.applicationName;
+  }
+}
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/org-at-risk-members-dialog.component.html b/bitwarden_license/bit-web/src/app/tools/access-intelligence/org-at-risk-members-dialog.component.html
new file mode 100644
index 0000000000..41ac8af788
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/org-at-risk-members-dialog.component.html
@@ -0,0 +1,27 @@
+<bit-dialog>
+  <ng-container bitDialogTitle>
+    <span bitDialogTitle>{{ "atRiskMembersWithCount" | i18n: atRiskMembers.length }} </span>
+  </ng-container>
+  <ng-container bitDialogContent>
+    <div class="tw-flex tw-flex-col tw-gap-2">
+      <span bitTypography="body2" class="tw-text-muted">{{
+        "atRiskMembersDescription" | i18n
+      }}</span>
+      <div class="tw-flex tw-justify-between tw-mt-2 tw-text-muted">
+        <div bitTypography="body2" class="tw-font-bold">{{ "email" | i18n }}</div>
+        <div bitTypography="body2" class="tw-font-bold">{{ "atRiskPasswords" | i18n }}</div>
+      </div>
+      <ng-container *ngFor="let member of atRiskMembers">
+        <div class="tw-flex tw-justify-between tw-mt-2">
+          <div>{{ member.email }}</div>
+          <div>{{ member.atRiskPasswordCount }}</div>
+        </div>
+      </ng-container>
+    </div>
+  </ng-container>
+  <ng-container bitDialogFooter>
+    <button bitButton bitDialogClose buttonType="secondary" type="button">
+      {{ "close" | i18n }}
+    </button>
+  </ng-container>
+</bit-dialog>
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/org-at-risk-members-dialog.component.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/org-at-risk-members-dialog.component.ts
new file mode 100644
index 0000000000..72518843d9
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/org-at-risk-members-dialog.component.ts
@@ -0,0 +1,24 @@
+import { DIALOG_DATA } from "@angular/cdk/dialog";
+import { CommonModule } from "@angular/common";
+import { Component, Inject } from "@angular/core";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { AtRiskMemberDetail } from "@bitwarden/bit-common/tools/reports/risk-insights/models/password-health";
+import { ButtonModule, DialogModule, DialogService, TypographyModule } from "@bitwarden/components";
+
+export const openOrgAtRiskMembersDialog = (
+  dialogService: DialogService,
+  dialogConfig: AtRiskMemberDetail[],
+) =>
+  dialogService.open<boolean, AtRiskMemberDetail[]>(OrgAtRiskMembersDialogComponent, {
+    data: dialogConfig,
+  });
+
+@Component({
+  standalone: true,
+  templateUrl: "./org-at-risk-members-dialog.component.html",
+  imports: [ButtonModule, CommonModule, DialogModule, JslibModule, TypographyModule],
+})
+export class OrgAtRiskMembersDialogComponent {
+  constructor(@Inject(DIALOG_DATA) protected atRiskMembers: AtRiskMemberDetail[]) {}
+}

From 698479eb5ac2eaa225eb05aa694127953a36cf41 Mon Sep 17 00:00:00 2001
From: cyprain-okeke <108260115+cyprain-okeke@users.noreply.github.com>
Date: Mon, 13 Jan 2025 18:12:24 +0100
Subject: [PATCH 058/150] [PM-15814]Alert owners of reseller-managed orgs to
 renewal events (#12834)

* Makes changes on the text

* Rename the message names
---
 .../app/billing/services/reseller-warning.service.ts |  6 +++---
 apps/web/src/locales/en/messages.json                | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/web/src/app/billing/services/reseller-warning.service.ts b/apps/web/src/app/billing/services/reseller-warning.service.ts
index bfd5be3233..2c59ebafe0 100644
--- a/apps/web/src/app/billing/services/reseller-warning.service.ts
+++ b/apps/web/src/app/billing/services/reseller-warning.service.ts
@@ -33,7 +33,7 @@ export class ResellerWarningService {
       return {
         type: "warning",
         message: this.i18nService.t(
-          "resellerPastDueWarning",
+          "resellerPastDueWarningMsg",
           organization.providerName,
           this.formatDate(gracePeriodEnd),
         ),
@@ -50,7 +50,7 @@ export class ResellerWarningService {
       return {
         type: "info",
         message: this.i18nService.t(
-          "resellerOpenInvoiceWarning",
+          "resellerOpenInvoiceWarningMgs",
           organization.providerName,
           this.formatDate(organizationBillingMetadata.invoiceCreatedDate),
           this.formatDate(organizationBillingMetadata.invoiceDueDate),
@@ -68,7 +68,7 @@ export class ResellerWarningService {
       return {
         type: "info",
         message: this.i18nService.t(
-          "resellerRenewalWarning",
+          "resellerRenewalWarningMsg",
           organization.providerName,
           this.formatDate(organizationBillingMetadata.subPeriodEndDate),
         ),
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 0181d4f9c7..4307dba71e 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -10104,8 +10104,8 @@
   "organizationNameMaxLength": {
     "message": "Organization name cannot exceed 50 characters."
   },
-  "resellerRenewalWarning": {
-    "message": "Your subscription will renew soon. To insure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
+  "resellerRenewalWarningMsg": {
+    "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {
       "reseller": {
         "content": "$1",
@@ -10117,8 +10117,8 @@
       }
     }
   },
-  "resellerOpenInvoiceWarning": {
-    "message": "An invoice for your subscription was issued on $ISSUED_DATE$. To insure uninterrupted service, contact $RESELLER$ to confirm your renewal before $DUE_DATE$.",
+  "resellerOpenInvoiceWarningMgs": {
+    "message": "An invoice for your subscription was issued on $ISSUED_DATE$. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $DUE_DATE$.",
     "placeholders": {
       "reseller": {
         "content": "$1",
@@ -10134,8 +10134,8 @@
       }
     }
   },
-  "resellerPastDueWarning": {
-    "message": "The invoice for your subscription has not been paid. To insure uninterrupted service, contact $RESELLER$ to confirm your renewal before $GRACE_PERIOD_END$.",
+  "resellerPastDueWarningMsg": {
+    "message": "The invoice for your subscription has not been paid. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $GRACE_PERIOD_END$.",
     "placeholders": {
       "reseller": {
         "content": "$1",

From 3bed613a91a688d1e76a9d6ef45d1f46a3282bbe Mon Sep 17 00:00:00 2001
From: Oscar Hinton <Hinton@users.noreply.github.com>
Date: Mon, 13 Jan 2025 18:35:58 +0100
Subject: [PATCH 059/150] Uninstall Angular elements (#12752)

---
 package-lock.json | 17 -----------------
 package.json      |  1 -
 2 files changed, 18 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 591478d351..73e7c41ebd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -83,7 +83,6 @@
         "@angular-eslint/template-parser": "18.4.3",
         "@angular/cli": "18.2.12",
         "@angular/compiler-cli": "18.2.13",
-        "@angular/elements": "18.2.13",
         "@babel/core": "7.24.9",
         "@babel/preset-env": "7.24.8",
         "@compodoc/compodoc": "1.1.26",
@@ -2287,22 +2286,6 @@
         "zone.js": "~0.14.10"
       }
     },
-    "node_modules/@angular/elements": {
-      "version": "18.2.13",
-      "resolved": "https://registry.npmjs.org/@angular/elements/-/elements-18.2.13.tgz",
-      "integrity": "sha512-yahRkXWgFolpWMeVsTIlWYwoq4Bsz6wrfS4b+TKHIZbTCyRUlJ5zBFecpYMwgmVuQDJZp+WkUWZV2Qg7kLJR5w==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
-      },
-      "peerDependencies": {
-        "@angular/core": "18.2.13",
-        "rxjs": "^6.5.3 || ^7.4.0"
-      }
-    },
     "node_modules/@angular/forms": {
       "version": "18.2.13",
       "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-18.2.13.tgz",
diff --git a/package.json b/package.json
index 3dcb2c142e..ef55a93883 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,6 @@
     "@angular-eslint/template-parser": "18.4.3",
     "@angular/cli": "18.2.12",
     "@angular/compiler-cli": "18.2.13",
-    "@angular/elements": "18.2.13",
     "@babel/core": "7.24.9",
     "@babel/preset-env": "7.24.8",
     "@compodoc/compodoc": "1.1.26",

From 459fb1bcf4c7378acde4a507aeb881d38f73efa7 Mon Sep 17 00:00:00 2001
From: Shane Melton <smelton@bitwarden.com>
Date: Mon, 13 Jan 2025 09:58:52 -0800
Subject: [PATCH 060/150] [PM-5718] Fix free organization generating TOTP
 (#11918)

* [PM-5718] Fix totp generation for free orgs in old add-edit component

* [PM-5718] Fix totp generation for free orgs in view cipher view component

* [PM-5718] Cleanup merge conflicts

* Don't generate totp code for premium users or free orgs

* Added redirect to organization helper page

* Changed text to learn more

* Only show upgrade message to premium users

* Show upgrade message to free users with free orgs as well

---------

Co-authored-by: Matt Bishop <mbishop@bitwarden.com>
Co-authored-by: gbubemismith <gsmithwalter@gmail.com>
---
 apps/desktop/src/app/app.component.ts         | 14 +++++++
 apps/desktop/src/locales/en/messages.json     |  9 +++++
 .../src/vault/app/vault/view.component.html   | 10 +++++
 .../src/vault/app/vault/view.component.ts     |  6 +++
 .../individual-vault/add-edit.component.ts    |  5 ++-
 .../vault/components/add-edit.component.ts    |  2 +-
 .../src/vault/components/view.component.ts    | 16 +++++---
 .../login-credentials-view.component.html     |  8 ++--
 .../login-credentials-view.component.ts       | 38 ++++++++++++++++---
 9 files changed, 89 insertions(+), 19 deletions(-)

diff --git a/apps/desktop/src/app/app.component.ts b/apps/desktop/src/app/app.component.ts
index 5fefbf9ddf..a05b09e139 100644
--- a/apps/desktop/src/app/app.component.ts
+++ b/apps/desktop/src/app/app.component.ts
@@ -330,6 +330,20 @@ export class AppComponent implements OnInit, OnDestroy {
             }
             break;
           }
+          case "upgradeOrganization": {
+            const upgradeConfirmed = await this.dialogService.openSimpleDialog({
+              title: { key: "upgradeOrganization" },
+              content: { key: "upgradeOrganizationDesc" },
+              acceptButtonText: { key: "learnMore" },
+              type: "info",
+            });
+            if (upgradeConfirmed) {
+              this.platformUtilsService.launchUri(
+                "https://bitwarden.com/help/upgrade-from-individual-to-org/",
+              );
+            }
+            break;
+          }
           case "emailVerificationRequired": {
             const emailVerificationConfirmed = await this.dialogService.openSimpleDialog({
               title: { key: "emailVerificationRequired" },
diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index 1a02e5db4e..bca12f16a7 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/vault/app/vault/view.component.html b/apps/desktop/src/vault/app/vault/view.component.html
index 59e609312d..f589ba5304 100644
--- a/apps/desktop/src/vault/app/vault/view.component.html
+++ b/apps/desktop/src/vault/app/vault/view.component.html
@@ -186,6 +186,16 @@
               </span>
             </div>
           </div>
+          <div class="box-content-row box-content-row-flex totp" *ngIf="showUpgradeRequiredTotp">
+            <div class="row-main">
+              <span class="row-label">{{ "verificationCodeTotp" | i18n }}</span>
+              <span class="row-label">
+                <a [routerLink]="" (click)="upgradeOrganization()"
+                  >{{ "organizationUpgradeRequired" | i18n }}
+                </a>
+              </span>
+            </div>
+          </div>
         </div>
         <!-- Card -->
         <div *ngIf="cipher.card">
diff --git a/apps/desktop/src/vault/app/vault/view.component.ts b/apps/desktop/src/vault/app/vault/view.component.ts
index 23b85eceda..d3e8fff349 100644
--- a/apps/desktop/src/vault/app/vault/view.component.ts
+++ b/apps/desktop/src/vault/app/vault/view.component.ts
@@ -157,4 +157,10 @@ export class ViewComponent extends BaseViewComponent implements OnInit, OnDestro
       this.messagingService.send("premiumRequired");
     }
   }
+
+  upgradeOrganization() {
+    this.messagingService.send("upgradeOrganization", {
+      organizationId: this.cipher.organizationId,
+    });
+  }
 }
diff --git a/apps/web/src/app/vault/individual-vault/add-edit.component.ts b/apps/web/src/app/vault/individual-vault/add-edit.component.ts
index 56db7dc88d..916c845e9d 100644
--- a/apps/web/src/app/vault/individual-vault/add-edit.component.ts
+++ b/apps/web/src/app/vault/individual-vault/add-edit.component.ts
@@ -66,7 +66,7 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit, On
     protected messagingService: MessagingService,
     eventCollectionService: EventCollectionService,
     protected policyService: PolicyService,
-    organizationService: OrganizationService,
+    protected organizationService: OrganizationService,
     logService: LogService,
     passwordRepromptService: PasswordRepromptService,
     dialogService: DialogService,
@@ -307,7 +307,8 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit, On
       this.cipher.type === CipherType.Login &&
       this.cipher.login.totp &&
       this.organization?.productTierType != ProductTierType.Free &&
-      (this.cipher.organizationUseTotp || this.canAccessPremium)
+      ((this.canAccessPremium && this.cipher.organizationId == null) ||
+        this.cipher.organizationUseTotp)
     );
   }
 
diff --git a/libs/angular/src/vault/components/add-edit.component.ts b/libs/angular/src/vault/components/add-edit.component.ts
index 8d286e0a3f..bf2e68b71c 100644
--- a/libs/angular/src/vault/components/add-edit.component.ts
+++ b/libs/angular/src/vault/components/add-edit.component.ts
@@ -128,7 +128,7 @@ export class AddEditComponent implements OnInit, OnDestroy {
     protected policyService: PolicyService,
     protected logService: LogService,
     protected passwordRepromptService: PasswordRepromptService,
-    private organizationService: OrganizationService,
+    protected organizationService: OrganizationService,
     protected dialogService: DialogService,
     protected win: Window,
     protected datePipe: DatePipe,
diff --git a/libs/angular/src/vault/components/view.component.ts b/libs/angular/src/vault/components/view.component.ts
index fc12aeff2f..724a1507be 100644
--- a/libs/angular/src/vault/components/view.component.ts
+++ b/libs/angular/src/vault/components/view.component.ts
@@ -65,6 +65,7 @@ export class ViewComponent implements OnDestroy, OnInit {
   showPrivateKey: boolean;
   canAccessPremium: boolean;
   showPremiumRequiredTotp: boolean;
+  showUpgradeRequiredTotp: boolean;
   totpCode: string;
   totpCodeFormatted: string;
   totpDash: number;
@@ -151,22 +152,25 @@ export class ViewComponent implements OnDestroy, OnInit {
       this.billingAccountProfileStateService.hasPremiumFromAnySource$(activeUserId),
     );
     this.showPremiumRequiredTotp =
-      this.cipher.login.totp && !this.canAccessPremium && !this.cipher.organizationUseTotp;
+      this.cipher.login.totp && !this.canAccessPremium && !this.cipher.organizationId;
     this.canDeleteCipher$ = this.cipherAuthorizationService.canDeleteCipher$(this.cipher, [
       this.collectionId as CollectionId,
     ]);
 
+    this.showUpgradeRequiredTotp =
+      this.cipher.login.totp && this.cipher.organizationId && !this.cipher.organizationUseTotp;
+
     if (this.cipher.folderId) {
       this.folder = await (
         await firstValueFrom(this.folderService.folderViews$(activeUserId))
       ).find((f) => f.id == this.cipher.folderId);
     }
 
-    if (
-      this.cipher.type === CipherType.Login &&
-      this.cipher.login.totp &&
-      (cipher.organizationUseTotp || this.canAccessPremium)
-    ) {
+    const canGenerateTotp = this.cipher.organizationId
+      ? this.cipher.organizationUseTotp
+      : this.canAccessPremium;
+
+    if (this.cipher.type === CipherType.Login && this.cipher.login.totp && canGenerateTotp) {
       await this.totpUpdateCode();
       const interval = this.totpService.getTimeInterval(this.cipher.login.totp);
       await this.totpTick(interval);
diff --git a/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.html b/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.html
index 8503604bf7..b4a0d4841f 100644
--- a/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.html
+++ b/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.html
@@ -116,7 +116,7 @@
       <bit-label [appTextDrag]="totpCodeCopyObj?.totpCode"
         >{{ "verificationCodeTotp" | i18n }}
         <span
-          *ngIf="!(isPremium$ | async)"
+          *ngIf="!(allowTotpGeneration$ | async)"
           bitBadge
           variant="success"
           class="tw-ml-2 tw-cursor-pointer"
@@ -130,14 +130,14 @@
         id="totp"
         readonly
         bitInput
-        [type]="!(isPremium$ | async) ? 'password' : 'text'"
+        [type]="!(allowTotpGeneration$ | async) ? 'password' : 'text'"
         [value]="totpCodeCopyObj?.totpCodeFormatted || '*** ***'"
         aria-readonly="true"
         data-testid="login-totp"
         class="tw-font-mono"
       />
       <div
-        *ngIf="isPremium$ | async"
+        *ngIf="allowTotpGeneration$ | async"
         bitTotpCountdown
         [cipher]="cipher"
         bitSuffix
@@ -152,7 +152,7 @@
         showToast
         [appA11yTitle]="'copyVerificationCode' | i18n"
         data-testid="copy-totp"
-        [disabled]="!(isPremium$ | async)"
+        [disabled]="!(allowTotpGeneration$ | async)"
         class="disabled:tw-cursor-default"
       ></button>
     </bit-form-field>
diff --git a/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.ts b/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.ts
index 7533ac2647..281e187f78 100644
--- a/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.ts
+++ b/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.ts
@@ -2,7 +2,15 @@
 // @ts-strict-ignore
 import { CommonModule, DatePipe } from "@angular/common";
 import { Component, inject, Input } from "@angular/core";
-import { Observable, switchMap } from "rxjs";
+import {
+  BehaviorSubject,
+  combineLatest,
+  filter,
+  map,
+  Observable,
+  shareReplay,
+  switchMap,
+} from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
@@ -12,13 +20,13 @@ import { EventType } from "@bitwarden/common/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import {
+  BadgeModule,
+  ColorPasswordModule,
   FormFieldModule,
+  IconButtonModule,
   SectionComponent,
   SectionHeaderComponent,
   TypographyModule,
-  IconButtonModule,
-  BadgeModule,
-  ColorPasswordModule,
 } from "@bitwarden/components";
 
 // FIXME: remove `src` and fix import
@@ -51,13 +59,31 @@ type TotpCodeValues = {
   ],
 })
 export class LoginCredentialsViewComponent {
-  @Input() cipher: CipherView;
+  @Input()
+  get cipher(): CipherView {
+    return this._cipher$.value;
+  }
+  set cipher(value: CipherView) {
+    this._cipher$.next(value);
+  }
+  private _cipher$ = new BehaviorSubject<CipherView>(null);
 
-  isPremium$: Observable<boolean> = this.accountService.activeAccount$.pipe(
+  private _userHasPremium$: Observable<boolean> = this.accountService.activeAccount$.pipe(
     switchMap((account) =>
       this.billingAccountProfileStateService.hasPremiumFromAnySource$(account.id),
     ),
   );
+
+  allowTotpGeneration$: Observable<boolean> = combineLatest([
+    this._userHasPremium$,
+    this._cipher$.pipe(filter((c) => c != null)),
+  ]).pipe(
+    map(([userHasPremium, cipher]) => {
+      // User premium status only applies to personal ciphers, organizationUseTotp applies to organization ciphers
+      return (userHasPremium && cipher.organizationId == null) || cipher.organizationUseTotp;
+    }),
+    shareReplay({ refCount: true, bufferSize: 1 }),
+  );
   showPasswordCount: boolean = false;
   passwordRevealed: boolean = false;
   totpCodeCopyObj: TotpCodeValues;

From 7b11905db81588a2cb03753df157c60664152a1f Mon Sep 17 00:00:00 2001
From: Oscar Hinton <Hinton@users.noreply.github.com>
Date: Mon, 13 Jan 2025 18:59:01 +0100
Subject: [PATCH 061/150] Fix platform bad imports (#12838)

---
 .../src/app/secrets-manager/overview/overview.module.ts       | 4 +---
 .../projects/guards/project-access.guard.spec.ts              | 4 +---
 .../guards/service-account-access.guard.spec.ts               | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.module.ts b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.module.ts
index b410bbec21..94d9ab2d8e 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.module.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.module.ts
@@ -1,10 +1,8 @@
 import { NgModule } from "@angular/core";
 
 import { BannerModule } from "@bitwarden/components";
+import { OnboardingModule } from "@bitwarden/web-vault/app/shared/components/onboarding/onboarding.module";
 
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { OnboardingModule } from "../../../../../../apps/web/src/app/shared/components/onboarding/onboarding.module";
 import { SecretsManagerSharedModule } from "../shared/sm-shared.module";
 
 import { OverviewRoutingModule } from "./overview-routing.module";
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/guards/project-access.guard.spec.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/guards/project-access.guard.spec.ts
index 8447127fc9..78d367776d 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/guards/project-access.guard.spec.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/guards/project-access.guard.spec.ts
@@ -8,10 +8,8 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { ToastService } from "@bitwarden/components";
+import { RouterService } from "@bitwarden/web-vault/app/core";
 
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { RouterService } from "../../../../../../../apps/web/src/app/core/router.service";
 import { ProjectView } from "../../models/view/project.view";
 import { ProjectService } from "../project.service";
 
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.spec.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.spec.ts
index ef29f6be7e..a4079a6def 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.spec.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.spec.ts
@@ -8,10 +8,8 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { ToastService } from "@bitwarden/components";
+import { RouterService } from "@bitwarden/web-vault/app/core";
 
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { RouterService } from "../../../../../../../../clients/apps/web/src/app/core/router.service";
 import { ServiceAccountView } from "../../models/view/service-account.view";
 import { ServiceAccountService } from "../service-account.service";
 

From be77489baaee68802bb87f497a3a8a99aac956dc Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Mon, 13 Jan 2025 19:11:36 +0100
Subject: [PATCH 062/150] Remove differences from flathub flatpak manifest and
 devel manifest (#12555)

---
 apps/desktop/resources/com.bitwarden.desktop.devel.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/desktop/resources/com.bitwarden.desktop.devel.yaml b/apps/desktop/resources/com.bitwarden.desktop.devel.yaml
index 02f2474927..fea28052f8 100644
--- a/apps/desktop/resources/com.bitwarden.desktop.devel.yaml
+++ b/apps/desktop/resources/com.bitwarden.desktop.devel.yaml
@@ -8,7 +8,6 @@ command: bitwarden.sh
 finish-args:
   - --share=ipc
   - --share=network
-  - --socket=wayland
   - --socket=x11
   - --device=dri
   - --env=XDG_CURRENT_DESKTOP=Unity
@@ -43,5 +42,4 @@ modules:
         commands:
           - ulimit -c 0
           - export TMPDIR="$XDG_RUNTIME_DIR/app/$FLATPAK_ID"
-          - exec zypak-wrapper /app/bin/bitwarden-app --ozone-platform-hint=auto
-            --enable-features=WaylandWindowDecorations "$@"
+          - exec zypak-wrapper /app/bin/bitwarden-app "$@"

From f28664716f2ea5cba813374d52d6c919c1482d4b Mon Sep 17 00:00:00 2001
From: Jonas Hendrickx <jhendrickx@bitwarden.com>
Date: Mon, 13 Jan 2025 19:26:50 +0100
Subject: [PATCH 063/150] [PM-16682] Provider setup tax id is not saved
 (#12678)

---
 .../app/admin-console/providers/setup/setup.component.ts  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts
index f773db6c11..ecf649b8f3 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts
@@ -23,8 +23,7 @@ import { KeyService } from "@bitwarden/key-management";
   templateUrl: "setup.component.html",
 })
 export class SetupComponent implements OnInit, OnDestroy {
-  @ViewChild(ManageTaxInformationComponent)
-  manageTaxInformationComponent: ManageTaxInformationComponent;
+  @ViewChild(ManageTaxInformationComponent) taxInformationComponent: ManageTaxInformationComponent;
 
   loading = true;
   providerId: string;
@@ -111,7 +110,7 @@ export class SetupComponent implements OnInit, OnDestroy {
     try {
       this.formGroup.markAllAsTouched();
 
-      if (!this.manageTaxInformationComponent.validate() || !this.formGroup.valid) {
+      if (!this.taxInformationComponent.validate() || !this.formGroup.valid) {
         return;
       }
 
@@ -125,7 +124,7 @@ export class SetupComponent implements OnInit, OnDestroy {
       request.key = key;
 
       request.taxInfo = new ExpandedTaxInfoUpdateRequest();
-      const taxInformation = this.manageTaxInformationComponent.getTaxInformation();
+      const taxInformation = this.taxInformationComponent.getTaxInformation();
 
       request.taxInfo.country = taxInformation.country;
       request.taxInfo.postalCode = taxInformation.postalCode;
@@ -147,6 +146,7 @@ export class SetupComponent implements OnInit, OnDestroy {
 
       await this.router.navigate(["/providers", provider.id]);
     } catch (e) {
+      e.message = this.i18nService.translate(e.message) || e.message;
       this.validationService.showError(e);
     }
   };

From ffe05f27c453df9b310a4cd9d3d5035fc245e8c3 Mon Sep 17 00:00:00 2001
From: Daniel James Smith <2670567+djsmith85@users.noreply.github.com>
Date: Mon, 13 Jan 2025 19:45:44 +0100
Subject: [PATCH 064/150] Add csv export instructions for Nordpass (#12829)

Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
---
 libs/importer/src/components/import.component.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libs/importer/src/components/import.component.html b/libs/importer/src/components/import.component.html
index 0da8127369..25172f850b 100644
--- a/libs/importer/src/components/import.component.html
+++ b/libs/importer/src/components/import.component.html
@@ -395,6 +395,11 @@
           Open the FullClient, go to the Main Menu and select Export. Start the export passwords
           wizard and follow the instructions to export a CSV file.
         </ng-container>
+        <ng-container *ngIf="format === 'nordpasscsv'">
+          Log in to NordPass and open Settings &rarr; Scroll down to the Import and Export section
+          and select Export items &rarr; Enter your Master Password and select Continue. &rarr; Save
+          the CSV file on your device.
+        </ng-container>
       </bit-callout>
       <import-lastpass
         *ngIf="showLastPassOptions"

From a54508a0e3cd14343e116abf26fb3b0b78258a1b Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Mon, 13 Jan 2025 19:59:59 +0100
Subject: [PATCH 065/150] [PM-16932] Fix timeout when desktop app is not
 started (#12799)

* Fix biometrics button showing up when biometrics is not enabled

* Fix tests

* Fix timeout when desktop app is not started

* Update comments for legacy biometrics removal
---
 .../src/background/nativeMessaging.background.ts       |  2 +-
 .../lock/services/extension-lock-component.service.ts  | 10 +++++++++-
 .../src/services/biometric-message-handler.service.ts  |  4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/apps/browser/src/background/nativeMessaging.background.ts b/apps/browser/src/background/nativeMessaging.background.ts
index 116d048d2e..c134860f1a 100644
--- a/apps/browser/src/background/nativeMessaging.background.ts
+++ b/apps/browser/src/background/nativeMessaging.background.ts
@@ -257,7 +257,7 @@ export class NativeMessagingBackground {
       message.command == BiometricsCommands.Unlock ||
       message.command == BiometricsCommands.IsAvailable
     ) {
-      // TODO remove after 2025.01
+      // TODO remove after 2025.3
       // wait until there is no other callbacks, or timeout
       const call = await firstValueFrom(
         race(
diff --git a/apps/browser/src/key-management/lock/services/extension-lock-component.service.ts b/apps/browser/src/key-management/lock/services/extension-lock-component.service.ts
index 77c0fcaf50..711ae4e378 100644
--- a/apps/browser/src/key-management/lock/services/extension-lock-component.service.ts
+++ b/apps/browser/src/key-management/lock/services/extension-lock-component.service.ts
@@ -54,7 +54,15 @@ export class ExtensionLockComponentService implements LockComponentService {
         if (!(await firstValueFrom(this.biometricStateService.biometricUnlockEnabled$))) {
           return BiometricsStatus.NotEnabledLocally;
         } else {
-          return await this.biometricsService.getBiometricsStatusForUser(userId);
+          // TODO remove after 2025.3
+          // remove after backward compatibility code for old biometrics ipc protocol is removed
+          const result: BiometricsStatus = (await Promise.race([
+            this.biometricsService.getBiometricsStatusForUser(userId),
+            new Promise((resolve) =>
+              setTimeout(() => resolve(BiometricsStatus.DesktopDisconnected), 1000),
+            ),
+          ])) as BiometricsStatus;
+          return result;
         }
       }),
       this.userDecryptionOptionsService.userDecryptionOptionsById$(userId),
diff --git a/apps/desktop/src/services/biometric-message-handler.service.ts b/apps/desktop/src/services/biometric-message-handler.service.ts
index ea1e7e76c5..72d00988e8 100644
--- a/apps/desktop/src/services/biometric-message-handler.service.ts
+++ b/apps/desktop/src/services/biometric-message-handler.service.ts
@@ -188,7 +188,7 @@ export class BiometricMessageHandlerService {
           appId,
         );
       }
-      // TODO: legacy, remove after 2025.01
+      // TODO: legacy, remove after 2025.3
       case BiometricsCommands.IsAvailable: {
         const available =
           (await this.biometricsService.getBiometricsStatus()) == BiometricsStatus.Available;
@@ -200,7 +200,7 @@ export class BiometricMessageHandlerService {
           appId,
         );
       }
-      // TODO: legacy, remove after 2025.01
+      // TODO: legacy, remove after 2025.3
       case BiometricsCommands.Unlock: {
         const isTemporarilyDisabled =
           (await this.biometricStateService.getBiometricUnlockEnabled(message.userId as UserId)) &&

From d2523374747ce91ceca5715c139d40e1160f9b9f Mon Sep 17 00:00:00 2001
From: Brandon Treston <btreston@bitwarden.com>
Date: Mon, 13 Jan 2025 14:32:57 -0500
Subject: [PATCH 066/150] [pm-13645] invite member modal for free org
 references up to 20 users (#12837)

* fix invite counter to show when there are 0 seats left
---
 .../member-dialog/member-dialog.component.html   | 16 ++++++++++------
 apps/web/src/locales/en/messages.json            |  3 +++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html
index 3bef1b6ccc..5e81e4ee71 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html
@@ -23,15 +23,19 @@
         <bit-tab [label]="'role' | i18n">
           <ng-container *ngIf="!editMode">
             <p bitTypography="body1">{{ "inviteUserDesc" | i18n }}</p>
-            <bit-form-field *ngIf="remainingSeats$ | async as remainingSeats">
+            <bit-form-field *ngIf="{ seats: remainingSeats$ | async } as remaining">
               <bit-label>{{ "email" | i18n }}</bit-label>
               <input id="emails" type="text" appAutoFocus bitInput formControlName="emails" />
-              <bit-hint *ngIf="remainingSeats > 1; else singleSeat">{{
-                "inviteMultipleEmailDesc" | i18n: remainingSeats
+
+              <bit-hint *ngIf="remaining.seats > 1">{{
+                "inviteMultipleEmailDesc" | i18n: remaining.seats
               }}</bit-hint>
-              <ng-template #singleSeat>
-                <bit-hint>{{ "inviteSingleEmailDesc" | i18n: remainingSeats }}</bit-hint>
-              </ng-template>
+
+              <bit-hint *ngIf="remaining.seats === 1">{{
+                "inviteSingleEmailDesc" | i18n
+              }}</bit-hint>
+
+              <bit-hint *ngIf="remaining.seats === 0">{{ "inviteZeroEmailDesc" | i18n }}</bit-hint>
             </bit-form-field>
           </ng-container>
           <bit-radio-group formControlName="type">
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 4307dba71e..456981fe9a 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -3302,6 +3302,9 @@
   "inviteSingleEmailDesc": {
     "message": "You have 1 invite remaining."
   },
+  "inviteZeroEmailDesc": {
+    "message": "You have 0 invites remaining."
+  },
   "userUsingTwoStep": {
     "message": "This user is using two-step login to protect their account."
   },

From 1fcdf25bf7c4a71ea3878e016e16c417adcce21c Mon Sep 17 00:00:00 2001
From: Jared Snider <116684653+JaredSnider-Bitwarden@users.noreply.github.com>
Date: Mon, 13 Jan 2025 14:39:48 -0500
Subject: [PATCH 067/150] Auth/PM-16947 - Web - Device Management - Add Manage
 Auth Requests support (#12809)

* PM-16947 - JsLibServices - register default DefaultLoginApprovalComponentService

* PM-16947 - DeviceResponse - add interface for DevicePendingAuthRequest

* PM-16947 - Web translations - migrate all LoginApprovalComponent translations from desktop to web

* PM-16947 - LoginApprovalComp - (1) Add loading state (2) Refactor to return proper boolean results (3) Don't create race condition by trying to respond to the close event in the dialog and re-sending responses upon approve or deny click

* PM-16947 - DeviceManagementComponent - added support for approving and denying auth requests.

* PM-16947 - LoginApprovalComp - Add validation error

* PM-16947 - LoginApprovalComponent - remove validation service for now.

* PM-16947 - Re add validation

* PM-16947 - Fix LoginApprovalComponent tests
---
 .../security/device-management.component.html | 24 ++++++--
 .../security/device-management.component.ts   | 57 +++++++++++------
 apps/web/src/locales/en/messages.json         | 61 +++++++++++++++++++
 .../src/services/jslib-services.module.ts     |  7 +++
 .../login-approval.component.html             | 46 ++++++++------
 .../login-approval.component.spec.ts          |  4 ++
 .../login-approval.component.ts               | 21 ++++---
 .../devices/responses/device.response.ts      |  7 ++-
 8 files changed, 178 insertions(+), 49 deletions(-)

diff --git a/apps/web/src/app/auth/settings/security/device-management.component.html b/apps/web/src/app/auth/settings/security/device-management.component.html
index 743414aac4..37827a33af 100644
--- a/apps/web/src/app/auth/settings/security/device-management.component.html
+++ b/apps/web/src/app/auth/settings/security/device-management.component.html
@@ -48,17 +48,31 @@
           <i [class]="getDeviceIcon(row.type)" class="bwi-lg" aria-hidden="true"></i>
         </div>
         <div>
-          {{ row.displayName }}
-          <span *ngIf="row.trusted" class="tw-text-sm tw-text-muted tw-block">
-            {{ "trusted" | i18n }}
-          </span>
+          <ng-container *ngIf="row.hasPendingAuthRequest">
+            <a bitLink href="#" appStopClick (click)="managePendingAuthRequest(row)">
+              {{ row.displayName }}
+            </a>
+
+            <span class="tw-text-sm tw-text-muted tw-block">
+              {{ "needsApproval" | i18n }}
+            </span>
+          </ng-container>
+          <ng-container *ngIf="!row.hasPendingAuthRequest">
+            {{ row.displayName }}
+            <span
+              *ngIf="row.trusted && !row.hasPendingAuthRequest"
+              class="tw-text-sm tw-text-muted tw-block"
+            >
+              {{ "trusted" | i18n }}
+            </span>
+          </ng-container>
         </div>
       </td>
       <td bitCell>
         <span *ngIf="isCurrentDevice(row)" bitBadge variant="primary">{{
           "currentSession" | i18n
         }}</span>
-        <span *ngIf="hasPendingAuthRequest(row)" bitBadge variant="warning">{{
+        <span *ngIf="row.hasPendingAuthRequest" bitBadge variant="warning">{{
           "requestPending" | i18n
         }}</span>
       </td>
diff --git a/apps/web/src/app/auth/settings/security/device-management.component.ts b/apps/web/src/app/auth/settings/security/device-management.component.ts
index 65f2afc250..e22122ad9a 100644
--- a/apps/web/src/app/auth/settings/security/device-management.component.ts
+++ b/apps/web/src/app/auth/settings/security/device-management.component.ts
@@ -1,10 +1,14 @@
 import { CommonModule } from "@angular/common";
 import { Component } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { firstValueFrom } from "rxjs";
-import { switchMap } from "rxjs/operators";
+import { combineLatest, firstValueFrom } from "rxjs";
 
+import { LoginApprovalComponent } from "@bitwarden/auth/angular";
 import { DevicesServiceAbstraction } from "@bitwarden/common/auth/abstractions/devices/devices.service.abstraction";
+import {
+  DevicePendingAuthRequest,
+  DeviceResponse,
+} from "@bitwarden/common/auth/abstractions/devices/responses/device.response";
 import { DeviceView } from "@bitwarden/common/auth/abstractions/devices/views/device.view";
 import { DeviceType, DeviceTypeMetadata } from "@bitwarden/common/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -26,7 +30,8 @@ interface DeviceTableData {
   loginStatus: string;
   firstLogin: Date;
   trusted: boolean;
-  devicePendingAuthRequest: object | null;
+  devicePendingAuthRequest: DevicePendingAuthRequest | null;
+  hasPendingAuthRequest: boolean;
 }
 
 /**
@@ -52,28 +57,25 @@ export class DeviceManagementComponent {
     private toastService: ToastService,
     private validationService: ValidationService,
   ) {
-    this.devicesService
-      .getCurrentDevice$()
-      .pipe(
-        takeUntilDestroyed(),
-        switchMap((currentDevice) => {
-          this.currentDevice = new DeviceView(currentDevice);
-          return this.devicesService.getDevices$();
-        }),
-      )
+    combineLatest([this.devicesService.getCurrentDevice$(), this.devicesService.getDevices$()])
+      .pipe(takeUntilDestroyed())
       .subscribe({
-        next: (devices) => {
-          this.dataSource.data = devices.map((device) => {
+        next: ([currentDevice, devices]: [DeviceResponse, Array<DeviceView>]) => {
+          this.currentDevice = new DeviceView(currentDevice);
+
+          this.dataSource.data = devices.map((device: DeviceView): DeviceTableData => {
             return {
               id: device.id,
               type: device.type,
               displayName: this.getHumanReadableDeviceType(device.type),
               loginStatus: this.getLoginStatus(device),
-              devicePendingAuthRequest: device.response.devicePendingAuthRequest,
               firstLogin: new Date(device.creationDate),
               trusted: device.response.isTrusted,
+              devicePendingAuthRequest: device.response.devicePendingAuthRequest,
+              hasPendingAuthRequest: this.hasPendingAuthRequest(device.response),
             };
           });
+
           this.loading = false;
         },
         error: () => {
@@ -176,15 +178,36 @@ export class DeviceManagementComponent {
 
   /**
    * Check if a device has a pending auth request
-   * @param device - The device
+   * @param device - The device response
    * @returns True if the device has a pending auth request, false otherwise
    */
-  protected hasPendingAuthRequest(device: DeviceTableData): boolean {
+  private hasPendingAuthRequest(device: DeviceResponse): boolean {
     return (
       device.devicePendingAuthRequest !== undefined && device.devicePendingAuthRequest !== null
     );
   }
 
+  /**
+   * Open a dialog to approve or deny a pending auth request for a device
+   */
+  async managePendingAuthRequest(device: DeviceTableData) {
+    if (device.devicePendingAuthRequest === undefined || device.devicePendingAuthRequest === null) {
+      return;
+    }
+
+    const dialogRef = LoginApprovalComponent.open(this.dialogService, {
+      notificationId: device.devicePendingAuthRequest.id,
+    });
+
+    const result = await firstValueFrom(dialogRef.closed);
+
+    if (result !== undefined && typeof result === "boolean") {
+      // auth request approved or denied so reset
+      device.devicePendingAuthRequest = null;
+      device.hasPendingAuthRequest = false;
+    }
+  }
+
   /**
    * Remove a device
    * @param device - The device
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 456981fe9a..2779c0470e 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -3813,6 +3813,67 @@
   "trusted": {
     "message": "Trusted"
   },
+  "needsApproval": {
+    "message": "Needs approval"
+  },
+  "areYouTryingtoLogin": {
+    "message": "Are you trying to log in?"
+  },
+  "logInAttemptBy": {
+    "message": "Login attempt by $EMAIL$",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
+  "deviceType": {
+    "message": "Device Type"
+  },
+  "ipAddress": {
+    "message": "IP Address"
+  },
+  "confirmLogIn": {
+    "message": "Confirm login"
+  },
+  "denyLogIn": {
+    "message": "Deny login"
+  },
+  "thisRequestIsNoLongerValid": {
+    "message": "This request is no longer valid."
+  },
+  "logInConfirmedForEmailOnDevice": {
+    "message": "Login confirmed for $EMAIL$ on $DEVICE$",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      },
+      "device": {
+        "content": "$2",
+        "example": "iOS"
+      }
+    }
+  },
+  "youDeniedALogInAttemptFromAnotherDevice": {
+    "message": "You denied a login attempt from another device. If this really was you, try to log in with the device again."
+  },
+  "loginRequestHasAlreadyExpired": {
+    "message": "Login request has already expired."
+  },
+  "justNow": {
+    "message": "Just now"
+  },
+  "requestedXMinutesAgo": {
+    "message": "Requested $MINUTES$ minutes ago",
+    "placeholders": {
+      "minutes": {
+        "content": "$1",
+        "example": "5"
+      }
+    }
+  },
   "creatingAccountOn": {
     "message": "Creating account on"
   },
diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts
index 93d25af1a5..803808612c 100644
--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -20,6 +20,7 @@ import {
   DefaultLoginComponentService,
   LoginDecryptionOptionsService,
   DefaultLoginDecryptionOptionsService,
+  DefaultLoginApprovalComponentService,
 } from "@bitwarden/auth/angular";
 import {
   AuthRequestServiceAbstraction,
@@ -39,6 +40,7 @@ import {
   DefaultAuthRequestApiService,
   DefaultLoginSuccessHandlerService,
   LoginSuccessHandlerService,
+  LoginApprovalComponentServiceAbstraction,
 } from "@bitwarden/auth/common";
 import { ApiService as ApiServiceAbstraction } from "@bitwarden/common/abstractions/api.service";
 import { AuditService as AuditServiceAbstraction } from "@bitwarden/common/abstractions/audit.service";
@@ -1405,6 +1407,11 @@ const safeProviders: SafeProvider[] = [
     useClass: DefaultAuthRequestApiService,
     deps: [ApiServiceAbstraction, LogService],
   }),
+  safeProvider({
+    provide: LoginApprovalComponentServiceAbstraction,
+    useClass: DefaultLoginApprovalComponentService,
+    deps: [],
+  }),
   safeProvider({
     provide: LoginDecryptionOptionsService,
     useClass: DefaultLoginDecryptionOptionsService,
diff --git a/libs/auth/src/angular/login-approval/login-approval.component.html b/libs/auth/src/angular/login-approval/login-approval.component.html
index ddbc48d71a..c0cb9b9caf 100644
--- a/libs/auth/src/angular/login-approval/login-approval.component.html
+++ b/libs/auth/src/angular/login-approval/login-approval.component.html
@@ -1,23 +1,31 @@
 <bit-dialog>
   <span bitDialogTitle>{{ "areYouTryingtoLogin" | i18n }}</span>
   <ng-container bitDialogContent>
-    <h4 class="tw-mb-3">{{ "logInAttemptBy" | i18n: email }}</h4>
-    <div>
-      <b>{{ "fingerprintPhraseHeader" | i18n }}</b>
-      <p class="tw-text-code">{{ fingerprintPhrase }}</p>
-    </div>
-    <div>
-      <b>{{ "deviceType" | i18n }}</b>
-      <p>{{ authRequestResponse?.requestDeviceType }}</p>
-    </div>
-    <div>
-      <b>{{ "ipAddress" | i18n }}</b>
-      <p>{{ authRequestResponse?.requestIpAddress }}</p>
-    </div>
-    <div>
-      <b>{{ "time" | i18n }}</b>
-      <p>{{ requestTimeText }}</p>
-    </div>
+    <ng-container *ngIf="loading">
+      <div class="tw-flex tw-items-center tw-justify-center" *ngIf="loading">
+        <i class="bwi bwi-spinner bwi-spin bwi-3x" aria-hidden="true"></i>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="!loading">
+      <h4 class="tw-mb-3">{{ "logInAttemptBy" | i18n: email }}</h4>
+      <div>
+        <b>{{ "fingerprintPhraseHeader" | i18n }}</b>
+        <p class="tw-text-code">{{ fingerprintPhrase }}</p>
+      </div>
+      <div>
+        <b>{{ "deviceType" | i18n }}</b>
+        <p>{{ authRequestResponse?.requestDeviceType }}</p>
+      </div>
+      <div>
+        <b>{{ "ipAddress" | i18n }}</b>
+        <p>{{ authRequestResponse?.requestIpAddress }}</p>
+      </div>
+      <div>
+        <b>{{ "time" | i18n }}</b>
+        <p>{{ requestTimeText }}</p>
+      </div>
+    </ng-container>
   </ng-container>
   <ng-container bitDialogFooter>
     <button
@@ -25,7 +33,7 @@
       type="button"
       buttonType="primary"
       [bitAction]="approveLogin"
-      [bitDialogClose]="true"
+      [disabled]="loading"
     >
       {{ "confirmLogIn" | i18n }}
     </button>
@@ -34,7 +42,7 @@
       type="button"
       buttonType="secondary"
       [bitAction]="denyLogin"
-      [bitDialogClose]="true"
+      [disabled]="loading"
     >
       {{ "denyLogIn" | i18n }}
     </button>
diff --git a/libs/auth/src/angular/login-approval/login-approval.component.spec.ts b/libs/auth/src/angular/login-approval/login-approval.component.spec.ts
index ff598bdeb9..da30df62ff 100644
--- a/libs/auth/src/angular/login-approval/login-approval.component.spec.ts
+++ b/libs/auth/src/angular/login-approval/login-approval.component.spec.ts
@@ -13,6 +13,7 @@ import { AuthRequestResponse } from "@bitwarden/common/auth/models/response/auth
 import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import { UserId } from "@bitwarden/common/types/guid";
 import { ToastService } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
@@ -29,6 +30,7 @@ describe("LoginApprovalComponent", () => {
   let i18nService: MockProxy<I18nService>;
   let dialogRef: MockProxy<DialogRef>;
   let toastService: MockProxy<ToastService>;
+  let validationService: MockProxy<ValidationService>;
 
   const testNotificationId = "test-notification-id";
   const testEmail = "test@bitwarden.com";
@@ -41,6 +43,7 @@ describe("LoginApprovalComponent", () => {
     i18nService = mock<I18nService>();
     dialogRef = mock<DialogRef>();
     toastService = mock<ToastService>();
+    validationService = mock<ValidationService>();
 
     accountService.activeAccount$ = of({
       email: testEmail,
@@ -62,6 +65,7 @@ describe("LoginApprovalComponent", () => {
         { provide: KeyService, useValue: mock<KeyService>() },
         { provide: DialogRef, useValue: dialogRef },
         { provide: ToastService, useValue: toastService },
+        { provide: ValidationService, useValue: validationService },
         {
           provide: LoginApprovalComponentServiceAbstraction,
           useValue: mock<LoginApprovalComponentServiceAbstraction>(),
diff --git a/libs/auth/src/angular/login-approval/login-approval.component.ts b/libs/auth/src/angular/login-approval/login-approval.component.ts
index 5192334a0c..3b44f545ab 100644
--- a/libs/auth/src/angular/login-approval/login-approval.component.ts
+++ b/libs/auth/src/angular/login-approval/login-approval.component.ts
@@ -16,6 +16,7 @@ import { AuthRequestResponse } from "@bitwarden/common/auth/models/response/auth
 import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import {
   AsyncActionsModule,
@@ -40,6 +41,8 @@ export interface LoginApprovalDialogParams {
   imports: [CommonModule, AsyncActionsModule, ButtonModule, DialogModule, JslibModule],
 })
 export class LoginApprovalComponent implements OnInit, OnDestroy {
+  loading = true;
+
   notificationId: string;
 
   private destroy$ = new Subject<void>();
@@ -62,25 +65,25 @@ export class LoginApprovalComponent implements OnInit, OnDestroy {
     private dialogRef: DialogRef,
     private toastService: ToastService,
     private loginApprovalComponentService: LoginApprovalComponentService,
+    private validationService: ValidationService,
   ) {
     this.notificationId = params.notificationId;
   }
 
   async ngOnDestroy(): Promise<void> {
     clearInterval(this.interval);
-    const closedWithButton = await firstValueFrom(this.dialogRef.closed);
-    if (!closedWithButton) {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.retrieveAuthRequestAndRespond(false);
-    }
     this.destroy$.next();
     this.destroy$.complete();
   }
 
   async ngOnInit() {
     if (this.notificationId != null) {
-      this.authRequestResponse = await this.apiService.getAuthRequest(this.notificationId);
+      try {
+        this.authRequestResponse = await this.apiService.getAuthRequest(this.notificationId);
+      } catch (error) {
+        this.validationService.showError(error);
+      }
+
       const publicKey = Utils.fromB64ToArray(this.authRequestResponse.publicKey);
       this.email = await await firstValueFrom(
         this.accountService.activeAccount$.pipe(map((a) => a?.email)),
@@ -96,6 +99,8 @@ export class LoginApprovalComponent implements OnInit, OnDestroy {
       }, RequestTimeUpdate);
 
       this.loginApprovalComponentService.showLoginRequestedAlertIfWindowNotVisible(this.email);
+
+      this.loading = false;
     }
   }
 
@@ -131,6 +136,8 @@ export class LoginApprovalComponent implements OnInit, OnDestroy {
       );
       this.showResultToast(loginResponse);
     }
+
+    this.dialogRef.close(approve);
   }
 
   showResultToast(loginResponse: AuthRequestResponse) {
diff --git a/libs/common/src/auth/abstractions/devices/responses/device.response.ts b/libs/common/src/auth/abstractions/devices/responses/device.response.ts
index 707616744a..84a2fb03c2 100644
--- a/libs/common/src/auth/abstractions/devices/responses/device.response.ts
+++ b/libs/common/src/auth/abstractions/devices/responses/device.response.ts
@@ -1,6 +1,11 @@
 import { DeviceType } from "../../../../enums";
 import { BaseResponse } from "../../../../models/response/base.response";
 
+export interface DevicePendingAuthRequest {
+  id: string;
+  creationDate: string;
+}
+
 export class DeviceResponse extends BaseResponse {
   id: string;
   userId: string;
@@ -10,7 +15,7 @@ export class DeviceResponse extends BaseResponse {
   creationDate: string;
   revisionDate: string;
   isTrusted: boolean;
-  devicePendingAuthRequest: { id: string; creationDate: string } | null;
+  devicePendingAuthRequest: DevicePendingAuthRequest | null;
 
   constructor(response: any) {
     super(response);

From 3f00f9eaf8aa4a8a7d9e6107afbdda6e78538af5 Mon Sep 17 00:00:00 2001
From: Jonathan Prusik <jprusik@users.noreply.github.com>
Date: Mon, 13 Jan 2025 14:43:34 -0500
Subject: [PATCH 068/150] [PM-16804] Add supporting Vault component
 presentational updates for blocked domains (#12720)

* Revert "remove vault component presentational updates"

This reverts commit fe40dd84644c10e932fb74f633c910293d9d04e8.

* update vault popup autofill service to enable moving state closer to blocked domain component callsites

* hide autofill actions from suggestions if the current tab location is on the blocklist

* update autofill suggestions section title

* update blocked domain section indicator tooltip message

* create and use blocked-injection-banner component

* update blocked URI banner with deeplink to settings

* remove blocked URI indicator for suggestions section

* fix suggested items showing cipher external link button

* fix message catalog updates

* move currentURIIsBlocked state fetching into VaultListItemsContainerComponent

* leverage shareReplay caching for new state additions to VaultPopupAutofillService

* have blocked-injection-banner component consume observable rather than init value

* fix tests

* use observables in the vault-list-items-container template
---
 apps/browser/src/_locales/en/messages.json    | 12 ++--
 .../autofill-vault-list-items.component.html  |  2 +-
 .../blocked-injection-banner.component.html   | 10 +++
 .../blocked-injection-banner.component.ts     | 53 +++++++++++++++
 .../vault-list-items-container.component.html | 10 ++-
 .../vault-list-items-container.component.ts   | 42 +++++++++++-
 .../vault-v2/vault-v2.component.html          |  5 ++
 .../components/vault-v2/vault-v2.component.ts |  2 +
 .../vault-popup-autofill.service.spec.ts      |  3 +
 .../services/vault-popup-autofill.service.ts  | 68 +++++++++++++++++++
 10 files changed, 191 insertions(+), 16 deletions(-)
 create mode 100644 apps/browser/src/vault/popup/components/vault-v2/blocked-injection-banner/blocked-injection-banner.component.html
 create mode 100644 apps/browser/src/vault/popup/components/vault-v2/blocked-injection-banner/blocked-injection-banner.component.ts

diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index b72a909252..51fb3a0a77 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4007,8 +4007,8 @@
   "passkeyRemoved": {
     "message": "Passkey removed"
   },
-  "autofillSuggestions": {
-    "message": "Autofill suggestions"
+  "itemSuggestions": {
+    "message": "Suggested items"
   },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
diff --git a/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.html b/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.html
index 7c4ea3e5b4..047d168ecb 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.html
@@ -1,7 +1,7 @@
 <app-vault-list-items-container
   *ngIf="autofillCiphers$ | async as ciphers"
   [ciphers]="ciphers"
-  [title]="'autofillSuggestions' | i18n"
+  [title]="'itemSuggestions' | i18n"
   [showRefresh]="showRefresh"
   (onRefresh)="refreshCurrentTab()"
   [description]="(showEmptyAutofillTip$ | async) ? ('autofillSuggestionsTip' | i18n) : null"
diff --git a/apps/browser/src/vault/popup/components/vault-v2/blocked-injection-banner/blocked-injection-banner.component.html b/apps/browser/src/vault/popup/components/vault-v2/blocked-injection-banner/blocked-injection-banner.component.html
new file mode 100644
index 0000000000..05db600bd5
--- /dev/null
+++ b/apps/browser/src/vault/popup/components/vault-v2/blocked-injection-banner/blocked-injection-banner.component.html
@@ -0,0 +1,10 @@
+<bit-banner
+  *ngIf="showCurrentTabIsBlockedBanner$ | async"
+  bannerType="info"
+  (onClose)="handleCurrentTabIsBlockedBannerDismiss()"
+>
+  {{ "autofillBlockedNoticeV2" | i18n }}
+  <a bitLink linkType="secondary" [routerLink]="blockedURISettingsRoute">
+    {{ "autofillBlockedNoticeGuidance" | i18n }}
+  </a>
+</bit-banner>
diff --git a/apps/browser/src/vault/popup/components/vault-v2/blocked-injection-banner/blocked-injection-banner.component.ts b/apps/browser/src/vault/popup/components/vault-v2/blocked-injection-banner/blocked-injection-banner.component.ts
new file mode 100644
index 0000000000..3a17825f4f
--- /dev/null
+++ b/apps/browser/src/vault/popup/components/vault-v2/blocked-injection-banner/blocked-injection-banner.component.ts
@@ -0,0 +1,53 @@
+import { CommonModule } from "@angular/common";
+import { Component, OnInit } from "@angular/core";
+import { RouterModule } from "@angular/router";
+import { Observable } from "rxjs";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import {
+  BannerModule,
+  IconButtonModule,
+  LinkModule,
+  TypographyModule,
+} from "@bitwarden/components";
+
+import { VaultPopupAutofillService } from "../../../services/vault-popup-autofill.service";
+
+const blockedURISettingsRoute = "/blocked-domains";
+
+@Component({
+  standalone: true,
+  imports: [
+    BannerModule,
+    CommonModule,
+    IconButtonModule,
+    JslibModule,
+    LinkModule,
+    RouterModule,
+    TypographyModule,
+  ],
+  selector: "blocked-injection-banner",
+  templateUrl: "blocked-injection-banner.component.html",
+})
+export class BlockedInjectionBanner implements OnInit {
+  /**
+   * Flag indicating that the banner should be shown
+   */
+  protected showCurrentTabIsBlockedBanner$: Observable<boolean> =
+    this.vaultPopupAutofillService.showCurrentTabIsBlockedBanner$;
+
+  /**
+   * Hostname for current tab
+   */
+  protected currentTabHostname?: string;
+
+  blockedURISettingsRoute: string = blockedURISettingsRoute;
+
+  constructor(private vaultPopupAutofillService: VaultPopupAutofillService) {}
+
+  async ngOnInit() {}
+
+  async handleCurrentTabIsBlockedBannerDismiss() {
+    await this.vaultPopupAutofillService.dismissCurrentTabIsBlockedBanner();
+  }
+}
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html b/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html
index 293bf3e67e..c55e8d9fb2 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html
@@ -80,11 +80,9 @@
         <button
           bit-item-content
           type="button"
-          (click)="primaryActionAutofill ? doAutofill(cipher) : onViewCipher(cipher)"
+          (click)="primaryActionOnSelect(cipher)"
           (dblclick)="launchCipher(cipher)"
-          [appA11yTitle]="
-            (primaryActionAutofill ? 'autofillTitle' : 'viewItemTitle') | i18n: cipher.name
-          "
+          [appA11yTitle]="cipherItemTitleKey | async | i18n: cipher.name"
           class="{{ itemHeightClass }}"
         >
           <div slot="start" class="tw-justify-start tw-w-7 tw-flex">
@@ -106,7 +104,7 @@
           <span slot="secondary">{{ cipher.subTitle }}</span>
         </button>
         <ng-container slot="end">
-          <bit-item-action *ngIf="showAutofillButton && !primaryActionAutofill">
+          <bit-item-action *ngIf="!(hideAutofillButton$ | async)">
             <button
               type="button"
               bitBadge
@@ -131,7 +129,7 @@
           <app-item-copy-actions [cipher]="cipher"></app-item-copy-actions>
           <app-item-more-options
             [cipher]="cipher"
-            [hideAutofillOptions]="showAutofillButton"
+            [hideAutofillOptions]="hideAutofillOptions$ | async"
             [showViewOption]="primaryActionAutofill"
           ></app-item-more-options>
         </ng-container>
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts
index 579cbf6692..725aaac466 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.ts
@@ -15,8 +15,8 @@ import {
   signal,
   ViewChild,
 } from "@angular/core";
-import { Router, RouterLink } from "@angular/router";
-import { map } from "rxjs";
+import { Router } from "@angular/router";
+import { firstValueFrom, Observable, map } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -62,7 +62,6 @@ import { ItemMoreOptionsComponent } from "../item-more-options/item-more-options
     TypographyModule,
     JslibModule,
     SectionHeaderComponent,
-    RouterLink,
     ItemCopyActionsComponent,
     ItemMoreOptionsComponent,
     OrgIconDirective,
@@ -151,12 +150,41 @@ export class VaultListItemsContainerComponent implements OnInit, AfterViewInit {
   @Output()
   onRefresh = new EventEmitter<void>();
 
+  /**
+   * Flag indicating that the current tab location is blocked
+   */
+  currentURIIsBlocked$: Observable<boolean> =
+    this.vaultPopupAutofillService.currentTabIsOnBlocklist$;
+
+  /**
+   * Resolved i18n key to use for suggested cipher items
+   */
+  cipherItemTitleKey = this.currentURIIsBlocked$.pipe(
+    map((uriIsBlocked) =>
+      this.primaryActionAutofill && !uriIsBlocked ? "autofillTitle" : "viewItemTitle",
+    ),
+  );
+
   /**
    * Option to show the autofill button for each item.
    */
   @Input({ transform: booleanAttribute })
   showAutofillButton: boolean;
 
+  /**
+   * Flag indicating whether the suggested cipher item autofill button should be shown or not
+   */
+  hideAutofillButton$ = this.currentURIIsBlocked$.pipe(
+    map((uriIsBlocked) => !this.showAutofillButton || uriIsBlocked || this.primaryActionAutofill),
+  );
+
+  /**
+   * Flag indicating whether the cipher item autofill options should be shown or not
+   */
+  hideAutofillOptions$: Observable<boolean> = this.currentURIIsBlocked$.pipe(
+    map((uriIsBlocked) => uriIsBlocked || this.showAutofillButton),
+  );
+
   /**
    * Option to perform autofill operation as the primary action for autofill suggestions.
    */
@@ -216,6 +244,14 @@ export class VaultListItemsContainerComponent implements OnInit, AfterViewInit {
     }
   }
 
+  async primaryActionOnSelect(cipher: CipherView) {
+    const isBlocked = await firstValueFrom(this.currentURIIsBlocked$);
+
+    return this.primaryActionAutofill && !isBlocked
+      ? this.doAutofill(cipher)
+      : this.onViewCipher(cipher);
+  }
+
   /**
    * Launches the login cipher in a new browser tab.
    */
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.html b/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.html
index c5a3c860c8..43471e56e7 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.html
@@ -22,6 +22,11 @@
     </bit-no-items>
   </div>
 
+  <blocked-injection-banner
+    *ngIf="vaultState !== VaultStateEnum.Empty"
+    slot="full-width-notice"
+  ></blocked-injection-banner>
+
   <!-- Show search & filters outside of the scroll area of the page -->
   <ng-container
     slot="above-scroll-area"
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.ts
index a3d8f3ffe3..a0c5498735 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.ts
@@ -21,6 +21,7 @@ import { VaultPopupItemsService } from "../../services/vault-popup-items.service
 import { VaultPopupListFiltersService } from "../../services/vault-popup-list-filters.service";
 import { VaultUiOnboardingService } from "../../services/vault-ui-onboarding.service";
 
+import { BlockedInjectionBanner } from "./blocked-injection-banner/blocked-injection-banner.component";
 import {
   NewItemDropdownV2Component,
   NewItemInitialValues,
@@ -40,6 +41,7 @@ enum VaultState {
   templateUrl: "vault-v2.component.html",
   standalone: true,
   imports: [
+    BlockedInjectionBanner,
     PopupPageComponent,
     PopupHeaderComponent,
     PopOutComponent,
diff --git a/apps/browser/src/vault/popup/services/vault-popup-autofill.service.spec.ts b/apps/browser/src/vault/popup/services/vault-popup-autofill.service.spec.ts
index ae8d466665..2dad1e3034 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-autofill.service.spec.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-autofill.service.spec.ts
@@ -4,6 +4,7 @@ import { mock } from "jest-mock-extended";
 import { BehaviorSubject, of } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -44,6 +45,7 @@ describe("VaultPopupAutofillService", () => {
 
   // Create mocks for VaultPopupAutofillService
   const mockAutofillService = mock<AutofillService>();
+  const mockDomainSettingsService = mock<DomainSettingsService>();
   const mockI18nService = mock<I18nService>();
   const mockToastService = mock<ToastService>();
   const mockPlatformUtilsService = mock<PlatformUtilsService>();
@@ -71,6 +73,7 @@ describe("VaultPopupAutofillService", () => {
     testBed = TestBed.configureTestingModule({
       providers: [
         { provide: AutofillService, useValue: mockAutofillService },
+        { provide: DomainSettingsService, useValue: mockDomainSettingsService },
         { provide: I18nService, useValue: mockI18nService },
         { provide: ToastService, useValue: mockToastService },
         { provide: PlatformUtilsService, useValue: mockPlatformUtilsService },
diff --git a/apps/browser/src/vault/popup/services/vault-popup-autofill.service.ts b/apps/browser/src/vault/popup/services/vault-popup-autofill.service.ts
index 586e918281..c0ac9c91e1 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-autofill.service.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-autofill.service.ts
@@ -15,6 +15,7 @@ import {
 } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -67,6 +68,72 @@ export class VaultPopupAutofillService {
     shareReplay({ refCount: false, bufferSize: 1 }),
   );
 
+  currentTabIsOnBlocklist$: Observable<boolean> = combineLatest([
+    this.domainSettingsService.blockedInteractionsUris$,
+    this.currentAutofillTab$,
+  ]).pipe(
+    map(([blockedInteractionsUris, currentTab]) => {
+      if (blockedInteractionsUris && currentTab?.url?.length) {
+        const tabURL = new URL(currentTab.url);
+        const tabIsBlocked = Object.keys(blockedInteractionsUris).includes(tabURL.hostname);
+
+        if (tabIsBlocked) {
+          return true;
+        }
+      }
+
+      return false;
+    }),
+    shareReplay({ refCount: false, bufferSize: 1 }),
+  );
+
+  showCurrentTabIsBlockedBanner$: Observable<boolean> = combineLatest([
+    this.domainSettingsService.blockedInteractionsUris$,
+    this.currentAutofillTab$,
+  ]).pipe(
+    map(([blockedInteractionsUris, currentTab]) => {
+      if (blockedInteractionsUris && currentTab?.url?.length) {
+        const tabURL = new URL(currentTab.url);
+        const tabIsBlocked = Object.keys(blockedInteractionsUris).includes(tabURL.hostname);
+
+        const showScriptInjectionIsBlockedBanner =
+          tabIsBlocked && !blockedInteractionsUris[tabURL.hostname]?.bannerIsDismissed;
+
+        return showScriptInjectionIsBlockedBanner;
+      }
+
+      return false;
+    }),
+    shareReplay({ refCount: false, bufferSize: 1 }),
+  );
+
+  async dismissCurrentTabIsBlockedBanner() {
+    try {
+      const currentTab = await firstValueFrom(this.currentAutofillTab$);
+      const currentTabURL = currentTab?.url.length && new URL(currentTab.url);
+
+      const currentTabHostname = currentTabURL && currentTabURL.hostname;
+
+      if (!currentTabHostname) {
+        return;
+      }
+
+      const blockedURIs = await firstValueFrom(this.domainSettingsService.blockedInteractionsUris$);
+      const tabIsBlocked = Object.keys(blockedURIs).includes(currentTabHostname);
+
+      if (tabIsBlocked) {
+        void this.domainSettingsService.setBlockedInteractionsUris({
+          ...blockedURIs,
+          [currentTabHostname as string]: { bannerIsDismissed: true },
+        });
+      }
+    } catch (e) {
+      throw new Error(
+        "There was a problem dismissing the blocked interaction URI notification banner",
+      );
+    }
+  }
+
   /**
    * Observable that indicates whether autofill is allowed in the current context.
    * Autofill is allowed when there is a current tab and the popup is not in a popout window.
@@ -125,6 +192,7 @@ export class VaultPopupAutofillService {
 
   constructor(
     private autofillService: AutofillService,
+    private domainSettingsService: DomainSettingsService,
     private i18nService: I18nService,
     private toastService: ToastService,
     private platformUtilService: PlatformUtilsService,

From 83ee64ba1d3cb9d079ec67758bd0ce0a1cf79685 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github.com>
Date: Mon, 13 Jan 2025 20:04:22 +0000
Subject: [PATCH 069/150] Bumped client version(s)

---
 apps/browser/package.json          | 2 +-
 apps/browser/src/manifest.json     | 2 +-
 apps/browser/src/manifest.v3.json  | 2 +-
 apps/cli/package.json              | 2 +-
 apps/desktop/package.json          | 2 +-
 apps/desktop/src/package-lock.json | 4 ++--
 apps/desktop/src/package.json      | 2 +-
 apps/web/package.json              | 2 +-
 package-lock.json                  | 8 ++++----
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/apps/browser/package.json b/apps/browser/package.json
index cf9309728a..e4ec1fd5e6 100644
--- a/apps/browser/package.json
+++ b/apps/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bitwarden/browser",
-  "version": "2025.1.0",
+  "version": "2025.1.1",
   "scripts": {
     "build": "npm run build:chrome",
     "build:chrome": "cross-env BROWSER=chrome MANIFEST_VERSION=3 webpack",
diff --git a/apps/browser/src/manifest.json b/apps/browser/src/manifest.json
index 9e4eb78291..86ea0eebbc 100644
--- a/apps/browser/src/manifest.json
+++ b/apps/browser/src/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "__MSG_extName__",
   "short_name": "__MSG_appName__",
-  "version": "2025.1.0",
+  "version": "2025.1.1",
   "description": "__MSG_extDesc__",
   "default_locale": "en",
   "author": "Bitwarden Inc.",
diff --git a/apps/browser/src/manifest.v3.json b/apps/browser/src/manifest.v3.json
index ef7ede6b05..ae7c888eb9 100644
--- a/apps/browser/src/manifest.v3.json
+++ b/apps/browser/src/manifest.v3.json
@@ -3,7 +3,7 @@
   "minimum_chrome_version": "102.0",
   "name": "__MSG_extName__",
   "short_name": "__MSG_appName__",
-  "version": "2025.1.0",
+  "version": "2025.1.1",
   "description": "__MSG_extDesc__",
   "default_locale": "en",
   "author": "Bitwarden Inc.",
diff --git a/apps/cli/package.json b/apps/cli/package.json
index 28432bd555..8a6dffb1cb 100644
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bitwarden/cli",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2025.1.0",
+  "version": "2025.1.1",
   "keywords": [
     "bitwarden",
     "password",
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index c55f39d1b2..b8541aad2e 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bitwarden/desktop",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2025.1.0",
+  "version": "2025.1.1",
   "keywords": [
     "bitwarden",
     "password",
diff --git a/apps/desktop/src/package-lock.json b/apps/desktop/src/package-lock.json
index f93d9059bc..d8705487d8 100644
--- a/apps/desktop/src/package-lock.json
+++ b/apps/desktop/src/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@bitwarden/desktop",
-  "version": "2025.1.0",
+  "version": "2025.1.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bitwarden/desktop",
-      "version": "2025.1.0",
+      "version": "2025.1.1",
       "license": "GPL-3.0",
       "dependencies": {
         "@bitwarden/desktop-napi": "file:../desktop_native/napi"
diff --git a/apps/desktop/src/package.json b/apps/desktop/src/package.json
index 39e1681502..95490ee34d 100644
--- a/apps/desktop/src/package.json
+++ b/apps/desktop/src/package.json
@@ -2,7 +2,7 @@
   "name": "@bitwarden/desktop",
   "productName": "Bitwarden",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2025.1.0",
+  "version": "2025.1.1",
   "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",
diff --git a/apps/web/package.json b/apps/web/package.json
index 42432de29a..73ecd8c3cb 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bitwarden/web-vault",
-  "version": "2025.1.0",
+  "version": "2025.1.1",
   "scripts": {
     "build:oss": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" webpack",
     "build:bit": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" webpack -c ../../bitwarden_license/bit-web/webpack.config.js",
diff --git a/package-lock.json b/package-lock.json
index 73e7c41ebd..d6f6b9d03a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -191,11 +191,11 @@
     },
     "apps/browser": {
       "name": "@bitwarden/browser",
-      "version": "2025.1.0"
+      "version": "2025.1.1"
     },
     "apps/cli": {
       "name": "@bitwarden/cli",
-      "version": "2025.1.0",
+      "version": "2025.1.1",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@koa/multer": "3.0.2",
@@ -231,7 +231,7 @@
     },
     "apps/desktop": {
       "name": "@bitwarden/desktop",
-      "version": "2025.1.0",
+      "version": "2025.1.1",
       "hasInstallScript": true,
       "license": "GPL-3.0"
     },
@@ -245,7 +245,7 @@
     },
     "apps/web": {
       "name": "@bitwarden/web-vault",
-      "version": "2025.1.0"
+      "version": "2025.1.1"
     },
     "libs/admin-console": {
       "name": "@bitwarden/admin-console",

From d471fe0418ceb60cdd1fcd0caa1729462af9eb4f Mon Sep 17 00:00:00 2001
From: Evan Bassler <ebassler@livefront.com>
Date: Mon, 13 Jan 2025 14:18:42 -0600
Subject: [PATCH 070/150] [PM-14954] implement multi input totp styling
 (#12449)

* update menu and button position for multi-input totp

* update test to better handle breaking changes

* fix sizing bug by filtering duplicate opid fields

* update getTotpFields usage

* revert private changes per feedback

* Update apps/browser/src/autofill/utils/index.ts with positive fucntion

Co-authored-by: Jonathan Prusik <jprusik@users.noreply.github.com>

* fix type and update rectNotZero function

---------

Co-authored-by: Evan Bassler <evanbassler@EvanBasslersMBP.attlocal.net>
Co-authored-by: Jonathan Prusik <jprusik@users.noreply.github.com>
Co-authored-by: Evan Bassler <evanbassler@Mac.attlocal.net>
---
 apps/browser/package.json                     |   3 +-
 .../abstractions/overlay.background.ts        |  12 ++
 .../background/overlay.background.spec.ts     | 118 ++++++++++++++++++
 .../autofill/background/overlay.background.ts |  92 +++++++++++++-
 .../src/autofill/models/autofill-field.ts     |   6 +
 .../autofill-overlay-content.service.ts       |   9 ++
 apps/browser/src/autofill/utils/index.ts      |  12 ++
 7 files changed, 248 insertions(+), 4 deletions(-)

diff --git a/apps/browser/package.json b/apps/browser/package.json
index e4ec1fd5e6..9ad1805362 100644
--- a/apps/browser/package.json
+++ b/apps/browser/package.json
@@ -30,6 +30,7 @@
     "dist:safari:mv3": "cross-env MANIFEST_VERSION=3 npm run dist:safari",
     "test": "jest",
     "test:watch": "jest --watch",
-    "test:watch:all": "jest --watchAll"
+    "test:watch:all": "jest --watchAll",
+    "test:clearCache": "jest --clear-cache"
   }
 }
diff --git a/apps/browser/src/autofill/background/abstractions/overlay.background.ts b/apps/browser/src/autofill/background/abstractions/overlay.background.ts
index 03284f3fd8..6ad9b8e06f 100644
--- a/apps/browser/src/autofill/background/abstractions/overlay.background.ts
+++ b/apps/browser/src/autofill/background/abstractions/overlay.background.ts
@@ -57,6 +57,17 @@ export type InlineMenuElementPosition = {
   height: number;
 };
 
+export type FieldRect = {
+  bottom: number;
+  height: number;
+  left: number;
+  right: number;
+  top: number;
+  width: number;
+  x: number;
+  y: number;
+};
+
 export type InlineMenuPosition = {
   button?: InlineMenuElementPosition;
   list?: InlineMenuElementPosition;
@@ -134,6 +145,7 @@ export type OverlayBackgroundExtensionMessage = {
   isFieldCurrentlyFilling?: boolean;
   subFrameData?: SubFrameOffsetData;
   focusedFieldData?: FocusedFieldData;
+  allFieldsRect?: any;
   isOpeningFullInlineMenu?: boolean;
   styles?: Partial<CSSStyleDeclaration>;
   data?: LockedVaultPendingNotificationsData;
diff --git a/apps/browser/src/autofill/background/overlay.background.spec.ts b/apps/browser/src/autofill/background/overlay.background.spec.ts
index 0ac6931785..c3a6357ed0 100644
--- a/apps/browser/src/autofill/background/overlay.background.spec.ts
+++ b/apps/browser/src/autofill/background/overlay.background.spec.ts
@@ -2913,6 +2913,124 @@ describe("OverlayBackground", () => {
         );
       });
     });
+    describe("handles menu position when input is focused", () => {
+      it("sets button and menu width and position when non-multi-input totp field is focused", async () => {
+        const subframe = {
+          top: 0,
+          left: 0,
+          url: "",
+          frameId: 0,
+        };
+
+        overlayBackground["focusedFieldData"] = createFocusedFieldDataMock({
+          focusedFieldRects: {
+            width: 49.328125,
+            height: 64,
+            top: 302.171875,
+            left: 1270.8125,
+          },
+        });
+
+        const buttonPostion = overlayBackground["getInlineMenuButtonPosition"](subframe);
+        const menuPostion = overlayBackground["getInlineMenuListPosition"](subframe);
+
+        expect(menuPostion).toEqual({
+          width: "49px",
+          top: "366px",
+          left: "1271px",
+        });
+        expect(buttonPostion).toEqual({
+          width: "34px",
+          height: "34px",
+          top: "317px",
+          left: "1271px",
+        });
+      });
+      it("sets button and menu width and position when multi-input totp field is focused", async () => {
+        const subframe = {
+          top: 0,
+          left: 0,
+          url: "",
+          frameId: 0,
+        };
+
+        const totpFields = [
+          createAutofillFieldMock({ autoCompleteType: "one-time-code", opid: "__0" }),
+          createAutofillFieldMock({ autoCompleteType: "one-time-code", opid: "__1" }),
+          createAutofillFieldMock({ autoCompleteType: "one-time-code", opid: "__2" }),
+        ];
+        const allFieldData = [
+          createAutofillFieldMock({
+            autoCompleteType: "one-time-code",
+            opid: "__0",
+            rect: {
+              x: 1041.5,
+              y: 302.171875,
+              width: 49.328125,
+              height: 64,
+              top: 302.171875,
+              right: 1090.828125,
+              bottom: 366.171875,
+              left: 1041.5,
+            },
+          }),
+          createAutofillFieldMock({
+            autoCompleteType: "one-time-code",
+            opid: "__1",
+            rect: {
+              x: 1098.828125,
+              y: 302.171875,
+              width: 49.328125,
+              height: 64,
+              top: 302.171875,
+              right: 1148.15625,
+              bottom: 366.171875,
+              left: 1098.828125,
+            },
+          }),
+          createAutofillFieldMock({
+            autoCompleteType: "one-time-code",
+            opid: "__2",
+            rect: {
+              x: 1156.15625,
+              y: 302.171875,
+              width: 249.328125,
+              height: 64,
+              top: 302.171875,
+              right: 2205.484375,
+              bottom: 366.171875,
+              left: 2156.15625,
+            },
+          }),
+        ];
+        overlayBackground["focusedFieldData"] = createFocusedFieldDataMock({
+          focusedFieldRects: {
+            width: 49.328125,
+            height: 64,
+            top: 302.171875,
+            left: 1270.8125,
+          },
+        });
+
+        overlayBackground["allFieldData"] = allFieldData;
+        jest.spyOn(overlayBackground as any, "isTotpFieldForCurrentField").mockReturnValue(true);
+        jest.spyOn(overlayBackground as any, "getTotpFields").mockReturnValue(totpFields);
+
+        const buttonPostion = overlayBackground["getInlineMenuButtonPosition"](subframe);
+        const menuPostion = overlayBackground["getInlineMenuListPosition"](subframe);
+        expect(menuPostion).toEqual({
+          width: "1164px",
+          top: "366px",
+          left: "1042px",
+        });
+        expect(buttonPostion).toEqual({
+          width: "34px",
+          height: "34px",
+          top: "292px",
+          left: "2187px",
+        });
+      });
+    });
 
     describe("triggerDelayedAutofillInlineMenuClosure message handler", () => {
       it("skips triggering the delayed closure of the inline menu if a field is currently focused", async () => {
diff --git a/apps/browser/src/autofill/background/overlay.background.ts b/apps/browser/src/autofill/background/overlay.background.ts
index 58e462943b..3d2b1ec783 100644
--- a/apps/browser/src/autofill/background/overlay.background.ts
+++ b/apps/browser/src/autofill/background/overlay.background.ts
@@ -70,6 +70,7 @@ import {
   generateDomainMatchPatterns,
   generateRandomChars,
   isInvalidResponseStatusCode,
+  rectHasSize,
   specialCharacterToKeyMap,
 } from "../utils";
 
@@ -130,6 +131,7 @@ export class OverlayBackground implements OverlayBackgroundInterface {
   private currentInlineMenuCiphersCount: number = 0;
   private currentAddNewItemData: CurrentAddNewItemData;
   private focusedFieldData: FocusedFieldData;
+  private allFieldData: AutofillField[];
   private isFieldCurrentlyFocused: boolean = false;
   private isFieldCurrentlyFilling: boolean = false;
   private isInlineMenuButtonVisible: boolean = false;
@@ -1367,6 +1369,71 @@ export class OverlayBackground implements OverlayBackgroundInterface {
     this.isInlineMenuListVisible = false;
   }
 
+  /**
+   * Get all the totp fields for the tab and frame of the currently focused field
+   */
+  private getTotpFields(): AutofillField[] {
+    const currentTabId = this.focusedFieldData?.tabId;
+    const currentFrameId = this.focusedFieldData?.frameId;
+    const pageDetailsMap = this.pageDetailsForTab[currentTabId];
+    const pageDetails = pageDetailsMap?.get(currentFrameId);
+
+    const fields = pageDetails.details.fields;
+    const totpFields = fields.filter((f) =>
+      this.inlineMenuFieldQualificationService.isTotpField(f),
+    );
+
+    return totpFields;
+  }
+
+  /**
+   * calculates the postion and width for multi-input totp field inline menu
+   * @param totpFieldArray - the totp fields used to evaluate the position of the menu
+   */
+  private calculateTotpMultiInputMenuBounds(totpFieldArray: AutofillField[]) {
+    // Filter the fields based on the provided totpfields
+    const filteredObjects = this.allFieldData.filter((obj) =>
+      totpFieldArray.some((o) => o.opid === obj.opid),
+    );
+
+    // Return null if no matching objects are found
+    if (filteredObjects.length === 0) {
+      return null;
+    }
+    // Calculate the smallest left and largest right values to determine width
+    const left = Math.min(
+      ...filteredObjects.filter((obj) => rectHasSize(obj.rect)).map((obj) => obj.rect.left),
+    );
+    const largestRight = Math.max(
+      ...filteredObjects.filter((obj) => rectHasSize(obj.rect)).map((obj) => obj.rect.right),
+    );
+
+    const width = largestRight - left;
+
+    return { left, width };
+  }
+
+  /**
+   * calculates the postion for multi-input totp field inline button
+   * @param totpFieldArray - the totp fields used to evaluate the position of the menu
+   */
+  private calculateTotpMultiInputButtonBounds(totpFieldArray: AutofillField[]) {
+    const filteredObjects = this.allFieldData.filter((obj) =>
+      totpFieldArray.some((o) => o.opid === obj.opid),
+    );
+
+    if (filteredObjects.length === 0) {
+      return null;
+    }
+
+    const maxRight = Math.max(...filteredObjects.map((obj) => obj.rect.right));
+    const maxObject = filteredObjects.find((obj) => obj.rect.right === maxRight);
+    const top = maxObject.rect.top - maxObject.rect.height * 0.39;
+    const left = maxRight - maxObject.rect.height * 0.3;
+
+    return { left, top };
+  }
+
   /**
    * Updates the position of either the inline menu list or button. The position
    * is based on the focused field's position and dimensions.
@@ -1472,8 +1539,17 @@ export class OverlayBackground implements OverlayBackgroundInterface {
     const subFrameTopOffset = subFrameOffsets?.top || 0;
     const subFrameLeftOffset = subFrameOffsets?.left || 0;
 
-    const { top, left, width, height } = this.focusedFieldData.focusedFieldRects;
+    const { width, height } = this.focusedFieldData.focusedFieldRects;
+    let { top, left } = this.focusedFieldData.focusedFieldRects;
     const { paddingRight, paddingLeft } = this.focusedFieldData.focusedFieldStyles;
+
+    if (this.isTotpFieldForCurrentField()) {
+      const totpFields = this.getTotpFields();
+      if (totpFields.length > 1) {
+        ({ left, top } = this.calculateTotpMultiInputButtonBounds(totpFields));
+      }
+    }
+
     let elementOffset = height * 0.37;
     if (height >= 35) {
       elementOffset = height >= 50 ? height * 0.47 : height * 0.42;
@@ -1512,7 +1588,16 @@ export class OverlayBackground implements OverlayBackgroundInterface {
     const subFrameTopOffset = subFrameOffsets?.top || 0;
     const subFrameLeftOffset = subFrameOffsets?.left || 0;
 
-    const { top, left, width, height } = this.focusedFieldData.focusedFieldRects;
+    const { top, height } = this.focusedFieldData.focusedFieldRects;
+    let { left, width } = this.focusedFieldData.focusedFieldRects;
+
+    if (this.isTotpFieldForCurrentField()) {
+      const totpFields = this.getTotpFields();
+
+      if (totpFields.length > 1) {
+        ({ left, width } = this.calculateTotpMultiInputMenuBounds(totpFields));
+      }
+    }
 
     this.inlineMenuPosition.list = {
       top: Math.round(top + height + subFrameTopOffset),
@@ -1535,7 +1620,7 @@ export class OverlayBackground implements OverlayBackgroundInterface {
    * @param sender - The sender of the extension message
    */
   private setFocusedFieldData(
-    { focusedFieldData }: OverlayBackgroundExtensionMessage,
+    { focusedFieldData, allFieldsRect }: OverlayBackgroundExtensionMessage,
     sender: chrome.runtime.MessageSender,
   ) {
     if (
@@ -1552,6 +1637,7 @@ export class OverlayBackground implements OverlayBackgroundInterface {
 
     const previousFocusedFieldData = this.focusedFieldData;
     this.focusedFieldData = { ...focusedFieldData, tabId: sender.tab.id, frameId: sender.frameId };
+    this.allFieldData = allFieldsRect;
     this.isFieldCurrentlyFocused = true;
 
     if (this.shouldUpdatePasswordGeneratorMenuOnFieldFocus()) {
diff --git a/apps/browser/src/autofill/models/autofill-field.ts b/apps/browser/src/autofill/models/autofill-field.ts
index 7660b4ce5f..c0be60f1cd 100644
--- a/apps/browser/src/autofill/models/autofill-field.ts
+++ b/apps/browser/src/autofill/models/autofill-field.ts
@@ -1,3 +1,4 @@
+import { FieldRect } from "../background/abstractions/overlay.background";
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { AutofillFieldQualifierType } from "../enums/autofill-field.enums";
@@ -124,4 +125,9 @@ export default class AutofillField {
   fieldQualifier?: AutofillFieldQualifierType;
 
   accountCreationFieldType?: InlineMenuAccountCreationFieldTypes;
+
+  /**
+   * used for totp multiline calculations
+   */
+  fieldRect?: FieldRect;
 }
diff --git a/apps/browser/src/autofill/services/autofill-overlay-content.service.ts b/apps/browser/src/autofill/services/autofill-overlay-content.service.ts
index daa65d74ae..2db08db187 100644
--- a/apps/browser/src/autofill/services/autofill-overlay-content.service.ts
+++ b/apps/browser/src/autofill/services/autofill-overlay-content.service.ts
@@ -957,8 +957,17 @@ export class AutofillOverlayContentService implements AutofillOverlayContentServ
       accountCreationFieldType: autofillFieldData?.accountCreationFieldType,
     };
 
+    const allFields = this.formFieldElements;
+    const allFieldsRect = [];
+
+    for (const key of allFields.keys()) {
+      const rect = await this.getMostRecentlyFocusedFieldRects(key);
+      allFieldsRect.push({ ...allFields.get(key), rect }); // Add the combined result to the array
+    }
+
     await this.sendExtensionMessage("updateFocusedFieldData", {
       focusedFieldData: this.focusedFieldData,
+      allFieldsRect,
     });
   }
 
diff --git a/apps/browser/src/autofill/utils/index.ts b/apps/browser/src/autofill/utils/index.ts
index 12d26914d8..0e102dcfd9 100644
--- a/apps/browser/src/autofill/utils/index.ts
+++ b/apps/browser/src/autofill/utils/index.ts
@@ -1,5 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
+import { FieldRect } from "../background/abstractions/overlay.background";
 import { AutofillPort } from "../enums/autofill-port.enum";
 import { FillableFormFieldElement, FormElementWithAttribute, FormFieldElement } from "../types";
 
@@ -545,6 +546,17 @@ export const specialCharacterToKeyMap: Record<string, string> = {
   "/": "forwardSlashCharacterDescriptor",
 };
 
+/**
+ * Determines if the current rect values are not all 0.
+ */
+export function rectHasSize(rect: FieldRect): boolean {
+  if (rect.right > 0 && rect.left > 0 && rect.top > 0 && rect.bottom > 0) {
+    return true;
+  }
+
+  return false;
+}
+
 /**
  * Checks if all the values corresponding to the specified keys in an object are null.
  * If no keys are specified, checks all keys in the object.

From 8a0ebd98af368922e98cd4f2bc18b8338f3ed073 Mon Sep 17 00:00:00 2001
From: Jordan Aasen <166539328+jaasen-livefront@users.noreply.github.com>
Date: Mon, 13 Jan 2025 12:36:56 -0800
Subject: [PATCH 071/150] align default globe vault icon (#12786)

---
 libs/angular/src/vault/components/icon.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/angular/src/vault/components/icon.component.html b/libs/angular/src/vault/components/icon.component.html
index 9fec22f4a6..f16545617c 100644
--- a/libs/angular/src/vault/components/icon.component.html
+++ b/libs/angular/src/vault/components/icon.component.html
@@ -10,7 +10,7 @@
       loading="lazy"
     />
     <i
-      class="tw-text-muted bwi bwi-lg {{ data.icon }}"
+      class="tw-w-6 tw-text-muted bwi bwi-lg {{ data.icon }}"
       *ngIf="!data.imageEnabled || !data.image"
     ></i>
   </ng-container>

From b95080be21cd06d58239352bc891ea9f396452d7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 13 Jan 2025 14:04:43 -0800
Subject: [PATCH 072/150] [PM-16874] [deps] Platform: Update electron to
 v33.3.1 (#12746)

* [deps] Platform: Update electron to v33.3.1

* Update electron-builder electronVersion

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Hinton <hinton@users.noreply.github.com>
---
 apps/desktop/electron-builder.json |  2 +-
 package-lock.json                  | 14 +++++++-------
 package.json                       |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json
index c8114d947e..4302f30247 100644
--- a/apps/desktop/electron-builder.json
+++ b/apps/desktop/electron-builder.json
@@ -20,7 +20,7 @@
     "**/node_modules/@bitwarden/desktop-napi/index.js",
     "**/node_modules/@bitwarden/desktop-napi/desktop_napi.${platform}-${arch}*.node"
   ],
-  "electronVersion": "33.2.1",
+  "electronVersion": "33.3.1",
   "generateUpdatesFilesForAllChannels": true,
   "publish": {
     "provider": "generic",
diff --git a/package-lock.json b/package-lock.json
index d6f6b9d03a..3d6ff01172 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -133,7 +133,7 @@
         "copy-webpack-plugin": "12.0.2",
         "cross-env": "7.0.3",
         "css-loader": "7.1.2",
-        "electron": "33.2.1",
+        "electron": "33.3.1",
         "electron-builder": "24.13.3",
         "electron-log": "5.2.4",
         "electron-reload": "2.0.0-alpha.1",
@@ -15318,9 +15318,9 @@
       }
     },
     "node_modules/electron": {
-      "version": "33.2.1",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-33.2.1.tgz",
-      "integrity": "sha512-SG/nmSsK9Qg1p6wAW+ZfqU+AV8cmXMTIklUL18NnOKfZLlum4ZsDoVdmmmlL39ZmeCaq27dr7CgslRPahfoVJg==",
+      "version": "33.3.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-33.3.1.tgz",
+      "integrity": "sha512-Z7l2bVgpdKxHQMI4i0CirBX2n+iCYKOx5mbzNM3BpOyFELwlobEXKmzCmEnwP+3EcNeIhUQyIEBFQxN06QgdIw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -15559,9 +15559,9 @@
       }
     },
     "node_modules/electron/node_modules/@types/node": {
-      "version": "20.17.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.8.tgz",
-      "integrity": "sha512-ahz2g6/oqbKalW9sPv6L2iRbhLnojxjYWspAqhjvqSWBgGebEJT5GvRmk0QXPj3sbC6rU0GTQjPLQkmR8CObvA==",
+      "version": "20.17.12",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.12.tgz",
+      "integrity": "sha512-vo/wmBgMIiEA23A/knMfn/cf37VnuF52nZh5ZoW0GWt4e4sxNquibrMRJ7UQsA06+MBx9r/H1jsI9grYjQCQlw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index ef55a93883..e6c476d2df 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "copy-webpack-plugin": "12.0.2",
     "cross-env": "7.0.3",
     "css-loader": "7.1.2",
-    "electron": "33.2.1",
+    "electron": "33.3.1",
     "electron-builder": "24.13.3",
     "electron-log": "5.2.4",
     "electron-reload": "2.0.0-alpha.1",

From ff5043f9ffa8f533a0587093259f3df270bc7397 Mon Sep 17 00:00:00 2001
From: Matt Andreko <mandreko@bitwarden.com>
Date: Tue, 14 Jan 2025 02:32:32 -0500
Subject: [PATCH 073/150] Updated SonarQube GitHub action to v4.2.1 (#12836)

---
 .github/workflows/scan.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml
index b0874b38cb..a09e8137b6 100644
--- a/.github/workflows/scan.yml
+++ b/.github/workflows/scan.yml
@@ -66,10 +66,9 @@ jobs:
           ref: ${{  github.event.pull_request.head.sha }}
 
       - name: Scan with SonarCloud
-        uses: sonarsource/sonarcloud-github-action@02ef91109b2d589e757aefcfb2854c2783fd7b19 # v4.0.0
+        uses: sonarsource/sonarqube-scan-action@bfd4e558cda28cda6b5defafb9232d191be8c203 # v4.2.1
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           args: >
             -Dsonar.organization=${{ github.repository_owner }}

From f6ec741a4a1a16873965fe9a7f5f56ffa6d266ee Mon Sep 17 00:00:00 2001
From: cyprain-okeke <108260115+cyprain-okeke@users.noreply.github.com>
Date: Tue, 14 Jan 2025 11:20:29 +0100
Subject: [PATCH 074/150] remove the toggle for restarting cancel sub (#12842)

Co-authored-by: Bernd Schoolmann <mail@quexten.com>
---
 .../app/billing/organizations/change-plan-dialog.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/app/billing/organizations/change-plan-dialog.component.html b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
index 902cac9c77..89c0075ba0 100644
--- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
+++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
@@ -30,7 +30,7 @@
             }}</span
           >
           <!-- Plan Interval Toggle -->
-          <div class="tw-inline-block">
+          <div class="tw-inline-block" *ngIf="!isSubscriptionCanceled">
             <bit-toggle-group
               [selected]="selectedInterval"
               (selectedChange)="updateInterval($event)"

From 6d07a4932aa8d611b45323417a4efc419e6b18be Mon Sep 17 00:00:00 2001
From: Jonathan Prusik <jprusik@users.noreply.github.com>
Date: Tue, 14 Jan 2025 09:33:37 -0500
Subject: [PATCH 075/150] group client feature flags (#12849)

---
 libs/common/src/enums/feature-flag.enum.ts | 40 ++++++++++++----------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts
index 0ab7d47acf..feffe2ca44 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -4,6 +4,17 @@
  * Flags MUST be short lived and SHALL be removed once enabled.
  */
 export enum FeatureFlag {
+  /* Autofill */
+  BlockBrowserInjectionsByDomain = "block-browser-injections-by-domain",
+  DelayFido2PageScriptInitWithinMv2 = "delay-fido2-page-script-init-within-mv2",
+  EnableNewCardCombinedExpiryAutofill = "enable-new-card-combined-expiry-autofill",
+  GenerateIdentityFillScriptRefactor = "generate-identity-fill-script-refactor",
+  InlineMenuFieldQualification = "inline-menu-field-qualification",
+  InlineMenuPositioningImprovements = "inline-menu-positioning-improvements",
+  InlineMenuTotp = "inline-menu-totp",
+  NotificationBarAddLoginImprovements = "notification-bar-add-login-improvements",
+  UseTreeWalkerApiForPageDetailsCollection = "use-tree-walker-api-for-page-details-collection",
+
   BrowserFilelessImport = "browser-fileless-import",
   ItemShare = "item-share",
   GeneratorToolsModernization = "generator-tools-modernization",
@@ -11,23 +22,15 @@ export enum FeatureFlag {
   ExtensionRefresh = "extension-refresh",
   PersistPopupView = "persist-popup-view",
   PM4154_BulkEncryptionService = "PM-4154-bulk-encryption-service",
-  UseTreeWalkerApiForPageDetailsCollection = "use-tree-walker-api-for-page-details-collection",
   EmailVerification = "email-verification",
-  InlineMenuFieldQualification = "inline-menu-field-qualification",
   TwoFactorComponentRefactor = "two-factor-component-refactor",
-  InlineMenuPositioningImprovements = "inline-menu-positioning-improvements",
   ProviderClientVaultPrivacyBanner = "ac-2833-provider-client-vault-privacy-banner",
   VaultBulkManagementAction = "vault-bulk-management-action",
   IdpAutoSubmitLogin = "idp-auto-submit-login",
   UnauthenticatedExtensionUIRefresh = "unauth-ui-refresh",
-  GenerateIdentityFillScriptRefactor = "generate-identity-fill-script-refactor",
-  EnableNewCardCombinedExpiryAutofill = "enable-new-card-combined-expiry-autofill",
-  DelayFido2PageScriptInitWithinMv2 = "delay-fido2-page-script-init-within-mv2",
   AccountDeprovisioning = "pm-10308-account-deprovisioning",
   SSHKeyVaultItem = "ssh-key-vault-item",
   SSHAgent = "ssh-agent",
-  NotificationBarAddLoginImprovements = "notification-bar-add-login-improvements",
-  BlockBrowserInjectionsByDomain = "block-browser-injections-by-domain",
   AC2476_DeprecateStripeSourcesAPI = "AC-2476-deprecate-stripe-sources-api",
   CipherKeyEncryption = "cipher-key-encryption",
   VerifiedSsoDomainEndpoint = "pm-12337-refactor-sso-details-endpoint",
@@ -39,7 +42,6 @@ export enum FeatureFlag {
   NewDeviceVerificationTemporaryDismiss = "new-device-temporary-dismiss",
   NewDeviceVerificationPermanentDismiss = "new-device-permanent-dismiss",
   DisableFreeFamiliesSponsorship = "PM-12274-disable-free-families-sponsorship",
-  InlineMenuTotp = "inline-menu-totp",
   MacOsNativeCredentialSync = "macos-native-credential-sync",
   PM11360RemoveProviderExportPermission = "pm-11360-remove-provider-export-permission",
   PM12443RemovePagingLogic = "pm-12443-remove-paging-logic",
@@ -59,6 +61,17 @@ const FALSE = false as boolean;
  * We support true as a value as we prefer flags to "enable" not "disable".
  */
 export const DefaultFeatureFlagValue = {
+  /* Autofill */
+  [FeatureFlag.BlockBrowserInjectionsByDomain]: FALSE,
+  [FeatureFlag.DelayFido2PageScriptInitWithinMv2]: FALSE,
+  [FeatureFlag.EnableNewCardCombinedExpiryAutofill]: FALSE,
+  [FeatureFlag.GenerateIdentityFillScriptRefactor]: FALSE,
+  [FeatureFlag.InlineMenuFieldQualification]: FALSE,
+  [FeatureFlag.InlineMenuPositioningImprovements]: FALSE,
+  [FeatureFlag.InlineMenuTotp]: FALSE,
+  [FeatureFlag.NotificationBarAddLoginImprovements]: FALSE,
+  [FeatureFlag.UseTreeWalkerApiForPageDetailsCollection]: FALSE,
+
   [FeatureFlag.BrowserFilelessImport]: FALSE,
   [FeatureFlag.ItemShare]: FALSE,
   [FeatureFlag.GeneratorToolsModernization]: FALSE,
@@ -66,23 +79,15 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.ExtensionRefresh]: FALSE,
   [FeatureFlag.PersistPopupView]: FALSE,
   [FeatureFlag.PM4154_BulkEncryptionService]: FALSE,
-  [FeatureFlag.UseTreeWalkerApiForPageDetailsCollection]: FALSE,
   [FeatureFlag.EmailVerification]: FALSE,
-  [FeatureFlag.InlineMenuFieldQualification]: FALSE,
   [FeatureFlag.TwoFactorComponentRefactor]: FALSE,
-  [FeatureFlag.InlineMenuPositioningImprovements]: FALSE,
   [FeatureFlag.ProviderClientVaultPrivacyBanner]: FALSE,
   [FeatureFlag.VaultBulkManagementAction]: FALSE,
   [FeatureFlag.IdpAutoSubmitLogin]: FALSE,
   [FeatureFlag.UnauthenticatedExtensionUIRefresh]: FALSE,
-  [FeatureFlag.GenerateIdentityFillScriptRefactor]: FALSE,
-  [FeatureFlag.EnableNewCardCombinedExpiryAutofill]: FALSE,
-  [FeatureFlag.DelayFido2PageScriptInitWithinMv2]: FALSE,
   [FeatureFlag.AccountDeprovisioning]: FALSE,
   [FeatureFlag.SSHKeyVaultItem]: FALSE,
   [FeatureFlag.SSHAgent]: FALSE,
-  [FeatureFlag.NotificationBarAddLoginImprovements]: FALSE,
-  [FeatureFlag.BlockBrowserInjectionsByDomain]: FALSE,
   [FeatureFlag.AC2476_DeprecateStripeSourcesAPI]: FALSE,
   [FeatureFlag.CipherKeyEncryption]: FALSE,
   [FeatureFlag.VerifiedSsoDomainEndpoint]: FALSE,
@@ -94,7 +99,6 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.NewDeviceVerificationTemporaryDismiss]: FALSE,
   [FeatureFlag.NewDeviceVerificationPermanentDismiss]: FALSE,
   [FeatureFlag.DisableFreeFamiliesSponsorship]: FALSE,
-  [FeatureFlag.InlineMenuTotp]: FALSE,
   [FeatureFlag.MacOsNativeCredentialSync]: FALSE,
   [FeatureFlag.PM11360RemoveProviderExportPermission]: FALSE,
   [FeatureFlag.PM12443RemovePagingLogic]: FALSE,

From b083a05d9f19ec349d02d06b66c16a9c193984d1 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Tue, 14 Jan 2025 15:47:19 +0100
Subject: [PATCH 076/150] Fix error prompt (#12830)

---
 libs/angular/src/auth/components/two-factor.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/angular/src/auth/components/two-factor.component.ts b/libs/angular/src/auth/components/two-factor.component.ts
index 18bfe54660..e2b41ad086 100644
--- a/libs/angular/src/auth/components/two-factor.component.ts
+++ b/libs/angular/src/auth/components/two-factor.component.ts
@@ -157,7 +157,7 @@ export class TwoFactorComponent extends CaptchaProtectedComponent implements OnI
           this.toastService.showToast({
             variant: "error",
             title: this.i18nService.t("errorOccurred"),
-            message: error,
+            message: this.i18nService.t("webauthnCancelOrTimeout"),
           });
         },
         (info: string) => {

From 8717d79d51ca5429ca336a9944afa7becb62af6c Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Tue, 14 Jan 2025 15:50:54 +0100
Subject: [PATCH 077/150] [PM-16918] Fix agent setting not disabling key usage
 (#12857)

* Fix agent setting not disabling key usage

* Cleanup

* Change firstvaluefrom to withlatestfrom

* Switch back to concatmap
---
 apps/desktop/src/platform/services/ssh-agent.service.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/apps/desktop/src/platform/services/ssh-agent.service.ts b/apps/desktop/src/platform/services/ssh-agent.service.ts
index 726d28022e5..d4c7c5f460 100644
--- a/apps/desktop/src/platform/services/ssh-agent.service.ts
+++ b/apps/desktop/src/platform/services/ssh-agent.service.ts
@@ -83,6 +83,15 @@ export class SshAgentService implements OnDestroy {
     this.messageListener
       .messages$(new CommandDefinition("sshagent.signrequest"))
       .pipe(
+        withLatestFrom(this.desktopSettingsService.sshAgentEnabled$),
+        concatMap(async ([message, enabled]) => {
+          if (!enabled) {
+            await ipc.platform.sshAgent.signRequestResponse(message.requestId as number, false);
+          }
+          return { message, enabled };
+        }),
+        filter(({ enabled }) => enabled),
+        map(({ message }) => message),
         withLatestFrom(this.authService.activeAccountStatus$),
         // This switchMap handles unlocking the vault if it is locked:
         //   - If the vault is locked, we will wait for it to be unlocked.

From fbb1211a7baa3138d16efc5f122f2941b0c5d4a1 Mon Sep 17 00:00:00 2001
From: Oscar Hinton <Hinton@users.noreply.github.com>
Date: Tue, 14 Jan 2025 16:11:37 +0100
Subject: [PATCH 078/150] [PM-17029] Convert libs/common to relative imports
 (#12852)

Convert absolute paths in lib/common to relative.
---
 .../org-domain-api.service.abstraction.ts     |  3 +--
 ...rganization-domain-sso-details.response.ts |  2 +-
 .../organization-api.service.abstraction.ts   |  3 +--
 .../org-domain-api.service.spec.ts            |  5 ++--
 .../organization/organization-api.service.ts  |  2 +-
 .../organization/vnext-organization.state.ts  |  3 +--
 .../webauthn-rotate-credential.request.ts     |  2 +-
 .../devices/devices.service.implementation.ts |  3 +--
 .../master-password.service.ts                |  3 +--
 ...-enrollment.service.implementation.spec.ts |  6 ++---
 ...reset-enrollment.service.implementation.ts |  2 +-
 .../services/domain-settings.service.spec.ts  |  3 +--
 .../services/domain-settings.service.ts       |  3 +--
 libs/common/src/autofill/utils.spec.ts        |  9 +++----
 libs/common/src/autofill/utils.ts             |  5 ++--
 ...account-billing-api.service.abstraction.ts |  2 +-
 .../billing-api.service.abstraction.ts        | 14 +++++-----
 .../organization-billing.service.ts           |  4 +--
 ...ization-billing-api.service.abstraction.ts |  2 +-
 .../abstractions/tax.service.abstraction.ts   |  8 +++---
 .../billing/models/domain/tax-information.ts  |  2 +-
 .../expanded-tax-info-update.request.ts       |  2 +-
 .../preview-organization-invoice.request.ts   |  2 +-
 .../tokenized-payment-source.request.ts       |  2 +-
 .../request/update-payment-method.request.ts  |  4 +--
 .../models/response/invoices.response.ts      |  2 +-
 .../response/payment-source.response.ts       |  4 +--
 .../response/preview-invoice.response.ts      |  2 +-
 .../provider-subscription-response.ts         | 10 +++----
 .../subscription-suspension.response.ts       |  2 +-
 .../models/response/tax-id-types.response.ts  |  2 +-
 ...ling-account-profile-state.service.spec.ts |  7 +++--
 .../billing-account-profile-state.service.ts  |  5 ++--
 .../billing/services/billing-api.service.ts   | 26 +++++++++----------
 .../services/organization-billing.service.ts  | 26 +++++++++----------
 .../src/billing/services/tax.service.ts       | 12 ++++-----
 .../default-process-reload.service.ts         |  4 +--
 .../src/models/export/ssh-key.export.ts       |  2 +-
 libs/common/src/models/export/utils.ts        |  2 +-
 .../vault-timeout-settings.service.spec.ts    |  4 +--
 .../vault-timeout.service.spec.ts             |  4 +--
 .../vault-timeout/vault-timeout.service.ts    |  4 +--
 ...-service-legacy-encryptor-provider.spec.ts | 10 +++----
 .../key-service-legacy-encryptor-provider.ts  |  4 +--
 .../organization-encryptor.abstraction.ts     |  3 +--
 .../organization-key-encryptor.ts             |  3 +--
 .../user-encryptor.abstraction.ts             |  3 +--
 .../tools/cryptography/user-key-encryptor.ts  |  3 +--
 libs/common/src/tools/dependencies.ts         |  4 +--
 .../integration/integration-context.spec.ts   |  2 +-
 .../tools/integration/integration-context.ts  |  4 +--
 .../tools/integration/rpc/rest-client.spec.ts |  4 +--
 .../src/tools/integration/rpc/rest-client.ts  |  4 +--
 libs/common/src/tools/private-classifier.ts   |  2 +-
 libs/common/src/tools/public-classifier.ts    |  2 +-
 .../src/tools/send/models/domain/send.spec.ts |  4 +--
 .../tools/send/services/send.service.spec.ts  |  4 +--
 .../tools/state/user-state-subject.spec.ts    |  5 ++--
 .../src/tools/state/user-state-subject.ts     |  7 +++--
 .../src/vault/abstractions/cipher.service.ts  |  2 +-
 .../folder/folder-api.service.abstraction.ts  |  2 +-
 .../src/vault/models/domain/cipher.spec.ts    |  3 +--
 .../common/src/vault/models/domain/ssh-key.ts |  3 +--
 .../cipher-authorization.service.spec.ts      |  6 ++---
 .../services/cipher-authorization.service.ts  |  4 +--
 .../src/vault/services/cipher.service.spec.ts |  3 +--
 .../src/vault/services/cipher.service.ts      |  7 +++--
 .../services/folder/folder-api.service.ts     |  3 +--
 .../vault/services/folder/folder.service.ts   |  5 ++--
 libs/common/tsconfig.json                     |  1 +
 70 files changed, 148 insertions(+), 173 deletions(-)

diff --git a/libs/common/src/admin-console/abstractions/organization-domain/org-domain-api.service.abstraction.ts b/libs/common/src/admin-console/abstractions/organization-domain/org-domain-api.service.abstraction.ts
index 5ecfca5ab8..5a393ed199 100644
--- a/libs/common/src/admin-console/abstractions/organization-domain/org-domain-api.service.abstraction.ts
+++ b/libs/common/src/admin-console/abstractions/organization-domain/org-domain-api.service.abstraction.ts
@@ -1,7 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { ListResponse } from "@bitwarden/common/models/response/list.response";
-
+import { ListResponse } from "../../../models/response/list.response";
 import { OrganizationDomainRequest } from "../../services/organization-domain/requests/organization-domain.request";
 
 import { OrganizationDomainSsoDetailsResponse } from "./responses/organization-domain-sso-details.response";
diff --git a/libs/common/src/admin-console/abstractions/organization-domain/responses/verified-organization-domain-sso-details.response.ts b/libs/common/src/admin-console/abstractions/organization-domain/responses/verified-organization-domain-sso-details.response.ts
index c4817306a6..066d2d381e 100644
--- a/libs/common/src/admin-console/abstractions/organization-domain/responses/verified-organization-domain-sso-details.response.ts
+++ b/libs/common/src/admin-console/abstractions/organization-domain/responses/verified-organization-domain-sso-details.response.ts
@@ -1,4 +1,4 @@
-import { BaseResponse } from "@bitwarden/common/models/response/base.response";
+import { BaseResponse } from "../../../../models/response/base.response";
 
 export class VerifiedOrganizationDomainSsoDetailsResponse extends BaseResponse {
   organizationName: string;
diff --git a/libs/common/src/admin-console/abstractions/organization/organization-api.service.abstraction.ts b/libs/common/src/admin-console/abstractions/organization/organization-api.service.abstraction.ts
index 0c45c919e9..000d165541 100644
--- a/libs/common/src/admin-console/abstractions/organization/organization-api.service.abstraction.ts
+++ b/libs/common/src/admin-console/abstractions/organization/organization-api.service.abstraction.ts
@@ -1,7 +1,5 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { BillingHistoryResponse } from "@bitwarden/common/billing/models/response/billing-history.response";
-
 import { OrganizationApiKeyRequest } from "../../../admin-console/models/request/organization-api-key.request";
 import { OrganizationSsoRequest } from "../../../auth/models/request/organization-sso.request";
 import { SecretVerificationRequest } from "../../../auth/models/request/secret-verification.request";
@@ -13,6 +11,7 @@ import { OrganizationSmSubscriptionUpdateRequest } from "../../../billing/models
 import { OrganizationSubscriptionUpdateRequest } from "../../../billing/models/request/organization-subscription-update.request";
 import { PaymentRequest } from "../../../billing/models/request/payment.request";
 import { SecretsManagerSubscribeRequest } from "../../../billing/models/request/sm-subscribe.request";
+import { BillingHistoryResponse } from "../../../billing/models/response/billing-history.response";
 import { BillingResponse } from "../../../billing/models/response/billing.response";
 import { OrganizationSubscriptionResponse } from "../../../billing/models/response/organization-subscription.response";
 import { PaymentResponse } from "../../../billing/models/response/payment.response";
diff --git a/libs/common/src/admin-console/services/organization-domain/org-domain-api.service.spec.ts b/libs/common/src/admin-console/services/organization-domain/org-domain-api.service.spec.ts
index 7497a77e6f..1052fe504d 100644
--- a/libs/common/src/admin-console/services/organization-domain/org-domain-api.service.spec.ts
+++ b/libs/common/src/admin-console/services/organization-domain/org-domain-api.service.spec.ts
@@ -1,14 +1,13 @@
 import { mock } from "jest-mock-extended";
 import { lastValueFrom } from "rxjs";
 
-import { VerifiedOrganizationDomainSsoDetailsResponse } from "@bitwarden/common/admin-console/abstractions/organization-domain/responses/verified-organization-domain-sso-details.response";
-import { ListResponse } from "@bitwarden/common/models/response/list.response";
-
 import { ApiService } from "../../../abstractions/api.service";
+import { ListResponse } from "../../../models/response/list.response";
 import { I18nService } from "../../../platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "../../../platform/abstractions/platform-utils.service";
 import { OrganizationDomainSsoDetailsResponse } from "../../abstractions/organization-domain/responses/organization-domain-sso-details.response";
 import { OrganizationDomainResponse } from "../../abstractions/organization-domain/responses/organization-domain.response";
+import { VerifiedOrganizationDomainSsoDetailsResponse } from "../../abstractions/organization-domain/responses/verified-organization-domain-sso-details.response";
 
 import { OrgDomainApiService } from "./org-domain-api.service";
 import { OrgDomainService } from "./org-domain.service";
diff --git a/libs/common/src/admin-console/services/organization/organization-api.service.ts b/libs/common/src/admin-console/services/organization/organization-api.service.ts
index b3fd11982b..598bb2a29d 100644
--- a/libs/common/src/admin-console/services/organization/organization-api.service.ts
+++ b/libs/common/src/admin-console/services/organization/organization-api.service.ts
@@ -1,6 +1,5 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { BillingHistoryResponse } from "@bitwarden/common/billing/models/response/billing-history.response";
 
 import { ApiService } from "../../../abstractions/api.service";
 import { OrganizationApiKeyRequest } from "../../../admin-console/models/request/organization-api-key.request";
@@ -14,6 +13,7 @@ import { OrganizationSmSubscriptionUpdateRequest } from "../../../billing/models
 import { OrganizationSubscriptionUpdateRequest } from "../../../billing/models/request/organization-subscription-update.request";
 import { PaymentRequest } from "../../../billing/models/request/payment.request";
 import { SecretsManagerSubscribeRequest } from "../../../billing/models/request/sm-subscribe.request";
+import { BillingHistoryResponse } from "../../../billing/models/response/billing-history.response";
 import { BillingResponse } from "../../../billing/models/response/billing.response";
 import { OrganizationSubscriptionResponse } from "../../../billing/models/response/organization-subscription.response";
 import { PaymentResponse } from "../../../billing/models/response/payment.response";
diff --git a/libs/common/src/admin-console/services/organization/vnext-organization.state.ts b/libs/common/src/admin-console/services/organization/vnext-organization.state.ts
index 48e09d6d07..fea0423f38 100644
--- a/libs/common/src/admin-console/services/organization/vnext-organization.state.ts
+++ b/libs/common/src/admin-console/services/organization/vnext-organization.state.ts
@@ -1,7 +1,6 @@
 import { Jsonify } from "type-fest";
 
-import { ORGANIZATIONS_DISK, UserKeyDefinition } from "@bitwarden/common/platform/state";
-
+import { ORGANIZATIONS_DISK, UserKeyDefinition } from "../../../platform/state";
 import { OrganizationData } from "../../models/data/organization.data";
 
 /**
diff --git a/libs/common/src/auth/models/request/webauthn-rotate-credential.request.ts b/libs/common/src/auth/models/request/webauthn-rotate-credential.request.ts
index 588f75bde4..84103fe5d2 100644
--- a/libs/common/src/auth/models/request/webauthn-rotate-credential.request.ts
+++ b/libs/common/src/auth/models/request/webauthn-rotate-credential.request.ts
@@ -1,10 +1,10 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 
 // FIXME: remove `src` and fix import
 // eslint-disable-next-line no-restricted-imports
 import { RotateableKeySet } from "../../../../../auth/src/common/models";
+import { EncString } from "../../../platform/models/domain/enc-string";
 
 export class WebauthnRotateCredentialRequest {
   id: string;
diff --git a/libs/common/src/auth/services/devices/devices.service.implementation.ts b/libs/common/src/auth/services/devices/devices.service.implementation.ts
index cd6f1148dd..cdaa7a9fc4 100644
--- a/libs/common/src/auth/services/devices/devices.service.implementation.ts
+++ b/libs/common/src/auth/services/devices/devices.service.implementation.ts
@@ -1,8 +1,7 @@
 import { Observable, defer, map } from "rxjs";
 
-import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
-
 import { ListResponse } from "../../../models/response/list.response";
+import { AppIdService } from "../../../platform/abstractions/app-id.service";
 import { DevicesServiceAbstraction } from "../../abstractions/devices/devices.service.abstraction";
 import { DeviceResponse } from "../../abstractions/devices/responses/device.response";
 import { DeviceView } from "../../abstractions/devices/views/device.view";
diff --git a/libs/common/src/auth/services/master-password/master-password.service.ts b/libs/common/src/auth/services/master-password/master-password.service.ts
index 3ac00adf8e..14e7522a83 100644
--- a/libs/common/src/auth/services/master-password/master-password.service.ts
+++ b/libs/common/src/auth/services/master-password/master-password.service.ts
@@ -2,10 +2,9 @@
 // @ts-strict-ignore
 import { firstValueFrom, map, Observable } from "rxjs";
 
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-
 import { EncryptService } from "../../../platform/abstractions/encrypt.service";
 import { KeyGenerationService } from "../../../platform/abstractions/key-generation.service";
+import { LogService } from "../../../platform/abstractions/log.service";
 import { StateService } from "../../../platform/abstractions/state.service";
 import { EncryptionType } from "../../../platform/enums";
 import { EncryptedString, EncString } from "../../../platform/models/domain/enc-string";
diff --git a/libs/common/src/auth/services/password-reset-enrollment.service.implementation.spec.ts b/libs/common/src/auth/services/password-reset-enrollment.service.implementation.spec.ts
index 95b6f3f8b9..ddd24ae790 100644
--- a/libs/common/src/auth/services/password-reset-enrollment.service.implementation.spec.ts
+++ b/libs/common/src/auth/services/password-reset-enrollment.service.implementation.spec.ts
@@ -2,17 +2,15 @@ import { mock, MockProxy } from "jest-mock-extended";
 import { BehaviorSubject } from "rxjs";
 
 import { OrganizationUserApiService } from "@bitwarden/admin-console/common";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { UserId } from "../../../../common/src/types/guid";
 // FIXME: remove `src` and fix import
 // eslint-disable-next-line no-restricted-imports
 import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { OrganizationApiServiceAbstraction } from "../../admin-console/abstractions/organization/organization-api.service.abstraction";
 import { OrganizationAutoEnrollStatusResponse } from "../../admin-console/models/response/organization-auto-enroll-status.response";
+import { EncryptService } from "../../platform/abstractions/encrypt.service";
 import { I18nService } from "../../platform/abstractions/i18n.service";
+import { UserId } from "../../types/guid";
 import { Account, AccountInfo, AccountService } from "../abstractions/account.service";
 
 import { PasswordResetEnrollmentServiceImplementation } from "./password-reset-enrollment.service.implementation";
diff --git a/libs/common/src/auth/services/password-reset-enrollment.service.implementation.ts b/libs/common/src/auth/services/password-reset-enrollment.service.implementation.ts
index 0bdf98cef7..22d5384e6a 100644
--- a/libs/common/src/auth/services/password-reset-enrollment.service.implementation.ts
+++ b/libs/common/src/auth/services/password-reset-enrollment.service.implementation.ts
@@ -6,12 +6,12 @@ import {
   OrganizationUserApiService,
   OrganizationUserResetPasswordEnrollmentRequest,
 } from "@bitwarden/admin-console/common";
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 
 // FIXME: remove `src` and fix import
 // eslint-disable-next-line no-restricted-imports
 import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { OrganizationApiServiceAbstraction } from "../../admin-console/abstractions/organization/organization-api.service.abstraction";
+import { EncryptService } from "../../platform/abstractions/encrypt.service";
 import { I18nService } from "../../platform/abstractions/i18n.service";
 import { Utils } from "../../platform/misc/utils";
 import { UserKey } from "../../types/key";
diff --git a/libs/common/src/autofill/services/domain-settings.service.spec.ts b/libs/common/src/autofill/services/domain-settings.service.spec.ts
index 5c5f85e7e6..36f7d0eace 100644
--- a/libs/common/src/autofill/services/domain-settings.service.spec.ts
+++ b/libs/common/src/autofill/services/domain-settings.service.spec.ts
@@ -1,9 +1,8 @@
 import { MockProxy, mock } from "jest-mock-extended";
 import { firstValueFrom, of } from "rxjs";
 
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-
 import { FakeStateProvider, FakeAccountService, mockAccountServiceWith } from "../../../spec";
+import { ConfigService } from "../../platform/abstractions/config/config.service";
 import { Utils } from "../../platform/misc/utils";
 import { UserId } from "../../types/guid";
 
diff --git a/libs/common/src/autofill/services/domain-settings.service.ts b/libs/common/src/autofill/services/domain-settings.service.ts
index 7d25c4e25d..b2833b9ee2 100644
--- a/libs/common/src/autofill/services/domain-settings.service.ts
+++ b/libs/common/src/autofill/services/domain-settings.service.ts
@@ -2,8 +2,7 @@
 // @ts-strict-ignore
 import { map, Observable, switchMap, of } from "rxjs";
 
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-
+import { FeatureFlag } from "../../enums/feature-flag.enum";
 import {
   NeverDomains,
   EquivalentDomains,
diff --git a/libs/common/src/autofill/utils.spec.ts b/libs/common/src/autofill/utils.spec.ts
index 4dd36ba7d8..554dc973b4 100644
--- a/libs/common/src/autofill/utils.spec.ts
+++ b/libs/common/src/autofill/utils.spec.ts
@@ -1,9 +1,6 @@
-import {
-  normalizeExpiryYearFormat,
-  isCardExpired,
-  parseYearMonthExpiry,
-} from "@bitwarden/common/autofill/utils";
-import { CardView } from "@bitwarden/common/vault/models/view/card.view";
+import { CardView } from "../vault/models/view/card.view";
+
+import { normalizeExpiryYearFormat, isCardExpired, parseYearMonthExpiry } from "./utils";
 
 function getExpiryYearValueFormats(currentCentury: string) {
   return [
diff --git a/libs/common/src/autofill/utils.ts b/libs/common/src/autofill/utils.ts
index 6bee5e1a19..a77ea8a715 100644
--- a/libs/common/src/autofill/utils.ts
+++ b/libs/common/src/autofill/utils.ts
@@ -1,11 +1,12 @@
+import { CardView } from "../vault/models/view/card.view";
+
 import {
   DelimiterPatternExpression,
   ExpiryFullYearPattern,
   ExpiryFullYearPatternExpression,
   IrrelevantExpiryCharactersPatternExpression,
   MonthPatternExpression,
-} from "@bitwarden/common/autofill/constants";
-import { CardView } from "@bitwarden/common/vault/models/view/card.view";
+} from "./constants";
 
 type NonZeroIntegers = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
 type Year = `${NonZeroIntegers}${NonZeroIntegers}${0 | NonZeroIntegers}${0 | NonZeroIntegers}`;
diff --git a/libs/common/src/billing/abstractions/account/account-billing-api.service.abstraction.ts b/libs/common/src/billing/abstractions/account/account-billing-api.service.abstraction.ts
index 06400081e1..e0e8b7377c 100644
--- a/libs/common/src/billing/abstractions/account/account-billing-api.service.abstraction.ts
+++ b/libs/common/src/billing/abstractions/account/account-billing-api.service.abstraction.ts
@@ -3,7 +3,7 @@
 import {
   BillingInvoiceResponse,
   BillingTransactionResponse,
-} from "@bitwarden/common/billing/models/response/billing.response";
+} from "../../models/response/billing.response";
 
 export class AccountBillingApiServiceAbstraction {
   getBillingInvoices: (status?: string, startAfter?: string) => Promise<BillingInvoiceResponse[]>;
diff --git a/libs/common/src/billing/abstractions/billing-api.service.abstraction.ts b/libs/common/src/billing/abstractions/billing-api.service.abstraction.ts
index 4b08b52a13..928f65a363 100644
--- a/libs/common/src/billing/abstractions/billing-api.service.abstraction.ts
+++ b/libs/common/src/billing/abstractions/billing-api.service.abstraction.ts
@@ -1,20 +1,20 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { ProviderOrganizationOrganizationDetailsResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-organization.response";
-import { PaymentMethodType } from "@bitwarden/common/billing/enums";
-import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
-import { UpdatePaymentMethodRequest } from "@bitwarden/common/billing/models/request/update-payment-method.request";
-import { VerifyBankAccountRequest } from "@bitwarden/common/billing/models/request/verify-bank-account.request";
-import { InvoicesResponse } from "@bitwarden/common/billing/models/response/invoices.response";
-import { PaymentMethodResponse } from "@bitwarden/common/billing/models/response/payment-method.response";
 
 import { OrganizationCreateRequest } from "../../admin-console/models/request/organization-create.request";
+import { ProviderOrganizationOrganizationDetailsResponse } from "../../admin-console/models/response/provider/provider-organization.response";
 import { SubscriptionCancellationRequest } from "../../billing/models/request/subscription-cancellation.request";
 import { OrganizationBillingMetadataResponse } from "../../billing/models/response/organization-billing-metadata.response";
 import { PlanResponse } from "../../billing/models/response/plan.response";
 import { ListResponse } from "../../models/response/list.response";
+import { PaymentMethodType } from "../enums";
 import { CreateClientOrganizationRequest } from "../models/request/create-client-organization.request";
+import { ExpandedTaxInfoUpdateRequest } from "../models/request/expanded-tax-info-update.request";
 import { UpdateClientOrganizationRequest } from "../models/request/update-client-organization.request";
+import { UpdatePaymentMethodRequest } from "../models/request/update-payment-method.request";
+import { VerifyBankAccountRequest } from "../models/request/verify-bank-account.request";
+import { InvoicesResponse } from "../models/response/invoices.response";
+import { PaymentMethodResponse } from "../models/response/payment-method.response";
 import { ProviderSubscriptionResponse } from "../models/response/provider-subscription-response";
 
 export abstract class BillingApiServiceAbstraction {
diff --git a/libs/common/src/billing/abstractions/organization-billing.service.ts b/libs/common/src/billing/abstractions/organization-billing.service.ts
index 7c4e0a39f8..1e68488ac9 100644
--- a/libs/common/src/billing/abstractions/organization-billing.service.ts
+++ b/libs/common/src/billing/abstractions/organization-billing.service.ts
@@ -1,11 +1,11 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { BillingSourceResponse } from "@bitwarden/common/billing/models/response/billing.response";
-import { PaymentSourceResponse } from "@bitwarden/common/billing/models/response/payment-source.response";
 
 import { OrganizationResponse } from "../../admin-console/models/response/organization.response";
 import { InitiationPath } from "../../models/request/reference-event.request";
 import { PaymentMethodType, PlanType } from "../enums";
+import { BillingSourceResponse } from "../models/response/billing.response";
+import { PaymentSourceResponse } from "../models/response/payment-source.response";
 
 export type OrganizationInformation = {
   name: string;
diff --git a/libs/common/src/billing/abstractions/organizations/organization-billing-api.service.abstraction.ts b/libs/common/src/billing/abstractions/organizations/organization-billing-api.service.abstraction.ts
index 6a72724a5e..2ed2549104 100644
--- a/libs/common/src/billing/abstractions/organizations/organization-billing-api.service.abstraction.ts
+++ b/libs/common/src/billing/abstractions/organizations/organization-billing-api.service.abstraction.ts
@@ -3,7 +3,7 @@
 import {
   BillingInvoiceResponse,
   BillingTransactionResponse,
-} from "@bitwarden/common/billing/models/response/billing.response";
+} from "../../models/response/billing.response";
 
 export class OrganizationBillingApiServiceAbstraction {
   getBillingInvoices: (
diff --git a/libs/common/src/billing/abstractions/tax.service.abstraction.ts b/libs/common/src/billing/abstractions/tax.service.abstraction.ts
index 438d3f394e..7a744dae85 100644
--- a/libs/common/src/billing/abstractions/tax.service.abstraction.ts
+++ b/libs/common/src/billing/abstractions/tax.service.abstraction.ts
@@ -1,7 +1,7 @@
-import { CountryListItem } from "@bitwarden/common/billing/models/domain";
-import { PreviewIndividualInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-individual-invoice.request";
-import { PreviewOrganizationInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-organization-invoice.request";
-import { PreviewInvoiceResponse } from "@bitwarden/common/billing/models/response/preview-invoice.response";
+import { CountryListItem } from "../models/domain";
+import { PreviewIndividualInvoiceRequest } from "../models/request/preview-individual-invoice.request";
+import { PreviewOrganizationInvoiceRequest } from "../models/request/preview-organization-invoice.request";
+import { PreviewInvoiceResponse } from "../models/response/preview-invoice.response";
 
 export abstract class TaxServiceAbstraction {
   abstract getCountries(): CountryListItem[];
diff --git a/libs/common/src/billing/models/domain/tax-information.ts b/libs/common/src/billing/models/domain/tax-information.ts
index 78e1bcc42b..794cdef3ed 100644
--- a/libs/common/src/billing/models/domain/tax-information.ts
+++ b/libs/common/src/billing/models/domain/tax-information.ts
@@ -1,6 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { TaxInfoResponse } from "@bitwarden/common/billing/models/response/tax-info.response";
+import { TaxInfoResponse } from "../response/tax-info.response";
 
 export class TaxInformation {
   country: string;
diff --git a/libs/common/src/billing/models/request/expanded-tax-info-update.request.ts b/libs/common/src/billing/models/request/expanded-tax-info-update.request.ts
index 784d269162..83b254ac51 100644
--- a/libs/common/src/billing/models/request/expanded-tax-info-update.request.ts
+++ b/libs/common/src/billing/models/request/expanded-tax-info-update.request.ts
@@ -1,6 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { TaxInformation } from "@bitwarden/common/billing/models/domain/tax-information";
+import { TaxInformation } from "../domain/tax-information";
 
 import { TaxInfoUpdateRequest } from "./tax-info-update.request";
 
diff --git a/libs/common/src/billing/models/request/preview-organization-invoice.request.ts b/libs/common/src/billing/models/request/preview-organization-invoice.request.ts
index 365dff5c11..40d8db03d3 100644
--- a/libs/common/src/billing/models/request/preview-organization-invoice.request.ts
+++ b/libs/common/src/billing/models/request/preview-organization-invoice.request.ts
@@ -1,4 +1,4 @@
-import { PlanType } from "@bitwarden/common/billing/enums";
+import { PlanType } from "../../enums";
 
 export class PreviewOrganizationInvoiceRequest {
   organizationId?: string;
diff --git a/libs/common/src/billing/models/request/tokenized-payment-source.request.ts b/libs/common/src/billing/models/request/tokenized-payment-source.request.ts
index c740e4157e..e4bf575cc6 100644
--- a/libs/common/src/billing/models/request/tokenized-payment-source.request.ts
+++ b/libs/common/src/billing/models/request/tokenized-payment-source.request.ts
@@ -1,6 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { PaymentMethodType } from "@bitwarden/common/billing/enums";
+import { PaymentMethodType } from "../../enums";
 
 export class TokenizedPaymentSourceRequest {
   type: PaymentMethodType;
diff --git a/libs/common/src/billing/models/request/update-payment-method.request.ts b/libs/common/src/billing/models/request/update-payment-method.request.ts
index 9ef91ae579..10b0310371 100644
--- a/libs/common/src/billing/models/request/update-payment-method.request.ts
+++ b/libs/common/src/billing/models/request/update-payment-method.request.ts
@@ -1,7 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
-import { TokenizedPaymentSourceRequest } from "@bitwarden/common/billing/models/request/tokenized-payment-source.request";
+import { ExpandedTaxInfoUpdateRequest } from "./expanded-tax-info-update.request";
+import { TokenizedPaymentSourceRequest } from "./tokenized-payment-source.request";
 
 export class UpdatePaymentMethodRequest {
   paymentSource: TokenizedPaymentSourceRequest;
diff --git a/libs/common/src/billing/models/response/invoices.response.ts b/libs/common/src/billing/models/response/invoices.response.ts
index bf797ba42d..05c95b83c6 100644
--- a/libs/common/src/billing/models/response/invoices.response.ts
+++ b/libs/common/src/billing/models/response/invoices.response.ts
@@ -1,4 +1,4 @@
-import { BaseResponse } from "@bitwarden/common/models/response/base.response";
+import { BaseResponse } from "../../../models/response/base.response";
 
 export class InvoicesResponse extends BaseResponse {
   invoices: InvoiceResponse[] = [];
diff --git a/libs/common/src/billing/models/response/payment-source.response.ts b/libs/common/src/billing/models/response/payment-source.response.ts
index 1aeeb450b1..93418fc2f5 100644
--- a/libs/common/src/billing/models/response/payment-source.response.ts
+++ b/libs/common/src/billing/models/response/payment-source.response.ts
@@ -1,5 +1,5 @@
-import { PaymentMethodType } from "@bitwarden/common/billing/enums";
-import { BaseResponse } from "@bitwarden/common/models/response/base.response";
+import { BaseResponse } from "../../../models/response/base.response";
+import { PaymentMethodType } from "../../enums";
 
 export class PaymentSourceResponse extends BaseResponse {
   type: PaymentMethodType;
diff --git a/libs/common/src/billing/models/response/preview-invoice.response.ts b/libs/common/src/billing/models/response/preview-invoice.response.ts
index c822a569bb..efd3da3e9f 100644
--- a/libs/common/src/billing/models/response/preview-invoice.response.ts
+++ b/libs/common/src/billing/models/response/preview-invoice.response.ts
@@ -1,4 +1,4 @@
-import { BaseResponse } from "@bitwarden/common/models/response/base.response";
+import { BaseResponse } from "../../../models/response/base.response";
 
 export class PreviewInvoiceResponse extends BaseResponse {
   effectiveTaxRate: number;
diff --git a/libs/common/src/billing/models/response/provider-subscription-response.ts b/libs/common/src/billing/models/response/provider-subscription-response.ts
index 2ecf988add..4481f7588f 100644
--- a/libs/common/src/billing/models/response/provider-subscription-response.ts
+++ b/libs/common/src/billing/models/response/provider-subscription-response.ts
@@ -1,9 +1,9 @@
-import { ProviderType } from "@bitwarden/common/admin-console/enums";
-import { PlanType, ProductTierType } from "@bitwarden/common/billing/enums";
-import { SubscriptionSuspensionResponse } from "@bitwarden/common/billing/models/response/subscription-suspension.response";
-import { TaxInfoResponse } from "@bitwarden/common/billing/models/response/tax-info.response";
-
+import { ProviderType } from "../../../admin-console/enums";
 import { BaseResponse } from "../../../models/response/base.response";
+import { PlanType, ProductTierType } from "../../enums";
+
+import { SubscriptionSuspensionResponse } from "./subscription-suspension.response";
+import { TaxInfoResponse } from "./tax-info.response";
 
 export class ProviderSubscriptionResponse extends BaseResponse {
   status: string;
diff --git a/libs/common/src/billing/models/response/subscription-suspension.response.ts b/libs/common/src/billing/models/response/subscription-suspension.response.ts
index 418e1c443c..3d714a05db 100644
--- a/libs/common/src/billing/models/response/subscription-suspension.response.ts
+++ b/libs/common/src/billing/models/response/subscription-suspension.response.ts
@@ -1,4 +1,4 @@
-import { BaseResponse } from "@bitwarden/common/models/response/base.response";
+import { BaseResponse } from "../../../models/response/base.response";
 
 export class SubscriptionSuspensionResponse extends BaseResponse {
   suspensionDate: string;
diff --git a/libs/common/src/billing/models/response/tax-id-types.response.ts b/libs/common/src/billing/models/response/tax-id-types.response.ts
index 0d5cce46c8..f31f2133b3 100644
--- a/libs/common/src/billing/models/response/tax-id-types.response.ts
+++ b/libs/common/src/billing/models/response/tax-id-types.response.ts
@@ -1,4 +1,4 @@
-import { BaseResponse } from "@bitwarden/common/models/response/base.response";
+import { BaseResponse } from "../../../models/response/base.response";
 
 export class TaxIdTypesResponse extends BaseResponse {
   taxIdTypes: TaxIdTypeResponse[] = [];
diff --git a/libs/common/src/billing/services/account/billing-account-profile-state.service.spec.ts b/libs/common/src/billing/services/account/billing-account-profile-state.service.spec.ts
index 372d809986..02dbef469d 100644
--- a/libs/common/src/billing/services/account/billing-account-profile-state.service.spec.ts
+++ b/libs/common/src/billing/services/account/billing-account-profile-state.service.spec.ts
@@ -1,17 +1,16 @@
 import { firstValueFrom } from "rxjs";
 
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { BillingHistoryResponse } from "@bitwarden/common/billing/models/response/billing-history.response";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-
 import {
   FakeAccountService,
   mockAccountServiceWith,
   FakeStateProvider,
   FakeSingleUserState,
 } from "../../../../spec";
+import { ApiService } from "../../../abstractions/api.service";
+import { PlatformUtilsService } from "../../../platform/abstractions/platform-utils.service";
 import { UserId } from "../../../types/guid";
 import { BillingAccountProfile } from "../../abstractions/account/billing-account-profile-state.service";
+import { BillingHistoryResponse } from "../../models/response/billing-history.response";
 
 import {
   BILLING_ACCOUNT_PROFILE_KEY_DEFINITION,
diff --git a/libs/common/src/billing/services/account/billing-account-profile-state.service.ts b/libs/common/src/billing/services/account/billing-account-profile-state.service.ts
index 579a81eeb5..155ce1493b 100644
--- a/libs/common/src/billing/services/account/billing-account-profile-state.service.ts
+++ b/libs/common/src/billing/services/account/billing-account-profile-state.service.ts
@@ -1,8 +1,7 @@
 import { map, Observable, combineLatest, concatMap } from "rxjs";
 
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-
+import { ApiService } from "../../../abstractions/api.service";
+import { PlatformUtilsService } from "../../../platform/abstractions/platform-utils.service";
 import { BILLING_DISK, StateProvider, UserKeyDefinition } from "../../../platform/state";
 import { UserId } from "../../../types/guid";
 import {
diff --git a/libs/common/src/billing/services/billing-api.service.ts b/libs/common/src/billing/services/billing-api.service.ts
index 7ce5602f3c..4306324395 100644
--- a/libs/common/src/billing/services/billing-api.service.ts
+++ b/libs/common/src/billing/services/billing-api.service.ts
@@ -1,25 +1,25 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { ProviderOrganizationOrganizationDetailsResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-organization.response";
-import { UpdatePaymentMethodRequest } from "@bitwarden/common/billing/models/request/update-payment-method.request";
-import { VerifyBankAccountRequest } from "@bitwarden/common/billing/models/request/verify-bank-account.request";
-import { InvoicesResponse } from "@bitwarden/common/billing/models/response/invoices.response";
-import { PaymentMethodResponse } from "@bitwarden/common/billing/models/response/payment-method.response";
-import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { ToastService } from "@bitwarden/components";
 
 import { ApiService } from "../../abstractions/api.service";
 import { OrganizationCreateRequest } from "../../admin-console/models/request/organization-create.request";
-import { BillingApiServiceAbstraction } from "../../billing/abstractions";
-import { PaymentMethodType } from "../../billing/enums";
-import { ExpandedTaxInfoUpdateRequest } from "../../billing/models/request/expanded-tax-info-update.request";
-import { SubscriptionCancellationRequest } from "../../billing/models/request/subscription-cancellation.request";
-import { OrganizationBillingMetadataResponse } from "../../billing/models/response/organization-billing-metadata.response";
-import { PlanResponse } from "../../billing/models/response/plan.response";
+import { ProviderOrganizationOrganizationDetailsResponse } from "../../admin-console/models/response/provider/provider-organization.response";
+import { ErrorResponse } from "../../models/response/error.response";
 import { ListResponse } from "../../models/response/list.response";
+import { LogService } from "../../platform/abstractions/log.service";
+import { BillingApiServiceAbstraction } from "../abstractions";
+import { PaymentMethodType } from "../enums";
 import { CreateClientOrganizationRequest } from "../models/request/create-client-organization.request";
+import { ExpandedTaxInfoUpdateRequest } from "../models/request/expanded-tax-info-update.request";
+import { SubscriptionCancellationRequest } from "../models/request/subscription-cancellation.request";
 import { UpdateClientOrganizationRequest } from "../models/request/update-client-organization.request";
+import { UpdatePaymentMethodRequest } from "../models/request/update-payment-method.request";
+import { VerifyBankAccountRequest } from "../models/request/verify-bank-account.request";
+import { InvoicesResponse } from "../models/response/invoices.response";
+import { OrganizationBillingMetadataResponse } from "../models/response/organization-billing-metadata.response";
+import { PaymentMethodResponse } from "../models/response/payment-method.response";
+import { PlanResponse } from "../models/response/plan.response";
 import { ProviderSubscriptionResponse } from "../models/response/provider-subscription-response";
 
 export class BillingApiService implements BillingApiServiceAbstraction {
diff --git a/libs/common/src/billing/services/organization-billing.service.ts b/libs/common/src/billing/services/organization-billing.service.ts
index ca10b36866..da1a1666ff 100644
--- a/libs/common/src/billing/services/organization-billing.service.ts
+++ b/libs/common/src/billing/services/organization-billing.service.ts
@@ -1,18 +1,5 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import {
-  BillingApiServiceAbstraction,
-  OrganizationBillingServiceAbstraction,
-  OrganizationInformation,
-  PaymentInformation,
-  PlanInformation,
-  SubscriptionInformation,
-} from "@bitwarden/common/billing/abstractions";
-import { BillingSourceResponse } from "@bitwarden/common/billing/models/response/billing.response";
-import { PaymentSourceResponse } from "@bitwarden/common/billing/models/response/payment-source.response";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { SyncService } from "@bitwarden/common/platform/sync";
 import { KeyService } from "@bitwarden/key-management";
 
 import { ApiService } from "../../abstractions/api.service";
@@ -20,12 +7,25 @@ import { OrganizationApiServiceAbstraction as OrganizationApiService } from "../
 import { OrganizationCreateRequest } from "../../admin-console/models/request/organization-create.request";
 import { OrganizationKeysRequest } from "../../admin-console/models/request/organization-keys.request";
 import { OrganizationResponse } from "../../admin-console/models/response/organization.response";
+import { FeatureFlag } from "../../enums/feature-flag.enum";
+import { ConfigService } from "../../platform/abstractions/config/config.service";
 import { EncryptService } from "../../platform/abstractions/encrypt.service";
 import { I18nService } from "../../platform/abstractions/i18n.service";
 import { EncString } from "../../platform/models/domain/enc-string";
+import { SyncService } from "../../platform/sync";
 import { OrgKey } from "../../types/key";
+import {
+  BillingApiServiceAbstraction,
+  OrganizationBillingServiceAbstraction,
+  OrganizationInformation,
+  PaymentInformation,
+  PlanInformation,
+  SubscriptionInformation,
+} from "../abstractions";
 import { PlanType } from "../enums";
 import { OrganizationNoPaymentMethodCreateRequest } from "../models/request/organization-no-payment-method-create-request";
+import { BillingSourceResponse } from "../models/response/billing.response";
+import { PaymentSourceResponse } from "../models/response/payment-source.response";
 
 interface OrganizationKeys {
   encryptedKey: EncString;
diff --git a/libs/common/src/billing/services/tax.service.ts b/libs/common/src/billing/services/tax.service.ts
index 45e57267ec..aa27c99adc 100644
--- a/libs/common/src/billing/services/tax.service.ts
+++ b/libs/common/src/billing/services/tax.service.ts
@@ -1,9 +1,9 @@
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
-import { CountryListItem } from "@bitwarden/common/billing/models/domain";
-import { PreviewIndividualInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-individual-invoice.request";
-import { PreviewOrganizationInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-organization-invoice.request";
-import { PreviewInvoiceResponse } from "@bitwarden/common/billing/models/response/preview-invoice.response";
+import { ApiService } from "../../abstractions/api.service";
+import { TaxServiceAbstraction } from "../abstractions/tax.service.abstraction";
+import { CountryListItem } from "../models/domain";
+import { PreviewIndividualInvoiceRequest } from "../models/request/preview-individual-invoice.request";
+import { PreviewOrganizationInvoiceRequest } from "../models/request/preview-organization-invoice.request";
+import { PreviewInvoiceResponse } from "../models/response/preview-invoice.response";
 
 export class TaxService implements TaxServiceAbstraction {
   constructor(private apiService: ApiService) {}
diff --git a/libs/common/src/key-management/services/default-process-reload.service.ts b/libs/common/src/key-management/services/default-process-reload.service.ts
index f1c3aed6a5..3f099b7732 100644
--- a/libs/common/src/key-management/services/default-process-reload.service.ts
+++ b/libs/common/src/key-management/services/default-process-reload.service.ts
@@ -2,8 +2,6 @@
 // @ts-strict-ignore
 import { firstValueFrom, map, timeout } from "rxjs";
 
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { BiometricStateService } from "@bitwarden/key-management";
 
 // FIXME: remove `src` and fix import
@@ -14,6 +12,8 @@ import { AccountService } from "../../auth/abstractions/account.service";
 import { AuthService } from "../../auth/abstractions/auth.service";
 import { AuthenticationStatus } from "../../auth/enums/authentication-status";
 import { VaultTimeoutAction } from "../../enums/vault-timeout-action.enum";
+import { LogService } from "../../platform/abstractions/log.service";
+import { MessagingService } from "../../platform/abstractions/messaging.service";
 import { UserId } from "../../types/guid";
 import { ProcessReloadServiceAbstraction } from "../abstractions/process-reload.service";
 
diff --git a/libs/common/src/models/export/ssh-key.export.ts b/libs/common/src/models/export/ssh-key.export.ts
index c502ddafd4..a99ebac34b 100644
--- a/libs/common/src/models/export/ssh-key.export.ts
+++ b/libs/common/src/models/export/ssh-key.export.ts
@@ -1,9 +1,9 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { SshKeyView as SshKeyView } from "@bitwarden/common/vault/models/view/ssh-key.view";
 
 import { EncString } from "../../platform/models/domain/enc-string";
 import { SshKey as SshKeyDomain } from "../../vault/models/domain/ssh-key";
+import { SshKeyView as SshKeyView } from "../../vault/models/view/ssh-key.view";
 
 import { safeGetString } from "./utils";
 
diff --git a/libs/common/src/models/export/utils.ts b/libs/common/src/models/export/utils.ts
index 630b489850..b7e0b74b61 100644
--- a/libs/common/src/models/export/utils.ts
+++ b/libs/common/src/models/export/utils.ts
@@ -1,4 +1,4 @@
-import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
+import { EncString } from "../../platform/models/domain/enc-string";
 
 export function safeGetString(value: string | EncString) {
   if (value == null) {
diff --git a/libs/common/src/services/vault-timeout/vault-timeout-settings.service.spec.ts b/libs/common/src/services/vault-timeout/vault-timeout-settings.service.spec.ts
index 4168baf138..77ed6c960a 100644
--- a/libs/common/src/services/vault-timeout/vault-timeout-settings.service.spec.ts
+++ b/libs/common/src/services/vault-timeout/vault-timeout-settings.service.spec.ts
@@ -6,8 +6,6 @@ import {
   FakeUserDecryptionOptions as UserDecryptionOptions,
   UserDecryptionOptionsServiceAbstraction,
 } from "@bitwarden/auth/common";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { UserId } from "@bitwarden/common/types/guid";
 import { BiometricStateService } from "@bitwarden/key-management";
 
 // FIXME: remove `src` and fix import
@@ -20,10 +18,12 @@ import { Policy } from "../../admin-console/models/domain/policy";
 import { TokenService } from "../../auth/abstractions/token.service";
 import { VaultTimeoutAction } from "../../enums/vault-timeout-action.enum";
 import { LogService } from "../../platform/abstractions/log.service";
+import { Utils } from "../../platform/misc/utils";
 import {
   VAULT_TIMEOUT,
   VAULT_TIMEOUT_ACTION,
 } from "../../services/vault-timeout/vault-timeout-settings.state";
+import { UserId } from "../../types/guid";
 import { VaultTimeout, VaultTimeoutStringType } from "../../types/vault-timeout.type";
 
 import { VaultTimeoutSettingsService } from "./vault-timeout-settings.service";
diff --git a/libs/common/src/services/vault-timeout/vault-timeout.service.spec.ts b/libs/common/src/services/vault-timeout/vault-timeout.service.spec.ts
index 8a166e63a1..986bbbf95a 100644
--- a/libs/common/src/services/vault-timeout/vault-timeout.service.spec.ts
+++ b/libs/common/src/services/vault-timeout/vault-timeout.service.spec.ts
@@ -3,8 +3,6 @@ import { BehaviorSubject, from, of } from "rxjs";
 
 import { CollectionService } from "@bitwarden/admin-console/common";
 import { LogoutReason } from "@bitwarden/auth/common";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { TaskSchedulerService } from "@bitwarden/common/platform/scheduling";
 import { BiometricsService } from "@bitwarden/key-management";
 
 import { FakeAccountService, mockAccountServiceWith } from "../../../spec/fake-account-service";
@@ -15,10 +13,12 @@ import { AuthService } from "../../auth/abstractions/auth.service";
 import { AuthenticationStatus } from "../../auth/enums/authentication-status";
 import { FakeMasterPasswordService } from "../../auth/services/master-password/fake-master-password.service";
 import { VaultTimeoutAction } from "../../enums/vault-timeout-action.enum";
+import { LogService } from "../../platform/abstractions/log.service";
 import { MessagingService } from "../../platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "../../platform/abstractions/platform-utils.service";
 import { StateService } from "../../platform/abstractions/state.service";
 import { Utils } from "../../platform/misc/utils";
+import { TaskSchedulerService } from "../../platform/scheduling";
 import { StateEventRunnerService } from "../../platform/state";
 import { UserId } from "../../types/guid";
 import { VaultTimeout, VaultTimeoutStringType } from "../../types/vault-timeout.type";
diff --git a/libs/common/src/services/vault-timeout/vault-timeout.service.ts b/libs/common/src/services/vault-timeout/vault-timeout.service.ts
index 8ab10b44b2..08dc02bb1a 100644
--- a/libs/common/src/services/vault-timeout/vault-timeout.service.ts
+++ b/libs/common/src/services/vault-timeout/vault-timeout.service.ts
@@ -4,8 +4,6 @@ import { combineLatest, concatMap, filter, firstValueFrom, map, timeout } from "
 
 import { CollectionService } from "@bitwarden/admin-console/common";
 import { LogoutReason } from "@bitwarden/auth/common";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { TaskSchedulerService, ScheduledTaskNames } from "@bitwarden/common/platform/scheduling";
 import { BiometricsService } from "@bitwarden/key-management";
 
 import { SearchService } from "../../abstractions/search.service";
@@ -16,9 +14,11 @@ import { AuthService } from "../../auth/abstractions/auth.service";
 import { InternalMasterPasswordServiceAbstraction } from "../../auth/abstractions/master-password.service.abstraction";
 import { AuthenticationStatus } from "../../auth/enums/authentication-status";
 import { VaultTimeoutAction } from "../../enums/vault-timeout-action.enum";
+import { LogService } from "../../platform/abstractions/log.service";
 import { MessagingService } from "../../platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "../../platform/abstractions/platform-utils.service";
 import { StateService } from "../../platform/abstractions/state.service";
+import { TaskSchedulerService, ScheduledTaskNames } from "../../platform/scheduling";
 import { StateEventRunnerService } from "../../platform/state";
 import { UserId } from "../../types/guid";
 import { CipherService } from "../../vault/abstractions/cipher.service";
diff --git a/libs/common/src/tools/cryptography/key-service-legacy-encryptor-provider.spec.ts b/libs/common/src/tools/cryptography/key-service-legacy-encryptor-provider.spec.ts
index 12257905d1..831cad7415 100644
--- a/libs/common/src/tools/cryptography/key-service-legacy-encryptor-provider.spec.ts
+++ b/libs/common/src/tools/cryptography/key-service-legacy-encryptor-provider.spec.ts
@@ -1,13 +1,13 @@
 import { mock } from "jest-mock-extended";
 import { BehaviorSubject, Subject } from "rxjs";
 
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
-import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
-import { CsprngArray } from "@bitwarden/common/types/csprng";
-import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
-import { OrgKey, UserKey } from "@bitwarden/common/types/key";
 import { KeyService } from "@bitwarden/key-management";
 
+import { EncryptService } from "../../platform/abstractions/encrypt.service";
+import { SymmetricCryptoKey } from "../../platform/models/domain/symmetric-crypto-key";
+import { CsprngArray } from "../../types/csprng";
+import { OrganizationId, UserId } from "../../types/guid";
+import { OrgKey, UserKey } from "../../types/key";
 import { OrganizationBound, UserBound } from "../dependencies";
 
 import { KeyServiceLegacyEncryptorProvider } from "./key-service-legacy-encryptor-provider";
diff --git a/libs/common/src/tools/cryptography/key-service-legacy-encryptor-provider.ts b/libs/common/src/tools/cryptography/key-service-legacy-encryptor-provider.ts
index 3eee08eb6b..d4a8dec7dc 100644
--- a/libs/common/src/tools/cryptography/key-service-legacy-encryptor-provider.ts
+++ b/libs/common/src/tools/cryptography/key-service-legacy-encryptor-provider.ts
@@ -12,10 +12,10 @@ import {
   takeWhile,
 } from "rxjs";
 
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
-import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
 import { KeyService } from "@bitwarden/key-management";
 
+import { EncryptService } from "../../platform/abstractions/encrypt.service";
+import { OrganizationId, UserId } from "../../types/guid";
 import {
   OrganizationBound,
   SingleOrganizationDependency,
diff --git a/libs/common/src/tools/cryptography/organization-encryptor.abstraction.ts b/libs/common/src/tools/cryptography/organization-encryptor.abstraction.ts
index dda8bfe957..9eec207e92 100644
--- a/libs/common/src/tools/cryptography/organization-encryptor.abstraction.ts
+++ b/libs/common/src/tools/cryptography/organization-encryptor.abstraction.ts
@@ -2,9 +2,8 @@
 // @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
-import { OrganizationId } from "@bitwarden/common/types/guid";
-
 import { EncString } from "../../platform/models/domain/enc-string";
+import { OrganizationId } from "../../types/guid";
 
 /** An encryption strategy that protects a type's secrets with
  *  organization-specific keys. This strategy is bound to a specific organization.
diff --git a/libs/common/src/tools/cryptography/organization-key-encryptor.ts b/libs/common/src/tools/cryptography/organization-key-encryptor.ts
index 3fdc0a1da3..d3b7dae10f 100644
--- a/libs/common/src/tools/cryptography/organization-key-encryptor.ts
+++ b/libs/common/src/tools/cryptography/organization-key-encryptor.ts
@@ -2,10 +2,9 @@
 // @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
-import { OrganizationId } from "@bitwarden/common/types/guid";
-
 import { EncryptService } from "../../platform/abstractions/encrypt.service";
 import { EncString } from "../../platform/models/domain/enc-string";
+import { OrganizationId } from "../../types/guid";
 import { OrgKey } from "../../types/key";
 import { DataPacker } from "../state/data-packer.abstraction";
 
diff --git a/libs/common/src/tools/cryptography/user-encryptor.abstraction.ts b/libs/common/src/tools/cryptography/user-encryptor.abstraction.ts
index d63a5e908e..6bb0e252af 100644
--- a/libs/common/src/tools/cryptography/user-encryptor.abstraction.ts
+++ b/libs/common/src/tools/cryptography/user-encryptor.abstraction.ts
@@ -2,9 +2,8 @@
 // @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
-import { UserId } from "@bitwarden/common/types/guid";
-
 import { EncString } from "../../platform/models/domain/enc-string";
+import { UserId } from "../../types/guid";
 
 /** An encryption strategy that protects a type's secrets with
  *  user-specific keys. This strategy is bound to a specific user.
diff --git a/libs/common/src/tools/cryptography/user-key-encryptor.ts b/libs/common/src/tools/cryptography/user-key-encryptor.ts
index 15a3a1b6d5..296c33ea1d 100644
--- a/libs/common/src/tools/cryptography/user-key-encryptor.ts
+++ b/libs/common/src/tools/cryptography/user-key-encryptor.ts
@@ -2,10 +2,9 @@
 // @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
-import { UserId } from "@bitwarden/common/types/guid";
-
 import { EncryptService } from "../../platform/abstractions/encrypt.service";
 import { EncString } from "../../platform/models/domain/enc-string";
+import { UserId } from "../../types/guid";
 import { UserKey } from "../../types/key";
 import { DataPacker } from "../state/data-packer.abstraction";
 
diff --git a/libs/common/src/tools/dependencies.ts b/libs/common/src/tools/dependencies.ts
index cdae45bc94..c22e71cff6 100644
--- a/libs/common/src/tools/dependencies.ts
+++ b/libs/common/src/tools/dependencies.ts
@@ -1,7 +1,7 @@
 import { Observable } from "rxjs";
 
-import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
-import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
+import { Policy } from "../admin-console/models/domain/policy";
+import { OrganizationId, UserId } from "../types/guid";
 
 import { OrganizationEncryptor } from "./cryptography/organization-encryptor.abstraction";
 import { UserEncryptor } from "./cryptography/user-encryptor.abstraction";
diff --git a/libs/common/src/tools/integration/integration-context.spec.ts b/libs/common/src/tools/integration/integration-context.spec.ts
index 58115c783c..42581c08de 100644
--- a/libs/common/src/tools/integration/integration-context.spec.ts
+++ b/libs/common/src/tools/integration/integration-context.spec.ts
@@ -1,6 +1,6 @@
 import { mock } from "jest-mock-extended";
 
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { I18nService } from "../../platform/abstractions/i18n.service";
 
 import { IntegrationContext } from "./integration-context";
 import { IntegrationId } from "./integration-id";
diff --git a/libs/common/src/tools/integration/integration-context.ts b/libs/common/src/tools/integration/integration-context.ts
index f30810ff81..40648df680 100644
--- a/libs/common/src/tools/integration/integration-context.ts
+++ b/libs/common/src/tools/integration/integration-context.ts
@@ -1,7 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { I18nService } from "../../platform/abstractions/i18n.service";
+import { Utils } from "../../platform/misc/utils";
 
 import { IntegrationMetadata } from "./integration-metadata";
 import { ApiSettings, IntegrationRequest } from "./rpc";
diff --git a/libs/common/src/tools/integration/rpc/rest-client.spec.ts b/libs/common/src/tools/integration/rpc/rest-client.spec.ts
index e113ab9ff4..9b76d305e6 100644
--- a/libs/common/src/tools/integration/rpc/rest-client.spec.ts
+++ b/libs/common/src/tools/integration/rpc/rest-client.spec.ts
@@ -1,7 +1,7 @@
 import { mock } from "jest-mock-extended";
 
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { ApiService } from "../../../abstractions/api.service";
+import { I18nService } from "../../../platform/abstractions/i18n.service";
 
 import { IntegrationRequest } from "./integration-request";
 import { RestClient } from "./rest-client";
diff --git a/libs/common/src/tools/integration/rpc/rest-client.ts b/libs/common/src/tools/integration/rpc/rest-client.ts
index 287bb4f257..c42244166e 100644
--- a/libs/common/src/tools/integration/rpc/rest-client.ts
+++ b/libs/common/src/tools/integration/rpc/rest-client.ts
@@ -1,7 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { ApiService } from "../../../abstractions/api.service";
+import { I18nService } from "../../../platform/abstractions/i18n.service";
 
 import { IntegrationRequest } from "./integration-request";
 import { JsonRpc } from "./rpc";
diff --git a/libs/common/src/tools/private-classifier.ts b/libs/common/src/tools/private-classifier.ts
index de21f78f1c..58244ae990 100644
--- a/libs/common/src/tools/private-classifier.ts
+++ b/libs/common/src/tools/private-classifier.ts
@@ -2,7 +2,7 @@
 // @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
-import { Classifier } from "@bitwarden/common/tools/state/classifier";
+import { Classifier } from "./state/classifier";
 
 export class PrivateClassifier<Data> implements Classifier<Data, Record<string, never>, Data> {
   constructor(private keys: (keyof Jsonify<Data>)[] = undefined) {}
diff --git a/libs/common/src/tools/public-classifier.ts b/libs/common/src/tools/public-classifier.ts
index e7c8c24ba7..e036ebd1c4 100644
--- a/libs/common/src/tools/public-classifier.ts
+++ b/libs/common/src/tools/public-classifier.ts
@@ -2,7 +2,7 @@
 // @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
-import { Classifier } from "@bitwarden/common/tools/state/classifier";
+import { Classifier } from "./state/classifier";
 
 export class PublicClassifier<Data> implements Classifier<Data, Data, Record<string, never>> {
   constructor(private keys: (keyof Jsonify<Data>)[]) {}
diff --git a/libs/common/src/tools/send/models/domain/send.spec.ts b/libs/common/src/tools/send/models/domain/send.spec.ts
index 408a4ea717..fcc273d41b 100644
--- a/libs/common/src/tools/send/models/domain/send.spec.ts
+++ b/libs/common/src/tools/send/models/domain/send.spec.ts
@@ -1,12 +1,12 @@
 import { mock } from "jest-mock-extended";
 
-import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
-import { UserKey } from "@bitwarden/common/types/key";
 import { KeyService } from "@bitwarden/key-management";
 
 import { makeStaticByteArray, mockEnc } from "../../../../../spec";
 import { EncryptService } from "../../../../platform/abstractions/encrypt.service";
+import { SymmetricCryptoKey } from "../../../../platform/models/domain/symmetric-crypto-key";
 import { ContainerService } from "../../../../platform/services/container.service";
+import { UserKey } from "../../../../types/key";
 import { SendType } from "../../enums/send-type";
 import { SendData } from "../data/send.data";
 
diff --git a/libs/common/src/tools/send/services/send.service.spec.ts b/libs/common/src/tools/send/services/send.service.spec.ts
index ff81430251..662fee02bb 100644
--- a/libs/common/src/tools/send/services/send.service.spec.ts
+++ b/libs/common/src/tools/send/services/send.service.spec.ts
@@ -1,8 +1,6 @@
 import { mock } from "jest-mock-extended";
 import { firstValueFrom, of } from "rxjs";
 
-import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
-import { SelfHostedEnvironment } from "@bitwarden/common/platform/services/default-environment.service";
 import { KeyService } from "@bitwarden/key-management";
 
 import {
@@ -13,12 +11,14 @@ import {
   mockAccountServiceWith,
 } from "../../../../spec";
 import { EncryptService } from "../../../platform/abstractions/encrypt.service";
+import { EnvironmentService } from "../../../platform/abstractions/environment.service";
 import { I18nService } from "../../../platform/abstractions/i18n.service";
 import { KeyGenerationService } from "../../../platform/abstractions/key-generation.service";
 import { Utils } from "../../../platform/misc/utils";
 import { EncString } from "../../../platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
 import { ContainerService } from "../../../platform/services/container.service";
+import { SelfHostedEnvironment } from "../../../platform/services/default-environment.service";
 import { UserId } from "../../../types/guid";
 import { UserKey } from "../../../types/key";
 import { SendType } from "../enums/send-type";
diff --git a/libs/common/src/tools/state/user-state-subject.spec.ts b/libs/common/src/tools/state/user-state-subject.spec.ts
index 6a50a1dd66..8111f6f9f1 100644
--- a/libs/common/src/tools/state/user-state-subject.spec.ts
+++ b/libs/common/src/tools/state/user-state-subject.spec.ts
@@ -1,9 +1,8 @@
 import { BehaviorSubject, of, Subject } from "rxjs";
 
-import { GENERATOR_DISK, UserKeyDefinition } from "@bitwarden/common/platform/state";
-import { UserId } from "@bitwarden/common/types/guid";
-
 import { awaitAsync, FakeSingleUserState, ObservableTracker } from "../../../spec";
+import { GENERATOR_DISK, UserKeyDefinition } from "../../platform/state";
+import { UserId } from "../../types/guid";
 import { UserEncryptor } from "../cryptography/user-encryptor.abstraction";
 import { UserBound } from "../dependencies";
 import { PrivateClassifier } from "../private-classifier";
diff --git a/libs/common/src/tools/state/user-state-subject.ts b/libs/common/src/tools/state/user-state-subject.ts
index d508cf7166..c00560304e 100644
--- a/libs/common/src/tools/state/user-state-subject.ts
+++ b/libs/common/src/tools/state/user-state-subject.ts
@@ -26,10 +26,9 @@ import {
   skip,
 } from "rxjs";
 
-import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
-import { SingleUserState, UserKeyDefinition } from "@bitwarden/common/platform/state";
-import { UserId } from "@bitwarden/common/types/guid";
-
+import { EncString } from "../../platform/models/domain/enc-string";
+import { SingleUserState, UserKeyDefinition } from "../../platform/state";
+import { UserId } from "../../types/guid";
 import { UserEncryptor } from "../cryptography/user-encryptor.abstraction";
 import { UserBound } from "../dependencies";
 import { anyComplete, errorOnChange, ready, withLatestReady } from "../rx";
diff --git a/libs/common/src/vault/abstractions/cipher.service.ts b/libs/common/src/vault/abstractions/cipher.service.ts
index 068b2fc52d..88cd476606 100644
--- a/libs/common/src/vault/abstractions/cipher.service.ts
+++ b/libs/common/src/vault/abstractions/cipher.service.ts
@@ -2,7 +2,6 @@
 // @ts-strict-ignore
 import { Observable } from "rxjs";
 
-import { LocalData } from "@bitwarden/common/vault/models/data/local.data";
 import { UserKeyRotationDataProvider } from "@bitwarden/key-management";
 
 import { UriMatchStrategySetting } from "../../models/domain/domain-service";
@@ -11,6 +10,7 @@ import { CipherId, CollectionId, OrganizationId, UserId } from "../../types/guid
 import { UserKey } from "../../types/key";
 import { CipherType } from "../enums/cipher-type";
 import { CipherData } from "../models/data/cipher.data";
+import { LocalData } from "../models/data/local.data";
 import { Cipher } from "../models/domain/cipher";
 import { Field } from "../models/domain/field";
 import { CipherWithIdRequest } from "../models/request/cipher-with-id.request";
diff --git a/libs/common/src/vault/abstractions/folder/folder-api.service.abstraction.ts b/libs/common/src/vault/abstractions/folder/folder-api.service.abstraction.ts
index 859f2183ed..b95dd35e5e 100644
--- a/libs/common/src/vault/abstractions/folder/folder-api.service.abstraction.ts
+++ b/libs/common/src/vault/abstractions/folder/folder-api.service.abstraction.ts
@@ -1,7 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { UserId } from "@bitwarden/common/types/guid";
 
+import { UserId } from "../../../types/guid";
 import { Folder } from "../../models/domain/folder";
 import { FolderResponse } from "../../models/response/folder.response";
 
diff --git a/libs/common/src/vault/models/domain/cipher.spec.ts b/libs/common/src/vault/models/domain/cipher.spec.ts
index 64df3204ac..dd79da3086 100644
--- a/libs/common/src/vault/models/domain/cipher.spec.ts
+++ b/libs/common/src/vault/models/domain/cipher.spec.ts
@@ -1,8 +1,6 @@
 import { mock } from "jest-mock-extended";
 import { Jsonify } from "type-fest";
 
-import { UserId } from "@bitwarden/common/types/guid";
-
 // FIXME: remove `src` and fix import
 // eslint-disable-next-line no-restricted-imports
 import { KeyService } from "../../../../../key-management/src/abstractions/key.service";
@@ -12,6 +10,7 @@ import { EncryptService } from "../../../platform/abstractions/encrypt.service";
 import { EncString } from "../../../platform/models/domain/enc-string";
 import { ContainerService } from "../../../platform/services/container.service";
 import { InitializerKey } from "../../../platform/services/cryptography/initializer-key";
+import { UserId } from "../../../types/guid";
 import { CipherService } from "../../abstractions/cipher.service";
 import { FieldType, SecureNoteType } from "../../enums";
 import { CipherRepromptType } from "../../enums/cipher-reprompt-type";
diff --git a/libs/common/src/vault/models/domain/ssh-key.ts b/libs/common/src/vault/models/domain/ssh-key.ts
index 9ce16fe455..b4df172e54 100644
--- a/libs/common/src/vault/models/domain/ssh-key.ts
+++ b/libs/common/src/vault/models/domain/ssh-key.ts
@@ -2,9 +2,8 @@
 // @ts-strict-ignore
 import { Jsonify } from "type-fest";
 
-import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
-
 import Domain from "../../../platform/models/domain/domain-base";
+import { EncString } from "../../../platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key";
 import { SshKeyData } from "../data/ssh-key.data";
 import { SshKeyView } from "../view/ssh-key.view";
diff --git a/libs/common/src/vault/services/cipher-authorization.service.spec.ts b/libs/common/src/vault/services/cipher-authorization.service.spec.ts
index cccd29ad69..15e8b03bfa 100644
--- a/libs/common/src/vault/services/cipher-authorization.service.spec.ts
+++ b/libs/common/src/vault/services/cipher-authorization.service.spec.ts
@@ -2,10 +2,10 @@ import { mock } from "jest-mock-extended";
 import { firstValueFrom, of } from "rxjs";
 
 import { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
-import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { CollectionId } from "@bitwarden/common/types/guid";
 
+import { OrganizationService } from "../../admin-console/abstractions/organization/organization.service.abstraction";
+import { Organization } from "../../admin-console/models/domain/organization";
+import { CollectionId } from "../../types/guid";
 import { CipherView } from "../models/view/cipher.view";
 
 import {
diff --git a/libs/common/src/vault/services/cipher-authorization.service.ts b/libs/common/src/vault/services/cipher-authorization.service.ts
index 260d1eeece..025d6b1cdc 100644
--- a/libs/common/src/vault/services/cipher-authorization.service.ts
+++ b/libs/common/src/vault/services/cipher-authorization.service.ts
@@ -3,9 +3,9 @@
 import { map, Observable, of, shareReplay, switchMap } from "rxjs";
 
 import { CollectionService } from "@bitwarden/admin-console/common";
-import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { CollectionId } from "@bitwarden/common/types/guid";
 
+import { OrganizationService } from "../../admin-console/abstractions/organization/organization.service.abstraction";
+import { CollectionId } from "../../types/guid";
 import { Cipher } from "../models/domain/cipher";
 import { CipherView } from "../models/view/cipher.view";
 
diff --git a/libs/common/src/vault/services/cipher.service.spec.ts b/libs/common/src/vault/services/cipher.service.spec.ts
index 8ab6a2d3d3..0d6578f165 100644
--- a/libs/common/src/vault/services/cipher.service.spec.ts
+++ b/libs/common/src/vault/services/cipher.service.spec.ts
@@ -1,8 +1,6 @@
 import { mock } from "jest-mock-extended";
 import { BehaviorSubject, map, of } from "rxjs";
 
-import { BulkEncryptService } from "@bitwarden/common/platform/abstractions/bulk-encrypt.service";
-
 // FIXME: remove `src` and fix import
 // eslint-disable-next-line no-restricted-imports
 import {
@@ -17,6 +15,7 @@ import { SearchService } from "../../abstractions/search.service";
 import { AutofillSettingsService } from "../../autofill/services/autofill-settings.service";
 import { DomainSettingsService } from "../../autofill/services/domain-settings.service";
 import { UriMatchStrategy } from "../../models/domain/domain-service";
+import { BulkEncryptService } from "../../platform/abstractions/bulk-encrypt.service";
 import { ConfigService } from "../../platform/abstractions/config/config.service";
 import { EncryptService } from "../../platform/abstractions/encrypt.service";
 import { I18nService } from "../../platform/abstractions/i18n.service";
diff --git a/libs/common/src/vault/services/cipher.service.ts b/libs/common/src/vault/services/cipher.service.ts
index 12712f169a..fe946fbb06 100644
--- a/libs/common/src/vault/services/cipher.service.ts
+++ b/libs/common/src/vault/services/cipher.service.ts
@@ -14,21 +14,20 @@ import {
 } from "rxjs";
 import { SemVer } from "semver";
 
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { BulkEncryptService } from "@bitwarden/common/platform/abstractions/bulk-encrypt.service";
-
 // FIXME: remove `src` and fix import
 // eslint-disable-next-line no-restricted-imports
 import { KeyService } from "../../../../key-management/src/abstractions/key.service";
 import { ApiService } from "../../abstractions/api.service";
 import { SearchService } from "../../abstractions/search.service";
+import { AccountService } from "../../auth/abstractions/account.service";
 import { AutofillSettingsServiceAbstraction } from "../../autofill/services/autofill-settings.service";
 import { DomainSettingsService } from "../../autofill/services/domain-settings.service";
+import { FeatureFlag } from "../../enums/feature-flag.enum";
 import { UriMatchStrategySetting } from "../../models/domain/domain-service";
 import { ErrorResponse } from "../../models/response/error.response";
 import { ListResponse } from "../../models/response/list.response";
 import { View } from "../../models/view/view";
+import { BulkEncryptService } from "../../platform/abstractions/bulk-encrypt.service";
 import { ConfigService } from "../../platform/abstractions/config/config.service";
 import { EncryptService } from "../../platform/abstractions/encrypt.service";
 import { I18nService } from "../../platform/abstractions/i18n.service";
diff --git a/libs/common/src/vault/services/folder/folder-api.service.ts b/libs/common/src/vault/services/folder/folder-api.service.ts
index 2483139366..9d434cc646 100644
--- a/libs/common/src/vault/services/folder/folder-api.service.ts
+++ b/libs/common/src/vault/services/folder/folder-api.service.ts
@@ -1,6 +1,5 @@
-import { UserId } from "@bitwarden/common/types/guid";
-
 import { ApiService } from "../../../abstractions/api.service";
+import { UserId } from "../../../types/guid";
 import { FolderApiServiceAbstraction } from "../../../vault/abstractions/folder/folder-api.service.abstraction";
 import { InternalFolderService } from "../../../vault/abstractions/folder/folder.service.abstraction";
 import { FolderData } from "../../../vault/models/data/folder.data";
diff --git a/libs/common/src/vault/services/folder/folder.service.ts b/libs/common/src/vault/services/folder/folder.service.ts
index fe77806877..c21a92fd89 100644
--- a/libs/common/src/vault/services/folder/folder.service.ts
+++ b/libs/common/src/vault/services/folder/folder.service.ts
@@ -2,9 +2,8 @@
 // @ts-strict-ignore
 import { Observable, Subject, firstValueFrom, map, shareReplay, switchMap, merge } from "rxjs";
 
-import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
-
+import { EncryptService } from ".././../../platform/abstractions/encrypt.service";
+import { Utils } from ".././../../platform/misc/utils";
 // FIXME: remove `src` and fix import
 // eslint-disable-next-line no-restricted-imports
 import { KeyService } from "../../../../../key-management/src/abstractions/key.service";
diff --git a/libs/common/tsconfig.json b/libs/common/tsconfig.json
index 128511ee41..c28b60e28f 100644
--- a/libs/common/tsconfig.json
+++ b/libs/common/tsconfig.json
@@ -4,6 +4,7 @@
     "paths": {
       "@bitwarden/admin-console/common": ["../admin-console/src/common"],
       "@bitwarden/auth/common": ["../auth/src/common"],
+      // TODO: Remove once circular dependencies in admin-console, auth and key-management are resolved
       "@bitwarden/common/*": ["../common/src/*"],
       "@bitwarden/components": ["../components/src"],
       "@bitwarden/key-management": ["../key-management/src"],

From 8e9502943977bc724429fbebaf2f27fa4f57aff5 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Tue, 14 Jan 2025 16:20:18 +0100
Subject: [PATCH 079/150] [PM-16985] Fix biometrics not working in firefox or
 windows (#12833)

* Fix biometrics not working in firefox or windows

* Remove logs

* Update badge after biometric unlock

* Add removal todo note

* Remove debug logging

* Fix type warnings

* Fix userkey typing in background biometrics service

* Simplify types for userkey in foreground-browser-biometrics and runtime.background.ts
---
 .../settings/account-security.component.ts    | 11 +++++-
 .../browser/src/background/main.background.ts | 12 ++++---
 .../background-browser-biometrics.service.ts  | 34 +++++++++++++++++--
 .../foreground-browser-biometrics.ts          |  5 ++-
 4 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/apps/browser/src/auth/popup/settings/account-security.component.ts b/apps/browser/src/auth/popup/settings/account-security.component.ts
index 3b1727f89a..1a64d860e4 100644
--- a/apps/browser/src/auth/popup/settings/account-security.component.ts
+++ b/apps/browser/src/auth/popup/settings/account-security.component.ts
@@ -507,7 +507,16 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
 
     const biometricsPromise = async () => {
       try {
-        const result = await this.biometricsService.authenticateWithBiometrics();
+        const userId = await firstValueFrom(
+          this.accountService.activeAccount$.pipe(map((a) => a.id)),
+        );
+        let result = false;
+        try {
+          const userKey = await this.biometricsService.unlockWithBiometricsForUser(userId);
+          result = await this.keyService.validateUserKey(userKey, userId);
+        } catch (e) {
+          result = false;
+        }
 
         // prevent duplicate dialog
         biometricsResponseReceived = true;
diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index 4bec3d6cc0..98f3867e5f 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -632,11 +632,6 @@ export default class MainBackground {
 
     this.i18nService = new I18nService(BrowserApi.getUILanguage(), this.globalStateProvider);
 
-    this.biometricsService = new BackgroundBrowserBiometricsService(
-      runtimeNativeMessagingBackground,
-      this.logService,
-    );
-
     this.kdfConfigService = new DefaultKdfConfigService(this.stateProvider);
 
     this.pinService = new PinService(
@@ -665,6 +660,13 @@ export default class MainBackground {
       this.kdfConfigService,
     );
 
+    this.biometricsService = new BackgroundBrowserBiometricsService(
+      runtimeNativeMessagingBackground,
+      this.logService,
+      this.keyService,
+      this.biometricStateService,
+    );
+
     this.appIdService = new AppIdService(this.storageService, this.logService);
 
     this.userDecryptionOptionsService = new UserDecryptionOptionsService(this.stateProvider);
diff --git a/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts b/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
index 8e6fc562d1..a0f54c58a6 100644
--- a/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
+++ b/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
@@ -1,9 +1,17 @@
 import { Injectable } from "@angular/core";
 
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { UserId } from "@bitwarden/common/types/guid";
 import { UserKey } from "@bitwarden/common/types/key";
-import { BiometricsService, BiometricsCommands, BiometricsStatus } from "@bitwarden/key-management";
+import {
+  BiometricsService,
+  BiometricsCommands,
+  BiometricsStatus,
+  KeyService,
+  BiometricStateService,
+} from "@bitwarden/key-management";
 
 import { NativeMessagingBackground } from "../../background/nativeMessaging.background";
 import { BrowserApi } from "../../platform/browser/browser-api";
@@ -13,6 +21,8 @@ export class BackgroundBrowserBiometricsService extends BiometricsService {
   constructor(
     private nativeMessagingBackground: () => NativeMessagingBackground,
     private logService: LogService,
+    private keyService: KeyService,
+    private biometricStateService: BiometricStateService,
   ) {
     super();
   }
@@ -74,12 +84,20 @@ export class BackgroundBrowserBiometricsService extends BiometricsService {
     try {
       await this.ensureConnected();
 
+      // todo remove after 2025.3
       if (this.nativeMessagingBackground().isConnectedToOutdatedDesktopClient) {
         const response = await this.nativeMessagingBackground().callCommand({
           command: BiometricsCommands.Unlock,
         });
         if (response.response == "unlocked") {
-          return response.userKeyB64;
+          const decodedUserkey = Utils.fromB64ToArray(response.userKeyB64);
+          const userKey = new SymmetricCryptoKey(decodedUserkey) as UserKey;
+          if (await this.keyService.validateUserKey(userKey, userId)) {
+            await this.biometricStateService.setBiometricUnlockEnabled(true);
+            await this.biometricStateService.setFingerprintValidated(true);
+            this.keyService.setUserKey(userKey, userId);
+            return userKey;
+          }
         } else {
           return null;
         }
@@ -89,7 +107,15 @@ export class BackgroundBrowserBiometricsService extends BiometricsService {
           userId: userId,
         });
         if (response.response) {
-          return response.userKeyB64;
+          // In case the requesting foreground context dies (popup), the userkey should still be set, so the user is unlocked / the setting should be enabled
+          const decodedUserkey = Utils.fromB64ToArray(response.userKeyB64);
+          const userKey = new SymmetricCryptoKey(decodedUserkey) as UserKey;
+          if (await this.keyService.validateUserKey(userKey, userId)) {
+            await this.biometricStateService.setBiometricUnlockEnabled(true);
+            await this.biometricStateService.setFingerprintValidated(true);
+            this.keyService.setUserKey(userKey, userId);
+            return userKey;
+          }
         } else {
           return null;
         }
@@ -98,6 +124,8 @@ export class BackgroundBrowserBiometricsService extends BiometricsService {
       this.logService.info("Biometric unlock for user failed", e);
       throw new Error("Biometric unlock failed");
     }
+
+    return null;
   }
 
   async getBiometricsStatusForUser(id: UserId): Promise<BiometricsStatus> {
diff --git a/apps/browser/src/key-management/biometrics/foreground-browser-biometrics.ts b/apps/browser/src/key-management/biometrics/foreground-browser-biometrics.ts
index 0235ad5bd9..43cc25e4da 100644
--- a/apps/browser/src/key-management/biometrics/foreground-browser-biometrics.ts
+++ b/apps/browser/src/key-management/biometrics/foreground-browser-biometrics.ts
@@ -1,4 +1,3 @@
-import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { UserId } from "@bitwarden/common/types/guid";
 import { UserKey } from "@bitwarden/common/types/key";
 import { BiometricsCommands, BiometricsService, BiometricsStatus } from "@bitwarden/key-management";
@@ -29,13 +28,13 @@ export class ForegroundBrowserBiometricsService extends BiometricsService {
 
   async unlockWithBiometricsForUser(userId: UserId): Promise<UserKey | null> {
     const response = await BrowserApi.sendMessageWithResponse<{
-      result: string;
+      result: UserKey;
       error: string;
     }>(BiometricsCommands.UnlockWithBiometricsForUser, { userId });
     if (!response.result) {
       return null;
     }
-    return SymmetricCryptoKey.fromString(response.result) as UserKey;
+    return response.result;
   }
 
   async getBiometricsStatusForUser(id: UserId): Promise<BiometricsStatus> {

From e568a7a812d3dee9509f7797a25928f6ce2a6b34 Mon Sep 17 00:00:00 2001
From: Victoria League <vleague@bitwarden.com>
Date: Tue, 14 Jan 2025 11:03:58 -0500
Subject: [PATCH 080/150] [CL-524] Ignore kitchen sink virtual scroll story
 (#12858)

---
 .../components/dialog-virtual-scroll-block.component.ts     | 2 +-
 .../src/stories/kitchen-sink/kitchen-sink.stories.ts        | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/libs/components/src/stories/kitchen-sink/components/dialog-virtual-scroll-block.component.ts b/libs/components/src/stories/kitchen-sink/components/dialog-virtual-scroll-block.component.ts
index 02b49a3e91..7709506f05 100644
--- a/libs/components/src/stories/kitchen-sink/components/dialog-virtual-scroll-block.component.ts
+++ b/libs/components/src/stories/kitchen-sink/components/dialog-virtual-scroll-block.component.ts
@@ -12,7 +12,7 @@ import { TableDataSource, TableModule } from "../../../table";
   imports: [DialogModule, IconButtonModule, SectionComponent, TableModule, ScrollingModule],
   template: /*html*/ `<bit-section>
     <cdk-virtual-scroll-viewport scrollWindow itemSize="47">
-      <bit-table [dataSource]="dataSource" data-chromatic="ignore">
+      <bit-table [dataSource]="dataSource">
         <ng-container header>
           <tr>
             <th bitCell bitSortable="id" default>Id</th>
diff --git a/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts b/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts
index 44080e2904..a90597c171 100644
--- a/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts
+++ b/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts
@@ -196,4 +196,10 @@ export const VirtualScrollBlockingDialog: Story = {
 
     await userEvent.click(dialogButton);
   },
+  parameters: {
+    chromatic: {
+      // TODO CL-524 fix flaky story (number of virtual scroll rows is inconsistent)
+      disableSnapshot: true,
+    },
+  },
 };

From 62e879940c439d40263c270371e58573cc4bcd04 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 14 Jan 2025 11:23:59 -0500
Subject: [PATCH 081/150] [deps] SM: Update typescript-eslint monorepo to v8
 (major) (#10601)

* [deps] SM: Update typescript-eslint monorepo to v8

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Hinton <hinton@users.noreply.github.com>
Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
---
 .eslintrc.json                                |   1 +
 apps/browser/postcss.config.js                |   2 +-
 .../auto-submit-login.background.spec.ts      |   4 +
 .../content/auto-submit-login.spec.ts         |   2 +
 .../content/components/buttons/edit-button.ts |   2 +
 .../content/components/cipher/types.ts        |   4 +
 .../content/content-message-handler.spec.ts   |   2 +
 .../trigger-autofill-script-injection.spec.ts |   2 +
 ...trap-autofill-overlay-button.deprecated.ts |   2 +
 ...tstrap-autofill-overlay-list.deprecated.ts |   2 +
 .../content/fido2-content-script.spec.ts      |  16 ++
 .../fido2-page-script-append.mv2.spec.ts      |   6 +
 .../fido2/content/fido2-page-script.ts        |   2 +
 ...do2-page-script.webauthn-supported.spec.ts |   6 +
 ...2-page-script.webauthn-unsupported.spec.ts |   2 +
 apps/browser/src/autofill/notification/bar.ts |   2 +
 .../bootstrap-autofill-inline-menu-button.ts  |   2 +
 .../bootstrap-autofill-inline-menu-list.ts    |   2 +
 ...ootstrap-autofill-inline-menu-container.ts |   2 +
 .../autofill-overlay-content.service.ts       |   2 +
 .../autofill/services/dom-query.service.ts    |   2 +
 .../background/nativeMessaging.background.ts  |   2 +
 .../background-browser-biometrics.service.ts  |   4 +
 apps/browser/src/platform/flags.ts            |   2 -
 .../offscreen-document.spec.ts                |   2 +
 ...cal-backed-session-storage.service.spec.ts |   4 +
 .../local-backed-session-storage.service.ts   |   2 +
 .../sdk/browser-sdk-client-factory.ts         |   2 +
 apps/browser/src/popup/main.ts                |   2 +
 .../content/lp-fileless-importer.spec.ts      |   2 +
 ...-import-download-script-append.mv2.spec.ts |   2 +
 .../lp-suppress-import-download.spec.ts       |   2 +
 .../admin-console/commands/share.command.ts   |   2 +
 apps/cli/src/auth/commands/login.command.ts   |   4 +
 apps/cli/src/commands/edit.command.ts         |   2 +
 apps/cli/src/platform/flags.ts                |   2 -
 .../node-env-secure-storage.service.ts        |   4 +
 .../src/tools/send/commands/create.command.ts |   2 +
 .../src/tools/send/commands/edit.command.ts   |   2 +
 .../tools/send/commands/receive.command.ts    |   2 +
 apps/cli/src/vault/create.command.ts          |   2 +
 apps/desktop/config/config.js                 |   2 +
 apps/desktop/postcss.config.js                |   2 +-
 apps/desktop/scripts/after-pack.js            |   2 +-
 apps/desktop/scripts/after-sign.js            |   2 +-
 apps/desktop/scripts/build-macos-extension.js |   2 +-
 apps/desktop/scripts/start.js                 |   2 +-
 apps/desktop/sign.js                          |   2 +-
 apps/desktop/src/app/app-routing.module.ts    |   1 +
 apps/desktop/src/app/main.ts                  |   2 +
 .../login/desktop-login-component.service.ts  |   2 +
 .../src/auth/login/login-v1.component.ts      |   2 +
 .../desktop/src/main/native-messaging.main.ts |   2 +
 apps/desktop/src/platform/flags.ts            |   2 -
 .../biometric-message-handler.service.ts      |   4 +
 .../duckduckgo-message-handler.service.ts     |   4 +
 .../encrypted-message-handler.service.ts      |   4 +
 apps/web/postcss.config.js                    |   2 +-
 .../common/base.events.component.ts           |   2 +
 .../manage/entity-events.component.ts         |   2 +
 ...families-for-enterprise-setup.component.ts |   2 +
 .../app/platform/web-sdk-client-factory.ts    |   2 +
 .../tools/send/send-access-file.component.ts  |   2 +
 .../folder-add-edit.component.ts              |   2 +
 apps/web/src/connectors/captcha.ts            |   6 +
 apps/web/src/connectors/duo-redirect.ts       |   2 +
 apps/web/src/connectors/sso.ts                |   2 +
 apps/web/src/connectors/webauthn-fallback.ts  |   6 +
 apps/web/src/connectors/webauthn.ts           |   6 +
 apps/web/src/utils/flags.ts                   |   2 -
 .../device-approvals.component.ts             |   2 +
 .../services/sm-porting-api.service.ts        |   2 +
 .../src/auth/components/login-v1.component.ts |   2 +
 .../vault/components/attachments.component.ts |   4 +
 .../src/vault/components/view.component.ts    |   2 +
 .../login-decryption-options.component.ts     |   2 +
 .../auth/src/angular/login/login.component.ts |   2 +
 .../decode-jwt-token-to-json.utility.ts       |   4 +
 .../device-trust.service.implementation.ts    |   2 +
 .../user-verification.service.ts              |   4 +
 libs/common/src/platform/misc/flags.ts        |   2 -
 libs/common/src/platform/misc/utils.ts        |   4 +
 .../models/domain/domain-base.spec.ts         |   4 +
 .../src/platform/models/domain/domain-base.ts |   2 +-
 .../src/platform/models/domain/enc-string.ts  |   6 +
 ...ve-autofill-settings-to-state-providers.ts |   2 +
 ...ard-to-autofill-settings-state-provider.ts |   2 +
 ...move-domain-settings-to-state-providers.ts |   2 +
 .../src/tools/send/models/domain/send.ts      |   2 +
 .../src/vault/icon/build-cipher-icon.ts       |   2 +
 .../src/vault/models/domain/attachment.ts     |   2 +
 .../src/vault/models/view/cipher.view.ts      |   2 +
 .../src/vault/models/view/login-uri.view.ts   |   2 +
 .../src/a11y/a11y-grid.directive.ts           |   2 +
 .../src/navigation/nav-group.component.ts     |   2 +
 .../src/services/import.service.spec.ts       |   2 +-
 libs/key-management/src/key.service.ts        |   2 +
 libs/shared/jest.config.angular.js            |   2 +-
 ...edit-custom-field-dialog.component.spec.ts |   2 +
 .../download-attachment.component.ts          |   2 +
 package-lock.json                             | 192 ++++++++++--------
 package.json                                  |   4 +-
 tsconfig.eslint.json                          |   1 +
 103 files changed, 355 insertions(+), 106 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index c10904c867..3fd6dec3d7 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -56,6 +56,7 @@
         "@typescript-eslint/no-floating-promises": "error",
         "@typescript-eslint/no-misused-promises": ["error", { "checksVoidReturn": false }],
         "@typescript-eslint/no-this-alias": ["error", { "allowedNames": ["self"] }],
+        "@typescript-eslint/no-unused-expressions": ["error", { "allowTernary": true }],
         "@typescript-eslint/no-unused-vars": ["error", { "args": "none" }],
         "no-console": "error",
         "import/no-unresolved": "off", // TODO: Look into turning off once each package is an actual package.
diff --git a/apps/browser/postcss.config.js b/apps/browser/postcss.config.js
index c4513687e8..83e237f06e 100644
--- a/apps/browser/postcss.config.js
+++ b/apps/browser/postcss.config.js
@@ -1,4 +1,4 @@
-/* eslint-disable no-undef */
+/* eslint-disable no-undef, @typescript-eslint/no-require-imports */
 module.exports = {
   plugins: [require("tailwindcss"), require("autoprefixer"), require("postcss-nested")],
 };
diff --git a/apps/browser/src/autofill/background/auto-submit-login.background.spec.ts b/apps/browser/src/autofill/background/auto-submit-login.background.spec.ts
index 73f936bb59..a300ac0866 100644
--- a/apps/browser/src/autofill/background/auto-submit-login.background.spec.ts
+++ b/apps/browser/src/autofill/background/auto-submit-login.background.spec.ts
@@ -453,12 +453,16 @@ describe("AutoSubmitLoginBackground", () => {
 
         sendMockExtensionMessage({ command: "triggerAutoSubmitLogin" }, sender);
 
+        // FIXME: Remove when updating file. Eslint update
+        // eslint-disable-next-line @typescript-eslint/no-unused-expressions
         expect(autofillService.doAutoFillOnTab).not.toHaveBeenCalled;
       });
 
       it("skips acting on messages whose command does not have a registered handler", () => {
         sendMockExtensionMessage({ command: "someInvalidCommand" }, sender);
 
+        // FIXME: Remove when updating file. Eslint update
+        // eslint-disable-next-line @typescript-eslint/no-unused-expressions
         expect(autofillService.doAutoFillOnTab).not.toHaveBeenCalled;
       });
 
diff --git a/apps/browser/src/autofill/content/auto-submit-login.spec.ts b/apps/browser/src/autofill/content/auto-submit-login.spec.ts
index ff1dbd4e94..d70fc1e744 100644
--- a/apps/browser/src/autofill/content/auto-submit-login.spec.ts
+++ b/apps/browser/src/autofill/content/auto-submit-login.spec.ts
@@ -46,6 +46,8 @@ describe("AutoSubmitLogin content script", () => {
   beforeEach(() => {
     jest.useFakeTimers();
     setupEnvironmentDefaults();
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     require("./auto-submit-login");
   });
 
diff --git a/apps/browser/src/autofill/content/components/buttons/edit-button.ts b/apps/browser/src/autofill/content/components/buttons/edit-button.ts
index 695cbfd3b9..cacd2b59f0 100644
--- a/apps/browser/src/autofill/content/components/buttons/edit-button.ts
+++ b/apps/browser/src/autofill/content/components/buttons/edit-button.ts
@@ -23,6 +23,8 @@ export function EditButton({
       title=${buttonText}
       class=${editButtonStyles({ disabled, theme })}
       @click=${(event: Event) => {
+        // FIXME: Remove when updating file. Eslint update
+        // eslint-disable-next-line @typescript-eslint/no-unused-expressions
         !disabled && buttonAction(event);
       }}
     >
diff --git a/apps/browser/src/autofill/content/components/cipher/types.ts b/apps/browser/src/autofill/content/components/cipher/types.ts
index 24f528c524..acdee75657 100644
--- a/apps/browser/src/autofill/content/components/cipher/types.ts
+++ b/apps/browser/src/autofill/content/components/cipher/types.ts
@@ -1,3 +1,5 @@
+// FIXME: Remove when updating file. Eslint update
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const CipherTypes = {
   Login: 1,
   SecureNote: 2,
@@ -7,6 +9,8 @@ const CipherTypes = {
 
 type CipherType = (typeof CipherTypes)[keyof typeof CipherTypes];
 
+// FIXME: Remove when updating file. Eslint update
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const CipherRepromptTypes = {
   None: 0,
   Password: 1,
diff --git a/apps/browser/src/autofill/content/content-message-handler.spec.ts b/apps/browser/src/autofill/content/content-message-handler.spec.ts
index 226fcb4bd6..a37a2e0767 100644
--- a/apps/browser/src/autofill/content/content-message-handler.spec.ts
+++ b/apps/browser/src/autofill/content/content-message-handler.spec.ts
@@ -19,6 +19,8 @@ describe("ContentMessageHandler", () => {
   );
 
   beforeEach(() => {
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     require("./content-message-handler");
   });
 
diff --git a/apps/browser/src/autofill/content/trigger-autofill-script-injection.spec.ts b/apps/browser/src/autofill/content/trigger-autofill-script-injection.spec.ts
index 1ad985bc8e..317f63e756 100644
--- a/apps/browser/src/autofill/content/trigger-autofill-script-injection.spec.ts
+++ b/apps/browser/src/autofill/content/trigger-autofill-script-injection.spec.ts
@@ -6,6 +6,8 @@ describe("TriggerAutofillScriptInjection", () => {
 
   describe("init", () => {
     it("sends a message to the extension background", () => {
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-require-imports
       require("../content/trigger-autofill-script-injection");
 
       expect(chrome.runtime.sendMessage).toHaveBeenCalledWith({
diff --git a/apps/browser/src/autofill/deprecated/overlay/pages/button/bootstrap-autofill-overlay-button.deprecated.ts b/apps/browser/src/autofill/deprecated/overlay/pages/button/bootstrap-autofill-overlay-button.deprecated.ts
index fde98a58a5..fd6a79733c 100644
--- a/apps/browser/src/autofill/deprecated/overlay/pages/button/bootstrap-autofill-overlay-button.deprecated.ts
+++ b/apps/browser/src/autofill/deprecated/overlay/pages/button/bootstrap-autofill-overlay-button.deprecated.ts
@@ -2,6 +2,8 @@ import { AutofillOverlayElement } from "../../../../enums/autofill-overlay.enum"
 
 import AutofillOverlayButton from "./autofill-overlay-button.deprecated";
 
+// FIXME: Remove when updating file. Eslint update
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 require("./legacy-button.scss");
 
 (function () {
diff --git a/apps/browser/src/autofill/deprecated/overlay/pages/list/bootstrap-autofill-overlay-list.deprecated.ts b/apps/browser/src/autofill/deprecated/overlay/pages/list/bootstrap-autofill-overlay-list.deprecated.ts
index 714ccbfbee..5d587bd429 100644
--- a/apps/browser/src/autofill/deprecated/overlay/pages/list/bootstrap-autofill-overlay-list.deprecated.ts
+++ b/apps/browser/src/autofill/deprecated/overlay/pages/list/bootstrap-autofill-overlay-list.deprecated.ts
@@ -2,6 +2,8 @@ import { AutofillOverlayElement } from "../../../../enums/autofill-overlay.enum"
 
 import AutofillOverlayList from "./autofill-overlay-list.deprecated";
 
+// FIXME: Remove when updating file. Eslint update
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 require("./legacy-list.scss");
 
 (function () {
diff --git a/apps/browser/src/autofill/fido2/content/fido2-content-script.spec.ts b/apps/browser/src/autofill/fido2/content/fido2-content-script.spec.ts
index 94bef354a7..8885ed6299 100644
--- a/apps/browser/src/autofill/fido2/content/fido2-content-script.spec.ts
+++ b/apps/browser/src/autofill/fido2/content/fido2-content-script.spec.ts
@@ -60,6 +60,8 @@ describe("Fido2 Content Script", () => {
   chrome.runtime.connect = jest.fn(() => portSpy);
 
   it("destroys the messenger when the port is disconnected", () => {
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     require("./fido2-content-script");
 
     triggerPortOnDisconnectEvent(portSpy);
@@ -75,6 +77,8 @@ describe("Fido2 Content Script", () => {
     const mockResult = { credentialId: "mock" } as CreateCredentialResult;
     jest.spyOn(chrome.runtime, "sendMessage").mockResolvedValue(mockResult);
 
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     require("./fido2-content-script");
 
     const response = await messenger.handler!(message, new AbortController());
@@ -99,6 +103,8 @@ describe("Fido2 Content Script", () => {
       data: mock<InsecureCreateCredentialParams>(),
     });
 
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     require("./fido2-content-script");
 
     await messenger.handler!(message, new AbortController());
@@ -121,6 +127,8 @@ describe("Fido2 Content Script", () => {
     const abortController = new AbortController();
     const abortSpy = jest.spyOn(abortController.signal, "removeEventListener");
 
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     require("./fido2-content-script");
 
     await messenger.handler!(message, abortController);
@@ -141,6 +149,8 @@ describe("Fido2 Content Script", () => {
         abortController.abort();
       });
 
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     require("./fido2-content-script");
 
     await messenger.handler!(message, abortController);
@@ -161,6 +171,8 @@ describe("Fido2 Content Script", () => {
     const abortController = new AbortController();
     jest.spyOn(chrome.runtime, "sendMessage").mockResolvedValue({ error: errorMessage });
 
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     require("./fido2-content-script");
     const result = messenger.handler!(message, abortController);
 
@@ -175,6 +187,8 @@ describe("Fido2 Content Script", () => {
       contentType: "application/json",
     }));
 
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     require("./fido2-content-script");
 
     expect(messengerForDOMCommunicationSpy).not.toHaveBeenCalled();
@@ -193,6 +207,8 @@ describe("Fido2 Content Script", () => {
       },
     }));
 
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     require("./fido2-content-script");
 
     expect(messengerForDOMCommunicationSpy).not.toHaveBeenCalled();
diff --git a/apps/browser/src/autofill/fido2/content/fido2-page-script-append.mv2.spec.ts b/apps/browser/src/autofill/fido2/content/fido2-page-script-append.mv2.spec.ts
index 6b9b41b5aa..69e17d26fe 100644
--- a/apps/browser/src/autofill/fido2/content/fido2-page-script-append.mv2.spec.ts
+++ b/apps/browser/src/autofill/fido2/content/fido2-page-script-append.mv2.spec.ts
@@ -22,6 +22,8 @@ describe("FIDO2 page-script for manifest v2", () => {
   it("skips appending the `page-script.js` file if the document contentType is not `text/html`", () => {
     Object.defineProperty(window.document, "contentType", { value: "text/plain", writable: true });
 
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     require("./fido2-page-script-append.mv2");
 
     expect(window.document.createElement).not.toHaveBeenCalled();
@@ -33,6 +35,8 @@ describe("FIDO2 page-script for manifest v2", () => {
       return node;
     });
 
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     require("./fido2-page-script-append.mv2");
 
     expect(window.document.createElement).toHaveBeenCalledWith("script");
@@ -48,6 +52,8 @@ describe("FIDO2 page-script for manifest v2", () => {
       return node;
     });
 
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     require("./fido2-page-script-append.mv2");
 
     expect(window.document.createElement).toHaveBeenCalledWith("script");
diff --git a/apps/browser/src/autofill/fido2/content/fido2-page-script.ts b/apps/browser/src/autofill/fido2/content/fido2-page-script.ts
index fd033090cd..4c1761c37b 100644
--- a/apps/browser/src/autofill/fido2/content/fido2-page-script.ts
+++ b/apps/browser/src/autofill/fido2/content/fido2-page-script.ts
@@ -267,6 +267,8 @@ import { Messenger } from "./messaging/messenger";
 
       clearWaitForFocus();
       void messenger.destroy();
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       /** empty */
     }
diff --git a/apps/browser/src/autofill/fido2/content/fido2-page-script.webauthn-supported.spec.ts b/apps/browser/src/autofill/fido2/content/fido2-page-script.webauthn-supported.spec.ts
index 31e8c941e8..f1aec69193 100644
--- a/apps/browser/src/autofill/fido2/content/fido2-page-script.webauthn-supported.spec.ts
+++ b/apps/browser/src/autofill/fido2/content/fido2-page-script.webauthn-supported.spec.ts
@@ -55,6 +55,8 @@ describe("Fido2 page script with native WebAuthn support", () => {
   setupMockedWebAuthnSupport();
 
   beforeAll(() => {
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     require("./fido2-page-script");
   });
 
@@ -166,6 +168,8 @@ describe("Fido2 page script with native WebAuthn support", () => {
         contentType: "json/application",
       }));
 
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-require-imports
       require("./fido2-content-script");
 
       expect(Messenger.forDOMCommunication).not.toHaveBeenCalled();
@@ -184,6 +188,8 @@ describe("Fido2 page script with native WebAuthn support", () => {
         },
       }));
 
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-require-imports
       require("./fido2-content-script");
 
       expect(Messenger.forDOMCommunication).not.toHaveBeenCalled();
diff --git a/apps/browser/src/autofill/fido2/content/fido2-page-script.webauthn-unsupported.spec.ts b/apps/browser/src/autofill/fido2/content/fido2-page-script.webauthn-unsupported.spec.ts
index e354453ca5..af1838ec94 100644
--- a/apps/browser/src/autofill/fido2/content/fido2-page-script.webauthn-unsupported.spec.ts
+++ b/apps/browser/src/autofill/fido2/content/fido2-page-script.webauthn-unsupported.spec.ts
@@ -50,6 +50,8 @@ describe("Fido2 page script without native WebAuthn support", () => {
   const mockCreateCredentialsResult = createCreateCredentialResultMock();
   const mockCredentialRequestOptions = createCredentialRequestOptionsMock();
   const mockCredentialAssertResult = createAssertCredentialResultMock();
+  // FIXME: Remove when updating file. Eslint update
+  // eslint-disable-next-line @typescript-eslint/no-require-imports
   require("./fido2-page-script");
 
   afterEach(() => {
diff --git a/apps/browser/src/autofill/notification/bar.ts b/apps/browser/src/autofill/notification/bar.ts
index a4b8ae44b6..2c0ebe8e8e 100644
--- a/apps/browser/src/autofill/notification/bar.ts
+++ b/apps/browser/src/autofill/notification/bar.ts
@@ -15,6 +15,8 @@ import {
   NotificationBarIframeInitData,
 } from "./abstractions/notification-bar";
 
+// FIXME: Remove when updating file. Eslint update
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 require("./bar.scss");
 
 const logService = new ConsoleLogService(false);
diff --git a/apps/browser/src/autofill/overlay/inline-menu/pages/button/bootstrap-autofill-inline-menu-button.ts b/apps/browser/src/autofill/overlay/inline-menu/pages/button/bootstrap-autofill-inline-menu-button.ts
index 0ed14a520c..36ef3897c5 100644
--- a/apps/browser/src/autofill/overlay/inline-menu/pages/button/bootstrap-autofill-inline-menu-button.ts
+++ b/apps/browser/src/autofill/overlay/inline-menu/pages/button/bootstrap-autofill-inline-menu-button.ts
@@ -2,6 +2,8 @@ import { AutofillOverlayElement } from "../../../../enums/autofill-overlay.enum"
 
 import { AutofillInlineMenuButton } from "./autofill-inline-menu-button";
 
+// FIXME: Remove when updating file. Eslint update
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 require("./button.scss");
 
 (function () {
diff --git a/apps/browser/src/autofill/overlay/inline-menu/pages/list/bootstrap-autofill-inline-menu-list.ts b/apps/browser/src/autofill/overlay/inline-menu/pages/list/bootstrap-autofill-inline-menu-list.ts
index c302c50b4a..b46b208b08 100644
--- a/apps/browser/src/autofill/overlay/inline-menu/pages/list/bootstrap-autofill-inline-menu-list.ts
+++ b/apps/browser/src/autofill/overlay/inline-menu/pages/list/bootstrap-autofill-inline-menu-list.ts
@@ -2,6 +2,8 @@ import { AutofillOverlayElement } from "../../../../enums/autofill-overlay.enum"
 
 import { AutofillInlineMenuList } from "./autofill-inline-menu-list";
 
+// FIXME: Remove when updating file. Eslint update
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 require("./list.scss");
 
 (function () {
diff --git a/apps/browser/src/autofill/overlay/inline-menu/pages/menu-container/bootstrap-autofill-inline-menu-container.ts b/apps/browser/src/autofill/overlay/inline-menu/pages/menu-container/bootstrap-autofill-inline-menu-container.ts
index 16d5c29d57..522b968e53 100644
--- a/apps/browser/src/autofill/overlay/inline-menu/pages/menu-container/bootstrap-autofill-inline-menu-container.ts
+++ b/apps/browser/src/autofill/overlay/inline-menu/pages/menu-container/bootstrap-autofill-inline-menu-container.ts
@@ -1,3 +1,5 @@
+// FIXME: Remove when updating file. Eslint update
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 require("./menu-container.scss");
 
 import { AutofillInlineMenuContainer } from "./autofill-inline-menu-container";
diff --git a/apps/browser/src/autofill/services/autofill-overlay-content.service.ts b/apps/browser/src/autofill/services/autofill-overlay-content.service.ts
index 2db08db187..acf0dedde2 100644
--- a/apps/browser/src/autofill/services/autofill-overlay-content.service.ts
+++ b/apps/browser/src/autofill/services/autofill-overlay-content.service.ts
@@ -1417,6 +1417,8 @@ export class AutofillOverlayContentService implements AutofillOverlayContentServ
         url.origin + pathWithoutTrailingSlashAndSearch,
         url.origin + pathWithoutTrailingSlashSearchAndHash,
       ]);
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (_error) {
       return null;
     }
diff --git a/apps/browser/src/autofill/services/dom-query.service.ts b/apps/browser/src/autofill/services/dom-query.service.ts
index 0dbc246b23..16310397a0 100644
--- a/apps/browser/src/autofill/services/dom-query.service.ts
+++ b/apps/browser/src/autofill/services/dom-query.service.ts
@@ -235,6 +235,8 @@ export class DomQueryService implements DomQueryServiceInterface {
     if ((chrome as any).dom?.openOrClosedShadowRoot) {
       try {
         return (chrome as any).dom.openOrClosedShadowRoot(node);
+        // FIXME: Remove when updating file. Eslint update
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
       } catch (error) {
         return null;
       }
diff --git a/apps/browser/src/background/nativeMessaging.background.ts b/apps/browser/src/background/nativeMessaging.background.ts
index c134860f1a..b08f1c8b56 100644
--- a/apps/browser/src/background/nativeMessaging.background.ts
+++ b/apps/browser/src/background/nativeMessaging.background.ts
@@ -342,6 +342,8 @@ export class NativeMessagingBackground {
         };
       }
       this.port.postMessage(msg);
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       this.logService.info(
         "[Native Messaging IPC] Disconnected from Bitwarden Desktop app because of the native port disconnecting.",
diff --git a/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts b/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
index a0f54c58a6..4c4753c3f7 100644
--- a/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
+++ b/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
@@ -75,6 +75,8 @@ export class BackgroundBrowserBiometricsService extends BiometricsService {
         }
       }
       return BiometricsStatus.Available;
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       return BiometricsStatus.DesktopDisconnected;
     }
@@ -142,6 +144,8 @@ export class BackgroundBrowserBiometricsService extends BiometricsService {
           userId: id,
         })
       ).response;
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       return BiometricsStatus.DesktopDisconnected;
     }
diff --git a/apps/browser/src/platform/flags.ts b/apps/browser/src/platform/flags.ts
index 383e982f06..2b1040bcd8 100644
--- a/apps/browser/src/platform/flags.ts
+++ b/apps/browser/src/platform/flags.ts
@@ -11,13 +11,11 @@ import { GroupPolicyEnvironment } from "../admin-console/types/group-policy-envi
 import { BrowserApi } from "./browser/browser-api";
 
 // required to avoid linting errors when there are no flags
-// eslint-disable-next-line @typescript-eslint/ban-types
 export type Flags = {
   accountSwitching?: boolean;
 } & SharedFlags;
 
 // required to avoid linting errors when there are no flags
-// eslint-disable-next-line @typescript-eslint/ban-types
 export type DevFlags = {
   managedEnvironment?: GroupPolicyEnvironment;
 } & SharedDevFlags;
diff --git a/apps/browser/src/platform/offscreen-document/offscreen-document.spec.ts b/apps/browser/src/platform/offscreen-document/offscreen-document.spec.ts
index 4065f2e46d..67fa920d18 100644
--- a/apps/browser/src/platform/offscreen-document/offscreen-document.spec.ts
+++ b/apps/browser/src/platform/offscreen-document/offscreen-document.spec.ts
@@ -8,6 +8,8 @@ describe("OffscreenDocument", () => {
   const browserClipboardServiceReadSpy = jest.spyOn(BrowserClipboardService, "read");
   const consoleErrorSpy = jest.spyOn(console, "error");
 
+  // FIXME: Remove when updating file. Eslint update
+  // eslint-disable-next-line @typescript-eslint/no-require-imports
   require("../offscreen-document/offscreen-document");
 
   describe("init", () => {
diff --git a/apps/browser/src/platform/services/local-backed-session-storage.service.spec.ts b/apps/browser/src/platform/services/local-backed-session-storage.service.spec.ts
index 949ecebde8..4d6a403a18 100644
--- a/apps/browser/src/platform/services/local-backed-session-storage.service.spec.ts
+++ b/apps/browser/src/platform/services/local-backed-session-storage.service.spec.ts
@@ -48,6 +48,8 @@ describe("LocalBackedSessionStorage", () => {
       localStorage.internalStore["session_test"] = encrypted.encryptedString;
       encryptService.decryptToUtf8.mockResolvedValue(JSON.stringify("decrypted"));
       const result = await sut.get("test");
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-expressions
       expect(encryptService.decryptToUtf8).toHaveBeenCalledWith(
         encrypted,
         sessionKey,
@@ -69,6 +71,8 @@ describe("LocalBackedSessionStorage", () => {
       localStorage.internalStore["session_test"] = encrypted.encryptedString;
       encryptService.decryptToUtf8.mockResolvedValue(JSON.stringify("decrypted"));
       const result = await sut.get("test");
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-expressions
       expect(encryptService.decryptToUtf8).toHaveBeenCalledWith(
         encrypted,
         sessionKey,
diff --git a/apps/browser/src/platform/services/local-backed-session-storage.service.ts b/apps/browser/src/platform/services/local-backed-session-storage.service.ts
index bdc0bed80c..900212ddef 100644
--- a/apps/browser/src/platform/services/local-backed-session-storage.service.ts
+++ b/apps/browser/src/platform/services/local-backed-session-storage.service.ts
@@ -198,6 +198,8 @@ export class LocalBackedSessionStorageService
   private compareValues<T>(value1: T, value2: T): boolean {
     try {
       return compareValues(value1, value2);
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       this.logService.error(
         `error comparing values\n${JSON.stringify(value1)}\n${JSON.stringify(value2)}`,
diff --git a/apps/browser/src/platform/services/sdk/browser-sdk-client-factory.ts b/apps/browser/src/platform/services/sdk/browser-sdk-client-factory.ts
index a2f0c78cd5..0499f34a4a 100644
--- a/apps/browser/src/platform/services/sdk/browser-sdk-client-factory.ts
+++ b/apps/browser/src/platform/services/sdk/browser-sdk-client-factory.ts
@@ -17,6 +17,8 @@ const supported = (() => {
         return new WebAssembly.Instance(module) instanceof WebAssembly.Instance;
       }
     }
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
   } catch (e) {
     // ignore
   }
diff --git a/apps/browser/src/popup/main.ts b/apps/browser/src/popup/main.ts
index 8ffe0743bf..dadd7917b9 100644
--- a/apps/browser/src/popup/main.ts
+++ b/apps/browser/src/popup/main.ts
@@ -4,7 +4,9 @@ import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
 import { PopupSizeService } from "../platform/popup/layout/popup-size.service";
 import { BrowserPlatformUtilsService } from "../platform/services/platform-utils/browser-platform-utils.service";
 
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 require("./scss/popup.scss");
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 require("./scss/tailwind.css");
 
 import { AppModule } from "./app.module";
diff --git a/apps/browser/src/tools/content/lp-fileless-importer.spec.ts b/apps/browser/src/tools/content/lp-fileless-importer.spec.ts
index 432754ab91..21fa44b8d3 100644
--- a/apps/browser/src/tools/content/lp-fileless-importer.spec.ts
+++ b/apps/browser/src/tools/content/lp-fileless-importer.spec.ts
@@ -12,6 +12,8 @@ describe("LpFilelessImporter", () => {
   chrome.runtime.connect = jest.fn(() => portSpy);
 
   beforeEach(() => {
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     require("./lp-fileless-importer");
     lpFilelessImporter = (globalThis as any).lpFilelessImporter;
   });
diff --git a/apps/browser/src/tools/content/lp-suppress-import-download-script-append.mv2.spec.ts b/apps/browser/src/tools/content/lp-suppress-import-download-script-append.mv2.spec.ts
index 95b49ea00e..8479235cc1 100644
--- a/apps/browser/src/tools/content/lp-suppress-import-download-script-append.mv2.spec.ts
+++ b/apps/browser/src/tools/content/lp-suppress-import-download-script-append.mv2.spec.ts
@@ -7,6 +7,8 @@ describe("LP Suppress Import Download for Manifest v2", () => {
       return node;
     });
 
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     require("./lp-suppress-import-download-script-append.mv2");
 
     expect(window.document.createElement).toHaveBeenCalledWith("script");
diff --git a/apps/browser/src/tools/content/lp-suppress-import-download.spec.ts b/apps/browser/src/tools/content/lp-suppress-import-download.spec.ts
index bfff378750..ff0ed38159 100644
--- a/apps/browser/src/tools/content/lp-suppress-import-download.spec.ts
+++ b/apps/browser/src/tools/content/lp-suppress-import-download.spec.ts
@@ -10,6 +10,8 @@ describe("LP Suppress Import Download", () => {
     jest.spyOn(Element.prototype, "appendChild");
     jest.spyOn(window, "addEventListener");
 
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     require("./lp-suppress-import-download");
 
     anchor = document.createElement("a");
diff --git a/apps/cli/src/admin-console/commands/share.command.ts b/apps/cli/src/admin-console/commands/share.command.ts
index 5b351efe45..e26d073326 100644
--- a/apps/cli/src/admin-console/commands/share.command.ts
+++ b/apps/cli/src/admin-console/commands/share.command.ts
@@ -34,6 +34,8 @@ export class ShareCommand {
         if (req == null || req.length === 0) {
           return Response.badRequest("You must provide at least one collection id for this item.");
         }
+        // FIXME: Remove when updating file. Eslint update
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
       } catch (e) {
         return Response.badRequest("Error parsing the encoded request data.");
       }
diff --git a/apps/cli/src/auth/commands/login.command.ts b/apps/cli/src/auth/commands/login.command.ts
index 2a3d5d8540..359ed08ca9 100644
--- a/apps/cli/src/auth/commands/login.command.ts
+++ b/apps/cli/src/auth/commands/login.command.ts
@@ -165,6 +165,8 @@ export class LoginCommand {
       if (options.method != null) {
         twoFactorMethod = parseInt(options.method, null);
       }
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       return Response.error("Invalid two-step login method.");
     }
@@ -240,6 +242,8 @@ export class LoginCommand {
         if (twoFactorMethod != null) {
           try {
             selectedProvider = twoFactorProviders.filter((p) => p.type === twoFactorMethod)[0];
+            // FIXME: Remove when updating file. Eslint update
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
           } catch (e) {
             return Response.error("Invalid two-step login method.");
           }
diff --git a/apps/cli/src/commands/edit.command.ts b/apps/cli/src/commands/edit.command.ts
index dd99d03b08..8efb414f5b 100644
--- a/apps/cli/src/commands/edit.command.ts
+++ b/apps/cli/src/commands/edit.command.ts
@@ -57,6 +57,8 @@ export class EditCommand {
       try {
         const reqJson = Buffer.from(requestJson, "base64").toString();
         req = JSON.parse(reqJson);
+        // FIXME: Remove when updating file. Eslint update
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
       } catch (e) {
         return Response.badRequest("Error parsing the encoded request data.");
       }
diff --git a/apps/cli/src/platform/flags.ts b/apps/cli/src/platform/flags.ts
index dc0103e243..a762053da3 100644
--- a/apps/cli/src/platform/flags.ts
+++ b/apps/cli/src/platform/flags.ts
@@ -7,11 +7,9 @@ import {
 } from "@bitwarden/common/platform/misc/flags";
 
 // required to avoid linting errors when there are no flags
-// eslint-disable-next-line @typescript-eslint/ban-types
 export type Flags = {} & SharedFlags;
 
 // required to avoid linting errors when there are no flags
-// eslint-disable-next-line @typescript-eslint/ban-types
 export type DevFlags = {} & SharedDevFlags;
 
 export function flagEnabled(flag: keyof Flags): boolean {
diff --git a/apps/cli/src/platform/services/node-env-secure-storage.service.ts b/apps/cli/src/platform/services/node-env-secure-storage.service.ts
index 5e9fdd26b3..2807509e42 100644
--- a/apps/cli/src/platform/services/node-env-secure-storage.service.ts
+++ b/apps/cli/src/platform/services/node-env-secure-storage.service.ts
@@ -87,6 +87,8 @@ export class NodeEnvSecureStorageService implements AbstractStorageService {
       }
 
       return Utils.fromBufferToB64(decValue);
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       this.logService.info("Decrypt error.");
       return null;
@@ -104,6 +106,8 @@ export class NodeEnvSecureStorageService implements AbstractStorageService {
           }
         }
       }
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       this.logService.info("Session key is invalid.");
     }
diff --git a/apps/cli/src/tools/send/commands/create.command.ts b/apps/cli/src/tools/send/commands/create.command.ts
index eff351be22..a9264c5012 100644
--- a/apps/cli/src/tools/send/commands/create.command.ts
+++ b/apps/cli/src/tools/send/commands/create.command.ts
@@ -49,6 +49,8 @@ export class SendCreateCommand {
         if (req == null) {
           throw new Error("Null request");
         }
+        // FIXME: Remove when updating file. Eslint update
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
       } catch (e) {
         return Response.badRequest("Error parsing the encoded request data.");
       }
diff --git a/apps/cli/src/tools/send/commands/edit.command.ts b/apps/cli/src/tools/send/commands/edit.command.ts
index 11508d5c41..ed719b5831 100644
--- a/apps/cli/src/tools/send/commands/edit.command.ts
+++ b/apps/cli/src/tools/send/commands/edit.command.ts
@@ -41,6 +41,8 @@ export class SendEditCommand {
       try {
         const reqJson = Buffer.from(requestJson, "base64").toString();
         req = SendResponse.fromJson(reqJson);
+        // FIXME: Remove when updating file. Eslint update
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
       } catch (e) {
         return Response.badRequest("Error parsing the encoded request data.");
       }
diff --git a/apps/cli/src/tools/send/commands/receive.command.ts b/apps/cli/src/tools/send/commands/receive.command.ts
index d27ba4f88e..41a6681af5 100644
--- a/apps/cli/src/tools/send/commands/receive.command.ts
+++ b/apps/cli/src/tools/send/commands/receive.command.ts
@@ -47,6 +47,8 @@ export class SendReceiveCommand extends DownloadCommand {
     let urlObject: URL;
     try {
       urlObject = new URL(url);
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       return Response.badRequest("Failed to parse the provided Send url");
     }
diff --git a/apps/cli/src/vault/create.command.ts b/apps/cli/src/vault/create.command.ts
index 13cd666754..a28d070d19 100644
--- a/apps/cli/src/vault/create.command.ts
+++ b/apps/cli/src/vault/create.command.ts
@@ -66,6 +66,8 @@ export class CreateCommand {
         try {
           const reqJson = Buffer.from(requestJson, "base64").toString();
           req = JSON.parse(reqJson);
+          // FIXME: Remove when updating file. Eslint update
+          // eslint-disable-next-line @typescript-eslint/no-unused-vars
         } catch (e) {
           return Response.badRequest("Error parsing the encoded request data.");
         }
diff --git a/apps/desktop/config/config.js b/apps/desktop/config/config.js
index 404295dd0d..30a5c16bb2 100644
--- a/apps/desktop/config/config.js
+++ b/apps/desktop/config/config.js
@@ -32,6 +32,8 @@ function log(configObj) {
 
 function loadConfig(configName) {
   try {
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     return require(`./${configName}.json`);
   } catch (e) {
     if (e instanceof Error && e.code === "MODULE_NOT_FOUND") {
diff --git a/apps/desktop/postcss.config.js b/apps/desktop/postcss.config.js
index c4513687e8..c39e7ea035 100644
--- a/apps/desktop/postcss.config.js
+++ b/apps/desktop/postcss.config.js
@@ -1,4 +1,4 @@
-/* eslint-disable no-undef */
+/* eslint-disable @typescript-eslint/no-require-imports, no-undef */
 module.exports = {
   plugins: [require("tailwindcss"), require("autoprefixer"), require("postcss-nested")],
 };
diff --git a/apps/desktop/scripts/after-pack.js b/apps/desktop/scripts/after-pack.js
index fd16cd5ffb..30b17a44d1 100644
--- a/apps/desktop/scripts/after-pack.js
+++ b/apps/desktop/scripts/after-pack.js
@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires, no-console */
+/* eslint-disable @typescript-eslint/no-require-imports, no-console */
 require("dotenv").config();
 const child_process = require("child_process");
 const path = require("path");
diff --git a/apps/desktop/scripts/after-sign.js b/apps/desktop/scripts/after-sign.js
index dc60e9d183..20c24c8a76 100644
--- a/apps/desktop/scripts/after-sign.js
+++ b/apps/desktop/scripts/after-sign.js
@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires, no-console */
+/* eslint-disable @typescript-eslint/no-require-imports, no-console */
 require("dotenv").config();
 const path = require("path");
 
diff --git a/apps/desktop/scripts/build-macos-extension.js b/apps/desktop/scripts/build-macos-extension.js
index 4cb643c34d..649fe3b673 100644
--- a/apps/desktop/scripts/build-macos-extension.js
+++ b/apps/desktop/scripts/build-macos-extension.js
@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires, no-console */
+/* eslint-disable @typescript-eslint/no-require-imports, no-console */
 const child = require("child_process");
 const { exit } = require("process");
 
diff --git a/apps/desktop/scripts/start.js b/apps/desktop/scripts/start.js
index c1a2fb3cff..d2c984a6f2 100644
--- a/apps/desktop/scripts/start.js
+++ b/apps/desktop/scripts/start.js
@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
+/* eslint-disable @typescript-eslint/no-require-imports */
 const concurrently = require("concurrently");
 const rimraf = require("rimraf");
 
diff --git a/apps/desktop/sign.js b/apps/desktop/sign.js
index 74c6393230..f0110ea195 100644
--- a/apps/desktop/sign.js
+++ b/apps/desktop/sign.js
@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires, no-console */
+/* eslint-disable @typescript-eslint/no-require-imports, no-console */
 
 exports.default = async function (configuration) {
   if (parseInt(process.env.ELECTRON_BUILDER_SIGN) === 1 && configuration.path.slice(-4) == ".exe") {
diff --git a/apps/desktop/src/app/app-routing.module.ts b/apps/desktop/src/app/app-routing.module.ts
index e4ee5ec047..e565681de9 100644
--- a/apps/desktop/src/app/app-routing.module.ts
+++ b/apps/desktop/src/app/app-routing.module.ts
@@ -67,6 +67,7 @@ import { SendComponent } from "./tools/send/send.component";
 /**
  * Data properties acceptable for use in route objects in the desktop
  */
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type
 export interface RouteDataProperties {
   // For any new route data properties, add them here.
   // then assert that the data object satisfies this interface in the route object.
diff --git a/apps/desktop/src/app/main.ts b/apps/desktop/src/app/main.ts
index a0b490edaa..287d66795d 100644
--- a/apps/desktop/src/app/main.ts
+++ b/apps/desktop/src/app/main.ts
@@ -1,7 +1,9 @@
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
 
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 require("../scss/styles.scss");
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 require("../scss/tailwind.css");
 
 import { AppModule } from "./app.module";
diff --git a/apps/desktop/src/auth/login/desktop-login-component.service.ts b/apps/desktop/src/auth/login/desktop-login-component.service.ts
index 8a2daef49f..dbf689e801 100644
--- a/apps/desktop/src/auth/login/desktop-login-component.service.ts
+++ b/apps/desktop/src/auth/login/desktop-login-component.service.ts
@@ -65,6 +65,8 @@ export class DesktopLoginComponentService
 
     try {
       await ipc.platform.localhostCallbackService.openSsoPrompt(codeChallenge, state);
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (err) {
       this.toastService.showToast({
         variant: "error",
diff --git a/apps/desktop/src/auth/login/login-v1.component.ts b/apps/desktop/src/auth/login/login-v1.component.ts
index 5b1a1c68d2..e0c3f794db 100644
--- a/apps/desktop/src/auth/login/login-v1.component.ts
+++ b/apps/desktop/src/auth/login/login-v1.component.ts
@@ -249,6 +249,8 @@ export class LoginComponentV1 extends BaseLoginComponent implements OnInit, OnDe
     await this.ssoLoginService.setCodeVerifier(ssoCodeVerifier);
     try {
       await ipc.platform.localhostCallbackService.openSsoPrompt(codeChallenge, state);
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (err) {
       this.platformUtilsService.showToast(
         "error",
diff --git a/apps/desktop/src/main/native-messaging.main.ts b/apps/desktop/src/main/native-messaging.main.ts
index 6915a18ded..107d546811 100644
--- a/apps/desktop/src/main/native-messaging.main.ts
+++ b/apps/desktop/src/main/native-messaging.main.ts
@@ -405,6 +405,8 @@ export class NativeMessagingMain {
             this.logService.info(`Error reading preferences: ${e}`);
           }
         }
+        // FIXME: Remove when updating file. Eslint update
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
       } catch (e) {
         // Browser is not installed, we can just skip it
       }
diff --git a/apps/desktop/src/platform/flags.ts b/apps/desktop/src/platform/flags.ts
index dc0103e243..a762053da3 100644
--- a/apps/desktop/src/platform/flags.ts
+++ b/apps/desktop/src/platform/flags.ts
@@ -7,11 +7,9 @@ import {
 } from "@bitwarden/common/platform/misc/flags";
 
 // required to avoid linting errors when there are no flags
-// eslint-disable-next-line @typescript-eslint/ban-types
 export type Flags = {} & SharedFlags;
 
 // required to avoid linting errors when there are no flags
-// eslint-disable-next-line @typescript-eslint/ban-types
 export type DevFlags = {} & SharedDevFlags;
 
 export function flagEnabled(flag: keyof Flags): boolean {
diff --git a/apps/desktop/src/services/biometric-message-handler.service.ts b/apps/desktop/src/services/biometric-message-handler.service.ts
index 72d00988e8..74f80785fc 100644
--- a/apps/desktop/src/services/biometric-message-handler.service.ts
+++ b/apps/desktop/src/services/biometric-message-handler.service.ts
@@ -265,6 +265,8 @@ export class BiometricMessageHandlerService {
           } else {
             await this.send({ command: "biometricUnlock", response: "canceled" }, appId);
           }
+          // FIXME: Remove when updating file. Eslint update
+          // eslint-disable-next-line @typescript-eslint/no-unused-vars
         } catch (e) {
           await this.send({ command: "biometricUnlock", response: "canceled" }, appId);
         }
@@ -342,6 +344,8 @@ export class BiometricMessageHandlerService {
           appId,
         );
       }
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       await this.send(
         { command: BiometricsCommands.UnlockWithBiometricsForUser, messageId, response: false },
diff --git a/apps/desktop/src/services/duckduckgo-message-handler.service.ts b/apps/desktop/src/services/duckduckgo-message-handler.service.ts
index 9a914f238b..fa5c2f4d9f 100644
--- a/apps/desktop/src/services/duckduckgo-message-handler.service.ts
+++ b/apps/desktop/src/services/duckduckgo-message-handler.service.ts
@@ -130,6 +130,8 @@ export class DuckDuckGoMessageHandlerService {
           sharedKey: Utils.fromBufferToB64(encryptedSecret),
         },
       });
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (error) {
       this.sendResponse({
         messageId: messageId,
@@ -153,6 +155,8 @@ export class DuckDuckGoMessageHandlerService {
         await this.encryptedMessageHandlerService.responseDataForCommand(decryptedCommandData);
 
       await this.sendEncryptedResponse(message, { command, payload: responseData });
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (error) {
       // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
diff --git a/apps/desktop/src/services/encrypted-message-handler.service.ts b/apps/desktop/src/services/encrypted-message-handler.service.ts
index 09c0fe2a07..43c4b9065a 100644
--- a/apps/desktop/src/services/encrypted-message-handler.service.ts
+++ b/apps/desktop/src/services/encrypted-message-handler.service.ts
@@ -178,6 +178,8 @@ export class EncryptedMessageHandlerService {
       await this.messagingService.send("refreshCiphers");
 
       return { status: "success" };
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (error) {
       return { status: "failure" };
     }
@@ -222,6 +224,8 @@ export class EncryptedMessageHandlerService {
       await this.messagingService.send("refreshCiphers");
 
       return { status: "success" };
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (error) {
       return { status: "failure" };
     }
diff --git a/apps/web/postcss.config.js b/apps/web/postcss.config.js
index c4513687e8..c39e7ea035 100644
--- a/apps/web/postcss.config.js
+++ b/apps/web/postcss.config.js
@@ -1,4 +1,4 @@
-/* eslint-disable no-undef */
+/* eslint-disable @typescript-eslint/no-require-imports, no-undef */
 module.exports = {
   plugins: [require("tailwindcss"), require("autoprefixer"), require("postcss-nested")],
 };
diff --git a/apps/web/src/app/admin-console/common/base.events.component.ts b/apps/web/src/app/admin-console/common/base.events.component.ts
index 1080880a46..9d06be92eb 100644
--- a/apps/web/src/app/admin-console/common/base.events.component.ts
+++ b/apps/web/src/app/admin-console/common/base.events.component.ts
@@ -167,6 +167,8 @@ export abstract class BaseEventsComponent {
     let dates: string[] = null;
     try {
       dates = this.eventService.formatDateFilters(this.start, this.end);
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       this.toastService.showToast({
         variant: "error",
diff --git a/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts b/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts
index 1ba1431cbd..58efc7348e 100644
--- a/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts
+++ b/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts
@@ -113,6 +113,8 @@ export class EntityEventsComponent implements OnInit {
         this.filterFormGroup.value.start,
         this.filterFormGroup.value.end,
       );
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       this.toastService.showToast({
         variant: "error",
diff --git a/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts b/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts
index b3c046d1fe..031bd7bf18 100644
--- a/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts
+++ b/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts
@@ -170,6 +170,8 @@ export class FamiliesForEnterpriseSetupComponent implements OnInit, OnDestroy {
       // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
       this.router.navigate(["/"]);
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       if (this.showNewOrganization) {
         const dialog = openDeleteOrganizationDialog(this.dialogService, {
diff --git a/apps/web/src/app/platform/web-sdk-client-factory.ts b/apps/web/src/app/platform/web-sdk-client-factory.ts
index 2ebb2bcc10..0dd43ecbb9 100644
--- a/apps/web/src/app/platform/web-sdk-client-factory.ts
+++ b/apps/web/src/app/platform/web-sdk-client-factory.ts
@@ -27,6 +27,8 @@ const supported = (() => {
         return new WebAssembly.Instance(module) instanceof WebAssembly.Instance;
       }
     }
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
   } catch (e) {
     // ignore
   }
diff --git a/apps/web/src/app/tools/send/send-access-file.component.ts b/apps/web/src/app/tools/send/send-access-file.component.ts
index 0b2a971bbe..b55e955f35 100644
--- a/apps/web/src/app/tools/send/send-access-file.component.ts
+++ b/apps/web/src/app/tools/send/send-access-file.component.ts
@@ -70,6 +70,8 @@ export class SendAccessFileComponent {
         blobData: decBuf,
         downloadMethod: "save",
       });
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       this.toastService.showToast({
         variant: "error",
diff --git a/apps/web/src/app/vault/individual-vault/folder-add-edit.component.ts b/apps/web/src/app/vault/individual-vault/folder-add-edit.component.ts
index 88af1ef601..bc639ff2f6 100644
--- a/apps/web/src/app/vault/individual-vault/folder-add-edit.component.ts
+++ b/apps/web/src/app/vault/individual-vault/folder-add-edit.component.ts
@@ -46,6 +46,8 @@ export class FolderAddEditComponent extends BaseFolderAddEditComponent {
       dialogService,
       formBuilder,
     );
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
     params?.folderId ? (this.folderId = params.folderId) : null;
   }
 
diff --git a/apps/web/src/connectors/captcha.ts b/apps/web/src/connectors/captcha.ts
index 01a14a79a2..aad6eaa3d4 100644
--- a/apps/web/src/connectors/captcha.ts
+++ b/apps/web/src/connectors/captcha.ts
@@ -5,8 +5,12 @@ import { b64Decode, getQsParam } from "./common";
 declare let hcaptcha: any;
 
 if (window.location.pathname.includes("mobile")) {
+  // FIXME: Remove when updating file. Eslint update
+  // eslint-disable-next-line @typescript-eslint/no-require-imports
   require("./captcha-mobile.scss");
 } else {
+  // FIXME: Remove when updating file. Eslint update
+  // eslint-disable-next-line @typescript-eslint/no-require-imports
   require("./captcha.scss");
 }
 
@@ -50,6 +54,8 @@ async function start() {
   let decodedData: any;
   try {
     decodedData = JSON.parse(b64Decode(data, true));
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
   } catch (e) {
     error("Cannot parse data.");
     return;
diff --git a/apps/web/src/connectors/duo-redirect.ts b/apps/web/src/connectors/duo-redirect.ts
index 0f067b583b..b5300ff65e 100644
--- a/apps/web/src/connectors/duo-redirect.ts
+++ b/apps/web/src/connectors/duo-redirect.ts
@@ -3,6 +3,8 @@
 import { getQsParam } from "./common";
 import { TranslationService } from "./translation.service";
 
+// FIXME: Remove when updating file. Eslint update
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 require("./duo-redirect.scss");
 
 const mobileDesktopCallback = "bitwarden://duo-callback";
diff --git a/apps/web/src/connectors/sso.ts b/apps/web/src/connectors/sso.ts
index 3ec6a8f7a3..b48c2b49d7 100644
--- a/apps/web/src/connectors/sso.ts
+++ b/apps/web/src/connectors/sso.ts
@@ -2,6 +2,8 @@
 // @ts-strict-ignore
 import { getQsParam } from "./common";
 
+// FIXME: Remove when updating file. Eslint update
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 require("./sso.scss");
 
 window.addEventListener("load", () => {
diff --git a/apps/web/src/connectors/webauthn-fallback.ts b/apps/web/src/connectors/webauthn-fallback.ts
index 971bc5e44a..6f32bbaecf 100644
--- a/apps/web/src/connectors/webauthn-fallback.ts
+++ b/apps/web/src/connectors/webauthn-fallback.ts
@@ -4,6 +4,8 @@ import { b64Decode, getQsParam } from "./common";
 import { buildDataString, parseWebauthnJson } from "./common-webauthn";
 import { TranslationService } from "./translation.service";
 
+// FIXME: Remove when updating file. Eslint update
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 require("./webauthn.scss");
 
 let parsed = false;
@@ -52,6 +54,8 @@ function parseParametersV2() {
   let dataObj: { data: any; btnText: string } = null;
   try {
     dataObj = JSON.parse(b64Decode(getQsParam("data")));
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
   } catch (e) {
     error("Cannot parse data.");
     return;
@@ -103,6 +107,8 @@ function start() {
   let json: any;
   try {
     json = parseWebauthnJson(webauthnJson);
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
   } catch (e) {
     error("Cannot parse data.");
     return;
diff --git a/apps/web/src/connectors/webauthn.ts b/apps/web/src/connectors/webauthn.ts
index 14ba8a280e..32e6e0ab67 100644
--- a/apps/web/src/connectors/webauthn.ts
+++ b/apps/web/src/connectors/webauthn.ts
@@ -3,6 +3,8 @@
 import { b64Decode, getQsParam } from "./common";
 import { buildDataString, parseWebauthnJson } from "./common-webauthn";
 
+// FIXME: Remove when updating file. Eslint update
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 require("./webauthn.scss");
 
 const mobileCallbackUri = "bitwarden://webauthn-callback";
@@ -88,6 +90,8 @@ function parseParametersV2() {
   } = null;
   try {
     dataObj = JSON.parse(b64Decode(getQsParam("data")));
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
   } catch (e) {
     error("Cannot parse data.");
     return;
@@ -116,6 +120,8 @@ function start() {
 
   try {
     obj = parseWebauthnJson(webauthnJson);
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
   } catch (e) {
     error("Cannot parse webauthn data.");
     return;
diff --git a/apps/web/src/utils/flags.ts b/apps/web/src/utils/flags.ts
index dc0103e243..a762053da3 100644
--- a/apps/web/src/utils/flags.ts
+++ b/apps/web/src/utils/flags.ts
@@ -7,11 +7,9 @@ import {
 } from "@bitwarden/common/platform/misc/flags";
 
 // required to avoid linting errors when there are no flags
-// eslint-disable-next-line @typescript-eslint/ban-types
 export type Flags = {} & SharedFlags;
 
 // required to avoid linting errors when there are no flags
-// eslint-disable-next-line @typescript-eslint/ban-types
 export type DevFlags = {} & SharedDevFlags;
 
 export function flagEnabled(flag: keyof Flags): boolean {
diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts
index 760877ff8b..ac8ad3112b 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts
@@ -98,6 +98,8 @@ export class DeviceApprovalsComponent implements OnInit, OnDestroy {
           title: null,
           message: this.i18nService.t("loginRequestApproved"),
         });
+        // FIXME: Remove when updating file. Eslint update
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
       } catch (error) {
         this.toastService.showToast({
           variant: "error",
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/settings/services/sm-porting-api.service.ts b/bitwarden_license/bit-web/src/app/secrets-manager/settings/services/sm-porting-api.service.ts
index 9ae9b2acec..c5934067fd 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/settings/services/sm-porting-api.service.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/settings/services/sm-porting-api.service.ts
@@ -107,6 +107,8 @@ export class SecretsManagerPortingApiService {
           return secret;
         }),
       );
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (error) {
       return null;
     }
diff --git a/libs/angular/src/auth/components/login-v1.component.ts b/libs/angular/src/auth/components/login-v1.component.ts
index 0775114bd8..ffe1dda3ae 100644
--- a/libs/angular/src/auth/components/login-v1.component.ts
+++ b/libs/angular/src/auth/components/login-v1.component.ts
@@ -397,6 +397,8 @@ export class LoginComponentV1 extends CaptchaProtectedComponent implements OnIni
         email,
         deviceIdentifier,
       );
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       this.showLoginWithDevice = false;
     }
diff --git a/libs/angular/src/vault/components/attachments.component.ts b/libs/angular/src/vault/components/attachments.component.ts
index 425b4be284..1a4c428aae 100644
--- a/libs/angular/src/vault/components/attachments.component.ts
+++ b/libs/angular/src/vault/components/attachments.component.ts
@@ -192,6 +192,8 @@ export class AttachmentsComponent implements OnInit {
         title: null,
         message: this.i18nService.t("fileSavedToDevice"),
       });
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       this.platformUtilsService.showToast("error", null, this.i18nService.t("errorOccurred"));
     }
@@ -285,6 +287,8 @@ export class AttachmentsComponent implements OnInit {
             this.i18nService.t("attachmentSaved"),
           );
           this.onReuploadedAttachment.emit();
+          // FIXME: Remove when updating file. Eslint update
+          // eslint-disable-next-line @typescript-eslint/no-unused-vars
         } catch (e) {
           this.platformUtilsService.showToast("error", null, this.i18nService.t("errorOccurred"));
         }
diff --git a/libs/angular/src/vault/components/view.component.ts b/libs/angular/src/vault/components/view.component.ts
index 724a1507be..ef9aff736e 100644
--- a/libs/angular/src/vault/components/view.component.ts
+++ b/libs/angular/src/vault/components/view.component.ts
@@ -466,6 +466,8 @@ export class ViewComponent implements OnDestroy, OnInit {
         fileName: attachment.fileName,
         blobData: decBuf,
       });
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       this.platformUtilsService.showToast("error", null, this.i18nService.t("errorOccurred"));
     }
diff --git a/libs/auth/src/angular/login-decryption-options/login-decryption-options.component.ts b/libs/auth/src/angular/login-decryption-options/login-decryption-options.component.ts
index 5600077c36..8f22f391b1 100644
--- a/libs/auth/src/angular/login-decryption-options/login-decryption-options.component.ts
+++ b/libs/auth/src/angular/login-decryption-options/login-decryption-options.component.ts
@@ -107,6 +107,8 @@ export class LoginDecryptionOptionsComponent implements OnInit {
     private userDecryptionOptionsService: UserDecryptionOptionsServiceAbstraction,
     private validationService: ValidationService,
   ) {
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
     this.clientType === this.platformUtilsService.getClientType();
   }
 
diff --git a/libs/auth/src/angular/login/login.component.ts b/libs/auth/src/angular/login/login.component.ts
index 40f85e6d75..f9aaa5d1e0 100644
--- a/libs/auth/src/angular/login/login.component.ts
+++ b/libs/auth/src/angular/login/login.component.ts
@@ -484,6 +484,8 @@ export class LoginComponent implements OnInit, OnDestroy {
     try {
       const deviceIdentifier = await this.appIdService.getAppId();
       this.isKnownDevice = await this.devicesApiService.getKnownDevice(email, deviceIdentifier);
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       this.isKnownDevice = false;
     }
diff --git a/libs/auth/src/common/utilities/decode-jwt-token-to-json.utility.ts b/libs/auth/src/common/utilities/decode-jwt-token-to-json.utility.ts
index 717e80b110..24b3adacc2 100644
--- a/libs/auth/src/common/utilities/decode-jwt-token-to-json.utility.ts
+++ b/libs/auth/src/common/utilities/decode-jwt-token-to-json.utility.ts
@@ -18,6 +18,8 @@ export function decodeJwtTokenToJson(jwtToken: string): any {
   try {
     // Attempt to decode from URL-safe Base64 to UTF-8
     decodedPayloadJSON = Utils.fromUrlB64ToUtf8(encodedPayload);
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
   } catch (decodingError) {
     throw new Error("Cannot decode the token");
   }
@@ -26,6 +28,8 @@ export function decodeJwtTokenToJson(jwtToken: string): any {
     // Attempt to parse the JSON payload
     const decodedToken = JSON.parse(decodedPayloadJSON);
     return decodedToken;
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
   } catch (jsonError) {
     throw new Error("Cannot parse the token's payload into JSON");
   }
diff --git a/libs/common/src/auth/services/device-trust.service.implementation.ts b/libs/common/src/auth/services/device-trust.service.implementation.ts
index c40091a66f..a94c8b6e42 100644
--- a/libs/common/src/auth/services/device-trust.service.implementation.ts
+++ b/libs/common/src/auth/services/device-trust.service.implementation.ts
@@ -337,6 +337,8 @@ export class DeviceTrustService implements DeviceTrustServiceAbstraction {
       );
 
       return new SymmetricCryptoKey(userKey) as UserKey;
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       // If either decryption effort fails, we want to remove the device key
       this.logService.error("Failed to decrypt using device key. Removing device key.");
diff --git a/libs/common/src/auth/services/user-verification/user-verification.service.ts b/libs/common/src/auth/services/user-verification/user-verification.service.ts
index 3f0a0adfcb..4735da32b6 100644
--- a/libs/common/src/auth/services/user-verification/user-verification.service.ts
+++ b/libs/common/src/auth/services/user-verification/user-verification.service.ts
@@ -163,6 +163,8 @@ export class UserVerificationService implements UserVerificationServiceAbstracti
     const request = new VerifyOTPRequest(verification.secret);
     try {
       await this.userVerificationApiService.postAccountVerifyOTP(request);
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       throw new Error(this.i18nService.t("invalidVerificationCode"));
     }
@@ -221,6 +223,8 @@ export class UserVerificationService implements UserVerificationServiceAbstracti
       request.masterPasswordHash = serverKeyHash;
       try {
         policyOptions = await this.userVerificationApiService.postAccountVerifyPassword(request);
+        // FIXME: Remove when updating file. Eslint update
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
       } catch (e) {
         throw new Error(this.i18nService.t("invalidMasterPassword"));
       }
diff --git a/libs/common/src/platform/misc/flags.ts b/libs/common/src/platform/misc/flags.ts
index 8ed19ce57f..30531b6799 100644
--- a/libs/common/src/platform/misc/flags.ts
+++ b/libs/common/src/platform/misc/flags.ts
@@ -1,14 +1,12 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 // required to avoid linting errors when there are no flags
-// eslint-disable-next-line @typescript-eslint/ban-types
 export type SharedFlags = {
   sdk?: boolean;
   prereleaseBuild?: boolean;
 };
 
 // required to avoid linting errors when there are no flags
-// eslint-disable-next-line @typescript-eslint/ban-types
 export type SharedDevFlags = {
   noopNotifications: boolean;
   skipWelcomeOnInstall: boolean;
diff --git a/libs/common/src/platform/misc/utils.ts b/libs/common/src/platform/misc/utils.ts
index 95d17e6d04..f654897e9e 100644
--- a/libs/common/src/platform/misc/utils.ts
+++ b/libs/common/src/platform/misc/utils.ts
@@ -14,6 +14,8 @@ import { KeyService } from "../../../../key-management/src/abstractions/key.serv
 import { EncryptService } from "../abstractions/encrypt.service";
 import { I18nService } from "../abstractions/i18n.service";
 
+// FIXME: Remove when updating file. Eslint update
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 const nodeURL = typeof self === "undefined" ? require("url") : null;
 
 declare global {
@@ -610,6 +612,8 @@ export class Utils {
       }
 
       return new URL(uriString);
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       // Ignore error
     }
diff --git a/libs/common/src/platform/models/domain/domain-base.spec.ts b/libs/common/src/platform/models/domain/domain-base.spec.ts
index 0bdee21e3c..80a4e5e860 100644
--- a/libs/common/src/platform/models/domain/domain-base.spec.ts
+++ b/libs/common/src/platform/models/domain/domain-base.spec.ts
@@ -67,9 +67,13 @@ describe("DomainBase", () => {
       );
 
       // @ts-expect-error -- encString2 was not decrypted
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-expressions
       decrypted as { encToString: string; encString2: string; plainText: string };
 
       // encString2 was not decrypted, so it's still an EncString
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-expressions
       decrypted as { encToString: string; encString2: EncString; plainText: string };
     });
 
diff --git a/libs/common/src/platform/models/domain/domain-base.ts b/libs/common/src/platform/models/domain/domain-base.ts
index 688cf52d4c..110a1dc720 100644
--- a/libs/common/src/platform/models/domain/domain-base.ts
+++ b/libs/common/src/platform/models/domain/domain-base.ts
@@ -8,7 +8,7 @@ import { EncryptService } from "../../abstractions/encrypt.service";
 import { EncString } from "./enc-string";
 import { SymmetricCryptoKey } from "./symmetric-crypto-key";
 
-// eslint-disable-next-line @typescript-eslint/ban-types
+// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
 type EncStringKeys<T> = ConditionalKeys<ConditionalExcept<T, Function>, EncString>;
 export type DecryptedObject<
   TEncryptedObject,
diff --git a/libs/common/src/platform/models/domain/enc-string.ts b/libs/common/src/platform/models/domain/enc-string.ts
index b8e0006942..f148664a4f 100644
--- a/libs/common/src/platform/models/domain/enc-string.ts
+++ b/libs/common/src/platform/models/domain/enc-string.ts
@@ -125,6 +125,8 @@ export class EncString implements Encrypted {
       try {
         encType = parseInt(headerPieces[0], null);
         encPieces = headerPieces[1].split("|");
+        // FIXME: Remove when updating file. Eslint update
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
       } catch (e) {
         return { encType: NaN, encPieces: [] };
       }
@@ -186,6 +188,8 @@ export class EncString implements Encrypted {
         key,
         decryptTrace == null ? context : `${decryptTrace}${context || ""}`,
       );
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       this.decryptedValue = DECRYPT_ERROR;
     }
@@ -203,6 +207,8 @@ export class EncString implements Encrypted {
       }
 
       this.decryptedValue = await encryptService.decryptToUtf8(this, key, decryptTrace);
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       this.decryptedValue = DECRYPT_ERROR;
     }
diff --git a/libs/common/src/state-migrations/migrations/18-move-autofill-settings-to-state-providers.ts b/libs/common/src/state-migrations/migrations/18-move-autofill-settings-to-state-providers.ts
index 53ae94c30b..84bcaeec60 100644
--- a/libs/common/src/state-migrations/migrations/18-move-autofill-settings-to-state-providers.ts
+++ b/libs/common/src/state-migrations/migrations/18-move-autofill-settings-to-state-providers.ts
@@ -3,6 +3,8 @@
 import { StateDefinitionLike, MigrationHelper } from "../migration-helper";
 import { Migrator } from "../migrator";
 
+// FIXME: Remove when updating file. Eslint update
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const AutofillOverlayVisibility = {
   Off: 0,
   OnButtonClick: 1,
diff --git a/libs/common/src/state-migrations/migrations/25-move-clear-clipboard-to-autofill-settings-state-provider.ts b/libs/common/src/state-migrations/migrations/25-move-clear-clipboard-to-autofill-settings-state-provider.ts
index 04b4a50e0e..9397191f54 100644
--- a/libs/common/src/state-migrations/migrations/25-move-clear-clipboard-to-autofill-settings-state-provider.ts
+++ b/libs/common/src/state-migrations/migrations/25-move-clear-clipboard-to-autofill-settings-state-provider.ts
@@ -3,6 +3,8 @@
 import { StateDefinitionLike, MigrationHelper } from "../migration-helper";
 import { Migrator } from "../migrator";
 
+// FIXME: Remove when updating file. Eslint update
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const ClearClipboardDelay = {
   Never: null as null,
   TenSeconds: 10,
diff --git a/libs/common/src/state-migrations/migrations/34-move-domain-settings-to-state-providers.ts b/libs/common/src/state-migrations/migrations/34-move-domain-settings-to-state-providers.ts
index b465a69131..71e5c531d5 100644
--- a/libs/common/src/state-migrations/migrations/34-move-domain-settings-to-state-providers.ts
+++ b/libs/common/src/state-migrations/migrations/34-move-domain-settings-to-state-providers.ts
@@ -3,6 +3,8 @@
 import { KeyDefinitionLike, MigrationHelper } from "../migration-helper";
 import { Migrator } from "../migrator";
 
+// FIXME: Remove when updating file. Eslint update
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const UriMatchStrategy = {
   Domain: 0,
   Host: 1,
diff --git a/libs/common/src/tools/send/models/domain/send.ts b/libs/common/src/tools/send/models/domain/send.ts
index 43115b6593..c2390d439e 100644
--- a/libs/common/src/tools/send/models/domain/send.ts
+++ b/libs/common/src/tools/send/models/domain/send.ts
@@ -81,6 +81,8 @@ export class Send extends Domain {
       const sendKeyEncryptionKey = await keyService.getUserKey();
       model.key = await encryptService.decryptToBytes(this.key, sendKeyEncryptionKey);
       model.cryptoKey = await keyService.makeSendKey(model.key);
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       // TODO: error?
     }
diff --git a/libs/common/src/vault/icon/build-cipher-icon.ts b/libs/common/src/vault/icon/build-cipher-icon.ts
index 8ffe474956..5775bc7f55 100644
--- a/libs/common/src/vault/icon/build-cipher-icon.ts
+++ b/libs/common/src/vault/icon/build-cipher-icon.ts
@@ -53,6 +53,8 @@ export function buildCipherIcon(iconsServerUrl: string, cipher: CipherView, show
           try {
             image = `${iconsServerUrl}/${Utils.getHostname(hostnameUri)}/icon.png`;
             fallbackImage = "images/bwi-globe.png";
+            // FIXME: Remove when updating file. Eslint update
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
           } catch (e) {
             // Ignore error since the fallback icon will be shown if image is null.
           }
diff --git a/libs/common/src/vault/models/domain/attachment.ts b/libs/common/src/vault/models/domain/attachment.ts
index 2b893e33f4..4eee030774 100644
--- a/libs/common/src/vault/models/domain/attachment.ts
+++ b/libs/common/src/vault/models/domain/attachment.ts
@@ -69,6 +69,8 @@ export class Attachment extends Domain {
       const encryptService = Utils.getContainerService().getEncryptService();
       const decValue = await encryptService.decryptToBytes(this.key, encKey);
       return new SymmetricCryptoKey(decValue);
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       // TODO: error?
     }
diff --git a/libs/common/src/vault/models/view/cipher.view.ts b/libs/common/src/vault/models/view/cipher.view.ts
index c5de01293e..20dbd23065 100644
--- a/libs/common/src/vault/models/view/cipher.view.ts
+++ b/libs/common/src/vault/models/view/cipher.view.ts
@@ -155,6 +155,8 @@ export class CipherView implements View, InitializerMetadata {
       return null;
     }
 
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const item = this.item;
     return this.item[linkedFieldOption.propertyKey as keyof typeof item];
   }
diff --git a/libs/common/src/vault/models/view/login-uri.view.ts b/libs/common/src/vault/models/view/login-uri.view.ts
index a6b7a0c0a2..315adb87c7 100644
--- a/libs/common/src/vault/models/view/login-uri.view.ts
+++ b/libs/common/src/vault/models/view/login-uri.view.ts
@@ -142,6 +142,8 @@ export class LoginUriView implements View {
         try {
           const regex = new RegExp(this.uri, "i");
           return regex.test(targetUri);
+          // FIXME: Remove when updating file. Eslint update
+          // eslint-disable-next-line @typescript-eslint/no-unused-vars
         } catch (e) {
           // Invalid regex
           return false;
diff --git a/libs/components/src/a11y/a11y-grid.directive.ts b/libs/components/src/a11y/a11y-grid.directive.ts
index c8e9d3d2fe..ef7ba68b65 100644
--- a/libs/components/src/a11y/a11y-grid.directive.ts
+++ b/libs/components/src/a11y/a11y-grid.directive.ts
@@ -86,6 +86,8 @@ export class A11yGridDirective implements AfterViewInit {
       });
 
       this.getActiveCellContent().tabIndex = 0;
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (error) {
       // eslint-disable-next-line no-console
       console.error("Unable to initialize grid");
diff --git a/libs/components/src/navigation/nav-group.component.ts b/libs/components/src/navigation/nav-group.component.ts
index 58d93ddd3a..d615bfe058 100644
--- a/libs/components/src/navigation/nav-group.component.ts
+++ b/libs/components/src/navigation/nav-group.component.ts
@@ -70,6 +70,8 @@ export class NavGroupComponent extends NavBaseComponent implements AfterContentI
   setOpen(isOpen: boolean) {
     this.open = isOpen;
     this.openChange.emit(this.open);
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
     this.open && this.parentNavGroup?.setOpen(this.open);
   }
 
diff --git a/libs/importer/src/services/import.service.spec.ts b/libs/importer/src/services/import.service.spec.ts
index 8b497beac9..e8f63ef870 100644
--- a/libs/importer/src/services/import.service.spec.ts
+++ b/libs/importer/src/services/import.service.spec.ts
@@ -267,7 +267,7 @@ describe("ImportService", () => {
 function createCipher(options: Partial<CipherView> = {}) {
   const cipher = new CipherView();
 
-  cipher.name;
+  cipher.name = options.name;
   cipher.type = options.type;
   cipher.folderId = options.folderId;
   cipher.collectionIds = options.collectionIds;
diff --git a/libs/key-management/src/key.service.ts b/libs/key-management/src/key.service.ts
index 5425dbc53f..98474b4bab 100644
--- a/libs/key-management/src/key.service.ts
+++ b/libs/key-management/src/key.service.ts
@@ -683,6 +683,8 @@ export class DefaultKeyService implements KeyServiceAbstraction {
         // failed to decrypt
         return false;
       }
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       return false;
     }
diff --git a/libs/shared/jest.config.angular.js b/libs/shared/jest.config.angular.js
index de703e2722..311318e46a 100644
--- a/libs/shared/jest.config.angular.js
+++ b/libs/shared/jest.config.angular.js
@@ -1,5 +1,5 @@
 /* eslint-env node */
-/* eslint-disable @typescript-eslint/no-var-requires */
+/* eslint-disable @typescript-eslint/no-require-imports */
 const { defaultTransformerOptions } = require("jest-preset-angular/presets");
 
 /** @type {import('jest').Config} */
diff --git a/libs/vault/src/cipher-form/components/custom-fields/add-edit-custom-field-dialog/add-edit-custom-field-dialog.component.spec.ts b/libs/vault/src/cipher-form/components/custom-fields/add-edit-custom-field-dialog/add-edit-custom-field-dialog.component.spec.ts
index f63a974d48..62d171b843 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/add-edit-custom-field-dialog/add-edit-custom-field-dialog.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/custom-fields/add-edit-custom-field-dialog/add-edit-custom-field-dialog.component.spec.ts
@@ -38,6 +38,8 @@ describe("AddEditCustomFieldDialogComponent", () => {
 
     fixture = TestBed.createComponent(AddEditCustomFieldDialogComponent);
     component = fixture.componentInstance;
+    // FIXME: Remove when updating file. Eslint update
+    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
     fixture.detectChanges;
   });
 
diff --git a/libs/vault/src/components/download-attachment/download-attachment.component.ts b/libs/vault/src/components/download-attachment/download-attachment.component.ts
index b22ced3d89..a47cdc8d1d 100644
--- a/libs/vault/src/components/download-attachment/download-attachment.component.ts
+++ b/libs/vault/src/components/download-attachment/download-attachment.component.ts
@@ -98,6 +98,8 @@ export class DownloadAttachmentComponent {
         fileName: this.attachment.fileName,
         blobData: decBuf,
       });
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       this.toastService.showToast({
         variant: "error",
diff --git a/package-lock.json b/package-lock.json
index 3d6ff01172..5366b26861 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -120,8 +120,8 @@
         "@types/proper-lockfile": "4.1.4",
         "@types/retry": "0.12.5",
         "@types/zxcvbn": "4.4.5",
-        "@typescript-eslint/eslint-plugin": "7.16.1",
-        "@typescript-eslint/parser": "7.16.1",
+        "@typescript-eslint/eslint-plugin": "8.19.1",
+        "@typescript-eslint/parser": "8.19.1",
         "@webcomponents/custom-elements": "1.6.0",
         "@yao-pkg/pkg": "5.16.1",
         "autoprefixer": "10.4.20",
@@ -10082,88 +10082,94 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "7.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.16.1.tgz",
-      "integrity": "sha512-SxdPak/5bO0EnGktV05+Hq8oatjAYVY3Zh2bye9pGZy6+jwyR3LG3YKkV4YatlsgqXP28BTeVm9pqwJM96vf2A==",
+      "version": "8.19.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.19.1.tgz",
+      "integrity": "sha512-tJzcVyvvb9h/PB96g30MpxACd9IrunT7GF9wfA9/0TJ1LxGOJx1TdPzSbBBnNED7K9Ka8ybJsnEpiXPktolTLg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "7.16.1",
-        "@typescript-eslint/type-utils": "7.16.1",
-        "@typescript-eslint/utils": "7.16.1",
-        "@typescript-eslint/visitor-keys": "7.16.1",
+        "@typescript-eslint/scope-manager": "8.19.1",
+        "@typescript-eslint/type-utils": "8.19.1",
+        "@typescript-eslint/utils": "8.19.1",
+        "@typescript-eslint/visitor-keys": "8.19.1",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
-        "ts-api-utils": "^1.3.0"
+        "ts-api-utils": "^2.0.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^7.0.0",
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils": {
-      "version": "7.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.16.1.tgz",
-      "integrity": "sha512-rbu/H2MWXN4SkjIIyWcmYBjlp55VT+1G3duFOIukTNFxr9PI35pLc2ydwAfejCEitCv4uztA07q0QWanOHC7dA==",
+      "version": "8.19.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.19.1.tgz",
+      "integrity": "sha512-Rp7k9lhDKBMRJB/nM9Ksp1zs4796wVNyihG9/TU9R6KCJDNkQbc2EOKjrBtLYh3396ZdpXLtr/MkaSEmNMtykw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.16.1",
-        "@typescript-eslint/utils": "7.16.1",
+        "@typescript-eslint/typescript-estree": "8.19.1",
+        "@typescript-eslint/utils": "8.19.1",
         "debug": "^4.3.4",
-        "ts-api-utils": "^1.3.0"
+        "ts-api-utils": "^2.0.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "7.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.16.1.tgz",
-      "integrity": "sha512-WrFM8nzCowV0he0RlkotGDujx78xudsxnGMBHI88l5J8wEhED6yBwaSLP99ygfrzAjsQvcYQ94quDwI0d7E1fA==",
+      "version": "8.19.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.19.1.tgz",
+      "integrity": "sha512-IxG5gLO0Ne+KaUc8iW1A+XuKLd63o4wlbI1Zp692n1xojCl/THvgIKXJXBZixTh5dd5+yTJ/VXH7GJaaw21qXA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.16.1",
-        "@typescript-eslint/types": "7.16.1",
-        "@typescript-eslint/typescript-estree": "7.16.1"
+        "@typescript-eslint/scope-manager": "8.19.1",
+        "@typescript-eslint/types": "8.19.1",
+        "@typescript-eslint/typescript-estree": "8.19.1"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.56.0"
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ts-api-utils": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.0.tgz",
+      "integrity": "sha512-xCt/TOAc+EOHS1XPnijD3/yzpH6qg2xppZO1YDqGoVsNXfQfzHpOdNuXwrwOU8u4ITXJyDCTyt8w5g1sZv9ynQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.12"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4"
       }
     },
     "node_modules/@typescript-eslint/experimental-utils": {
@@ -10316,46 +10322,42 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "7.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.16.1.tgz",
-      "integrity": "sha512-u+1Qx86jfGQ5i4JjK33/FnawZRpsLxRnKzGE6EABZ40KxVT/vWsiZFEBBHjFOljmmV3MBYOHEKi0Jm9hbAOClA==",
+      "version": "8.19.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.19.1.tgz",
+      "integrity": "sha512-67gbfv8rAwawjYx3fYArwldTQKoYfezNUT4D5ioWetr/xCrxXxvleo3uuiFuKfejipvq+og7mjz3b0G2bVyUCw==",
       "dev": true,
-      "license": "BSD-2-Clause",
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "7.16.1",
-        "@typescript-eslint/types": "7.16.1",
-        "@typescript-eslint/typescript-estree": "7.16.1",
-        "@typescript-eslint/visitor-keys": "7.16.1",
+        "@typescript-eslint/scope-manager": "8.19.1",
+        "@typescript-eslint/types": "8.19.1",
+        "@typescript-eslint/typescript-estree": "8.19.1",
+        "@typescript-eslint/visitor-keys": "8.19.1",
         "debug": "^4.3.4"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.16.1.tgz",
-      "integrity": "sha512-nYpyv6ALte18gbMz323RM+vpFpTjfNdyakbf3nsLvF43uF9KeNC289SUEW3QLZ1xPtyINJ1dIsZOuWuSRIWygw==",
+      "version": "8.19.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.19.1.tgz",
+      "integrity": "sha512-60L9KIuN/xgmsINzonOcMDSB8p82h95hoBfSBtXuO4jlR1R9L1xSkmVZKgCPVfavDlXihh4ARNjXhh1gGnLC7Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.16.1",
-        "@typescript-eslint/visitor-keys": "7.16.1"
+        "@typescript-eslint/types": "8.19.1",
+        "@typescript-eslint/visitor-keys": "8.19.1"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
@@ -10363,13 +10365,13 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "7.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.16.1.tgz",
-      "integrity": "sha512-AQn9XqCzUXd4bAVEsAXM/Izk11Wx2u4H3BAfQVhSfzfDOm/wAON9nP7J5rpkCxts7E5TELmN845xTUCQrD1xIQ==",
+      "version": "8.19.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.19.1.tgz",
+      "integrity": "sha512-JBVHMLj7B1K1v1051ZaMMgLW4Q/jre5qGK0Ew6UgXz1Rqh+/xPzV1aW581OM00X6iOfyr1be+QyW8LOUf19BbA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
@@ -10377,32 +10379,43 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.16.1.tgz",
-      "integrity": "sha512-0vFPk8tMjj6apaAZ1HlwM8w7jbghC8jc1aRNJG5vN8Ym5miyhTQGMqU++kuBFDNKe9NcPeZ6x0zfSzV8xC1UlQ==",
+      "version": "8.19.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.19.1.tgz",
+      "integrity": "sha512-jk/TZwSMJlxlNnqhy0Eod1PNEvCkpY6MXOXE/WLlblZ6ibb32i2We4uByoKPv1d0OD2xebDv4hbs3fm11SMw8Q==",
       "dev": true,
-      "license": "BSD-2-Clause",
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.16.1",
-        "@typescript-eslint/visitor-keys": "7.16.1",
+        "@typescript-eslint/types": "8.19.1",
+        "@typescript-eslint/visitor-keys": "8.19.1",
         "debug": "^4.3.4",
-        "globby": "^11.1.0",
+        "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
         "minimatch": "^9.0.4",
         "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
+        "ts-api-utils": "^2.0.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.8.0"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/ts-api-utils": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.0.tgz",
+      "integrity": "sha512-xCt/TOAc+EOHS1XPnijD3/yzpH6qg2xppZO1YDqGoVsNXfQfzHpOdNuXwrwOU8u4ITXJyDCTyt8w5g1sZv9ynQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.12"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4"
       }
     },
     "node_modules/@typescript-eslint/utils": {
@@ -10513,23 +10526,36 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.16.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.16.1.tgz",
-      "integrity": "sha512-Qlzzx4sE4u3FsHTPQAAQFJFNOuqtuY0LFrZHwQ8IHK705XxBiWOFkfKRWu6niB7hwfgnwIpO4jTC75ozW1PHWg==",
+      "version": "8.19.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.19.1.tgz",
+      "integrity": "sha512-fzmjU8CHK853V/avYZAvuVut3ZTfwN5YtMaoi+X9Y9MA9keaWNHC3zEQ9zvyX/7Hj+5JkNyK1l7TOR2hevHB6Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.16.1",
-        "eslint-visitor-keys": "^3.4.3"
+        "@typescript-eslint/types": "8.19.1",
+        "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
     "node_modules/@ungap/structured-clone": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
diff --git a/package.json b/package.json
index e6c476d2df..1090d3efb3 100644
--- a/package.json
+++ b/package.json
@@ -80,8 +80,8 @@
     "@types/proper-lockfile": "4.1.4",
     "@types/retry": "0.12.5",
     "@types/zxcvbn": "4.4.5",
-    "@typescript-eslint/eslint-plugin": "7.16.1",
-    "@typescript-eslint/parser": "7.16.1",
+    "@typescript-eslint/eslint-plugin": "8.19.1",
+    "@typescript-eslint/parser": "8.19.1",
     "@webcomponents/custom-elements": "1.6.0",
     "@yao-pkg/pkg": "5.16.1",
     "autoprefixer": "10.4.20",
diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
index 80f70e47b0..941a612a30 100644
--- a/tsconfig.eslint.json
+++ b/tsconfig.eslint.json
@@ -14,6 +14,7 @@
     "declarationDir": "dist/types",
     "outDir": "dist",
     "baseUrl": ".",
+    "allowJs": true,
     "paths": {
       "@bitwarden/admin-console": ["./libs/admin-console/src"],
       "@bitwarden/angular/*": ["./libs/angular/src/*"],

From 63a9c69f5a904bde34315fdff151e21eff59480f Mon Sep 17 00:00:00 2001
From: Brandon Treston <btreston@bitwarden.com>
Date: Tue, 14 Jan 2025 12:15:23 -0500
Subject: [PATCH 082/150] fix seat count to include invited and accepted
 members (#12848)

---
 .../components/member-dialog/member-dialog.component.ts    | 6 +++---
 .../organizations/members/members.component.ts             | 7 ++++++-
 .../member-access-report/member-access-report.component.ts | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts
index 514e7701e4..4f43dacad3 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts
@@ -68,7 +68,7 @@ export interface MemberDialogParams {
   usesKeyConnector: boolean;
   isOnSecretsManagerStandalone: boolean;
   initialTab?: MemberDialogTab;
-  numConfirmedMembers: number;
+  numSeatsUsed: number;
   managedByOrganization?: boolean;
 }
 
@@ -263,7 +263,7 @@ export class MemberDialogComponent implements OnDestroy {
       });
 
     this.remainingSeats$ = this.organization$.pipe(
-      map((organization) => organization.seats - this.params.numConfirmedMembers),
+      map((organization) => organization.seats - this.params.numSeatsUsed),
     );
   }
 
@@ -458,7 +458,7 @@ export class MemberDialogComponent implements OnDestroy {
       }
       if (
         organization.hasReseller &&
-        this.params.numConfirmedMembers + emails.length > organization.seats
+        this.params.numSeatsUsed + emails.length > organization.seats
       ) {
         this.formGroup.controls.emails.setErrors({
           tooManyEmails: { message: this.i18nService.t("seatLimitReachedContactYourProvider") },
diff --git a/apps/web/src/app/admin-console/organizations/members/members.component.ts b/apps/web/src/app/admin-console/organizations/members/members.component.ts
index 3d10a4a07b..703f187b22 100644
--- a/apps/web/src/app/admin-console/organizations/members/members.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/members.component.ts
@@ -510,6 +510,11 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
       return;
     }
 
+    const numSeatsUsed =
+      this.dataSource.confirmedUserCount +
+      this.dataSource.invitedUserCount +
+      this.dataSource.acceptedUserCount;
+
     const dialog = openUserAddEditDialog(this.dialogService, {
       data: {
         name: this.userNamePipe.transform(user),
@@ -519,7 +524,7 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
         usesKeyConnector: user?.usesKeyConnector,
         isOnSecretsManagerStandalone: this.orgIsOnSecretsManagerStandalone,
         initialTab: initialTab,
-        numConfirmedMembers: this.dataSource.confirmedUserCount,
+        numSeatsUsed,
         managedByOrganization: user?.managedByOrganization,
       },
     });
diff --git a/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/member-access-report.component.ts b/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/member-access-report.component.ts
index 6aaaf1a406..321aae165c 100644
--- a/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/member-access-report.component.ts
+++ b/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/member-access-report.component.ts
@@ -103,7 +103,7 @@ export class MemberAccessReportComponent implements OnInit {
         usesKeyConnector: user?.usesKeyConnector,
         isOnSecretsManagerStandalone: this.orgIsOnSecretsManagerStandalone,
         initialTab: MemberDialogTab.Role,
-        numConfirmedMembers: this.dataSource.data.length,
+        numSeatsUsed: this.dataSource.data.length,
       },
     });
 

From 318a3ac6a9718e8cde7455095fb441fd7344031a Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Tue, 14 Jan 2025 18:29:52 +0100
Subject: [PATCH 083/150] [PM-17038] Fix biometrics autoprompt in firefox and
 chrome (#12853)

* Fix biometrics not working in firefox or windows

* Remove logs

* Update badge after biometric unlock

* Add removal todo note

* Remove debug logging

* Fix type warnings

* Fix userkey typing in background biometrics service

* Simplify types for userkey in foreground-browser-biometrics and runtime.background.ts

* Add process reload logging

* Fix autoprompt not working when no process reload happened

* Fix instant reprompt on firefox lock

* Fix biometrics enabling error on chrome

* Update apps/browser/src/key-management/biometrics/foreground-browser-biometrics.ts

Co-authored-by: Maciej Zieniuk <167752252+mzieniukbw@users.noreply.github.com>

* FIx build & linting

---------

Co-authored-by: Maciej Zieniuk <167752252+mzieniukbw@users.noreply.github.com>
---
 .../biometrics/foreground-browser-biometrics.ts       |  3 ++-
 apps/browser/src/popup/app.component.ts               |  6 ++++--
 .../services/default-process-reload.service.ts        | 11 +++++++++++
 .../src/angular/lock/components/lock.component.ts     |  8 +++++---
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/apps/browser/src/key-management/biometrics/foreground-browser-biometrics.ts b/apps/browser/src/key-management/biometrics/foreground-browser-biometrics.ts
index 43cc25e4da..d248a630cc 100644
--- a/apps/browser/src/key-management/biometrics/foreground-browser-biometrics.ts
+++ b/apps/browser/src/key-management/biometrics/foreground-browser-biometrics.ts
@@ -1,3 +1,4 @@
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { UserId } from "@bitwarden/common/types/guid";
 import { UserKey } from "@bitwarden/common/types/key";
 import { BiometricsCommands, BiometricsService, BiometricsStatus } from "@bitwarden/key-management";
@@ -34,7 +35,7 @@ export class ForegroundBrowserBiometricsService extends BiometricsService {
     if (!response.result) {
       return null;
     }
-    return response.result;
+    return SymmetricCryptoKey.fromString(response.result.keyB64) as UserKey;
   }
 
   async getBiometricsStatusForUser(id: UserId): Promise<BiometricsStatus> {
diff --git a/apps/browser/src/popup/app.component.ts b/apps/browser/src/popup/app.component.ts
index e8a660620a..7b6e402a90 100644
--- a/apps/browser/src/popup/app.component.ts
+++ b/apps/browser/src/popup/app.component.ts
@@ -21,7 +21,7 @@ import {
   ToastOptions,
   ToastService,
 } from "@bitwarden/components";
-import { BiometricStateService } from "@bitwarden/key-management";
+import { BiometricsService, BiometricStateService } from "@bitwarden/key-management";
 
 import { PopupCompactModeService } from "../platform/popup/layout/popup-compact-mode.service";
 import { PopupViewCacheService } from "../platform/popup/view-cache/popup-view-cache.service";
@@ -66,6 +66,7 @@ export class AppComponent implements OnInit, OnDestroy {
     private accountService: AccountService,
     private animationControlService: AnimationControlService,
     private biometricStateService: BiometricStateService,
+    private biometricsService: BiometricsService,
   ) {}
 
   async ngOnInit() {
@@ -102,7 +103,7 @@ export class AppComponent implements OnInit, OnDestroy {
 
     this.messageListener.allMessages$
       .pipe(
-        tap((msg: any) => {
+        tap(async (msg: any) => {
           if (msg.command === "doneLoggingOut") {
             // TODO: PM-8544 - why do we call logout in the popup after receiving the doneLoggingOut message? Hasn't this already completeted logout?
             this.authService.logOut(async () => {
@@ -119,6 +120,7 @@ export class AppComponent implements OnInit, OnDestroy {
             msg.command === "locked" &&
             (msg.userId == null || msg.userId == this.activeUserId)
           ) {
+            await this.biometricsService.setShouldAutopromptNow(false);
             // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
             // eslint-disable-next-line @typescript-eslint/no-floating-promises
             this.router.navigate(["lock"]);
diff --git a/libs/common/src/key-management/services/default-process-reload.service.ts b/libs/common/src/key-management/services/default-process-reload.service.ts
index 3f099b7732..9f97e0a94c 100644
--- a/libs/common/src/key-management/services/default-process-reload.service.ts
+++ b/libs/common/src/key-management/services/default-process-reload.service.ts
@@ -39,6 +39,9 @@ export class DefaultProcessReloadService implements ProcessReloadServiceAbstract
           let status = await firstValueFrom(authService.authStatusFor$(userId as UserId));
           status = await authService.getAuthStatus(userId);
           if (status === AuthenticationStatus.Unlocked) {
+            this.logService.info(
+              "[Process Reload Service] User unlocked, preventing process reload",
+            );
             return;
           }
         }
@@ -55,6 +58,9 @@ export class DefaultProcessReloadService implements ProcessReloadServiceAbstract
     if (userId != null) {
       const ephemeralPin = await this.pinService.getPinKeyEncryptedUserKeyEphemeral(userId);
       if (ephemeralPin != null) {
+        this.logService.info(
+          "[Process Reload Service] Ephemeral pin active, preventing process reload",
+        );
         return;
       }
     }
@@ -97,7 +103,12 @@ export class DefaultProcessReloadService implements ProcessReloadServiceAbstract
         await this.reloadCallback();
       }
       return;
+    } else {
+      this.logService.info(
+        "[Process Reload Service] Desktop ipc fingerprint validated, preventing process reload",
+      );
     }
+
     if (this.reloadInterval == null) {
       this.reloadInterval = setInterval(async () => await this.executeProcessReload(), 1000);
     }
diff --git a/libs/key-management/src/angular/lock/components/lock.component.ts b/libs/key-management/src/angular/lock/components/lock.component.ts
index 23f1a7a433..6c912b0eaa 100644
--- a/libs/key-management/src/angular/lock/components/lock.component.ts
+++ b/libs/key-management/src/angular/lock/components/lock.component.ts
@@ -307,10 +307,12 @@ export class LockComponent implements OnInit, OnDestroy {
         (await this.biometricService.getShouldAutopromptNow())
       ) {
         await this.biometricService.setShouldAutopromptNow(false);
+
+        const lastProcessReload = await this.biometricStateService.getLastProcessReload();
         if (
-          (await this.biometricStateService.getLastProcessReload()) == null ||
-          Date.now() - (await this.biometricStateService.getLastProcessReload()).getTime() >
-            AUTOPROMPT_BIOMETRICS_PROCESS_RELOAD_DELAY
+          lastProcessReload == null ||
+          isNaN(lastProcessReload.getTime()) ||
+          Date.now() - lastProcessReload.getTime() > AUTOPROMPT_BIOMETRICS_PROCESS_RELOAD_DELAY
         ) {
           await this.unlockViaBiometrics();
         }

From eedf9af2e79e8e53844f4a4dd35dbaf11f07e071 Mon Sep 17 00:00:00 2001
From: Maciej Zieniuk <167752252+mzieniukbw@users.noreply.github.com>
Date: Tue, 14 Jan 2025 18:39:43 +0100
Subject: [PATCH 084/150] in desktop "Allow browser integration" button fails
 on dev environment, but should pass fine. (#12797)

Co-authored-by: aj-bw <81774843+aj-bw@users.noreply.github.com>
---
 apps/desktop/src/app/accounts/settings.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/desktop/src/app/accounts/settings.component.ts b/apps/desktop/src/app/accounts/settings.component.ts
index 19748e797b..f3440975cf 100644
--- a/apps/desktop/src/app/accounts/settings.component.ts
+++ b/apps/desktop/src/app/accounts/settings.component.ts
@@ -650,7 +650,7 @@ export class SettingsComponent implements OnInit, OnDestroy {
     const skipSupportedPlatformCheck =
       ipc.platform.allowBrowserintegrationOverride || ipc.platform.isDev;
 
-    if (skipSupportedPlatformCheck) {
+    if (!skipSupportedPlatformCheck) {
       if (
         ipc.platform.deviceType === DeviceType.MacOsDesktop &&
         !this.platformUtilsService.isMacAppStore()

From f44b36bdf62ff192ea3da59654f24c08bcd0f0bc Mon Sep 17 00:00:00 2001
From: Oscar Hinton <Hinton@users.noreply.github.com>
Date: Tue, 14 Jan 2025 18:48:50 +0100
Subject: [PATCH 085/150] Fix linting conflicts after merge (#12864)

---
 .../src/auth/popup/settings/account-security.component.ts       | 2 ++
 .../src/vault/popup/services/vault-popup-autofill.service.ts    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/apps/browser/src/auth/popup/settings/account-security.component.ts b/apps/browser/src/auth/popup/settings/account-security.component.ts
index 1a64d860e4..7e094fe508 100644
--- a/apps/browser/src/auth/popup/settings/account-security.component.ts
+++ b/apps/browser/src/auth/popup/settings/account-security.component.ts
@@ -514,6 +514,8 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
         try {
           const userKey = await this.biometricsService.unlockWithBiometricsForUser(userId);
           result = await this.keyService.validateUserKey(userKey, userId);
+          // FIXME: Remove when updating file. Eslint update
+          // eslint-disable-next-line @typescript-eslint/no-unused-vars
         } catch (e) {
           result = false;
         }
diff --git a/apps/browser/src/vault/popup/services/vault-popup-autofill.service.ts b/apps/browser/src/vault/popup/services/vault-popup-autofill.service.ts
index c0ac9c91e1..ff282d7a6d 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-autofill.service.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-autofill.service.ts
@@ -127,6 +127,8 @@ export class VaultPopupAutofillService {
           [currentTabHostname as string]: { bannerIsDismissed: true },
         });
       }
+      // FIXME: Remove when updating file. Eslint update
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (e) {
       throw new Error(
         "There was a problem dismissing the blocked interaction URI notification banner",

From 8621e8aa6a2b6636a95359e13a32c8fdc1b19d73 Mon Sep 17 00:00:00 2001
From: Graham Walker <ghwtx@icloud.com>
Date: Tue, 14 Jan 2025 13:16:26 -0600
Subject: [PATCH 086/150] PM-16170 remove methods using deprecated send
 endpoints (#12751)

---
 .../services/send-api.service.abstraction.ts  |  5 ---
 .../tools/send/services/send-api.service.ts   | 45 +------------------
 2 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/libs/common/src/tools/send/services/send-api.service.abstraction.ts b/libs/common/src/tools/send/services/send-api.service.abstraction.ts
index a6427824a6..570f3e746a 100644
--- a/libs/common/src/tools/send/services/send-api.service.abstraction.ts
+++ b/libs/common/src/tools/send/services/send-api.service.abstraction.ts
@@ -22,11 +22,6 @@ export abstract class SendApiService {
   postSend: (request: SendRequest) => Promise<SendResponse>;
   postFileTypeSend: (request: SendRequest) => Promise<SendFileUploadDataResponse>;
   postSendFile: (sendId: string, fileId: string, data: FormData) => Promise<any>;
-  /**
-   * @deprecated Mar 25 2021: This method has been deprecated in favor of direct uploads.
-   * This method still exists for backward compatibility with old server versions.
-   */
-  postSendFileLegacy: (data: FormData) => Promise<SendResponse>;
   putSend: (id: string, request: SendRequest) => Promise<SendResponse>;
   putSendRemovePassword: (id: string) => Promise<SendResponse>;
   deleteSend: (id: string) => Promise<any>;
diff --git a/libs/common/src/tools/send/services/send-api.service.ts b/libs/common/src/tools/send/services/send-api.service.ts
index ff71408bce..f709553646 100644
--- a/libs/common/src/tools/send/services/send-api.service.ts
+++ b/libs/common/src/tools/send/services/send-api.service.ts
@@ -5,7 +5,6 @@ import {
   FileUploadApiMethods,
   FileUploadService,
 } from "../../../platform/abstractions/file-upload/file-upload.service";
-import { Utils } from "../../../platform/misc/utils";
 import { EncArrayBuffer } from "../../../platform/models/domain/enc-array-buffer";
 import { SendType } from "../enums/send-type";
 import { SendData } from "../models/data/send.data";
@@ -106,15 +105,6 @@ export class SendApiService implements SendApiServiceAbstraction {
     return this.apiService.send("POST", "/sends/" + sendId + "/file/" + fileId, data, true, false);
   }
 
-  /**
-   * @deprecated Mar 25 2021: This method has been deprecated in favor of direct uploads.
-   * This method still exists for backward compatibility with old server versions.
-   */
-  async postSendFileLegacy(data: FormData): Promise<SendResponse> {
-    const r = await this.apiService.send("POST", "/sends/file", data, true, true);
-    return new SendResponse(r);
-  }
-
   async putSend(id: string, request: SendRequest): Promise<SendResponse> {
     const r = await this.apiService.send("PUT", "/sends/" + id, request, true, true);
     return new SendResponse(r);
@@ -173,9 +163,7 @@ export class SendApiService implements SendApiServiceAbstraction {
             this.generateMethods(uploadDataResponse, response),
           );
         } catch (e) {
-          if (e instanceof ErrorResponse && (e as ErrorResponse).statusCode === 404) {
-            response = await this.legacyServerSendFileUpload(sendData, request);
-          } else if (e instanceof ErrorResponse) {
+          if (e instanceof ErrorResponse) {
             throw new Error((e as ErrorResponse).getSingleMessage());
           } else {
             throw e;
@@ -219,35 +207,4 @@ export class SendApiService implements SendApiServiceAbstraction {
       return this.deleteSend(sendId);
     };
   }
-
-  /**
-   * @deprecated Mar 25 2021: This method has been deprecated in favor of direct uploads.
-   * This method still exists for backward compatibility with old server versions.
-   */
-  async legacyServerSendFileUpload(
-    sendData: [Send, EncArrayBuffer],
-    request: SendRequest,
-  ): Promise<SendResponse> {
-    const fd = new FormData();
-    try {
-      const blob = new Blob([sendData[1].buffer], { type: "application/octet-stream" });
-      fd.append("model", JSON.stringify(request));
-      fd.append("data", blob, sendData[0].file.fileName.encryptedString);
-    } catch (e) {
-      if (Utils.isNode && !Utils.isBrowser) {
-        fd.append("model", JSON.stringify(request));
-        fd.append(
-          "data",
-          Buffer.from(sendData[1].buffer) as any,
-          {
-            filepath: sendData[0].file.fileName.encryptedString,
-            contentType: "application/octet-stream",
-          } as any,
-        );
-      } else {
-        throw e;
-      }
-    }
-    return await this.postSendFileLegacy(fd);
-  }
 }

From 27e8a1f27c4477ad645259de90db4e1beb3b9eeb Mon Sep 17 00:00:00 2001
From: rr-bw <102181210+rr-bw@users.noreply.github.com>
Date: Tue, 14 Jan 2025 11:23:51 -0800
Subject: [PATCH 087/150] fix(auth) [PM-17047] Change clientType expression to
 assignment (#12865)

Fixes a bug where we had an expression (`===`) that should be an assignment (`=`).

Feature Flag: UnauthenticatedExtensionUIRefresh
---
 .../login-decryption-options.component.ts                     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libs/auth/src/angular/login-decryption-options/login-decryption-options.component.ts b/libs/auth/src/angular/login-decryption-options/login-decryption-options.component.ts
index 8f22f391b1..a3f5e062e4 100644
--- a/libs/auth/src/angular/login-decryption-options/login-decryption-options.component.ts
+++ b/libs/auth/src/angular/login-decryption-options/login-decryption-options.component.ts
@@ -107,9 +107,7 @@ export class LoginDecryptionOptionsComponent implements OnInit {
     private userDecryptionOptionsService: UserDecryptionOptionsServiceAbstraction,
     private validationService: ValidationService,
   ) {
-    // FIXME: Remove when updating file. Eslint update
-    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-    this.clientType === this.platformUtilsService.getClientType();
+    this.clientType = this.platformUtilsService.getClientType();
   }
 
   async ngOnInit() {

From f2b6f05d3f007500a843ce1c737b1ceda9379606 Mon Sep 17 00:00:00 2001
From: Vijay Oommen <voommen@livefront.com>
Date: Tue, 14 Jan 2025 13:58:57 -0600
Subject: [PATCH 088/150] PM-16891 Applications at risk dialog (#12843)

* Org at risk members click on the card

* Fixing at risk member counts

* At risk member text modification

* Changing ok button to close

* PM-16891 added a dialog for at risk apps

* PM-16891 fixing order of imports (linting error)

* PM-16891 updated PR comments

---------

Co-authored-by: Tom <ttalty@bitwarden.com>
Co-authored-by: Tom <144813356+ttalty@users.noreply.github.com>
---
 apps/web/src/locales/en/messages.json         | 33 +++++++++++++++++++
 .../risk-insights/models/password-health.ts   |  9 +++++
 .../services/risk-insights-report.service.ts  | 25 ++++++++++++++
 .../all-applications.component.html           |  3 +-
 .../all-applications.component.ts             |  7 ++++
 .../org-at-risk-apps-dialog.component.html    | 25 ++++++++++++++
 .../org-at-risk-apps-dialog.component.ts      | 24 ++++++++++++++
 7 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 bitwarden_license/bit-web/src/app/tools/access-intelligence/org-at-risk-apps-dialog.component.html
 create mode 100644 bitwarden_license/bit-web/src/app/tools/access-intelligence/org-at-risk-apps-dialog.component.ts

diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 2779c0470e..eacba623ec 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -122,6 +122,39 @@
       }
     }
   },
+  "atRiskApplicationsWithCount": {
+    "message": "At-risk applications ($COUNT$)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
+  "atRiskMembersDescription": {
+    "message": "These members are logging into applications with weak, exposed, or reused passwords."
+  },
+  "atRiskApplicationsDescription": {
+    "message": "These applications have weak, exposed, or reused passwords."
+  },
+  "atRiskMembersDescriptionWithApp": {
+    "message": "These members are logging into $APPNAME$ with weak, exposed, or reused passwords.",
+    "placeholders": {
+      "appname": {
+        "content": "$1",
+        "example": "Salesforce"
+      }
+    }
+  },
+  "atRiskMembersWithCount": {
+    "message": "At-risk members ($COUNT$)",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "3"
+      }
+    }
+  },
   "atRiskMembersDescription": {
     "message": "These members are logging into applications with weak, exposed, or reused passwords."
   },
diff --git a/bitwarden_license/bit-common/src/tools/reports/risk-insights/models/password-health.ts b/bitwarden_license/bit-common/src/tools/reports/risk-insights/models/password-health.ts
index ad87f319e7..94dad65fdc 100644
--- a/bitwarden_license/bit-common/src/tools/reports/risk-insights/models/password-health.ts
+++ b/bitwarden_license/bit-common/src/tools/reports/risk-insights/models/password-health.ts
@@ -100,3 +100,12 @@ export type AtRiskMemberDetail = {
   email: string;
   atRiskPasswordCount: number;
 };
+
+/*
+ * A list of applications and the count of
+ * at risk passwords for each application
+ */
+export type AtRiskApplicationDetail = {
+  applicationName: string;
+  atRiskPasswordCount: number;
+};
diff --git a/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/risk-insights-report.service.ts b/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/risk-insights-report.service.ts
index d97550b588..c3bcc59eca 100644
--- a/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/risk-insights-report.service.ts
+++ b/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/risk-insights-report.service.ts
@@ -13,6 +13,7 @@ import {
   ApplicationHealthReportDetail,
   ApplicationHealthReportSummary,
   AtRiskMemberDetail,
+  AtRiskApplicationDetail,
   CipherHealthReportDetail,
   CipherHealthReportUriDetail,
   ExposedPasswordDetail,
@@ -114,6 +115,30 @@ export class RiskInsightsReportService {
     }));
   }
 
+  generateAtRiskApplicationList(
+    cipherHealthReportDetails: ApplicationHealthReportDetail[],
+  ): AtRiskApplicationDetail[] {
+    const appsRiskMap = new Map<string, number>();
+
+    cipherHealthReportDetails
+      .filter((app) => app.atRiskPasswordCount > 0)
+      .forEach((app) => {
+        if (appsRiskMap.has(app.applicationName)) {
+          appsRiskMap.set(
+            app.applicationName,
+            appsRiskMap.get(app.applicationName) + app.atRiskPasswordCount,
+          );
+        } else {
+          appsRiskMap.set(app.applicationName, app.atRiskPasswordCount);
+        }
+      });
+
+    return Array.from(appsRiskMap.entries()).map(([applicationName, atRiskPasswordCount]) => ({
+      applicationName,
+      atRiskPasswordCount,
+    }));
+  }
+
   /**
    * Gets the summary from the application health report. Returns total members and applications as well
    * as the total at risk members and at risk applications
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.html b/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.html
index 0493f7e44b..e17ac07868 100644
--- a/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.html
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.html
@@ -35,10 +35,11 @@
     >
     </tools-card>
     <tools-card
-      class="tw-flex-1"
+      class="tw-flex-1 tw-cursor-pointer"
       [title]="'atRiskApplications' | i18n"
       [value]="applicationSummary.totalAtRiskApplicationCount"
       [maxValue]="applicationSummary.totalApplicationCount"
+      (click)="showOrgAtRiskApps()"
     >
     </tools-card>
   </div>
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.ts
index 00708de282..5fb12fed09 100644
--- a/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.ts
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.ts
@@ -32,6 +32,7 @@ import { SharedModule } from "@bitwarden/web-vault/app/shared";
 import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pipes/pipes.module";
 
 import { openAppAtRiskMembersDialog } from "./app-at-risk-members-dialog.component";
+import { OrgAtRiskAppsDialogComponent } from "./org-at-risk-apps-dialog.component";
 import { OrgAtRiskMembersDialogComponent } from "./org-at-risk-members-dialog.component";
 import { ApplicationsLoadingComponent } from "./risk-insights-loading.component";
 
@@ -154,6 +155,12 @@ export class AllApplicationsComponent implements OnInit, OnDestroy {
     });
   };
 
+  showOrgAtRiskApps = async () => {
+    this.dialogService.open(OrgAtRiskAppsDialogComponent, {
+      data: this.reportService.generateAtRiskApplicationList(this.dataSource.data),
+    });
+  };
+
   onCheckboxChange(id: number, event: Event) {
     const isChecked = (event.target as HTMLInputElement).checked;
     if (isChecked) {
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/org-at-risk-apps-dialog.component.html b/bitwarden_license/bit-web/src/app/tools/access-intelligence/org-at-risk-apps-dialog.component.html
new file mode 100644
index 0000000000..298011b215
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/org-at-risk-apps-dialog.component.html
@@ -0,0 +1,25 @@
+<bit-dialog>
+  <ng-container bitDialogTitle>
+    <span bitDialogTitle>{{ "atRiskApplicationsWithCount" | i18n: atRiskApps.length }} </span>
+  </ng-container>
+  <ng-container bitDialogContent>
+    <div class="tw-flex tw-flex-col tw-gap-2">
+      <span bitTypography="body1">{{ "atRiskApplicationsDescription" | i18n }}</span>
+      <div class="tw-flex tw-justify-between tw-mt-2 tw-text-muted">
+        <div bitTypography="body2" class="tw-font-bold">{{ "application" | i18n }}</div>
+        <div bitTypography="body2" class="tw-font-bold">{{ "atRiskPasswords" | i18n }}</div>
+      </div>
+      <ng-container *ngFor="let app of atRiskApps">
+        <div class="tw-flex tw-justify-between tw-mt-2">
+          <div>{{ app.applicationName }}</div>
+          <div>{{ app.atRiskPasswordCount }}</div>
+        </div>
+      </ng-container>
+    </div>
+  </ng-container>
+  <ng-container bitDialogFooter>
+    <button bitButton bitDialogClose buttonType="secondary" type="button">
+      {{ "close" | i18n }}
+    </button>
+  </ng-container>
+</bit-dialog>
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/org-at-risk-apps-dialog.component.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/org-at-risk-apps-dialog.component.ts
new file mode 100644
index 0000000000..0ae00f6087
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/org-at-risk-apps-dialog.component.ts
@@ -0,0 +1,24 @@
+import { DIALOG_DATA } from "@angular/cdk/dialog";
+import { CommonModule } from "@angular/common";
+import { Component, Inject } from "@angular/core";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { AtRiskApplicationDetail } from "@bitwarden/bit-common/tools/reports/risk-insights/models/password-health";
+import { ButtonModule, DialogModule, DialogService, TypographyModule } from "@bitwarden/components";
+
+export const openOrgAtRiskMembersDialog = (
+  dialogService: DialogService,
+  dialogConfig: AtRiskApplicationDetail[],
+) =>
+  dialogService.open<boolean, AtRiskApplicationDetail[]>(OrgAtRiskAppsDialogComponent, {
+    data: dialogConfig,
+  });
+
+@Component({
+  standalone: true,
+  templateUrl: "./org-at-risk-apps-dialog.component.html",
+  imports: [ButtonModule, CommonModule, DialogModule, JslibModule, TypographyModule],
+})
+export class OrgAtRiskAppsDialogComponent {
+  constructor(@Inject(DIALOG_DATA) protected atRiskApps: AtRiskApplicationDetail[]) {}
+}

From 39a5addddc4a1a1d5d0696113663e8af1abd013a Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github.com>
Date: Tue, 14 Jan 2025 20:07:32 +0000
Subject: [PATCH 089/150] Bumped Desktop client to 2025.1.2

---
 apps/desktop/package.json          | 2 +-
 apps/desktop/src/package-lock.json | 4 ++--
 apps/desktop/src/package.json      | 2 +-
 package-lock.json                  | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index b8541aad2e..8f6c6525a3 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bitwarden/desktop",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2025.1.1",
+  "version": "2025.1.2",
   "keywords": [
     "bitwarden",
     "password",
diff --git a/apps/desktop/src/package-lock.json b/apps/desktop/src/package-lock.json
index d8705487d8..d878e1af2a 100644
--- a/apps/desktop/src/package-lock.json
+++ b/apps/desktop/src/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@bitwarden/desktop",
-  "version": "2025.1.1",
+  "version": "2025.1.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bitwarden/desktop",
-      "version": "2025.1.1",
+      "version": "2025.1.2",
       "license": "GPL-3.0",
       "dependencies": {
         "@bitwarden/desktop-napi": "file:../desktop_native/napi"
diff --git a/apps/desktop/src/package.json b/apps/desktop/src/package.json
index 95490ee34d..08bdd74506 100644
--- a/apps/desktop/src/package.json
+++ b/apps/desktop/src/package.json
@@ -2,7 +2,7 @@
   "name": "@bitwarden/desktop",
   "productName": "Bitwarden",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2025.1.1",
+  "version": "2025.1.2",
   "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",
diff --git a/package-lock.json b/package-lock.json
index 5366b26861..6b8d35c6d4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -231,7 +231,7 @@
     },
     "apps/desktop": {
       "name": "@bitwarden/desktop",
-      "version": "2025.1.1",
+      "version": "2025.1.2",
       "hasInstallScript": true,
       "license": "GPL-3.0"
     },
@@ -30884,6 +30884,7 @@
       "integrity": "sha512-032cPxaEKwM+GT3vA5JXNzIaizx388rhsSW79vGRNGXfRRAdEAn2mvk36PvK5HnOchyWZ7afLEXqYCvPCrzuzQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=16"
       },

From 04566488dc827b95cb0e058b9c107165f2dcedac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=9C=A8=20Audrey=20=E2=9C=A8?= <ajensen@bitwarden.com>
Date: Tue, 14 Jan 2025 15:18:14 -0500
Subject: [PATCH 090/150] add close button to passoword history dialog (#12790)

---
 ...redential-generator-history-dialog.component.html |  6 ++++++
 .../credential-generator-history-dialog.component.ts | 12 ++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/libs/tools/generator/components/src/credential-generator-history-dialog.component.html b/libs/tools/generator/components/src/credential-generator-history-dialog.component.html
index b07eb62ae9..ad629601c3 100644
--- a/libs/tools/generator/components/src/credential-generator-history-dialog.component.html
+++ b/libs/tools/generator/components/src/credential-generator-history-dialog.component.html
@@ -14,5 +14,11 @@
     >
       {{ "clearHistory" | i18n }}
     </button>
+    <!-- FIXME: Remove the close button once the dialog doesn't overlap electron's
+         drag area.
+     -->
+    <button bitButton type="submit" buttonType="secondary" (click)="close()">
+      {{ "close" | i18n }}
+    </button>
   </ng-container>
 </bit-dialog>
diff --git a/libs/tools/generator/components/src/credential-generator-history-dialog.component.ts b/libs/tools/generator/components/src/credential-generator-history-dialog.component.ts
index cec818b1cd..7bcffd9239 100644
--- a/libs/tools/generator/components/src/credential-generator-history-dialog.component.ts
+++ b/libs/tools/generator/components/src/credential-generator-history-dialog.component.ts
@@ -1,5 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
+import { DialogRef } from "@angular/cdk/dialog";
 import { CommonModule } from "@angular/common";
 import { Component } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
@@ -34,6 +35,7 @@ export class CredentialGeneratorHistoryDialogComponent {
     private accountService: AccountService,
     private history: GeneratorHistoryService,
     private dialogService: DialogService,
+    private dialogRef: DialogRef,
   ) {
     this.accountService.activeAccount$
       .pipe(
@@ -52,7 +54,13 @@ export class CredentialGeneratorHistoryDialogComponent {
       .subscribe(this.hasHistory$);
   }
 
-  clear = async () => {
+  /** closes the dialog */
+  protected close() {
+    this.dialogRef.close();
+  }
+
+  /** Launches clear history flow */
+  protected async clear() {
     const confirmed = await this.dialogService.openSimpleDialog({
       title: { key: "clearGeneratorHistoryTitle" },
       content: { key: "cleargGeneratorHistoryDescription" },
@@ -64,5 +72,5 @@ export class CredentialGeneratorHistoryDialogComponent {
     if (confirmed) {
       await this.history.clear(await firstValueFrom(this.userId$));
     }
-  };
+  }
 }

From 553d20f7a7aabf2ddf357efb1c4458a1071cad45 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 14 Jan 2025 15:42:49 -0500
Subject: [PATCH 091/150] [deps] AC: Update bufferutil to v4.0.9 (#12700)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jimmy Vo <huynhmaivo82@gmail.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6b8d35c6d4..87e0354f7a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,7 +38,7 @@
         "bootstrap": "4.6.0",
         "braintree-web-drop-in": "1.43.0",
         "buffer": "6.0.3",
-        "bufferutil": "4.0.8",
+        "bufferutil": "4.0.9",
         "chalk": "4.1.2",
         "commander": "11.1.0",
         "core-js": "3.39.0",
@@ -12728,9 +12728,9 @@
       "license": "MIT"
     },
     "node_modules/bufferutil": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.8.tgz",
-      "integrity": "sha512-4T53u4PdgsXqKaIctwF8ifXlRTTmEPJ8iEPWFdGZvcf7sbwYo6FKFEX9eNNAnzFZ7EzJAQ3CJeOtCRA4rDp7Pw==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.9.tgz",
+      "integrity": "sha512-WDtdLmJvAuNNPzByAYpRo2rF1Mmradw6gvWsQKf63476DDXmomT9zUiGypLcG4ibIM67vhAj8jJRdbmEws2Aqw==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 1090d3efb3..641a49c4d0 100644
--- a/package.json
+++ b/package.json
@@ -168,7 +168,7 @@
     "bootstrap": "4.6.0",
     "braintree-web-drop-in": "1.43.0",
     "buffer": "6.0.3",
-    "bufferutil": "4.0.8",
+    "bufferutil": "4.0.9",
     "chalk": "4.1.2",
     "commander": "11.1.0",
     "core-js": "3.39.0",

From 5fb383d7dc3b0b186e83533f8a3c44bf84c6ccd5 Mon Sep 17 00:00:00 2001
From: Evan Bassler <ebassler@livefront.com>
Date: Tue, 14 Jan 2025 16:10:57 -0600
Subject: [PATCH 092/150] [PM-16248] add notification refresh feature flag
 (#12859)

* add notification refresh feature flag

* update order

---------

Co-authored-by: Evan Bassler <evanbassler@Mac.attlocal.net>
---
 libs/common/src/enums/feature-flag.enum.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts
index feffe2ca44..dde31acb9e 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -13,6 +13,7 @@ export enum FeatureFlag {
   InlineMenuPositioningImprovements = "inline-menu-positioning-improvements",
   InlineMenuTotp = "inline-menu-totp",
   NotificationBarAddLoginImprovements = "notification-bar-add-login-improvements",
+  NotificationRefresh = "notification-refresh",
   UseTreeWalkerApiForPageDetailsCollection = "use-tree-walker-api-for-page-details-collection",
 
   BrowserFilelessImport = "browser-fileless-import",
@@ -70,6 +71,7 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.InlineMenuPositioningImprovements]: FALSE,
   [FeatureFlag.InlineMenuTotp]: FALSE,
   [FeatureFlag.NotificationBarAddLoginImprovements]: FALSE,
+  [FeatureFlag.NotificationRefresh]: FALSE,
   [FeatureFlag.UseTreeWalkerApiForPageDetailsCollection]: FALSE,
 
   [FeatureFlag.BrowserFilelessImport]: FALSE,

From 6f018e1b2e74f0bdf003a2187bccbee14ec4a7bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rui=20Tom=C3=A9?=
 <108268980+r-tome@users.noreply.github.com>
Date: Tue, 14 Jan 2025 22:11:29 +0000
Subject: [PATCH 093/150] Fix claimed domains page for manage SSO users by
 replacing policies server check with policy service (#12863)

---
 .../domain-verification.component.ts              | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts
index 2a2ae73227..1cbe57a708 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts
@@ -16,7 +16,7 @@ import {
 import { OrgDomainApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization-domain/org-domain-api.service.abstraction";
 import { OrgDomainServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization-domain/org-domain.service.abstraction";
 import { OrganizationDomainResponse } from "@bitwarden/common/admin-console/abstractions/organization-domain/responses/organization-domain.response";
-import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { HttpStatusCode } from "@bitwarden/common/enums";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
@@ -54,7 +54,7 @@ export class DomainVerificationComponent implements OnInit, OnDestroy {
     private validationService: ValidationService,
     private toastService: ToastService,
     private configService: ConfigService,
-    private policyApiService: PolicyApiServiceAbstraction,
+    private policyService: PolicyService,
   ) {
     this.accountDeprovisioningEnabled$ = this.configService.getFeatureFlag$(
       FeatureFlag.AccountDeprovisioning,
@@ -83,9 +83,14 @@ export class DomainVerificationComponent implements OnInit, OnDestroy {
     await this.orgDomainApiService.getAllByOrgId(this.organizationId);
 
     if (await this.configService.getFeatureFlag(FeatureFlag.AccountDeprovisioning)) {
-      const singleOrgPolicy = await this.policyApiService.getPolicy(
-        this.organizationId,
-        PolicyType.SingleOrg,
+      const singleOrgPolicy = await firstValueFrom(
+        this.policyService.policies$.pipe(
+          map((policies) =>
+            policies.find(
+              (p) => p.type === PolicyType.SingleOrg && p.organizationId === this.organizationId,
+            ),
+          ),
+        ),
       );
       this.singleOrgPolicyEnabled = singleOrgPolicy?.enabled ?? false;
     }

From 55e4b5ee09a8bfce868f614eca27ddc3f32ef74d Mon Sep 17 00:00:00 2001
From: Addison Beck <github@addisonbeck.com>
Date: Wed, 15 Jan 2025 05:41:44 -0500
Subject: [PATCH 094/150] fix: Use `WeakMap` in `DerivedStateProvider` to
 separate user state caches (#12866)

Bug fix for PM-15914 where switching users would incorrectly share cached
derived states. The `DerivedStateProvider` now uses a `WeakMap` to maintain
separate caches for each user's state `Observable`.

- Modifies `DefaultDerivedStateProvider` to use `WeakMap` for caching
- Each user's state `Observable` gets its own definition cache
- Added test to verify correct behavior during user switching
- Allows proper garbage collection of unused state caches

This fixes issues where:
- Users would see other users' cached states after switching accounts
- Derived states weren't properly isolated between users
- Cache keys didn't distinguish between different user states
---
 .../default-derived-state.provider.ts         | 19 +++++++++++---
 .../default-derived-state.spec.ts             | 26 +++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/libs/common/src/platform/state/implementations/default-derived-state.provider.ts b/libs/common/src/platform/state/implementations/default-derived-state.provider.ts
index 3c8c39e21e..61f36fa0b7 100644
--- a/libs/common/src/platform/state/implementations/default-derived-state.provider.ts
+++ b/libs/common/src/platform/state/implementations/default-derived-state.provider.ts
@@ -8,7 +8,14 @@ import { DerivedStateProvider } from "../derived-state.provider";
 import { DefaultDerivedState } from "./default-derived-state";
 
 export class DefaultDerivedStateProvider implements DerivedStateProvider {
-  private cache: Record<string, DerivedState<unknown>> = {};
+  /**
+   * The cache uses a WeakMap to maintain separate derived states per user.
+   * Each user's state Observable acts as a unique key, without needing to
+   * pass around `userId`. Also, when a user's state Observable is cleaned up
+   * (like during an account swap) their cache is automatically garbage
+   * collected.
+   */
+  private cache = new WeakMap<Observable<unknown>, Record<string, DerivedState<unknown>>>();
 
   constructor() {}
 
@@ -17,8 +24,14 @@ export class DefaultDerivedStateProvider implements DerivedStateProvider {
     deriveDefinition: DeriveDefinition<TFrom, TTo, TDeps>,
     dependencies: TDeps,
   ): DerivedState<TTo> {
+    let stateCache = this.cache.get(parentState$);
+    if (!stateCache) {
+      stateCache = {};
+      this.cache.set(parentState$, stateCache);
+    }
+
     const cacheKey = deriveDefinition.buildCacheKey();
-    const existingDerivedState = this.cache[cacheKey];
+    const existingDerivedState = stateCache[cacheKey];
     if (existingDerivedState != null) {
       // I have to cast out of the unknown generic but this should be safe if rules
       // around domain token are made
@@ -26,7 +39,7 @@ export class DefaultDerivedStateProvider implements DerivedStateProvider {
     }
 
     const newDerivedState = this.buildDerivedState(parentState$, deriveDefinition, dependencies);
-    this.cache[cacheKey] = newDerivedState;
+    stateCache[cacheKey] = newDerivedState;
     return newDerivedState;
   }
 
diff --git a/libs/common/src/platform/state/implementations/default-derived-state.spec.ts b/libs/common/src/platform/state/implementations/default-derived-state.spec.ts
index 7e8d76bd20..6fcc1c408c 100644
--- a/libs/common/src/platform/state/implementations/default-derived-state.spec.ts
+++ b/libs/common/src/platform/state/implementations/default-derived-state.spec.ts
@@ -9,6 +9,7 @@ import { DeriveDefinition } from "../derive-definition";
 import { StateDefinition } from "../state-definition";
 
 import { DefaultDerivedState } from "./default-derived-state";
+import { DefaultDerivedStateProvider } from "./default-derived-state.provider";
 
 let callCount = 0;
 const cleanupDelayMs = 10;
@@ -182,4 +183,29 @@ describe("DefaultDerivedState", () => {
       expect(await firstValueFrom(observable)).toEqual(new Date(newDate));
     });
   });
+
+  describe("account switching", () => {
+    let provider: DefaultDerivedStateProvider;
+
+    beforeEach(() => {
+      provider = new DefaultDerivedStateProvider();
+    });
+
+    it("should provide a dedicated cache for each account", async () => {
+      const user1State$ = new Subject<string>();
+      const user1Derived = provider.get(user1State$, deriveDefinition, deps);
+      const user1Emissions = trackEmissions(user1Derived.state$);
+
+      const user2State$ = new Subject<string>();
+      const user2Derived = provider.get(user2State$, deriveDefinition, deps);
+      const user2Emissions = trackEmissions(user2Derived.state$);
+
+      user1State$.next("2015-12-30");
+      user2State$.next("2020-12-29");
+      await awaitAsync();
+
+      expect(user1Emissions).toEqual([new Date("2015-12-30")]);
+      expect(user2Emissions).toEqual([new Date("2020-12-29")]);
+    });
+  });
 });

From ee6822c00d70c4eace5109b96bb78f2a9fe661ee Mon Sep 17 00:00:00 2001
From: Jonas Hendrickx <jhendrickx@bitwarden.com>
Date: Wed, 15 Jan 2025 16:05:31 +0100
Subject: [PATCH 095/150] [PM-17064] Prevent error being thrown when
 taxInformation is undefined. (#12884)

---
 .../billing/organizations/change-plan-dialog.component.ts   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts b/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
index bc5c7da8db..73577c7b00 100644
--- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
+++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
@@ -1062,7 +1062,11 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
   }
 
   private refreshSalesTax(): void {
-    if (!this.taxInformation.country || !this.taxInformation.postalCode) {
+    if (
+      this.taxInformation === undefined ||
+      !this.taxInformation.country ||
+      !this.taxInformation.postalCode
+    ) {
       return;
     }
 

From bdab4aa939e2d41f37afef666e9877a5b102b3f4 Mon Sep 17 00:00:00 2001
From: Maciej Zieniuk <167752252+mzieniukbw@users.noreply.github.com>
Date: Wed, 15 Jan 2025 16:29:37 +0100
Subject: [PATCH 096/150] PM-17042: Biometrics auto prompt popup does not show
 up on safari (#12868)

This is due to missing await before process reload, triggered by lock, effectively disabling the biometrics auto prompt on safari.
This should be detected by eslint, but due to misconfiguration, nothing was reported. Also fixed two other missing awaits on biometrics unlock.
---
 .../biometrics/background-browser-biometrics.service.ts       | 4 ++--
 apps/browser/src/popup/app.component.ts                       | 4 ++--
 tsconfig.eslint.json                                          | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts b/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
index 4c4753c3f7..e943f241f7 100644
--- a/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
+++ b/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
@@ -97,7 +97,7 @@ export class BackgroundBrowserBiometricsService extends BiometricsService {
           if (await this.keyService.validateUserKey(userKey, userId)) {
             await this.biometricStateService.setBiometricUnlockEnabled(true);
             await this.biometricStateService.setFingerprintValidated(true);
-            this.keyService.setUserKey(userKey, userId);
+            await this.keyService.setUserKey(userKey, userId);
             return userKey;
           }
         } else {
@@ -115,7 +115,7 @@ export class BackgroundBrowserBiometricsService extends BiometricsService {
           if (await this.keyService.validateUserKey(userKey, userId)) {
             await this.biometricStateService.setBiometricUnlockEnabled(true);
             await this.biometricStateService.setFingerprintValidated(true);
-            this.keyService.setUserKey(userKey, userId);
+            await this.keyService.setUserKey(userKey, userId);
             return userKey;
           }
         } else {
diff --git a/apps/browser/src/popup/app.component.ts b/apps/browser/src/popup/app.component.ts
index 7b6e402a90..9d4835889b 100644
--- a/apps/browser/src/popup/app.component.ts
+++ b/apps/browser/src/popup/app.component.ts
@@ -137,8 +137,8 @@ export class AppComponent implements OnInit, OnDestroy {
             this.toastService._showToast(msg);
           } else if (msg.command === "reloadProcess") {
             if (this.platformUtilsService.isSafari()) {
-              window.setTimeout(() => {
-                this.biometricStateService.updateLastProcessReload();
+              window.setTimeout(async () => {
+                await this.biometricStateService.updateLastProcessReload();
                 window.location.reload();
               }, 2000);
             }
diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
index 941a612a30..a69452389f 100644
--- a/tsconfig.eslint.json
+++ b/tsconfig.eslint.json
@@ -36,6 +36,8 @@
       "@bitwarden/platform": ["./libs/platform/src"],
       "@bitwarden/node/*": ["./libs/node/src/*"],
       "@bitwarden/vault": ["./libs/vault/src"],
+      "@bitwarden/key-management": ["./libs/key-management/src"],
+      "@bitwarden/key-management/angular": ["./libs/key-management/src/angular"],
       "@bitwarden/bit-common/*": ["./bitwarden_license/bit-common/src/*"]
     },
     "plugins": [

From 8c13ea894ba9d88d511aa533c071c71b92051bf2 Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Thu, 16 Jan 2025 01:43:26 +1000
Subject: [PATCH 097/150] [PM-16917] Remove jest-extended dependency (#12798)

* add toContainPartialObjects matcher (replacing toIncludeAllPartialMembers from jest-extended)
* replace jest-extended matchers with equivalent default matchers
---
 .github/renovate.json                         |  2 +-
 .../vault-header-v2.component.spec.ts         |  2 +-
 .../view-v2/view-v2.component.spec.ts         | 12 +--
 .../vault-popup-list-filters.service.spec.ts  |  4 +-
 .../default-vnext-collection.service.spec.ts  | 10 +--
 libs/admin-console/test.setup.ts              |  4 +
 libs/admin-console/tsconfig.json              |  2 +-
 libs/common/spec/matchers/index.ts            | 12 +--
 .../to-contain-partial-objects.spec.ts        | 77 +++++++++++++++++++
 .../matchers/to-contain-partial-objects.ts    | 31 ++++++++
 ...-service-legacy-encryptor-provider.spec.ts | 12 +--
 libs/common/src/tools/rx.spec.ts              |  2 +-
 .../services/folder/folder.service.spec.ts    |  4 +-
 package-lock.json                             | 24 +-----
 package.json                                  |  2 +-
 15 files changed, 146 insertions(+), 54 deletions(-)
 create mode 100644 libs/common/spec/matchers/to-contain-partial-objects.spec.ts
 create mode 100644 libs/common/spec/matchers/to-contain-partial-objects.ts

diff --git a/.github/renovate.json b/.github/renovate.json
index 776c66af68..a1987ca038 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -210,10 +210,10 @@
         "eslint-plugin-storybook",
         "eslint-plugin-tailwindcss",
         "husky",
-        "jest-extended",
         "jest-junit",
         "jest-mock-extended",
         "jest-preset-angular",
+        "jest-diff",
         "lint-staged",
         "ts-jest"
       ],
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.spec.ts
index 38ec6056d1..1f67dd51c2 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.spec.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.spec.ts
@@ -152,7 +152,7 @@ describe("VaultHeaderV2Component", () => {
   it("defaults the initial state to true", (done) => {
     // The initial value of the `state$` variable above is undefined
     component["initialDisclosureVisibility$"].subscribe((initialVisibility) => {
-      expect(initialVisibility).toBeTrue();
+      expect(initialVisibility).toBe(true);
       done();
     });
 
diff --git a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.spec.ts
index 7ee15aa833..526ab2e257 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.spec.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.spec.ts
@@ -179,7 +179,7 @@ describe("ViewV2Component", () => {
 
       flush(); // Resolve all promises
 
-      expect(doAutofill).toHaveBeenCalledOnce();
+      expect(doAutofill).toHaveBeenCalledTimes(1);
     }));
 
     it('invokes `copy` when action="copy-username"', fakeAsync(() => {
@@ -187,7 +187,7 @@ describe("ViewV2Component", () => {
 
       flush(); // Resolve all promises
 
-      expect(copy).toHaveBeenCalledOnce();
+      expect(copy).toHaveBeenCalledTimes(1);
     }));
 
     it('invokes `copy` when action="copy-password"', fakeAsync(() => {
@@ -195,7 +195,7 @@ describe("ViewV2Component", () => {
 
       flush(); // Resolve all promises
 
-      expect(copy).toHaveBeenCalledOnce();
+      expect(copy).toHaveBeenCalledTimes(1);
     }));
 
     it('invokes `copy` when action="copy-totp"', fakeAsync(() => {
@@ -203,7 +203,7 @@ describe("ViewV2Component", () => {
 
       flush(); // Resolve all promises
 
-      expect(copy).toHaveBeenCalledOnce();
+      expect(copy).toHaveBeenCalledTimes(1);
     }));
 
     it("closes the popout after a load action", fakeAsync(() => {
@@ -218,9 +218,9 @@ describe("ViewV2Component", () => {
 
       flush(); // Resolve all promises
 
-      expect(doAutofill).toHaveBeenCalledOnce();
+      expect(doAutofill).toHaveBeenCalledTimes(1);
       expect(focusSpy).toHaveBeenCalledWith(99);
-      expect(closeSpy).toHaveBeenCalledOnce();
+      expect(closeSpy).toHaveBeenCalledTimes(1);
     }));
   });
 });
diff --git a/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts b/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts
index 0eb91c6cbe..e1236be08f 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts
@@ -488,7 +488,7 @@ describe("VaultPopupListFiltersService", () => {
       state$.next(true);
 
       service.filterVisibilityState$.subscribe((filterVisibility) => {
-        expect(filterVisibility).toBeTrue();
+        expect(filterVisibility).toBe(true);
         done();
       });
     });
@@ -496,7 +496,7 @@ describe("VaultPopupListFiltersService", () => {
     it("updates stored filter state", async () => {
       await service.updateFilterVisibility(false);
 
-      expect(update).toHaveBeenCalledOnce();
+      expect(update).toHaveBeenCalledTimes(1);
       // Get callback passed to `update`
       const updateCallback = update.mock.calls[0][0];
       expect(updateCallback()).toBe(false);
diff --git a/libs/admin-console/src/common/collections/services/default-vnext-collection.service.spec.ts b/libs/admin-console/src/common/collections/services/default-vnext-collection.service.spec.ts
index 4aa54429aa..048a473394 100644
--- a/libs/admin-console/src/common/collections/services/default-vnext-collection.service.spec.ts
+++ b/libs/admin-console/src/common/collections/services/default-vnext-collection.service.spec.ts
@@ -91,7 +91,7 @@ describe("DefaultvNextCollectionService", () => {
 
       // Assert emitted values
       expect(result.length).toBe(2);
-      expect(result).toIncludeAllPartialMembers([
+      expect(result).toContainPartialObjects([
         {
           id: collection1.id,
           name: "DEC_NAME_" + collection1.id,
@@ -167,7 +167,7 @@ describe("DefaultvNextCollectionService", () => {
       const result = await firstValueFrom(collectionService.encryptedCollections$(userId));
 
       expect(result.length).toBe(2);
-      expect(result).toIncludeAllPartialMembers([
+      expect(result).toContainPartialObjects([
         {
           id: collection1.id,
           name: makeEncString("ENC_NAME_" + collection1.id),
@@ -205,7 +205,7 @@ describe("DefaultvNextCollectionService", () => {
 
       const result = await firstValueFrom(collectionService.encryptedCollections$(userId));
       expect(result.length).toBe(3);
-      expect(result).toIncludeAllPartialMembers([
+      expect(result).toContainPartialObjects([
         {
           id: collection1.id,
           name: makeEncString("UPDATED_ENC_NAME_" + collection1.id),
@@ -230,7 +230,7 @@ describe("DefaultvNextCollectionService", () => {
 
       const result = await firstValueFrom(collectionService.encryptedCollections$(userId));
       expect(result.length).toBe(1);
-      expect(result).toIncludeAllPartialMembers([
+      expect(result).toContainPartialObjects([
         {
           id: collection1.id,
           name: makeEncString("ENC_NAME_" + collection1.id),
@@ -253,7 +253,7 @@ describe("DefaultvNextCollectionService", () => {
 
       const result = await firstValueFrom(collectionService.encryptedCollections$(userId));
       expect(result.length).toBe(1);
-      expect(result).toIncludeAllPartialMembers([
+      expect(result).toContainPartialObjects([
         {
           id: newCollection3.id,
           name: makeEncString("ENC_NAME_" + newCollection3.id),
diff --git a/libs/admin-console/test.setup.ts b/libs/admin-console/test.setup.ts
index 6be6e7b8dd..8ab102f2cf 100644
--- a/libs/admin-console/test.setup.ts
+++ b/libs/admin-console/test.setup.ts
@@ -1,6 +1,10 @@
 import { webcrypto } from "crypto";
+
+import { addCustomMatchers } from "@bitwarden/common/spec";
 import "jest-preset-angular/setup-jest";
 
+addCustomMatchers();
+
 Object.defineProperty(window, "CSS", { value: null });
 Object.defineProperty(window, "getComputedStyle", {
   value: () => {
diff --git a/libs/admin-console/tsconfig.json b/libs/admin-console/tsconfig.json
index 3d22cb2ec5..4f057fd6af 100644
--- a/libs/admin-console/tsconfig.json
+++ b/libs/admin-console/tsconfig.json
@@ -8,6 +8,6 @@
       "@bitwarden/key-management": ["../key-management/src"]
     }
   },
-  "include": ["src", "spec"],
+  "include": ["src", "spec", "../../libs/common/custom-matchers.d.ts"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/libs/common/spec/matchers/index.ts b/libs/common/spec/matchers/index.ts
index 44440be5b5..b2e09cc8e9 100644
--- a/libs/common/spec/matchers/index.ts
+++ b/libs/common/spec/matchers/index.ts
@@ -1,16 +1,12 @@
-import * as matchers from "jest-extended";
-
 import { toBeFulfilled, toBeResolved, toBeRejected } from "./promise-fulfilled";
 import { toAlmostEqual } from "./to-almost-equal";
+import { toContainPartialObjects } from "./to-contain-partial-objects";
 import { toEqualBuffer } from "./to-equal-buffer";
 
 export * from "./to-equal-buffer";
 export * from "./to-almost-equal";
 export * from "./promise-fulfilled";
 
-// add all jest-extended matchers
-expect.extend(matchers);
-
 export function addCustomMatchers() {
   expect.extend({
     toEqualBuffer: toEqualBuffer,
@@ -18,6 +14,7 @@ export function addCustomMatchers() {
     toBeFulfilled: toBeFulfilled,
     toBeResolved: toBeResolved,
     toBeRejected: toBeRejected,
+    toContainPartialObjects,
   });
 }
 
@@ -59,4 +56,9 @@ export interface CustomMatchers<R = unknown> {
    * @returns CustomMatcherResult indicating whether or not the test passed
    */
   toBeRejected(withinMs?: number): Promise<R>;
+  /**
+   * Matches if the received array contains all the expected objects using partial matching (expect.objectContaining).
+   * @param expected An array of partial objects that should be contained in the received array.
+   */
+  toContainPartialObjects<T>(expected: Array<T>): R;
 }
diff --git a/libs/common/spec/matchers/to-contain-partial-objects.spec.ts b/libs/common/spec/matchers/to-contain-partial-objects.spec.ts
new file mode 100644
index 0000000000..ab6f90adf1
--- /dev/null
+++ b/libs/common/spec/matchers/to-contain-partial-objects.spec.ts
@@ -0,0 +1,77 @@
+describe("toContainPartialObjects", () => {
+  describe("matches", () => {
+    it("if the array only contains the partial objects", () => {
+      const actual = [
+        {
+          id: 1,
+          name: "foo",
+        },
+        {
+          id: 2,
+          name: "bar",
+        },
+      ];
+
+      const expected = [{ id: 1 }, { id: 2 }];
+
+      expect(actual).toContainPartialObjects(expected);
+    });
+
+    it("if the array contains the partial objects and other objects", () => {
+      const actual = [
+        {
+          id: 1,
+          name: "foo",
+        },
+        {
+          id: 2,
+          name: "bar",
+        },
+        {
+          id: 3,
+          name: "baz",
+        },
+      ];
+
+      const expected = [{ id: 1 }, { id: 2 }];
+
+      expect(actual).toContainPartialObjects(expected);
+    });
+  });
+
+  describe("doesn't match", () => {
+    it("if the array does not contain any partial objects", () => {
+      const actual = [
+        {
+          id: 1,
+          name: "foo",
+        },
+        {
+          id: 2,
+          name: "bar",
+        },
+      ];
+
+      const expected = [{ id: 1, name: "Foo" }];
+
+      expect(actual).not.toContainPartialObjects(expected);
+    });
+
+    it("if the array contains some but not all partial objects", () => {
+      const actual = [
+        {
+          id: 1,
+          name: "foo",
+        },
+        {
+          id: 2,
+          name: "bar",
+        },
+      ];
+
+      const expected = [{ id: 2 }, { id: 3 }];
+
+      expect(actual).not.toContainPartialObjects(expected);
+    });
+  });
+});
diff --git a/libs/common/spec/matchers/to-contain-partial-objects.ts b/libs/common/spec/matchers/to-contain-partial-objects.ts
new file mode 100644
index 0000000000..f072ca6fba
--- /dev/null
+++ b/libs/common/spec/matchers/to-contain-partial-objects.ts
@@ -0,0 +1,31 @@
+import { EOL } from "os";
+
+import { diff } from "jest-diff";
+
+export const toContainPartialObjects: jest.CustomMatcher = function (
+  received: Array<any>,
+  expected: Array<any>,
+) {
+  const matched = this.equals(
+    received,
+    expect.arrayContaining(expected.map((e) => expect.objectContaining(e))),
+  );
+
+  if (matched) {
+    return {
+      message: () =>
+        "Expected the received array NOT to include partial matches for all expected objects." +
+        EOL +
+        diff(expected, received),
+      pass: true,
+    };
+  }
+
+  return {
+    message: () =>
+      "Expected the received array to contain partial matches for all expected objects." +
+      EOL +
+      diff(expected, received),
+    pass: false,
+  };
+};
diff --git a/libs/common/src/tools/cryptography/key-service-legacy-encryptor-provider.spec.ts b/libs/common/src/tools/cryptography/key-service-legacy-encryptor-provider.spec.ts
index 831cad7415..0b60aef491 100644
--- a/libs/common/src/tools/cryptography/key-service-legacy-encryptor-provider.spec.ts
+++ b/libs/common/src/tools/cryptography/key-service-legacy-encryptor-provider.spec.ts
@@ -184,7 +184,7 @@ describe("KeyServiceLegacyEncryptorProvider", () => {
 
       singleUserId$.complete();
 
-      expect(completed).toBeTrue();
+      expect(completed).toBe(true);
     });
 
     it("completes when `userKey$` emits a falsy value after emitting a truthy value", () => {
@@ -199,7 +199,7 @@ describe("KeyServiceLegacyEncryptorProvider", () => {
 
       userKey$.next(null);
 
-      expect(completed).toBeTrue();
+      expect(completed).toBe(true);
     });
 
     it("completes once `dependencies.singleUserId$` emits and `userKey$` completes", () => {
@@ -214,7 +214,7 @@ describe("KeyServiceLegacyEncryptorProvider", () => {
 
       userKey$.complete();
 
-      expect(completed).toBeTrue();
+      expect(completed).toBe(true);
     });
   });
 
@@ -445,7 +445,7 @@ describe("KeyServiceLegacyEncryptorProvider", () => {
 
       singleOrganizationId$.complete();
 
-      expect(completed).toBeTrue();
+      expect(completed).toBe(true);
     });
 
     it("completes when `orgKeys$` emits a falsy value after emitting a truthy value", () => {
@@ -466,7 +466,7 @@ describe("KeyServiceLegacyEncryptorProvider", () => {
       orgKey$.next(OrgRecords);
       orgKey$.next(null);
 
-      expect(completed).toBeTrue();
+      expect(completed).toBe(true);
     });
 
     it("completes once `dependencies.singleOrganizationId$` emits and `userKey$` completes", () => {
@@ -486,7 +486,7 @@ describe("KeyServiceLegacyEncryptorProvider", () => {
 
       orgKey$.complete();
 
-      expect(completed).toBeTrue();
+      expect(completed).toBe(true);
     });
   });
 });
diff --git a/libs/common/src/tools/rx.spec.ts b/libs/common/src/tools/rx.spec.ts
index 9ce147a3ff..2c433fef93 100644
--- a/libs/common/src/tools/rx.spec.ts
+++ b/libs/common/src/tools/rx.spec.ts
@@ -56,7 +56,7 @@ describe("errorOnChange", () => {
 
     source$.complete();
 
-    expect(complete).toBeTrue();
+    expect(complete).toBe(true);
   });
 
   it("errors when the input changes", async () => {
diff --git a/libs/common/src/vault/services/folder/folder.service.spec.ts b/libs/common/src/vault/services/folder/folder.service.spec.ts
index 9fdb4327b9..cc3aa1946c 100644
--- a/libs/common/src/vault/services/folder/folder.service.spec.ts
+++ b/libs/common/src/vault/services/folder/folder.service.spec.ts
@@ -77,7 +77,7 @@ describe("Folder Service", () => {
       const result = await firstValueFrom(folderService.folders$(mockUserId));
 
       expect(result.length).toBe(2);
-      expect(result).toIncludeAllPartialMembers([
+      expect(result).toContainPartialObjects([
         { id: "1", name: makeEncString("ENC_STRING_1") },
         { id: "2", name: makeEncString("ENC_STRING_2") },
       ]);
@@ -98,7 +98,7 @@ describe("Folder Service", () => {
       const result = await firstValueFrom(folderService.folderViews$(mockUserId));
 
       expect(result.length).toBe(3);
-      expect(result).toIncludeAllPartialMembers([
+      expect(result).toContainPartialObjects([
         { id: "1", name: "DEC" },
         { id: "2", name: "DEC" },
         { name: "No Folder" },
diff --git a/package-lock.json b/package-lock.json
index 87e0354f7a..a8f8295251 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -151,7 +151,7 @@
         "html-webpack-injector": "1.1.4",
         "html-webpack-plugin": "5.6.3",
         "husky": "9.1.4",
-        "jest-extended": "4.0.2",
+        "jest-diff": "29.7.0",
         "jest-junit": "16.0.0",
         "jest-mock-extended": "3.0.7",
         "jest-preset-angular": "14.1.1",
@@ -20729,28 +20729,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-extended": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/jest-extended/-/jest-extended-4.0.2.tgz",
-      "integrity": "sha512-FH7aaPgtGYHc9mRjriS0ZEHYM5/W69tLrFTIdzm+yJgeoCmmrSB/luSfMSqWP9O29QWHPEmJ4qmU6EwsZideog==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "jest-diff": "^29.0.0",
-        "jest-get-type": "^29.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "jest": ">=27.2.5"
-      },
-      "peerDependenciesMeta": {
-        "jest": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/jest-get-type": {
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
diff --git a/package.json b/package.json
index 641a49c4d0..0af1445a8a 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
     "html-webpack-injector": "1.1.4",
     "html-webpack-plugin": "5.6.3",
     "husky": "9.1.4",
-    "jest-extended": "4.0.2",
+    "jest-diff": "29.7.0",
     "jest-junit": "16.0.0",
     "jest-mock-extended": "3.0.7",
     "jest-preset-angular": "14.1.1",

From bbf128767172d5869c4e132b928d77406bc588a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=9C=A8=20Audrey=20=E2=9C=A8?= <ajensen@bitwarden.com>
Date: Wed, 15 Jan 2025 10:44:16 -0500
Subject: [PATCH 098/150] clean up classes that aren't tailwind-compatible
 (#12871)

---
 .../generator/components/src/catchall-settings.component.html | 2 +-
 .../components/src/credential-generator.component.html        | 4 ++--
 .../components/src/forwarder-settings.component.html          | 2 +-
 .../components/src/passphrase-settings.component.html         | 2 +-
 .../generator/components/src/password-settings.component.html | 2 +-
 .../components/src/subaddress-settings.component.html         | 2 +-
 .../components/src/username-generator.component.html          | 4 ++--
 .../generator/components/src/username-settings.component.html | 2 +-
 .../send-list-items-container.component.html                  | 4 ++--
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/libs/tools/generator/components/src/catchall-settings.component.html b/libs/tools/generator/components/src/catchall-settings.component.html
index 61037c91a7..4afa145c05 100644
--- a/libs/tools/generator/components/src/catchall-settings.component.html
+++ b/libs/tools/generator/components/src/catchall-settings.component.html
@@ -1,4 +1,4 @@
-<form class="box" [formGroup]="settings" class="tw-container">
+<form [formGroup]="settings" class="tw-container">
   <bit-form-field>
     <bit-label>{{ "domainName" | i18n }}</bit-label>
     <input
diff --git a/libs/tools/generator/components/src/credential-generator.component.html b/libs/tools/generator/components/src/credential-generator.component.html
index ce86abe80a..6f27c7020d 100644
--- a/libs/tools/generator/components/src/credential-generator.component.html
+++ b/libs/tools/generator/components/src/credential-generator.component.html
@@ -56,7 +56,7 @@
   </bit-section-header>
   <div class="tw-mb-4">
     <bit-card>
-      <form [formGroup]="username" class="box tw-container">
+      <form [formGroup]="username" class="tw-container">
         <bit-form-field>
           <bit-label>{{ "type" | i18n }}</bit-label>
           <bit-select
@@ -70,7 +70,7 @@
           }}</bit-hint>
         </bit-form-field>
       </form>
-      <form *ngIf="showForwarder$ | async" [formGroup]="forwarder" class="box tw-container">
+      <form *ngIf="showForwarder$ | async" [formGroup]="forwarder" class="tw-container">
         <bit-form-field>
           <bit-label>{{ "service" | i18n }}</bit-label>
           <bit-select
diff --git a/libs/tools/generator/components/src/forwarder-settings.component.html b/libs/tools/generator/components/src/forwarder-settings.component.html
index d610f53d59..8ad6eab1ac 100644
--- a/libs/tools/generator/components/src/forwarder-settings.component.html
+++ b/libs/tools/generator/components/src/forwarder-settings.component.html
@@ -1,4 +1,4 @@
-<form class="box" [formGroup]="settings" class="tw-container">
+<form [formGroup]="settings" class="tw-container">
   <bit-form-field *ngIf="displayDomain">
     <bit-label>{{ "forwarderDomainName" | i18n }}</bit-label>
     <input
diff --git a/libs/tools/generator/components/src/passphrase-settings.component.html b/libs/tools/generator/components/src/passphrase-settings.component.html
index 4e073f3424..0af27f7fdc 100644
--- a/libs/tools/generator/components/src/passphrase-settings.component.html
+++ b/libs/tools/generator/components/src/passphrase-settings.component.html
@@ -2,7 +2,7 @@
   <bit-section-header *ngIf="showHeader">
     <h6 bitTypography="h6">{{ "options" | i18n }}</h6>
   </bit-section-header>
-  <form class="box" [formGroup]="settings" class="tw-container">
+  <form [formGroup]="settings" class="tw-container">
     <div class="tw-mb-4">
       <bit-card>
         <bit-form-field disableMargin>
diff --git a/libs/tools/generator/components/src/password-settings.component.html b/libs/tools/generator/components/src/password-settings.component.html
index 9f8e00921f..5e4d107972 100644
--- a/libs/tools/generator/components/src/password-settings.component.html
+++ b/libs/tools/generator/components/src/password-settings.component.html
@@ -2,7 +2,7 @@
   <bit-section-header *ngIf="showHeader">
     <h2 bitTypography="h6">{{ "options" | i18n }}</h2>
   </bit-section-header>
-  <form class="box" [formGroup]="settings" class="tw-container">
+  <form [formGroup]="settings" class="tw-container">
     <div class="tw-mb-4">
       <bit-card>
         <bit-form-field disableMargin>
diff --git a/libs/tools/generator/components/src/subaddress-settings.component.html b/libs/tools/generator/components/src/subaddress-settings.component.html
index 1dfb5e3460..b7f71b12b2 100644
--- a/libs/tools/generator/components/src/subaddress-settings.component.html
+++ b/libs/tools/generator/components/src/subaddress-settings.component.html
@@ -1,4 +1,4 @@
-<form class="box" [formGroup]="settings" class="tw-container">
+<form [formGroup]="settings" class="tw-container">
   <bit-form-field>
     <bit-label>{{ "email" | i18n }}</bit-label>
     <input
diff --git a/libs/tools/generator/components/src/username-generator.component.html b/libs/tools/generator/components/src/username-generator.component.html
index 31e224713e..a5effcc0f9 100644
--- a/libs/tools/generator/components/src/username-generator.component.html
+++ b/libs/tools/generator/components/src/username-generator.component.html
@@ -33,7 +33,7 @@
   </bit-section-header>
   <div [ngClass]="{ 'tw-mb-4': !disableMargin }">
     <bit-card>
-      <form class="box" [formGroup]="username" class="tw-container">
+      <form [formGroup]="username" class="tw-container">
         <bit-form-field>
           <bit-label>{{ "type" | i18n }}</bit-label>
           <bit-select
@@ -47,7 +47,7 @@
           }}</bit-hint>
         </bit-form-field>
       </form>
-      <form *ngIf="showForwarder$ | async" [formGroup]="forwarder" class="box tw-container">
+      <form *ngIf="showForwarder$ | async" [formGroup]="forwarder" class="tw-container">
         <bit-form-field>
           <bit-label>{{ "service" | i18n }}</bit-label>
           <bit-select
diff --git a/libs/tools/generator/components/src/username-settings.component.html b/libs/tools/generator/components/src/username-settings.component.html
index 649cd052e7..fd8b32e2b3 100644
--- a/libs/tools/generator/components/src/username-settings.component.html
+++ b/libs/tools/generator/components/src/username-settings.component.html
@@ -1,4 +1,4 @@
-<form class="box" [formGroup]="settings" class="tw-container">
+<form [formGroup]="settings" class="tw-container">
   <bit-form-control>
     <input
       bitCheckbox
diff --git a/libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.html b/libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.html
index d775554636..d244be1508 100644
--- a/libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.html
+++ b/libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.html
@@ -18,12 +18,12 @@
         <i
           slot="start"
           *ngIf="send.type === sendType.Text"
-          class="bwi bwi-file-text tw-text-2xl text-muted"
+          class="bwi bwi-file-text tw-text-2xl tw-text-muted"
         ></i>
         <i
           slot="start"
           *ngIf="send.type === sendType.File"
-          class="bwi bwi-file tw-text-2xl text-muted"
+          class="bwi bwi-file tw-text-2xl tw-text-muted"
         ></i>
         {{ send.name }}
         <span slot="secondary">

From f6f4bc9d4b68aeb25ba95b169e1066a97289b800 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=9C=A8=20Audrey=20=E2=9C=A8?= <ajensen@bitwarden.com>
Date: Wed, 15 Jan 2025 10:45:14 -0500
Subject: [PATCH 099/150] remove circular reference to generator-core (#12869)

---
 libs/tools/generator/core/tsconfig.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libs/tools/generator/core/tsconfig.json b/libs/tools/generator/core/tsconfig.json
index 7c703686b2..a95b588686 100644
--- a/libs/tools/generator/core/tsconfig.json
+++ b/libs/tools/generator/core/tsconfig.json
@@ -5,7 +5,6 @@
       "@bitwarden/admin-console/common": ["../../../admin-console/src/common"],
       "@bitwarden/auth/common": ["../../../auth/src/common"],
       "@bitwarden/common/*": ["../../../common/src/*"],
-      "@bitwarden/generator-core": ["../../../tools/generator/core/src"],
       "@bitwarden/key-management": ["../../../key-management/src"]
     }
   },

From e79dab868956a21e1886f38ae8d1dbc05246ead9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=9C=A8=20Audrey=20=E2=9C=A8?= <ajensen@bitwarden.com>
Date: Wed, 15 Jan 2025 10:47:02 -0500
Subject: [PATCH 100/150] [PM-16789] introduce extension metadata (#12717)

---
 libs/common/src/tools/extension/data.ts       |  26 +
 .../extension-registry.abstraction.ts         | 104 ++
 .../src/tools/extension/extension-site.ts     |  20 +
 libs/common/src/tools/extension/factory.ts    |  24 +
 libs/common/src/tools/extension/index.ts      |  12 +
 libs/common/src/tools/extension/metadata.ts   |  17 +
 .../runtime-extension-registry.spec.ts        | 923 ++++++++++++++++++
 .../extension/runtime-extension-registry.ts   | 286 ++++++
 libs/common/src/tools/extension/type.ts       | 109 +++
 .../src/tools/extension/vendor/addyio.ts      |  25 +
 .../src/tools/extension/vendor/bitwarden.ts   |   8 +
 .../common/src/tools/extension/vendor/data.ts |  11 +
 .../src/tools/extension/vendor/duckduckgo.ts  |  25 +
 .../src/tools/extension/vendor/fastmail.ts    |  25 +
 .../tools/extension/vendor/forwardemail.ts    |  25 +
 .../src/tools/extension/vendor/index.ts       |  30 +
 .../src/tools/extension/vendor/mozilla.ts     |  26 +
 .../src/tools/extension/vendor/readme.md      |  33 +
 .../src/tools/extension/vendor/simplelogin.ts |  25 +
 libs/common/src/tools/util.ts                 |  19 +
 20 files changed, 1773 insertions(+)
 create mode 100644 libs/common/src/tools/extension/data.ts
 create mode 100644 libs/common/src/tools/extension/extension-registry.abstraction.ts
 create mode 100644 libs/common/src/tools/extension/extension-site.ts
 create mode 100644 libs/common/src/tools/extension/factory.ts
 create mode 100644 libs/common/src/tools/extension/index.ts
 create mode 100644 libs/common/src/tools/extension/metadata.ts
 create mode 100644 libs/common/src/tools/extension/runtime-extension-registry.spec.ts
 create mode 100644 libs/common/src/tools/extension/runtime-extension-registry.ts
 create mode 100644 libs/common/src/tools/extension/type.ts
 create mode 100644 libs/common/src/tools/extension/vendor/addyio.ts
 create mode 100644 libs/common/src/tools/extension/vendor/bitwarden.ts
 create mode 100644 libs/common/src/tools/extension/vendor/data.ts
 create mode 100644 libs/common/src/tools/extension/vendor/duckduckgo.ts
 create mode 100644 libs/common/src/tools/extension/vendor/fastmail.ts
 create mode 100644 libs/common/src/tools/extension/vendor/forwardemail.ts
 create mode 100644 libs/common/src/tools/extension/vendor/index.ts
 create mode 100644 libs/common/src/tools/extension/vendor/mozilla.ts
 create mode 100644 libs/common/src/tools/extension/vendor/readme.md
 create mode 100644 libs/common/src/tools/extension/vendor/simplelogin.ts
 create mode 100644 libs/common/src/tools/util.ts

diff --git a/libs/common/src/tools/extension/data.ts b/libs/common/src/tools/extension/data.ts
new file mode 100644
index 0000000000..cab6272a06
--- /dev/null
+++ b/libs/common/src/tools/extension/data.ts
@@ -0,0 +1,26 @@
+/** well-known name for a feature extensible through an extension. */
+export const Site = Object.freeze({
+  forwarder: "forwarder",
+} as const);
+
+/** well-known name for a field surfaced from an extension site to a vendor. */
+export const Field = Object.freeze({
+  token: "token",
+  baseUrl: "baseUrl",
+  domain: "domain",
+  prefix: "prefix",
+} as const);
+
+/** Permission levels for metadata. */
+export const Permission = Object.freeze({
+  /** unless a rule denies access, allow it. If a permission is `null`
+   * or `undefined` it should be treated as `Permission.default`.
+   */
+  default: "default",
+  /** unless a rule allows access, deny it. */
+  none: "none",
+  /** access is explicitly granted to use an extension. */
+  allow: "allow",
+  /** access is explicitly prohibited for this extension. This rule overrides allow rules. */
+  deny: "deny",
+} as const);
diff --git a/libs/common/src/tools/extension/extension-registry.abstraction.ts b/libs/common/src/tools/extension/extension-registry.abstraction.ts
new file mode 100644
index 0000000000..7734c01ea5
--- /dev/null
+++ b/libs/common/src/tools/extension/extension-registry.abstraction.ts
@@ -0,0 +1,104 @@
+import { ExtensionSite } from "./extension-site";
+import {
+  ExtensionMetadata,
+  ExtensionSet,
+  ExtensionPermission,
+  SiteId,
+  SiteMetadata,
+  VendorId,
+  VendorMetadata,
+} from "./type";
+
+/** Tracks extension sites and the vendors that extend them. */
+export abstract class ExtensionRegistry {
+  /** Registers a site supporting extensibility.
+   *  Each site may only be registered once. Calls after the first for
+   *  the same SiteId have no effect.
+   *  @param site identifies the site being extended
+   *  @param meta configures the extension site
+   *  @return self for method chaining.
+   *  @remarks The registry initializes with a set of allowed sites and fields.
+   *  `registerSite` drops a registration and trims its allowed fields to only
+   *  those indicated in the allow list.
+   */
+  abstract registerSite: (meta: SiteMetadata) => this;
+
+  /** List all registered extension sites with their extension permission, if any.
+   *  @returns a list of all extension sites. `permission` is defined when the site
+   *    is associated with an extension permission.
+   */
+  abstract sites: () => { site: SiteMetadata; permission?: ExtensionPermission }[];
+
+  /** Get a site's metadata
+   *  @param site identifies a site registration
+   *  @return the site's metadata or `undefined` if the site isn't registered.
+   */
+  abstract site: (site: SiteId) => SiteMetadata | undefined;
+
+  /** Registers a vendor providing an extension.
+   *  Each vendor may only be registered once. Calls after the first for
+   *  the same VendorId have no effect.
+   *  @param site - identifies the site being extended
+   *  @param meta - configures the extension site
+   *  @return self for method chaining.
+   */
+  abstract registerVendor: (meta: VendorMetadata) => this;
+
+  /** List all registered vendors with their permissions, if any.
+   *  @returns a list of all extension sites. `permission` is defined when the site
+   *    is associated with an extension permission.
+   */
+  abstract vendors: () => { vendor: VendorMetadata; permission?: ExtensionPermission }[];
+
+  /** Get a vendor's metadata
+   *  @param site identifies a vendor registration
+   *  @return the vendor's metadata or `undefined` if the vendor isn't registered.
+   */
+  abstract vendor: (vendor: VendorId) => VendorMetadata | undefined;
+
+  /** Registers an extension provided by a vendor to an extension site.
+   *  The vendor and site MUST be registered before the extension.
+   *  Each extension may only be registered once. Calls after the first for
+   *  the same SiteId and VendorId have no effect.
+   *  @param site - identifies the site being extended
+   *  @param meta - configures the extension site
+   *  @return self for method chaining.
+   */
+  abstract registerExtension: (meta: ExtensionMetadata) => this;
+
+  /** Get an extensions metadata
+   *  @param site identifies the extension's site
+   *  @param vendor identifies the extension's vendor
+   *  @return the extension's metadata or `undefined` if the extension isn't registered.
+   */
+  abstract extension: (site: SiteId, vendor: VendorId) => ExtensionMetadata | undefined;
+
+  /** List all registered extensions and their permissions */
+  abstract extensions: () => ReadonlyArray<{
+    extension: ExtensionMetadata;
+    permissions: ExtensionPermission[];
+  }>;
+
+  /** Registers a permission. Only 1 permission can be registered for each extension set.
+   *  Calls after the first *replace* the registered permission.
+   *  @param set the collection of extensions affected by the permission
+   *  @param permission the permission for the collection
+   *  @return self for method chaining.
+   */
+  abstract setPermission: (set: ExtensionSet, permission: ExtensionPermission) => this;
+
+  /** Retrieves the current permission for the given extension set or `undefined` if
+   *  a permission doesn't exist.
+   */
+  abstract permission: (set: ExtensionSet) => ExtensionPermission | undefined;
+
+  /** Returns all registered extension rules. */
+  abstract permissions: () => { set: ExtensionSet; permission: ExtensionPermission }[];
+
+  /** Creates a point-in-time snapshot of the registry's contents with extension
+   *  permissions applied for the provided SiteId.
+   *  @param id identifies the extension site to create.
+   *  @returns the extension site, or `undefined` if the site is not registered.
+   */
+  abstract build: (id: SiteId) => ExtensionSite | undefined;
+}
diff --git a/libs/common/src/tools/extension/extension-site.ts b/libs/common/src/tools/extension/extension-site.ts
new file mode 100644
index 0000000000..e8aba00849
--- /dev/null
+++ b/libs/common/src/tools/extension/extension-site.ts
@@ -0,0 +1,20 @@
+import { deepFreeze } from "../util";
+
+import { ExtensionMetadata, SiteMetadata, VendorId } from "./type";
+
+/** Describes the capabilities of an extension site.
+ *  This type is immutable.
+ */
+export class ExtensionSite {
+  /** instantiate the extension site
+   *  @param site describes the extension site
+   *  @param vendors describes the available vendors
+   *  @param extensions describes the available extensions
+   */
+  constructor(
+    readonly site: Readonly<SiteMetadata>,
+    readonly extensions: ReadonlyMap<VendorId, Readonly<ExtensionMetadata>>,
+  ) {
+    deepFreeze(this);
+  }
+}
diff --git a/libs/common/src/tools/extension/factory.ts b/libs/common/src/tools/extension/factory.ts
new file mode 100644
index 0000000000..10ebc77804
--- /dev/null
+++ b/libs/common/src/tools/extension/factory.ts
@@ -0,0 +1,24 @@
+import { DefaultFields, DefaultSites, Extension } from "./metadata";
+import { RuntimeExtensionRegistry } from "./runtime-extension-registry";
+import { VendorExtensions, Vendors } from "./vendor";
+
+// FIXME: find a better way to build the registry than a hard-coded factory function
+
+/** Constructs the extension registry */
+export function buildExtensionRegistry() {
+  const registry = new RuntimeExtensionRegistry(DefaultSites, DefaultFields);
+
+  for (const site of Reflect.ownKeys(Extension) as string[]) {
+    registry.registerSite(Extension[site]);
+  }
+
+  for (const vendor of Vendors) {
+    registry.registerVendor(vendor);
+  }
+
+  for (const extension of VendorExtensions) {
+    registry.registerExtension(extension);
+  }
+
+  return registry;
+}
diff --git a/libs/common/src/tools/extension/index.ts b/libs/common/src/tools/extension/index.ts
new file mode 100644
index 0000000000..e786dde4f5
--- /dev/null
+++ b/libs/common/src/tools/extension/index.ts
@@ -0,0 +1,12 @@
+export { Site, Field, Permission } from "./data";
+export {
+  SiteId,
+  FieldId,
+  VendorId,
+  ExtensionId,
+  ExtensionPermission,
+  SiteMetadata,
+  ExtensionMetadata,
+  VendorMetadata,
+} from "./type";
+export { ExtensionSite } from "./extension-site";
diff --git a/libs/common/src/tools/extension/metadata.ts b/libs/common/src/tools/extension/metadata.ts
new file mode 100644
index 0000000000..895b1d1b31
--- /dev/null
+++ b/libs/common/src/tools/extension/metadata.ts
@@ -0,0 +1,17 @@
+import { Field, Site, Permission } from "./data";
+import { FieldId, SiteId, SiteMetadata } from "./type";
+
+export const DefaultSites: SiteId[] = Object.freeze(Object.keys(Site) as any);
+
+export const DefaultFields: FieldId[] = Object.freeze(Object.keys(Field) as any);
+
+export const Extension: Record<string, SiteMetadata> = {
+  [Site.forwarder]: {
+    id: Site.forwarder,
+    availableFields: [Field.baseUrl, Field.domain, Field.prefix, Field.token],
+  },
+};
+
+export const AllowedPermissions: ReadonlyArray<keyof typeof Permission> = Object.freeze(
+  Object.values(Permission),
+);
diff --git a/libs/common/src/tools/extension/runtime-extension-registry.spec.ts b/libs/common/src/tools/extension/runtime-extension-registry.spec.ts
new file mode 100644
index 0000000000..f4fe0e0ec0
--- /dev/null
+++ b/libs/common/src/tools/extension/runtime-extension-registry.spec.ts
@@ -0,0 +1,923 @@
+import { deepFreeze } from "../util";
+
+import { Field, Site, Permission } from "./data";
+import { ExtensionSite } from "./extension-site";
+import { DefaultFields, DefaultSites } from "./metadata";
+import { RuntimeExtensionRegistry } from "./runtime-extension-registry";
+import { ExtensionMetadata, SiteId, SiteMetadata, VendorMetadata } from "./type";
+import { Bitwarden } from "./vendor/bitwarden";
+
+// arbitrary test entities
+const SomeSiteId: SiteId = Site.forwarder;
+
+const SomeSite: SiteMetadata = Object.freeze({
+  id: SomeSiteId,
+  availableFields: [],
+});
+
+const SomeVendor = Bitwarden;
+const SomeVendorId = SomeVendor.id;
+const SomeExtension: ExtensionMetadata = deepFreeze({
+  site: SomeSite,
+  product: { vendor: SomeVendor, name: "Some Product" },
+  host: { authorization: "bearer", selfHost: "maybe", baseUrl: "https://vault.bitwarden.com" },
+  requestedFields: [],
+});
+
+const JustTrustUs: VendorMetadata = Object.freeze({
+  id: "justrustus" as any,
+  name: "JustTrust.Us",
+});
+const JustTrustUsExtension: ExtensionMetadata = deepFreeze({
+  site: SomeSite,
+  product: { vendor: JustTrustUs },
+  host: { authorization: "bearer", selfHost: "maybe", baseUrl: "https://justrust.us" },
+  requestedFields: [],
+});
+
+// In the following tests, not-null assertions (`!`) indicate that
+// the returned object should never be null or undefined given
+// the conditions defined within the test case
+describe("RuntimeExtensionRegistry", () => {
+  describe("registerSite", () => {
+    it("registers an extension site", () => {
+      const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+
+      const result = registry.registerSite(SomeSite).site(SomeSiteId);
+
+      expect(result).toEqual(SomeSite);
+    });
+
+    it("interns the site", () => {
+      const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+
+      const result = registry.registerSite(SomeSite).site(SomeSiteId);
+
+      expect(result).not.toBe(SomeSite);
+    });
+
+    it("registers an extension site with fields", () => {
+      const registry = new RuntimeExtensionRegistry(DefaultSites, DefaultFields);
+      const site: SiteMetadata = {
+        ...SomeSite,
+        availableFields: [Field.baseUrl],
+      };
+
+      const result = registry.registerSite(site).site(SomeSiteId);
+
+      expect(result).toEqual(site);
+    });
+
+    it("ignores unavailable sites", () => {
+      const registry = new RuntimeExtensionRegistry([], []);
+      const ignored: SiteMetadata = {
+        id: "an-unavailable-site" as any,
+        availableFields: [],
+      };
+
+      const result = registry.registerSite(ignored).sites();
+
+      expect(result).toEqual([]);
+    });
+
+    it("ignores duplicate registrations", () => {
+      const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+      const ignored: SiteMetadata = {
+        ...SomeSite,
+        availableFields: [Field.token],
+      };
+
+      const result = registry.registerSite(SomeSite).registerSite(ignored).site(SomeSiteId);
+
+      expect(result).toEqual(SomeSite);
+    });
+
+    it("ignores unknown available fields", () => {
+      const registry = new RuntimeExtensionRegistry(DefaultSites, DefaultFields);
+      const ignored: SiteMetadata = {
+        ...SomeSite,
+        availableFields: [SomeSite.availableFields, "ignored" as any],
+      };
+
+      const { availableFields } = registry.registerSite(ignored).site(SomeSiteId)!;
+
+      expect(availableFields).toEqual(SomeSite.availableFields);
+    });
+
+    it("freezes the site definition", () => {
+      const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+      const site = registry.registerSite(SomeSite).site(SomeSiteId)!;
+
+      // reassigning `availableFields` throws b/c the object is frozen
+      expect(() => (site.availableFields = [Field.domain])).toThrow();
+    });
+  });
+
+  describe("site", () => {
+    it("returns `undefined` for an unknown site", () => {
+      const registry = new RuntimeExtensionRegistry(DefaultSites, DefaultFields);
+
+      const result = registry.site(SomeSiteId);
+
+      expect(result).toBeUndefined();
+    });
+
+    it("returns the same result when called repeatedly", () => {
+      const registry = new RuntimeExtensionRegistry(DefaultSites, DefaultFields);
+      registry.registerSite(SomeSite);
+
+      const first = registry.site(SomeSiteId);
+      const second = registry.site(SomeSiteId);
+
+      expect(first).toBe(second);
+    });
+  });
+
+  describe("sites", () => {
+    it("lists registered sites", () => {
+      const registry = new RuntimeExtensionRegistry([SomeSiteId, "bar"] as any[], DefaultFields);
+      const barSite: SiteMetadata = {
+        id: "bar" as any,
+        availableFields: [],
+      };
+
+      const result = registry.registerSite(SomeSite).registerSite(barSite).sites();
+
+      expect(result.some(({ site }) => site.id === SomeSiteId)).toBeTrue();
+      expect(result.some(({ site }) => site.id === barSite.id)).toBeTrue();
+    });
+
+    it("includes permissions for a site", () => {
+      const registry = new RuntimeExtensionRegistry(DefaultSites, DefaultFields);
+
+      const result = registry
+        .registerSite(SomeSite)
+        .setPermission({ site: SomeSite.id }, Permission.allow)
+        .sites();
+
+      expect(result).toEqual([{ site: SomeSite, permission: Permission.allow }]);
+    });
+
+    it("ignores duplicate registrations", () => {
+      const registry = new RuntimeExtensionRegistry(DefaultSites, DefaultFields);
+      const ignored: SiteMetadata = {
+        ...SomeSite,
+        availableFields: [Field.token],
+      };
+
+      const result = registry.registerSite(SomeSite).registerSite(ignored).sites();
+
+      expect(result).toEqual([{ site: SomeSite }]);
+    });
+
+    it("ignores permissions for other sites", () => {
+      const registry = new RuntimeExtensionRegistry(DefaultSites, DefaultFields);
+
+      const result = registry
+        .registerSite(SomeSite)
+        .setPermission({ site: SomeSite.id }, Permission.allow)
+        .setPermission({ site: "bar" as any }, Permission.deny)
+        .sites();
+
+      expect(result).toEqual([{ site: SomeSite, permission: Permission.allow }]);
+    });
+  });
+
+  describe("registerVendor", () => {
+    it("registers a vendor", () => {
+      const registry = new RuntimeExtensionRegistry([], []);
+      const result = registry.registerVendor(SomeVendor).vendors();
+
+      expect(result).toEqual([{ vendor: SomeVendor }]);
+    });
+
+    it("freezes the vendor definition", () => {
+      const registry = new RuntimeExtensionRegistry([], []);
+      // copy `SomeVendor` because it is already frozen
+      const original: VendorMetadata = { ...SomeVendor };
+
+      const [{ vendor }] = registry.registerVendor(original).vendors();
+
+      // reassigning `name` throws b/c the object is frozen
+      expect(() => (vendor.name = "Bytewarden")).toThrow();
+    });
+  });
+
+  describe("vendor", () => {
+    it("returns `undefined` for an unknown site", () => {
+      const registry = new RuntimeExtensionRegistry([], []);
+
+      const result = registry.vendor(SomeVendorId);
+
+      expect(result).toBeUndefined();
+    });
+
+    it("returns the same result when called repeatedly", () => {
+      const registry = new RuntimeExtensionRegistry(DefaultSites, DefaultFields);
+      registry.registerVendor(SomeVendor);
+
+      const first = registry.vendor(SomeVendorId);
+      const second = registry.vendor(SomeVendorId);
+
+      expect(first).toBe(second);
+    });
+  });
+
+  describe("vendors", () => {
+    it("lists registered vendors", () => {
+      const registry = new RuntimeExtensionRegistry([], []);
+      registry.registerVendor(SomeVendor).registerVendor(JustTrustUs);
+
+      const result = registry.vendors();
+
+      expect(result.some(({ vendor }) => vendor.id === SomeVendorId)).toBeTrue();
+      expect(result.some(({ vendor }) => vendor.id === JustTrustUs.id)).toBeTrue();
+    });
+
+    it("includes permissions for a vendor", () => {
+      const registry = new RuntimeExtensionRegistry([], []);
+
+      const result = registry
+        .registerVendor(SomeVendor)
+        .setPermission({ vendor: SomeVendorId }, Permission.allow)
+        .vendors();
+
+      expect(result).toEqual([{ vendor: SomeVendor, permission: Permission.allow }]);
+    });
+
+    it("ignores duplicate registrations", () => {
+      const registry = new RuntimeExtensionRegistry([], []);
+      const vendor: VendorMetadata = SomeVendor;
+      const ignored: VendorMetadata = {
+        ...SomeVendor,
+        name: "Duplicate",
+      };
+
+      const result = registry.registerVendor(vendor).registerVendor(ignored).vendors();
+
+      expect(result).toEqual([{ vendor }]);
+    });
+
+    it("ignores permissions for other sites", () => {
+      const registry = new RuntimeExtensionRegistry(DefaultSites, DefaultFields);
+      registry.registerVendor(SomeVendor).setPermission({ vendor: SomeVendorId }, Permission.allow);
+
+      const result = registry.setPermission({ vendor: JustTrustUs.id }, Permission.deny).vendors();
+
+      expect(result).toEqual([{ vendor: SomeVendor, permission: Permission.allow }]);
+    });
+  });
+
+  describe("setPermission", () => {
+    it("sets the all permission", () => {
+      const registry = new RuntimeExtensionRegistry([], []);
+      const target = { all: true } as const;
+
+      const permission = registry.setPermission(target, Permission.allow).permission(target);
+
+      expect(permission).toEqual(Permission.allow);
+    });
+
+    it("sets a vendor permission", () => {
+      const registry = new RuntimeExtensionRegistry([], []);
+      const target = { vendor: SomeVendorId };
+
+      const permission = registry.setPermission(target, Permission.allow).permission(target);
+
+      expect(permission).toEqual(Permission.allow);
+    });
+
+    it("sets a site permission", () => {
+      const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+      const target = { site: SomeSiteId };
+
+      const permission = registry.setPermission(target, Permission.allow).permission(target);
+
+      expect(permission).toEqual(Permission.allow);
+    });
+
+    it("ignores a site permission unless it is in the allowed sites list", () => {
+      const registry = new RuntimeExtensionRegistry([], []);
+      const target = { site: SomeSiteId };
+
+      const permission = registry.setPermission(target, Permission.allow).permission(target);
+
+      expect(permission).toBeUndefined();
+    });
+
+    it("throws when a permission is invalid", () => {
+      const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+
+      expect(() => registry.setPermission({ all: true }, "invalid" as any)).toThrow();
+    });
+
+    it("throws when the extension set is the wrong type", () => {
+      const registry = new RuntimeExtensionRegistry([], []);
+      const target = { invalid: "invalid" } as any;
+
+      expect(() => registry.setPermission(target, Permission.allow)).toThrow();
+    });
+  });
+
+  describe("permission", () => {
+    it("gets the default all permission", () => {
+      const registry = new RuntimeExtensionRegistry([], []);
+      const target = { all: true } as const;
+
+      const permission = registry.permission(target);
+
+      expect(permission).toEqual(Permission.default);
+    });
+
+    it("gets an all permission", () => {
+      const registry = new RuntimeExtensionRegistry([], []);
+      const target = { all: true } as const;
+      registry.setPermission(target, Permission.none);
+
+      const permission = registry.permission(target);
+
+      expect(permission).toEqual(Permission.none);
+    });
+
+    it("gets a vendor permission", () => {
+      const registry = new RuntimeExtensionRegistry([], []);
+      const target = { vendor: SomeVendorId };
+      registry.setPermission(target, Permission.allow);
+
+      const permission = registry.permission(target);
+
+      expect(permission).toEqual(Permission.allow);
+    });
+
+    it("gets a site permission", () => {
+      const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+      const target = { site: SomeSiteId };
+      registry.setPermission(target, Permission.allow);
+
+      const permission = registry.permission(target);
+
+      expect(permission).toEqual(Permission.allow);
+    });
+
+    it("gets a vendor permission", () => {
+      const registry = new RuntimeExtensionRegistry([], []);
+      const target = { vendor: SomeVendorId };
+      registry.setPermission(target, Permission.allow);
+
+      const permission = registry.permission(target);
+
+      expect(permission).toEqual(Permission.allow);
+    });
+
+    it("returns undefined when the extension set is the wrong type", () => {
+      const registry = new RuntimeExtensionRegistry([], []);
+      const target = { invalid: "invalid" } as any;
+
+      const permission = registry.permission(target);
+
+      expect(permission).toBeUndefined();
+    });
+  });
+
+  describe("permissions", () => {
+    it("returns a default all permission by default", () => {
+      const registry = new RuntimeExtensionRegistry([], []);
+
+      const permission = registry.permissions();
+
+      expect(permission).toEqual([{ set: { all: true }, permission: Permission.default }]);
+    });
+
+    it("returns the all permission", () => {
+      const registry = new RuntimeExtensionRegistry([], []);
+      registry.setPermission({ all: true }, Permission.none);
+
+      const permission = registry.permissions();
+
+      expect(permission).toEqual([{ set: { all: true }, permission: Permission.none }]);
+    });
+
+    it("includes site permissions", () => {
+      const registry = new RuntimeExtensionRegistry([SomeSiteId, "bar"] as any[], DefaultFields);
+      registry.registerSite(SomeSite).setPermission({ site: SomeSiteId }, Permission.allow);
+      registry
+        .registerSite({
+          id: "bar" as any,
+          availableFields: [],
+        })
+        .setPermission({ site: "bar" as any }, Permission.deny);
+
+      const result = registry.permissions();
+
+      expect(
+        result.some((p: any) => p.set.site === SomeSiteId && p.permission === Permission.allow),
+      ).toBeTrue();
+      expect(
+        result.some((p: any) => p.set.site === "bar" && p.permission === Permission.deny),
+      ).toBeTrue();
+    });
+
+    it("includes vendor permissions", () => {
+      const registry = new RuntimeExtensionRegistry([], DefaultFields);
+      registry.registerVendor(SomeVendor).setPermission({ vendor: SomeVendorId }, Permission.allow);
+      registry
+        .registerVendor(JustTrustUs)
+        .setPermission({ vendor: JustTrustUs.id }, Permission.deny);
+
+      const result = registry.permissions();
+
+      expect(
+        result.some((p: any) => p.set.vendor === SomeVendorId && p.permission === Permission.allow),
+      ).toBeTrue();
+      expect(
+        result.some(
+          (p: any) => p.set.vendor === JustTrustUs.id && p.permission === Permission.deny,
+        ),
+      ).toBeTrue();
+    });
+  });
+
+  describe("registerExtension", () => {
+    it("registers an extension", () => {
+      const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+      registry.registerSite(SomeSite).registerVendor(SomeVendor);
+
+      const result = registry.registerExtension(SomeExtension).extension(SomeSiteId, SomeVendorId);
+
+      expect(result).toEqual(SomeExtension);
+    });
+
+    it("ignores extensions with nonregistered sites", () => {
+      const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+      registry.registerVendor(SomeVendor);
+
+      // precondition: the site is not registered
+      expect(registry.site(SomeSiteId)).toBeUndefined();
+
+      const result = registry.registerExtension(SomeExtension).extension(SomeSiteId, SomeVendorId);
+
+      expect(result).toBeUndefined();
+    });
+
+    it("ignores extensions with nonregistered vendors", () => {
+      const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+      registry.registerSite(SomeSite);
+
+      // precondition: the vendor is not registered
+      expect(registry.vendor(SomeVendorId)).toBeUndefined();
+
+      const result = registry.registerExtension(SomeExtension).extension(SomeSiteId, SomeVendorId);
+
+      expect(result).toBeUndefined();
+    });
+
+    it("ignores repeated extensions with nonregistered vendors", () => {
+      const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+      registry.registerSite(SomeSite).registerVendor(SomeVendor).registerExtension(SomeExtension);
+
+      // precondition: the vendor is already registered
+      expect(registry.extension(SomeSiteId, SomeVendorId)).toBeDefined();
+
+      const result = registry
+        .registerExtension({
+          ...SomeExtension,
+          requestedFields: [Field.domain],
+        })
+        .extension(SomeSiteId, SomeVendorId);
+
+      expect(result).toEqual(SomeExtension);
+    });
+
+    it("interns site metadata", () => {
+      const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+      registry.registerSite(SomeSite).registerVendor(SomeVendor);
+
+      const internedSite = registry.site(SomeSiteId);
+      const result = registry.registerExtension(SomeExtension).extension(SomeSiteId, SomeVendorId)!;
+
+      expect(result.site).toBe(internedSite);
+    });
+
+    it("interns vendor metadata", () => {
+      const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+      registry.registerSite(SomeSite).registerVendor(SomeVendor);
+
+      const internedVendor = registry.vendor(SomeVendorId);
+      const result = registry.registerExtension(SomeExtension).extension(SomeSiteId, SomeVendorId)!;
+
+      expect(result.product.vendor).toBe(internedVendor);
+    });
+
+    it("freezes the extension metadata", () => {
+      const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+      registry.registerSite(SomeSite).registerVendor(SomeVendor).registerExtension(SomeExtension);
+      const extension = registry.extension(SomeSiteId, SomeVendorId)!;
+
+      // field assignments & mutation functions throw b/c the object is frozen
+      expect(() => ((extension.site as any) = SomeSite)).toThrow();
+      expect(() => ((extension.product.vendor as any) = SomeVendor)).toThrow();
+      expect(() => ((extension.product.name as any) = "SomeVendor")).toThrow();
+      expect(() => ((extension.host as any) = {})).toThrow();
+      expect(() => ((extension.host.selfHost as any) = {})).toThrow();
+      expect(() => ((extension.host as any).authorization = "basic")).toThrow();
+      expect(() => ((extension.host as any).baseUrl = "https://www.example.com")).toThrow();
+      expect(() => ((extension.requestedFields as any) = [Field.baseUrl])).toThrow();
+      expect(() => (extension.requestedFields as any).push(Field.baseUrl)).toThrow();
+    });
+  });
+
+  describe("extension", () => {
+    describe("extension", () => {
+      it("returns `undefined` for an unknown extension", () => {
+        const registry = new RuntimeExtensionRegistry(DefaultSites, DefaultFields);
+
+        const result = registry.extension(SomeSiteId, SomeVendorId);
+
+        expect(result).toBeUndefined();
+      });
+
+      it("interns the extension", () => {
+        const registry = new RuntimeExtensionRegistry(DefaultSites, DefaultFields);
+        registry.registerSite(SomeSite).registerVendor(SomeVendor).registerExtension(SomeExtension);
+
+        const first = registry.extension(SomeSiteId, SomeVendorId);
+        const second = registry.extension(SomeSiteId, SomeVendorId);
+
+        expect(first).toBe(second);
+      });
+    });
+
+    describe("extensions", () => {
+      it("lists registered extensions", () => {
+        const registry = new RuntimeExtensionRegistry(DefaultSites, DefaultFields);
+        registry.registerSite(SomeSite);
+        registry.registerVendor(SomeVendor).registerExtension(SomeExtension);
+        registry.registerVendor(JustTrustUs).registerExtension(JustTrustUsExtension);
+
+        const result = registry.extensions();
+
+        expect(
+          result.some(
+            ({ extension }) =>
+              extension.site.id === SomeSiteId && extension.product.vendor.id === SomeVendorId,
+          ),
+        ).toBeTrue();
+        expect(
+          result.some(
+            ({ extension }) =>
+              extension.site.id === SomeSiteId && extension.product.vendor.id === JustTrustUs.id,
+          ),
+        ).toBeTrue();
+      });
+
+      it("includes permissions for extensions", () => {
+        const registry = new RuntimeExtensionRegistry(DefaultSites, DefaultFields);
+        registry
+          .registerSite(SomeSite)
+          .registerVendor(SomeVendor)
+          .registerExtension(SomeExtension)
+          .setPermission({ vendor: SomeVendorId }, Permission.allow);
+
+        const result = registry.extensions();
+
+        expect(
+          result.some(
+            ({ extension, permissions }) =>
+              extension.site.id === SomeSiteId &&
+              extension.product.vendor.id === SomeVendorId &&
+              permissions.includes(Permission.allow),
+          ),
+        ).toBeTrue();
+      });
+    });
+
+    describe("build", () => {
+      it("builds an empty extension site when no extensions are registered", () => {
+        const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+        registry.registerSite(SomeSite).registerVendor(SomeVendor);
+
+        const result = registry.build(SomeSiteId)!;
+
+        expect(result.extensions.size).toBe(0);
+      });
+
+      it("builds an extension site with all registered extensions", () => {
+        const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+        registry.registerSite(SomeSite).registerVendor(SomeVendor).registerExtension(SomeExtension);
+        const expected = registry.extension(SomeSiteId, SomeVendorId);
+
+        const result = registry.build(SomeSiteId)!;
+
+        expect(result).toBeInstanceOf(ExtensionSite);
+        expect(result.extensions.get(SomeVendorId)).toBe(expected);
+      });
+
+      it("returns `undefined` for an unknown site", () => {
+        const registry = new RuntimeExtensionRegistry(DefaultSites, DefaultFields);
+
+        const result = registry.build(SomeSiteId);
+
+        expect(result).toBeUndefined();
+      });
+
+      describe("when the all permission is `default`", () => {
+        const allPermission = Permission.default;
+
+        it("builds an extension site with all registered extensions", () => {
+          const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+          registry
+            .registerSite(SomeSite)
+            .registerVendor(SomeVendor)
+            .registerExtension(SomeExtension)
+            .setPermission({ all: true }, Permission.default);
+          const expected = registry.extension(SomeSiteId, SomeVendorId);
+
+          const result = registry.build(SomeSiteId)!;
+
+          expect(result.extensions.get(SomeVendorId)).toBe(expected);
+        });
+
+        it.each([[Permission.default], [Permission.allow]])(
+          "includes sites with `%p` permission",
+          (permission) => {
+            const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+            registry
+              .registerSite(SomeSite)
+              .registerVendor(SomeVendor)
+              .registerExtension(SomeExtension);
+            registry.setPermission({ all: true }, allPermission);
+            registry.setPermission({ site: SomeSiteId }, permission);
+
+            const result = registry.build(SomeSiteId)!;
+
+            expect(result.extensions.get(SomeVendorId)).toEqual(SomeExtension);
+          },
+        );
+
+        it.each([[Permission.none], [Permission.deny]])(
+          "ignores sites with `%p` permission",
+          (permission) => {
+            const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+            registry
+              .registerSite(SomeSite)
+              .registerVendor(SomeVendor)
+              .registerExtension(SomeExtension);
+            registry.setPermission({ all: true }, allPermission);
+            registry.setPermission({ site: SomeSiteId }, permission);
+
+            const result = registry.build(SomeSiteId)!;
+
+            expect(result.extensions.size).toBe(0);
+          },
+        );
+
+        it.each([[Permission.default], [Permission.allow]])(
+          "includes vendors with `%p` permission",
+          (permission) => {
+            const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+            registry
+              .registerSite(SomeSite)
+              .registerVendor(SomeVendor)
+              .registerExtension(SomeExtension);
+            registry.setPermission({ all: true }, allPermission);
+            registry.setPermission({ vendor: SomeVendorId }, permission);
+
+            const result = registry.build(SomeSiteId)!;
+
+            expect(result.extensions.get(SomeVendorId)).toEqual(SomeExtension);
+          },
+        );
+
+        it.each([[Permission.none], [Permission.deny]])(
+          "ignores vendors with `%p` permission",
+          (permission) => {
+            const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+            registry
+              .registerSite(SomeSite)
+              .registerVendor(SomeVendor)
+              .registerExtension(SomeExtension);
+            registry.setPermission({ all: true }, allPermission);
+            registry.setPermission({ vendor: SomeVendorId }, permission);
+
+            const result = registry.build(SomeSiteId)!;
+
+            expect(result.extensions.size).toBe(0);
+          },
+        );
+      });
+
+      describe("when the all permission is `none`", () => {
+        const allPermission = Permission.none;
+
+        it("builds an empty extension site", () => {
+          const registry = new RuntimeExtensionRegistry(DefaultSites, DefaultFields);
+          registry
+            .registerSite(SomeSite)
+            .registerVendor(SomeVendor)
+            .registerExtension(SomeExtension)
+            .setPermission({ all: true }, Permission.none);
+
+          const result = registry.build(SomeSiteId)!;
+
+          expect(result).toBeInstanceOf(ExtensionSite);
+          expect(result.extensions.size).toBe(0);
+        });
+
+        it.each([[Permission.allow]])("includes sites with `%p` permission", (permission) => {
+          const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+          registry
+            .registerSite(SomeSite)
+            .registerVendor(SomeVendor)
+            .registerExtension(SomeExtension);
+          registry.setPermission({ all: true }, allPermission);
+          registry.setPermission({ site: SomeSiteId }, permission);
+
+          const result = registry.build(SomeSiteId)!;
+
+          expect(result.extensions.get(SomeVendorId)).toEqual(SomeExtension);
+        });
+
+        it.each([[Permission.default], [Permission.none], [Permission.deny]])(
+          "ignores sites with `%p` permission",
+          (permission) => {
+            const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+            registry
+              .registerSite(SomeSite)
+              .registerVendor(SomeVendor)
+              .registerExtension(SomeExtension);
+            registry.setPermission({ all: true }, allPermission);
+            registry.setPermission({ site: SomeSiteId }, permission);
+
+            const result = registry.build(SomeSiteId)!;
+
+            expect(result.extensions.size).toBe(0);
+          },
+        );
+
+        it.each([[Permission.allow]])("includes vendors with `%p` permission", (permission) => {
+          const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+          registry
+            .registerSite(SomeSite)
+            .registerVendor(SomeVendor)
+            .registerExtension(SomeExtension);
+          registry.setPermission({ all: true }, allPermission);
+          registry.setPermission({ vendor: SomeVendorId }, permission);
+
+          const result = registry.build(SomeSiteId)!;
+
+          expect(result.extensions.get(SomeVendorId)).toEqual(SomeExtension);
+        });
+
+        it.each([[Permission.default], [Permission.none], [Permission.deny]])(
+          "ignores vendors with `%p` permission",
+          (permission) => {
+            const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+            registry
+              .registerSite(SomeSite)
+              .registerVendor(SomeVendor)
+              .registerExtension(SomeExtension);
+            registry.setPermission({ all: true }, allPermission);
+            registry.setPermission({ vendor: SomeVendorId }, permission);
+
+            const result = registry.build(SomeSiteId)!;
+
+            expect(result.extensions.size).toBe(0);
+          },
+        );
+      });
+
+      describe("when the all permission is `allow`", () => {
+        const allPermission = Permission.allow;
+
+        it("builds an extension site with all registered extensions", () => {
+          const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+          registry
+            .registerSite(SomeSite)
+            .registerVendor(SomeVendor)
+            .registerExtension(SomeExtension)
+            .setPermission({ all: true }, Permission.default);
+          const expected = registry.extension(SomeSiteId, SomeVendorId);
+
+          const result = registry.build(SomeSiteId)!;
+
+          expect(result).toBeInstanceOf(ExtensionSite);
+          expect(result.extensions.get(SomeVendorId)).toBe(expected);
+        });
+
+        it.each([[Permission.default], [Permission.none], [Permission.allow]])(
+          "includes sites with `%p` permission",
+          (permission) => {
+            const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+            registry
+              .registerSite(SomeSite)
+              .registerVendor(SomeVendor)
+              .registerExtension(SomeExtension);
+            registry.setPermission({ all: true }, allPermission);
+            registry.setPermission({ site: SomeSiteId }, permission);
+
+            const result = registry.build(SomeSiteId)!;
+
+            expect(result.extensions.get(SomeVendorId)).toEqual(SomeExtension);
+          },
+        );
+
+        it.each([[Permission.deny]])("ignores sites with `%p` permission", (permission) => {
+          const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+          registry
+            .registerSite(SomeSite)
+            .registerVendor(SomeVendor)
+            .registerExtension(SomeExtension);
+          registry.setPermission({ all: true }, allPermission);
+          registry.setPermission({ site: SomeSiteId }, permission);
+
+          const result = registry.build(SomeSiteId)!;
+
+          expect(result.extensions.size).toBe(0);
+        });
+
+        it.each([[Permission.default], [Permission.none], [Permission.allow]])(
+          "includes vendors with `%p` permission",
+          (permission) => {
+            const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+            registry
+              .registerSite(SomeSite)
+              .registerVendor(SomeVendor)
+              .registerExtension(SomeExtension);
+            registry.setPermission({ all: true }, allPermission);
+            registry.setPermission({ vendor: SomeVendorId }, permission);
+
+            const result = registry.build(SomeSiteId)!;
+
+            expect(result.extensions.get(SomeVendorId)).toEqual(SomeExtension);
+          },
+        );
+
+        it.each([[Permission.deny]])("ignores vendors with `%p` permission", (permission) => {
+          const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+          registry
+            .registerSite(SomeSite)
+            .registerVendor(SomeVendor)
+            .registerExtension(SomeExtension);
+          registry.setPermission({ all: true }, allPermission);
+          registry.setPermission({ vendor: SomeVendorId }, permission);
+
+          const result = registry.build(SomeSiteId)!;
+
+          expect(result.extensions.size).toBe(0);
+        });
+      });
+
+      describe("when the all permission is `deny`", () => {
+        const allPermission = Permission.deny;
+
+        it("builds an empty extension site", () => {
+          const registry = new RuntimeExtensionRegistry(DefaultSites, DefaultFields);
+          registry
+            .registerSite(SomeSite)
+            .registerVendor(SomeVendor)
+            .registerExtension(SomeExtension)
+            .setPermission({ all: true }, Permission.deny);
+
+          const result = registry.build(SomeSiteId)!;
+
+          expect(result).toBeInstanceOf(ExtensionSite);
+          expect(result.extensions.size).toBe(0);
+        });
+
+        it.each([[Permission.default], [Permission.none], [Permission.allow], [Permission.deny]])(
+          "ignores sites with `%p` permission",
+          (permission) => {
+            const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+            registry
+              .registerSite(SomeSite)
+              .registerVendor(SomeVendor)
+              .registerExtension(SomeExtension);
+            registry.setPermission({ all: true }, allPermission);
+            registry.setPermission({ site: SomeSiteId }, permission);
+
+            const result = registry.build(SomeSiteId)!;
+
+            expect(result.extensions.size).toBe(0);
+          },
+        );
+
+        it.each([[Permission.default], [Permission.none], [Permission.allow], [Permission.deny]])(
+          "ignores vendors with `%p` permission",
+          (permission) => {
+            const registry = new RuntimeExtensionRegistry(DefaultSites, []);
+            registry
+              .registerSite(SomeSite)
+              .registerVendor(SomeVendor)
+              .registerExtension(SomeExtension);
+            registry.setPermission({ all: true }, allPermission);
+            registry.setPermission({ vendor: SomeVendorId }, permission);
+
+            const result = registry.build(SomeSiteId)!;
+
+            expect(result.extensions.size).toBe(0);
+          },
+        );
+      });
+    });
+  });
+});
diff --git a/libs/common/src/tools/extension/runtime-extension-registry.ts b/libs/common/src/tools/extension/runtime-extension-registry.ts
new file mode 100644
index 0000000000..1c630dcc91
--- /dev/null
+++ b/libs/common/src/tools/extension/runtime-extension-registry.ts
@@ -0,0 +1,286 @@
+import { deepFreeze } from "../util";
+
+import { ExtensionRegistry } from "./extension-registry.abstraction";
+import { ExtensionSite } from "./extension-site";
+import { AllowedPermissions } from "./metadata";
+import {
+  ExtensionMetadata,
+  ExtensionPermission,
+  ExtensionSet,
+  FieldId,
+  ProductMetadata,
+  SiteMetadata,
+  SiteId,
+  VendorId,
+  VendorMetadata,
+} from "./type";
+
+/** Tracks extension sites and the vendors that extend them in application memory. */
+export class RuntimeExtensionRegistry implements ExtensionRegistry {
+  /** Instantiates the extension registry
+   *  @param allowedSites sites that are valid for use by any extension;
+   *    this is most useful to disable an extension site that is only
+   *    available on a specific client.
+   *  @param allowedFields fields that are valid for use by any extension;
+   *    this is most useful to prohibit access to a field via policy.
+   */
+  constructor(
+    private readonly allowedSites: SiteId[],
+    private readonly allowedFields: FieldId[],
+  ) {
+    Object.freeze(this.allowedFields);
+    Object.freeze(this.allowedSites);
+  }
+
+  private allPermission: ExtensionPermission = "default";
+
+  private siteRegistrations = new Map<SiteId, SiteMetadata>();
+  private sitePermissions = new Map<SiteId, ExtensionPermission>();
+
+  private vendorRegistrations = new Map<VendorId, VendorMetadata>();
+  private vendorPermissions = new Map<VendorId, ExtensionPermission>();
+
+  private extensionRegistrations = new Array<ExtensionMetadata>();
+  private extensionsBySiteByVendor = new Map<SiteId, Map<VendorId, number>>();
+
+  registerSite(site: SiteMetadata): this {
+    if (!this.allowedSites.includes(site.id)) {
+      return this;
+    }
+
+    // verify requested fields are on the list of valid fields to expose to
+    // an extension
+    const availableFields = site.availableFields.filter((field) =>
+      this.allowedFields.includes(field),
+    );
+    const validated: SiteMetadata = deepFreeze({ id: site.id, availableFields });
+
+    if (!this.siteRegistrations.has(site.id)) {
+      this.siteRegistrations.set(site.id, validated);
+    }
+
+    return this;
+  }
+
+  site(site: SiteId): SiteMetadata | undefined {
+    const result = this.siteRegistrations.get(site);
+    return result;
+  }
+
+  sites() {
+    const sites: { site: SiteMetadata; permission?: ExtensionPermission }[] = [];
+
+    for (const [k, site] of this.siteRegistrations.entries()) {
+      const s: (typeof sites)[number] = { site };
+      const permission = this.sitePermissions.get(k);
+      if (permission) {
+        s.permission = permission;
+      }
+
+      sites.push(s);
+    }
+
+    return sites;
+  }
+
+  registerVendor(vendor: VendorMetadata): this {
+    if (!this.vendorRegistrations.has(vendor.id)) {
+      const frozen = deepFreeze(vendor);
+      this.vendorRegistrations.set(vendor.id, frozen);
+    }
+
+    return this;
+  }
+
+  vendor(vendor: VendorId): VendorMetadata | undefined {
+    const result = this.vendorRegistrations.get(vendor);
+    return result;
+  }
+
+  vendors() {
+    const vendors: { vendor: VendorMetadata; permission?: ExtensionPermission }[] = [];
+
+    for (const [k, vendor] of this.vendorRegistrations.entries()) {
+      const s: (typeof vendors)[number] = { vendor };
+      const permission = this.vendorPermissions.get(k);
+      if (permission) {
+        s.permission = permission;
+      }
+
+      vendors.push(s);
+    }
+
+    return vendors;
+  }
+
+  setPermission(set: ExtensionSet, permission: ExtensionPermission): this {
+    if (!AllowedPermissions.includes(permission)) {
+      throw new Error(`invalid extension permission: ${permission}`);
+    }
+
+    if ("all" in set && set.all) {
+      this.allPermission = permission;
+    } else if ("vendor" in set) {
+      this.vendorPermissions.set(set.vendor, permission);
+    } else if ("site" in set) {
+      if (this.allowedSites.includes(set.site)) {
+        this.sitePermissions.set(set.site, permission);
+      }
+    } else {
+      throw new Error(`Unrecognized extension set received: ${JSON.stringify(set)}.`);
+    }
+
+    return this;
+  }
+
+  permission(set: ExtensionSet) {
+    if ("all" in set && set.all) {
+      return this.allPermission;
+    } else if ("vendor" in set) {
+      return this.vendorPermissions.get(set.vendor);
+    } else if ("site" in set) {
+      return this.sitePermissions.get(set.site);
+    } else {
+      return undefined;
+    }
+  }
+
+  permissions() {
+    const rules: { set: ExtensionSet; permission: ExtensionPermission }[] = [];
+    rules.push({ set: { all: true }, permission: this.allPermission });
+
+    for (const [site, permission] of this.sitePermissions.entries()) {
+      rules.push({ set: { site }, permission });
+    }
+
+    for (const [vendor, permission] of this.vendorPermissions.entries()) {
+      rules.push({ set: { vendor }, permission });
+    }
+
+    return rules;
+  }
+
+  registerExtension(meta: ExtensionMetadata): this {
+    const site = this.siteRegistrations.get(meta.site.id);
+    const vendor = this.vendorRegistrations.get(meta.product.vendor.id);
+    if (!site || !vendor) {
+      return this;
+    }
+
+    // exit early if the extension is already registered
+    const extensionsByVendor =
+      this.extensionsBySiteByVendor.get(meta.site.id) ?? new Map<VendorId, number>();
+    if (extensionsByVendor.has(meta.product.vendor.id)) {
+      return this;
+    }
+
+    // create immutable copy; this updates the vendor and site with
+    // their internalized representation to provide reference equality
+    // across registrations
+    const product: ProductMetadata = { vendor };
+    if (meta.product.name) {
+      product.name = meta.product.name;
+    }
+    const extension: ExtensionMetadata = Object.freeze({
+      site,
+      product: Object.freeze(product),
+      host: Object.freeze({ ...meta.host }),
+      requestedFields: Object.freeze([...meta.requestedFields]),
+    });
+
+    // register it
+    const index = this.extensionRegistrations.push(extension) - 1;
+    extensionsByVendor.set(vendor.id, index);
+    this.extensionsBySiteByVendor.set(site.id, extensionsByVendor);
+
+    return this;
+  }
+
+  extension(site: SiteId, vendor: VendorId): ExtensionMetadata | undefined {
+    const index = this.extensionsBySiteByVendor.get(site)?.get(vendor) ?? -1;
+    if (index < 0) {
+      return undefined;
+    } else {
+      return this.extensionRegistrations[index];
+    }
+  }
+
+  private getPermissions(site: SiteId, vendor: VendorId): ExtensionPermission[] {
+    const permissions = [
+      this.sitePermissions.get(site),
+      this.vendorPermissions.get(vendor),
+      this.allPermission,
+      // Need to cast away `undefined` because typescript isn't
+      // aware that the filter eliminates undefined elements
+    ].filter((p) => !!p) as ExtensionPermission[];
+
+    return permissions;
+  }
+
+  extensions(): ReadonlyArray<{
+    extension: ExtensionMetadata;
+    permissions: ExtensionPermission[];
+  }> {
+    const extensions = [];
+    for (const extension of this.extensionRegistrations) {
+      const permissions = this.getPermissions(extension.site.id, extension.product.vendor.id);
+
+      extensions.push({ extension, permissions });
+    }
+
+    return extensions;
+  }
+
+  build(id: SiteId): ExtensionSite | undefined {
+    const site = this.siteRegistrations.get(id);
+    if (!site) {
+      return undefined;
+    }
+
+    if (this.allPermission === "deny") {
+      return new ExtensionSite(site, new Map());
+    }
+
+    const extensions = new Map<VendorId, ExtensionMetadata>();
+    const entries = this.extensionsBySiteByVendor.get(id)?.entries() ?? ([] as const);
+    for (const [vendor, index] of entries) {
+      const permissions = this.getPermissions(id, vendor);
+
+      const extension = evaluate(permissions, this.extensionRegistrations[index]);
+      if (extension) {
+        extensions.set(vendor, extension);
+      }
+    }
+
+    const extensionSite = new ExtensionSite(site, extensions);
+    return extensionSite;
+  }
+}
+
+function evaluate(
+  permissions: ExtensionPermission[],
+  value: ExtensionMetadata,
+): ExtensionMetadata | undefined {
+  // deny always wins
+  if (permissions.includes("deny")) {
+    return undefined;
+  }
+
+  // allow overrides implicit permissions
+  if (permissions.includes("allow")) {
+    return value;
+  }
+
+  // none permission becomes a deny
+  if (permissions.includes("none")) {
+    return undefined;
+  }
+
+  // default permission becomes an allow
+  if (permissions.includes("default")) {
+    return value;
+  }
+
+  // if no permission is recognized, throw. This code is unreachable.
+  throw new Error("failed to recognize any permissions");
+}
diff --git a/libs/common/src/tools/extension/type.ts b/libs/common/src/tools/extension/type.ts
new file mode 100644
index 0000000000..f37d4ff8e5
--- /dev/null
+++ b/libs/common/src/tools/extension/type.ts
@@ -0,0 +1,109 @@
+import { Opaque } from "type-fest";
+
+import { Site, Field, Permission } from "./data";
+
+/** well-known name for a feature extensible through an extension. */
+export type SiteId = keyof typeof Site;
+
+/** well-known name for a field surfaced from an extension site to a vendor. */
+export type FieldId = keyof typeof Field;
+
+/** Identifies a vendor extending bitwarden */
+export type VendorId = Opaque<"vendor", string>;
+
+/** uniquely identifies an extension. */
+export type ExtensionId = { site: SiteId; vendor: VendorId };
+
+/** Permission levels for metadata. */
+export type ExtensionPermission = keyof typeof Permission;
+
+/** The capabilities and descriptive content for an extension */
+export type SiteMetadata = {
+  /** Uniquely identifies the extension site. */
+  id: SiteId;
+
+  /** Lists the fields disclosed by the extension to the vendor */
+  availableFields: FieldId[];
+};
+
+/** The capabilities and descriptive content for an extension */
+export type VendorMetadata = {
+  /** Uniquely identifies the vendor. */
+  id: VendorId;
+
+  /** Brand name of the service providing the extension. */
+  name: string;
+};
+
+type TokenHeader =
+  | {
+      /** Transmit the token as the value of an `Authentication` header */
+      authentication: true;
+    }
+  | {
+      /** Transmit the token as an `Authorization` header and a formatted value
+       *  * `bearer` uses OAUTH-2.0 bearer token format
+       *  * `token` prefixes the token with "Token"
+       *  * `basic-username` uses HTTP Basic authentication format, encoding the
+       *     token as the username.
+       */
+      authorization: "bearer" | "token" | "basic-username";
+    };
+
+/** Catalogues an extension's hosting status.
+ *  selfHost: "never" always uses the service's base URL
+ *  selfHost: "maybe" allows the user to override the service's
+ *    base URL with their own.
+ *  selfHost: "always" requires a base URL.
+ */
+export type ApiHost = TokenHeader &
+  (
+    | { selfHost: "never"; baseUrl: string }
+    | { selfHost: "maybe"; baseUrl: string }
+    | { selfHost: "always" }
+  );
+
+/** Describes a branded product */
+export type ProductMetadata = {
+  /** The vendor providing the extension */
+  vendor: VendorMetadata;
+
+  /** The branded name of the product, if it varies from the Vendor name */
+  name?: string;
+};
+
+/** Describes an extension provided by a vendor */
+export type ExtensionMetadata = {
+  /** The part of Bitwarden extended by the vendor's services */
+  readonly site: Readonly<SiteMetadata>;
+
+  /** Product description */
+  readonly product: Readonly<ProductMetadata>;
+
+  /** Hosting provider capabilities required by the extension  */
+  readonly host: Readonly<ApiHost>;
+
+  /** Lists the fields disclosed by the extension to the vendor.
+   *  This should be a subset of the `availableFields` listed in
+   *  the extension.
+   */
+  readonly requestedFields: ReadonlyArray<Readonly<FieldId>>;
+};
+
+/** Identifies a collection of extensions.
+ */
+export type ExtensionSet =
+  | {
+      /** A set of extensions sharing an extension point */
+      site: SiteId;
+    }
+  | {
+      /** A set of extensions sharing a vendor */
+      vendor: VendorId;
+    }
+  | {
+      /** The total set of extensions. This is used to set a categorical
+       *  rule affecting all extensions.
+       */
+      all: true;
+    };
diff --git a/libs/common/src/tools/extension/vendor/addyio.ts b/libs/common/src/tools/extension/vendor/addyio.ts
new file mode 100644
index 0000000000..c33abd570a
--- /dev/null
+++ b/libs/common/src/tools/extension/vendor/addyio.ts
@@ -0,0 +1,25 @@
+import { Field } from "../data";
+import { Extension } from "../metadata";
+import { ExtensionMetadata, VendorMetadata } from "../type";
+
+import { Vendor } from "./data";
+
+export const AddyIo: VendorMetadata = {
+  id: Vendor.addyio,
+  name: "Addy.io",
+};
+
+export const AddyIoExtensions: ExtensionMetadata[] = [
+  {
+    site: Extension.forwarder,
+    product: {
+      vendor: AddyIo,
+    },
+    host: {
+      authorization: "bearer",
+      selfHost: "maybe",
+      baseUrl: "https://app.addy.io",
+    },
+    requestedFields: [Field.token, Field.baseUrl, Field.domain],
+  },
+];
diff --git a/libs/common/src/tools/extension/vendor/bitwarden.ts b/libs/common/src/tools/extension/vendor/bitwarden.ts
new file mode 100644
index 0000000000..7f659c2d07
--- /dev/null
+++ b/libs/common/src/tools/extension/vendor/bitwarden.ts
@@ -0,0 +1,8 @@
+import { VendorMetadata } from "../type";
+
+import { Vendor } from "./data";
+
+export const Bitwarden: VendorMetadata = Object.freeze({
+  id: Vendor.bitwarden,
+  name: "Bitwarden",
+});
diff --git a/libs/common/src/tools/extension/vendor/data.ts b/libs/common/src/tools/extension/vendor/data.ts
new file mode 100644
index 0000000000..7f0802ef82
--- /dev/null
+++ b/libs/common/src/tools/extension/vendor/data.ts
@@ -0,0 +1,11 @@
+import { VendorId } from "../type";
+
+export const Vendor = Object.freeze({
+  addyio: "addyio" as VendorId,
+  bitwarden: "bitwarden" as VendorId, // RESERVED
+  duckduckgo: "duckduckgo" as VendorId,
+  fastmail: "fastmail" as VendorId,
+  forwardemail: "forwardemail" as VendorId,
+  mozilla: "mozilla" as VendorId,
+  simplelogin: "simplelogin" as VendorId,
+} as const);
diff --git a/libs/common/src/tools/extension/vendor/duckduckgo.ts b/libs/common/src/tools/extension/vendor/duckduckgo.ts
new file mode 100644
index 0000000000..ca4634192f
--- /dev/null
+++ b/libs/common/src/tools/extension/vendor/duckduckgo.ts
@@ -0,0 +1,25 @@
+import { Field } from "../data";
+import { Extension } from "../metadata";
+import { ExtensionMetadata, VendorMetadata } from "../type";
+
+import { Vendor } from "./data";
+
+export const DuckDuckGo: VendorMetadata = {
+  id: Vendor.duckduckgo,
+  name: "DuckDuckGo",
+};
+
+export const DuckDuckGoExtensions: ExtensionMetadata[] = [
+  {
+    site: Extension.forwarder,
+    product: {
+      vendor: DuckDuckGo,
+    },
+    host: {
+      authorization: "bearer",
+      selfHost: "never",
+      baseUrl: "https://quack.duckduckgo.com/api",
+    },
+    requestedFields: [Field.token],
+  },
+];
diff --git a/libs/common/src/tools/extension/vendor/fastmail.ts b/libs/common/src/tools/extension/vendor/fastmail.ts
new file mode 100644
index 0000000000..e6fb9ec16b
--- /dev/null
+++ b/libs/common/src/tools/extension/vendor/fastmail.ts
@@ -0,0 +1,25 @@
+import { Field } from "../data";
+import { Extension } from "../metadata";
+import { ExtensionMetadata, VendorMetadata } from "../type";
+
+import { Vendor } from "./data";
+
+export const Fastmail: VendorMetadata = {
+  id: Vendor.fastmail,
+  name: "Fastmail",
+};
+
+export const FastmailExtensions: ExtensionMetadata[] = [
+  {
+    site: Extension.forwarder,
+    product: {
+      vendor: Fastmail,
+    },
+    host: {
+      authorization: "bearer",
+      selfHost: "maybe",
+      baseUrl: "https://api.fastmail.com",
+    },
+    requestedFields: [Field.token],
+  },
+];
diff --git a/libs/common/src/tools/extension/vendor/forwardemail.ts b/libs/common/src/tools/extension/vendor/forwardemail.ts
new file mode 100644
index 0000000000..4fbc8c139b
--- /dev/null
+++ b/libs/common/src/tools/extension/vendor/forwardemail.ts
@@ -0,0 +1,25 @@
+import { Field } from "../data";
+import { Extension } from "../metadata";
+import { ExtensionMetadata, VendorMetadata } from "../type";
+
+import { Vendor } from "./data";
+
+export const ForwardEmail: VendorMetadata = {
+  id: Vendor.forwardemail,
+  name: "Forward Email",
+};
+
+export const ForwardEmailExtensions: ExtensionMetadata[] = [
+  {
+    site: Extension.forwarder,
+    product: {
+      vendor: ForwardEmail,
+    },
+    host: {
+      authorization: "basic-username",
+      selfHost: "never",
+      baseUrl: "https://api.forwardemail.net",
+    },
+    requestedFields: [Field.domain, Field.token],
+  },
+];
diff --git a/libs/common/src/tools/extension/vendor/index.ts b/libs/common/src/tools/extension/vendor/index.ts
new file mode 100644
index 0000000000..3bac78c80d
--- /dev/null
+++ b/libs/common/src/tools/extension/vendor/index.ts
@@ -0,0 +1,30 @@
+import { deepFreeze } from "../../util";
+
+import { AddyIo, AddyIoExtensions } from "./addyio";
+import { Bitwarden } from "./bitwarden";
+import { DuckDuckGo, DuckDuckGoExtensions } from "./duckduckgo";
+import { Fastmail, FastmailExtensions } from "./fastmail";
+import { ForwardEmail, ForwardEmailExtensions } from "./forwardemail";
+import { Mozilla, MozillaExtensions } from "./mozilla";
+import { SimpleLogin, SimpleLoginExtensions } from "./simplelogin";
+
+export const Vendors = deepFreeze([
+  AddyIo,
+  Bitwarden,
+  DuckDuckGo,
+  Fastmail,
+  ForwardEmail,
+  Mozilla,
+  SimpleLogin,
+]);
+
+export const VendorExtensions = deepFreeze(
+  [
+    AddyIoExtensions,
+    DuckDuckGoExtensions,
+    FastmailExtensions,
+    ForwardEmailExtensions,
+    MozillaExtensions,
+    SimpleLoginExtensions,
+  ].flat(),
+);
diff --git a/libs/common/src/tools/extension/vendor/mozilla.ts b/libs/common/src/tools/extension/vendor/mozilla.ts
new file mode 100644
index 0000000000..b02b97d877
--- /dev/null
+++ b/libs/common/src/tools/extension/vendor/mozilla.ts
@@ -0,0 +1,26 @@
+import { Field } from "../data";
+import { Extension } from "../metadata";
+import { ExtensionMetadata, VendorMetadata } from "../type";
+
+import { Vendor } from "./data";
+
+export const Mozilla: VendorMetadata = {
+  id: Vendor.mozilla,
+  name: "Mozilla",
+};
+
+export const MozillaExtensions: ExtensionMetadata[] = [
+  {
+    site: Extension.forwarder,
+    product: {
+      vendor: Mozilla,
+      name: "Firefox Relay",
+    },
+    host: {
+      authorization: "token",
+      selfHost: "never",
+      baseUrl: "https://relay.firefox.com/api",
+    },
+    requestedFields: [Field.token],
+  },
+];
diff --git a/libs/common/src/tools/extension/vendor/readme.md b/libs/common/src/tools/extension/vendor/readme.md
new file mode 100644
index 0000000000..507769edd4
--- /dev/null
+++ b/libs/common/src/tools/extension/vendor/readme.md
@@ -0,0 +1,33 @@
+# Vendors
+
+This folder contains vendor-specific logic that extends the
+Bitwarden password manager.
+
+## Vendor IDs
+
+A vendor's ID is used to identify and trace the code provided by
+a vendor across Bitwarden. There are a few rules that vendor ids
+must follow:
+
+1. They should be human-readable. (No UUIDs.)
+2. They may only contain lowercase ASCII characters and numbers.
+3. They must retain backwards compatibility with prior versions.
+
+As such, any given ID may not not match the vendor's present
+brand identity. Said branding may be stored in `VendorMetadata.name`.
+
+## Core files
+
+There are 4 vendor-independent files in this directory.
+
+- `data.ts` - core metadata used for system initialization
+- `index.ts` - exports vendor metadata
+- `README.md` - this file
+
+## Vendor definitions
+
+Each vendor should have one and only one definition, whose name
+MUST match their `VendorId`. The vendor is free to use either a
+single file (e.g. `bitwarden.ts`) or a folder containing multiple
+files (e.g. `bitwarden/extension.ts`, `bitwarden/forwarder.ts`) to
+host their files.
diff --git a/libs/common/src/tools/extension/vendor/simplelogin.ts b/libs/common/src/tools/extension/vendor/simplelogin.ts
new file mode 100644
index 0000000000..21ee969ceb
--- /dev/null
+++ b/libs/common/src/tools/extension/vendor/simplelogin.ts
@@ -0,0 +1,25 @@
+import { Field } from "../data";
+import { Extension } from "../metadata";
+import { ExtensionMetadata, VendorMetadata } from "../type";
+
+import { Vendor } from "./data";
+
+export const SimpleLogin: VendorMetadata = {
+  id: Vendor.simplelogin,
+  name: "SimpleLogin",
+};
+
+export const SimpleLoginExtensions: ExtensionMetadata[] = [
+  {
+    site: Extension.forwarder,
+    product: {
+      vendor: SimpleLogin,
+    },
+    host: {
+      authentication: true,
+      selfHost: "maybe",
+      baseUrl: "https://app.simplelogin.io",
+    },
+    requestedFields: [Field.baseUrl, Field.token, Field.domain],
+  },
+];
diff --git a/libs/common/src/tools/util.ts b/libs/common/src/tools/util.ts
new file mode 100644
index 0000000000..9a3a14c1c8
--- /dev/null
+++ b/libs/common/src/tools/util.ts
@@ -0,0 +1,19 @@
+/** Recursively freeze an object's own keys
+ *  @param value the value to freeze
+ *  @returns `value`
+ *  @remarks this function is derived from MDN's `deepFreeze`, which
+ *   has been committed to the public domain.
+ */
+export function deepFreeze<T extends object>(value: T): Readonly<T> {
+  const keys = Reflect.ownKeys(value) as (keyof T)[];
+
+  for (const key of keys) {
+    const own = value[key];
+
+    if ((own && typeof own === "object") || typeof own === "function") {
+      deepFreeze(own);
+    }
+  }
+
+  return Object.freeze(value);
+}

From 1721552294548fce688548100f40eb4d63e67ad3 Mon Sep 17 00:00:00 2001
From: Conner Turnbull <133619638+cturnbull-bitwarden@users.noreply.github.com>
Date: Wed, 15 Jan 2025 10:53:30 -0500
Subject: [PATCH 101/150] Updated org plans component to not call for tax info
 on self hosted instances (#12888)

---
 .../app/billing/organizations/organization-plans.component.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/app/billing/organizations/organization-plans.component.ts b/apps/web/src/app/billing/organizations/organization-plans.component.ts
index 4592f8de89..edc29b1604 100644
--- a/apps/web/src/app/billing/organizations/organization-plans.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-plans.component.ts
@@ -193,7 +193,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
       this.billing = await this.organizationApiService.getBilling(this.organizationId);
       this.sub = await this.organizationApiService.getSubscription(this.organizationId);
       this.taxInformation = await this.organizationApiService.getTaxInfo(this.organizationId);
-    } else {
+    } else if (!this.selfHosted) {
       this.taxInformation = await this.apiService.getTaxInfo();
     }
 

From b26ad6a173da33bfcdfce7f2edd2b65c31957953 Mon Sep 17 00:00:00 2001
From: Jonathan Prusik <jprusik@users.noreply.github.com>
Date: Wed, 15 Jan 2025 11:22:24 -0500
Subject: [PATCH 102/150] update the suggested items section header copy based
 on the blocked state of the current page (#12860)

---
 apps/browser/src/_locales/en/messages.json                  | 3 +++
 .../autofill-vault-list-items.component.html                | 2 +-
 .../autofill-vault-list-items.component.ts                  | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index 51fb3a0a77..9848be6d5f 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -4007,6 +4007,9 @@
   "passkeyRemoved": {
     "message": "Passkey removed"
   },
+  "autofillSuggestions": {
+    "message": "Autofill suggestions"
+  },
   "itemSuggestions": {
     "message": "Suggested items"
   },
diff --git a/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.html b/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.html
index 047d168ecb..eae8e2cc98 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.html
@@ -1,7 +1,7 @@
 <app-vault-list-items-container
   *ngIf="autofillCiphers$ | async as ciphers"
   [ciphers]="ciphers"
-  [title]="'itemSuggestions' | i18n"
+  [title]="((currentURIIsBlocked$ | async) ? 'itemSuggestions' : 'autofillSuggestions') | i18n"
   [showRefresh]="showRefresh"
   (onRefresh)="refreshCurrentTab()"
   [description]="(showEmptyAutofillTip$ | async) ? ('autofillSuggestionsTip' | i18n) : null"
diff --git a/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.ts b/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.ts
index deba204bd7..d2dd21be6d 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/autofill-vault-list-items/autofill-vault-list-items.component.ts
@@ -65,6 +65,12 @@ export class AutofillVaultListItemsComponent implements OnInit {
     ),
   );
 
+  /**
+   * Flag indicating that the current tab location is blocked
+   */
+  currentURIIsBlocked$: Observable<boolean> =
+    this.vaultPopupAutofillService.currentTabIsOnBlocklist$;
+
   constructor(
     private vaultPopupItemsService: VaultPopupItemsService,
     private vaultPopupAutofillService: VaultPopupAutofillService,

From 58bd44fa2fe8124944f31b1d474f27ebc2147489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=9C=A8=20Audrey=20=E2=9C=A8?= <ajensen@bitwarden.com>
Date: Wed, 15 Jan 2025 11:49:26 -0500
Subject: [PATCH 103/150] replace toBeTrue() with toBe(true) (#12893)

---
 .../runtime-extension-registry.spec.ts        | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/libs/common/src/tools/extension/runtime-extension-registry.spec.ts b/libs/common/src/tools/extension/runtime-extension-registry.spec.ts
index f4fe0e0ec0..6aa7382db5 100644
--- a/libs/common/src/tools/extension/runtime-extension-registry.spec.ts
+++ b/libs/common/src/tools/extension/runtime-extension-registry.spec.ts
@@ -143,8 +143,8 @@ describe("RuntimeExtensionRegistry", () => {
 
       const result = registry.registerSite(SomeSite).registerSite(barSite).sites();
 
-      expect(result.some(({ site }) => site.id === SomeSiteId)).toBeTrue();
-      expect(result.some(({ site }) => site.id === barSite.id)).toBeTrue();
+      expect(result.some(({ site }) => site.id === SomeSiteId)).toBe(true);
+      expect(result.some(({ site }) => site.id === barSite.id)).toBe(true);
     });
 
     it("includes permissions for a site", () => {
@@ -230,8 +230,8 @@ describe("RuntimeExtensionRegistry", () => {
 
       const result = registry.vendors();
 
-      expect(result.some(({ vendor }) => vendor.id === SomeVendorId)).toBeTrue();
-      expect(result.some(({ vendor }) => vendor.id === JustTrustUs.id)).toBeTrue();
+      expect(result.some(({ vendor }) => vendor.id === SomeVendorId)).toBe(true);
+      expect(result.some(({ vendor }) => vendor.id === JustTrustUs.id)).toBe(true);
     });
 
     it("includes permissions for a vendor", () => {
@@ -411,10 +411,10 @@ describe("RuntimeExtensionRegistry", () => {
 
       expect(
         result.some((p: any) => p.set.site === SomeSiteId && p.permission === Permission.allow),
-      ).toBeTrue();
+      ).toBe(true);
       expect(
         result.some((p: any) => p.set.site === "bar" && p.permission === Permission.deny),
-      ).toBeTrue();
+      ).toBe(true);
     });
 
     it("includes vendor permissions", () => {
@@ -428,12 +428,12 @@ describe("RuntimeExtensionRegistry", () => {
 
       expect(
         result.some((p: any) => p.set.vendor === SomeVendorId && p.permission === Permission.allow),
-      ).toBeTrue();
+      ).toBe(true);
       expect(
         result.some(
           (p: any) => p.set.vendor === JustTrustUs.id && p.permission === Permission.deny,
         ),
-      ).toBeTrue();
+      ).toBe(true);
     });
   });
 
@@ -561,13 +561,13 @@ describe("RuntimeExtensionRegistry", () => {
             ({ extension }) =>
               extension.site.id === SomeSiteId && extension.product.vendor.id === SomeVendorId,
           ),
-        ).toBeTrue();
+        ).toBe(true);
         expect(
           result.some(
             ({ extension }) =>
               extension.site.id === SomeSiteId && extension.product.vendor.id === JustTrustUs.id,
           ),
-        ).toBeTrue();
+        ).toBe(true);
       });
 
       it("includes permissions for extensions", () => {
@@ -587,7 +587,7 @@ describe("RuntimeExtensionRegistry", () => {
               extension.product.vendor.id === SomeVendorId &&
               permissions.includes(Permission.allow),
           ),
-        ).toBeTrue();
+        ).toBe(true);
       });
     });
 

From a5dce0535433c5ff5afff3b025260be9b9cee883 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Wed, 15 Jan 2025 17:59:39 +0100
Subject: [PATCH 104/150] [PM-17035] Fix biometric unlock badge in mv2 (#12854)

* Fix biometrics not working in firefox or windows

* Remove logs

* Update badge after biometric unlock

* Add removal todo note

* Remove debug logging

* Fix type warnings

* Fix userkey typing in background biometrics service

* Simplify types for userkey in foreground-browser-biometrics and runtime.background.ts

* Add process reload logging

* Fix autoprompt not working when no process reload happened

* Fix biometric unlock badge in mv2

* Fix instant reprompt on firefox lock

* Remove biometrics autoprompt on firefox (#12856)
---
 .../auth/popup/settings/account-security.component.html    | 2 +-
 .../src/auth/popup/settings/account-security.component.ts  | 7 +++++++
 apps/browser/src/background/main.background.ts             | 1 +
 .../biometrics/background-browser-biometrics.service.ts    | 6 ++++++
 .../src/angular/lock/components/lock.component.ts          | 7 ++++++-
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/apps/browser/src/auth/popup/settings/account-security.component.html b/apps/browser/src/auth/popup/settings/account-security.component.html
index 0f2754b2bf..8bc28c9754 100644
--- a/apps/browser/src/auth/popup/settings/account-security.component.html
+++ b/apps/browser/src/auth/popup/settings/account-security.component.html
@@ -20,7 +20,7 @@
             {{ biometricUnavailabilityReason }}
           </bit-hint>
         </bit-form-control>
-        <bit-form-control class="tw-pl-5" *ngIf="this.form.value.biometric">
+        <bit-form-control class="tw-pl-5" *ngIf="this.form.value.biometric && showAutoPrompt">
           <input
             bitCheckbox
             id="autoBiometricsPrompt"
diff --git a/apps/browser/src/auth/popup/settings/account-security.component.ts b/apps/browser/src/auth/popup/settings/account-security.component.ts
index 7e094fe508..5979afca4b 100644
--- a/apps/browser/src/auth/popup/settings/account-security.component.ts
+++ b/apps/browser/src/auth/popup/settings/account-security.component.ts
@@ -29,6 +29,7 @@ import { PolicyService } from "@bitwarden/common/admin-console/abstractions/poli
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
+import { DeviceType } from "@bitwarden/common/enums";
 import { VaultTimeoutAction } from "@bitwarden/common/enums/vault-timeout-action.enum";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -106,6 +107,7 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
   hasVaultTimeoutPolicy = false;
   biometricUnavailabilityReason: string;
   showChangeMasterPass = true;
+  showAutoPrompt = true;
 
   form = this.formBuilder.group({
     vaultTimeout: [null as VaultTimeout | null],
@@ -141,6 +143,11 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
   ) {}
 
   async ngOnInit() {
+    // Firefox popup closes when unfocused by biometrics, blocking all unlock methods
+    if (this.platformUtilsService.getDevice() === DeviceType.FirefoxExtension) {
+      this.showAutoPrompt = false;
+    }
+
     const hasMasterPassword = await this.userVerificationService.hasMasterPassword();
     this.showMasterPasswordOnClientRestartOption = hasMasterPassword;
     const maximumVaultTimeoutPolicy = this.policyService.get$(PolicyType.MaximumVaultTimeout);
diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index 98f3867e5f..5d09122bbd 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -665,6 +665,7 @@ export default class MainBackground {
       this.logService,
       this.keyService,
       this.biometricStateService,
+      this.messagingService,
     );
 
     this.appIdService = new AppIdService(this.storageService, this.logService);
diff --git a/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts b/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
index e943f241f7..54b6faad84 100644
--- a/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
+++ b/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
@@ -1,6 +1,7 @@
 import { Injectable } from "@angular/core";
 
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { UserId } from "@bitwarden/common/types/guid";
@@ -23,6 +24,7 @@ export class BackgroundBrowserBiometricsService extends BiometricsService {
     private logService: LogService,
     private keyService: KeyService,
     private biometricStateService: BiometricStateService,
+    private messagingService: MessagingService,
   ) {
     super();
   }
@@ -98,6 +100,8 @@ export class BackgroundBrowserBiometricsService extends BiometricsService {
             await this.biometricStateService.setBiometricUnlockEnabled(true);
             await this.biometricStateService.setFingerprintValidated(true);
             await this.keyService.setUserKey(userKey, userId);
+            // to update badge and other things
+            this.messagingService.send("switchAccount", { userId });
             return userKey;
           }
         } else {
@@ -116,6 +120,8 @@ export class BackgroundBrowserBiometricsService extends BiometricsService {
             await this.biometricStateService.setBiometricUnlockEnabled(true);
             await this.biometricStateService.setFingerprintValidated(true);
             await this.keyService.setUserKey(userKey, userId);
+            // to update badge and other things
+            this.messagingService.send("switchAccount", { userId });
             return userKey;
           }
         } else {
diff --git a/libs/key-management/src/angular/lock/components/lock.component.ts b/libs/key-management/src/angular/lock/components/lock.component.ts
index 6c912b0eaa..0adc9b838e 100644
--- a/libs/key-management/src/angular/lock/components/lock.component.ts
+++ b/libs/key-management/src/angular/lock/components/lock.component.ts
@@ -30,7 +30,7 @@ import {
   MasterPasswordVerification,
   MasterPasswordVerificationResponse,
 } from "@bitwarden/common/auth/types/verification";
-import { ClientType } from "@bitwarden/common/enums";
+import { ClientType, DeviceType } from "@bitwarden/common/enums";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -301,6 +301,11 @@ export class LockComponent implements OnInit, OnDestroy {
     }
 
     if (this.clientType === "browser") {
+      // Firefox closes the popup when unfocused, so this would block all unlock methods
+      if (this.platformUtilsService.getDevice() === DeviceType.FirefoxExtension) {
+        return;
+      }
+
       if (
         this.unlockOptions.biometrics.enabled &&
         autoPromptBiometrics &&

From 4a1e8cc763454f61df0528de12282b3e332dc14a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa?=
 <dani-garcia@users.noreply.github.com>
Date: Wed, 15 Jan 2025 18:14:31 +0100
Subject: [PATCH 105/150] Remove unused lifetime (#12889)

---
 apps/desktop/desktop_native/core/src/password/windows.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/desktop/desktop_native/core/src/password/windows.rs b/apps/desktop/desktop_native/core/src/password/windows.rs
index 32300b9f81..8b297fc33b 100644
--- a/apps/desktop/desktop_native/core/src/password/windows.rs
+++ b/apps/desktop/desktop_native/core/src/password/windows.rs
@@ -13,7 +13,7 @@ use windows::{
 
 const CRED_FLAGS_NONE: u32 = 0;
 
-pub async fn get_password<'a>(service: &str, account: &str) -> Result<String> {
+pub async fn get_password(service: &str, account: &str) -> Result<String> {
     let target_name = U16CString::from_str(target_name(service, account))?;
 
     let mut credential: *mut CREDENTIALW = std::ptr::null_mut();

From 1916fdc87f0f0d30e0f49edd208765b373ab1109 Mon Sep 17 00:00:00 2001
From: Todd Martin <106564991+trmartin4@users.noreply.github.com>
Date: Wed, 15 Jan 2025 12:23:49 -0500
Subject: [PATCH 106/150] Adjust handling of GH action dependencies for CI/CD
 partnership (#12818)

---
 .github/renovate.json | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index a1987ca038..5de1138803 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -4,13 +4,9 @@
   "enabledManagers": ["cargo", "github-actions", "npm"],
   "packageRules": [
     {
-      "groupName": "gh minor",
+      "groupName": "github action dependencies",
       "matchManagers": ["github-actions"],
-      "matchUpdateTypes": ["minor", "patch"]
-    },
-    {
-      "matchManagers": ["github-actions"],
-      "commitMessagePrefix": "[deps] BRE:"
+      "matchUpdateTypes": ["minor"]
     },
     {
       "matchManagers": ["cargo"],

From 334dd4cebe1ad20fa7f1b65c56f08266b67d5ed4 Mon Sep 17 00:00:00 2001
From: Merissa Weinstein <merissa.k.weinstein@gmail.com>
Date: Wed, 15 Jan 2025 11:53:03 -0600
Subject: [PATCH 107/150] [PM-10429] remove onboarding module for the browser
 refresh (#12759)

* remove onboarding module

* revert package.json commit
---
 apps/browser/src/_locales/en/messages.json    |  6 --
 .../vault-ui-onboarding.component.ts          | 79 ----------------
 .../components/vault-v2/vault-v2.component.ts |  5 --
 .../services/vault-ui-onboarding.service.ts   | 89 -------------------
 .../src/platform/state/state-definitions.ts   |  1 -
 5 files changed, 180 deletions(-)
 delete mode 100644 apps/browser/src/vault/popup/components/vault-v2/vault-ui-onboarding/vault-ui-onboarding.component.ts
 delete mode 100644 apps/browser/src/vault/popup/services/vault-ui-onboarding.service.ts

diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index 9848be6d5f..51e1203673 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -4589,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-ui-onboarding/vault-ui-onboarding.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-ui-onboarding/vault-ui-onboarding.component.ts
deleted file mode 100644
index 20b39c5a88..0000000000
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-ui-onboarding/vault-ui-onboarding.component.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { CommonModule } from "@angular/common";
-import { Component } from "@angular/core";
-
-import { JslibModule } from "@bitwarden/angular/jslib.module";
-import {
-  ButtonModule,
-  DialogModule,
-  DialogService,
-  IconModule,
-  svgIcon,
-} from "@bitwarden/components";
-
-const announcementIcon = svgIcon`
-<svg xmlns="http://www.w3.org/2000/svg" width="86" height="74" fill="none">
-  <g fill-rule="evenodd" clip-path="url(#a)" clip-rule="evenodd">
-    <path class="tw-fill-art-primary" d="m17.477 51.274 2.472 17.441a3.779 3.779 0 0 0 4.583 3.154l1.497-.342a3.779 3.779 0 0 0 2.759-4.831L23.44 49.91l1.8-.573 5.348 16.784a5.668 5.668 0 0 1-4.138 7.247l-1.497.341a5.668 5.668 0 0 1-6.874-4.73l-2.473-17.44 1.871-.266Z"/>
-    <path class="tw-fill-art-accent" d="m55.063 27.1-1.38.316-.211-.92 1.381-.316a3.306 3.306 0 0 1 3.96 2.486l1.052 4.605a3.306 3.306 0 0 1-2.487 3.96l-.92.21-.211-.92.92-.211a2.362 2.362 0 0 0 1.777-2.828l-1.052-4.605a2.362 2.362 0 0 0-2.829-1.777Z"/>
-    <path class="tw-fill-art-primary" d="M49.79 12.5a.18.18 0 0 0-.272-.11L21.855 29.438a.181.181 0 0 0-.058.055l-.208.323-10.947 2.5a.457.457 0 0 0-.139.064.664.664 0 0 0-.15.135.343.343 0 0 0-.06.095l.499 2.182-4.36.996c-1.873.428-3.086 2.465-2.64 4.417l1.5 6.566c.446 1.951 2.423 3.26 4.296 2.832l4.36-.996.499 2.182c.012.012.04.034.095.06a.658.658 0 0 0 .194.055c.07.009.122.004.152-.003l10.947-2.501.328.2a.18.18 0 0 0 .075.025l32.324 3.344a.18.18 0 0 0 .196-.218L49.79 12.5Zm-1.263-1.72a2.07 2.07 0 0 1 3.104 1.299L60.6 51.332a2.07 2.07 0 0 1-2.233 2.517l-32.323-3.343a2.072 2.072 0 0 1-.474-.106l-10.26 2.344a2.474 2.474 0 0 1-1.571-.184c-.463-.217-.973-.643-1.127-1.32l-.085-.37-2.518.576c-2.975.68-5.9-1.37-6.559-4.253l-1.5-6.566c-.659-2.883 1.086-6 4.061-6.68l2.518-.575-.084-.37c-.155-.677.12-1.282.442-1.678.325-.4.803-.727 1.334-.848l10.262-2.345c.113-.113.24-.214.38-.3l27.664-17.05Z"/>
-    <path class="tw-fill-art-accent" d="m10.792 34.793 3.156 13.814-.92.21L9.87 35.004l.921-.21ZM21.59 29.817l4.246 18.578-.508.12-.512.118L20.68 30.02l.91-.203Z"/>
-    <path class="tw-fill-art-primary" d="M64.287.59A.945.945 0 0 1 65.58.248c8.784 5.11 15.628 14.039 18.166 25.145 2.537 11.105.25 22.12-5.443 30.538a.945.945 0 0 1-1.565-1.059c5.398-7.98 7.587-18.46 5.166-29.058C79.48 15.215 72.958 6.726 64.629 1.882A.945.945 0 0 1 64.287.59Z"/>
-    <path class="tw-fill-art-accent" d="M61.6 6.385a.472.472 0 0 1 .643-.18c7.245 4.067 12.949 11.44 15.055 20.66s.171 18.338-4.588 25.149a.472.472 0 0 1-.774-.542c4.603-6.587 6.49-15.431 4.441-24.397-2.048-8.965-7.59-16.113-14.596-20.047a.472.472 0 0 1-.18-.643Z"/>
-    <path class="tw-fill-art-primary" d="M57.804 11.193a.472.472 0 0 1 .604-.285c6.11 2.186 11.426 8.739 13.364 17.22 1.938 8.48-.006 16.693-4.56 21.315a.472.472 0 1 1-.672-.663c4.27-4.335 6.197-12.187 4.311-20.442-1.886-8.254-7.032-14.49-12.761-16.54a.472.472 0 0 1-.286-.605Z"/>
-  </g>
-  <defs>
-    <clipPath id="a">
-      <path fill="#fff" d="M0 0h86v74H0z"/>
-    </clipPath>
-  </defs>
-</svg>
-`;
-
-@Component({
-  standalone: true,
-  selector: "app-vault-ui-onboarding",
-  template: `
-    <bit-simple-dialog>
-      <div bitDialogIcon>
-        <bit-icon [icon]="icon"></bit-icon>
-      </div>
-      <span bitDialogTitle>
-        {{ "bitwardenNewLook" | i18n }}
-      </span>
-      <span bitDialogContent>
-        {{ "bitwardenNewLookDesc" | i18n }}
-      </span>
-
-      <ng-container bitDialogFooter>
-        <button
-          bitButton
-          type="button"
-          buttonType="primary"
-          (click)="navigateToLink()"
-          bitDialogClose
-        >
-          {{ "learnMore" | i18n }}
-          <i class="bwi bwi-external-link bwi-fw" aria-hidden="true"></i>
-        </button>
-        <button bitButton type="button" buttonType="secondary" bitDialogClose>
-          {{ "close" | i18n }}
-        </button>
-      </ng-container>
-    </bit-simple-dialog>
-  `,
-  imports: [CommonModule, DialogModule, ButtonModule, JslibModule, IconModule],
-})
-export class VaultUiOnboardingComponent {
-  icon = announcementIcon;
-
-  static open(dialogService: DialogService) {
-    return dialogService.open<boolean>(VaultUiOnboardingComponent);
-  }
-
-  navigateToLink = async () => {
-    window.open(
-      "https://bitwarden.com/blog/bringing-intuitive-workflows-and-visual-updates-to-the-bitwarden-browser/",
-      "_blank",
-    );
-  };
-}
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.ts
index a0c5498735..7c21c7e6a0 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.ts
@@ -19,7 +19,6 @@ import { PopupHeaderComponent } from "../../../../platform/popup/layout/popup-he
 import { PopupPageComponent } from "../../../../platform/popup/layout/popup-page.component";
 import { VaultPopupItemsService } from "../../services/vault-popup-items.service";
 import { VaultPopupListFiltersService } from "../../services/vault-popup-list-filters.service";
-import { VaultUiOnboardingService } from "../../services/vault-ui-onboarding.service";
 
 import { BlockedInjectionBanner } from "./blocked-injection-banner/blocked-injection-banner.component";
 import {
@@ -58,7 +57,6 @@ enum VaultState {
     VaultHeaderV2Component,
     DecryptionFailureDialogComponent,
   ],
-  providers: [VaultUiOnboardingService],
 })
 export class VaultV2Component implements OnInit, OnDestroy {
   cipherType = CipherType;
@@ -93,7 +91,6 @@ export class VaultV2Component implements OnInit, OnDestroy {
   constructor(
     private vaultPopupItemsService: VaultPopupItemsService,
     private vaultPopupListFiltersService: VaultPopupListFiltersService,
-    private vaultUiOnboardingService: VaultUiOnboardingService,
     private destroyRef: DestroyRef,
     private cipherService: CipherService,
     private dialogService: DialogService,
@@ -123,8 +120,6 @@ export class VaultV2Component implements OnInit, OnDestroy {
   }
 
   async ngOnInit() {
-    await this.vaultUiOnboardingService.showOnboardingDialog();
-
     this.cipherService.failedToDecryptCiphers$
       .pipe(
         map((ciphers) => ciphers.filter((c) => !c.isDeleted)),
diff --git a/apps/browser/src/vault/popup/services/vault-ui-onboarding.service.ts b/apps/browser/src/vault/popup/services/vault-ui-onboarding.service.ts
deleted file mode 100644
index f50d6ebc23..0000000000
--- a/apps/browser/src/vault/popup/services/vault-ui-onboarding.service.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Injectable } from "@angular/core";
-import { firstValueFrom, map } from "rxjs";
-
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import {
-  GlobalState,
-  KeyDefinition,
-  StateProvider,
-  VAULT_BROWSER_UI_ONBOARDING,
-} from "@bitwarden/common/platform/state";
-import { DialogService } from "@bitwarden/components";
-
-import { VaultUiOnboardingComponent } from "../components/vault-v2/vault-ui-onboarding/vault-ui-onboarding.component";
-
-// Key definition for the Vault UI onboarding state.
-// This key is used to store the state of the new UI information dialog.
-export const GLOBAL_VAULT_UI_ONBOARDING = new KeyDefinition<boolean>(
-  VAULT_BROWSER_UI_ONBOARDING,
-  "dialogState",
-  {
-    deserializer: (obj) => obj,
-  },
-);
-
-@Injectable()
-export class VaultUiOnboardingService {
-  private onboardingUiReleaseDate = new Date("2024-12-10");
-
-  private vaultUiOnboardingState: GlobalState<boolean> = this.stateProvider.getGlobal(
-    GLOBAL_VAULT_UI_ONBOARDING,
-  );
-
-  private readonly vaultUiOnboardingState$ = this.vaultUiOnboardingState.state$.pipe(
-    map((x) => x ?? false),
-  );
-
-  constructor(
-    private stateProvider: StateProvider,
-    private dialogService: DialogService,
-    private apiService: ApiService,
-  ) {}
-
-  /**
-   * Checks whether the onboarding dialog should be shown and opens it if necessary.
-   * The dialog is shown if the user has not previously viewed it and is not a new account.
-   */
-  async showOnboardingDialog(): Promise<void> {
-    const hasViewedDialog = await this.getVaultUiOnboardingState();
-
-    if (!hasViewedDialog && !(await this.isNewAccount())) {
-      await this.openVaultUiOnboardingDialog();
-    }
-  }
-
-  private async openVaultUiOnboardingDialog(): Promise<boolean> {
-    const dialogRef = VaultUiOnboardingComponent.open(this.dialogService);
-
-    const result = firstValueFrom(dialogRef.closed);
-
-    // Update the onboarding state when the dialog is closed
-    await this.setVaultUiOnboardingState(true);
-
-    return result;
-  }
-
-  private async isNewAccount(): Promise<boolean> {
-    const userProfile = await this.apiService.getProfile();
-    const profileCreationDate = new Date(userProfile.creationDate);
-    return profileCreationDate > this.onboardingUiReleaseDate;
-  }
-
-  /**
-   * Updates and saves the state indicating whether the user has viewed
-   * the new UI onboarding information dialog.
-   */
-  private async setVaultUiOnboardingState(value: boolean): Promise<void> {
-    await this.vaultUiOnboardingState.update(() => value);
-  }
-
-  /**
-   * Retrieves the current state indicating whether the user has viewed
-   * the new UI onboarding information dialog.s
-   */
-  private async getVaultUiOnboardingState(): Promise<boolean> {
-    return await firstValueFrom(this.vaultUiOnboardingState$);
-  }
-}
diff --git a/libs/common/src/platform/state/state-definitions.ts b/libs/common/src/platform/state/state-definitions.ts
index 1ed5227cb1..483a8c050d 100644
--- a/libs/common/src/platform/state/state-definitions.ts
+++ b/libs/common/src/platform/state/state-definitions.ts
@@ -179,7 +179,6 @@ export const PREMIUM_BANNER_DISK_LOCAL = new StateDefinition("premiumBannerRepro
   web: "disk-local",
 });
 export const BANNERS_DISMISSED_DISK = new StateDefinition("bannersDismissed", "disk");
-export const VAULT_BROWSER_UI_ONBOARDING = new StateDefinition("vaultBrowserUiOnboarding", "disk");
 export const NEW_DEVICE_VERIFICATION_NOTICE = new StateDefinition(
   "newDeviceVerificationNotice",
   "disk",

From 7b496cc7a57165452fe8f38e0f49a7190b9e4897 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 15 Jan 2025 10:12:42 -0800
Subject: [PATCH 108/150] [deps] Vault: Update form-data to v4.0.1 (#11536)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: jaasen-livefront <jaasen@livefront.com>
---
 apps/cli/package.json |  2 +-
 package-lock.json     | 10 +++++-----
 package.json          |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/cli/package.json b/apps/cli/package.json
index 8a6dffb1cb..d1d8ac76ec 100644
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -63,7 +63,7 @@
     "browser-hrtime": "1.1.8",
     "chalk": "4.1.2",
     "commander": "11.1.0",
-    "form-data": "4.0.0",
+    "form-data": "4.0.1",
     "https-proxy-agent": "7.0.5",
     "inquirer": "8.2.6",
     "jsdom": "25.0.1",
diff --git a/package-lock.json b/package-lock.json
index a8f8295251..6fc9bebb61 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -42,7 +42,7 @@
         "chalk": "4.1.2",
         "commander": "11.1.0",
         "core-js": "3.39.0",
-        "form-data": "4.0.0",
+        "form-data": "4.0.1",
         "https-proxy-agent": "7.0.5",
         "inquirer": "8.2.6",
         "jquery": "3.7.1",
@@ -205,7 +205,7 @@
         "browser-hrtime": "1.1.8",
         "chalk": "4.1.2",
         "commander": "11.1.0",
-        "form-data": "4.0.0",
+        "form-data": "4.0.1",
         "https-proxy-agent": "7.0.5",
         "inquirer": "8.2.6",
         "jsdom": "25.0.1",
@@ -17764,9 +17764,9 @@
       }
     },
     "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==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
+      "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
diff --git a/package.json b/package.json
index 0af1445a8a..9b7a2efeff 100644
--- a/package.json
+++ b/package.json
@@ -172,7 +172,7 @@
     "chalk": "4.1.2",
     "commander": "11.1.0",
     "core-js": "3.39.0",
-    "form-data": "4.0.0",
+    "form-data": "4.0.1",
     "https-proxy-agent": "7.0.5",
     "inquirer": "8.2.6",
     "jquery": "3.7.1",

From 494d349b579d6dfc016b23289bdc7da1428684d1 Mon Sep 17 00:00:00 2001
From: Jake Fink <jfink@bitwarden.com>
Date: Wed, 15 Jan 2025 12:22:50 -0600
Subject: [PATCH 109/150] prevent bio prompt when switching to unlocked account
 (#12875)

---
 .../src/angular/lock/components/lock.component.ts             | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libs/key-management/src/angular/lock/components/lock.component.ts b/libs/key-management/src/angular/lock/components/lock.component.ts
index 0adc9b838e..c4e3207813 100644
--- a/libs/key-management/src/angular/lock/components/lock.component.ts
+++ b/libs/key-management/src/angular/lock/components/lock.component.ts
@@ -244,6 +244,10 @@ export class LockComponent implements OnInit, OnDestroy {
     if (activeAccount == null) {
       return;
     }
+    // this account may be unlocked, prevent any prompts so we can redirect to vault
+    if (await this.keyService.hasUserKeyInMemory(activeAccount.id)) {
+      return;
+    }
 
     this.setEmailAsPageSubtitle(activeAccount.email);
 

From b0957cf1f6c8e6591c47e83d7c15b3f4f27da671 Mon Sep 17 00:00:00 2001
From: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>
Date: Wed, 15 Jan 2025 12:47:01 -0600
Subject: [PATCH 110/150] Remove setting setFingerprintValidated to true
 (#12874)

Co-authored-by: Jake Fink <jfink@bitwarden.com>
---
 .../biometrics/background-browser-biometrics.service.ts         | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts b/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
index 54b6faad84..3031134dc3 100644
--- a/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
+++ b/apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
@@ -98,7 +98,6 @@ export class BackgroundBrowserBiometricsService extends BiometricsService {
           const userKey = new SymmetricCryptoKey(decodedUserkey) as UserKey;
           if (await this.keyService.validateUserKey(userKey, userId)) {
             await this.biometricStateService.setBiometricUnlockEnabled(true);
-            await this.biometricStateService.setFingerprintValidated(true);
             await this.keyService.setUserKey(userKey, userId);
             // to update badge and other things
             this.messagingService.send("switchAccount", { userId });
@@ -118,7 +117,6 @@ export class BackgroundBrowserBiometricsService extends BiometricsService {
           const userKey = new SymmetricCryptoKey(decodedUserkey) as UserKey;
           if (await this.keyService.validateUserKey(userKey, userId)) {
             await this.biometricStateService.setBiometricUnlockEnabled(true);
-            await this.biometricStateService.setFingerprintValidated(true);
             await this.keyService.setUserKey(userKey, userId);
             // to update badge and other things
             this.messagingService.send("switchAccount", { userId });

From 99937e5831baa1ce9adbef4fd2403dcb5b7b777c Mon Sep 17 00:00:00 2001
From: Daniel Riera <driera@livefront.com>
Date: Wed, 15 Jan 2025 14:13:03 -0500
Subject: [PATCH 111/150] PM-14051-storybook-implementation (#12840)

* PM-14051 -initial storybook set up
-Initial stories and folder structure

* clean up typing on existing stories

* add icons file

* assign packages to autofill

* row stories

* row storiescd

* -change file nnames to avoid rendering in main storybook instance - fix folder structure to set prep for doc creation

* remove babel loader

* -fix folder structure -add new package json -edit main to correct ts-config path

* edit package name
---
 .github/renovate.json                         |  1 +
 .../content/components/.lit-storybook/main.ts | 67 +++++++++++++++++++
 .../buttons/action-button.lit-stories.ts      | 34 ++++++++++
 .../buttons/badge-button.lit-stories.ts       | 34 ++++++++++
 .../buttons/close-button.lit-stories.ts       | 29 ++++++++
 .../buttons/edit-button.lit-stories.ts        | 33 +++++++++
 .../ciphers/cipher-action.lit-stories.ts      | 36 ++++++++++
 .../ciphers/cipher-icon.lit-stories.ts        | 40 +++++++++++
 .../cipher-indicator-icon.lit-stories.ts      | 33 +++++++++
 .../lit-stories/icons/icons.lit-stories.ts    | 66 ++++++++++++++++++
 .../notification/body.lit-stories.ts          | 53 +++++++++++++++
 .../notification/footer.lit-stories.ts        | 32 +++++++++
 .../notification/header.lit-stories.ts        | 33 +++++++++
 .../rows/action-row.lit-stories.ts            | 31 +++++++++
 .../rows/button-row.lit-stories.ts            | 25 +++++++
 .../lit-stories/rows/item-row.lit-stories.ts  | 28 ++++++++
 .../autofill/content/components/package.json  |  7 ++
 package-lock.json                             | 57 +++++++++++++++-
 package.json                                  |  1 +
 19 files changed, 637 insertions(+), 3 deletions(-)
 create mode 100644 apps/browser/src/autofill/content/components/.lit-storybook/main.ts
 create mode 100644 apps/browser/src/autofill/content/components/lit-stories/buttons/action-button.lit-stories.ts
 create mode 100644 apps/browser/src/autofill/content/components/lit-stories/buttons/badge-button.lit-stories.ts
 create mode 100644 apps/browser/src/autofill/content/components/lit-stories/buttons/close-button.lit-stories.ts
 create mode 100644 apps/browser/src/autofill/content/components/lit-stories/buttons/edit-button.lit-stories.ts
 create mode 100644 apps/browser/src/autofill/content/components/lit-stories/ciphers/cipher-action.lit-stories.ts
 create mode 100644 apps/browser/src/autofill/content/components/lit-stories/ciphers/cipher-icon.lit-stories.ts
 create mode 100644 apps/browser/src/autofill/content/components/lit-stories/ciphers/cipher-indicator-icon.lit-stories.ts
 create mode 100644 apps/browser/src/autofill/content/components/lit-stories/icons/icons.lit-stories.ts
 create mode 100644 apps/browser/src/autofill/content/components/lit-stories/notification/body.lit-stories.ts
 create mode 100644 apps/browser/src/autofill/content/components/lit-stories/notification/footer.lit-stories.ts
 create mode 100644 apps/browser/src/autofill/content/components/lit-stories/notification/header.lit-stories.ts
 create mode 100644 apps/browser/src/autofill/content/components/lit-stories/rows/action-row.lit-stories.ts
 create mode 100644 apps/browser/src/autofill/content/components/lit-stories/rows/button-row.lit-stories.ts
 create mode 100644 apps/browser/src/autofill/content/components/lit-stories/rows/item-row.lit-stories.ts
 create mode 100644 apps/browser/src/autofill/content/components/package.json

diff --git a/.github/renovate.json b/.github/renovate.json
index 5de1138803..350484b5c2 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -82,6 +82,7 @@
         "prettier",
         "prettier-plugin-tailwindcss",
         "rimraf",
+        "@storybook/web-components-webpack5",
         "tabbable",
         "tldts",
         "wait-on"
diff --git a/apps/browser/src/autofill/content/components/.lit-storybook/main.ts b/apps/browser/src/autofill/content/components/.lit-storybook/main.ts
new file mode 100644
index 0000000000..9e2da59d99
--- /dev/null
+++ b/apps/browser/src/autofill/content/components/.lit-storybook/main.ts
@@ -0,0 +1,67 @@
+import { dirname, join } from "path";
+import path from "path";
+import type { StorybookConfig } from "@storybook/web-components-webpack5";
+import TsconfigPathsPlugin from "tsconfig-paths-webpack-plugin";
+import remarkGfm from "remark-gfm";
+
+const getAbsolutePath = (value: string): string =>
+  dirname(require.resolve(join(value, "package.json")));
+
+const config: StorybookConfig = {
+  stories: ["../lit-stories/**/*.lit-stories.@(js|jsx|ts|tsx)"],
+  addons: [
+    getAbsolutePath("@storybook/addon-links"),
+    getAbsolutePath("@storybook/addon-essentials"),
+    getAbsolutePath("@storybook/addon-a11y"),
+    getAbsolutePath("@storybook/addon-designs"),
+    getAbsolutePath("@storybook/addon-interactions"),
+    {
+      name: "@storybook/addon-docs",
+      options: {
+        mdxPluginOptions: {
+          mdxCompileOptions: {
+            remarkPlugins: [remarkGfm],
+          },
+        },
+      },
+    },
+  ],
+  framework: {
+    name: getAbsolutePath("@storybook/web-components-webpack5"),
+    options: {
+      legacyRootApi: true,
+    },
+  },
+  core: {
+    disableTelemetry: true,
+  },
+  env: (existingConfig) => ({
+    ...existingConfig,
+    FLAGS: JSON.stringify({}),
+  }),
+  webpackFinal: async (config) => {
+    if (config.resolve) {
+      config.resolve.plugins = [
+        new TsconfigPathsPlugin({
+          configFile: path.resolve(__dirname, "../../../../../tsconfig.json"),
+        }),
+      ] as any;
+    }
+
+    if (config.module && config.module.rules) {
+      config.module.rules.push({
+        test: /\.(ts|tsx)$/,
+        exclude: /node_modules/,
+        use: [
+          {
+            loader: require.resolve("ts-loader"),
+          },
+        ],
+      });
+    }
+    return config;
+  },
+  docs: {},
+};
+
+export default config;
diff --git a/apps/browser/src/autofill/content/components/lit-stories/buttons/action-button.lit-stories.ts b/apps/browser/src/autofill/content/components/lit-stories/buttons/action-button.lit-stories.ts
new file mode 100644
index 0000000000..aa53555d11
--- /dev/null
+++ b/apps/browser/src/autofill/content/components/lit-stories/buttons/action-button.lit-stories.ts
@@ -0,0 +1,34 @@
+import { Meta, StoryObj } from "@storybook/web-components";
+
+import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
+
+import { ActionButton } from "../../buttons/action-button";
+
+type Args = {
+  buttonText: string;
+  disabled: boolean;
+  theme: Theme;
+  buttonAction: (e: Event) => void;
+};
+
+export default {
+  title: "Components/Buttons/Action Button",
+  argTypes: {
+    buttonText: { control: "text" },
+    disabled: { control: "boolean" },
+    theme: { control: "select", options: [...Object.values(ThemeTypes)] },
+    buttonAction: { control: false },
+  },
+  args: {
+    buttonText: "Click Me",
+    disabled: false,
+    theme: ThemeTypes.Light,
+    buttonAction: () => alert("Clicked"),
+  },
+} as Meta<Args>;
+
+const Template = (args: Args) => ActionButton({ ...args });
+
+export const Default: StoryObj<Args> = {
+  render: Template,
+};
diff --git a/apps/browser/src/autofill/content/components/lit-stories/buttons/badge-button.lit-stories.ts b/apps/browser/src/autofill/content/components/lit-stories/buttons/badge-button.lit-stories.ts
new file mode 100644
index 0000000000..876a70eebc
--- /dev/null
+++ b/apps/browser/src/autofill/content/components/lit-stories/buttons/badge-button.lit-stories.ts
@@ -0,0 +1,34 @@
+import { Meta, StoryObj } from "@storybook/web-components";
+
+import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
+
+import { BadgeButton } from "../../buttons/badge-button";
+
+type Args = {
+  buttonAction: (e: Event) => void;
+  buttonText: string;
+  disabled?: boolean;
+  theme: Theme;
+};
+
+export default {
+  title: "Components/Buttons/Badge Button",
+  argTypes: {
+    buttonText: { control: "text" },
+    disabled: { control: "boolean" },
+    theme: { control: "select", options: [...Object.values(ThemeTypes)] },
+    buttonAction: { control: false },
+  },
+  args: {
+    buttonText: "Click Me",
+    disabled: false,
+    theme: ThemeTypes.Light,
+    buttonAction: () => alert("Clicked"),
+  },
+} as Meta<Args>;
+
+const Template = (args: Args) => BadgeButton({ ...args });
+
+export const Default: StoryObj<Args> = {
+  render: Template,
+};
diff --git a/apps/browser/src/autofill/content/components/lit-stories/buttons/close-button.lit-stories.ts b/apps/browser/src/autofill/content/components/lit-stories/buttons/close-button.lit-stories.ts
new file mode 100644
index 0000000000..dc202f330a
--- /dev/null
+++ b/apps/browser/src/autofill/content/components/lit-stories/buttons/close-button.lit-stories.ts
@@ -0,0 +1,29 @@
+import { Meta, StoryObj } from "@storybook/web-components";
+
+import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
+
+import { CloseButton } from "../../buttons/close-button";
+
+type Args = {
+  handleCloseNotification: (e: Event) => void;
+  theme: Theme;
+};
+export default {
+  title: "Components/Buttons/Close Button",
+  argTypes: {
+    theme: { control: "select", options: [...Object.values(ThemeTypes)] },
+    handleCloseNotification: { control: false },
+  },
+  args: {
+    theme: ThemeTypes.Light,
+    handleCloseNotification: () => {
+      alert("Close button clicked!");
+    },
+  },
+} as Meta<Args>;
+
+const Template = (args: Args) => CloseButton({ ...args });
+
+export const Default: StoryObj<Args> = {
+  render: Template,
+};
diff --git a/apps/browser/src/autofill/content/components/lit-stories/buttons/edit-button.lit-stories.ts b/apps/browser/src/autofill/content/components/lit-stories/buttons/edit-button.lit-stories.ts
new file mode 100644
index 0000000000..769fe475dd
--- /dev/null
+++ b/apps/browser/src/autofill/content/components/lit-stories/buttons/edit-button.lit-stories.ts
@@ -0,0 +1,33 @@
+import { Meta, StoryObj } from "@storybook/web-components";
+
+import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
+
+import { EditButton } from "../../buttons/edit-button";
+
+type Args = {
+  buttonAction: (e: Event) => void;
+  buttonText: string;
+  disabled?: boolean;
+  theme: Theme;
+};
+export default {
+  title: "Components/Buttons/Edit Button",
+  argTypes: {
+    buttonText: { control: "text" },
+    disabled: { control: "boolean" },
+    theme: { control: "select", options: [...Object.values(ThemeTypes)] },
+    buttonAction: { control: false },
+  },
+  args: {
+    buttonText: "Click Me",
+    disabled: false,
+    theme: ThemeTypes.Light,
+    buttonAction: () => alert("Clicked"),
+  },
+} as Meta<Args>;
+
+const Template = (args: Args) => EditButton({ ...args });
+
+export const Default: StoryObj<Args> = {
+  render: Template,
+};
diff --git a/apps/browser/src/autofill/content/components/lit-stories/ciphers/cipher-action.lit-stories.ts b/apps/browser/src/autofill/content/components/lit-stories/ciphers/cipher-action.lit-stories.ts
new file mode 100644
index 0000000000..e597cddabe
--- /dev/null
+++ b/apps/browser/src/autofill/content/components/lit-stories/ciphers/cipher-action.lit-stories.ts
@@ -0,0 +1,36 @@
+import { Meta, StoryObj } from "@storybook/web-components";
+
+import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
+
+import { NotificationTypes } from "../../../../notification/abstractions/notification-bar";
+import { CipherAction } from "../../cipher/cipher-action";
+
+type Args = {
+  handleAction?: (e: Event) => void;
+  notificationType: typeof NotificationTypes.Change | typeof NotificationTypes.Add;
+  theme: Theme;
+};
+export default {
+  title: "Components/Ciphers/Cipher Action",
+  argTypes: {
+    theme: { control: "select", options: [...Object.values(ThemeTypes)] },
+    notificationType: {
+      control: "select",
+      options: [NotificationTypes.Change, NotificationTypes.Add],
+    },
+    handleAction: { control: false },
+  },
+  args: {
+    theme: ThemeTypes.Light,
+    notificationType: NotificationTypes.Change,
+    handleAction: () => {
+      alert("Action triggered!");
+    },
+  },
+} as Meta<Args>;
+
+const Template = (args: Args) => CipherAction({ ...args });
+
+export const Default: StoryObj<Args> = {
+  render: Template,
+};
diff --git a/apps/browser/src/autofill/content/components/lit-stories/ciphers/cipher-icon.lit-stories.ts b/apps/browser/src/autofill/content/components/lit-stories/ciphers/cipher-icon.lit-stories.ts
new file mode 100644
index 0000000000..a8884f063d
--- /dev/null
+++ b/apps/browser/src/autofill/content/components/lit-stories/ciphers/cipher-icon.lit-stories.ts
@@ -0,0 +1,40 @@
+import { Meta, StoryObj } from "@storybook/web-components";
+import { html } from "lit";
+
+import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
+
+import { CipherIcon } from "../../cipher/cipher-icon";
+
+type Args = {
+  color: string;
+  size: string;
+  theme: Theme;
+  uri?: string;
+};
+
+export default {
+  title: "Components/Ciphers/Cipher Icon",
+  argTypes: {
+    color: { control: "color" },
+    size: { control: "text" },
+    theme: { control: "select", options: [...Object.values(ThemeTypes)] },
+    uri: { control: "text" },
+  },
+  args: {
+    size: "50px",
+    theme: ThemeTypes.Light,
+    uri: "",
+  },
+} as Meta<Args>;
+
+const Template = (args: Args) => {
+  return html`
+    <div style="width: ${args.size}; height: ${args.size}; overflow: hidden;">
+      ${CipherIcon({ ...args })}
+    </div>
+  `;
+};
+
+export const Default: StoryObj<Args> = {
+  render: Template,
+};
diff --git a/apps/browser/src/autofill/content/components/lit-stories/ciphers/cipher-indicator-icon.lit-stories.ts b/apps/browser/src/autofill/content/components/lit-stories/ciphers/cipher-indicator-icon.lit-stories.ts
new file mode 100644
index 0000000000..2d031fa3af
--- /dev/null
+++ b/apps/browser/src/autofill/content/components/lit-stories/ciphers/cipher-indicator-icon.lit-stories.ts
@@ -0,0 +1,33 @@
+import { Meta, StoryObj } from "@storybook/web-components";
+import { html } from "lit";
+
+import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
+
+import { CipherInfoIndicatorIcons } from "../../cipher/cipher-indicator-icons";
+
+type Args = {
+  isBusinessOrg?: boolean;
+  isFamilyOrg?: boolean;
+  theme: Theme;
+};
+
+export default {
+  title: "Components/Ciphers/Cipher Indicator Icon",
+  argTypes: {
+    isBusinessOrg: { control: "boolean" },
+    isFamilyOrg: { control: "boolean" },
+    theme: { control: "select", options: [...Object.values(ThemeTypes)] },
+  },
+  args: {
+    theme: ThemeTypes.Light,
+    isBusinessOrg: true,
+    isFamilyOrg: false,
+  },
+} as Meta<Args>;
+
+const Template: StoryObj<Args>["render"] = (args) =>
+  html`<div>${CipherInfoIndicatorIcons({ ...args })}</div>`;
+
+export const Default: StoryObj<Args> = {
+  render: Template,
+};
diff --git a/apps/browser/src/autofill/content/components/lit-stories/icons/icons.lit-stories.ts b/apps/browser/src/autofill/content/components/lit-stories/icons/icons.lit-stories.ts
new file mode 100644
index 0000000000..20c88a5924
--- /dev/null
+++ b/apps/browser/src/autofill/content/components/lit-stories/icons/icons.lit-stories.ts
@@ -0,0 +1,66 @@
+import { Meta, StoryObj } from "@storybook/web-components";
+import { html } from "lit";
+
+import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
+
+import * as Icons from "../../icons";
+
+type Args = {
+  color?: string;
+  disabled?: boolean;
+  theme: Theme;
+  size: number;
+  iconLink: URL;
+};
+
+export default {
+  title: "Components/Icons/Icons",
+  argTypes: {
+    iconLink: { control: "text" },
+    color: { control: "color" },
+    disabled: { control: "boolean" },
+    theme: { control: "select", options: [...Object.values(ThemeTypes)] },
+    size: { control: "number", min: 10, max: 100, step: 1 },
+  },
+  args: {
+    iconLink: new URL("https://bitwarden.com"),
+    disabled: false,
+    theme: ThemeTypes.Light,
+    size: 50,
+  },
+} as Meta<Args>;
+
+const Template = (args: Args, IconComponent: (props: Args) => ReturnType<typeof html>) => html`
+  <div
+    style="width: ${args.size}px; height: ${args.size}px; display: flex; align-items: center; justify-content: center;"
+  >
+    ${IconComponent({ ...args })}
+  </div>
+`;
+
+const createIconStory = (iconName: keyof typeof Icons): StoryObj<Args> => {
+  const story = {
+    render: (args) => Template(args, Icons[iconName]),
+  } as StoryObj<Args>;
+
+  if (iconName !== "BrandIconContainer") {
+    story.argTypes = {
+      iconLink: { table: { disable: true } },
+    };
+  }
+
+  return story;
+};
+
+export const AngleDownIcon = createIconStory("AngleDown");
+export const BusinessIcon = createIconStory("Business");
+export const BrandIcon = createIconStory("BrandIconContainer");
+export const CloseIcon = createIconStory("Close");
+export const ExclamationTriangleIcon = createIconStory("ExclamationTriangle");
+export const FamilyIcon = createIconStory("Family");
+export const FolderIcon = createIconStory("Folder");
+export const GlobeIcon = createIconStory("Globe");
+export const PartyHornIcon = createIconStory("PartyHorn");
+export const PencilSquareIcon = createIconStory("PencilSquare");
+export const ShieldIcon = createIconStory("Shield");
+export const UserIcon = createIconStory("User");
diff --git a/apps/browser/src/autofill/content/components/lit-stories/notification/body.lit-stories.ts b/apps/browser/src/autofill/content/components/lit-stories/notification/body.lit-stories.ts
new file mode 100644
index 0000000000..00ea905a2f
--- /dev/null
+++ b/apps/browser/src/autofill/content/components/lit-stories/notification/body.lit-stories.ts
@@ -0,0 +1,53 @@
+import { Meta, StoryObj } from "@storybook/web-components";
+
+import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
+import { CipherType } from "@bitwarden/common/vault/enums";
+import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
+
+import { NotificationType } from "../../../../notification/abstractions/notification-bar";
+import { CipherData } from "../../cipher/types";
+import { NotificationBody } from "../../notification/body";
+
+type Args = {
+  ciphers: CipherData[];
+  notificationType: NotificationType;
+  theme: Theme;
+};
+
+export default {
+  title: "Components/Notifications/Notification Body",
+  argTypes: {
+    ciphers: { control: "object" },
+    theme: { control: "select", options: [...Object.values(ThemeTypes)] },
+    notificationType: {
+      control: "select",
+      options: ["add", "change", "unlock", "fileless-import"],
+    },
+  },
+  args: {
+    ciphers: [
+      {
+        id: "1",
+        name: "Example Cipher",
+        type: CipherType.Login,
+        favorite: false,
+        reprompt: CipherRepromptType.None,
+        icon: {
+          imageEnabled: true,
+          image: "",
+          fallbackImage: "https://example.com/fallback.png",
+          icon: "icon-class",
+        },
+        login: { username: "user@example.com", passkey: null },
+      },
+    ],
+    theme: ThemeTypes.Light,
+    notificationType: "change",
+  },
+} as Meta<Args>;
+
+const Template = (args: Args) => NotificationBody({ ...args });
+
+export const Default: StoryObj<Args> = {
+  render: Template,
+};
diff --git a/apps/browser/src/autofill/content/components/lit-stories/notification/footer.lit-stories.ts b/apps/browser/src/autofill/content/components/lit-stories/notification/footer.lit-stories.ts
new file mode 100644
index 0000000000..c8f30eb036
--- /dev/null
+++ b/apps/browser/src/autofill/content/components/lit-stories/notification/footer.lit-stories.ts
@@ -0,0 +1,32 @@
+import { Meta, StoryObj } from "@storybook/web-components";
+
+import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
+
+import { NotificationType } from "../../../../notification/abstractions/notification-bar";
+import { NotificationFooter } from "../../notification/footer";
+
+type Args = {
+  notificationType: NotificationType;
+  theme: Theme;
+};
+
+export default {
+  title: "Components/Notifications/Notification Footer",
+  argTypes: {
+    theme: { control: "select", options: [...Object.values(ThemeTypes)] },
+    notificationType: {
+      control: "select",
+      options: ["add", "change", "unlock", "fileless-import"],
+    },
+  },
+  args: {
+    theme: ThemeTypes.Light,
+    notificationType: "add",
+  },
+} as Meta<Args>;
+
+const Template = (args: Args) => NotificationFooter({ ...args });
+
+export const Default: StoryObj<Args> = {
+  render: Template,
+};
diff --git a/apps/browser/src/autofill/content/components/lit-stories/notification/header.lit-stories.ts b/apps/browser/src/autofill/content/components/lit-stories/notification/header.lit-stories.ts
new file mode 100644
index 0000000000..fd8423f995
--- /dev/null
+++ b/apps/browser/src/autofill/content/components/lit-stories/notification/header.lit-stories.ts
@@ -0,0 +1,33 @@
+import { Meta, StoryObj } from "@storybook/web-components";
+
+import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
+
+import { NotificationHeader } from "../../notification/header";
+
+type Args = {
+  message: string;
+  standalone: boolean;
+  theme: Theme;
+  handleCloseNotification: (e: Event) => void;
+};
+
+export default {
+  title: "Components/Notifications/Notification Header",
+  argTypes: {
+    message: { control: "text" },
+    standalone: { control: "boolean" },
+    theme: { control: "select", options: [...Object.values(ThemeTypes)] },
+  },
+  args: {
+    message: "This is a notification message",
+    standalone: true,
+    theme: ThemeTypes.Light,
+    handleCloseNotification: () => alert("Close Clicked"),
+  },
+} as Meta<Args>;
+
+const Template = (args: Args) => NotificationHeader({ ...args });
+
+export const Default: StoryObj<Args> = {
+  render: Template,
+};
diff --git a/apps/browser/src/autofill/content/components/lit-stories/rows/action-row.lit-stories.ts b/apps/browser/src/autofill/content/components/lit-stories/rows/action-row.lit-stories.ts
new file mode 100644
index 0000000000..4b10076420
--- /dev/null
+++ b/apps/browser/src/autofill/content/components/lit-stories/rows/action-row.lit-stories.ts
@@ -0,0 +1,31 @@
+import { Meta, StoryObj } from "@storybook/web-components";
+
+import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
+
+import { ActionRow } from "../../rows/action-row";
+
+type Args = {
+  itemText: string;
+  handleAction: (e: Event) => void;
+  theme: Theme;
+};
+
+export default {
+  title: "Components/Rows/Action Row",
+  argTypes: {
+    itemText: { control: "text" },
+    theme: { control: "select", options: [...Object.values(ThemeTypes)] },
+    handleAction: { control: false },
+  },
+  args: {
+    itemText: "Action Item",
+    theme: ThemeTypes.Light,
+    handleAction: () => alert("Action triggered"),
+  },
+} as Meta<Args>;
+
+const Template = (args: Args) => ActionRow({ ...args });
+
+export const Default: StoryObj<Args> = {
+  render: Template,
+};
diff --git a/apps/browser/src/autofill/content/components/lit-stories/rows/button-row.lit-stories.ts b/apps/browser/src/autofill/content/components/lit-stories/rows/button-row.lit-stories.ts
new file mode 100644
index 0000000000..3283c2798a
--- /dev/null
+++ b/apps/browser/src/autofill/content/components/lit-stories/rows/button-row.lit-stories.ts
@@ -0,0 +1,25 @@
+import { Meta, StoryObj } from "@storybook/web-components";
+
+import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
+
+import { ButtonRow } from "../../rows/button-row";
+
+type Args = {
+  theme: Theme;
+};
+
+export default {
+  title: "Components/Rows/Button Row",
+  argTypes: {
+    theme: { control: "select", options: [...Object.values(ThemeTypes)] },
+  },
+  args: {
+    theme: ThemeTypes.Light,
+  },
+} as Meta<Args>;
+
+const Template = (args: Args) => ButtonRow({ ...args });
+
+export const Default: StoryObj<Args> = {
+  render: Template,
+};
diff --git a/apps/browser/src/autofill/content/components/lit-stories/rows/item-row.lit-stories.ts b/apps/browser/src/autofill/content/components/lit-stories/rows/item-row.lit-stories.ts
new file mode 100644
index 0000000000..fbb6520198
--- /dev/null
+++ b/apps/browser/src/autofill/content/components/lit-stories/rows/item-row.lit-stories.ts
@@ -0,0 +1,28 @@
+import { Meta, StoryObj } from "@storybook/web-components";
+import { TemplateResult } from "lit";
+
+import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums/theme-type.enum";
+
+import { ItemRow } from "../../rows/item-row";
+
+type Args = {
+  theme: Theme;
+  children: TemplateResult | TemplateResult[];
+};
+
+export default {
+  title: "Components/Rows/Item Row",
+  argTypes: {
+    theme: { control: "select", options: [...Object.values(ThemeTypes)] },
+    children: { control: "object" },
+  },
+  args: {
+    theme: ThemeTypes.Light,
+  },
+} as Meta<Args>;
+
+const Template = (args: Args) => ItemRow({ ...args });
+
+export const Default: StoryObj<Args> = {
+  render: Template,
+};
diff --git a/apps/browser/src/autofill/content/components/package.json b/apps/browser/src/autofill/content/components/package.json
new file mode 100644
index 0000000000..8dbe9e7f51
--- /dev/null
+++ b/apps/browser/src/autofill/content/components/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "@bitwarden/lit-components",
+  "version": "2025.1.1",
+  "scripts": {
+    "storybook:lit": "storybook dev -p 6006 -c ./.lit-storybook"
+  }
+}
diff --git a/package-lock.json b/package-lock.json
index 6fc9bebb61..9544eb398a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -98,6 +98,7 @@
         "@storybook/angular": "8.4.7",
         "@storybook/manager-api": "8.4.7",
         "@storybook/theming": "8.4.7",
+        "@storybook/web-components-webpack5": "8.4.7",
         "@types/argon2-browser": "1.18.4",
         "@types/chrome": "0.0.280",
         "@types/firefox-webext-browser": "120.0.4",
@@ -2713,9 +2714,9 @@
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz",
-      "integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz",
+      "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -9017,6 +9018,56 @@
         "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0"
       }
     },
+    "node_modules/@storybook/web-components": {
+      "version": "8.4.7",
+      "resolved": "https://registry.npmjs.org/@storybook/web-components/-/web-components-8.4.7.tgz",
+      "integrity": "sha512-zR/bUWGkS5uxvqfXnW082ScrC4y5UrTdE1VKasezLGi5bTLub2hz8JP87PJgtWrq+mdrdmkLGzv5O4iJ/tlMAw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@storybook/components": "8.4.7",
+        "@storybook/global": "^5.0.0",
+        "@storybook/manager-api": "8.4.7",
+        "@storybook/preview-api": "8.4.7",
+        "@storybook/theming": "8.4.7",
+        "tiny-invariant": "^1.3.1",
+        "ts-dedent": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "lit": "^2.0.0 || ^3.0.0",
+        "storybook": "^8.4.7"
+      }
+    },
+    "node_modules/@storybook/web-components-webpack5": {
+      "version": "8.4.7",
+      "resolved": "https://registry.npmjs.org/@storybook/web-components-webpack5/-/web-components-webpack5-8.4.7.tgz",
+      "integrity": "sha512-RgLFQB7F4FOX5nOK3byaCo5Gs8nKMq1uNswOXdHSgZKfJfaZxmyMMGmnVUmOOLECsxyREokHwRDKma8SgFrRRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@storybook/builder-webpack5": "8.4.7",
+        "@storybook/web-components": "8.4.7",
+        "@types/node": "^22.0.0"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "lit": "^2.0.0 || ^3.0.0",
+        "storybook": "^8.4.7"
+      }
+    },
     "node_modules/@szmarczak/http-timer": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
diff --git a/package.json b/package.json
index 9b7a2efeff..03d1f3d3c7 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,7 @@
     "@storybook/angular": "8.4.7",
     "@storybook/manager-api": "8.4.7",
     "@storybook/theming": "8.4.7",
+    "@storybook/web-components-webpack5": "8.4.7",
     "@types/argon2-browser": "1.18.4",
     "@types/chrome": "0.0.280",
     "@types/firefox-webext-browser": "120.0.4",

From b750b6c082f45592a76ea7cf0ad06ff0ce6c961c Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github.com>
Date: Wed, 15 Jan 2025 22:10:26 +0000
Subject: [PATCH 112/150] Bumped client version(s)

---
 apps/desktop/package.json          | 2 +-
 apps/desktop/src/package-lock.json | 4 ++--
 apps/desktop/src/package.json      | 2 +-
 package-lock.json                  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 8f6c6525a3..aff1d0ffbb 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bitwarden/desktop",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2025.1.2",
+  "version": "2025.1.3",
   "keywords": [
     "bitwarden",
     "password",
diff --git a/apps/desktop/src/package-lock.json b/apps/desktop/src/package-lock.json
index d878e1af2a..e825bd4158 100644
--- a/apps/desktop/src/package-lock.json
+++ b/apps/desktop/src/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@bitwarden/desktop",
-  "version": "2025.1.2",
+  "version": "2025.1.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bitwarden/desktop",
-      "version": "2025.1.2",
+      "version": "2025.1.3",
       "license": "GPL-3.0",
       "dependencies": {
         "@bitwarden/desktop-napi": "file:../desktop_native/napi"
diff --git a/apps/desktop/src/package.json b/apps/desktop/src/package.json
index 08bdd74506..6feed97079 100644
--- a/apps/desktop/src/package.json
+++ b/apps/desktop/src/package.json
@@ -2,7 +2,7 @@
   "name": "@bitwarden/desktop",
   "productName": "Bitwarden",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2025.1.2",
+  "version": "2025.1.3",
   "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",
diff --git a/package-lock.json b/package-lock.json
index 9544eb398a..ae473f3e5f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -232,7 +232,7 @@
     },
     "apps/desktop": {
       "name": "@bitwarden/desktop",
-      "version": "2025.1.2",
+      "version": "2025.1.3",
       "hasInstallScript": true,
       "license": "GPL-3.0"
     },

From ffa5afb5e81bc4a231c45c5ead94ee1514b6762d Mon Sep 17 00:00:00 2001
From: Todd Martin <106564991+trmartin4@users.noreply.github.com>
Date: Wed, 15 Jan 2025 17:30:01 -0500
Subject: [PATCH 113/150] Renamed group for consistency with server renovate
 (#12896)

---
 .github/renovate.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index 350484b5c2..150ac1ac99 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -4,7 +4,7 @@
   "enabledManagers": ["cargo", "github-actions", "npm"],
   "packageRules": [
     {
-      "groupName": "github action dependencies",
+      "groupName": "github-action minor",
       "matchManagers": ["github-actions"],
       "matchUpdateTypes": ["minor"]
     },

From e4e436b76872d2f39ee66afc8b670c3964467e91 Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Thu, 16 Jan 2025 13:12:29 +1000
Subject: [PATCH 114/150] [PM-15182] Remove remove-provider-export-permission
 feature flag (#12878)

* Remove remove-provider-export feature flag

* Remove ts-strict comment

* Revert changes to tests
---
 .../layouts/organization-layout.component.ts  |  5 +--
 .../organization-settings-routing.module.ts   | 33 +++----------------
 .../navigation-switcher.stories.ts            |  3 --
 .../product-switcher.stories.ts               |  3 --
 .../shared/product-switcher.service.spec.ts   |  3 --
 .../organization.service.abstraction.ts       |  2 +-
 .../vnext.organization.service.ts             |  2 +-
 .../models/domain/organization.ts             |  6 +---
 libs/common/src/enums/feature-flag.enum.ts    |  2 --
 9 files changed, 9 insertions(+), 50 deletions(-)

diff --git a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
index 0b024817ed..c1112c51e3 100644
--- a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
+++ b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
@@ -77,10 +77,7 @@ export class OrganizationLayoutComponent implements OnInit {
       filter((org) => org != null),
     );
 
-    this.canAccessExport$ = combineLatest([
-      this.organization$,
-      this.configService.getFeatureFlag$(FeatureFlag.PM11360RemoveProviderExportPermission),
-    ]).pipe(map(([org, removeProviderExport]) => org.canAccessExport(removeProviderExport)));
+    this.canAccessExport$ = this.organization$.pipe(map((org) => org.canAccessExport));
 
     this.showPaymentAndHistory$ = this.organization$.pipe(
       map(
diff --git a/apps/web/src/app/admin-console/organizations/settings/organization-settings-routing.module.ts b/apps/web/src/app/admin-console/organizations/settings/organization-settings-routing.module.ts
index ac2c7448b0..06ceaa0d9c 100644
--- a/apps/web/src/app/admin-console/organizations/settings/organization-settings-routing.module.ts
+++ b/apps/web/src/app/admin-console/organizations/settings/organization-settings-routing.module.ts
@@ -1,13 +1,8 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { inject, NgModule } from "@angular/core";
-import { CanMatchFn, RouterModule, Routes } from "@angular/router";
-import { map } from "rxjs";
+import { NgModule } from "@angular/core";
+import { RouterModule, Routes } from "@angular/router";
 
 import { canAccessSettingsTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
 import { organizationPermissionsGuard } from "../../organizations/guards/org-permissions.guard";
 import { organizationRedirectGuard } from "../../organizations/guards/org-redirect.guard";
@@ -16,11 +11,6 @@ import { PoliciesComponent } from "../../organizations/policies";
 import { AccountComponent } from "./account.component";
 import { TwoFactorSetupComponent } from "./two-factor-setup.component";
 
-const removeProviderExportPermission$: CanMatchFn = () =>
-  inject(ConfigService)
-    .getFeatureFlag$(FeatureFlag.PM11360RemoveProviderExportPermission)
-    .pipe(map((removeProviderExport) => removeProviderExport === true));
-
 const routes: Routes = [
   {
     path: "",
@@ -68,27 +58,13 @@ const routes: Routes = [
               titleId: "importData",
             },
           },
-
-          // Export routing is temporarily duplicated to set the flag value passed into org.canAccessExport
           {
             path: "export",
             loadComponent: () =>
               import("../tools/vault-export/org-vault-export.component").then(
                 (mod) => mod.OrganizationVaultExportComponent,
               ),
-            canMatch: [removeProviderExportPermission$], // if this matches, the flag is ON
-            canActivate: [organizationPermissionsGuard((org) => org.canAccessExport(true))],
-            data: {
-              titleId: "exportVault",
-            },
-          },
-          {
-            path: "export",
-            loadComponent: () =>
-              import("../tools/vault-export/org-vault-export.component").then(
-                (mod) => mod.OrganizationVaultExportComponent,
-              ),
-            canActivate: [organizationPermissionsGuard((org) => org.canAccessExport(false))],
+            canActivate: [organizationPermissionsGuard((org) => org.canAccessExport)],
             data: {
               titleId: "exportVault",
             },
@@ -118,7 +94,8 @@ function getSettingsRoute(organization: Organization) {
   if (organization.canManageDeviceApprovals) {
     return "device-approvals";
   }
-  return undefined;
+
+  return "/";
 }
 
 @NgModule({
diff --git a/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.stories.ts b/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.stories.ts
index a7ff50b426..1c15f7cc7c 100644
--- a/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.stories.ts
+++ b/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.stories.ts
@@ -157,7 +157,6 @@ export const SMAvailable: Story = {
         canManageUsers: false,
         canAccessSecretsManager: true,
         enabled: true,
-        canAccessExport: (_) => false,
       },
     ] as Organization[],
     mockProviders: [],
@@ -173,7 +172,6 @@ export const SMAndACAvailable: Story = {
         canManageUsers: true,
         canAccessSecretsManager: true,
         enabled: true,
-        canAccessExport: (_) => false,
       },
     ] as Organization[],
     mockProviders: [],
@@ -189,7 +187,6 @@ export const WithAllOptions: Story = {
         canManageUsers: true,
         canAccessSecretsManager: true,
         enabled: true,
-        canAccessExport: (_) => false,
       },
     ] as Organization[],
     mockProviders: [{ id: "provider-a" }] as Provider[],
diff --git a/apps/web/src/app/layouts/product-switcher/product-switcher.stories.ts b/apps/web/src/app/layouts/product-switcher/product-switcher.stories.ts
index b53d0243f6..7a4df4bad0 100644
--- a/apps/web/src/app/layouts/product-switcher/product-switcher.stories.ts
+++ b/apps/web/src/app/layouts/product-switcher/product-switcher.stories.ts
@@ -176,7 +176,6 @@ export const WithSM: Story = {
         canManageUsers: false,
         canAccessSecretsManager: true,
         enabled: true,
-        canAccessExport: (_) => false,
       },
     ] as Organization[],
     mockProviders: [],
@@ -192,7 +191,6 @@ export const WithSMAndAC: Story = {
         canManageUsers: true,
         canAccessSecretsManager: true,
         enabled: true,
-        canAccessExport: (_) => false,
       },
     ] as Organization[],
     mockProviders: [],
@@ -208,7 +206,6 @@ export const WithAllOptions: Story = {
         canManageUsers: true,
         canAccessSecretsManager: true,
         enabled: true,
-        canAccessExport: (_) => false,
       },
     ] as Organization[],
     mockProviders: [{ id: "provider-a" }] as Provider[],
diff --git a/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.spec.ts b/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.spec.ts
index a071d0f885..919b3be042 100644
--- a/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.spec.ts
+++ b/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.spec.ts
@@ -116,7 +116,6 @@ describe("ProductSwitcherService", () => {
             id: "1234",
             canAccessSecretsManager: true,
             enabled: true,
-            canAccessExport: (_) => true,
           },
         ] as Organization[]);
 
@@ -232,14 +231,12 @@ describe("ProductSwitcherService", () => {
           canAccessSecretsManager: true,
           enabled: true,
           name: "Org 2",
-          canAccessExport: (_) => true,
         },
         {
           id: "4243",
           canAccessSecretsManager: true,
           enabled: true,
           name: "Org 32",
-          canAccessExport: (_) => true,
         },
       ] as Organization[]);
 
diff --git a/libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts b/libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts
index 2161feb516..da81f340fd 100644
--- a/libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts
+++ b/libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts
@@ -17,7 +17,7 @@ export function canAccessSettingsTab(org: Organization): boolean {
     org.canManageSso ||
     org.canManageScim ||
     org.canAccessImport ||
-    org.canAccessExport(false) || // Feature flag value doesn't matter here, providers will have access to this group anyway
+    org.canAccessExport ||
     org.canManageDeviceApprovals
   );
 }
diff --git a/libs/common/src/admin-console/abstractions/organization/vnext.organization.service.ts b/libs/common/src/admin-console/abstractions/organization/vnext.organization.service.ts
index b5c0f6291f..c25a153a06 100644
--- a/libs/common/src/admin-console/abstractions/organization/vnext.organization.service.ts
+++ b/libs/common/src/admin-console/abstractions/organization/vnext.organization.service.ts
@@ -17,7 +17,7 @@ export function canAccessSettingsTab(org: Organization): boolean {
     org.canManageSso ||
     org.canManageScim ||
     org.canAccessImport ||
-    org.canAccessExport(false) || // Feature flag value doesn't matter here, providers will have access to this group anyway
+    org.canAccessExport ||
     org.canManageDeviceApprovals
   );
 }
diff --git a/libs/common/src/admin-console/models/domain/organization.ts b/libs/common/src/admin-console/models/domain/organization.ts
index 8441298bbf..9dcc9f0752 100644
--- a/libs/common/src/admin-console/models/domain/organization.ts
+++ b/libs/common/src/admin-console/models/domain/organization.ts
@@ -182,11 +182,7 @@ export class Organization {
     );
   }
 
-  canAccessExport(removeProviderExport: boolean) {
-    if (!removeProviderExport && this.isProviderUser) {
-      return true;
-    }
-
+  get canAccessExport() {
     return (
       this.isMember &&
       (this.type === OrganizationUserType.Owner ||
diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts
index dde31acb9e..d008a09d66 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -44,7 +44,6 @@ export enum FeatureFlag {
   NewDeviceVerificationPermanentDismiss = "new-device-permanent-dismiss",
   DisableFreeFamiliesSponsorship = "PM-12274-disable-free-families-sponsorship",
   MacOsNativeCredentialSync = "macos-native-credential-sync",
-  PM11360RemoveProviderExportPermission = "pm-11360-remove-provider-export-permission",
   PM12443RemovePagingLogic = "pm-12443-remove-paging-logic",
   PrivateKeyRegeneration = "pm-12241-private-key-regeneration",
   ResellerManagedOrgAlert = "PM-15814-alert-owners-of-reseller-managed-orgs",
@@ -102,7 +101,6 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.NewDeviceVerificationPermanentDismiss]: FALSE,
   [FeatureFlag.DisableFreeFamiliesSponsorship]: FALSE,
   [FeatureFlag.MacOsNativeCredentialSync]: FALSE,
-  [FeatureFlag.PM11360RemoveProviderExportPermission]: FALSE,
   [FeatureFlag.PM12443RemovePagingLogic]: FALSE,
   [FeatureFlag.PrivateKeyRegeneration]: FALSE,
   [FeatureFlag.ResellerManagedOrgAlert]: FALSE,

From ca420d73143987c447e79fc9d091b744cc9b25fd Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Thu, 16 Jan 2025 11:02:16 +0100
Subject: [PATCH 115/150] Attempt to fix snap build (#12882)

* Attempt to fix snap build

* Move snap

* Add debug logging

* Fix move

* Remove debug logs
---
 apps/desktop/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index aff1d0ffbb..eaa27c3eb9 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -35,7 +35,7 @@
     "clean:dist": "rimraf ./dist",
     "pack:dir": "npm run clean:dist && electron-builder --dir -p never",
     "pack:lin:flatpak": "npm run clean:dist && electron-builder --dir -p never && flatpak-builder  --repo=build/.repo build/.flatpak  ./resources/com.bitwarden.desktop.devel.yaml --install-deps-from=flathub --force-clean &&  flatpak build-bundle ./build/.repo/ ./dist/com.bitwarden.desktop.flatpak com.bitwarden.desktop",
-    "pack:lin": "npm run clean:dist && electron-builder --linux --x64 -p never && export SNAP_FILE=$(realpath ./dist/bitwarden_*.snap) && unsquashfs -d ./dist/tmp-snap/ $SNAP_FILE && mkdir -p ./dist/tmp-snap/meta/polkit/ && cp ./resources/com.bitwarden.desktop.policy  ./dist/tmp-snap/meta/polkit/polkit.com.bitwarden.desktop.policy && rm $SNAP_FILE && mksquashfs ./dist/tmp-snap/ $SNAP_FILE -noappend -comp lzo -no-fragments && rm -rf ./dist/tmp-snap/",
+    "pack:lin": "npm run clean:dist && electron-builder --linux --x64 -p never && export SNAP_FILE=$(realpath ./dist/bitwarden_*.snap) && unsquashfs -d ./dist/tmp-snap/ $SNAP_FILE && mkdir -p ./dist/tmp-snap/meta/polkit/ && cp ./resources/com.bitwarden.desktop.policy  ./dist/tmp-snap/meta/polkit/polkit.com.bitwarden.desktop.policy && rm $SNAP_FILE && snapcraft pack ./dist/tmp-snap/ && mv ./*.snap ./dist/ && rm -rf ./dist/tmp-snap/",
     "pack:mac": "npm run clean:dist && electron-builder --mac --universal -p never",
     "pack:mac:arm64": "npm run clean:dist && electron-builder --mac --arm64 -p never",
     "pack:mac:mas": "npm run clean:dist && electron-builder --mac mas --universal -p never",

From 68e02bc236e33c3e558f197439c2bb1f22940597 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 16 Jan 2025 15:45:01 +0100
Subject: [PATCH 116/150] [deps] SM: Update eslint-plugin-tailwindcss to
 v3.17.5 (#11535)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Oscar Hinton <Hinton@users.noreply.github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ae473f3e5f..ac31cc8258 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -147,7 +147,7 @@
         "eslint-plugin-rxjs": "5.0.3",
         "eslint-plugin-rxjs-angular": "2.0.1",
         "eslint-plugin-storybook": "0.8.0",
-        "eslint-plugin-tailwindcss": "3.17.4",
+        "eslint-plugin-tailwindcss": "3.17.5",
         "html-loader": "5.1.0",
         "html-webpack-injector": "1.1.4",
         "html-webpack-plugin": "5.6.3",
@@ -16540,9 +16540,9 @@
       }
     },
     "node_modules/eslint-plugin-tailwindcss": {
-      "version": "3.17.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-tailwindcss/-/eslint-plugin-tailwindcss-3.17.4.tgz",
-      "integrity": "sha512-gJAEHmCq2XFfUP/+vwEfEJ9igrPeZFg+skeMtsxquSQdxba9XRk5bn0Bp9jxG1VV9/wwPKi1g3ZjItu6MIjhNg==",
+      "version": "3.17.5",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-tailwindcss/-/eslint-plugin-tailwindcss-3.17.5.tgz",
+      "integrity": "sha512-8Mi7p7dm+mO1dHgRHHFdPu4RDTBk69Cn4P0B40vRQR+MrguUpwmKwhZy1kqYe3Km8/4nb+cyrCF+5SodOEmaow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 03d1f3d3c7..cd4bc77079 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "eslint-plugin-rxjs": "5.0.3",
     "eslint-plugin-rxjs-angular": "2.0.1",
     "eslint-plugin-storybook": "0.8.0",
-    "eslint-plugin-tailwindcss": "3.17.4",
+    "eslint-plugin-tailwindcss": "3.17.5",
     "html-loader": "5.1.0",
     "html-webpack-injector": "1.1.4",
     "html-webpack-plugin": "5.6.3",

From 5ba5f04e72c20be4384a508f15264d0bb1cb7e49 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 16 Jan 2025 15:45:10 +0100
Subject: [PATCH 117/150] [deps] SM: Update husky to v9.1.7 (#10846)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Oscar Hinton <Hinton@users.noreply.github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ac31cc8258..11625f0fd9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -151,7 +151,7 @@
         "html-loader": "5.1.0",
         "html-webpack-injector": "1.1.4",
         "html-webpack-plugin": "5.6.3",
-        "husky": "9.1.4",
+        "husky": "9.1.7",
         "jest-diff": "29.7.0",
         "jest-junit": "16.0.0",
         "jest-mock-extended": "3.0.7",
@@ -18972,9 +18972,9 @@
       }
     },
     "node_modules/husky": {
-      "version": "9.1.4",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.4.tgz",
-      "integrity": "sha512-bho94YyReb4JV7LYWRWxZ/xr6TtOTt8cMfmQ39MQYJ7f/YE268s3GdghGwi+y4zAeqewE5zYLvuhV0M0ijsDEA==",
+      "version": "9.1.7",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz",
+      "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==",
       "dev": true,
       "license": "MIT",
       "bin": {
diff --git a/package.json b/package.json
index cd4bc77079..02ffd22a19 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
     "html-loader": "5.1.0",
     "html-webpack-injector": "1.1.4",
     "html-webpack-plugin": "5.6.3",
-    "husky": "9.1.4",
+    "husky": "9.1.7",
     "jest-diff": "29.7.0",
     "jest-junit": "16.0.0",
     "jest-mock-extended": "3.0.7",

From 51717cab07bfddf4be2eb6e80d28650a3fda865a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 16 Jan 2025 15:45:20 +0100
Subject: [PATCH 118/150] [deps] SM: Update eslint to v8.57.1 (#11317)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Oscar Hinton <Hinton@users.noreply.github.com>
---
 package-lock.json | 26 +++++++++++++-------------
 package.json      |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 11625f0fd9..b94ad3b762 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -140,7 +140,7 @@
         "electron-reload": "2.0.0-alpha.1",
         "electron-store": "8.2.0",
         "electron-updater": "6.3.9",
-        "eslint": "8.57.0",
+        "eslint": "8.57.1",
         "eslint-config-prettier": "9.1.0",
         "eslint-import-resolver-typescript": "3.6.1",
         "eslint-plugin-import": "2.29.1",
@@ -5905,9 +5905,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
-      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
+      "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6013,14 +6013,14 @@
       }
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
+      "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
       "deprecated": "Use @eslint/config-array instead",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
+        "@humanwhocodes/object-schema": "^2.0.3",
         "debug": "^4.3.1",
         "minimatch": "^3.0.5"
       },
@@ -16091,9 +16091,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
-      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
+      "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
       "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
       "dev": true,
       "license": "MIT",
@@ -16101,8 +16101,8 @@
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.57.0",
-        "@humanwhocodes/config-array": "^0.11.14",
+        "@eslint/js": "8.57.1",
+        "@humanwhocodes/config-array": "^0.13.0",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "@ungap/structured-clone": "^1.2.0",
diff --git a/package.json b/package.json
index 02ffd22a19..07e3f21786 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
     "electron-reload": "2.0.0-alpha.1",
     "electron-store": "8.2.0",
     "electron-updater": "6.3.9",
-    "eslint": "8.57.0",
+    "eslint": "8.57.1",
     "eslint-config-prettier": "9.1.0",
     "eslint-import-resolver-typescript": "3.6.1",
     "eslint-plugin-import": "2.29.1",

From ad8694b641c31640637b139d288c28145ad8b368 Mon Sep 17 00:00:00 2001
From: Vijay Oommen <voommen@livefront.com>
Date: Thu, 16 Jan 2025 08:47:36 -0600
Subject: [PATCH 119/150] PM-15070 Star critical apps (#12109)

Ability to star a record when flagged as critical. This is still behind a feature flag
---
 .../risk-insights/models/password-health.ts   |   4 +
 .../critical-apps-api.service.spec.ts         |  79 +++++++++
 .../services/critical-apps-api.service.ts     |  39 +++++
 .../services/critical-apps.service.spec.ts    | 142 ++++++++++++++++
 .../services/critical-apps.service.ts         | 159 ++++++++++++++++++
 .../reports/risk-insights/services/index.ts   |   2 +
 .../access-intelligence.module.ts             |  15 ++
 .../all-applications.component.html           |   8 +-
 .../all-applications.component.ts             | 102 ++++++-----
 .../application-table.mock.ts                 |   6 +
 .../risk-insights.component.html              |   2 +-
 .../risk-insights.component.ts                |  13 +-
 12 files changed, 523 insertions(+), 48 deletions(-)
 create mode 100644 bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps-api.service.spec.ts
 create mode 100644 bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps-api.service.ts
 create mode 100644 bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps.service.spec.ts
 create mode 100644 bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps.service.ts

diff --git a/bitwarden_license/bit-common/src/tools/reports/risk-insights/models/password-health.ts b/bitwarden_license/bit-common/src/tools/reports/risk-insights/models/password-health.ts
index 94dad65fdc..947fc8a79d 100644
--- a/bitwarden_license/bit-common/src/tools/reports/risk-insights/models/password-health.ts
+++ b/bitwarden_license/bit-common/src/tools/reports/risk-insights/models/password-health.ts
@@ -30,6 +30,10 @@ export type ApplicationHealthReportDetail = {
   atRiskMemberDetails: MemberDetailsFlat[];
 };
 
+export type ApplicationHealthReportDetailWithCriticalFlag = ApplicationHealthReportDetail & {
+  isMarkedAsCritical: boolean;
+};
+
 /**
  * Breaks the cipher health info out by uri and passes
  * along the password health and member info
diff --git a/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps-api.service.spec.ts b/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps-api.service.spec.ts
new file mode 100644
index 0000000000..838dc2c824
--- /dev/null
+++ b/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps-api.service.spec.ts
@@ -0,0 +1,79 @@
+import { mock } from "jest-mock-extended";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { OrganizationId } from "@bitwarden/common/types/guid";
+
+import { CriticalAppsApiService } from "./critical-apps-api.service";
+import {
+  PasswordHealthReportApplicationId,
+  PasswordHealthReportApplicationsRequest,
+  PasswordHealthReportApplicationsResponse,
+} from "./critical-apps.service";
+
+describe("CriticalAppsApiService", () => {
+  let service: CriticalAppsApiService;
+  const apiService = mock<ApiService>();
+
+  beforeEach(() => {
+    service = new CriticalAppsApiService(apiService);
+  });
+
+  it("should be created", () => {
+    expect(service).toBeTruthy();
+  });
+
+  it("should call apiService.send with correct parameters for SaveCriticalApps", (done) => {
+    const requests: PasswordHealthReportApplicationsRequest[] = [
+      { organizationId: "org1" as OrganizationId, url: "test one" },
+      { organizationId: "org1" as OrganizationId, url: "test two" },
+    ];
+    const response: PasswordHealthReportApplicationsResponse[] = [
+      {
+        id: "1" as PasswordHealthReportApplicationId,
+        organizationId: "org1" as OrganizationId,
+        uri: "test one",
+      },
+      {
+        id: "2" as PasswordHealthReportApplicationId,
+        organizationId: "org1" as OrganizationId,
+        uri: "test two",
+      },
+    ];
+
+    apiService.send.mockReturnValue(Promise.resolve(response));
+
+    service.saveCriticalApps(requests).subscribe((result) => {
+      expect(result).toEqual(response);
+      expect(apiService.send).toHaveBeenCalledWith(
+        "POST",
+        "/reports/password-health-report-applications/",
+        requests,
+        true,
+        true,
+      );
+      done();
+    });
+  });
+
+  it("should call apiService.send with correct parameters for GetCriticalApps", (done) => {
+    const orgId: OrganizationId = "org1" as OrganizationId;
+    const response: PasswordHealthReportApplicationsResponse[] = [
+      { id: "1" as PasswordHealthReportApplicationId, organizationId: orgId, uri: "test one" },
+      { id: "2" as PasswordHealthReportApplicationId, organizationId: orgId, uri: "test two" },
+    ];
+
+    apiService.send.mockReturnValue(Promise.resolve(response));
+
+    service.getCriticalApps(orgId).subscribe((result) => {
+      expect(result).toEqual(response);
+      expect(apiService.send).toHaveBeenCalledWith(
+        "GET",
+        `/reports/password-health-report-applications/${orgId.toString()}`,
+        null,
+        true,
+        true,
+      );
+      done();
+    });
+  });
+});
diff --git a/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps-api.service.ts b/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps-api.service.ts
new file mode 100644
index 0000000000..edd2cf34b5
--- /dev/null
+++ b/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps-api.service.ts
@@ -0,0 +1,39 @@
+import { from, Observable } from "rxjs";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { OrganizationId } from "@bitwarden/common/types/guid";
+
+import {
+  PasswordHealthReportApplicationsRequest,
+  PasswordHealthReportApplicationsResponse,
+} from "./critical-apps.service";
+
+export class CriticalAppsApiService {
+  constructor(private apiService: ApiService) {}
+
+  saveCriticalApps(
+    requests: PasswordHealthReportApplicationsRequest[],
+  ): Observable<PasswordHealthReportApplicationsResponse[]> {
+    const dbResponse = this.apiService.send(
+      "POST",
+      "/reports/password-health-report-applications/",
+      requests,
+      true,
+      true,
+    );
+
+    return from(dbResponse as Promise<PasswordHealthReportApplicationsResponse[]>);
+  }
+
+  getCriticalApps(orgId: OrganizationId): Observable<PasswordHealthReportApplicationsResponse[]> {
+    const dbResponse = this.apiService.send(
+      "GET",
+      `/reports/password-health-report-applications/${orgId.toString()}`,
+      null,
+      true,
+      true,
+    );
+
+    return from(dbResponse as Promise<PasswordHealthReportApplicationsResponse[]>);
+  }
+}
diff --git a/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps.service.spec.ts b/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps.service.spec.ts
new file mode 100644
index 0000000000..c6c4562310
--- /dev/null
+++ b/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps.service.spec.ts
@@ -0,0 +1,142 @@
+import { randomUUID } from "crypto";
+
+import { fakeAsync, flush } from "@angular/core/testing";
+import { mock } from "jest-mock-extended";
+import { of } from "rxjs";
+
+import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
+import { CsprngArray } from "@bitwarden/common/types/csprng";
+import { OrganizationId } from "@bitwarden/common/types/guid";
+import { OrgKey } from "@bitwarden/common/types/key";
+import { KeyService } from "@bitwarden/key-management";
+
+import { CriticalAppsApiService } from "./critical-apps-api.service";
+import {
+  CriticalAppsService,
+  PasswordHealthReportApplicationId,
+  PasswordHealthReportApplicationsRequest,
+  PasswordHealthReportApplicationsResponse,
+} from "./critical-apps.service";
+
+describe("CriticalAppsService", () => {
+  let service: CriticalAppsService;
+  const keyService = mock<KeyService>();
+  const encryptService = mock<EncryptService>();
+  const criticalAppsApiService = mock<CriticalAppsApiService>({
+    saveCriticalApps: jest.fn(),
+    getCriticalApps: jest.fn(),
+  });
+
+  beforeEach(() => {
+    service = new CriticalAppsService(keyService, encryptService, criticalAppsApiService);
+
+    // reset mocks
+    jest.resetAllMocks();
+  });
+
+  it("should be created", () => {
+    expect(service).toBeTruthy();
+  });
+
+  it("should set critical apps", async () => {
+    // arrange
+    const criticalApps = ["https://example.com", "https://example.org"];
+
+    const request = [
+      { organizationId: "org1", url: "encryptedUrlName" },
+      { organizationId: "org1", url: "encryptedUrlName" },
+    ] as PasswordHealthReportApplicationsRequest[];
+
+    const response = [
+      { id: "id1", organizationId: "org1", uri: "https://example.com" },
+      { id: "id2", organizationId: "org1", uri: "https://example.org" },
+    ] as PasswordHealthReportApplicationsResponse[];
+
+    encryptService.encrypt.mockResolvedValue(new EncString("encryptedUrlName"));
+    criticalAppsApiService.saveCriticalApps.mockReturnValue(of(response));
+
+    // act
+    await service.setCriticalApps("org1", criticalApps);
+
+    // expectations
+    expect(keyService.getOrgKey).toHaveBeenCalledWith("org1");
+    expect(encryptService.encrypt).toHaveBeenCalledTimes(2);
+    expect(criticalAppsApiService.saveCriticalApps).toHaveBeenCalledWith(request);
+  });
+
+  it("should exclude records that already exist", async () => {
+    // arrange
+    // one record already exists
+    service.setAppsInListForOrg([
+      {
+        id: randomUUID() as PasswordHealthReportApplicationId,
+        organizationId: "org1" as OrganizationId,
+        uri: "https://example.com",
+      },
+    ]);
+
+    // two records are selected - one already in the database
+    const selectedUrls = ["https://example.com", "https://example.org"];
+
+    // expect only one record to be sent to the server
+    const request = [
+      { organizationId: "org1", url: "encryptedUrlName" },
+    ] as PasswordHealthReportApplicationsRequest[];
+
+    // mocked response
+    const response = [
+      { id: "id1", organizationId: "org1", uri: "test" },
+    ] as PasswordHealthReportApplicationsResponse[];
+
+    encryptService.encrypt.mockResolvedValue(new EncString("encryptedUrlName"));
+    criticalAppsApiService.saveCriticalApps.mockReturnValue(of(response));
+
+    // act
+    await service.setCriticalApps("org1", selectedUrls);
+
+    // expectations
+    expect(keyService.getOrgKey).toHaveBeenCalledWith("org1");
+    expect(encryptService.encrypt).toHaveBeenCalledTimes(1);
+    expect(criticalAppsApiService.saveCriticalApps).toHaveBeenCalledWith(request);
+  });
+
+  it("should get critical apps", fakeAsync(() => {
+    const orgId = "org1" as OrganizationId;
+    const response = [
+      { id: "id1", organizationId: "org1", uri: "https://example.com" },
+      { id: "id2", organizationId: "org1", uri: "https://example.org" },
+    ] as PasswordHealthReportApplicationsResponse[];
+
+    encryptService.decryptToUtf8.mockResolvedValue("https://example.com");
+    criticalAppsApiService.getCriticalApps.mockReturnValue(of(response));
+
+    const mockRandomBytes = new Uint8Array(64) as CsprngArray;
+    const mockOrgKey = new SymmetricCryptoKey(mockRandomBytes) as OrgKey;
+    keyService.getOrgKey.mockResolvedValue(mockOrgKey);
+
+    service.setOrganizationId(orgId as OrganizationId);
+    flush();
+
+    expect(keyService.getOrgKey).toHaveBeenCalledWith(orgId.toString());
+    expect(encryptService.decryptToUtf8).toHaveBeenCalledTimes(2);
+    expect(criticalAppsApiService.getCriticalApps).toHaveBeenCalledWith(orgId);
+  }));
+
+  it("should get by org id", () => {
+    const orgId = "org1" as OrganizationId;
+    const response = [
+      { id: "id1", organizationId: "org1", uri: "https://example.com" },
+      { id: "id2", organizationId: "org1", uri: "https://example.org" },
+      { id: "id3", organizationId: "org2", uri: "https://example.org" },
+      { id: "id4", organizationId: "org2", uri: "https://example.org" },
+    ] as PasswordHealthReportApplicationsResponse[];
+
+    service.setAppsInListForOrg(response);
+
+    service.getAppsListForOrg(orgId as OrganizationId).subscribe((res) => {
+      expect(res).toHaveLength(2);
+    });
+  });
+});
diff --git a/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps.service.ts b/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps.service.ts
new file mode 100644
index 0000000000..10b7d3f1fb
--- /dev/null
+++ b/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps.service.ts
@@ -0,0 +1,159 @@
+import {
+  BehaviorSubject,
+  first,
+  firstValueFrom,
+  forkJoin,
+  from,
+  map,
+  Observable,
+  of,
+  Subject,
+  switchMap,
+  takeUntil,
+  zip,
+} from "rxjs";
+import { Opaque } from "type-fest";
+
+import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
+import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
+import { OrganizationId } from "@bitwarden/common/types/guid";
+import { OrgKey } from "@bitwarden/common/types/key";
+import { KeyService } from "@bitwarden/key-management";
+
+import { CriticalAppsApiService } from "./critical-apps-api.service";
+
+/* Retrieves and decrypts critical apps for a given organization
+ *  Encrypts and saves data for a given organization
+ */
+export class CriticalAppsService {
+  private orgId = new BehaviorSubject<OrganizationId | null>(null);
+  private criticalAppsList = new BehaviorSubject<PasswordHealthReportApplicationsResponse[]>([]);
+  private teardown = new Subject<void>();
+
+  private fetchOrg$ = this.orgId
+    .pipe(
+      switchMap((orgId) => this.retrieveCriticalApps(orgId)),
+      takeUntil(this.teardown),
+    )
+    .subscribe((apps) => this.criticalAppsList.next(apps));
+
+  constructor(
+    private keyService: KeyService,
+    private encryptService: EncryptService,
+    private criticalAppsApiService: CriticalAppsApiService,
+  ) {}
+
+  // Get a list of critical apps for a given organization
+  getAppsListForOrg(orgId: string): Observable<PasswordHealthReportApplicationsResponse[]> {
+    return this.criticalAppsList
+      .asObservable()
+      .pipe(map((apps) => apps.filter((app) => app.organizationId === orgId)));
+  }
+
+  // Reset the critical apps list
+  setAppsInListForOrg(apps: PasswordHealthReportApplicationsResponse[]) {
+    this.criticalAppsList.next(apps);
+  }
+
+  // Save the selected critical apps for a given organization
+  async setCriticalApps(orgId: string, selectedUrls: string[]) {
+    const key = await this.keyService.getOrgKey(orgId);
+
+    // only save records that are not already in the database
+    const newEntries = await this.filterNewEntries(orgId as OrganizationId, selectedUrls);
+    const criticalAppsRequests = await this.encryptNewEntries(
+      orgId as OrganizationId,
+      key,
+      newEntries,
+    );
+
+    const dbResponse = await firstValueFrom(
+      this.criticalAppsApiService.saveCriticalApps(criticalAppsRequests),
+    );
+
+    // add the new entries to the criticalAppsList
+    const updatedList = [...this.criticalAppsList.value];
+    for (const responseItem of dbResponse) {
+      const decryptedUrl = await this.encryptService.decryptToUtf8(
+        new EncString(responseItem.uri),
+        key,
+      );
+      if (!updatedList.some((f) => f.uri === decryptedUrl)) {
+        updatedList.push({
+          id: responseItem.id,
+          organizationId: responseItem.organizationId,
+          uri: decryptedUrl,
+        } as PasswordHealthReportApplicationsResponse);
+      }
+    }
+    this.criticalAppsList.next(updatedList);
+  }
+
+  // Get the critical apps for a given organization
+  setOrganizationId(orgId: OrganizationId) {
+    this.orgId.next(orgId);
+  }
+
+  private retrieveCriticalApps(
+    orgId: OrganizationId | null,
+  ): Observable<PasswordHealthReportApplicationsResponse[]> {
+    if (orgId === null) {
+      return of([]);
+    }
+
+    const result$ = zip(
+      this.criticalAppsApiService.getCriticalApps(orgId),
+      from(this.keyService.getOrgKey(orgId)),
+    ).pipe(
+      switchMap(([response, key]) => {
+        const results = response.map(async (r: PasswordHealthReportApplicationsResponse) => {
+          const encrypted = new EncString(r.uri);
+          const uri = await this.encryptService.decryptToUtf8(encrypted, key);
+          return { id: r.id, organizationId: r.organizationId, uri: uri };
+        });
+        return forkJoin(results);
+      }),
+      first(),
+    );
+
+    return result$ as Observable<PasswordHealthReportApplicationsResponse[]>;
+  }
+
+  private async filterNewEntries(orgId: OrganizationId, selectedUrls: string[]): Promise<string[]> {
+    return await firstValueFrom(this.criticalAppsList).then((criticalApps) => {
+      const criticalAppsUri = criticalApps
+        .filter((f) => f.organizationId === orgId)
+        .map((f) => f.uri);
+      return selectedUrls.filter((url) => !criticalAppsUri.includes(url));
+    });
+  }
+
+  private async encryptNewEntries(
+    orgId: OrganizationId,
+    key: OrgKey,
+    newEntries: string[],
+  ): Promise<PasswordHealthReportApplicationsRequest[]> {
+    const criticalAppsPromises = newEntries.map(async (url) => {
+      const encryptedUrlName = await this.encryptService.encrypt(url, key);
+      return {
+        organizationId: orgId,
+        url: encryptedUrlName?.encryptedString?.toString() ?? "",
+      } as PasswordHealthReportApplicationsRequest;
+    });
+
+    return await Promise.all(criticalAppsPromises);
+  }
+}
+
+export interface PasswordHealthReportApplicationsRequest {
+  organizationId: OrganizationId;
+  url: string;
+}
+
+export interface PasswordHealthReportApplicationsResponse {
+  id: PasswordHealthReportApplicationId;
+  organizationId: OrganizationId;
+  uri: string;
+}
+
+export type PasswordHealthReportApplicationId = Opaque<string, "PasswordHealthReportApplicationId">;
diff --git a/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/index.ts b/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/index.ts
index a8e62437b9..f547df31f4 100644
--- a/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/index.ts
+++ b/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/index.ts
@@ -1,4 +1,6 @@
 export * from "./member-cipher-details-api.service";
 export * from "./password-health.service";
+export * from "./critical-apps.service";
+export * from "./critical-apps-api.service";
 export * from "./risk-insights-report.service";
 export * from "./risk-insights-data.service";
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/access-intelligence.module.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/access-intelligence.module.ts
index 2db7af4bb4..5f461ff6c4 100644
--- a/bitwarden_license/bit-web/src/app/tools/access-intelligence/access-intelligence.module.ts
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/access-intelligence.module.ts
@@ -1,14 +1,19 @@
 import { NgModule } from "@angular/core";
 
+import { safeProvider } from "@bitwarden/angular/platform/utils/safe-provider";
+import { CriticalAppsService } from "@bitwarden/bit-common/tools/reports/risk-insights";
 import {
+  CriticalAppsApiService,
   MemberCipherDetailsApiService,
   RiskInsightsDataService,
   RiskInsightsReportService,
 } from "@bitwarden/bit-common/tools/reports/risk-insights/services";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AuditService } from "@bitwarden/common/abstractions/audit.service";
+import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength/password-strength.service.abstraction";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { KeyService } from "@bitwarden/key-management";
 
 import { AccessIntelligenceRoutingModule } from "./access-intelligence-routing.module";
 import { RiskInsightsComponent } from "./risk-insights.component";
@@ -33,6 +38,16 @@ import { RiskInsightsComponent } from "./risk-insights.component";
       provide: RiskInsightsDataService,
       deps: [RiskInsightsReportService],
     },
+    safeProvider({
+      provide: CriticalAppsService,
+      useClass: CriticalAppsService,
+      deps: [KeyService, EncryptService, CriticalAppsApiService],
+    }),
+    safeProvider({
+      provide: CriticalAppsApiService,
+      useClass: CriticalAppsApiService,
+      deps: [ApiService],
+    }),
   ],
 })
 export class AccessIntelligenceModule {}
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.html b/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.html
index e17ac07868..bcc15fbc8f 100644
--- a/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.html
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.html
@@ -55,7 +55,7 @@
       buttonType="secondary"
       bitButton
       *ngIf="isCriticalAppsFeatureEnabled"
-      [disabled]="!selectedIds.size"
+      [disabled]="!selectedUrls.size"
       [loading]="markingAsCritical"
       (click)="markAppsAsCritical()"
     >
@@ -80,9 +80,11 @@
           <input
             bitCheckbox
             type="checkbox"
-            [checked]="selectedIds.has(r.id)"
-            (change)="onCheckboxChange(r.id, $event)"
+            *ngIf="!r.isMarkedAsCritical"
+            [checked]="selectedUrls.has(r.applicationName)"
+            (change)="onCheckboxChange(r.applicationName, $event)"
           />
+          <i class="bwi bwi-star-f" *ngIf="r.isMarkedAsCritical"></i>
         </td>
         <td class="tw-cursor-pointer" (click)="showAppAtRiskMembers(r.applicationName)" bitCell>
           <span>{{ r.applicationName }}</span>
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.ts
index 5fb12fed09..b22b94599f 100644
--- a/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.ts
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.ts
@@ -1,15 +1,17 @@
-import { Component, DestroyRef, OnDestroy, OnInit, inject } from "@angular/core";
+import { Component, DestroyRef, inject, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
-import { debounceTime, map, Observable, of, Subscription } from "rxjs";
+import { combineLatest, debounceTime, map, Observable, of, skipWhile } from "rxjs";
 
 import {
+  CriticalAppsService,
   RiskInsightsDataService,
   RiskInsightsReportService,
 } from "@bitwarden/bit-common/tools/reports/risk-insights";
 import {
   ApplicationHealthReportDetail,
+  ApplicationHealthReportDetailWithCriticalFlag,
   ApplicationHealthReportSummary,
 } from "@bitwarden/bit-common/tools/reports/risk-insights/models/password-health";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
@@ -50,16 +52,15 @@ import { ApplicationsLoadingComponent } from "./risk-insights-loading.component"
     SharedModule,
   ],
 })
-export class AllApplicationsComponent implements OnInit, OnDestroy {
-  protected dataSource = new TableDataSource<ApplicationHealthReportDetail>();
-  protected selectedIds: Set<number> = new Set<number>();
+export class AllApplicationsComponent implements OnInit {
+  protected dataSource = new TableDataSource<ApplicationHealthReportDetailWithCriticalFlag>();
+  protected selectedUrls: Set<string> = new Set<string>();
   protected searchControl = new FormControl("", { nonNullable: true });
   protected loading = true;
   protected organization = {} as Organization;
   noItemsIcon = Icons.Security;
   protected markingAsCritical = false;
   protected applicationSummary = {} as ApplicationHealthReportSummary;
-  private subscription = new Subscription();
 
   destroyRef = inject(DestroyRef);
   isLoading$: Observable<boolean> = of(false);
@@ -70,28 +71,33 @@ export class AllApplicationsComponent implements OnInit, OnDestroy {
       FeatureFlag.CriticalApps,
     );
 
-    const organizationId = this.activatedRoute.snapshot.paramMap.get("organizationId");
+    const organizationId = this.activatedRoute.snapshot.paramMap.get("organizationId") ?? "";
+    combineLatest([
+      this.dataService.applications$,
+      this.criticalAppsService.getAppsListForOrg(organizationId),
+      this.organizationService.get$(organizationId),
+    ])
+      .pipe(
+        takeUntilDestroyed(this.destroyRef),
+        skipWhile(([_, __, organization]) => !organization),
+        map(([applications, criticalApps, organization]) => {
+          const criticalUrls = criticalApps.map((ca) => ca.uri);
+          const data = applications?.map((app) => ({
+            ...app,
+            isMarkedAsCritical: criticalUrls.includes(app.applicationName),
+          })) as ApplicationHealthReportDetailWithCriticalFlag[];
+          return { data, organization };
+        }),
+      )
+      .subscribe(({ data, organization }) => {
+        this.dataSource.data = data ?? [];
+        this.applicationSummary = this.reportService.generateApplicationsSummary(data ?? []);
+        if (organization) {
+          this.organization = organization;
+        }
+      });
 
-    if (organizationId) {
-      this.organization = await this.organizationService.get(organizationId);
-      this.subscription = this.dataService.applications$
-        .pipe(
-          map((applications) => {
-            if (applications) {
-              this.dataSource.data = applications;
-              this.applicationSummary =
-                this.reportService.generateApplicationsSummary(applications);
-            }
-          }),
-          takeUntilDestroyed(this.destroyRef),
-        )
-        .subscribe();
-      this.isLoading$ = this.dataService.isLoading$;
-    }
-  }
-
-  ngOnDestroy(): void {
-    this.subscription?.unsubscribe();
+    this.isLoading$ = this.dataService.isLoading$;
   }
 
   constructor(
@@ -103,6 +109,7 @@ export class AllApplicationsComponent implements OnInit, OnDestroy {
     protected dataService: RiskInsightsDataService,
     protected organizationService: OrganizationService,
     protected reportService: RiskInsightsReportService,
+    protected criticalAppsService: CriticalAppsService,
     protected dialogService: DialogService,
   ) {
     this.searchControl.valueChanges
@@ -119,21 +126,28 @@ export class AllApplicationsComponent implements OnInit, OnDestroy {
     });
   };
 
+  isMarkedAsCriticalItem(applicationName: string) {
+    return this.selectedUrls.has(applicationName);
+  }
+
   markAppsAsCritical = async () => {
-    // TODO: Send to API once implemented
     this.markingAsCritical = true;
-    return new Promise((resolve) => {
-      setTimeout(() => {
-        this.selectedIds.clear();
-        this.toastService.showToast({
-          variant: "success",
-          title: "",
-          message: this.i18nService.t("appsMarkedAsCritical"),
-        });
-        resolve(true);
-        this.markingAsCritical = false;
-      }, 1000);
-    });
+
+    try {
+      await this.criticalAppsService.setCriticalApps(
+        this.organization.id,
+        Array.from(this.selectedUrls),
+      );
+
+      this.toastService.showToast({
+        variant: "success",
+        title: "",
+        message: this.i18nService.t("appsMarkedAsCritical"),
+      });
+    } finally {
+      this.selectedUrls.clear();
+      this.markingAsCritical = false;
+    }
   };
 
   trackByFunction(_: number, item: ApplicationHealthReportDetail) {
@@ -161,12 +175,14 @@ export class AllApplicationsComponent implements OnInit, OnDestroy {
     });
   };
 
-  onCheckboxChange(id: number, event: Event) {
+  onCheckboxChange(applicationName: string, event: Event) {
     const isChecked = (event.target as HTMLInputElement).checked;
     if (isChecked) {
-      this.selectedIds.add(id);
+      this.selectedUrls.add(applicationName);
     } else {
-      this.selectedIds.delete(id);
+      this.selectedUrls.delete(applicationName);
     }
   }
+
+  getSelectedUrls = () => Array.from(this.selectedUrls);
 }
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/application-table.mock.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/application-table.mock.ts
index 4df363ab2c..4dffa60b56 100644
--- a/bitwarden_license/bit-web/src/app/tools/access-intelligence/application-table.mock.ts
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/application-table.mock.ts
@@ -6,6 +6,7 @@ export const applicationTableMockData = [
     totalPasswords: 10,
     atRiskMembers: 2,
     totalMembers: 5,
+    isMarkedAsCritical: false,
   },
   {
     id: 2,
@@ -14,6 +15,7 @@ export const applicationTableMockData = [
     totalPasswords: 8,
     atRiskMembers: 1,
     totalMembers: 3,
+    isMarkedAsCritical: false,
   },
   {
     id: 3,
@@ -22,6 +24,7 @@ export const applicationTableMockData = [
     totalPasswords: 6,
     atRiskMembers: 0,
     totalMembers: 2,
+    isMarkedAsCritical: false,
   },
   {
     id: 4,
@@ -30,6 +33,7 @@ export const applicationTableMockData = [
     totalPasswords: 4,
     atRiskMembers: 0,
     totalMembers: 1,
+    isMarkedAsCritical: false,
   },
   {
     id: 5,
@@ -38,6 +42,7 @@ export const applicationTableMockData = [
     totalPasswords: 2,
     atRiskMembers: 0,
     totalMembers: 0,
+    isMarkedAsCritical: false,
   },
   {
     id: 6,
@@ -46,5 +51,6 @@ export const applicationTableMockData = [
     totalPasswords: 1,
     atRiskMembers: 0,
     totalMembers: 0,
+    isMarkedAsCritical: false,
   },
 ];
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/risk-insights.component.html b/bitwarden_license/bit-web/src/app/tools/access-intelligence/risk-insights.component.html
index 7fe320ede6..ae8bd94e5f 100644
--- a/bitwarden_license/bit-web/src/app/tools/access-intelligence/risk-insights.component.html
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/risk-insights.component.html
@@ -40,7 +40,7 @@
     <bit-tab *ngIf="isCriticalAppsFeatureEnabled">
       <ng-template bitTabLabel>
         <i class="bwi bwi-star"></i>
-        {{ "criticalApplicationsWithCount" | i18n: criticalAppsCount }}
+        {{ "criticalApplicationsWithCount" | i18n: (criticalApps$ | async)?.length ?? 0 }}
       </ng-template>
       <tools-critical-applications></tools-critical-applications>
     </bit-tab>
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/risk-insights.component.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/risk-insights.component.ts
index 75601994c7..5adb0d3294 100644
--- a/bitwarden_license/bit-web/src/app/tools/access-intelligence/risk-insights.component.ts
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/risk-insights.component.ts
@@ -6,11 +6,17 @@ import { Observable, EMPTY } from "rxjs";
 import { map, switchMap } from "rxjs/operators";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { RiskInsightsDataService } from "@bitwarden/bit-common/tools/reports/risk-insights";
+import {
+  RiskInsightsDataService,
+  CriticalAppsService,
+  PasswordHealthReportApplicationsResponse,
+} from "@bitwarden/bit-common/tools/reports/risk-insights";
 import { ApplicationHealthReportDetail } from "@bitwarden/bit-common/tools/reports/risk-insights/models/password-health";
+// eslint-disable-next-line no-restricted-imports -- used for dependency injection
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { devFlagEnabled } from "@bitwarden/common/platform/misc/flags";
+import { OrganizationId } from "@bitwarden/common/types/guid";
 import { AsyncActionsModule, ButtonModule, TabsModule } from "@bitwarden/components";
 import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module";
 
@@ -51,6 +57,7 @@ export class RiskInsightsComponent implements OnInit {
   dataLastUpdated: Date = new Date();
 
   isCriticalAppsFeatureEnabled: boolean = false;
+  criticalApps$: Observable<PasswordHealthReportApplicationsResponse[]> = new Observable();
   showDebugTabs: boolean = false;
 
   appsCount: number = 0;
@@ -69,10 +76,13 @@ export class RiskInsightsComponent implements OnInit {
     private router: Router,
     private configService: ConfigService,
     private dataService: RiskInsightsDataService,
+    private criticalAppsService: CriticalAppsService,
   ) {
     this.route.queryParams.pipe(takeUntilDestroyed()).subscribe(({ tabIndex }) => {
       this.tabIndex = !isNaN(Number(tabIndex)) ? Number(tabIndex) : RiskInsightsTabType.AllApps;
     });
+    const orgId = this.route.snapshot.paramMap.get("organizationId") ?? "";
+    this.criticalApps$ = this.criticalAppsService.getAppsListForOrg(orgId);
   }
 
   async ngOnInit() {
@@ -104,6 +114,7 @@ export class RiskInsightsComponent implements OnInit {
           if (applications) {
             this.appsCount = applications.length;
           }
+          this.criticalAppsService.setOrganizationId(this.organizationId as OrganizationId);
         },
       });
   }

From 8942f8d440f1289cf2c9a1dff94237901d9487d9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 16 Jan 2025 14:56:48 +0000
Subject: [PATCH 120/150] [deps] SM: Update lint-staged to v15.4.0 (#10565)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Oscar Hinton <Hinton@users.noreply.github.com>
---
 package-lock.json | 38 +++++++++++++++++++-------------------
 package.json      |  2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b94ad3b762..4b30fedbd0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -156,7 +156,7 @@
         "jest-junit": "16.0.0",
         "jest-mock-extended": "3.0.7",
         "jest-preset-angular": "14.1.1",
-        "lint-staged": "15.2.8",
+        "lint-staged": "15.4.0",
         "mini-css-extract-plugin": "2.9.2",
         "node-ipc": "9.2.1",
         "postcss": "8.4.49",
@@ -14661,9 +14661,9 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
-      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "license": "MIT",
       "dependencies": {
         "ms": "^2.1.3"
@@ -22338,22 +22338,22 @@
       "license": "MIT"
     },
     "node_modules/lint-staged": {
-      "version": "15.2.8",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.8.tgz",
-      "integrity": "sha512-PUWFf2zQzsd9EFU+kM1d7UP+AZDbKFKuj+9JNVTBkhUFhbg4MAt6WfyMMwBfM4lYqd4D2Jwac5iuTu9rVj4zCQ==",
+      "version": "15.4.0",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.4.0.tgz",
+      "integrity": "sha512-UdODqEZiQimd7rCzZ2vqFuELRNUda3mdv7M93jhE4SmDiqAj/w/msvwKgagH23jv2iCPw6Q5m+ltX4VlHvp2LQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "chalk": "~5.3.0",
+        "chalk": "~5.4.1",
         "commander": "~12.1.0",
-        "debug": "~4.3.6",
+        "debug": "~4.4.0",
         "execa": "~8.0.1",
-        "lilconfig": "~3.1.2",
-        "listr2": "~8.2.4",
-        "micromatch": "~4.0.7",
+        "lilconfig": "~3.1.3",
+        "listr2": "~8.2.5",
+        "micromatch": "~4.0.8",
         "pidtree": "~0.6.0",
         "string-argv": "~0.3.2",
-        "yaml": "~2.5.0"
+        "yaml": "~2.6.1"
       },
       "bin": {
         "lint-staged": "bin/lint-staged.js"
@@ -22366,9 +22366,9 @@
       }
     },
     "node_modules/lint-staged/node_modules/chalk": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
-      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz",
+      "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -33151,9 +33151,9 @@
       "license": "ISC"
     },
     "node_modules/yaml": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz",
-      "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.1.tgz",
+      "integrity": "sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==",
       "license": "ISC",
       "bin": {
         "yaml": "bin.mjs"
diff --git a/package.json b/package.json
index 07e3f21786..5d7c2ace64 100644
--- a/package.json
+++ b/package.json
@@ -116,7 +116,7 @@
     "jest-junit": "16.0.0",
     "jest-mock-extended": "3.0.7",
     "jest-preset-angular": "14.1.1",
-    "lint-staged": "15.2.8",
+    "lint-staged": "15.4.0",
     "mini-css-extract-plugin": "2.9.2",
     "node-ipc": "9.2.1",
     "postcss": "8.4.49",

From cc311d9a9258e66b2af9eac8749383d8427e2da2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=9C=A8=20Audrey=20=E2=9C=A8?= <ajensen@bitwarden.com>
Date: Thu, 16 Jan 2025 10:02:28 -0500
Subject: [PATCH 121/150] [PM-16788] introduce generator metadata (#12757)

---
 .../core/src/metadata/algorithm-metadata.ts   |  61 +++++
 .../tools/generator/core/src/metadata/data.ts |  48 ++++
 .../core/src/metadata/email/catchall.spec.ts  |  65 ++++++
 .../core/src/metadata/email/catchall.ts       |  70 ++++++
 .../core/src/metadata/email/forwarder.ts      |   4 +
 .../src/metadata/email/plus-address.spec.ts   |  65 ++++++
 .../core/src/metadata/email/plus-address.ts   |  72 ++++++
 .../core/src/metadata/generator-metadata.ts   |  29 +++
 .../metadata/password/eff-word-list.spec.ts   | 102 ++++++++
 .../src/metadata/password/eff-word-list.ts    |  91 ++++++++
 .../metadata/password/random-password.spec.ts | 105 +++++++++
 .../src/metadata/password/random-password.ts  | 117 ++++++++++
 .../core/src/metadata/profile-metadata.ts     |  80 +++++++
 .../tools/generator/core/src/metadata/type.ts |  28 +++
 .../metadata/username/eff-word-list.spec.ts   |  58 +++++
 .../src/metadata/username/eff-word-list.ts    |  70 ++++++
 .../generator/core/src/metadata/util.spec.ts  | 218 ++++++++++++++++++
 .../tools/generator/core/src/metadata/util.ts |  60 +++++
 .../core/src/policies/catchall-constraints.ts |   2 +-
 .../src/types/password-generation-options.ts  |  20 +-
 libs/tools/generator/core/src/util.ts         |   2 +-
 21 files changed, 1355 insertions(+), 12 deletions(-)
 create mode 100644 libs/tools/generator/core/src/metadata/algorithm-metadata.ts
 create mode 100644 libs/tools/generator/core/src/metadata/data.ts
 create mode 100644 libs/tools/generator/core/src/metadata/email/catchall.spec.ts
 create mode 100644 libs/tools/generator/core/src/metadata/email/catchall.ts
 create mode 100644 libs/tools/generator/core/src/metadata/email/forwarder.ts
 create mode 100644 libs/tools/generator/core/src/metadata/email/plus-address.spec.ts
 create mode 100644 libs/tools/generator/core/src/metadata/email/plus-address.ts
 create mode 100644 libs/tools/generator/core/src/metadata/generator-metadata.ts
 create mode 100644 libs/tools/generator/core/src/metadata/password/eff-word-list.spec.ts
 create mode 100644 libs/tools/generator/core/src/metadata/password/eff-word-list.ts
 create mode 100644 libs/tools/generator/core/src/metadata/password/random-password.spec.ts
 create mode 100644 libs/tools/generator/core/src/metadata/password/random-password.ts
 create mode 100644 libs/tools/generator/core/src/metadata/profile-metadata.ts
 create mode 100644 libs/tools/generator/core/src/metadata/type.ts
 create mode 100644 libs/tools/generator/core/src/metadata/username/eff-word-list.spec.ts
 create mode 100644 libs/tools/generator/core/src/metadata/username/eff-word-list.ts
 create mode 100644 libs/tools/generator/core/src/metadata/util.spec.ts
 create mode 100644 libs/tools/generator/core/src/metadata/util.ts

diff --git a/libs/tools/generator/core/src/metadata/algorithm-metadata.ts b/libs/tools/generator/core/src/metadata/algorithm-metadata.ts
new file mode 100644
index 0000000000..f776dd76e5
--- /dev/null
+++ b/libs/tools/generator/core/src/metadata/algorithm-metadata.ts
@@ -0,0 +1,61 @@
+import { CredentialAlgorithm, CredentialType } from "./type";
+
+/** Credential generator metadata common across credential generators */
+export type AlgorithmMetadata = {
+  /** Uniquely identifies the credential configuration
+   * @example
+   *   // Use `isForwarderIntegration(algorithm: CredentialAlgorithm)`
+   *   // to pattern test whether the credential describes a forwarder algorithm
+   *   const meta : AlgorithmMetadata = // ...
+   *   const { forwarder } = isForwarderIntegration(meta.id) ? credentialId : {};
+   */
+  id: CredentialAlgorithm;
+
+  /** The kind of credential generated by this configuration */
+  category: CredentialType;
+
+  /** Used to order credential algorithms for display purposes.
+   *  Items with lesser weights appear before entries with greater
+   *  weights (i.e. ascending sort).
+   */
+  weight: number;
+
+  /** Localization keys */
+  i18nKeys: {
+    /** descriptive name of the algorithm */
+    name: string;
+
+    /** explanatory text for the algorithm  */
+    description?: string;
+
+    /** labels the generate action */
+    generateCredential: string;
+
+    /** message informing users when the generator produces a new credential */
+    credentialGenerated: string;
+
+    /* labels the action that assigns a generated value to a domain object */
+    useCredential: string;
+
+    /** labels the generated output */
+    credentialType: string;
+
+    /** labels the copy output action */
+    copyCredential: string;
+  };
+
+  /** fine-tunings for generator user experiences */
+  capabilities: {
+    /** `true` when the generator supports autogeneration
+     *  @remarks this property is useful when credential generation
+     *   carries side effects, such as configuring a service external
+     *   to Bitwarden.
+     */
+    autogenerate: boolean;
+
+    /** Well-known fields to display on the options panel or collect from the environment.
+     *  @remarks: at present, this is only used by forwarders
+     */
+    fields: string[];
+  };
+};
diff --git a/libs/tools/generator/core/src/metadata/data.ts b/libs/tools/generator/core/src/metadata/data.ts
new file mode 100644
index 0000000000..2b9dad5055
--- /dev/null
+++ b/libs/tools/generator/core/src/metadata/data.ts
@@ -0,0 +1,48 @@
+import { deepFreeze } from "@bitwarden/common/tools/util";
+
+/** algorithms for generating credentials */
+export const Algorithm = Object.freeze({
+  /** A password composed of random characters */
+  password: "password",
+
+  /** A password composed of random words from the EFF word list */
+  passphrase: "passphrase",
+
+  /** A username composed of words from the EFF word list */
+  username: "username",
+
+  /** An email username composed of random characters */
+  catchall: "catchall",
+
+  /** An email username composed of words from the EFF word list  */
+  plusAddress: "subaddress",
+} as const);
+
+/** categorizes credentials according to their use-case outside of Bitwarden */
+export const Type = Object.freeze({
+  password: "password",
+  username: "username",
+  email: "email",
+} as const);
+
+/** categorizes settings according to their expected use-case within Bitwarden */
+export const Profile = Object.freeze({
+  /** account-level generator options. This is the default.
+   *  @remarks these are the options displayed on the generator tab
+   */
+  account: "account",
+
+  // FIXME: consider adding a profile for bitwarden's master password
+});
+
+/** Credential generation algorithms grouped by purpose. */
+export const AlgorithmsByType = deepFreeze({
+  /** Algorithms that produce passwords */
+  [Type.password]: [Algorithm.password, Algorithm.passphrase] as const,
+
+  /** Algorithms that produce usernames */
+  [Type.username]: [Algorithm.username] as const,
+
+  /** Algorithms that produce email addresses */
+  [Type.email]: [Algorithm.catchall, Algorithm.plusAddress] as const,
+} as const);
diff --git a/libs/tools/generator/core/src/metadata/email/catchall.spec.ts b/libs/tools/generator/core/src/metadata/email/catchall.spec.ts
new file mode 100644
index 0000000000..f63f141842
--- /dev/null
+++ b/libs/tools/generator/core/src/metadata/email/catchall.spec.ts
@@ -0,0 +1,65 @@
+import { mock } from "jest-mock-extended";
+
+import { EmailRandomizer } from "../../engine";
+import { CatchallConstraints } from "../../policies/catchall-constraints";
+import { CatchallGenerationOptions, GeneratorDependencyProvider } from "../../types";
+import { Profile } from "../data";
+import { CoreProfileMetadata } from "../profile-metadata";
+import { isCoreProfile } from "../util";
+
+import catchall from "./catchall";
+
+const dependencyProvider = mock<GeneratorDependencyProvider>();
+
+describe("email - catchall generator metadata", () => {
+  describe("engine.create", () => {
+    it("returns an email randomizer", () => {
+      expect(catchall.engine.create(dependencyProvider)).toBeInstanceOf(EmailRandomizer);
+    });
+  });
+
+  describe("profiles[account]", () => {
+    let accountProfile: CoreProfileMetadata<CatchallGenerationOptions> = null;
+    beforeEach(() => {
+      const profile = catchall.profiles[Profile.account];
+      if (isCoreProfile(profile)) {
+        accountProfile = profile;
+      }
+    });
+
+    describe("storage.options.deserializer", () => {
+      it("returns its input", () => {
+        const value: CatchallGenerationOptions = {
+          catchallType: "random",
+          catchallDomain: "example.com",
+        };
+
+        const result = accountProfile.storage.options.deserializer(value);
+
+        expect(result).toBe(value);
+      });
+    });
+
+    describe("constraints.create", () => {
+      // these tests check that the wiring is correct by exercising the behavior
+      // of functionality encapsulated by `create`. These methods may fail if the
+      // enclosed behaviors change.
+
+      it("creates a catchall constraints", () => {
+        const context = { defaultConstraints: {} };
+
+        const constraints = accountProfile.constraints.create([], context);
+
+        expect(constraints).toBeInstanceOf(CatchallConstraints);
+      });
+
+      it("extracts the domain from context.email", () => {
+        const context = { email: "foo@example.com", defaultConstraints: {} };
+
+        const constraints = accountProfile.constraints.create([], context) as CatchallConstraints;
+
+        expect(constraints.domain).toEqual("example.com");
+      });
+    });
+  });
+});
diff --git a/libs/tools/generator/core/src/metadata/email/catchall.ts b/libs/tools/generator/core/src/metadata/email/catchall.ts
new file mode 100644
index 0000000000..0711e5c371
--- /dev/null
+++ b/libs/tools/generator/core/src/metadata/email/catchall.ts
@@ -0,0 +1,70 @@
+import { GENERATOR_DISK } from "@bitwarden/common/platform/state";
+import { PublicClassifier } from "@bitwarden/common/tools/public-classifier";
+import { deepFreeze } from "@bitwarden/common/tools/util";
+
+import { EmailRandomizer } from "../../engine";
+import { CatchallConstraints } from "../../policies/catchall-constraints";
+import {
+  CatchallGenerationOptions,
+  CredentialGenerator,
+  GeneratorDependencyProvider,
+} from "../../types";
+import { Algorithm, Type, Profile } from "../data";
+import { GeneratorMetadata } from "../generator-metadata";
+
+const catchall: GeneratorMetadata<CatchallGenerationOptions> = deepFreeze({
+  id: Algorithm.catchall,
+  category: Type.email,
+  weight: 210,
+  i18nKeys: {
+    name: "catchallEmail",
+    description: "catchallEmailDesc",
+    credentialType: "email",
+    generateCredential: "generateEmail",
+    credentialGenerated: "emailGenerated",
+    copyCredential: "copyEmail",
+    useCredential: "useThisEmail",
+  },
+  capabilities: {
+    autogenerate: true,
+    fields: [],
+  },
+  engine: {
+    create(
+      dependencies: GeneratorDependencyProvider,
+    ): CredentialGenerator<CatchallGenerationOptions> {
+      return new EmailRandomizer(dependencies.randomizer);
+    },
+  },
+  profiles: {
+    [Profile.account]: {
+      type: "core",
+      storage: {
+        key: "catchallGeneratorSettings",
+        target: "object",
+        format: "plain",
+        classifier: new PublicClassifier<CatchallGenerationOptions>([
+          "catchallType",
+          "catchallDomain",
+        ]),
+        state: GENERATOR_DISK,
+        initial: {
+          catchallType: "random",
+          catchallDomain: "",
+        },
+        options: {
+          deserializer: (value) => value,
+          clearOn: ["logout"],
+        },
+      },
+      constraints: {
+        default: { catchallDomain: { minLength: 1 } },
+        create(_policies, context) {
+          return new CatchallConstraints(context.email ?? "");
+        },
+      },
+    },
+  },
+});
+
+export default catchall;
diff --git a/libs/tools/generator/core/src/metadata/email/forwarder.ts b/libs/tools/generator/core/src/metadata/email/forwarder.ts
new file mode 100644
index 0000000000..1dfc219d46
--- /dev/null
+++ b/libs/tools/generator/core/src/metadata/email/forwarder.ts
@@ -0,0 +1,4 @@
+// Forwarders are pending integration with the extension API
+//
+// They use the 300-block of weights and derive their metadata
+// using logic similar to `toCredentialGeneratorConfiguration`
diff --git a/libs/tools/generator/core/src/metadata/email/plus-address.spec.ts b/libs/tools/generator/core/src/metadata/email/plus-address.spec.ts
new file mode 100644
index 0000000000..2ac7645ed3
--- /dev/null
+++ b/libs/tools/generator/core/src/metadata/email/plus-address.spec.ts
@@ -0,0 +1,65 @@
+import { mock } from "jest-mock-extended";
+
+import { EmailRandomizer } from "../../engine";
+import { SubaddressConstraints } from "../../policies/subaddress-constraints";
+import { SubaddressGenerationOptions, GeneratorDependencyProvider } from "../../types";
+import { Profile } from "../data";
+import { CoreProfileMetadata } from "../profile-metadata";
+import { isCoreProfile } from "../util";
+
+import plusAddress from "./plus-address";
+
+const dependencyProvider = mock<GeneratorDependencyProvider>();
+
+describe("email - plus address generator metadata", () => {
+  describe("engine.create", () => {
+    it("returns an email randomizer", () => {
+      expect(plusAddress.engine.create(dependencyProvider)).toBeInstanceOf(EmailRandomizer);
+    });
+  });
+
+  describe("profiles[account]", () => {
+    let accountProfile: CoreProfileMetadata<SubaddressGenerationOptions> = null;
+    beforeEach(() => {
+      const profile = plusAddress.profiles[Profile.account];
+      if (isCoreProfile(profile)) {
+        accountProfile = profile;
+      }
+    });
+
+    describe("storage.options.deserializer", () => {
+      it("returns its input", () => {
+        const value: SubaddressGenerationOptions = {
+          subaddressType: "random",
+          subaddressEmail: "foo@example.com",
+        };
+
+        const result = accountProfile.storage.options.deserializer(value);
+
+        expect(result).toBe(value);
+      });
+    });
+
+    describe("constraints.create", () => {
+      // these tests check that the wiring is correct by exercising the behavior
+      // of functionality encapsulated by `create`. These methods may fail if the
+      // enclosed behaviors change.
+
+      it("creates a subaddress constraints", () => {
+        const context = { defaultConstraints: {} };
+
+        const constraints = accountProfile.constraints.create([], context);
+
+        expect(constraints).toBeInstanceOf(SubaddressConstraints);
+      });
+
+      it("sets the constraint email to context.email", () => {
+        const context = { email: "bar@example.com", defaultConstraints: {} };
+
+        const constraints = accountProfile.constraints.create([], context) as SubaddressConstraints;
+
+        expect(constraints.email).toEqual("bar@example.com");
+      });
+    });
+  });
+});
diff --git a/libs/tools/generator/core/src/metadata/email/plus-address.ts b/libs/tools/generator/core/src/metadata/email/plus-address.ts
new file mode 100644
index 0000000000..0db0acd415
--- /dev/null
+++ b/libs/tools/generator/core/src/metadata/email/plus-address.ts
@@ -0,0 +1,72 @@
+import { GENERATOR_DISK } from "@bitwarden/common/platform/state";
+import { PublicClassifier } from "@bitwarden/common/tools/public-classifier";
+import { deepFreeze } from "@bitwarden/common/tools/util";
+
+import { EmailRandomizer } from "../../engine";
+import { SubaddressConstraints } from "../../policies/subaddress-constraints";
+import {
+  CredentialGenerator,
+  GeneratorDependencyProvider,
+  SubaddressGenerationOptions,
+} from "../../types";
+import { Algorithm, Profile, Type } from "../data";
+import { GeneratorMetadata } from "../generator-metadata";
+
+const plusAddress: GeneratorMetadata<SubaddressGenerationOptions> = deepFreeze({
+  id: Algorithm.plusAddress,
+  category: Type.email,
+  weight: 200,
+  i18nKeys: {
+    name: "plusAddressedEmail",
+    description: "plusAddressedEmailDesc",
+    credentialType: "email",
+    generateCredential: "generateEmail",
+    credentialGenerated: "emailGenerated",
+    copyCredential: "copyEmail",
+    useCredential: "useThisEmail",
+  },
+  capabilities: {
+    autogenerate: true,
+    fields: [],
+  },
+  engine: {
+    create(
+      dependencies: GeneratorDependencyProvider,
+    ): CredentialGenerator<SubaddressGenerationOptions> {
+      return new EmailRandomizer(dependencies.randomizer);
+    },
+  },
+  profiles: {
+    [Profile.account]: {
+      type: "core",
+      storage: {
+        key: "subaddressGeneratorSettings",
+        target: "object",
+        format: "plain",
+        classifier: new PublicClassifier<SubaddressGenerationOptions>([
+          "subaddressType",
+          "subaddressEmail",
+        ]),
+        state: GENERATOR_DISK,
+        initial: {
+          subaddressType: "random",
+          subaddressEmail: "",
+        },
+        options: {
+          deserializer(value) {
+            return value;
+          },
+          clearOn: ["logout"],
+        },
+      },
+      constraints: {
+        default: {},
+        create(_policy, context) {
+          return new SubaddressConstraints(context.email ?? "");
+        },
+      },
+    },
+  },
+});
+
+export default plusAddress;
diff --git a/libs/tools/generator/core/src/metadata/generator-metadata.ts b/libs/tools/generator/core/src/metadata/generator-metadata.ts
new file mode 100644
index 0000000000..9296d30430
--- /dev/null
+++ b/libs/tools/generator/core/src/metadata/generator-metadata.ts
@@ -0,0 +1,29 @@
+import { CredentialGenerator, GeneratorDependencyProvider } from "../types";
+
+import { AlgorithmMetadata } from "./algorithm-metadata";
+import { Profile } from "./data";
+import { ProfileMetadata } from "./profile-metadata";
+
+/** Extends the algorithm metadata with storage and engine configurations.
+ * @example
+ *   // Use `isForwarderIntegration(algorithm: CredentialAlgorithm)`
+ *   // to pattern test whether the credential describes a forwarder algorithm
+ *   const meta : CredentialGeneratorInfo = // ...
+ *   const { forwarder } = isForwarderIntegration(meta.id) ? credentialId : {};
+ */
+export type GeneratorMetadata<Options> = AlgorithmMetadata & {
+  /** An algorithm that generates credentials when ran. */
+  engine: {
+    /** Factory for the generator
+     */
+    create: (randomizer: GeneratorDependencyProvider) => CredentialGenerator<Options>;
+  };
+
+  /** Defines parameters for credential generation */
+  profiles: {
+    /** profiles supported by this generator; when `undefined`,
+     * the generator does not support the profile.
+     */
+    [K in keyof typeof Profile]?: ProfileMetadata<Options>;
+  };
+};
diff --git a/libs/tools/generator/core/src/metadata/password/eff-word-list.spec.ts b/libs/tools/generator/core/src/metadata/password/eff-word-list.spec.ts
new file mode 100644
index 0000000000..57961a6003
--- /dev/null
+++ b/libs/tools/generator/core/src/metadata/password/eff-word-list.spec.ts
@@ -0,0 +1,102 @@
+import { mock } from "jest-mock-extended";
+
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
+import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
+
+import { PasswordRandomizer } from "../../engine";
+import { PassphrasePolicyConstraints } from "../../policies";
+import { PassphraseGenerationOptions, GeneratorDependencyProvider } from "../../types";
+import { Profile } from "../data";
+import { CoreProfileMetadata } from "../profile-metadata";
+import { isCoreProfile } from "../util";
+
+import effPassphrase from "./eff-word-list";
+
+const dependencyProvider = mock<GeneratorDependencyProvider>();
+
+describe("password - eff words generator metadata", () => {
+  describe("engine.create", () => {
+    it("returns an email randomizer", () => {
+      expect(effPassphrase.engine.create(dependencyProvider)).toBeInstanceOf(PasswordRandomizer);
+    });
+  });
+
+  describe("profiles[account]", () => {
+    let accountProfile: CoreProfileMetadata<PassphraseGenerationOptions> = null;
+    beforeEach(() => {
+      const profile = effPassphrase.profiles[Profile.account];
+      if (isCoreProfile(profile)) {
+        accountProfile = profile;
+      }
+    });
+
+    describe("storage.options.deserializer", () => {
+      it("returns its input", () => {
+        const value: PassphraseGenerationOptions = { ...accountProfile.storage.initial };
+
+        const result = accountProfile.storage.options.deserializer(value);
+
+        expect(result).toBe(value);
+      });
+    });
+
+    describe("constraints.create", () => {
+      // these tests check that the wiring is correct by exercising the behavior
+      // of functionality encapsulated by `create`. These methods may fail if the
+      // enclosed behaviors change.
+
+      it("creates a passphrase policy constraints", () => {
+        const context = { defaultConstraints: accountProfile.constraints.default };
+
+        const constraints = accountProfile.constraints.create([], context);
+
+        expect(constraints).toBeInstanceOf(PassphrasePolicyConstraints);
+      });
+
+      it("forwards the policy to the constraints", () => {
+        const context = { defaultConstraints: accountProfile.constraints.default };
+        const policies = [
+          {
+            type: PolicyType.PasswordGenerator,
+            data: {
+              minNumberWords: 6,
+              capitalize: false,
+              includeNumber: false,
+            },
+          },
+        ] as Policy[];
+
+        const constraints = accountProfile.constraints.create(policies, context);
+
+        expect(constraints.constraints.numWords.min).toEqual(6);
+      });
+
+      it("combines multiple policies in the constraints", () => {
+        const context = { defaultConstraints: accountProfile.constraints.default };
+        const policies = [
+          {
+            type: PolicyType.PasswordGenerator,
+            data: {
+              minNumberWords: 6,
+              capitalize: false,
+              includeNumber: false,
+            },
+          },
+          {
+            type: PolicyType.PasswordGenerator,
+            data: {
+              minNumberWords: 3,
+              capitalize: true,
+              includeNumber: false,
+            },
+          },
+        ] as Policy[];
+
+        const constraints = accountProfile.constraints.create(policies, context);
+
+        expect(constraints.constraints.numWords.min).toEqual(6);
+        expect(constraints.constraints.capitalize.requiredValue).toEqual(true);
+      });
+    });
+  });
+});
diff --git a/libs/tools/generator/core/src/metadata/password/eff-word-list.ts b/libs/tools/generator/core/src/metadata/password/eff-word-list.ts
new file mode 100644
index 0000000000..fc86032bf6
--- /dev/null
+++ b/libs/tools/generator/core/src/metadata/password/eff-word-list.ts
@@ -0,0 +1,91 @@
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
+import { GENERATOR_DISK } from "@bitwarden/common/platform/state";
+import { PublicClassifier } from "@bitwarden/common/tools/public-classifier";
+import { ObjectKey } from "@bitwarden/common/tools/state/object-key";
+
+import { PasswordRandomizer } from "../../engine";
+import { passphraseLeastPrivilege, PassphrasePolicyConstraints } from "../../policies";
+import {
+  CredentialGenerator,
+  GeneratorDependencyProvider,
+  PassphraseGenerationOptions,
+} from "../../types";
+import { Algorithm, Profile, Type } from "../data";
+import { GeneratorMetadata } from "../generator-metadata";
+
+const passphrase: GeneratorMetadata<PassphraseGenerationOptions> = {
+  id: Algorithm.passphrase,
+  category: Type.password,
+  weight: 110,
+  i18nKeys: {
+    name: "passphrase",
+    credentialType: "passphrase",
+    generateCredential: "generatePassphrase",
+    credentialGenerated: "passphraseGenerated",
+    copyCredential: "copyPassphrase",
+    useCredential: "useThisPassphrase",
+  },
+  capabilities: {
+    autogenerate: false,
+    fields: [],
+  },
+  engine: {
+    create(
+      dependencies: GeneratorDependencyProvider,
+    ): CredentialGenerator<PassphraseGenerationOptions> {
+      return new PasswordRandomizer(dependencies.randomizer);
+    },
+  },
+  profiles: {
+    [Profile.account]: {
+      type: "core",
+      storage: {
+        key: "passphraseGeneratorSettings",
+        target: "object",
+        format: "plain",
+        classifier: new PublicClassifier<PassphraseGenerationOptions>([
+          "numWords",
+          "wordSeparator",
+          "capitalize",
+          "includeNumber",
+        ]),
+        state: GENERATOR_DISK,
+        initial: {
+          numWords: 6,
+          wordSeparator: "-",
+          capitalize: false,
+          includeNumber: false,
+        },
+        options: {
+          deserializer(value) {
+            return value;
+          },
+          clearOn: ["logout"],
+        },
+      } satisfies ObjectKey<PassphraseGenerationOptions>,
+      constraints: {
+        type: PolicyType.PasswordGenerator,
+        default: {
+          wordSeparator: { maxLength: 1 },
+          numWords: {
+            min: 3,
+            max: 20,
+            recommendation: 6,
+          },
+        },
+        create(policies, context) {
+          const initial = {
+            minNumberWords: 0,
+            capitalize: false,
+            includeNumber: false,
+          };
+          const policy = policies.reduce(passphraseLeastPrivilege, initial);
+          const constraints = new PassphrasePolicyConstraints(policy, context.defaultConstraints);
+          return constraints;
+        },
+      },
+    },
+  },
+};
+
+export default passphrase;
diff --git a/libs/tools/generator/core/src/metadata/password/random-password.spec.ts b/libs/tools/generator/core/src/metadata/password/random-password.spec.ts
new file mode 100644
index 0000000000..d91ceaac24
--- /dev/null
+++ b/libs/tools/generator/core/src/metadata/password/random-password.spec.ts
@@ -0,0 +1,105 @@
+import { mock } from "jest-mock-extended";
+
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
+import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
+
+import { PasswordRandomizer } from "../../engine";
+import { DynamicPasswordPolicyConstraints } from "../../policies";
+import { PasswordGenerationOptions, GeneratorDependencyProvider } from "../../types";
+import { Profile } from "../data";
+import { CoreProfileMetadata } from "../profile-metadata";
+import { isCoreProfile } from "../util";
+
+import password from "./random-password";
+
+const dependencyProvider = mock<GeneratorDependencyProvider>();
+
+describe("password - characters generator metadata", () => {
+  describe("engine.create", () => {
+    it("returns an email randomizer", () => {
+      expect(password.engine.create(dependencyProvider)).toBeInstanceOf(PasswordRandomizer);
+    });
+  });
+
+  describe("profiles[account]", () => {
+    let accountProfile: CoreProfileMetadata<PasswordGenerationOptions> = null;
+    beforeEach(() => {
+      const profile = password.profiles[Profile.account];
+      if (isCoreProfile(profile)) {
+        accountProfile = profile;
+      }
+    });
+
+    describe("storage.options.deserializer", () => {
+      it("returns its input", () => {
+        const value: PasswordGenerationOptions = { ...accountProfile.storage.initial };
+
+        const result = accountProfile.storage.options.deserializer(value);
+
+        expect(result).toBe(value);
+      });
+    });
+
+    describe("constraints.create", () => {
+      // these tests check that the wiring is correct by exercising the behavior
+      // of functionality encapsulated by `create`. These methods may fail if the
+      // enclosed behaviors change.
+
+      it("creates a passphrase policy constraints", () => {
+        const context = { defaultConstraints: accountProfile.constraints.default };
+
+        const constraints = accountProfile.constraints.create([], context);
+
+        expect(constraints).toBeInstanceOf(DynamicPasswordPolicyConstraints);
+      });
+
+      it("forwards the policy to the constraints", () => {
+        const context = { defaultConstraints: accountProfile.constraints.default };
+        const policies = [
+          {
+            type: PolicyType.PasswordGenerator,
+            enabled: true,
+            data: {
+              minLength: 10,
+              capitalize: false,
+              useNumbers: false,
+            },
+          },
+        ] as Policy[];
+
+        const constraints = accountProfile.constraints.create(policies, context);
+
+        expect(constraints.constraints.length.min).toEqual(10);
+      });
+
+      it("combines multiple policies in the constraints", () => {
+        const context = { defaultConstraints: accountProfile.constraints.default };
+        const policies = [
+          {
+            type: PolicyType.PasswordGenerator,
+            enabled: true,
+            data: {
+              minLength: 14,
+              useSpecial: false,
+              useNumbers: false,
+            },
+          },
+          {
+            type: PolicyType.PasswordGenerator,
+            enabled: true,
+            data: {
+              minLength: 10,
+              useSpecial: true,
+              includeNumber: false,
+            },
+          },
+        ] as Policy[];
+
+        const constraints = accountProfile.constraints.create(policies, context);
+
+        expect(constraints.constraints.length.min).toEqual(14);
+        expect(constraints.constraints.special.requiredValue).toEqual(true);
+      });
+    });
+  });
+});
diff --git a/libs/tools/generator/core/src/metadata/password/random-password.ts b/libs/tools/generator/core/src/metadata/password/random-password.ts
new file mode 100644
index 0000000000..693236b096
--- /dev/null
+++ b/libs/tools/generator/core/src/metadata/password/random-password.ts
@@ -0,0 +1,117 @@
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
+import { GENERATOR_DISK } from "@bitwarden/common/platform/state";
+import { PublicClassifier } from "@bitwarden/common/tools/public-classifier";
+import { deepFreeze } from "@bitwarden/common/tools/util";
+
+import { PasswordRandomizer } from "../../engine";
+import { DynamicPasswordPolicyConstraints, passwordLeastPrivilege } from "../../policies";
+import {
+  CredentialGenerator,
+  GeneratorDependencyProvider,
+  PasswordGeneratorSettings,
+} from "../../types";
+import { Algorithm, Profile, Type } from "../data";
+import { GeneratorMetadata } from "../generator-metadata";
+
+const password: GeneratorMetadata<PasswordGeneratorSettings> = deepFreeze({
+  id: Algorithm.password,
+  category: Type.password,
+  weight: 100,
+  i18nKeys: {
+    name: "password",
+    generateCredential: "generatePassword",
+    credentialGenerated: "passwordGenerated",
+    credentialType: "password",
+    copyCredential: "copyPassword",
+    useCredential: "useThisPassword",
+  },
+  capabilities: {
+    autogenerate: true,
+    fields: [],
+  },
+  engine: {
+    create(
+      dependencies: GeneratorDependencyProvider,
+    ): CredentialGenerator<PasswordGeneratorSettings> {
+      return new PasswordRandomizer(dependencies.randomizer);
+    },
+  },
+  profiles: {
+    [Profile.account]: {
+      type: "core",
+      storage: {
+        key: "passwordGeneratorSettings",
+        target: "object",
+        format: "plain",
+        classifier: new PublicClassifier<PasswordGeneratorSettings>([
+          "length",
+          "ambiguous",
+          "uppercase",
+          "minUppercase",
+          "lowercase",
+          "minLowercase",
+          "number",
+          "minNumber",
+          "special",
+          "minSpecial",
+        ]),
+        state: GENERATOR_DISK,
+        initial: {
+          length: 14,
+          ambiguous: true,
+          uppercase: true,
+          minUppercase: 1,
+          lowercase: true,
+          minLowercase: 1,
+          number: true,
+          minNumber: 1,
+          special: false,
+          minSpecial: 0,
+        },
+        options: {
+          deserializer(value) {
+            return value;
+          },
+          clearOn: ["logout"],
+        },
+      },
+      constraints: {
+        type: PolicyType.PasswordGenerator,
+        default: {
+          length: {
+            min: 5,
+            max: 128,
+            recommendation: 14,
+          },
+          minNumber: {
+            min: 0,
+            max: 9,
+          },
+          minSpecial: {
+            min: 0,
+            max: 9,
+          },
+        },
+        create(policies, context) {
+          const initial = {
+            minLength: 0,
+            useUppercase: false,
+            useLowercase: false,
+            useNumbers: false,
+            numberCount: 0,
+            useSpecial: false,
+            specialCount: 0,
+          };
+          const policy = policies.reduce(passwordLeastPrivilege, initial);
+          const constraints = new DynamicPasswordPolicyConstraints(
+            policy,
+            context.defaultConstraints,
+          );
+          return constraints;
+        },
+      },
+    },
+  },
+});
+
+export default password;
diff --git a/libs/tools/generator/core/src/metadata/profile-metadata.ts b/libs/tools/generator/core/src/metadata/profile-metadata.ts
new file mode 100644
index 0000000000..4ac9139f63
--- /dev/null
+++ b/libs/tools/generator/core/src/metadata/profile-metadata.ts
@@ -0,0 +1,80 @@
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
+import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
+import { SiteId } from "@bitwarden/common/tools/extension";
+import { ObjectKey } from "@bitwarden/common/tools/state/object-key";
+import { Constraints } from "@bitwarden/common/tools/types";
+
+import { GeneratorConstraints } from "../types";
+
+export type ProfileContext<Options> = {
+  /** The email address for the current user;
+   *  `undefined` when no email is available.
+   */
+  email?: string;
+
+  /** Default application limits for the profile */
+  defaultConstraints: Constraints<Options>;
+};
+
+type ProfileConstraints<Options> = {
+  /** The key used to locate this profile's policies in the admin console.
+   *  When this type is undefined, no policy is defined for the profile.
+   */
+  type?: PolicyType;
+
+  /** default application limits for this profile; these are overridden
+   *  by the policy
+   */
+  default: Constraints<Options>;
+
+  /** Constructs generator constraints from a policy.
+   *  @param policies the administrative policy to apply to the provided constraints
+   *  When `type` is undefined then `policy` is `undefined` this is an empty array.
+   *  @param defaultConstraints application constraints; typically those defined in
+   *   the `default` member, above.
+   *  @returns the generator constraints to apply to this profile's options.
+   */
+  create: (policies: Policy[], context: ProfileContext<Options>) => GeneratorConstraints<Options>;
+};
+
+/** Generator profiles partition generator operations
+ *  according to where they're used within the password
+ *  manager. Core profiles store their data using the
+ *  generator's system storage.
+ */
+export type CoreProfileMetadata<Options> = {
+  /** distinguishes profile metadata types */
+  type: "core";
+
+  /** plaintext import buffer */
+  import?: ObjectKey<Options, Record<string, never>, Options> & { format: "plain" };
+
+  /** persistent storage location */
+  storage: ObjectKey<Options>;
+
+  /** policy enforced when saving the options */
+  constraints: ProfileConstraints<Options>;
+};
+
+/** Generator profiles partition generator operations
+ *  according to where they're used within the password
+ *  manager. Extension profiles store their data
+ *  using the extension system.
+ */
+export type ExtensionProfileMetadata<Options, Site extends SiteId> = {
+  /** distinguishes profile metadata types */
+  type: "extension";
+
+  /** The extension site described by this metadata */
+  site: Site;
+
+  constraints: ProfileConstraints<Options>;
+};
+
+/** Generator profiles partition generator operations
+ *  according to where they're used within the password
+ *  manager
+ */
+export type ProfileMetadata<Options> =
+  | CoreProfileMetadata<Options>
+  | ExtensionProfileMetadata<Options, "forwarder">;
diff --git a/libs/tools/generator/core/src/metadata/type.ts b/libs/tools/generator/core/src/metadata/type.ts
new file mode 100644
index 0000000000..924b92883e
--- /dev/null
+++ b/libs/tools/generator/core/src/metadata/type.ts
@@ -0,0 +1,28 @@
+import { VendorId } from "@bitwarden/common/tools/extension";
+
+import { AlgorithmsByType, Profile, Type } from "./data";
+
+/** categorizes credentials according to their use-case outside of Bitwarden */
+export type CredentialType = keyof typeof Type;
+
+/** categorizes credentials according to their expected use-case within Bitwarden */
+export type GeneratorProfile = keyof typeof Profile;
+
+/** A type of password that may be generated by the credential generator. */
+export type PasswordAlgorithm = (typeof AlgorithmsByType.password)[number];
+
+/** A type of username that may be generated by the credential generator. */
+export type UsernameAlgorithm = (typeof AlgorithmsByType.username)[number];
+
+/** A type of email address that may be generated by the credential generator. */
+export type EmailAlgorithm = (typeof AlgorithmsByType.email)[number] | ForwarderExtensionId;
+
+/** Identifies a forwarding service */
+export type ForwarderExtensionId = { forwarder: VendorId };
+
+/** A type of credential that can be generated by the credential generator. */
+// this is defined in terms of `AlgorithmsByType` to typecheck the keys of
+// `AlgorithmsByType` against the keys of `CredentialType`.
+export type CredentialAlgorithm =
+  | (typeof AlgorithmsByType)[CredentialType][number]
+  | ForwarderExtensionId;
diff --git a/libs/tools/generator/core/src/metadata/username/eff-word-list.spec.ts b/libs/tools/generator/core/src/metadata/username/eff-word-list.spec.ts
new file mode 100644
index 0000000000..aba9680a44
--- /dev/null
+++ b/libs/tools/generator/core/src/metadata/username/eff-word-list.spec.ts
@@ -0,0 +1,58 @@
+import { mock } from "jest-mock-extended";
+
+import { IdentityConstraint } from "@bitwarden/common/tools/state/identity-state-constraint";
+
+import { UsernameRandomizer } from "../../engine";
+import { EffUsernameGenerationOptions, GeneratorDependencyProvider } from "../../types";
+import { Profile } from "../data";
+import { CoreProfileMetadata } from "../profile-metadata";
+import { isCoreProfile } from "../util";
+
+import effWordList from "./eff-word-list";
+
+const dependencyProvider = mock<GeneratorDependencyProvider>();
+
+describe("username - eff words generator metadata", () => {
+  describe("engine.create", () => {
+    it("returns an email randomizer", () => {
+      expect(effWordList.engine.create(dependencyProvider)).toBeInstanceOf(UsernameRandomizer);
+    });
+  });
+
+  describe("profiles[account]", () => {
+    let accountProfile: CoreProfileMetadata<EffUsernameGenerationOptions> = null;
+    beforeEach(() => {
+      const profile = effWordList.profiles[Profile.account];
+      if (isCoreProfile(profile)) {
+        accountProfile = profile;
+      }
+    });
+
+    describe("storage.options.deserializer", () => {
+      it("returns its input", () => {
+        const value: EffUsernameGenerationOptions = {
+          wordCapitalize: true,
+          wordIncludeNumber: true,
+        };
+
+        const result = accountProfile.storage.options.deserializer(value);
+
+        expect(result).toBe(value);
+      });
+    });
+
+    describe("constraints.create", () => {
+      // these tests check that the wiring is correct by exercising the behavior
+      // of functionality encapsulated by `create`. These methods may fail if the
+      // enclosed behaviors change.
+
+      it("creates a effWordList constraints", () => {
+        const context = { defaultConstraints: {} };
+
+        const constraints = accountProfile.constraints.create([], context);
+
+        expect(constraints).toBeInstanceOf(IdentityConstraint);
+      });
+    });
+  });
+});
diff --git a/libs/tools/generator/core/src/metadata/username/eff-word-list.ts b/libs/tools/generator/core/src/metadata/username/eff-word-list.ts
new file mode 100644
index 0000000000..6373daf8ed
--- /dev/null
+++ b/libs/tools/generator/core/src/metadata/username/eff-word-list.ts
@@ -0,0 +1,70 @@
+import { GENERATOR_DISK } from "@bitwarden/common/platform/state";
+import { PublicClassifier } from "@bitwarden/common/tools/public-classifier";
+import { IdentityConstraint } from "@bitwarden/common/tools/state/identity-state-constraint";
+import { deepFreeze } from "@bitwarden/common/tools/util";
+
+import { UsernameRandomizer } from "../../engine";
+import {
+  CredentialGenerator,
+  EffUsernameGenerationOptions,
+  GeneratorDependencyProvider,
+} from "../../types";
+import { Algorithm, Profile, Type } from "../data";
+import { GeneratorMetadata } from "../generator-metadata";
+
+const effWordList: GeneratorMetadata<EffUsernameGenerationOptions> = deepFreeze({
+  id: Algorithm.username,
+  category: Type.username,
+  weight: 400,
+  i18nKeys: {
+    name: "randomWord",
+    credentialType: "username",
+    generateCredential: "generateUsername",
+    credentialGenerated: "usernameGenerated",
+    copyCredential: "copyUsername",
+    useCredential: "useThisUsername",
+  },
+  capabilities: {
+    autogenerate: true,
+    fields: [],
+  },
+  engine: {
+    create(
+      dependencies: GeneratorDependencyProvider,
+    ): CredentialGenerator<EffUsernameGenerationOptions> {
+      return new UsernameRandomizer(dependencies.randomizer);
+    },
+  },
+  profiles: {
+    [Profile.account]: {
+      type: "core",
+      storage: {
+        key: "effUsernameGeneratorSettings",
+        target: "object",
+        format: "plain",
+        classifier: new PublicClassifier<EffUsernameGenerationOptions>([
+          "wordCapitalize",
+          "wordIncludeNumber",
+        ]),
+        state: GENERATOR_DISK,
+        initial: {
+          wordCapitalize: false,
+          wordIncludeNumber: false,
+          website: null,
+        },
+        options: {
+          deserializer: (value) => value,
+          clearOn: ["logout"],
+        },
+      },
+      constraints: {
+        default: {},
+        create(_policies, _context) {
+          return new IdentityConstraint<EffUsernameGenerationOptions>();
+        },
+      },
+    },
+  },
+});
+
+export default effWordList;
diff --git a/libs/tools/generator/core/src/metadata/util.spec.ts b/libs/tools/generator/core/src/metadata/util.spec.ts
new file mode 100644
index 0000000000..2283699140
--- /dev/null
+++ b/libs/tools/generator/core/src/metadata/util.spec.ts
@@ -0,0 +1,218 @@
+import { VendorId } from "@bitwarden/common/tools/extension";
+
+import { Algorithm, AlgorithmsByType } from "./data";
+import { ProfileMetadata } from "./profile-metadata";
+import {
+  isPasswordAlgorithm,
+  isUsernameAlgorithm,
+  isForwarderExtensionId,
+  isEmailAlgorithm,
+  isSameAlgorithm,
+  isCoreProfile,
+  isForwarderProfile,
+} from "./util";
+
+describe("credential generator metadata utility functions", () => {
+  describe("isPasswordAlgorithm", () => {
+    it("returns `true` when the algorithm is a password algorithm", () => {
+      for (const algorithm of AlgorithmsByType.password) {
+        expect(isPasswordAlgorithm(algorithm)).toBe(true);
+      }
+    });
+
+    it("returns `false` when the algorithm is an email algorithm", () => {
+      for (const algorithm of AlgorithmsByType.email) {
+        expect(isPasswordAlgorithm(algorithm)).toBe(false);
+      }
+    });
+
+    it("returns `false` when the algorithm is a username algorithm", () => {
+      for (const algorithm of AlgorithmsByType.username) {
+        expect(isPasswordAlgorithm(algorithm)).toBe(false);
+      }
+    });
+
+    it("returns `false` when the algorithm is a forwarder extension", () => {
+      expect(isPasswordAlgorithm({ forwarder: "bitwarden" as VendorId })).toBe(false);
+    });
+  });
+
+  describe("isUsernameAlgorithm", () => {
+    it("returns `false` when the algorithm is a password algorithm", () => {
+      for (const algorithm of AlgorithmsByType.password) {
+        expect(isUsernameAlgorithm(algorithm)).toBe(false);
+      }
+    });
+
+    it("returns `false` when the algorithm is an email algorithm", () => {
+      for (const algorithm of AlgorithmsByType.email) {
+        expect(isUsernameAlgorithm(algorithm)).toBe(false);
+      }
+    });
+
+    it("returns `true` when the algorithm is a username algorithm", () => {
+      for (const algorithm of AlgorithmsByType.username) {
+        expect(isUsernameAlgorithm(algorithm)).toBe(true);
+      }
+    });
+
+    it("returns `false` when the algorithm is a forwarder extension", () => {
+      expect(isUsernameAlgorithm({ forwarder: "bitwarden" as VendorId })).toBe(false);
+    });
+  });
+
+  describe("isForwarderExtensionId", () => {
+    it("returns `false` when the algorithm is a password algorithm", () => {
+      for (const algorithm of AlgorithmsByType.password) {
+        expect(isForwarderExtensionId(algorithm)).toBe(false);
+      }
+    });
+
+    it("returns `false` when the algorithm is an email algorithm", () => {
+      for (const algorithm of AlgorithmsByType.email) {
+        expect(isForwarderExtensionId(algorithm)).toBe(false);
+      }
+    });
+
+    it("returns `false` when the algorithm is a username algorithm", () => {
+      for (const algorithm of AlgorithmsByType.username) {
+        expect(isForwarderExtensionId(algorithm)).toBe(false);
+      }
+    });
+
+    it("returns `true` when the algorithm is a forwarder extension", () => {
+      expect(isForwarderExtensionId({ forwarder: "bitwarden" as VendorId })).toBe(true);
+    });
+  });
+
+  describe("isEmailAlgorithm", () => {
+    it("returns `false` when the algorithm is a password algorithm", () => {
+      for (const algorithm of AlgorithmsByType.password) {
+        expect(isEmailAlgorithm(algorithm)).toBe(false);
+      }
+    });
+
+    it("returns `true` when the algorithm is an email algorithm", () => {
+      for (const algorithm of AlgorithmsByType.email) {
+        expect(isEmailAlgorithm(algorithm)).toBe(true);
+      }
+    });
+
+    it("returns `false` when the algorithm is a username algorithm", () => {
+      for (const algorithm of AlgorithmsByType.username) {
+        expect(isEmailAlgorithm(algorithm)).toBe(false);
+      }
+    });
+
+    it("returns `true` when the algorithm is a forwarder extension", () => {
+      expect(isEmailAlgorithm({ forwarder: "bitwarden" as VendorId })).toBe(true);
+    });
+  });
+
+  describe("isSameAlgorithm", () => {
+    it("returns `true` when the algorithms are equal", () => {
+      // identical object
+      expect(isSameAlgorithm(Algorithm.catchall, Algorithm.catchall)).toBe(true);
+
+      // equal object
+      expect(isSameAlgorithm(Algorithm.catchall, `${Algorithm.catchall}`)).toBe(true);
+    });
+
+    it("returns `false` when the algorithms are different", () => {
+      // not an exhaustive list
+      expect(isSameAlgorithm(Algorithm.catchall, Algorithm.passphrase)).toBe(false);
+      expect(isSameAlgorithm(Algorithm.passphrase, Algorithm.password)).toBe(false);
+      expect(isSameAlgorithm(Algorithm.password, Algorithm.plusAddress)).toBe(false);
+      expect(isSameAlgorithm(Algorithm.plusAddress, Algorithm.username)).toBe(false);
+      expect(isSameAlgorithm(Algorithm.username, Algorithm.passphrase)).toBe(false);
+    });
+
+    it("returns `true` when the algorithms refer to a forwarder with a matching vendor", () => {
+      const someVendor = { forwarder: "bitwarden" as VendorId };
+      const sameVendor = { forwarder: "bitwarden" as VendorId };
+      expect(isSameAlgorithm(someVendor, sameVendor)).toBe(true);
+    });
+
+    it("returns `false` when the algorithms refer to a forwarder with a different vendor", () => {
+      const someVendor = { forwarder: "bitwarden" as VendorId };
+      const sameVendor = { forwarder: "bytewarden" as VendorId };
+      expect(isSameAlgorithm(someVendor, sameVendor)).toBe(false);
+    });
+
+    it("returns `false` when the algorithms refer to a forwarder and a core algorithm", () => {
+      const someVendor = { forwarder: "bitwarden" as VendorId };
+      // not an exhaustive list
+      expect(isSameAlgorithm(someVendor, Algorithm.plusAddress)).toBe(false);
+      expect(isSameAlgorithm(Algorithm.username, someVendor)).toBe(false);
+    });
+  });
+
+  describe("isCoreProfile", () => {
+    it("returns `true` when the profile's type is `core`", () => {
+      const profile: ProfileMetadata<object> = {
+        type: "core",
+        storage: null,
+        constraints: {
+          default: {},
+          create: () => null,
+        },
+      };
+
+      expect(isCoreProfile(profile)).toBe(true);
+    });
+
+    it("returns `false` when the profile's type is `extension`", () => {
+      const profile: ProfileMetadata<object> = {
+        type: "extension",
+        site: "forwarder",
+        constraints: {
+          default: {},
+          create: () => null,
+        },
+      };
+
+      expect(isCoreProfile(profile)).toBe(false);
+    });
+  });
+
+  describe("isForwarderProfile", () => {
+    it("returns `false` when the profile's type is `core`", () => {
+      const profile: ProfileMetadata<object> = {
+        type: "core",
+        storage: null,
+        constraints: {
+          default: {},
+          create: () => null,
+        },
+      };
+
+      expect(isForwarderProfile(profile)).toBe(false);
+    });
+
+    it("returns `true` when the profile's type is `extension` and the site is `forwarder`", () => {
+      const profile: ProfileMetadata<object> = {
+        type: "extension",
+        site: "forwarder",
+        constraints: {
+          default: {},
+          create: () => null,
+        },
+      };
+
+      expect(isForwarderProfile(profile)).toBe(true);
+    });
+
+    it("returns `false` when the profile's type is `extension` and the site is not `forwarder`", () => {
+      const profile: ProfileMetadata<object> = {
+        type: "extension",
+        site: "not-a-forwarder" as any,
+        constraints: {
+          default: {},
+          create: () => null,
+        },
+      };
+
+      expect(isForwarderProfile(profile)).toBe(false);
+    });
+  });
+});
diff --git a/libs/tools/generator/core/src/metadata/util.ts b/libs/tools/generator/core/src/metadata/util.ts
new file mode 100644
index 0000000000..e85061720a
--- /dev/null
+++ b/libs/tools/generator/core/src/metadata/util.ts
@@ -0,0 +1,60 @@
+import { AlgorithmsByType } from "./data";
+import { CoreProfileMetadata, ExtensionProfileMetadata, ProfileMetadata } from "./profile-metadata";
+import {
+  CredentialAlgorithm,
+  EmailAlgorithm,
+  ForwarderExtensionId,
+  PasswordAlgorithm,
+  UsernameAlgorithm,
+} from "./type";
+
+/** Returns true when the input algorithm is a password algorithm. */
+export function isPasswordAlgorithm(
+  algorithm: CredentialAlgorithm,
+): algorithm is PasswordAlgorithm {
+  return AlgorithmsByType.password.includes(algorithm as any);
+}
+
+/** Returns true when the input algorithm is a username algorithm. */
+export function isUsernameAlgorithm(
+  algorithm: CredentialAlgorithm,
+): algorithm is UsernameAlgorithm {
+  return AlgorithmsByType.username.includes(algorithm as any);
+}
+
+/** Returns true when the input algorithm is a forwarder integration. */
+export function isForwarderExtensionId(
+  algorithm: CredentialAlgorithm,
+): algorithm is ForwarderExtensionId {
+  return algorithm && typeof algorithm === "object" && "forwarder" in algorithm;
+}
+
+/** Returns true when the input algorithm is an email algorithm. */
+export function isEmailAlgorithm(algorithm: CredentialAlgorithm): algorithm is EmailAlgorithm {
+  return AlgorithmsByType.email.includes(algorithm as any) || isForwarderExtensionId(algorithm);
+}
+
+/** Returns true when the algorithms are the same. */
+export function isSameAlgorithm(lhs: CredentialAlgorithm, rhs: CredentialAlgorithm) {
+  if (lhs === rhs) {
+    return true;
+  } else if (isForwarderExtensionId(lhs) && isForwarderExtensionId(rhs)) {
+    return lhs.forwarder === rhs.forwarder;
+  } else {
+    return false;
+  }
+}
+
+/** Returns true when the input describes a core profile. */
+export function isCoreProfile<Options>(
+  value: ProfileMetadata<Options>,
+): value is CoreProfileMetadata<Options> {
+  return value.type === "core";
+}
+
+/** Returns true when the input describes a forwarder extension profile. */
+export function isForwarderProfile<Options>(
+  value: ProfileMetadata<Options>,
+): value is ExtensionProfileMetadata<Options, "forwarder"> {
+  return value.type === "extension" && value.site === "forwarder";
+}
diff --git a/libs/tools/generator/core/src/policies/catchall-constraints.ts b/libs/tools/generator/core/src/policies/catchall-constraints.ts
index 47476a304a..7793180988 100644
--- a/libs/tools/generator/core/src/policies/catchall-constraints.ts
+++ b/libs/tools/generator/core/src/policies/catchall-constraints.ts
@@ -24,7 +24,7 @@ export class CatchallConstraints implements StateConstraints<CatchallGenerationO
       this.domain = parsed.groups.domain;
     }
   }
-  private domain: string;
+  readonly domain: string;
 
   constraints: Readonly<Constraints<CatchallGenerationOptions>> = {};
 
diff --git a/libs/tools/generator/core/src/types/password-generation-options.ts b/libs/tools/generator/core/src/types/password-generation-options.ts
index 76e8827d4d..7a8a538c40 100644
--- a/libs/tools/generator/core/src/types/password-generation-options.ts
+++ b/libs/tools/generator/core/src/types/password-generation-options.ts
@@ -2,58 +2,58 @@
  */
 export type PasswordGeneratorSettings = {
   /** The length of the password selected by the user */
-  length: number;
+  length?: number;
 
   /** `true` when ambiguous characters may be included in the output.
    *  `false` when ambiguous characters should not be included in the output.
    */
-  ambiguous: boolean;
+  ambiguous?: boolean;
 
   /** `true` when uppercase ASCII characters should be included in the output
    * This value defaults to `false.
    */
-  uppercase: boolean;
+  uppercase?: boolean;
 
   /** The minimum number of uppercase characters to include in the output.
    *  The value is ignored when `uppercase` is `false`.
    *  The value defaults to 1 when `uppercase` is `true`.
    */
-  minUppercase: number;
+  minUppercase?: number;
 
   /** `true` when lowercase ASCII characters should be included in the output.
    * This value defaults to `false`.
    */
-  lowercase: boolean;
+  lowercase?: boolean;
 
   /** The minimum number of lowercase characters to include in the output.
    * The value defaults to 1 when `lowercase` is `true`.
    * The value defaults to 0 when `lowercase` is `false`.
    */
-  minLowercase: number;
+  minLowercase?: number;
 
   /** Whether or not to include ASCII digits in the output
    * This value defaults to `true` when `minNumber` is at least 1.
    * This value defaults to `false` when `minNumber` is less than 1.
    */
-  number: boolean;
+  number?: boolean;
 
   /** The minimum number of digits to include in the output.
    * The value defaults to 1 when `number` is `true`.
    * The value defaults to 0 when `number` is `false`.
    */
-  minNumber: number;
+  minNumber?: number;
 
   /** Whether or not to include special characters in the output.
    * This value defaults to `true` when `minSpecial` is at least 1.
    * This value defaults to `false` when `minSpecial` is less than 1.
    */
-  special: boolean;
+  special?: boolean;
 
   /** The minimum number of special characters to include in the output.
    * This value defaults to 1 when `special` is `true`.
    * This value defaults to 0 when `special` is `false`.
    */
-  minSpecial: number;
+  minSpecial?: number;
 };
 
 /** Request format for password credential generation.
diff --git a/libs/tools/generator/core/src/util.ts b/libs/tools/generator/core/src/util.ts
index 98c2e8ab28..4b6041ffeb 100644
--- a/libs/tools/generator/core/src/util.ts
+++ b/libs/tools/generator/core/src/util.ts
@@ -107,7 +107,7 @@ export function optionsToRandomAsciiRequest(options: PasswordGenerationOptions)
       DefaultPasswordGenerationOptions.special,
       DefaultPasswordGenerationOptions.minSpecial,
     ),
-    ambiguous: options.ambiguous ?? DefaultPasswordGenerationOptions.ambiguous,
+    ambiguous: options.ambiguous ?? DefaultPasswordGenerationOptions.ambiguous!,
     all: 0,
   };
 

From 0fce8e2726e5b5665b573c45cb5219ab9c55131a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 16 Jan 2025 16:05:44 +0100
Subject: [PATCH 122/150] [deps] SM: Update eslint-plugin-storybook to v0.11.2
 (#11322)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Oscar Hinton <Hinton@users.noreply.github.com>
---
 package-lock.json | 282 ++++++++++------------------------------------
 package.json      |   2 +-
 2 files changed, 62 insertions(+), 222 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4b30fedbd0..bf724bae69 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -146,7 +146,7 @@
         "eslint-plugin-import": "2.29.1",
         "eslint-plugin-rxjs": "5.0.3",
         "eslint-plugin-rxjs-angular": "2.0.1",
-        "eslint-plugin-storybook": "0.8.0",
+        "eslint-plugin-storybook": "0.11.2",
         "eslint-plugin-tailwindcss": "3.17.5",
         "html-loader": "5.1.0",
         "html-webpack-injector": "1.1.4",
@@ -10210,19 +10210,6 @@
         "typescript": ">=4.8.4 <5.8.0"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ts-api-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.0.tgz",
-      "integrity": "sha512-xCt/TOAc+EOHS1XPnijD3/yzpH6qg2xppZO1YDqGoVsNXfQfzHpOdNuXwrwOU8u4ITXJyDCTyt8w5g1sZv9ynQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18.12"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4"
-      }
-    },
     "node_modules/@typescript-eslint/experimental-utils": {
       "version": "5.62.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.62.0.tgz",
@@ -10456,56 +10443,42 @@
         "typescript": ">=4.8.4 <5.8.0"
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/ts-api-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.0.tgz",
-      "integrity": "sha512-xCt/TOAc+EOHS1XPnijD3/yzpH6qg2xppZO1YDqGoVsNXfQfzHpOdNuXwrwOU8u4ITXJyDCTyt8w5g1sZv9ynQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18.12"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4"
-      }
-    },
     "node_modules/@typescript-eslint/utils": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.11.0.tgz",
-      "integrity": "sha512-xlAWwPleNRHwF37AhrZurOxA1wyXowW4PqVXZVUNCLjB48CqdPJoJWkrpH2nij9Q3Lb7rtWindtoXwxjxlKKCA==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.20.0.tgz",
+      "integrity": "sha512-dq70RUw6UK9ei7vxc4KQtBRk7qkHZv447OUZ6RPQMQl71I3NZxQJX/f32Smr+iqWrB02pHKn2yAdHBb0KNrRMA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.11.0",
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/typescript-estree": "7.11.0"
+        "@typescript-eslint/scope-manager": "8.20.0",
+        "@typescript-eslint/types": "8.20.0",
+        "@typescript-eslint/typescript-estree": "8.20.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.56.0"
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
       }
     },
     "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.11.0.tgz",
-      "integrity": "sha512-27tGdVEiutD4POirLZX4YzT180vevUURJl4wJGmm6TrQoiYwuxTIY98PBp6L2oN+JQxzE0URvYlzJaBHIekXAw==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.20.0.tgz",
+      "integrity": "sha512-J7+VkpeGzhOt3FeG1+SzhiMj9NzGD/M6KoGn9f4dbz3YzK9hvbhVTmLj/HiTp9DazIzJ8B4XcM80LrR9Dm1rJw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/visitor-keys": "7.11.0"
+        "@typescript-eslint/types": "8.20.0",
+        "@typescript-eslint/visitor-keys": "8.20.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
@@ -10513,14 +10486,13 @@
       }
     },
     "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.11.0.tgz",
-      "integrity": "sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.20.0.tgz",
+      "integrity": "sha512-cqaMiY72CkP+2xZRrFt3ExRBu0WmVitN/rYPZErA80mHjHx/Svgp8yfbzkJmDoQ/whcytOPO9/IZXnOc+wigRA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
@@ -10528,54 +10500,63 @@
       }
     },
     "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.11.0.tgz",
-      "integrity": "sha512-cxkhZ2C/iyi3/6U9EPc5y+a6csqHItndvN/CzbNXTNrsC3/ASoYQZEt9uMaEp+xFNjasqQyszp5TumAVKKvJeQ==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.20.0.tgz",
+      "integrity": "sha512-Y7ncuy78bJqHI35NwzWol8E0X7XkRVS4K4P4TCyzWkOJih5NDvtoRDW4Ba9YJJoB2igm9yXDdYI/+fkiiAxPzA==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "peer": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/visitor-keys": "7.11.0",
+        "@typescript-eslint/types": "8.20.0",
+        "@typescript-eslint/visitor-keys": "8.20.0",
         "debug": "^4.3.4",
-        "globby": "^11.1.0",
+        "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
         "minimatch": "^9.0.4",
         "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
+        "ts-api-utils": "^2.0.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.8.0"
       }
     },
     "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.11.0.tgz",
-      "integrity": "sha512-7syYk4MzjxTEk0g/w3iqtgxnFQspDJfn6QKD36xMuuhTzjcxY7F8EmBLnALjVyaOF1/bVocu3bS/2/F7rXrveQ==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.20.0.tgz",
+      "integrity": "sha512-v/BpkeeYAsPkKCkR8BDwcno0llhzWVqPOamQrAEMdpZav2Y9OVjd9dwJyBLJWwf335B5DmlifECIkZRJCaGaHA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "eslint-visitor-keys": "^3.4.3"
+        "@typescript-eslint/types": "8.20.0",
+        "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/utils/node_modules/eslint-visitor-keys": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
     "node_modules/@typescript-eslint/visitor-keys": {
       "version": "8.19.1",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.19.1.tgz",
@@ -16382,161 +16363,21 @@
       }
     },
     "node_modules/eslint-plugin-storybook": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-storybook/-/eslint-plugin-storybook-0.8.0.tgz",
-      "integrity": "sha512-CZeVO5EzmPY7qghO2t64oaFM+8FTaD4uzOEjHKp516exyTKo+skKAL9GI3QALS2BXhyALJjNtwbmr1XinGE8bA==",
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-storybook/-/eslint-plugin-storybook-0.11.2.tgz",
+      "integrity": "sha512-0Z4DUklJrC+GHjCRXa7PYfPzWC15DaVnwaOYenpgXiCEijXPZkLKCms+rHhtoRcWccP7Z8DpOOaP1gc3P9oOwg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@storybook/csf": "^0.0.1",
-        "@typescript-eslint/utils": "^5.62.0",
-        "requireindex": "^1.2.0",
+        "@storybook/csf": "^0.1.11",
+        "@typescript-eslint/utils": "^8.8.1",
         "ts-dedent": "^2.2.0"
       },
       "engines": {
         "node": ">= 18"
       },
       "peerDependencies": {
-        "eslint": ">=6"
-      }
-    },
-    "node_modules/eslint-plugin-storybook/node_modules/@storybook/csf": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.0.1.tgz",
-      "integrity": "sha512-USTLkZze5gkel8MYCujSRBVIrUQ3YPBrLOx7GNk/0wttvVtlzWXAq9eLbQ4p/NicGxP+3T7KPEMVV//g+yubpw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "lodash": "^4.17.15"
-      }
-    },
-    "node_modules/eslint-plugin-storybook/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"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/eslint-plugin-storybook/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"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/eslint-plugin-storybook/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",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-plugin-storybook/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",
-        "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.62.0",
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/typescript-estree": "5.62.0",
-        "eslint-scope": "^5.1.1",
-        "semver": "^7.3.7"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-storybook/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"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/eslint-plugin-storybook/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"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-storybook/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"
+        "eslint": ">=8"
       }
     },
     "node_modules/eslint-plugin-tailwindcss": {
@@ -30908,17 +30749,16 @@
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.0.tgz",
-      "integrity": "sha512-032cPxaEKwM+GT3vA5JXNzIaizx388rhsSW79vGRNGXfRRAdEAn2mvk36PvK5HnOchyWZ7afLEXqYCvPCrzuzQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.0.tgz",
+      "integrity": "sha512-xCt/TOAc+EOHS1XPnijD3/yzpH6qg2xppZO1YDqGoVsNXfQfzHpOdNuXwrwOU8u4ITXJyDCTyt8w5g1sZv9ynQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
-        "node": ">=16"
+        "node": ">=18.12"
       },
       "peerDependencies": {
-        "typescript": ">=4.2.0"
+        "typescript": ">=4.8.4"
       }
     },
     "node_modules/ts-dedent": {
diff --git a/package.json b/package.json
index 5d7c2ace64..c4248bcdba 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-rxjs": "5.0.3",
     "eslint-plugin-rxjs-angular": "2.0.1",
-    "eslint-plugin-storybook": "0.8.0",
+    "eslint-plugin-storybook": "0.11.2",
     "eslint-plugin-tailwindcss": "3.17.5",
     "html-loader": "5.1.0",
     "html-webpack-injector": "1.1.4",

From 918c68a9f643fdf4e031620431190b21448d973d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 16 Jan 2025 16:08:22 +0100
Subject: [PATCH 123/150] [deps] SM: Update eslint-plugin-import to v2.31.0
 (#11066)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Oscar Hinton <Hinton@users.noreply.github.com>
---
 package-lock.json | 35 ++++++++++++++++++++++-------------
 package.json      |  2 +-
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bf724bae69..9f1acd6b67 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -143,7 +143,7 @@
         "eslint": "8.57.1",
         "eslint-config-prettier": "9.1.0",
         "eslint-import-resolver-typescript": "3.6.1",
-        "eslint-plugin-import": "2.29.1",
+        "eslint-plugin-import": "2.31.0",
         "eslint-plugin-rxjs": "5.0.3",
         "eslint-plugin-rxjs-angular": "2.0.1",
         "eslint-plugin-storybook": "0.11.2",
@@ -7990,6 +7990,13 @@
         "darwin"
       ]
     },
+    "node_modules/@rtsao/scc": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
+      "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@schematics/angular": {
       "version": "18.2.12",
       "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.2.12.tgz",
@@ -16234,35 +16241,37 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.29.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz",
-      "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==",
+      "version": "2.31.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz",
+      "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "array-includes": "^3.1.7",
-        "array.prototype.findlastindex": "^1.2.3",
+        "@rtsao/scc": "^1.1.0",
+        "array-includes": "^3.1.8",
+        "array.prototype.findlastindex": "^1.2.5",
         "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.9",
-        "eslint-module-utils": "^2.8.0",
-        "hasown": "^2.0.0",
-        "is-core-module": "^2.13.1",
+        "eslint-module-utils": "^2.12.0",
+        "hasown": "^2.0.2",
+        "is-core-module": "^2.15.1",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
-        "object.fromentries": "^2.0.7",
-        "object.groupby": "^1.0.1",
-        "object.values": "^1.1.7",
+        "object.fromentries": "^2.0.8",
+        "object.groupby": "^1.0.3",
+        "object.values": "^1.2.0",
         "semver": "^6.3.1",
+        "string.prototype.trimend": "^1.0.8",
         "tsconfig-paths": "^3.15.0"
       },
       "engines": {
         "node": ">=4"
       },
       "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
       }
     },
     "node_modules/eslint-plugin-import/node_modules/brace-expansion": {
diff --git a/package.json b/package.json
index c4248bcdba..2cd4d7b470 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "eslint": "8.57.1",
     "eslint-config-prettier": "9.1.0",
     "eslint-import-resolver-typescript": "3.6.1",
-    "eslint-plugin-import": "2.29.1",
+    "eslint-plugin-import": "2.31.0",
     "eslint-plugin-rxjs": "5.0.3",
     "eslint-plugin-rxjs-angular": "2.0.1",
     "eslint-plugin-storybook": "0.11.2",

From 9a6f00ef119c92c10d6c6488b7ef5bc1db84cf51 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 16 Jan 2025 16:24:46 +0100
Subject: [PATCH 124/150] [deps] SM: Update eslint-import-resolver-typescript
 to v3.7.0 (#10845)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package-lock.json | 175 ++++++++++++++--------------------------------
 package.json      |   2 +-
 2 files changed, 53 insertions(+), 124 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9f1acd6b67..604de46900 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -142,7 +142,7 @@
         "electron-updater": "6.3.9",
         "eslint": "8.57.1",
         "eslint-config-prettier": "9.1.0",
-        "eslint-import-resolver-typescript": "3.6.1",
+        "eslint-import-resolver-typescript": "3.7.0",
         "eslint-plugin-import": "2.31.0",
         "eslint-plugin-rxjs": "5.0.3",
         "eslint-plugin-rxjs-angular": "2.0.1",
@@ -950,18 +950,6 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/webpack": {
       "version": "5.94.0",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
@@ -1324,18 +1312,6 @@
         "node": ">= 4"
       }
     },
-    "node_modules/@angular-eslint/schematics/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@angular-eslint/template-parser": {
       "version": "18.4.3",
       "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-18.4.3.tgz",
@@ -1853,18 +1829,6 @@
         "node": ">=14.0.0"
       }
     },
-    "node_modules/@angular/build/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@angular/build/node_modules/slice-ansi": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
@@ -2060,18 +2024,6 @@
         "node": ">=18.0.0"
       }
     },
-    "node_modules/@angular/cli/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@angular/cli/node_modules/slice-ansi": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
@@ -5042,19 +4994,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@compodoc/compodoc/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@compodoc/compodoc/node_modules/uuid": {
       "version": "10.0.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
@@ -7499,6 +7438,16 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@nolyfill/is-core-module": {
+      "version": "1.0.39",
+      "resolved": "https://registry.npmjs.org/@nolyfill/is-core-module/-/is-core-module-1.0.39.tgz",
+      "integrity": "sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.4.0"
+      }
+    },
     "node_modules/@npmcli/agent": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz",
@@ -8864,19 +8813,6 @@
         "storybook": "^8.4.7"
       }
     },
-    "node_modules/@storybook/core/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@storybook/csf": {
       "version": "0.1.11",
       "resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.1.11.tgz",
@@ -15610,19 +15546,6 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/electron-updater/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/electron/node_modules/@types/node": {
       "version": "20.17.12",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.12.tgz",
@@ -16187,19 +16110,20 @@
       }
     },
     "node_modules/eslint-import-resolver-typescript": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.1.tgz",
-      "integrity": "sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg==",
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.7.0.tgz",
+      "integrity": "sha512-Vrwyi8HHxY97K5ebydMtffsWAn1SCR9eol49eCd5fJS4O1WV7PaAjbcjmbfJJSMz/t4Mal212Uz/fQZrOB8mow==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "debug": "^4.3.4",
-        "enhanced-resolve": "^5.12.0",
-        "eslint-module-utils": "^2.7.4",
-        "fast-glob": "^3.3.1",
-        "get-tsconfig": "^4.5.0",
-        "is-core-module": "^2.11.0",
-        "is-glob": "^4.0.3"
+        "@nolyfill/is-core-module": "1.0.39",
+        "debug": "^4.3.7",
+        "enhanced-resolve": "^5.15.0",
+        "fast-glob": "^3.3.2",
+        "get-tsconfig": "^4.7.5",
+        "is-bun-module": "^1.0.2",
+        "is-glob": "^4.0.3",
+        "stable-hash": "^0.0.4"
       },
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
@@ -16209,7 +16133,16 @@
       },
       "peerDependencies": {
         "eslint": "*",
-        "eslint-plugin-import": "*"
+        "eslint-plugin-import": "*",
+        "eslint-plugin-import-x": "*"
+      },
+      "peerDependenciesMeta": {
+        "eslint-plugin-import": {
+          "optional": true
+        },
+        "eslint-plugin-import-x": {
+          "optional": true
+        }
       }
     },
     "node_modules/eslint-module-utils": {
@@ -19354,6 +19287,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-bun-module": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/is-bun-module/-/is-bun-module-1.3.0.tgz",
+      "integrity": "sha512-DgXeu5UWI0IsMQundYb5UAOzm6G2eVnarJ0byP6Tm55iZNKceD59LNPA2L4VvsScTtHcw0yEkVwSf7PC+QoLSA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.6.3"
+      }
+    },
     "node_modules/is-callable": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
@@ -28852,13 +28795,10 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "license": "ISC",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -28874,24 +28814,6 @@
       "license": "MIT",
       "optional": true
     },
-    "node_modules/semver/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==",
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/semver/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "license": "ISC"
-    },
     "node_modules/send": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/send/-/send-1.1.0.tgz",
@@ -29613,6 +29535,13 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/stable-hash": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/stable-hash/-/stable-hash-0.0.4.tgz",
+      "integrity": "sha512-LjdcbuBeLcdETCrPn9i8AYAZ1eCtu4ECAWtP7UleOiZ9LzVxRzzUZEoZ8zB24nhkQnDWyET0I+3sWokSDS3E7g==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/stack-utils": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
diff --git a/package.json b/package.json
index 2cd4d7b470..2b2abb8d0b 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
     "electron-updater": "6.3.9",
     "eslint": "8.57.1",
     "eslint-config-prettier": "9.1.0",
-    "eslint-import-resolver-typescript": "3.6.1",
+    "eslint-import-resolver-typescript": "3.7.0",
     "eslint-plugin-import": "2.31.0",
     "eslint-plugin-rxjs": "5.0.3",
     "eslint-plugin-rxjs-angular": "2.0.1",

From 7c89c520987b3845896408d11122291ae11341a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa?=
 <dani-garcia@users.noreply.github.com>
Date: Thu, 16 Jan 2025 16:50:38 +0100
Subject: [PATCH 125/150] Dynamically load MacOS passkey (#12897)

---
 .../objc/src/native/autofill/commands/sync.m  | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/apps/desktop/desktop_native/objc/src/native/autofill/commands/sync.m b/apps/desktop/desktop_native/objc/src/native/autofill/commands/sync.m
index 8b73635a7c..fc13c04591 100644
--- a/apps/desktop/desktop_native/objc/src/native/autofill/commands/sync.m
+++ b/apps/desktop/desktop_native/objc/src/native/autofill/commands/sync.m
@@ -30,21 +30,24 @@ void runSync(void* context, NSDictionary *params) {
       [mappedCredentials addObject:credential];
     }
 
-    if ([type isEqualToString:@"fido2"]) {
-      NSString *cipherId = credential[@"cipherId"];
-      NSString *rpId = credential[@"rpId"];
-      NSString *userName = credential[@"userName"];
-      NSData *credentialId = decodeBase64URL(credential[@"credentialId"]);
-      NSData *userHandle = decodeBase64URL(credential[@"userHandle"]);
+    if (@available(macos 14, *)) {
+      if ([type isEqualToString:@"fido2"]) {
+        NSString *cipherId = credential[@"cipherId"];
+        NSString *rpId = credential[@"rpId"];
+        NSString *userName = credential[@"userName"];
+        NSData *credentialId = decodeBase64URL(credential[@"credentialId"]);
+        NSData *userHandle = decodeBase64URL(credential[@"userHandle"]);
 
-      ASPasskeyCredentialIdentity *credential = [[ASPasskeyCredentialIdentity alloc]
-        initWithRelyingPartyIdentifier:rpId
-        userName:userName
-        credentialID:credentialId
-        userHandle:userHandle
-        recordIdentifier:cipherId];
+        Class passkeyCredentialIdentityClass = NSClassFromString(@"ASPasskeyCredentialIdentity");
+        id credential = [[passkeyCredentialIdentityClass alloc]
+          initWithRelyingPartyIdentifier:rpId
+          userName:userName
+          credentialID:credentialId
+          userHandle:userHandle
+          recordIdentifier:cipherId];
 
-      [mappedCredentials addObject:credential];
+        [mappedCredentials addObject:credential];
+      }
     }
   }
 

From ca9bb52a899d1feda8ed8c6db3c62e4bc873fab4 Mon Sep 17 00:00:00 2001
From: Oscar Hinton <Hinton@users.noreply.github.com>
Date: Thu, 16 Jan 2025 17:12:26 +0100
Subject: [PATCH 126/150] Move linting dependencies to architecture (#12910)

---
 .github/renovate.json | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index 150ac1ac99..b5c43cc1d3 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -69,6 +69,29 @@
       "commitMessagePrefix": "[deps] Auth:",
       "reviewers": ["team:team-auth-dev"]
     },
+    {
+      "matchPackageNames": [
+        "@angular-eslint/eslint-plugin-template",
+        "@angular-eslint/eslint-plugin",
+        "@angular-eslint/schematics",
+        "@angular-eslint/template-parser",
+        "@typescript-eslint/eslint-plugin",
+        "@typescript-eslint/parser",
+        "eslint-config-prettier",
+        "eslint-import-resolver-typescript",
+        "eslint-plugin-import",
+        "eslint-plugin-rxjs-angular",
+        "eslint-plugin-rxjs",
+        "eslint-plugin-storybook",
+        "eslint-plugin-tailwindcss",
+        "eslint",
+        "husky",
+        "lint-staged"
+      ],
+      "description": "Architecture owned dependencies",
+      "commitMessagePrefix": "[deps] Architecture:",
+      "reviewers": ["team:dept-architecture"]
+    },
     {
       "matchPackageNames": [
         "@emotion/css",
@@ -190,28 +213,11 @@
     },
     {
       "matchPackageNames": [
-        "@angular-eslint/eslint-plugin",
-        "@angular-eslint/eslint-plugin-template",
-        "@angular-eslint/schematics",
-        "@angular-eslint/template-parser",
-        "@angular/elements",
         "@types/jest",
-        "@typescript-eslint/eslint-plugin",
-        "@typescript-eslint/parser",
-        "eslint",
-        "eslint-config-prettier",
-        "eslint-import-resolver-typescript",
-        "eslint-plugin-import",
-        "eslint-plugin-rxjs",
-        "eslint-plugin-rxjs-angular",
-        "eslint-plugin-storybook",
-        "eslint-plugin-tailwindcss",
-        "husky",
         "jest-junit",
         "jest-mock-extended",
         "jest-preset-angular",
         "jest-diff",
-        "lint-staged",
         "ts-jest"
       ],
       "description": "Secrets Manager owned dependencies",

From 97ee050e5dd9701cf9facbbf31fad160b6f066d2 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Thu, 16 Jan 2025 17:49:20 +0100
Subject: [PATCH 127/150] [PM-17113] Fix system authentication setup (#12907)

* Fix system authentication setup

* Fix biometric status

* Remove debug log

* Fix tests
---
 .../src/app/accounts/settings.component.ts     | 18 ++++++++++++++----
 .../biometrics/biometrics.service.spec.ts      | 10 +++++-----
 .../biometrics/main-biometrics.service.ts      |  4 ++--
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/apps/desktop/src/app/accounts/settings.component.ts b/apps/desktop/src/app/accounts/settings.component.ts
index f3440975cf..d35845fa6a 100644
--- a/apps/desktop/src/app/accounts/settings.component.ts
+++ b/apps/desktop/src/app/accounts/settings.component.ts
@@ -362,14 +362,24 @@ export class SettingsComponent implements OnInit, OnDestroy {
         }
       });
 
-    this.supportsBiometric =
-      (await this.biometricsService.getBiometricsStatus()) === BiometricsStatus.Available;
+    this.supportsBiometric = this.shouldAllowBiometricSetup(
+      await this.biometricsService.getBiometricsStatus(),
+    );
     this.timerId = setInterval(async () => {
-      this.supportsBiometric =
-        (await this.biometricsService.getBiometricsStatus()) === BiometricsStatus.Available;
+      this.supportsBiometric = this.shouldAllowBiometricSetup(
+        await this.biometricsService.getBiometricsStatus(),
+      );
     }, 1000);
   }
 
+  private shouldAllowBiometricSetup(biometricStatus: BiometricsStatus): boolean {
+    return [
+      BiometricsStatus.Available,
+      BiometricsStatus.AutoSetupNeeded,
+      BiometricsStatus.ManualSetupNeeded,
+    ].includes(biometricStatus);
+  }
+
   async saveVaultTimeout(newValue: VaultTimeout) {
     if (newValue === VaultTimeoutStringType.Never) {
       const confirmed = await this.dialogService.openSimpleDialog({
diff --git a/apps/desktop/src/key-management/biometrics/biometrics.service.spec.ts b/apps/desktop/src/key-management/biometrics/biometrics.service.spec.ts
index e69ebca363..9e5755dd57 100644
--- a/apps/desktop/src/key-management/biometrics/biometrics.service.spec.ts
+++ b/apps/desktop/src/key-management/biometrics/biometrics.service.spec.ts
@@ -117,15 +117,15 @@ describe("biometrics tests", function () {
       const testCases = [
         // happy path
         [true, false, false, BiometricsStatus.Available],
-        [false, true, true, BiometricsStatus.AutoSetupNeeded],
-        [false, true, false, BiometricsStatus.ManualSetupNeeded],
-        [false, false, false, BiometricsStatus.HardwareUnavailable],
+        [false, true, true, BiometricsStatus.HardwareUnavailable],
+        [true, true, true, BiometricsStatus.AutoSetupNeeded],
+        [true, true, false, BiometricsStatus.ManualSetupNeeded],
 
         // should not happen
         [false, false, true, BiometricsStatus.HardwareUnavailable],
-        [true, true, true, BiometricsStatus.Available],
-        [true, true, false, BiometricsStatus.Available],
         [true, false, true, BiometricsStatus.Available],
+        [false, true, false, BiometricsStatus.HardwareUnavailable],
+        [false, false, false, BiometricsStatus.HardwareUnavailable],
       ];
 
       for (const [supportsBiometric, needsSetup, canAutoSetup, expected] of testCases) {
diff --git a/apps/desktop/src/key-management/biometrics/main-biometrics.service.ts b/apps/desktop/src/key-management/biometrics/main-biometrics.service.ts
index 06956503a0..d0ba66fdad 100644
--- a/apps/desktop/src/key-management/biometrics/main-biometrics.service.ts
+++ b/apps/desktop/src/key-management/biometrics/main-biometrics.service.ts
@@ -60,6 +60,8 @@ export class MainBiometricsService extends DesktopBiometricsService {
    */
   async getBiometricsStatus(): Promise<BiometricsStatus> {
     if (!(await this.osBiometricsService.osSupportsBiometric())) {
+      return BiometricsStatus.HardwareUnavailable;
+    } else {
       if (await this.osBiometricsService.osBiometricsNeedsSetup()) {
         if (await this.osBiometricsService.osBiometricsCanAutoSetup()) {
           return BiometricsStatus.AutoSetupNeeded;
@@ -67,8 +69,6 @@ export class MainBiometricsService extends DesktopBiometricsService {
           return BiometricsStatus.ManualSetupNeeded;
         }
       }
-
-      return BiometricsStatus.HardwareUnavailable;
     }
     return BiometricsStatus.Available;
   }

From e815f89b9993d56d8c4c3f4f13cb96d0c5877bd8 Mon Sep 17 00:00:00 2001
From: Vijay Oommen <voommen@livefront.com>
Date: Thu, 16 Jan 2025 11:07:16 -0600
Subject: [PATCH 128/150] PM-17173 minor style changes (#12913)

---
 .../org-at-risk-members-dialog.component.html                 | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/org-at-risk-members-dialog.component.html b/bitwarden_license/bit-web/src/app/tools/access-intelligence/org-at-risk-members-dialog.component.html
index 41ac8af788..1f1de10366 100644
--- a/bitwarden_license/bit-web/src/app/tools/access-intelligence/org-at-risk-members-dialog.component.html
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/org-at-risk-members-dialog.component.html
@@ -4,9 +4,7 @@
   </ng-container>
   <ng-container bitDialogContent>
     <div class="tw-flex tw-flex-col tw-gap-2">
-      <span bitTypography="body2" class="tw-text-muted">{{
-        "atRiskMembersDescription" | i18n
-      }}</span>
+      <span bitTypography="body1">{{ "atRiskMembersDescription" | i18n }}</span>
       <div class="tw-flex tw-justify-between tw-mt-2 tw-text-muted">
         <div bitTypography="body2" class="tw-font-bold">{{ "email" | i18n }}</div>
         <div bitTypography="body2" class="tw-font-bold">{{ "atRiskPasswords" | i18n }}</div>

From 772196c6e32ea496d11518e8830338d559030650 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 16 Jan 2025 17:44:58 +0000
Subject: [PATCH 129/150] [deps] SM: Update typescript-eslint monorepo to
 v8.20.0 (#10583)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Oscar Hinton <Hinton@users.noreply.github.com>
---
 package-lock.json | 222 +++++++++++-----------------------------------
 package.json      |   4 +-
 2 files changed, 56 insertions(+), 170 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 604de46900..12a1468e3b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -121,8 +121,8 @@
         "@types/proper-lockfile": "4.1.4",
         "@types/retry": "0.12.5",
         "@types/zxcvbn": "4.4.5",
-        "@typescript-eslint/eslint-plugin": "8.19.1",
-        "@typescript-eslint/parser": "8.19.1",
+        "@typescript-eslint/eslint-plugin": "8.20.0",
+        "@typescript-eslint/parser": "8.20.0",
         "@webcomponents/custom-elements": "1.6.0",
         "@yao-pkg/pkg": "5.16.1",
         "autoprefixer": "10.4.20",
@@ -10076,17 +10076,17 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.19.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.19.1.tgz",
-      "integrity": "sha512-tJzcVyvvb9h/PB96g30MpxACd9IrunT7GF9wfA9/0TJ1LxGOJx1TdPzSbBBnNED7K9Ka8ybJsnEpiXPktolTLg==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.20.0.tgz",
+      "integrity": "sha512-naduuphVw5StFfqp4Gq4WhIBE2gN1GEmMUExpJYknZJdRnc+2gDzB8Z3+5+/Kv33hPQRDGzQO/0opHE72lZZ6A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.19.1",
-        "@typescript-eslint/type-utils": "8.19.1",
-        "@typescript-eslint/utils": "8.19.1",
-        "@typescript-eslint/visitor-keys": "8.19.1",
+        "@typescript-eslint/scope-manager": "8.20.0",
+        "@typescript-eslint/type-utils": "8.20.0",
+        "@typescript-eslint/utils": "8.20.0",
+        "@typescript-eslint/visitor-keys": "8.20.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
@@ -10105,54 +10105,6 @@
         "typescript": ">=4.8.4 <5.8.0"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils": {
-      "version": "8.19.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.19.1.tgz",
-      "integrity": "sha512-Rp7k9lhDKBMRJB/nM9Ksp1zs4796wVNyihG9/TU9R6KCJDNkQbc2EOKjrBtLYh3396ZdpXLtr/MkaSEmNMtykw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.19.1",
-        "@typescript-eslint/utils": "8.19.1",
-        "debug": "^4.3.4",
-        "ts-api-utils": "^2.0.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.8.0"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "8.19.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.19.1.tgz",
-      "integrity": "sha512-IxG5gLO0Ne+KaUc8iW1A+XuKLd63o4wlbI1Zp692n1xojCl/THvgIKXJXBZixTh5dd5+yTJ/VXH7GJaaw21qXA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.19.1",
-        "@typescript-eslint/types": "8.19.1",
-        "@typescript-eslint/typescript-estree": "8.19.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.8.0"
-      }
-    },
     "node_modules/@typescript-eslint/experimental-utils": {
       "version": "5.62.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.62.0.tgz",
@@ -10303,16 +10255,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.19.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.19.1.tgz",
-      "integrity": "sha512-67gbfv8rAwawjYx3fYArwldTQKoYfezNUT4D5ioWetr/xCrxXxvleo3uuiFuKfejipvq+og7mjz3b0G2bVyUCw==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.20.0.tgz",
+      "integrity": "sha512-gKXG7A5HMyjDIedBi6bUrDcun8GIjnI8qOwVLiY3rx6T/sHP/19XLJOnIq/FgQvWLHja5JN/LSE7eklNBr612g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.19.1",
-        "@typescript-eslint/types": "8.19.1",
-        "@typescript-eslint/typescript-estree": "8.19.1",
-        "@typescript-eslint/visitor-keys": "8.19.1",
+        "@typescript-eslint/scope-manager": "8.20.0",
+        "@typescript-eslint/types": "8.20.0",
+        "@typescript-eslint/typescript-estree": "8.20.0",
+        "@typescript-eslint/visitor-keys": "8.20.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -10328,14 +10280,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.19.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.19.1.tgz",
-      "integrity": "sha512-60L9KIuN/xgmsINzonOcMDSB8p82h95hoBfSBtXuO4jlR1R9L1xSkmVZKgCPVfavDlXihh4ARNjXhh1gGnLC7Q==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.20.0.tgz",
+      "integrity": "sha512-J7+VkpeGzhOt3FeG1+SzhiMj9NzGD/M6KoGn9f4dbz3YzK9hvbhVTmLj/HiTp9DazIzJ8B4XcM80LrR9Dm1rJw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.19.1",
-        "@typescript-eslint/visitor-keys": "8.19.1"
+        "@typescript-eslint/types": "8.20.0",
+        "@typescript-eslint/visitor-keys": "8.20.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -10345,10 +10297,34 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.20.0.tgz",
+      "integrity": "sha512-bPC+j71GGvA7rVNAHAtOjbVXbLN5PkwqMvy1cwGeaxUoRQXVuKCebRoLzm+IPW/NtFFpstn1ummSIasD5t60GA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "8.20.0",
+        "@typescript-eslint/utils": "8.20.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^2.0.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
+      }
+    },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.19.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.19.1.tgz",
-      "integrity": "sha512-JBVHMLj7B1K1v1051ZaMMgLW4Q/jre5qGK0Ew6UgXz1Rqh+/xPzV1aW581OM00X6iOfyr1be+QyW8LOUf19BbA==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.20.0.tgz",
+      "integrity": "sha512-cqaMiY72CkP+2xZRrFt3ExRBu0WmVitN/rYPZErA80mHjHx/Svgp8yfbzkJmDoQ/whcytOPO9/IZXnOc+wigRA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -10360,14 +10336,14 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.19.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.19.1.tgz",
-      "integrity": "sha512-jk/TZwSMJlxlNnqhy0Eod1PNEvCkpY6MXOXE/WLlblZ6ibb32i2We4uByoKPv1d0OD2xebDv4hbs3fm11SMw8Q==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.20.0.tgz",
+      "integrity": "sha512-Y7ncuy78bJqHI35NwzWol8E0X7XkRVS4K4P4TCyzWkOJih5NDvtoRDW4Ba9YJJoB2igm9yXDdYI/+fkiiAxPzA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.19.1",
-        "@typescript-eslint/visitor-keys": "8.19.1",
+        "@typescript-eslint/types": "8.20.0",
+        "@typescript-eslint/visitor-keys": "8.20.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -10410,66 +10386,7 @@
         "typescript": ">=4.8.4 <5.8.0"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.20.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.20.0.tgz",
-      "integrity": "sha512-J7+VkpeGzhOt3FeG1+SzhiMj9NzGD/M6KoGn9f4dbz3YzK9hvbhVTmLj/HiTp9DazIzJ8B4XcM80LrR9Dm1rJw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.20.0",
-        "@typescript-eslint/visitor-keys": "8.20.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": {
-      "version": "8.20.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.20.0.tgz",
-      "integrity": "sha512-cqaMiY72CkP+2xZRrFt3ExRBu0WmVitN/rYPZErA80mHjHx/Svgp8yfbzkJmDoQ/whcytOPO9/IZXnOc+wigRA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.20.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.20.0.tgz",
-      "integrity": "sha512-Y7ncuy78bJqHI35NwzWol8E0X7XkRVS4K4P4TCyzWkOJih5NDvtoRDW4Ba9YJJoB2igm9yXDdYI/+fkiiAxPzA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.20.0",
-        "@typescript-eslint/visitor-keys": "8.20.0",
-        "debug": "^4.3.4",
-        "fast-glob": "^3.3.2",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^2.0.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <5.8.0"
-      }
-    },
-    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": {
+    "node_modules/@typescript-eslint/visitor-keys": {
       "version": "8.20.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.20.0.tgz",
       "integrity": "sha512-v/BpkeeYAsPkKCkR8BDwcno0llhzWVqPOamQrAEMdpZav2Y9OVjd9dwJyBLJWwf335B5DmlifECIkZRJCaGaHA==",
@@ -10487,37 +10404,6 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.19.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.19.1.tgz",
-      "integrity": "sha512-fzmjU8CHK853V/avYZAvuVut3ZTfwN5YtMaoi+X9Y9MA9keaWNHC3zEQ9zvyX/7Hj+5JkNyK1l7TOR2hevHB6Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.19.1",
-        "eslint-visitor-keys": "^4.2.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
diff --git a/package.json b/package.json
index 2b2abb8d0b..8b692a57ac 100644
--- a/package.json
+++ b/package.json
@@ -81,8 +81,8 @@
     "@types/proper-lockfile": "4.1.4",
     "@types/retry": "0.12.5",
     "@types/zxcvbn": "4.4.5",
-    "@typescript-eslint/eslint-plugin": "8.19.1",
-    "@typescript-eslint/parser": "8.19.1",
+    "@typescript-eslint/eslint-plugin": "8.20.0",
+    "@typescript-eslint/parser": "8.20.0",
     "@webcomponents/custom-elements": "1.6.0",
     "@yao-pkg/pkg": "5.16.1",
     "autoprefixer": "10.4.20",

From f82b8ca844cd7602d9a8257bd26a8c8f0b57ee14 Mon Sep 17 00:00:00 2001
From: rr-bw <102181210+rr-bw@users.noreply.github.com>
Date: Thu, 16 Jan 2025 09:59:18 -0800
Subject: [PATCH 130/150] feat(auth): [PM-14949] Update TDE Decryption Option
 Text (#12850)

Update the text for the TDE decryption options under "Member decryption options".
---
 apps/web/src/locales/en/messages.json         | 32 +++++++++----------
 .../src/app/auth/sso/sso.component.html       | 26 +++++++--------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index eacba623ec..15c5a7fcf6 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -8289,33 +8289,33 @@
   "trustedDevices": {
     "message": "Trusted devices"
   },
-  "memberDecryptionOptionTdeDescriptionPartOne": {
-    "message": "Once authenticated, members will decrypt vault data using a key stored on their device. The",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The single organization policy, SSO Required policy, and account recovery administration policy with automatic enrollment will turn on when this option is used.'"
+  "memberDecryptionOptionTdeDescPart1": {
+    "message": "Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
-  "memberDecryptionOptionTdeDescriptionLinkOne": {
+  "memberDecryptionOptionTdeDescLink1": {
     "message": "single organization",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The single organization policy, SSO required policy, and account recovery administration policy with automatic enrollment will turn on when this option is used.'"
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
-  "memberDecryptionOptionTdeDescriptionPartTwo": {
+  "memberDecryptionOptionTdeDescPart2": {
     "message": "policy,",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The single organization policy, SSO required policy, and account recovery administration policy with automatic enrollment will turn on when this option is used.'"
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
-  "memberDecryptionOptionTdeDescriptionLinkTwo": {
+  "memberDecryptionOptionTdeDescLink2": {
     "message": "SSO required",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The single organization policy, SSO required policy, and account recovery administration policy with automatic enrollment will turn on when this option is used.'"
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
-  "memberDecryptionOptionTdeDescriptionPartThree": {
+  "memberDecryptionOptionTdeDescPart3": {
     "message": "policy, and",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The single organization policy, SSO required policy, and account recovery administration policy with automatic enrollment will turn on when this option is used.'"
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
-  "memberDecryptionOptionTdeDescriptionLinkThree": {
+  "memberDecryptionOptionTdeDescLink3": {
     "message": "account recovery administration",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The single organization policy, SSO required policy, and account recovery administration policy with automatic enrollment will turn on when this option is used.'"
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
-  "memberDecryptionOptionTdeDescriptionPartFour": {
-    "message": "policy with automatic enrollment will turn on when this option is used.",
-    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Once authenticated, members will decrypt vault data using a key stored on their device. The single organization policy, SSO required policy, and account recovery administration policy with automatic enrollment will turn on when this option is used.'"
+  "memberDecryptionOptionTdeDescPart4": {
+    "message": "policy will turn on when this option is used.",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Members will not need a master password when logging in with SSO. Master password is replaced with an encryption key stored on the device, making that device trusted. The first device a member creates their account and logs into will be trusted. New devices will need to be approved by an existing trusted device or by an administrator. The single organization policy, SSO required policy, and account recovery administration policy will turn on when this option is used.'"
   },
   "orgPermissionsUpdatedMustSetPassword": {
     "message": "Your organization permissions were updated, requiring you to set a master password.",
diff --git a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html
index 0731820e41..036163af3d 100644
--- a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html
+++ b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html
@@ -89,19 +89,19 @@
             {{ "trustedDevices" | i18n }}
           </bit-label>
           <bit-hint>
-            {{ "memberDecryptionOptionTdeDescriptionPartOne" | i18n }}
-            <a bitLink routerLink="../policies">{{
-              "memberDecryptionOptionTdeDescriptionLinkOne" | i18n
-            }}</a>
-            {{ "memberDecryptionOptionTdeDescriptionPartTwo" | i18n }}
-            <a bitLink routerLink="../policies">{{
-              "memberDecryptionOptionTdeDescriptionLinkTwo" | i18n
-            }}</a>
-            {{ "memberDecryptionOptionTdeDescriptionPartThree" | i18n }}
-            <a bitLink routerLink="../policies">{{
-              "memberDecryptionOptionTdeDescriptionLinkThree" | i18n
-            }}</a>
-            {{ "memberDecryptionOptionTdeDescriptionPartFour" | i18n }}
+            {{ "memberDecryptionOptionTdeDescPart1" | i18n }}
+            <a bitLink routerLink="../policies">
+              {{ "memberDecryptionOptionTdeDescLink1" | i18n }}
+            </a>
+            {{ "memberDecryptionOptionTdeDescPart2" | i18n }}
+            <a bitLink routerLink="../policies">
+              {{ "memberDecryptionOptionTdeDescLink2" | i18n }}
+            </a>
+            {{ "memberDecryptionOptionTdeDescPart3" | i18n }}
+            <a bitLink routerLink="../policies">
+              {{ "memberDecryptionOptionTdeDescLink3" | i18n }}
+            </a>
+            {{ "memberDecryptionOptionTdeDescPart4" | i18n }}
           </bit-hint>
         </bit-radio-button>
       </bit-radio-group>

From 70cf4593fbffb7b7ca1c6e7828f6533c3a07fbd5 Mon Sep 17 00:00:00 2001
From: Jordan Aasen <166539328+jaasen-livefront@users.noreply.github.com>
Date: Thu, 16 Jan 2025 11:10:23 -0800
Subject: [PATCH 131/150] show login credentials if only passkey is present
 (#12870)

---
 libs/vault/src/cipher-view/cipher-view.component.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/vault/src/cipher-view/cipher-view.component.ts b/libs/vault/src/cipher-view/cipher-view.component.ts
index 4bd87a7869..f872ad0cf1 100644
--- a/libs/vault/src/cipher-view/cipher-view.component.ts
+++ b/libs/vault/src/cipher-view/cipher-view.component.ts
@@ -101,8 +101,8 @@ export class CipherViewComponent implements OnChanges, OnDestroy {
       return false;
     }
 
-    const { username, password, totp } = this.cipher.login;
-    return username || password || totp;
+    const { username, password, totp, fido2Credentials } = this.cipher.login;
+    return username || password || totp || fido2Credentials;
   }
 
   get hasAutofill() {

From 3917f50fdde96dbe0c746a3f0e956e115756096c Mon Sep 17 00:00:00 2001
From: Andy Pixley <3723676+pixman20@users.noreply.github.com>
Date: Thu, 16 Jan 2025 15:20:03 -0500
Subject: [PATCH 132/150] [BRE-560] Display rollout percentage in run name
 (#12919)

---
 .github/workflows/staged-rollout-desktop.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/staged-rollout-desktop.yml b/.github/workflows/staged-rollout-desktop.yml
index 91250a443f..4ec3af3be9 100644
--- a/.github/workflows/staged-rollout-desktop.yml
+++ b/.github/workflows/staged-rollout-desktop.yml
@@ -1,4 +1,5 @@
 name: Staged Rollout Desktop
+run-name: Staged Rollout Desktop - ${{ inputs.rollout_percentage }}%
 
 on:
   workflow_dispatch:

From ea052b9e079dc95daa799dc87c7394c0473649d8 Mon Sep 17 00:00:00 2001
From: Will Martin <contact@willmartian.com>
Date: Thu, 16 Jan 2025 15:43:04 -0500
Subject: [PATCH 133/150] [CL-428] create drawer component (#12812)

* remove private/protected/lifecycle fields from Storybook docs table

* move theme override decorator into util method

* implement base drawer component

* update bit-layout to be drawer container

* create drawer helper components

* expose new APIs to DS barrel file

* write docs

* update docs; add role input

* use host directive instead of service

* clean up logic a tad

* add start slot to story

* update docs

* Apply suggestions from code review

Co-authored-by: Victoria League <vleague@bitwarden.com>

* update docs

* Update libs/components/src/drawer/drawer.mdx

Co-authored-by: Victoria League <vleague@bitwarden.com>

* update docs / stories

* add non text element to drawer

---------

Co-authored-by: Victoria League <vleague@bitwarden.com>
---
 angular.json                                  |   8 ++
 .../src/drawer/drawer-body.component.ts       |  36 +++++
 .../src/drawer/drawer-close.directive.ts      |  29 ++++
 .../src/drawer/drawer-header.component.html   |  15 +++
 .../src/drawer/drawer-header.component.ts     |  34 +++++
 .../src/drawer/drawer-host.directive.ts       |  28 ++++
 .../src/drawer/drawer.component.html          |   8 ++
 .../components/src/drawer/drawer.component.ts |  76 +++++++++++
 libs/components/src/drawer/drawer.mdx         | 120 +++++++++++++++++
 libs/components/src/drawer/drawer.module.ts   |  12 ++
 libs/components/src/drawer/drawer.stories.ts  | 124 ++++++++++++++++++
 libs/components/src/drawer/index.ts           |   5 +
 libs/components/src/index.ts                  |   1 +
 .../src/layout/layout.component.html          |   1 +
 .../components/src/layout/layout.component.ts |  10 +-
 libs/components/src/layout/layout.stories.ts  |  10 +-
 libs/components/src/layout/mocks.ts           |   7 +
 .../src/navigation/nav-group.stories.ts       |   2 +-
 .../src/navigation/nav-item.stories.ts        |   2 +-
 .../components/kitchen-sink-main.component.ts |  97 +++++++++++---
 .../kitchen-sink-shared.module.ts             |   3 +
 .../kitchen-sink/kitchen-sink.stories.ts      |  45 +++----
 .../storybook-decorators.ts}                  |  16 ++-
 23 files changed, 634 insertions(+), 55 deletions(-)
 create mode 100644 libs/components/src/drawer/drawer-body.component.ts
 create mode 100644 libs/components/src/drawer/drawer-close.directive.ts
 create mode 100644 libs/components/src/drawer/drawer-header.component.html
 create mode 100644 libs/components/src/drawer/drawer-header.component.ts
 create mode 100644 libs/components/src/drawer/drawer-host.directive.ts
 create mode 100644 libs/components/src/drawer/drawer.component.html
 create mode 100644 libs/components/src/drawer/drawer.component.ts
 create mode 100644 libs/components/src/drawer/drawer.mdx
 create mode 100644 libs/components/src/drawer/drawer.module.ts
 create mode 100644 libs/components/src/drawer/drawer.stories.ts
 create mode 100644 libs/components/src/drawer/index.ts
 create mode 100644 libs/components/src/layout/mocks.ts
 rename libs/components/src/{utils/position-fixed-wrapper-decorator.ts => stories/storybook-decorators.ts} (50%)

diff --git a/angular.json b/angular.json
index 7053050262..665d810cf4 100644
--- a/angular.json
+++ b/angular.json
@@ -147,6 +147,10 @@
               "./tsconfig.json",
               "-e",
               "json",
+              "--disableInternal",
+              "--disableLifeCycleHooks",
+              "--disablePrivate",
+              "--disableProtected",
               "-d",
               ".",
               "--disableRoutesGraph"
@@ -165,6 +169,10 @@
               "./tsconfig.json",
               "-e",
               "json",
+              "--disableInternal",
+              "--disableLifeCycleHooks",
+              "--disablePrivate",
+              "--disableProtected",
               "-d",
               ".",
               "--disableRoutesGraph"
diff --git a/libs/components/src/drawer/drawer-body.component.ts b/libs/components/src/drawer/drawer-body.component.ts
new file mode 100644
index 0000000000..9bd2adcffb
--- /dev/null
+++ b/libs/components/src/drawer/drawer-body.component.ts
@@ -0,0 +1,36 @@
+import { CdkScrollable } from "@angular/cdk/scrolling";
+import { ChangeDetectionStrategy, Component, Signal, inject } from "@angular/core";
+import { toSignal } from "@angular/core/rxjs-interop";
+import { map } from "rxjs";
+
+/**
+ * Body container for `bit-drawer`
+ */
+@Component({
+  selector: "bit-drawer-body",
+  standalone: true,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [],
+  host: {
+    class:
+      "tw-p-4 tw-pt-0 tw-block tw-overflow-auto tw-border-solid tw-border tw-border-transparent tw-transition-colors tw-duration-200",
+    "[class.tw-border-t-secondary-300]": "isScrolled()",
+  },
+  hostDirectives: [
+    {
+      directive: CdkScrollable,
+    },
+  ],
+  template: ` <ng-content></ng-content> `,
+})
+export class DrawerBodyComponent {
+  private scrollable = inject(CdkScrollable);
+
+  /** TODO: share this utility with browser popup header? */
+  protected isScrolled: Signal<boolean> = toSignal(
+    this.scrollable
+      .elementScrolled()
+      .pipe(map(() => this.scrollable.measureScrollOffset("top") > 0)),
+    { initialValue: false },
+  );
+}
diff --git a/libs/components/src/drawer/drawer-close.directive.ts b/libs/components/src/drawer/drawer-close.directive.ts
new file mode 100644
index 0000000000..bf56dd8b71
--- /dev/null
+++ b/libs/components/src/drawer/drawer-close.directive.ts
@@ -0,0 +1,29 @@
+import { Directive, inject } from "@angular/core";
+
+import { DrawerComponent } from "./drawer.component";
+
+/**
+ * Closes the ancestor drawer
+ *
+ * @example
+ *
+ * ```html
+ * <bit-drawer>
+ *  <button type="button" bitButton bitDrawerClose>Close</button>
+ * </bit-drawer>
+ * ```
+ **/
+@Directive({
+  selector: "button[bitDrawerClose]",
+  standalone: true,
+  host: {
+    "(click)": "onClick()",
+  },
+})
+export class DrawerCloseDirective {
+  private drawer = inject(DrawerComponent, { optional: true });
+
+  protected onClick() {
+    this.drawer?.open.set(false);
+  }
+}
diff --git a/libs/components/src/drawer/drawer-header.component.html b/libs/components/src/drawer/drawer-header.component.html
new file mode 100644
index 0000000000..4652e5537e
--- /dev/null
+++ b/libs/components/src/drawer/drawer-header.component.html
@@ -0,0 +1,15 @@
+<header class="tw-flex tw-justify-between tw-items-center">
+  <div class="tw-flex tw-items-center tw-gap-1 tw-overflow-auto">
+    <ng-content select="[slot=start]"></ng-content>
+    <h2 bitTypography="h3" noMargin class="tw-text-main tw-mb-0 tw-truncate" [attr.title]="title()">
+      {{ title() }}
+    </h2>
+  </div>
+  <button
+    bitIconButton="bwi-close"
+    type="button"
+    bitDrawerClose
+    [attr.title]="'close' | i18n"
+    [attr.aria-label]="'close' | i18n"
+  ></button>
+</header>
diff --git a/libs/components/src/drawer/drawer-header.component.ts b/libs/components/src/drawer/drawer-header.component.ts
new file mode 100644
index 0000000000..73834b8487
--- /dev/null
+++ b/libs/components/src/drawer/drawer-header.component.ts
@@ -0,0 +1,34 @@
+import { CommonModule } from "@angular/common";
+import { ChangeDetectionStrategy, Component, HostBinding, input } from "@angular/core";
+
+import { IconButtonModule } from "../icon-button";
+import { I18nPipe } from "../shared/i18n.pipe";
+import { TypographyModule } from "../typography";
+
+import { DrawerCloseDirective } from "./drawer-close.directive";
+
+/**
+ * Header container for `bit-drawer`
+ **/
+@Component({
+  selector: "bit-drawer-header",
+  standalone: true,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [CommonModule, DrawerCloseDirective, TypographyModule, IconButtonModule, I18nPipe],
+  templateUrl: "drawer-header.component.html",
+  host: {
+    class: "tw-block tw-pl-4 tw-pr-2 tw-py-2",
+  },
+})
+export class DrawerHeaderComponent {
+  /**
+   * The title to display
+   */
+  title = input.required<string>();
+
+  /** We don't want to set the HTML title attribute with `this.title` */
+  @HostBinding("attr.title")
+  protected get getTitle(): null {
+    return null;
+  }
+}
diff --git a/libs/components/src/drawer/drawer-host.directive.ts b/libs/components/src/drawer/drawer-host.directive.ts
new file mode 100644
index 0000000000..f5e3e56b09
--- /dev/null
+++ b/libs/components/src/drawer/drawer-host.directive.ts
@@ -0,0 +1,28 @@
+import { Portal } from "@angular/cdk/portal";
+import { Directive, signal } from "@angular/core";
+
+/**
+ * Host that renders a drawer
+ *
+ * @internal
+ */
+@Directive({
+  selector: "[bitDrawerHost]",
+  standalone: true,
+})
+export class DrawerHostDirective {
+  private _portal = signal<Portal<unknown> | undefined>(undefined);
+
+  /** The portal to display */
+  portal = this._portal.asReadonly();
+
+  open(portal: Portal<unknown>) {
+    this._portal.set(portal);
+  }
+
+  close(portal: Portal<unknown>) {
+    if (portal === this.portal()) {
+      this._portal.set(undefined);
+    }
+  }
+}
diff --git a/libs/components/src/drawer/drawer.component.html b/libs/components/src/drawer/drawer.component.html
new file mode 100644
index 0000000000..fce6b3c57e
--- /dev/null
+++ b/libs/components/src/drawer/drawer.component.html
@@ -0,0 +1,8 @@
+<ng-container *cdkPortal>
+  <section
+    [attr.role]="role()"
+    class="tw-w-[23rem] tw-sticky tw-top-0 tw-h-screen tw-flex tw-flex-col tw-overflow-auto tw-border-0 tw-border-l tw-border-solid tw-border-secondary-300 tw-bg-background"
+  >
+    <ng-content></ng-content>
+  </section>
+</ng-container>
diff --git a/libs/components/src/drawer/drawer.component.ts b/libs/components/src/drawer/drawer.component.ts
new file mode 100644
index 0000000000..ccabb6f0b6
--- /dev/null
+++ b/libs/components/src/drawer/drawer.component.ts
@@ -0,0 +1,76 @@
+import { CdkPortal, PortalModule } from "@angular/cdk/portal";
+import { CommonModule } from "@angular/common";
+import {
+  ChangeDetectionStrategy,
+  Component,
+  effect,
+  inject,
+  input,
+  model,
+  viewChild,
+} from "@angular/core";
+
+import { DrawerHostDirective } from "./drawer-host.directive";
+
+/**
+ * A drawer is a panel of supplementary content that is adjacent to the page's main content.
+ *
+ * Drawers render in `bit-layout`. Drawers must be a descendant of `bit-layout`, but they do not need to be a direct descendant.
+ */
+@Component({
+  selector: "bit-drawer",
+  standalone: true,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [CommonModule, PortalModule],
+  templateUrl: "drawer.component.html",
+})
+export class DrawerComponent {
+  private drawerHost = inject(DrawerHostDirective);
+  private portal = viewChild.required(CdkPortal);
+
+  /**
+   * Whether or not the drawer is open.
+   *
+   * Note: Does not support implicit boolean transform due to Angular limitation. Must be bound explicitly `[open]="true"` instead of just `open`.
+   * https://github.com/angular/angular/issues/55166#issuecomment-2032150999
+   **/
+  open = model<boolean>(false);
+
+  /**
+   * The ARIA role of the drawer.
+   *
+   * - [complementary](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles/complementary_role)
+   *    - For drawers that contain content that is complementary to the page's main content. (default)
+   * - [navigation](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles/navigation_role)
+   *    - For drawers that primary contain links to other content.
+   */
+  role = input<"complementary" | "navigation">("complementary");
+
+  constructor() {
+    effect(
+      () => {
+        this.open() ? this.drawerHost.open(this.portal()) : this.drawerHost.close(this.portal());
+      },
+      {
+        allowSignalWrites: true,
+      },
+    );
+
+    // Set `open` to `false` when another drawer is opened.
+    effect(
+      () => {
+        if (this.drawerHost.portal() !== this.portal()) {
+          this.open.set(false);
+        }
+      },
+      {
+        allowSignalWrites: true,
+      },
+    );
+  }
+
+  /** Toggle the drawer between open & closed */
+  toggle() {
+    this.open.update((prev) => !prev);
+  }
+}
diff --git a/libs/components/src/drawer/drawer.mdx b/libs/components/src/drawer/drawer.mdx
new file mode 100644
index 0000000000..0098ce64ea
--- /dev/null
+++ b/libs/components/src/drawer/drawer.mdx
@@ -0,0 +1,120 @@
+import { Meta, Story, Primary, Controls } from "@storybook/addon-docs";
+
+import * as stories from "./drawer.stories";
+
+import { DrawerOpen as KitchenSink } from "../stories/kitchen-sink/kitchen-sink.stories";
+
+<Meta of={stories} />
+
+```ts
+import { DrawerComponent } from "@bitwarden/components";
+```
+
+# Drawer
+
+A drawer is a panel of supplementary content that is adjacent to the page's main content.
+
+<Primary />
+
+<Controls />
+
+## Usage
+
+A `bit-drawer` in a template will not render inline, but rather will render adjacent to the main
+page content.
+
+```html
+<bit-drawer [open]="true">
+  <bit-drawer-header title="Hello Bitwaaaaaaaaaaaaaaaaaaaaaaaaarden!"></bit-drawer-header>
+  <bit-drawer-body>
+    <p>Lorem ipsum dolor...</p>
+  </bit-drawer-body>
+</bit-drawer>
+```
+
+`bit-drawer` must be a descendant of `bit-layout`, but it does not need to be a direct descendant.
+
+## Header and body
+
+Header and body content can be provided with the `bit-drawer-header` and `bit-drawer-body`
+components, respectively.
+
+A title can be passed to the header by input:
+`<bit-drawer-header title="Foobar"></bit-drawer-header>`
+
+Custom content can be rendered before the title with the header's `start` slot:
+
+```html
+<bit-drawer-header title="Foobar">
+  <i slot="start" class="bwi bwi-key" aria-hidden="true"></i>
+</bit-drawer-header>
+```
+
+## Opening and closing
+
+`bit-drawer` opens when its `open` input is `true`:
+
+```html
+<bit-drawer [open]="true">...</bit-drawer>
+```
+
+Note: Model inputs do not support implicit boolean transformation (see Angular reasoning
+[here](https://github.com/angular/angular/issues/55166#issuecomment-2032150999)). `open` must be
+bound explicitly `<bit-drawer [open]="true">` instead of just `<bit-drawer open>`.
+
+Buttons can be made to open/toggle drawers by referencing a template variable, or by manipulating
+state that is bound to `open`:
+
+```html
+<button (click)="myDrawer.toggle()"></button> <bit-drawer #myDrawer>...</bit-drawer>
+```
+
+For convenience, close buttons can be created _inside_ the drawer with the `bitDrawerClose`
+directive:
+
+```html
+<bit-drawer>
+  <button type="button" bitDrawerClose>Close</button>
+</bit-drawer>
+```
+
+## Multiple Drawers
+
+Only one drawer can be open at a time, and they do not stack. If a drawer is already open, opening
+another will close and replace the one already open.
+
+<Story of={stories.MultipleDrawers} />
+
+## Headless
+
+Omitting `bit-drawer-header` and `bit-drawer-body` allows for fully customizable content.
+
+<Story of={stories.Headless} />
+
+## Accessibility
+
+- The drawer should contain an h2 element. If you are using `bit-drawer-header`, this is created for
+  you via the `title` input:
+
+```html
+<bit-drawer>
+  <h2 bitTypography="h2">Hello world!</h2>
+</bit-drawer>
+
+<!-- or -->
+
+<bit-drawer>
+  <bit-drawer-header title="Hello world!"></bit-drawer-header>
+</bit-drawer>
+```
+
+- The ARIA role of the drawer can be set with the `role` attribute:
+  - [complementary](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles/complementary_role)
+    (default)
+    - For drawers that contain content that is complementary to the page's main content.
+  - [navigation](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles/navigation_role)
+    - For drawers that primary contain links to other content.
+
+## Kitchen Sink
+
+<Story of={KitchenSink} autoplay />
diff --git a/libs/components/src/drawer/drawer.module.ts b/libs/components/src/drawer/drawer.module.ts
new file mode 100644
index 0000000000..9f51ba06b4
--- /dev/null
+++ b/libs/components/src/drawer/drawer.module.ts
@@ -0,0 +1,12 @@
+import { NgModule } from "@angular/core";
+
+import { DrawerBodyComponent } from "./drawer-body.component";
+import { DrawerCloseDirective } from "./drawer-close.directive";
+import { DrawerHeaderComponent } from "./drawer-header.component";
+import { DrawerComponent } from "./drawer.component";
+
+@NgModule({
+  imports: [DrawerComponent, DrawerHeaderComponent, DrawerBodyComponent, DrawerCloseDirective],
+  exports: [DrawerComponent, DrawerHeaderComponent, DrawerBodyComponent, DrawerCloseDirective],
+})
+export class DrawerModule {}
diff --git a/libs/components/src/drawer/drawer.stories.ts b/libs/components/src/drawer/drawer.stories.ts
new file mode 100644
index 0000000000..54b4c89f4c
--- /dev/null
+++ b/libs/components/src/drawer/drawer.stories.ts
@@ -0,0 +1,124 @@
+// FIXME: Update this file to be type safe and remove this and next line
+// @ts-strict-ignore
+import { RouterTestingModule } from "@angular/router/testing";
+import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+
+import { ButtonModule } from "../button";
+import { CalloutModule } from "../callout";
+import { LayoutComponent } from "../layout";
+import { mockLayoutI18n } from "../layout/mocks";
+import {
+  disableBothThemeDecorator,
+  positionFixedWrapperDecorator,
+} from "../stories/storybook-decorators";
+import { TypographyModule } from "../typography";
+import { I18nMockService } from "../utils";
+
+import { DrawerBodyComponent } from "./drawer-body.component";
+import { DrawerHeaderComponent } from "./drawer-header.component";
+import { DrawerComponent } from "./drawer.component";
+import { DrawerModule } from "./drawer.module";
+
+export default {
+  title: "Component Library/Drawer",
+  component: DrawerComponent,
+  subcomponents: {
+    DrawerHeaderComponent,
+    DrawerBodyComponent,
+  },
+  decorators: [
+    positionFixedWrapperDecorator(),
+    disableBothThemeDecorator,
+    moduleMetadata({
+      imports: [
+        RouterTestingModule,
+        LayoutComponent,
+        DrawerModule,
+        ButtonModule,
+        CalloutModule,
+        TypographyModule,
+      ],
+      providers: [
+        {
+          provide: I18nService,
+          useFactory: () => {
+            return new I18nMockService({
+              ...mockLayoutI18n,
+              close: "Close",
+            });
+          },
+        },
+      ],
+    }),
+  ],
+} as Meta<DrawerComponent>;
+
+type Story = StoryObj<DrawerComponent>;
+
+export const Default: Story = {
+  render: (args) => ({
+    props: args,
+    template: /*html*/ `
+        <bit-layout class="tw-text-main">
+            <p>The drawer is {{ open ? "open" : "closed" }}.<p>
+            <button type="button" bitButton (click)="drawer.toggle()">Toggle</button>
+            
+            <!-- Note: bit-drawer does *not* need to be a direct descendant of bit-layout. -->
+            <bit-drawer [(open)]="open" #drawer>
+              <bit-drawer-header title="Hello Bitwaaaaaaaaaaaaaaaaaaaaaaaaarden!">
+                <i slot="start" class="bwi bwi-key" aria-hidden="true"></i>
+              </bit-drawer-header>
+              <bit-drawer-body>
+                <p bitTypography="body1">
+                  Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+                </p>
+              </bit-drawer-body>
+            </bit-drawer>
+        </bit-layout>
+    `,
+  }),
+  args: {
+    open: true,
+  },
+};
+
+export const Headless: Story = {
+  render: (args) => ({
+    props: args,
+    template: /*html*/ `
+        <bit-layout class="tw-text-main">
+            <p>The drawer is {{ open ? "open" : "closed" }}.<p>
+            <button type="button" bitButton (click)="drawer.toggle()">Toggle</button>
+            <bit-drawer [(open)]="open" #drawer>
+              <h2 bitTypography="h2"></h2>
+              Hello world!
+            </bit-drawer>
+        </bit-layout>
+    `,
+  }),
+  args: {
+    open: true,
+  },
+};
+
+export const MultipleDrawers: Story = {
+  render: (args) => ({
+    props: args,
+    template: /*html*/ `
+        <bit-layout class="tw-text-main">
+            <button type="button" bitButton (click)="foo.toggle()">{{ !foo.open() ? "Open" : "Close" }} Foo</button>
+            <button type="button" bitButton (click)="bar.toggle()">{{ !bar.open() ? "Open" : "Close" }} Bar</button>
+            
+            <bit-drawer #foo>
+              Foo
+            </bit-drawer>
+
+            <bit-drawer #bar [open]="true">
+              Bar
+            </bit-drawer>
+        </bit-layout>
+    `,
+  }),
+};
diff --git a/libs/components/src/drawer/index.ts b/libs/components/src/drawer/index.ts
new file mode 100644
index 0000000000..abf5b8d34f
--- /dev/null
+++ b/libs/components/src/drawer/index.ts
@@ -0,0 +1,5 @@
+export * from "./drawer.module";
+export * from "./drawer.component";
+export * from "./drawer-body.component";
+export * from "./drawer-close.directive";
+export * from "./drawer-header.component";
diff --git a/libs/components/src/index.ts b/libs/components/src/index.ts
index a48750a99f..ed84452044 100644
--- a/libs/components/src/index.ts
+++ b/libs/components/src/index.ts
@@ -14,6 +14,7 @@ export * from "./color-password";
 export * from "./container";
 export * from "./dialog";
 export * from "./disclosure";
+export * from "./drawer";
 export * from "./form-field";
 export * from "./icon-button";
 export * from "./icon";
diff --git a/libs/components/src/layout/layout.component.html b/libs/components/src/layout/layout.component.html
index ccbb40c2b5..7c1c5b2501 100644
--- a/libs/components/src/layout/layout.component.html
+++ b/libs/components/src/layout/layout.component.html
@@ -37,4 +37,5 @@
       ></div>
     </div>
   </main>
+  <ng-template [cdkPortalOutlet]="drawerPortal()"></ng-template>
 </div>
diff --git a/libs/components/src/layout/layout.component.ts b/libs/components/src/layout/layout.component.ts
index d55ad8493e..7bf8a6ad17 100644
--- a/libs/components/src/layout/layout.component.ts
+++ b/libs/components/src/layout/layout.component.ts
@@ -1,7 +1,9 @@
+import { PortalModule } from "@angular/cdk/portal";
 import { CommonModule } from "@angular/common";
-import { Component } from "@angular/core";
+import { Component, inject } from "@angular/core";
 import { RouterModule } from "@angular/router";
 
+import { DrawerHostDirective } from "../drawer/drawer-host.directive";
 import { LinkModule } from "../link";
 import { SideNavService } from "../navigation/side-nav.service";
 import { SharedModule } from "../shared";
@@ -10,12 +12,14 @@ import { SharedModule } from "../shared";
   selector: "bit-layout",
   templateUrl: "layout.component.html",
   standalone: true,
-  imports: [CommonModule, SharedModule, LinkModule, RouterModule],
+  imports: [CommonModule, SharedModule, LinkModule, RouterModule, PortalModule],
+  hostDirectives: [DrawerHostDirective],
 })
 export class LayoutComponent {
   protected mainContentId = "main-content";
 
-  constructor(protected sideNavService: SideNavService) {}
+  protected sideNavService = inject(SideNavService);
+  protected drawerPortal = inject(DrawerHostDirective).portal;
 
   focusMainContent() {
     document.getElementById(this.mainContentId)?.focus();
diff --git a/libs/components/src/layout/layout.stories.ts b/libs/components/src/layout/layout.stories.ts
index a0eadebe7f..7fdad65554 100644
--- a/libs/components/src/layout/layout.stories.ts
+++ b/libs/components/src/layout/layout.stories.ts
@@ -6,10 +6,11 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 
 import { CalloutModule } from "../callout";
 import { NavigationModule } from "../navigation";
+import { positionFixedWrapperDecorator } from "../stories/storybook-decorators";
 import { I18nMockService } from "../utils/i18n-mock.service";
-import { positionFixedWrapperDecorator } from "../utils/position-fixed-wrapper-decorator";
 
 import { LayoutComponent } from "./layout.component";
+import { mockLayoutI18n } from "./mocks";
 
 export default {
   title: "Component Library/Layout",
@@ -22,12 +23,7 @@ export default {
         {
           provide: I18nService,
           useFactory: () => {
-            return new I18nMockService({
-              toggleSideNavigation: "Toggle side navigation",
-              skipToContent: "Skip to content",
-              submenu: "submenu",
-              toggleCollapse: "toggle collapse",
-            });
+            return new I18nMockService(mockLayoutI18n);
           },
         },
       ],
diff --git a/libs/components/src/layout/mocks.ts b/libs/components/src/layout/mocks.ts
new file mode 100644
index 0000000000..50c2bd9afb
--- /dev/null
+++ b/libs/components/src/layout/mocks.ts
@@ -0,0 +1,7 @@
+/** TODO: create mock messages.json file for all of CL in favor of sharing per-Story mocks */
+export const mockLayoutI18n = {
+  toggleSideNavigation: "Toggle side navigation",
+  skipToContent: "Skip to content",
+  submenu: "submenu",
+  toggleCollapse: "toggle collapse",
+};
diff --git a/libs/components/src/navigation/nav-group.stories.ts b/libs/components/src/navigation/nav-group.stories.ts
index a6fa53ff18..f412dbc20b 100644
--- a/libs/components/src/navigation/nav-group.stories.ts
+++ b/libs/components/src/navigation/nav-group.stories.ts
@@ -6,8 +6,8 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 
 import { LayoutComponent } from "../layout";
 import { SharedModule } from "../shared/shared.module";
+import { positionFixedWrapperDecorator } from "../stories/storybook-decorators";
 import { I18nMockService } from "../utils/i18n-mock.service";
-import { positionFixedWrapperDecorator } from "../utils/position-fixed-wrapper-decorator";
 
 import { NavGroupComponent } from "./nav-group.component";
 import { NavigationModule } from "./navigation.module";
diff --git a/libs/components/src/navigation/nav-item.stories.ts b/libs/components/src/navigation/nav-item.stories.ts
index 20d6ebd1d7..376f121eb0 100644
--- a/libs/components/src/navigation/nav-item.stories.ts
+++ b/libs/components/src/navigation/nav-item.stories.ts
@@ -5,8 +5,8 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 
 import { IconButtonModule } from "../icon-button";
 import { LayoutComponent } from "../layout";
+import { positionFixedWrapperDecorator } from "../stories/storybook-decorators";
 import { I18nMockService } from "../utils/i18n-mock.service";
-import { positionFixedWrapperDecorator } from "../utils/position-fixed-wrapper-decorator";
 
 import { NavItemComponent } from "./nav-item.component";
 import { NavigationModule } from "./navigation.module";
diff --git a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-main.component.ts b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-main.component.ts
index 687b891738..13f0a16a4d 100644
--- a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-main.component.ts
+++ b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-main.component.ts
@@ -1,5 +1,5 @@
 import { DialogRef } from "@angular/cdk/dialog";
-import { Component } from "@angular/core";
+import { Component, signal } from "@angular/core";
 
 import { DialogService } from "../../../dialog";
 import { KitchenSinkSharedModule } from "../kitchen-sink-shared.module";
@@ -28,13 +28,7 @@ class KitchenSinkDialog {
 @Component({
   standalone: true,
   selector: "bit-tab-main",
-  imports: [
-    KitchenSinkSharedModule,
-    KitchenSinkTable,
-    KitchenSinkToggleList,
-    KitchenSinkForm,
-    KitchenSinkDialog,
-  ],
+  imports: [KitchenSinkSharedModule, KitchenSinkTable, KitchenSinkToggleList, KitchenSinkForm],
   template: `
     <bit-banner bannerType="info" class="-tw-m-6 tw-flex tw-flex-col tw-pb-6">
       Kitchen Sink test zone
@@ -48,6 +42,11 @@ class KitchenSinkDialog {
       </bit-breadcrumbs>
     </p>
 
+    <div class="tw-mb-6 tw-mt-6">
+      <h1 bitTypography="h1">Bitwarden Kitchen Sink<bit-avatar text="Bit Warden"></bit-avatar></h1>
+      <a bitLink linkType="primary" href="#">Learn more</a>
+    </div>
+
     <bit-callout type="info" title="About the Kitchen Sink">
       <p bitTypography="body1">
         The purpose of this story is to compose together all of our components. When snapshot tests
@@ -63,18 +62,14 @@ class KitchenSinkDialog {
       </p>
     </bit-callout>
 
-    <div class="tw-mb-6 tw-mt-6">
-      <h1 bitTypography="h1">Bitwarden <bit-avatar text="Bit Warden"></bit-avatar></h1>
-      <a bitLink linkType="primary" href="#">Learn more</a>
-    </div>
-
     <bit-tab-group label="Main content tabs" class="tw-text-main">
       <bit-tab label="Evaluation">
         <bit-section>
           <h2 bitTypography="h2" class="tw-mb-6">About</h2>
           <bit-kitchen-sink-table></bit-kitchen-sink-table>
 
-          <button bitButton (click)="openDefaultDialog()">Open Dialog</button>
+          <button bitButton (click)="openDialog()">Open Dialog</button>
+          <button bitButton (click)="openDrawer()">Open Drawer</button>
         </bit-section>
         <bit-section>
           <h2 bitTypography="h2" class="tw-mb-6">Companies using Bitwarden</h2>
@@ -99,15 +94,87 @@ class KitchenSinkDialog {
         </bit-section>
       </bit-tab>
     </bit-tab-group>
+
+    <bit-drawer [(open)]="drawerOpen">
+      <bit-drawer-header title="Foo ipsum"></bit-drawer-header>
+      <bit-drawer-body>
+        <p bitTypography="body1">
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
+          ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
+          ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
+          reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur
+          sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
+          est laborum.
+        </p>
+        <bit-form-field>
+          <bit-label>What did foo say to bar?</bit-label>
+          <input bitInput value="Baz" />
+        </bit-form-field>
+        <p bitTypography="body1">
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
+          ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
+          ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
+          reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur
+          sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
+          est laborum.
+        </p>
+        <p bitTypography="body1">
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
+          ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
+          ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
+          reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur
+          sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
+          est laborum.
+        </p>
+        <p bitTypography="body1">
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
+          ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
+          ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
+          reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur
+          sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
+          est laborum.
+        </p>
+        <p bitTypography="body1">
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
+          ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
+          ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
+          reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur
+          sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
+          est laborum.
+        </p>
+        <p bitTypography="body1">
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
+          ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
+          ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
+          reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur
+          sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
+          est laborum.
+        </p>
+        <p bitTypography="body1">
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
+          ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
+          ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
+          reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur
+          sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
+          est laborum.
+        </p>
+      </bit-drawer-body>
+    </bit-drawer>
   `,
 })
 export class KitchenSinkMainComponent {
   constructor(public dialogService: DialogService) {}
 
-  openDefaultDialog() {
+  protected drawerOpen = signal(false);
+
+  openDialog() {
     this.dialogService.open(KitchenSinkDialog);
   }
 
+  openDrawer() {
+    this.drawerOpen.set(true);
+  }
+
   navItems = [
     { icon: "bwi-collection", name: "Password Managers", route: "/" },
     { icon: "bwi-collection", name: "Favorites", route: "/" },
diff --git a/libs/components/src/stories/kitchen-sink/kitchen-sink-shared.module.ts b/libs/components/src/stories/kitchen-sink/kitchen-sink-shared.module.ts
index 56e3a92e2a..c4fe2f9b2a 100644
--- a/libs/components/src/stories/kitchen-sink/kitchen-sink-shared.module.ts
+++ b/libs/components/src/stories/kitchen-sink/kitchen-sink-shared.module.ts
@@ -13,6 +13,7 @@ import { CalloutModule } from "../../callout";
 import { CheckboxModule } from "../../checkbox";
 import { ColorPasswordModule } from "../../color-password";
 import { DialogModule } from "../../dialog";
+import { DrawerModule } from "../../drawer";
 import { FormControlModule } from "../../form-control";
 import { FormFieldModule } from "../../form-field";
 import { IconModule } from "../../icon";
@@ -48,6 +49,7 @@ import { TypographyModule } from "../../typography";
     ColorPasswordModule,
     CommonModule,
     DialogModule,
+    DrawerModule,
     FormControlModule,
     FormFieldModule,
     FormsModule,
@@ -85,6 +87,7 @@ import { TypographyModule } from "../../typography";
     ColorPasswordModule,
     CommonModule,
     DialogModule,
+    DrawerModule,
     FormControlModule,
     FormFieldModule,
     FormsModule,
diff --git a/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts b/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts
index a90597c171..62b9398438 100644
--- a/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts
+++ b/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts
@@ -1,13 +1,7 @@
 import { importProvidersFrom } from "@angular/core";
 import { provideNoopAnimations } from "@angular/platform-browser/animations";
 import { RouterModule } from "@angular/router";
-import {
-  Meta,
-  StoryObj,
-  applicationConfig,
-  componentWrapperDecorator,
-  moduleMetadata,
-} from "@storybook/angular";
+import { Meta, StoryObj, applicationConfig, moduleMetadata } from "@storybook/angular";
 import {
   userEvent,
   getAllByRole,
@@ -23,6 +17,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { DialogService } from "../../dialog";
 import { LayoutComponent } from "../../layout";
 import { I18nMockService } from "../../utils/i18n-mock.service";
+import { disableBothThemeDecorator, positionFixedWrapperDecorator } from "../storybook-decorators";
 
 import { DialogVirtualScrollBlockComponent } from "./components/dialog-virtual-scroll-block.component";
 import { KitchenSinkForm } from "./components/kitchen-sink-form.component";
@@ -35,25 +30,8 @@ export default {
   title: "Documentation / Kitchen Sink",
   component: LayoutComponent,
   decorators: [
-    componentWrapperDecorator(
-      /**
-       * Applying a CSS transform makes a `position: fixed` element act like it is `position: relative`
-       * https://github.com/storybookjs/storybook/issues/8011#issue-490251969
-       */
-      (story) => {
-        return /* HTML */ `<div class="tw-scale-100 tw-border-2 tw-border-solid tw-border-[red]">
-          ${story}
-        </div>`;
-      },
-      ({ globals }) => {
-        /**
-         * avoid a bug with the way that we render the same component twice in the same iframe and how
-         * that interacts with the router-outlet
-         */
-        const themeOverride = globals["theme"] === "both" ? "light" : globals["theme"];
-        return { theme: themeOverride };
-      },
-    ),
+    positionFixedWrapperDecorator(),
+    disableBothThemeDecorator,
     moduleMetadata({
       imports: [
         KitchenSinkSharedModule,
@@ -135,7 +113,7 @@ export const MenuOpen: Story = {
   },
 };
 
-export const DefaultDialogOpen: Story = {
+export const DialogOpen: Story = {
   ...Default,
   play: async (context) => {
     const canvas = context.canvasElement;
@@ -148,6 +126,19 @@ export const DefaultDialogOpen: Story = {
   },
 };
 
+export const DrawerOpen: Story = {
+  ...Default,
+  play: async (context) => {
+    const canvas = context.canvasElement;
+    const drawerButton = getByRole(canvas, "button", {
+      name: "Open Drawer",
+    });
+
+    // workaround for userEvent not firing in FF https://github.com/testing-library/user-event/issues/1075
+    await fireEvent.click(drawerButton);
+  },
+};
+
 export const PopoverOpen: Story = {
   ...Default,
   play: async (context) => {
diff --git a/libs/components/src/utils/position-fixed-wrapper-decorator.ts b/libs/components/src/stories/storybook-decorators.ts
similarity index 50%
rename from libs/components/src/utils/position-fixed-wrapper-decorator.ts
rename to libs/components/src/stories/storybook-decorators.ts
index a3298e6ad0..d59f2dd1f3 100644
--- a/libs/components/src/utils/position-fixed-wrapper-decorator.ts
+++ b/libs/components/src/stories/storybook-decorators.ts
@@ -11,7 +11,21 @@ export const positionFixedWrapperDecorator = (wrapper?: (story: string) => strin
      * https://github.com/storybookjs/storybook/issues/8011#issue-490251969
      */
     (story) =>
-      /* HTML */ `<div class="tw-scale-100 tw-h-screen tw-border-2 tw-border-solid tw-border-[red]">
+      /* HTML */ `<div
+        class="tw-scale-100 tw-h-screen tw-border-2 tw-border-solid tw-border-secondary-300 tw-overflow-auto"
+      >
         ${wrapper ? wrapper(story) : story}
       </div>`,
   );
+
+export const disableBothThemeDecorator = componentWrapperDecorator(
+  (story) => story,
+  ({ globals }) => {
+    /**
+     * avoid a bug with the way that we render the same component twice in the same iframe and how
+     * that interacts with the router-outlet
+     */
+    const themeOverride = globals["theme"] === "both" ? "light" : globals["theme"];
+    return { theme: themeOverride };
+  },
+);

From 65b393e3eeee84daa8c59b173476192f22eb64f0 Mon Sep 17 00:00:00 2001
From: Andy Pixley <3723676+pixman20@users.noreply.github.com>
Date: Thu, 16 Jan 2025 16:17:29 -0500
Subject: [PATCH 134/150] [BRE-563] Adding ability to skip electron publish
 (#12920)

---
 .github/workflows/publish-desktop.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/publish-desktop.yml b/.github/workflows/publish-desktop.yml
index 69ccd84106..a8719f71a6 100644
--- a/.github/workflows/publish-desktop.yml
+++ b/.github/workflows/publish-desktop.yml
@@ -7,22 +7,26 @@ on:
       publish_type:
         description: 'Publish Options'
         required: true
-        default: 'Initial Publish'
+        default: 'Publish'
         type: choice
         options:
-          - Initial Publish
-          - Republish
+          - Publish
           - Dry Run
       version:
         description: 'Version to publish (default: latest desktop release)'
         required: true
         type: string
         default: latest
-      rollout_percentage:
-        description: 'Staged Rollout Percentage'
+      electron_rollout_percentage:
+        description: 'Staged Rollout Percentage for Electron'
         required: true
         default: '10'
         type: string
+      electron_publish:
+        description: 'Publish Electron blob to AWS'
+        required: true
+        default: true
+        type: boolean
       snap_publish:
         description: 'Publish to Snap store'
         required: true
@@ -107,6 +111,7 @@ jobs:
     name: Electron blob publish
     runs-on: ubuntu-22.04
     needs: setup
+    if: inputs.electron_publish
     env:
       _PKG_VERSION: ${{ needs.setup.outputs.release_version }}
       _RELEASE_TAG: ${{ needs.setup.outputs.tag_name }}
@@ -137,7 +142,7 @@ jobs:
       - name: Set staged rollout percentage
         env:
           RELEASE_CHANNEL: ${{ needs.setup.outputs.release_channel }}
-          ROLLOUT_PCT: ${{ inputs.rollout_percentage }}
+          ROLLOUT_PCT: ${{ inputs.electron_rollout_percentage }}
         run: |
           echo "stagingPercentage: ${ROLLOUT_PCT}" >> apps/desktop/artifacts/${RELEASE_CHANNEL}.yml
           echo "stagingPercentage: ${ROLLOUT_PCT}" >> apps/desktop/artifacts/${RELEASE_CHANNEL}-linux.yml

From 2579c29c730c82fc5ecf6595995dfb72d0eded10 Mon Sep 17 00:00:00 2001
From: Jordan Aasen <166539328+jaasen-livefront@users.noreply.github.com>
Date: Thu, 16 Jan 2025 13:37:46 -0800
Subject: [PATCH 135/150] update button copy for generate passphrase. remove
 legacy css class (#12841)

---
 ...credential-generator-dialog.component.html | 21 +++++++++----------
 .../generator/core/src/data/generators.ts     |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/apps/desktop/src/vault/app/vault/credential-generator-dialog.component.html b/apps/desktop/src/vault/app/vault/credential-generator-dialog.component.html
index d16f8e4f1c..713118aeac 100644
--- a/apps/desktop/src/vault/app/vault/credential-generator-dialog.component.html
+++ b/apps/desktop/src/vault/app/vault/credential-generator-dialog.component.html
@@ -21,16 +21,15 @@
     </bit-item>
   </ng-container>
   <ng-container bitDialogFooter>
-    <div class="modal-footer">
-      <button
-        type="button"
-        class="primary"
-        (click)="applyCredentials()"
-        appA11yTitle="{{ buttonLabel }}"
-        bitDialogClose
-      >
-        {{ buttonLabel }}
-      </button>
-    </div>
+    <button
+      type="button"
+      buttonType="primary"
+      (click)="applyCredentials()"
+      appA11yTitle="{{ buttonLabel }}"
+      bitButton
+      bitDialogClose
+    >
+      {{ buttonLabel }}
+    </button>
   </ng-container>
 </bit-dialog>
diff --git a/libs/tools/generator/core/src/data/generators.ts b/libs/tools/generator/core/src/data/generators.ts
index 92b20b02b7..12209b402e 100644
--- a/libs/tools/generator/core/src/data/generators.ts
+++ b/libs/tools/generator/core/src/data/generators.ts
@@ -58,7 +58,7 @@ const PASSPHRASE: CredentialGeneratorConfiguration<
   generateKey: "generatePassphrase",
   generatedValueKey: "passphrase",
   copyKey: "copyPassphrase",
-  useGeneratedValueKey: "useThisPassphrase",
+  useGeneratedValueKey: "useThisPassword",
   onlyOnRequest: false,
   request: [],
   engine: {

From 795ad78a4e5aaff788841519fd8004a206626f3e Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github.com>
Date: Thu, 16 Jan 2025 22:01:33 +0000
Subject: [PATCH 136/150] Bumped Desktop client to 2025.1.4

---
 apps/desktop/package.json          | 2 +-
 apps/desktop/src/package-lock.json | 4 ++--
 apps/desktop/src/package.json      | 2 +-
 package-lock.json                  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index eaa27c3eb9..249145eb3e 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bitwarden/desktop",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2025.1.3",
+  "version": "2025.1.4",
   "keywords": [
     "bitwarden",
     "password",
diff --git a/apps/desktop/src/package-lock.json b/apps/desktop/src/package-lock.json
index e825bd4158..f3dc98b8d9 100644
--- a/apps/desktop/src/package-lock.json
+++ b/apps/desktop/src/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@bitwarden/desktop",
-  "version": "2025.1.3",
+  "version": "2025.1.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bitwarden/desktop",
-      "version": "2025.1.3",
+      "version": "2025.1.4",
       "license": "GPL-3.0",
       "dependencies": {
         "@bitwarden/desktop-napi": "file:../desktop_native/napi"
diff --git a/apps/desktop/src/package.json b/apps/desktop/src/package.json
index 6feed97079..7497d31d62 100644
--- a/apps/desktop/src/package.json
+++ b/apps/desktop/src/package.json
@@ -2,7 +2,7 @@
   "name": "@bitwarden/desktop",
   "productName": "Bitwarden",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2025.1.3",
+  "version": "2025.1.4",
   "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",
diff --git a/package-lock.json b/package-lock.json
index 12a1468e3b..28624e50a9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -232,7 +232,7 @@
     },
     "apps/desktop": {
       "name": "@bitwarden/desktop",
-      "version": "2025.1.3",
+      "version": "2025.1.4",
       "hasInstallScript": true,
       "license": "GPL-3.0"
     },

From 374ea6af7c86ed99ba1e9ebc6a10a761dd1e32d9 Mon Sep 17 00:00:00 2001
From: Cesar Gonzalez <cesar.a.gonzalezcs@gmail.com>
Date: Thu, 16 Jan 2025 17:39:05 -0600
Subject: [PATCH 137/150] [PM-16719] [COMMUNITY] Debounce requestIdleCallback a
 single time every 100ms, as opposed to call requestIdleCallback on debounce
 method (#12695)

* [COMMUNITY] Debounce requestIdleCallback a single time every 100ms, as opposed to call requestIdleCallback on debounce method

Potential fix for #12031

* [COMMUNITY] Fixing broken jest mock of the debounce utils method

* [COMMUNITY] Fixing broken jest mock of the debounce utils method

* [COMMUNITY] Fixing broken jest mock of the debounce utils method
---
 .../services/collect-autofill-content.service.spec.ts       | 2 +-
 .../autofill/services/collect-autofill-content.service.ts   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/browser/src/autofill/services/collect-autofill-content.service.spec.ts b/apps/browser/src/autofill/services/collect-autofill-content.service.spec.ts
index 7471c29891..f15c3e4c38 100644
--- a/apps/browser/src/autofill/services/collect-autofill-content.service.spec.ts
+++ b/apps/browser/src/autofill/services/collect-autofill-content.service.spec.ts
@@ -21,7 +21,7 @@ jest.mock("../utils", () => {
   const utils = jest.requireActual("../utils");
   return {
     ...utils,
-    debounce: jest.fn((fn) => fn),
+    debounce: jest.fn((fn, wait) => setTimeout(() => fn(), wait)),
   };
 });
 
diff --git a/apps/browser/src/autofill/services/collect-autofill-content.service.ts b/apps/browser/src/autofill/services/collect-autofill-content.service.ts
index 13c546bccd..8ccf726aa6 100644
--- a/apps/browser/src/autofill/services/collect-autofill-content.service.ts
+++ b/apps/browser/src/autofill/services/collect-autofill-content.service.ts
@@ -947,7 +947,8 @@ export class CollectAutofillContentService implements CollectAutofillContentServ
     }
 
     if (!this.mutationsQueue.length) {
-      requestIdleCallbackPolyfill(debounce(this.processMutations, 100), { timeout: 500 });
+      // Collect all mutations and debounce the processing of those mutations by 100ms to ensure we don't process too many mutations at once.
+      debounce(this.processMutations, 100);
     }
     this.mutationsQueue.push(mutations);
   };
@@ -982,7 +983,8 @@ export class CollectAutofillContentService implements CollectAutofillContentServ
     const queueLength = this.mutationsQueue.length;
 
     if (!this.domQueryService.pageContainsShadowDomElements()) {
-      this.checkPageContainsShadowDom();
+      // Checking if a page contains shadowDOM elements is a heavy operation and doesn't have to be done immediately, so we can call this within an idle moment on the event loop.
+      requestIdleCallbackPolyfill(this.checkPageContainsShadowDom, { timeout: 500 });
     }
 
     for (let queueIndex = 0; queueIndex < queueLength; queueIndex++) {

From 53f9d665697adf51f4cc8584a43f66a303c6b921 Mon Sep 17 00:00:00 2001
From: "bw-ghapp[bot]" <178206702+bw-ghapp[bot]@users.noreply.github.com>
Date: Fri, 17 Jan 2025 10:59:33 +0100
Subject: [PATCH 138/150] Autosync the updated translations (#12922)

Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>
---
 apps/desktop/src/locales/af/messages.json    |  9 +++++++++
 apps/desktop/src/locales/ar/messages.json    |  9 +++++++++
 apps/desktop/src/locales/az/messages.json    |  9 +++++++++
 apps/desktop/src/locales/be/messages.json    |  9 +++++++++
 apps/desktop/src/locales/bg/messages.json    |  9 +++++++++
 apps/desktop/src/locales/bn/messages.json    |  9 +++++++++
 apps/desktop/src/locales/bs/messages.json    |  9 +++++++++
 apps/desktop/src/locales/ca/messages.json    |  9 +++++++++
 apps/desktop/src/locales/cs/messages.json    |  9 +++++++++
 apps/desktop/src/locales/cy/messages.json    |  9 +++++++++
 apps/desktop/src/locales/da/messages.json    |  9 +++++++++
 apps/desktop/src/locales/de/messages.json    | 11 ++++++++++-
 apps/desktop/src/locales/el/messages.json    |  9 +++++++++
 apps/desktop/src/locales/en_GB/messages.json |  9 +++++++++
 apps/desktop/src/locales/en_IN/messages.json |  9 +++++++++
 apps/desktop/src/locales/eo/messages.json    |  9 +++++++++
 apps/desktop/src/locales/es/messages.json    |  9 +++++++++
 apps/desktop/src/locales/et/messages.json    |  9 +++++++++
 apps/desktop/src/locales/eu/messages.json    |  9 +++++++++
 apps/desktop/src/locales/fa/messages.json    |  9 +++++++++
 apps/desktop/src/locales/fi/messages.json    |  9 +++++++++
 apps/desktop/src/locales/fil/messages.json   |  9 +++++++++
 apps/desktop/src/locales/fr/messages.json    |  9 +++++++++
 apps/desktop/src/locales/gl/messages.json    |  9 +++++++++
 apps/desktop/src/locales/he/messages.json    |  9 +++++++++
 apps/desktop/src/locales/hi/messages.json    |  9 +++++++++
 apps/desktop/src/locales/hr/messages.json    |  9 +++++++++
 apps/desktop/src/locales/hu/messages.json    |  9 +++++++++
 apps/desktop/src/locales/id/messages.json    |  9 +++++++++
 apps/desktop/src/locales/it/messages.json    |  9 +++++++++
 apps/desktop/src/locales/ja/messages.json    |  9 +++++++++
 apps/desktop/src/locales/ka/messages.json    |  9 +++++++++
 apps/desktop/src/locales/km/messages.json    |  9 +++++++++
 apps/desktop/src/locales/kn/messages.json    |  9 +++++++++
 apps/desktop/src/locales/ko/messages.json    |  9 +++++++++
 apps/desktop/src/locales/lt/messages.json    |  9 +++++++++
 apps/desktop/src/locales/lv/messages.json    | 13 +++++++++++--
 apps/desktop/src/locales/me/messages.json    |  9 +++++++++
 apps/desktop/src/locales/ml/messages.json    |  9 +++++++++
 apps/desktop/src/locales/mr/messages.json    |  9 +++++++++
 apps/desktop/src/locales/my/messages.json    |  9 +++++++++
 apps/desktop/src/locales/nb/messages.json    |  9 +++++++++
 apps/desktop/src/locales/ne/messages.json    |  9 +++++++++
 apps/desktop/src/locales/nl/messages.json    |  9 +++++++++
 apps/desktop/src/locales/nn/messages.json    |  9 +++++++++
 apps/desktop/src/locales/or/messages.json    |  9 +++++++++
 apps/desktop/src/locales/pl/messages.json    |  9 +++++++++
 apps/desktop/src/locales/pt_BR/messages.json |  9 +++++++++
 apps/desktop/src/locales/pt_PT/messages.json | 13 +++++++++++--
 apps/desktop/src/locales/ro/messages.json    |  9 +++++++++
 apps/desktop/src/locales/ru/messages.json    |  9 +++++++++
 apps/desktop/src/locales/si/messages.json    |  9 +++++++++
 apps/desktop/src/locales/sk/messages.json    |  9 +++++++++
 apps/desktop/src/locales/sl/messages.json    |  9 +++++++++
 apps/desktop/src/locales/sr/messages.json    |  9 +++++++++
 apps/desktop/src/locales/sv/messages.json    |  9 +++++++++
 apps/desktop/src/locales/te/messages.json    |  9 +++++++++
 apps/desktop/src/locales/th/messages.json    |  9 +++++++++
 apps/desktop/src/locales/tr/messages.json    |  9 +++++++++
 apps/desktop/src/locales/uk/messages.json    |  9 +++++++++
 apps/desktop/src/locales/vi/messages.json    |  9 +++++++++
 apps/desktop/src/locales/zh_CN/messages.json |  9 +++++++++
 apps/desktop/src/locales/zh_TW/messages.json |  9 +++++++++
 63 files changed, 572 insertions(+), 5 deletions(-)

diff --git a/apps/desktop/src/locales/af/messages.json b/apps/desktop/src/locales/af/messages.json
index 5ee3ba7e02..1710005ab6 100644
--- a/apps/desktop/src/locales/af/messages.json
+++ b/apps/desktop/src/locales/af/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/ar/messages.json b/apps/desktop/src/locales/ar/messages.json
index 132021f776..c2ccab5b90 100644
--- a/apps/desktop/src/locales/ar/messages.json
+++ b/apps/desktop/src/locales/ar/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "تغيير البريد الإلكتروني الخاص بالحساب"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/az/messages.json b/apps/desktop/src/locales/az/messages.json
index 9af089d1ef..68753f204e 100644
--- a/apps/desktop/src/locales/az/messages.json
+++ b/apps/desktop/src/locales/az/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Hesabın e-poçtunu dəyişdir"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Təşkilat yüksəltmə tələb olunur"
+  },
+  "upgradeOrganization": {
+    "message": "Təşkilatı yüksəlt"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "Bu özəllik, ödənişsiz təşkilatlar üçün əlçatan deyil. Daha çox özəlliyin kilidini açmaq üçün ödənişli plana keçin."
   }
 }
diff --git a/apps/desktop/src/locales/be/messages.json b/apps/desktop/src/locales/be/messages.json
index e778c59525..70b30128f9 100644
--- a/apps/desktop/src/locales/be/messages.json
+++ b/apps/desktop/src/locales/be/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/bg/messages.json b/apps/desktop/src/locales/bg/messages.json
index 9b000177bb..b3052fbc6c 100644
--- a/apps/desktop/src/locales/bg/messages.json
+++ b/apps/desktop/src/locales/bg/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Промяна на е-пощата"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Необходимо е надграждане на организацията"
+  },
+  "upgradeOrganization": {
+    "message": "Надграждане на организацията"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "Безплатните планове нямат достъп до тази функционалност. Преминете към платен план, за да се възползвате от тази и много други възможности."
   }
 }
diff --git a/apps/desktop/src/locales/bn/messages.json b/apps/desktop/src/locales/bn/messages.json
index 069c58d751..7e1994cdea 100644
--- a/apps/desktop/src/locales/bn/messages.json
+++ b/apps/desktop/src/locales/bn/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/bs/messages.json b/apps/desktop/src/locales/bs/messages.json
index f5052559de..487d98a327 100644
--- a/apps/desktop/src/locales/bs/messages.json
+++ b/apps/desktop/src/locales/bs/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/ca/messages.json b/apps/desktop/src/locales/ca/messages.json
index 9d82ad59fa..46f876e560 100644
--- a/apps/desktop/src/locales/ca/messages.json
+++ b/apps/desktop/src/locales/ca/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/cs/messages.json b/apps/desktop/src/locales/cs/messages.json
index 83f2840b72..28c20ee518 100644
--- a/apps/desktop/src/locales/cs/messages.json
+++ b/apps/desktop/src/locales/cs/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Změnit e-mail účtu"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Je vyžadována aktualizace organizace"
+  },
+  "upgradeOrganization": {
+    "message": "Aktualizovat organizaci"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "Tato funkce není dostupná pro bezplatné organizace. Přepněte na placenou verzi a odemkněte další funkce."
   }
 }
diff --git a/apps/desktop/src/locales/cy/messages.json b/apps/desktop/src/locales/cy/messages.json
index f4e0853a93..897b5bb550 100644
--- a/apps/desktop/src/locales/cy/messages.json
+++ b/apps/desktop/src/locales/cy/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/da/messages.json b/apps/desktop/src/locales/da/messages.json
index ebe74818f4..0d1c94527b 100644
--- a/apps/desktop/src/locales/da/messages.json
+++ b/apps/desktop/src/locales/da/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Skift kontoe-mailadresse"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organisationsopgradering krævet"
+  },
+  "upgradeOrganization": {
+    "message": "Opgradér organisation"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "Denne funktion er utilgængelig for gratis organisationer. Skift til en betalingsabonnementstype for at oplåse flere funktioner."
   }
 }
diff --git a/apps/desktop/src/locales/de/messages.json b/apps/desktop/src/locales/de/messages.json
index 133d98c3fa..5ce63034cb 100644
--- a/apps/desktop/src/locales/de/messages.json
+++ b/apps/desktop/src/locales/de/messages.json
@@ -260,7 +260,7 @@
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "contactCSToAvoidDataLossPart2": {
-    "message": "um zusätzlichen Datenverlust zu vermeiden.",
+    "message": ", um zusätzlichen Datenverlust zu vermeiden.",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "january": {
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "E-Mail-Adresse des Kontos ändern"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organisations-Upgrade erforderlich"
+  },
+  "upgradeOrganization": {
+    "message": "Organisation upgraden"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "Diese Funktion ist für kostenlose Organisationen nicht verfügbar. Wechsle zu einem kostenpflichtigen Abonnement, um weitere Funktionen freizuschalten."
   }
 }
diff --git a/apps/desktop/src/locales/el/messages.json b/apps/desktop/src/locales/el/messages.json
index 145f386c6b..3fed18252f 100644
--- a/apps/desktop/src/locales/el/messages.json
+++ b/apps/desktop/src/locales/el/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/en_GB/messages.json b/apps/desktop/src/locales/en_GB/messages.json
index acca06b8b4..b33f264440 100644
--- a/apps/desktop/src/locales/en_GB/messages.json
+++ b/apps/desktop/src/locales/en_GB/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organisation upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organisation"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organisations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/en_IN/messages.json b/apps/desktop/src/locales/en_IN/messages.json
index 122217dae9..e3780c1698 100644
--- a/apps/desktop/src/locales/en_IN/messages.json
+++ b/apps/desktop/src/locales/en_IN/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organisation upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organisation"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organisations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/eo/messages.json b/apps/desktop/src/locales/eo/messages.json
index a4621439f5..4ba31aa743 100644
--- a/apps/desktop/src/locales/eo/messages.json
+++ b/apps/desktop/src/locales/eo/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/es/messages.json b/apps/desktop/src/locales/es/messages.json
index 1915002b6b..00e17cadc4 100644
--- a/apps/desktop/src/locales/es/messages.json
+++ b/apps/desktop/src/locales/es/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/et/messages.json b/apps/desktop/src/locales/et/messages.json
index 8396316416..a34820dc5a 100644
--- a/apps/desktop/src/locales/et/messages.json
+++ b/apps/desktop/src/locales/et/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/eu/messages.json b/apps/desktop/src/locales/eu/messages.json
index 2daed855e5..ff7faec50b 100644
--- a/apps/desktop/src/locales/eu/messages.json
+++ b/apps/desktop/src/locales/eu/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/fa/messages.json b/apps/desktop/src/locales/fa/messages.json
index b79dc2d90e..710e7ec346 100644
--- a/apps/desktop/src/locales/fa/messages.json
+++ b/apps/desktop/src/locales/fa/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/fi/messages.json b/apps/desktop/src/locales/fi/messages.json
index 2d0a8cae99..fd3d9a8a3d 100644
--- a/apps/desktop/src/locales/fi/messages.json
+++ b/apps/desktop/src/locales/fi/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Muuta tilin sähköpostiosoitetta"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/fil/messages.json b/apps/desktop/src/locales/fil/messages.json
index 1f77b85e3c..179cc7a2a5 100644
--- a/apps/desktop/src/locales/fil/messages.json
+++ b/apps/desktop/src/locales/fil/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/fr/messages.json b/apps/desktop/src/locales/fr/messages.json
index f0ab36ba63..5e6c9ed71a 100644
--- a/apps/desktop/src/locales/fr/messages.json
+++ b/apps/desktop/src/locales/fr/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Changer le courriel du compte"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/gl/messages.json b/apps/desktop/src/locales/gl/messages.json
index 1a02e5db4e..bca12f16a7 100644
--- a/apps/desktop/src/locales/gl/messages.json
+++ b/apps/desktop/src/locales/gl/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/he/messages.json b/apps/desktop/src/locales/he/messages.json
index df61cefe73..853e950dc0 100644
--- a/apps/desktop/src/locales/he/messages.json
+++ b/apps/desktop/src/locales/he/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/hi/messages.json b/apps/desktop/src/locales/hi/messages.json
index 723ea0f699..59c0f3df59 100644
--- a/apps/desktop/src/locales/hi/messages.json
+++ b/apps/desktop/src/locales/hi/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/hr/messages.json b/apps/desktop/src/locales/hr/messages.json
index 109a1abff2..5fd7fae86a 100644
--- a/apps/desktop/src/locales/hr/messages.json
+++ b/apps/desktop/src/locales/hr/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Promjeni e-poštu računa"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/hu/messages.json b/apps/desktop/src/locales/hu/messages.json
index 3716e1e67a..19fd8a7fe4 100644
--- a/apps/desktop/src/locales/hu/messages.json
+++ b/apps/desktop/src/locales/hu/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Fiók email cím megváltoztatása"
+  },
+  "organizationUpgradeRequired": {
+    "message": "A szervezet felminősítése szükséges."
+  },
+  "upgradeOrganization": {
+    "message": "Szervezeti áttérés"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "Ez a szolgáltatás nem elérhető ingyenes szervezeteknek. Váltás fizetős díjcsomagra a további funkciók feloldásához."
   }
 }
diff --git a/apps/desktop/src/locales/id/messages.json b/apps/desktop/src/locales/id/messages.json
index d4bcded0ee..328200858e 100644
--- a/apps/desktop/src/locales/id/messages.json
+++ b/apps/desktop/src/locales/id/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/it/messages.json b/apps/desktop/src/locales/it/messages.json
index c85127fce2..e58d2fd665 100644
--- a/apps/desktop/src/locales/it/messages.json
+++ b/apps/desktop/src/locales/it/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Cambia l'e-mail dell'account"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Aggiornamento dell'organizzazione richiesto"
+  },
+  "upgradeOrganization": {
+    "message": "Aggiorna organizzazione"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "Questa funzione non è disponibile per le organizzazioni gratuite. Passa a un piano a pagamento per sbloccare più funzioni."
   }
 }
diff --git a/apps/desktop/src/locales/ja/messages.json b/apps/desktop/src/locales/ja/messages.json
index 9ce8f6a3ea..671ab6c830 100644
--- a/apps/desktop/src/locales/ja/messages.json
+++ b/apps/desktop/src/locales/ja/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "アカウントのメールアドレスを変更する"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/ka/messages.json b/apps/desktop/src/locales/ka/messages.json
index bf434a6c29..a1951c542a 100644
--- a/apps/desktop/src/locales/ka/messages.json
+++ b/apps/desktop/src/locales/ka/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/km/messages.json b/apps/desktop/src/locales/km/messages.json
index 1a02e5db4e..bca12f16a7 100644
--- a/apps/desktop/src/locales/km/messages.json
+++ b/apps/desktop/src/locales/km/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/kn/messages.json b/apps/desktop/src/locales/kn/messages.json
index f3401477f4..840b73558c 100644
--- a/apps/desktop/src/locales/kn/messages.json
+++ b/apps/desktop/src/locales/kn/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/ko/messages.json b/apps/desktop/src/locales/ko/messages.json
index 1aafdc4bc6..38b1a2b9a5 100644
--- a/apps/desktop/src/locales/ko/messages.json
+++ b/apps/desktop/src/locales/ko/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/lt/messages.json b/apps/desktop/src/locales/lt/messages.json
index 11c70dd419..1f010d3330 100644
--- a/apps/desktop/src/locales/lt/messages.json
+++ b/apps/desktop/src/locales/lt/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/lv/messages.json b/apps/desktop/src/locales/lv/messages.json
index 68495a2513..292cff77fb 100644
--- a/apps/desktop/src/locales/lv/messages.json
+++ b/apps/desktop/src/locales/lv/messages.json
@@ -2880,10 +2880,10 @@
     "message": "Noteikta vāja parole, un tā ir atrasta datu noplūdē. Jāizmanto spēcīga un neatkārtojama parole, lai aizsargātu savu kontu. Vai tiešām izmantot šo paroli?"
   },
   "useThisPassword": {
-    "message": "Use this password"
+    "message": "Izmantot šo paroli"
   },
   "useThisUsername": {
-    "message": "Use this username"
+    "message": "Izmantot šo lietotājvārdu"
   },
   "checkForBreaches": {
     "message": "Meklēt šo paroli zināmās datu noplūdēs"
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Mainīt konta e-pasta adresi"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Nepieciešams apvienības uzlabojums"
+  },
+  "upgradeOrganization": {
+    "message": "Uzlabot apvienību"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "Šī iespēja nav pieejama bezmaksas apvienībām. Maksas plāna izvēle sniedz plašākas iespējas."
   }
 }
diff --git a/apps/desktop/src/locales/me/messages.json b/apps/desktop/src/locales/me/messages.json
index ac9994c313..a03a80d01c 100644
--- a/apps/desktop/src/locales/me/messages.json
+++ b/apps/desktop/src/locales/me/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/ml/messages.json b/apps/desktop/src/locales/ml/messages.json
index 15d4de334e..41e4225c2d 100644
--- a/apps/desktop/src/locales/ml/messages.json
+++ b/apps/desktop/src/locales/ml/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/mr/messages.json b/apps/desktop/src/locales/mr/messages.json
index 1a02e5db4e..bca12f16a7 100644
--- a/apps/desktop/src/locales/mr/messages.json
+++ b/apps/desktop/src/locales/mr/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/my/messages.json b/apps/desktop/src/locales/my/messages.json
index ca39973149..2c16b832f3 100644
--- a/apps/desktop/src/locales/my/messages.json
+++ b/apps/desktop/src/locales/my/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/nb/messages.json b/apps/desktop/src/locales/nb/messages.json
index 0ebecf3be8..f6fe08a897 100644
--- a/apps/desktop/src/locales/nb/messages.json
+++ b/apps/desktop/src/locales/nb/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/ne/messages.json b/apps/desktop/src/locales/ne/messages.json
index 624547d212..7be28d2ced 100644
--- a/apps/desktop/src/locales/ne/messages.json
+++ b/apps/desktop/src/locales/ne/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/nl/messages.json b/apps/desktop/src/locales/nl/messages.json
index 6f3670afa3..877acb0d0d 100644
--- a/apps/desktop/src/locales/nl/messages.json
+++ b/apps/desktop/src/locales/nl/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "E-mailadres van het account veranderen"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organisatie-upgrade vereist"
+  },
+  "upgradeOrganization": {
+    "message": "Organisatie upgraden"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "Deze mogelijkheid is niet beschikbaar voor gratis organisaties. Schakel over naar een betaald abonnement om meer mogelijkheden te ontgrendelen."
   }
 }
diff --git a/apps/desktop/src/locales/nn/messages.json b/apps/desktop/src/locales/nn/messages.json
index df2f70ae83..ef5a060376 100644
--- a/apps/desktop/src/locales/nn/messages.json
+++ b/apps/desktop/src/locales/nn/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/or/messages.json b/apps/desktop/src/locales/or/messages.json
index ea55a1c602..374cbf1bc9 100644
--- a/apps/desktop/src/locales/or/messages.json
+++ b/apps/desktop/src/locales/or/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/pl/messages.json b/apps/desktop/src/locales/pl/messages.json
index d7b950100f..9cc6355554 100644
--- a/apps/desktop/src/locales/pl/messages.json
+++ b/apps/desktop/src/locales/pl/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/pt_BR/messages.json b/apps/desktop/src/locales/pt_BR/messages.json
index 312fe4e8e8..33bceb6166 100644
--- a/apps/desktop/src/locales/pt_BR/messages.json
+++ b/apps/desktop/src/locales/pt_BR/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Alterar e-mail"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/pt_PT/messages.json b/apps/desktop/src/locales/pt_PT/messages.json
index d88862a798..61aa40e330 100644
--- a/apps/desktop/src/locales/pt_PT/messages.json
+++ b/apps/desktop/src/locales/pt_PT/messages.json
@@ -2801,7 +2801,7 @@
     "message": "Recusar início de sessão"
   },
   "logInConfirmedForEmailOnDevice": {
-    "message": "Início de sessão confirmado para $EMAIL$ em $DEVICE$",
+    "message": "Início de sessão confirmado para $EMAIL$ no $DEVICE$",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -2814,7 +2814,7 @@
     }
   },
   "youDeniedALogInAttemptFromAnotherDevice": {
-    "message": "Negou uma tentativa de início de sessão de outro dispositivo. Se foi realmente o caso, tente iniciar sessão com o dispositivo novamente."
+    "message": "Recusou uma tentativa de início de sessão de outro dispositivo. Se foi realmente o caso, tente iniciar sessão com o dispositivo novamente."
   },
   "justNow": {
     "message": "Agora mesmo"
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Alterar o e-mail da conta"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Atualização da organização necessária"
+  },
+  "upgradeOrganization": {
+    "message": "Atualizar organização"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "Esta funcionalidade não está disponível para organizações gratuitas. Mude para um plano pago para desbloquear mais funcionalidades."
   }
 }
diff --git a/apps/desktop/src/locales/ro/messages.json b/apps/desktop/src/locales/ro/messages.json
index d4ca5e21a5..17b9d050f0 100644
--- a/apps/desktop/src/locales/ro/messages.json
+++ b/apps/desktop/src/locales/ro/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/ru/messages.json b/apps/desktop/src/locales/ru/messages.json
index 46e04b7770..408bc37317 100644
--- a/apps/desktop/src/locales/ru/messages.json
+++ b/apps/desktop/src/locales/ru/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Изменить email аккаунта"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Требуется обновление организации"
+  },
+  "upgradeOrganization": {
+    "message": "Обновить организацию"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "Эта функция недоступна для бесплатных организаций. Переключитесь на платный план, чтобы разблокировать дополнительные возможности."
   }
 }
diff --git a/apps/desktop/src/locales/si/messages.json b/apps/desktop/src/locales/si/messages.json
index 5372bf5963..caec95368e 100644
--- a/apps/desktop/src/locales/si/messages.json
+++ b/apps/desktop/src/locales/si/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/sk/messages.json b/apps/desktop/src/locales/sk/messages.json
index 07851ddc47..1c253151ab 100644
--- a/apps/desktop/src/locales/sk/messages.json
+++ b/apps/desktop/src/locales/sk/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Zmeniť e-mail účtu"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Vyžaduje sa upgrade organizácie"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organizácie"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "Táto funkcia nie je k dispozícii pre bezplatné organizácie. Ak chcete odomknúť ďalšie funkcie, prejdite na platený plán."
   }
 }
diff --git a/apps/desktop/src/locales/sl/messages.json b/apps/desktop/src/locales/sl/messages.json
index c4fae11c81..cd36695335 100644
--- a/apps/desktop/src/locales/sl/messages.json
+++ b/apps/desktop/src/locales/sl/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/sr/messages.json b/apps/desktop/src/locales/sr/messages.json
index 03cc5b8c26..d4109a70bf 100644
--- a/apps/desktop/src/locales/sr/messages.json
+++ b/apps/desktop/src/locales/sr/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/sv/messages.json b/apps/desktop/src/locales/sv/messages.json
index 920981908f..e26e44c692 100644
--- a/apps/desktop/src/locales/sv/messages.json
+++ b/apps/desktop/src/locales/sv/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/te/messages.json b/apps/desktop/src/locales/te/messages.json
index 1a02e5db4e..bca12f16a7 100644
--- a/apps/desktop/src/locales/te/messages.json
+++ b/apps/desktop/src/locales/te/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/th/messages.json b/apps/desktop/src/locales/th/messages.json
index 7f7e373132..3298ed1668 100644
--- a/apps/desktop/src/locales/th/messages.json
+++ b/apps/desktop/src/locales/th/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/tr/messages.json b/apps/desktop/src/locales/tr/messages.json
index 2fbd751ddb..76ba6cb9d2 100644
--- a/apps/desktop/src/locales/tr/messages.json
+++ b/apps/desktop/src/locales/tr/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Hesap e-postasını değiştir"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/uk/messages.json b/apps/desktop/src/locales/uk/messages.json
index db0259adc0..4d9e851242 100644
--- a/apps/desktop/src/locales/uk/messages.json
+++ b/apps/desktop/src/locales/uk/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Змінити адресу е-пошти"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/vi/messages.json b/apps/desktop/src/locales/vi/messages.json
index 07dcdfd373..c0e79109ad 100644
--- a/apps/desktop/src/locales/vi/messages.json
+++ b/apps/desktop/src/locales/vi/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "Change account email"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }
diff --git a/apps/desktop/src/locales/zh_CN/messages.json b/apps/desktop/src/locales/zh_CN/messages.json
index c9046b34a5..54b51259a8 100644
--- a/apps/desktop/src/locales/zh_CN/messages.json
+++ b/apps/desktop/src/locales/zh_CN/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "更改账户电子邮箱"
+  },
+  "organizationUpgradeRequired": {
+    "message": "需要升级组织"
+  },
+  "upgradeOrganization": {
+    "message": "升级组织"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "此功能不适用于免费组织。请切换到付费计划以解锁更多功能。"
   }
 }
diff --git a/apps/desktop/src/locales/zh_TW/messages.json b/apps/desktop/src/locales/zh_TW/messages.json
index a9206a50df..c59d3f8ddf 100644
--- a/apps/desktop/src/locales/zh_TW/messages.json
+++ b/apps/desktop/src/locales/zh_TW/messages.json
@@ -3474,5 +3474,14 @@
   },
   "changeAcctEmail": {
     "message": "更改帳號電子郵件位址"
+  },
+  "organizationUpgradeRequired": {
+    "message": "Organization upgrade required"
+  },
+  "upgradeOrganization": {
+    "message": "Upgrade organization"
+  },
+  "upgradeOrganizationDesc": {
+    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
   }
 }

From 9eb7daa77d3b90c47f97ac2d5a7e3d938c124cc1 Mon Sep 17 00:00:00 2001
From: "bw-ghapp[bot]" <178206702+bw-ghapp[bot]@users.noreply.github.com>
Date: Fri, 17 Jan 2025 11:13:00 +0100
Subject: [PATCH 139/150] Autosync the updated translations (#12923)

Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>
---
 apps/browser/src/_locales/ar/messages.json    | 17 +++---
 apps/browser/src/_locales/az/messages.json    | 17 +++---
 apps/browser/src/_locales/be/messages.json    | 17 +++---
 apps/browser/src/_locales/bg/messages.json    | 19 +++----
 apps/browser/src/_locales/bn/messages.json    | 17 +++---
 apps/browser/src/_locales/bs/messages.json    | 17 +++---
 apps/browser/src/_locales/ca/messages.json    | 17 +++---
 apps/browser/src/_locales/cs/messages.json    | 17 +++---
 apps/browser/src/_locales/cy/messages.json    | 17 +++---
 apps/browser/src/_locales/da/messages.json    | 17 +++---
 apps/browser/src/_locales/de/messages.json    | 25 ++++-----
 apps/browser/src/_locales/el/messages.json    | 19 +++----
 apps/browser/src/_locales/en_GB/messages.json | 19 +++----
 apps/browser/src/_locales/en_IN/messages.json | 19 +++----
 apps/browser/src/_locales/es/messages.json    | 19 +++----
 apps/browser/src/_locales/et/messages.json    | 17 +++---
 apps/browser/src/_locales/eu/messages.json    | 17 +++---
 apps/browser/src/_locales/fa/messages.json    | 17 +++---
 apps/browser/src/_locales/fi/messages.json    | 19 +++----
 apps/browser/src/_locales/fil/messages.json   | 17 +++---
 apps/browser/src/_locales/fr/messages.json    | 19 +++----
 apps/browser/src/_locales/gl/messages.json    | 47 ++++++++--------
 apps/browser/src/_locales/he/messages.json    | 19 +++----
 apps/browser/src/_locales/hi/messages.json    | 17 +++---
 apps/browser/src/_locales/hr/messages.json    | 19 +++----
 apps/browser/src/_locales/hu/messages.json    | 17 +++---
 apps/browser/src/_locales/id/messages.json    | 19 +++----
 apps/browser/src/_locales/it/messages.json    | 19 +++----
 apps/browser/src/_locales/ja/messages.json    | 19 +++----
 apps/browser/src/_locales/ka/messages.json    | 17 +++---
 apps/browser/src/_locales/km/messages.json    | 17 +++---
 apps/browser/src/_locales/kn/messages.json    | 17 +++---
 apps/browser/src/_locales/ko/messages.json    | 19 +++----
 apps/browser/src/_locales/lt/messages.json    | 17 +++---
 apps/browser/src/_locales/lv/messages.json    | 19 +++----
 apps/browser/src/_locales/ml/messages.json    | 17 +++---
 apps/browser/src/_locales/mr/messages.json    | 17 +++---
 apps/browser/src/_locales/my/messages.json    | 17 +++---
 apps/browser/src/_locales/nb/messages.json    | 19 +++----
 apps/browser/src/_locales/ne/messages.json    | 17 +++---
 apps/browser/src/_locales/nl/messages.json    | 17 +++---
 apps/browser/src/_locales/nn/messages.json    | 17 +++---
 apps/browser/src/_locales/or/messages.json    | 17 +++---
 apps/browser/src/_locales/pl/messages.json    | 19 +++----
 apps/browser/src/_locales/pt_BR/messages.json | 19 +++----
 apps/browser/src/_locales/pt_PT/messages.json | 17 +++---
 apps/browser/src/_locales/ro/messages.json    | 17 +++---
 apps/browser/src/_locales/ru/messages.json    | 17 +++---
 apps/browser/src/_locales/si/messages.json    | 17 +++---
 apps/browser/src/_locales/sk/messages.json    | 17 +++---
 apps/browser/src/_locales/sl/messages.json    | 17 +++---
 apps/browser/src/_locales/sr/messages.json    | 19 +++----
 apps/browser/src/_locales/sv/messages.json    | 17 +++---
 apps/browser/src/_locales/te/messages.json    | 17 +++---
 apps/browser/src/_locales/th/messages.json    | 17 +++---
 apps/browser/src/_locales/tr/messages.json    | 43 +++++++--------
 apps/browser/src/_locales/uk/messages.json    | 39 +++++++-------
 apps/browser/src/_locales/vi/messages.json    | 19 +++----
 apps/browser/src/_locales/zh_CN/messages.json | 17 +++---
 apps/browser/src/_locales/zh_TW/messages.json | 19 +++----
 apps/browser/store/locales/ru/copy.resx       | 53 +++++++++----------
 61 files changed, 509 insertions(+), 690 deletions(-)

diff --git a/apps/browser/src/_locales/ar/messages.json b/apps/browser/src/_locales/ar/messages.json
index 8b4bbe23e0..30f20dfff1 100644
--- a/apps/browser/src/_locales/ar/messages.json
+++ b/apps/browser/src/_locales/ar/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "الموقع $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/az/messages.json b/apps/browser/src/_locales/az/messages.json
index 86f1d07fb3..9184b84d73 100644
--- a/apps/browser/src/_locales/az/messages.json
+++ b/apps/browser/src/_locales/az/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Bu veb saytlar üçün avto-doldurma və digər əlaqəli özəlliklər təklif olunmayacaq. Dəyişikliklərin qüvvəyə minməsi üçün səhifəni təzələməlisiniz."
   },
-  "autofillBlockedNotice": {
-    "message": "Bu veb sayt üçün avto-doldurma əngəllənib. Bunu ayarlarda incələyin və ya dəyişdirin."
+  "autofillBlockedNoticeV2": {
+    "message": "Bu veb sayt üçün avto-doldurma əngəllənib."
   },
-  "autofillBlockedTooltip": {
-    "message": "Bu veb saytda avto-doldurma əngəllənib. Ayarlarda incələyin."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Bunu ayarlarda dəyişdir"
   },
   "websiteItemLabel": {
     "message": "Veb sayt $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Avto-doldurma təklifləri"
   },
+  "itemSuggestions": {
+    "message": "Təklif olunan elementlər"
+  },
   "autofillSuggestionsTip": {
     "message": "Bu saytın avto-doldurması üçün giriş elementini saxlayın"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Mətn \"Send\"ləri"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden-in yeni bir görünüşü var!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "Seyf vərəqindən avto-doldurma və axtarış etmə artıq daha asan və intuitivdir. Nəzər salın!"
-  },
   "accountActions": {
     "message": "Hesab fəaliyyətləri"
   },
diff --git a/apps/browser/src/_locales/be/messages.json b/apps/browser/src/_locales/be/messages.json
index 036b1dfcb2..66545d5666 100644
--- a/apps/browser/src/_locales/be/messages.json
+++ b/apps/browser/src/_locales/be/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Вэб-сайт $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/bg/messages.json b/apps/browser/src/_locales/bg/messages.json
index 098e2b9105..d4f8188367 100644
--- a/apps/browser/src/_locales/bg/messages.json
+++ b/apps/browser/src/_locales/bg/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Автоматичното попълване и други свързани функции няма да бъдат предлагани за тези уеб сайтове. Трябва да презаредите страницата, за да влязат в сила промените."
   },
-  "autofillBlockedNotice": {
-    "message": "Автоматичното попълване е блокирано за този уеб сайт. Можете да прегледате и промените това в настройките."
+  "autofillBlockedNoticeV2": {
+    "message": "Автоматичното попълване е блокирано за този уеб сайт."
   },
-  "autofillBlockedTooltip": {
-    "message": "Автоматичното попълване е блокирано за този уеб сайт. Можете да прегледате това в настройките."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Променете това в настройките"
   },
   "websiteItemLabel": {
     "message": "Уеб сайт $number$ (адрес)",
@@ -4008,7 +4008,10 @@
     "message": "Секретният ключ е премахнат"
   },
   "autofillSuggestions": {
-    "message": "Автоматично попълване на предложения"
+    "message": "Предложения за авт. попълване"
+  },
+  "itemSuggestions": {
+    "message": "Препоръчани елементи"
   },
   "autofillSuggestionsTip": {
     "message": "Запазване на елемент за вписване за този уеб сайт, за авт. попълване"
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Текстови изпращания"
   },
-  "bitwardenNewLook": {
-    "message": "Биуорден има нов облик!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "Сега е по-лесно и интуитивно от всякога да използвате автоматичното попълване и да търсите в раздела на трезора. Разгледайте!"
-  },
   "accountActions": {
     "message": "Действия по регистрацията"
   },
diff --git a/apps/browser/src/_locales/bn/messages.json b/apps/browser/src/_locales/bn/messages.json
index f60fc2c968..8180813a2c 100644
--- a/apps/browser/src/_locales/bn/messages.json
+++ b/apps/browser/src/_locales/bn/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/bs/messages.json b/apps/browser/src/_locales/bs/messages.json
index aaf04da98b..0bd4144f6c 100644
--- a/apps/browser/src/_locales/bs/messages.json
+++ b/apps/browser/src/_locales/bs/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/ca/messages.json b/apps/browser/src/_locales/ca/messages.json
index e7113d5aab..ec7682f501 100644
--- a/apps/browser/src/_locales/ca/messages.json
+++ b/apps/browser/src/_locales/ca/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/cs/messages.json b/apps/browser/src/_locales/cs/messages.json
index eb2f9149da..c40ddfc6ed 100644
--- a/apps/browser/src/_locales/cs/messages.json
+++ b/apps/browser/src/_locales/cs/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Automatické vyplňování a další související funkce nebudou pro tyto webové stránky nabízeny. Aby se změny projevily, musíte stránku aktualizovat."
   },
-  "autofillBlockedNotice": {
-    "message": "Automatické vyplňování je pro tento web zablokováno. Zkontrolujte to nebo to změňte v nastavení."
+  "autofillBlockedNoticeV2": {
+    "message": "Automatické vyplňování je pro tuto stránku zablokováno."
   },
-  "autofillBlockedTooltip": {
-    "message": "Automatické vyplňování je pro tento web zablokováno. Zkontrolujte to v nastavení."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Změňte to v nastavení"
   },
   "websiteItemLabel": {
     "message": "Webová stránka $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Návrhy automatického vyplňování"
   },
+  "itemSuggestions": {
+    "message": "Navrhované položky"
+  },
   "autofillSuggestionsTip": {
     "message": "Uložit přihlašovací údaje pro tuto stránku do automatického vyplňování"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Sends s texty"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden má nový vzhled!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "Je snazší a intuitivnější než kdy jindy automaticky vyplňovat a vyhledávat z karty trezor. Mrkněte se!"
-  },
   "accountActions": {
     "message": "Činnosti účtu"
   },
diff --git a/apps/browser/src/_locales/cy/messages.json b/apps/browser/src/_locales/cy/messages.json
index 8ad494f0bf..cfa74caaa3 100644
--- a/apps/browser/src/_locales/cy/messages.json
+++ b/apps/browser/src/_locales/cy/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/da/messages.json b/apps/browser/src/_locales/da/messages.json
index 9008049e1a..c5e69fc375 100644
--- a/apps/browser/src/_locales/da/messages.json
+++ b/apps/browser/src/_locales/da/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofyldning og andre relaterede funktioner tilbydes ikke på disse websteder. Siden skal opdateres for at effektuere ændringerne."
   },
-  "autofillBlockedNotice": {
-    "message": "Autoudfyldning er blokeret på dette websted. Gennemgå eller ændr dette i Indstillinger."
+  "autofillBlockedNoticeV2": {
+    "message": "Autoudfyldning blokeret for dette websted."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autoudfyldning er blokeret på dette websted. Gennemgå i Indstillinger."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Ændr dette i Indstillinger"
   },
   "websiteItemLabel": {
     "message": "Websted $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autoudfyldningsforslag"
   },
+  "itemSuggestions": {
+    "message": "Foreslåede emner"
+  },
   "autofillSuggestionsTip": {
     "message": "Gem et loginemne for dette websted til autoudfyldning"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Tekst-Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden har fået et nyt look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "Det er lettere og mere intuitivt end nogensinde at autoudfylde og søge via fanen Boks. Tag et kig omkring!"
-  },
   "accountActions": {
     "message": "Kontohandlinger"
   },
diff --git a/apps/browser/src/_locales/de/messages.json b/apps/browser/src/_locales/de/messages.json
index fce84d1b43..872307dd94 100644
--- a/apps/browser/src/_locales/de/messages.json
+++ b/apps/browser/src/_locales/de/messages.json
@@ -2337,13 +2337,13 @@
     "message": "Bitwarden wird für alle angemeldeten Konten nicht danach fragen Zugangsdaten für diese Domains speichern. Du musst die Seite neu laden, damit die Änderungen wirksam werden."
   },
   "blockedDomainsDesc": {
-    "message": "Automatisches Ausfüllen und andere zugehörige Funktionen werden für diese Webseiten nicht angeboten. Sie müssen die Seite aktualisieren, damit die Änderungen wirksam werden."
+    "message": "Automatisches Ausfüllen und andere zugehörige Funktionen werden für diese Webseiten nicht angeboten. Du musst die Seite neu laden, damit die Änderungen wirksam werden."
   },
-  "autofillBlockedNotice": {
-    "message": "Das automatische Ausfüllen ist für diese Website gesperrt. Dieses Verhalten kann in den Einstellungen überprüft oder geändert werden."
+  "autofillBlockedNoticeV2": {
+    "message": "Automatisches Ausfüllen ist für diese Website gesperrt."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Dies in den Einstellungen ändern"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -2808,14 +2808,14 @@
     "message": "Entschlüsselungsfehler"
   },
   "couldNotDecryptVaultItemsBelow": {
-    "message": "Bitwarden konnte den unten aufgelisteten Tresoreintrag bzw. die Tresoreinträge nicht entschlüsseln."
+    "message": "Bitwarden konnte folgende(n) Tresor-Eintrag/Einträge nicht entschlüsseln."
   },
   "contactCSToAvoidDataLossPart1": {
-    "message": "Contact customer success",
+    "message": "Kontaktiere den Kundensupport",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "contactCSToAvoidDataLossPart2": {
-    "message": "um zusätzlichen Datenverlust zu vermeiden.",
+    "message": ", um zusätzlichen Datenverlust zu vermeiden.",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "generateUsername": {
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Vorschläge zum Auto-Ausfüllen"
   },
+  "itemSuggestions": {
+    "message": "Vorgeschlagene Einträge"
+  },
   "autofillSuggestionsTip": {
     "message": "Speichere einen Login-Eintrag für diese Seite zum automatischen Ausfüllen"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text-Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden hat einen neuen Look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "Auto-Ausfüllen und Suchen vom Tresor-Tab ist einfacher und intuitiver als je zuvor. Schau dich um!"
-  },
   "accountActions": {
     "message": "Konto-Aktionen"
   },
diff --git a/apps/browser/src/_locales/el/messages.json b/apps/browser/src/_locales/el/messages.json
index bdb0eb2c17..37ddbc081f 100644
--- a/apps/browser/src/_locales/el/messages.json
+++ b/apps/browser/src/_locales/el/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Η αυτόματη συμπλήρωση και άλλες σχετικές λειτουργίες δεν θα προσφερθούν για αυτούς τους ιστότοπους. Πρέπει να ανανεώσετε τη σελίδα για να τεθούν σε ισχύ οι αλλαγές."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Ιστοσελίδα $number$ (URI)",
@@ -4008,7 +4008,10 @@
     "message": "Το κλειδί πρόσβασης αφαιρέθηκε"
   },
   "autofillSuggestions": {
-    "message": "Προτάσεις αυτόματης συμπλήρωσης"
+    "message": "Autofill suggestions"
+  },
+  "itemSuggestions": {
+    "message": "Suggested items"
   },
   "autofillSuggestionsTip": {
     "message": "Αποθηκεύστε ένα αντικείμενο σύνδεσης για την αυτόματη συμπλήρωση αυτού του ιστοτόπου"
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Send κειμένων"
   },
-  "bitwardenNewLook": {
-    "message": "Το Bitwarden έχει μια νέα εμφάνιση!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "Είναι πιο ευκολότερο και πιο διαισθητικό από ποτέ στην αυτόματη συμπλήρωση και αναζήτηση από την καρτέλα Θησαυ/κιο. Ρίξτε μια ματιά τριγύρω!"
-  },
   "accountActions": {
     "message": "Ενέργειες λογαριασμού"
   },
diff --git a/apps/browser/src/_locales/en_GB/messages.json b/apps/browser/src/_locales/en_GB/messages.json
index 7e938bb6b2..5a3ca3893b 100644
--- a/apps/browser/src/_locales/en_GB/messages.json
+++ b/apps/browser/src/_locales/en_GB/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4008,7 +4008,10 @@
     "message": "Passkey removed"
   },
   "autofillSuggestions": {
-    "message": "Auto-fill suggestions"
+    "message": "Autofill suggestions"
+  },
+  "itemSuggestions": {
+    "message": "Suggested items"
   },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to auto-fill"
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/en_IN/messages.json b/apps/browser/src/_locales/en_IN/messages.json
index 70e725c3a8..0783f0e917 100644
--- a/apps/browser/src/_locales/en_IN/messages.json
+++ b/apps/browser/src/_locales/en_IN/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4008,7 +4008,10 @@
     "message": "Passkey removed"
   },
   "autofillSuggestions": {
-    "message": "Auto-fill suggestions"
+    "message": "Autofill suggestions"
+  },
+  "itemSuggestions": {
+    "message": "Suggested items"
   },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to auto-fill"
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/es/messages.json b/apps/browser/src/_locales/es/messages.json
index d9cd251781..37a823b77f 100644
--- a/apps/browser/src/_locales/es/messages.json
+++ b/apps/browser/src/_locales/es/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4008,7 +4008,10 @@
     "message": "Clave de acceso eliminada"
   },
   "autofillSuggestions": {
-    "message": "Autocompletar sugerencias"
+    "message": "Autofill suggestions"
+  },
+  "itemSuggestions": {
+    "message": "Suggested items"
   },
   "autofillSuggestionsTip": {
     "message": "Guarda un elemento de inicio de sesión para este sitio para autocompletar"
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden tiene un aspecto nuevo."
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Acciones de cuenta"
   },
diff --git a/apps/browser/src/_locales/et/messages.json b/apps/browser/src/_locales/et/messages.json
index 5245de4fb7..b4401bd885 100644
--- a/apps/browser/src/_locales/et/messages.json
+++ b/apps/browser/src/_locales/et/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/eu/messages.json b/apps/browser/src/_locales/eu/messages.json
index fc875be6da..67d45a1745 100644
--- a/apps/browser/src/_locales/eu/messages.json
+++ b/apps/browser/src/_locales/eu/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/fa/messages.json b/apps/browser/src/_locales/fa/messages.json
index d2362a2655..1eff69e292 100644
--- a/apps/browser/src/_locales/fa/messages.json
+++ b/apps/browser/src/_locales/fa/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/fi/messages.json b/apps/browser/src/_locales/fi/messages.json
index 0dd96ef9a0..143cc60314 100644
--- a/apps/browser/src/_locales/fi/messages.json
+++ b/apps/browser/src/_locales/fi/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Verkkotunnus $number$ (URI)",
@@ -4008,7 +4008,10 @@
     "message": "Pääsyavain poistettiin"
   },
   "autofillSuggestions": {
-    "message": "Automaattitäytön ehdotukset"
+    "message": "Autofill suggestions"
+  },
+  "itemSuggestions": {
+    "message": "Suggested items"
   },
   "autofillSuggestionsTip": {
     "message": "Tallenna tälle sivustolle automaattisesti täytettävä kirjautumistieto."
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Teksti-Sendit"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwardenilla on uusi ulkoasu!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "Automaattinen täyttö ja sisällön haku Holvi-välilehdeltä on nyt entistä helpompaa ja luontevampaa. Kokeile nyt!"
-  },
   "accountActions": {
     "message": "Tilitoiminnot"
   },
diff --git a/apps/browser/src/_locales/fil/messages.json b/apps/browser/src/_locales/fil/messages.json
index d0fdf1018f..0c24db214a 100644
--- a/apps/browser/src/_locales/fil/messages.json
+++ b/apps/browser/src/_locales/fil/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/fr/messages.json b/apps/browser/src/_locales/fr/messages.json
index 913391d218..890d00b644 100644
--- a/apps/browser/src/_locales/fr/messages.json
+++ b/apps/browser/src/_locales/fr/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Site web $number$ (URI)",
@@ -4008,7 +4008,10 @@
     "message": "Clé d'identification (passkey) retirée"
   },
   "autofillSuggestions": {
-    "message": "Suggestions de saisie automatique"
+    "message": "Autofill suggestions"
+  },
+  "itemSuggestions": {
+    "message": "Suggested items"
   },
   "autofillSuggestionsTip": {
     "message": "Enregistrez un élément de connexion à remplir automatiquement pour ce site"
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden a un nouveau look !"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "Il est plus facile et plus intuitif que jamais de remplir automatiquement les champs et d'effectuer des recherches à partir de l'onglet \"Coffre\". Jetez un coup d'œil !"
-  },
   "accountActions": {
     "message": "Actions du compte"
   },
diff --git a/apps/browser/src/_locales/gl/messages.json b/apps/browser/src/_locales/gl/messages.json
index e655159f24..9f5e7771a1 100644
--- a/apps/browser/src/_locales/gl/messages.json
+++ b/apps/browser/src/_locales/gl/messages.json
@@ -2325,7 +2325,7 @@
     "description": "A category title describing the concept of web domains"
   },
   "blockedDomains": {
-    "message": "Blocked domains"
+    "message": "Dominios bloqueados"
   },
   "excludedDomains": {
     "message": "Dominios excluídos"
@@ -2337,13 +2337,13 @@
     "message": "Bitwarden non ofrecerá gardar contas para estes dominios en ningunha das sesións iniciadas. Recarga a páxina para que os cambios fornezan efecto."
   },
   "blockedDomainsDesc": {
-    "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
+    "message": "O autoenchido e outras funcións relacionadas non estarán dispoñibles para estas webs. Debes recargar a páxina para que os cambios teñan efecto."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "O autoenchido está bloqueado para esta web."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Cambia isto en axustes"
   },
   "websiteItemLabel": {
     "message": "Web $number$ (URI)",
@@ -2364,7 +2364,7 @@
     }
   },
   "blockedDomainsSavedSuccess": {
-    "message": "Blocked domain changes saved"
+    "message": "Dominios bloqueados gardados"
   },
   "excludedDomainsSavedSuccess": {
     "message": "Dominios excluídos gardados"
@@ -2805,17 +2805,17 @@
     "message": "Erro"
   },
   "decryptionError": {
-    "message": "Decryption error"
+    "message": "Erro de descifrado"
   },
   "couldNotDecryptVaultItemsBelow": {
-    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+    "message": "Bitwarden non puido descifrar os seguintes elementos."
   },
   "contactCSToAvoidDataLossPart1": {
-    "message": "Contact customer success",
+    "message": "Contacto co cliente exitoso",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "contactCSToAvoidDataLossPart2": {
-    "message": "to avoid additional data loss.",
+    "message": "para evitar a perda de datos.",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "generateUsername": {
@@ -4008,7 +4008,10 @@
     "message": "Clave de acceso eliminada"
   },
   "autofillSuggestions": {
-    "message": "Suxestións de autoenchido"
+    "message": "Autofill suggestions"
+  },
+  "itemSuggestions": {
+    "message": "Entradas suxeridas"
   },
   "autofillSuggestionsTip": {
     "message": "Gardar unha credencial como suxestión para este sitio"
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Textos Send"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden ten un novo look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "É máis fácil e intuitivo que nunca autoencher e buscar dende a caixa forte. Bota un ollo!"
-  },
   "accountActions": {
     "message": "Accións da conta"
   },
@@ -4671,22 +4668,22 @@
     "message": "Non tes permiso para modificar esta entrada"
   },
   "biometricsStatusHelptextUnlockNeeded": {
-    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+    "message": "O desbloqueo biométrico non está dispoñible porque se require o PIN ou contrasinal primeiro."
   },
   "biometricsStatusHelptextHardwareUnavailable": {
-    "message": "Biometric unlock is currently unavailable."
+    "message": "O desbloqueo biométrico non está dispoñible."
   },
   "biometricsStatusHelptextAutoSetupNeeded": {
-    "message": "Biometric unlock is unavailable due to misconfigured system files."
+    "message": "O desbloqueo biométrico non está dispoñible por arquivos do sistema desconfigurados."
   },
   "biometricsStatusHelptextManualSetupNeeded": {
-    "message": "Biometric unlock is unavailable due to misconfigured system files."
+    "message": "O desbloqueo biométrico non está dispoñible por arquivos do sistema desconfigurados."
   },
   "biometricsStatusHelptextDesktopDisconnected": {
-    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+    "message": "O desbloqueo biométrico non está dispoñible porque a aplicación de escritorio está pechada."
   },
   "biometricsStatusHelptextNotEnabledInDesktop": {
-    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "message": "O desbloqueo biométrico non está dispoñible porque non está activada para $EMAIL$ na aplicación de escritorio.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -4695,7 +4692,7 @@
     }
   },
   "biometricsStatusHelptextUnavailableReasonUnknown": {
-    "message": "Biometric unlock is currently unavailable for an unknown reason."
+    "message": "O desbloqueo biométrico non está dispoñible por algunha razón non prevista."
   },
   "authenticating": {
     "message": "Autenticando"
diff --git a/apps/browser/src/_locales/he/messages.json b/apps/browser/src/_locales/he/messages.json
index 1a3057ac29..19c0d292d1 100644
--- a/apps/browser/src/_locales/he/messages.json
+++ b/apps/browser/src/_locales/he/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4008,7 +4008,10 @@
     "message": "Passkey removed"
   },
   "autofillSuggestions": {
-    "message": "Autofill suggestions"
+    "message": "הצעות למילוי אוטומטי"
+  },
+  "itemSuggestions": {
+    "message": "Suggested items"
   },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/hi/messages.json b/apps/browser/src/_locales/hi/messages.json
index fd4a6612af..3db3ef3e29 100644
--- a/apps/browser/src/_locales/hi/messages.json
+++ b/apps/browser/src/_locales/hi/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "बिटवार्डन का नया रूप!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "वॉल्ट टैब से ऑटोफिल और सर्च करना पहले से कहीं ज़्यादा आसान और सहज है। सबकुछ ध्यान से देखें!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/hr/messages.json b/apps/browser/src/_locales/hr/messages.json
index 331bc10930..8d830fd6dc 100644
--- a/apps/browser/src/_locales/hr/messages.json
+++ b/apps/browser/src/_locales/hr/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Web stranica $number$ (URI)",
@@ -4008,7 +4008,10 @@
     "message": "Pristupni ključ uklonjen"
   },
   "autofillSuggestions": {
-    "message": "Prijedlozi auto-ispune"
+    "message": "Autofill suggestions"
+  },
+  "itemSuggestions": {
+    "message": "Suggested items"
   },
   "autofillSuggestionsTip": {
     "message": "Spremi u auto-ispunu stavku prijave za ovu stranicu"
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Send tekstovi"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden ima novi izgled!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "Auto-ispuna i pretraga iz kartice Trezor je lakša i intuitivnija nego ikad prije. Razgledaj!"
-  },
   "accountActions": {
     "message": "Radnje na računu"
   },
diff --git a/apps/browser/src/_locales/hu/messages.json b/apps/browser/src/_locales/hu/messages.json
index 0aea2c7ece..07bc92c342 100644
--- a/apps/browser/src/_locales/hu/messages.json
+++ b/apps/browser/src/_locales/hu/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Az automatikus kitöltés és az egyéb kapcsolódó funkciók ezeken a webhelyeken nincsenek a kínálatban. A változtatások életbe lépéséhez frissíteni kell az oldalt."
   },
-  "autofillBlockedNotice": {
-    "message": "Az automatikus kitöltés le van tiltva ezen a webhelyen. Tekintsük át vagy módosítsuk ezt a beállításokban."
+  "autofillBlockedNoticeV2": {
+    "message": "Az automatikus kitöltés blokkolásra került ezen a webhelyen."
   },
-  "autofillBlockedTooltip": {
-    "message": "Az automatikus kitöltés le van tiltva ezen a webhelyen. Tekintsük át ezt a beállításokban."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Megváltoztatás a beállításokban"
   },
   "websiteItemLabel": {
     "message": "Webhely $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Automatikus kitöltés javaslatok"
   },
+  "itemSuggestions": {
+    "message": "Javasolt elemek"
+  },
   "autofillSuggestionsTip": {
     "message": "A bejelentkezési elem mentése ehhez a webhelyhez az automatikus kitöltéshez"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Szöveg küldés"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Fiókműveletek"
   },
diff --git a/apps/browser/src/_locales/id/messages.json b/apps/browser/src/_locales/id/messages.json
index 82776a8e82..9755e7322a 100644
--- a/apps/browser/src/_locales/id/messages.json
+++ b/apps/browser/src/_locales/id/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Situs web $number$ (URI)",
@@ -4008,7 +4008,10 @@
     "message": "Kunci sandi dihapus"
   },
   "autofillSuggestions": {
-    "message": "Saran isi otomatis"
+    "message": "Autofill suggestions"
+  },
+  "itemSuggestions": {
+    "message": "Suggested items"
   },
   "autofillSuggestionsTip": {
     "message": "Simpan benda login untuk situs ini ke isi otomatis"
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/it/messages.json b/apps/browser/src/_locales/it/messages.json
index 04e2c4ee64..e0a868717a 100644
--- a/apps/browser/src/_locales/it/messages.json
+++ b/apps/browser/src/_locales/it/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Per questi siti, l'auto-completamento e funzionalità simili non saranno disponibili. Ricarica la pagina per applicare le modifiche."
   },
-  "autofillBlockedNotice": {
-    "message": "L'auto-completamento è bloccato per questo sito. Modifica questa scelta nelle impostazioni."
+  "autofillBlockedNoticeV2": {
+    "message": "La compilazione automatica è bloccata per questo sito."
   },
-  "autofillBlockedTooltip": {
-    "message": "L'auto-completamento è bloccato per questo sito. Verifica nelle impostazioni."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Modifica questo nelle impostazioni"
   },
   "websiteItemLabel": {
     "message": "Sito $number$ (URI)",
@@ -4008,7 +4008,10 @@
     "message": "Passkey rimossa"
   },
   "autofillSuggestions": {
-    "message": "Suggerimenti per il riempimento automatico"
+    "message": "Suggerimenti riempimento automatico"
+  },
+  "itemSuggestions": {
+    "message": "Elementi suggeriti"
   },
   "autofillSuggestionsTip": {
     "message": "Salva un elemento di accesso per questo sito da riempire automaticamente"
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Send Testo"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden ha un nuovo look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "È più facile e intuitivo che mai utilizzare il riempimento automatico e cercare dalla scheda Cassaforte. Dai un'occhiata!"
-  },
   "accountActions": {
     "message": "Azioni dell'account"
   },
diff --git a/apps/browser/src/_locales/ja/messages.json b/apps/browser/src/_locales/ja/messages.json
index cc1f34e498..81b81cf16c 100644
--- a/apps/browser/src/_locales/ja/messages.json
+++ b/apps/browser/src/_locales/ja/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "ウェブサイト $number$ (URI)",
@@ -4008,7 +4008,10 @@
     "message": "パスキーを削除しました"
   },
   "autofillSuggestions": {
-    "message": "候補を自動入力する"
+    "message": "Autofill suggestions"
+  },
+  "itemSuggestions": {
+    "message": "Suggested items"
   },
   "autofillSuggestionsTip": {
     "message": "自動入力するためにこのサイトのログインアイテムを保存します"
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "テキスト Send"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden が新しい外観になりました。"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "保管庫タブからの自動入力と検索がこれまで以上に簡単で直感的になりました。"
-  },
   "accountActions": {
     "message": "アカウントの操作"
   },
diff --git a/apps/browser/src/_locales/ka/messages.json b/apps/browser/src/_locales/ka/messages.json
index 50fdc6613c..9bd12ce601 100644
--- a/apps/browser/src/_locales/ka/messages.json
+++ b/apps/browser/src/_locales/ka/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/km/messages.json b/apps/browser/src/_locales/km/messages.json
index e34751eea7..ad7d258214 100644
--- a/apps/browser/src/_locales/km/messages.json
+++ b/apps/browser/src/_locales/km/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/kn/messages.json b/apps/browser/src/_locales/kn/messages.json
index 3f9e99e563..d613ba2695 100644
--- a/apps/browser/src/_locales/kn/messages.json
+++ b/apps/browser/src/_locales/kn/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/ko/messages.json b/apps/browser/src/_locales/ko/messages.json
index 4ac6d281b0..8aad2f586c 100644
--- a/apps/browser/src/_locales/ko/messages.json
+++ b/apps/browser/src/_locales/ko/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "웹사이트 $number$ (URI)",
@@ -4008,7 +4008,10 @@
     "message": "패스키 제거됨"
   },
   "autofillSuggestions": {
-    "message": "자동 완성 제안"
+    "message": "Autofill suggestions"
+  },
+  "itemSuggestions": {
+    "message": "Suggested items"
   },
   "autofillSuggestionsTip": {
     "message": "이 사이트에서 자동으로 작성할 로그인 항목 저장"
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "텍스트 Send"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden이 새로운 모습으로 돌아왔습니다!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "보관함 탭에서 자동 완성하고 검색하는 것이 그 어느 때보다 쉽고 직관적입니다. 둘러보세요!"
-  },
   "accountActions": {
     "message": "계정 작업"
   },
diff --git a/apps/browser/src/_locales/lt/messages.json b/apps/browser/src/_locales/lt/messages.json
index 3c81df00f1..a29c60d5e8 100644
--- a/apps/browser/src/_locales/lt/messages.json
+++ b/apps/browser/src/_locales/lt/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/lv/messages.json b/apps/browser/src/_locales/lv/messages.json
index fc682ced38..c1cdd0182a 100644
--- a/apps/browser/src/_locales/lv/messages.json
+++ b/apps/browser/src/_locales/lv/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Automātiskā aizpilde un citas saistītās iespējas šajās tīmekļvietnēs netiks piedāvātas. Ir jāatsvaidzina lapa, lai izmaiņas iedarbotos."
   },
-  "autofillBlockedNotice": {
-    "message": "Automātiskā aizpilde šajā tīmekļvietnē ir liegta. Šo pārskatīt vai mainīt var iestatījumos."
+  "autofillBlockedNoticeV2": {
+    "message": "Automātiskā aizpilde šajā tīmekļvietnē ir liegta."
   },
-  "autofillBlockedTooltip": {
-    "message": "Automātiskā aizpilde šajā tīmekļvietnē ir liegta. Šo var pārskatīt iestatījumos."
+  "autofillBlockedNoticeGuidance": {
+    "message": "To var mainīt iestatījumos"
   },
   "websiteItemLabel": {
     "message": "Tīmekļvietne $number$ (URI)",
@@ -4008,7 +4008,10 @@
     "message": "Piekļuves atslēga noņemta"
   },
   "autofillSuggestions": {
-    "message": "Ieteikumi automātiskajai aizpildei"
+    "message": "Automātiskās aizpildes ieteikumi"
+  },
+  "itemSuggestions": {
+    "message": "Ieteiktie vienumi"
   },
   "autofillSuggestionsTip": {
     "message": "Saglabāt pieteikšanās vienumi, ko automātiski aizpildīt šajā vietnē"
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Teksta Send"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden ir jauns izskats."
-  },
-  "bitwardenNewLookDesc": {
-    "message": "Veikt automātisko aizpildi un meklēšanu glabātavas cilnē ir vienkāršāk un izprotamāk kā jebkad. Apskati izmaiņas!"
-  },
   "accountActions": {
     "message": "Konta darbības"
   },
diff --git a/apps/browser/src/_locales/ml/messages.json b/apps/browser/src/_locales/ml/messages.json
index 4cbbfc46d6..f985f6377a 100644
--- a/apps/browser/src/_locales/ml/messages.json
+++ b/apps/browser/src/_locales/ml/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/mr/messages.json b/apps/browser/src/_locales/mr/messages.json
index cbb0b1bdf1..26c0af364a 100644
--- a/apps/browser/src/_locales/mr/messages.json
+++ b/apps/browser/src/_locales/mr/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/my/messages.json b/apps/browser/src/_locales/my/messages.json
index e34751eea7..ad7d258214 100644
--- a/apps/browser/src/_locales/my/messages.json
+++ b/apps/browser/src/_locales/my/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/nb/messages.json b/apps/browser/src/_locales/nb/messages.json
index 3a12c9ae4f..17cd112b2e 100644
--- a/apps/browser/src/_locales/nb/messages.json
+++ b/apps/browser/src/_locales/nb/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4008,7 +4008,10 @@
     "message": "Passkey removed"
   },
   "autofillSuggestions": {
-    "message": "Autoutfyllingsforslag"
+    "message": "Autofill suggestions"
+  },
+  "itemSuggestions": {
+    "message": "Suggested items"
   },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden har fått et nytt utseende!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/ne/messages.json b/apps/browser/src/_locales/ne/messages.json
index e34751eea7..ad7d258214 100644
--- a/apps/browser/src/_locales/ne/messages.json
+++ b/apps/browser/src/_locales/ne/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/nl/messages.json b/apps/browser/src/_locales/nl/messages.json
index 0112ded198..c8e0b46f7e 100644
--- a/apps/browser/src/_locales/nl/messages.json
+++ b/apps/browser/src/_locales/nl/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill en andere gerelateerde functies worden niet aangeboden voor deze websites. Vernieuw de pagina om de wijzigingen toe te passen."
   },
-  "autofillBlockedNotice": {
-    "message": "Automatisch invullen is geblokkeerd voor deze website. Bekijk of verander dit in de instellingen."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is geblokkeerd voor deze website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Automatisch invullen is geblokkeerd voor deze website. Bekijk in de instellingen."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Dit aanpassen in instellingen"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Suggesties automatisch invullen"
   },
+  "itemSuggestions": {
+    "message": "Voorgestelde items"
+  },
   "autofillSuggestionsTip": {
     "message": "Inlogitem opslaan voor automatisch invullen op deze site"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Tekst-Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden heeft een nieuw uiterlijk!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "Automatisch invullen en zoeken is makkelijker en intuïtiever dan ooit vanaf het tabblad Kluis. Kijk rond!"
-  },
   "accountActions": {
     "message": "Accountacties"
   },
diff --git a/apps/browser/src/_locales/nn/messages.json b/apps/browser/src/_locales/nn/messages.json
index e34751eea7..ad7d258214 100644
--- a/apps/browser/src/_locales/nn/messages.json
+++ b/apps/browser/src/_locales/nn/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/or/messages.json b/apps/browser/src/_locales/or/messages.json
index e34751eea7..ad7d258214 100644
--- a/apps/browser/src/_locales/or/messages.json
+++ b/apps/browser/src/_locales/or/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/pl/messages.json b/apps/browser/src/_locales/pl/messages.json
index 4b7d3a19fc..b14cd9961a 100644
--- a/apps/browser/src/_locales/pl/messages.json
+++ b/apps/browser/src/_locales/pl/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Strona internetowa $number$ (URI)",
@@ -4008,7 +4008,10 @@
     "message": "Passkey został usunięty"
   },
   "autofillSuggestions": {
-    "message": "Sugestie autouzupełnienia"
+    "message": "Autofill suggestions"
+  },
+  "itemSuggestions": {
+    "message": "Suggested items"
   },
   "autofillSuggestionsTip": {
     "message": "Zapisz element logowania dla tej witryny, aby automatycznie wypełnić"
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden ma nowy wygląd!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "Auto wypełnianie i szukanie na zakładce sejfu jest teraz prostsze i bardziej intuicyjne. Rozejrzyj się tam!"
-  },
   "accountActions": {
     "message": "Akcje konta"
   },
diff --git a/apps/browser/src/_locales/pt_BR/messages.json b/apps/browser/src/_locales/pt_BR/messages.json
index e3409b1da5..3ac6412a3c 100644
--- a/apps/browser/src/_locales/pt_BR/messages.json
+++ b/apps/browser/src/_locales/pt_BR/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Site $number$ (URI)",
@@ -4008,7 +4008,10 @@
     "message": "Chave de acesso removida"
   },
   "autofillSuggestions": {
-    "message": "Sugestões de autopreenchimento"
+    "message": "Autofill suggestions"
+  },
+  "itemSuggestions": {
+    "message": "Suggested items"
   },
   "autofillSuggestionsTip": {
     "message": "Salvar um item de login para este site autopreenchimento"
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Texto enviado"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden tem uma nova aparência!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "É mais fácil e mais intuitivo do que nunca autopreenchimento e pesquise na guia Cofre. Dê uma olhada ao redor!"
-  },
   "accountActions": {
     "message": "Ações da conta"
   },
diff --git a/apps/browser/src/_locales/pt_PT/messages.json b/apps/browser/src/_locales/pt_PT/messages.json
index 6b3c190f0b..f2f7cd2324 100644
--- a/apps/browser/src/_locales/pt_PT/messages.json
+++ b/apps/browser/src/_locales/pt_PT/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "O preenchimento automático e outras funcionalidades relacionadas não serão disponibilizados para estes sites. É necessário atualizar a página para que as alterações tenham efeito."
   },
-  "autofillBlockedNotice": {
-    "message": "O preenchimento automático está bloqueado para este site. Reveja ou altere esta opção nas definições."
+  "autofillBlockedNoticeV2": {
+    "message": "O preenchimento automático está bloqueado para este site."
   },
-  "autofillBlockedTooltip": {
-    "message": "O preenchimento automático está bloqueado neste site. Reveja nas definições."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Alterar esta opção nas definições"
   },
   "websiteItemLabel": {
     "message": "Site $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Sugestões de preenchimento automático"
   },
+  "itemSuggestions": {
+    "message": "Itens sugeridos"
+  },
   "autofillSuggestionsTip": {
     "message": "Guarde uma credencial deste site para preenchimento automático"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Sends de texto"
   },
-  "bitwardenNewLook": {
-    "message": "O Bitwarden tem um novo visual!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "É mais fácil e mais intuitivo do que nunca preencher automaticamente e pesquisar a partir do separador Cofre. Dê uma vista de olhos!"
-  },
   "accountActions": {
     "message": "Ações da conta"
   },
diff --git a/apps/browser/src/_locales/ro/messages.json b/apps/browser/src/_locales/ro/messages.json
index 114c01aff4..04b3e02fc9 100644
--- a/apps/browser/src/_locales/ro/messages.json
+++ b/apps/browser/src/_locales/ro/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/ru/messages.json b/apps/browser/src/_locales/ru/messages.json
index 53f31813ac..605f1bb9a4 100644
--- a/apps/browser/src/_locales/ru/messages.json
+++ b/apps/browser/src/_locales/ru/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Автозаполнение и другие связанные с ним функции не будут предлагаться для этих сайтов. Чтобы изменения вступили в силу, необходимо обновить страницу."
   },
-  "autofillBlockedNotice": {
-    "message": "Автозаполнение для этого сайта заблокировано. Просмотрите или измените это в настройках."
+  "autofillBlockedNoticeV2": {
+    "message": "Автозаполнение для этого сайта заблокировано."
   },
-  "autofillBlockedTooltip": {
-    "message": "Автозаполнение на этом сайте заблокировано. Просмотрите в настройках."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Измените это в настройках"
   },
   "websiteItemLabel": {
     "message": "Сайт $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Предложения по автозаполнению"
   },
+  "itemSuggestions": {
+    "message": "Предлагаемые элементы"
+  },
   "autofillSuggestionsTip": {
     "message": "Сохранить логин для этого сайта для автозаполнения"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Текстовая Send"
   },
-  "bitwardenNewLook": {
-    "message": "У Bitwarden новый облик!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "Теперь автозаполнение и поиск на вкладке Хранилище стали проще и интуитивно понятнее, чем когда-либо. Осмотритесь!"
-  },
   "accountActions": {
     "message": "Действия аккаунта"
   },
diff --git a/apps/browser/src/_locales/si/messages.json b/apps/browser/src/_locales/si/messages.json
index 56cf378344..6a7bb30431 100644
--- a/apps/browser/src/_locales/si/messages.json
+++ b/apps/browser/src/_locales/si/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/sk/messages.json b/apps/browser/src/_locales/sk/messages.json
index 08bfcc79f6..e1020228e8 100644
--- a/apps/browser/src/_locales/sk/messages.json
+++ b/apps/browser/src/_locales/sk/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Automatické vypĺňanie a ďalšie súvisiace funkcie sa na týchto webových stránkach nebudú ponúkať. Aby sa zmeny prejavili, musíte stránku obnoviť."
   },
-  "autofillBlockedNotice": {
-    "message": "Automatické vypĺňanie je pre túto webovú stránku zablokované. Skontrolujte alebo zmeňte to v nastaveniach."
+  "autofillBlockedNoticeV2": {
+    "message": "Automatické vypĺňanie je pre túto webovú stránku zablokované."
   },
-  "autofillBlockedTooltip": {
-    "message": "Automatické vypĺňanie je na tejto webovej stránke zablokované. Pozrite v nastaveniach."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Zmeňte to v nastaveniach"
   },
   "websiteItemLabel": {
     "message": "Webstránka $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Návrhy automatického vypĺňania"
   },
+  "itemSuggestions": {
+    "message": "Navrhované položky"
+  },
   "autofillSuggestionsTip": {
     "message": "Uložte položku prihlásenia pre tento web na automatické vyplnenie"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Textové Sendy"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden má nový vzhľad!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "Automatické vypĺňanie a vyhľadávanie na karte Trezor je jednoduchšie a intuitívnejšie ako kedykoľvek predtým. Poobzerajte sa!"
-  },
   "accountActions": {
     "message": "Operácie s účtom"
   },
diff --git a/apps/browser/src/_locales/sl/messages.json b/apps/browser/src/_locales/sl/messages.json
index 2d2ee45541..db8558b0a3 100644
--- a/apps/browser/src/_locales/sl/messages.json
+++ b/apps/browser/src/_locales/sl/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/sr/messages.json b/apps/browser/src/_locales/sr/messages.json
index 01d95a6ed1..948956bb36 100644
--- a/apps/browser/src/_locales/sr/messages.json
+++ b/apps/browser/src/_locales/sr/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Сајт $number$ (УРЛ)",
@@ -4008,7 +4008,10 @@
     "message": "Приступни кључ је уклоњен"
   },
   "autofillSuggestions": {
-    "message": "Предлози за ауто-попуњавање"
+    "message": "Autofill suggestions"
+  },
+  "itemSuggestions": {
+    "message": "Suggested items"
   },
   "autofillSuggestionsTip": {
     "message": "Сачувајте ставку за пријаву за ову локацију за ауто-попуњавање"
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Текст „Send“"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden има нови изглед!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "Лакше је и интуитивније него икада да се аутоматски попуњава и тражи са картице Сефа. Проверите!"
-  },
   "accountActions": {
     "message": "Акције везане за налог"
   },
diff --git a/apps/browser/src/_locales/sv/messages.json b/apps/browser/src/_locales/sv/messages.json
index a443a8e6b2..47e9dc2cff 100644
--- a/apps/browser/src/_locales/sv/messages.json
+++ b/apps/browser/src/_locales/sv/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Webbplats $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden har fått ett nytt utseende!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Kontoåtgärder"
   },
diff --git a/apps/browser/src/_locales/te/messages.json b/apps/browser/src/_locales/te/messages.json
index e34751eea7..ad7d258214 100644
--- a/apps/browser/src/_locales/te/messages.json
+++ b/apps/browser/src/_locales/te/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/th/messages.json b/apps/browser/src/_locales/th/messages.json
index 1b493de3d2..b3cddf4e83 100644
--- a/apps/browser/src/_locales/th/messages.json
+++ b/apps/browser/src/_locales/th/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Autofill suggestions"
   },
+  "itemSuggestions": {
+    "message": "Suggested items"
+  },
   "autofillSuggestionsTip": {
     "message": "Save a login item for this site to autofill"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/tr/messages.json b/apps/browser/src/_locales/tr/messages.json
index 8095a9f604..1d60fbed0e 100644
--- a/apps/browser/src/_locales/tr/messages.json
+++ b/apps/browser/src/_locales/tr/messages.json
@@ -1275,7 +1275,7 @@
     "message": "Bitwarden'ı desteklediğiniz için teşekkür ederiz."
   },
   "premiumFeatures": {
-    "message": "Premium'a yükseltin ve şunları alın:"
+    "message": "Premium'a geçmenin avantajları:"
   },
   "premiumPrice": {
     "message": "Bunların hepsi sadece yılda $PRICE$!",
@@ -1502,13 +1502,13 @@
     "description": "Overlay appearance select option for showing the field on click of the overlay icon"
   },
   "enableAutoFillOnPageLoadSectionTitle": {
-    "message": "Sayfa yüklendiğinde otomatik doldur"
+    "message": "Sayfa yüklenince otomatik doldur"
   },
   "enableAutoFillOnPageLoad": {
-    "message": "Sayfa yüklendiğinde otomatik doldur"
+    "message": "Sayfa yüklenince otomatik doldur"
   },
   "enableAutoFillOnPageLoadDesc": {
-    "message": "Sayfa yüklendiğinde giriş formu tespit edilirse otomatik olarak formu doldur."
+    "message": "Sayfa yüklenince giriş formu tespit edilirse otomatik olarak formu doldur."
   },
   "experimentalFeature": {
     "message": "Ele geçirilmiş veya güvenilmeyen web siteleri sayfa yüklenirken otomatik doldurmayı suistimal edebilir."
@@ -1523,19 +1523,19 @@
     "message": "Hesaplar için varsayılan otomatik doldurma ayarı"
   },
   "defaultAutoFillOnPageLoadDesc": {
-    "message": "\"Sayfa yüklendiğinde otomatik doldur\"u her hesabın \"Düzenle\" görünümünden ayrı ayrı kapatabilirsiniz."
+    "message": "\"Sayfa yüklenince otomatik doldur\"u her hesabın \"Düzenle\" görünümünden ayrı ayrı kapatabilirsiniz."
   },
   "itemAutoFillOnPageLoad": {
-    "message": "Sayfa yüklendiğinde otomatik doldur (Seçeneklerde ayarlanmışsa)"
+    "message": "Sayfa yüklenince otomatik doldur (Seçeneklerde ayarlanmışsa)"
   },
   "autoFillOnPageLoadUseDefault": {
     "message": "Varsayılan ayarı kullan"
   },
   "autoFillOnPageLoadYes": {
-    "message": "Sayfa yüklendiğinde otomatik doldur"
+    "message": "Sayfa yüklenince otomatik doldur"
   },
   "autoFillOnPageLoadNo": {
-    "message": "Sayfa yüklendiğinde otomatik doldurma"
+    "message": "Sayfa yüklenince otomatik doldurma"
   },
   "commandOpenPopup": {
     "message": "Kasayı açılır pencerede aç"
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Bu sitede otomatik doldurma engellenmiş."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Bunu ayarlardan değiştirebilirsiniz"
   },
   "websiteItemLabel": {
     "message": "Web sitesi $number$ (URI)",
@@ -3151,7 +3151,7 @@
     }
   },
   "autofillPageLoadPolicyActivated": {
-    "message": "Kuruluş ilkeleriniz, sayfa yüklendiğinde otomatik doldurmayı etkinleştirdi."
+    "message": "Kuruluş ilkeleriniz, sayfa yüklenince otomatik doldurmayı etkinleştirdi."
   },
   "howToAutofill": {
     "message": "Otomatik doldurma nasıl yapılır?"
@@ -3461,11 +3461,11 @@
     "message": "Alias alan adı"
   },
   "passwordRepromptDisabledAutofillOnPageLoad": {
-    "message": "Ana parolayı yeniden isteyen kayıtlar sayfa yüklendiğinde otomatik olarak doldurulamaz. Sayfa yüklendiğinde otomatik doldurma kapatıldı.",
+    "message": "Ana parolayı yeniden isteyen kayıtlar sayfa yüklenince otomatik olarak doldurulamaz. Sayfa yüklenince otomatik doldurma kapatıldı.",
     "description": "Toast message for describing that master password re-prompt cannot be autofilled on page load."
   },
   "autofillOnPageLoadSetToDefault": {
-    "message": "Sayfa yüklendiğinde otomatik doldurma, varsayılan ayarı kullanacak şekilde ayarlandı.",
+    "message": "Sayfa yüklenince otomatik doldurma, varsayılan ayarı kullanacak şekilde ayarlandı.",
     "description": "Toast message for informing the user that autofill on page load has been set to the default setting."
   },
   "turnOffMasterPasswordPromptToEditField": {
@@ -3740,7 +3740,7 @@
     "message": "Geçiş anahtarı"
   },
   "accessing": {
-    "message": "Erişim"
+    "message": "Erişilen konum:"
   },
   "loggedInExclamation": {
     "message": "Giriş yapıldı!"
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Önerileri otomatik doldur"
   },
+  "itemSuggestions": {
+    "message": "Önerilen kayıtlar"
+  },
   "autofillSuggestionsTip": {
     "message": "Otomatik doldurma için bu siteye ait bir hesap kaydededin"
   },
@@ -4333,7 +4336,7 @@
     }
   },
   "autoFillOnPageLoad": {
-    "message": "Sayfa yüklendiğinde otomatik doldur"
+    "message": "Sayfa yüklenince otomatik doldur"
   },
   "cardExpiredTitle": {
     "message": "Kartın süresi dolmuş"
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Metin Send'leri"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden'ın tasarımı güncellendi!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "Otomatik doldurma ve kasanızda arama yapma artık eskisinden daha kolay. Yeni tasarıma göz atmayı unutmayın!"
-  },
   "accountActions": {
     "message": "Hesap işlemleri"
   },
diff --git a/apps/browser/src/_locales/uk/messages.json b/apps/browser/src/_locales/uk/messages.json
index d6b0b88ead..2d35489e09 100644
--- a/apps/browser/src/_locales/uk/messages.json
+++ b/apps/browser/src/_locales/uk/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Автозаповнення та інші пов'язані функції не пропонуватимуться для цих вебсайтів. Вам слід оновити сторінку для застосування змін."
   },
-  "autofillBlockedNotice": {
-    "message": "Автозаповнення заблоковано для цього вебсайту. Перегляньте або змініть це в налаштуваннях."
+  "autofillBlockedNoticeV2": {
+    "message": "Автозаповнення для цього вебсайту заблоковано."
   },
-  "autofillBlockedTooltip": {
-    "message": "Автозаповнення заблоковано на цьому вебсайті. Перевірте налаштування."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Змінити в налаштуваннях"
   },
   "websiteItemLabel": {
     "message": "Вебсайт $number$ (URI)",
@@ -2805,17 +2805,17 @@
     "message": "Помилка"
   },
   "decryptionError": {
-    "message": "Decryption error"
+    "message": "Помилка розшифрування"
   },
   "couldNotDecryptVaultItemsBelow": {
-    "message": "Bitwarden could not decrypt the vault item(s) listed below."
+    "message": "Bitwarden не зміг розшифрувати вказані нижче елементи сховища."
   },
   "contactCSToAvoidDataLossPart1": {
-    "message": "Contact customer success",
+    "message": "Зверніться до служби підтримки клієнтів,",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "contactCSToAvoidDataLossPart2": {
-    "message": "to avoid additional data loss.",
+    "message": "щоб уникнути втрати даних.",
     "description": "This is part of a larger sentence. The full sentence will read 'Contact customer success to avoid additional data loss.'"
   },
   "generateUsername": {
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "Пропозиції автозаповнення"
   },
+  "itemSuggestions": {
+    "message": "Запропоновані записи"
+  },
   "autofillSuggestionsTip": {
     "message": "Зберегти дані входу цього сайту для автозаповнення"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Відправлення тексту"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden має новий вигляд!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "Ще простіше автозаповнення та інтуїтивніший пошук у сховищі. Ознайомтеся!"
-  },
   "accountActions": {
     "message": "Дії з обліковим записом"
   },
@@ -4671,22 +4668,22 @@
     "message": "Вам не дозволено редагувати цей запис"
   },
   "biometricsStatusHelptextUnlockNeeded": {
-    "message": "Biometric unlock is unavailable because PIN or password unlock is required first."
+    "message": "Біометричне розблокування недоступне, оскільки спочатку потрібно ввести PIN-код або пароль."
   },
   "biometricsStatusHelptextHardwareUnavailable": {
-    "message": "Biometric unlock is currently unavailable."
+    "message": "Біометричне розблокування наразі недоступне."
   },
   "biometricsStatusHelptextAutoSetupNeeded": {
-    "message": "Biometric unlock is unavailable due to misconfigured system files."
+    "message": "Біометричне розблокування недоступне через неправильно налаштовані системні файли."
   },
   "biometricsStatusHelptextManualSetupNeeded": {
-    "message": "Biometric unlock is unavailable due to misconfigured system files."
+    "message": "Біометричне розблокування недоступне через неправильно налаштовані системні файли."
   },
   "biometricsStatusHelptextDesktopDisconnected": {
-    "message": "Biometric unlock is unavailable because the Bitwarden desktop app is closed."
+    "message": "Біометричне розблокування недоступне, оскільки програму Bitwarden для комп'ютера закрито."
   },
   "biometricsStatusHelptextNotEnabledInDesktop": {
-    "message": "Biometric unlock is unavailable because it is not enabled for $EMAIL$ in the Bitwarden desktop app.",
+    "message": "Біометричне розблокування недоступне, оскільки воно не увімкнене для $EMAIL$ у програмі Bitwarden для комп'ютера.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -4695,7 +4692,7 @@
     }
   },
   "biometricsStatusHelptextUnavailableReasonUnknown": {
-    "message": "Biometric unlock is currently unavailable for an unknown reason."
+    "message": "Біометричне розблокування зараз недоступне з невідомої причини."
   },
   "authenticating": {
     "message": "Аутентифікація"
diff --git a/apps/browser/src/_locales/vi/messages.json b/apps/browser/src/_locales/vi/messages.json
index 4ccdaf808f..af33914d3e 100644
--- a/apps/browser/src/_locales/vi/messages.json
+++ b/apps/browser/src/_locales/vi/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
-  "autofillBlockedNotice": {
-    "message": "Autofill is blocked for this website. Review or change this in settings."
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "Autofill is blocked on this website. Review in settings."
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "Trang Web $number$ (URI)",
@@ -4008,7 +4008,10 @@
     "message": "Đã xóa mã khoá"
   },
   "autofillSuggestions": {
-    "message": "Gợi ý điền tự động"
+    "message": "Autofill suggestions"
+  },
+  "itemSuggestions": {
+    "message": "Suggested items"
   },
   "autofillSuggestionsTip": {
     "message": "Lưu thông tin đăng nhập cho trang này để tự động điền"
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "Text Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden has a new look!"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "It's easier and more intuitive than ever to autofill and search from the Vault tab. Take a look around!"
-  },
   "accountActions": {
     "message": "Account actions"
   },
diff --git a/apps/browser/src/_locales/zh_CN/messages.json b/apps/browser/src/_locales/zh_CN/messages.json
index dd6a2286c4..14ad3927be 100644
--- a/apps/browser/src/_locales/zh_CN/messages.json
+++ b/apps/browser/src/_locales/zh_CN/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "将不会为这些网站提供自动填充和其他相关功能。您必须刷新页面才能使更改生效。"
   },
-  "autofillBlockedNotice": {
-    "message": "该网站的自动填充功能已被阻止。请在设置中查看或更改。"
+  "autofillBlockedNoticeV2": {
+    "message": "该网站的自动填充已被屏蔽。"
   },
-  "autofillBlockedTooltip": {
-    "message": "该网站的自动填充功能已被阻止。请在设置中查看。"
+  "autofillBlockedNoticeGuidance": {
+    "message": "在设置中更改它"
   },
   "websiteItemLabel": {
     "message": "网站 $number$ (URI)",
@@ -4010,6 +4010,9 @@
   "autofillSuggestions": {
     "message": "自动填充建议"
   },
+  "itemSuggestions": {
+    "message": "建议的项目"
+  },
   "autofillSuggestionsTip": {
     "message": "将此站点保存为登录项目以用于自动填充"
   },
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "文本 Send"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden 拥有一个新的外观！"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "从密码库标签页自动填充和搜索比以往任何时候都更简单直观。来看看吧！"
-  },
   "accountActions": {
     "message": "账户操作"
   },
diff --git a/apps/browser/src/_locales/zh_TW/messages.json b/apps/browser/src/_locales/zh_TW/messages.json
index 467deffd81..d5903198e3 100644
--- a/apps/browser/src/_locales/zh_TW/messages.json
+++ b/apps/browser/src/_locales/zh_TW/messages.json
@@ -2339,11 +2339,11 @@
   "blockedDomainsDesc": {
     "message": "自動填入及其它相關的功能無法在這些網站上使用。您必須重新整理頁面來使變更生效。"
   },
-  "autofillBlockedNotice": {
-    "message": "自動填入已在此網站被封鎖。請在設定中檢視或更改此限制。"
+  "autofillBlockedNoticeV2": {
+    "message": "Autofill is blocked for this website."
   },
-  "autofillBlockedTooltip": {
-    "message": "自動填入已在此網站被封鎖。請在設定中檢視。"
+  "autofillBlockedNoticeGuidance": {
+    "message": "Change this in settings"
   },
   "websiteItemLabel": {
     "message": "網站 $number$ (URI)",
@@ -4008,7 +4008,10 @@
     "message": "密碼金鑰已移除"
   },
   "autofillSuggestions": {
-    "message": "自動填入建議"
+    "message": "Autofill suggestions"
+  },
+  "itemSuggestions": {
+    "message": "Suggested items"
   },
   "autofillSuggestionsTip": {
     "message": "對此網站儲存登入項目為自動填入"
@@ -4586,12 +4589,6 @@
   "textSends": {
     "message": "文字 Sends"
   },
-  "bitwardenNewLook": {
-    "message": "Bitwarden 有了新外觀！"
-  },
-  "bitwardenNewLookDesc": {
-    "message": "更容易使用的自動填入及密碼庫搜尋體驗。試試看吧！"
-  },
   "accountActions": {
     "message": "帳號動作"
   },
diff --git a/apps/browser/store/locales/ru/copy.resx b/apps/browser/store/locales/ru/copy.resx
index 7c9480567e..f67462c750 100644
--- a/apps/browser/store/locales/ru/copy.resx
+++ b/apps/browser/store/locales/ru/copy.resx
@@ -124,48 +124,47 @@
     <value>Дома, на работе или в пути - Bitwarden всегда защитит ваши пароли, passkeys и конфиденциальную информацию.</value>
   </data>
   <data name="Description" xml:space="preserve">
-    <value>Recognized as the best password manager by PCMag, WIRED, The Verge, CNET, G2, and more!
+    <value>Признан лучшим менеджером паролей по версии PCMag, WIRED, The Verge, CNET, G2 и других!
 
-SECURE YOUR DIGITAL LIFE
-Secure your digital life and protect against data breaches by generating and saving unique, strong passwords for every account. Maintain everything in an end-to-end encrypted password vault that only you can access.
+ЗАЩИТИТЕ СВОЮ ЦИФРОВУЮ ЖИЗНЬ
+Защитите свою цифровую жизнь и защитите её от утечек данных, создавая уникальные, надёжные пароли для каждой учетной записи. Сохраните всё в зашифрованном сквозным шифрованием хранилище паролей, доступ к которому есть только у вас.
 
-ACCESS YOUR DATA, ANYWHERE, ANYTIME, ON ANY DEVICE
-Easily manage, store, secure, and share unlimited passwords across unlimited devices without restrictions.
+ДОСТУП К СВОИМ ДАННЫМ В ЛЮБОМ МЕСТЕ, В ЛЮБОЕ ВРЕМЯ, НА ЛЮБОМ УСТРОЙСТВЕ
+Легко управляйте, храните, защищайте и делитесь неограниченным количеством паролей на неограниченном количестве устройств без ограничений.
 
-EVERYONE SHOULD HAVE THE TOOLS TO STAY SAFE ONLINE
-Utilize Bitwarden for free with no ads or selling data. Bitwarden believes everyone should have the ability to stay safe online. Premium plans offer access to advanced features.
+КАЖДЫЙ ДОЛЖЕН ИМЕТЬ ИНСТРУМЕНТЫ ДЛЯ БЕЗОПАСНОСТИ В СЕТИ
+Используйте Bitwarden бесплатно без рекламы или продажи данных. Bitwarden считает, что каждый должен иметь возможность оставаться в безопасности в сети. Премиум-планы предлагают доступ к расширенным функциям.
 
-EMPOWER YOUR TEAMS WITH BITWARDEN
-Plans for Teams and Enterprise come with professional business features. Some examples include SSO integration, self-hosting, directory integration and SCIM provisioning, global policies, API access, event logs, and more.
+РАСШИРЯЙТЕ ВОЗМОЖНОСТИ СВОИХ КОМАНД С ПОМОЩЬЮ BITWARDEN
+Планы для Teams и Enterprise включают профессиональные бизнес-функции. Вот несколько примеров: интеграция SSO, собственный хостинг, интеграция каталогов и SCIM, глобальные политики, доступ через API, журналы событий и многое другое.
 
-Use Bitwarden to secure your workforce and share sensitive information with colleagues.
+Используйте Bitwarden для защиты своих сотрудников и обмена конфиденциальной информацией с коллегами.
 
+Дополнительные причины выбрать Bitwarden:
 
-More reasons to choose Bitwarden:
+Шифрование мирового класса
+Пароли защищены усовершенствованным сквозным шифрованием (AES-256, хэштег salt и PBKDF2 SHA-256), поэтому ваши данные остаются в безопасности и конфиденциальности.
 
-World-Class Encryption
-Passwords are protected with advanced end-to-end encryption (AES-256 bit, salted hashtag, and PBKDF2 SHA-256) so your data stays secure and private.
+Сторонние аудиты
+Bitwarden регулярно проводит комплексные сторонние аудиты безопасности с известными фирмами по безопасности. Эти ежегодные аудиты включают оценку исходного кода и тестирование на проникновение по IP-адресам Bitwarden, серверам и веб-приложениям.
 
-3rd-party Audits
-Bitwarden regularly conducts comprehensive third-party security audits with notable security firms. These annual audits include source code assessments and penetration testing across Bitwarden IPs, servers, and web applications.
-
-Advanced 2FA
-Secure your login with a third-party authenticator, emailed codes, or FIDO2 WebAuthn credentials such as a hardware security key or passkey.
+Расширенная 2FA
+Защитите свой вход с помощью стороннего аутентификатора, кодов, отправленных по электронной почте, или учетных данных FIDO2 WebAuthn, таких как аппаратный ключ безопасности или ключ доступа.
 
 Bitwarden Send
-Transmit data directly to others while maintaining end-to-end encrypted security and limiting exposure.
+Передавайте данные другим без посредников, сохраняя сквозное шифрование и ограничивая раскрытие информации.
 
-Built-in Generator
-Create long, complex, and distinct passwords and unique usernames for every site you visit. Integrate with email alias providers for additional privacy.
+Встроенный генератор паролей
+Создавайте длинные, сложные и уникальные пароли и имена пользователей для каждого посещаемого вами сайта. Интегрируйтесь с поставщиками псевдонимов электронной почты для дополнительной конфиденциальности.
 
-Global Translations
-Bitwarden translations exist for more than 60 languages, translated by the global community though Crowdin.
+Многоязычный перевод
+Bitwarden переведён на более чем 60 языков, с помощью мирового сообщества через Crowdin.
 
-Cross-Platform Applications
-Secure and share sensitive data within your Bitwarden Vault from any browser, mobile device, or desktop OS, and more.
+Кроссплатформенные приложения
+Защищайте и делитесь конфиденциальными данными в вашем хранилище Bitwarden из любого браузера, мобильного устройства или настольной ОС и т. д.
 
-Bitwarden secures more than just passwords
-End-to-end encrypted credential management solutions from Bitwarden empower organizations to secure everything, including developer secrets and passkey experiences. Visit Bitwarden.com to learn more about Bitwarden Secrets Manager and Bitwarden Passwordless.dev!
+Bitwarden защищает не только пароли
+Решения со сквозным шифрованием для управления учётными данными от Bitwarden позволяют организациям защищать всё, включая секреты разработчиков и ключи доступа. Посетите Bitwarden.com, чтобы узнать больше о Bitwarden Secrets Manager и Bitwarden Passwordless.dev!
 </value>
   </data>
   <data name="AssetTitle" xml:space="preserve">

From 2726b3a957b087def091fea57a2a28b1c54ba717 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Fri, 17 Jan 2025 11:22:03 +0100
Subject: [PATCH 140/150] Add no-sandbox to make electron work on ubuntu
 (#12908)

---
 apps/desktop/scripts/start.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/desktop/scripts/start.js b/apps/desktop/scripts/start.js
index d2c984a6f2..0e11ebd908 100644
--- a/apps/desktop/scripts/start.js
+++ b/apps/desktop/scripts/start.js
@@ -25,7 +25,7 @@ concurrently(
     },
     {
       name: "Elec",
-      command: `npx wait-on ./build/main.js && npx electron --inspect=5858 ${args.join(
+      command: `npx wait-on ./build/main.js && npx electron --no-sandbox --inspect=5858 ${args.join(
         " ",
       )} ./build --watch`,
       prefixColor: "green",

From dafeb1492a6319326df32c6b233f65c41b0771cf Mon Sep 17 00:00:00 2001
From: Oscar Hinton <Hinton@users.noreply.github.com>
Date: Fri, 17 Jan 2025 14:57:31 +0100
Subject: [PATCH 141/150] Add type=button to stories (#12930)

---
 .../platform/popup/layout/popup-layout.stories.ts  |  6 +++---
 .../src/directives/copy-click.directive.spec.ts    | 14 ++++++++++----
 .../src/dialog/dialog.service.stories.ts           |  8 +++++---
 .../simple-configurable-dialog.service.stories.ts  |  1 +
 .../simple-dialog/simple-dialog.service.stories.ts |  8 +++++---
 .../components/kitchen-sink-main.component.ts      | 10 +++++-----
 .../components/kitchen-sink-table.component.ts     | 12 ++++++++++--
 .../kitchen-sink-toggle-list.component.ts          |  2 +-
 libs/components/src/table/sortable.component.ts    |  7 ++++++-
 9 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/apps/browser/src/platform/popup/layout/popup-layout.stories.ts b/apps/browser/src/platform/popup/layout/popup-layout.stories.ts
index c1ac882326..6a2d8162c7 100644
--- a/apps/browser/src/platform/popup/layout/popup-layout.stories.ts
+++ b/apps/browser/src/platform/popup/layout/popup-layout.stories.ts
@@ -45,7 +45,7 @@ class ExtensionContainerComponent {}
     <bit-section>
       <bit-item-group aria-label="Mock Vault Items">
         <bit-item *ngFor="let item of data; index as i">
-          <button bit-item-content>
+          <button type="button" bit-item-content>
             <i slot="start" class="bwi bwi-globe tw-text-3xl tw-text-muted" aria-hidden="true"></i>
             {{ i }} of {{ data.length - 1 }}
             <span slot="secondary">Bar</span>
@@ -277,8 +277,8 @@ class MockSettingsPageComponent {}
       </popup-header>
       <vault-placeholder></vault-placeholder>
       <popup-footer slot="footer">
-        <button bitButton buttonType="primary">Save</button>
-        <button bitButton buttonType="secondary">Cancel</button>
+        <button type="button" bitButton buttonType="primary">Save</button>
+        <button type="button" bitButton buttonType="secondary">Cancel</button>
         <button slot="end" type="button" buttonType="danger" bitIconButton="bwi-trash"></button>
       </popup-footer>
     </popup-page>
diff --git a/libs/angular/src/directives/copy-click.directive.spec.ts b/libs/angular/src/directives/copy-click.directive.spec.ts
index 29466f7fbe..09161ee261 100644
--- a/libs/angular/src/directives/copy-click.directive.spec.ts
+++ b/libs/angular/src/directives/copy-click.directive.spec.ts
@@ -9,10 +9,16 @@ import { CopyClickDirective } from "./copy-click.directive";
 
 @Component({
   template: `
-    <button appCopyClick="no toast shown" #noToast></button>
-    <button appCopyClick="info toast shown" showToast="info" #infoToast></button>
-    <button appCopyClick="success toast shown" showToast #successToast></button>
-    <button appCopyClick="toast with label" showToast valueLabel="Content" #toastWithLabel></button>
+    <button type="button" appCopyClick="no toast shown" #noToast></button>
+    <button type="button" appCopyClick="info toast shown" showToast="info" #infoToast></button>
+    <button type="button" appCopyClick="success toast shown" showToast #successToast></button>
+    <button
+      type="button"
+      appCopyClick="toast with label"
+      showToast
+      valueLabel="Content"
+      #toastWithLabel
+    ></button>
   `,
 })
 class TestCopyClickComponent {
diff --git a/libs/components/src/dialog/dialog.service.stories.ts b/libs/components/src/dialog/dialog.service.stories.ts
index 5e93841280..2b42faeccc 100644
--- a/libs/components/src/dialog/dialog.service.stories.ts
+++ b/libs/components/src/dialog/dialog.service.stories.ts
@@ -19,7 +19,7 @@ interface Animal {
 }
 
 @Component({
-  template: `<button bitButton (click)="openDialog()">Open Dialog</button>`,
+  template: `<button bitButton type="button" (click)="openDialog()">Open Dialog</button>`,
 })
 class StoryDialogComponent {
   constructor(public dialogService: DialogService) {}
@@ -42,8 +42,10 @@ class StoryDialogComponent {
         Animal: {{ animal }}
       </span>
       <ng-container bitDialogFooter>
-        <button bitButton buttonType="primary" (click)="dialogRef.close()">Save</button>
-        <button bitButton buttonType="secondary" bitDialogClose>Cancel</button>
+        <button type="button" bitButton buttonType="primary" (click)="dialogRef.close()">
+          Save
+        </button>
+        <button type="button" bitButton buttonType="secondary" bitDialogClose>Cancel</button>
       </ng-container>
     </bit-dialog>
   `,
diff --git a/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.service.stories.ts b/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.service.stories.ts
index 4f21b8611b..9953fdd24e 100644
--- a/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.service.stories.ts
+++ b/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.service.stories.ts
@@ -16,6 +16,7 @@ import { DialogModule } from "../../dialog.module";
       <h2>{{ group.title }}</h2>
       <div class="tw-mb-4 tw-flex tw-flex-row tw-gap-2">
         <button
+          type="button"
           *ngFor="let dialog of group.dialogs"
           bitButton
           (click)="openSimpleConfigurableDialog(dialog)"
diff --git a/libs/components/src/dialog/simple-dialog/simple-dialog.service.stories.ts b/libs/components/src/dialog/simple-dialog/simple-dialog.service.stories.ts
index 665d658f8e..3bc4999878 100644
--- a/libs/components/src/dialog/simple-dialog/simple-dialog.service.stories.ts
+++ b/libs/components/src/dialog/simple-dialog/simple-dialog.service.stories.ts
@@ -17,7 +17,7 @@ interface Animal {
 }
 
 @Component({
-  template: `<button bitButton (click)="openDialog()">Open Simple Dialog</button>`,
+  template: `<button type="button" bitButton (click)="openDialog()">Open Simple Dialog</button>`,
 })
 class StoryDialogComponent {
   constructor(public dialogService: DialogService) {}
@@ -41,8 +41,10 @@ class StoryDialogComponent {
         Animal: {{ animal }}
       </span>
       <ng-container bitDialogFooter>
-        <button bitButton buttonType="primary" (click)="dialogRef.close()">Save</button>
-        <button bitButton buttonType="secondary" bitDialogClose>Cancel</button>
+        <button type="button" bitButton buttonType="primary" (click)="dialogRef.close()">
+          Save
+        </button>
+        <button type="button" bitButton buttonType="secondary" bitDialogClose>Cancel</button>
       </ng-container>
     </bit-simple-dialog>
   `,
diff --git a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-main.component.ts b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-main.component.ts
index 13f0a16a4d..568c78566f 100644
--- a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-main.component.ts
+++ b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-main.component.ts
@@ -15,8 +15,8 @@ import { KitchenSinkToggleList } from "./kitchen-sink-toggle-list.component";
     <bit-dialog title="Dialog Title" dialogSize="large">
       <span bitDialogContent> Dialog body text goes here. </span>
       <ng-container bitDialogFooter>
-        <button bitButton buttonType="primary" (click)="dialogRef.close()">OK</button>
-        <button bitButton buttonType="secondary" bitDialogClose>Cancel</button>
+        <button type="button" bitButton buttonType="primary" (click)="dialogRef.close()">OK</button>
+        <button type="button" bitButton buttonType="secondary" bitDialogClose>Cancel</button>
       </ng-container>
     </bit-dialog>
   `,
@@ -42,7 +42,7 @@ class KitchenSinkDialog {
       </bit-breadcrumbs>
     </p>
 
-    <div class="tw-mb-6 tw-mt-6">
+    <div class="tw-my-6">
       <h1 bitTypography="h1">Bitwarden Kitchen Sink<bit-avatar text="Bit Warden"></bit-avatar></h1>
       <a bitLink linkType="primary" href="#">Learn more</a>
     </div>
@@ -68,8 +68,8 @@ class KitchenSinkDialog {
           <h2 bitTypography="h2" class="tw-mb-6">About</h2>
           <bit-kitchen-sink-table></bit-kitchen-sink-table>
 
-          <button bitButton (click)="openDialog()">Open Dialog</button>
-          <button bitButton (click)="openDrawer()">Open Drawer</button>
+          <button type="button" bitButton (click)="openDialog()">Open Dialog</button>
+          <button type="button" bitButton (click)="openDrawer()">Open Drawer</button>
         </bit-section>
         <bit-section>
           <h2 bitTypography="h2" class="tw-mb-6">Companies using Bitwarden</h2>
diff --git a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-table.component.ts b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-table.component.ts
index 3c6d6f1144..ba71483d7d 100644
--- a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-table.component.ts
+++ b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-table.component.ts
@@ -20,7 +20,11 @@ import { KitchenSinkSharedModule } from "../kitchen-sink-shared.module";
           <td bitCell>Password Manager</td>
           <td bitCell>Everyone</td>
           <td bitCell>
-            <button bitIconButton="bwi-ellipsis-v" [bitMenuTriggerFor]="menu1"></button>
+            <button
+              type="button"
+              bitIconButton="bwi-ellipsis-v"
+              [bitMenuTriggerFor]="menu1"
+            ></button>
             <bit-menu #menu1>
               <a href="#" bitMenuItem>Anchor link</a>
               <a href="#" bitMenuItem>Another link</a>
@@ -33,7 +37,11 @@ import { KitchenSinkSharedModule } from "../kitchen-sink-shared.module";
           <td bitCell>Secrets Manager</td>
           <td bitCell>Developers</td>
           <td bitCell>
-            <button bitIconButton="bwi-ellipsis-v" [bitMenuTriggerFor]="menu2"></button>
+            <button
+              type="button"
+              bitIconButton="bwi-ellipsis-v"
+              [bitMenuTriggerFor]="menu2"
+            ></button>
             <bit-menu #menu2>
               <a href="#" bitMenuItem>Anchor link</a>
               <a href="#" bitMenuItem>Another link</a>
diff --git a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-toggle-list.component.ts b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-toggle-list.component.ts
index 2804c9e835..6f0054912c 100644
--- a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-toggle-list.component.ts
+++ b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-toggle-list.component.ts
@@ -7,7 +7,7 @@ import { KitchenSinkSharedModule } from "../kitchen-sink-shared.module";
   selector: "bit-kitchen-sink-toggle-list",
   imports: [KitchenSinkSharedModule],
   template: `
-    <div class="tw-mt-6 tw-mb-6">
+    <div class="tw-my-6">
       <bit-toggle-group [(selected)]="selectedToggle" aria-label="Company list filter">
         <bit-toggle value="all"> All <span bitBadge variant="info">3</span> </bit-toggle>
 
diff --git a/libs/components/src/table/sortable.component.ts b/libs/components/src/table/sortable.component.ts
index d3309c03aa..bdfb87ac52 100644
--- a/libs/components/src/table/sortable.component.ts
+++ b/libs/components/src/table/sortable.component.ts
@@ -10,7 +10,12 @@ import { TableComponent } from "./table.component";
 @Component({
   selector: "th[bitSortable]",
   template: `
-    <button [ngClass]="classList" [attr.aria-pressed]="isActive" (click)="setActive()">
+    <button
+      type="button"
+      [ngClass]="classList"
+      [attr.aria-pressed]="isActive"
+      (click)="setActive()"
+    >
       <ng-content></ng-content>
       <i class="bwi tw-ml-2" [ngClass]="icon"></i>
     </button>

From 9eecfbc8afad3d2b8ce5a066f57c713363f30853 Mon Sep 17 00:00:00 2001
From: Daniel James Smith <2670567+djsmith85@users.noreply.github.com>
Date: Fri, 17 Jan 2025 15:56:09 +0100
Subject: [PATCH 142/150] [PM-17189] Remove LP fileless importer (#12918)

* Remove LP fileless importer

- Remove content scripts
- Remove additions to message handlers and notifcation queue
- Remove UI elements for the importer
- Remove the actual importer code
- Remove unsued keys from en/messages.json
Remove feature flag "browser-fileless-
import"
Update webpack.config and manifest files to no longer include content scripts

* Move feature flag idp-auto-submit-login under autofill grouping

---------

Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
---
 apps/browser/src/_locales/en/messages.json    |  32 --
 .../abstractions/notification.background.ts   |   9 +-
 .../background/notification.background.ts     |  55 ---
 .../components/notification/container.ts      |   2 -
 .../notification-queue-message-type.enum.ts   |   1 -
 .../abstractions/notification-bar.ts          |   1 -
 .../src/autofill/notification/bar.html        |  10 -
 apps/browser/src/autofill/notification/bar.ts |  77 ----
 .../browser/src/background/main.background.ts |  13 -
 apps/browser/src/manifest.json                |   7 -
 apps/browser/src/manifest.v3.json             |   6 -
 .../fileless-importer.background.ts           |  34 --
 .../fileless-importer.background.spec.ts      | 339 ------------------
 .../fileless-importer.background.ts           | 265 --------------
 .../fileless-importer-injected-scripts.ts     |  25 --
 .../abstractions/lp-fileless-importer.ts      |  25 --
 .../content/lp-fileless-importer.spec.ts      | 211 -----------
 .../src/tools/content/lp-fileless-importer.ts | 158 --------
 ...-import-download-script-append.mv2.spec.ts |  23 --
 ...press-import-download-script-append.mv2.ts |   9 -
 .../lp-suppress-import-download.spec.ts       |  83 -----
 .../content/lp-suppress-import-download.ts    |  52 ---
 .../src/tools/enums/fileless-import.enums.ts  |  12 -
 apps/browser/webpack.config.js                |   4 -
 libs/common/src/enums/feature-flag.enum.ts    |   6 +-
 25 files changed, 3 insertions(+), 1456 deletions(-)
 delete mode 100644 apps/browser/src/tools/background/abstractions/fileless-importer.background.ts
 delete mode 100644 apps/browser/src/tools/background/fileless-importer.background.spec.ts
 delete mode 100644 apps/browser/src/tools/background/fileless-importer.background.ts
 delete mode 100644 apps/browser/src/tools/config/fileless-importer-injected-scripts.ts
 delete mode 100644 apps/browser/src/tools/content/abstractions/lp-fileless-importer.ts
 delete mode 100644 apps/browser/src/tools/content/lp-fileless-importer.spec.ts
 delete mode 100644 apps/browser/src/tools/content/lp-fileless-importer.ts
 delete mode 100644 apps/browser/src/tools/content/lp-suppress-import-download-script-append.mv2.spec.ts
 delete mode 100644 apps/browser/src/tools/content/lp-suppress-import-download-script-append.mv2.ts
 delete mode 100644 apps/browser/src/tools/content/lp-suppress-import-download.spec.ts
 delete mode 100644 apps/browser/src/tools/content/lp-suppress-import-download.ts
 delete mode 100644 apps/browser/src/tools/enums/fileless-import.enums.ts

diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index 51e1203673..ecb47843df 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -3425,38 +3425,6 @@
     "message": "Toggle collapse",
     "description": "Toggling an expand/collapse state."
   },
-  "filelessImport": {
-    "message": "Import your data to Bitwarden?",
-    "description": "Default notification title for triggering a fileless import."
-  },
-  "lpFilelessImport": {
-    "message": "Protect your LastPass data and import to Bitwarden?",
-    "description": "LastPass specific notification title for triggering a fileless import."
-  },
-  "lpCancelFilelessImport": {
-    "message": "Save as unencrypted file",
-    "description": "LastPass specific notification button text for cancelling a fileless import."
-  },
-  "startFilelessImport": {
-    "message": "Import to Bitwarden",
-    "description": "Notification button text for starting a fileless import."
-  },
-  "importing": {
-    "message": "Importing...",
-    "description": "Notification message for when an import is in progress."
-  },
-  "dataSuccessfullyImported": {
-    "message": "Data successfully imported!",
-    "description": "Notification message for when an import has completed successfully."
-  },
-  "dataImportFailed": {
-    "message": "Error importing. Check console for details.",
-    "description": "Notification message for when an import has failed."
-  },
-  "importNetworkError": {
-    "message": "Network error encountered during import.",
-    "description": "Notification message for when an import has failed due to a network error."
-  },
   "aliasDomain": {
     "message": "Alias domain"
   },
diff --git a/apps/browser/src/autofill/background/abstractions/notification.background.ts b/apps/browser/src/autofill/background/abstractions/notification.background.ts
index ed9d8e6d84..1b98928311 100644
--- a/apps/browser/src/autofill/background/abstractions/notification.background.ts
+++ b/apps/browser/src/autofill/background/abstractions/notification.background.ts
@@ -31,16 +31,10 @@ interface AddUnlockVaultQueueMessage extends NotificationQueueMessage {
   type: "unlock";
 }
 
-interface AddRequestFilelessImportQueueMessage extends NotificationQueueMessage {
-  type: "fileless-import";
-  importType?: string;
-}
-
 type NotificationQueueMessageItem =
   | AddLoginQueueMessage
   | AddChangePasswordQueueMessage
-  | AddUnlockVaultQueueMessage
-  | AddRequestFilelessImportQueueMessage;
+  | AddUnlockVaultQueueMessage;
 
 type LockedVaultPendingNotificationsData = {
   commandToRetry: {
@@ -122,7 +116,6 @@ export {
   AddChangePasswordQueueMessage,
   AddLoginQueueMessage,
   AddUnlockVaultQueueMessage,
-  AddRequestFilelessImportQueueMessage,
   NotificationQueueMessageItem,
   LockedVaultPendingNotificationsData,
   AdjustNotificationBarMessageData,
diff --git a/apps/browser/src/autofill/background/notification.background.ts b/apps/browser/src/autofill/background/notification.background.ts
index 5c6ff3c2c8..0175b27bd6 100644
--- a/apps/browser/src/autofill/background/notification.background.ts
+++ b/apps/browser/src/autofill/background/notification.background.ts
@@ -37,7 +37,6 @@ import { AutofillService } from "../services/abstractions/autofill.service";
 import {
   AddChangePasswordQueueMessage,
   AddLoginQueueMessage,
-  AddRequestFilelessImportQueueMessage,
   AddUnlockVaultQueueMessage,
   ChangePasswordMessageData,
   AddLoginMessageData,
@@ -201,11 +200,6 @@ export default class NotificationBackground {
       case NotificationQueueMessageType.AddLogin:
         typeData.removeIndividualVault = await this.removeIndividualVault();
         break;
-      case NotificationQueueMessageType.RequestFilelessImport:
-        typeData.importType = (
-          notificationQueueMessage as AddRequestFilelessImportQueueMessage
-        ).importType;
-        break;
     }
 
     await BrowserApi.tabSendMessageData(tab, "openNotificationBar", {
@@ -399,25 +393,6 @@ export default class NotificationBackground {
     }
   }
 
-  /**
-   * Sets up a notification to request a fileless import when the user
-   * attempts to trigger an import from a third party website.
-   *
-   * @param tab - The tab that we are sending the notification to
-   * @param importType - The type of import that is being requested
-   */
-  async requestFilelessImport(tab: chrome.tabs.Tab, importType: string) {
-    const currentAuthStatus = await this.getAuthStatus();
-    if (currentAuthStatus !== AuthenticationStatus.Unlocked || this.notificationQueue.length) {
-      return;
-    }
-
-    const loginDomain = Utils.getDomain(tab.url);
-    if (loginDomain) {
-      await this.pushRequestFilelessImportToQueue(loginDomain, tab, importType);
-    }
-  }
-
   private async pushChangePasswordToQueue(
     cipherId: string,
     loginDomain: string,
@@ -456,36 +431,6 @@ export default class NotificationBackground {
     await this.sendNotificationQueueMessage(tab, message);
   }
 
-  /**
-   * Pushes a request to start a fileless import to the notification queue.
-   * This will display a notification bar to the user, prompting them to
-   * start the import.
-   *
-   * @param loginDomain - The domain of the tab that we are sending the notification to
-   * @param tab - The tab that we are sending the notification to
-   * @param importType - The type of import that is being requested
-   */
-  private async pushRequestFilelessImportToQueue(
-    loginDomain: string,
-    tab: chrome.tabs.Tab,
-    importType?: string,
-  ) {
-    this.removeTabFromNotificationQueue(tab);
-    const launchTimestamp = new Date().getTime();
-    const message: AddRequestFilelessImportQueueMessage = {
-      type: NotificationQueueMessageType.RequestFilelessImport,
-      domain: loginDomain,
-      tab,
-      launchTimestamp,
-      expires: new Date(launchTimestamp + 0.5 * 60000), // 30 seconds
-      wasVaultLocked: false,
-      importType,
-    };
-    this.notificationQueue.push(message);
-    await this.checkNotificationQueue(tab);
-    this.removeTabFromNotificationQueue(tab);
-  }
-
   /**
    * Saves a cipher based on the message sent from the notification bar. If the vault
    * is locked, the message will be added to the notification queue and the unlock
diff --git a/apps/browser/src/autofill/content/components/notification/container.ts b/apps/browser/src/autofill/content/components/notification/container.ts
index 0cce066cf3..8bd07ab829 100644
--- a/apps/browser/src/autofill/content/components/notification/container.ts
+++ b/apps/browser/src/autofill/content/components/notification/container.ts
@@ -91,8 +91,6 @@ function getHeaderMessage(i18n: { [key: string]: string }, type?: NotificationTy
       return i18n.updateLoginPrompt;
     case NotificationTypes.Unlock:
       return "";
-    case NotificationTypes.FilelessImport:
-      return "";
     default:
       return undefined;
   }
diff --git a/apps/browser/src/autofill/enums/notification-queue-message-type.enum.ts b/apps/browser/src/autofill/enums/notification-queue-message-type.enum.ts
index 1f5abac92b..5a7b8fa990 100644
--- a/apps/browser/src/autofill/enums/notification-queue-message-type.enum.ts
+++ b/apps/browser/src/autofill/enums/notification-queue-message-type.enum.ts
@@ -2,7 +2,6 @@ const NotificationQueueMessageType = {
   AddLogin: "add",
   ChangePassword: "change",
   UnlockVault: "unlock",
-  RequestFilelessImport: "fileless-import",
 } as const;
 
 type NotificationQueueMessageTypes =
diff --git a/apps/browser/src/autofill/notification/abstractions/notification-bar.ts b/apps/browser/src/autofill/notification/abstractions/notification-bar.ts
index 2e38adacb3..53948a26a2 100644
--- a/apps/browser/src/autofill/notification/abstractions/notification-bar.ts
+++ b/apps/browser/src/autofill/notification/abstractions/notification-bar.ts
@@ -4,7 +4,6 @@ const NotificationTypes = {
   Add: "add",
   Change: "change",
   Unlock: "unlock",
-  FilelessImport: "fileless-import",
 } as const;
 
 type NotificationType = (typeof NotificationTypes)[keyof typeof NotificationTypes];
diff --git a/apps/browser/src/autofill/notification/bar.html b/apps/browser/src/autofill/notification/bar.html
index 6b0e76b516..b686e1ec2f 100644
--- a/apps/browser/src/autofill/notification/bar.html
+++ b/apps/browser/src/autofill/notification/bar.html
@@ -55,14 +55,4 @@
       </div>
     </div>
   </template>
-
-  <template id="template-fileless-import">
-    <div class="inner-wrapper">
-      <div id="fileless-import-text" class="notification-body"></div>
-      <div id="fileless-import-buttons" class="notification-actions">
-        <button type="button" id="cancel-fileless-import" class="secondary"></button>
-        <button type="button" id="start-fileless-import" class="primary"></button>
-      </div>
-    </div>
-  </template>
 </html>
diff --git a/apps/browser/src/autofill/notification/bar.ts b/apps/browser/src/autofill/notification/bar.ts
index 2c0ebe8e8e..3fc61c448f 100644
--- a/apps/browser/src/autofill/notification/bar.ts
+++ b/apps/browser/src/autofill/notification/bar.ts
@@ -4,7 +4,6 @@ import { ThemeTypes } from "@bitwarden/common/platform/enums";
 import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service";
 import type { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 
-import { FilelessImportPort, FilelessImportType } from "../../tools/enums/fileless-import.enums";
 import { AdjustNotificationBarMessageData } from "../background/abstractions/notification.background";
 import { buildSvgDomElement } from "../utils";
 import { circleCheckIcon } from "../utils/svg-icons";
@@ -59,11 +58,6 @@ function initNotificationBar(message: NotificationBarWindowMessage) {
     notificationChangeDesc: chrome.i18n.getMessage("notificationChangeDesc"),
     notificationUnlock: chrome.i18n.getMessage("notificationUnlock"),
     notificationUnlockDesc: chrome.i18n.getMessage("notificationUnlockDesc"),
-    filelessImport: chrome.i18n.getMessage("filelessImport"),
-    lpFilelessImport: chrome.i18n.getMessage("lpFilelessImport"),
-    cancelFilelessImport: chrome.i18n.getMessage("no"),
-    lpCancelFilelessImport: chrome.i18n.getMessage("lpCancelFilelessImport"),
-    startFilelessImport: chrome.i18n.getMessage("startFilelessImport"),
   };
 
   setupLogoLink(i18n);
@@ -107,22 +101,6 @@ function initNotificationBar(message: NotificationBarWindowMessage) {
 
   unlockTemplate.content.getElementById("unlock-text").textContent = i18n.notificationUnlockDesc;
 
-  // i18n for "Fileless Import" (fileless-import) template
-  const isLpImport = initData.importType === FilelessImportType.LP;
-  const importTemplate = document.getElementById("template-fileless-import") as HTMLTemplateElement;
-
-  const startImportButton = importTemplate.content.getElementById("start-fileless-import");
-  startImportButton.textContent = i18n.startFilelessImport;
-
-  const cancelImportButton = importTemplate.content.getElementById("cancel-fileless-import");
-  cancelImportButton.textContent = isLpImport
-    ? i18n.lpCancelFilelessImport
-    : i18n.cancelFilelessImport;
-
-  importTemplate.content.getElementById("fileless-import-text").textContent = isLpImport
-    ? i18n.lpFilelessImport
-    : i18n.filelessImport;
-
   // i18n for body content
   const closeButton = document.getElementById("close-button");
   closeButton.title = i18n.close;
@@ -134,8 +112,6 @@ function initNotificationBar(message: NotificationBarWindowMessage) {
     handleTypeChange();
   } else if (notificationType === "unlock") {
     handleTypeUnlock();
-  } else if (notificationType === "fileless-import") {
-    handleTypeFilelessImport();
   }
 
   closeButton.addEventListener("click", (e) => {
@@ -249,59 +225,6 @@ function handleTypeUnlock() {
   });
 }
 
-/**
- * Sets up a port to communicate with the fileless importer content script.
- * This connection to the background script is used to trigger the action of
- * downloading the CSV file from the LP importer or importing the data into
- * the Bitwarden vault.
- */
-function handleTypeFilelessImport() {
-  const importType = notificationBarIframeInitData.importType;
-  const port = chrome.runtime.connect({ name: FilelessImportPort.NotificationBar });
-  setContent(document.getElementById("template-fileless-import") as HTMLTemplateElement);
-
-  const startFilelessImportButton = document.getElementById("start-fileless-import");
-  const startFilelessImport = () => {
-    port.postMessage({ command: "startFilelessImport", importType });
-    document.getElementById("fileless-import-buttons").textContent =
-      chrome.i18n.getMessage("importing");
-    startFilelessImportButton.removeEventListener("click", startFilelessImport);
-  };
-  startFilelessImportButton.addEventListener("click", startFilelessImport);
-
-  const cancelFilelessImportButton = document.getElementById("cancel-fileless-import");
-  cancelFilelessImportButton.addEventListener("click", () => {
-    port.postMessage({ command: "cancelFilelessImport", importType });
-  });
-
-  const handlePortMessage = (msg: any) => {
-    if (msg.command !== "filelessImportCompleted" && msg.command !== "filelessImportFailed") {
-      return;
-    }
-
-    port.disconnect();
-
-    const filelessImportButtons = document.getElementById("fileless-import-buttons");
-    const notificationBarOuterWrapper = document.getElementById("notification-bar-outer-wrapper");
-
-    if (msg.command === "filelessImportCompleted") {
-      filelessImportButtons.textContent = chrome.i18n.getMessage("dataSuccessfullyImported");
-      filelessImportButtons.prepend(buildSvgDomElement(circleCheckIcon));
-      filelessImportButtons.classList.add("success-message");
-      notificationBarOuterWrapper.classList.add("success-event");
-      adjustHeight();
-      return;
-    }
-
-    filelessImportButtons.textContent = chrome.i18n.getMessage("dataImportFailed");
-    filelessImportButtons.classList.add("error-message");
-    notificationBarOuterWrapper.classList.add("error-event");
-    adjustHeight();
-    logService.error(`Error Encountered During Import: ${msg.importErrorMessage}`);
-  };
-  port.onMessage.addListener(handlePortMessage);
-}
-
 function setContent(template: HTMLTemplateElement) {
   const content = document.getElementById("content");
   while (content.firstChild) {
diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index 5d09122bbd..3a60cc5210 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -268,7 +268,6 @@ import { OffscreenStorageService } from "../platform/storage/offscreen-storage.s
 import { SyncServiceListener } from "../platform/sync/sync-service.listener";
 import { fromChromeRuntimeMessaging } from "../platform/utils/from-chrome-runtime-messaging";
 import VaultTimeoutService from "../services/vault-timeout/vault-timeout.service";
-import FilelessImporterBackground from "../tools/background/fileless-importer.background";
 import { VaultFilterService } from "../vault/services/vault-filter.service";
 
 import CommandsBackground from "./commands.background";
@@ -393,7 +392,6 @@ export default class MainBackground {
   private notificationBackground: NotificationBackground;
   private overlayBackground: OverlayBackgroundInterface;
   private overlayNotificationsBackground: OverlayNotificationsBackgroundInterface;
-  private filelessImporterBackground: FilelessImporterBackground;
   private runtimeBackground: RuntimeBackground;
   private tabsBackground: TabsBackground;
   private webRequestBackground: WebRequestBackground;
@@ -1160,16 +1158,6 @@ export default class MainBackground {
       this.notificationBackground,
     );
 
-    this.filelessImporterBackground = new FilelessImporterBackground(
-      this.configService,
-      this.authService,
-      this.policyService,
-      this.notificationBackground,
-      this.importService,
-      this.syncService,
-      this.scriptInjectorService,
-    );
-
     this.autoSubmitLoginBackground = new AutoSubmitLoginBackground(
       this.logService,
       this.autofillService,
@@ -1296,7 +1284,6 @@ export default class MainBackground {
     await this.runtimeBackground.init();
     await this.notificationBackground.init();
     this.overlayNotificationsBackground.init();
-    this.filelessImporterBackground.init();
     this.commandsBackground.init();
     this.contextMenusBackground?.init();
     this.idleBackground.init();
diff --git a/apps/browser/src/manifest.json b/apps/browser/src/manifest.json
index 86ea0eebbc..016bf6dfe4 100644
--- a/apps/browser/src/manifest.json
+++ b/apps/browser/src/manifest.json
@@ -29,12 +29,6 @@
       "matches": ["*://*/*", "file:///*"],
       "exclude_matches": ["*://*/*.xml*", "file:///*.xml*"],
       "run_at": "document_start"
-    },
-    {
-      "all_frames": false,
-      "js": ["content/lp-fileless-importer.js"],
-      "matches": ["https://lastpass.com/export.php"],
-      "run_at": "document_start"
     }
   ],
   "background": {
@@ -140,7 +134,6 @@
   },
   "web_accessible_resources": [
     "content/fido2-page-script.js",
-    "content/lp-suppress-import-download.js",
     "notification/bar.html",
     "images/icon38.png",
     "images/icon38_locked.png",
diff --git a/apps/browser/src/manifest.v3.json b/apps/browser/src/manifest.v3.json
index ae7c888eb9..104036140b 100644
--- a/apps/browser/src/manifest.v3.json
+++ b/apps/browser/src/manifest.v3.json
@@ -30,12 +30,6 @@
       "matches": ["*://*/*", "file:///*"],
       "exclude_matches": ["*://*/*.xml*", "file:///*.xml*"],
       "run_at": "document_start"
-    },
-    {
-      "all_frames": false,
-      "js": ["content/lp-fileless-importer.js"],
-      "matches": ["https://lastpass.com/export.php"],
-      "run_at": "document_start"
     }
   ],
   "background": {
diff --git a/apps/browser/src/tools/background/abstractions/fileless-importer.background.ts b/apps/browser/src/tools/background/abstractions/fileless-importer.background.ts
deleted file mode 100644
index 2ade5bf767..0000000000
--- a/apps/browser/src/tools/background/abstractions/fileless-importer.background.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { FilelessImportTypeKeys } from "../../enums/fileless-import.enums";
-
-type FilelessImportPortMessage = {
-  command?: string;
-  importType?: FilelessImportTypeKeys;
-  data?: string;
-};
-
-type FilelessImportPortMessageHandlerParams = {
-  message: FilelessImportPortMessage;
-  port: chrome.runtime.Port;
-};
-
-type ImportNotificationMessageHandlers = {
-  [key: string]: ({ message, port }: FilelessImportPortMessageHandlerParams) => void;
-  cancelFilelessImport: ({ message, port }: FilelessImportPortMessageHandlerParams) => void;
-};
-
-type LpImporterMessageHandlers = {
-  [key: string]: ({ message, port }: FilelessImportPortMessageHandlerParams) => void;
-  displayLpImportNotification: ({ port }: { port: chrome.runtime.Port }) => void;
-  startLpImport: ({ message }: { message: FilelessImportPortMessage }) => void;
-};
-
-interface FilelessImporterBackground {
-  init(): void;
-}
-
-export {
-  FilelessImportPortMessage,
-  ImportNotificationMessageHandlers,
-  LpImporterMessageHandlers,
-  FilelessImporterBackground,
-};
diff --git a/apps/browser/src/tools/background/fileless-importer.background.spec.ts b/apps/browser/src/tools/background/fileless-importer.background.spec.ts
deleted file mode 100644
index 409fac9790..0000000000
--- a/apps/browser/src/tools/background/fileless-importer.background.spec.ts
+++ /dev/null
@@ -1,339 +0,0 @@
-import { mock } from "jest-mock-extended";
-import { of } from "rxjs";
-
-import { PolicyService } from "@bitwarden/common/admin-console/services/policy/policy.service";
-import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
-import { AuthService } from "@bitwarden/common/auth/services/auth.service";
-import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
-import { Importer, ImportResult, ImportServiceAbstraction } from "@bitwarden/importer/core";
-
-import NotificationBackground from "../../autofill/background/notification.background";
-import { createPortSpyMock } from "../../autofill/spec/autofill-mocks";
-import {
-  flushPromises,
-  sendPortMessage,
-  triggerRuntimeOnConnectEvent,
-} from "../../autofill/spec/testing-utils";
-import { BrowserApi } from "../../platform/browser/browser-api";
-import { BrowserScriptInjectorService } from "../../platform/services/browser-script-injector.service";
-import { FilelessImportPort, FilelessImportType } from "../enums/fileless-import.enums";
-
-import FilelessImporterBackground from "./fileless-importer.background";
-
-describe("FilelessImporterBackground ", () => {
-  let filelessImporterBackground: FilelessImporterBackground;
-  const configService = mock<ConfigService>();
-  const domainSettingsService = mock<DomainSettingsService>();
-  const authService = mock<AuthService>();
-  const policyService = mock<PolicyService>();
-  const notificationBackground = mock<NotificationBackground>();
-  const importService = mock<ImportServiceAbstraction>();
-  const syncService = mock<SyncService>();
-  const platformUtilsService = mock<PlatformUtilsService>();
-  const logService = mock<LogService>();
-  let scriptInjectorService: BrowserScriptInjectorService;
-  let tabMock: chrome.tabs.Tab;
-
-  beforeEach(() => {
-    domainSettingsService.blockedInteractionsUris$ = of({});
-    policyService.policyAppliesToActiveUser$.mockImplementation(() => of(true));
-    scriptInjectorService = new BrowserScriptInjectorService(
-      domainSettingsService,
-      platformUtilsService,
-      logService,
-    );
-    filelessImporterBackground = new FilelessImporterBackground(
-      configService,
-      authService,
-      policyService,
-      notificationBackground,
-      importService,
-      syncService,
-      scriptInjectorService,
-    );
-    filelessImporterBackground.init();
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  describe("init", () => {
-    it("sets up the port message listeners on initialization of the class", () => {
-      expect(chrome.runtime.onConnect.addListener).toHaveBeenCalledWith(expect.any(Function));
-    });
-  });
-
-  describe("handle ports onConnect", () => {
-    let lpImporterPort: chrome.runtime.Port;
-    let manifestVersionSpy: jest.SpyInstance;
-    let executeScriptInTabSpy: jest.SpyInstance;
-
-    beforeEach(() => {
-      lpImporterPort = createPortSpyMock(FilelessImportPort.LpImporter);
-      tabMock = lpImporterPort.sender.tab;
-      jest.spyOn(BrowserApi, "getTab").mockImplementation(async () => tabMock);
-      manifestVersionSpy = jest.spyOn(BrowserApi, "manifestVersion", "get");
-      executeScriptInTabSpy = jest.spyOn(BrowserApi, "executeScriptInTab").mockResolvedValue(null);
-      jest.spyOn(authService, "getAuthStatus").mockResolvedValue(AuthenticationStatus.Unlocked);
-      jest.spyOn(configService, "getFeatureFlag").mockResolvedValue(true);
-      jest.spyOn(filelessImporterBackground as any, "removeIndividualVault");
-    });
-
-    it("ignores the port connection if the port name is not present in the set of filelessImportNames", async () => {
-      const port = createPortSpyMock("some-other-port");
-
-      triggerRuntimeOnConnectEvent(port);
-      await flushPromises();
-
-      expect(port.postMessage).not.toHaveBeenCalled();
-    });
-
-    it("posts a message to the port indicating that the fileless import feature is disabled if the user's auth status is not unlocked", async () => {
-      jest.spyOn(authService, "getAuthStatus").mockResolvedValue(AuthenticationStatus.Locked);
-
-      triggerRuntimeOnConnectEvent(lpImporterPort);
-      await flushPromises();
-
-      expect(lpImporterPort.postMessage).toHaveBeenCalledWith({
-        command: "verifyFeatureFlag",
-        filelessImportEnabled: false,
-      });
-    });
-
-    it("posts a message to the port indicating that the fileless import feature is disabled if the user's policy removes individual vaults", async () => {
-      triggerRuntimeOnConnectEvent(lpImporterPort);
-      await flushPromises();
-
-      expect(lpImporterPort.postMessage).toHaveBeenCalledWith({
-        command: "verifyFeatureFlag",
-        filelessImportEnabled: false,
-      });
-    });
-
-    it("posts a message to the port indicating that the fileless import feature is disabled if the feature flag is turned off", async () => {
-      jest.spyOn(configService, "getFeatureFlag").mockResolvedValue(false);
-
-      triggerRuntimeOnConnectEvent(lpImporterPort);
-      await flushPromises();
-
-      expect(lpImporterPort.postMessage).toHaveBeenCalledWith({
-        command: "verifyFeatureFlag",
-        filelessImportEnabled: false,
-      });
-    });
-
-    it("posts a message to the port indicating that the fileless import feature is enabled", async () => {
-      policyService.policyAppliesToActiveUser$.mockImplementationOnce(() => of(false));
-
-      triggerRuntimeOnConnectEvent(lpImporterPort);
-      await flushPromises();
-
-      expect(lpImporterPort.postMessage).toHaveBeenCalledWith({
-        command: "verifyFeatureFlag",
-        filelessImportEnabled: true,
-      });
-    });
-
-    it("triggers an injection of the `lp-suppress-import-download.js` script in manifest v3", async () => {
-      policyService.policyAppliesToActiveUser$.mockImplementationOnce(() => of(false));
-      manifestVersionSpy.mockReturnValue(3);
-
-      triggerRuntimeOnConnectEvent(lpImporterPort);
-      await flushPromises();
-
-      expect(executeScriptInTabSpy).toHaveBeenCalledWith(
-        lpImporterPort.sender.tab.id,
-        { file: "content/lp-suppress-import-download.js", runAt: "document_start", frameId: 0 },
-        { world: "MAIN" },
-      );
-    });
-
-    it("triggers an injection of the `lp-suppress-import-download-script-append-mv2.js` script in manifest v2", async () => {
-      policyService.policyAppliesToActiveUser$.mockImplementationOnce(() => of(false));
-      manifestVersionSpy.mockReturnValue(2);
-
-      triggerRuntimeOnConnectEvent(lpImporterPort);
-      await flushPromises();
-
-      expect(executeScriptInTabSpy).toHaveBeenCalledWith(lpImporterPort.sender.tab.id, {
-        file: "content/lp-suppress-import-download-script-append-mv2.js",
-        runAt: "document_start",
-        frameId: 0,
-      });
-    });
-  });
-
-  describe("port messages", () => {
-    let notificationPort: chrome.runtime.Port;
-    let lpImporterPort: chrome.runtime.Port;
-
-    beforeEach(async () => {
-      policyService.policyAppliesToActiveUser$.mockImplementation(() => of(false));
-      jest.spyOn(authService, "getAuthStatus").mockResolvedValue(AuthenticationStatus.Unlocked);
-      jest.spyOn(configService, "getFeatureFlag").mockResolvedValue(true);
-
-      triggerRuntimeOnConnectEvent(createPortSpyMock(FilelessImportPort.NotificationBar));
-      triggerRuntimeOnConnectEvent(createPortSpyMock(FilelessImportPort.LpImporter));
-      await flushPromises();
-      notificationPort = filelessImporterBackground["importNotificationsPort"];
-      lpImporterPort = filelessImporterBackground["lpImporterPort"];
-    });
-
-    it("skips handling a message if a message handler is not associated with the port message command", () => {
-      sendPortMessage(notificationPort, { command: "commandNotFound" });
-
-      expect(chrome.tabs.sendMessage).not.toHaveBeenCalled();
-    });
-
-    describe("import notification port messages", () => {
-      describe("startFilelessImport", () => {
-        it("sends a message to start the LastPass fileless import within the content script", () => {
-          sendPortMessage(notificationPort, {
-            command: "startFilelessImport",
-            importType: FilelessImportType.LP,
-          });
-
-          expect(lpImporterPort.postMessage).toHaveBeenCalledWith({
-            command: "startLpFilelessImport",
-          });
-        });
-      });
-
-      describe("cancelFilelessImport", () => {
-        it("sends a message to close the notification bar", async () => {
-          sendPortMessage(notificationPort, { command: "cancelFilelessImport" });
-
-          expect(chrome.tabs.sendMessage).toHaveBeenCalledWith(
-            notificationPort.sender.tab.id,
-            {
-              command: "closeNotificationBar",
-            },
-            null,
-            expect.anything(),
-          );
-          expect(lpImporterPort.postMessage).not.toHaveBeenCalledWith({
-            command: "triggerCsvDownload",
-          });
-        });
-
-        it("sends a message to trigger a download of the LP importer CSV", () => {
-          sendPortMessage(notificationPort, {
-            command: "cancelFilelessImport",
-            importType: FilelessImportType.LP,
-          });
-
-          expect(lpImporterPort.postMessage).toHaveBeenCalledWith({
-            command: "triggerCsvDownload",
-          });
-          expect(lpImporterPort.disconnect).toHaveBeenCalled();
-        });
-      });
-    });
-
-    describe("lp importer port messages", () => {
-      describe("displayLpImportNotification", () => {
-        it("creates a request fileless import notification", async () => {
-          jest.spyOn(filelessImporterBackground["notificationBackground"], "requestFilelessImport");
-
-          sendPortMessage(lpImporterPort, {
-            command: "displayLpImportNotification",
-          });
-          await flushPromises();
-
-          expect(
-            filelessImporterBackground["notificationBackground"].requestFilelessImport,
-          ).toHaveBeenCalledWith(lpImporterPort.sender.tab, FilelessImportType.LP);
-        });
-      });
-
-      describe("startLpImport", () => {
-        it("ignores the message if the message does not contain data", () => {
-          sendPortMessage(lpImporterPort, {
-            command: "startLpImport",
-          });
-
-          expect(filelessImporterBackground["importService"].import).not.toHaveBeenCalled();
-        });
-
-        it("triggers the import of the LastPass vault", async () => {
-          const data = "url,username,password";
-          const importer = mock<Importer>();
-          jest
-            .spyOn(filelessImporterBackground["importService"], "getImporter")
-            .mockReturnValue(importer);
-          jest.spyOn(filelessImporterBackground["importService"], "import").mockResolvedValue(
-            mock<ImportResult>({
-              success: true,
-            }),
-          );
-          jest.spyOn(filelessImporterBackground["syncService"], "fullSync");
-
-          sendPortMessage(lpImporterPort, {
-            command: "startLpImport",
-            data,
-          });
-          await flushPromises();
-
-          expect(filelessImporterBackground["importService"].import).toHaveBeenCalledWith(
-            importer,
-            data,
-            null,
-            null,
-            false,
-          );
-          expect(
-            filelessImporterBackground["importNotificationsPort"].postMessage,
-          ).toHaveBeenCalledWith({ command: "filelessImportCompleted" });
-          expect(filelessImporterBackground["syncService"].fullSync).toHaveBeenCalledWith(true);
-        });
-
-        it("posts a failed message if the import fails", async () => {
-          const data = "url,username,password";
-          const importer = mock<Importer>();
-          jest
-            .spyOn(filelessImporterBackground["importService"], "getImporter")
-            .mockReturnValue(importer);
-          jest
-            .spyOn(filelessImporterBackground["importService"], "import")
-            .mockImplementation(() => {
-              throw new Error("error");
-            });
-          jest.spyOn(filelessImporterBackground["syncService"], "fullSync");
-
-          sendPortMessage(lpImporterPort, {
-            command: "startLpImport",
-            data,
-          });
-          await flushPromises();
-
-          expect(
-            filelessImporterBackground["importNotificationsPort"].postMessage,
-          ).toHaveBeenCalledWith({ command: "filelessImportFailed" });
-        });
-      });
-    });
-  });
-
-  describe("handleImporterPortDisconnect", () => {
-    it("resets the port properties to null", () => {
-      const lpImporterPort = createPortSpyMock(FilelessImportPort.LpImporter);
-      const notificationPort = createPortSpyMock(FilelessImportPort.NotificationBar);
-      filelessImporterBackground["lpImporterPort"] = lpImporterPort;
-      filelessImporterBackground["importNotificationsPort"] = notificationPort;
-
-      filelessImporterBackground["handleImporterPortDisconnect"](lpImporterPort);
-
-      expect(filelessImporterBackground["lpImporterPort"]).toBeNull();
-      expect(filelessImporterBackground["importNotificationsPort"]).not.toBeNull();
-
-      filelessImporterBackground["handleImporterPortDisconnect"](notificationPort);
-
-      expect(filelessImporterBackground["importNotificationsPort"]).toBeNull();
-    });
-  });
-});
diff --git a/apps/browser/src/tools/background/fileless-importer.background.ts b/apps/browser/src/tools/background/fileless-importer.background.ts
deleted file mode 100644
index 21d597ec8a..0000000000
--- a/apps/browser/src/tools/background/fileless-importer.background.ts
+++ /dev/null
@@ -1,265 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { firstValueFrom } from "rxjs";
-
-import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
-import { PolicyType } from "@bitwarden/common/admin-console/enums";
-import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
-import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
-import { ImportServiceAbstraction } from "@bitwarden/importer/core";
-
-import NotificationBackground from "../../autofill/background/notification.background";
-import { BrowserApi } from "../../platform/browser/browser-api";
-import { ScriptInjectorService } from "../../platform/services/abstractions/script-injector.service";
-import { FilelessImporterInjectedScriptsConfig } from "../config/fileless-importer-injected-scripts";
-import {
-  FilelessImportPort,
-  FilelessImportType,
-  FilelessImportTypeKeys,
-} from "../enums/fileless-import.enums";
-
-import {
-  ImportNotificationMessageHandlers,
-  LpImporterMessageHandlers,
-  FilelessImporterBackground as FilelessImporterBackgroundInterface,
-  FilelessImportPortMessage,
-} from "./abstractions/fileless-importer.background";
-
-class FilelessImporterBackground implements FilelessImporterBackgroundInterface {
-  private static readonly filelessImporterPortNames: Set<string> = new Set([
-    FilelessImportPort.LpImporter,
-    FilelessImportPort.NotificationBar,
-  ]);
-  private importNotificationsPort: chrome.runtime.Port;
-  private lpImporterPort: chrome.runtime.Port;
-  private readonly importNotificationsPortMessageHandlers: ImportNotificationMessageHandlers = {
-    startFilelessImport: ({ message }) => this.startFilelessImport(message.importType),
-    cancelFilelessImport: ({ message, port }) =>
-      this.cancelFilelessImport(message.importType, port.sender),
-  };
-  private readonly lpImporterPortMessageHandlers: LpImporterMessageHandlers = {
-    displayLpImportNotification: ({ port }) =>
-      this.displayFilelessImportNotification(port.sender.tab, FilelessImportType.LP),
-    startLpImport: ({ message }) => this.triggerLpImport(message.data),
-  };
-
-  /**
-   * Creates a new instance of the fileless importer background logic.
-   *
-   * @param configService - Identifies if the feature flag is enabled.
-   * @param authService - Verifies if the auth status of the user.
-   * @param policyService - Identifies if the user account has a policy that disables personal ownership.
-   * @param notificationBackground - Used to inject the notification bar into the tab.
-   * @param importService - Used to import the export data into the vault.
-   * @param syncService - Used to trigger a full sync after the import is completed.
-   * @param scriptInjectorService - Used to inject content scripts that initialize the import process
-   */
-  constructor(
-    private configService: ConfigService,
-    private authService: AuthService,
-    private policyService: PolicyService,
-    private notificationBackground: NotificationBackground,
-    private importService: ImportServiceAbstraction,
-    private syncService: SyncService,
-    private scriptInjectorService: ScriptInjectorService,
-  ) {}
-
-  /**
-   * Initializes the fileless importer background logic.
-   */
-  init() {
-    this.setupPortMessageListeners();
-  }
-
-  /**
-   * Starts an import of the export data pulled from the tab.
-   *
-   * @param importType - The type of import to start. Identifies the used content script.
-   */
-  private startFilelessImport(importType: FilelessImportTypeKeys) {
-    if (importType === FilelessImportType.LP) {
-      this.lpImporterPort?.postMessage({ command: "startLpFilelessImport" });
-    }
-  }
-
-  /**
-   * Cancels an import of the export data pulled from the tab. This closes any
-   * existing notifications that are present in the tab, and triggers importer
-   * specific behavior based on the import type.
-   *
-   * @param importType - The type of import to cancel. Identifies the used content script.
-   * @param sender - The sender of the message.
-   */
-  private async cancelFilelessImport(
-    importType: FilelessImportTypeKeys,
-    sender: chrome.runtime.MessageSender,
-  ) {
-    if (importType === FilelessImportType.LP) {
-      this.triggerLpImporterCsvDownload();
-    }
-
-    await BrowserApi.tabSendMessage(sender.tab, { command: "closeNotificationBar" });
-  }
-
-  /**
-   * Injects the notification bar into the passed tab.
-   *
-   * @param tab
-   * @param importType
-   */
-  private async displayFilelessImportNotification(tab: chrome.tabs.Tab, importType: string) {
-    await this.notificationBackground.requestFilelessImport(tab, importType);
-  }
-
-  /**
-   * Triggers the download of the CSV file from the LP importer. This is triggered
-   * when the user opts to not save the export to Bitwarden within the notification bar.
-   */
-  private triggerLpImporterCsvDownload() {
-    this.lpImporterPort?.postMessage({ command: "triggerCsvDownload" });
-    this.lpImporterPort?.disconnect();
-  }
-
-  /**
-   * Completes the import process for the LP importer. This is triggered when the
-   * user opts to save the export to Bitwarden within the notification bar.
-   *
-   * @param data - The export data to import.
-   * @param sender - The sender of the message.
-   */
-  private async triggerLpImport(data: string) {
-    if (!data) {
-      return;
-    }
-
-    const promptForPassword_callback = async () => "";
-    const importer = this.importService.getImporter(
-      "lastpasscsv",
-      promptForPassword_callback,
-      null,
-    );
-
-    try {
-      const result = await this.importService.import(importer, data, null, null, false);
-      if (result.success) {
-        this.importNotificationsPort?.postMessage({ command: "filelessImportCompleted" });
-        await this.syncService.fullSync(true);
-      }
-    } catch (error) {
-      this.importNotificationsPort?.postMessage({
-        command: "filelessImportFailed",
-        importErrorMessage: Object.values(error).length
-          ? error
-          : chrome.i18n.getMessage("importNetworkError"),
-      });
-    }
-  }
-
-  /**
-   * Identifies if the user account has a policy that disables personal ownership.
-   */
-  private async removeIndividualVault(): Promise<boolean> {
-    return await firstValueFrom(
-      this.policyService.policyAppliesToActiveUser$(PolicyType.PersonalOwnership),
-    );
-  }
-
-  /**
-   * Sets up onConnect listeners for the extension.
-   */
-  private setupPortMessageListeners() {
-    chrome.runtime.onConnect.addListener(this.handlePortOnConnect);
-  }
-
-  /**
-   * Handles connections from content scripts that affect the fileless importer behavior.
-   * Is used to facilitate the passing of data and user actions to enact the import
-   * of web content to the Bitwarden vault. Along with this, a check is made to ensure
-   * that the feature flag is enabled and the user is authenticated.
-   */
-  private handlePortOnConnect = async (port: chrome.runtime.Port) => {
-    if (!FilelessImporterBackground.filelessImporterPortNames.has(port.name)) {
-      return;
-    }
-
-    const filelessImportFeatureFlagEnabled = await this.configService.getFeatureFlag(
-      FeatureFlag.BrowserFilelessImport,
-    );
-    const userAuthStatus = await this.authService.getAuthStatus();
-    const removeIndividualVault = await this.removeIndividualVault();
-    const filelessImportEnabled =
-      filelessImportFeatureFlagEnabled &&
-      userAuthStatus === AuthenticationStatus.Unlocked &&
-      !removeIndividualVault;
-    port.postMessage({ command: "verifyFeatureFlag", filelessImportEnabled });
-
-    if (!filelessImportEnabled) {
-      return;
-    }
-
-    port.onMessage.addListener(this.handleImporterPortMessage);
-    port.onDisconnect.addListener(this.handleImporterPortDisconnect);
-
-    switch (port.name) {
-      case FilelessImportPort.LpImporter:
-        this.lpImporterPort = port;
-        await this.scriptInjectorService.inject({
-          tabId: port.sender.tab.id,
-          injectDetails: { runAt: "document_start" },
-          mv2Details: FilelessImporterInjectedScriptsConfig.LpSuppressImportDownload.mv2,
-          mv3Details: FilelessImporterInjectedScriptsConfig.LpSuppressImportDownload.mv3,
-        });
-        break;
-      case FilelessImportPort.NotificationBar:
-        this.importNotificationsPort = port;
-        break;
-    }
-  };
-
-  /**
-   * Handles messages that are sent from fileless importer content scripts.
-   * @param message - The message that was sent.
-   * @param port - The port that the message was sent from.
-   */
-  private handleImporterPortMessage = (
-    message: FilelessImportPortMessage,
-    port: chrome.runtime.Port,
-  ) => {
-    let handler: CallableFunction | undefined;
-
-    switch (port.name) {
-      case FilelessImportPort.LpImporter:
-        handler = this.lpImporterPortMessageHandlers[message.command];
-        break;
-      case FilelessImportPort.NotificationBar:
-        handler = this.importNotificationsPortMessageHandlers[message.command];
-        break;
-    }
-
-    if (!handler) {
-      return;
-    }
-
-    handler({ message, port });
-  };
-
-  /**
-   * Handles disconnections from fileless importer content scripts.
-   * @param port - The port that was disconnected.
-   */
-  private handleImporterPortDisconnect = (port: chrome.runtime.Port) => {
-    switch (port.name) {
-      case FilelessImportPort.LpImporter:
-        this.lpImporterPort = null;
-        break;
-      case FilelessImportPort.NotificationBar:
-        this.importNotificationsPort = null;
-        break;
-    }
-  };
-}
-
-export default FilelessImporterBackground;
diff --git a/apps/browser/src/tools/config/fileless-importer-injected-scripts.ts b/apps/browser/src/tools/config/fileless-importer-injected-scripts.ts
deleted file mode 100644
index 898ee1205a..0000000000
--- a/apps/browser/src/tools/config/fileless-importer-injected-scripts.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import {
-  Mv2ScriptInjectionDetails,
-  Mv3ScriptInjectionDetails,
-} from "../../platform/services/abstractions/script-injector.service";
-
-type FilelessImporterInjectedScriptsConfigurations = {
-  LpSuppressImportDownload: {
-    mv2: Mv2ScriptInjectionDetails;
-    mv3: Mv3ScriptInjectionDetails;
-  };
-};
-
-const FilelessImporterInjectedScriptsConfig: FilelessImporterInjectedScriptsConfigurations = {
-  LpSuppressImportDownload: {
-    mv2: {
-      file: "content/lp-suppress-import-download-script-append-mv2.js",
-    },
-    mv3: {
-      file: "content/lp-suppress-import-download.js",
-      world: "MAIN",
-    },
-  },
-} as const;
-
-export { FilelessImporterInjectedScriptsConfig };
diff --git a/apps/browser/src/tools/content/abstractions/lp-fileless-importer.ts b/apps/browser/src/tools/content/abstractions/lp-fileless-importer.ts
deleted file mode 100644
index 018ea2c8d9..0000000000
--- a/apps/browser/src/tools/content/abstractions/lp-fileless-importer.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-type LpFilelessImporterMessage = {
-  command?: string;
-  data?: string;
-  filelessImportEnabled?: boolean;
-};
-
-type LpFilelessImporterMessageHandlerParams = {
-  message: LpFilelessImporterMessage;
-  port: chrome.runtime.Port;
-};
-
-type LpFilelessImporterMessageHandlers = {
-  [key: string]: ({ message, port }: LpFilelessImporterMessageHandlerParams) => void;
-  verifyFeatureFlag: ({ message }: { message: LpFilelessImporterMessage }) => void;
-  triggerCsvDownload: () => void;
-  startLpFilelessImport: () => void;
-};
-
-interface LpFilelessImporter {
-  init(): void;
-  handleFeatureFlagVerification(message: LpFilelessImporterMessage): void;
-  triggerCsvDownload(): void;
-}
-
-export { LpFilelessImporterMessage, LpFilelessImporterMessageHandlers, LpFilelessImporter };
diff --git a/apps/browser/src/tools/content/lp-fileless-importer.spec.ts b/apps/browser/src/tools/content/lp-fileless-importer.spec.ts
deleted file mode 100644
index 21fa44b8d3..0000000000
--- a/apps/browser/src/tools/content/lp-fileless-importer.spec.ts
+++ /dev/null
@@ -1,211 +0,0 @@
-import { mock } from "jest-mock-extended";
-
-import { createPortSpyMock } from "../../autofill/spec/autofill-mocks";
-import { sendPortMessage } from "../../autofill/spec/testing-utils";
-import { FilelessImportPort } from "../enums/fileless-import.enums";
-
-import { LpFilelessImporter } from "./abstractions/lp-fileless-importer";
-
-describe("LpFilelessImporter", () => {
-  let lpFilelessImporter: LpFilelessImporter & { [key: string]: any };
-  const portSpy: chrome.runtime.Port = createPortSpyMock(FilelessImportPort.LpImporter);
-  chrome.runtime.connect = jest.fn(() => portSpy);
-
-  beforeEach(() => {
-    // FIXME: Remove when updating file. Eslint update
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    require("./lp-fileless-importer");
-    lpFilelessImporter = (globalThis as any).lpFilelessImporter;
-  });
-
-  afterEach(() => {
-    (globalThis as any).lpFilelessImporter = undefined;
-    jest.clearAllMocks();
-    jest.resetModules();
-    Object.defineProperty(document, "readyState", {
-      value: "complete",
-      writable: true,
-    });
-  });
-
-  describe("init", () => {
-    it("sets up the port connection with the background script", () => {
-      lpFilelessImporter.init();
-
-      expect(chrome.runtime.connect).toHaveBeenCalledWith({
-        name: FilelessImportPort.LpImporter,
-      });
-    });
-  });
-
-  describe("handleFeatureFlagVerification", () => {
-    it("disconnects the message port when the fileless import feature is disabled", () => {
-      lpFilelessImporter.handleFeatureFlagVerification({ filelessImportEnabled: false });
-
-      expect(portSpy.disconnect).toHaveBeenCalled();
-    });
-
-    it("sets up an event listener for DOMContentLoaded that triggers the importer when the document ready state is `loading`", () => {
-      Object.defineProperty(document, "readyState", {
-        value: "loading",
-        writable: true,
-      });
-      const message = {
-        command: "verifyFeatureFlag",
-        filelessImportEnabled: true,
-      };
-      jest.spyOn(document, "addEventListener");
-
-      lpFilelessImporter.handleFeatureFlagVerification(message);
-
-      expect(document.addEventListener).toHaveBeenCalledWith(
-        "DOMContentLoaded",
-        (lpFilelessImporter as any).loadImporter,
-      );
-    });
-
-    it("sets up a mutation observer to watch the document body for injection of the export content", () => {
-      const message = {
-        command: "verifyFeatureFlag",
-        filelessImportEnabled: true,
-      };
-      jest.spyOn(document, "addEventListener");
-      jest.spyOn(window, "MutationObserver").mockImplementationOnce(() => mock<MutationObserver>());
-
-      lpFilelessImporter.handleFeatureFlagVerification(message);
-
-      expect(window.MutationObserver).toHaveBeenCalledWith(
-        (lpFilelessImporter as any).handleMutation,
-      );
-      expect((lpFilelessImporter as any).mutationObserver.observe).toHaveBeenCalledWith(
-        document.body,
-        { childList: true, subtree: true },
-      );
-    });
-  });
-
-  describe("triggerCsvDownload", () => {
-    it("posts a window message that triggers the download of the LastPass export", () => {
-      jest.spyOn(globalThis, "postMessage");
-
-      lpFilelessImporter.triggerCsvDownload();
-
-      expect(globalThis.postMessage).toHaveBeenCalledWith(
-        { command: "triggerCsvDownload" },
-        "https://lastpass.com",
-      );
-    });
-  });
-
-  describe("handleMutation", () => {
-    beforeEach(() => {
-      lpFilelessImporter["mutationObserver"] = mock<MutationObserver>({ disconnect: jest.fn() });
-      jest.spyOn(portSpy, "postMessage");
-    });
-
-    it("ignores mutations that contain empty records", () => {
-      lpFilelessImporter["handleMutation"]([]);
-
-      expect(portSpy.postMessage).not.toHaveBeenCalled();
-    });
-
-    it("ignores mutations that have no added nodes in the mutation", () => {
-      lpFilelessImporter["handleMutation"]([{ addedNodes: [] }]);
-
-      expect(portSpy.postMessage).not.toHaveBeenCalled();
-    });
-
-    it("ignores mutations that have no added nodes with a tagname of `pre`", () => {
-      lpFilelessImporter["handleMutation"]([{ addedNodes: [{ nodeName: "div" }] }]);
-
-      expect(portSpy.postMessage).not.toHaveBeenCalled();
-    });
-
-    it("ignores mutations where the found `pre` element does not contain any textContent", () => {
-      lpFilelessImporter["handleMutation"]([{ addedNodes: [{ nodeName: "pre" }] }]);
-
-      expect(portSpy.postMessage).not.toHaveBeenCalled();
-    });
-
-    it("ignores mutations where the found `pre` element does not contain the expected header content", () => {
-      lpFilelessImporter["handleMutation"]([
-        { addedNodes: [{ nodeName: "pre", textContent: "some other content" }] },
-      ]);
-
-      expect(portSpy.postMessage).not.toHaveBeenCalled();
-    });
-
-    it("will store the export data, display the import notification, and disconnect the mutation observer when the export data is appended", () => {
-      const observerDisconnectSpy = jest.spyOn(
-        lpFilelessImporter["mutationObserver"],
-        "disconnect",
-      );
-
-      lpFilelessImporter["handleMutation"]([
-        { addedNodes: [{ nodeName: "pre", textContent: "url,username,password" }] },
-      ]);
-
-      expect(lpFilelessImporter["exportData"]).toEqual("url,username,password");
-      expect(portSpy.postMessage).toHaveBeenCalledWith({ command: "displayLpImportNotification" });
-      expect(observerDisconnectSpy).toHaveBeenCalled();
-    });
-  });
-
-  describe("handlePortMessage", () => {
-    it("ignores messages that are not registered with the portMessageHandlers", () => {
-      const message = { command: "unknownCommand" };
-      jest.spyOn(lpFilelessImporter, "handleFeatureFlagVerification");
-      jest.spyOn(lpFilelessImporter, "triggerCsvDownload");
-
-      sendPortMessage(portSpy, message);
-
-      expect(lpFilelessImporter.handleFeatureFlagVerification).not.toHaveBeenCalled();
-      expect(lpFilelessImporter.triggerCsvDownload).not.toHaveBeenCalled();
-    });
-
-    it("handles the port message that verifies the fileless import feature flag", () => {
-      const message = { command: "verifyFeatureFlag", filelessImportEnabled: true };
-      jest.spyOn(lpFilelessImporter, "handleFeatureFlagVerification").mockImplementation();
-
-      sendPortMessage(portSpy, message);
-
-      expect(lpFilelessImporter.handleFeatureFlagVerification).toHaveBeenCalledWith(message);
-    });
-
-    it("handles the port message that triggers the LastPass csv download", () => {
-      const message = { command: "triggerCsvDownload" };
-      jest.spyOn(lpFilelessImporter, "triggerCsvDownload");
-
-      sendPortMessage(portSpy, message);
-
-      expect(lpFilelessImporter.triggerCsvDownload).toHaveBeenCalled();
-    });
-
-    describe("handles the port message that triggers the LastPass fileless import", () => {
-      beforeEach(() => {
-        jest.spyOn(lpFilelessImporter as any, "postPortMessage");
-      });
-
-      it("skips the import of the export data is not populated", () => {
-        const message = { command: "startLpFilelessImport" };
-
-        sendPortMessage(portSpy, message);
-
-        expect(lpFilelessImporter.postPortMessage).not.toHaveBeenCalled();
-      });
-
-      it("starts the last pass fileless import", () => {
-        const message = { command: "startLpFilelessImport" };
-        const exportData = "url,username,password";
-        lpFilelessImporter["exportData"] = exportData;
-
-        sendPortMessage(portSpy, message);
-
-        expect(lpFilelessImporter.postPortMessage).toHaveBeenCalledWith({
-          command: "startLpImport",
-          data: exportData,
-        });
-      });
-    });
-  });
-});
diff --git a/apps/browser/src/tools/content/lp-fileless-importer.ts b/apps/browser/src/tools/content/lp-fileless-importer.ts
deleted file mode 100644
index 497a499b33..0000000000
--- a/apps/browser/src/tools/content/lp-fileless-importer.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { FilelessImportPort } from "../enums/fileless-import.enums";
-
-import {
-  LpFilelessImporter as LpFilelessImporterInterface,
-  LpFilelessImporterMessage,
-  LpFilelessImporterMessageHandlers,
-} from "./abstractions/lp-fileless-importer";
-
-class LpFilelessImporter implements LpFilelessImporterInterface {
-  private exportData: string;
-  private messagePort: chrome.runtime.Port;
-  private mutationObserver: MutationObserver;
-  private readonly portMessageHandlers: LpFilelessImporterMessageHandlers = {
-    verifyFeatureFlag: ({ message }) => this.handleFeatureFlagVerification(message),
-    triggerCsvDownload: () => this.triggerCsvDownload(),
-    startLpFilelessImport: () => this.startLpImport(),
-  };
-
-  /**
-   * Initializes the LP fileless importer.
-   */
-  init() {
-    this.setupMessagePort();
-  }
-
-  /**
-   * Enacts behavior based on the feature flag verification message. If the feature flag is
-   * not enabled, the message port is disconnected. If the feature flag is enabled, the
-   * download of the CSV file is suppressed.
-   *
-   * @param message - The port message, contains the feature flag indicator.
-   */
-  handleFeatureFlagVerification(message: LpFilelessImporterMessage) {
-    if (!message.filelessImportEnabled) {
-      this.messagePort?.disconnect();
-      return;
-    }
-
-    if (document.readyState === "loading") {
-      document.addEventListener("DOMContentLoaded", this.loadImporter);
-      return;
-    }
-
-    this.loadImporter();
-  }
-
-  /**
-   * Posts a message to the LP importer to trigger the download of the CSV file.
-   */
-  triggerCsvDownload() {
-    this.postWindowMessage({ command: "triggerCsvDownload" });
-  }
-
-  /**
-   * Initializes the importing mechanism used to import the CSV file into Bitwarden.
-   * This is done by observing the DOM for the addition of the LP importer element.
-   */
-  private loadImporter = () => {
-    this.mutationObserver = new MutationObserver(this.handleMutation);
-    this.mutationObserver.observe(document.body, {
-      childList: true,
-      subtree: true,
-    });
-  };
-
-  /**
-   * Handles mutations that are observed by the mutation observer. When the exported data
-   * element is added to the DOM, the export data is extracted and the import prompt is
-   * displayed.
-   *
-   * @param mutations - The mutations that were observed.
-   */
-  private handleMutation = (mutations: MutationRecord[]) => {
-    let textContent: string;
-    for (let index = 0; index < mutations?.length; index++) {
-      const mutation: MutationRecord = mutations[index];
-
-      textContent = Array.from(mutation.addedNodes)
-        .filter((node) => node.nodeName.toLowerCase() === "pre")
-        .map((node) => (node as HTMLPreElement).textContent?.trim())
-        .find((text) => text?.indexOf("url,username,password") >= 0);
-
-      if (textContent) {
-        break;
-      }
-    }
-
-    if (textContent) {
-      this.exportData = textContent;
-      this.postPortMessage({ command: "displayLpImportNotification" });
-      this.mutationObserver.disconnect();
-    }
-  };
-
-  /**
-   * If the export data is present, sends a message to the background with
-   * the export data to start the import process.
-   */
-  private startLpImport() {
-    if (!this.exportData) {
-      return;
-    }
-
-    this.postPortMessage({ command: "startLpImport", data: this.exportData });
-    this.messagePort?.disconnect();
-  }
-
-  /**
-   * Posts a message to the background script.
-   *
-   * @param message - The message to post.
-   */
-  private postPortMessage(message: LpFilelessImporterMessage) {
-    this.messagePort?.postMessage(message);
-  }
-
-  /**
-   * Posts a message to the global context of the page.
-   *
-   * @param message - The message to post.
-   */
-  private postWindowMessage(message: LpFilelessImporterMessage) {
-    globalThis.postMessage(message, "https://lastpass.com");
-  }
-
-  /**
-   * Sets up the message port that is used to facilitate communication between the
-   * background script and the content script.
-   */
-  private setupMessagePort() {
-    this.messagePort = chrome.runtime.connect({ name: FilelessImportPort.LpImporter });
-    this.messagePort.onMessage.addListener(this.handlePortMessage);
-  }
-
-  /**
-   * Handles messages that are sent from the background script.
-   *
-   * @param message - The message that was sent.
-   * @param port - The port that the message was sent from.
-   */
-  private handlePortMessage = (message: LpFilelessImporterMessage, port: chrome.runtime.Port) => {
-    const handler = this.portMessageHandlers[message.command];
-    if (!handler) {
-      return;
-    }
-
-    handler({ message, port });
-  };
-}
-
-(function () {
-  if (!(globalThis as any).lpFilelessImporter) {
-    (globalThis as any).lpFilelessImporter = new LpFilelessImporter();
-    (globalThis as any).lpFilelessImporter.init();
-  }
-})();
diff --git a/apps/browser/src/tools/content/lp-suppress-import-download-script-append.mv2.spec.ts b/apps/browser/src/tools/content/lp-suppress-import-download-script-append.mv2.spec.ts
deleted file mode 100644
index 8479235cc1..0000000000
--- a/apps/browser/src/tools/content/lp-suppress-import-download-script-append.mv2.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-describe("LP Suppress Import Download for Manifest v2", () => {
-  it("appends the `lp-suppress-import-download.js` script to the document element", () => {
-    let createdScriptElement: HTMLScriptElement;
-    jest.spyOn(window.document, "createElement");
-    jest.spyOn(window.document.documentElement, "appendChild").mockImplementation((node) => {
-      createdScriptElement = node as HTMLScriptElement;
-      return node;
-    });
-
-    // FIXME: Remove when updating file. Eslint update
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    require("./lp-suppress-import-download-script-append.mv2");
-
-    expect(window.document.createElement).toHaveBeenCalledWith("script");
-    expect(chrome.runtime.getURL).toHaveBeenCalledWith("content/lp-suppress-import-download.js");
-    expect(window.document.documentElement.appendChild).toHaveBeenCalledWith(
-      expect.any(HTMLScriptElement),
-    );
-    expect(createdScriptElement.src).toBe(
-      "chrome-extension://id/content/lp-suppress-import-download.js",
-    );
-  });
-});
diff --git a/apps/browser/src/tools/content/lp-suppress-import-download-script-append.mv2.ts b/apps/browser/src/tools/content/lp-suppress-import-download-script-append.mv2.ts
deleted file mode 100644
index cd641590ad..0000000000
--- a/apps/browser/src/tools/content/lp-suppress-import-download-script-append.mv2.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * This script handles injection of the LP suppress import download script into the document.
- * This is required for manifest v2, but will be removed when we migrate fully to manifest v3.
- */
-(function (globalContext) {
-  const script = globalContext.document.createElement("script");
-  script.src = chrome.runtime.getURL("content/lp-suppress-import-download.js");
-  globalContext.document.documentElement.appendChild(script);
-})(window);
diff --git a/apps/browser/src/tools/content/lp-suppress-import-download.spec.ts b/apps/browser/src/tools/content/lp-suppress-import-download.spec.ts
deleted file mode 100644
index ff0ed38159..0000000000
--- a/apps/browser/src/tools/content/lp-suppress-import-download.spec.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import { flushPromises, postWindowMessage } from "../../autofill/spec/testing-utils";
-
-describe("LP Suppress Import Download", () => {
-  const downloadAttribute = "file.csv";
-  const hrefAttribute = "https://example.com/file.csv";
-  const overridenHrefAttribute = "javascript:void(0)";
-  let anchor: HTMLAnchorElement;
-
-  beforeEach(() => {
-    jest.spyOn(Element.prototype, "appendChild");
-    jest.spyOn(window, "addEventListener");
-
-    // FIXME: Remove when updating file. Eslint update
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    require("./lp-suppress-import-download");
-
-    anchor = document.createElement("a");
-    anchor.download = downloadAttribute;
-    anchor.href = hrefAttribute;
-    anchor.click = jest.fn();
-  });
-
-  afterEach(() => {
-    jest.resetModules();
-    jest.clearAllMocks();
-  });
-
-  it("disables the automatic download anchor", () => {
-    document.body.appendChild(anchor);
-
-    expect(anchor.href).toBe(overridenHrefAttribute);
-    expect(anchor.download).toBe("");
-  });
-
-  it("triggers the CSVDownload when receiving a `triggerCsvDownload` window message", async () => {
-    window.document.createElement = jest.fn(() => anchor);
-    jest.spyOn(window, "removeEventListener");
-
-    document.body.appendChild(anchor);
-
-    // Precondition - Ensure the anchor in the document has overridden href and download attributes
-    expect(anchor.href).toBe(overridenHrefAttribute);
-    expect(anchor.download).toBe("");
-
-    postWindowMessage({ command: "triggerCsvDownload" });
-    await flushPromises();
-
-    expect(anchor.click).toHaveBeenCalled();
-    expect(anchor.href).toEqual(hrefAttribute);
-    expect(anchor.download).toEqual(downloadAttribute);
-    expect(window.removeEventListener).toHaveBeenCalledWith("message", expect.any(Function));
-  });
-
-  it("skips subsequent calls to trigger a CSVDownload", async () => {
-    window.document.createElement = jest.fn(() => anchor);
-
-    document.body.appendChild(anchor);
-
-    postWindowMessage({ command: "triggerCsvDownload" });
-    await flushPromises();
-
-    postWindowMessage({ command: "triggerCsvDownload" });
-    await flushPromises();
-
-    expect(anchor.click).toHaveBeenCalledTimes(1);
-  });
-
-  it("skips triggering the CSV download for window messages that do not have the correct command", () => {
-    document.body.appendChild(anchor);
-
-    postWindowMessage({ command: "notTriggerCsvDownload" });
-
-    expect(anchor.click).not.toHaveBeenCalled();
-  });
-
-  it("skips triggering the CSV download for window messages that do not have a data value", () => {
-    document.body.appendChild(anchor);
-
-    postWindowMessage(null);
-
-    expect(anchor.click).not.toHaveBeenCalled();
-  });
-});
diff --git a/apps/browser/src/tools/content/lp-suppress-import-download.ts b/apps/browser/src/tools/content/lp-suppress-import-download.ts
deleted file mode 100644
index 1d5d449d19..0000000000
--- a/apps/browser/src/tools/content/lp-suppress-import-download.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-/**
- * Handles intercepting the injection of the CSV download link, and ensures the
- * download of the script is suppressed until the user opts to download the file.
- * The download is triggered by a window message sent from the LpFilelessImporter
- * content script.
- */
-(function (globalContext) {
-  let csvDownload = "";
-  let csvHref = "";
-  let isCsvDownloadTriggered = false;
-  const defaultAppendChild = Element.prototype.appendChild;
-  Element.prototype.appendChild = function (newChild: Node) {
-    if (isAnchorElement(newChild) && newChild.download) {
-      csvDownload = newChild.download;
-      csvHref = newChild.href;
-      newChild.setAttribute("href", "javascript:void(0)");
-      newChild.setAttribute("download", "");
-      Element.prototype.appendChild = defaultAppendChild;
-    }
-
-    return defaultAppendChild.call(this, newChild);
-  };
-
-  function isAnchorElement(node: Node): node is HTMLAnchorElement {
-    return node.nodeName.toLowerCase() === "a";
-  }
-
-  const handleWindowMessage = (event: MessageEvent) => {
-    const command = event.data?.command;
-    if (
-      event.source !== globalContext ||
-      command !== "triggerCsvDownload" ||
-      isCsvDownloadTriggered
-    ) {
-      return;
-    }
-
-    isCsvDownloadTriggered = true;
-    globalContext.removeEventListener("message", handleWindowMessage);
-
-    const anchor = globalContext.document.createElement("a");
-    anchor.setAttribute("href", csvHref);
-    anchor.setAttribute("download", csvDownload);
-    globalContext.document.body.appendChild(anchor);
-    anchor.click();
-    globalContext.document.body.removeChild(anchor);
-  };
-
-  globalContext.addEventListener("message", handleWindowMessage);
-})(window);
diff --git a/apps/browser/src/tools/enums/fileless-import.enums.ts b/apps/browser/src/tools/enums/fileless-import.enums.ts
deleted file mode 100644
index e20f4f1545..0000000000
--- a/apps/browser/src/tools/enums/fileless-import.enums.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-const FilelessImportType = {
-  LP: "LP",
-} as const;
-
-type FilelessImportTypeKeys = (typeof FilelessImportType)[keyof typeof FilelessImportType];
-
-const FilelessImportPort = {
-  NotificationBar: "fileless-importer-notification-bar",
-  LpImporter: "lp-fileless-importer",
-} as const;
-
-export { FilelessImportType, FilelessImportTypeKeys, FilelessImportPort };
diff --git a/apps/browser/webpack.config.js b/apps/browser/webpack.config.js
index 6ba74d7df4..bce41d64d1 100644
--- a/apps/browser/webpack.config.js
+++ b/apps/browser/webpack.config.js
@@ -206,9 +206,7 @@ const mainConfig = {
     "overlay/list":
       "./src/autofill/deprecated/overlay/pages/list/bootstrap-autofill-overlay-list.deprecated.ts",
     "encrypt-worker": "../../libs/common/src/platform/services/cryptography/encrypt.worker.ts",
-    "content/lp-fileless-importer": "./src/tools/content/lp-fileless-importer.ts",
     "content/send-on-installed-message": "./src/vault/content/send-on-installed-message.ts",
-    "content/lp-suppress-import-download": "./src/tools/content/lp-suppress-import-download.ts",
   },
   optimization: {
     minimize: ENV !== "development",
@@ -312,8 +310,6 @@ if (manifestVersion == 2) {
   // Manifest V2 background pages can be run through the regular build pipeline.
   // Since it's a standard webpage.
   mainConfig.entry.background = "./src/platform/background.ts";
-  mainConfig.entry["content/lp-suppress-import-download-script-append-mv2"] =
-    "./src/tools/content/lp-suppress-import-download-script-append.mv2.ts";
   mainConfig.entry["content/fido2-page-script-append-mv2"] =
     "./src/autofill/fido2/content/fido2-page-script-append.mv2.ts";
   mainConfig.entry["content/fido2-page-script-delay-append-mv2"] =
diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts
index d008a09d66..2ac4f507cd 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -9,6 +9,7 @@ export enum FeatureFlag {
   DelayFido2PageScriptInitWithinMv2 = "delay-fido2-page-script-init-within-mv2",
   EnableNewCardCombinedExpiryAutofill = "enable-new-card-combined-expiry-autofill",
   GenerateIdentityFillScriptRefactor = "generate-identity-fill-script-refactor",
+  IdpAutoSubmitLogin = "idp-auto-submit-login",
   InlineMenuFieldQualification = "inline-menu-field-qualification",
   InlineMenuPositioningImprovements = "inline-menu-positioning-improvements",
   InlineMenuTotp = "inline-menu-totp",
@@ -16,7 +17,6 @@ export enum FeatureFlag {
   NotificationRefresh = "notification-refresh",
   UseTreeWalkerApiForPageDetailsCollection = "use-tree-walker-api-for-page-details-collection",
 
-  BrowserFilelessImport = "browser-fileless-import",
   ItemShare = "item-share",
   GeneratorToolsModernization = "generator-tools-modernization",
   AC1795_UpdatedSubscriptionStatusSection = "AC-1795_updated-subscription-status-section",
@@ -27,7 +27,6 @@ export enum FeatureFlag {
   TwoFactorComponentRefactor = "two-factor-component-refactor",
   ProviderClientVaultPrivacyBanner = "ac-2833-provider-client-vault-privacy-banner",
   VaultBulkManagementAction = "vault-bulk-management-action",
-  IdpAutoSubmitLogin = "idp-auto-submit-login",
   UnauthenticatedExtensionUIRefresh = "unauth-ui-refresh",
   AccountDeprovisioning = "pm-10308-account-deprovisioning",
   SSHKeyVaultItem = "ssh-key-vault-item",
@@ -66,6 +65,7 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.DelayFido2PageScriptInitWithinMv2]: FALSE,
   [FeatureFlag.EnableNewCardCombinedExpiryAutofill]: FALSE,
   [FeatureFlag.GenerateIdentityFillScriptRefactor]: FALSE,
+  [FeatureFlag.IdpAutoSubmitLogin]: FALSE,
   [FeatureFlag.InlineMenuFieldQualification]: FALSE,
   [FeatureFlag.InlineMenuPositioningImprovements]: FALSE,
   [FeatureFlag.InlineMenuTotp]: FALSE,
@@ -73,7 +73,6 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.NotificationRefresh]: FALSE,
   [FeatureFlag.UseTreeWalkerApiForPageDetailsCollection]: FALSE,
 
-  [FeatureFlag.BrowserFilelessImport]: FALSE,
   [FeatureFlag.ItemShare]: FALSE,
   [FeatureFlag.GeneratorToolsModernization]: FALSE,
   [FeatureFlag.AC1795_UpdatedSubscriptionStatusSection]: FALSE,
@@ -84,7 +83,6 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.TwoFactorComponentRefactor]: FALSE,
   [FeatureFlag.ProviderClientVaultPrivacyBanner]: FALSE,
   [FeatureFlag.VaultBulkManagementAction]: FALSE,
-  [FeatureFlag.IdpAutoSubmitLogin]: FALSE,
   [FeatureFlag.UnauthenticatedExtensionUIRefresh]: FALSE,
   [FeatureFlag.AccountDeprovisioning]: FALSE,
   [FeatureFlag.SSHKeyVaultItem]: FALSE,

From 87171289f028cec3a89188692cd5c6a374aeba70 Mon Sep 17 00:00:00 2001
From: Todd Martin <106564991+trmartin4@users.noreply.github.com>
Date: Fri, 17 Jan 2025 10:16:52 -0500
Subject: [PATCH 143/150] Revert Opera to Mv2 build (#12921)

---
 .github/workflows/build-browser.yml | 6 +++++-
 apps/browser/package.json           | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-browser.yml b/.github/workflows/build-browser.yml
index 64cbaa0c7f..974e07829c 100644
--- a/.github/workflows/build-browser.yml
+++ b/.github/workflows/build-browser.yml
@@ -208,7 +208,11 @@ jobs:
           - name: "opera"
             npm_command: "dist:opera"
             archive_name: "dist-opera.zip"
-            artifact_name: "dist-opera-MV3"
+            artifact_name: "dist-opera"
+          - name: "opera-mv3"
+            npm_command: "dist:opera:mv3"
+            archive_name: "dist-opera.zip"
+            artifact_name: "DO-NOT-USE-FOR-PROD-dist-opera-MV3"
     steps:
       - name: Check out repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
diff --git a/apps/browser/package.json b/apps/browser/package.json
index 9ad1805362..c37e7c2419 100644
--- a/apps/browser/package.json
+++ b/apps/browser/package.json
@@ -6,7 +6,7 @@
     "build:chrome": "cross-env BROWSER=chrome MANIFEST_VERSION=3 webpack",
     "build:edge": "cross-env BROWSER=edge MANIFEST_VERSION=3 webpack",
     "build:firefox": "cross-env BROWSER=firefox webpack",
-    "build:opera": "cross-env BROWSER=opera MANIFEST_VERSION=3 webpack",
+    "build:opera": "cross-env BROWSER=opera webpack",
     "build:safari": "cross-env BROWSER=safari webpack",
     "build:watch": "npm run build:watch:chrome",
     "build:watch:chrome": "npm run build:chrome -- --watch",

From e5f83ff08605424b6656d7b379fd1d95f3f4d1b5 Mon Sep 17 00:00:00 2001
From: Oscar Hinton <Hinton@users.noreply.github.com>
Date: Fri, 17 Jan 2025 16:42:31 +0100
Subject: [PATCH 144/150] [PM-17031] Create UI-common (#12831)

Extract core functionality from `libs/angular` to allow teams to depend on `libs/ui-common` instead.

Moves the following functionality to `ui-common`.
- `I18nPipe`. `libs/angular` still has an old copy but `components` depends on the new variant from `ui-common`.
- `safeProvider`, `SafeProvider` and `SafeInjectionToken`. `libs/angular`re-exports these to avoid needing to update all consumers.
---
 .github/CODEOWNERS                            |   1 +
 .github/whitelist-capital-letters.txt         |  17 ---
 .github/workflows/lint.yml                    |   1 +
 .../popup/two-factor-auth-duo.component.ts    |   4 -
 .../popup/two-factor-auth-email.component.ts  |   4 -
 apps/browser/tsconfig.json                    |  15 +-
 .../src/auth/two-factor-auth.component.ts     |   4 -
 apps/desktop/tsconfig.json                    |   9 +-
 .../integration-card.component.spec.ts        |   2 +-
 .../integration-grid.component.spec.ts        |   2 +-
 apps/web/tsconfig.json                        |  11 +-
 bitwarden_license/bit-common/tsconfig.json    |  15 +-
 bitwarden_license/bit-web/tsconfig.json       |   1 +
 libs/angular/src/platform/pipes/i18n.pipe.ts  |   3 +
 .../src/platform/utils/safe-provider.ts       | 138 +-----------------
 libs/angular/src/services/injection-tokens.ts |  15 +-
 .../src/services/jslib-services.module.ts     |   2 +-
 libs/angular/tsconfig.json                    |   1 +
 libs/auth/tsconfig.json                       |  11 +-
 libs/common/tsconfig.json                     |   5 +-
 .../src/badge-list/badge-list.component.ts    |   3 +-
 .../components/src/banner/banner.component.ts |   3 +-
 .../src/dialog/dialog/dialog.component.ts     |   3 +-
 .../form-control/form-control.component.ts    |   2 +-
 .../src/form-field/error-summary.component.ts |   2 +-
 .../src/form-field/form-field.component.ts    |   3 +-
 .../multi-select/multi-select.component.ts    |   2 +-
 .../src/navigation/nav-group.component.ts     |   3 +-
 .../src/navigation/side-nav.component.ts      |   3 +-
 .../src/radio-button/radio-group.component.ts |   3 +-
 .../components/src/search/search.component.ts |   2 +-
 libs/components/src/shared/shared.module.ts   |   2 +-
 libs/components/tsconfig.json                 |   3 +-
 libs/importer/tsconfig.json                   |   1 +
 libs/key-management/tsconfig.json             |   3 +-
 libs/shared/tsconfig.spec.json                |   9 +-
 libs/tools/card/tsconfig.json                 |   3 +-
 .../vault-export-ui/tsconfig.json             |   1 +
 libs/tools/generator/components/tsconfig.json |   3 +-
 libs/tools/send/send-ui/tsconfig.json         |   3 +-
 libs/ui/README.md                             |   5 +
 libs/ui/common/package.json                   |  15 ++
 libs/ui/common/src/di/index.ts                |   2 +
 libs/ui/common/src/di/safe-injection-token.ts |  14 ++
 libs/ui/common/src/di/safe-provider.ts        | 138 ++++++++++++++++++
 .../common/src/di}/safe-provider.type.spec.ts |   4 +-
 .../src/shared => ui/common/src}/i18n.pipe.ts |   8 +-
 libs/ui/common/src/index.ts                   |   2 +
 libs/ui/common/tsconfig.json                  |  10 ++
 libs/vault/tsconfig.json                      |   1 +
 tsconfig.eslint.json                          |  17 ++-
 tsconfig.json                                 |  13 +-
 52 files changed, 300 insertions(+), 247 deletions(-)
 create mode 100644 libs/ui/README.md
 create mode 100644 libs/ui/common/package.json
 create mode 100644 libs/ui/common/src/di/index.ts
 create mode 100644 libs/ui/common/src/di/safe-injection-token.ts
 create mode 100644 libs/ui/common/src/di/safe-provider.ts
 rename libs/{angular/src/platform/utils => ui/common/src/di}/safe-provider.type.spec.ts (96%)
 rename libs/{components/src/shared => ui/common/src}/i18n.pipe.ts (77%)
 create mode 100644 libs/ui/common/src/index.ts
 create mode 100644 libs/ui/common/tsconfig.json

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index cb36d87b9e..d7cca18960 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -111,6 +111,7 @@ apps/desktop/desktop_native/core/src/ssh_agent @bitwarden/team-autofill-dev @bit
 ## Component Library ##
 .storybook @bitwarden/team-design-system
 libs/components @bitwarden/team-design-system
+libs/ui @bitwarden/team-design-system
 apps/browser/src/platform/popup/layout @bitwarden/team-design-system
 apps/browser/src/popup/app-routing.animations.ts @bitwarden/team-design-system
 apps/web/src/app/layouts @bitwarden/team-design-system
diff --git a/.github/whitelist-capital-letters.txt b/.github/whitelist-capital-letters.txt
index 73d323851e..653f6591c7 100644
--- a/.github/whitelist-capital-letters.txt
+++ b/.github/whitelist-capital-letters.txt
@@ -3,26 +3,12 @@
 ./apps/browser/src/safari/desktop/Assets.xcassets/AppIcon.appiconset
 ./apps/browser/src/safari/desktop/Base.lproj
 ./apps/browser/store/windows/Assets
-./bitwarden_license/README.md
 ./libs/angular/src/directives/cipherListVirtualScroll.directive.ts
-./libs/admin-console/README.md
-./libs/auth/README.md
-./libs/billing/README.md
-./libs/common/src/tools/integration/README.md
-./libs/platform/README.md
-./libs/key-management/README.md
-./libs/tools/README.md
-./libs/tools/export/vault-export/README.md
-./libs/tools/send/README.md
-./libs/tools/card/README.md
-./libs/vault/README.md
-./README.md
 ./LICENSE_BITWARDEN.txt
 ./CONTRIBUTING.md
 ./LICENSE_GPL.txt
 ./LICENSE.txt
 ./apps/web/Dockerfile
-./apps/web/README.md
 ./apps/desktop/resources/installerSidebar.bmp
 ./apps/desktop/resources/appx/SplashScreen.png
 ./apps/desktop/resources/appx/BadgeLogo.png
@@ -30,10 +16,7 @@
 ./apps/desktop/resources/appx/StoreLogo.png
 ./apps/desktop/resources/appx/Wide310x150Logo.png
 ./apps/desktop/resources/appx/Square44x44Logo.png
-./apps/desktop/README.md
 ./apps/cli/stores/chocolatey/tools/VERIFICATION.txt
-./apps/cli/README.md
-./apps/browser/README.md
 ./apps/browser/store/windows/AppxManifest.xml
 ./apps/browser/src/background/nativeMessaging.background.ts
 ./apps/browser/src/models/browserComponentState.ts
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 867de3844e..5bc566202c 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -34,6 +34,7 @@ jobs:
             ! -path "*/.DS_Store" \
             ! -path "*/*locales/*" \
             ! -path "./.github/*" \
+            ! -path "*/README.md" \
             ! -path "*/Cargo.toml" \
             ! -path "*/Cargo.lock" \
             ! -path "./apps/desktop/macos/*" \
diff --git a/apps/browser/src/auth/popup/two-factor-auth-duo.component.ts b/apps/browser/src/auth/popup/two-factor-auth-duo.component.ts
index 53aedc7a5f..687dc68392 100644
--- a/apps/browser/src/auth/popup/two-factor-auth-duo.component.ts
+++ b/apps/browser/src/auth/popup/two-factor-auth-duo.component.ts
@@ -27,9 +27,6 @@ import { FormFieldModule } from "../../../../../libs/components/src/form-field";
 import { LinkModule } from "../../../../../libs/components/src/link";
 // FIXME: remove `src` and fix import
 // eslint-disable-next-line no-restricted-imports
-import { I18nPipe } from "../../../../../libs/components/src/shared/i18n.pipe";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
 import { TypographyModule } from "../../../../../libs/components/src/typography";
 import { ZonedMessageListenerService } from "../../platform/browser/zoned-message-listener.service";
 
@@ -50,7 +47,6 @@ import { ZonedMessageListenerService } from "../../platform/browser/zoned-messag
     AsyncActionsModule,
     FormsModule,
   ],
-  providers: [I18nPipe],
 })
 export class TwoFactorAuthDuoComponent
   extends TwoFactorAuthDuoBaseComponent
diff --git a/apps/browser/src/auth/popup/two-factor-auth-email.component.ts b/apps/browser/src/auth/popup/two-factor-auth-email.component.ts
index 723152adfa..7afe1eb889 100644
--- a/apps/browser/src/auth/popup/two-factor-auth-email.component.ts
+++ b/apps/browser/src/auth/popup/two-factor-auth-email.component.ts
@@ -23,9 +23,6 @@ import { FormFieldModule } from "../../../../../libs/components/src/form-field";
 import { LinkModule } from "../../../../../libs/components/src/link";
 // FIXME: remove `src` and fix import
 // eslint-disable-next-line no-restricted-imports
-import { I18nPipe } from "../../../../../libs/components/src/shared/i18n.pipe";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
 import { TypographyModule } from "../../../../../libs/components/src/typography";
 import BrowserPopupUtils from "../../platform/popup/browser-popup-utils";
 
@@ -46,7 +43,6 @@ import BrowserPopupUtils from "../../platform/popup/browser-popup-utils";
     AsyncActionsModule,
     FormsModule,
   ],
-  providers: [I18nPipe],
 })
 export class TwoFactorAuthEmailComponent extends TwoFactorAuthEmailBaseComponent implements OnInit {
   private dialogService = inject(DialogService);
diff --git a/apps/browser/tsconfig.json b/apps/browser/tsconfig.json
index c1ef1443ac..2326e68f55 100644
--- a/apps/browser/tsconfig.json
+++ b/apps/browser/tsconfig.json
@@ -24,17 +24,18 @@
       "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"],
       "@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
       "@bitwarden/generator-navigation": ["../../libs/tools/generator/extensions/navigation/src"],
+      "@bitwarden/importer/core": ["../../libs/importer/src"],
+      "@bitwarden/importer/ui": ["../../libs/importer/src/components"],
+      "@bitwarden/key-management": ["../../libs/key-management/src"],
+      "@bitwarden/key-management/angular": ["../../libs/key-management/src/angular"],
+      "@bitwarden/platform": ["../../libs/platform/src"],
+      "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"],
+      "@bitwarden/tools-card": ["../../libs/tools/card/src"],
+      "@bitwarden/ui-common": ["../../libs/ui/common/src"],
       "@bitwarden/vault-export-core": [
         "../../libs/tools/export/vault-export/vault-export-core/src"
       ],
       "@bitwarden/vault-export-ui": ["../../libs/tools/export/vault-export/vault-export-ui/src"],
-      "@bitwarden/importer/core": ["../../libs/importer/src"],
-      "@bitwarden/importer/ui": ["../../libs/importer/src/components"],
-      "@bitwarden/platform": ["../../libs/platform/src"],
-      "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"],
-      "@bitwarden/tools-card": ["../../libs/tools/card/src"],
-      "@bitwarden/key-management": ["../../libs/key-management/src"],
-      "@bitwarden/key-management/angular": ["../../libs/key-management/src/angular"],
       "@bitwarden/vault": ["../../libs/vault/src"]
     },
     "plugins": [
diff --git a/apps/desktop/src/auth/two-factor-auth.component.ts b/apps/desktop/src/auth/two-factor-auth.component.ts
index 9e0898c39e..d8b80c28df 100644
--- a/apps/desktop/src/auth/two-factor-auth.component.ts
+++ b/apps/desktop/src/auth/two-factor-auth.component.ts
@@ -42,9 +42,6 @@ import { FormFieldModule } from "../../../../libs/components/src/form-field";
 import { LinkModule } from "../../../../libs/components/src/link";
 // FIXME: remove `src` and fix import
 // eslint-disable-next-line no-restricted-imports
-import { I18nPipe } from "../../../../libs/components/src/shared/i18n.pipe";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
 import { TypographyModule } from "../../../../libs/components/src/typography";
 
 import { TwoFactorAuthDuoComponent } from "./two-factor-auth-duo.component";
@@ -73,6 +70,5 @@ import { TwoFactorAuthDuoComponent } from "./two-factor-auth-duo.component";
     TwoFactorAuthDuoComponent,
     TwoFactorAuthWebAuthnComponent,
   ],
-  providers: [I18nPipe],
 })
 export class TwoFactorAuthComponent extends BaseTwoFactorAuthComponent {}
diff --git a/apps/desktop/tsconfig.json b/apps/desktop/tsconfig.json
index da61ef22dd..cbeb1034d6 100644
--- a/apps/desktop/tsconfig.json
+++ b/apps/desktop/tsconfig.json
@@ -22,10 +22,6 @@
       "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"],
       "@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
       "@bitwarden/generator-navigation": ["../../libs/tools/generator/extensions/navigation/src"],
-      "@bitwarden/vault-export-core": [
-        "../../libs/tools/export/vault-export/vault-export-core/src"
-      ],
-      "@bitwarden/vault-export-ui": ["../../libs/tools/export/vault-export/vault-export-ui/src"],
       "@bitwarden/importer/core": ["../../libs/importer/src"],
       "@bitwarden/importer/ui": ["../../libs/importer/src/components"],
       "@bitwarden/key-management": ["../../libs/key-management/src"],
@@ -34,6 +30,11 @@
       "@bitwarden/platform": ["../../libs/platform/src"],
       "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"],
       "@bitwarden/tools-card": ["../../libs/tools/card/src"],
+      "@bitwarden/ui-common": ["../../libs/ui/common/src"],
+      "@bitwarden/vault-export-core": [
+        "../../libs/tools/export/vault-export/vault-export-core/src"
+      ],
+      "@bitwarden/vault-export-ui": ["../../libs/tools/export/vault-export/vault-export-ui/src"],
       "@bitwarden/vault": ["../../libs/vault/src"]
     },
     "plugins": [
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-card/integration-card.component.spec.ts b/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-card/integration-card.component.spec.ts
index c8b6a29042..b9d5474476 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-card/integration-card.component.spec.ts
+++ b/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-card/integration-card.component.spec.ts
@@ -7,7 +7,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { ThemeType } from "@bitwarden/common/platform/enums";
 import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
 import { SharedModule } from "@bitwarden/components/src/shared";
-import { I18nPipe } from "@bitwarden/components/src/shared/i18n.pipe";
+import { I18nPipe } from "@bitwarden/ui-common";
 
 import { IntegrationCardComponent } from "./integration-card.component";
 
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-grid/integration-grid.component.spec.ts b/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-grid/integration-grid.component.spec.ts
index c77ec455e0..ee124a41c0 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-grid/integration-grid.component.spec.ts
+++ b/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-grid/integration-grid.component.spec.ts
@@ -9,7 +9,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { ThemeTypes } from "@bitwarden/common/platform/enums";
 import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
 import { SharedModule } from "@bitwarden/components/src/shared";
-import { I18nPipe } from "@bitwarden/components/src/shared/i18n.pipe";
+import { I18nPipe } from "@bitwarden/ui-common";
 
 import { IntegrationCardComponent } from "../integration-card/integration-card.component";
 import { Integration } from "../models";
diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json
index 678db7c4af..701808df13 100644
--- a/apps/web/tsconfig.json
+++ b/apps/web/tsconfig.json
@@ -7,8 +7,8 @@
     "paths": {
       "@bitwarden/admin-console/common": ["../../libs/admin-console/src/common"],
       "@bitwarden/angular/*": ["../../libs/angular/src/*"],
-      "@bitwarden/auth/common": ["../../libs/auth/src/common"],
       "@bitwarden/auth/angular": ["../../libs/auth/src/angular"],
+      "@bitwarden/auth/common": ["../../libs/auth/src/common"],
       "@bitwarden/billing": ["../../libs/billing/src"],
       "@bitwarden/bit-common/*": ["../../bitwarden_license/bit-common/src/*"],
       "@bitwarden/common/*": ["../../libs/common/src/*"],
@@ -18,10 +18,6 @@
       "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"],
       "@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
       "@bitwarden/generator-navigation": ["../../libs/tools/generator/extensions/navigation/src"],
-      "@bitwarden/vault-export-core": [
-        "../../libs/tools/export/vault-export/vault-export-core/src"
-      ],
-      "@bitwarden/vault-export-ui": ["../../libs/tools/export/vault-export/vault-export-ui/src"],
       "@bitwarden/importer/core": ["../../libs/importer/src"],
       "@bitwarden/importer/ui": ["../../libs/importer/src/components"],
       "@bitwarden/key-management": ["../../libs/key-management/src"],
@@ -29,6 +25,11 @@
       "@bitwarden/platform": ["../../libs/platform/src"],
       "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"],
       "@bitwarden/tools-card": ["../../libs/tools/card/src"],
+      "@bitwarden/ui-common": ["../../libs/ui/common/src"],
+      "@bitwarden/vault-export-core": [
+        "../../libs/tools/export/vault-export/vault-export-core/src"
+      ],
+      "@bitwarden/vault-export-ui": ["../../libs/tools/export/vault-export/vault-export-ui/src"],
       "@bitwarden/vault": ["../../libs/vault/src"],
       "@bitwarden/web-vault/*": ["src/*"]
     }
diff --git a/bitwarden_license/bit-common/tsconfig.json b/bitwarden_license/bit-common/tsconfig.json
index 7791840950..ec1d3787f8 100644
--- a/bitwarden_license/bit-common/tsconfig.json
+++ b/bitwarden_license/bit-common/tsconfig.json
@@ -9,6 +9,7 @@
       "@bitwarden/angular/*": ["../../libs/angular/src/*"],
       "@bitwarden/auth": ["../../libs/auth/src"],
       "@bitwarden/billing": ["../../libs/billing/src"],
+      "@bitwarden/bit-common/*": ["../bit-common/src/*"],
       "@bitwarden/common/*": ["../../libs/common/src/*"],
       "@bitwarden/components": ["../../libs/components/src"],
       "@bitwarden/generator-components": ["../../libs/tools/generator/components/src"],
@@ -16,18 +17,18 @@
       "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"],
       "@bitwarden/generator-legacy": ["../../libs/tools/generator/extensions/legacy/src"],
       "@bitwarden/generator-navigation": ["../../libs/tools/generator/extensions/navigation/src"],
+      "@bitwarden/key-management": ["../../libs/key-management/src"],
+      "@bitwarden/key-management/angular": ["../../libs/key-management/src/angular"],
+      "@bitwarden/platform": ["../../libs/platform/src"],
+      "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"],
+      "@bitwarden/tools-card": ["../../libs/tools/card/src"],
+      "@bitwarden/ui-common": ["../../libs/ui/common/src"],
       "@bitwarden/vault-export-core": [
         "../../libs/tools/export/vault-export/vault-export-core/src"
       ],
       "@bitwarden/vault-export-ui": ["../../libs/tools/export/vault-export/vault-export-core/src"],
-      "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"],
-      "@bitwarden/tools-card": ["../../libs/tools/card/src"],
-      "@bitwarden/key-management": ["../../libs/key-management/src"],
-      "@bitwarden/key-management/angular": ["../../libs/key-management/src/angular"],
-      "@bitwarden/platform": ["../../libs/platform/src"],
       "@bitwarden/vault": ["../../libs/vault/src"],
-      "@bitwarden/web-vault/*": ["../../apps/web/src/*"],
-      "@bitwarden/bit-common/*": ["../bit-common/src/*"]
+      "@bitwarden/web-vault/*": ["../../apps/web/src/*"]
     }
   }
 }
diff --git a/bitwarden_license/bit-web/tsconfig.json b/bitwarden_license/bit-web/tsconfig.json
index c4304ec2bd..13a6466b3b 100644
--- a/bitwarden_license/bit-web/tsconfig.json
+++ b/bitwarden_license/bit-web/tsconfig.json
@@ -26,6 +26,7 @@
       "@bitwarden/key-management": ["../../libs/key-management/src"],
       "@bitwarden/key-management/angular": ["../../libs/key-management/src/angular"],
       "@bitwarden/platform": ["../../libs/platform/src"],
+      "@bitwarden/ui-common": ["../../libs/ui/common/src"],
       "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"],
       "@bitwarden/tools-card": ["../../libs/tools/card/src"],
       "@bitwarden/vault": ["../../libs/vault/src"],
diff --git a/libs/angular/src/platform/pipes/i18n.pipe.ts b/libs/angular/src/platform/pipes/i18n.pipe.ts
index 1f92bbb19a..a6fdbc7825 100644
--- a/libs/angular/src/platform/pipes/i18n.pipe.ts
+++ b/libs/angular/src/platform/pipes/i18n.pipe.ts
@@ -2,6 +2,9 @@ import { Pipe, PipeTransform } from "@angular/core";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
+/**
+ * @deprecated: Please use the I18nPipe from @bitwarden/ui-common
+ */
 @Pipe({
   name: "i18n",
 })
diff --git a/libs/angular/src/platform/utils/safe-provider.ts b/libs/angular/src/platform/utils/safe-provider.ts
index e7547f9b82..82b5affcc2 100644
--- a/libs/angular/src/platform/utils/safe-provider.ts
+++ b/libs/angular/src/platform/utils/safe-provider.ts
@@ -1,138 +1,4 @@
-import { Provider } from "@angular/core";
-import { Constructor, Opaque } from "type-fest";
-
-import { SafeInjectionToken } from "../../services/injection-tokens";
-
 /**
- * The return type of the {@link safeProvider} helper function.
- * Used to distinguish a type safe provider definition from a non-type safe provider definition.
+ * @deprecated: Please use the SafeProvider & safeProvider from @bitwarden/ui-common
  */
-export type SafeProvider = Opaque<Provider>;
-
-// TODO: type-fest also provides a type like this when we upgrade >= 3.7.0
-type AbstractConstructor<T> = abstract new (...args: any) => T;
-
-type MapParametersToDeps<T> = {
-  [K in keyof T]: AbstractConstructor<T[K]> | SafeInjectionToken<T[K]>;
-};
-
-type SafeInjectionTokenType<T> = T extends SafeInjectionToken<infer J> ? J : never;
-
-/**
- * Gets the instance type from a constructor, abstract constructor, or SafeInjectionToken
- */
-type ProviderInstanceType<T> =
-  T extends SafeInjectionToken<any>
-    ? InstanceType<SafeInjectionTokenType<T>>
-    : T extends Constructor<any> | AbstractConstructor<any>
-      ? InstanceType<T>
-      : never;
-
-/**
- * Represents a dependency provided with the useClass option.
- */
-type SafeClassProvider<
-  A extends AbstractConstructor<any> | SafeInjectionToken<any>,
-  I extends Constructor<ProviderInstanceType<A>>,
-  D extends MapParametersToDeps<ConstructorParameters<I>>,
-> = {
-  provide: A;
-  useClass: I;
-  deps: D;
-};
-
-/**
- * Represents a dependency provided with the useValue option.
- */
-type SafeValueProvider<A extends SafeInjectionToken<any>, V extends SafeInjectionTokenType<A>> = {
-  provide: A;
-  useValue: V;
-};
-
-/**
- * Represents a dependency provided with the useFactory option.
- */
-type SafeFactoryProvider<
-  A extends AbstractConstructor<any> | SafeInjectionToken<any>,
-  I extends (...args: any) => ProviderInstanceType<A>,
-  D extends MapParametersToDeps<Parameters<I>>,
-> = {
-  provide: A;
-  useFactory: I;
-  deps: D;
-  multi?: boolean;
-};
-
-/**
- * Represents a dependency provided with the useExisting option.
- */
-type SafeExistingProvider<
-  A extends Constructor<any> | AbstractConstructor<any> | SafeInjectionToken<any>,
-  I extends Constructor<ProviderInstanceType<A>> | AbstractConstructor<ProviderInstanceType<A>>,
-> = {
-  provide: A;
-  useExisting: I;
-};
-
-/**
- * Represents a dependency where there is no abstract token, the token is the implementation
- */
-type SafeConcreteProvider<
-  I extends Constructor<any>,
-  D extends MapParametersToDeps<ConstructorParameters<I>>,
-> = {
-  provide: I;
-  deps: D;
-};
-
-/**
- * If useAngularDecorators: true is specified, do not require a deps array.
- * This is a manual override for where @Injectable decorators are used
- */
-type UseAngularDecorators<T extends { deps: any }> = Omit<T, "deps"> & {
-  useAngularDecorators: true;
-};
-
-/**
- * Represents a type with a deps array that may optionally be overridden with useAngularDecorators
- */
-type AllowAngularDecorators<T extends { deps: any }> = T | UseAngularDecorators<T>;
-
-/**
- * A factory function that creates a provider for the ngModule providers array.
- * This (almost) guarantees type safety for your provider definition. It does nothing at runtime.
- * Warning: the useAngularDecorators option provides an override where your class uses the Injectable decorator,
- * however this cannot be enforced by the type system and will not cause an error if the decorator is not used.
- * @example safeProvider({ provide: MyService, useClass: DefaultMyService, deps: [AnotherService] })
- * @param provider Your provider object in the usual shape (e.g. using useClass, useValue, useFactory, etc.)
- * @returns The exact same object without modification (pass-through).
- */
-export const safeProvider = <
-  // types for useClass
-  AClass extends AbstractConstructor<any> | SafeInjectionToken<any>,
-  IClass extends Constructor<ProviderInstanceType<AClass>>,
-  DClass extends MapParametersToDeps<ConstructorParameters<IClass>>,
-  // types for useValue
-  AValue extends SafeInjectionToken<any>,
-  VValue extends SafeInjectionTokenType<AValue>,
-  // types for useFactory
-  AFactory extends AbstractConstructor<any> | SafeInjectionToken<any>,
-  IFactory extends (...args: any) => ProviderInstanceType<AFactory>,
-  DFactory extends MapParametersToDeps<Parameters<IFactory>>,
-  // types for useExisting
-  AExisting extends Constructor<any> | AbstractConstructor<any> | SafeInjectionToken<any>,
-  IExisting extends
-    | Constructor<ProviderInstanceType<AExisting>>
-    | AbstractConstructor<ProviderInstanceType<AExisting>>,
-  // types for no token
-  IConcrete extends Constructor<any>,
-  DConcrete extends MapParametersToDeps<ConstructorParameters<IConcrete>>,
->(
-  provider:
-    | AllowAngularDecorators<SafeClassProvider<AClass, IClass, DClass>>
-    | SafeValueProvider<AValue, VValue>
-    | AllowAngularDecorators<SafeFactoryProvider<AFactory, IFactory, DFactory>>
-    | SafeExistingProvider<AExisting, IExisting>
-    | AllowAngularDecorators<SafeConcreteProvider<IConcrete, DConcrete>>
-    | Constructor<unknown>,
-): SafeProvider => provider as SafeProvider;
+export { SafeProvider, safeProvider } from "@bitwarden/ui-common";
diff --git a/libs/angular/src/services/injection-tokens.ts b/libs/angular/src/services/injection-tokens.ts
index 3842c3250e..2c740d5bb4 100644
--- a/libs/angular/src/services/injection-tokens.ts
+++ b/libs/angular/src/services/injection-tokens.ts
@@ -1,6 +1,5 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { InjectionToken } from "@angular/core";
 import { Observable, Subject } from "rxjs";
 
 import { LogoutReason } from "@bitwarden/auth/common";
@@ -14,17 +13,9 @@ import { Theme } from "@bitwarden/common/platform/enums";
 import { StateFactory } from "@bitwarden/common/platform/factories/state-factory";
 import { Message } from "@bitwarden/common/platform/messaging";
 import { VaultTimeout } from "@bitwarden/common/types/vault-timeout.type";
-
-declare const tag: unique symbol;
-/**
- * A (more) typesafe version of InjectionToken which will more strictly enforce the generic type parameter.
- * @remarks The default angular implementation does not use the generic type to define the structure of the object,
- * so the structural type system will not complain about a mismatch in the type parameter.
- * This is solved by assigning T to an arbitrary private property.
- */
-export class SafeInjectionToken<T> extends InjectionToken<T> {
-  private readonly [tag]: T;
-}
+import { SafeInjectionToken } from "@bitwarden/ui-common";
+// Re-export the SafeInjectionToken from ui-common
+export { SafeInjectionToken } from "@bitwarden/ui-common";
 
 export const WINDOW = new SafeInjectionToken<Window>("WINDOW");
 export const OBSERVABLE_MEMORY_STORAGE = new SafeInjectionToken<
diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts
index 803808612c..c1d25407c0 100644
--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -293,6 +293,7 @@ import {
   UserAsymmetricKeysRegenerationApiService,
   DefaultUserAsymmetricKeysRegenerationApiService,
 } from "@bitwarden/key-management";
+import { SafeInjectionToken } from "@bitwarden/ui-common";
 import { PasswordRepromptService } from "@bitwarden/vault";
 import {
   VaultExportService,
@@ -323,7 +324,6 @@ import {
   MEMORY_STORAGE,
   OBSERVABLE_DISK_STORAGE,
   OBSERVABLE_MEMORY_STORAGE,
-  SafeInjectionToken,
   SECURE_STORAGE,
   STATE_FACTORY,
   SUPPORTS_SECURE_STORAGE,
diff --git a/libs/angular/tsconfig.json b/libs/angular/tsconfig.json
index 6c510f8149..b638410a6a 100644
--- a/libs/angular/tsconfig.json
+++ b/libs/angular/tsconfig.json
@@ -16,6 +16,7 @@
       "@bitwarden/importer/core": ["../importer/src"],
       "@bitwarden/key-management": ["../key-management/src"],
       "@bitwarden/platform": ["../platform/src"],
+      "@bitwarden/ui-common": ["../ui/common/src"],
       "@bitwarden/vault-export-core": ["../tools/export/vault-export/vault-export-core/src"],
       "@bitwarden/vault": ["../vault/src"]
     }
diff --git a/libs/auth/tsconfig.json b/libs/auth/tsconfig.json
index 9be942d38d..8d08522ffc 100644
--- a/libs/auth/tsconfig.json
+++ b/libs/auth/tsconfig.json
@@ -4,17 +4,18 @@
     "resolveJsonModule": true,
     "paths": {
       "@bitwarden/admin-console/common": ["../admin-console/src/common"],
-      "@bitwarden/auth/common": ["../auth/src/common"],
-      "@bitwarden/auth/angular": ["../auth/src/angular"],
       "@bitwarden/angular/*": ["../angular/src/*"],
+      "@bitwarden/auth/angular": ["../auth/src/angular"],
+      "@bitwarden/auth/common": ["../auth/src/common"],
       "@bitwarden/common/*": ["../common/src/*"],
       "@bitwarden/components": ["../components/src"],
-      "@bitwarden/key-management": ["../key-management/src"],
-      "@bitwarden/platform": ["../platform/src"],
       "@bitwarden/generator-core": ["../tools/generator/core/src"],
       "@bitwarden/generator-history": ["../tools/generator/extensions/history/src"],
       "@bitwarden/generator-legacy": ["../tools/generator/extensions/legacy/src"],
-      "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"]
+      "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"],
+      "@bitwarden/key-management": ["../key-management/src"],
+      "@bitwarden/platform": ["../platform/src"],
+      "@bitwarden/ui-common": ["../ui/common/src"]
     }
   },
   "include": ["src", "spec"],
diff --git a/libs/common/tsconfig.json b/libs/common/tsconfig.json
index c28b60e28f..2d1379f9c5 100644
--- a/libs/common/tsconfig.json
+++ b/libs/common/tsconfig.json
@@ -6,9 +6,12 @@
       "@bitwarden/auth/common": ["../auth/src/common"],
       // TODO: Remove once circular dependencies in admin-console, auth and key-management are resolved
       "@bitwarden/common/*": ["../common/src/*"],
+      // TODO: Remove once billing stops depending on components
       "@bitwarden/components": ["../components/src"],
       "@bitwarden/key-management": ["../key-management/src"],
-      "@bitwarden/platform": ["../platform/src"]
+      "@bitwarden/platform": ["../platform/src"],
+      // TODO: Remove once billing stops depending on components
+      "@bitwarden/ui-common": ["../ui/common/src"]
     }
   },
   "include": ["src", "spec", "./custom-matchers.d.ts", "../key-management/src/index.ts"],
diff --git a/libs/components/src/badge-list/badge-list.component.ts b/libs/components/src/badge-list/badge-list.component.ts
index ac8cb3281a..7d152761ed 100644
--- a/libs/components/src/badge-list/badge-list.component.ts
+++ b/libs/components/src/badge-list/badge-list.component.ts
@@ -3,8 +3,9 @@
 import { CommonModule } from "@angular/common";
 import { Component, Input, OnChanges } from "@angular/core";
 
+import { I18nPipe } from "@bitwarden/ui-common";
+
 import { BadgeModule, BadgeVariant } from "../badge";
-import { I18nPipe } from "../shared/i18n.pipe";
 
 @Component({
   selector: "bit-badge-list",
diff --git a/libs/components/src/banner/banner.component.ts b/libs/components/src/banner/banner.component.ts
index d3f6432997..a7b710d6a7 100644
--- a/libs/components/src/banner/banner.component.ts
+++ b/libs/components/src/banner/banner.component.ts
@@ -3,8 +3,9 @@
 import { CommonModule } from "@angular/common";
 import { Component, Input, OnInit, Output, EventEmitter } from "@angular/core";
 
+import { I18nPipe } from "@bitwarden/ui-common";
+
 import { IconButtonModule } from "../icon-button";
-import { I18nPipe } from "../shared/i18n.pipe";
 
 type BannerTypes = "premium" | "info" | "warning" | "danger";
 
diff --git a/libs/components/src/dialog/dialog/dialog.component.ts b/libs/components/src/dialog/dialog/dialog.component.ts
index ed47201805..e9e3e89825 100644
--- a/libs/components/src/dialog/dialog/dialog.component.ts
+++ b/libs/components/src/dialog/dialog/dialog.component.ts
@@ -4,8 +4,9 @@ import { coerceBooleanProperty } from "@angular/cdk/coercion";
 import { CommonModule } from "@angular/common";
 import { Component, HostBinding, Input } from "@angular/core";
 
+import { I18nPipe } from "@bitwarden/ui-common";
+
 import { BitIconButtonComponent } from "../../icon-button/icon-button.component";
-import { I18nPipe } from "../../shared/i18n.pipe";
 import { TypographyDirective } from "../../typography/typography.directive";
 import { fadeIn } from "../animations";
 import { DialogCloseDirective } from "../directives/dialog-close.directive";
diff --git a/libs/components/src/form-control/form-control.component.ts b/libs/components/src/form-control/form-control.component.ts
index 9b87c44157..d22d49ac03 100644
--- a/libs/components/src/form-control/form-control.component.ts
+++ b/libs/components/src/form-control/form-control.component.ts
@@ -5,8 +5,8 @@ import { NgClass, NgIf } from "@angular/common";
 import { Component, ContentChild, HostBinding, Input } from "@angular/core";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { I18nPipe } from "@bitwarden/ui-common";
 
-import { I18nPipe } from "../shared/i18n.pipe";
 import { TypographyDirective } from "../typography/typography.directive";
 
 import { BitFormControlAbstraction } from "./form-control.abstraction";
diff --git a/libs/components/src/form-field/error-summary.component.ts b/libs/components/src/form-field/error-summary.component.ts
index beed32a88a..f9325d8f82 100644
--- a/libs/components/src/form-field/error-summary.component.ts
+++ b/libs/components/src/form-field/error-summary.component.ts
@@ -4,7 +4,7 @@ import { NgIf } from "@angular/common";
 import { Component, Input } from "@angular/core";
 import { AbstractControl, UntypedFormGroup } from "@angular/forms";
 
-import { I18nPipe } from "../shared/i18n.pipe";
+import { I18nPipe } from "@bitwarden/ui-common";
 
 @Component({
   selector: "bit-error-summary",
diff --git a/libs/components/src/form-field/form-field.component.ts b/libs/components/src/form-field/form-field.component.ts
index 9f41c6cf6a..4f7c2a6748 100644
--- a/libs/components/src/form-field/form-field.component.ts
+++ b/libs/components/src/form-field/form-field.component.ts
@@ -14,10 +14,11 @@ import {
   signal,
 } from "@angular/core";
 
+import { I18nPipe } from "@bitwarden/ui-common";
+
 import { BitHintComponent } from "../form-control/hint.component";
 import { BitLabel } from "../form-control/label.component";
 import { inputBorderClasses } from "../input/input.directive";
-import { I18nPipe } from "../shared/i18n.pipe";
 
 import { BitErrorComponent } from "./error.component";
 import { BitFormFieldControl } from "./form-field-control";
diff --git a/libs/components/src/multi-select/multi-select.component.ts b/libs/components/src/multi-select/multi-select.component.ts
index 53e51bfe2f..71b00404cf 100644
--- a/libs/components/src/multi-select/multi-select.component.ts
+++ b/libs/components/src/multi-select/multi-select.component.ts
@@ -24,10 +24,10 @@ import {
 import { NgSelectComponent, NgSelectModule } from "@ng-select/ng-select";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { I18nPipe } from "@bitwarden/ui-common";
 
 import { BadgeModule } from "../badge";
 import { BitFormFieldControl } from "../form-field/form-field-control";
-import { I18nPipe } from "../shared/i18n.pipe";
 
 import { SelectItemView } from "./models/select-item-view";
 
diff --git a/libs/components/src/navigation/nav-group.component.ts b/libs/components/src/navigation/nav-group.component.ts
index d615bfe058..37244f37c8 100644
--- a/libs/components/src/navigation/nav-group.component.ts
+++ b/libs/components/src/navigation/nav-group.component.ts
@@ -12,8 +12,9 @@ import {
   SkipSelf,
 } from "@angular/core";
 
+import { I18nPipe } from "@bitwarden/ui-common";
+
 import { IconButtonModule } from "../icon-button";
-import { I18nPipe } from "../shared/i18n.pipe";
 
 import { NavBaseComponent } from "./nav-base.component";
 import { NavGroupAbstraction, NavItemComponent } from "./nav-item.component";
diff --git a/libs/components/src/navigation/side-nav.component.ts b/libs/components/src/navigation/side-nav.component.ts
index c86a517100..e8e4f131d6 100644
--- a/libs/components/src/navigation/side-nav.component.ts
+++ b/libs/components/src/navigation/side-nav.component.ts
@@ -4,8 +4,9 @@ import { CdkTrapFocus } from "@angular/cdk/a11y";
 import { CommonModule } from "@angular/common";
 import { Component, ElementRef, Input, ViewChild } from "@angular/core";
 
+import { I18nPipe } from "@bitwarden/ui-common";
+
 import { BitIconButtonComponent } from "../icon-button/icon-button.component";
-import { I18nPipe } from "../shared/i18n.pipe";
 
 import { NavDividerComponent } from "./nav-divider.component";
 import { SideNavService } from "./side-nav.service";
diff --git a/libs/components/src/radio-button/radio-group.component.ts b/libs/components/src/radio-button/radio-group.component.ts
index b9e48f4644..4ab626f796 100644
--- a/libs/components/src/radio-button/radio-group.component.ts
+++ b/libs/components/src/radio-button/radio-group.component.ts
@@ -4,8 +4,9 @@ import { NgIf, NgTemplateOutlet } from "@angular/common";
 import { Component, ContentChild, HostBinding, Input, Optional, Self } from "@angular/core";
 import { ControlValueAccessor, NgControl, Validators } from "@angular/forms";
 
+import { I18nPipe } from "@bitwarden/ui-common";
+
 import { BitLabel } from "../form-control/label.component";
-import { I18nPipe } from "../shared/i18n.pipe";
 
 let nextId = 0;
 
diff --git a/libs/components/src/search/search.component.ts b/libs/components/src/search/search.component.ts
index 9a811ce677..7f1bd781e9 100644
--- a/libs/components/src/search/search.component.ts
+++ b/libs/components/src/search/search.component.ts
@@ -9,10 +9,10 @@ import {
 } from "@angular/forms";
 
 import { isBrowserSafariApi } from "@bitwarden/platform";
+import { I18nPipe } from "@bitwarden/ui-common";
 
 import { InputModule } from "../input/input.module";
 import { FocusableElement } from "../shared/focusable-element";
-import { I18nPipe } from "../shared/i18n.pipe";
 
 let nextId = 0;
 
diff --git a/libs/components/src/shared/shared.module.ts b/libs/components/src/shared/shared.module.ts
index 253b049f8f..99d052c335 100644
--- a/libs/components/src/shared/shared.module.ts
+++ b/libs/components/src/shared/shared.module.ts
@@ -1,7 +1,7 @@
 import { CommonModule } from "@angular/common";
 import { NgModule } from "@angular/core";
 
-import { I18nPipe } from "./i18n.pipe";
+import { I18nPipe } from "@bitwarden/ui-common";
 
 @NgModule({
   imports: [CommonModule, I18nPipe],
diff --git a/libs/components/tsconfig.json b/libs/components/tsconfig.json
index 71eef15fac..abd5830d42 100644
--- a/libs/components/tsconfig.json
+++ b/libs/components/tsconfig.json
@@ -20,7 +20,8 @@
     "lib": ["es2020", "dom"],
     "paths": {
       "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/platform": ["../platform/src"]
+      "@bitwarden/platform": ["../platform/src"],
+      "@bitwarden/ui-common": ["../ui/common/src"]
     },
     "plugins": [
       {
diff --git a/libs/importer/tsconfig.json b/libs/importer/tsconfig.json
index 2235cccb5c..09eb33e288 100644
--- a/libs/importer/tsconfig.json
+++ b/libs/importer/tsconfig.json
@@ -13,6 +13,7 @@
       "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"],
       "@bitwarden/key-management": ["../key-management/src"],
       "@bitwarden/platform": ["../platform/src"],
+      "@bitwarden/ui-common": ["../ui/common/src"],
       "@bitwarden/vault-export-core": ["../tools/export/vault-export/vault-export-core/src"]
     }
   },
diff --git a/libs/key-management/tsconfig.json b/libs/key-management/tsconfig.json
index 8279f14c78..e1e618314e 100644
--- a/libs/key-management/tsconfig.json
+++ b/libs/key-management/tsconfig.json
@@ -13,7 +13,8 @@
       "@bitwarden/generator-history": ["../tools/generator/extensions/history/src"],
       "@bitwarden/generator-legacy": ["../tools/generator/extensions/legacy/src"],
       "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"],
-      "@bitwarden/platform": ["../platform/src"]
+      "@bitwarden/platform": ["../platform/src"],
+      "@bitwarden/ui-common": ["../ui/common/src"]
     }
   },
   "include": ["src", "spec"],
diff --git a/libs/shared/tsconfig.spec.json b/libs/shared/tsconfig.spec.json
index 2366507918..92c957c297 100644
--- a/libs/shared/tsconfig.spec.json
+++ b/libs/shared/tsconfig.spec.json
@@ -5,8 +5,8 @@
     "paths": {
       "@bitwarden/admin-console/common": ["../admin-console/src/common"],
       "@bitwarden/angular/*": ["../angular/src/*"],
-      "@bitwarden/auth/common": ["../auth/src/common"],
       "@bitwarden/auth/angular": ["../auth/src/angular"],
+      "@bitwarden/auth/common": ["../auth/src/common"],
       "@bitwarden/billing": ["../billing/src"],
       "@bitwarden/common/*": ["../common/src/*"],
       "@bitwarden/components": ["../components/src"],
@@ -15,16 +15,17 @@
       "@bitwarden/generator-history": ["../tools/generator/extensions/history/src"],
       "@bitwarden/generator-legacy": ["../tools/generator/extensions/legacy/src"],
       "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"],
-      "@bitwarden/vault-export-core": ["../tools/export/vault-export/vault-export-core/src"],
-      "@bitwarden/vault-export-ui": ["../tools/export/vault-export/vault-export-ui/src"],
       "@bitwarden/importer/core": ["../importer/src"],
       "@bitwarden/importer/ui": ["../importer/src/components"],
       "@bitwarden/key-management": ["../key-management/src"],
       "@bitwarden/key-management/angular": ["../key-management/src/angular"],
+      "@bitwarden/node/*": ["../node/src/*"],
       "@bitwarden/platform": ["../platform/src"],
       "@bitwarden/send-ui": ["../tools/send/send-ui/src"],
       "@bitwarden/tools-card": ["../tools/card/src"],
-      "@bitwarden/node/*": ["../node/src/*"],
+      "@bitwarden/ui-common": ["../ui/common/src"],
+      "@bitwarden/vault-export-core": ["../tools/export/vault-export/vault-export-core/src"],
+      "@bitwarden/vault-export-ui": ["../tools/export/vault-export/vault-export-ui/src"],
       "@bitwarden/vault": ["../vault/src"]
     }
   }
diff --git a/libs/tools/card/tsconfig.json b/libs/tools/card/tsconfig.json
index 9c910521cc..050a1748b7 100644
--- a/libs/tools/card/tsconfig.json
+++ b/libs/tools/card/tsconfig.json
@@ -8,7 +8,8 @@
       "@bitwarden/common/*": ["../../common/src/*"],
       "@bitwarden/components": ["../../components/src"],
       "@bitwarden/key-management": ["../../key-management/src"],
-      "@bitwarden/platform": ["../../platform/src"]
+      "@bitwarden/platform": ["../../platform/src"],
+      "@bitwarden/ui-common": ["../../ui/common/src"]
     }
   },
   "include": ["src"],
diff --git a/libs/tools/export/vault-export/vault-export-ui/tsconfig.json b/libs/tools/export/vault-export/vault-export-ui/tsconfig.json
index 8c8a04d4b6..1732817986 100644
--- a/libs/tools/export/vault-export/vault-export-ui/tsconfig.json
+++ b/libs/tools/export/vault-export/vault-export-ui/tsconfig.json
@@ -14,6 +14,7 @@
       "@bitwarden/generator-navigation": ["../../../../tools/generator/extensions/navigation/src"],
       "@bitwarden/key-management": ["../../../../key-management/src"],
       "@bitwarden/platform": ["../../../../platform/src"],
+      "@bitwarden/ui-common": ["../../../../ui/common/src"],
       "@bitwarden/vault-export-core": [
         "../../../../tools/export/vault-export/vault-export-core/src"
       ]
diff --git a/libs/tools/generator/components/tsconfig.json b/libs/tools/generator/components/tsconfig.json
index 76b060334f..e0e4da268d 100644
--- a/libs/tools/generator/components/tsconfig.json
+++ b/libs/tools/generator/components/tsconfig.json
@@ -10,7 +10,8 @@
       "@bitwarden/generator-core": ["../../../tools/generator/core/src"],
       "@bitwarden/generator-history": ["../../../tools/generator/extensions/history/src"],
       "@bitwarden/key-management": ["../../../key-management/src"],
-      "@bitwarden/platform": ["../../../platform/src"]
+      "@bitwarden/platform": ["../../../platform/src"],
+      "@bitwarden/ui-common": ["../../../ui/common/src"]
     }
   },
   "include": ["src"],
diff --git a/libs/tools/send/send-ui/tsconfig.json b/libs/tools/send/send-ui/tsconfig.json
index 671154e0a0..e6d6680ad4 100644
--- a/libs/tools/send/send-ui/tsconfig.json
+++ b/libs/tools/send/send-ui/tsconfig.json
@@ -13,7 +13,8 @@
       "@bitwarden/generator-legacy": ["../../../tools/generator/extensions/legacy/src"],
       "@bitwarden/generator-navigation": ["../../../tools/generator/extensions/navigation/src"],
       "@bitwarden/key-management": ["../../../key-management/src"],
-      "@bitwarden/platform": ["../../../platform/src"]
+      "@bitwarden/platform": ["../../../platform/src"],
+      "@bitwarden/ui-common": ["../../../ui/common/src"]
     }
   },
   "include": ["src"],
diff --git a/libs/ui/README.md b/libs/ui/README.md
new file mode 100644
index 0000000000..e245aac71c
--- /dev/null
+++ b/libs/ui/README.md
@@ -0,0 +1,5 @@
+# UI Foundation
+
+Core UI libraries maintained by the UI Foundation team.
+
+- _ui-common_: Low-level utilities for Angular applications.
diff --git a/libs/ui/common/package.json b/libs/ui/common/package.json
new file mode 100644
index 0000000000..f1b03a3ebd
--- /dev/null
+++ b/libs/ui/common/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "@bitwarden/ui-common",
+  "version": "0.0.0",
+  "description": "Low-level utilities for Angular applications",
+  "keywords": [
+    "bitwarden"
+  ],
+  "author": "Bitwarden Inc.",
+  "homepage": "https://bitwarden.com",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/bitwarden/clients"
+  },
+  "license": "GPL-3.0"
+}
diff --git a/libs/ui/common/src/di/index.ts b/libs/ui/common/src/di/index.ts
new file mode 100644
index 0000000000..7b0705f136
--- /dev/null
+++ b/libs/ui/common/src/di/index.ts
@@ -0,0 +1,2 @@
+export * from "./safe-injection-token";
+export * from "./safe-provider";
diff --git a/libs/ui/common/src/di/safe-injection-token.ts b/libs/ui/common/src/di/safe-injection-token.ts
new file mode 100644
index 0000000000..aad081e1c7
--- /dev/null
+++ b/libs/ui/common/src/di/safe-injection-token.ts
@@ -0,0 +1,14 @@
+// FIXME: Update this file to be type safe and remove this and next line
+// @ts-strict-ignore
+import { InjectionToken } from "@angular/core";
+
+declare const tag: unique symbol;
+/**
+ * A (more) typesafe version of InjectionToken which will more strictly enforce the generic type parameter.
+ * @remarks The default angular implementation does not use the generic type to define the structure of the object,
+ * so the structural type system will not complain about a mismatch in the type parameter.
+ * This is solved by assigning T to an arbitrary private property.
+ */
+export class SafeInjectionToken<T> extends InjectionToken<T> {
+  private readonly [tag]: T;
+}
diff --git a/libs/ui/common/src/di/safe-provider.ts b/libs/ui/common/src/di/safe-provider.ts
new file mode 100644
index 0000000000..002aa69a50
--- /dev/null
+++ b/libs/ui/common/src/di/safe-provider.ts
@@ -0,0 +1,138 @@
+import { Provider } from "@angular/core";
+import { Constructor, Opaque } from "type-fest";
+
+import { SafeInjectionToken } from "./safe-injection-token";
+
+/**
+ * The return type of the {@link safeProvider} helper function.
+ * Used to distinguish a type safe provider definition from a non-type safe provider definition.
+ */
+export type SafeProvider = Opaque<Provider>;
+
+// TODO: type-fest also provides a type like this when we upgrade >= 3.7.0
+type AbstractConstructor<T> = abstract new (...args: any) => T;
+
+type MapParametersToDeps<T> = {
+  [K in keyof T]: AbstractConstructor<T[K]> | SafeInjectionToken<T[K]>;
+};
+
+type SafeInjectionTokenType<T> = T extends SafeInjectionToken<infer J> ? J : never;
+
+/**
+ * Gets the instance type from a constructor, abstract constructor, or SafeInjectionToken
+ */
+type ProviderInstanceType<T> =
+  T extends SafeInjectionToken<any>
+    ? InstanceType<SafeInjectionTokenType<T>>
+    : T extends Constructor<any> | AbstractConstructor<any>
+      ? InstanceType<T>
+      : never;
+
+/**
+ * Represents a dependency provided with the useClass option.
+ */
+type SafeClassProvider<
+  A extends AbstractConstructor<any> | SafeInjectionToken<any>,
+  I extends Constructor<ProviderInstanceType<A>>,
+  D extends MapParametersToDeps<ConstructorParameters<I>>,
+> = {
+  provide: A;
+  useClass: I;
+  deps: D;
+};
+
+/**
+ * Represents a dependency provided with the useValue option.
+ */
+type SafeValueProvider<A extends SafeInjectionToken<any>, V extends SafeInjectionTokenType<A>> = {
+  provide: A;
+  useValue: V;
+};
+
+/**
+ * Represents a dependency provided with the useFactory option.
+ */
+type SafeFactoryProvider<
+  A extends AbstractConstructor<any> | SafeInjectionToken<any>,
+  I extends (...args: any) => ProviderInstanceType<A>,
+  D extends MapParametersToDeps<Parameters<I>>,
+> = {
+  provide: A;
+  useFactory: I;
+  deps: D;
+  multi?: boolean;
+};
+
+/**
+ * Represents a dependency provided with the useExisting option.
+ */
+type SafeExistingProvider<
+  A extends Constructor<any> | AbstractConstructor<any> | SafeInjectionToken<any>,
+  I extends Constructor<ProviderInstanceType<A>> | AbstractConstructor<ProviderInstanceType<A>>,
+> = {
+  provide: A;
+  useExisting: I;
+};
+
+/**
+ * Represents a dependency where there is no abstract token, the token is the implementation
+ */
+type SafeConcreteProvider<
+  I extends Constructor<any>,
+  D extends MapParametersToDeps<ConstructorParameters<I>>,
+> = {
+  provide: I;
+  deps: D;
+};
+
+/**
+ * If useAngularDecorators: true is specified, do not require a deps array.
+ * This is a manual override for where @Injectable decorators are used
+ */
+type UseAngularDecorators<T extends { deps: any }> = Omit<T, "deps"> & {
+  useAngularDecorators: true;
+};
+
+/**
+ * Represents a type with a deps array that may optionally be overridden with useAngularDecorators
+ */
+type AllowAngularDecorators<T extends { deps: any }> = T | UseAngularDecorators<T>;
+
+/**
+ * A factory function that creates a provider for the ngModule providers array.
+ * This (almost) guarantees type safety for your provider definition. It does nothing at runtime.
+ * Warning: the useAngularDecorators option provides an override where your class uses the Injectable decorator,
+ * however this cannot be enforced by the type system and will not cause an error if the decorator is not used.
+ * @example safeProvider({ provide: MyService, useClass: DefaultMyService, deps: [AnotherService] })
+ * @param provider Your provider object in the usual shape (e.g. using useClass, useValue, useFactory, etc.)
+ * @returns The exact same object without modification (pass-through).
+ */
+export const safeProvider = <
+  // types for useClass
+  AClass extends AbstractConstructor<any> | SafeInjectionToken<any>,
+  IClass extends Constructor<ProviderInstanceType<AClass>>,
+  DClass extends MapParametersToDeps<ConstructorParameters<IClass>>,
+  // types for useValue
+  AValue extends SafeInjectionToken<any>,
+  VValue extends SafeInjectionTokenType<AValue>,
+  // types for useFactory
+  AFactory extends AbstractConstructor<any> | SafeInjectionToken<any>,
+  IFactory extends (...args: any) => ProviderInstanceType<AFactory>,
+  DFactory extends MapParametersToDeps<Parameters<IFactory>>,
+  // types for useExisting
+  AExisting extends Constructor<any> | AbstractConstructor<any> | SafeInjectionToken<any>,
+  IExisting extends
+    | Constructor<ProviderInstanceType<AExisting>>
+    | AbstractConstructor<ProviderInstanceType<AExisting>>,
+  // types for no token
+  IConcrete extends Constructor<any>,
+  DConcrete extends MapParametersToDeps<ConstructorParameters<IConcrete>>,
+>(
+  provider:
+    | AllowAngularDecorators<SafeClassProvider<AClass, IClass, DClass>>
+    | SafeValueProvider<AValue, VValue>
+    | AllowAngularDecorators<SafeFactoryProvider<AFactory, IFactory, DFactory>>
+    | SafeExistingProvider<AExisting, IExisting>
+    | AllowAngularDecorators<SafeConcreteProvider<IConcrete, DConcrete>>
+    | Constructor<unknown>,
+): SafeProvider => provider as SafeProvider;
diff --git a/libs/angular/src/platform/utils/safe-provider.type.spec.ts b/libs/ui/common/src/di/safe-provider.type.spec.ts
similarity index 96%
rename from libs/angular/src/platform/utils/safe-provider.type.spec.ts
rename to libs/ui/common/src/di/safe-provider.type.spec.ts
index 6fe6d0d0b6..afc7071af1 100644
--- a/libs/angular/src/platform/utils/safe-provider.type.spec.ts
+++ b/libs/ui/common/src/di/safe-provider.type.spec.ts
@@ -11,7 +11,7 @@ class FooFactory {
 }
 
 abstract class FooService {
-  createFoo: (str: string) => string;
+  abstract createFoo(str: string): string;
 }
 
 class DefaultFooService implements FooService {
@@ -29,7 +29,7 @@ class BarFactory {
 }
 
 abstract class BarService {
-  createBar: (num: number) => number;
+  abstract createBar(num: number): number;
 }
 
 class DefaultBarService implements BarService {
diff --git a/libs/components/src/shared/i18n.pipe.ts b/libs/ui/common/src/i18n.pipe.ts
similarity index 77%
rename from libs/components/src/shared/i18n.pipe.ts
rename to libs/ui/common/src/i18n.pipe.ts
index 91bf0b3198..fdcfec0cea 100644
--- a/libs/components/src/shared/i18n.pipe.ts
+++ b/libs/ui/common/src/i18n.pipe.ts
@@ -3,7 +3,13 @@ import { Pipe, PipeTransform } from "@angular/core";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
 /**
- * Temporarily duplicate this pipe
+ * Localizes the specified string.
+ *
+ * @example
+ * {{ 'key' | i18n }}
+ *
+ * @example
+ * {{ 'key' | i18n: 'param1' }}
  */
 @Pipe({
   name: "i18n",
diff --git a/libs/ui/common/src/index.ts b/libs/ui/common/src/index.ts
new file mode 100644
index 0000000000..97e5510811
--- /dev/null
+++ b/libs/ui/common/src/index.ts
@@ -0,0 +1,2 @@
+export * from "./di";
+export * from "./i18n.pipe";
diff --git a/libs/ui/common/tsconfig.json b/libs/ui/common/tsconfig.json
new file mode 100644
index 0000000000..31062d41a1
--- /dev/null
+++ b/libs/ui/common/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../../shared/tsconfig",
+  "compilerOptions": {
+    "paths": {
+      "@bitwarden/common/*": ["../../common/src/*"]
+    }
+  },
+  "include": ["src"],
+  "exclude": ["node_modules", "dist"]
+}
diff --git a/libs/vault/tsconfig.json b/libs/vault/tsconfig.json
index 8318212e81..e1515183f2 100644
--- a/libs/vault/tsconfig.json
+++ b/libs/vault/tsconfig.json
@@ -15,6 +15,7 @@
       "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"],
       "@bitwarden/key-management": ["../key-management/src"],
       "@bitwarden/platform": ["../platform/src"],
+      "@bitwarden/ui-common": ["../ui/common/src"],
       "@bitwarden/vault": ["../vault/src"]
     }
   },
diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
index a69452389f..980d7832ac 100644
--- a/tsconfig.eslint.json
+++ b/tsconfig.eslint.json
@@ -20,6 +20,7 @@
       "@bitwarden/angular/*": ["./libs/angular/src/*"],
       "@bitwarden/auth": ["./libs/auth/src"],
       "@bitwarden/billing": ["./libs/billing/src"],
+      "@bitwarden/bit-common/*": ["./bitwarden_license/bit-common/src/*"],
       "@bitwarden/common/*": ["./libs/common/src/*"],
       "@bitwarden/components": ["./libs/components/src"],
       "@bitwarden/generator-components": ["./libs/tools/generator/components/src"],
@@ -27,18 +28,18 @@
       "@bitwarden/generator-history": ["./libs/tools/generator/extensions/history/src"],
       "@bitwarden/generator-legacy": ["./libs/tools/generator/extensions/legacy/src"],
       "@bitwarden/generator-navigation": ["./libs/tools/generator/extensions/navigation/src"],
-      "@bitwarden/vault-export-core": [".libs/tools/export/vault-export/vault-export-core/src"],
-      "@bitwarden/vault-export-ui": [".libs/tools/export/vault-export/vault-export-ui/src"],
       "@bitwarden/importer/core": ["./libs/importer/src"],
       "@bitwarden/importer/ui": ["./libs/importer/src/components"],
-      "@bitwarden/send-ui": [".libs/tools/send/send-ui/src"],
-      "@bitwarden/tools-card": [".libs/tools/card/src"],
-      "@bitwarden/platform": ["./libs/platform/src"],
-      "@bitwarden/node/*": ["./libs/node/src/*"],
-      "@bitwarden/vault": ["./libs/vault/src"],
       "@bitwarden/key-management": ["./libs/key-management/src"],
       "@bitwarden/key-management/angular": ["./libs/key-management/src/angular"],
-      "@bitwarden/bit-common/*": ["./bitwarden_license/bit-common/src/*"]
+      "@bitwarden/node/*": ["./libs/node/src/*"],
+      "@bitwarden/platform": ["./libs/platform/src"],
+      "@bitwarden/send-ui": [".libs/tools/send/send-ui/src"],
+      "@bitwarden/tools-card": [".libs/tools/card/src"],
+      "@bitwarden/ui-common": ["./libs/ui/common/src"],
+      "@bitwarden/vault-export-core": [".libs/tools/export/vault-export/vault-export-core/src"],
+      "@bitwarden/vault-export-ui": [".libs/tools/export/vault-export/vault-export-ui/src"],
+      "@bitwarden/vault": ["./libs/vault/src"]
     },
     "plugins": [
       {
diff --git a/tsconfig.json b/tsconfig.json
index 91b4ee7dd6..efa2ff70e1 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -18,9 +18,10 @@
     "paths": {
       "@bitwarden/admin-console/common": ["./libs/admin-console/src/common"],
       "@bitwarden/angular/*": ["./libs/angular/src/*"],
-      "@bitwarden/auth/common": ["./libs/auth/src/common"],
       "@bitwarden/auth/angular": ["./libs/auth/src/angular"],
+      "@bitwarden/auth/common": ["./libs/auth/src/common"],
       "@bitwarden/billing": ["./libs/billing/src"],
+      "@bitwarden/bit-common/*": ["./bitwarden_license/bit-common/src/*"],
       "@bitwarden/common/*": ["./libs/common/src/*"],
       "@bitwarden/components": ["./libs/components/src"],
       "@bitwarden/generator-components": ["./libs/tools/generator/components/src"],
@@ -28,19 +29,19 @@
       "@bitwarden/generator-history": ["./libs/tools/generator/extensions/history/src"],
       "@bitwarden/generator-legacy": ["./libs/tools/generator/extensions/legacy/src"],
       "@bitwarden/generator-navigation": ["./libs/tools/generator/extensions/navigation/src"],
-      "@bitwarden/vault-export-core": ["./libs/tools/export/vault-export/vault-export-core/src"],
-      "@bitwarden/vault-export-ui": ["./libs/tools/export/vault-export/vault-export-ui/src"],
       "@bitwarden/importer/core": ["./libs/importer/src"],
       "@bitwarden/importer/ui": ["./libs/importer/src/components"],
       "@bitwarden/key-management": ["./libs/key-management/src"],
       "@bitwarden/key-management/angular": ["./libs/key-management/src/angular"],
+      "@bitwarden/node/*": ["./libs/node/src/*"],
       "@bitwarden/platform": ["./libs/platform/src"],
       "@bitwarden/send-ui": ["./libs/tools/send/send-ui/src"],
       "@bitwarden/tools-card": ["./libs/tools/card/src"],
-      "@bitwarden/node/*": ["./libs/node/src/*"],
-      "@bitwarden/web-vault/*": ["./apps/web/src/*"],
+      "@bitwarden/ui-common": ["./libs/ui/common/src"],
+      "@bitwarden/vault-export-core": ["./libs/tools/export/vault-export/vault-export-core/src"],
+      "@bitwarden/vault-export-ui": ["./libs/tools/export/vault-export/vault-export-ui/src"],
       "@bitwarden/vault": ["./libs/vault/src"],
-      "@bitwarden/bit-common/*": ["./bitwarden_license/bit-common/src/*"]
+      "@bitwarden/web-vault/*": ["./apps/web/src/*"]
     },
     "plugins": [
       {

From 23227f50646bcf6e9e8e3579d391895c0a32e485 Mon Sep 17 00:00:00 2001
From: Danielle Flinn <43477473+danielleflinn@users.noreply.github.com>
Date: Fri, 17 Jan 2025 07:50:20 -0800
Subject: [PATCH 145/150] [CL-256] Update Figma links in Storybook docs
 (#12901)

* Update Figma links

updated existing Figma links to point to the new file and added Figma links to components missing them

* Added last missing Figma links
---
 .../src/platform/popup/layout/popup-layout.stories.ts       | 4 ++++
 libs/components/src/avatar/avatar.stories.ts                | 2 +-
 libs/components/src/badge-list/badge-list.stories.ts        | 2 +-
 libs/components/src/badge/badge.stories.ts                  | 2 +-
 libs/components/src/banner/banner.stories.ts                | 2 +-
 libs/components/src/breadcrumbs/breadcrumbs.stories.ts      | 6 ++++++
 libs/components/src/button/button.stories.ts                | 2 +-
 libs/components/src/callout/callout.stories.ts              | 2 +-
 libs/components/src/card/card.stories.ts                    | 6 ++++++
 libs/components/src/checkbox/checkbox.stories.ts            | 2 +-
 libs/components/src/chip-select/chip-select.stories.ts      | 6 ++++++
 .../components/src/color-password/color-password.stories.ts | 2 +-
 libs/components/src/dialog/dialog.service.stories.ts        | 2 +-
 libs/components/src/dialog/dialog/dialog.stories.ts         | 2 +-
 .../simple-configurable-dialog.service.stories.ts           | 2 +-
 .../dialog/simple-dialog/simple-dialog.service.stories.ts   | 2 +-
 .../src/dialog/simple-dialog/simple-dialog.stories.ts       | 2 +-
 libs/components/src/disclosure/disclosure.stories.ts        | 6 ++++++
 libs/components/src/form-field/bit-validators.stories.ts    | 2 +-
 libs/components/src/form-field/error-summary.stories.ts     | 2 +-
 libs/components/src/form-field/form-field.stories.ts        | 2 +-
 libs/components/src/form-field/multi-select.stories.ts      | 2 +-
 .../src/form-field/password-input-toggle.stories.ts         | 2 +-
 libs/components/src/form/form.stories.ts                    | 2 +-
 libs/components/src/icon-button/icon-button.stories.ts      | 2 +-
 libs/components/src/icon/icon.stories.ts                    | 6 ++++++
 libs/components/src/item/item.stories.ts                    | 6 ++++++
 libs/components/src/layout/layout.stories.ts                | 4 ++++
 libs/components/src/link/link.stories.ts                    | 2 +-
 libs/components/src/menu/menu.stories.ts                    | 2 +-
 libs/components/src/navigation/nav-group.stories.ts         | 2 +-
 libs/components/src/navigation/nav-item.stories.ts          | 2 +-
 libs/components/src/no-items/no-items.stories.ts            | 6 ++++++
 libs/components/src/popover/popover.stories.ts              | 2 +-
 libs/components/src/progress/progress.stories.ts            | 2 +-
 libs/components/src/radio-button/radio-button.stories.ts    | 2 +-
 libs/components/src/section/section.stories.ts              | 6 ++++++
 libs/components/src/select/select.stories.ts                | 2 +-
 libs/components/src/table/table.stories.ts                  | 2 +-
 libs/components/src/tabs/tabs.stories.ts                    | 2 +-
 libs/components/src/toast/toast.stories.ts                  | 2 +-
 libs/components/src/toggle-group/toggle-group.stories.ts    | 2 +-
 42 files changed, 88 insertions(+), 32 deletions(-)

diff --git a/apps/browser/src/platform/popup/layout/popup-layout.stories.ts b/apps/browser/src/platform/popup/layout/popup-layout.stories.ts
index 6a2d8162c7..43693ca223 100644
--- a/apps/browser/src/platform/popup/layout/popup-layout.stories.ts
+++ b/apps/browser/src/platform/popup/layout/popup-layout.stories.ts
@@ -306,6 +306,10 @@ export default {
       // Disable tests while we troubleshoot their flaky-ness
       disableSnapshot: true,
     },
+    design: {
+      type: "figma",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-38889&t=k6OTDDPZOTtypRqo-11",
+    },
   },
   decorators: [
     moduleMetadata({
diff --git a/libs/components/src/avatar/avatar.stories.ts b/libs/components/src/avatar/avatar.stories.ts
index d3a00fbe34..19a6f86d89 100644
--- a/libs/components/src/avatar/avatar.stories.ts
+++ b/libs/components/src/avatar/avatar.stories.ts
@@ -13,7 +13,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=1881%3A16994",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-26525&t=b5tDKylm5sWm2yKo-4",
     },
   },
 } as Meta;
diff --git a/libs/components/src/badge-list/badge-list.stories.ts b/libs/components/src/badge-list/badge-list.stories.ts
index ede005f6fd..f69ecde837 100644
--- a/libs/components/src/badge-list/badge-list.stories.ts
+++ b/libs/components/src/badge-list/badge-list.stories.ts
@@ -33,7 +33,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/f32LSg3jaegICkMu7rPARm/Tailwind-Component-Library-Update?node-id=1881%3A16956",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-26440&t=b5tDKylm5sWm2yKo-4",
     },
   },
 } as Meta;
diff --git a/libs/components/src/badge/badge.stories.ts b/libs/components/src/badge/badge.stories.ts
index 5d697f8ad8..bff9eec616 100644
--- a/libs/components/src/badge/badge.stories.ts
+++ b/libs/components/src/badge/badge.stories.ts
@@ -18,7 +18,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=1881%3A16956",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-26440&t=b5tDKylm5sWm2yKo-4",
     },
   },
 } as Meta<BadgeComponent>;
diff --git a/libs/components/src/banner/banner.stories.ts b/libs/components/src/banner/banner.stories.ts
index c75d8b7034..105d30bc04 100644
--- a/libs/components/src/banner/banner.stories.ts
+++ b/libs/components/src/banner/banner.stories.ts
@@ -30,7 +30,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=2070%3A17207",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-26720&t=b5tDKylm5sWm2yKo-4",
     },
   },
   args: {
diff --git a/libs/components/src/breadcrumbs/breadcrumbs.stories.ts b/libs/components/src/breadcrumbs/breadcrumbs.stories.ts
index 9c8ccbccd3..eb75a70ad7 100644
--- a/libs/components/src/breadcrumbs/breadcrumbs.stories.ts
+++ b/libs/components/src/breadcrumbs/breadcrumbs.stories.ts
@@ -35,6 +35,12 @@ export default {
       ],
     }),
   ],
+  parameters: {
+    design: {
+      type: "figma",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-26962&t=b5tDKylm5sWm2yKo-4",
+    },
+  },
   args: {
     items: [],
     show: 3,
diff --git a/libs/components/src/button/button.stories.ts b/libs/components/src/button/button.stories.ts
index 3654442801..469c2d1b51 100644
--- a/libs/components/src/button/button.stories.ts
+++ b/libs/components/src/button/button.stories.ts
@@ -13,7 +13,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=5115%3A26950",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-28224&t=b5tDKylm5sWm2yKo-4",
     },
   },
 } as Meta<ButtonComponent>;
diff --git a/libs/components/src/callout/callout.stories.ts b/libs/components/src/callout/callout.stories.ts
index cb51e96e8d..3101d4316f 100644
--- a/libs/components/src/callout/callout.stories.ts
+++ b/libs/components/src/callout/callout.stories.ts
@@ -30,7 +30,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=1881%3A17484",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-28300&t=b5tDKylm5sWm2yKo-4",
     },
   },
 } as Meta;
diff --git a/libs/components/src/card/card.stories.ts b/libs/components/src/card/card.stories.ts
index b33f5f4a19..3482eedfd5 100644
--- a/libs/components/src/card/card.stories.ts
+++ b/libs/components/src/card/card.stories.ts
@@ -34,6 +34,12 @@ export default {
       (story) => `<div class="tw-bg-background-alt tw-p-10 tw-text-main">${story}</div>`,
     ),
   ],
+  parameters: {
+    design: {
+      type: "figma",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-28355&t=b5tDKylm5sWm2yKo-4",
+    },
+  },
 } as Meta;
 
 type Story = StoryObj<CardComponent>;
diff --git a/libs/components/src/checkbox/checkbox.stories.ts b/libs/components/src/checkbox/checkbox.stories.ts
index f3e5a5cb3f..908085bb6d 100644
--- a/libs/components/src/checkbox/checkbox.stories.ts
+++ b/libs/components/src/checkbox/checkbox.stories.ts
@@ -83,7 +83,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=3930%3A16850&t=xXPx6GJYsJfuMQPE-4",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-35837&t=b5tDKylm5sWm2yKo-4",
     },
   },
 } as Meta;
diff --git a/libs/components/src/chip-select/chip-select.stories.ts b/libs/components/src/chip-select/chip-select.stories.ts
index 598fa5b80b..e9b78235cc 100644
--- a/libs/components/src/chip-select/chip-select.stories.ts
+++ b/libs/components/src/chip-select/chip-select.stories.ts
@@ -30,6 +30,12 @@ export default {
       ],
     }),
   ],
+  parameters: {
+    design: {
+      type: "figma",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-29548&t=b5tDKylm5sWm2yKo-4",
+    },
+  },
 } as Meta;
 
 type Story = StoryObj<ChipSelectComponent & { value: any }>;
diff --git a/libs/components/src/color-password/color-password.stories.ts b/libs/components/src/color-password/color-password.stories.ts
index 07418cad72..bb835d97d4 100644
--- a/libs/components/src/color-password/color-password.stories.ts
+++ b/libs/components/src/color-password/color-password.stories.ts
@@ -14,7 +14,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/6fvTDa3zfvgWdizLQ7nSTP/Numbered-Password",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=21540-46261&t=b5tDKylm5sWm2yKo-4",
     },
   },
 } as Meta;
diff --git a/libs/components/src/dialog/dialog.service.stories.ts b/libs/components/src/dialog/dialog.service.stories.ts
index 2b42faeccc..e7c5a17c30 100644
--- a/libs/components/src/dialog/dialog.service.stories.ts
+++ b/libs/components/src/dialog/dialog.service.stories.ts
@@ -93,7 +93,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-30495&t=b5tDKylm5sWm2yKo-4",
     },
   },
 } as Meta;
diff --git a/libs/components/src/dialog/dialog/dialog.stories.ts b/libs/components/src/dialog/dialog/dialog.stories.ts
index 7cb6f40aa5..03a88458f5 100644
--- a/libs/components/src/dialog/dialog/dialog.stories.ts
+++ b/libs/components/src/dialog/dialog/dialog.stories.ts
@@ -68,7 +68,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-30495&t=b5tDKylm5sWm2yKo-4",
     },
   },
 } as Meta;
diff --git a/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.service.stories.ts b/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.service.stories.ts
index 9953fdd24e..b4bf199358 100644
--- a/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.service.stories.ts
+++ b/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.service.stories.ts
@@ -176,7 +176,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=21514-19247&t=b5tDKylm5sWm2yKo-4",
     },
   },
 } as Meta;
diff --git a/libs/components/src/dialog/simple-dialog/simple-dialog.service.stories.ts b/libs/components/src/dialog/simple-dialog/simple-dialog.service.stories.ts
index 3bc4999878..680ebe9ed3 100644
--- a/libs/components/src/dialog/simple-dialog/simple-dialog.service.stories.ts
+++ b/libs/components/src/dialog/simple-dialog/simple-dialog.service.stories.ts
@@ -89,7 +89,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=21514-19247&t=b5tDKylm5sWm2yKo-4",
     },
   },
 } as Meta;
diff --git a/libs/components/src/dialog/simple-dialog/simple-dialog.stories.ts b/libs/components/src/dialog/simple-dialog/simple-dialog.stories.ts
index d86b56101b..50016ef358 100644
--- a/libs/components/src/dialog/simple-dialog/simple-dialog.stories.ts
+++ b/libs/components/src/dialog/simple-dialog/simple-dialog.stories.ts
@@ -17,7 +17,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=21514-19247&t=b5tDKylm5sWm2yKo-4",
     },
   },
 } as Meta;
diff --git a/libs/components/src/disclosure/disclosure.stories.ts b/libs/components/src/disclosure/disclosure.stories.ts
index 974589a667..bb3680c1f3 100644
--- a/libs/components/src/disclosure/disclosure.stories.ts
+++ b/libs/components/src/disclosure/disclosure.stories.ts
@@ -13,6 +13,12 @@ export default {
       imports: [DisclosureTriggerForDirective, DisclosureComponent, IconButtonModule],
     }),
   ],
+  parameters: {
+    design: {
+      type: "figma",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=21662-47329&t=k6OTDDPZOTtypRqo-11",
+    },
+  },
 } as Meta<DisclosureComponent>;
 
 type Story = StoryObj<DisclosureComponent>;
diff --git a/libs/components/src/form-field/bit-validators.stories.ts b/libs/components/src/form-field/bit-validators.stories.ts
index 642ff30bb5..748f92f252 100644
--- a/libs/components/src/form-field/bit-validators.stories.ts
+++ b/libs/components/src/form-field/bit-validators.stories.ts
@@ -35,7 +35,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/f32LSg3jaegICkMu7rPARm/Tailwind-Component-Library-Update?node-id=1881%3A17689",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=13213-55392&t=b5tDKylm5sWm2yKo-4",
     },
   },
 } as Meta;
diff --git a/libs/components/src/form-field/error-summary.stories.ts b/libs/components/src/form-field/error-summary.stories.ts
index 4e1031abaf..4b1a30c45b 100644
--- a/libs/components/src/form-field/error-summary.stories.ts
+++ b/libs/components/src/form-field/error-summary.stories.ts
@@ -34,7 +34,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=1881%3A17689",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=13213-55392&t=b5tDKylm5sWm2yKo-4",
     },
   },
 } as Meta;
diff --git a/libs/components/src/form-field/form-field.stories.ts b/libs/components/src/form-field/form-field.stories.ts
index 6d8323e088..738ac96bf7 100644
--- a/libs/components/src/form-field/form-field.stories.ts
+++ b/libs/components/src/form-field/form-field.stories.ts
@@ -108,7 +108,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=1881%3A17689",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=13213-55392&t=b5tDKylm5sWm2yKo-4",
     },
   },
 } as Meta;
diff --git a/libs/components/src/form-field/multi-select.stories.ts b/libs/components/src/form-field/multi-select.stories.ts
index da4776ab02..8d84aa735b 100644
--- a/libs/components/src/form-field/multi-select.stories.ts
+++ b/libs/components/src/form-field/multi-select.stories.ts
@@ -56,7 +56,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=5600%3A24278",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=13213-55392&t=b5tDKylm5sWm2yKo-4",
     },
   },
 } as Meta;
diff --git a/libs/components/src/form-field/password-input-toggle.stories.ts b/libs/components/src/form-field/password-input-toggle.stories.ts
index 094f939e0e..d46ec92ab3 100644
--- a/libs/components/src/form-field/password-input-toggle.stories.ts
+++ b/libs/components/src/form-field/password-input-toggle.stories.ts
@@ -27,7 +27,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/f32LSg3jaegICkMu7rPARm/Tailwind-Component-Library-Update?node-id=1881%3A17689",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=13213-55392&t=b5tDKylm5sWm2yKo-4",
     },
     docs: {
       description: {
diff --git a/libs/components/src/form/form.stories.ts b/libs/components/src/form/form.stories.ts
index 23b2cc8cea..6aef140fe5 100644
--- a/libs/components/src/form/form.stories.ts
+++ b/libs/components/src/form/form.stories.ts
@@ -64,7 +64,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=1881%3A17689",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=13213-55392&t=b5tDKylm5sWm2yKo-4",
     },
   },
 } as Meta;
diff --git a/libs/components/src/icon-button/icon-button.stories.ts b/libs/components/src/icon-button/icon-button.stories.ts
index 6274bb2b8d..08c95c5d64 100644
--- a/libs/components/src/icon-button/icon-button.stories.ts
+++ b/libs/components/src/icon-button/icon-button.stories.ts
@@ -13,7 +13,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=4369%3A16686",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-37011&t=b5tDKylm5sWm2yKo-4",
     },
   },
 } as Meta<BitIconButtonComponent>;
diff --git a/libs/components/src/icon/icon.stories.ts b/libs/components/src/icon/icon.stories.ts
index 54cdd7928c..53454567b7 100644
--- a/libs/components/src/icon/icon.stories.ts
+++ b/libs/components/src/icon/icon.stories.ts
@@ -6,6 +6,12 @@ import * as GenericIcons from "./icons";
 export default {
   title: "Component Library/Icon",
   component: BitIconComponent,
+  parameters: {
+    design: {
+      type: "figma",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=21662-50335&t=k6OTDDPZOTtypRqo-11",
+    },
+  },
 } as Meta;
 
 type Story = StoryObj<BitIconComponent>;
diff --git a/libs/components/src/item/item.stories.ts b/libs/components/src/item/item.stories.ts
index 5adf9d3c49..3a64a334d0 100644
--- a/libs/components/src/item/item.stories.ts
+++ b/libs/components/src/item/item.stories.ts
@@ -53,6 +53,12 @@ export default {
     }),
     componentWrapperDecorator((story) => `<div class="tw-bg-background-alt tw-p-2">${story}</div>`),
   ],
+  parameters: {
+    design: {
+      type: "figma",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-37011&t=b5tDKylm5sWm2yKo-11",
+    },
+  },
 } as Meta;
 
 type Story = StoryObj<ItemGroupComponent>;
diff --git a/libs/components/src/layout/layout.stories.ts b/libs/components/src/layout/layout.stories.ts
index 7fdad65554..e09055df59 100644
--- a/libs/components/src/layout/layout.stories.ts
+++ b/libs/components/src/layout/layout.stories.ts
@@ -31,6 +31,10 @@ export default {
   ],
   parameters: {
     chromatic: { viewports: [640, 1280] },
+    design: {
+      type: "figma",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=21662-51009&t=k6OTDDPZOTtypRqo-11",
+    },
   },
 } as Meta;
 
diff --git a/libs/components/src/link/link.stories.ts b/libs/components/src/link/link.stories.ts
index cc3d26dc9d..d07d33ae58 100644
--- a/libs/components/src/link/link.stories.ts
+++ b/libs/components/src/link/link.stories.ts
@@ -19,7 +19,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=1881%3A17419",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-39582&t=b5tDKylm5sWm2yKo-4",
     },
   },
 } as Meta;
diff --git a/libs/components/src/menu/menu.stories.ts b/libs/components/src/menu/menu.stories.ts
index 65fafd2d04..f1f4d8df00 100644
--- a/libs/components/src/menu/menu.stories.ts
+++ b/libs/components/src/menu/menu.stories.ts
@@ -17,7 +17,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=1881%3A17952",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-40144&t=b5tDKylm5sWm2yKo-11",
     },
   },
 } as Meta;
diff --git a/libs/components/src/navigation/nav-group.stories.ts b/libs/components/src/navigation/nav-group.stories.ts
index f412dbc20b..6fbb89d4d9 100644
--- a/libs/components/src/navigation/nav-group.stories.ts
+++ b/libs/components/src/navigation/nav-group.stories.ts
@@ -62,7 +62,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=4687%3A86642",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-40145&t=b5tDKylm5sWm2yKo-4",
     },
     chromatic: { viewports: [640, 1280] },
   },
diff --git a/libs/components/src/navigation/nav-item.stories.ts b/libs/components/src/navigation/nav-item.stories.ts
index 376f121eb0..0f6f406b2e 100644
--- a/libs/components/src/navigation/nav-item.stories.ts
+++ b/libs/components/src/navigation/nav-item.stories.ts
@@ -39,7 +39,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=4687%3A86642",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-40145&t=b5tDKylm5sWm2yKo-4",
     },
     chromatic: { viewports: [640, 1280] },
   },
diff --git a/libs/components/src/no-items/no-items.stories.ts b/libs/components/src/no-items/no-items.stories.ts
index d8e5b59bdb..48d52476b1 100644
--- a/libs/components/src/no-items/no-items.stories.ts
+++ b/libs/components/src/no-items/no-items.stories.ts
@@ -13,6 +13,12 @@ export default {
       imports: [ButtonModule, NoItemsModule],
     }),
   ],
+  parameters: {
+    design: {
+      type: "figma",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=21665-25102&t=k6OTDDPZOTtypRqo-11",
+    },
+  },
 } as Meta;
 
 type Story = StoryObj<NoItemsComponent>;
diff --git a/libs/components/src/popover/popover.stories.ts b/libs/components/src/popover/popover.stories.ts
index 10b7b248b7..fca4d65960 100644
--- a/libs/components/src/popover/popover.stories.ts
+++ b/libs/components/src/popover/popover.stories.ts
@@ -30,7 +30,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=1717-15868",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-40852&t=b5tDKylm5sWm2yKo-4",
     },
   },
   argTypes: {
diff --git a/libs/components/src/progress/progress.stories.ts b/libs/components/src/progress/progress.stories.ts
index 49a5398d2d..1484dab0a2 100644
--- a/libs/components/src/progress/progress.stories.ts
+++ b/libs/components/src/progress/progress.stories.ts
@@ -8,7 +8,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=1881%3A18185&t=AM0acaIJ00BUhZKz-4",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-40933&t=b5tDKylm5sWm2yKo-4",
     },
   },
   args: {
diff --git a/libs/components/src/radio-button/radio-button.stories.ts b/libs/components/src/radio-button/radio-button.stories.ts
index dcef13a19b..f5d7f6732f 100644
--- a/libs/components/src/radio-button/radio-button.stories.ts
+++ b/libs/components/src/radio-button/radio-button.stories.ts
@@ -31,7 +31,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=3930%3A16850&t=xXPx6GJYsJfuMQPE-4",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-35836&t=b5tDKylm5sWm2yKo-4",
     },
   },
 } as Meta<RadioGroupComponent>;
diff --git a/libs/components/src/section/section.stories.ts b/libs/components/src/section/section.stories.ts
index 0d36d6e5a1..53e6bc078c 100644
--- a/libs/components/src/section/section.stories.ts
+++ b/libs/components/src/section/section.stories.ts
@@ -22,6 +22,12 @@ export default {
     }),
     componentWrapperDecorator((story) => `<div class="tw-text-main">${story}</div>`),
   ],
+  parameters: {
+    design: {
+      type: "figma",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=21666-19363&t=k6OTDDPZOTtypRqo-11",
+    },
+  },
 } as Meta;
 
 type Story = StoryObj<SectionComponent>;
diff --git a/libs/components/src/select/select.stories.ts b/libs/components/src/select/select.stories.ts
index 4bc85d8dba..c030bea86c 100644
--- a/libs/components/src/select/select.stories.ts
+++ b/libs/components/src/select/select.stories.ts
@@ -33,7 +33,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/3tWtMSYoLB0ZLEimLNzYsm/End-user-%26-admin-Vault-Refresh?t=7QEmGA69YTOF8sXU-0",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=13213-55392&t=b5tDKylm5sWm2yKo-4",
     },
   },
 } as Meta;
diff --git a/libs/components/src/table/table.stories.ts b/libs/components/src/table/table.stories.ts
index 4ebc3045d1..e8ab24ee8b 100644
--- a/libs/components/src/table/table.stories.ts
+++ b/libs/components/src/table/table.stories.ts
@@ -21,7 +21,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=1881%3A18371",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-41282&t=b5tDKylm5sWm2yKo-4",
     },
   },
 } as Meta;
diff --git a/libs/components/src/tabs/tabs.stories.ts b/libs/components/src/tabs/tabs.stories.ts
index 6b460d8ee0..250a744306 100644
--- a/libs/components/src/tabs/tabs.stories.ts
+++ b/libs/components/src/tabs/tabs.stories.ts
@@ -74,7 +74,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=1881%3A17922",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-41432&t=b5tDKylm5sWm2yKo-4",
     },
   },
 } as Meta;
diff --git a/libs/components/src/toast/toast.stories.ts b/libs/components/src/toast/toast.stories.ts
index 382e19097b..abb737f5c2 100644
--- a/libs/components/src/toast/toast.stories.ts
+++ b/libs/components/src/toast/toast.stories.ts
@@ -63,7 +63,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=16329-41506&t=b5tDKylm5sWm2yKo-11",
     },
   },
 } as Meta;
diff --git a/libs/components/src/toggle-group/toggle-group.stories.ts b/libs/components/src/toggle-group/toggle-group.stories.ts
index fc8ea0ea92..4860636c15 100644
--- a/libs/components/src/toggle-group/toggle-group.stories.ts
+++ b/libs/components/src/toggle-group/toggle-group.stories.ts
@@ -19,7 +19,7 @@ export default {
   parameters: {
     design: {
       type: "figma",
-      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=1881%3A17157",
+      url: "https://www.figma.com/design/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=1881-17157&t=b5tDKylm5sWm2yKo-4",
     },
   },
 } as Meta;

From 83802fcdc51d95756e585e8f494738e73b9a20fe Mon Sep 17 00:00:00 2001
From: Oscar Hinton <Hinton@users.noreply.github.com>
Date: Fri, 17 Jan 2025 17:01:23 +0100
Subject: [PATCH 146/150] Fix i18n import of drawer component (#12932)

Resolves main being broken after merging #12831 due to a new component depending on `I18nPipe`.
---
 libs/components/src/drawer/drawer-header.component.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/components/src/drawer/drawer-header.component.ts b/libs/components/src/drawer/drawer-header.component.ts
index 73834b8487..de112a448c 100644
--- a/libs/components/src/drawer/drawer-header.component.ts
+++ b/libs/components/src/drawer/drawer-header.component.ts
@@ -1,8 +1,9 @@
 import { CommonModule } from "@angular/common";
 import { ChangeDetectionStrategy, Component, HostBinding, input } from "@angular/core";
 
+import { I18nPipe } from "@bitwarden/ui-common";
+
 import { IconButtonModule } from "../icon-button";
-import { I18nPipe } from "../shared/i18n.pipe";
 import { TypographyModule } from "../typography";
 
 import { DrawerCloseDirective } from "./drawer-close.directive";

From dbb341141a721299637ec3ffaf37ec909d584f2a Mon Sep 17 00:00:00 2001
From: Jordan Aasen <166539328+jaasen-livefront@users.noreply.github.com>
Date: Fri, 17 Jan 2025 09:10:28 -0800
Subject: [PATCH 147/150] [PM-15572] - don't allow restore for 'edit except
 password' permission (#12851)

* don't allow restore for 'edit except password' permission

* show login credentials if only passkey is present

* Revert "show login credentials if only passkey is present"

This reverts commit dc2f2367c2092cb827cf95fe8c7bc82919949627.
---
 .../popup/components/vault-v2/view-v2/view-v2.component.ts  | 6 +++++-
 .../trash-list-items-container.component.html               | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts
index 6532fb004c..f3cd713dd5 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts
@@ -235,7 +235,11 @@ export class ViewV2Component {
   }
 
   protected showFooter(): boolean {
-    return this.cipher && (!this.cipher.isDeleted || (this.cipher.isDeleted && this.cipher.edit));
+    return (
+      this.cipher &&
+      (!this.cipher.isDeleted ||
+        (this.cipher.isDeleted && this.cipher.edit && this.cipher.viewPassword))
+    );
   }
 
   /**
diff --git a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html
index dcbda9fd96..c77ac4f975 100644
--- a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html
+++ b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html
@@ -31,7 +31,7 @@
         ></i>
         <span slot="secondary">{{ cipher.subTitle }}</span>
       </button>
-      <ng-container slot="end" *ngIf="cipher.edit">
+      <ng-container slot="end" *ngIf="cipher.edit && cipher.viewPassword">
         <bit-item-action>
           <button
             type="button"

From 457aa07aa928ca6cdbde9cdaf3da9a065ce1ddb5 Mon Sep 17 00:00:00 2001
From: Jordan Aasen <166539328+jaasen-livefront@users.noreply.github.com>
Date: Fri, 17 Jan 2025 09:12:54 -0800
Subject: [PATCH 148/150] return updated folder when saving a folder (#12894)

---
 apps/cli/src/commands/edit.command.ts                        | 5 +++--
 .../abstractions/folder/folder-api.service.abstraction.ts    | 3 ++-
 libs/common/src/vault/services/folder/folder-api.service.ts  | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/cli/src/commands/edit.command.ts b/apps/cli/src/commands/edit.command.ts
index 8efb414f5b..13152f3d29 100644
--- a/apps/cli/src/commands/edit.command.ts
+++ b/apps/cli/src/commands/edit.command.ts
@@ -14,6 +14,7 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import { Folder } from "@bitwarden/common/vault/models/domain/folder";
 import { KeyService } from "@bitwarden/key-management";
 
 import { OrganizationCollectionRequest } from "../admin-console/models/request/organization-collection.request";
@@ -152,8 +153,8 @@ export class EditCommand {
     const userKey = await this.keyService.getUserKeyWithLegacySupport(activeUserId);
     const encFolder = await this.folderService.encrypt(folderView, userKey);
     try {
-      await this.folderApiService.save(encFolder, activeUserId);
-      const updatedFolder = await this.folderService.get(folder.id, activeUserId);
+      const folder = await this.folderApiService.save(encFolder, activeUserId);
+      const updatedFolder = new Folder(folder);
       const decFolder = await updatedFolder.decrypt();
       const res = new FolderResponse(decFolder);
       return Response.success(res);
diff --git a/libs/common/src/vault/abstractions/folder/folder-api.service.abstraction.ts b/libs/common/src/vault/abstractions/folder/folder-api.service.abstraction.ts
index b95dd35e5e..1bb4a52e92 100644
--- a/libs/common/src/vault/abstractions/folder/folder-api.service.abstraction.ts
+++ b/libs/common/src/vault/abstractions/folder/folder-api.service.abstraction.ts
@@ -2,11 +2,12 @@
 // @ts-strict-ignore
 
 import { UserId } from "../../../types/guid";
+import { FolderData } from "../../models/data/folder.data";
 import { Folder } from "../../models/domain/folder";
 import { FolderResponse } from "../../models/response/folder.response";
 
 export class FolderApiServiceAbstraction {
-  save: (folder: Folder, userId: UserId) => Promise<any>;
+  save: (folder: Folder, userId: UserId) => Promise<FolderData>;
   delete: (id: string, userId: UserId) => Promise<any>;
   get: (id: string) => Promise<FolderResponse>;
   deleteAll: (userId: UserId) => Promise<void>;
diff --git a/libs/common/src/vault/services/folder/folder-api.service.ts b/libs/common/src/vault/services/folder/folder-api.service.ts
index 9d434cc646..fe9c3218a8 100644
--- a/libs/common/src/vault/services/folder/folder-api.service.ts
+++ b/libs/common/src/vault/services/folder/folder-api.service.ts
@@ -13,7 +13,7 @@ export class FolderApiService implements FolderApiServiceAbstraction {
     private apiService: ApiService,
   ) {}
 
-  async save(folder: Folder, userId: UserId): Promise<any> {
+  async save(folder: Folder, userId: UserId): Promise<FolderData> {
     const request = new FolderRequest(folder);
 
     let response: FolderResponse;
@@ -26,6 +26,7 @@ export class FolderApiService implements FolderApiServiceAbstraction {
 
     const data = new FolderData(response);
     await this.folderService.upsert(data, userId);
+    return data;
   }
 
   async delete(id: string, userId: UserId): Promise<any> {

From 3b4eb4099034b59474f6e0b0336b5d284ba8dea4 Mon Sep 17 00:00:00 2001
From: Jordan Aasen <166539328+jaasen-livefront@users.noreply.github.com>
Date: Fri, 17 Jan 2025 09:15:21 -0800
Subject: [PATCH 149/150] [PM-14952] - remove Edit button and show restore
 button when viewing item in trash (#12847)

* add restore function to vault item dialog

* update comment

* revert removing of delete button

* use canDeleteCipher$

* put canRestore in class property

* set showRestore after canDeleteCipher is set
---
 .../vault-item-dialog.component.html          |  9 +++--
 .../vault-item-dialog.component.ts            | 38 +++++++++++++++++++
 .../vault/individual-vault/vault.component.ts |  1 +
 .../app/vault/org-vault/vault.component.ts    |  5 ++-
 4 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.html b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.html
index 56acc421de..c19329f712 100644
--- a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.html
+++ b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.html
@@ -36,7 +36,10 @@
     </vault-cipher-form>
   </div>
   <ng-container bitDialogFooter>
-    <ng-container *ngIf="showCipherView">
+    <button *ngIf="showRestore" [bitAction]="restore" bitButton buttonType="primary" type="button">
+      {{ "restore" | i18n }}
+    </button>
+    <ng-container *ngIf="showCipherView && !showRestore">
       <button
         bitButton
         [bitAction]="switchToEdit"
@@ -53,7 +56,7 @@
       form="cipherForm"
       buttonType="primary"
       #submitBtn
-      [hidden]="showCipherView"
+      [hidden]="showCipherView || showRestore"
     >
       {{ "save" | i18n }}
     </button>
@@ -62,7 +65,7 @@
       type="button"
       buttonType="secondary"
       (click)="cancel()"
-      *ngIf="!showCipherView"
+      *ngIf="!showCipherView && !showRestore"
     >
       {{ "cancel" | i18n }}
     </button>
diff --git a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
index 59638aad65..a530fd0cc8 100644
--- a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
+++ b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
@@ -49,6 +49,8 @@ import {
   AttachmentDialogResult,
   AttachmentsV2Component,
 } from "../../individual-vault/attachments-v2.component";
+import { RoutedVaultFilterService } from "../../individual-vault/vault-filter/services/routed-vault-filter.service";
+import { RoutedVaultFilterModel } from "../../individual-vault/vault-filter/shared/models/routed-vault-filter.model";
 import { WebCipherFormGenerationService } from "../../services/web-cipher-form-generation.service";
 import { WebVaultPremiumUpgradePromptService } from "../../services/web-premium-upgrade-prompt.service";
 import { WebViewPasswordHistoryService } from "../../services/web-view-password-history.service";
@@ -82,6 +84,11 @@ export interface VaultItemDialogParams {
    * If true, the dialog is being opened from the admin console.
    */
   isAdminConsoleAction?: boolean;
+
+  /**
+   * Function to restore a cipher from the trash.
+   */
+  restore: (c: CipherView) => Promise<boolean>;
 }
 
 export enum VaultItemDialogResult {
@@ -99,6 +106,11 @@ export enum VaultItemDialogResult {
    * The dialog was closed to navigate the user the premium upgrade page.
    */
   PremiumUpgrade = "premiumUpgrade",
+
+  /**
+   * A cipher was restored
+   */
+  Restored = "restored",
 }
 
 @Component({
@@ -121,6 +133,7 @@ export enum VaultItemDialogResult {
     { provide: PremiumUpgradePromptService, useClass: WebVaultPremiumUpgradePromptService },
     { provide: ViewPasswordHistoryService, useClass: WebViewPasswordHistoryService },
     { provide: CipherFormGenerationService, useClass: WebCipherFormGenerationService },
+    RoutedVaultFilterService,
   ],
 })
 export class VaultItemDialogComponent implements OnInit, OnDestroy {
@@ -191,6 +204,20 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
     ),
   );
 
+  /**
+   * Determines if the user may restore the item.
+   * A user may restore items if they have delete permissions and the item is in the trash.
+   */
+  protected async canUserRestore() {
+    return (
+      this.filter?.type === "trash" &&
+      this.cipher?.isDeleted &&
+      (await firstValueFrom(this.canDeleteCipher$))
+    );
+  }
+
+  protected showRestore: boolean;
+
   protected get loadingForm() {
     return this.loadForm && !this.formReady;
   }
@@ -230,6 +257,8 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
 
   protected canDeleteCipher$: Observable<boolean>;
 
+  protected filter: RoutedVaultFilterModel;
+
   constructor(
     @Inject(DIALOG_DATA) protected params: VaultItemDialogParams,
     private dialogRef: DialogRef<VaultItemDialogResult>,
@@ -246,6 +275,7 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
     private cipherAuthorizationService: CipherAuthorizationService,
     private apiService: ApiService,
     private eventCollectionService: EventCollectionService,
+    private routedVaultFilterService: RoutedVaultFilterService,
   ) {
     this.updateTitle();
   }
@@ -283,6 +313,9 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
       );
     }
 
+    this.filter = await firstValueFrom(this.routedVaultFilterService.filter$);
+
+    this.showRestore = await this.canUserRestore();
     this.performingInitialLoad = false;
   }
 
@@ -336,6 +369,11 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
     this._formReadySubject.next();
   }
 
+  restore = async () => {
+    await this.params.restore(this.cipher);
+    this.dialogRef.close(VaultItemDialogResult.Restored);
+  };
+
   delete = async () => {
     if (!this.cipher) {
       return;
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts
index 8c1d08b269..46c678fd98 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.component.ts
@@ -717,6 +717,7 @@ export class VaultComponent implements OnInit, OnDestroy {
       mode,
       formConfig,
       activeCollectionId,
+      restore: this.restore,
     });
 
     const result = await lastValueFrom(this.vaultItemDialogRef.closed);
diff --git a/apps/web/src/app/vault/org-vault/vault.component.ts b/apps/web/src/app/vault/org-vault/vault.component.ts
index 14550968ba..779266d830 100644
--- a/apps/web/src/app/vault/org-vault/vault.component.ts
+++ b/apps/web/src/app/vault/org-vault/vault.component.ts
@@ -994,6 +994,7 @@ export class VaultComponent implements OnInit, OnDestroy {
       disableForm,
       activeCollectionId,
       isAdminConsoleAction: true,
+      restore: this.restore,
     });
 
     const result = await lastValueFrom(this.vaultItemDialogRef.closed);
@@ -1033,7 +1034,7 @@ export class VaultComponent implements OnInit, OnDestroy {
     });
   }
 
-  async restore(c: CipherView): Promise<boolean> {
+  restore = async (c: CipherView): Promise<boolean> => {
     if (!c.isDeleted) {
       return;
     }
@@ -1064,7 +1065,7 @@ export class VaultComponent implements OnInit, OnDestroy {
     } catch (e) {
       this.logService.error(e);
     }
-  }
+  };
 
   async bulkRestore(ciphers: CipherView[]) {
     if (

From ce2ec07f74f251f01fb39f330284b6cf8e716148 Mon Sep 17 00:00:00 2001
From: cyprain-okeke <108260115+cyprain-okeke@users.noreply.github.com>
Date: Fri, 17 Jan 2025 18:32:29 +0100
Subject: [PATCH 150/150] [PM-17138][Defect] Submitting blank payment method is
 displaying unreadable validation message for Bank Account and Account Credit
 (#12937)

* Changes to display descriptive message for bank account

* resolve message for invalid message display

* Add the paymentMethodType credit

---------

Co-authored-by: Conner Turnbull <133619638+cturnbull-bitwarden@users.noreply.github.com>
---
 .../organization-plans.component.ts           |  1 +
 .../shared/payment/payment-v2.component.ts    | 32 +++++++++++++------
 .../manage-tax-information.component.ts       |  4 +++
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/apps/web/src/app/billing/organizations/organization-plans.component.ts b/apps/web/src/app/billing/organizations/organization-plans.component.ts
index edc29b1604..94e8637e8a 100644
--- a/apps/web/src/app/billing/organizations/organization-plans.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-plans.component.ts
@@ -605,6 +605,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
 
   submit = async () => {
     if (this.taxComponent && !this.taxComponent.validate()) {
+      this.taxComponent.markAllAsTouched();
       return;
     }
 
diff --git a/apps/web/src/app/billing/shared/payment/payment-v2.component.ts b/apps/web/src/app/billing/shared/payment/payment-v2.component.ts
index 10cf7ccb70..f65a5743c3 100644
--- a/apps/web/src/app/billing/shared/payment/payment-v2.component.ts
+++ b/apps/web/src/app/billing/shared/payment/payment-v2.component.ts
@@ -113,16 +113,21 @@ export class PaymentV2Component implements OnInit, OnDestroy {
       const clientSecret = await this.billingApiService.createSetupIntent(type);
 
       if (this.usingBankAccount) {
-        const token = await this.stripeService.setupBankAccountPaymentMethod(clientSecret, {
-          accountHolderName: this.formGroup.value.bankInformation.accountHolderName,
-          routingNumber: this.formGroup.value.bankInformation.routingNumber,
-          accountNumber: this.formGroup.value.bankInformation.accountNumber,
-          accountHolderType: this.formGroup.value.bankInformation.accountHolderType,
-        });
-        return {
-          type,
-          token,
-        };
+        this.formGroup.markAllAsTouched();
+        if (this.formGroup.valid) {
+          const token = await this.stripeService.setupBankAccountPaymentMethod(clientSecret, {
+            accountHolderName: this.formGroup.value.bankInformation.accountHolderName,
+            routingNumber: this.formGroup.value.bankInformation.routingNumber,
+            accountNumber: this.formGroup.value.bankInformation.accountNumber,
+            accountHolderType: this.formGroup.value.bankInformation.accountHolderType,
+          });
+          return {
+            type,
+            token,
+          };
+        } else {
+          throw "Invalid input provided, Please ensure all required fields are filled out correctly and try again.";
+        }
       }
 
       if (this.usingCard) {
@@ -142,6 +147,13 @@ export class PaymentV2Component implements OnInit, OnDestroy {
       };
     }
 
+    if (this.usingAccountCredit) {
+      return {
+        type: PaymentMethodType.Credit,
+        token: null,
+      };
+    }
+
     return null;
   }
 
diff --git a/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.ts b/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.ts
index 13a6d2d0cc..885afb1ae6 100644
--- a/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.ts
+++ b/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.ts
@@ -72,6 +72,10 @@ export class ManageTaxInformationComponent implements OnInit, OnDestroy {
     }
   }
 
+  markAllAsTouched() {
+    this.formGroup.markAllAsTouched();
+  }
+
   async ngOnInit() {
     if (this.startWith) {
       this.formGroup.controls.country.setValue(this.startWith.country);