Merge branch 'feature/org-admin-refresh' into EC-8-restructure-tabs

.eslintrc.json

@@ -14,7 +14,7 @@
   ],
   "rules": {
     "@typescript-eslint/no-explicit-any": "off", // TODO: This should be re-enabled
-    "@typescript-eslint/no-unused-vars": ["warn", { "args": "none" }],
+    "@typescript-eslint/no-unused-vars": ["error", { "args": "none" }],
     "@typescript-eslint/explicit-member-accessibility": [
       "error",
       {
@@ -27,7 +27,7 @@
         "allowedNames": ["self"]
       }
     ],
-    "no-console": "warn",
+    "no-console": "error",
     "import/no-unresolved": "off", // TODO: Look into turning off once each package is an actual package.
     "import/order": [
       "error",

.github/workflows/build-browser.yml

@@ -16,7 +16,7 @@ on:
     branches:
       - 'master'
       - 'rc'
-      - 'hotfix-rc/**'
+      - 'hotfix-rc'
     paths:
       - 'apps/browser/**'
       - 'libs/**'
@@ -347,7 +347,7 @@ jobs:
 
   trigger-desktop-build:
     name: Trigger desktop build
-    if: ${{ (github.ref == 'refs/heads/master') || (github.ref == 'refs/heads/rc') || contains(github.ref, 'hotfix-rc') }}
+    if: ${{ (github.ref == 'refs/heads/master') || (github.ref == 'refs/heads/rc') || github.ref != 'refs/heads/hotfix-rc' }}
     runs-on: ubuntu-20.04
     needs:
       - build

.github/workflows/build-cli.yml

@@ -17,7 +17,7 @@ on:
     branches:
       - 'master'
       - 'rc'
-      - 'hotfix-rc/**'
+      - 'hotfix-rc'
     paths:
       - 'apps/cli/**'
       - 'libs/**'

.github/workflows/build-desktop.yml

@@ -159,7 +159,7 @@ jobs:
       - name: Set up environment
         run: |
           sudo apt-get update
-          sudo apt-get -y install pkg-config libxss-dev libsecret-1-dev rpm
+          sudo apt-get -y install pkg-config libxss-dev libsecret-1-dev rpm musl-dev musl-tools
 
       - name: Set up Snap
         run: sudo snap install snapcraft --classic
@@ -175,6 +175,27 @@ jobs:
         run: npm ci
         working-directory: ./
 
+      - name: Cache Native Module
+        uses: actions/cache@48af2dc4a9e8278b89d7fa154b955c30c6aaab09 # v3.0.2
+        id: cache
+        with:
+          path: |
+            apps/desktop/desktop_native/*.node
+            ${{ env.RUNNER_TEMP }}/.cargo/registry
+            ${{ env.RUNNER_TEMP }}/.cargo/git
+          key: rust-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }}
+
+      - name: Build Native Module
+        if: steps.cache.outputs.cache-hit != 'true'
+        working-directory: apps/desktop/desktop_native
+        env:
+          PKG_CONFIG_ALLOW_CROSS: true
+          PKG_CONFIG_ALL_STATIC: true
+          TARGET: musl
+        run: |
+          rustup target add x86_64-unknown-linux-musl
+          npm run build:cross-platform
+
       - name: Build application
         run: npm run dist:lin
 
@@ -256,11 +277,18 @@ jobs:
       - name: Set up environment
         run: choco install checksum --no-progress
 
+      - name: Rust
+        shell: pwsh
+        run: |
+          rustup target install i686-pc-windows-msvc
+          rustup target install aarch64-pc-windows-msvc
+
       - name: Print environment
         run: |
           node --version
           npm --version
           choco --version
+          rustup show
 
       - name: Login to Azure
         uses: Azure/login@1f63701bf3e6892515f1b7ce2d2bf1708b46beaf
@@ -282,6 +310,19 @@ jobs:
         run: npm ci
         working-directory: ./
 
+      - name: Cache Native Module
+        uses: actions/cache@48af2dc4a9e8278b89d7fa154b955c30c6aaab09 # v3.0.2
+        id: cache
+        with:
+          path: apps/desktop/desktop_native/*.node
+          key: rust-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }}
+
+      - name: Build Native Module
+        if: steps.cache.outputs.cache-hit != 'true'
+        working-directory: apps/desktop/desktop_native
+        run: |
+          npm run build:cross-platform
+
       - name: Build & Sign (dev)
         env:
           ELECTRON_BUILDER_SIGN: 1
@@ -443,10 +484,15 @@ jobs:
           npm install -g node-gyp
           node-gyp install $(node -v)
 
+      - name: Rust
+        shell: pwsh
+        run: rustup target install aarch64-apple-darwin
+
       - name: Print environment
         run: |
           node --version
           npm --version
+          rustup show
           echo "GitHub ref: $GITHUB_REF"
           echo "GitHub event: $GITHUB_EVENT"
 
@@ -536,6 +582,19 @@ jobs:
         run: npm ci
         working-directory: ./
 
+      - name: Cache Native Module
+        uses: actions/cache@48af2dc4a9e8278b89d7fa154b955c30c6aaab09 # v3.0.2
+        id: cache
+        with:
+          path: apps/desktop/desktop_native/*.node
+          key: rust-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }}
+
+      - name: Build Native Module
+        if: steps.cache.outputs.cache-hit != 'true'
+        working-directory: apps/desktop/desktop_native
+        run: |
+          npm run build:cross-platform
+
       - name: Build application (dev)
         run: npm run build
 
@@ -570,10 +629,15 @@ jobs:
           npm install -g node-gyp
           node-gyp install $(node -v)
 
+      - name: Rust
+        shell: pwsh
+        run: rustup target install aarch64-apple-darwin
+
       - name: Print environment
         run: |
           node --version
           npm --version
+          rustup show
           echo "GitHub ref: $GITHUB_REF"
           echo "GitHub event: $GITHUB_EVENT"
 
@@ -663,23 +727,30 @@ jobs:
         run: npm ci
         working-directory: ./
 
+      - name: Cache Native Module
+        uses: actions/cache@48af2dc4a9e8278b89d7fa154b955c30c6aaab09 # v3.0.2
+        id: cache
+        with:
+          path: apps/desktop/desktop_native/*.node
+          key: rust-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }}
+
+      - name: Build Native Module
+        if: steps.cache.outputs.cache-hit != 'true'
+        working-directory: apps/desktop/desktop_native
+        run: |
+          npm run build:cross-platform
+
       - name: Build
         if: steps.build-cache.outputs.cache-hit != 'true'
         run: npm run build
 
-      - name: Extract branch name
-        if: contains(github.ref, 'hotfix-rc')
-        id: extract_branch
-        shell: bash
-        run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
-
       - name: Download artifact from hotfix-rc
-        if: contains(github.ref, 'hotfix-rc')
+        if: github.ref == 'refs/heads/hotfix-rc'
         uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39  # v2.19.0
         with:
           workflow: build-browser.yml
           workflow_conclusion: success
-          branch: ${{ steps.extract_branch.outputs.branch }}
+          branch: hotfix-rc
           path: ${{ github.workspace }}/browser-build-artifacts
 
       - name: Download artifact from rc
@@ -692,7 +763,7 @@ jobs:
           path: ${{ github.workspace }}/browser-build-artifacts
 
       - name: Download artifact from master
-        if: ${{ github.ref != 'refs/heads/rc' && !contains(github.ref, 'hotfix-rc') }}
+        if: ${{ github.ref != 'refs/heads/rc' && github.ref != 'refs/heads/hotfix-rc' }}
         uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39  # v2.19.0
         with:
           workflow: build-browser.yml
@@ -776,10 +847,15 @@ jobs:
           npm install -g node-gyp
           node-gyp install $(node -v)
 
+      - name: Rust
+        shell: pwsh
+        run: rustup target install aarch64-apple-darwin
+
       - name: Print environment
         run: |
           node --version
           npm --version
+          rustup show
           echo "GitHub ref: $GITHUB_REF"
           echo "GitHub event: $GITHUB_EVENT"
 
@@ -869,23 +945,30 @@ jobs:
         run: npm ci
         working-directory: ./
 
+      - name: Cache Native Module
+        uses: actions/cache@48af2dc4a9e8278b89d7fa154b955c30c6aaab09 # v3.0.2
+        id: cache
+        with:
+          path: apps/desktop/desktop_native/*.node
+          key: rust-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }}
+
+      - name: Build Native Module
+        if: steps.cache.outputs.cache-hit != 'true'
+        working-directory: apps/desktop/desktop_native
+        run: |
+          npm run build:cross-platform
+
       - name: Build
         if: steps.build-cache.outputs.cache-hit != 'true'
         run: npm run build
 
-      - name: Extract branch name
-        if: contains(github.ref, 'hotfix-rc')
-        id: extract_branch
-        shell: bash
-        run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
-
       - name: Download artifact from hotfix-rc
-        if: contains(github.ref, 'hotfix-rc')
+        if: github.ref == 'refs/heads/hotfix-rc'
         uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39  # v2.19.0
         with:
           workflow: build-browser.yml
           workflow_conclusion: success
-          branch: ${{ steps.extract_branch.outputs.branch }}
+          branch: hotfix-rc
           path: ${{ github.workspace }}/browser-build-artifacts
 
       - name: Download artifact from rc
@@ -898,7 +981,7 @@ jobs:
           path: ${{ github.workspace }}/browser-build-artifacts
 
       - name: Download artifact from master
-        if: ${{ github.ref != 'refs/heads/rc' && !contains(github.ref, 'hotfix-rc') }}
+        if: ${{ github.ref != 'refs/heads/rc' && github.ref != 'refs/heads/hotfix-rc' }}
         uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39  # v2.19.0
         with:
           workflow: build-browser.yml
@@ -1067,6 +1150,19 @@ jobs:
         run: npm ci
         working-directory: ./
 
+      - name: Cache Native Module
+        uses: actions/cache@48af2dc4a9e8278b89d7fa154b955c30c6aaab09 # v3.0.2
+        id: cache
+        with:
+          path: apps/desktop/desktop_native/*.node
+          key: rust-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }}
+
+      - name: Build Native Module
+        if: steps.cache.outputs.cache-hit != 'true'
+        working-directory: apps/desktop/desktop_native
+        run: |
+          npm run build:cross-platform
+
       - name: Build
         if: steps.build-cache.outputs.cache-hit != 'true'
         run: npm run build

.github/workflows/build-web.yml

@@ -17,7 +17,7 @@ on:
     branches:
       - 'master'
       - 'rc'
-      - 'hotfix-rc/**'
+      - 'hotfix-rc'
     paths:
       - 'apps/web/**'
       - 'libs/**'

.github/workflows/release-browser.yml

@@ -31,9 +31,9 @@ jobs:
       - name: Branch check
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         run: |
-          if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ $GITHUB_REF != refs/heads/hotfix-rc/* ]]; then
+          if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ $GITHUB_REF != refs/heads/hotfix-rc ]]; then
             echo "==================================="
-            echo "[!] Can only release from the 'rc' or 'hotfix-rc/*' branches"
+            echo "[!] Can only release from the 'rc' or 'hotfix-rc' branches"
             echo "==================================="
             exit 1
           fi
@@ -90,6 +90,22 @@ jobs:
       - setup
       - locales-test
     steps:
+      - name: Create GitHub deployment
+        uses: chrnorm/deployment-action@1b599fe41a0ef1f95191e7f2eec4743f2d7dfc48
+        id: deployment
+        with:
+          token: '${{ secrets.GITHUB_TOKEN }}'
+          environment: 'Browser - Production'
+          description: 'Deployment ${{ needs.setup.outputs.release-version }} from branch ${{ github.ref_name }}'
+          task: release
+      
+      - name: Update deployment status to In Progress
+        uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
+        with:
+          token: '${{ secrets.GITHUB_TOKEN }}'
+          state: 'in_progress'
+          deployment-id: ${{ steps.deployment.outputs.deployment_id }}
+
       - name: Download latest Release build artifacts
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         uses: bitwarden/gh-actions/download-artifacts@c1fa8e09871a860862d6bbe36184b06d2c7e35a8
@@ -141,3 +157,19 @@ jobs:
           body: "<insert release notes here>"
           token: ${{ secrets.GITHUB_TOKEN }}
           draft: true
+
+      - name: Update deployment status to Success
+        if: success()
+        uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
+        with:
+          token: '${{ secrets.GITHUB_TOKEN }}'
+          state: 'success'
+          deployment-id: ${{ steps.deployment.outputs.deployment_id }}
+
+      - name: Update deployment status to Failure
+        if: failure()
+        uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
+        with:
+          token: '${{ secrets.GITHUB_TOKEN }}'
+          state: 'failure'
+          deployment-id: ${{ steps.deployment.outputs.deployment_id }}

.github/workflows/release-cli.yml

@@ -47,9 +47,9 @@ jobs:
       - name: Branch check
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         run: |
-          if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ $GITHUB_REF != refs/heads/hotfix-rc/* ]]; then
+          if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ $GITHUB_REF != refs/heads/hotfix-rc ]]; then
             echo "==================================="
-            echo "[!] Can only release from the 'rc' or 'hotfix-rc/*' branches"
+            echo "[!] Can only release from the 'rc' or 'hotfix-rc' branches"
             echo "==================================="
             exit 1
           fi
@@ -64,6 +64,22 @@ jobs:
           monorepo: true
           monorepo-project: cli
 
+      - name: Create GitHub deployment for Snap
+        uses: chrnorm/deployment-action@1b599fe41a0ef1f95191e7f2eec4743f2d7dfc48
+        id: deployment
+        with:
+          token: '${{ secrets.GITHUB_TOKEN }}'
+          environment: 'CLI - Production'
+          description: 'Deployment ${{ steps.version.outputs.version }} from branch ${{ github.ref_name }}'
+          task: release
+      
+      - name: Update deployment status to In Progress
+        uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
+        with:
+          token: '${{ secrets.GITHUB_TOKEN }}'
+          state: 'in_progress'
+          deployment-id: ${{ steps.deployment.outputs.deployment_id }}
+
       - name: Download all Release artifacts
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         uses: bitwarden/gh-actions/download-artifacts@c1fa8e09871a860862d6bbe36184b06d2c7e35a8
@@ -104,6 +120,21 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           draft: true
 
+      - name: Update deployment status to Success
+        if: success()
+        uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
+        with:
+          token: '${{ secrets.GITHUB_TOKEN }}'
+          state: 'success'
+          deployment-id: ${{ steps.deployment.outputs.deployment_id }}
+
+      - name: Update deployment status to Failure
+        if: failure()
+        uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
+        with:
+          token: '${{ secrets.GITHUB_TOKEN }}'
+          state: 'failure'
+          deployment-id: ${{ steps.deployment.outputs.deployment_id }}
 
   snap:
     name: Deploy Snap
@@ -159,7 +190,6 @@ jobs:
           snapcraft push bw_${{ env._PKG_VERSION }}_amd64.snap --release stable
           snapcraft logout
 
-
   choco:
     name: Deploy Choco
     runs-on: windows-2019
@@ -219,7 +249,6 @@ jobs:
           cd dist
           choco push
 
-
   npm:
     name: Publish NPM
     runs-on: ubuntu-20.04
@@ -274,3 +303,4 @@ jobs:
       - name: Publish NPM
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         run: npm publish --access public
+

.github/workflows/release-desktop-beta.yml

@@ -25,9 +25,9 @@ jobs:
 
       # - name: Branch check
       #   run: |
-      #     if [[ "$GITHUB_REF" != "refs/heads/master" ]] && [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ $GITHUB_REF != refs/heads/hotfix-rc/* ]]; then
+      #     if [[ "$GITHUB_REF" != "refs/heads/master" ]] && [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ $GITHUB_REF != "refs/heads/hotfix-rc" ]]; then
       #       echo "==================================="
-      #       echo "[!] Can only release from the 'master', 'rc' or 'hotfix-rc/*' branches"
+      #       echo "[!] Can only release from the 'master', 'rc' or 'hotfix-rc' branches"
       #       echo "==================================="
       #       exit 1
       #     fi
@@ -609,19 +609,13 @@ jobs:
         if: steps.build-cache.outputs.cache-hit != 'true'
         run: npm run build
 
-      - name: Extract branch name
-        if: contains(github.ref, 'hotfix-rc')
-        id: extract_branch
-        shell: bash
-        run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
-
       - name: Download artifact from hotfix-rc
-        if: contains(github.ref, 'hotfix-rc')
+        if: github.ref == 'refs/heads/hotfix-rc')
         uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39  # v2.19.0
         with:
           workflow: build-browser.yml
           workflow_conclusion: success
-          branch: ${{ steps.extract_branch.outputs.branch }}
+          branch: hotfix-rc
           path: ${{ github.workspace }}/browser-build-artifacts
 
       - name: Download artifact from rc
@@ -634,7 +628,7 @@ jobs:
           path: ${{ github.workspace }}/browser-build-artifacts
 
       - name: Download artifact from master
-        if: ${{ github.ref != 'refs/heads/rc' && !contains(github.ref, 'hotfix-rc') }}
+        if: ${{ github.ref != 'refs/heads/rc' && github.ref != 'refs/heads/hotfix-rc' }}
         uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39  # v2.19.0
         with:
           workflow: build-browser.yml
@@ -815,19 +809,13 @@ jobs:
         if: steps.build-cache.outputs.cache-hit != 'true'
         run: npm run build
 
-      - name: Extract branch name
-        if: contains(github.ref, 'hotfix-rc')
-        id: extract_branch
-        shell: bash
-        run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
-
       - name: Download artifact from hotfix-rc
-        if: contains(github.ref, 'hotfix-rc')
+        if: github.ref == 'refs/heads/hotfix-rc')
         uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39  # v2.19.0
         with:
           workflow: build-browser.yml
           workflow_conclusion: success
-          branch: ${{ steps.extract_branch.outputs.branch }}
+          branch: hotfix-rc
           path: ${{ github.workspace }}/browser-build-artifacts
 
       - name: Download artifact from rc
@@ -840,7 +828,7 @@ jobs:
           path: ${{ github.workspace }}/browser-build-artifacts
 
       - name: Download artifact from master
-        if: ${{ github.ref != 'refs/heads/rc' && !contains(github.ref, 'hotfix-rc') }}
+        if: ${{ github.ref != 'refs/heads/rc' && github.ref != 'refs/heads/hotfix-rc' }}
         uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39  # v2.19.0
         with:
           workflow: build-browser.yml

.github/workflows/release-desktop.yml

@@ -42,9 +42,9 @@ jobs:
       - name: Branch check
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         run: |
-          if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ $GITHUB_REF != refs/heads/hotfix-rc/* ]]; then
+          if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ $GITHUB_REF != refs/heads/hotfix-rc ]]; then
             echo "==================================="
-            echo "[!] Can only release from the 'rc' or 'hotfix-rc/*' branches"
+            echo "[!] Can only release from the 'rc' or 'hotfix-rc' branches"
             echo "==================================="
             exit 1
           fi
@@ -76,6 +76,22 @@ jobs:
               ;;
           esac
 
+      - name: Create GitHub deployment
+        uses: chrnorm/deployment-action@1b599fe41a0ef1f95191e7f2eec4743f2d7dfc48
+        id: deployment
+        with:
+          token: '${{ secrets.GITHUB_TOKEN }}'
+          environment: 'Desktop - Production'
+          description: 'Deployment ${{ steps.version.outputs.version }} to channel ${{ steps.release-channel.outputs.channel }} from branch ${{ github.ref_name }}'
+          task: release
+      
+      - name: Update deployment status to In Progress
+        uses: chrnorm/deployment-status@1b599fe41a0ef1f95191e7f2eec4743f2d7dfc48
+        with:
+          token: '${{ secrets.GITHUB_TOKEN }}'
+          state: 'failure'
+          deployment-id: ${{ steps.deployment.outputs.deployment_id }}
+
       - name: Login to Azure
         uses: Azure/login@ec3c14589bd3e9312b3cc8c41e6860e258df9010
         with:
@@ -164,6 +180,21 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           draft: true
 
+      - name: Update deployment status to Success
+        if: success()
+        uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
+        with:
+          token: '${{ secrets.GITHUB_TOKEN }}'
+          state: 'success'
+          deployment-id: ${{ steps.deployment.outputs.deployment_id }}
+
+      - name: Update deployment status to Failure
+        if: failure()
+        uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
+        with:
+          token: '${{ secrets.GITHUB_TOKEN }}'
+          state: 'failure'
+          deployment-id: ${{ steps.deployment.outputs.deployment_id }}
 
   snap:
     name: Deploy Snap

.github/workflows/release-qa-web.yml

@@ -72,6 +72,23 @@ jobs:
     name: Deploy Web Vault to QA CloudFlare Pages branch
     runs-on: ubuntu-20.04
     steps:
+      - name: Create GitHub deployment
+        uses: chrnorm/deployment-action@1b599fe41a0ef1f95191e7f2eec4743f2d7dfc48
+        id: deployment
+        with:
+          token: '${{ secrets.GITHUB_TOKEN }}'
+          environment-url: http://vault.qa.bitwarden.pw
+          environment: 'Web Vault - QA'
+          description: 'Deployment from branch ${{ github.ref_name }}'
+      
+      - name: Update deployment status to In Progress
+        uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
+        with:
+          token: '${{ secrets.GITHUB_TOKEN }}'
+          environment-url: http://vault.qa.bitwarden.pw
+          state: 'in_progress'
+          deployment-id: ${{ steps.deployment.outputs.deployment_id }}
+
       - name: Checkout Repo
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b  # v3.0.2
 
@@ -118,3 +135,21 @@ jobs:
             echo "No changes to commit!";
           fi
         working-directory: deployment
+
+      - name: Update deployment status to Success
+        if: success()
+        uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
+        with:
+          token: '${{ secrets.GITHUB_TOKEN }}'
+          environment-url: http://vault.qa.bitwarden.pw
+          state: 'success'
+          deployment-id: ${{ steps.deployment.outputs.deployment_id }}
+
+      - name: Update deployment status to Failure
+        if: failure()
+        uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
+        with:
+          token: '${{ secrets.GITHUB_TOKEN }}'
+          environment-url: http://vault.qa.bitwarden.pw
+          state: 'failure'
+          deployment-id: ${{ steps.deployment.outputs.deployment_id }}

.github/workflows/release-web.yml

@@ -28,9 +28,9 @@ jobs:
       - name: Branch check
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         run: |
-          if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ $GITHUB_REF != refs/heads/hotfix-rc/* ]]; then
+          if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ $GITHUB_REF != "refs/heads/hotfix-rc" ]]; then
             echo "==================================="
-            echo "[!] Can only release from the 'rc' or 'hotfix-rc/*' branches"
+            echo "[!] Can only release from the 'rc' or 'hotfix-rc' branches"
             echo "==================================="
             exit 1
           fi
@@ -227,6 +227,24 @@ jobs:
       - self-host
       - cfpages-deploy
     steps:
+      - name: Create GitHub deployment
+        uses: chrnorm/deployment-action@1b599fe41a0ef1f95191e7f2eec4743f2d7dfc48
+        id: deployment
+        with:
+          token: '${{ secrets.GITHUB_TOKEN }}'
+          environment-url: http://vault.bitwarden.com
+          environment: 'Web Vault - Production'
+          description: 'Deployment ${{ needs.setup.outputs.release_version }} from branch ${{ github.ref_name }}'
+          task: release
+      
+      - name: Update deployment status to In Progress
+        uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
+        with:
+          token: '${{ secrets.GITHUB_TOKEN }}'
+          environment-url: http://vault.bitwarden.com
+          state: 'in_progress'
+          deployment-id: ${{ steps.deployment.outputs.deployment_id }}
+
       - name: Download latest build artifacts
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         uses: bitwarden/gh-actions/download-artifacts@c1fa8e09871a860862d6bbe36184b06d2c7e35a8
@@ -267,3 +285,21 @@ jobs:
             apps/web/artifacts/web-${{ needs.setup.outputs.release_version }}-selfhosted-open-source.zip"
           token: ${{ secrets.GITHUB_TOKEN }}
           draft: true
+
+      - name: Update deployment status to Success
+        if: success()
+        uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
+        with:
+          token: '${{ secrets.GITHUB_TOKEN }}'
+          environment-url: http://vault.bitwarden.com
+          state: 'success'
+          deployment-id: ${{ steps.deployment.outputs.deployment_id }}
+
+      - name: Update deployment status to Failure
+        if: failure()
+        uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
+        with:
+          token: '${{ secrets.GITHUB_TOKEN }}'
+          environment-url: http://vault.bitwarden.com
+          state: 'failure'
+          deployment-id: ${{ steps.deployment.outputs.deployment_id }}

.gitignore

@@ -26,6 +26,7 @@ npm-debug.log
 # Build directories
 dist
 build
+.angular/cache
 
 # Testing
 coverage

.storybook/tsconfig.json

@@ -4,7 +4,10 @@
     "types": ["node"],
     "allowSyntheticDefaultImports": true
   },
-  "exclude": ["../src/test.setup.ts", "../src/**/*.spec.ts", "../projects/**/*.spec.ts"],
+  "exclude": ["../src/test.setup.ts", "../apps/src/**/*.spec.ts", "../libs/**/*.spec.ts"],
-  "include": ["../src/**/*", "../projects/**/*"],
+  "files": [
-  "files": ["./typings.d.ts"]
+    "./typings.d.ts",
+    "../libs/components/src/main.ts",
+    "../libs/components/src/polyfills.ts"
+  ]
 }

angular.json

@@ -3,6 +3,83 @@
   "version": 1,
   "newProjectRoot": "apps",
   "projects": {
+    "web": {
+      "projectType": "application",
+      "schematics": {
+        "@schematics/angular:application": {
+          "strict": true
+        }
+      },
+      "root": "apps/web",
+      "sourceRoot": "apps/web/src",
+      "prefix": "app",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/web",
+            "index": "apps/web/src/index.html",
+            "main": "apps/web/src/app/main.ts",
+            "polyfills": "apps/web/src/app/polyfills.ts",
+            "tsConfig": "apps/web/tsconfig.json",
+            "assets": ["apps/web/src/favicon.ico"],
+            "styles": [],
+            "scripts": []
+          }
+        }
+      }
+    },
+    "browser": {
+      "projectType": "application",
+      "schematics": {
+        "@schematics/angular:application": {
+          "strict": true
+        }
+      },
+      "root": "apps/browser",
+      "sourceRoot": "apps/browser/src",
+      "prefix": "app",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/browser",
+            "index": "apps/browser/src/popup/index.html",
+            "main": "apps/browser/src/popup/main.ts",
+            "polyfills": "apps/browser/src/popup/polyfills.ts",
+            "tsConfig": "apps/browser/tsconfig.json",
+            "assets": [],
+            "styles": [],
+            "scripts": []
+          }
+        }
+      }
+    },
+    "desktop": {
+      "projectType": "application",
+      "schematics": {
+        "@schematics/angular:application": {
+          "strict": true
+        }
+      },
+      "root": "apps/desktop",
+      "sourceRoot": "apps/desktop/src",
+      "prefix": "app",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/desktop",
+            "index": "apps/desktop/src/index.html",
+            "main": "apps/desktop/src/app/main.ts",
+            "tsConfig": "apps/desktop/tsconfig.json",
+            "assets": [],
+            "styles": [],
+            "scripts": []
+          }
+        }
+      }
+    },
     "components": {
       "projectType": "application",
       "schematics": {
@@ -10,9 +87,9 @@
           "strict": true
         }
       },
-      "root": "./libs/components",
+      "root": "libs/components",
       "sourceRoot": "libs/components/src",
-      "prefix": "components",
+      "prefix": "bit",
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
@@ -31,18 +108,6 @@
           },
           "configurations": {
             "production": {
-              "budgets": [
-                {
-                  "type": "initial",
-                  "maximumWarning": "500kb",
-                  "maximumError": "1mb"
-                },
-                {
-                  "type": "anyComponentStyle",
-                  "maximumWarning": "2kb",
-                  "maximumError": "4kb"
-                }
-              ],
               "outputHashing": "all"
             },
             "development": {
@@ -60,22 +125,42 @@
           "builder": "@angular-devkit/build-angular:dev-server",
           "configurations": {
             "production": {
-              "browserTarget": "components:build:production"
+              "browserTarget": "test-storybook:build:production"
             },
             "development": {
-              "browserTarget": "components:build:development"
+              "browserTarget": "test-storybook:build:development"
             }
           },
           "defaultConfiguration": "development"
-        },
+        }
-        "extract-i18n": {
+      }
-          "builder": "@angular-devkit/build-angular:extract-i18n",
+    },
+    "storybook": {
+      "projectType": "application",
+      "root": "libs/components",
+      "sourceRoot": "libs/components/src",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "browserTarget": "components:build"
+            "tsConfig": ".storybook/tsconfig.json",
+            "styles": ["libs/components/src/styles.scss", "libs/components/src/styles.css"],
+            "scripts": []
           }
         }
       }
+    },
+    "angular": {
+      "projectType": "library",
+      "root": "libs/angular",
+      "sourceRoot": "libs/angular/src",
+      "prefix": "app",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:ng-packagr",
+          "defaultConfiguration": "production"
+        }
+      }
     }
-  },
+  }
-  "defaultProject": "components"
 }

apps/browser/src/_locales/ar/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/az/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Sıradan çıxarılmış Təşkilatlardakı elementlərə müraciət edilə bilmir. Kömək üçün Təşkilatınızın sahibi ilə əlaqə saxlayın."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/be/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/bg/messages.json

@@ -430,7 +430,7 @@
     "message": "Повторното въвеждане на главната парола е задължително."
   },
   "masterPasswordMinlength": {
-    "message": "Master password must be at least 8 characters long."
+    "message": "Главната парола трябва да е дълга поне 8 знака."
   },
   "masterPassDoesntMatch": {
     "message": "Главната парола и потвърждението ѝ не съвпадат."
@@ -1969,9 +1969,12 @@
     "message": "Грешка с конектора за ключове: уверете се, че конекторът за ключове е наличен и работи правилно."
   },
   "organizationIsDisabled": {
-    "message": "Organization is disabled."
+    "message": "Организацията е изключена."
   },
   "disabledOrganizationFilterError": {
-    "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+    "message": "Записите в изключени организации не са достъпни. Свържете се със собственика на организацията си за помощ."
+  },
+  "cardBrandMir": {
+    "message": "Мир"
   }
 }

apps/browser/src/_locales/bn/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/bs/messages.json

@@ -11,28 +11,28 @@
     "description": "Extension description"
   },
   "loginOrCreateNewAccount": {
-    "message": "Log in or create a new account to access your secure vault."
+    "message": "Prijavite se ili napravite novi račun da biste pristupili svom sigurnom trezoru."
   },
   "createAccount": {
-    "message": "Create Account"
+    "message": "Napravi račun"
   },
   "login": {
-    "message": "Log In"
+    "message": "Prijavite se"
   },
   "enterpriseSingleSignOn": {
     "message": "Enterprise Single Sign-On"
   },
   "cancel": {
-    "message": "Cancel"
+    "message": "Otkaži"
   },
   "close": {
-    "message": "Close"
+    "message": "Zatvori"
   },
   "submit": {
-    "message": "Submit"
+    "message": "Potvrdi"
   },
   "emailAddress": {
-    "message": "Email Address"
+    "message": "E-Mail adresa"
   },
   "masterPass": {
     "message": "Master Password"
@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/ca/messages.json

@@ -1969,9 +1969,12 @@
     "message": "Error del connector de claus: assegureu-vos que el connector de claus està disponible i funcionant correctament."
   },
   "organizationIsDisabled": {
-    "message": "Organization is disabled."
+    "message": "L'organització està inhabilitada."
   },
   "disabledOrganizationFilterError": {
-    "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+    "message": "No es pot accedir als elements de les organitzacions inhabilitades. Poseu-vos en contacte amb el propietari de la vostra organització per obtenir ajuda."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/cs/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/da/messages.json

@@ -424,13 +424,13 @@
     "message": "Ugyldig e-mailadresse."
   },
   "masterPasswordRequired": {
-    "message": "Master password is required."
+    "message": "Hovedadgangskode er påkrævet."
   },
   "confirmMasterPasswordRequired": {
-    "message": "Master password retype is required."
+    "message": "Hovedadgangskode kræves angivet igen."
   },
   "masterPasswordMinlength": {
-    "message": "Master password must be at least 8 characters long."
+    "message": "Hovedadgangskode skal være mindst 8 tegn."
   },
   "masterPassDoesntMatch": {
     "message": "De to adgangskoder matcher ikke."
@@ -571,10 +571,10 @@
     "description": "This is the folder for uncategorized items"
   },
   "enableAddLoginNotification": {
-    "message": "Bed om at tilføje login"
+    "message": "Spørg om at tilføje login"
   },
   "addLoginNotificationDesc": {
-    "message": "Bed om at tilføje et element, hvis et ikke findes i din boks."
+    "message": "Spørg om at tilføje et element, hvis et ikke findes i din boks."
   },
   "showCardsCurrentTab": {
     "message": "Vis kort på fanebladet"
@@ -1484,7 +1484,7 @@
     "message": "Ved at markere dette felt accepterer du følgende:"
   },
   "acceptPoliciesRequired": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "Tjenestevilkår og fortrolighedspolitik er ikke blevet accepteret."
   },
   "termsOfService": {
     "message": "Servicevilkår"
@@ -1969,9 +1969,12 @@
     "message": "Key Connector-fejl: Sørg for, at Key Connector er tilgængelig og fungerer korrekt."
   },
   "organizationIsDisabled": {
-    "message": "Organization is disabled."
+    "message": "Organisationen er deaktiveret."
   },
   "disabledOrganizationFilterError": {
-    "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+    "message": "Elementer i deaktiverede organisationer kan ikke tilgås. Kontakt din organisationsejer for at få hjælp."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/de/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Auf Einträge in deaktivierten Organisationen kann nicht zugegriffen werden. Kontaktiere deinen Organisationseigentümer für Unterstützung."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/el/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/en_GB/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organisations cannot be accessed. Contact your Organisation owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/en_IN/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/es/messages.json

@@ -1969,9 +1969,12 @@
     "message": "Error en el conector de claves: asegúrate de que el conector de claves está disponible y que funciona correctamente."
   },
   "organizationIsDisabled": {
-    "message": "Organization is disabled."
+    "message": "La organización está desactivada."
   },
   "disabledOrganizationFilterError": {
-    "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+    "message": "No se puede acceder a los elementos de las organizaciones desactivadas. Póngase en contacto con el personal propietario de la organización para obtener ayuda."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/et/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Organisatsiooni alla kuuluvatele kirjetele ei ole ligipääsu. Kontakteeru oma organisatsiooni omanikuga."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/eu/messages.json

@@ -157,7 +157,7 @@
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "twoStepLogin": {
-    "message": "Bi urratseko egiaztatzea"
+    "message": "Bi urratseko saio hasiera"
   },
   "logOut": {
     "message": "Itxi saioa"
@@ -491,7 +491,7 @@
     "message": "Zure pasahitz nagusia alda dezakezu bitwarden.com webgunean. Orain joan nahi duzu webgunera?"
   },
   "twoStepLoginConfirmation": {
-    "message": "Bi urratseko egiaztatzea dela eta, zure kontua seguruagoa da, beste aplikazio/gailu batekin saioa hastea eskatzen baitizu; adibidez, segurtasun kode, baimentze aplikazio, SMS, telefono dei edo posta elektroniko bidez. Bi urratseko egiaztatzea bitwarden.com webgunean  aktibatu daiteke. Orain joan nahi duzu webgunera?"
+    "message": "Bi urratseko saio hasiera dela eta, zure kontua seguruagoa da, beste aplikazio/gailu batekin saioa hastea eskatzen baitizu; adibidez, segurtasun kode, autentifikazio aplikazio, SMS, telefono dei edo email bidez. Bi urratseko saio hasiera bitwarden.com webgunean aktibatu daiteke. Orain joan nahi duzu webgunera?"
   },
   "editedFolder": {
     "message": "Karpeta editatuta"
@@ -705,7 +705,7 @@
     "message": "Gehiago ikasi"
   },
   "authenticatorKeyTotp": {
-    "message": "Baimentze kodea (TOTP)"
+    "message": "Autentifikazio giltza (TOTP)"
   },
   "verificationCodeTotp": {
     "message": "Egiaztatze kodea"
@@ -771,7 +771,7 @@
     "message": "Eranskinentzako 1GB-eko enkriptatutako biltegia."
   },
   "ppremiumSignUpTwoStep": {
-    "message": "YubiKey, FIDO U2F eta Duo bezalako saio-hasieratarako bi urratseko egiaztatze aukerak."
+    "message": "YubiKey, FIDO U2F eta Duo bezalako bi urratseko saio hasierarako aukera gehigarriak."
   },
   "ppremiumSignUpReports": {
     "message": "Pasahitzaren higienea, kontuaren egoera eta datu-bortxaketen txostenak, kutxa gotorra seguru mantentzeko."
@@ -813,7 +813,7 @@
     "message": "Kopiatu TOTO automatikoki"
   },
   "disableAutoTotpCopyDesc": {
-    "message": "Saio-hasiera batek baimentze-kodea badu, TOTP egiaztatze-kodea arbelean automatikoki kopiatuko da saio-hasiera bat auto-betetzean."
+    "message": "Saio hasiera batek autentifikazio giltza badu, TOTP egiaztatze kodea arbelean automatikoki kopiatuko da saio hasiera bat auto-betetzean."
   },
   "enableAutoBiometricsPrompt": {
     "message": "Biometria eskatu saioa hastean"
@@ -825,7 +825,7 @@
     "message": "Premium bazkidetza beharrezkoa da ezaugarri hau erabiltzeko."
   },
   "enterVerificationCodeApp": {
-    "message": "Sartu zure baimentze-aplikazioaren 6 digituko egiaztatze-kodea."
+    "message": "Sartu zure autentifikazio aplikazioaren 6 digituko egiaztatze kodea."
   },
   "enterVerificationCodeEmail": {
     "message": "Sartu $EMAIL$-era bidalitako 6 digituko egiaztatze-kodea.",
@@ -852,13 +852,13 @@
     "message": "Berbidali email bidezko egiaztatze-kodea."
   },
   "useAnotherTwoStepMethod": {
-    "message": "Erabili bi urratseko egiaztatzeko beste modu bat."
+    "message": "Erabili bi urratseko saio hasierarako beste modu bat"
   },
   "insertYubiKey": {
-    "message": "Sartu zure YubiKey-a ordenagailuko USB portuan, ondoren, sakatu bere botoia."
+    "message": "Sartu zure YubiKey-a ordenagailuko USB atakan, ondoren, sakatu bere botoia."
   },
   "insertU2f": {
-    "message": "Sartu zure segurtasun giltza ordenagailuaren USB portuan. Botoia badu, sakatu ezazu."
+    "message": "Sartu zure segurtasun giltza ordenagailuaren USB atakan. Botoia badu, sakatu ezazu."
   },
   "webAuthnNewTab": {
     "message": "WebAuthn 2FA egiaztatzea hasteko. Egin klik beheko botoian fitxa berria irekitzeko eta jarraitu fitxa berriko jarraibideei."
@@ -867,19 +867,19 @@
     "message": "Ireki fitxa berria"
   },
   "webAuthnAuthenticate": {
-    "message": "WebAuthn baimendu"
+    "message": "WebAuthn autentifikatu"
   },
   "loginUnavailable": {
     "message": "Ez dago eskuragarri saio-hasierarik"
   },
   "noTwoStepProviders": {
-    "message": "Kontu honek bi urratseko egiaztatzea du gaituta, baina konfiguratutako bi urratseko egiaztatzea ez da web-nabigatzaile honekin bateragarria."
+    "message": "Kontu honek bi urratseko saio hasiera du gaituta, baina ezarritako bi urratserako hornitzailea ez da web-nabigatzaile honekin bateragarria."
   },
   "noTwoStepProviders2": {
-    "message": "Mesedez, erabili nabigatzaile bateragarri bat (adibidez, Chrome) eta/edo gehitu bateragarritasun obea duten nabigatzaile bidezko (baimentze-aplikazio gisa) baimentze modu gehigarriak."
+    "message": "Mesedez, erabili nabigatzaile bateragarri bat (adibidez, Chrome) eta/edo gehitu bateragarritasun obea duten nabigatzaile bidezko (autentifikazio aplikazio gisa) autentifikazio modu gehigarriak."
   },
   "twoStepOptions": {
-    "message": "Bi urratseko egiaztatzearen aukerak"
+    "message": "Bi urratseko saio hasieraren aukerak"
   },
   "recoveryCodeDesc": {
     "message": "Bi urratseko egiaztatzeko modu guztietarako sarbidea galdu duzu? Erabili zure berreskuratze-kodea zure kontuko bi urratseko egiaztatze hornitzaile guztiak desaktibatzeko."
@@ -888,10 +888,10 @@
     "message": "Berreskuratze-kodea"
   },
   "authenticatorAppTitle": {
-    "message": "Baimentze aplikazioa"
+    "message": "Autentifikazio aplikazioa"
   },
   "authenticatorAppDesc": {
-    "message": "Erabili baimentze-aplikazio bat (adibidez, Authy edo Google Authenticator) denboran oinarritutako egiaztatze-kodeak sortzeko.",
+    "message": "Erabili autentifikazio aplikazio bat (adibidez, Authy edo Google Authenticator) denboran oinarritutako egiaztatze-kodeak sortzeko.",
     "description": "'Authy' and 'Google Authenticator' are product names and should not be translated."
   },
   "yubiKeyTitle": {
@@ -1421,7 +1421,7 @@
     "message": "Elementua berreskuratua"
   },
   "vaultTimeoutLogOutConfirmation": {
-    "message": "Saioa ixteak kutxa gotorreko sarrera guztia kenduko du eta itxaronaldiaren ondoren lineako baimentzea eskatuko du. Ziur zaude hau egin nahi duzula?"
+    "message": "Saioa ixteak kutxa gotorreko sarrera guztia kenduko du eta itxaronaldiaren ondoren lineako autentifikazioa eskatuko du. Ziur zaude hau egin nahi duzula?"
   },
   "vaultTimeoutLogOutConfirmationTitle": {
     "message": "Baieztatu itxarote denboraren ekintza"
@@ -1886,7 +1886,7 @@
     "message": "Ziur al zaude erakundea utzi nahi duzula?"
   },
   "leftOrganization": {
-    "message": "Erakundea utzi egin duzu."
+    "message": "Erakundea utzi duzu."
   },
   "toggleCharacterCount": {
     "message": "Karaktere kontaketak txandakatu"
@@ -1969,9 +1969,12 @@
     "message": "Errore bat gertatu da konektore giltzan: ziurtatu giltza konektorea erabilgarri dagoela eta behar bezala dabilela."
   },
   "organizationIsDisabled": {
-    "message": "Organization is disabled."
+    "message": "Erakundea desgaituta dago."
   },
   "disabledOrganizationFilterError": {
-    "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+    "message": "Ezin da sartu desgaitutako erakundeetako elementuetara. Laguntza lortzeko, jarri harremanetan zure erakundearekin."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/fa/messages.json

@@ -430,7 +430,7 @@
     "message": "تایپ مجدد گذرواژه اصلی نیاز است."
   },
   "masterPasswordMinlength": {
-    "message": "Master password must be at least 8 characters long."
+    "message": "طول کلمه عبور اصلی باید حداقل ۸ کاراکتر باشد."
   },
   "masterPassDoesntMatch": {
     "message": "کلمه عبور اصلی با تکرار کلمه عبور اصلی مطابقت ندارد."
@@ -1969,9 +1969,12 @@
     "message": "خطای Key Connector: مطمئن شوید که Key Connector در دسترس است و به درستی کار می کند."
   },
   "organizationIsDisabled": {
-    "message": "Organization is disabled."
+    "message": "سازمان از کار افتاده است."
   },
   "disabledOrganizationFilterError": {
-    "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+    "message": "موارد موجود در سازمان‌های غیرفعال، قابل دسترسی نیستند. برای دریافت کمک با مالک سازمان خود تماس بگیرید."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/fi/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Käytöstä poistettujen organisaatioiden kohteet eivät ole käytettävissä. Ole yhteydessä organisaation omistajaan saadaksesi apua."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/fil/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/fr/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/he/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/hi/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/hr/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/hu/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "A letiltott szervezetek elemei nem érhetők el. Vegyük fel a kapcsolatot a szervezet tulajdonosával segítségért."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/id/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/it/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Non è possibile accedere agli oggetti nelle organizzazioni disabilitate. Contatta il proprietario della tua organizzazione per ricevere assistenza."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/ja/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "無効な組織のアイテムにアクセスすることはできません。組織の所有者に連絡してください。"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/ka/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/km/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/kn/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/ko/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/lt/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/lv/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Atspējotu apvienību vienumiem nevar piekļūt. Jāsazinās ar apvienības īpašnieku, lai iegūtu palīdzību."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/ml/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/nb/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/nl/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Je kunt uitgeschakelde items in een organisatie niet benaderen. Neem contact op met de eigenaar van je organisatie voor hulp."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/nn/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/pl/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Nie można uzyskać dostępu do elementów w wyłączonych organizacjach. Skontaktuj się z właścicielem organizacji, aby uzyskać pomoc."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/pt_BR/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/pt_PT/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/ro/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Articolele din Organizațiile dezactivate nu pot fi accesate. Contactați proprietarul Organizației pentru asistență."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/ru/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Доступ к элементам в отключенных организациях невозможен. Обратитесь за помощью к владельцу организации."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/si/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/sk/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "K položkám vo vypnutej organizácii nie je možné pristupovať. Požiadajte o pomoc vlastníka organizácie."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/sl/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/sr/messages.json

@@ -1969,9 +1969,12 @@
     "message": "Key Connector грешка: будите сигурни да је Key Connector доступан и да ради."
   },
   "organizationIsDisabled": {
-    "message": "Organization is disabled."
+    "message": "Организација је онемогућена."
   },
   "disabledOrganizationFilterError": {
-    "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+    "message": "Није могуће приступити ставкама у онемогућене организације. Обратите се власнику организације за помоћ."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/sv/messages.json

@@ -424,13 +424,13 @@
     "message": "Ogiltig e-postadress."
   },
   "masterPasswordRequired": {
-    "message": "Master password is required."
+    "message": "Huvudlösenord krävs."
   },
   "confirmMasterPasswordRequired": {
-    "message": "Master password retype is required."
+    "message": "Huvudlösenord måste anges igen."
   },
   "masterPasswordMinlength": {
-    "message": "Master password must be at least 8 characters long."
+    "message": "Huvudlösenordet måste vara minst 8 tecken långt."
   },
   "masterPassDoesntMatch": {
     "message": "Bekräftelsen för huvudlösenordet stämde ej."
@@ -571,7 +571,7 @@
     "description": "This is the folder for uncategorized items"
   },
   "enableAddLoginNotification": {
-    "message": "Ask to add login"
+    "message": "Be om att lägga till inloggning"
   },
   "addLoginNotificationDesc": {
     "message": "Aviseringar för nya inloggningar frågar dig om du vill lägga till en inloggning automatiskt till ditt valv, när du använder en inloggning som inte redan finns i ditt valv."
@@ -603,10 +603,10 @@
     "message": "Spara"
   },
   "enableChangedPasswordNotification": {
-    "message": "Ask to update existing login"
+    "message": "Be om att uppdatera befintlig inloggning"
   },
   "changedPasswordNotificationDesc": {
-    "message": "Ask to update a login's password when a change is detected on a website."
+    "message": "Be om att uppdatera ett lösenord när en ändring upptäcks på en webbplats."
   },
   "notificationChangeDesc": {
     "message": "Vill du uppdatera det här lösenordet i Bitwarden?"
@@ -615,7 +615,7 @@
     "message": "Uppdatera"
   },
   "enableContextMenuItem": {
-    "message": "Show context menu options"
+    "message": "Visa alternativ för snabbmenyn"
   },
   "contextMenuItemDesc": {
     "message": "Use a secondary click to access password generation and matching logins for the website. "
@@ -810,13 +810,13 @@
     "message": "Uppdatering färdig"
   },
   "enableAutoTotpCopy": {
-    "message": "Copy TOTP automatically"
+    "message": "Kopiera TOTP automatiskt"
   },
   "disableAutoTotpCopyDesc": {
     "message": "Om din inloggning har en autentiseringsnyckel kopplad till den, kommer TOTP-verifieringskoden att automatiskt kopieras till urklipp när du automatiskt fyller i inloggningen."
   },
   "enableAutoBiometricsPrompt": {
-    "message": "Ask for biometrics on launch"
+    "message": "Be om biometri vid start"
   },
   "premiumRequired": {
     "message": "Premium krävs"
@@ -1037,16 +1037,16 @@
     "message": "Den här webbläsaren kan inte bearbeta U2F-förfrågningar i detta popup-fönster. Vill du öppna ett nytt fönster så att du kan logga in med U2F?"
   },
   "enableFavicon": {
-    "message": "Show website icons"
+    "message": "Visa webbplatsikoner"
   },
   "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+    "message": "Visa en identifierbar bild bredvid varje inloggning."
   },
   "enableBadgeCounter": {
-    "message": "Show badge counter"
+    "message": "Visa aktivitetsräknaren"
   },
   "badgeCounterDesc": {
-    "message": "Indicate how many logins you have for the current web page."
+    "message": "Visa hur många inloggningar du har för den aktuella webbsidan."
   },
   "cardholderName": {
     "message": "Kortinnehavarens namn"
@@ -1484,7 +1484,7 @@
     "message": "Genom att markera denna ruta godkänner du följande:"
   },
   "acceptPoliciesRequired": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "Användarvillkoren och Integritetspolicyn har inte accepterats."
   },
   "termsOfService": {
     "message": "Användarvillkor"
@@ -1850,7 +1850,7 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "Ditt valvs tidsgräns överskrider de begränsningar som fastställts av din organisation."
   },
   "vaultExportDisabled": {
     "message": "Valvexport inaktiverad"
@@ -1969,9 +1969,12 @@
     "message": "Key Connector-fel: säkerställ att Key Connector är tillgänglig och fungerar korrekt."
   },
   "organizationIsDisabled": {
-    "message": "Organization is disabled."
+    "message": "Organisationen är inaktiverad."
   },
   "disabledOrganizationFilterError": {
-    "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+    "message": "Objekt i inaktiverade organisationer är inte åtkomliga. Kontakta organisationens ägare för att få hjälp."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/th/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/tr/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Devre dışı kuruluşlardaki kayıtlara erişilemez. Destek almak için kuruluş sahibinizle iletişime geçin."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/uk/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Записи у вимкнених організаціях недоступні. Зверніться до власника вашої організації для отримання допомоги."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/vi/messages.json

@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/zh_CN/messages.json

@@ -618,7 +618,7 @@
     "message": "显示上下文菜单选项"
   },
   "contextMenuItemDesc": {
-    "message": "使用辅助点击来访问网站的密码生成和匹配的登录项目。 "
+    "message": "使用辅助点击来访问密码生成和匹配的网站登录项目。 "
   },
   "defaultUriMatchDetection": {
     "message": "默认 URI 匹配检测",
@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "无法访问已禁用组织中的项目。请联系您的组织所有者获取协助。"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/_locales/zh_TW/messages.json

@@ -618,7 +618,7 @@
     "message": "顯示內容選單選項"
   },
   "contextMenuItemDesc": {
-    "message": "使用輔助點選（右鍵選單）來存取網站的密碼產生和匹配的登入項目。 "
+    "message": "使用輔助點選（右鍵選單）來存取密碼產生和匹配的網站登入項目。 "
   },
   "defaultUriMatchDetection": {
     "message": "預設的 URI 一致性偵測",
@@ -1973,5 +1973,8 @@
   },
   "disabledOrganizationFilterError": {
     "message": "無法存取已停用組織中的項目。請聯絡您組織的擁有者以獲取協助。"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/browser/src/background/main.background.ts

@@ -517,7 +517,7 @@ export default class MainBackground {
   }
 
   async bootstrap() {
-    this.containerService.attachToWindow(window);
+    this.containerService.attachToGlobal(window);
 
     await this.stateService.init();
 

apps/browser/src/browser/browserApi.ts

@@ -156,7 +156,7 @@ export class BrowserApi {
 
   static reloadExtension(win: Window) {
     if (win != null) {
-      return win.location.reload(true);
+      return (win.location as any).reload(true);
     } else {
       return chrome.runtime.reload();
     }

apps/browser/src/notification/bar.scss

@@ -87,7 +87,7 @@ button.neutral {
   }
 }
 
-@media (print) {
+@media print {
   body {
     display: none;
   }

apps/browser/src/popup/accounts/environment.component.html

@@ -1,13 +1,13 @@
 <form #form (ngSubmit)="submit()">
   <header>
     <div class="left">
-      <a routerLink="/home">{{ "close" | i18n }}</a>
+      <button type="button" routerLink="/home">{{ "close" | i18n }}</button>
     </div>
     <h1 class="center">
       <span class="title">{{ "appName" | i18n }}</span>
     </h1>
     <div class="right">
-      <button type="submit" appBlurClick [disabled]="form.loading">
+      <button type="submit" [disabled]="form.loading">
         <span [hidden]="form.loading">{{ "save" | i18n }}</span>
         <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!form.loading" aria-hidden="true"></i>
       </button>

apps/browser/src/popup/accounts/hint.component.html

@@ -1,13 +1,13 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise">
   <header>
     <div class="left">
-      <a routerLink="/login">{{ "cancel" | i18n }}</a>
+      <button type="button" routerLink="/login">{{ "cancel" | i18n }}</button>
     </div>
     <h1 class="center">
       <span class="title">{{ "passwordHint" | i18n }}</span>
     </h1>
     <div class="right">
-      <button type="submit" appBlurClick [disabled]="form.loading">
+      <button type="submit" [disabled]="form.loading">
         <span [hidden]="form.loading">{{ "submit" | i18n }}</span>
         <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!form.loading" aria-hidden="true"></i>
       </button>

apps/browser/src/popup/accounts/home.component.html

@@ -2,15 +2,17 @@
   <div class="content">
     <div class="logo-image"></div>
     <p class="lead text-center">{{ "loginOrCreateNewAccount" | i18n }}</p>
-    <a class="btn primary block" routerLink="/login"
+    <button type="button" class="btn primary block" routerLink="/login">
-      ><b>{{ "login" | i18n }}</b></a
+      <b>{{ "login" | i18n }}</b>
-    >
+    </button>
     <button type="button" (click)="launchSsoBrowser()" class="btn block">
       <i class="bwi bwi-bank" aria-hidden="true"></i> {{ "enterpriseSingleSignOn" | i18n }}
     </button>
-    <a class="btn block" routerLink="/register">{{ "createAccount" | i18n }}</a>
+    <button type="button" class="btn block" routerLink="/register">
+      {{ "createAccount" | i18n }}
+    </button>
   </div>
 </div>
-<a routerLink="/environment" class="settings-icon">
+<button type="button" routerLink="/environment" class="settings-icon">
   <i class="bwi bwi-cog-f bwi-lg" aria-hidden="true"></i><span>&nbsp;{{ "settings" | i18n }}</span>
-</a>
+</button>

apps/browser/src/popup/accounts/lock.component.html

@@ -5,7 +5,7 @@
       <span class="title">{{ "verifyIdentity" | i18n }}</span>
     </h1>
     <div class="right">
-      <button type="submit" appBlurClick *ngIf="!hideInput">{{ "unlock" | i18n }}</button>
+      <button type="submit" *ngIf="!hideInput">{{ "unlock" | i18n }}</button>
     </div>
   </header>
   <main tabindex="-1">
@@ -41,7 +41,6 @@
               type="button"
               class="row-btn"
               appStopClick
-              appBlurClick
               appA11yTitle="{{ 'toggleVisibility' | i18n }}"
               (click)="togglePassword()"
               [attr.aria-pressed]="showPassword"

apps/browser/src/popup/accounts/login.component.html

@@ -1,13 +1,13 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise">
   <header>
     <div class="left">
-      <a routerLink="/home">{{ "cancel" | i18n }}</a>
+      <button type="button" routerLink="/home">{{ "cancel" | i18n }}</button>
     </div>
     <h1 class="center">
       <span class="title">{{ "appName" | i18n }}</span>
     </h1>
     <div class="right">
-      <button type="submit" appBlurClick [disabled]="form.loading">
+      <button type="submit" [disabled]="form.loading">
         <span [hidden]="form.loading">{{ "login" | i18n }}</span>
         <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!form.loading" aria-hidden="true"></i>
       </button>
@@ -46,7 +46,6 @@
               type="button"
               class="row-btn"
               appStopClick
-              appBlurClick
               appA11yTitle="{{ 'toggleVisibility' | i18n }}"
               (click)="togglePassword()"
               [attr.aria-pressed]="showPassword"
@@ -65,7 +64,7 @@
       </div>
     </div>
     <p class="text-center">
-      <a routerLink="/hint">{{ "getMasterPasswordHint" | i18n }}</a>
+      <button type="button" routerLink="/hint">{{ "getMasterPasswordHint" | i18n }}</button>
     </p>
     <app-private-mode-warning></app-private-mode-warning>
   </main>

apps/browser/src/popup/accounts/register.component.html

@@ -1,13 +1,13 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise" [formGroup]="formGroup">
   <header>
     <div class="left">
-      <a routerLink="/home">{{ "cancel" | i18n }}</a>
+      <button type="button" routerLink="/home">{{ "cancel" | i18n }}</button>
     </div>
     <h1 class="center">
       <span class="title">{{ "createAccount" | i18n }}</span>
     </h1>
     <div class="right">
-      <button type="submit" appBlurClick [disabled]="form.loading">
+      <button type="submit" [disabled]="form.loading">
         <span [hidden]="form.loading">{{ "submit" | i18n }}</span>
         <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!form.loading" aria-hidden="true"></i>
       </button>
@@ -46,7 +46,6 @@
                 type="button"
                 class="row-btn"
                 appStopClick
-                appBlurClick
                 appA11yTitle="{{ 'toggleVisibility' | i18n }}"
                 (click)="togglePassword()"
                 [attr.aria-pressed]="showPassword"
@@ -94,7 +93,6 @@
               type="button"
               class="row-btn"
               appStopClick
-              appBlurClick
               appA11yTitle="{{ 'toggleVisibility' | i18n }}"
               (click)="togglePassword()"
               [attr.aria-pressed]="showPassword"

apps/browser/src/popup/accounts/register.component.ts

@@ -1,5 +1,5 @@
 import { Component } from "@angular/core";
-import { FormBuilder } from "@angular/forms";
+import { UntypedFormBuilder } from "@angular/forms";
 import { Router } from "@angular/router";
 
 import { RegisterComponent as BaseRegisterComponent } from "@bitwarden/angular/components/register.component";
@@ -21,7 +21,7 @@ import { StateService } from "@bitwarden/common/abstractions/state.service";
 export class RegisterComponent extends BaseRegisterComponent {
   constructor(
     formValidationErrorService: FormValidationErrorsService,
-    formBuilder: FormBuilder,
+    formBuilder: UntypedFormBuilder,
     authService: AuthService,
     router: Router,
     i18nService: I18nService,

apps/browser/src/popup/accounts/set-password.component.html

@@ -1,13 +1,13 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise">
   <header>
     <div class="left">
-      <a routerLink="/home">{{ "cancel" | i18n }}</a>
+      <button type="button" routerLink="/home">{{ "cancel" | i18n }}</button>
     </div>
     <h1 class="center">
       <span class="title">{{ "setMasterPassword" | i18n }}</span>
     </h1>
     <div class="right">
-      <button type="submit" appBlurClick [disabled]="form.loading">
+      <button type="submit" [disabled]="form.loading">
         <span [hidden]="form.loading">{{ "submit" | i18n }}</span>
         <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!form.loading" aria-hidden="true"></i>
       </button>
@@ -64,7 +64,6 @@
                   type="button"
                   class="row-btn"
                   appStopClick
-                  appBlurClick
                   appA11yTitle="{{ 'toggleVisibility' | i18n }}"
                   (click)="togglePassword(false)"
                   [attr.aria-pressed]="showPassword"
@@ -116,7 +115,6 @@
                   type="button"
                   class="row-btn"
                   appStopClick
-                  appBlurClick
                   appA11yTitle="{{ 'toggleVisibility' | i18n }}"
                   (click)="togglePassword(true)"
                   [attr.aria-pressed]="showPassword"

apps/browser/src/popup/accounts/two-factor-options.component.html

@@ -1,6 +1,6 @@
 <header>
   <div class="left">
-    <a routerLink="/2fa">{{ "close" | i18n }}</a>
+    <button type="button" routerLink="/2fa">{{ "close" | i18n }}</button>
   </div>
   <h1 class="center">
     <span class="title">{{ "twoStepOptions" | i18n }}</span>

apps/browser/src/popup/accounts/two-factor.component.html

@@ -1,7 +1,7 @@
 <form id="two-factor-page" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
   <header>
     <div class="left">
-      <a routerLink="/login">{{ "back" | i18n }}</a>
+      <button type="button" routerLink="/login">{{ "back" | i18n }}</button>
     </div>
     <h1 class="center">
       <span class="title">{{ title }}</span>
@@ -9,7 +9,6 @@
     <div class="right">
       <button
         type="submit"
-        appBlurClick
         [disabled]="form.loading"
         *ngIf="
           selectedProviderType != null &&

apps/browser/src/popup/accounts/update-temp-password.component.html

@@ -7,7 +7,7 @@
       <span class="title">{{ "updateMasterPassword" | i18n }}</span>
     </h1>
     <div class="right">
-      <button type="submit" appBlurClick [disabled]="form.loading">
+      <button type="submit" [disabled]="form.loading">
         <span [hidden]="form.loading">{{ "submit" | i18n }}</span>
         <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!form.loading" aria-hidden="true"></i>
       </button>
@@ -53,7 +53,6 @@
                 type="button"
                 class="row-btn"
                 appStopClick
-                appBlurClick
                 appA11yTitle="{{ 'toggleVisibility' | i18n }}"
                 (click)="togglePassword(false)"
                 [attr.aria-pressed]="showPassword"
@@ -100,7 +99,6 @@
               type="button"
               class="row-btn"
               appStopClick
-              appBlurClick
               appA11yTitle="{{ 'toggleVisibility' | i18n }}"
               (click)="togglePassword(true)"
               [attr.aria-pressed]="showPassword"

apps/browser/src/popup/app.module.ts

@@ -239,7 +239,6 @@ registerLocaleData(localeZhTw, "zh-TW");
     RemovePasswordComponent,
     VaultSelectComponent,
   ],
-  entryComponents: [],
   providers: [CurrencyPipe, DatePipe],
   bootstrap: [AppComponent],
 })

apps/browser/src/popup/components/password-reprompt.component.html

@@ -23,7 +23,6 @@
                   type="button"
                   class="row-btn"
                   appStopClick
-                  appBlurClick
                   appA11yTitle="{{ 'toggleVisibility' | i18n }}"
                   (click)="togglePassword()"
                   [attr.aria-pressed]="showPassword"
@@ -43,7 +42,7 @@
         </div>
       </div>
       <div class="modal-footer">
-        <button type="submit" class="btn btn-primary btn-submit" appBlurClick>
+        <button type="submit" class="btn btn-primary btn-submit">
           <span>{{ "ok" | i18n }}</span>
         </button>
         <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">

apps/browser/src/popup/components/set-pin.component.html

@@ -25,7 +25,6 @@
                   type="button"
                   class="row-btn"
                   appStopClick
-                  appBlurClick
                   appA11yTitle="{{ 'toggleVisibility' | i18n }}"
                   (click)="toggleVisibility()"
                   [attr.aria-pressed]="showPin"
@@ -53,7 +52,7 @@
         </div>
       </div>
       <div class="modal-footer">
-        <button type="submit" class="btn btn-primary btn-submit" appBlurClick>
+        <button type="submit" class="btn btn-primary btn-submit">
           <span>{{ "ok" | i18n }}</span>
         </button>
         <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">

apps/browser/src/popup/generator/generator.component.html

@@ -1,7 +1,7 @@
 <header>
   <div class="left">
     <app-pop-out [show]="!comingFromAddEdit"></app-pop-out>
-    <button type="button" appBlurClick (click)="close()" *ngIf="comingFromAddEdit">
+    <button type="button" (click)="close()" *ngIf="comingFromAddEdit">
       {{ "cancel" | i18n }}
     </button>
   </div>
@@ -9,7 +9,7 @@
     <span class="title">{{ "generator" | i18n }}</span>
   </h1>
   <div class="right">
-    <button type="button" appBlurClick (click)="select()" *ngIf="comingFromAddEdit">
+    <button type="button" (click)="select()" *ngIf="comingFromAddEdit">
       {{ "select" | i18n }}
     </button>
   </div>
@@ -33,7 +33,6 @@
       <button
         type="button"
         appStopClick
-        appBlurClick
         appA11yTitle="{{ 'regeneratePassword' | i18n }}"
         (click)="regenerate()"
       >
@@ -56,7 +55,6 @@
       <button
         type="button"
         appStopClick
-        appBlurClick
         appA11yTitle="{{ 'regenerateUsername' | i18n }}"
         (click)="regenerate()"
         [disabled]="form.loading"

apps/browser/src/popup/generator/password-generator-history.component.html

@@ -1,6 +1,6 @@
 <header>
   <div class="left">
-    <button type="button" appBlurClick type="button" (click)="close()">
+    <button type="button" type="button" (click)="close()">
       <span class="header-icon" aria-hidden="true"><i class="bwi bwi-angle-left"></i></span>
       <span>{{ "back" | i18n }}</span>
     </button>
@@ -9,7 +9,7 @@
     <span class="title">{{ "passwordHistory" | i18n }}</span>
   </h1>
   <div class="right">
-    <button type="button" appBlurClick type="button" (click)="clear()">
+    <button type="button" type="button" (click)="clear()">
       {{ "clear" | i18n }}
     </button>
   </div>

apps/browser/src/popup/polyfills.ts

@@ -1,4 +1,3 @@
 import "core-js/stable";
 import "date-input-polyfill";
-import "web-animations-js";
 import "zone.js/dist/zone";

apps/browser/src/popup/scss/pages.scss

@@ -56,7 +56,7 @@ app-home {
     margin-top: 10px;
   }
 
-  a.settings-icon {
+  button.settings-icon {
     position: absolute;
     top: 10px;
     left: 10px;

apps/browser/src/popup/scss/popup.scss

@@ -11,4 +11,4 @@
 @import "plugins.scss";
 @import "environment.scss";
 @import "pages.scss";
-@import "~@angular/cdk/overlay-prebuilt.css";
+@import "@angular/cdk/overlay-prebuilt.css";

apps/browser/src/popup/send/send-add-edit.component.html

@@ -1,13 +1,13 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise">
   <header>
     <div class="left">
-      <button type="button" appBlurClick (click)="cancel()">{{ "cancel" | i18n }}</button>
+      <button type="button" (click)="cancel()">{{ "cancel" | i18n }}</button>
     </div>
     <h1 class="center">
       <span class="title">{{ title }}</span>
     </h1>
     <div class="right">
-      <button type="submit" appBlurClick [disabled]="form.loading || disableSend">
+      <button type="submit" [disabled]="form.loading || disableSend">
         <span [hidden]="form.loading">{{ "save" | i18n }}</span>
         <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!form.loading" aria-hidden="true"></i>
       </button>
@@ -226,7 +226,6 @@
                 type="button"
                 class="row-btn"
                 appStopClick
-                appBlurClick
                 appA11yTitle="{{ 'toggleVisibility' | i18n }}"
                 (click)="togglePasswordVisible()"
                 [attr.aria-pressed]="showPassword"
@@ -300,7 +299,6 @@
           type="button"
           class="box-content-row"
           appStopClick
-          appBlurClick
           (click)="delete()"
           [appApiAction]="deletePromise"
           #deleteBtn

apps/browser/src/popup/send/send-groupings.component.html

@@ -18,7 +18,6 @@
   <div class="right">
     <button
       type="button"
-      appBlurClick
       (click)="addSend()"
       appA11yTitle="{{ 'addSend' | i18n }}"
       [disabled]="disableSend"
@@ -56,7 +55,6 @@
           type="button"
           class="box-content-row"
           appStopClick
-          appBlurClick
           (click)="selectType(sendType.Text)"
         >
           <div class="row-main">
@@ -70,7 +68,6 @@
           type="button"
           class="box-content-row"
           appStopClick
-          appBlurClick
           (click)="selectType(sendType.File)"
         >
           <div class="row-main">

apps/browser/src/popup/send/send-type.component.html

@@ -1,6 +1,6 @@
 <header>
   <div class="left">
-    <button type="button" appBlurClick (click)="back()">
+    <button type="button" (click)="back()">
       <span class="header-icon"><i class="bwi bwi-angle-left" aria-hidden="true"></i></span>
       <span>{{ "back" | i18n }}</span>
     </button>
@@ -21,7 +21,6 @@
   <div class="right">
     <button
       type="button"
-      appBlurClick
       (click)="addSend()"
       appA11yTitle="{{ 'addSend' | i18n }}"
       [disabled]="disableSend"

apps/browser/src/popup/settings/excluded-domains.component.html

@@ -1,16 +1,16 @@
 <form #form (ngSubmit)="submit()">
   <header>
     <div class="left">
-      <a routerLink="/tabs/settings">
+      <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>
-      </a>
+      </button>
     </div>
     <h1 class="center">
       <span class="title">{{ "excludedDomains" | i18n }}</span>
     </h1>
     <div class="right">
-      <button type="submit" appBlurClick>{{ "save" | i18n }}</button>
+      <button type="submit">{{ "save" | i18n }}</button>
     </div>
   </header>
   <main tabindex="-1">
@@ -73,7 +73,6 @@
         <button
           type="button"
           appStopClick
-          appBlurClick
           (click)="addUri()"
           class="box-content-row box-content-row-newmulti"
         >

apps/browser/src/popup/settings/excluded-domains.component.ts

@@ -22,6 +22,7 @@ const BroadcasterSubscriptionId = "excludedDomains";
 })
 export class ExcludedDomainsComponent implements OnInit, OnDestroy {
   excludedDomains: ExcludedDomain[] = [];
+  existingExcludedDomains: ExcludedDomain[] = [];
   currentUris: string[];
   loadCurrentUrisTimeout: number;
 
@@ -39,6 +40,7 @@ export class ExcludedDomainsComponent implements OnInit, OnDestroy {
     if (savedDomains) {
       for (const uri of Object.keys(savedDomains)) {
         this.excludedDomains.push({ uri: uri, showCurrentUris: false });
+        this.existingExcludedDomains.push({ uri: uri, showCurrentUris: false });
       }
     }
 
@@ -78,20 +80,27 @@ export class ExcludedDomainsComponent implements OnInit, OnDestroy {
 
   async submit() {
     const savedDomains: { [name: string]: null } = {};
+    const newExcludedDomains = this.getNewlyAddedDomians(this.excludedDomains);
     for (const domain of this.excludedDomains) {
-      if (domain.uri && domain.uri !== "") {
+      const resp = newExcludedDomains.filter((e) => e.uri === domain.uri);
-        const validDomain = Utils.getHostname(domain.uri);
+      if (resp.length === 0) {
-        if (!validDomain) {
+        savedDomains[domain.uri] = null;
-          this.platformUtilsService.showToast(
+      } else {
-            "error",
+        if (domain.uri && domain.uri !== "") {
-            null,
+          const validDomain = Utils.getHostname(domain.uri);
-            this.i18nService.t("excludedDomainsInvalidDomain", domain.uri)
+          if (!validDomain) {
-          );
+            this.platformUtilsService.showToast(
-          return;
+              "error",
+              null,
+              this.i18nService.t("excludedDomainsInvalidDomain", domain.uri)
+            );
+            return;
+          }
+          savedDomains[validDomain] = null;
         }
-        savedDomains[validDomain] = null;
       }
     }
+
     await this.stateService.setNeverDomains(savedDomains);
     this.router.navigate(["/tabs/settings"]);
   }
@@ -100,6 +109,14 @@ export class ExcludedDomainsComponent implements OnInit, OnDestroy {
     return index;
   }
 
+  getNewlyAddedDomians(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;
   }

apps/browser/src/popup/settings/export.component.html

@@ -1,16 +1,16 @@
 <form (ngSubmit)="submit()" [formGroup]="exportForm">
   <header>
     <div class="left">
-      <a routerLink="/tabs/settings">
+      <button type="button" routerLink="/tabs/settings">
         <span class="header-icon" aria-hidden="true"><i class="bwi bwi-angle-left"></i></span>
         <span>{{ "back" | i18n }}</span>
-      </a>
+      </button>
     </div>
     <h1 class="center">
       <span class="title">{{ "exportVault" | i18n }}</span>
     </h1>
     <div class="right">
-      <button appBlurClick type="submit" [disabled]="!exportForm.enabled">
+      <button type="submit" [disabled]="!exportForm.enabled">
         {{ "submit" | i18n }}
       </button>
     </div>

apps/browser/src/popup/settings/export.component.ts

@@ -1,5 +1,5 @@
 import { Component } from "@angular/core";
-import { FormBuilder } from "@angular/forms";
+import { UntypedFormBuilder } from "@angular/forms";
 import { Router } from "@angular/router";
 
 import { ExportComponent as BaseExportComponent } from "@bitwarden/angular/components/export.component";
@@ -28,7 +28,7 @@ export class ExportComponent extends BaseExportComponent {
     private router: Router,
     logService: LogService,
     userVerificationService: UserVerificationService,
-    formBuilder: FormBuilder,
+    formBuilder: UntypedFormBuilder,
     fileDownloadService: FileDownloadService
   ) {
     super(

apps/browser/src/popup/settings/folder-add-edit.component.html

@@ -1,13 +1,13 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise">
   <header>
     <div class="left">
-      <a routerLink="/folders">{{ "cancel" | i18n }}</a>
+      <button type="button" routerLink="/folders">{{ "cancel" | i18n }}</button>
     </div>
     <h1 class="center">
       <span class="title">{{ title }}</span>
     </h1>
     <div class="right">
-      <button type="submit" appBlurClick [disabled]="form.loading">
+      <button type="submit" [disabled]="form.loading">
         <span [hidden]="form.loading">{{ "save" | i18n }}</span>
         <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!form.loading" aria-hidden="true"></i>
       </button>
@@ -34,7 +34,6 @@
           type="button"
           class="box-content-row"
           appStopClick
-          appBlurClick
           (click)="delete()"
           [appApiAction]="deletePromise"
           #deleteBtn

apps/browser/src/popup/settings/folders.component.html

@@ -1,20 +1,15 @@
 <header>
   <div class="left">
-    <a routerLink="/tabs/settings">
+    <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>
-    </a>
+    </button>
   </div>
   <h1 class="center">
     <span class="title">{{ "folders" | i18n }}</span>
   </h1>
   <div class="right">
-    <button
+    <button type="button" (click)="addFolder()" appA11yTitle="{{ 'addFolder' | i18n }}">
-      type="button"
-      appBlurClick
-      (click)="addFolder()"
-      appA11yTitle="{{ 'addFolder' | i18n }}"
-    >
       <i class="bwi bwi-plus bwi-lg bwi-fw" aria-hidden="true"></i>
     </button>
   </div>

apps/browser/src/popup/settings/options.component.html

@@ -1,9 +1,9 @@
 <header>
   <div class="left">
-    <a routerLink="/tabs/settings">
+    <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>
-    </a>
+    </button>
   </div>
   <h1 class="center">
     <span class="title">{{ "options" | i18n }}</span>

apps/browser/src/popup/settings/premium.component.html

@@ -1,9 +1,9 @@
 <header>
   <div class="left">
-    <a routerLink="/tabs/settings">
+    <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>
-    </a>
+    </button>
   </div>
   <h1 class="center">
     <span class="title">{{ "premiumMembership" | i18n }}</span>
@@ -42,13 +42,12 @@
         </li>
       </ul>
       <p class="text-center lead">{{ priceString }}</p>
-      <button type="button" class="btn primary block" appBlurClick (click)="purchase()">
+      <button type="button" class="btn primary block" (click)="purchase()">
         <b>{{ "premiumPurchase" | i18n }}</b>
       </button>
       <button
         #refreshBtn
         type="button"
-        appBlurClick
         (click)="refresh()"
         [disabled]="refreshBtn.loading"
         [appApiAction]="refreshPromise"
@@ -65,7 +64,7 @@
     <ng-container *ngIf="isPremium">
       <p class="text-center lead">{{ "premiumCurrentMember" | i18n }}</p>
       <p class="text-center">{{ "premiumCurrentMemberThanks" | i18n }}</p>
-      <button type="button" class="btn block primary" appBlurClick (click)="manage()">
+      <button type="button" class="btn block primary" (click)="manage()">
         <b>{{ "premiumManage" | i18n }}</b>
       </button>
     </ng-container>