From d994faa8a606c7d5c773a6cd532582c5575857ac Mon Sep 17 00:00:00 2001
From: Oscar Hinton <Hinton@users.noreply.github.com>
Date: Mon, 28 Nov 2022 18:59:46 +0100
Subject: [PATCH] [SM-252] Enable strict templates (#3601)

---
 .../accounts/set-password.component.html      | 11 ++----
 .../popup/accounts/two-factor.component.html  |  4 +-
 .../popup/generator/generator.component.html  |  4 +-
 .../popup/send/send-add-edit.component.html   |  7 +++-
 .../settings/folder-add-edit.component.html   |  7 +++-
 .../src/popup/settings/premium.component.html |  6 +--
 .../src/popup/settings/sync.component.html    | 10 +++--
 .../add-edit-custom-fields.component.html     |  4 +-
 .../src/popup/vault/add-edit.component.html   | 27 +++++++------
 .../popup/vault/attachments.component.html    |  6 +--
 .../popup/vault/collections.component.html    |  2 +-
 .../src/popup/vault/current-tab.component.ts  |  2 +-
 .../popup/vault/vault-select.component.html   |  8 +---
 .../src/popup/vault/view.component.html       | 10 ++---
 apps/browser/tsconfig.json                    |  1 +
 .../src/app/accounts/premium.component.html   |  8 ++--
 .../app/accounts/two-factor.component.html    |  2 +-
 .../src/app/components/avatar.component.ts    |  9 +----
 .../layout/account-switcher.component.html    |  4 +-
 .../src/app/send/add-edit.component.html      | 10 +++--
 .../src/app/send/efflux-dates.component.html  |  1 -
 .../add-edit-custom-fields.component.html     |  4 +-
 .../src/app/vault/add-edit.component.html     | 38 +++++++++++++------
 .../src/app/vault/attachments.component.html  |  6 +--
 .../src/app/vault/collections.component.html  |  2 +-
 .../app/vault/folder-add-edit.component.html  |  6 +--
 .../src/app/vault/generator.component.html    |  4 +-
 .../organization-filter.component.html        |  1 -
 .../desktop/src/app/vault/view.component.html | 10 ++---
 apps/desktop/tsconfig.json                    |  1 +
 .../src/app/accounts/register.component.html  |  2 +-
 .../vertical-stepper.component.ts             |  6 ++-
 .../app/accounts/two-factor.component.html    |  2 +-
 .../user-verification.component.html          |  0
 .../components/user-verification.component.ts | 23 +++++++++++
 .../organization-subscription.component.html  | 10 ++---
 .../access-selector.component.html            | 10 +++--
 .../manage/collection-add-edit.component.html | 16 ++++----
 .../manage/entity-events.component.html       |  6 +--
 .../manage/events.component.html              |  2 +-
 .../manage/group-add-edit.component.html      | 12 +++---
 .../manage/user-add-edit.component.html       | 12 +++---
 .../manage/user-groups.component.html         |  2 +-
 .../policies/policies.component.ts            |  2 +-
 .../organization-billing.component.ts         |  0
 .../organizations/vault/add-edit.component.ts |  2 -
 .../vault/vault-items.component.ts            |  5 +--
 .../organizations/vault/vault.component.html  |  2 +-
 .../app/organizations/vault/vault.module.ts   |  3 +-
 .../pages/weak-passwords-report.component.ts  |  5 ++-
 .../report-card/report-card.component.ts      |  4 +-
 apps/web/src/app/send/access.component.html   |  2 +-
 apps/web/src/app/send/add-edit.component.html | 17 +++------
 .../src/app/send/efflux-dates.component.html  |  3 --
 apps/web/src/app/send/send.component.html     |  2 +-
 .../emergency-access-add-edit.component.html  |  6 +--
 .../organization-plans.component.html         | 19 ----------
 .../sponsoring-org-row.component.html         |  4 +-
 .../two-factor-authenticator.component.html   |  2 +-
 .../settings/two-factor-duo.component.html    |  2 +-
 .../settings/two-factor-email.component.html  |  4 +-
 .../two-factor-recovery.component.html        |  7 +---
 .../two-factor-webauthn.component.html        | 15 ++++----
 .../two-factor-yubikey.component.html         |  4 +-
 .../settings/user-subscription.component.html |  4 +-
 .../app/settings/verify-email.component.html  |  2 +-
 .../src/app/shared/loose-components.module.ts | 12 +-----
 .../src/app/tools/generator.component.html    |  2 +-
 .../tools/import-export/export.component.html |  3 +-
 .../tools/import-export/import.component.html |  2 +
 .../add-edit-custom-fields.component.html     |  4 +-
 .../web/src/app/vault/add-edit.component.html | 12 +++---
 .../src/app/vault/attachments.component.html  | 16 +++++---
 .../src/app/vault/bulk-share.component.html   |  2 +-
 .../src/app/vault/collections.component.html  |  2 +-
 .../app/vault/folder-add-edit.component.html  |  6 +--
 .../organization-filter.component.html        |  1 -
 .../shared/vault-filter-shared.module.ts      |  9 +++++
 .../vault/vault-filter/vault-filter.module.ts | 10 +----
 .../src/app/vault/vault-items.component.html  |  2 +-
 .../src/app/vault/vault-items.component.ts    |  4 ++
 apps/web/src/app/vault/vault.component.html   |  2 +-
 apps/web/tsconfig.json                        |  1 +
 .../organizations/manage/scim.component.html  |  4 +-
 .../app/organizations/manage/sso.component.ts | 10 ++---
 .../providers/manage/events.component.html    |  2 +-
 .../providers/manage/people.component.html    | 11 ------
 .../manage/user-add-edit.component.html       |  6 +--
 .../app/providers/setup/setup.component.html  |  3 --
 .../src/components/add-edit.component.ts      |  2 +
 .../src/components/attachments.component.ts   |  4 ++
 .../components/user-verification.component.ts | 20 ++--------
 .../src/components/vault-items.component.ts   |  3 ++
 libs/angular/src/pipes/i18n.pipe.ts           |  2 +-
 libs/common/src/abstractions/i18n.service.ts  |  2 +-
 libs/common/src/services/i18n.service.ts      |  8 ++--
 libs/components/src/badge/badge.directive.ts  |  2 +-
 97 files changed, 302 insertions(+), 301 deletions(-)
 rename {libs/angular/src => apps/web/src/app}/components/user-verification.component.html (100%)
 create mode 100644 apps/web/src/app/components/user-verification.component.ts
 delete mode 100644 apps/web/src/app/organizations/settings/organization-billing.component.ts

diff --git a/apps/browser/src/popup/accounts/set-password.component.html b/apps/browser/src/popup/accounts/set-password.component.html
index 517374578c..9eb551bf26 100644
--- a/apps/browser/src/popup/accounts/set-password.component.html
+++ b/apps/browser/src/popup/accounts/set-password.component.html
@@ -39,13 +39,10 @@
           <div class="box-content-row" appBoxRow>
             <div class="box-content-row-flex">
               <div class="row-main">
-                <label for="masterPassword"
-                  >{{ "masterPass" | i18n }}
-                  <strong
-                    class="sub-label text-{{ passwordStrengthComponent?.masterPasswordScoreColor }}"
-                    *ngIf="passwordStrengthComponent?.masterPasswordScoreText"
-                  >
-                    {{ passwordStrengthComponent?.masterPasswordScoreText }}
+                <label for="masterPassword">
+                  {{ "masterPass" | i18n }}
+                  <strong class="sub-label text-{{ color }}" *ngIf="text">
+                    {{ text }}
                   </strong>
                 </label>
                 <input
diff --git a/apps/browser/src/popup/accounts/two-factor.component.html b/apps/browser/src/popup/accounts/two-factor.component.html
index b2d017a9f9..71d7c2498d 100644
--- a/apps/browser/src/popup/accounts/two-factor.component.html
+++ b/apps/browser/src/popup/accounts/two-factor.component.html
@@ -86,7 +86,9 @@
       </div>
     </ng-container>
     <ng-container *ngIf="selectedProviderType === providerType.WebAuthn && !webAuthnNewTab">
-      <div id="web-authn-frame"><iframe id="webauthn_iframe" [allow]="webAuthnAllow"></iframe></div>
+      <div id="web-authn-frame">
+        <iframe id="webauthn_iframe" [attr.allow]="webAuthnAllow"></iframe>
+      </div>
       <div class="box">
         <div class="box-content">
           <div class="box-content-row box-content-row-checkbox" appBoxRow>
diff --git a/apps/browser/src/popup/generator/generator.component.html b/apps/browser/src/popup/generator/generator.component.html
index 1f0a0a328a..e0b230c6d8 100644
--- a/apps/browser/src/popup/generator/generator.component.html
+++ b/apps/browser/src/popup/generator/generator.component.html
@@ -57,11 +57,11 @@
         appStopClick
         appA11yTitle="{{ 'regenerateUsername' | i18n }}"
         (click)="regenerate()"
-        [disabled]="form.loading"
+        [disabled]="$any(form).loading"
       >
         <i
           class="bwi bwi-lg bwi-generate"
-          [ngClass]="form.loading ? 'bwi-spin' : ''"
+          [ngClass]="$any(form).loading ? 'bwi-spin' : ''"
           aria-hidden="true"
         ></i>
       </button>
diff --git a/apps/browser/src/popup/send/send-add-edit.component.html b/apps/browser/src/popup/send/send-add-edit.component.html
index fb1ba6b801..19e5c53512 100644
--- a/apps/browser/src/popup/send/send-add-edit.component.html
+++ b/apps/browser/src/popup/send/send-add-edit.component.html
@@ -305,8 +305,11 @@
         >
           <div class="row-main text-danger">
             <div class="icon text-danger" aria-hidden="true">
-              <i class="bwi bwi-trash bwi-lg bwi-fw" [hidden]="deleteBtn.loading"></i>
-              <i class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw" [hidden]="!deleteBtn.loading"></i>
+              <i class="bwi bwi-trash bwi-lg bwi-fw" [hidden]="$any(deleteBtn).loading"></i>
+              <i
+                class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
+                [hidden]="!$any(deleteBtn).loading"
+              ></i>
             </div>
             <span>{{ "deleteSend" | i18n }}</span>
           </div>
diff --git a/apps/browser/src/popup/settings/folder-add-edit.component.html b/apps/browser/src/popup/settings/folder-add-edit.component.html
index b8aa391f0f..3568a971b8 100644
--- a/apps/browser/src/popup/settings/folder-add-edit.component.html
+++ b/apps/browser/src/popup/settings/folder-add-edit.component.html
@@ -40,8 +40,11 @@
         >
           <div class="row-main text-danger">
             <div class="icon text-danger" aria-hidden="true">
-              <i class="bwi bwi-trash bwi-lg bwi-fw" [hidden]="deleteBtn.loading"></i>
-              <i class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw" [hidden]="!deleteBtn.loading"></i>
+              <i class="bwi bwi-trash bwi-lg bwi-fw" [hidden]="$any(deleteBtn).loading"></i>
+              <i
+                class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
+                [hidden]="!$any(deleteBtn).loading"
+              ></i>
             </div>
             <span>{{ "deleteFolder" | i18n }}</span>
           </div>
diff --git a/apps/browser/src/popup/settings/premium.component.html b/apps/browser/src/popup/settings/premium.component.html
index 01ac925813..a9a569ec17 100644
--- a/apps/browser/src/popup/settings/premium.component.html
+++ b/apps/browser/src/popup/settings/premium.component.html
@@ -49,14 +49,14 @@
         #refreshBtn
         type="button"
         (click)="refresh()"
-        [disabled]="refreshBtn.loading"
+        [disabled]="$any(refreshBtn).loading"
         [appApiAction]="refreshPromise"
         class="btn link block"
       >
-        <span [hidden]="refreshBtn.loading">{{ "premiumRefresh" | i18n }}</span>
+        <span [hidden]="$any(refreshBtn).loading">{{ "premiumRefresh" | i18n }}</span>
         <i
           class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-          [hidden]="!refreshBtn.loading"
+          [hidden]="!$any(refreshBtn).loading"
           aria-hidden="true"
         ></i>
       </button>
diff --git a/apps/browser/src/popup/settings/sync.component.html b/apps/browser/src/popup/settings/sync.component.html
index c28302291f..ffa0b1ec66 100644
--- a/apps/browser/src/popup/settings/sync.component.html
+++ b/apps/browser/src/popup/settings/sync.component.html
@@ -17,11 +17,15 @@
       class="btn block primary"
       (click)="sync()"
       #syncBtn
-      [disabled]="syncBtn.loading"
+      [disabled]="$any(syncBtn).loading"
       [appApiAction]="syncPromise"
     >
-      <span [hidden]="syncBtn.loading">{{ "syncVaultNow" | i18n }}</span>
-      <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!syncBtn.loading" aria-hidden="true"></i>
+      <span [hidden]="$any(syncBtn).loading">{{ "syncVaultNow" | i18n }}</span>
+      <i
+        class="bwi bwi-spinner bwi-lg bwi-spin"
+        [hidden]="!$any(syncBtn).loading"
+        aria-hidden="true"
+      ></i>
     </button>
     <p class="text-center text-muted small">{{ "lastSync" | i18n }} {{ lastSync }}</p>
   </div>
diff --git a/apps/browser/src/popup/vault/add-edit-custom-fields.component.html b/apps/browser/src/popup/vault/add-edit-custom-fields.component.html
index 8464655c20..42200f72fa 100644
--- a/apps/browser/src/popup/vault/add-edit-custom-fields.component.html
+++ b/apps/browser/src/popup/vault/add-edit-custom-fields.component.html
@@ -81,8 +81,8 @@
           [(ngModel)]="f.value"
           *ngIf="f.type === fieldType.Boolean"
           appTrueFalseValue
-          trueValue="true"
-          falseValue="false"
+          [trueValue]="true"
+          [falseValue]="false"
           attr.aria-describedby="fieldName{{ i }}"
           [readonly]="!cipher.edit && editMode"
         />
diff --git a/apps/browser/src/popup/vault/add-edit.component.html b/apps/browser/src/popup/vault/add-edit.component.html
index 77c94c8108..069046f475 100644
--- a/apps/browser/src/popup/vault/add-edit.component.html
+++ b/apps/browser/src/popup/vault/add-edit.component.html
@@ -88,17 +88,17 @@
                 appA11yTitle="{{ 'checkPassword' | i18n }}"
                 (click)="checkPassword()"
                 [appApiAction]="checkPasswordPromise"
-                [disabled]="checkPasswordBtn.loading"
+                [disabled]="$any(checkPasswordBtn).loading"
                 *ngIf="cipher.viewPassword"
               >
                 <i
                   class="bwi bwi-lg bwi-check-circle"
-                  [hidden]="checkPasswordBtn.loading"
+                  [hidden]="$any(checkPasswordBtn).loading"
                   aria-hidden="true"
                 ></i>
                 <i
                   class="bwi bwi-lg bwi-spinner bwi-spin"
-                  [hidden]="!checkPasswordBtn.loading"
+                  [hidden]="!$any(checkPasswordBtn).loading"
                   aria-hidden="true"
                 ></i>
               </button>
@@ -487,7 +487,7 @@
                 type="text"
                 name="Login.Uris[{{ i }}].Uri"
                 [(ngModel)]="u.uri"
-                [hidden]="u.showUriOptionsInput === true"
+                [hidden]="$any(u).showUriOptionsInput === true"
                 placeholder="{{ 'ex' | i18n }} https://google.com"
                 inputmode="url"
                 appInputVerbatim
@@ -500,7 +500,7 @@
                 id="currentUris{{ i }}"
                 name="Login.Uris[{{ i }}].CurrentUris"
                 [(ngModel)]="u.uri"
-                [hidden]="!u.showCurrentUris"
+                [hidden]="!$any(u).showCurrentUris"
               >
                 <option [ngValue]="null">-- {{ "select" | i18n }} --</option>
                 <option *ngFor="let u of currentUris" [ngValue]="u">{{ u }}</option>
@@ -512,7 +512,9 @@
                 id="loginUriMatch{{ i }}"
                 name="Login.Uris[{{ i }}].Match"
                 [(ngModel)]="u.match"
-                [hidden]="u.showOptions === false || (u.showOptions == null && u.match == null)"
+                [hidden]="
+                  $any(u).showOptions === false || ($any(u).showOptions == null && u.match == null)
+                "
                 (change)="loginUriMatchChanged(u)"
               >
                 <option *ngFor="let o of uriMatchOptions" [ngValue]="o.value">{{ o.name }}</option>
@@ -526,7 +528,7 @@
                 appStopClick
                 appA11yTitle="{{ 'toggleCurrentUris' | i18n }}"
                 (click)="toggleUriInput(u)"
-                [attr.aria-pressed]="u.showCurrentUris === true"
+                [attr.aria-pressed]="$any(u).showCurrentUris === true"
               >
                 <i aria-hidden="true" class="bwi bwi-lg bwi-list"></i>
               </button>
@@ -536,7 +538,7 @@
                 appStopClick
                 appA11yTitle="{{ 'toggleOptions' | i18n }}"
                 (click)="toggleUriOptions(u)"
-                [attr.aria-pressed]="u.showOptions === true"
+                [attr.aria-pressed]="$any(u).showOptions === true"
               >
                 <i class="bwi bwi-lg bwi-cog" aria-hidden="true"></i>
               </button>
@@ -695,7 +697,7 @@
           <input
             id="collection_{{ i }}"
             type="checkbox"
-            [(ngModel)]="c.checked"
+            [(ngModel)]="$any(c).checked"
             name="Collection[{{ i }}].Checked"
           />
         </div>
@@ -713,8 +715,11 @@
         >
           <div class="row-main text-danger">
             <div class="icon text-danger" aria-hidden="true">
-              <i class="bwi bwi-trash bwi-lg bwi-fw" [hidden]="deleteBtn.loading"></i>
-              <i class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw" [hidden]="!deleteBtn.loading"></i>
+              <i class="bwi bwi-trash bwi-lg bwi-fw" [hidden]="$any(deleteBtn).loading"></i>
+              <i
+                class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
+                [hidden]="!$any(deleteBtn).loading"
+              ></i>
             </div>
             <span>{{ "deleteItem" | i18n }}</span>
           </div>
diff --git a/apps/browser/src/popup/vault/attachments.component.html b/apps/browser/src/popup/vault/attachments.component.html
index 8ae4e49a69..0101fb60e0 100644
--- a/apps/browser/src/popup/vault/attachments.component.html
+++ b/apps/browser/src/popup/vault/attachments.component.html
@@ -37,16 +37,16 @@
               (click)="delete(a)"
               #deleteBtn
               [appApiAction]="deletePromises[a.id]"
-              [disabled]="deleteBtn.loading"
+              [disabled]="$any(deleteBtn).loading"
             >
               <i
                 class="bwi bwi-trash bwi-lg bwi-fw"
-                [hidden]="deleteBtn.loading"
+                [hidden]="$any(deleteBtn).loading"
                 aria-hidden="true"
               ></i>
               <i
                 class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-                [hidden]="!deleteBtn.loading"
+                [hidden]="!$any(deleteBtn).loading"
                 aria-hidden="true"
               ></i>
             </button>
diff --git a/apps/browser/src/popup/vault/collections.component.html b/apps/browser/src/popup/vault/collections.component.html
index d8bcf9a029..36c1336c5b 100644
--- a/apps/browser/src/popup/vault/collections.component.html
+++ b/apps/browser/src/popup/vault/collections.component.html
@@ -33,7 +33,7 @@
           <input
             id="collection_{{ i }}"
             type="checkbox"
-            [(ngModel)]="c.checked"
+            [(ngModel)]="$any(c).checked"
             name="Collection[{{ i }}].Checked"
           />
         </div>
diff --git a/apps/browser/src/popup/vault/current-tab.component.ts b/apps/browser/src/popup/vault/current-tab.component.ts
index 48b22a518f..fd0e356476 100644
--- a/apps/browser/src/popup/vault/current-tab.component.ts
+++ b/apps/browser/src/popup/vault/current-tab.component.ts
@@ -200,7 +200,7 @@ export class CurrentTabComponent implements OnInit, OnDestroy {
     }
   }
 
-  private async load() {
+  protected async load() {
     this.isLoading = false;
     this.tab = await BrowserApi.getTabFromCurrentWindow();
     if (this.tab != null) {
diff --git a/apps/browser/src/popup/vault/vault-select.component.html b/apps/browser/src/popup/vault/vault-select.component.html
index f57056feb5..8ef8c2dc04 100644
--- a/apps/browser/src/popup/vault/vault-select.component.html
+++ b/apps/browser/src/popup/vault/vault-select.component.html
@@ -27,11 +27,7 @@
         role="dialog"
         aria-modal="true"
       >
-        <button
-          appStopClick
-          (click)="selectAllVaults()"
-          [ngClass]="{ active: !myVaultOnly && !selectOrganizationId }"
-        >
+        <button appStopClick (click)="selectAllVaults()">
           <i class="bwi bwi-fw bwi-filter" aria-hidden="true"></i>
           &nbsp;{{ "allVaults" | i18n }}
         </button>
@@ -60,7 +56,7 @@
           <i
             *ngIf="!organization.enabled"
             class="bwi bwi-fw bwi-exclamation-triangle text-danger"
-            aria-label="{{ 'organizationIsDisabled' | i18n }}"
+            attr.aria-label="{{ 'organizationIsDisabled' | i18n }}"
             appA11yTitle="{{ 'organizationIsDisabled' | i18n }}"
           ></i>
         </button>
diff --git a/apps/browser/src/popup/vault/view.component.html b/apps/browser/src/popup/vault/view.component.html
index 73d75b662b..a7958b7608 100644
--- a/apps/browser/src/popup/vault/view.component.html
+++ b/apps/browser/src/popup/vault/view.component.html
@@ -88,17 +88,17 @@
               appA11yTitle="{{ 'checkPassword' | i18n }}"
               (click)="checkPassword()"
               [appApiAction]="checkPasswordPromise"
-              [disabled]="checkPasswordBtn.loading"
+              [disabled]="$any(checkPasswordBtn).loading"
               *ngIf="cipher.viewPassword"
             >
               <i
                 class="bwi bwi-lg bwi-check-circle"
-                [hidden]="checkPasswordBtn.loading"
+                [hidden]="$any(checkPasswordBtn).loading"
                 aria-hidden="true"
               ></i>
               <i
                 class="bwi bwi-lg bwi-spinner bwi-spin"
-                [hidden]="!checkPasswordBtn.loading"
+                [hidden]="!$any(checkPasswordBtn).loading"
                 aria-hidden="true"
               ></i>
             </button>
@@ -537,12 +537,12 @@
         <small class="row-sub-label">{{ attachment.sizeName }}</small>
         <i
           class="bwi bwi-download bwi-fw row-sub-icon"
-          *ngIf="!attachment.downloading"
+          *ngIf="!$any(attachment).downloading"
           aria-hidden="true"
         ></i>
         <i
           class="bwi bwi-spinner bwi-fw bwi-spin row-sub-icon"
-          *ngIf="attachment.downloading"
+          *ngIf="$any(attachment).downloading"
           aria-hidden="true"
         ></i>
       </button>
diff --git a/apps/browser/tsconfig.json b/apps/browser/tsconfig.json
index 70c40f52e6..446ac67c50 100644
--- a/apps/browser/tsconfig.json
+++ b/apps/browser/tsconfig.json
@@ -15,6 +15,7 @@
     }
   },
   "angularCompilerOptions": {
+    "strictTemplates": true,
     "preserveWhitespaces": true
   },
   "include": ["src", "../../libs/common/src/services/**/*.worker.ts"]
diff --git a/apps/desktop/src/app/accounts/premium.component.html b/apps/desktop/src/app/accounts/premium.component.html
index f47f377cff..4ac3cb422c 100644
--- a/apps/desktop/src/app/accounts/premium.component.html
+++ b/apps/desktop/src/app/accounts/premium.component.html
@@ -57,7 +57,7 @@
           class="primary"
           (click)="purchase()"
           *ngIf="!isPremium"
-          [disabled]="purchaseBtn.loading"
+          [disabled]="$any(purchaseBtn).loading"
         >
           <b>{{ "premiumPurchase" | i18n }}</b>
         </button>
@@ -67,18 +67,18 @@
             #refreshBtn
             type="button"
             (click)="refresh()"
-            [disabled]="refreshBtn.loading"
+            [disabled]="$any(refreshBtn).loading"
             appA11yTitle="{{ 'premiumRefresh' | i18n }}"
             [appApiAction]="refreshPromise"
           >
             <i
               class="bwi bwi-refresh bwi-lg bwi-fw"
-              [hidden]="refreshBtn.loading"
+              [hidden]="$any(refreshBtn).loading"
               aria-hidden="true"
             ></i>
             <i
               class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-              [hidden]="!refreshBtn.loading"
+              [hidden]="!$any(refreshBtn).loading"
               aria-hidden="true"
             ></i>
           </button>
diff --git a/apps/desktop/src/app/accounts/two-factor.component.html b/apps/desktop/src/app/accounts/two-factor.component.html
index dc67e4e0b4..8809ff2465 100644
--- a/apps/desktop/src/app/accounts/two-factor.component.html
+++ b/apps/desktop/src/app/accounts/two-factor.component.html
@@ -65,7 +65,7 @@
     </ng-container>
     <ng-container *ngIf="selectedProviderType === providerType.WebAuthn">
       <div id="web-authn-frame">
-        <iframe id="webauthn_iframe" [allow]="webAuthnAllow"></iframe>
+        <iframe id="webauthn_iframe" [attr.allow]="webAuthnAllow"></iframe>
       </div>
       <div class="box first">
         <div class="box-content">
diff --git a/apps/desktop/src/app/components/avatar.component.ts b/apps/desktop/src/app/components/avatar.component.ts
index b837c541eb..8caba7f459 100644
--- a/apps/desktop/src/app/components/avatar.component.ts
+++ b/apps/desktop/src/app/components/avatar.component.ts
@@ -5,12 +5,7 @@ import { Utils } from "@bitwarden/common/misc/utils";
 
 @Component({
   selector: "app-avatar",
-  template: `<img
-    *ngIf="src"
-    [src]="src"
-    title="{{ data }}"
-    [ngClass]="{ 'rounded-circle': circle }"
-  />`,
+  template: `<img *ngIf="src" [src]="src" [ngClass]="{ 'rounded-circle': circle }" />`,
 })
 export class AvatarComponent implements OnChanges, OnInit {
   @Input() size = 45;
@@ -20,7 +15,7 @@ export class AvatarComponent implements OnChanges, OnInit {
   @Input() circle = false;
 
   @Input() color?: string;
-  @Input() id?: number;
+  @Input() id?: string;
   @Input() text?: string;
 
   private svgCharCount = 2;
diff --git a/apps/desktop/src/app/layout/account-switcher.component.html b/apps/desktop/src/app/layout/account-switcher.component.html
index 4080b2e031..f361c09939 100644
--- a/apps/desktop/src/app/layout/account-switcher.component.html
+++ b/apps/desktop/src/app/layout/account-switcher.component.html
@@ -12,7 +12,7 @@
     <app-avatar
       [text]="activeAccount.name"
       [id]="activeAccount.id"
-      size="25"
+      [size]="25"
       [circle]="true"
       [fontSize]="14"
       [dynamic]="true"
@@ -61,7 +61,7 @@
         <app-avatar
           [text]="a.value.profile.name ?? a.value.profile.email"
           [id]="a.value.profile.userId"
-          size="25"
+          [size]="25"
           [circle]="true"
           [fontSize]="14"
           [dynamic]="true"
diff --git a/apps/desktop/src/app/send/add-edit.component.html b/apps/desktop/src/app/send/add-edit.component.html
index d61cbf9965..47c0d4ae00 100644
--- a/apps/desktop/src/app/send/add-edit.component.html
+++ b/apps/desktop/src/app/send/add-edit.component.html
@@ -35,7 +35,7 @@
                 name="Type_{{ o.value }}"
                 id="type_{{ o.value }}"
                 [value]="o.value"
-                (change)="typeChanged(o)"
+                (change)="typeChanged()"
                 [checked]="send.type === o.value"
                 [disabled]="disableSend"
               />
@@ -280,10 +280,14 @@
         appA11yTitle="{{ 'delete' | i18n }}"
         *ngIf="editMode"
       >
-        <i class="bwi bwi-trash bwi-lg bwi-fw" [hidden]="deleteBtn.loading" aria-hidden="true"></i>
+        <i
+          class="bwi bwi-trash bwi-lg bwi-fw"
+          [hidden]="$any(deleteBtn).loading"
+          aria-hidden="true"
+        ></i>
         <i
           class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-          [hidden]="!deleteBtn.loading"
+          [hidden]="!$any(deleteBtn).loading"
           aria-hidden="true"
         ></i>
       </button>
diff --git a/apps/desktop/src/app/send/efflux-dates.component.html b/apps/desktop/src/app/send/efflux-dates.component.html
index e0fc766b12..37eacad9dc 100644
--- a/apps/desktop/src/app/send/efflux-dates.component.html
+++ b/apps/desktop/src/app/send/efflux-dates.component.html
@@ -46,7 +46,6 @@
           formControlName="defaultExpirationDateTime"
           required
           placeholder="MM/DD/YYYY HH:MM AM/PM"
-          [readOnly]="disableSend"
         />
         <small *ngIf="editMode" class="help-block">{{ "expirationDateDesc" | i18n }}</small>
       </div>
diff --git a/apps/desktop/src/app/vault/add-edit-custom-fields.component.html b/apps/desktop/src/app/vault/add-edit-custom-fields.component.html
index c7efaad70b..a5cfefdcec 100644
--- a/apps/desktop/src/app/vault/add-edit-custom-fields.component.html
+++ b/apps/desktop/src/app/vault/add-edit-custom-fields.component.html
@@ -79,8 +79,8 @@
           [(ngModel)]="f.value"
           *ngIf="f.type === fieldType.Boolean"
           appTrueFalseValue
-          trueValue="true"
-          falseValue="false"
+          [trueValue]="true"
+          [falseValue]="false"
           attr.aria-describedby="fieldName{{ i }}"
           [readonly]="!cipher.edit && editMode"
         />
diff --git a/apps/desktop/src/app/vault/add-edit.component.html b/apps/desktop/src/app/vault/add-edit.component.html
index 25de9f6f7b..2bd1364448 100644
--- a/apps/desktop/src/app/vault/add-edit.component.html
+++ b/apps/desktop/src/app/vault/add-edit.component.html
@@ -75,16 +75,16 @@
                   appA11yTitle="{{ 'checkPassword' | i18n }}"
                   (click)="checkPassword()"
                   [appApiAction]="checkPasswordPromise"
-                  [disabled]="checkPasswordBtn.loading"
+                  [disabled]="$any(checkPasswordBtn).loading"
                 >
                   <i
                     class="bwi bwi-lg bwi-check-circle"
-                    [hidden]="checkPasswordBtn.loading"
+                    [hidden]="$any(checkPasswordBtn).loading"
                     aria-hidden="true"
                   ></i>
                   <i
                     class="bwi bwi-lg bwi-spinner bwi-spin"
-                    [hidden]="!checkPasswordBtn.loading"
+                    [hidden]="!$any(checkPasswordBtn).loading"
                     aria-hidden="true"
                   ></i>
                 </button>
@@ -485,7 +485,10 @@
                   id="loginUriMatch{{ i }}"
                   name="Login.Uris[{{ i }}].Match"
                   [(ngModel)]="u.match"
-                  [hidden]="u.showOptions === false || (u.showOptions == null && u.match == null)"
+                  [hidden]="
+                    $any(u).showOptions === false ||
+                    ($any(u).showOptions == null && u.match == null)
+                  "
                   (change)="loginUriMatchChanged(u)"
                 >
                   <option *ngFor="let o of uriMatchOptions" [ngValue]="o.value">
@@ -501,7 +504,10 @@
                   appA11yTitle="{{ 'toggleOptions' | i18n }}"
                   (click)="toggleUriOptions(u)"
                   [attr.aria-expanded]="
-                    !(u.showOptions === false || (u.showOptions == null && u.match == null))
+                    !(
+                      $any(u).showOptions === false ||
+                      ($any(u).showOptions == null && u.match == null)
+                    )
                   "
                 >
                   <i class="bwi bwi-lg bwi-cog" aria-hidden="true"></i>
@@ -634,7 +640,7 @@
             <input
               id="collection_{{ i }}"
               type="checkbox"
-              [(ngModel)]="c.checked"
+              [(ngModel)]="$any(c).checked"
               name="Collection[{{ i }}].Checked"
             />
           </div>
@@ -647,12 +653,16 @@
       type="submit"
       class="primary"
       appA11yTitle="{{ 'save' | i18n }}"
-      [disabled]="form.loading"
+      [disabled]="$any(form).loading"
     >
-      <i class="bwi bwi-save-changes bwi-lg bwi-fw" [hidden]="form.loading" aria-hidden="true"></i>
+      <i
+        class="bwi bwi-save-changes bwi-lg bwi-fw"
+        [hidden]="$any(form).loading"
+        aria-hidden="true"
+      ></i>
       <i
         class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-        [hidden]="!form.loading"
+        [hidden]="!$any(form).loading"
         aria-hidden="true"
       ></i>
     </button>
@@ -675,13 +685,17 @@
         class="danger"
         appA11yTitle="{{ 'delete' | i18n }}"
         *ngIf="editMode && !cloneMode"
-        [disabled]="deleteBtn.loading"
+        [disabled]="$any(deleteBtn).loading"
         [appApiAction]="deletePromise"
       >
-        <i class="bwi bwi-trash bwi-lg bwi-fw" [hidden]="deleteBtn.loading" aria-hidden="true"></i>
+        <i
+          class="bwi bwi-trash bwi-lg bwi-fw"
+          [hidden]="$any(deleteBtn).loading"
+          aria-hidden="true"
+        ></i>
         <i
           class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-          [hidden]="!deleteBtn.loading"
+          [hidden]="!$any(deleteBtn).loading"
           aria-hidden="true"
         ></i>
       </button>
diff --git a/apps/desktop/src/app/vault/attachments.component.html b/apps/desktop/src/app/vault/attachments.component.html
index 8a7cb93ce5..0248d78b02 100644
--- a/apps/desktop/src/app/vault/attachments.component.html
+++ b/apps/desktop/src/app/vault/attachments.component.html
@@ -21,16 +21,16 @@
                   (click)="delete(a)"
                   #deleteBtn
                   [appApiAction]="deletePromises[a.id]"
-                  [disabled]="deleteBtn.loading"
+                  [disabled]="$any(deleteBtn).loading"
                 >
                   <i
                     class="bwi bwi-trash bwi-lg bwi-fw"
-                    [hidden]="deleteBtn.loading"
+                    [hidden]="$any(deleteBtn).loading"
                     aria-hidden="true"
                   ></i>
                   <i
                     class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-                    [hidden]="!deleteBtn.loading"
+                    [hidden]="!$any(deleteBtn).loading"
                     aria-hidden="true"
                   ></i>
                 </button>
diff --git a/apps/desktop/src/app/vault/collections.component.html b/apps/desktop/src/app/vault/collections.component.html
index 047bd77d80..113ebe5ff9 100644
--- a/apps/desktop/src/app/vault/collections.component.html
+++ b/apps/desktop/src/app/vault/collections.component.html
@@ -19,7 +19,7 @@
               <input
                 id="collection_{{ i }}"
                 type="checkbox"
-                [(ngModel)]="c.checked"
+                [(ngModel)]="$any(c).checked"
                 name="Collection[{{ i }}].Checked"
               />
             </div>
diff --git a/apps/desktop/src/app/vault/folder-add-edit.component.html b/apps/desktop/src/app/vault/folder-add-edit.component.html
index ea7303dceb..4e9adec817 100644
--- a/apps/desktop/src/app/vault/folder-add-edit.component.html
+++ b/apps/desktop/src/app/vault/folder-add-edit.component.html
@@ -47,17 +47,17 @@
             class="danger"
             appA11yTitle="{{ 'delete' | i18n }}"
             *ngIf="editMode"
-            [disabled]="deleteBtn.loading"
+            [disabled]="$any(deleteBtn).loading"
             [appApiAction]="deletePromise"
           >
             <i
               class="bwi bwi-trash bwi-lg bwi-fw"
-              [hidden]="deleteBtn.loading"
+              [hidden]="$any(deleteBtn).loading"
               aria-hidden="true"
             ></i>
             <i
               class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-              [hidden]="!deleteBtn.loading"
+              [hidden]="!$any(deleteBtn).loading"
               aria-hidden="true"
             ></i>
           </button>
diff --git a/apps/desktop/src/app/vault/generator.component.html b/apps/desktop/src/app/vault/generator.component.html
index 6111bcc3c6..bddaa7d343 100644
--- a/apps/desktop/src/app/vault/generator.component.html
+++ b/apps/desktop/src/app/vault/generator.component.html
@@ -52,11 +52,11 @@
               appStopClick
               appA11yTitle="{{ 'regenerateUsername' | i18n }}"
               (click)="regenerate()"
-              [disabled]="form.loading"
+              [disabled]="$any(form).loading"
             >
               <i
                 class="bwi bwi-lg bwi-generate"
-                [ngClass]="form.loading ? 'bwi-spin' : ''"
+                [ngClass]="$any(form).loading ? 'bwi-spin' : ''"
                 aria-hidden="true"
               ></i>
             </button>
diff --git a/apps/desktop/src/app/vault/vault-filter/filters/organization-filter.component.html b/apps/desktop/src/app/vault/vault-filter/filters/organization-filter.component.html
index 3663b69fc4..dbba1353c9 100644
--- a/apps/desktop/src/app/vault/vault-filter/filters/organization-filter.component.html
+++ b/apps/desktop/src/app/vault/vault-filter/filters/organization-filter.component.html
@@ -112,7 +112,6 @@
               <i
                 *ngIf="!organization.enabled"
                 class="bwi bwi-fw bwi-exclamation-triangle text-danger mr-auto"
-                aria-label="{{ 'organizationIsDisabled' | i18n }}"
                 appA11yTitle="{{ 'organizationIsDisabled' | i18n }}"
               ></i>
             </span>
diff --git a/apps/desktop/src/app/vault/view.component.html b/apps/desktop/src/app/vault/view.component.html
index 8b1b044574..5b3896f68e 100644
--- a/apps/desktop/src/app/vault/view.component.html
+++ b/apps/desktop/src/app/vault/view.component.html
@@ -64,16 +64,16 @@
                 appA11yTitle="{{ 'checkPassword' | i18n }}"
                 (click)="checkPassword()"
                 [appApiAction]="checkPasswordPromise"
-                [disabled]="checkPasswordBtn.loading"
+                [disabled]="$any(checkPasswordBtn).loading"
               >
                 <i
                   class="bwi bwi-lg bwi-check-circle"
-                  [hidden]="checkPasswordBtn.loading"
+                  [hidden]="$any(checkPasswordBtn).loading"
                   aria-hidden="true"
                 ></i>
                 <i
                   class="bwi bwi-lg bwi-spinner bwi-spin"
-                  [hidden]="!checkPasswordBtn.loading"
+                  [hidden]="!$any(checkPasswordBtn).loading"
                   aria-hidden="true"
                 ></i>
               </button>
@@ -472,12 +472,12 @@
           <small class="row-sub-label">{{ attachment.sizeName }}</small>
           <i
             class="bwi bwi-download bwi-fw row-sub-icon"
-            *ngIf="!attachment.downloading"
+            *ngIf="!$any(attachment).downloading"
             aria-hidden="true"
           ></i>
           <i
             class="bwi bwi-spinner bwi-fw bwi-spin row-sub-icon"
-            *ngIf="attachment.downloading"
+            *ngIf="$any(attachment).downloading"
             aria-hidden="true"
           ></i>
         </button>
diff --git a/apps/desktop/tsconfig.json b/apps/desktop/tsconfig.json
index f2f28c7306..74b0670b3e 100644
--- a/apps/desktop/tsconfig.json
+++ b/apps/desktop/tsconfig.json
@@ -16,6 +16,7 @@
     }
   },
   "angularCompilerOptions": {
+    "strictTemplates": true,
     "preserveWhitespaces": true
   },
   "include": ["src", "../../libs/common/src/services/**/*.worker.ts"]
diff --git a/apps/web/src/app/accounts/register.component.html b/apps/web/src/app/accounts/register.component.html
index ed492a6bb8..8a68d32b03 100644
--- a/apps/web/src/app/accounts/register.component.html
+++ b/apps/web/src/app/accounts/register.component.html
@@ -55,7 +55,7 @@
           <!-- Teams & Enterprise Body -->
           <div *ngIf="layout === 'teams1' || layout === 'teams2' || layout === 'enterprise2'">
             <h1>
-              Start Your <span *ngIf="layout === 'teams1' || layout === 'teams1'">Teams<br /></span
+              Start Your <span *ngIf="layout === 'teams1'">Teams<br /></span
               ><span *ngIf="layout === 'enterprise2'">Enterprise</span> Free Trial Now
             </h1>
             <h2>
diff --git a/apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-stepper.component.ts b/apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-stepper.component.ts
index 2c66dae7be..745bb5767f 100644
--- a/apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-stepper.component.ts
+++ b/apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-stepper.component.ts
@@ -1,5 +1,7 @@
 import { CdkStepper } from "@angular/cdk/stepper";
-import { Component, Input } from "@angular/core";
+import { Component, Input, QueryList } from "@angular/core";
+
+import { VerticalStep } from "./vertical-step.component";
 
 @Component({
   selector: "app-vertical-stepper",
@@ -7,6 +9,8 @@ import { Component, Input } from "@angular/core";
   providers: [{ provide: CdkStepper, useExisting: VerticalStepperComponent }],
 })
 export class VerticalStepperComponent extends CdkStepper {
+  readonly steps: QueryList<VerticalStep>;
+
   @Input()
   activeClass = "active";
 
diff --git a/apps/web/src/app/accounts/two-factor.component.html b/apps/web/src/app/accounts/two-factor.component.html
index 835fd12e78..94066d684b 100644
--- a/apps/web/src/app/accounts/two-factor.component.html
+++ b/apps/web/src/app/accounts/two-factor.component.html
@@ -80,7 +80,7 @@
           </ng-container>
           <ng-container *ngIf="selectedProviderType === providerType.WebAuthn">
             <div id="web-authn-frame" class="mb-3">
-              <iframe id="webauthn_iframe" [allow]="webAuthnAllow"></iframe>
+              <iframe id="webauthn_iframe" [attr.allow]="webAuthnAllow"></iframe>
             </div>
           </ng-container>
           <ng-container
diff --git a/libs/angular/src/components/user-verification.component.html b/apps/web/src/app/components/user-verification.component.html
similarity index 100%
rename from libs/angular/src/components/user-verification.component.html
rename to apps/web/src/app/components/user-verification.component.html
diff --git a/apps/web/src/app/components/user-verification.component.ts b/apps/web/src/app/components/user-verification.component.ts
new file mode 100644
index 0000000000..2eb89c2833
--- /dev/null
+++ b/apps/web/src/app/components/user-verification.component.ts
@@ -0,0 +1,23 @@
+import { animate, style, transition, trigger } from "@angular/animations";
+import { Component } from "@angular/core";
+import { NG_VALUE_ACCESSOR } from "@angular/forms";
+
+import { UserVerificationComponent as BaseComponent } from "@bitwarden/angular/components/user-verification.component";
+
+@Component({
+  selector: "app-user-verification",
+  templateUrl: "user-verification.component.html",
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      multi: true,
+      useExisting: UserVerificationComponent,
+    },
+  ],
+  animations: [
+    trigger("sent", [
+      transition(":enter", [style({ opacity: 0 }), animate("100ms", style({ opacity: 1 }))]),
+    ]),
+  ],
+})
+export class UserVerificationComponent extends BaseComponent {}
diff --git a/apps/web/src/app/organizations/billing/organization-subscription.component.html b/apps/web/src/app/organizations/billing/organization-subscription.component.html
index 2b5f50a8b6..1ebda8f76c 100644
--- a/apps/web/src/app/organizations/billing/organization-subscription.component.html
+++ b/apps/web/src/app/organizations/billing/organization-subscription.component.html
@@ -44,7 +44,7 @@
       class="btn btn-outline-secondary btn-submit"
       (click)="reinstate()"
       [appApiAction]="reinstatePromise"
-      [disabled]="reinstateBtn.loading"
+      [disabled]="$any(reinstateBtn).loading"
     >
       <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
       <span>{{ "reinstateSubscription" | i18n }}</span>
@@ -113,8 +113,8 @@
       </button>
       <app-change-plan
         [organizationId]="organizationId"
-        (onChanged)="closeChangePlan(true)"
-        (onCanceled)="closeChangePlan(false)"
+        (onChanged)="closeChangePlan()"
+        (onCanceled)="closeChangePlan()"
         *ngIf="showChangePlan"
       ></app-change-plan>
     </ng-container>
@@ -143,7 +143,7 @@
       class="btn btn-outline-danger btn-submit"
       (click)="removeSponsorship()"
       [appApiAction]="removeSponsorshipPromise"
-      [disabled]="removeSponsorshipBtn.loading"
+      [disabled]="$any(removeSponsorshipBtn).loading"
       *ngIf="isSponsoredSubscription"
     >
       <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
@@ -230,7 +230,7 @@
         class="btn btn-outline-danger btn-submit ml-1"
         (click)="cancel()"
         [appApiAction]="cancelPromise"
-        [disabled]="cancelBtn.loading"
+        [disabled]="$any(cancelBtn).loading"
         *ngIf="subscription && !subscription.cancelled && !subscriptionMarkedForCancel"
       >
         <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
diff --git a/apps/web/src/app/organizations/components/access-selector/access-selector.component.html b/apps/web/src/app/organizations/components/access-selector/access-selector.component.html
index 10390b3e05..cc4d1d7fa7 100644
--- a/apps/web/src/app/organizations/components/access-selector/access-selector.component.html
+++ b/apps/web/src/app/organizations/components/access-selector/access-selector.component.html
@@ -53,11 +53,13 @@
           <div class="tw-flex tw-flex-col">
             <div class="tw-text-sm">
               {{ item.labelName }}
-              <span *ngIf="item.status == 0" bitBadge badgeType="secondary">
+              <span *ngIf="$any(item).status == 0" bitBadge badgeType="secondary">
                 {{ "invited" | i18n }}
               </span>
             </div>
-            <div class="tw-text-xs tw-text-muted" *ngIf="item.status != 0">{{ item.email }}</div>
+            <div class="tw-text-xs tw-text-muted" *ngIf="$any(item).status != 0">
+              {{ $any(item).email }}
+            </div>
           </div>
         </div>
 
@@ -110,11 +112,11 @@
       </td>
 
       <td bitCell *ngIf="showMemberRoles">
-        {{ item.role | userType: "-" }}
+        {{ $any(item).role | userType: "-" }}
       </td>
 
       <td bitCell *ngIf="showGroupColumn">
-        {{ item.viaGroupName ?? "-" }}
+        {{ $any(item).viaGroupName ?? "-" }}
       </td>
 
       <td bitCell>
diff --git a/apps/web/src/app/organizations/manage/collection-add-edit.component.html b/apps/web/src/app/organizations/manage/collection-add-edit.component.html
index 97c973a419..41368d589a 100644
--- a/apps/web/src/app/organizations/manage/collection-add-edit.component.html
+++ b/apps/web/src/app/organizations/manage/collection-add-edit.component.html
@@ -81,7 +81,7 @@
                 <td class="table-list-checkbox" (click)="check(g)">
                   <input
                     type="checkbox"
-                    [(ngModel)]="g.checked"
+                    [(ngModel)]="$any(g).checked"
                     name="Groups[{{ i }}].Checked"
                     [disabled]="g.accessAll || !this.canSave"
                     appStopProp
@@ -101,17 +101,17 @@
                 <td class="text-center">
                   <input
                     type="checkbox"
-                    [(ngModel)]="g.hidePasswords"
+                    [(ngModel)]="$any(g).hidePasswords"
                     name="Groups[{{ i }}].HidePasswords"
-                    [disabled]="!g.checked || g.accessAll || !this.canSave"
+                    [disabled]="!$any(g).checked || g.accessAll || !this.canSave"
                   />
                 </td>
                 <td class="text-center">
                   <input
                     type="checkbox"
-                    [(ngModel)]="g.readOnly"
+                    [(ngModel)]="$any(g).readOnly"
                     name="Groups[{{ i }}].ReadOnly"
-                    [disabled]="!g.checked || g.accessAll || !this.canSave"
+                    [disabled]="!$any(g).checked || g.accessAll || !this.canSave"
                   />
                 </td>
               </tr>
@@ -140,17 +140,17 @@
             class="btn btn-outline-danger"
             appA11yTitle="{{ 'delete' | i18n }}"
             *ngIf="editMode"
-            [disabled]="deleteBtn.loading"
+            [disabled]="$any(deleteBtn).loading"
             [appApiAction]="deletePromise"
           >
             <i
               class="bwi bwi-trash bwi-lg bwi-fw"
-              [hidden]="deleteBtn.loading"
+              [hidden]="$any(deleteBtn).loading"
               aria-hidden="true"
             ></i>
             <i
               class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-              [hidden]="!deleteBtn.loading"
+              [hidden]="!$any(deleteBtn).loading"
               title="{{ 'loading' | i18n }}"
               aria-hidden="true"
             ></i>
diff --git a/apps/web/src/app/organizations/manage/entity-events.component.html b/apps/web/src/app/organizations/manage/entity-events.component.html
index 122d0b8188..b41e6f3ba1 100644
--- a/apps/web/src/app/organizations/manage/entity-events.component.html
+++ b/apps/web/src/app/organizations/manage/entity-events.component.html
@@ -52,11 +52,11 @@
             type="button"
             class="btn btn-sm btn-outline-primary ml-3"
             (click)="loadEvents(true)"
-            [disabled]="loaded && refreshBtn.loading"
+            [disabled]="loaded && $any(refreshBtn).loading"
           >
             <i
               class="bwi bwi-refresh bwi-fw"
-              [ngClass]="{ 'bwi-spin': loaded && refreshBtn.loading }"
+              [ngClass]="{ 'bwi-spin': loaded && $any(refreshBtn).loading }"
               aria-hidden="true"
             ></i>
             {{ "refresh" | i18n }}
@@ -101,7 +101,7 @@
           type="button"
           class="btn btn-block btn-link btn-submit"
           (click)="loadEvents(false)"
-          [disabled]="loaded && moreBtn.loading"
+          [disabled]="loaded && $any(moreBtn).loading"
           *ngIf="continuationToken"
         >
           <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
diff --git a/apps/web/src/app/organizations/manage/events.component.html b/apps/web/src/app/organizations/manage/events.component.html
index a7468bcf37..e2c03f0dde 100644
--- a/apps/web/src/app/organizations/manage/events.component.html
+++ b/apps/web/src/app/organizations/manage/events.component.html
@@ -95,7 +95,7 @@
     bitButton
     buttonType="primary"
     (click)="loadEvents(false)"
-    [disabled]="loaded && moreBtn.loading"
+    [disabled]="loaded && $any(moreBtn).loading"
     *ngIf="continuationToken"
   >
     <i
diff --git a/apps/web/src/app/organizations/manage/group-add-edit.component.html b/apps/web/src/app/organizations/manage/group-add-edit.component.html
index d1055d86e8..83db60051e 100644
--- a/apps/web/src/app/organizations/manage/group-add-edit.component.html
+++ b/apps/web/src/app/organizations/manage/group-add-edit.component.html
@@ -119,7 +119,7 @@
                 <td class="table-list-checkbox" (click)="check(c)">
                   <input
                     type="checkbox"
-                    [(ngModel)]="c.checked"
+                    [(ngModel)]="$any(c).checked"
                     name="Collection[{{ i }}].Checked"
                     appStopProp
                   />
@@ -132,7 +132,7 @@
                     type="checkbox"
                     [(ngModel)]="c.hidePasswords"
                     name="Collection[{{ i }}].HidePasswords"
-                    [disabled]="!c.checked"
+                    [disabled]="!$any(c).checked"
                   />
                 </td>
                 <td class="text-center">
@@ -140,7 +140,7 @@
                     type="checkbox"
                     [(ngModel)]="c.readOnly"
                     name="Collection[{{ i }}].ReadOnly"
-                    [disabled]="!c.checked"
+                    [disabled]="!$any(c).checked"
                   />
                 </td>
               </tr>
@@ -164,17 +164,17 @@
             class="btn btn-outline-danger"
             appA11yTitle="{{ 'delete' | i18n }}"
             *ngIf="editMode"
-            [disabled]="deleteBtn.loading"
+            [disabled]="$any(deleteBtn).loading"
             [appApiAction]="deletePromise"
           >
             <i
               class="bwi bwi-trash bwi-lg bwi-fw"
-              [hidden]="deleteBtn.loading"
+              [hidden]="$any(deleteBtn).loading"
               aria-hidden="true"
             ></i>
             <i
               class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-              [hidden]="!deleteBtn.loading"
+              [hidden]="!$any(deleteBtn).loading"
               aria-hidden="true"
               title="{{ 'loading' | i18n }}"
             ></i>
diff --git a/apps/web/src/app/organizations/manage/user-add-edit.component.html b/apps/web/src/app/organizations/manage/user-add-edit.component.html
index 7d15eaa22f..458d1d0bab 100644
--- a/apps/web/src/app/organizations/manage/user-add-edit.component.html
+++ b/apps/web/src/app/organizations/manage/user-add-edit.component.html
@@ -341,7 +341,7 @@
                 <td class="table-list-checkbox" (click)="check(c)">
                   <input
                     type="checkbox"
-                    [(ngModel)]="c.checked"
+                    [(ngModel)]="$any(c).checked"
                     name="Collection[{{ i }}].Checked"
                     appStopProp
                   />
@@ -354,7 +354,7 @@
                     type="checkbox"
                     [(ngModel)]="c.hidePasswords"
                     name="Collection[{{ i }}].HidePasswords"
-                    [disabled]="!c.checked"
+                    [disabled]="!$any(c).checked"
                   />
                 </td>
                 <td class="text-center">
@@ -362,7 +362,7 @@
                     type="checkbox"
                     [(ngModel)]="c.readOnly"
                     name="Collection[{{ i }}].ReadOnly"
-                    [disabled]="!c.checked"
+                    [disabled]="!$any(c).checked"
                   />
                 </td>
               </tr>
@@ -416,17 +416,17 @@
             class="btn btn-outline-danger"
             appA11yTitle="{{ 'delete' | i18n }}"
             *ngIf="editMode"
-            [disabled]="deleteBtn.loading"
+            [disabled]="$any(deleteBtn).loading"
             [appApiAction]="deletePromise"
           >
             <i
               class="bwi bwi-trash bwi-lg bwi-fw"
-              [hidden]="deleteBtn.loading"
+              [hidden]="$any(deleteBtn).loading"
               aria-hidden="true"
             ></i>
             <i
               class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-              [hidden]="!deleteBtn.loading"
+              [hidden]="!$any(deleteBtn).loading"
               title="{{ 'loading' | i18n }}"
               aria-hidden="true"
             ></i>
diff --git a/apps/web/src/app/organizations/manage/user-groups.component.html b/apps/web/src/app/organizations/manage/user-groups.component.html
index 347125e982..217af6ea44 100644
--- a/apps/web/src/app/organizations/manage/user-groups.component.html
+++ b/apps/web/src/app/organizations/manage/user-groups.component.html
@@ -34,7 +34,7 @@
               <td class="table-list-checkbox" (click)="check(g)">
                 <input
                   type="checkbox"
-                  [(ngModel)]="g.checked"
+                  [(ngModel)]="$any(g).checked"
                   name="Groups[{{ i }}].Checked"
                   appStopProp
                 />
diff --git a/apps/web/src/app/organizations/policies/policies.component.ts b/apps/web/src/app/organizations/policies/policies.component.ts
index 0a316f5597..717e35ac96 100644
--- a/apps/web/src/app/organizations/policies/policies.component.ts
+++ b/apps/web/src/app/organizations/policies/policies.component.ts
@@ -29,7 +29,7 @@ export class PoliciesComponent implements OnInit {
   organization: Organization;
 
   private orgPolicies: PolicyResponse[];
-  private policiesEnabledMap: Map<PolicyType, boolean> = new Map<PolicyType, boolean>();
+  protected policiesEnabledMap: Map<PolicyType, boolean> = new Map<PolicyType, boolean>();
 
   constructor(
     private route: ActivatedRoute,
diff --git a/apps/web/src/app/organizations/settings/organization-billing.component.ts b/apps/web/src/app/organizations/settings/organization-billing.component.ts
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/web/src/app/organizations/vault/add-edit.component.ts b/apps/web/src/app/organizations/vault/add-edit.component.ts
index e8138b1abc..27a2b9a11d 100644
--- a/apps/web/src/app/organizations/vault/add-edit.component.ts
+++ b/apps/web/src/app/organizations/vault/add-edit.component.ts
@@ -18,7 +18,6 @@ import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { TotpService } from "@bitwarden/common/abstractions/totp.service";
 import { CipherData } from "@bitwarden/common/models/data/cipher.data";
 import { Cipher } from "@bitwarden/common/models/domain/cipher";
-import { Organization } from "@bitwarden/common/models/domain/organization";
 import { CipherCreateRequest } from "@bitwarden/common/models/request/cipher-create.request";
 import { CipherRequest } from "@bitwarden/common/models/request/cipher.request";
 
@@ -29,7 +28,6 @@ import { AddEditComponent as BaseAddEditComponent } from "../../vault/add-edit.c
   templateUrl: "../../vault/add-edit.component.html",
 })
 export class AddEditComponent extends BaseAddEditComponent {
-  organization: Organization;
   originalCipher: Cipher = null;
 
   constructor(
diff --git a/apps/web/src/app/organizations/vault/vault-items.component.ts b/apps/web/src/app/organizations/vault/vault-items.component.ts
index 670217a724..044b3d6d75 100644
--- a/apps/web/src/app/organizations/vault/vault-items.component.ts
+++ b/apps/web/src/app/organizations/vault/vault-items.component.ts
@@ -12,7 +12,6 @@ import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { TokenService } from "@bitwarden/common/abstractions/token.service";
 import { TotpService } from "@bitwarden/common/abstractions/totp.service";
-import { Organization } from "@bitwarden/common/models/domain/organization";
 import { CipherView } from "@bitwarden/common/models/view/cipher.view";
 
 import { VaultItemsComponent as BaseVaultItemsComponent } from "../../vault/vault-items.component";
@@ -24,9 +23,6 @@ import { VaultItemsComponent as BaseVaultItemsComponent } from "../../vault/vaul
 export class VaultItemsComponent extends BaseVaultItemsComponent {
   @Output() onEventsClicked = new EventEmitter<CipherView>();
 
-  organization: Organization;
-  accessEvents = false;
-
   protected allCiphers: CipherView[] = [];
 
   constructor(
@@ -86,6 +82,7 @@ export class VaultItemsComponent extends BaseVaultItemsComponent {
   async search(timeout: number = null) {
     await super.search(timeout, this.allCiphers);
   }
+
   events(c: CipherView) {
     this.onEventsClicked.emit(c);
   }
diff --git a/apps/web/src/app/organizations/vault/vault.component.html b/apps/web/src/app/organizations/vault/vault.component.html
index dcc20913b9..7a75ce01c4 100644
--- a/apps/web/src/app/organizations/vault/vault.component.html
+++ b/apps/web/src/app/organizations/vault/vault.component.html
@@ -19,7 +19,7 @@
         <h1>
           {{ "vaultItems" | i18n }}
           <small #actionSpinner [appApiAction]="vaultItemsComponent.actionPromise">
-            <ng-container *ngIf="actionSpinner.loading">
+            <ng-container *ngIf="$any(actionSpinner).loading">
               <i
                 class="bwi bwi-spinner bwi-spin text-muted"
                 title="{{ 'loading' | i18n }}"
diff --git a/apps/web/src/app/organizations/vault/vault.module.ts b/apps/web/src/app/organizations/vault/vault.module.ts
index af32f6588d..8bae42ec9c 100644
--- a/apps/web/src/app/organizations/vault/vault.module.ts
+++ b/apps/web/src/app/organizations/vault/vault.module.ts
@@ -1,5 +1,6 @@
 import { NgModule } from "@angular/core";
 
+import { OrganizationBadgeModule } from "../../vault/organization-badge/organization-badge.module";
 import { VaultSharedModule } from "../../vault/shared/vault-shared.module";
 
 import { VaultFilterModule } from "./vault-filter/vault-filter.module";
@@ -8,7 +9,7 @@ import { VaultRoutingModule } from "./vault-routing.module";
 import { VaultComponent } from "./vault.component";
 
 @NgModule({
-  imports: [VaultSharedModule, VaultRoutingModule, VaultFilterModule],
+  imports: [VaultSharedModule, VaultRoutingModule, VaultFilterModule, OrganizationBadgeModule],
   declarations: [VaultComponent, VaultItemsComponent],
   exports: [VaultComponent],
 })
diff --git a/apps/web/src/app/reports/pages/weak-passwords-report.component.ts b/apps/web/src/app/reports/pages/weak-passwords-report.component.ts
index dabb835d72..b6a2278285 100644
--- a/apps/web/src/app/reports/pages/weak-passwords-report.component.ts
+++ b/apps/web/src/app/reports/pages/weak-passwords-report.component.ts
@@ -8,6 +8,7 @@ import { PasswordRepromptService } from "@bitwarden/common/abstractions/password
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { CipherType } from "@bitwarden/common/enums/cipherType";
 import { CipherView } from "@bitwarden/common/models/view/cipher.view";
+import { BadgeTypes } from "@bitwarden/components";
 
 import { CipherReportComponent } from "./cipher-report.component";
 
@@ -16,7 +17,7 @@ import { CipherReportComponent } from "./cipher-report.component";
   templateUrl: "weak-passwords-report.component.html",
 })
 export class WeakPasswordsReportComponent extends CipherReportComponent implements OnInit {
-  passwordStrengthMap = new Map<string, [string, string]>();
+  passwordStrengthMap = new Map<string, [string, BadgeTypes]>();
 
   private passwordStrengthCache = new Map<string, number>();
 
@@ -110,7 +111,7 @@ export class WeakPasswordsReportComponent extends CipherReportComponent implemen
     return true;
   }
 
-  private scoreKey(score: number): [string, string] {
+  private scoreKey(score: number): [string, BadgeTypes] {
     switch (score) {
       case 4:
         return ["strong", "success"];
diff --git a/apps/web/src/app/reports/shared/report-card/report-card.component.ts b/apps/web/src/app/reports/shared/report-card/report-card.component.ts
index 063d52bc68..13a2a04e0d 100644
--- a/apps/web/src/app/reports/shared/report-card/report-card.component.ts
+++ b/apps/web/src/app/reports/shared/report-card/report-card.component.ts
@@ -1,5 +1,7 @@
 import { Component, Input } from "@angular/core";
 
+import { Icon } from "@bitwarden/components";
+
 import { ReportVariant } from "../models/report-variant";
 
 @Component({
@@ -10,7 +12,7 @@ export class ReportCardComponent {
   @Input() title: string;
   @Input() description: string;
   @Input() route: string;
-  @Input() icon: string;
+  @Input() icon: Icon;
   @Input() variant: ReportVariant;
 
   protected get disabled() {
diff --git a/apps/web/src/app/send/access.component.html b/apps/web/src/app/send/access.component.html
index b581861020..91ae288d3c 100644
--- a/apps/web/src/app/send/access.component.html
+++ b/apps/web/src/app/send/access.component.html
@@ -81,7 +81,7 @@
                 id="text"
                 rows="8"
                 name="Text"
-                [(ngModel)]="sendText"
+                [ngModel]="sendText"
                 class="form-control"
                 readonly
               ></textarea>
diff --git a/apps/web/src/app/send/add-edit.component.html b/apps/web/src/app/send/add-edit.component.html
index dcc60a3c7a..dd9f61c6c5 100644
--- a/apps/web/src/app/send/add-edit.component.html
+++ b/apps/web/src/app/send/add-edit.component.html
@@ -55,7 +55,7 @@
                 name="Type_{{ o.value }}"
                 id="type_{{ o.value }}"
                 [value]="o.value"
-                (change)="typeChanged(o)"
+                (change)="typeChanged()"
                 [checked]="send.type === o.value"
               />
               <label class="form-check-label" for="type_{{ o.value }}">
@@ -120,14 +120,7 @@
         <h3 class="mt-5">{{ "share" | i18n }}</h3>
         <div class="form-group" *ngIf="link">
           <label for="link">{{ "sendLinkLabel" | i18n }}</label>
-          <input
-            type="text"
-            readonly
-            id="link"
-            name="Link"
-            [(ngModel)]="link"
-            class="form-control"
-          />
+          <input type="text" readonly id="link" name="Link" [ngModel]="link" class="form-control" />
         </div>
         <div class="form-group">
           <div class="form-check">
@@ -286,17 +279,17 @@
             class="btn btn-outline-danger"
             appA11yTitle="{{ 'delete' | i18n }}"
             *ngIf="editMode"
-            [disabled]="deleteBtn.loading"
+            [disabled]="$any(deleteBtn).loading"
             [appApiAction]="deletePromise"
           >
             <i
               class="bwi bwi-trash bwi-lg bwi-fw"
-              [hidden]="deleteBtn.loading"
+              [hidden]="$any(deleteBtn).loading"
               aria-hidden="true"
             ></i>
             <i
               class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-              [hidden]="!deleteBtn.loading"
+              [hidden]="!$any(deleteBtn).loading"
               title="{{ 'loading' | i18n }}"
               aria-hidden="true"
             ></i>
diff --git a/apps/web/src/app/send/efflux-dates.component.html b/apps/web/src/app/send/efflux-dates.component.html
index f8974e00c4..cd7924234e 100644
--- a/apps/web/src/app/send/efflux-dates.component.html
+++ b/apps/web/src/app/send/efflux-dates.component.html
@@ -13,7 +13,6 @@
               formControlName="fallbackDeletionDate"
               required
               placeholder="MM/DD/YYYY"
-              [readOnly]="disableSend"
               data-date-format="mm/dd/yyyy"
             />
             <input
@@ -24,7 +23,6 @@
               formControlName="fallbackDeletionTime"
               required
               placeholder="HH:MM AM/PM"
-              [readOnly]="disableSend"
             />
           </div>
         </ng-container>
@@ -38,7 +36,6 @@
               formControlName="fallbackDeletionDate"
               required
               placeholder="MM/DD/YYYY"
-              [readOnly]="disableSend"
               data-date-format="mm/dd/yyyy"
             />
             <select
diff --git a/apps/web/src/app/send/send.component.html b/apps/web/src/app/send/send.component.html
index b0ccca88dc..913ff67c28 100644
--- a/apps/web/src/app/send/send.component.html
+++ b/apps/web/src/app/send/send.component.html
@@ -59,7 +59,7 @@
         <h1>
           {{ "send" | i18n }}
           <small #actionSpinner [appApiAction]="actionPromise">
-            <ng-container *ngIf="actionSpinner.loading">
+            <ng-container *ngIf="$any(actionSpinner).loading">
               <i
                 class="bwi bwi-spinner bwi-spin text-muted"
                 title="{{ 'loading' | i18n }}"
diff --git a/apps/web/src/app/settings/emergency-access-add-edit.component.html b/apps/web/src/app/settings/emergency-access-add-edit.component.html
index b438cee937..b3590f8fb0 100644
--- a/apps/web/src/app/settings/emergency-access-add-edit.component.html
+++ b/apps/web/src/app/settings/emergency-access-add-edit.component.html
@@ -121,16 +121,16 @@
             (click)="delete()"
             appA11yTitle="{{ 'delete' | i18n }}"
             *ngIf="editMode"
-            [disabled]="deleteBtn.loading"
+            [disabled]="$any(deleteBtn).loading"
           >
             <i
               class="bwi bwi-trash bwi-lg bwi-fw"
-              [hidden]="deleteBtn.loading"
+              [hidden]="$any(deleteBtn).loading"
               aria-hidden="true"
             ></i>
             <i
               class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-              [hidden]="!deleteBtn.loading"
+              [hidden]="!$any(deleteBtn).loading"
               title="{{ 'loading' | i18n }}"
               aria-hidden="true"
             ></i>
diff --git a/apps/web/src/app/settings/organization-plans.component.html b/apps/web/src/app/settings/organization-plans.component.html
index ac6bee95ab..3ba90d3bd5 100644
--- a/apps/web/src/app/settings/organization-plans.component.html
+++ b/apps/web/src/app/settings/organization-plans.component.html
@@ -240,14 +240,6 @@
             {{ "monthAbbr" | i18n }} =
             {{ additionalStorageTotal(selectablePlan) | currency: "$" }} /{{ "year" | i18n }}
           </small>
-          <small *ngIf="selectablePlan.hasPremiumAccessOption && premiumAccessAddon">
-            {{ "premiumAccess" | i18n }}:
-            {{ selectablePlan.premiumAccessOptionCost / 12 | currency: "$" }} &times; 12
-            {{ "monthAbbr" | i18n }}
-            =
-            {{ 40 | currency: "$" }}
-            /{{ "year" | i18n }}
-          </small>
         </ng-container>
         <ng-container *ngIf="!selectablePlan.isAnnual">
           {{ "monthly" | i18n }}
@@ -272,17 +264,6 @@
             {{ "monthAbbr" | i18n }} =
             {{ additionalStorageTotal(selectablePlan) | currency: "$" }} /{{ "month" | i18n }}
           </small>
-          <small
-            *ngIf="
-              selectablePlan.hasPremiumAccessOption &&
-              formGroup.controls['premiumAccessAddon'].value
-            "
-          >
-            {{ "premiumAccess" | i18n }}:
-            {{ selectablePlan.premiumAccessOptionCost | currency: "$" }} {{ "monthAbbr" | i18n }} =
-            {{ 40 | currency: "$" }}
-            /{{ "month" | i18n }}
-          </small>
         </ng-container>
       </label>
     </div>
diff --git a/apps/web/src/app/settings/sponsoring-org-row.component.html b/apps/web/src/app/settings/sponsoring-org-row.component.html
index 30abad4475..bbff339959 100644
--- a/apps/web/src/app/settings/sponsoring-org-row.component.html
+++ b/apps/web/src/app/settings/sponsoring-org-row.component.html
@@ -25,7 +25,7 @@
         *ngIf="!isSelfHosted && !sponsoringOrg.familySponsorshipValidUntil"
         [appApiAction]="resendEmailPromise"
         class="dropdown-item btn-submit"
-        [disabled]="resendEmailBtn.loading"
+        [disabled]="$any(resendEmailBtn).loading"
         (click)="resendEmail()"
         [attr.aria-label]="'resendEmailLabel' | i18n: sponsoringOrg.familySponsorshipFriendlyName"
       >
@@ -36,7 +36,7 @@
         #revokeSponsorshipBtn
         [appApiAction]="revokeSponsorshipPromise"
         class="dropdown-item text-danger btn-submit"
-        [disabled]="revokeSponsorshipBtn.loading"
+        [disabled]="$any(revokeSponsorshipBtn).loading"
         (click)="revokeSponsorship()"
         [attr.aria-label]="'revokeAccount' | i18n: sponsoringOrg.familySponsorshipFriendlyName"
       >
diff --git a/apps/web/src/app/settings/two-factor-authenticator.component.html b/apps/web/src/app/settings/two-factor-authenticator.component.html
index 3ed1b2e573..748c6e0bd6 100644
--- a/apps/web/src/app/settings/two-factor-authenticator.component.html
+++ b/apps/web/src/app/settings/two-factor-authenticator.component.html
@@ -18,7 +18,7 @@
       <app-two-factor-verify
         [organizationId]="organizationId"
         [type]="type"
-        (onAuthed)="auth($event)"
+        (onAuthed)="auth($any($event))"
         *ngIf="!authed"
       >
       </app-two-factor-verify>
diff --git a/apps/web/src/app/settings/two-factor-duo.component.html b/apps/web/src/app/settings/two-factor-duo.component.html
index 02e3e9c595..fa76cf362c 100644
--- a/apps/web/src/app/settings/two-factor-duo.component.html
+++ b/apps/web/src/app/settings/two-factor-duo.component.html
@@ -18,7 +18,7 @@
       <app-two-factor-verify
         [organizationId]="organizationId"
         [type]="type"
-        (onAuthed)="auth($event)"
+        (onAuthed)="auth($any($event))"
         *ngIf="!authed"
       >
       </app-two-factor-verify>
diff --git a/apps/web/src/app/settings/two-factor-email.component.html b/apps/web/src/app/settings/two-factor-email.component.html
index 5f98fb0d93..a885aa9624 100644
--- a/apps/web/src/app/settings/two-factor-email.component.html
+++ b/apps/web/src/app/settings/two-factor-email.component.html
@@ -18,7 +18,7 @@
       <app-two-factor-verify
         [organizationId]="organizationId"
         [type]="type"
-        (onAuthed)="auth($event)"
+        (onAuthed)="auth($any($event))"
         *ngIf="!authed"
       >
       </app-two-factor-verify>
@@ -61,7 +61,7 @@
                 class="btn btn-outline-primary btn-sm btn-submit align-self-start"
                 (click)="sendEmail()"
                 [appApiAction]="emailPromise"
-                [disabled]="sendBtn.loading"
+                [disabled]="$any(sendBtn).loading"
               >
                 <i
                   class="bwi bwi-spinner bwi-spin"
diff --git a/apps/web/src/app/settings/two-factor-recovery.component.html b/apps/web/src/app/settings/two-factor-recovery.component.html
index d3bb8c28b6..6fdf5591c1 100644
--- a/apps/web/src/app/settings/two-factor-recovery.component.html
+++ b/apps/web/src/app/settings/two-factor-recovery.component.html
@@ -15,12 +15,7 @@
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
-      <app-two-factor-verify
-        [organizationId]="organizationId"
-        [type]="type"
-        (onAuthed)="auth($event)"
-        *ngIf="!authed"
-      >
+      <app-two-factor-verify [type]="type" (onAuthed)="auth($event)" *ngIf="!authed">
       </app-two-factor-verify>
       <ng-container *ngIf="authed">
         <div class="modal-body text-center">
diff --git a/apps/web/src/app/settings/two-factor-webauthn.component.html b/apps/web/src/app/settings/two-factor-webauthn.component.html
index 1a5676afd8..72f9d66c2c 100644
--- a/apps/web/src/app/settings/two-factor-webauthn.component.html
+++ b/apps/web/src/app/settings/two-factor-webauthn.component.html
@@ -18,7 +18,7 @@
       <app-two-factor-verify
         [organizationId]="organizationId"
         [type]="type"
-        (onAuthed)="auth($event)"
+        (onAuthed)="auth($any($event))"
         *ngIf="!authed"
       >
       </app-two-factor-verify>
@@ -54,7 +54,7 @@
               <i class="bwi bwi-li bwi-key"></i>
               <strong *ngIf="!k.configured || !k.name">{{ "webAuthnkeyX" | i18n: i + 1 }}</strong>
               <strong *ngIf="k.configured && k.name">{{ k.name }}</strong>
-              <ng-container *ngIf="k.configured && !removeKeyBtn.loading">
+              <ng-container *ngIf="k.configured && !$any(removeKeyBtn).loading">
                 <ng-container *ngIf="k.migrated">
                   <span>{{ "webAuthnMigrated" | i18n }}</span>
                 </ng-container>
@@ -63,7 +63,7 @@
                 <i
                   class="bwi bwi-spin bwi-spinner text-muted bwi-fw"
                   title="{{ 'loading' | i18n }}"
-                  *ngIf="removeKeyBtn.loading"
+                  *ngIf="$any(removeKeyBtn).loading"
                   aria-hidden="true"
                 ></i>
                 -
@@ -96,16 +96,16 @@
             type="button"
             (click)="readKey()"
             class="btn btn-outline-secondary mr-2"
-            [disabled]="readKeyBtn.loading || webAuthnListening || !keyIdAvailable"
+            [disabled]="$any(readKeyBtn).loading || webAuthnListening || !keyIdAvailable"
             #readKeyBtn
             [appApiAction]="challengePromise"
           >
             {{ "readKey" | i18n }}
           </button>
-          <ng-container *ngIf="readKeyBtn.loading">
+          <ng-container *ngIf="$any(readKeyBtn).loading">
             <i class="bwi bwi-spinner bwi-spin text-muted" aria-hidden="true"></i>
           </ng-container>
-          <ng-container *ngIf="!readKeyBtn.loading">
+          <ng-container *ngIf="!$any(readKeyBtn).loading">
             <ng-container *ngIf="webAuthnListening">
               <i class="bwi bwi-spinner bwi-spin text-muted" aria-hidden="true"></i>
               {{ "twoFactorU2fWaiting" | i18n }}...
@@ -138,8 +138,7 @@
             #disableBtn
             type="button"
             class="btn btn-outline-secondary btn-submit"
-            [appApiAction]="disablePromise"
-            [disabled]="disableBtn.loading"
+            [disabled]="$any(disableBtn).loading"
             (click)="disable()"
             *ngIf="enabled"
           >
diff --git a/apps/web/src/app/settings/two-factor-yubikey.component.html b/apps/web/src/app/settings/two-factor-yubikey.component.html
index ad26df871d..d377b303ef 100644
--- a/apps/web/src/app/settings/two-factor-yubikey.component.html
+++ b/apps/web/src/app/settings/two-factor-yubikey.component.html
@@ -18,7 +18,7 @@
       <app-two-factor-verify
         [organizationId]="organizationId"
         [type]="type"
-        (onAuthed)="auth($event)"
+        (onAuthed)="auth($any($event))"
         *ngIf="!authed"
       >
       </app-two-factor-verify>
@@ -104,7 +104,7 @@
             type="button"
             class="btn btn-outline-secondary btn-submit"
             [appApiAction]="disablePromise"
-            [disabled]="disableBtn.loading"
+            [disabled]="$any(disableBtn).loading"
             (click)="disable()"
             *ngIf="enabled"
           >
diff --git a/apps/web/src/app/settings/user-subscription.component.html b/apps/web/src/app/settings/user-subscription.component.html
index 64d6f93602..cb645d95a4 100644
--- a/apps/web/src/app/settings/user-subscription.component.html
+++ b/apps/web/src/app/settings/user-subscription.component.html
@@ -46,7 +46,7 @@
       class="btn-submit"
       (click)="reinstate()"
       [appApiAction]="reinstatePromise"
-      [disabled]="reinstateBtn.loading"
+      [disabled]="$any(reinstateBtn).loading"
     >
       <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
       <span>{{ "reinstateSubscription" | i18n }}</span>
@@ -147,7 +147,7 @@
         class="btn-submit tw-ml-auto"
         (click)="cancel()"
         [appApiAction]="cancelPromise"
-        [disabled]="cancelBtn.loading"
+        [disabled]="$any(cancelBtn).loading"
         *ngIf="subscription && !subscription.cancelled && !subscriptionMarkedForCancel"
       >
         <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
diff --git a/apps/web/src/app/settings/verify-email.component.html b/apps/web/src/app/settings/verify-email.component.html
index c599fdad4c..d1ec7aed2f 100644
--- a/apps/web/src/app/settings/verify-email.component.html
+++ b/apps/web/src/app/settings/verify-email.component.html
@@ -9,7 +9,7 @@
       class="btn btn-block btn-outline-secondary btn-submit"
       #sendBtn
       [appApiAction]="actionPromise"
-      [disabled]="sendBtn.loading"
+      [disabled]="$any(sendBtn).loading"
       (click)="send()"
     >
       <i class="bwi bwi-spin bwi-spinner" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts
index 1dfbc8da6b..cd9992bd79 100644
--- a/apps/web/src/app/shared/loose-components.module.ts
+++ b/apps/web/src/app/shared/loose-components.module.ts
@@ -1,7 +1,5 @@
 import { NgModule } from "@angular/core";
 
-import { UserVerificationComponent } from "@bitwarden/angular/components/user-verification.component";
-
 import { AcceptEmergencyComponent } from "../accounts/accept-emergency.component";
 import { AcceptOrganizationComponent } from "../accounts/accept-organization.component";
 import { HintComponent } from "../accounts/hint.component";
@@ -24,6 +22,7 @@ import { OrganizationSwitcherComponent } from "../components/organization-switch
 import { PasswordRepromptComponent } from "../components/password-reprompt.component";
 import { PremiumBadgeComponent } from "../components/premium-badge.component";
 import { UserVerificationPromptComponent } from "../components/user-verification-prompt.component";
+import { UserVerificationComponent } from "../components/user-verification.component";
 import { FooterComponent } from "../layouts/footer.component";
 import { FrontendLayoutComponent } from "../layouts/frontend-layout.component";
 import { NavbarComponent } from "../layouts/navbar.component";
@@ -124,7 +123,6 @@ import { BulkRestoreComponent } from "../vault/bulk-restore.component";
 import { BulkShareComponent } from "../vault/bulk-share.component";
 import { CollectionsComponent } from "../vault/collections.component";
 import { FolderAddEditComponent } from "../vault/folder-add-edit.component";
-import { OrganizationBadgeModule } from "../vault/organization-badge/organization-badge.module";
 import { ShareComponent } from "../vault/share.component";
 import { VaultFilterModule } from "../vault/vault-filter/vault-filter.module";
 
@@ -133,13 +131,7 @@ import { SharedModule } from ".";
 // Please do not add to this list of declarations - we should refactor these into modules when doing so makes sense until there are none left.
 // If you are building new functionality, please create or extend a feature module instead.
 @NgModule({
-  imports: [
-    SharedModule,
-    VaultFilterModule,
-    OrganizationBadgeModule,
-    OrganizationCreateModule,
-    RegisterFormModule,
-  ],
+  imports: [SharedModule, VaultFilterModule, OrganizationCreateModule, RegisterFormModule],
   declarations: [
     PremiumBadgeComponent,
     AcceptEmergencyComponent,
diff --git a/apps/web/src/app/tools/generator.component.html b/apps/web/src/app/tools/generator.component.html
index 0801941706..52717b509d 100644
--- a/apps/web/src/app/tools/generator.component.html
+++ b/apps/web/src/app/tools/generator.component.html
@@ -408,7 +408,7 @@
       type="button"
       class="btn btn-submit btn-primary"
       (click)="regenerate()"
-      [disabled]="form.loading"
+      [disabled]="$any(form).loading"
     >
       <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
       <span>{{ "regenerateUsername" | i18n }}</span>
diff --git a/apps/web/src/app/tools/import-export/export.component.html b/apps/web/src/app/tools/import-export/export.component.html
index 4e27fc70f7..252e30665f 100644
--- a/apps/web/src/app/tools/import-export/export.component.html
+++ b/apps/web/src/app/tools/import-export/export.component.html
@@ -157,7 +157,8 @@
       <button
         type="submit"
         class="btn btn-primary btn-submit"
-        [disabled]="form.loading || disabled"
+        [disabled]="form.loading || disabledByPolicy"
+        [ngClass]="{ manual: disabledByPolicy }"
       >
         <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
         <span>{{ "confirmFormat" | i18n }}</span>
diff --git a/apps/web/src/app/tools/import-export/import.component.html b/apps/web/src/app/tools/import-export/import.component.html
index 92441600cb..1224bc4691 100644
--- a/apps/web/src/app/tools/import-export/import.component.html
+++ b/apps/web/src/app/tools/import-export/import.component.html
@@ -80,11 +80,13 @@
       right) and select "Settings". Go to "Export" and find the "Export to .csv File" option. Click
       "Export" to save the CSV file.
     </ng-container>
+    <!--
     <ng-container *ngIf="format === 'keeperjson'">
       Log into the Keeper web vault (keepersecurity.com/vault). Click on your "account email" (top
       right) and select "Settings". Go to "Export" and find the "Export to .json File" option. Click
       "Export" to save the JSON file.
     </ng-container>
+    -->
     <ng-container
       *ngIf="format === 'chromecsv' || format === 'operacsv' || format === 'vivaldicsv'"
     >
diff --git a/apps/web/src/app/vault/add-edit-custom-fields.component.html b/apps/web/src/app/vault/add-edit-custom-fields.component.html
index c524f34641..e01360562f 100644
--- a/apps/web/src/app/vault/add-edit-custom-fields.component.html
+++ b/apps/web/src/app/vault/add-edit-custom-fields.component.html
@@ -122,8 +122,8 @@
               [(ngModel)]="f.value"
               *ngIf="f.type === fieldType.Boolean"
               appTrueFalseValue
-              trueValue="true"
-              falseValue="false"
+              [trueValue]="true"
+              [falseValue]="false"
               [disabled]="cipher.isDeleted || viewOnly"
               attr.aria-describedby="fieldName{{ i }}"
             />
diff --git a/apps/web/src/app/vault/add-edit.component.html b/apps/web/src/app/vault/add-edit.component.html
index 0f5730b70a..8f4ec12d03 100644
--- a/apps/web/src/app/vault/add-edit.component.html
+++ b/apps/web/src/app/vault/add-edit.component.html
@@ -118,13 +118,13 @@
                   >
                     <i
                       class="bwi bwi-lg bwi-fw bwi-check-circle"
-                      [hidden]="checkPasswordBtn.loading"
+                      [hidden]="$any(checkPasswordBtn).loading"
                       aria-hidden="true"
                     ></i>
                     <i
                       class="bwi bwi-lg bwi-fw bwi-spinner bwi-spin"
                       aria-hidden="true"
-                      [hidden]="!checkPasswordBtn.loading"
+                      [hidden]="!$any(checkPasswordBtn).loading"
                       title="{{ 'loading' | i18n }}"
                     ></i>
                   </a>
@@ -838,7 +838,7 @@
               <input
                 class="form-check-input"
                 type="checkbox"
-                [(ngModel)]="c.checked"
+                [(ngModel)]="$any(c).checked"
                 id="collection-{{ i }}"
                 name="Collection[{{ i }}].Checked"
                 [disabled]="cipher.isDeleted || viewOnly"
@@ -935,17 +935,17 @@
             class="btn btn-outline-danger"
             appA11yTitle="{{ (cipher.isDeleted ? 'permanentlyDelete' : 'delete') | i18n }}"
             *ngIf="editMode && !cloneMode && !(!cipher.edit && editMode)"
-            [disabled]="deleteBtn.loading"
+            [disabled]="$any(deleteBtn).loading"
             [appApiAction]="deletePromise"
           >
             <i
               class="bwi bwi-trash bwi-lg bwi-fw"
-              [hidden]="deleteBtn.loading"
+              [hidden]="$any(deleteBtn).loading"
               aria-hidden="true"
             ></i>
             <i
               class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-              [hidden]="!deleteBtn.loading"
+              [hidden]="!$any(deleteBtn).loading"
               title="{{ 'loading' | i18n }}"
               aria-hidden="true"
             ></i>
diff --git a/apps/web/src/app/vault/attachments.component.html b/apps/web/src/app/vault/attachments.component.html
index 0940f0fa89..074ac41c85 100644
--- a/apps/web/src/app/vault/attachments.component.html
+++ b/apps/web/src/app/vault/attachments.component.html
@@ -26,10 +26,14 @@
           <tbody>
             <tr *ngFor="let a of cipher.attachments">
               <td class="table-list-icon">
-                <i class="bwi bwi-fw bwi-lg bwi-file" *ngIf="!a.downloading" aria-hidden="true"></i>
+                <i
+                  class="bwi bwi-fw bwi-lg bwi-file"
+                  *ngIf="!$any(a).downloading"
+                  aria-hidden="true"
+                ></i>
                 <i
                   class="bwi bwi-spinner bwi-lg bwi-fw bwi-spin"
-                  *ngIf="a.downloading"
+                  *ngIf="$any(a).downloading"
                   aria-hidden="true"
                 ></i>
               </td>
@@ -55,7 +59,7 @@
                       (click)="reupload(a)"
                       #reuploadBtn
                       [appApiAction]="reuploadPromises[a.id]"
-                      [disabled]="reuploadBtn.loading"
+                      [disabled]="$any(reuploadBtn).loading"
                     >
                       {{ "fix" | i18n }}
                     </button>
@@ -72,16 +76,16 @@
                   (click)="delete(a)"
                   #deleteBtn
                   [appApiAction]="deletePromises[a.id]"
-                  [disabled]="deleteBtn.loading"
+                  [disabled]="$any(deleteBtn).loading"
                 >
                   <i
                     class="bwi bwi-trash bwi-lg bwi-fw"
-                    [hidden]="deleteBtn.loading"
+                    [hidden]="$any(deleteBtn).loading"
                     aria-hidden="true"
                   ></i>
                   <i
                     class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-                    [hidden]="!deleteBtn.loading"
+                    [hidden]="!$any(deleteBtn).loading"
                     title="{{ 'loading' | i18n }}"
                     aria-hidden="true"
                   ></i>
diff --git a/apps/web/src/app/vault/bulk-share.component.html b/apps/web/src/app/vault/bulk-share.component.html
index 7b4ffe7a0a..fa84eb3f54 100644
--- a/apps/web/src/app/vault/bulk-share.component.html
+++ b/apps/web/src/app/vault/bulk-share.component.html
@@ -54,7 +54,7 @@
               <td class="table-list-checkbox">
                 <input
                   type="checkbox"
-                  [(ngModel)]="c.checked"
+                  [(ngModel)]="$any(c).checked"
                   name="Collection[{{ i }}].Checked"
                   appStopProp
                 />
diff --git a/apps/web/src/app/vault/collections.component.html b/apps/web/src/app/vault/collections.component.html
index f7c8dd7b89..603e899c11 100644
--- a/apps/web/src/app/vault/collections.component.html
+++ b/apps/web/src/app/vault/collections.component.html
@@ -37,7 +37,7 @@
               <td class="table-list-checkbox">
                 <input
                   type="checkbox"
-                  [(ngModel)]="c.checked"
+                  [(ngModel)]="$any(c).checked"
                   name="Collection[{{ i }}].Checked"
                   appStopProp
                 />
diff --git a/apps/web/src/app/vault/folder-add-edit.component.html b/apps/web/src/app/vault/folder-add-edit.component.html
index ea660594fd..1718f654d2 100644
--- a/apps/web/src/app/vault/folder-add-edit.component.html
+++ b/apps/web/src/app/vault/folder-add-edit.component.html
@@ -46,17 +46,17 @@
             class="btn btn-outline-danger"
             appA11yTitle="{{ 'delete' | i18n }}"
             *ngIf="editMode"
-            [disabled]="deleteBtn.loading"
+            [disabled]="$any(deleteBtn).loading"
             [appApiAction]="deletePromise"
           >
             <i
               class="bwi bwi-trash bwi-lg bwi-fw"
-              [hidden]="deleteBtn.loading"
+              [hidden]="$any(deleteBtn).loading"
               aria-hidden="true"
             ></i>
             <i
               class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-              [hidden]="!deleteBtn.loading"
+              [hidden]="!$any(deleteBtn).loading"
               title="{{ 'loading' | i18n }}"
               aria-hidden="true"
             ></i>
diff --git a/apps/web/src/app/vault/vault-filter/organization-filter/organization-filter.component.html b/apps/web/src/app/vault/vault-filter/organization-filter/organization-filter.component.html
index 9d5d8b45a7..81924ba643 100644
--- a/apps/web/src/app/vault/vault-filter/organization-filter/organization-filter.component.html
+++ b/apps/web/src/app/vault/vault-filter/organization-filter/organization-filter.component.html
@@ -167,7 +167,6 @@
               <i
                 *ngIf="!organization.enabled"
                 class="org-options bwi bwi-fw bwi-exclamation-triangle text-danger"
-                aria-label="{{ 'organizationIsDisabled' | i18n }}"
                 appA11yTitle="{{ 'organizationIsDisabled' | i18n }}"
               ></i
               ><button [bitMenuTriggerFor]="orgMenu" class="org-options">
diff --git a/apps/web/src/app/vault/vault-filter/shared/vault-filter-shared.module.ts b/apps/web/src/app/vault/vault-filter/shared/vault-filter-shared.module.ts
index b099655d66..d69181f570 100644
--- a/apps/web/src/app/vault/vault-filter/shared/vault-filter-shared.module.ts
+++ b/apps/web/src/app/vault/vault-filter/shared/vault-filter-shared.module.ts
@@ -1,6 +1,9 @@
 import { NgModule } from "@angular/core";
 
 import { SharedModule } from "../../../shared";
+import { LinkSsoComponent } from "../organization-filter/link-sso.component";
+import { OrganizationFilterComponent } from "../organization-filter/organization-filter.component";
+import { OrganizationOptionsComponent } from "../organization-filter/organization-options.component";
 
 import { CollectionFilterComponent } from "./collection-filter/collection-filter.component";
 import { FolderFilterComponent } from "./folder-filter/folder-filter.component";
@@ -15,6 +18,9 @@ import { VaultFilterService } from "./vault-filter.service";
     FolderFilterComponent,
     StatusFilterComponent,
     TypeFilterComponent,
+    OrganizationFilterComponent,
+    OrganizationOptionsComponent,
+    LinkSsoComponent,
   ],
   exports: [
     SharedModule,
@@ -22,6 +28,9 @@ import { VaultFilterService } from "./vault-filter.service";
     FolderFilterComponent,
     StatusFilterComponent,
     TypeFilterComponent,
+    OrganizationFilterComponent,
+    OrganizationOptionsComponent,
+    LinkSsoComponent,
   ],
   providers: [VaultFilterService],
 })
diff --git a/apps/web/src/app/vault/vault-filter/vault-filter.module.ts b/apps/web/src/app/vault/vault-filter/vault-filter.module.ts
index f325392094..8499b2580a 100644
--- a/apps/web/src/app/vault/vault-filter/vault-filter.module.ts
+++ b/apps/web/src/app/vault/vault-filter/vault-filter.module.ts
@@ -1,19 +1,11 @@
 import { NgModule } from "@angular/core";
 
-import { LinkSsoComponent } from "./organization-filter/link-sso.component";
-import { OrganizationFilterComponent } from "./organization-filter/organization-filter.component";
-import { OrganizationOptionsComponent } from "./organization-filter/organization-options.component";
 import { VaultFilterSharedModule } from "./shared/vault-filter-shared.module";
 import { VaultFilterComponent } from "./vault-filter.component";
 
 @NgModule({
   imports: [VaultFilterSharedModule],
-  declarations: [
-    VaultFilterComponent,
-    OrganizationFilterComponent,
-    OrganizationOptionsComponent,
-    LinkSsoComponent,
-  ],
+  declarations: [VaultFilterComponent],
   exports: [VaultFilterComponent],
 })
 export class VaultFilterModule {}
diff --git a/apps/web/src/app/vault/vault-items.component.html b/apps/web/src/app/vault/vault-items.component.html
index 1c24a96d2f..c46423833e 100644
--- a/apps/web/src/app/vault/vault-items.component.html
+++ b/apps/web/src/app/vault/vault-items.component.html
@@ -10,7 +10,7 @@
     <tbody>
       <tr *ngFor="let c of filteredCiphers">
         <td (click)="checkCipher(c)" class="table-list-checkbox">
-          <input type="checkbox" [(ngModel)]="c.checked" appStopProp />
+          <input type="checkbox" [(ngModel)]="$any(c).checked" appStopProp />
         </td>
         <td (click)="checkCipher(c)" class="table-list-icon">
           <app-vault-icon [cipher]="c"></app-vault-icon>
diff --git a/apps/web/src/app/vault/vault-items.component.ts b/apps/web/src/app/vault/vault-items.component.ts
index 4de11e2ead..9027c53d8c 100644
--- a/apps/web/src/app/vault/vault-items.component.ts
+++ b/apps/web/src/app/vault/vault-items.component.ts
@@ -289,6 +289,10 @@ export class VaultItemsComponent extends BaseVaultItemsComponent implements OnDe
     this.onOrganzationBadgeClicked.emit(organizationId);
   }
 
+  events(c: CipherView) {
+    // TODO: This should be removed but is needed since we reuse the same template
+  }
+
   protected deleteCipher(id: string, permanent: boolean) {
     return permanent
       ? this.cipherService.deleteWithServer(id)
diff --git a/apps/web/src/app/vault/vault.component.html b/apps/web/src/app/vault/vault.component.html
index fb4afb8386..73a9b981f7 100644
--- a/apps/web/src/app/vault/vault.component.html
+++ b/apps/web/src/app/vault/vault.component.html
@@ -21,7 +21,7 @@
         <h1>
           {{ "vaultItems" | i18n }}
           <small #actionSpinner [appApiAction]="vaultItemsComponent.actionPromise">
-            <ng-container *ngIf="actionSpinner.loading">
+            <ng-container *ngIf="$any(actionSpinner).loading">
               <i
                 class="bwi bwi-spinner bwi-spin text-muted"
                 title="{{ 'loading' | i18n }}"
diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json
index b226cd4c09..34d5798505 100644
--- a/apps/web/tsconfig.json
+++ b/apps/web/tsconfig.json
@@ -12,6 +12,7 @@
     }
   },
   "angularCompilerOptions": {
+    "strictTemplates": true,
     "preserveWhitespaces": true
   },
   "files": ["src/polyfills.ts", "src/main.ts", "../../bitwarden_license/bit-web/src/main.ts"],
diff --git a/bitwarden_license/bit-web/src/app/organizations/manage/scim.component.html b/bitwarden_license/bit-web/src/app/organizations/manage/scim.component.html
index 5dafe8c536..595fe5446b 100644
--- a/bitwarden_license/bit-web/src/app/organizations/manage/scim.component.html
+++ b/bitwarden_license/bit-web/src/app/organizations/manage/scim.component.html
@@ -70,7 +70,7 @@
     </ng-container>
     <ng-container #rotateButton [appApiAction]="rotatePromise">
       <button
-        [disabled]="rotateButton.loading"
+        [disabled]="$any(rotateButton).loading"
         type="button"
         bitSuffix
         bitButton
@@ -80,7 +80,7 @@
         <i
           aria-hidden="true"
           class="bwi bwi-lg bwi-generate"
-          [ngClass]="{ 'bwi-spin': rotateButton.loading }"
+          [ngClass]="{ 'bwi-spin': $any(rotateButton).loading }"
         ></i>
       </button>
     </ng-container>
diff --git a/bitwarden_license/bit-web/src/app/organizations/manage/sso.component.ts b/bitwarden_license/bit-web/src/app/organizations/manage/sso.component.ts
index a268cbccf6..a03afe5d24 100644
--- a/bitwarden_license/bit-web/src/app/organizations/manage/sso.component.ts
+++ b/bitwarden_license/bit-web/src/app/organizations/manage/sso.component.ts
@@ -97,13 +97,13 @@ export class SsoComponent implements OnInit, OnDestroy {
   spMetadataUrl: string;
   spAcsUrl: string;
 
-  private enabled = this.formBuilder.control(false);
+  protected enabled = this.formBuilder.control(false);
 
-  private ssoIdentifier = this.formBuilder.control("", {
+  protected ssoIdentifier = this.formBuilder.control("", {
     validators: [Validators.maxLength(50), Validators.required],
   });
 
-  private openIdForm = this.formBuilder.group<ControlsOf<SsoConfigView["openId"]>>(
+  protected openIdForm = this.formBuilder.group<ControlsOf<SsoConfigView["openId"]>>(
     {
       authority: new FormControl("", Validators.required),
       clientId: new FormControl("", Validators.required),
@@ -126,7 +126,7 @@ export class SsoComponent implements OnInit, OnDestroy {
     }
   );
 
-  private samlForm = this.formBuilder.group<ControlsOf<SsoConfigView["saml"]>>(
+  protected samlForm = this.formBuilder.group<ControlsOf<SsoConfigView["saml"]>>(
     {
       spNameIdFormat: new FormControl(Saml2NameIdFormat.NotConfigured),
       spOutboundSigningAlgorithm: new FormControl(defaultSigningAlgorithm),
@@ -150,7 +150,7 @@ export class SsoComponent implements OnInit, OnDestroy {
     }
   );
 
-  private ssoConfigForm = this.formBuilder.group<ControlsOf<SsoConfigView>>({
+  protected ssoConfigForm = this.formBuilder.group<ControlsOf<SsoConfigView>>({
     configType: new FormControl(SsoType.None),
     keyConnectorEnabled: new FormControl(false),
     keyConnectorUrl: new FormControl(""),
diff --git a/bitwarden_license/bit-web/src/app/providers/manage/events.component.html b/bitwarden_license/bit-web/src/app/providers/manage/events.component.html
index d27b53e8d9..c64a572258 100644
--- a/bitwarden_license/bit-web/src/app/providers/manage/events.component.html
+++ b/bitwarden_license/bit-web/src/app/providers/manage/events.component.html
@@ -98,7 +98,7 @@
     type="button"
     class="btn btn-block btn-link btn-submit"
     (click)="loadEvents(false)"
-    [disabled]="loaded && moreBtn.loading"
+    [disabled]="loaded && $any(moreBtn).loading"
     *ngIf="continuationToken"
   >
     <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
diff --git a/bitwarden_license/bit-web/src/app/providers/manage/people.component.html b/bitwarden_license/bit-web/src/app/providers/manage/people.component.html
index 5eaa94303c..f76356bd36 100644
--- a/bitwarden_license/bit-web/src/app/providers/manage/people.component.html
+++ b/bitwarden_license/bit-web/src/app/providers/manage/people.component.html
@@ -149,7 +149,6 @@
           <td>
             <span *ngIf="u.type === userType.ProviderAdmin">{{ "providerAdmin" | i18n }}</span>
             <span *ngIf="u.type === userType.ServiceUser">{{ "serviceUser" | i18n }}</span>
-            <span *ngIf="u.type === userType.Custom">{{ "custom" | i18n }}</span>
           </td>
           <td class="table-list-options">
             <div class="dropdown" appListDropdown>
@@ -184,16 +183,6 @@
                   <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
                   {{ "confirm" | i18n }}
                 </a>
-                <a
-                  class="dropdown-item"
-                  href="#"
-                  appStopClick
-                  (click)="groups(u)"
-                  *ngIf="accessGroups"
-                >
-                  <i class="bwi bwi-fw bwi-sitemap" aria-hidden="true"></i>
-                  {{ "groups" | i18n }}
-                </a>
                 <a
                   class="dropdown-item"
                   href="#"
diff --git a/bitwarden_license/bit-web/src/app/providers/manage/user-add-edit.component.html b/bitwarden_license/bit-web/src/app/providers/manage/user-add-edit.component.html
index d784294071..24be5ca2a7 100644
--- a/bitwarden_license/bit-web/src/app/providers/manage/user-add-edit.component.html
+++ b/bitwarden_license/bit-web/src/app/providers/manage/user-add-edit.component.html
@@ -102,17 +102,17 @@
             class="btn btn-outline-danger"
             appA11yTitle="{{ 'delete' | i18n }}"
             *ngIf="editMode"
-            [disabled]="deleteBtn.loading"
+            [disabled]="$any(deleteBtn).loading"
             [appApiAction]="deletePromise"
           >
             <i
               class="bwi bwi-trash bwi-lg bwi-fw"
-              [hidden]="deleteBtn.loading"
+              [hidden]="$any(deleteBtn).loading"
               aria-hidden="true"
             ></i>
             <i
               class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-              [hidden]="!deleteBtn.loading"
+              [hidden]="!$any(deleteBtn).loading"
               title="{{ 'loading' | i18n }}"
               aria-hidden="true"
             ></i>
diff --git a/bitwarden_license/bit-web/src/app/providers/setup/setup.component.html b/bitwarden_license/bit-web/src/app/providers/setup/setup.component.html
index 8bbbe41774..cd0e792d1d 100644
--- a/bitwarden_license/bit-web/src/app/providers/setup/setup.component.html
+++ b/bitwarden_license/bit-web/src/app/providers/setup/setup.component.html
@@ -30,9 +30,6 @@
         <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
         <span>{{ "submit" | i18n }}</span>
       </button>
-      <button type="button" class="btn btn-outline-secondary" (click)="cancel()" *ngIf="showCancel">
-        {{ "cancel" | i18n }}
-      </button>
     </div>
   </form>
 </div>
diff --git a/libs/angular/src/components/add-edit.component.ts b/libs/angular/src/components/add-edit.component.ts
index 371cc8d575..7194b88295 100644
--- a/libs/angular/src/components/add-edit.component.ts
+++ b/libs/angular/src/components/add-edit.component.ts
@@ -23,6 +23,7 @@ import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType";
 import { UriMatchType } from "@bitwarden/common/enums/uriMatchType";
 import { Utils } from "@bitwarden/common/misc/utils";
 import { Cipher } from "@bitwarden/common/models/domain/cipher";
+import { Organization } from "@bitwarden/common/models/domain/organization";
 import { CardView } from "@bitwarden/common/models/view/card.view";
 import { CipherView } from "@bitwarden/common/models/view/cipher.view";
 import { CollectionView } from "@bitwarden/common/models/view/collection.view";
@@ -74,6 +75,7 @@ export class AddEditComponent implements OnInit, OnDestroy {
   allowPersonal = true;
   reprompt = false;
   canUseReprompt = true;
+  organization: Organization;
 
   protected destroy$ = new Subject<void>();
   protected writeableCollections: CollectionView[];
diff --git a/libs/angular/src/components/attachments.component.ts b/libs/angular/src/components/attachments.component.ts
index 819ab43661..a484661be3 100644
--- a/libs/angular/src/components/attachments.component.ts
+++ b/libs/angular/src/components/attachments.component.ts
@@ -292,4 +292,8 @@ export class AttachmentsComponent implements OnInit {
   protected deleteCipherAttachment(attachmentId: string) {
     return this.cipherService.deleteAttachmentWithServer(this.cipher.id, attachmentId);
   }
+
+  protected async reupload(attachment: AttachmentView) {
+    // TODO: This should be removed but is needed since we re-use the same template
+  }
 }
diff --git a/libs/angular/src/components/user-verification.component.ts b/libs/angular/src/components/user-verification.component.ts
index 198a214c49..3234d353c1 100644
--- a/libs/angular/src/components/user-verification.component.ts
+++ b/libs/angular/src/components/user-verification.component.ts
@@ -1,6 +1,5 @@
-import { animate, style, transition, trigger } from "@angular/animations";
-import { Component, OnInit } from "@angular/core";
-import { ControlValueAccessor, NG_VALUE_ACCESSOR, FormControl } from "@angular/forms";
+import { Directive, OnInit } from "@angular/core";
+import { ControlValueAccessor, FormControl } from "@angular/forms";
 
 import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service";
 import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction";
@@ -14,21 +13,8 @@ import { Verification } from "@bitwarden/common/types/verification";
  * This is exposed to the parent component via the ControlValueAccessor interface (e.g. bind it to a FormControl).
  * Use UserVerificationService to verify the user's input.
  */
-@Component({
+@Directive({
   selector: "app-user-verification",
-  templateUrl: "user-verification.component.html",
-  providers: [
-    {
-      provide: NG_VALUE_ACCESSOR,
-      multi: true,
-      useExisting: UserVerificationComponent,
-    },
-  ],
-  animations: [
-    trigger("sent", [
-      transition(":enter", [style({ opacity: 0 }), animate("100ms", style({ opacity: 1 }))]),
-    ]),
-  ],
 })
 // eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class UserVerificationComponent implements ControlValueAccessor, OnInit {
diff --git a/libs/angular/src/components/vault-items.component.ts b/libs/angular/src/components/vault-items.component.ts
index b0d51777cb..28df06890a 100644
--- a/libs/angular/src/components/vault-items.component.ts
+++ b/libs/angular/src/components/vault-items.component.ts
@@ -1,6 +1,7 @@
 import { Directive, EventEmitter, Input, Output } from "@angular/core";
 
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
+import { Organization } from "@bitwarden/common/models/domain/organization";
 import { CipherView } from "@bitwarden/common/models/view/cipher.view";
 
 @Directive()
@@ -17,6 +18,8 @@ export class VaultItemsComponent {
   searchPlaceholder: string = null;
   filter: (cipher: CipherView) => boolean = null;
   deleted = false;
+  organization: Organization;
+  accessEvents = false;
 
   protected searchPending = false;
 
diff --git a/libs/angular/src/pipes/i18n.pipe.ts b/libs/angular/src/pipes/i18n.pipe.ts
index 730f439b46..afab9b8d02 100644
--- a/libs/angular/src/pipes/i18n.pipe.ts
+++ b/libs/angular/src/pipes/i18n.pipe.ts
@@ -8,7 +8,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 export class I18nPipe implements PipeTransform {
   constructor(private i18nService: I18nService) {}
 
-  transform(id: string, p1?: string, p2?: string, p3?: string): string {
+  transform(id: string, p1?: string | number, p2?: string | number, p3?: string | number): string {
     return this.i18nService.t(id, p1, p2, p3);
   }
 }
diff --git a/libs/common/src/abstractions/i18n.service.ts b/libs/common/src/abstractions/i18n.service.ts
index 23f2d4fd23..f4a9b8ceef 100644
--- a/libs/common/src/abstractions/i18n.service.ts
+++ b/libs/common/src/abstractions/i18n.service.ts
@@ -6,6 +6,6 @@ export abstract class I18nService {
   translationLocale: string;
   collator: Intl.Collator;
   localeNames: Map<string, string>;
-  t: (id: string, p1?: string, p2?: string, p3?: string) => string;
+  t: (id: string, p1?: string | number, p2?: string | number, p3?: string | number) => string;
   translate: (id: string, p1?: string, p2?: string, p3?: string) => string;
 }
diff --git a/libs/common/src/services/i18n.service.ts b/libs/common/src/services/i18n.service.ts
index 5076e1dbdf..9fd39b092a 100644
--- a/libs/common/src/services/i18n.service.ts
+++ b/libs/common/src/services/i18n.service.ts
@@ -122,7 +122,7 @@ export class I18nService implements I18nServiceAbstraction {
     return this.translate(id, p1, p2, p3);
   }
 
-  translate(id: string, p1?: string, p2?: string, p3?: string): string {
+  translate(id: string, p1?: string | number, p2?: string | number, p3?: string | number): string {
     let result: string;
     // eslint-disable-next-line
     if (this.localeMessages.hasOwnProperty(id) && this.localeMessages[id]) {
@@ -136,13 +136,13 @@ export class I18nService implements I18nServiceAbstraction {
 
     if (result !== "") {
       if (p1 != null) {
-        result = result.split("__$1__").join(p1);
+        result = result.split("__$1__").join(p1.toString());
       }
       if (p2 != null) {
-        result = result.split("__$2__").join(p2);
+        result = result.split("__$2__").join(p2.toString());
       }
       if (p3 != null) {
-        result = result.split("__$3__").join(p3);
+        result = result.split("__$3__").join(p3.toString());
       }
     }
 
diff --git a/libs/components/src/badge/badge.directive.ts b/libs/components/src/badge/badge.directive.ts
index 352da9c41f..c5482423e5 100644
--- a/libs/components/src/badge/badge.directive.ts
+++ b/libs/components/src/badge/badge.directive.ts
@@ -1,6 +1,6 @@
 import { Directive, ElementRef, HostBinding, Input } from "@angular/core";
 
-type BadgeTypes = "primary" | "secondary" | "success" | "danger" | "warning" | "info";
+export type BadgeTypes = "primary" | "secondary" | "success" | "danger" | "warning" | "info";
 
 const styles: Record<BadgeTypes, string[]> = {
   primary: ["tw-bg-primary-500"],